--- bnetd-0.4.25.orig/debian/postinst +++ bnetd-0.4.25/debian/postinst @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +case "$1" in + configure|abort-upgrade|abort-remove|abort-deconfigure) + # continue below + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +for dir in /var/lib/bnetd/player /var/lib/bnetd/reports /var/lib/bnetd/chanlogs /var/run/bnetd; do + chown games $dir +done + +# postrms prior to 0.4.25-3 had a bug which created an empty +# /etc/bnetd/users directory, which we don't need. +if [ -d /etc/bnetd/users ]; then + rmdir --ignore-fail-on-non-empty /etc/bnetd/users +fi + +#DEBHELPER# + +exit 0 + --- bnetd-0.4.25.orig/debian/copyright +++ bnetd-0.4.25/debian/copyright @@ -0,0 +1,34 @@ +This is the Debian GNU/Linux packaged version of BNETD version 0.4.18. + +The developers of this software are : + Mark Baysinger + Ross Combs + Rob Crittenden + Descolada + Gediminas + Damien Clermonte + Moreaus Denis + +It was put together by Raphael Bossek +from the following sources: + + + +Changes: + * Added Debian GNU/Linux packaging files. + * Changed the directories for Debian. + * Added Debian GNU/Linux banner. + +BNETD is distributed under the terms of the GNU General Public License. + +On Debian systems, the complete text of the GNU General Public License +can be found in `/usr/share/common-licenses/GPL'. + +Other legal notices: + + Battle.net, Diablo, Starcraft, Brood War, Warcraft, and Blizzard + Entertainment are trademarks or registered trademarks of Blizzard + Entertainment in the U.S. and/or other countries. All rights reserved. + + Neither this program nor the bnetd project are in any way affiliated with + Blizzard Entertainment. --- bnetd-0.4.25.orig/debian/prerm +++ bnetd-0.4.25/debian/prerm @@ -0,0 +1,44 @@ +#!/bin/sh + +set -e + +case "$1" in + upgrade|remove|failed-upgrade|deconfigure) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/bnetd ]; then + rm -f /usr/doc/bnetd +fi + +# If the previous bnetd configuration was buggy, the init script called by +# the debhelper code may not be able to stop the bnetd daemon. +# To catch this, we ignore shell failures while running the devhelper code +# and look at its exit status. + +set +e + +#DEBHELPER# + +# If devhelper code didn't work, kill bnetd using cruder methods +if [ $? -ne 0 ]; then + BNETD_PS_REGEX='[0-9]:[0-9][0-9] /usr/sbin/bnetd$' + if ps ax | grep -q "$BNETD_PS_REGEX"; then + echo -n 'Sending TERM signal to bnetd ... ' + kill `ps ax | grep "$BNETD_PS_REGEX" | cut -c1-6` + echo 'done.' + fi + sleep 2 + if ps ax | grep -q "$BNETD_PS_REGEX"; then + echo -n 'Sending KILL signal to bnetd ... ' + kill -9 `ps ax | grep "$BNETD_PS_REGEX" | cut -c1-6` + echo 'done.' + fi +fi + +exit 0 + --- bnetd-0.4.25.orig/debian/changelog +++ bnetd-0.4.25/debian/changelog @@ -0,0 +1,197 @@ +bnetd (0.4.25-8) unstable; urgency=low + + * Removed bashism in init.d script (Closes: #464496) + * Addded LSB formatted dependency info in init.d script (Closes: + #469121) + + -- Dennis L. Clark Mon, 3 Mar 2008 21:17:01 -0500 + +bnetd (0.4.25-7) unstable; urgency=low + + * Don't force stripping of executables before calling dh_strip + (Closes: #436598). + + -- Dennis L. Clark Tue, 28 Aug 2007 05:04:27 -0400 + +bnetd (0.4.25-6) unstable; urgency=low + + * Update config.guess and config.sub on debian/rules clean (Closes: #342394). + + -- Dennis L. Clark Mon, 6 Feb 2006 22:29:27 -0500 + +bnetd (0.4.25-5) unstable; urgency=low + + * Updated documentation on the status of the bnetd project, and removed + all references to the www.bnetd.org web site (Closes: #254584). + + -- Dennis L. Clark Sat, 31 Jul 2004 22:04:26 -0400 + +bnetd (0.4.25-4) unstable; urgency=low + + * Included some more docs, such as the bnetd FAQ. + * Changed some optional configuration files from conffiles to examples. + * Upgraded debhelper to V4 compatibility mode. + * Changed init script so that 'restart' works when bnetd isn't running. + * Conforms to Debian policy 3.6.1.0. + + -- Dennis L. Clark Sat, 25 Oct 2003 17:35:13 -0400 + +bnetd (0.4.25-3) unstable; urgency=low + + * Fixed multiline string literals so that package could be built with + gcc 3.3. (Closes: #195221). + * Tweaked debian/rules to stop (sooner) on build failure. + * Fixed some incorrect paths in bnetd.conf. + * Postinst now changes the ownership of some of bnetd's directories so that + bnetd can create and delete files in them. + * Turned on the pidfile option in bnetd.conf so the pid file can be used + to stop bnetd, and put the pid file in its own directory. + * Included chat online help file. + * Included some missing configuration files (bnissue.txt, bnban, gametrans). + * Made the terms of service files (tos_*.txt) conffiles and put them + in /etc/bnetd, with symlinks to them from /usr/share/bnetd. + * Updated text in various places to be more respectful of Blizzard + Entertainment's trademarks, particulary Battle.net(R). + * Upgraded from dh_installmanpages to dh_installman, removed useless + manpages, and moved the bnetd and bnproxy manpages to section 8. + * Modified the text in the Debian bnetd ad banner, and included an entry + for it in the ad banner list. Removed the default.pcx symlink as it isn't + a valid ad banner filename. + * Fixed the wrong version numbers used in some of the maintenance scripts. + * Added 'set -e' to maintenance scripts. + * The prerm script now explicitly kills bnetd if the init script didn't + work. + + -- Dennis L. Clark Sun, 13 Jul 2003 15:10:22 -0400 + +bnetd (0.4.25-2) unstable; urgency=low + + * New Maintainer (Closes: #123479). + + -- Dennis L. Clark Sat, 12 Apr 2003 23:23:27 -0400 + +bnetd (0.4.25-1) unstable; urgency=low + + * Maintainer set to QA group. + * Policy updated to 3.5.8. + * deb scripts normalized for a correct debhelper use. + * removed /usr/doc linking in postinst. + * Lintian clean. + + According to SlashDot this project is no more active. + http://slashdot.org/articles/02/02/21/0136256.shtml?tid=127 + + -- Francesco Paolo Lovergine Mon, 13 Jan 2003 14:06:28 +0100 + +bnetd (0.4.25-0.2) unstable; urgency=medium + + * Non-Maintainer Upload. + * Applied patch from Randolph Chung to fix build errors in 64-bit + architectures (closes: #136705). Thanks tausq! + * Updated config.{guess,sub}. + + -- Jordi Mallach Mon, 4 Mar 2002 14:18:21 +0100 + +bnetd (0.4.25-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream release. (Closes: #134494) + * Running the daemon as games. (part of #76749, needs chroot) + * Removed obsolete dh_suidregister from debian/rules. + * Above fixes by Robert Millan . + * Install symlinks for manpages. (Closes: #99533) + * Users in the USA should read #134984 and do something about it... + + -- Jordi Mallach Thu, 21 Feb 2002 13:03:20 +0100 + +bnetd (0.4.19-1.3) unstable; urgency=low + + * Non-maintainer upload. + * Mark /etc/bnetd/{bnetd.reg,news.txt} as conffiles (closes: #132155). + + -- Colin Watson Fri, 8 Feb 2002 01:12:25 +0000 + +bnetd (0.4.19-1.2) unstable; urgency=low + + * Non-maintainer upload. + * debian/control (Build-Depends): add sharutils, closes: #98897. + + -- James Troup Sun, 1 Jul 2001 16:24:18 +0100 + +bnetd (0.4.19-1.1) unstable; urgency=low + + * Non-maintainer upload + * Fixed typo in bnetd.conf (Closes: Bug#62449) + * Added build-depends (Closes: Bug#70363) + * Changed default userdir and reportdir to comply with the FHS + (Closes: Bug#81883) + + -- Gergely Nagy <8@free.bsd.hu> Sun, 15 Apr 2001 17:14:19 +0200 + +bnetd (0.4.19-1) unstable; urgency=low + + * New upstream version. + * Works with latest SartCraft patch again. + + -- Raphael Bossek Sun, 24 Oct 1999 11:19:43 +0200 + +bnetd (0.4.18-2) unstable; urgency=low + + * Configuration file could not be found. + * FHS 2.0 compilent. + + -- Raphael Bossek Sun, 3 Oct 1999 12:23:54 +0200 + +bnetd (0.4.18-1) unstable; urgency=low + + * New upstream version. + * Confirms with debian policy 3.0.1. + + -- Raphael Bossek Sat, 28 Aug 1999 00:26:38 +0200 + +bnetd (0.4.16-1) unstable; urgency=low + + * New upstream version + * Changed syntax for closing bugs + + -- Raphael Bossek Thu, 10 Aug 1999 20:41:41 +0200 + +bnetd (0.4.9-2) unstable; urgency=low + + * Missing -lm options caused compilation errors on m68k (closes: #40791) + + -- Raphael Bossek Mon, 5 Jul 1999 16:15:01 +0200 + +bnetd (0.4.9-1) unstable; urgency=low + + * New upstream version + * Moved user database to /var/cache/bnetd/player (closes: #40461) + + -- Raphael Bossek Fri, 2 Jul 1999 07:29:26 +0200 + +bnetd (0.4.8-3) unstable; urgency=low + + * Changed the supported architectures to "any" (closes: #39259) + + -- Raphael Bossek Thu, 10 Jun 1999 12:06:56 +0200 + +bnetd (0.4.8-2) unstable; urgency=low + + * Typographic error(s) removed (closes: #39034) + + -- Raphael Bossek Tue, 6 Jun 1999 22:55:02 +0200 + +bnetd (0.4.8-1) unstable; urgency=low + + * Initial release (considered unstable, but seems pretty stable to me.) + * Created autoconf/automake build environment missing for the source package + * New man page added for the bnbot program. + * Windows Registry file added for simple Battle.Net client configuration. + * New Battle.Net logo for the Debian GNU/Linux distribution set as default. + + -- Raphael Bossek Tue, 1 Jun 1999 18:20:36 +0200 + +Local variables: +mode: debian-changelog +End: + --- bnetd-0.4.25.orig/debian/postrm +++ bnetd-0.4.25/debian/postrm @@ -0,0 +1,45 @@ +#!/bin/sh + +set -e + +case "$1" in + purge) + rm -f /var/log/bnetd.log /var/run/bnetd.pid + rm -fr /var/lib/bnetd /var/run/bnetd /etc/bnetd + ;; + upgrade) + a=`echo $2|sed 's/\.[0-9]*\.[0-9]*-[0-9]*$//g'` + b=`echo $2|sed -e 's/^[0-9]*\.//g' -e 's/\.[0-9]*-[0-9]*$//g'` + c=`echo $2|sed -e 's/^[0-9]*\.[0-9]*\.//g' -e 's/-[0-9]*$//g'` + # + # Workaround for bug #40461 + # + if dpkg --compare-versions $2 lt 0.4.9 ; then + mkdir -p /etc/bnetd/users + if [ -d /var/lib/bnetd/player ]; then + mv /var/lib/bnetd/player/* /etc/bnetd/users/. + fi + elif dpkg --compare-versions $2 le 0.4.19-1 ; then + mkdir -p /var/cache/bnetd/player + if [ -d /var/lib/bnetd/player ]; then + mv /var/lib/bnetd/player/* /var/cache/bnetd/player/. + fi + fi + + if dpkg --compare-versions $2 lt 0.4.25-3 ; then + if [ ! -e /usr/share/bnetd/default.pcx ]; then + ln -s debian.pcx /usr/share/bnetd/default.pcx + fi + fi + ;; + remove|failed-upgrade|abort-install|abort-upgrade|disapper) + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- bnetd-0.4.25.orig/debian/examples +++ bnetd-0.4.25/debian/examples @@ -0,0 +1,6 @@ +conf/autoupdate +conf/bnban +conf/gametrans +conf/realm.list +conf/versioncheck +debian/bnetd.reg --- bnetd-0.4.25.orig/debian/rules +++ bnetd-0.4.25/debian/rules @@ -0,0 +1,134 @@ +#!/usr/bin/make -f + +build: + cd src && ./configure --prefix=/ + cd src && make + uudecode debian/debian.pcx.uu --o debian/debian.pcx + touch build + +clean: + if [ -f src/Makefile ]; then cd src && make distclean; fi + rm -f build debian/debian.pcx + -test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub src/autoconf/config.sub + -test -r /usr/share/misc/config.guess && \ + cp -f /usr/share/misc/config.guess src/autoconf/config.guess + dh_clean + +binary-indep: + +binary-arch: build +# Initialize the building procedure + dh_testdir + dh_testroot + dh_clean + dh_installdirs + +# Install the configuration files + install -p -o root -g root -m 644 conf/bnetd.conf.in \ + debian/bnetd/etc/bnetd/bnetd.conf + #ln -s bnetd/bnetd.conf debian/bnetd/etc/bnetd.conf + install -p -o root -g root -m 644 conf/bnetd_default_user \ + debian/bnetd/etc/bnetd/bnetd_default_user + install -p -o root -g root -m 644 conf/channel.list \ + debian/bnetd/etc/bnetd/channel.list + install -p -o root -g root -m 644 conf/bnmotd.txt \ + debian/bnetd/etc/bnetd/bnmotd.txt + install -p -o root -g root -m 644 debian/changelog \ + debian/bnetd/etc/bnetd/news.txt + install -p -o root -g root -m 644 conf/ad.list \ + debian/bnetd/etc/bnetd/ad.list + install -p -o root -g root -m 644 conf/bnissue.txt \ + debian/bnetd/etc/bnetd/bnissue.txt + +# Install the Terms of Service + install -p -o root -g root -m 644 files/tos_USA.txt \ + debian/bnetd/etc/bnetd/tos_USA.txt + install -p -o root -g root -m 644 files/tos_DEU.txt \ + debian/bnetd/etc/bnetd/tos_DEU.txt + +# Install the banners + install -p -o root -g root -m 644 files/ad000001.pcx \ + debian/bnetd/usr/share/bnetd/ad000001.pcx + install -p -o root -g root -m 644 debian/debian.pcx \ + debian/bnetd/usr/share/bnetd/debian.pcx + +# Install the files + install -p -o root -g root -m 644 files/icons.bni \ + debian/bnetd/usr/share/bnetd/icons.bni + install -p -o root -g root -m 644 conf/bnhelp \ + debian/bnetd/usr/share/bnetd/bnhelp + +# Install the bnetd console applications + install -o root -g root -m 755 bin/bnbot \ + debian/bnetd/usr/bin/bnbot + install -o root -g root -m 755 bin/bnchat \ + debian/bnetd/usr/bin/bnchat + install -o root -g root -m 755 bin/bnftp \ + debian/bnetd/usr/bin/bnftp + install -o root -g root -m 755 bin/bnpass \ + debian/bnetd/usr/bin/bnpass + install -o root -g root -m 755 bin/bnstat \ + debian/bnetd/usr/bin/bnstat + +# Install the bnetd daemon + install -o root -g root -m 755 sbin/bnetd \ + debian/bnetd/usr/sbin/bnetd + install -o root -g root -m 755 sbin/bnproxy \ + debian/bnetd/usr/sbin/bnproxy + +# Install the man1 pages +# install -p -o root -g root -m 644 man/bnetd.1 \ +# debian/bnetd/usr/man/man1/bnetd.1 +# install -p -o root -g root -m 644 man/bnpass.1 \ +# debian/bnetd/usr/man/man1/bnpass.1 +# install -p -o root -g root -m 644 debian/bnbot.1 \ +# debian/bnetd/usr/man/man1/bnbot.1 +# install -p -o root -g root -m 644 man/bnftp.1 \ +# debian/bnetd/usr/man/man1/bnftp.1 +# install -p -o root -g root -m 644 man/bnchat.1 \ +# debian/bnetd/usr/man/man1/bnchat.1 +# Install the man4 pages +# install -p -o root -g root -m 644 man/bntext.4 \ +# debian/bnetd/usr/man/man4/bntext.4 +# install -p -o root -g root -m 644 man/bnetd.conf.4 \ +# debian/bnetd/usr/man/man4/bnetd.conf.4 +# install -p -o root -g root -m 644 man/bntext.4 \ +# debian/bnetd/usr/man/man4/bntext.4 +# install -p -o root -g root -m 644 man/bnmotd.txt.4 \ +# debian/bnetd/usr/man/man4/bnmotd.txt.4 +# install -p -o root -g root -m 644 man/bnnews.txt.4 \ +# debian/bnetd/usr/man/man4/bnnews.txt.4 + +# Install the docs +# install -p -o root -g root -m 644 CHANGELOG \ +# debian/bnetd/usr/doc/bnetd/CHANGELOG +# install -p -o root -g root -m 644 CREDITS \ +# debian/bnetd/usr/doc/bnetd/CREDITS +# install -p -o root -g root -m 644 README \ +# debian/bnetd/usr/doc/bnetd/README + +# Install the other (Debian) stuff + dh_installdocs + mv debian/bnetd/usr/share/doc/bnetd/CHANGELOG debian/bnetd/usr/share/doc/bnetd/changelog + dh_installexamples +# dh_installmenu +# dh_installemacsen + dh_installinit +# dh_installcron + dh_installman + dh_installchangelogs + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol +# dh_makeshlibs + dh_md5sums + dh_builddeb + +binary: binary-arch binary-indep + +.PHONY: clean binary binary-arch binary-indep --- bnetd-0.4.25.orig/debian/init +++ bnetd-0.4.25/debian/init @@ -0,0 +1,75 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: bnetd +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start or stop the bnetd daemon. +### END INIT INFO + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/bnetd +NAME=bnetd +DESC="Battle.net(R) gaming server" + +CONFFILE=/etc/bnetd/bnetd.conf +PIDFILE=`grep ^pidfile $CONFFILE | head -n 1 | cut -d '=' -f 2 | tr -d ' \t'` + +# The config setting `` pidfile = "" '' means do not use a pid file +if [ "$PIDFILE" = '""' ]; then + PIDFILE= +fi + +test -f $DAEMON || exit 0 + +set -e + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet ${PIDFILE:+ --pidfile $PIDFILE} \ + --exec $DAEMON + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet ${PIDFILE:+ --pidfile $PIDFILE} \ + --exec $DAEMON + echo "$NAME." + ;; + #reload) + # + # If the daemon can reload its config files on the fly + # for example by sending it SIGHUP, do it here. + # + # If the daemon responds to changes in its config file + # directly anyway, make this a do-nothing entry. + # + # echo "Reloading $DESC configuration files." + # start-stop-daemon --stop --signal 1 --quiet --pidfile \ + # /var/run/$NAME.pid --exec $DAEMON + #;; + restart|force-reload) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart". + # + echo -n "Restarting $DESC: " + start-stop-daemon --stop --oknodo --quiet ${PIDFILE:+ --pidfile $PIDFILE} \ + --exec $DAEMON + sleep 1 + start-stop-daemon --start --quiet ${PIDFILE:+ --pidfile $PIDFILE} \ + --exec $DAEMON + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 --- bnetd-0.4.25.orig/debian/prerm.debhelper +++ bnetd-0.4.25/debian/prerm.debhelper @@ -0,0 +1,9 @@ +# Automatically added by dh_installinit +if [ -x "/etc/init.d/bnetd" ]; then + if [ -x /usr/sbin/invoke-rc.d ] ; then + invoke-rc.d bnetd stop + else + /etc/init.d/bnetd stop + fi +fi +# End automatically added section --- bnetd-0.4.25.orig/debian/dirs +++ bnetd-0.4.25/debian/dirs @@ -0,0 +1,9 @@ +etc/bnetd +usr/bin +usr/sbin +usr/share/bnetd +var/log +var/lib/bnetd/player +var/lib/bnetd/reports +var/lib/bnetd/chanlogs +var/run/bnetd --- bnetd-0.4.25.orig/debian/manpages +++ bnetd-0.4.25/debian/manpages @@ -0,0 +1,9 @@ +man/bnbot.1 +man/bnchat.1 +man/bnetd.1 +man/bnetd.conf.5 +man/bnftp.1 +man/bnpass.1 +man/bnproxy.1 +man/bnstat.1 +man/bntext.5 --- bnetd-0.4.25.orig/debian/docs +++ bnetd-0.4.25/debian/docs @@ -0,0 +1,8 @@ +CHANGELOG +CREDITS +README +docs/FAQ.html +docs/README.adbanner +docs/README.diablo108 +docs/README.ladder +docs/README.registry --- bnetd-0.4.25.orig/debian/debian.pcx.uu +++ bnetd-0.4.25/debian/debian.pcx.uu @@ -0,0 +1,93 @@ +begin 644 debian.pcx +M"@4!"`````#3`3L`+`$L`0`````````````````````````````````````` +M```````````````````````````!U`$!```````````````````````````` +M``````````````````````````````````````````````````#_`/\`_P#_ +M`/\`_P#_`-L`_P#_`/\`_P#_`/\`_P#;`/\`_P#_`/\`_P#_`/\`VP#_`/\` +M_P#_`/\`_P#_`-L`_P#_`/\`_P#_`/\`_P#;`/\`_P#_`/\`_P#_`/\`VP#_ +M`/\`_P#_`/\`_P#_`-L`_P#_`/\`_P#_`/\`_P#;`/\`_P#_`/\`_P#_`/\` +MVP#_`/\`_P#_`/\`_P#_`-L`_P#_`/\`_P#_`/\`_P#;`/\`_P#_`/\`_P#_ +M`/\`VP#_`/\`_P#_`/\`_P#_`-L`_P#_`/\`_P#_`/\`_P#;`/\`_P#_`/\` +M_P#_`/\`VP#_`/\`_P#_`/\`_P#_`-L`_P#_`/\`_P#_`/\`_P#;`/\`_P#_ +M`/\`_P#_`/\`VP#_`/\`_P#_`/\`_P#_`-L`_P#_`/\`_P#_`/\`_P#;`/\` +M_P#_`/\`_P#_`/\`VP#_`/\`_P#_`/\`_P#_`-L`XP#,!]4`PP?,`,('Z@#' +M!\,`Q0?'`,X'Q`#(!\<`P@?"`,<'R0#"!_0`RP?$`,4'QP#4!P#1!P#,!\X` +MQ@?_`/,`Y0##!\8`Q`?1`,0'RP#$!^8`PP?%`,0'PP#$!\D`!\4`PP?)`,(' +MR0##!\0`PP?*`,0']0##!\4`P@?%`,0'R0`'Q`##!\8`PP<`PP?$`,,'Q`## +M!\,`PP?&`,0'R0##!\0`P@?_`/(`Y0##!\D`P@?1`,,'\P#$!\@`P@?#`,4' +MR``'Q0##!\D`P@?)``?&`,,'_P#$`,,'Q@##!\,`Q0?(``?$`,,'QP#"!P#" +M!\4`PP?%`,('PP##!\D`P@?'`,,'Q@`'_P#R`.4`PP?)`,('T0##!_,`PP?* +M``?#`,('`,0'Q@`'Q0##!\D`P@?)``?&`,,'_P#$`,,'Q@##!\,`P@<`Q`?& +M``?$`,,'R``'``?&`,,'Q@`'PP##!\D`P@?'`,,'Q@`'_P#R`.4`PP?)`,(' +MT0##!_,`PP?*``?#`,('`,0'Q@`'Q0##!\D`P@?)``?&`,,'_P#$`,,'Q@## +M!\,`P@<`Q`?&``?$`,,'T0##!\H`PP?)`,('QP##!\8`!_\`\@#E`,,'R@#" +M!\8`Q0?%`,,'`,4'Q@##!\8`Q@?$`,,'`,4'R@##!\\`P@?"`,,'Q@`'Q0## +M!\D`P@?)``?&`,,'RP##!\0`PP<`Q0?&`,,'Q0#"!\,`Q0?"`,4'R0##!\8` +MPP?#`,('P@##!\8`!\0`PP?&``?*`,,'R@##!\H`P@?&`,0'S0#%!\4`PP<` +MR0?"`,4'Q`#%!\4`PP<`Q`?V`.4`PP?*`,('Q`##!\(`PP?$`,0'Q`#"!\0` +MQ`?$`,,'Q``'PP#%!\0`P@?)`,,'SP#"!\(`Q`?%``?%`,,'R0#"!\@`!\<` +MPP?*`,0'PP#%!\0`P@?$`,0'Q`##!\0`PP?%``?+`,,'Q0#"!\4`P@?"`,0' +MQ0`'Q`##!\4`P@?*`,,'R@##!\H`P@?&`,4'R@##!\(`PP?#`,@'P@##!\8` +M!\,`PP?"`,,'PP#(!_<`Y0##!\H`P@?$`,('Q0#"!\,`PP?&`,,'PP##!\,` +MPP?%`,('PP##!\4`P@?)`,,'SP#"!\,`Q`?$``?%`,,'R0#"!\@`!\<`PP?+ +M`,,'Q`##!\4`P@?%`,,'Q0#"!\4`PP?"`,('S`#)!\8`P@?#`,0'Q``'Q`#* +M!\H`PP?*`,,'R@#"!\<`QP?'`,('Q0#"!\,`PP?'`,('Q0`'Q`#"!\4`P@?# +M`,,'^P#E`,,'R@#"!\,`PP?%`,('PP##!\8`PP?#`,,'RP#"!\,`PP?%`,(' +MR0##!\\`P@?%`,,'PP`'Q0##!\D`P@?(``?'`,,'RP##!\0`PP?%`,('Q0## +M!\4`P@?'`,,'S@##!\4`Q`?#`,('Q0##!\,`!\0`PP?%`,('R@##!\H`PP?* +M`,('R@#&!\0`PP?%`,('PP##!\<`PP?$``?#`,,'Q0#"!\,`PP?[`.4`PP?* +M`,('PP##!\4`P@?#`,,'Q@##!\,`PP?+`,('PP##!\4`P@?)`,,'SP#"!\4` +MPP?#``?%`,,'R0#"!\@`!\<`PP?+`,,'Q`##!\4`P@?%`,,'Q0#"!\<`PP?. +M`,,'Q0#$!\,`P@?%`,,'PP`'Q`##!\8`!\H`PP?*`,,'R@#"!\H`Q@?$`,,' +MQ0#"!\,`PP?'`,,'Q``'PP##!\4`P@?#`,,'^P#E`,,'R@#"!\,`R@?#`,,' +MQ@##!\,`PP?'`,8'PP##!\4`P@?)`,,'QP#&!\(`P@?&`,('PP`'Q0##!\D` +MP@?(``?'`,,'RP##!\0`PP?%`,('Q0##!\4`P@?'`,,'S@##!\<`PP?"`,(' +MQ@#"!\,`!\0`PP?1`,,'R@##!\H`P@?.`,,'PP#*!\,`PP?'`,,'Q``'PP#* +M!\,`PP?[`.4`PP?*``?$`,,'R@##!\8`PP?#`,,'Q`##!\0`P@?#`,,'Q0#" +M!\D`PP?*`,('PP#"!\8`Q`<`!\4`PP?)`,('QP`'R`##!\L`PP?$`,,'Q0#" +M!\4`PP?%`,('R`#"!\X`PP?'`,,'P@#"!\8`Q`<`!\0`PP?1`,,'R@##!\H` +M!\<`!\@`P@?#`,,'R@##!\D`!\(`P@?$`,,'R@##!_L`Y0##!\D`P@?$`,,' +MR@##!\8`PP?#`,,'PP##!\4`P@?#`,,'Q0#"!\H`PP?)`,('PP#"!\<`Q0?% +M`,,'R0#"!\<`!\@`PP?'`,('P@##!\0`PP?%`,('Q0##!\4`P@?'``<`PP?, +M`,,'QP##!\(`P@?'`,4'Q`##!\@`!\@`PP?*`,,'R0#"!\<`!\@`P@?#`,,' +MR@##!\D`P@<`P@?$`,,'R@##!_L`Y0##!\D`!\4`PP?&``?#`,,'Q@`'Q0## +M!\,`PP?%`,('PP##!\4`P@?*`,,'R0#"!\,`P@?(`,0'QP#"!\8`PP?(``?( +M`,,'QP#"!\(`PP?$`,,'Q0#"!\4`PP?%`,('Q0#"!\,`PP?+`,,'QP##!\(` +MP@?(`,0'Q`##!\<`P@?(`,,'R@##!\D`!\@`PP?&`,('PP##!\8`!\,`PP?) +M`,('`,('Q`##!\8`!\,`PP?[`.4`PP?)``?%`,,'Q@`'PP##!\8`!\4`PP?# +M`,,'Q0#"!\,`PP?%`,('R@##!\D`P@?#`,('R`#$!\<`P@?&`,,'R``'R`## +M!\<`P@?"`,,'Q`##!\4`P@?%`,,'Q0#"!\4`P@?#`,,'RP##!\<`P@?#`,(' +MR`#$!\0`PP?'`,('R`##!\H`PP?)``?(`,,'Q@#"!\,`PP?&``?#`,,'R0#" +M!P#"!\0`PP?&``?#`,,'^P#E`,,'Q@#$!\8`PP?$``?$`,0'Q`#"!\4`PP?$ +M`,('PP#$!\,`PP?%`,('S`##!\<`P@?#`,('R@#"!\<`PP?$`,0'Q@##!\@` +MPP?&``?$`,,'Q`##!\4`P@?%`,,'Q`##!\4`P@?#`,,'RP##!\8`PP?#`,(' +MR@#"!\0`PP?&`,,'R`##!\H`PP?&`,0'R`#$!\0`P@?%`,,'Q``'Q`##!\H` +MP@?'`,,'Q``'Q`##!_L`XP#,!\L`Q0?%`,('`,4'Q@#%!\,`Q0?"`,D'PP#% +M!\P`R`?#`,8'R`#"!\D`Q@?)`,('QP#,!\,`Q0?"`,4'PP#%!\4`Q0<`Q`<` +MQ0<`Q@?'`,L'Q`#&!\@`P@?"`,X'Q@#&!\<`S`?.`,4'R0#%!\0`Q@?(`,(' +MR0#%!\0`Q@?Y`/\`_P#_`/\`_P#_`/\`VP#_`/\`_P#_`/\`_P#_`-L`_P#_ +M`/\`_P#_`/\`_P#;`/\`_P#_`/\`_P#_`/\`VP#_`/\`_P#_`/\`_P#_`-L` +M_P#_`/\`_P#_`/\`_P#;`/\`_P#_`/\`_P#_`/\`VP#_`/\`_P#_`/\`_P#_ +M`-L`_P#_`/\`_P#_`/\`_P#;`/\`_P#_`/\`_P#_`/\`VP#_`/\`_P#_`/\` +M_P#_`-L`_P#_`/\`_P#_`/\`_P#;`/\`_P#_`/\`_P#_`/\`VP#_`/\`_P#_ +M`/\`_P#_`-L`_P#_`/\`_P#_`/\`_P#;`/\`_P#_`/\`_P#_`/\`VP#_`/\` +M_P#_`/\`_P#_`-L`_P#_`/\`_P#_`/\`_P#;`/\`_P#_`/\`_P#_`/\`VP#_ +M`/\`_P#_`/\`_P#_`-L`_P#_`/\`_P#_`/\`_P#;``P````D.``2'``W50"G +M_P"4X@!OJ@"!Q@!*<0!556_C8W&JJHT'!Q;'!RA5560<7%X<7'?QL;0JJK&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 + --- bnetd-0.4.25.orig/debian/README +++ bnetd-0.4.25/debian/README @@ -0,0 +1,18 @@ +This package contains a Windows Registry file that +should help you configure your Battle.net(R) games. +This file can be found in /etc/bnetd/bnetd.reg +Be careful with this file ! It will overwrite +your already existing Battle.net(R) configuration so +check your configuration before import this file. +The Battle.net(R) configuration can by found at + \HKEY_LOCAL_MACHINE\SOFTWARE\Battle.Net + +Don't forget to enter your new bnetd Server IP into +the 'Server List' entry within the Battle.net(R) +Registry section. If you use our Registry file this +is set to 192.168.1.1. You can enter more than one +IP using ';' as sperator. + +NOTE: If you have trouble remove the bncache.dat +file from your game directory first. + --- bnetd-0.4.25.orig/debian/substvars +++ bnetd-0.4.25/debian/substvars @@ -0,0 +1 @@ +shlibs:Depends=libc6 (>= 2.3.2-1) --- bnetd-0.4.25.orig/debian/postrm.debhelper +++ bnetd-0.4.25/debian/postrm.debhelper @@ -0,0 +1,5 @@ +# Automatically added by dh_installinit +if [ "$1" = "purge" ] ; then + update-rc.d bnetd remove defaults >/dev/null +fi +# End automatically added section --- bnetd-0.4.25.orig/debian/README.Debian +++ bnetd-0.4.25/debian/README.Debian @@ -0,0 +1,13 @@ +bnetd for Debian +------------------ + +The upstream bnetd project is dead, and has been so for a while now. +Do not expect major enhancements or anything in the upsteam's TODO list +to ever be implemented in this package. + +This bnetd works sufficiently well for Starcraft(R), Diablo(R), and +Warcraft(R) II games, but for Diablo(R) II and Warcraft(R) III games +I strongly recommend the pvpgn package, which is being actively developed +upstream at the time of this writing. + +-- Dennis L. Clark Sat, 31 Jul 2004 20:27:53 -0400 --- bnetd-0.4.25.orig/debian/compat +++ bnetd-0.4.25/debian/compat @@ -0,0 +1 @@ +4 --- bnetd-0.4.25.orig/debian/postinst.debhelper +++ bnetd-0.4.25/debian/postinst.debhelper @@ -0,0 +1,10 @@ +# Automatically added by dh_installinit +if [ -x "/etc/init.d/bnetd" ]; then + update-rc.d bnetd defaults >/dev/null + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d bnetd start + else + /etc/init.d/bnetd start + fi +fi +# End automatically added section --- bnetd-0.4.25.orig/debian/control +++ bnetd-0.4.25/debian/control @@ -0,0 +1,20 @@ +Source: bnetd +Section: net +Priority: optional +Maintainer: Dennis L. Clark +Standards-Version: 3.6.1.0 +Build-Depends: debhelper (>= 2.4.0), sharutils, autotools-dev + +Package: bnetd +Architecture: any +Depends: ${shlibs:Depends} +Suggests: fortune +Description: Gaming server that emulates Battle.net(R) + The server currently implements most of the same functionality as the + real Battle.net(R) servers from Blizzard Entertainment. You can chat, + play games, use / commands, and things like account passwords, user + icons, ad banners, and channel operators work too. It is by no means + complete, though. + . + Currently Starcraft(R), Brood War(R), Diablo(R), and Warcraft(R) II + BNE are supported as clients. --- bnetd-0.4.25.orig/docs/README.ladder +++ bnetd-0.4.25/docs/README.ladder @@ -10,7 +10,7 @@ Welcome to Ladder play. We have implemented Ladder play that should mimic the way Blizzard does - it on Battle.net, using an extended Elo rating system. This computes a + it on Battle.net(R), using an extended Elo rating system. This computes a probability to win and then assigns points based upon that probability and the outcome of the game. The number of possible points decreases as a player advances. @@ -23,7 +23,7 @@ - select a game type of Ladder - select a map designated for Ladder play when selecting the game map, found in the ladder subdirectory under Browse - - be using a Starcraft or Brood Wars client + - be using a Starcraft(R) or Brood War(R) client (Note that Ladder games run only in Fast speed) @@ -83,9 +83,9 @@ LEGAL NOTES - Blizzard Entertainment is a trademark of Davidson & Associates, Inc. - Battle.net is a trademark of Davidson & Associates, Inc. - Starcraft is a trademark of Davidson & Associates, Inc. + Battle.net, Starcraft, Brood War, and Blizzard Entertainment are + trademarks or registered trademarks of Blizzard Entertainment in the + U.S. and/or other countries. All rights reserved. - The bnetd project is in no way affiliated with Blizzard Entertainment + The bnetd project is in no way affiliated with Blizzard Entertainment. --- bnetd-0.4.25.orig/docs/FAQ.html +++ bnetd-0.4.25/docs/FAQ.html @@ -27,7 +27,7 @@ - version 3.3, updated Aug 5, 2001
+ version 3.3.1, updated Jul 31, 2004
@@ -48,12 +48,10 @@
1.1) What is the bnetd Project?
-
1.2) What is Battle.net?
-
1.3) What is Starcraft?
-
1.4) Why create bnetd when Battle.net already exists?
+
1.2) What is Battle.net®?
+
1.3) What is Starcraft®?
+
1.4) Why create bnetd when Battle.net® already exists?
1.5) What is the history of bnetd?
-
1.6) How can I subscribe to your mailing lists?
-
1.7) Why is your homepage so out of date? Is the project dead?


