--- ebnetd-1.0.dfsg.1.orig/config.guess
+++ ebnetd-1.0.dfsg.1/config.guess
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2003-10-03'
+timestamp='2012-02-10'
# 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
@@ -16,24 +17,24 @@
# General Public License for more details.
#
# 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.
+# along with this program; if not, see .
#
# 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.
-# Originally written by Per Bothner .
-# Please send patches to . Submit a context
-# diff and a properly formatted ChangeLog entry.
+
+# Originally written by Per Bothner. Please send patches (context
+# diff format) to and include a 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 build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -53,7 +54,8 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -66,11 +68,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -104,7 +106,7 @@
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 -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$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 ; } ;
@@ -123,7 +125,7 @@
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+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 1994-08-24)
@@ -141,7 +143,7 @@
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*,
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
@@ -158,6 +160,7 @@
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -166,7 +169,7 @@
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
+ | grep -q __ELF__
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
@@ -176,7 +179,7 @@
fi
;;
*)
- os=netbsd
+ os=netbsd
;;
esac
# The OS release
@@ -196,50 +199,32 @@
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
- exit 0 ;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mac68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- macppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvmeppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- pmax:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sgi:OpenBSD:*:*)
- echo mipseb-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sun3:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- wgrisc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ 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:*:*)
- if test $UNAME_RELEASE = "V4.0"; then
+ case $UNAME_RELEASE in
+ *4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- fi
+ ;;
+ *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
@@ -277,42 +262,52 @@
"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 ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
- Alpha*:OpenVMS:*:*)
- echo alpha-hp-vms
- exit 0 ;;
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ exitcode=$?
+ trap '' 0
+ exit $exitcode ;;
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 0 ;;
+ exit ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
- exit 0 ;;
+ exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
- exit 0;;
+ exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
- exit 0 ;;
+ exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-morphos
- exit 0 ;;
+ exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
- exit 0 ;;
+ 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;;
+ 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 0;;
+ 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
@@ -320,32 +315,51 @@
else
echo pyramid-pyramid-bsd
fi
- exit 0 ;;
+ exit ;;
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
- exit 0 ;;
+ exit ;;
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
- exit 0 ;;
- DRS?6000:UNIX_SV:4.2*:7*)
+ 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 0 ;;
+ sparc) echo sparc-icl-nx7; exit ;;
esac ;;
+ s390x:SunOS:*:*)
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
- i86pc:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+ echo i386-pc-auroraux${UNAME_RELEASE}
+ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+ # If there is a compiler, see if it is configured for 64-bit objects.
+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ # This test works for both compilers.
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ SUN_ARCH="x86_64"
+ fi
+ fi
+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 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*)
@@ -354,10 +368,10 @@
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
@@ -369,10 +383,10 @@
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
- exit 0 ;;
+ exit ;;
aushp:SunOS:*:*)
echo sparc-auspex-sunos${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
@@ -382,38 +396,41 @@
# 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 0 ;;
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit 0 ;;
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit 0 ;;
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit 0 ;;
+ 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 0 ;;
+ exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -437,35 +454,36 @@
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c \
- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && exit 0
+ $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 0 ;;
+ exit ;;
Motorola:*:4.3:PL8-*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
echo powerpc-harris-powermax
- exit 0 ;;
+ 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`
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -478,29 +496,29 @@
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 '
+ 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`
@@ -508,7 +526,7 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval $set_cc_for_build
@@ -523,15 +541,19 @@
exit(0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- 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:*:[45])
+ exit ;;
+ *:AIX:*:[4567])
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
@@ -544,28 +566,28 @@
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 ;;
+ 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 ;;
+ exit ;;
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
@@ -574,52 +596,52 @@
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" ;;
+ 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
+ esac ;;
+ esac
fi
if [ "${HP_ARCH}" = "" ]; then
eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ 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);
- }
+ #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
@@ -627,9 +649,19 @@
esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
- # avoid double evaluation of $set_cc_for_build
- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ 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 -q __LP64__
then
HP_ARCH="hppa2.0w"
else
@@ -637,11 +669,11 @@
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 0 ;;
+ exit ;;
3050*:HI-UX:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -669,211 +701,266 @@
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ $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 0 ;;
+ exit ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
echo hppa1.1-hp-osf
- exit 0 ;;
+ exit ;;
hp8??:OSF1:*:*)
echo hppa1.0-hp-osf
- exit 0 ;;
+ 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 ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*[A-Z]90:*:*:*)
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
*:UNICOS/mp:*:*)
- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ 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 "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ 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 0 ;;
+ exit ;;
*:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
- *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
- # Determine whether the default compiler uses glibc.
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include
- #if __GLIBC__ >= 2
- LIBC=gnu
- #else
- LIBC=
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- # GNU/FreeBSD systems have a "k" prefix to indicate we are using
- # FreeBSD's kernel, but not the complete OS.
- case ${LIBC} in gnu) kernel_only='k' ;; esac
- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
- exit 0 ;;
+ exit ;;
+ *:FreeBSD:*:*)
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ case ${UNAME_PROCESSOR} in
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
+ exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
- exit 0 ;;
- i*:MINGW*:*)
+ exit ;;
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
- exit 0 ;;
+ exit ;;
+ i*:MSYS*:*)
+ echo ${UNAME_MACHINE}-pc-msys
+ exit ;;
+ i*:windows32*:*)
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
+ exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
- exit 0 ;;
- x86:Interix*:[34]*)
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
- exit 0 ;;
+ exit ;;
+ *:Interix*:*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ authenticamd | genuineintel | EM64T)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
- exit 0 ;;
+ exit ;;
+ 8664:Windows_NT:*)
+ echo x86_64-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 0 ;;
+ exit ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
- exit 0 ;;
+ exit ;;
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
- exit 0 ;;
+ exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
*:GNU:*:*)
+ # the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
+ 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 0 ;;
+ exit ;;
+ aarch64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+ echo ${UNAME_MACHINE}-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 -q ld.so.1
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+ fi
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
cris:Linux:*:*)
- echo cris-axis-linux-gnu
- exit 0 ;;
- ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-axis-linux-gnu
+ exit ;;
+ crisv32:Linux:*:*)
+ echo ${UNAME_MACHINE}-axis-linux-gnu
+ exit ;;
+ frv:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
- m68*:Linux:*:*)
+ exit ;;
+ hexagon:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
- mips:Linux:*:*)
+ exit ;;
+ i*86:Linux:*:*)
+ LIBC=gnu
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
+ #ifdef __dietlibc__
+ LIBC=dietlibc
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
- ;;
- mips64:Linux:*:*)
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ 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:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
- #undef mips64
- #undef mips64el
+ #undef ${UNAME_MACHINE}
+ #undef ${UNAME_MACHINE}el
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mips64el
+ CPU=${UNAME_MACHINE}el
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips64
+ CPU=${UNAME_MACHINE}
#else
CPU=
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
- exit 0 ;;
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
- exit 0 ;;
- 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 0 ;;
+ or32:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
+ exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -881,112 +968,71 @@
PA8*) echo hppa2.0-unknown-linux-gnu ;;
*) echo hppa-unknown-linux-gnu ;;
esac
- exit 0 ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
+ exit ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
- exit 0 ;;
+ exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ tile*: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 0 ;;
- i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
- # first see if it will tell us. cd to the root directory to prevent
- # problems with other programs or directories called `ld' in the path.
- # Set LC_ALL=C to ensure ld outputs messages in English.
- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&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 0 ;;
- coff-i386)
- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit 0 ;;
- "")
- # 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 0 ;;
- 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
- #ifdef __INTEL_COMPILER
- LIBC=gnu
- #else
- LIBC=gnuaout
- #endif
- #endif
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
- ;;
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 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 ;;
+ 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,
+ # 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.
+ # Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit 0 ;;
+ 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 0 ;;
+ exit ;;
i*86:XTS-300:*:STOP)
echo ${UNAME_MACHINE}-unknown-stop
- exit 0 ;;
+ exit ;;
i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos
- exit 0 ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ exit ;;
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit 0 ;;
+ 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
@@ -994,15 +1040,16 @@
else
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
- exit 0 ;;
- i*86:*:5:[78]*)
+ 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 0 ;;
+ exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' /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 ;;
+ exit ;;
mc68k:UNIX:SYSTEM5:3.51m)
echo m68k-convergent-sysv
- exit 0 ;;
+ exit ;;
M680?0:D-NIX:5.3:*)
echo m68k-diab-dnix
- exit 0 ;;
- M68*:*:R3V[567]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[34]??:*: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)
+ 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 ;;
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4; exit; } ;;
+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+ OS_REL='.3'
+ 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; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; 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 ;;
+ exit ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ exit ;;
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ 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`
@@ -1094,68 +1154,94 @@
else
echo ns32k-sni-sysv
fi
- exit 0 ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says
- echo i586-unisys-sysv4
- 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 0 ;;
+ exit ;;
mc68*:A/UX:*:*)
echo m68k-apple-aux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
- exit 0 ;;
+ exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
+ echo mips-nec-sysv${UNAME_RELEASE}
else
- echo mips-unknown-sysv${UNAME_RELEASE}
+ echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
- exit 0 ;;
+ exit ;;
BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
echo powerpc-apple-beos
- exit 0 ;;
+ exit ;;
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
- exit 0 ;;
+ exit ;;
+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
+ echo i586-pc-haiku
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Darwin:*:*)
- case `uname -p` in
- *86) UNAME_PROCESSOR=i686 ;;
- powerpc) UNAME_PROCESSOR=powerpc ;;
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
+ i386)
+ eval $set_cc_for_build
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ UNAME_PROCESSOR="x86_64"
+ fi
+ fi ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1163,22 +1249,28 @@
UNAME_MACHINE=pc
fi
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
- exit 0 ;;
- NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*)
+ exit ;;
+ NEO-?:NONSTOP_KERNEL:*:*)
+ echo neo-tandem-nsk${UNAME_RELEASE}
+ exit ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
- exit 0 ;;
+ exit ;;
BS2000:POSIX*:*:*)
echo bs2000-siemens-sysv
- exit 0 ;;
+ exit ;;
DS/*:UNIX_System_V:*:*)
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
@@ -1189,28 +1281,53 @@
UNAME_MACHINE="$cputype"
fi
echo ${UNAME_MACHINE}-unknown-plan9
- exit 0 ;;
+ exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
- exit 0 ;;
+ exit ;;
*:TENEX:*:*)
echo pdp10-unknown-tenex
- exit 0 ;;
+ exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
- exit 0 ;;
+ exit ;;
XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
echo pdp10-xkl-tops20
- exit 0 ;;
+ exit ;;
*:TOPS-20:*:*)
echo pdp10-unknown-tops20
- exit 0 ;;
+ exit ;;
*:ITS:*:*)
echo pdp10-unknown-its
- exit 0 ;;
+ exit ;;
SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
- exit 0 ;;
+ 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 ;;
+ i*86:AROS:*:*)
+ echo ${UNAME_MACHINE}-pc-aros
+ exit ;;
+ x86_64:VMkernel:*:*)
+ echo ${UNAME_MACHINE}-unknown-esx
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1233,16 +1350,16 @@
#include
printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
- "4"
+ "4"
#else
- ""
+ ""
#endif
- ); exit (0);
+ ); exit (0);
#endif
#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)
@@ -1331,11 +1448,12 @@
}
EOF
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$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)
@@ -1344,22 +1462,22 @@
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
@@ -1370,7 +1488,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- ftp://ftp.gnu.org/pub/gnu/config/
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
--- ebnetd-1.0.dfsg.1.orig/config.sub
+++ ebnetd-1.0.dfsg.1/config.sub
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2003-08-18'
+timestamp='2012-04-18'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -20,23 +21,25 @@
# GNU General Public License for more details.
#
# 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.
-
+# along with this program; if not, see .
+#
# 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.
+# diff and a properly formatted GNU 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.
# Otherwise, we print the canonical config type on stdout and succeed.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
@@ -70,7 +73,8 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -83,11 +87,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -99,7 +103,7 @@
*local*)
# First pass through any local machine types.
echo $1
- exit 0;;
+ exit ;;
* )
break ;;
@@ -118,10 +122,18 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ ;;
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
@@ -144,10 +156,13 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis)
+ -apple | -axis | -knuth | -cray | -microblaze)
os=
basic_machine=$1
;;
+ -bluegene*)
+ os=-cnk
+ ;;
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
@@ -162,13 +177,17 @@
os=-chorusos
basic_machine=$1
;;
- -chorusrdb)
- os=-chorusrdb
+ -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
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -185,6 +204,10 @@
# 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/'`
@@ -202,6 +225,12 @@
-isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
+ -lynx*178)
+ os=-lynxos178
+ ;;
+ -lynx*5)
+ os=-lynxos5
+ ;;
-lynx*)
os=-lynxos
;;
@@ -226,25 +255,36 @@
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
+ | aarch64 | aarch64_be \
| 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 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | be32 | be64 \
+ | bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | epiphany \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m68000 | m68k | m88k | mcore \
+ | le32 | le64 \
+ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
- | mips64vr | mips64vrel \
+ | mips64octeon | mips64octeonel \
| mips64orion | mips64orionel \
+ | mips64r5900 | mips64r5900el \
+ | mips64vr | mips64vrel \
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
@@ -253,30 +293,65 @@
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | moxie \
+ | mt \
| msp430 \
+ | nds32 | nds32le | nds32be \
+ | nios | nios2 \
| ns16k | ns32k \
- | openrisc | or32 \
+ | open8 \
+ | or32 \
| pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | rl78 | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
- | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+ | ubicom32 \
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| we32k \
- | x86 | xscale | xstormy16 | xtensa \
- | z8k)
+ | x86 | xc16x | xstormy16 | xtensa \
+ | z8k | z80)
basic_machine=$basic_machine-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12)
- # Motorola 68HC11/12.
+ c54x)
+ basic_machine=tic54x-unknown
+ ;;
+ c55x)
+ basic_machine=tic55x-unknown
+ ;;
+ c6x)
+ basic_machine=tic6x-unknown
+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
;;
+ ms1)
+ basic_machine=mt-unknown
+ ;;
+
+ strongarm | thumb | xscale)
+ basic_machine=arm-unknown
+ ;;
+ xgate)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+ xscaleeb)
+ basic_machine=armeb-unknown
+ ;;
+
+ xscaleel)
+ basic_machine=armel-unknown
+ ;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
@@ -292,32 +367,40 @@
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
+ | aarch64-* | aarch64_be-* \
| 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-* \
- | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | cydra-* \
+ | avr-* | avr32-* \
+ | be32-* | be64-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
+ | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
- | m32r-* \
+ | le32-* | le64-* \
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
- | mips64vr-* | mips64vrel-* \
+ | mips64octeon-* | mips64octeonel-* \
| mips64orion-* | mips64orionel-* \
+ | mips64r5900-* | mips64r5900el-* \
+ | mips64vr-* | mips64vrel-* \
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
+ | mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
@@ -325,26 +408,39 @@
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
+ | mmix-* \
+ | mt-* \
| msp430-* \
- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+ | nds32-* | nds32le-* | nds32be-* \
+ | nios-* | nios2-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
- | romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | rl78-* | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tile*-* \
| tron-* \
- | v850-* | v850e-* | vax-* \
+ | ubicom32-* \
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+ | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
- | xtensa-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
- | z8k-*)
+ | z8k-* | z80-*)
+ ;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
@@ -362,6 +458,9 @@
basic_machine=a29k-amd
os=-udi
;;
+ abacus)
+ basic_machine=abacus-unknown
+ ;;
adobe68k)
basic_machine=m68010-adobe
os=-scout
@@ -379,6 +478,9 @@
amd64)
basic_machine=x86_64-pc
;;
+ amd64-*)
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
amdahl)
basic_machine=580-amdahl
os=-sysv
@@ -402,6 +504,10 @@
basic_machine=m68k-apollo
os=-bsd
;;
+ aros)
+ basic_machine=i386-pc
+ os=-aros
+ ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -410,10 +516,35 @@
basic_machine=ns32k-sequent
os=-dynix
;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
+ bluegene*)
+ basic_machine=powerpc-ibm
+ os=-cnk
+ ;;
+ c54x-*)
+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c55x-*)
+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c6x-*)
+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
;;
+ cegcc)
+ basic_machine=arm-unknown
+ os=-cegcc
+ ;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -438,12 +569,27 @@
basic_machine=j90-cray
os=-unicos
;;
+ craynv)
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+ cr16 | cr16-*)
+ basic_machine=cr16-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
;;
@@ -466,6 +612,14 @@
basic_machine=m88k-motorola
os=-sysv3
;;
+ dicos)
+ basic_machine=i686-pc
+ os=-dicos
+ ;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+ ;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
@@ -577,7 +731,6 @@
i370-ibm* | ibm*)
basic_machine=i370-ibm
;;
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
@@ -616,6 +769,14 @@
basic_machine=m68k-isi
os=-sysv
;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -627,10 +788,17 @@
basic_machine=ns32k-utek
os=-sysv
;;
+ microblaze)
+ basic_machine=microblaze-xilinx
+ ;;
mingw32)
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -644,10 +812,6 @@
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
- mmix*)
- basic_machine=mmix-knuth
- os=-mmixware
- ;;
monitor)
basic_machine=m68k-rom68k
os=-coff
@@ -660,10 +824,21 @@
basic_machine=i386-pc
os=-msdos
;;
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
+ msys)
+ basic_machine=i386-pc
+ os=-msys
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
;;
+ nacl)
+ basic_machine=le32-unknown
+ os=-nacl
+ ;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
@@ -728,9 +903,11 @@
np1)
basic_machine=np1-gould
;;
- nv1)
- basic_machine=nv1-cray
- os=-unicosmp
+ neo-tandem)
+ basic_machine=neo-tandem
+ ;;
+ nse-tandem)
+ basic_machine=nse-tandem
;;
nsr-tandem)
basic_machine=nsr-tandem
@@ -739,9 +916,12 @@
basic_machine=hppa1.1-oki
os=-proelf
;;
- or32 | or32-*)
+ openrisc | openrisc-*)
basic_machine=or32-unknown
- os=-coff
+ ;;
+ os400)
+ basic_machine=powerpc-ibm
+ os=-os400
;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
@@ -759,6 +939,14 @@
basic_machine=i860-intel
os=-osf
;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
pbd)
basic_machine=sparc-tti
;;
@@ -768,6 +956,12 @@
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
+ pc98)
+ basic_machine=i386-pc
+ ;;
+ pc98-*)
+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
@@ -797,9 +991,10 @@
;;
power) basic_machine=power-ibm
;;
- ppc) basic_machine=powerpc-unknown
+ ppc | ppcbe) basic_machine=powerpc-unknown
;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc-* | ppcbe-*)
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
@@ -824,6 +1019,10 @@
basic_machine=i586-unknown
os=-pw32
;;
+ rdos)
+ basic_machine=i386-pc
+ os=-rdos
+ ;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
@@ -850,6 +1049,10 @@
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -861,6 +1064,9 @@
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -882,6 +1088,9 @@
basic_machine=i860-stratus
os=-sysv4
;;
+ strongarm-* | thumb-*)
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
sun2)
basic_machine=m68000-sun
;;
@@ -938,17 +1147,9 @@
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
+ tile*)
+ basic_machine=$basic_machine-unknown
+ os=-linux-gnu
;;
tx39)
basic_machine=mipstx39-unknown
@@ -963,6 +1164,10 @@
tower | tower-32)
basic_machine=m68k-ncr
;;
+ tpf)
+ basic_machine=s390x-ibm
+ os=-tpf
+ ;;
udi29k)
basic_machine=a29k-amd
os=-udi
@@ -1006,9 +1211,16 @@
basic_machine=hppa1.1-winbond
os=-proelf
;;
+ xbox)
+ basic_machine=i686-pc
+ os=-mingw32
+ ;;
xps | xps100)
basic_machine=xps100-honeywell
;;
+ xscale-* | xscalee[bl]-*)
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ ;;
ymp)
basic_machine=ymp-cray
os=-unicos
@@ -1017,6 +1229,10 @@
basic_machine=z8k-unknown
os=-sim
;;
+ z80-*-coff)
+ basic_machine=z80-unknown
+ os=-sim
+ ;;
none)
basic_machine=none-none
os=-none
@@ -1036,6 +1252,9 @@
romp)
basic_machine=romp-ibm
;;
+ mmix)
+ basic_machine=mmix-knuth
+ ;;
rs6000)
basic_machine=rs6000-ibm
;;
@@ -1052,13 +1271,10 @@
we32k)
basic_machine=we32k-att
;;
- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sh64)
- basic_machine=sh64-unknown
- ;;
- sparc | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun
;;
cydra)
@@ -1102,9 +1318,12 @@
if [ x"$os" != x"" ]
then
case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
+ # First match some system type aliases
+ # that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
+ -auroraux)
+ os=-auroraux
+ ;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
@@ -1125,25 +1344,31 @@
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+ | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* \
+ | -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -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* \
- | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-android* \
+ | -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*)
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1161,7 +1386,7 @@
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
@@ -1182,6 +1407,9 @@
-opened*)
os=-openedition
;;
+ -os400*)
+ os=-os400
+ ;;
-wince*)
os=-wince
;;
@@ -1203,6 +1431,9 @@
-atheos*)
os=-atheos
;;
+ -syllable*)
+ os=-syllable
+ ;;
-386bsd)
os=-bsd
;;
@@ -1225,6 +1456,9 @@
-sinix*)
os=-sysv4
;;
+ -tpf*)
+ os=-tpf
+ ;;
-triton*)
os=-sysv3
;;
@@ -1261,6 +1495,14 @@
-kaos*)
os=-kaos
;;
+ -zvmoe)
+ os=-zvmoe
+ ;;
+ -dicos*)
+ os=-dicos
+ ;;
+ -nacl*)
+ ;;
-none)
;;
*)
@@ -1283,6 +1525,12 @@
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
+ spu-*)
+ os=-elf
+ ;;
*-acorn)
os=-riscix1.2
;;
@@ -1292,9 +1540,21 @@
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
+ hexagon-*)
+ os=-elf
+ ;;
+ tic54x-*)
+ os=-coff
+ ;;
+ tic55x-*)
+ os=-coff
+ ;;
+ tic6x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
@@ -1313,13 +1573,13 @@
;;
m68000-sun)
os=-sunos3
- # This also exists in the configure program, but was not the
- # default.
- # os=-sunos4
;;
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
@@ -1338,9 +1598,15 @@
*-be)
os=-beos
;;
+ *-haiku)
+ os=-haiku
+ ;;
*-ibm)
os=-aix
;;
+ *-knuth)
+ os=-mmixware
+ ;;
*-wec)
os=-proelf
;;
@@ -1443,7 +1709,7 @@
-sunos*)
vendor=sun
;;
- -aix*)
+ -cnk*|-aix*)
vendor=ibm
;;
-beos*)
@@ -1473,9 +1739,15 @@
-mvs* | -opened*)
vendor=ibm
;;
+ -os400*)
+ vendor=ibm
+ ;;
-ptx*)
vendor=sequent
;;
+ -tpf*)
+ vendor=ibm
+ ;;
-vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
@@ -1500,7 +1772,7 @@
esac
echo $basic_machine$os
-exit 0
+exit
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
--- ebnetd-1.0.dfsg.1.orig/debian/ndtpd.postinst
+++ ebnetd-1.0.dfsg.1/debian/ndtpd.postinst
@@ -0,0 +1,49 @@
+#!/bin/sh
+# postinst script for ndtpd
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * `configure'
+# * `abort-upgrade'
+# * `abort-remove' `in-favour'
+#
+# * `abort-deconfigure' `in-favour'
+# `removing'
+#
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+case "$1" in
+ configure)
+
+ # Add the entry to /etc/inetd.conf
+ if ! grep -q ndtpd /etc/inetd.conf; then
+ if [ -x /usr/sbin/update-inetd ]; then
+ update-inetd --add "ndtp stream tcp nowait root /usr/sbin/tcpd /usr/sbin/ndtpd --inetd"
+ fi
+ fi
+
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- ebnetd-1.0.dfsg.1.orig/debian/ebnetd.init.d
+++ ebnetd-1.0.dfsg.1/debian/ebnetd.init.d
@@ -0,0 +1,114 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: ebnetd
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: the server of EBNET protocol
+# Description: series of servers which provide ways to
+# access so-called "CD-ROM books" via TCP/IP, using EB Library.
+### END INIT INFO
+
+# Author: Kenshi Muto
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="EBNET protocol server"
+NAME=ebnetd
+LOCKDIR=/var/run/ebnetd
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+ # Return
+ # 0 if daemon has been started
+ # 1 if daemon was already running
+ # 2 if daemon could not be started
+ if [ ! -d $LOCKDIR ]; then
+ mkdir $LOCKDIR || return 2
+ chown ebnetd:nogroup $LOCKDIR || return 2
+ fi
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+ # Return
+ # 0 if daemon has been stopped
+ # 1 if daemon was already stopped
+ # 2 if daemon could not be stopped
+ # other if a failure occurred
+ return 0
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+ #
+ # If the daemon can reload its configuration without
+ # restarting (for example, when it is sent a SIGHUP),
+ # then implement that here.
+ #
+ return 0
+}
+
+case "$1" in
+ start)
+ [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
+ do_start
+ case "$?" in
+ 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ esac
+ ;;
+ stop)
+ [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ esac
+ ;;
+ restart|force-reload)
+ #
+ # If the "reload" option is implemented then remove the
+ # 'force-reload' alias
+ #
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1)
+ do_start
+ case "$?" in
+ 0) log_end_msg 0 ;;
+ 1) log_end_msg 1 ;; # Old process is still running
+ *) log_end_msg 1 ;; # Failed to start
+ esac
+ ;;
+ *)
+ # Failed to stop
+ log_end_msg 1
+ ;;
+ esac
+ ;;
+ *)
+ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+ exit 3
+ ;;
+esac
+
+:
--- ebnetd-1.0.dfsg.1.orig/debian/00ebnetd
+++ ebnetd-1.0.dfsg.1/debian/00ebnetd
@@ -0,0 +1,58 @@
+######################################################################
+# Configuration file for ebnetd/ndtpd/ebhttpd.
+# (Copy this file to `ebnetd.conf', and edit it.)
+######################################################################
+
+### Port number `ebnetd' binds.
+### (default: ebnet)
+# ebnet-port ebnet
+
+### Port number `ndtpd' binds.
+### (default: ndtp)
+# ndtp-port ndtp
+
+### Port number `ebhttpd' binds.
+### (default: http)
+# http-port http
+
+### Owner of the server process.
+### (default: none)
+user ebnetd
+
+### Group of the server process.
+### (default: none)
+group daemon
+
+### How many clients can be connected to the server at the same time.
+### (default: 1)
+# max-clients 1
+
+### Which hosts can or cannot connect to the server.
+### (default: none)
+hosts 127.0.0.1
+hosts ::1
+hosts !?
+hosts host.your.domain
+
+### Timeout seconds until the server disconnects an idle connection.
+### (default: 900)
+# timeout 900
+
+### Path to a working directory.
+### Please create the directory and make it be writable for the server
+### processes before executing the server.
+### (default: /var/run/ebnetd)
+# work-path /var/run/ebnetd
+
+### How many hit entries the server tries to find at a search.
+### (default: 50)
+# max-hits 50
+
+### The maximum size of text the server may send as a response to
+### a client.
+### (default: 32768)
+# max-text-size 32768
+
+### Syslog facility
+### (default: daemon)
+syslog-facility daemon
--- ebnetd-1.0.dfsg.1.orig/debian/ebnetd-common.docs
+++ ebnetd-1.0.dfsg.1/debian/ebnetd-common.docs
@@ -0,0 +1,5 @@
+NEWS
+README
+README-ja
+UPGRADE
+UPGRADE-ja
--- ebnetd-1.0.dfsg.1.orig/debian/ebhttpd.postrm
+++ ebnetd-1.0.dfsg.1/debian/ebhttpd.postrm
@@ -0,0 +1,42 @@
+#!/bin/sh
+# postrm script for ebhttpd
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * `remove'
+# * `purge'
+# * `upgrade'
+# * `failed-upgrade'
+# * `abort-install'
+# * `abort-install'
+# * `abort-upgrade'
+# * `disappear' overwrit>r>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+ # Remove from /etc/inetd.conf
+ if [ -x /usr/sbin/update-inetd ]; then
+ update-inetd --remove ebhttpd
+ fi
+
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- ebnetd-1.0.dfsg.1.orig/debian/changelog
+++ ebnetd-1.0.dfsg.1/debian/changelog
@@ -0,0 +1,512 @@
+ebnetd (1:1.0.dfsg.1-4.3) unstable; urgency=low
+
+ * Non-maintainer upload with maintainer's agreement.
+ * Add init script to make volatile /var/run/ebnetd. (Closes: #673943)
+
+ -- Kenshi Muto Sat, 30 Jun 2012 10:53:59 +0900
+
+ebnetd (1:1.0.dfsg.1-4.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build-depends on libeb16-dev instead of libeb13-dev (Closes: #623458).
+
+ -- Luca Falavigna Sun, 15 May 2011 01:04:34 +0200
+
+ebnetd (1:1.0.dfsg.1-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build-depends on libeb13-dev instead of libeb12-dev.
+
+ -- Aurelien Jarno Sun, 31 Jan 2010 14:26:13 +0100
+
+ebnetd (1:1.0.dfsg.1-4) unstable; urgency=low
+
+ * Bumped to Standards-Version: 3.8.0.
+
+ -- Masayuki Hatta (mhatta) Mon, 14 Jul 2008 19:41:29 +0900
+
+ebnetd (1:1.0.dfsg.1-3) unstable; urgency=low
+
+ * Now remove leftovers of the old ndtpd package more aggressively
+ - closes: #455015
+
+ -- Masayuki Hatta (mhatta) Mon, 10 Dec 2007 20:26:45 +0900
+
+ebnetd (1:1.0.dfsg.1-2) unstable; urgency=low
+
+ * Bumped to Standards-Version: 3.7.3.
+ * Fixed various lintian warnings.
+
+ -- Masayuki Hatta (mhatta) Thu, 06 Dec 2007 20:46:25 +0900
+
+ebnetd (1:1.0.dfsg.1-1) unstable; urgency=low
+
+ * The upstream made ndtpd a part of ebnetd, and released it as the
+ version 1.0. Setting epoch to 1.
+ * Now Build-Depends: libeb12-dev - closes: #410446
+ * Demolished the use of syslog-facility - closes: #389389
+ * Will remove unneedful entries in /etc/syslog.conf on preinst - closes: #184284
+ * Now postrm removes the ebnet/ndtp entry correctly from /etc/inetd.conf - closes: #414163
+ * Stopped using debconf at all -- closes: #257679, #332045
+ * Acknowledged NMUs - closes: #308851, #301672
+ * Removed/Replaced NetBSD-licensed files from the original tarball to avoid license conflicts.
+ * Now packages depend on update-inetd, instead of netbase.
+ * debian/copyright: Now refers the license of documentation in doc/.
+
+ -- Masayuki Hatta (mhatta) Tue, 24 Apr 2007 19:43:43 +0900
+
+ndtpd (3.1.5-6.3) unstable; urgency=high
+
+ * NMU
+ * Fix missing dependency.
+ Added Depends: adduser, sysklogd, and Recommends: netbase.
+ Modified postinst/postrm to check /usr/sbin/update-inetd existence before
+ use it.
+ (closes: #308851)
+
+ -- Kenshi Muto Fri, 13 May 2005 06:04:09 +0000
+
+ndtpd (3.1.5-6.2) unstable; urgency=high
+
+ * Fix missing info. It caused uninstallable.
+ (closes: #307615)
+ * Remove doc/ndtpd.info and doc-ja/ndtpd-ja.info when do debian/rules clean
+
+ -- Kenshi Muto Wed, 4 May 2005 10:54:39 +0000
+
+ndtpd (3.1.5-6.1) unstable; urgency=high
+
+ * NMU
+ * Fix invalid sed using. (closes: #301672)
+
+ -- Kenshi Muto Mon, 2 May 2005 01:57:20 +0000
+
+ndtpd (3.1.5-6) unstable; urgency=medium
+
+ * Run autoconf -i - closes: #249669
+
+ -- Masayuki Hatta (mhatta) Sun, 20 Jun 2004 02:29:55 +0900
+
+ndtpd (3.1.5-5) unstable; urgency=low
+
+ * The "Now You Can Call Me An Idiot" release.
+ * [control] changed Maintainer field.
+ * Now suppress verbose debug messages - closes: #212386
+ * Make sure /etc/ndtpd/syslog_entry is removed when purge - closes: #238740
+ * Thanks andreas and ohura.
+
+ -- Masayuki Hatta (mhatta) Mon, 29 Mar 2004 01:38:39 +0900
+
+ndtpd (3.1.5-4) unstable; urgency=low
+
+ * Now uses dpatch.
+ * Wind up the outcome of old broken automake - closes: #219612
+ * Now includes debconf library from postinst - closes: #238736
+ * Now use invoke-rc.d to run /etc/init.d/* - closes: #238738
+ * Now depends on system-log-daemon - closes: #236617
+ * Thanks andreas and tyuyu.
+
+ -- Masayuki Hatta (mhatta) Mon, 29 Mar 2004 00:20:51 +0900
+
+ndtpd (3.1.5-3) unstable; urgency=low
+
+ * Linked with libeb7.
+
+ -- Masayuki Hatta Tue, 16 Sep 2003 09:00:11 +0900
+
+ndtpd (3.1.5-2) unstable; urgency=low
+
+ * Now can be purged - closes: #195325
+
+ -- Masayuki Hatta Sun, 14 Sep 2003 21:57:36 +0900
+
+ndtpd (3.1.5-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Masayuki Hatta Sat, 24 May 2003 19:00:43 +0900
+
+ndtpd (3.1.4-2) unstable; urgency=low
+
+ * Bumped to Standards-Version: 3.5.9.
+ * Rebuilt with new libeb.
+ * Changed dependency on sysklogd | syslog-log-daemon - closes: #167350
+ * Do not override ndtpd.conf - closes: #184268
+
+ -- Masayuki Hatta Mon, 21 Apr 2003 22:00:09 +0900
+
+ndtpd (3.1.4-1) unstable; urgency=low
+
+ * New upstream release
+ * Bumped Standards-Version to 3.5.7.
+
+ -- Masayuki Hatta Sat, 21 Sep 2002 11:31:46 +0900
+
+ndtpd (3.1.2-2) unstable; urgency=low
+
+ * Now uses /usr/sbin/syslog-facility to modify the syslogd configuration.
+ * Note that this package now depends on sysklogd or
+ syslog-common(msyslog), but not system-log-daemon(so eventually
+ syslog-ng) since syslog-ng does not provide syslog-facility.
+ Maybe you want to file a wishlist bug against
+ syslog-ng to ask to include syslog-facility - closes: #143080
+
+ -- Masayuki Hatta Tue, 16 Apr 2002 21:45:07 +0900
+
+ndtpd (3.1.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Added Build-Depends: autotools-dev. config.{guess,sub} are now
+ updated from /usr/share/misc at build time.
+
+ -- Masayuki Hatta Fri, 12 Apr 2002 18:04:35 +0900
+
+ndtpd (3.1.1+-2) unstable; urgency=low
+
+ * Rebuilt with eb 3.2.1.
+
+ -- Masayuki Hatta Sat, 16 Mar 2002 16:26:49 +0900
+
+ndtpd (3.1.1+-1) unstable; urgency=low
+
+ * New upstream release - closes: #133655
+
+ -- Masayuki Hatta Sun, 24 Feb 2002 11:16:33 +0900
+
+ndtpd (3.0.2-3) unstable; urgency=low
+
+ * Fixed cron.daily issue (by ysjj, thanx) - closes: #126400
+
+ -- Masayuki Hatta Mon, 31 Dec 2001 12:40:26 +0900
+
+ndtpd (3.0.2-2) unstable; urgency=low
+
+ * Fixed typo in description - closes: #125170
+
+ -- Masayuki Hatta Sat, 22 Dec 2001 13:05:01 +0900
+
+ndtpd (3.0.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Masayuki Hatta Wed, 8 Aug 2001 19:33:07 +0900
+
+ndtpd (3.0.1-2) unstable; urgency=low
+
+ * Added manpages generated by help2man - closes: #90291, #90292, #90352, #90353, #90369
+ * Added ndtpd.conf.sample as example.
+
+ -- Masayuki Hatta Sat, 21 Jul 2001 09:19:43 +0900
+
+ndtpd (3.0.1-1) unstable; urgency=low
+
+ * New maintainer: Masayuki Hatta .
+ * The "On Our Way Up" Release.
+ * Basically re-packaged.
+ * Updated Standards-Version: 3.5.2.
+ * Updated config.{sub,guess} - closes: #105010
+ * Rebuilt with libeb4 - closes: #98106
+ * Added German template. Wow. - closes: #100064
+ * Fixed in NMUs - closes: #78151, #90787
+
+ -- Masayuki Hatta Mon, 16 Jul 2001 20:30:20 +0900
+
+ndtpd (2.3.8-4.1) unstable; urgency=low
+
+ * NMU
+ * Added the missing build dependency on zlib1g-dev. (closes: #78151)
+ * Added a dependency on sysklogd to ensure that there's an
+ /etc/syslog.conf when installing the package.
+ (closes: #90322, #90787)
+ * Standards-Version: 3.1.1 (no changes)
+
+ -- Adrian Bunk Sun, 15 Apr 2001 15:46:15 +0200
+
+ndtpd (2.3.8-4) unstable; urgency=low
+
+ * Really mv /etc/ndtpd.conf to /etc/ndtpd/book.d/00ndtpd.
+ * Fixed Build-Depends.
+ * cleanup debian/00ndptd.
+
+ -- Masato Taruishi Sat, 11 Nov 2000 13:51:56 +0900
+
+ndtpd (2.3.8-3) unstable; urgency=low
+
+ * New Maintainer.
+ * Added a dependency to debconf.
+ * Added Build-Depends.
+
+ -- Masato Taruishi Tue, 24 Oct 2000 14:40:01 +0900
+
+ndtpd (2.3.8-2.2) unstable; urgency=low
+
+ * Added a debconf's notation about moving ndtpd.conf.
+ * Added a update-ndtpd.conf's documentation in README.Debian.
+
+ -- Masato Taruishi Tue, 24 Oct 2000 14:21:49 +0900
+
+ndtpd (2.3.8-2.1) unstable; urgency=low
+
+ * NMU
+ * Added update-ndtpd.conf.
+ * Installed ndtpd.conf.sample as examples.
+ - put a modified configuration for Debian in /etc/ndtpd/00ndtpd
+ * Moved ndtpd.conf to /etc/ndtpd/.
+
+ -- Masato Taruishi Mon, 16 Oct 2000 03:59:22 +0900
+
+ndtpd (2.3.8-2) unstable; urgency=low
+
+ * Fix errors if system has alreay user 'ndtpd'.(closes: Bug#72369)
+ This changes is written by UKAI fumi-kun Fumitoshi .
+
+ -- Susumu OSAWA Tue, 26 Sep 2000 15:51:47 +0900
+
+ndtpd (2.3.8-1) unstable; urgency=low
+
+ * New upstream release
+ * Applied ndtpd-2.3.8+ and ndtpd-2.3.8+2 patch.
+
+ -- Susumu OSAWA Thu, 21 Sep 2000 23:57:59 +0900
+
+ndtpd (2.3.6-3) unstable unstable; urgency=low
+
+ * Fix incorrect procotol bug.(closes: Bug#52753)
+
+ -- Susumu OSAWA Sun, 2 Jan 2000 00:29:29 +0900
+
+ndtpd (2.3.6-2) unstable unstable; urgency=low
+
+ * Fix postrm's userdel bug.(closes: Bug#52675)
+
+ -- Susumu OSAWA Mon, 20 Dec 1999 02:24:58 +0900
+
+ndtpd (2.3.6-1) unstable unstable; urgency=low
+
+ * New upstream release
+
+ -- Susumu OSAWA Mon, 13 Dec 1999 06:14:20 +0900
+
+ndtpd (2.3.5-2) unstable unstable; urgency=low
+
+ * Postinst changes directory's owners (closes: Bug#49657).
+ * Postrm removes user 'ndtpd' (closes: Bug#48261).
+ * Postinst adds inetd's entry (closes: Bug#48265).
+
+ -- Susumu OSAWA Sun, 14 Nov 1999 04:49:06 +0900
+
+ndtpd (2.3.5-1) unstable unstable; urgency=low
+
+ * New upstream release
+
+ -- Susumu OSAWA Sun, 7 Nov 1999 01:43:09 +0900
+
+ndtpd (2.3.4+-1) unstable unstable; urgency=low
+
+ * New upstream release
+
+ -- Susumu OSAWA Sun, 31 Oct 1999 01:38:11 +0900
+
+ndtpd (2.3.4-1) unstable unstable; urgency=low
+
+ * New upstream release
+
+ -- Susumu OSAWA Sun, 31 Oct 1999 01:35:02 +0900
+
+ndtpd (2.3.3-4) unstable unstable; urgency=low
+
+ * Upload to Debian Project.
+ * Adopt FHS compliance.
+ * Adopt Debian Policy 3.0
+
+ -- Susumu OSAWA Mon, 11 Oct 1999 00:57:31 +0900
+
+ndtpd (2.3.3-3) unstable unstable; urgency=low
+
+ * Add cron.daily to ndtpd.daily.
+
+ -- Susumu OSAWA Tue, 21 Sep 1999 00:57:53 +0900
+
+ndtpd (2.3.3-2) unstable unstable; urgency=low
+
+ * Fix missing info files.
+
+ -- Susumu OSAWA Mon, 20 Sep 1999 07:40:58 +0900
+
+ndtpd (2.3.3-1) unstable unstable; urgency=low
+
+ * New upstream release
+
+ -- Susumu OSAWA Sun, 19 Sep 1999 02:58:43 +0900
+
+ndtpd (2.3.1-2) unstable unstable; urgency=low
+
+ * postinst adds syslog.conf ndtpd's entry.
+
+ -- Susumu OSAWA Fri, 17 Sep 1999 22:12:06 +0900
+
+ndtpd (2.3.1-1) unstable unstable; urgency=low
+
+ * New upstream release
+
+ -- Susumu OSAWA Mon, 31 May 1999 02:33:31 +0900
+
+ndtpd (2.3-2) unstable unstable; urgency=low
+
+ * Applied ndtpd-2.3+.diff and ndtpd-2.3+2.diff
+
+ -- Susumu OSAWA Fri, 28 May 1999 00:15:39 +0900
+
+ndtpd (2.3-1) unstable unstable; urgency=low
+
+ * New upstream release
+
+ -- Susumu OSAWA Sun, 23 May 1999 04:01:06 +0900
+
+ndtpd (2.2.2-2) unstable unstable; urgency=low
+
+ * Do not make libeb.
+
+ -- Susumu OSAWA Mon, 19 Apr 1999 03:47:06 +0900
+
+ndtpd (2.2.2-1) frozen unstable; urgency=low
+
+ * New upstream release
+
+ -- Susumu OSAWA Sat, 13 Mar 1999 02:49:38 +0900
+
+ndtpd (2.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Susumu OSAWA Sun, 14 Feb 1999 16:08:14 +0900
+
+ndtpd (2.1.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Susumu OSAWA Thu, 24 Dec 1998 23:24:23 +0900
+
+ndtpd (2.1-6) unstable; urgency=low
+
+ * Fix incorrect info install.
+
+ -- Susumu OSAWA Wed, 23 Dec 1998 23:34:28 +0900
+
+ndtpd (2.1-5) unstable; urgency=low
+
+ * Fix lintian errors in libeb.
+
+ -- Susumu OSAWA Tue, 24 Nov 1998 01:34:37 +0900
+
+ndtpd (2.1-4) unstable; urgency=low
+
+ * Fix lintian errors.
+
+ -- Susumu OSAWA Mon, 23 Nov 1998 04:43:06 +0900
+
+ndtpd (2.1-3) unstable; urgency=low
+
+ * Fix incorrect manpages.
+
+ -- Susumu OSAWA Sun, 1 Nov 1998 03:07:26 +0900
+
+ndtpd (2.1-2) unstable; urgency=low
+
+ * Use to zlib1g-dev
+
+ -- Susumu OSAWA Sat, 31 Oct 1998 01:32:38 +0900
+
+ndtpd (2.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Susumu OSAWA Sat, 24 Oct 1998 02:08:24 +0900
+
+ndtpd (2.0.3-2) unstable; urgency=low
+
+ * Use new debhelper.
+
+ -- Susumu OSAWA Sun, 13 Sep 1998 17:20:15 +0900
+
+ndtpd (2.0.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Susumu OSAWA Thu, 10 Sep 1998 23:56:34 +0900
+
+ndtpd (2.0.1-4) unstable; urgency=low
+
+ * Split libeb.
+
+ -- Susumu OSAWA Wed, 9 Sep 1998 00:58:36 +0900
+
+ndtpd (2.0.1-3) unstable; urgency=low
+
+ * Fix incorrect info character code.
+
+ -- Susumu OSAWA Sat, 18 Jul 1998 21:31:34 +0900
+
+ndtpd (2.0.1-2) unstable; urgency=low
+
+ * Fix incorrect info install.
+
+ -- Susumu OSAWA Fri, 17 Jul 1998 23:18:33 +0900
+
+ndtpd (2.0.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Change maintainer's address.
+
+ -- Susumu OSAWA Thu, 9 Jul 1998 00:55:11 +0900
+
+ndtpd (2.0beta1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Susumu OSAWA Mon, 11 May 1998 00:08:15 +0900
+
+ndtpd (1.0.5-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Susumu OSAWA Mon, 16 Feb 1998 05:28:42 +0900
+
+ndtpd (1.0.4-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Susumu OSAWA Fri, 9 Jan 1998 21:57:42 +0900
+
+ndtpd (1.0.3-2) unstable; urgency=low
+
+ * Change datadir /usr/share to /usr/lib.
+
+ -- Susumu OSAWA Sun, 9 Nov 1997 19:41:11 +0900
+
+ndtpd (1.0.3-1) hamm-jp; urgency=low
+
+ * New upstream release.
+ * Libc6.
+
+ -- Susumu OSAWA Sun, 2 Nov 1997 00:00:22 +0900
+
+ndtpd (1.0+-1) bo-jp hamm-jp; urgency=low
+
+ * New upstream release
+
+ -- Susumu OSAWA Fri, 5 Sep 1997 15:13:51 +0900
+
+ndtpd (1.0-2) bo-jp hamm-jp; urgency=low
+
+ * Add missing README.debian.
+ * Add missing service.
+
+ -- Susumu OSAWA Fri, 5 Sep 1997 14:49:57 +0900
+
+ndtpd (1.0-1) bo-jp hamm-jp; urgency=low
+
+ * Initial Release.
+
+ -- Susumu OSAWA Fri, 8 Aug 1997 14:41:08 +0900
+
--- ebnetd-1.0.dfsg.1.orig/debian/ebnetd.postinst
+++ ebnetd-1.0.dfsg.1/debian/ebnetd.postinst
@@ -0,0 +1,51 @@
+#!/bin/sh
+# postinst script for ebnetd
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * `configure'
+# * `abort-upgrade'
+# * `abort-remove' `in-favour'
+#
+# * `abort-deconfigure' `in-favour'
+# `removing'
+#
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+case "$1" in
+ configure)
+
+ # Add the entry to /etc/inetd.conf
+ if ! grep -q ebnetd /etc/inetd.conf; then
+ if [ -x /usr/sbin/update-inetd ]; then
+ update-inetd --add "ebnet stream tcp nowait root /usr/sbin/tcpd /usr/sbin/ebnetd --inetd"
+ fi
+ fi
+
+ update-ebnetd.conf
+
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- ebnetd-1.0.dfsg.1.orig/debian/ebhttpd.postinst
+++ ebnetd-1.0.dfsg.1/debian/ebhttpd.postinst
@@ -0,0 +1,51 @@
+#!/bin/sh
+# postinst script for ebhttpd
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * `configure'
+# * `abort-upgrade'
+# * `abort-remove' `in-favour'
+#
+# * `abort-deconfigure' `in-favour'
+# `removing'
+#
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+case "$1" in
+ configure)
+
+ # Add the entry to /etc/inetd.conf
+ if ! grep -q ndtpd /etc/inetd.conf; then
+ if [ -x /usr/sbin/update-inetd ]; then
+ update-inetd --add "http stream tcp nowait root /usr/sbin/tcpd /usr/sbin/ebhttpd --inetd"
+ fi
+ fi
+
+ update-ebnetd.conf
+
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- ebnetd-1.0.dfsg.1.orig/debian/watch
+++ ebnetd-1.0.dfsg.1/debian/watch
@@ -0,0 +1,23 @@
+# watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+# Uncomment to examine a Webpage
+#
+#http://www.example.com/downloads.php ebnetd-(.*)\.tar\.gz
+
+# Uncomment to examine a Webserver directory
+#http://www.example.com/pub/ebnetd-(.*)\.tar\.gz
+
+# Uncommment to examine a FTP server
+opts=dversionmangle=s/\.dfsg\.\d+$// \
+ ftp://ftp.sra.co.jp/pub/misc/eb/ebnetd-(.*)\.tar\.gz debian uupdate
+
+# Uncomment to find new files on sourceforge, for debscripts >= 2.9
+# http://sf.net/ebnetd/ebnetd-(.*)\.tar\.gz
+
+
--- ebnetd-1.0.dfsg.1.orig/debian/ebnetd-common.info
+++ ebnetd-1.0.dfsg.1/debian/ebnetd-common.info
@@ -0,0 +1,2 @@
+doc/ebnetd.info
+doc-ja/ebnetd-ja.info
--- ebnetd-1.0.dfsg.1.orig/debian/ebnetd.dirs
+++ ebnetd-1.0.dfsg.1/debian/ebnetd.dirs
@@ -0,0 +1,2 @@
+usr/sbin
+
--- ebnetd-1.0.dfsg.1.orig/debian/copyright
+++ ebnetd-1.0.dfsg.1/debian/copyright
@@ -0,0 +1,55 @@
+This package was debianized by Masayuki Hatta (mhatta) on
+Sat, 7 Oct 2006 20:43:25 +0900.
+
+It was downloaded from ftp://ftp.sra.co.jp/pub/misc/eb
+
+Upstream Author: Motoyuki Kasahara
+
+Copyright: 1997-2003 Motoyuki Kasahara.
+
+License:
+
+ This package 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
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2006, Masayuki Hatta (mhatta) and is licensed under the GPL, see above.
+
+License for documentation under doc*/:
+
+Copyright (c) 1997, 98, 99, 2000, 01, 03 Motoyuki Kasahara
+
+Permission is granted to make and distribute verbatim copies of this
+manual provided the copyright notice and this permission notice are
+preserved on all copies.
+
+Permission is granted to process this file through TeX and print the
+results, provided the printed document carries copying permission
+notice identical to this one except for the removal of this paragraph
+(this paragraph not being relevant to the printed manual).
+
+Permission is granted to copy and distribute modified versions of this
+manual under the conditions for verbatim copying, provided that the
+entire resulting derived work is distributed under the terms of a
+permission notice identical to this one.
+
+Permission is granted to copy and distribute translations of this
+manual into another language, under the above conditions for modified
+versions, except that this permission notice may be stated in a
+translation approved by Free Software Foundation, Inc
+
+
+
--- ebnetd-1.0.dfsg.1.orig/debian/ebnetd-common.postrm
+++ ebnetd-1.0.dfsg.1/debian/ebnetd-common.postrm
@@ -0,0 +1,53 @@
+#!/bin/sh
+# postrm script for ebnetd-common
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * `remove'
+# * `purge'
+# * `upgrade'
+# * `failed-upgrade'
+# * `abort-install'
+# * `abort-install'
+# * `abort-upgrade'
+# * `disappear' overwrit>r>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+ # Remove the user ebnetd
+ id ebnetd > /dev/null 2>&1 && userdel -r ebnetd || true
+
+ rm -rf /var/run/ebnetd
+
+ ;;
+
+ purge)
+
+ # Remove the user ebnetd
+ id ebnetd > /dev/null 2>&1 && userdel -r ebnetd || true
+
+ rm -rf /var/run/ebnetd
+
+ rm -rf /etc/ebnetd
+
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- ebnetd-1.0.dfsg.1.orig/debian/ndtpd.install
+++ ebnetd-1.0.dfsg.1/debian/ndtpd.install
@@ -0,0 +1 @@
+usr/sbin/ndtp*
--- ebnetd-1.0.dfsg.1.orig/debian/ebnetd-common.install
+++ ebnetd-1.0.dfsg.1/debian/ebnetd-common.install
@@ -0,0 +1,4 @@
+usr/sbin/ebndaily
+usr/sbin/ebnupgrade
+var
+
--- ebnetd-1.0.dfsg.1.orig/debian/ebnetd-common.postinst
+++ ebnetd-1.0.dfsg.1/debian/ebnetd-common.postinst
@@ -0,0 +1,55 @@
+#!/bin/sh
+# postinst script for ebnetd-common
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * `configure'
+# * `abort-upgrade'
+# * `abort-remove' `in-favour'
+#
+# * `abort-deconfigure' `in-favour'
+# `removing'
+#
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+case "$1" in
+ configure)
+
+ # Add the user ebnetd
+ id ebnetd > /dev/null 2>&1 || adduser --system --home /var/lib/ebnetd --gecos ebnetd ebnetd || true
+
+ # Installation fails if this dir doesn't exist
+ if [ ! -d /var/run/ebnetd ]; then
+ mkdir /var/run/ebnetd
+ fi
+
+ chown ebnetd:daemon /var/run/ebnetd/
+ chown ebnetd:nogroup /var/lib/ebnetd/
+
+ update-ebnetd.conf
+
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- ebnetd-1.0.dfsg.1.orig/debian/control
+++ ebnetd-1.0.dfsg.1/debian/control
@@ -0,0 +1,63 @@
+Source: ebnetd
+Section: text
+Priority: optional
+Maintainer: Masayuki Hatta (mhatta)
+Build-Depends: debhelper (>= 5), autotools-dev, dpatch, libeb16-dev, libz-dev, bzip2, texinfo
+Standards-Version: 3.8.0
+
+Package: ebnetd
+Architecture: any
+Depends: ${shlibs:Depends}, ebnetd-common, update-inetd
+Description: the server of EBNET protocol
+ The EBNETD distribution is a series of servers which provide ways to
+ access so-called "CD-ROM books" via TCP/IP, using EB Library. The CD-ROM
+ books is a popular form to provide dictionaries and multimedia references
+ in Japan. Various formats such as EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING
+ are supported.
+ .
+ ebnetd speaks EBNET protocol. With ebnetd, applications using EB Library
+ can access CD-ROM books on a remote server on which ebnetd runs.
+
+Package: ebnetd-common
+Architecture: any
+Depends: ${shlibs:Depends}, adduser, update-inetd
+Conflicts: ndtpd (<= 3.1.5), edict-fpw (<= 1.2.1-4.1)
+Description: Common files for the EBNETD suite
+ The EBNETD distribution is a series of servers which provide ways to
+ access so-called "CD-ROM books" via TCP/IP, using EB Library. The CD-ROM
+ books is a popular form to provide dictionaries and multimedia references
+ in Japan. Various formats such as EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING
+ are supported.
+ .
+ This package provides common files for EBNETD servers, including the
+ configuation framework and documents.
+
+Package: ndtpd
+Architecture: any
+Depends: ${shlibs:Depends}, ebnetd-common, update-inetd
+Suggests: lookup-el, edict-fpw
+Description: the Network Dictionary Transfer Protocol server
+ The EBNETD distribution is a series of servers which provide ways to
+ access so-called "CD-ROM books" via TCP/IP, using EB Library. The CD-ROM
+ books is a popular form to provide dictionaries and multimedia references
+ in Japan. Various formats such as EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING
+ are supported.
+ .
+ ndtpd is a server for accessing CD-ROM books via NDTP (Network
+ Dictionary Transfer Protocol). NDTP is a de facto standard way to
+ use CD-ROM books.
+
+Package: ebhttpd
+Architecture: any
+Depends: ${shlibs:Depends}, ebnetd-common, update-inetd
+Provides: httpd
+Description: specialized HTTP server to access CD-ROM books
+ The EBNETD distribution is a series of servers which provide ways to
+ access so-called "CD-ROM books" via TCP/IP, using EB Library. The CD-ROM
+ books is a popular form to provide dictionaries and multimedia references
+ in Japan. Various formats such as EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING
+ are supported.
+ .
+ ebhttpd is a specialized HTTP server which provides a way to access
+ CD-ROM books on remote servers via HTTP/1.0 and HTTP/1.1. Note that
+ you can not use ebhttpd for generic WWW purposes.
--- ebnetd-1.0.dfsg.1.orig/debian/ebnetd.postrm
+++ ebnetd-1.0.dfsg.1/debian/ebnetd.postrm
@@ -0,0 +1,42 @@
+#!/bin/sh
+# postrm script for ebnetd
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * `remove'
+# * `purge'
+# * `upgrade'
+# * `failed-upgrade'
+# * `abort-install'
+# * `abort-install'
+# * `abort-upgrade'
+# * `disappear' overwrit>r>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+ # Remove from /etc/inetd.conf
+ if [ -x /usr/sbin/update-inetd ]; then
+ update-inetd --remove ebnet || true
+ fi
+
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- ebnetd-1.0.dfsg.1.orig/debian/ebnetd-common.preinst
+++ ebnetd-1.0.dfsg.1/debian/ebnetd-common.preinst
@@ -0,0 +1,77 @@
+#!/bin/sh
+# preinst script for ebnetd-common
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * `install'
+# * `install'
+# * `upgrade'
+# * `abort-upgrade'
+#
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ install|upgrade)
+
+ #
+ # Remove leftover of the previous packaging
+ #
+ facility=local0
+ logfile=/var/log/ndtpd.log
+
+ syslogline="$facility.info $logfile"
+
+ # Left by ancient versions
+ if grep "^# Added by ndtpd package" /etc/syslog.conf > /dev/null; then
+ echo "Removing really old ndtpd's entry from syslog.conf"
+ sed '/^# Added by ndtpd package/,/^"$syslogline"/D' < /etc/syslog.conf > /etc/syslog.conf.new
+ mv -f /etc/syslog.conf /etc/syslog.conf.old
+ mv -f /etc/syslog.conf.new /etc/syslog.conf
+ fi
+
+ # Left by relatively new versions
+ if grep "^local[0-7].info $logfile" /etc/syslog.conf > /dev/null; then
+ echo "Removing old ndtpd's entry from syslog.conf"
+ sed '/^local[0-7].info.*ndtpd.log$/D' < /etc/syslog.conf > /etc/syslog.conf.new
+ mv -f /etc/syslog.conf /etc/syslog.conf.old
+ mv -f /etc/syslog.conf.new /etc/syslog.conf
+ fi
+
+ # Remove the user ndtpd
+ id ndtpd > /dev/null 2>&1 && userdel -r ndtpd || true
+
+ # For upgrading from the old ndtpd (<= 3.1.5)
+ if [ -d /etc/ndtpd ]; then
+ install -d /etc/ebnetd/book.d
+ cp /etc/ndtpd/book.d/* /etc/ebnetd/book.d
+ rm -f /etc/ebnetd/book.d/00ndtpd
+ rm -f /etc/cron.daily/ndtpd
+ rm -rf /etc/ndtpd
+ fi
+
+ rm -f /etc/syslog.conf.old
+
+ ;;
+
+ abort-upgrade)
+ ;;
+
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- ebnetd-1.0.dfsg.1.orig/debian/compat
+++ ebnetd-1.0.dfsg.1/debian/compat
@@ -0,0 +1 @@
+5
--- ebnetd-1.0.dfsg.1.orig/debian/NEWS.Debian
+++ ebnetd-1.0.dfsg.1/debian/NEWS.Debian
@@ -0,0 +1,16 @@
+ebnetd (1:1.0-1) unstable; urgency=low
+
+ ndtpd is now a part of ebnetd, and the structure of the package has been
+ massively changed. Now all configuration files are placed under
+ /etc/ebnetd, not /etc/ndtpd. The old configuration files (including
+ your own additions under /etc/ndtpd/book.d) for ndtpd will be
+ converted automatically and copied to /etc/ebnetd, so you may remove the
+ /etc/ndtpd directory after the upgrade if you wish. However, if you
+ have tweaked /etc/ndtpd/book.d/00ndtpd by yourself, then you have to
+ reflect your changes to /etc/ebnetd/book.d/00ebnetd by hand.
+
+ -- Masayuki Hatta (mhatta) Sun, 8 Oct 2006 05:43:04 +0900
+
+
+
+
--- ebnetd-1.0.dfsg.1.orig/debian/README.Debian
+++ ebnetd-1.0.dfsg.1/debian/README.Debian
@@ -0,0 +1,34 @@
+ebnetd for Debian
+-----------------
+
+ebnetd in Debian has a flexible configuration handling system. To use
+this system, use update-ebnetd.conf to update your
+/etc/ebnetd/ebnetd.conf.
+
+ * For site administrators
+
+ Put your global configurations for ebnetd in /etc/ebnetd/book.d/00ebnetd
+ and each book configuration in /etc/ebnetd/book.d/.
+ Edit each /etc/ebnetd/book.d/'s hosts subsection to allow
+ the access hosts if you want.
+
+ Then invoke /usr/sbin/update-ebnetd.conf to update
+ /etc/ebnetd/ebnetd.conf.
+
+ * for package maintainers
+
+ Put /etc/ebnetd/book.d/ in your package, which includes a
+ book configuration the package has.
+ I suggests the book can be allowed to access from any hosts by
+ default to use the book soon. i.e. hosts * subsection is added.
+ The access control is processed by global configuration by default.
+
+ Put /usr/sbin/update-ebnetd.conf in your maintainer scripts.
+
+ The edict-fpw package would be a good example for adding ebnetd
+ support to your own package.
+
+Info of update-ebnetd.conf was written by Masato Taruishi
+.
+
+ -- Masayuki Hatta (mhatta) , Sun, 8 Oct 2006 14:32:33 +0900
--- ebnetd-1.0.dfsg.1.orig/debian/update-ebnetd.conf
+++ ebnetd-1.0.dfsg.1/debian/update-ebnetd.conf
@@ -0,0 +1,35 @@
+#!/bin/sh
+# update-ebnetd.conf
+# Copyright 2000 Masato Taruishi
+# Copyright 2006 Masayuki Hatta
+# License: GPL
+
+EBNETDCONF=/etc/ebnetd/ebnetd.conf
+BOOKDIR=/etc/ebnetd/book.d/
+
+if [ -f $EBNETDCONF ]; then
+ mv $EBNETDCONF $EBNETDCONF.backup
+fi
+
+cat > $EBNETDCONF << EOF
+#
+# ebnetd.conf: Automatically generated file. Do not edit by hand.
+#
+EOF
+
+for i in $BOOKDIR/*; do
+ if ! echo $i | grep -q '\(\.dpkg-[a-z]*\|~\)$'; then
+ cat $i >> $EBNETDCONF
+ fi
+done
+
+if [ -f $EBNETDCONF ]; then
+ ebnupgrade
+ mv $EBNETDCONF.new $EBNETDCONF
+fi
+
+if [ -f $EBNETDCONF.backup ]; then
+ rm $EBNETDCONF.backup
+fi
+
+exit
--- ebnetd-1.0.dfsg.1.orig/debian/ebhttpd.install
+++ ebnetd-1.0.dfsg.1/debian/ebhttpd.install
@@ -0,0 +1 @@
+usr/sbin/ebht*
--- ebnetd-1.0.dfsg.1.orig/debian/ndtpd.postrm
+++ ebnetd-1.0.dfsg.1/debian/ndtpd.postrm
@@ -0,0 +1,42 @@
+#!/bin/sh
+# postrm script for ebnetd
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * `remove'
+# * `purge'
+# * `upgrade'
+# * `failed-upgrade'
+# * `abort-install'
+# * `abort-install'
+# * `abort-upgrade'
+# * `disappear' overwrit>r>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+ # Remove from /etc/inetd.conf
+ if [ -x /usr/sbin/update-inetd ]; then
+ update-inetd --remove ndtp || true
+ fi
+
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- ebnetd-1.0.dfsg.1.orig/debian/rules
+++ ebnetd-1.0.dfsg.1/debian/rules
@@ -0,0 +1,126 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+# Include dpatch stuff.
+include /usr/share/dpatch/dpatch.make
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+config.status: configure
+ dh_testdir
+ # Add here commands to configure the package.
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" \
+ --libexecdir=\$${prefix}/share/info \
+ --localstatedir=/var/run --sysconfdir=/etc/ebnetd \
+ --with-eb-conf=/etc/eb.conf --with-logdir=/var/log
+
+
+build: patch build-stamp
+
+build-stamp: config.status
+ dh_testdir
+
+ # Add here commands to compile the package.
+ $(MAKE)
+ #docbook-to-man debian/ebnetd.sgml > ebnetd.1
+
+ touch $@
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ # Add here commands to clean up after the build process.
+ [ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+ rm -f doc/ebnetd.info doc-ja/ebnetd-ja.info
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/ebnetd.
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/ebnetd
+
+ # Install misc things to ebnetd-common
+ install -m 644 $(CURDIR)/debian/00ebnetd $(CURDIR)/debian/ebnetd-common/etc/ebnetd/book.d/00ebnetd
+ install -m 755 $(CURDIR)/debian/update-ebnetd.conf $(CURDIR)/debian/ebnetd-common/usr/sbin
+
+ # Remove dups from ebnetd
+ rm -rf $(CURDIR)/debian/ebnetd/etc $(CURDIR)/debian/ebnetd/usr/share/info
+ rm -rf $(CURDIR)/debian/ebnetd/var/run
+ rm -rf $(CURDIR)/debian/ebnetd-common/var/run
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_installexamples --package=ebnetd-common ebnetd.conf.sample
+ dh_install --sourcedir=debian/ebnetd
+ # I'm not sure why dh_install doesn't remove these files...
+ rm debian/ebnetd/usr/sbin/ndtp* debian/ebnetd/usr/sbin/ebht*
+ rm debian/ebnetd/usr/sbin/ebndaily debian/ebnetd/usr/sbin/ebnupgrade
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_python
+ dh_installinit
+# dh_installcron
+ dh_installinfo
+ dh_installman -pebnetd debian/manpages/ebncheck.8 debian/manpages/ebncontrol.8 debian/manpages/ebnetd.8
+ dh_installman -pebnetd-common debian/manpages/ebndaily.8 debian/manpages/ebnupgrade.8 debian/manpages/update-ebnetd.conf.8
+ dh_installman -pebhttpd debian/manpages/ebhtcheck.8 debian/manpages/ebhtcontrol.8 debian/manpages/ebhttpd.8
+ dh_installman -pndtpd debian/manpages/ndtpcheck.8 debian/manpages/ndtpcontrol.8 debian/manpages/ndtpd.8
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_perl
+# dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- ebnetd-1.0.dfsg.1.orig/debian/ebnetd-common.dirs
+++ ebnetd-1.0.dfsg.1/debian/ebnetd-common.dirs
@@ -0,0 +1,2 @@
+usr/sbin
+etc/ebnetd/book.d
--- ebnetd-1.0.dfsg.1.orig/debian/manpages/ebhtcheck.8
+++ ebnetd-1.0.dfsg.1/debian/manpages/ebhtcheck.8
@@ -0,0 +1,42 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH EBHTCHECK "1" "October 2006" "ebhtcheck (EBNETD) version 1.0" "User Commands"
+.SH NAME
+ebhtcheck \- a lint for ebhttpd configuration
+.SH SYNOPSIS
+.B ebhtcheck
+[\fIoption\fR...]
+.SH OPTIONS
+.TP
+\fB\-c\fR FILE \fB\-\-configuration\-file\fR FILE
+specify a configuration file
+(default: /etc/ebnetd/ebnetd.conf)
+.TP
+\fB\-d\fR \fB\-\-debug\fR \fB\-\-verbose\fR
+degug mode
+.TP
+\fB\-h\fR \fB\-\-help\fR
+display this help, then exit
+.TP
+\fB\-v\fR \fB\-\-version\fR
+display version number, then exit
+.SS "Default value used in a configuration file:"
+.TP
+work\-path
+/var/run/ebnetd/ebnetd
+.SH "REPORTING BUGS"
+Report bugs to m\-kasahr@sra.co.jp.
+.SH COPYRIGHT
+Copyright \(co 1997 - 2003
+ Motoyuki Kasahara
+.SH "SEE ALSO"
+The full documentation for
+.B ebhtcheck
+is maintained as a Texinfo manual. If the
+.B info
+and
+.B ebhtcheck
+programs are properly installed at your site, the command
+.IP
+.B info ebhtcheck
+.PP
+should give you access to the complete manual.
--- ebnetd-1.0.dfsg.1.orig/debian/manpages/ebncontrol.8
+++ ebnetd-1.0.dfsg.1/debian/manpages/ebncontrol.8
@@ -0,0 +1,52 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH EBNCONTROL "1" "October 2006" "ebncontrol (EBNETD) version 1.0" "User Commands"
+.SH NAME
+ebncontrol \- a controller for ebnetd
+.SH SYNOPSIS
+.B ebncontrol
+[\fIoption\fR...] \fIsub-command\fR
+.SH OPTIONS
+.TP
+\fB\-c\fR FILE \fB\-\-configuration\-file\fR FILE
+specify a configuration file
+(default: /etc/ebnetd/ebnetd.conf)
+.TP
+\fB\-h\fR \fB\-\-help\fR
+display this help, then exit
+.TP
+\fB\-v\fR \fB\-\-version\fR
+display version number, then exit
+.SS "Sub-commands:"
+.TP
+kill
+kill ndtpd (send SIGKILL)
+.TP
+restart
+restart ndtpd (send SIGHUP)
+.TP
+status
+output status of ndtpd
+.TP
+terminate
+terminate ndtpd (send SIGTERM)
+.SS "Default value used in a configuration file:"
+.TP
+work\-path
+/var/run/ebnetd/ebnetd
+.SH "REPORTING BUGS"
+Report bugs to m\-kasahr@sra.co.jp.
+.SH COPYRIGHT
+Copyright \(co 1997 - 2003
+ Motoyuki Kasahara
+.SH "SEE ALSO"
+The full documentation for
+.B ebncontrol
+is maintained as a Texinfo manual. If the
+.B info
+and
+.B ebncontrol
+programs are properly installed at your site, the command
+.IP
+.B info ebncontrol
+.PP
+should give you access to the complete manual.
--- ebnetd-1.0.dfsg.1.orig/debian/manpages/ebhtcontrol.8
+++ ebnetd-1.0.dfsg.1/debian/manpages/ebhtcontrol.8
@@ -0,0 +1,52 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH EBHTCONTROL "1" "October 2006" "ebhtcontrol (EBNETD) version 1.0" "User Commands"
+.SH NAME
+ebhtcontrol \- a controller for ebhttpd
+.SH SYNOPSIS
+.B ebhtcontrol
+[\fIoption\fR...] \fIsub-command\fR
+.SH OPTIONS
+.TP
+\fB\-c\fR FILE \fB\-\-configuration\-file\fR FILE
+specify a configuration file
+(default: /etc/ebnetd/ebnetd.conf)
+.TP
+\fB\-h\fR \fB\-\-help\fR
+display this help, then exit
+.TP
+\fB\-v\fR \fB\-\-version\fR
+display version number, then exit
+.SS "Sub-commands:"
+.TP
+kill
+kill ndtpd (send SIGKILL)
+.TP
+restart
+restart ndtpd (send SIGHUP)
+.TP
+status
+output status of ndtpd
+.TP
+terminate
+terminate ndtpd (send SIGTERM)
+.SS "Default value used in a configuration file:"
+.TP
+work\-path
+/var/run/ebnetd/ebnetd
+.SH "REPORTING BUGS"
+Report bugs to m\-kasahr@sra.co.jp.
+.SH COPYRIGHT
+Copyright \(co 1997 - 2003
+ Motoyuki Kasahara
+.SH "SEE ALSO"
+The full documentation for
+.B ebhtcontrol
+is maintained as a Texinfo manual. If the
+.B info
+and
+.B ebhtcontrol
+programs are properly installed at your site, the command
+.IP
+.B info ebhtcontrol
+.PP
+should give you access to the complete manual.
--- ebnetd-1.0.dfsg.1.orig/debian/manpages/update-ebnetd.conf.8
+++ ebnetd-1.0.dfsg.1/debian/manpages/update-ebnetd.conf.8
@@ -0,0 +1,12 @@
+.TH UPDATE-EBNETD.CONF "1" "October 2006" "update-ebnetd.conf (EBNETD) version 1.0" "User Commands"
+.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.SH NAME
+update-ebnetd.conf \- reads /etc/ebnetd/book.d/* and generates /etc/ebnetd.conf
+.SH SYNOPSIS
+.B update-ebnetd.conf
+.SH "DESCRIPTION"
+.BR update-ebnetd.conf
+reads /etc/ebnetd/book.d/* and generates /etc/ebnetd.conf.
+.SH AUTHOR
+Masayuki Hatta
--- ebnetd-1.0.dfsg.1.orig/debian/manpages/ebnupgrade.8
+++ ebnetd-1.0.dfsg.1/debian/manpages/ebnupgrade.8
@@ -0,0 +1,45 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH EBNUPGRADE "1" "October 2006" "ebnupgrade (EBNETD) version 1.0" "User Commands"
+.SH NAME
+ebnupgrade \- smooths transition from old ndtpd
+.SH SYNOPSIS
+.B ebnupgrade
+[\fIoption\fR...]
+.SH OPTIONS
+.TP
+\fB\-c\fR FILE \fB\-\-configuration\-file\fR FILE
+input old configuration from FILE
+(default: /etc/ebnetd/ebnetd.conf)
+.TP
+\fB\-h\fR \fB\-\-help\fR
+display this help, then exit
+.TP
+\fB\-o\fR FILE \fB\-\-output\-file\fR FILE
+output new configuration to FILE
+(default: /etc/ebnetd/ebnetd.conf.new)
+.TP
+\fB\-q\fR \fB\-\-quiet\fR \fB\-\-silence\fR
+suppress report messages
+.TP
+\fB\-t\fR \fB\-\-test\fR
+only check for input file
+.TP
+\fB\-v\fR \fB\-\-version\fR
+display version number, then exit
+.SH "REPORTING BUGS"
+Report bugs to m\-kasahr@sra.co.jp.
+.SH COPYRIGHT
+Copyright \(co 2000 - 2003
+ Motoyuki Kasahara
+.SH "SEE ALSO"
+The full documentation for
+.B ebnupgrade
+is maintained as a Texinfo manual. If the
+.B info
+and
+.B ebnupgrade
+programs are properly installed at your site, the command
+.IP
+.B info ebnupgrade
+.PP
+should give you access to the complete manual.
--- ebnetd-1.0.dfsg.1.orig/debian/manpages/ebnetd.8
+++ ebnetd-1.0.dfsg.1/debian/manpages/ebnetd.8
@@ -0,0 +1,49 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH EBNETD "1" "October 2006" "ebnetd (EBNETD) version 1.0" "User Commands"
+.SH NAME
+ebnetd \- the EBNET server
+.SH SYNOPSIS
+.B ebnetd
+[\fIoption\fR...]
+.SH OPTIONS
+.TP
+\fB\-c\fR FILE \fB\-\-configuration\-file\fR FILE
+specify a configuration file
+(default: /etc/ebnetd/ebnetd.conf)
+.TP
+\fB\-h\fR \fB\-\-help\fR
+display this help, then exit
+.TP
+\fB\-i\fR \fB\-\-inetd\fR
+inetd mode
+.TP
+\fB\-t\fR \fB\-\-test\fR
+test mode
+.TP
+\fB\-v\fR \fB\-\-version\fR
+display version number, then exit
+.SS "Default value used in a configuration file:"
+.TP
+work\-path
+/var/run/ebnetd/ebnetd
+.SS "Optional feature:"
+.TP
+IPv6 support
+enabled
+.SH "REPORTING BUGS"
+Report bugs to m\-kasahr@sra.co.jp.
+.SH COPYRIGHT
+Copyright \(co 1997 - 2003
+ Motoyuki Kasahara
+.SH "SEE ALSO"
+The full documentation for
+.B ebnetd
+is maintained as a Texinfo manual. If the
+.B info
+and
+.B ebnetd
+programs are properly installed at your site, the command
+.IP
+.B info ebnetd
+.PP
+should give you access to the complete manual.
--- ebnetd-1.0.dfsg.1.orig/debian/manpages/ebhttpd.8
+++ ebnetd-1.0.dfsg.1/debian/manpages/ebhttpd.8
@@ -0,0 +1,49 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH EBHTTPD "1" "October 2006" "ebhttpd (EBNETD) version 1.0" "User Commands"
+.SH NAME
+ebhttpd \- a specialized HTTP server for CD-ROM books
+.SH SYNOPSIS
+.B ebhttpd
+[\fIoption\fR...]
+.SH OPTIONS
+.TP
+\fB\-c\fR FILE \fB\-\-configuration\-file\fR FILE
+specify a configuration file
+(default: /etc/ebnetd/ebnetd.conf)
+.TP
+\fB\-h\fR \fB\-\-help\fR
+display this help, then exit
+.TP
+\fB\-i\fR \fB\-\-inetd\fR
+inetd mode
+.TP
+\fB\-t\fR \fB\-\-test\fR
+test mode
+.TP
+\fB\-v\fR \fB\-\-version\fR
+display version number, then exit
+.SS "Default value used in a configuration file:"
+.TP
+work\-path
+/var/run/ebnetd/ebnetd
+.SS "Optional feature:"
+.TP
+IPv6 support
+enabled
+.SH "REPORTING BUGS"
+Report bugs to m\-kasahr@sra.co.jp.
+.SH COPYRIGHT
+Copyright \(co 1997 - 2003
+ Motoyuki Kasahara
+.SH "SEE ALSO"
+The full documentation for
+.B ebhttpd
+is maintained as a Texinfo manual. If the
+.B info
+and
+.B ebhttpd
+programs are properly installed at your site, the command
+.IP
+.B info ebhttpd
+.PP
+should give you access to the complete manual.
--- ebnetd-1.0.dfsg.1.orig/debian/manpages/ndtpcontrol.8
+++ ebnetd-1.0.dfsg.1/debian/manpages/ndtpcontrol.8
@@ -0,0 +1,52 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH NDTPCONTORL "1" "October 2006" "ndtpcontorl (EBNETD) version 1.0" "User Commands"
+.SH NAME
+ndtpcontorl \- a controller for ndtpd
+.SH SYNOPSIS
+.B ndtpcontorl
+[\fIoption\fR...] \fIsub-command\fR
+.SH OPTIONS
+.TP
+\fB\-c\fR FILE \fB\-\-configuration\-file\fR FILE
+specify a configuration file
+(default: /etc/ebnetd/ebnetd.conf)
+.TP
+\fB\-h\fR \fB\-\-help\fR
+display this help, then exit
+.TP
+\fB\-v\fR \fB\-\-version\fR
+display version number, then exit
+.SS "Sub-commands:"
+.TP
+kill
+kill ndtpd (send SIGKILL)
+.TP
+restart
+restart ndtpd (send SIGHUP)
+.TP
+status
+output status of ndtpd
+.TP
+terminate
+terminate ndtpd (send SIGTERM)
+.SS "Default value used in a configuration file:"
+.TP
+work\-path
+/var/run/ebnetd/ebnetd
+.SH "REPORTING BUGS"
+Report bugs to m\-kasahr@sra.co.jp.
+.SH COPYRIGHT
+Copyright \(co 1997 - 2003
+ Motoyuki Kasahara
+.SH "SEE ALSO"
+The full documentation for
+.B ndtpcontorl
+is maintained as a Texinfo manual. If the
+.B info
+and
+.B ndtpcontorl
+programs are properly installed at your site, the command
+.IP
+.B info ndtpcontorl
+.PP
+should give you access to the complete manual.
--- ebnetd-1.0.dfsg.1.orig/debian/manpages/ndtpd.8
+++ ebnetd-1.0.dfsg.1/debian/manpages/ndtpd.8
@@ -0,0 +1,49 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH NDTPD "1" "October 2006" "ndtpd (EBNETD) version 1.0" "User Commands"
+.SH NAME
+ndtpd \- the Network Dictionary Transfer Protocol server
+.SH SYNOPSIS
+.B ndtpd
+[\fIoption\fR...]
+.SH OPTIONS
+.TP
+\fB\-c\fR FILE \fB\-\-configuration\-file\fR FILE
+specify a configuration file
+(default: /etc/ebnetd/ebnetd.conf)
+.TP
+\fB\-h\fR \fB\-\-help\fR
+display this help, then exit
+.TP
+\fB\-i\fR \fB\-\-inetd\fR
+inetd mode
+.TP
+\fB\-t\fR \fB\-\-test\fR
+test mode
+.TP
+\fB\-v\fR \fB\-\-version\fR
+display version number, then exit
+.SS "Default value used in a configuration file:"
+.TP
+work\-path
+/var/run/ebnetd/ebnetd
+.SS "Optional feature:"
+.TP
+IPv6 support
+enabled
+.SH "REPORTING BUGS"
+Report bugs to m\-kasahr@sra.co.jp.
+.SH COPYRIGHT
+Copyright \(co 1997 - 2003
+ Motoyuki Kasahara
+.SH "SEE ALSO"
+The full documentation for
+.B ndtpd
+is maintained as a Texinfo manual. If the
+.B info
+and
+.B ndtpd
+programs are properly installed at your site, the command
+.IP
+.B info ndtpd
+.PP
+should give you access to the complete manual.
--- ebnetd-1.0.dfsg.1.orig/debian/manpages/ebncheck.8
+++ ebnetd-1.0.dfsg.1/debian/manpages/ebncheck.8
@@ -0,0 +1,42 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH EBNCHECK "1" "October 2006" "ebncheck (EBNETD) version 1.0" "User Commands"
+.SH NAME
+ebncheck \- a lint for ebnetd configuration
+.SH SYNOPSIS
+.B ebncheck
+[\fIoption\fR...]
+.SH OPTIONS
+.TP
+\fB\-c\fR FILE \fB\-\-configuration\-file\fR FILE
+specify a configuration file
+(default: /etc/ebnetd/ebnetd.conf)
+.TP
+\fB\-d\fR \fB\-\-debug\fR \fB\-\-verbose\fR
+degug mode
+.TP
+\fB\-h\fR \fB\-\-help\fR
+display this help, then exit
+.TP
+\fB\-v\fR \fB\-\-version\fR
+display version number, then exit
+.SS "Default value used in a configuration file:"
+.TP
+work\-path
+/var/run/ebnetd/ebnetd
+.SH "REPORTING BUGS"
+Report bugs to m\-kasahr@sra.co.jp.
+.SH COPYRIGHT
+Copyright \(co 1997 - 2003
+ Motoyuki Kasahara
+.SH "SEE ALSO"
+The full documentation for
+.B ebncheck
+is maintained as a Texinfo manual. If the
+.B info
+and
+.B ebncheck
+programs are properly installed at your site, the command
+.IP
+.B info ebncheck
+.PP
+should give you access to the complete manual.
--- ebnetd-1.0.dfsg.1.orig/debian/manpages/ebndaily.8
+++ ebnetd-1.0.dfsg.1/debian/manpages/ebndaily.8
@@ -0,0 +1,56 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH EBNDAILY "1" "October 2006" "ebndaily (EBNETD) version 1.0" "User Commands"
+.SH NAME
+ebndaily \- get stats for ebnetd and send it to admins
+.SH SYNOPSIS
+.B ebndaily
+[\fIoption\fR...] \fImail-address\fR...
+.SH OPTIONS
+.TP
+\fB\-a\fR INTEGER \fB\-\-ages\fR INTEGER
+keep INTEGER ages of old syslog files
+(default: 7)
+.TP
+\fB\-c\fR TYPE \fB\-\-compressor\fR TYPE
+how to compress old syslog files; compress, gzip,
+bzip2 or none (default: none)
+.TP
+\fB\-h\fR \fB\-\-help\fR
+display this help, then exit
+.TP
+\fB\-l\fR FILE \fB\-\-log\-file\fR FILE
+specify a syslog file
+(default: /var/log/ebnetd.log)
+.TP
+\fB\-n\fR \fB\-\-no\-mail\fR
+do not send report mail
+.TP
+\fB\-v\fR \fB\-\-version\fR
+display version number, then exit
+.TP
+\fB\-1\fR \fB\-\-fast\fR
+compress faster when using gzip or bzip2
+.TP
+\fB\-9\fR \fB\-\-best\fR
+compress better when using gzip or bzip2
+.SS "Arguemnts:"
+.TP
+mail\-address
+receipient of a report from ebndaily.
+.SH "REPORTING BUGS"
+Report bugs to m\-kasahr@sra.co.jp.
+.SH COPYRIGHT
+Copyright \(co 1997 - 2003
+ Motoyuki Kasahara
+.SH "SEE ALSO"
+The full documentation for
+.B ebndaily
+is maintained as a Texinfo manual. If the
+.B info
+and
+.B ebndaily
+programs are properly installed at your site, the command
+.IP
+.B info ebndaily
+.PP
+should give you access to the complete manual.
--- ebnetd-1.0.dfsg.1.orig/debian/manpages/ndtpcheck.8
+++ ebnetd-1.0.dfsg.1/debian/manpages/ndtpcheck.8
@@ -0,0 +1,42 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
+.TH NDTPCHECK "1" "October 2006" "ndtpcheck (EBNETD) version 1.0" "User Commands"
+.SH NAME
+ndtpcheck \- a lint for ndtpd configuration
+.SH SYNOPSIS
+.B ndtpcheck
+[\fIoption\fR...]
+.SH OPTIONS
+.TP
+\fB\-c\fR FILE \fB\-\-configuration\-file\fR FILE
+specify a configuration file
+(default: /etc/ebnetd/ebnetd.conf)
+.TP
+\fB\-d\fR \fB\-\-debug\fR \fB\-\-verbose\fR
+degug mode
+.TP
+\fB\-h\fR \fB\-\-help\fR
+display this help, then exit
+.TP
+\fB\-v\fR \fB\-\-version\fR
+display version number, then exit
+.SS "Default value used in a configuration file:"
+.TP
+work\-path
+/var/run/ebnetd/ebnetd
+.SH "REPORTING BUGS"
+Report bugs to m\-kasahr@sra.co.jp.
+.SH COPYRIGHT
+Copyright \(co 1997 - 2003
+ Motoyuki Kasahara
+.SH "SEE ALSO"
+The full documentation for
+.B ndtpcheck
+is maintained as a Texinfo manual. If the
+.B info
+and
+.B ndtpcheck
+programs are properly installed at your site, the command
+.IP
+.B info ndtpcheck
+.PP
+should give you access to the complete manual.
--- ebnetd-1.0.dfsg.1.orig/debian/patches/00list
+++ ebnetd-1.0.dfsg.1/debian/patches/00list
@@ -0,0 +1,2 @@
+01_suppress_verbose_debug_msg
+02_remove_dup_refs_in_info
--- ebnetd-1.0.dfsg.1.orig/debian/patches/02_remove_dup_refs_in_info.dpatch
+++ ebnetd-1.0.dfsg.1/debian/patches/02_remove_dup_refs_in_info.dpatch
@@ -0,0 +1,45 @@
+#! /bin/sh -e
+## 02_remove_dup_refs_in_info.dpatch by Masayuki Hatta
+##
+## All lines beginning with \`## DP:' are a description of the patch.
+## DP: Remove duplicate references in info.
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch) patch -f --no-backup-if-mismatch --dry-run -p1 < $0 && patch -f --no-backup-if-mismatch -p1 < $0
+;;
+ -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+diff -urN ebnetd-1.0.orig/doc/ebnetd.texi ebnetd-1.0/doc/ebnetd.texi
+--- ebnetd-1.0.orig/doc/ebnetd.texi 2003-09-03 20:26:39.000000000 +0900
++++ ebnetd-1.0/doc/ebnetd.texi 2006-10-08 13:01:01.000000000 +0900
+@@ -9,8 +9,6 @@
+ @dircategory CD-ROM Book Utilities
+ @direntry
+ * EBNETD: (ebnetd). Network EB Library server.
+-* NDTPD: (ndtpd). Server for accessing CD-ROM books with NDTP.
+-* ebHTTPD: (ebhttpd). Server for accessing CD-ROM books with HTTP.
+ @end direntry
+
+ @ifinfo
+diff -urN ebnetd-1.0.orig/doc-ja/ebnetd-ja.texi ebnetd-1.0/doc-ja/ebnetd-ja.texi
+--- ebnetd-1.0.orig/doc-ja/ebnetd-ja.texi 2003-09-03 20:26:39.000000000 +0900
++++ ebnetd-1.0/doc-ja/ebnetd-ja.texi 2006-10-08 13:01:10.000000000 +0900
+@@ -9,8 +9,6 @@
+ @dircategory CD-ROM Book Utilities
+ @direntry
+ * EBNETD: (ebnetd). Network EB Library server.
+-* NDTPD: (ndtpd). Server for accessing CD-ROM books with NDTP.
+-* ebHTTPD: (ebhttpd). Server for accessing CD-ROM books with HTTP.
+ @end direntry
+
+ @ifinfo
--- ebnetd-1.0.dfsg.1.orig/debian/patches/01_suppress_verbose_debug_msg.dpatch
+++ ebnetd-1.0.dfsg.1/debian/patches/01_suppress_verbose_debug_msg.dpatch
@@ -0,0 +1,46 @@
+#! /bin/sh -e
+## 01_suppress_verbose_debug_msg.dpatch by Masayuki Hatta
+##
+## All lines beginning with \`## DP:' are a description of the patch.
+## DP: Suppress verbose debug messages.
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch) patch -f --no-backup-if-mismatch --dry-run -p1 < $0 && patch -f --no-backup-if-mismatch -p1 < $0
+;;
+ -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+diff -urN ebnetd-1.0.orig/ebnetd/ebnetd.c ebnetd-1.0/ebnetd/ebnetd.c
+--- ebnetd-1.0.orig/ebnetd/ebnetd.c 2006-10-08 12:22:15.000000000 +0900
++++ ebnetd-1.0/ebnetd/ebnetd.c 2006-10-08 12:24:40.000000000 +0900
+@@ -228,7 +228,7 @@
+ */
+ set_fakelog_name(invoked_name);
+ set_fakelog_mode(FAKELOG_TO_SYSLOG);
+- set_fakelog_level(LOG_DEBUG);
++ set_fakelog_level(LOG_INFO);
+
+ /*
+ * Open syslog.
+diff -urN ebnetd-1.0.orig/lib/fakelog.c ebnetd-1.0/lib/fakelog.c
+--- ebnetd-1.0.orig/lib/fakelog.c 2006-10-08 12:22:15.000000000 +0900
++++ ebnetd-1.0/lib/fakelog.c 2006-10-08 12:24:18.000000000 +0900
+@@ -270,7 +270,8 @@
+ /*
+ * Output the message to syslog.
+ */
+- if (log_mode == FAKELOG_TO_SYSLOG || log_mode == FAKELOG_TO_BOTH) {
++ if ((log_mode == FAKELOG_TO_SYSLOG || log_mode == FAKELOG_TO_BOTH)
++ && log_flag ) {
+ #if (defined(HAVE_VPRINTF) || defined(HAVE_DOPRNT)) && defined(HAVE_VSYSLOG)
+ vsyslog(priority, message, ap);
+ #else /* not (defined(HAVE_VPRINTF) || ... */
--- ebnetd-1.0.dfsg.1.orig/doc/stamp-vti
+++ ebnetd-1.0.dfsg.1/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 3 September 2003
-@set UPDATED-MONTH September 2003
+@set UPDATED 14 July 2008
+@set UPDATED-MONTH July 2008
@set EDITION 1.0
@set VERSION 1.0
--- ebnetd-1.0.dfsg.1.orig/doc/version.texi
+++ ebnetd-1.0.dfsg.1/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 3 September 2003
-@set UPDATED-MONTH September 2003
+@set UPDATED 14 July 2008
+@set UPDATED-MONTH July 2008
@set EDITION 1.0
@set VERSION 1.0
--- ebnetd-1.0.dfsg.1.orig/doc-ja/stamp-vti
+++ ebnetd-1.0.dfsg.1/doc-ja/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 2003 ǯ 9
-@set UPDATED-MONTH ǯ 9
+@set UPDATED 2008 ǯ 7
+@set UPDATED-MONTH ǯ 7
@set EDITION 1.0
@set VERSION 1.0
--- ebnetd-1.0.dfsg.1.orig/doc-ja/version.texi
+++ ebnetd-1.0.dfsg.1/doc-ja/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 2003 ǯ 9
-@set UPDATED-MONTH ǯ 9
+@set UPDATED 2008 ǯ 7
+@set UPDATED-MONTH ǯ 7
@set EDITION 1.0
@set VERSION 1.0