@@ -63,10 +61,8 @@
2.1) How complete is bnetd right now?
2.2) On what systems does bnetd work?
2.3) Who is the bnetd team?
-
2.4) How can I help?
-
2.5) What is the versioning scheme?
-
2.6) Where is the bnetd changelog?
-
2.7) Is there a todo list?
+
2.4) Where is the bnetd changelog?
+
2.5) Is there a todo list?


@@ -75,8 +71,6 @@
3.1) Where can I download bnetd?
3.2) What version should I use?
-
3.3) How do I compile from the source distribution?
-
3.4) Why does the compiler generate an error in eventlog.c line 29?


@@ -86,8 +80,8 @@
4.1) How do I start bnetd?
4.2) Why don't I see anything when I start bnetd?
4.3) How do I customize the server?
-
4.4) Why can't I start Diablo games?
-
4.5) Why can't I connect with Diablo II?
+
4.4) Why can't I start Diablo® games?
+
4.5) Why can't I connect with Diablo® II?
4.6) How do I enable autoupdates?
4.7) How do I add admin rights to an account?


@@ -99,7 +93,7 @@
5.1) How do I connect to a server through my firewall?
5.2) How do I choose which server to connect to?
5.3) I'm using BNS but it doesn't select my server?
-
5.4) How do I connect to the original Battle.net server?
+
5.4) How do I connect to the original Battle.net® server?


@@ -138,42 +132,41 @@ The project is a collaboration focusing on development of the bnetd server. This is a program that attempts to emulate Blizzard's - Battle.net service. The bnetd + Battle.net® service. The bnetd project is run by volunteers and neither supported by nor otherwise - affiliated with Blizzard Entertainment. + affiliated with Blizzard Entertainment®.

- A major part of the effort is supporting all Bizzard's Battle.net + A major part of the effort is supporting all Bizzard's Battle.net® compatible games. The server may eventually support some non-Blizzard clients as well, but no work is currently being put into that. Certain software in addition to the bnetd server should also be considered part of the bnetd project. This includes BNS (BNetd Selector), bnchat (a text-based chat client), the BNI utilities, and bntrackd (BNetd TRACKing Daemon). The bnetd team also produces - documentation about these programs and the Battle.net protocol. + documentation about these programs and the Battle.net® protocol.


-
1.2) What is Battle.net?
+
1.2) What is Battle.net®?

- To avoid confusion please note that Battle.net is a trademark of - Davidson & Associates, Inc. The term is used here to refer to their - free (as in beer) online gaming services. Their game division - (maybe subsidiary?) is commonly called "Blizzard Entertainment" or just - "Blizzard". + To avoid confusion please note that Battle.net® is a trademark + and/or trademark of Blizzard Entertainment in the U.S. and other + countries. The term is used here to refer to their free (as in beer) + online gaming services.

- Battle.net's servers communicate with their client products like - Starcraft, Diablo, and Warcraft. The servers provide chat rooms and + Battle.net®'s servers communicate with their client products like + Starcraft®, Diablo®, and Warcraft®. The servers provide chat rooms and lists of multi-player games to join. Other services they provide include ladder rankings, permanant accounts, and client upgrades.


-
1.3) What is Starcraft?
+
1.3) What is Starcraft®?

- Starcraft is an RTS (real time strategy) game produced by Blizzard - Entertainment. It is unique in the fact that the game may be played + Starcraft® is an RTS (real time strategy) game produced by Blizzard + Entertainment®. It is unique in the fact that the game may be played from the point of view of three warring races. The races are completely different to one another, and a great deal of design and thought has gone to creating a balance between the participating races. Up to @@ -187,20 +180,20 @@


-
1.4) Why create bnetd when Battle.net already exists?
+
1.4) Why create bnetd when Battle.net® already exists?

- Starcraft provides no method to play TCP/IP games other than using a + Starcraft® provides no method to play TCP/IP games other than using a proprietary service provided by Blizzard. This service is often slow, and is sometimes down due to a crash or maintanence.

For some people (at LAN parties, school networks, etc.) it is not - possible to access Battle.net because of a lack of Internet connectivity - or because of a firewall. Using Battle.net chat rooms brings attention + possible to access Battle.net® because of a lack of Internet connectivity + or because of a firewall. Using Battle.net® chat rooms brings attention to your computer similar to using IRC.

- With the staggering numbers of players on Battle.net, it can be + With the staggering numbers of players on Battle.net®, it can be difficult to locate friends or other players willing to avoid using cheats or disconnecting when things aren't going their way.

@@ -218,7 +211,7 @@
1.5) What is the history of bnetd?

- The project started around the time Starcraft was released. It was + The project started around the time Starcraft® was released. It was created for hack value and as a solution for the problems mentioned in the reply to question 1.4.

@@ -233,93 +226,15 @@ http://bnetd.unleashed.org/ and collaboration quickly ensued producing the 0.4 release which supported account passwords (yea!). Tim set up the bnetd.org domain and - a permanent net connection. Work continues, and an 0.6.x release should - be out soon (0.5 will be skipped, see question 2.5). + a permanent net connection.

-
- -
1.6) How can I subscribe to your mailing lists?

- There are actually two different sets of mailing lists. The ones at - bnetd.org (hosted by igateway.net) - are older and have more subscribers. The ones on SourceForge are nice - because they are archived. -

-

- If anyone has bnetd-dev messages before June of 2000, please contact Ross - so he can put together a historic archive. -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
list namehosttopictraffic
bnetd-announce bnetd.org Announcementsvery low
bnetd-dev bnetd.org Development discussionmedium
bnetd-discuss bnetd.org User discussionvery low
bnetd-announce sourceforge.net Announcementsvery low
bnetd-devel sourceforge.net Development discussionmedium
bnetd-users sourceforge.net User discussionvery low
-

- Both list hosts use GNU Mailman which allows you to subscribe - an unsubscribe with a web browser. -

-

- The bnetd.org subscribe page.
- The SourceForge subscribe page. -

-
- -
1.7) Why is your homepage so out of date? Is the project dead?
-

- First of all, the project is alive. It will continue to be alive as - long as there are people willing to work on it. -

-

- Some of the main developers are very busy with their jobs, school, and - life in general. Releases aren't made as often as they used to be. - However those who wish to be on the cutting edge can still do so via - preleases (which are made every few weeks) and the - public CVS tree - on SourceForge - (which contains all the latest patches). + The bnetd project was shut down in February 2002. You can read about it + in the Slashdot article. + The last release of bnetd was release 0.4.25 in January 2002.


-   @@ -349,19 +264,19 @@
2.1) How complete is bnetd right now?

- It currently supports most Battle.net functionality. Features include: + It currently supports most Battle.net® functionality. Features include:

  • Highly configurable -
  • Starcraft and Brood War clients -
  • Diablo 1.05 and later clients -
  • Warcraft II BNE clients -
  • Diablo II (closed characters can't play) clients +
  • Starcraft® and Brood War® clients +
  • Diablo® 1.05 and later clients +
  • Warcraft® II BNE clients +
  • Diablo® II (closed characters can't play) clients
  • Chat and bot clients
  • Account creation, login, and changing passwords
  • Permanent and user-created channels -
  • Player record statistics for Starcraft, Brood War, and Warcraft -
  • Player character stats for Diablo +
  • Player record statistics for Starcraft®, Brood War®, and Warcraft® +
  • Player character stats for Diablo®
  • Game reports
  • Channel operators and server admins
  • Logging of server activity @@ -387,11 +302,8 @@
    2.2) On what systems does bnetd work?

    - The answer of course depends on the version number. 0.4 should work on - most systems after fixing the bug mentioned in question - 3.4. Later 0.4.x development versions and 0.6.x - when it is released should work on almost any Unix-like system. - Systems that have been tested recently are AIX, FreeBSD, HP-UX, Irix, + 0.4 should work on almost any Unix-like system. + Systems that have been tested are AIX, FreeBSD, HP-UX, Irix, OpenBSD, NetBSD, Solaris, SunOS (gcc only). Even Win32 works.

    @@ -402,121 +314,12 @@

    2.3) Who is the bnetd team?

    - The makeup of the team isn't set in stone. Currently there are only a - few active developers, Ross and Typhoon. Rob and Dizzy send in - occasional patches. Lots of others have sent in bug reports, patches, - and useful information. Tim provides a nice network connection, DNS, - and a machine to run our webserver on. For more details, see the + For details, see the CREDITS file which is included in the source tarfile.


    - -
    2.4) How can I help?
    -

    - If you have experience with C programming then grab the source and hack - away. Or if you don't have experience with programming go pick up some - books on C, Unix, sockets, or whatever you are intererested in. We are - always glad to answer questions about the source or to help people - develop their patches. See the TODO file included with the source - distribution for ideas to work on. We are in need of a Macintosh - network programming person to help port bnetd to the Macintosh. -

    -

    - If you are into GUIs, you can work on the Win32 or Macintosh connection - utilities called BNS. -

    -

    - If you aren't into programming, download the source and compile it (or - install a binary package), play with it, and tell us if you find - problems and we'll add them to the TODO list. -

    -
    - -
    2.5) What is the versioning scheme?
    -

    - There are two active releases at any point in time: "stable" and - "development". The development versions eventually become the next - stable release and a new development branch is opened. -

    -

    - The first two numbers separated by decimal points determine the release - number. So 0.3 and 0.4 are not only separate versions, but separate - releases (instead of being two revisions from release "0"). -

    -

    - Either type of release should compile and generally work (in theory). - More testing and effort is put into validating stable releases. There - are also "pre" releases like 0.4.22pre6. They were introduced late in - the 0.4.x development cycle and are mostly intended for keeping - developers in sync. -

    -

    - In the past, stable releases didn't have a third component. The next - development after stable release X.Y would be X.Y.1. The obvious - problem with this is that it doesn't leave any room for having new - versions in a stable release. An example of the kind of problem this - causes is the well-known bug described in question - 3.4. For this reason, the next stable release after - the 0.4.x development cycle will be 0.6.x, not 0.5. The - development cycle after that will be 0.7.x. -

    -

    - This system is bascially be the same as the even/odd system used by - the Linux kernel developers. -

    -

    - If that was just too confusing, you may find this table easier to - understand: -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    0.3stable
    0.3.Xdevelopment
    0.4stable
    0.4.Xdevelopment
    0.4.XpreXprerelease
    0.5nonexistant
    0.5.Xnonexistant
    0.6.Xstable
    0.6.XpreXprerelease
    0.7.Xdevelopment
    0.7.XpreXprerelease
    -
    -
    2.6) Where is the bnetd changelog?
    +
    2.4) Where is the bnetd changelog?

    You can look for the file CHANGELOG in the top level directory of the source tarfile or you may read the latest version from the @@ -529,11 +332,9 @@


    -
    2.7) Is there a todo list?
    +
    2.5) Is there a todo list?

    - Yes, you can see the list at - TODO - or you can look for the file TODO in the source tarfile. You can also + Look for the file TODO in the source tarfile. You can also read the latest version from the CVS Browser. Use the direct link to the @@ -572,61 +373,19 @@

    3.1) Where can I download bnetd?

    - If you wish to install from source, the main web site has a - file download section - which is usually up to date. There is also a - file archive on - Mike's box. And as a last resort, Ross also puts recent releases on his - CS account. -

    -

    - Daily snapshots of the source can also be found at the - Anonymous FTP Space - at sourceforge. -

    -

    - If you want an RPM, you can also find those on the main web site and - Mike's page. Debian and *BSD packages are avaliable when installing - those systems. + There is no longer an official download location for bnetd. You may be + able to find the sources or perhaps even compiled packages in the archives + of one of the Linux distributions or *BSD ports collections.


    3.2) What version should I use?

    - The 0.4 stable release has troubles compiling on recent glibc versions - so I recommend not using it. 0.3 has so many features lacking that the - only viable option is a recent 0.4.x development release. Typically - development versions are ok to use. When 0.6.x is released, it should - be the "default" install option for end users. + The last release of bnetd, 0.4.25, works sufficiently well for the old + Blizzard games, but see question 4.5.


    -
    3.3) How do I customize the server?
    -

    - The bnetd configuration file can be found in conf/bnetd.conf. - This contains pointers to where log and player files may be found and - also some tuning information so you can customize it to fit your needs. - See the bnetd.conf(5) manual page found in the man subdirectory - of the distribution for details on each possible setting. -

    -
    - -
    3.4) Why does the compiler generate an error in eventlog.c line 29?
    -

    - This is due to a bug in bnetd-0.4.0 and some earlier versions. - Basically the code is assuming that stderr is a constant but that is - untrue on newer glibc systems. -

    -

    - There are several ways to fix it. The simplest fix is to change - stderr to NULL at the top of eventlog.c and - recompile. Upgrading to a newer version of bnetd also fixes the - problem. The 0.4 series can not be patched because of the way the - versioning scheme works. The new scheme does not - have this problem. -

    -
    - @@ -678,7 +437,7 @@
    4.3) How do I customize the server?

    - The bnetd configuration file can be found in conf/bnetd.conf. This + The bnetd configuration file can be found in /etc/bnetd/bnetd.conf. This contains pointers to where log and player files may be found and also some tuning information so you can customize it to fit your needs. See the bnetd.conf(4) manual page found in the man subdirectory of @@ -686,16 +445,16 @@


    -
    4.4) Why can't I start Diablo games?
    +
    4.4) Why can't I start Diablo® games?

    - The support for games other than Starcraft and Brood War was in its + The support for games other than Starcraft® and Brood War® was in its infancy at the time 0.4 was released. So when using bnetd 0.4, some versions of Diablo difficulty connecting or starting games. Versions of bnetd after 0.4.22 have good Diablo I support as long as your client is upgraded to version 1.05 or greater.

    - Before 1.05, Battle.net used a completely different protocol which + Before 1.05, Battle.net® used a completely different protocol which looked liked database transactions and ran on a low port number. Support for this is now difficult to add since we don't have any packet traces. If someone really wants support for this we would @@ -703,7 +462,7 @@


    -
    4.5) Why can't I connect with Diablo II?
    +
    4.5) Why can't I connect with Diablo® II?

    Diablo II uses a new connection type that was not supported before bnetd version 0.4.23. Later versions support this feature. If you @@ -711,18 +470,22 @@ next paragraph.

    - With patch 1.08 of Diablo II, Blizzard changed its CD Key + With patch 1.08 of Diablo® II, Blizzard changed its CD Key authentification (again). Release 0.4.25pre3 and earlier don't unterstand the new packet type. Later releases should handle this - properly (try the nightly CVS build if you wish to test the fix - before the next release). + properly. +

    +

    + It is unknown whether later patches of Diablo® II work with bnetd. + If you are having troubles, you may need to look for an alternative to + bnetd.


    4.6)How do I enable autoupdates?

    Autoupdates are Blizzard's method of automatically upgrading game clients - to the latest version when they connect to Battle.net. Doing this ensures + to the latest version when they connect to Battle.net®. Doing this ensures that all users have compatible game versions and will not have syncronization errors during game play.

    @@ -748,7 +511,7 @@ becomes 105 and 1.08 becomes 108.

    - The MPQ files can be obtained from Battle.net using bnftp(1) or + The MPQ files can be obtained from Battle.net® using bnftp(1) or you can search for them on the world wide web or get them from an FSGS distribution.

    @@ -809,7 +572,7 @@

    The first thing you might want is the port information. The protocol uses TCP port 6112 on the bnetd server. It also uses UDP port 6112 on - both the client and the bnetd server. If you use Diablo II, then TCP + both the client and the bnetd server. If you use Diablo® II, then TCP port 4000 also needs to be open to the server. The clients will also talk to each other on UDP port 6112 during a game. If port 6112 is not available on the client when it binds the socket, it will receive on a @@ -835,14 +598,14 @@ combination of machines inside or outside the firewall. There is a message from Rick Kramer on the Netfilter mailing lists describing how to set it - up. In his case, he is assuming the Battle.net server is outside the + up. In his case, he is assuming the bnetd server is outside the local network.

    The instructions for Linux kernels 2.0.36 have been recorded below:

    - A simple way to connect to a Battle.net-like server is to use the + A simple way to connect to a Battle.net®-like server is to use the ipautofw program to add a forwarding rule for the packets, where x.x.x.x is the client machine.

    @@ -925,11 +688,11 @@ Once Starcraft, Diablo, or another client is installed, you can use a program named BNSv1103.exe - to switch between different bnetd servers and Blizzard's Battle.net. + to switch between different bnetd servers and Blizzard's Battle.net®.

    This program has a simple interface that has a radio button that lets - you switch between the Blizzard Battle.net server or Other. + you switch between the Blizzard Battle.net® server or Other. To use Other click on the radio button next to that entry and type in your hostname or IP address below.

    @@ -939,23 +702,23 @@

    You can also change the server while the client is running. For example, - with Starcraft you should return to the first screen past Multiplayer + with Starcraft® you should return to the first screen past Multiplayer where you can choose Ok or Cancel to connect to the - Battle.net server. Use Alt-Tab to switch to either BNS (if it is still + Battle.net® server. Use Alt-Tab to switch to either BNS (if it is still running) or to Windows Explorer and select a new server and click - Apply. Then switch back to Starcraft and click Ok to + Apply. Then switch back to Starcraft® and click Ok to connect to the new server.


    5.3) I'm using BNS but it doesn't select my server?

    - If you are using BNS 1.1.0.3 or older with Starcraft/Brood War 1.08 or - newer, Diablo 1.08 or newer, or Diablo II then you are not alone. + If you are using BNS 1.1.0.3 or older with Starcraft®/Brood War® 1.08 or + newer, Diablo® 1.08 or newer, or Diablo® II then you are not alone.

    This is because Blizzard has changed the registry format to support - client-side selection of the Battle.net gateway (USWest, USEast, etc.). + client-side selection of the Battle.net® gateway (USWest, USEast, etc.). While this is a very nice change, BNS hasn't yet been updated to handle the new format.

    @@ -980,7 +743,7 @@


    -
    5.4) How do I connect to the original Battle.net server?
    +
    5.4) How do I connect to the original Battle.net® server?

    For BNS users: start BNS, make sure Battle.net is selected as the server, and then click Ok. --- bnetd-0.4.25.orig/src/autoconf/config.guess +++ bnetd-0.4.25/src/autoconf/config.guess @@ -1,7 +1,11 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc. -# +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. + +timestamp='2006-07-02' + # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -14,88 +18,326 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Written by Per Bothner . -# The master version of this file is at the FSF in /home/gd/gnu/lib. + +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # # The plan is that this can be called by configure scripts if you -# don't specify an explicit system type (host/target name). -# -# Only a few systems have been added to this list; please add others -# (but try to keep the structure clean). -# +# don't specify an explicit build system type. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 8/24/94.) +# (ghazi@noc.rutgers.edu 1994-08-24) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15 - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep __ELF__ >/dev/null + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'` - exit 0 ;; + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-cbm-sysv4 - exit 0;; - amiga:NetBSD:*:*) - echo m68k-cbm-netbsd${UNAME_RELEASE} - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-cbm-openbsd${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; - Pyramid*:OSx*:*:*|MIS*:OSx*:*:*) + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then echo pyramid-pyramid-sysv3 else echo pyramid-pyramid-bsd fi - exit 0 ;; - NILE:*:*:dcosx) + exit ;; + NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -104,46 +346,78 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; - atari*:NetBSD:*:*) - echo m68k-atari-netbsd${UNAME_RELEASE} - exit 0 ;; - atari*:OpenBSD:*:*) - echo m68k-atari-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3*:NetBSD:*:*) - echo m68k-sun-netbsd${UNAME_RELEASE} - exit 0 ;; - sun3*:OpenBSD:*:*) - echo m68k-sun-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:NetBSD:*:*) - echo m68k-apple-netbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-apple-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - sed 's/^ //' << EOF >dummy.c - int main (argc, argv) int argc; char **argv; { + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); @@ -158,62 +432,83 @@ exit (-1); } EOF - ${CC-cc} dummy.c -o dummy \ - && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ - -o ${TARGET_BINARY_INTERFACE}x = x ] ; then + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then echo m88k-dg-dgux${UNAME_RELEASE} - else + else echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} fi - else echo i586-dg-dgux${UNAME_RELEASE} - fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i?86:AIX:*:*) + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - sed 's/^ //' << EOF >dummy.c + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c #include main() @@ -224,17 +519,21 @@ exit(0); } EOF - ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; - *:AIX:*:4) - if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then + exit ;; + *:AIX:*:[45]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -242,43 +541,120 @@ if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=4.${UNAME_RELEASE} + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; - 9000/[3478]??:HP-UX:*:*) + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;; - 9000/8?? ) HP_ARCH=hppa1.0 ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; esac - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; 3050*:HI-UX:*:*) - sed 's/^ //' << EOF >dummy.c + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c #include int main () @@ -303,224 +679,475 @@ exit (0); } EOF - ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; - i?86:OSF1:*:*) + exit ;; + i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; - CRAY*X-MP:*:*:*) - echo xmp-cray-unicos - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} - exit 0 ;; + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ - exit 0 ;; + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} - exit 0 ;; - CRAY-2:*:*:*) - echo cray2-cray-unicos - exit 0 ;; - F300:UNIX_System_V:*:*) - FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'` + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; - F301:UNIX_System_V:*:*) - echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` - exit 0 ;; - hp3[0-9][05]:NetBSD:*:*) - echo m68k-hp-netbsd${UNAME_RELEASE} - exit 0 ;; - hp3[0-9][05]:OpenBSD:*:*) - echo m68k-hp-openbsd${UNAME_RELEASE} - exit 0 ;; - i?86:BSD/386:*:* | *:BSD/OS:*:*) + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; - *:NetBSD:*:*) - echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) - echo i386-pc-cygwin32 - exit 0 ;; + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + i*:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + x86:Interix*:[3456]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[3456]*) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin32 - exit 0 ;; + echo powerpcle-unknown-cygwin + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) - echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; - *:Linux:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + arm*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + mips:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so - # first see if it will tell us. - ld_help_string=`ld --help 2>&1` - if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then - echo "${UNAME_MACHINE}-pc-linux-gnu" ; exit 0 - elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then - echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 - elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then - echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 - elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then - echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0 - elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then - echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 - elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then - echo "powerpc-unknown-linux-gnu" ; exit 0 - elif test "${UNAME_MACHINE}" = "alpha" ; then - echo alpha-unknown-linux-gnu ; exit 0 - elif test "${UNAME_MACHINE}" = "sparc" ; then - echo sparc-unknown-linux-gnu ; exit 0 - else - # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us - # useful --help. Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout. - test ! -d /usr/lib/ldscripts/. \ - && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 - # Determine whether the default compiler is a.out or elf - cat >dummy.c <&1 \ + | sed -ne '/supported targets:/!d + s/[ ][ ]*/ /g + s/.*supported targets: *// + s/ .*// + p'` + case "$ld_supported_targets" in + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit ;; + coff-i386) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF - ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy - fi ;; -# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions -# are messed up and put the nodename in both sysname and nodename. - i?86:DYNIX/ptx:4*:*) + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; - i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i?86:*:3.2:*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi - exit 0 ;; + exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i386. + echo i386-pc-msdosdjgpp + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 - exit 0 ;; + exit ;; paragon:*:*:*) echo i860-intel-osf1 - exit 0 ;; + exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; - m68*:LynxOS:2.*:*) + && { echo i486-ncr-sysv4; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; - i?86:LynxOS:2.*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) + exit ;; + rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -528,36 +1155,156 @@ else echo ns32k-sni-sysv fi - exit 0 ;; + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; - R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*) + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; - PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit 0 ;; + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -cat >dummy.c <$dummy.c < # include @@ -582,7 +1329,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -595,7 +1342,10 @@ #endif int version; version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); exit (0); #endif @@ -640,11 +1390,24 @@ #endif #if defined (vax) -#if !defined (ultrix) - printf ("vax-dec-bsd\n"); exit (0); -#else - printf ("vax-dec-ultrix\n"); exit (0); -#endif +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif #endif #if defined (alliant) && defined (i860) @@ -655,12 +1418,12 @@ } EOF -${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0 -rm -f dummy.c dummy +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -669,25 +1432,69 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi -#echo '(Unable to guess system type)' 1>&2 +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: --- bnetd-0.4.25.orig/src/autoconf/config.sub +++ bnetd-0.4.25/src/autoconf/config.sub @@ -1,6 +1,11 @@ #! /bin/sh -# Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc. +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. + +timestamp='2006-07-02' + # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. @@ -17,14 +22,18 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. +# # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. @@ -45,30 +54,75 @@ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -if [ x$1 = x ] -then - echo Configuration name missing. 1>&2 - echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 - echo "or $0 ALIAS" 1>&2 - echo where ALIAS is a recognized configuration type. 1>&2 - exit 1 -fi +me=`echo "$0" | sed -e 's,.*/,,'` -# First pass through any local machine types. -case $1 in - *local*) - echo $1 - exit 0 - ;; - *) - ;; +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - linux-gnu*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -94,15 +148,37 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) - os=sco3.2v5 + os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco4) @@ -117,10 +193,17 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -isc) os=-isc2.2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -143,25 +226,83 @@ -psos*) os=-psos ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; esac # Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. - tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \ - | arme[lb] | pyramid \ - | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \ - | alpha | we32k | ns16k | clipper | i370 | sh \ - | powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \ - | pdp11 | mips64el | mips64orion | mips64orionel \ - | sparc | sparclet | sparclite | sparc64) + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | mt \ + | msp430 \ + | nios | nios2 \ + | ns16k | ns32k \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k) basic_machine=$basic_machine-unknown ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. - i[3456]86) + i*86 | x86_64) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. @@ -170,23 +311,90 @@ exit 1 ;; # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \ - | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \ - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \ - | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \ - | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \ - | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \ - | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* | f301-*) + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ + | ymp-* \ + | z8k-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) basic_machine=m68000-att ;; 3b*) basic_machine=we32k-att ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; alliant | fx80) basic_machine=fx80-alliant ;; @@ -197,25 +405,35 @@ basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv ;; amiga | amiga-*) - basic_machine=m68k-cbm + basic_machine=m68k-unknown ;; - amigados) - basic_machine=m68k-cbm - os=-amigados + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos ;; amigaunix | amix) - basic_machine=m68k-cbm + basic_machine=m68k-unknown os=-sysv4 ;; apollo68) basic_machine=m68k-apollo os=-sysv ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; aux) basic_machine=m68k-apple os=-aux @@ -224,6 +442,10 @@ basic_machine=ns32k-sequent os=-dynix ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -244,27 +466,45 @@ basic_machine=c38-convex os=-bsd ;; - cray | ymp) - basic_machine=ymp-cray - os=-unicos - ;; - cray2) - basic_machine=cray2-cray + cray | j90) + basic_machine=j90-cray os=-unicos ;; - [ctj]90-cray) - basic_machine=c90-cray - os=-unicos + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16c) + basic_machine=cr16c-unknown + os=-elf ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola @@ -273,6 +513,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -292,6 +536,10 @@ encore | umax | mmax) basic_machine=ns32k-encore ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; fx2800) basic_machine=i860-alliant ;; @@ -302,6 +550,10 @@ basic_machine=tron-gmicro os=-sysv ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; h3050r* | hiux*) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -310,6 +562,14 @@ basic_machine=h8300-hitachi os=-hms ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; harris) basic_machine=m88k-harris os=-sysv3 @@ -325,13 +585,30 @@ basic_machine=m68k-hp os=-hpux ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; hp9k2[0-9][0-9] | hp9k31[0-9]) basic_machine=m68000-hp ;; hp9k3[2-9][0-9]) basic_machine=m68k-hp ;; - hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7) + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) basic_machine=hppa1.1-hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) @@ -340,27 +617,42 @@ hppa-next) os=-nextstep3 ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; i370-ibm* | ibm*) basic_machine=i370-ibm - os=-mvs ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? - i[3456]86v32) + i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; - i[3456]86v4*) + i*86v4*) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; - i[3456]86v) + i*86v) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv ;; - i[3456]86sol2) + i*86sol2) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; iris | iris4d) basic_machine=mips-sgi case $os in @@ -386,19 +678,54 @@ basic_machine=ns32k-utek os=-sysv ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; miniframe) basic_machine=m68000-convergent ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; news | news700 | news800 | news900) basic_machine=m68k-sony os=-newsos @@ -411,6 +738,10 @@ basic_machine=mips-sony os=-newsos ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; next | m*-next ) basic_machine=m68k-next case $os in @@ -436,9 +767,39 @@ basic_machine=i960-intel os=-nindy ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; np1) basic_machine=np1-gould ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; pa-hitachi) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -453,53 +814,105 @@ pbb) basic_machine=m68k-tti ;; - pc532 | pc532-*) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5) - basic_machine=i586-intel + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc ;; - pentiumpro | p6) - basic_machine=i686-intel + pentium4) + basic_machine=i786-pc ;; - pentium-* | p5-*) + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumpro-* | p6-*) + pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - k5) - # We don't have specific support for AMD's K5 yet, so just call it a Pentium - basic_machine=i586-amd - ;; - nexen) - # We don't have specific support for Nexgen yet, so just call it a Pentium - basic_machine=i586-nexgen + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould ;; - power) basic_machine=rs6000-ibm + power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown - ;; + ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown - ;; + ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ps2) basic_machine=i386-ibm ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; rm[46]00) basic_machine=mips-siemens ;; rtpc | rtpc-*) basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -507,6 +920,13 @@ basic_machine=sh-hitachi os=-hms ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; sps7) basic_machine=m68k-bull os=-sysv2 @@ -514,6 +934,13 @@ spur) basic_machine=spur-unknown ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; sun2) basic_machine=m68000-sun ;; @@ -554,13 +981,51 @@ sun386 | sun386i | roadrunner) basic_machine=i386-sun ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; symmetry) basic_machine=i386-sequent os=-dynix ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -569,6 +1034,10 @@ basic_machine=a29k-nyu os=-sym1 ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; vaxv) basic_machine=vax-dec os=-sysv @@ -577,9 +1046,9 @@ basic_machine=vax-dec os=-vms ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -592,13 +1061,29 @@ basic_machine=a29k-wrs os=-vxworks ;; - xmp) - basic_machine=xmp-cray - os=-unicos + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 ;; - xps | xps100) + xps | xps100) basic_machine=xps100-honeywell ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -606,28 +1091,44 @@ # Here we handle the default manufacturer of certain CPU types. It is in # some cases the only manufacturer, in others, it is the most popular. - mips) - basic_machine=mips-mips + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki ;; romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; vax) basic_machine=vax-dec ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; pdp11) basic_machine=pdp11-dec ;; we32k) basic_machine=we32k-att ;; - sparc) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; - cydra) + cydra) basic_machine=cydra-cydrome ;; orion) @@ -636,6 +1137,15 @@ orion105) basic_machine=clipper-highlevel ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; *) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 exit 1 @@ -668,9 +1178,12 @@ -solaris) os=-solaris2 ;; - -unixware* | svr4*) + -svr4*) os=-sysv4 ;; + -unixware*) + os=-sysv4.2uw + ;; -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; @@ -681,17 +1194,53 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -linux-gnu* | -uxpv*) + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -701,6 +1250,15 @@ -sunos6*) os=`echo $os | sed -e 's|sunos6|solaris3|'` ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; -osfrose*) os=-osfrose ;; @@ -716,11 +1274,26 @@ -acis*) os=-aos ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; -ctix* | -uts*) os=-sysv ;; + -nova*) + os=-rtmk-nova + ;; -ns2 ) - os=-nextstep2 + os=-nextstep2 + ;; + -nsk*) + os=-nsk ;; # Preserve the version number of sinix5. -sinix5.*) @@ -729,6 +1302,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -747,9 +1323,27 @@ # This must come after -sysvr4. -sysv*) ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; -xenix) os=-xenix ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *) @@ -772,13 +1366,26 @@ # system, and we'll never get to this point. case $basic_machine in + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; + arm*-rebel) + os=-linux + ;; arm*-semi) os=-aout ;; - pdp11-*) + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) os=-none ;; *-dec | vax-*) @@ -796,15 +1403,45 @@ # default. # os=-sunos4 ;; + m68*-cisco) + os=-aout + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; sparc-* | *-sun) os=-sunos4.1.1 ;; + *-be) + os=-beos + ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; *-hp) os=-hpux ;; @@ -815,7 +1452,7 @@ os=-sysv ;; *-cbm) - os=-amigados + os=-amigaos ;; *-dg) os=-dgux @@ -847,27 +1484,39 @@ *-next) os=-nextstep3 ;; - *-gould) + *-gould) os=-sysv ;; - *-highlevel) + *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; - *-sgi) + *-sgi) os=-irix ;; - *-siemens) + *-siemens) os=-sysv4 ;; *-masscomp) os=-rtu ;; - f301-fujitsu) + f30[01]-fujitsu | f700-fujitsu) os=-uxpv ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; *) os=-none ;; @@ -889,9 +1538,15 @@ -aix*) vendor=ibm ;; + -beos*) + vendor=be + ;; -hpux*) vendor=hp ;; + -mpeix*) + vendor=hp + ;; -hiux*) vendor=hitachi ;; @@ -907,21 +1562,47 @@ -genix*) vendor=ns ;; - -mvs*) + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) vendor=ibm ;; -ptx*) vendor=sequent ;; - -vxsim* | -vxworks*) + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) vendor=apple ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac echo $basic_machine$os +exit + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: --- bnetd-0.4.25.orig/src/d2dbs/prefs.c +++ bnetd-0.4.25/src/d2dbs/prefs.c @@ -43,13 +43,13 @@ #include "common/setup_after.h" static t_conf_table prefs_conf_table[]={ - { "logfile", offsetof(t_prefs,logfile), conf_type_str, (int)DEFAULT_LOG_FILE }, - { "logfile-gs", offsetof(t_prefs,logfile_gs), conf_type_str, (int)DEFAULT_LOG_FILE_GS}, - { "loglevels", offsetof(t_prefs,loglevels), conf_type_str, (int)DEFAULT_LOG_LEVELS }, - { "servaddrs", offsetof(t_prefs,servaddrs), conf_type_str, (int)D2DBS_SERVER_ADDRS }, - { "gameservlist", offsetof(t_prefs,gameservlist), conf_type_str, (int)D2GS_SERVER_LIST }, - { "charsavedir", offsetof(t_prefs,charsavedir), conf_type_str, (int)D2DBS_CHARSAVE_DIR }, - { "charinfodir", offsetof(t_prefs,charinfodir), conf_type_str, (int)D2DBS_CHARINFO_DIR }, + { "logfile", offsetof(t_prefs,logfile), conf_type_str, (long)DEFAULT_LOG_FILE }, + { "logfile-gs", offsetof(t_prefs,logfile_gs), conf_type_str, (long)DEFAULT_LOG_FILE_GS}, + { "loglevels", offsetof(t_prefs,loglevels), conf_type_str, (long)DEFAULT_LOG_LEVELS }, + { "servaddrs", offsetof(t_prefs,servaddrs), conf_type_str, (long)D2DBS_SERVER_ADDRS }, + { "gameservlist", offsetof(t_prefs,gameservlist), conf_type_str, (long)D2GS_SERVER_LIST }, + { "charsavedir", offsetof(t_prefs,charsavedir), conf_type_str, (long)D2DBS_CHARSAVE_DIR }, + { "charinfodir", offsetof(t_prefs,charinfodir), conf_type_str, (long)D2DBS_CHARINFO_DIR }, { "bak_charsavedir",offsetof(t_prefs,charsavebakdir),conf_type_str, 0 }, { "bak_charinfodir",offsetof(t_prefs,charinfobakdir),conf_type_str, 0 }, { "ladderdir", offsetof(t_prefs,ladderdir), conf_type_str, 0 }, --- bnetd-0.4.25.orig/src/d2dbs/cmdline_parse.c +++ bnetd-0.4.25/src/d2dbs/cmdline_parse.c @@ -46,10 +46,10 @@ static t_conf_table param_conf_table[]={ #ifdef USE_CHECK_ALLOC - { "-m", offsetof(t_param,memlog_file), conf_type_str, (int)DEFAULT_MEMLOG_FILE}, + { "-m", offsetof(t_param,memlog_file), conf_type_str, (long)DEFAULT_MEMLOG_FILE}, #endif - { "-c", offsetof(t_param,prefs_file), conf_type_str, (int)D2DBS_DEFAULT_CONF_FILE }, - { "-l", offsetof(t_param,logfile), conf_type_str, (int)NULL }, + { "-c", offsetof(t_param,prefs_file), conf_type_str, (long)D2DBS_DEFAULT_CONF_FILE }, + { "-l", offsetof(t_param,logfile), conf_type_str, (long)NULL }, { "-h", offsetof(t_param,help), conf_type_bool, 0 }, { "--help", offsetof(t_param,help), conf_type_bool, 0 }, { "-v", offsetof(t_param,version), conf_type_bool, 0 }, @@ -64,18 +64,18 @@ static t_param cmdline_param; static char help_message[]="\ -Usage: d2cs [] - -m : set memory debug logging file to FILE - -c : set configuration file to FILE - -l : set log to FILE - -h, --help: show this help message and exit - -v, --version: show version information and exit - -f, --foreground: start in foreground mode (don`t daemonize) - -s, --stderr: log to stderr instead of logging to file - -Notes: - 1.You should always use absolute path here for all FILE names - 2.-m option only works when compiled with USE_CHECK_ALLOC defined +\nUsage: d2cs []\n\ + -m : set memory debug logging file to FILE\n\ + -c : set configuration file to FILE\n\ + -l : set log to FILE\n\ + -h, --help: show this help message and exit\n\ + -v, --version: show version information and exit\n\ + -f, --foreground: start in foreground mode (don`t daemonize)\n\ + -s, --stderr: log to stderr instead of logging to file\n\ +\n\ +Notes:\n\ + 1.You should always use absolute path here for all FILE names\n\ + 2.-m option only works when compiled with USE_CHECK_ALLOC defined\n\ "; extern void cmdline_show_help(void) --- bnetd-0.4.25.orig/src/d2dbs/main.c +++ bnetd-0.4.25/src/d2dbs/main.c @@ -132,9 +132,7 @@ { if (!(temp = strdup(levels))) { - eventlog(eventlog_level_fatal,"main","could not allocate memory for tem -p - (exiting)"); + eventlog(eventlog_level_fatal,"main","could not allocate memory for temp (exiting)"); return -1; } @@ -143,8 +141,7 @@ while (tok) { if (eventlog_add_level(tok)<0) - eventlog(eventlog_level_error,"main","could not add log level \"%s\" -",tok); + eventlog(eventlog_level_error,"main","could not add log level \"%s\"",tok); tok = strtok(NULL,","); } --- bnetd-0.4.25.orig/src/d2dbs/setup.h +++ bnetd-0.4.25/src/d2dbs/setup.h @@ -56,12 +56,12 @@ #define MAX_GAMENAME_LEN 16 #define MAX_REALMNAME_LEN 32 -#define DEFAULT_LOG_FILE "/usr/local/var/d2dbs.log" -#define DEFAULT_LOG_FILE_GS "/usr/local/var/d2dbs-gs.log" +#define DEFAULT_LOG_FILE "/var/log/d2dbs.log" +#define DEFAULT_LOG_FILE_GS "/var/log/d2dbs-gs.log" #define DEFAULT_LOG_LEVELS "info,warn,error" -#define D2DBS_CHARSAVE_DIR "/usr/local/var/charsave" -#define D2DBS_CHARINFO_DIR "/usr/local/var/charinfo" -#define DEFAULT_MEMLOG_FILE "/tmp/d2dbs-mem.log" +#define D2DBS_CHARSAVE_DIR "/var/log/charsave" +#define D2DBS_CHARINFO_DIR "/var/log/charinfo" +#define DEFAULT_MEMLOG_FILE "/var/log/d2dbs-mem.log" #define DEFAULT_LISTEN_PORT 6114 #define D2DBS_SERVER_ADDRS "0.0.0.0" #define D2GS_SERVER_LIST "192.168.0.1" --- bnetd-0.4.25.orig/src/Makefile.in +++ bnetd-0.4.25/src/Makefile.in @@ -23,7 +23,7 @@ bindir = @bindir@ sbindir = @sbindir@ mandir = @mandir@ -confdir = @sysconfdir@ +confdir = @sysconfdir@/bnetd sharedir = @localstatedir@ filesdir = @localstatedir@/files usersdir = @localstatedir@/users --- bnetd-0.4.25.orig/src/configure +++ bnetd-0.4.25/src/configure @@ -2201,15 +2201,16 @@ #line 2202 "configure" #include "confdefs.h" #include -int main() +#include +main() { FILE *f=fopen("conftestval", "w"); - if (!f) return(1); + if (!f) exit(1); fprintf(f, "%d\n", sizeof(unsigned char)); - return(0); + exit(0); } EOF -if { (eval echo configure:2213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_char=`cat conftestval` else @@ -2229,7 +2230,7 @@ echo $ac_n "checking size of unsigned short""... $ac_c" 1>&6 -echo "configure:2233: checking size of unsigned short" >&5 +echo "configure:2234: checking size of unsigned short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2237,18 +2238,19 @@ ac_cv_sizeof_unsigned_short=2 else cat > conftest.$ac_ext < -int main() +#include +main() { FILE *f=fopen("conftestval", "w"); - if (!f) return(1); + if (!f) exit(1); fprintf(f, "%d\n", sizeof(unsigned short)); - return(0); + exit(0); } EOF -if { (eval echo configure:2252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_short=`cat conftestval` else @@ -2268,7 +2270,7 @@ echo $ac_n "checking size of unsigned int""... $ac_c" 1>&6 -echo "configure:2272: checking size of unsigned int" >&5 +echo "configure:2274: checking size of unsigned int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2276,18 +2278,19 @@ ac_cv_sizeof_unsigned_int=4 else cat > conftest.$ac_ext < -int main() +#include +main() { FILE *f=fopen("conftestval", "w"); - if (!f) return(1); + if (!f) exit(1); fprintf(f, "%d\n", sizeof(unsigned int)); - return(0); + exit(0); } EOF -if { (eval echo configure:2291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_int=`cat conftestval` else @@ -2307,7 +2310,7 @@ echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 -echo "configure:2311: checking size of unsigned long" >&5 +echo "configure:2314: checking size of unsigned long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2315,18 +2318,19 @@ ac_cv_sizeof_unsigned_long=4 else cat > conftest.$ac_ext < -int main() +#include +main() { FILE *f=fopen("conftestval", "w"); - if (!f) return(1); + if (!f) exit(1); fprintf(f, "%d\n", sizeof(unsigned long)); - return(0); + exit(0); } EOF -if { (eval echo configure:2330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long=`cat conftestval` else @@ -2346,7 +2350,7 @@ echo $ac_n "checking size of unsigned long long""... $ac_c" 1>&6 -echo "configure:2350: checking size of unsigned long long" >&5 +echo "configure:2354: checking size of unsigned long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2354,18 +2358,19 @@ ac_cv_sizeof_unsigned_long_long=0 else cat > conftest.$ac_ext < -int main() +#include +main() { FILE *f=fopen("conftestval", "w"); - if (!f) return(1); + if (!f) exit(1); fprintf(f, "%d\n", sizeof(unsigned long long)); - return(0); + exit(0); } EOF -if { (eval echo configure:2369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long_long=`cat conftestval` else @@ -2387,12 +2392,12 @@ # Checks for library functions. echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:2391: checking for strftime" >&5 +echo "configure:2396: checking for strftime" >&5 if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -2437,7 +2442,7 @@ echo "$ac_t""no" 1>&6 # strftime is in -lintl on SCO UNIX. echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:2441: checking for strftime in -lintl" >&5 +echo "configure:2446: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2445,7 +2450,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2483,12 +2488,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2487: checking for vprintf" >&5 +echo "configure:2492: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2535,12 +2540,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2539: checking for _doprnt" >&5 +echo "configure:2544: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2588,7 +2593,7 @@ fi echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:2592: checking whether setpgrp takes no argument" >&5 +echo "configure:2597: checking whether setpgrp takes no argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2596,7 +2601,7 @@ { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setpgrp_void=no else @@ -2640,7 +2645,7 @@ fi echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 -echo "configure:2644: checking whether closedir returns void" >&5 +echo "configure:2649: checking whether closedir returns void" >&5 if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2648,13 +2653,13 @@ ac_cv_func_closedir_void=yes else cat > conftest.$ac_ext < #include <$ac_header_dirent> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF -if { (eval echo configure:2658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_closedir_void=no else @@ -2679,12 +2684,12 @@ for ac_func in mkdir _mkdir do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2683: checking for $ac_func" >&5 +echo "configure:2688: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2732,12 +2737,12 @@ done echo $ac_n "checking whether mkdir takes one argument""... $ac_c" 1>&6 -echo "configure:2736: checking whether mkdir takes one argument" >&5 +echo "configure:2741: checking whether mkdir takes one argument" >&5 if eval "test \"`echo '$''{'ac_cv_mkdir_takes_one_arg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mkdir_takes_one_arg=yes else @@ -2785,12 +2790,12 @@ for ac_func in gethostname gettimeofday select socket strdup strtoul strerror inet_aton inet_ntoa uname recv send recvfrom sendto uname fork getpid sigaction sigprocmask sigaddset setpgid setpgrp ftime strcasecmp strncasecmp stricmp strnicmp chdir difftime strchr strrchr index rindex memcpy memset memmove bcopy wait waitpid pipe getenv ioctl setsid mktime poll gethostbyname getservbyname getlogin pow getpwnam getgrnam getuid getgid setuid setgid mkdir _mkdir do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2789: checking for $ac_func" >&5 +echo "configure:2794: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- bnetd-0.4.25.orig/src/d2cs/conf.h +++ bnetd-0.4.25/src/d2cs/conf.h @@ -32,7 +32,7 @@ char const * name; int offset; e_conf_type type; - int def_value; + long def_value; } t_conf_table; extern int conf_cleanup(t_conf_table * conf_table, void * param_data, int size); --- bnetd-0.4.25.orig/src/d2cs/prefs.c +++ bnetd-0.4.25/src/d2cs/prefs.c @@ -42,18 +42,18 @@ #include "common/setup_after.h" static t_conf_table prefs_conf_table[]={ - { "logfile", offsetof(t_prefs,logfile), conf_type_str, (int)DEFAULT_LOG_FILE }, - { "loglevels", offsetof(t_prefs,loglevels), conf_type_str, (int)DEFAULT_LOG_LEVELS }, - { "servaddrs", offsetof(t_prefs,servaddrs), conf_type_str, (int)D2CS_SERVER_ADDRS }, - { "gameservlist", offsetof(t_prefs,gameservlist), conf_type_str, (int)D2GS_SERVER_LIST }, - { "bnetdaddr", offsetof(t_prefs,bnetdaddr), conf_type_str, (int)BNETD_SERVER_LIST }, - { "charsavedir", offsetof(t_prefs,charsavedir), conf_type_str, (int)D2CS_CHARSAVE_DIR }, - { "charinfodir", offsetof(t_prefs,charinfodir), conf_type_str, (int)D2CS_CHARINFO_DIR }, + { "logfile", offsetof(t_prefs,logfile), conf_type_str, (long)DEFAULT_LOG_FILE }, + { "loglevels", offsetof(t_prefs,loglevels), conf_type_str, (long)DEFAULT_LOG_LEVELS }, + { "servaddrs", offsetof(t_prefs,servaddrs), conf_type_str, (long)D2CS_SERVER_ADDRS }, + { "gameservlist", offsetof(t_prefs,gameservlist), conf_type_str, (long)D2GS_SERVER_LIST }, + { "bnetdaddr", offsetof(t_prefs,bnetdaddr), conf_type_str, (long)BNETD_SERVER_LIST }, + { "charsavedir", offsetof(t_prefs,charsavedir), conf_type_str, (long)D2CS_CHARSAVE_DIR }, + { "charinfodir", offsetof(t_prefs,charinfodir), conf_type_str, (long)D2CS_CHARINFO_DIR }, { "ladderdir", offsetof(t_prefs,ladderdir), conf_type_str, 0 }, { "ladder_refresh_interval",offsetof(t_prefs,ladder_refresh_interval),conf_type_int,3600 }, - { "newbiefile", offsetof(t_prefs,newbiefile), conf_type_str, (int)D2CS_CHARSAVE_NEWBIE}, - { "motd", offsetof(t_prefs,motd), conf_type_hexstr,(int)D2CS_MOTD }, - { "realmname", offsetof(t_prefs,realmname), conf_type_str, (int)DEFAULT_REALM_NAME }, + { "newbiefile", offsetof(t_prefs,newbiefile), conf_type_str, (long)D2CS_CHARSAVE_NEWBIE}, + { "motd", offsetof(t_prefs,motd), conf_type_hexstr,(long)D2CS_MOTD }, + { "realmname", offsetof(t_prefs,realmname), conf_type_str, (long)DEFAULT_REALM_NAME }, { "maxchar", offsetof(t_prefs,maxchar), conf_type_int, MAX_CHAR_PER_ACCT }, { "listpurgeinterval", offsetof(t_prefs,listpurgeinterval),conf_type_int,LIST_PURGE_INTERVAL }, { "gqcheckinterval", offsetof(t_prefs,gqcheckinterval), conf_type_int,GAMEQUEUE_CHECK_INTERVAL}, @@ -72,7 +72,7 @@ { "sq_timeout", offsetof(t_prefs,sq_timeout), conf_type_int, DEFAULT_SQ_TIMEOUT }, { "d2gs_checksum", offsetof(t_prefs,d2gs_checksum),conf_type_int, 0 }, { "d2gs_version", offsetof(t_prefs,d2gs_version), conf_type_int, 0 }, - { "d2gs_password", offsetof(t_prefs,d2gs_password),conf_type_str, (int)"" }, + { "d2gs_password", offsetof(t_prefs,d2gs_password),conf_type_str, (long)"" }, { "check_multilogin", offsetof(t_prefs,check_multilogin),conf_type_int,1 }, { "s2s_idletime", offsetof(t_prefs,s2s_idletime),conf_type_int, DEFAULT_S2S_IDLETIME }, { "s2s_keepalive_interval", offsetof(t_prefs,s2s_keepalive_interval),conf_type_int, DEFAULT_S2S_KEEPALIVE_INTERVAL}, --- bnetd-0.4.25.orig/src/d2cs/cmdline_parse.c +++ bnetd-0.4.25/src/d2cs/cmdline_parse.c @@ -46,10 +46,10 @@ static t_conf_table param_conf_table[]={ #ifdef USE_CHECK_ALLOC - { "-m", offsetof(t_param,memlog_file), conf_type_str, (int)DEFAULT_MEMLOG_FILE}, + { "-m", offsetof(t_param,memlog_file), conf_type_str, (long)DEFAULT_MEMLOG_FILE}, #endif - { "-c", offsetof(t_param,prefs_file), conf_type_str, (int)D2CS_DEFAULT_CONF_FILE }, - { "-l", offsetof(t_param,logfile), conf_type_str, (int)NULL }, + { "-c", offsetof(t_param,prefs_file), conf_type_str, (long)D2CS_DEFAULT_CONF_FILE }, + { "-l", offsetof(t_param,logfile), conf_type_str, (long)NULL }, { "-h", offsetof(t_param,help), conf_type_bool, 0 }, { "--help", offsetof(t_param,help), conf_type_bool, 0 }, { "-v", offsetof(t_param,version), conf_type_bool, 0 }, @@ -64,18 +64,18 @@ static t_param cmdline_param; static char help_message[]="\ -Usage: d2cs [] - -m : set memory debug logging file to FILE - -c : set configuration file to FILE - -l : set log to FILE - -h, --help: show this help message and exit - -v, --version: show version information and exit - -f, --foreground: start in foreground mode (don`t daemonize) - -s, --stderr: log to stderr instead of logging to file - -Notes: - 1.You should always use absolute path here for all FILE names - 2.-m option only works when compiled with USE_CHECK_ALLOC defined +\nUsage: d2cs []\n\ + -m : set memory debug logging file to FILE\n\ + -c : set configuration file to FILE\n\ + -l : set log to FILE\n\ + -h, --help: show this help message and exit\n\ + -v, --version: show version information and exit\n\ + -f, --foreground: start in foreground mode (don`t daemonize)\n\ + -s, --stderr: log to stderr instead of logging to file\n\ +\n\ +Notes:\n\ + 1.You should always use absolute path here for all FILE names\n\ + 2.-m option only works when compiled with USE_CHECK_ALLOC defined\n\ "; extern void cmdline_show_help(void) --- bnetd-0.4.25.orig/src/d2cs/xstring.c +++ bnetd-0.4.25/src/d2cs/xstring.c @@ -173,7 +173,7 @@ int i ,n, index_size; int in_delim, match; char * temp, * result; - int * pindex; + long * pindex; char * pd; char const * ps; char * realloc_tmp; @@ -218,7 +218,7 @@ free(temp); return NULL; } - pindex=(int *)realloc_tmp; + pindex=(long *)realloc_tmp; } pindex[*count]= pd-temp; in_delim = 0; @@ -247,7 +247,7 @@ } memcpy(result+index_size,temp,pd-temp); for (i=0; i< *count; i++) { - pindex[i]+=(int)result+index_size; + pindex[i]+=(long)result+index_size; } memcpy(result,pindex,index_size); free(temp); @@ -260,7 +260,7 @@ unsigned int n, index_size; char * temp; int i, j; - int * pindex; + long * pindex; char * result; char * realloc_tmp; @@ -283,7 +283,7 @@ free(temp); return NULL; } - pindex=(int *)realloc_tmp; + pindex=(long *)realloc_tmp; } pindex[*count]=j; (*count)++; @@ -320,7 +320,7 @@ } memcpy(result+index_size,temp,j); for (i=0; i< *count; i++) { - pindex[i] +=(int)result+index_size; + pindex[i] +=(long)result+index_size; } memcpy(result,pindex,index_size); free(temp); --- bnetd-0.4.25.orig/src/d2cs/setup.h +++ bnetd-0.4.25/src/d2cs/setup.h @@ -106,12 +106,12 @@ #define DEFAULT_TIMEOUT_CHECKINTERVAL 60 #ifndef D2CS_DEFAULT_CONF_FILE -# define D2CS_DEFAULT_CONF_FILE "/usr/local/etc/d2cs.conf" +# define D2CS_DEFAULT_CONF_FILE "/etc/bnetd/d2cs.conf" #endif -#define DEFAULT_LOG_FILE "/usr/local/var/d2cs.log" +#define DEFAULT_LOG_FILE "/var/log/d2cs.log" #define DEFAULT_LOG_LEVELS "info,warn,error" -#define DEFAULT_MEMLOG_FILE "/tmp/d2cs-mem.log" +#define DEFAULT_MEMLOG_FILE "/var/log/d2cs-mem.log" #define D2CS_SERVER_ADDRS "0.0.0.0" #define D2GS_SERVER_LIST "192.168.0.1" @@ -120,9 +120,9 @@ #define MAX_CHAR_PER_ACCT 8 #define MAX_CLIENT_IDLETIME 30 * 60 -#define D2CS_CHARINFO_DIR "/usr/local/var/charinfo" -#define D2CS_CHARSAVE_DIR "/usr/local/var/charsave" -#define D2CS_CHARSAVE_NEWBIE "/usr/local/var/files/newbie.save" +#define D2CS_CHARINFO_DIR "/var/lib/bnetd/charinfo" +#define D2CS_CHARSAVE_DIR "/var/lib/bnetd/charsave" +#define D2CS_CHARSAVE_NEWBIE "/var/lib/bnetd/files/newbie.save" #define D2CS_MOTD "No MOTD yet" --- bnetd-0.4.25.orig/conf/bnetd.conf.in +++ bnetd-0.4.25/conf/bnetd.conf.in @@ -1,5 +1,5 @@ ############################################################################## -# bnetd.conf - Configuration file for the Unix Battle.net daemon # +# bnetd.conf - Configuration file for the deamon emulating Battle.net(R) # #----------------------------------------------------------------------------# # # # This file is an example configuration and may require modification to # @@ -15,8 +15,8 @@ # a leading '#'). If none are specified, the userid will not be changed. # #----------------------------------------------------------------------------# -#effective_user = games -#effective_group = games +effective_user = games +effective_group = games # effective_user = #12 # effective_group = #20 @@ -30,25 +30,25 @@ # Use absolute paths in these lines to avoid problems! # #----------------------------------------------------------------------------# -filedir = /usr/local/var/files/ -userdir = /usr/local/var/users/ -reportdir = /usr/local/var/reports/ -chanlogdir = /usr/local/var/chanlogs/ -defacct = /usr/local/etc/bnetd_default_user -motdfile = /usr/local/etc/bnmotd.txt -issuefile = /usr/local/etc/bnissue.txt -channelfile = /usr/local/etc/channel.list -newsfile = /usr/local/etc/news.txt -adfile = /usr/local/etc/ad.list -ipbanfile = /usr/local/etc/bnban -helpfile = /usr/local/etc/bnhelp -transfile = /usr/local/etc/gametrans -mpqfile = /usr/local/etc/autoupdate -logfile = /usr/local/var/bnetd.log -realmfile = /usr/local/etc/realm.list -maildir = /usr/local/var/bnmail/ -versioncheck_file = /usr/local/etc/versioncheck -#pidfile = /usr/local/var/bnetd.pid +filedir = /usr/share/bnetd/ +userdir = /var/lib/bnetd/player/ +reportdir = /var/lib/bnetd/reports/ +chanlogdir = /var/lib/bnetd/chanlogs/ +defacct = /etc/bnetd/bnetd_default_user +motdfile = /etc/bnetd/bnmotd.txt +issuefile = /etc/bnetd/bnissue.txt +channelfile = /etc/bnetd/channel.list +newsfile = /etc/bnetd/news.txt +adfile = /etc/bnetd/ad.list +ipbanfile = /etc/bnetd/bnban +helpfile = /usr/share/bnetd/bnhelp +transfile = /etc/bnetd/gametrans +mpqfile = /etc/bnetd/autoupdate +logfile = /var/log/bnetd.log +realmfile = /etc/bnetd/realm.list +maildir = /var/mail/bnmail/ +versioncheck_file = /etc/bnetd/versioncheck +pidfile = /var/run/bnetd/bnetd.pid fortunecmd = /usr/games/fortune @@ -97,7 +97,7 @@ # These filenames are reported directly to the client and are relative to # the "filedir" directory specified above. iconfile = "icons.bni" -tosfile = "tos.txt" +tosfile = "tos_USA.txt" # # ############################################################################## @@ -110,7 +110,7 @@ # If this option is enabled, the verification step is skipped if possible. # This only works with clients < 109. It is useful because you no longer # need any of the IX86AUTH?.MPQ and PMACAUTH?.MPQ files. Note that it will -# also skip over all the autoupdate checks effectively diabling it. +# also skip over all the autoupdate checks effectively disabling it. # # If you disable this you must have one or more of the MPQ files. Otherwise # clients will hang when they first connect because they are attempting to --- bnetd-0.4.25.orig/conf/ad.list +++ bnetd-0.4.25/conf/ad.list @@ -7,8 +7,8 @@ # # # The "file name" field should be in the form llXXXXXX.eee where the X's are # # the ad id. The ad id is a non-zero hexadecimal number. The files must be # -# in the files/ directory and no path components should be listed here, only # -# the filename portion. # +# in the /usr/share/bnetd directory and no path components should be listed # +# here, only the filename portion. # # # # The "when" field determines which ad banners should be picked to start a # # sequence. These can be used to make the server avoid picking an "answer" # @@ -27,7 +27,10 @@ # zero, then a start banner may be chosen randomly. # # # # --file name-- when- time ---------------URL--------------- --next-- # - "ad000001.pcx" init 30 "http://www.bnetd.org/" 0x000000 +#"ad000001.pcx" init 30 "http://www.bnetd.org/" 0x000000 +#"ad000001.pcx" start 30 "http://www.bnetd.org/" 0x000000 + "ad000002.pcx" init 30 "http://packages.debian.org/bnetd" 0x000000 + "ad000002.pcx" start 30 "http://packages.debian.org/bnetd" 0x000000 #"ad000003.pcx" start 30 "http://www.place.edu/~clanpage" 0x000000 #"ad000002.smk" start 30 "http://www.blah.com/" 0x000004 #"ad000004.smk" norm 30 "http://foo.com/" 0x000000 --- bnetd-0.4.25.orig/conf/bnmotd.txt +++ bnetd-0.4.25/conf/bnmotd.txt @@ -1,7 +1,5 @@ -%IHello %l, welcome to bnetd! -%IRunning version %v on %h. -%IFor more information please visit: -%I http://www.bnetd.org/ +%IHello %l, welcome to BNETD! +%IRunning version %v on %h (Debian GNU/Linux). %I %IThere are %a user accounts on this server. %IThere are currently %u users online in %g games and %c channels. --- bnetd-0.4.25.orig/README +++ bnetd-0.4.25/README @@ -27,10 +27,7 @@ DOWNLOADING - The latest version of the program can be found at - http://www.bnetd.org/files.php - http://www.cs.nmsu.edu/~rocombs/sc - http://sourceforge.net/project/showfiles.php?group_id=6933 + You're on your own. INSTALLING @@ -89,13 +86,7 @@ SUPPORT If you have trouble with the server or setting up the clients, you - should check to see if the answer to your problem is in our FAQ. The - current version can be found on - http://www.bnetd.org/doc.php?docname=FAQ.html. If that doesn't solve - your problem, try posting in one of the forums at - http://www.bnetd.org/phpBB. You can also send email to the list - bnetd-discuss@bnetd.org. See the file README.debugging in the docs - directory for information about submitting good bug reports. + should check to see if the answer to your problem is in our FAQ. Other documents are included in the docs directory of this distribution including README.ladder and README.adbanner which @@ -103,25 +94,14 @@ server. -CONTRIBUTING - - Discovered anything about the Battle.net protocol that we overlooked? - Have some ideas that you would like to see implemented in the server? - Please consider either posting in http://www.bnetd.org/phpBB/ or - sending mail to to the list bnetd-dev@bnetd.org. Please note that - the license agreement is the GNU GPL. See the CREDITS file for a list - of current contributors and TODO for a list of work that needs to be - done. - - LEGAL NOTES - Blizzard Entertainment is a trademark of Davidson & Associates, Inc. - Starcraft is a trademark of Davidson & Associates, Inc. - Warcraft is a trademark of Davidson & Associates, Inc. - Diablo is a trademark of Davidson & Associates, Inc. - Battle.net is a trademark of Davidson & Associates, Inc. + Blizzard Entertainment, StarCraft, WarCraft, Diablo, and Battle.net + are trademarks or registered trademarks of Blizzard Entertainment + in the U.S. and/or other countries. All rights reserved. + Windows is a registered trademark of Microsoft Corporation + MacOS is a registered trademark of Apple Computer, Inc. The bnetd project is in no way affiliated with Blizzard Entertainment --- bnetd-0.4.25.orig/files/tos_USA.txt +++ bnetd-0.4.25/files/tos_USA.txt @@ -1,19 +1,12 @@ LEGAL NOTES - Blizzard Entertainment is a trademark of Davidson & Associates, Inc. - Battle.net is a trademark of Davidson & Associates, Inc. - Starcraft is a trademark of Davidson & Associates, Inc. - Diablo is a trademark of Davidson & Associates, Inc. + Battle.net, Diablo, Starcraft, Brood War, Warcraft, and Blizzard + Entertainment are trademarks or registered trademarks of Blizzard + Entertainment in the U.S. and/or other countries. All rights reserved. Neither this server nor the bnetd project are in any way affiliated - with Blizzard Entertainment - - This server is distributed under the terms of the GPL - Use the /copyright command in the chat screen for more information - - -TERMS OF SERVICE - - Not likely :) + with Blizzard Entertainment. + This server is distributed under the terms of the GPL. + Use the /copyright command in the chat screen for more information. --- bnetd-0.4.25.orig/files/tos_DEU.txt +++ bnetd-0.4.25/files/tos_DEU.txt @@ -1,19 +1,12 @@ LEGAL NOTES - Blizzard Entertainment is a trademark of Davidson & Associates, Inc. - Battle.net is a trademark of Davidson & Associates, Inc. - Starcraft is a trademark of Davidson & Associates, Inc. - Diablo is a trademark of Davidson & Associates, Inc. + Battle.net, Diablo, Starcraft, Brood War, Warcraft, and Blizzard + Entertainment are trademarks or registered trademarks of Blizzard + Entertainment in the U.S. and/or other countries. All rights reserved. Neither this server nor the bnetd project are in any way affiliated - with Blizzard Entertainment - - This server is distributed under the terms of the GPL - Use the /copyright command in the chat screen for more information - - -TERMS OF SERVICE - - Not likely :) + with Blizzard Entertainment. + This server is distributed under the terms of the GPL. + Use the /copyright command in the chat screen for more information. --- bnetd-0.4.25.orig/man/bnetd.conf.5 +++ bnetd-0.4.25/man/bnetd.conf.5 @@ -25,12 +25,12 @@ .\" .TH BNETD.CONF 5 "12 June, 2000" "BNETD" "BNETD User's Manual" .SH NAME -bnetd.conf \- configuration for the Unix Battle.net daemon +bnetd.conf \- configuration for the Unix Battle.net\*R daemon .SH DESCRIPTION The file .I bnetd.conf -contains information used by the Unix Battle.net daemon -.BR bnetd (1) +contains information used by the Unix Battle.net\*R daemon +.BR bnetd (8) to obtain system-specific information such as file locations and policies. .LP The file consists of a list of configuration entries and comments. A comment @@ -206,7 +206,7 @@ .B ask_new_channel If this value is true, a user using the "Channels" button to join a non-existing channel will be asked if they wish to create it just like -Battle.net. Otherwise, the channel will be created silently. +Battle.net\*R. Otherwise, the channel will be created silently. .TP .B report_all_games If this value is true, all games with more than one player lasting for more @@ -214,7 +214,7 @@ .TP .B hide_pass_games If this value is true, private (passworded) games will not be shown in the game -list just like Battle.net. Otherwise all games will be listed. +list just like Battle.net\*R. Otherwise all games will be listed. .TP .B hide_started_games If this value is true, games which have already stated will not be sent to the @@ -222,11 +222,11 @@ .TP .B hide_temp_channels If this value is true, private channels will not be shown in the channel list -just like Battle.net. Otherwise all channels will be listed. +just like Battle.net\*R. Otherwise all channels will be listed. .TP .B extra_commands If this value is true then all the extended chat commands are enabled, -otherwise only those which exist on Battle.net are enabled. +otherwise only those which exist on Battle.net\*R are enabled. .TP .B disc_is_loss If this value is true then any disconnect will be treated as a loss (regardless @@ -296,7 +296,14 @@ packets. If it is set to zero, the server will use the remote TCP port number as the default UDP port number. .SH SEE ALSO -.BR bnetd (1) +.BR bnetd (8) .SH AUTHOR Rob Crittenden (\fIrob@bnetd.org\fP), Ross Combs (\fIross@bnetd.org\fP) +.SH LEGAL NOTICES +Battle.net, Diablo, Starcraft, Brood War, Warcraft, and Blizzard +Entertainment are trademarks or registered trademarks of Blizzard +Entertainment in the U.S. and/or other countries. All rights reserved. +.PP +Neither this program nor the bnetd project are in any way affiliated with +Blizzard Entertainment. --- bnetd-0.4.25.orig/man/bnbot.1 +++ bnetd-0.4.25/man/bnbot.1 @@ -23,7 +23,7 @@ .\" .TH BNBOT 1 "11 June, 2000" "BNETD" "BNETD User's Manual" .SH NAME -bnbot \- Battle.net text-based chat bot client +bnbot \- Battle.net\*R text-based chat bot client .SH SYNOPSIS .B bnbot [\fIoptions\fP] @@ -32,7 +32,7 @@ .SH DESCRIPTION .B bnbot is a simple program which will allow communication through the bot protocol of a -Battle.net server from the command line. Input from stdin is sent to the server and +Battle.net\*R server from the command line. Input from stdin is sent to the server and output from the server is send to stdout. The interface is so simple that .BR telnet (1) could be used. The only complicating factor is that a control-C character must be sent @@ -52,12 +52,6 @@ .TP .B \-v --version Print its version number and exit. -.SH NOTES -The current version is available with the bnetd distribution at: -.LP -.RS -.I http://www.bnetd.org/ -.RE .SH BUGS The terminal settings are not consulted for keybindings. The following are assumed: .TP @@ -85,8 +79,15 @@ ^? (delete) delete the character to the left of the cursor .SH "SEE ALSO" -.BR bnetd (1), +.BR bnetd (8), .BR bnchat (1) .SH AUTHOR .TP Ross Combs (\fIross@bnetd.org\fP) +.SH LEGAL NOTICES +Battle.net, Diablo, Starcraft, Brood War, Warcraft, and Blizzard +Entertainment are trademarks or registered trademarks of Blizzard +Entertainment in the U.S. and/or other countries. All rights reserved. +.PP +Neither this program nor the bnetd project are in any way affiliated with +Blizzard Entertainment. --- bnetd-0.4.25.orig/man/bnpcap.1 +++ bnetd-0.4.25/man/bnpcap.1 @@ -50,12 +50,6 @@ \-i <\fIyour_interface\fP> \-s 2000 \-w <\fIpcap-filename\fP> -.SH NOTES -The current version is available with the bnetd distribution at: -.LP -.RS -.I http://www.bnetd.org/ -.RE .SH "SEE ALSO" .BR bnetd (1), .BR tcpdump (1) --- bnetd-0.4.25.orig/man/bniextract.1 +++ bnetd-0.4.25/man/bniextract.1 @@ -50,12 +50,6 @@ .B -- Signal end of options. Any further arguments will be treated as filenames even if they begin with a "-". -.SH NOTES -The current version is available with the bnetd distribution at: -.LP -.RS -.I http://www.bnetd.org/ -.RE .SH BUGS The purpose of some of the fields in the BNI format are not known. Only true-color formats are currently supported. --- bnetd-0.4.25.orig/man/bnpass.1 +++ bnetd-0.4.25/man/bnpass.1 @@ -51,15 +51,16 @@ .B -- Signal end of options. Any further arguments will be treated as passwords even if they begin with a "-". -.SH NOTES -The current version is available with the bnetd distribution at: -.LP -.RS -.I http://www.bnetd.org/ -.RE .SH "SEE ALSO" -.BR bnetd (1), +.BR bnetd (8), .BR bnchat (1), .BR bnftp (1) .SH AUTHOR Ross Combs (\fIross@bnetd.org\fP) +.SH LEGAL NOTICES +Battle.net, Diablo, Starcraft, Brood War, Warcraft, and Blizzard +Entertainment are trademarks or registered trademarks of Blizzard +Entertainment in the U.S. and/or other countries. All rights reserved. +.PP +Neither this program nor the bnetd project are in any way affiliated with +Blizzard Entertainment. --- bnetd-0.4.25.orig/man/bnilist.1 +++ bnetd-0.4.25/man/bnilist.1 @@ -52,12 +52,6 @@ .B -- Signal end of options. Any further arguments will be treated as filenames even if they begin with a "-". -.SH NOTES -The current version is available with the bnetd distribution at: -.LP -.RS -.I http://www.bnetd.org/ -.RE .SH BUGS The purpose of some of the fields in the BNI format are not known. Only true-color formats are currently supported. --- bnetd-0.4.25.orig/man/bnftp.1 +++ bnetd-0.4.25/man/bnftp.1 @@ -23,7 +23,7 @@ .\" .TH BNFTP 1 "11 June, 2000" "BNETD" "BNETD User's Manual" .SH NAME -bnftp \- Battle.net file transfer client +bnftp \- Battle.net\*R file transfer client .SH SYNOPSIS .B bnftp [\fIoptions\fP] @@ -44,7 +44,7 @@ .B \-b Causes .B bnftp -to emulate a Brood Wars client. +to emulate a Brood War\*R client. .TP .B \--client Causes @@ -57,7 +57,7 @@ .B \-d Causes .B bnftp -to emulate a Diablo client. +to emulate a Diablo\*R client. .TP .B \-h --help --usage Print usage information and exit. @@ -65,7 +65,7 @@ .B \-s Causes .B bnftp -to emulate a Starcraft client. +to emulate a Starcraft\*R client. .TP .B \-v --version Print its version number and exit. @@ -73,13 +73,7 @@ .B \-w Causes .B bnftp -to emulate a Warcraft II BNE client. -.SH NOTES -The current version is available with the bnetd distribution at: -.LP -.RS -.I http://www.bnetd.org/ -.RE +to emulate a Warcraft\*R II BNE client. .SH BUGS This program assumes that the terminal will move to the beginning of the current line when the carriage return character (^M) is printed. It also assumes the backspace @@ -112,6 +106,13 @@ ^? (delete) delete the character to the left of the cursor .SH "SEE ALSO" -.BR bnetd (1) +.BR bnetd (8) .SH AUTHOR Ross Combs (\fIross@bnetd.org\fP) +.SH LEGAL NOTICES +Battle.net, Diablo, Starcraft, Brood War, Warcraft, and Blizzard +Entertainment are trademarks or registered trademarks of Blizzard +Entertainment in the U.S. and/or other countries. All rights reserved. +.PP +Neither this program nor the bnetd project are in any way affiliated with +Blizzard Entertainment. --- bnetd-0.4.25.orig/man/bnstat.1 +++ bnetd-0.4.25/man/bnstat.1 @@ -23,15 +23,15 @@ .\" .TH BNSTAT 1 "11 June, 2000" "BNETD" "BNETD User's Manual" .SH NAME -bnstat \- Battle.net statisics client +bnstat \- Battle.net\*R statisics client .SH SYNOPSIS .B bnstat [\fIoptions\fP] [\fIservername\fP [\fIserverport\fP]] .SH DESCRIPTION .B bnstat -is a simple Battle.net client emulator that can be used to gather player statistics. -It is also compatible with FSGS servers, but has difficulty with real Battle.net servers. +is a simple Battle.net\*R client emulator that can be used to gather player statistics. +It is also compatible with FSGS servers, but has difficulty with real Battle.net\*R servers. .LP If no \fIservername\fP is specified, localhost is assumed. If no \fIserverport\fP is specified, 6112 is assumed. If no player is specified on the command line, @@ -41,7 +41,7 @@ .SH OPTIONS .TP .B \-b -Causes \fBbnstat\fP to emulate a Brood Wars client. +Causes \fBbnstat\fP to emulate a Brood War\*R client. .TP .B \--client Causes \fBbnstat\fP to emulate a specific client. The following client tags are @@ -51,11 +51,11 @@ .TP .B \--bnetd Also attempt to gather -.BR bnetd (1) +.BR bnetd (8) specific information. .TP .B \-d -Causes \fBbnstat\fP to emulate a Diablo client. +Causes \fBbnstat\fP to emulate a Diablo\*R client. .TP .B \--fsgs Also attempt to gather FSGS specific information. @@ -65,12 +65,12 @@ .TP .B \-k --cdkey Causes \fBbnstat\fP to report an alternate key to the -.BR bnetd (1) +.BR bnetd (8) server. .TP .B \-o --owner Causes \fBbnstat\fP to report an alternate owner to the -.BR bnetd (1) +.BR bnetd (8) server. .TP .B \-p --player @@ -78,19 +78,13 @@ using login and terminal functions allowing it to be used in shell scripts. .TP .B \-s -Causes \fBbnstat\fP to emulate a Starcraft client. +Causes \fBbnstat\fP to emulate a Starcraft\*R client. .TP .B \-v --version Print its version number and exit. .TP .B \-w -Causes \fBbnstat\fP to emulate a Warcraft II BNE client. -.SH NOTES -The current version is available with the bnetd distribution at: -.LP -.RS -.I http://www.bnetd.org/ -.RE +Causes \fBbnstat\fP to emulate a Warcraft\*R II BNE client. .SH BUGS This program assumes that the terminal will move to the beginning of the current line when the carriage return character (^M) is printed. It also assumes the backspace @@ -123,6 +117,13 @@ ^? (delete) delete the character to the left of the cursor .SH "SEE ALSO" -.BR bnetd (1) +.BR bnetd (8) .SH AUTHOR Ross Combs (\fIross@bnetd.org\fP) +.SH LEGAL NOTICES +Battle.net, Diablo, Starcraft, Brood War, Warcraft, and Blizzard +Entertainment are trademarks or registered trademarks of Blizzard +Entertainment in the U.S. and/or other countries. All rights reserved. +.PP +Neither this program nor the bnetd project are in any way affiliated with +Blizzard Entertainment. --- bnetd-0.4.25.orig/man/bnchat.1 +++ bnetd-0.4.25/man/bnchat.1 @@ -23,18 +23,18 @@ .\" .TH BNCHAT 1 "09 April, 1999" "BNETD" "BNETD User's Manual" .SH NAME -bnchat \- Battle.net text-based chat client +bnchat \- Battle.net\*R text-based chat client .SH SYNOPSIS .B bnchat [\fIoptions\fP] [\fIservername\fP [\fIserverport\fP]] .SH DESCRIPTION .B bnchat -is a simple Battle.net client emulator that can be used as a minimal chat client with -.BR bnetd (1) +is a simple Battle.net\*R client emulator that can be used as a minimal chat client with +.BR bnetd (8) in order to test certain aspects of the server configuration or to do server administration from the Unix command line. It is also compatible with FSGS servers, but -has difficulty with real Battle.net servers. +has difficulty with real Battle.net\*R servers. .LP If no \fIservername\fP is specified, localhost is assumed. If no \fIserverport\fP is specified, 6112 is assumed. @@ -50,13 +50,13 @@ .B \-b Causes .B bnchat -to emulate a Brood Wars client. +to emulate a Brood War\*R client. .TP .B \-c --change-password Causes .B bnchat to prompt for a new login password on the -.BR bnetd (1) +.BR bnetd (8) server. .TP .B \--client @@ -69,7 +69,7 @@ .B \-d Causes .B bnchat -to emulate a Diablo client. +to emulate a Diablo\*R client. .TP .B \-h --help --usage Print usage information and exit. @@ -78,27 +78,27 @@ Causes .B bnchat to report an alternate key to the -.BR bnetd (1) +.BR bnetd (8) server. .TP .B \-o --owner Causes .B bnchat to report an alternate owner to the -.BR bnetd (1) +.BR bnetd (8) server. .TP .B \-n --new-account Causes .B bnchat to prompt to create a new player account on the -.BR bnetd (1) +.BR bnetd (8) server. .TP .B \-s Causes .B bnchat -to emulate a Starcraft client. +to emulate a Starcraft\*R client. .TP .B \-v --version Print its version number and exit. @@ -106,7 +106,7 @@ .B \-w Causes .B bnchat -to emulate a Warcraft II BNE client. +to emulate a Warcraft\*R II BNE client. .SH NOTES The terminal width is attempted to be determined at runtime but if it does not work you may need to try running @@ -118,11 +118,6 @@ are supported on your system, resizing the window while the program is running should immediately update width of the entry line. .LP -The current version is available with the bnetd distribution at: -.LP -.RS -.I http://www.bnetd.org/ -.RE .SH BUGS This program assumes that the terminal will move to the beginning of the current line when the carriage return character (^M) is printed. It also assumes the backspace @@ -155,6 +150,13 @@ ^? (delete) delete the character to the left of the cursor .SH "SEE ALSO" -.BR bnetd (1) +.BR bnetd (8) .SH AUTHOR Ross Combs (\fIross@bnetd.org\fP) +.SH LEGAL NOTICES +Battle.net, Diablo, Starcraft, Brood War, Warcraft, and Blizzard +Entertainment are trademarks or registered trademarks of Blizzard +Entertainment in the U.S. and/or other countries. All rights reserved. +.PP +Neither this program nor the bnetd project are in any way affiliated with +Blizzard Entertainment. --- bnetd-0.4.25.orig/man/bnetd.1 +++ bnetd-0.4.25/man/bnetd.1 @@ -23,9 +23,9 @@ .\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, .\" USA. .\" -.TH BNETD 1 "12 June, 2000" "BNETD" "The bnetd Project" +.TH BNETD 8 "12 June, 2000" "BNETD" "The bnetd Project" .SH NAME -bnetd \- Unix Battle.net daemon +bnetd \- Unix Battle.net\*R daemon .SH SYNOPSIS .B bnetd [\fB-f\fP] @@ -33,8 +33,8 @@ [\fB-d\fP \fIdumpfile\fP] .SH DESCRIPTION .B bnetd -is a program that will eventually completely emulate a Blizzard Battle.net -server. Currently Starcraft, Brood War, Diablo, and Warcraft II BNE are +is a program that will eventually completely emulate a Battle.net\*R +server. Currently Starcraft\*R, Brood War\*R, Diablo\*R, and Warcraft\*R II BNE are supported as clients. .LP It is known to work under most versions of Unix and can also be used under @@ -105,15 +105,9 @@ .TP .I ad000001.pcx This is the ad Banner. Currently, it says "Welcome to... BNETD". -.SH NOTES -The current version is available at: -.LP -.RS -.I http://www.bnetd.org/ -.RE .SH "SEE ALSO" .BR bntrackd (1), -.BR bnproxy (1), +.BR bnproxy (8), .BR bnchat (1), .BR bnbot (1), .BR bnpass (1), @@ -124,3 +118,10 @@ Ross Combs (\fIross@bnetd.org\fP), Rob Crittenden (\fIrob@bnetd.org\fP), and Mark Baysinger (\fImark@bnetd.org\fP) +.SH LEGAL NOTICES +Battle.net, Diablo, Starcraft, Brood War, Warcraft, and Blizzard +Entertainment are trademarks or registered trademarks of Blizzard +Entertainment in the U.S. and/or other countries. All rights reserved. +.PP +Neither this program nor the bnetd project are in any way affiliated with +Blizzard Entertainment. --- bnetd-0.4.25.orig/man/bnproxy.1 +++ bnetd-0.4.25/man/bnproxy.1 @@ -21,9 +21,9 @@ .\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, .\" USA. .\" -.TH BNPROXY 1 "12 June, 2000" "BNETD" "BNETD User's Manual" +.TH BNPROXY 8 "12 June, 2000" "BNETD" "BNETD User's Manual" .SH NAME -bnproxy \- Battle.net proxy daemon +bnproxy \- Battle.net\*R proxy daemon .SH SYNOPSIS .B bnproxy [\fB-f\fP] @@ -34,9 +34,9 @@ .BR .SH DESCRIPTION .B bnproxy -is a simple daemon which will relay client connections to a Battle.net +is a simple daemon which will relay client connections to a Battle.net\*R server like -.BR bnetd (1). +.BR bnetd (8). It has the capability of saving a hexadecimal/ASCII dump of the network records (packets) into a log file. Someday this command might be useful for people playing from behind a NAT firewall. @@ -65,18 +65,18 @@ Causes .B bnproxy to print its version number and exit. -.SH NOTES -.TP -The current version is available at: -.LP -.RS -.I http://www.bnetd.org/ -.RE .SH BUGS No support for dynamic UDP address determination (SESSIONADDR[12] packets) has been added. Support for multiple clients is broken because the server becomes confused as to which client to relay UDP server traffic to. .SH "SEE ALSO" -.BR bnetd (1) +.BR bnetd (8) .SH AUTHOR Ross Combs (\fIross@bnetd.org\fP) +.SH LEGAL NOTICES +Battle.net, Diablo, Starcraft, Brood War, Warcraft, and Blizzard +Entertainment are trademarks or registered trademarks of Blizzard +Entertainment in the U.S. and/or other countries. All rights reserved. +.PP +Neither this program nor the bnetd project are in any way affiliated with +Blizzard Entertainment. --- bnetd-0.4.25.orig/man/bni2tga.1 +++ bnetd-0.4.25/man/bni2tga.1 @@ -55,12 +55,6 @@ .B -- Signal end of options. Any further arguments will be treated as filenames even if they begin with a "-". -.SH NOTES -The current version is available with the bnetd distribution at: -.LP -.RS -.I http://www.bnetd.org/ -.RE .SH BUGS The purpose of some of the fields in the BNI format are not known. Only true-color formats are currently supported. --- bnetd-0.4.25.orig/man/bntrackd.1 +++ bnetd-0.4.25/man/bntrackd.1 @@ -93,13 +93,6 @@ Causes .B bntrackd to print its version number and exit. -.SH NOTES -.TP -The current version is available at: -.LP -.RS -.I http://www.bnetd.org/ -.RE .SH "SEE ALSO" .BR bnetd (1), .BR perl (1) --- bnetd-0.4.25.orig/man/bnibuild.1 +++ bnetd-0.4.25/man/bnibuild.1 @@ -52,12 +52,6 @@ .B -- Signal end of options. Any further arguments will be treated as filenames even if they begin with a "-". -.SH NOTES -The current version is available with the bnetd distribution at: -.LP -.RS -.I http://www.bnetd.org/ -.RE .SH BUGS The purpose of some of the fields in the BNI format are not known. Only true-color formats are currently supported. --- bnetd-0.4.25.orig/man/tgainfo.1 +++ bnetd-0.4.25/man/tgainfo.1 @@ -51,12 +51,6 @@ .B -- Signal end of options. Any further arguments will be treated as filenames even if they begin with a "-". -.SH NOTES -The current version is available with the bnetd distribution at: -.LP -.RS -.I http://www.bnetd.org/ -.RE .SH BUGS Only a subset of all the possible Targa formats are recognized properly. .SH "SEE ALSO" --- bnetd-0.4.25.orig/man/bntext.5 +++ bnetd-0.4.25/man/bntext.5 @@ -25,12 +25,12 @@ .\" .TH bntext 5 "2 August, 2001" .SH NAME -bnmotd.txt, bnnews.txt bnissue.txt \- messages for the Unix Battle.net daemon +bnmotd.txt, bnnews.txt bnissue.txt \- messages for the Unix Battle.net\*R daemon .SH DESCRIPTION The file .I bnmotd.txt contains text displayed by -.BR bnetd (1), +.BR bnetd (8), when users first log into the server. .LP The file @@ -107,7 +107,14 @@ .RE .SH "SEE ALSO" .TP -.BR bnetd (1) +.BR bnetd (8) .SH AUTHOR .TP Ross Combs (\fIross@bnetd.org\fP) +.SH LEGAL NOTICES +Battle.net, Diablo, Starcraft, Brood War, Warcraft, and Blizzard +Entertainment are trademarks or registered trademarks of Blizzard +Entertainment in the U.S. and/or other countries. All rights reserved. +.PP +Neither this program nor the bnetd project are in any way affiliated with +Blizzard Entertainment.