View | Details | Raw Unified | Return to bug 22478 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-1431 / +8904 lines)
Line     Link Here 
0
-- bind9-9.7.3.dfsg.orig/configure.in
0
++ bind9-9.7.3.dfsg/configure.in
 Lines 681-686    Link Here 
681
esac
681
esac
682
682
683
#
683
#
684
# Check for GeoIP - if yes enable it
685
#
686
687
AC_MSG_CHECKING(for GeoIP library)
688
AC_ARG_WITH(geoip,
689
[  --with-geoip=PATH   Specify path for system-supplied GeoIP],
690
    use_geoip="$withval", use_geoip="no")
691
692
#geoipdirs="/usr/local /usr/pkg /usr/kerberos /usr"
693
#
694
#if test "$use_geoip" = "yes"
695
#then
696
#	for d in $geoipdirs
697
#	do
698
#		if test -f $d/include/include/GeoIP.h -o -f $d/include/GeoIP.h
699
#		then
700
#			use_geoip=$d
701
#			break
702
#		fi
703
#	done
704
#fi
705
706
AC_DEFINE([GEOIP_V6], [1], [Defined if GeoIP supports IPv6 lookups])
707
case "$use_geoip" in
708
	no)
709
		AC_MSG_RESULT(disabled)
710
		USE_GEOIP=''
711
		;;
712
#	yes)
713
#		AC_MSG_ERROR([--with-geoip must specify a path])
714
#		;;
715
	*)
716
		AC_CHECK_HEADER(GeoIP.h,,
717
					[AC_MSG_ERROR([GeoIP library header files not found])]
718
				)
719
		AC_CHECK_LIB(GeoIP, GeoIP_open,
720
			[
721
				AC_DEFINE(SUPPORT_GEOIP, 1, Define if you want GeoIP support.)
722
			],
723
			[
724
				AC_MSG_ERROR([GeoIP library header files were found but the library was not found])
725
			])
726
		GEOIP_LIBS="-lGeoIP"
727
                AC_MSG_CHECKING(for for GeoIP IPv6 support)
728
                AC_TRY_COMPILE([
729
#include <GeoIP.h>
730
#include <netinet/in.h>
731
],
732
[
733
734
extern const struct in6_addr in6addr_loopback;
735
static GeoIP *geoip = NULL;
736
737
const char* value = value = GeoIP_country_name_by_ipnum_v6(geoip, (geoipv6_t)in6addr_loopback);
738
739
]
740
,
741
	[AC_MSG_RESULT(yes)
742
		GEOIP_V6="#define GEOIP_V6 1"],
743
	[AC_MSG_RESULT(no)
744
		GEOIP_V6="#undef GEOIP_V6"])
745
AC_DEFINE(GEOIP_V6)
746
		;;
747
esac
748
749
AC_SUBST(GEOIP_LIBS)
750
751
#
684
# This would include the system openssl path (and linker options to use
752
# This would include the system openssl path (and linker options to use
685
# it as needed) if it is found.
753
# it as needed) if it is found.
686
#
754
#
 Lines 1053-1059    Link Here 
1053
		# LinuxThreads requires some changes to the way we
1121
		# LinuxThreads requires some changes to the way we
1054
		# deal with signals.
1122
		# deal with signals.
1055
		#
1123
		#
1056
		*-linux*)
1124
		*-linux*|*-kfreebsd*-gnu)
1057
			AC_DEFINE(HAVE_LINUXTHREADS)
1125
			AC_DEFINE(HAVE_LINUXTHREADS)
1058
			;;
1126
			;;
1059
		#
1127
		#
1060
-- bind9-9.7.3.dfsg.orig/lib/isccfg/aclconf.c
1128
++ bind9-9.7.3.dfsg/lib/isccfg/aclconf.c
 Lines 218-223    Link Here 
218
		} else if (cfg_obj_isstring(ce)) {
218
		} else if (cfg_obj_isstring(ce)) {
219
			const char *name = cfg_obj_asstring(ce);
219
			const char *name = cfg_obj_asstring(ce);
220
			if (strcasecmp(name, "localhost") == 0 ||
220
			if (strcasecmp(name, "localhost") == 0 ||
221
#ifdef SUPPORT_GEOIP
222
			    strncasecmp(name, "country_", 8) == 0 ||
223
#endif
221
			    strcasecmp(name, "localnets") == 0) {
224
			    strcasecmp(name, "localnets") == 0) {
222
				n++;
225
				n++;
223
			} else if (strcasecmp(name, "any") != 0 &&
226
			} else if (strcasecmp(name, "any") != 0 &&
 Lines 412-417    Link Here 
412
					de->negative = !neg;
415
					de->negative = !neg;
413
				} else
416
				} else
414
					continue;
417
					continue;
418
#ifdef SUPPORT_GEOIP
419
			} else if ((0 == (strncmp("country_", name, 8))) && (10 == strlen(name))) {
420
				/* It is a country code */
421
				de->type = dns_aclelementtype_ipcountry;
422
				de->country[0] = name[8];
423
				de->country[1] = name[9];
424
				de->country[2] = '\0';
425
#endif
415
			} else if (strcasecmp(name, "localhost") == 0) {
426
			} else if (strcasecmp(name, "localhost") == 0) {
416
				de->type = dns_aclelementtype_localhost;
427
				de->type = dns_aclelementtype_localhost;
417
				de->negative = neg;
428
				de->negative = neg;
418
-- bind9-9.7.3.dfsg.orig/lib/isccfg/namedconf.c
429
++ bind9-9.7.3.dfsg/lib/isccfg/namedconf.c
 Lines 1033-1038    Link Here 
1033
	{ "max-clients-per-query", &cfg_type_uint32, 0 },
1033
	{ "max-clients-per-query", &cfg_type_uint32, 0 },
1034
	{ "max-ncache-ttl", &cfg_type_uint32, 0 },
1034
	{ "max-ncache-ttl", &cfg_type_uint32, 0 },
1035
	{ "max-udp-size", &cfg_type_uint32, 0 },
1035
	{ "max-udp-size", &cfg_type_uint32, 0 },
1036
	{ "min-cache-ttl", &cfg_type_uint32, 0 },
1037
	{ "min-ncache-ttl", &cfg_type_uint32, 0 },
1036
	{ "min-roots", &cfg_type_uint32, CFG_CLAUSEFLAG_NOTIMP },
1038
	{ "min-roots", &cfg_type_uint32, CFG_CLAUSEFLAG_NOTIMP },
1037
	{ "minimal-responses", &cfg_type_boolean, 0 },
1039
	{ "minimal-responses", &cfg_type_boolean, 0 },
1038
	{ "preferred-glue", &cfg_type_astring, 0 },
1040
	{ "preferred-glue", &cfg_type_astring, 0 },
1039
-- bind9-9.7.3.dfsg.orig/lib/isccfg/Makefile.in
1041
++ bind9-9.7.3.dfsg/lib/isccfg/Makefile.in
 Lines 38-44    Link Here 
38
ISCDEPLIBS =	../../lib/isc/libisc.@A@
38
ISCDEPLIBS =	../../lib/isc/libisc.@A@
39
ISCCFGDEPLIBS =	libisccfg.@A@
39
ISCCFGDEPLIBS =	libisccfg.@A@
40
40
41
LIBS =		@LIBS@
41
LIBS =		@LIBS@ -L../dns -L../isc -L../isccc
42
42
43
SUBDIRS =	include
43
SUBDIRS =	include
44
44
45
-- bind9-9.7.3.dfsg.orig/lib/bind9/check.c
45
++ bind9-9.7.3.dfsg/lib/bind9/check.c
 Lines 131-136    Link Here 
131
			    "compilation time");
131
			    "compilation time");
132
#endif
132
#endif
133
	} else if (strcasecmp(cfg_obj_asstring(obj), "random") != 0 &&
133
	} else if (strcasecmp(cfg_obj_asstring(obj), "random") != 0 &&
134
		   strcasecmp(cfg_obj_asstring(obj), "random_1") != 0 &&
134
		   strcasecmp(cfg_obj_asstring(obj), "cyclic") != 0) {
135
		   strcasecmp(cfg_obj_asstring(obj), "cyclic") != 0) {
135
		cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
136
		cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
136
			    "rrset-order: invalid order '%s'",
137
			    "rrset-order: invalid order '%s'",
137
-- bind9-9.7.3.dfsg.orig/lib/isccc/Makefile.in
138
++ bind9-9.7.3.dfsg/lib/isccc/Makefile.in
 Lines 36-42    Link Here 
36
ISCDEPLIBS =	../../lib/isc/libisc.@A@
36
ISCDEPLIBS =	../../lib/isc/libisc.@A@
37
ISCCCDEPLIBS =	libisccc.@A@
37
ISCCCDEPLIBS =	libisccc.@A@
38
38
39
LIBS =		@LIBS@
39
LIBS =		@LIBS@ -L../../lib/isc
40
40
41
SUBDIRS =	include
41
SUBDIRS =	include
42
42
 Lines 72-77    Link Here 
72
		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisccc.la -rpath ${libdir} \
72
		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisccc.la -rpath ${libdir} \
73
		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
73
		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
74
	ln -sf .libs/libisccc.so .
74
75
75
timestamp: libisccc.@A@
76
timestamp: libisccc.@A@
76
	touch timestamp
77
	touch timestamp
 Lines 83-86    Link Here 
83
	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccc.@A@ ${DESTDIR}${libdir}
84
	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccc.@A@ ${DESTDIR}${libdir}
84
85
85
clean distclean::
86
clean distclean::
86
	rm -f libisccc.@A@ timestamp
87
	rm -f libisccc.@A@ timestamp libisccc.so 
87
-- bind9-9.7.3.dfsg.orig/lib/isc/Makefile.in
88
++ bind9-9.7.3.dfsg/lib/isc/Makefile.in
 Lines 118-123    Link Here 
118
		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-nosymtbl.la -rpath ${libdir} \
118
		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-nosymtbl.la -rpath ${libdir} \
119
		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
119
		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
120
		${OBJS} ${LIBS}
120
		${OBJS} ${LIBS}
121
	ln -sf .libs/libisc.so .
121
122
122
timestamp: libisc.@A@ libisc-nosymtbl.@A@
123
timestamp: libisc.@A@ libisc-nosymtbl.@A@
123
	touch timestamp
124
	touch timestamp
 Lines 130-133    Link Here 
130
131
131
clean distclean::
132
clean distclean::
132
	rm -f libisc.@A@ libisc-nosymtbl.@A@ libisc.la \
133
	rm -f libisc.@A@ libisc-nosymtbl.@A@ libisc.la \
133
	libisc-nosymtbl.la timestamp
134
	libisc-nosymtbl.la timestamp libisc.so
134
-- bind9-9.7.3.dfsg.orig/lib/isc/unix/resource.c
135
++ bind9-9.7.3.dfsg/lib/isc/unix/resource.c
 Lines 29-34    Link Here 
29
#include <isc/util.h>
29
#include <isc/util.h>
30
30
31
#ifdef __linux__
31
#ifdef __linux__
32
#include <inttypes.h>
32
#include <linux/fs.h>	/* To get the large NR_OPEN. */
33
#include <linux/fs.h>	/* To get the large NR_OPEN. */
33
#endif
34
#endif
34
35
35
-- bind9-9.7.3.dfsg.orig/lib/isc/ia64/include/isc/atomic.h
36
++ bind9-9.7.3.dfsg/lib/isc/ia64/include/isc/atomic.h
 Lines 42-47    Link Here 
42
		swapped = prev + val;
42
		swapped = prev + val;
43
		__asm__ volatile(
43
		__asm__ volatile(
44
			"mov ar.ccv=%2;"
44
			"mov ar.ccv=%2;"
45
			";;"
45
			"cmpxchg4.acq %0=%4,%3,ar.ccv"
46
			"cmpxchg4.acq %0=%4,%3,ar.ccv"
46
			: "=r" (swapped), "=m" (*p)
47
			: "=r" (swapped), "=m" (*p)
47
			: "r" (prev), "r" (swapped), "m" (*p)
48
			: "r" (prev), "r" (swapped), "m" (*p)
48
-- bind9-9.7.3.dfsg.orig/lib/isc/mips/include/isc/atomic.h
49
++ bind9-9.7.3.dfsg/lib/isc/mips/include/isc/atomic.h
 Lines 31-48    Link Here 
31
isc_atomic_xadd(isc_int32_t *p, int val) {
31
isc_atomic_xadd(isc_int32_t *p, int val) {
32
	isc_int32_t orig;
32
	isc_int32_t orig;
33
33
34
	/* add is a cheat, since MIPS has no mov instruction */
34
	__asm__ __volatile__ (
35
	__asm__ volatile (
35
	"	.set	push		\n"
36
	    "1:"
36
	"	.set	mips2		\n"
37
	    "ll $3, %1\n"
37
	"	.set	noreorder	\n"
38
	    "add %0, $0, $3\n"
38
	"	.set	noat		\n"
39
	    "add $3, $3, %2\n"
39
	"1:	ll	$1, %1		\n"
40
	    "sc $3, %1\n"
40
	"	addu	%0, $1, %2	\n"
41
	    "beq $3, 0, 1b"
41
	"	sc	%0, %1		\n"
42
	    : "=&r"(orig)
42
	"	beqz	%0, 1b		\n"
43
	    : "m"(*p), "r"(val)
43
	"	move	%0, $1		\n"
44
	    : "memory", "$3"
44
	"	.set	pop		\n"
45
		);
45
	: "=&r" (orig), "+R" (*p)
46
	: "r" (val)
47
	: "memory");
46
48
47
	return (orig);
49
	return (orig);
48
}
50
}
 Lines 52-67    Link Here 
52
 */
54
 */
53
static inline void
55
static inline void
54
isc_atomic_store(isc_int32_t *p, isc_int32_t val) {
56
isc_atomic_store(isc_int32_t *p, isc_int32_t val) {
55
	__asm__ volatile (
57
	*p = val;
56
	    "1:"
57
	    "ll $3, %0\n"
58
	    "add $3, $0, %1\n"
59
	    "sc $3, %0\n"
60
	    "beq $3, 0, 1b"
61
	    :
62
	    : "m"(*p), "r"(val)
63
	    : "memory", "$3"
64
		);
65
}
58
}
66
59
67
/*
60
/*
 Lines 72-91    Link Here 
72
static inline isc_int32_t
65
static inline isc_int32_t
73
isc_atomic_cmpxchg(isc_int32_t *p, int cmpval, int val) {
66
isc_atomic_cmpxchg(isc_int32_t *p, int cmpval, int val) {
74
	isc_int32_t orig;
67
	isc_int32_t orig;
68
	isc_int32_t tmp;
75
69
76
	__asm__ volatile(
70
	__asm__ __volatile__ (
77
	    "1:"
71
	"	.set	push		\n"
78
	    "ll $3, %1\n"
72
	"	.set	mips2		\n"
79
	    "add %0, $0, $3\n"
73
	"	.set	noreorder	\n"
80
	    "bne $3, %2, 2f\n"
74
	"	.set	noat		\n"
81
	    "add $3, $0, %3\n"
75
	"1:	ll	$1, %1		\n"
82
	    "sc $3, %1\n"
76
	"	bne	$1, %3, 2f	\n"
83
	    "beq $3, 0, 1b\n"
77
	"	move	%2, %4		\n"
84
	    "2:"
78
	"	sc	%2, %1		\n"
85
	    : "=&r"(orig)
79
	"	beqz	%2, 1b		\n"
86
	    : "m"(*p), "r"(cmpval), "r"(val)
80
	"2:	move	%0, $1		\n"
87
	    : "memory", "$3"
81
	"	.set	pop		\n"
88
		);
82
	: "=&r"(orig), "+R" (*p), "=r" (tmp)
83
	: "r"(cmpval), "r"(val)
84
	: "memory");
89
85
90
	return (orig);
86
	return (orig);
91
}
87
}
92
-- bind9-9.7.3.dfsg.orig/lib/isc/alpha/include/isc/atomic.h
88
++ bind9-9.7.3.dfsg/lib/isc/alpha/include/isc/atomic.h
 Lines 123-128    Link Here 
123
	__asm__ volatile(
123
	__asm__ volatile(
124
		"mb;"
124
		"mb;"
125
		"1:"
125
		"1:"
126
		"mb;"
126
		"ldl_l %0, %1;"			/* load old value */
127
		"ldl_l %0, %1;"			/* load old value */
127
		"mov %0, %2;"			/* copy the old value */
128
		"mov %0, %2;"			/* copy the old value */
128
		"addl %0, %3, %0;"		/* calculate new value */
129
		"addl %0, %3, %0;"		/* calculate new value */
 Lines 143-148    Link Here 
143
	__asm__ volatile(
144
	__asm__ volatile(
144
		"mb;"
145
		"mb;"
145
		"1:"
146
		"1:"
147
		"mb;"
146
		"ldl_l %0, %1;"			/* load old value */
148
		"ldl_l %0, %1;"			/* load old value */
147
		"mov %2, %0;"			/* value to store */
149
		"mov %2, %0;"			/* value to store */
148
		"stl_c %0, %1;"			/* attempt to store */
150
		"stl_c %0, %1;"			/* attempt to store */
 Lines 160-165    Link Here 
160
	__asm__ volatile(
162
	__asm__ volatile(
161
		"mb;"
163
		"mb;"
162
		"1:"
164
		"1:"
165
		"mb;"
163
		"ldl_l %0, %1;"			/* load old value */
166
		"ldl_l %0, %1;"			/* load old value */
164
		"mov %0, %2;"			/* copy the old value */
167
		"mov %0, %2;"			/* copy the old value */
165
		"cmpeq %0, %3, %0;"		/* compare */
168
		"cmpeq %0, %3, %0;"		/* compare */
 Lines 167-172    Link Here 
167
		"mov %4, %0;"			/* value to store */
170
		"mov %4, %0;"			/* value to store */
168
		"stl_c %0, %1;"			/* attempt to store */
171
		"stl_c %0, %1;"			/* attempt to store */
169
		"beq %0, 1b;"			/* if it failed, spin */
172
		"beq %0, 1b;"			/* if it failed, spin */
173
		"mb;"
170
		"2:"
174
		"2:"
171
		"mb;"
175
		"mb;"
172
		: "=&r"(temp), "+m"(*p), "=&r"(prev)
176
		: "=&r"(temp), "+m"(*p), "=&r"(prev)
173
-- bind9-9.7.3.dfsg.orig/lib/dns/resolver.c
177
++ bind9-9.7.3.dfsg/lib/dns/resolver.c
 Lines 438-444    Link Here 
438
static isc_result_t ncache_adderesult(dns_message_t *message,
439
static isc_result_t ncache_adderesult(dns_message_t *message,
439
				      dns_db_t *cache, dns_dbnode_t *node,
440
				      dns_db_t *cache, dns_dbnode_t *node,
440
				      dns_rdatatype_t covers,
441
				      dns_rdatatype_t covers,
441
				      isc_stdtime_t now, dns_ttl_t maxttl,
442
				      isc_stdtime_t now,
443
				      dns_ttl_t minttl,
444
				      dns_ttl_t maxttl,
442
				      isc_boolean_t optout,
445
				      isc_boolean_t optout,
443
				      dns_rdataset_t *ardataset,
446
				      dns_rdataset_t *ardataset,
444
				      isc_result_t *eresultp);
447
				      isc_result_t *eresultp);
 Lines 4180-4186    Link Here 
4180
			ttl = 0;
4183
			ttl = 0;
4181
4184
4182
		result = ncache_adderesult(fctx->rmessage, fctx->cache, node,
4185
		result = ncache_adderesult(fctx->rmessage, fctx->cache, node,
4183
					   covers, now, ttl, vevent->optout,
4186
					   covers, now, fctx->res->view->minncachettl, ttl, vevent->optout,
4184
					   ardataset, &eresult);
4187
					   ardataset, &eresult);
4185
		if (result != ISC_R_SUCCESS)
4188
		if (result != ISC_R_SUCCESS)
4186
			goto noanswer_response;
4189
			goto noanswer_response;
 Lines 4468-4473    Link Here 
4468
		 */
4471
		 */
4469
		if (rdataset->ttl > res->view->maxcachettl)
4472
		if (rdataset->ttl > res->view->maxcachettl)
4470
			rdataset->ttl = res->view->maxcachettl;
4473
			rdataset->ttl = res->view->maxcachettl;
4474
		
4475
		/*
4476
		 * Enforce configured minimum cache TTL.
4477
		 */
4478
		if (rdataset->ttl < res->view->mincachettl)
4479
			rdataset->ttl = res->view->mincachettl;
4471
4480
4472
		/*
4481
		/*
4473
		 * If this RRset is in a secure domain, is in bailiwick,
4482
		 * If this RRset is in a secure domain, is in bailiwick,
 Lines 4761-4767    Link Here 
4761
 */
4770
 */
4762
static isc_result_t
4771
static isc_result_t
4763
ncache_adderesult(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
4772
ncache_adderesult(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
4764
		  dns_rdatatype_t covers, isc_stdtime_t now, dns_ttl_t maxttl,
4773
		  dns_rdatatype_t covers, isc_stdtime_t now, dns_ttl_t minttl, dns_ttl_t maxttl,
4765
		  isc_boolean_t optout, dns_rdataset_t *ardataset,
4774
		  isc_boolean_t optout, dns_rdataset_t *ardataset,
4766
		  isc_result_t *eresultp)
4775
		  isc_result_t *eresultp)
4767
{
4776
{
 Lines 4719-4725    Link Here 
4719
		ardataset = &rdataset;
4719
		ardataset = &rdataset;
4720
	}
4720
	}
4721
	result = dns_ncache_addoptout(message, cache, node, covers, now,
4721
	result = dns_ncache_addoptout(message, cache, node, covers, now,
4722
				     maxttl, optout, ardataset);
4722
				     minttl, maxttl, optout, ardataset);
4723
	if (result == DNS_R_UNCHANGED || result == ISC_R_SUCCESS) {
4723
	if (result == DNS_R_UNCHANGED || result == ISC_R_SUCCESS) {
4724
		/*
4724
		/*
4725
		 * If the cache now contains a negative entry and we
4725
		 * If the cache now contains a negative entry and we
 Lines 4938-4944    Link Here 
4938
		ttl = 0;
4947
		ttl = 0;
4939
4948
4940
	result = ncache_adderesult(fctx->rmessage, fctx->cache, node,
4949
	result = ncache_adderesult(fctx->rmessage, fctx->cache, node,
4941
				   covers, now, ttl, ISC_FALSE,
4950
				   covers, now, fctx->res->view->minncachettl, ttl, ISC_FALSE,
4942
				   ardataset, &eresult);
4951
				   ardataset, &eresult);
4943
	if (result != ISC_R_SUCCESS)
4952
	if (result != ISC_R_SUCCESS)
4944
		goto unlock;
4953
		goto unlock;
4945
-- bind9-9.7.3.dfsg.orig/lib/dns/order.c
4954
++ bind9-9.7.3.dfsg/lib/dns/order.c
 Lines 89-94    Link Here 
89
	REQUIRE(DNS_ORDER_VALID(order));
89
	REQUIRE(DNS_ORDER_VALID(order));
90
	REQUIRE(mode == DNS_RDATASETATTR_RANDOMIZE ||
90
	REQUIRE(mode == DNS_RDATASETATTR_RANDOMIZE ||
91
	        mode == DNS_RDATASETATTR_FIXEDORDER ||
91
	        mode == DNS_RDATASETATTR_FIXEDORDER ||
92
		mode == (DNS_RDATASETATTR_RANDOMIZE|DNS_RDATASETATTR_SINGLE) ||
92
		mode == 0 /* DNS_RDATASETATTR_CYCLIC */ );
93
		mode == 0 /* DNS_RDATASETATTR_CYCLIC */ );
93
94
94
	ent = isc_mem_get(order->mctx, sizeof(*ent));
95
	ent = isc_mem_get(order->mctx, sizeof(*ent));
95
-- bind9-9.7.3.dfsg.orig/lib/dns/rdataset.c
96
++ bind9-9.7.3.dfsg/lib/dns/rdataset.c
 Lines 276-281    Link Here 
276
#define MAX_SHUFFLE	32
296
#define MAX_SHUFFLE	32
277
#define WANT_FIXED(r)	(((r)->attributes & DNS_RDATASETATTR_FIXEDORDER) != 0)
297
#define WANT_FIXED(r)	(((r)->attributes & DNS_RDATASETATTR_FIXEDORDER) != 0)
278
#define WANT_RANDOM(r)	(((r)->attributes & DNS_RDATASETATTR_RANDOMIZE) != 0)
298
#define WANT_RANDOM(r)	(((r)->attributes & DNS_RDATASETATTR_RANDOMIZE) != 0)
299
#define WANT_SINGLE(r)	(((r)->attributes & DNS_RDATASETATTR_SINGLE) != 0)
279
300
280
struct towire_sort {
301
struct towire_sort {
281
	int key;
302
	int key;
 Lines 299-305    Link Here 
299
	dns_rdata_t rdata = DNS_RDATA_INIT;
320
	dns_rdata_t rdata = DNS_RDATA_INIT;
300
	isc_region_t r;
321
	isc_region_t r;
301
	isc_result_t result;
322
	isc_result_t result;
302
	unsigned int i, count, added, choice;
323
	unsigned int i, real_count, count, added, choice;
303
	isc_buffer_t savedbuffer, rdlen, rrbuffer;
324
	isc_buffer_t savedbuffer, rdlen, rrbuffer;
304
	unsigned int headlen;
325
	unsigned int headlen;
305
	isc_boolean_t question = ISC_FALSE;
326
	isc_boolean_t question = ISC_FALSE;
 Lines 342-347    Link Here 
342
		if (result != ISC_R_SUCCESS)
363
		if (result != ISC_R_SUCCESS)
343
			return (result);
364
			return (result);
344
	}
365
	}
366
	real_count = count;
345
367
346
	/*
368
	/*
347
	 * Do we want to shuffle this answer?
369
	 * Do we want to shuffle this answer?
 Lines 410-415    Link Here 
410
					sorted[i].key = 0; /* Unused */
432
					sorted[i].key = 0; /* Unused */
411
				sorted[i].rdata = &shuffled[i];
433
				sorted[i].rdata = &shuffled[i];
412
			}
434
			}
435
			if (count > 1 && WANT_SINGLE(rdataset)) {
436
				count = 1;
437
			}
413
		} else {
438
		} else {
414
			/*
439
			/*
415
			 * "Cyclic" order.
440
			 * "Cyclic" order.
 Lines 530-538    Link Here 
530
555
531
 cleanup:
556
 cleanup:
532
	if (sorted != NULL && sorted != sorted_fixed)
557
	if (sorted != NULL && sorted != sorted_fixed)
533
		isc_mem_put(cctx->mctx, sorted, count * sizeof(*sorted));
558
		isc_mem_put(cctx->mctx, sorted, real_count * sizeof(*sorted));
534
	if (shuffled != NULL && shuffled != shuffled_fixed)
559
	if (shuffled != NULL && shuffled != shuffled_fixed)
535
		isc_mem_put(cctx->mctx, shuffled, count * sizeof(*shuffled));
560
		isc_mem_put(cctx->mctx, shuffled, real_count * sizeof(*shuffled));
536
	return (result);
561
	return (result);
537
}
562
}
538
563
539
-- bind9-9.7.3.dfsg.orig/lib/dns/Makefile.in
564
++ bind9-9.7.3.dfsg/lib/dns/Makefile.in
 Lines 42-48    Link Here 
42
42
43
ISCDEPLIBS =	../../lib/isc/libisc.@A@
43
ISCDEPLIBS =	../../lib/isc/libisc.@A@
44
44
45
LIBS =		@LIBS@
45
LIBS =		@LIBS@ -L../../lib/isc -lcrypto @GEOIP_LIBS@
46
46
47
# Alphabetically
47
# Alphabetically
48
48
 Lines 125-130    Link Here 
125
		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la -rpath ${libdir} \
125
		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la -rpath ${libdir} \
126
		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
126
		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
127
		${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
127
		${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
128
	ln -sf .libs/libdns.so .
128
129
129
timestamp: libdns.@A@
130
timestamp: libdns.@A@
130
	touch timestamp
131
	touch timestamp
 Lines 139-144    Link Here 
139
	rm -f libdns.@A@ timestamp
140
	rm -f libdns.@A@ timestamp
140
	rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h
141
	rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h
141
	rm -f include/dns/rdatastruct.h
142
	rm -f include/dns/rdatastruct.h
143
	rm -f libdns.so
142
144
143
newrr::
145
newrr::
144
	rm -f code.h include/dns/enumtype.h include/dns/enumclass.h
146
	rm -f code.h include/dns/enumtype.h include/dns/enumclass.h
145
-- bind9-9.7.3.dfsg.orig/lib/dns/acl.c
147
++ bind9-9.7.3.dfsg/lib/dns/acl.c
 Lines 21-30    Link Here 
21
21
22
#include <config.h>
22
#include <config.h>
23
23
24
#ifdef SUPPORT_GEOIP
25
#include <GeoIP.h>
26
#endif
27
24
#include <isc/mem.h>
28
#include <isc/mem.h>
25
#include <isc/once.h>
29
#include <isc/once.h>
26
#include <isc/string.h>
30
#include <isc/string.h>
27
#include <isc/util.h>
31
#include <isc/util.h>
32
#include <dns/log.h>
28
33
29
#include <dns/acl.h>
34
#include <dns/acl.h>
30
#include <dns/iptable.h>
35
#include <dns/iptable.h>
 Lines 316-321    Link Here 
316
		dest->elements[nelem + i].node_num =
321
		dest->elements[nelem + i].node_num =
317
			source->elements[i].node_num + dest->node_count;
322
			source->elements[i].node_num + dest->node_count;
318
323
324
#ifdef SUPPORT_GEOIP
325
		/* Country */
326
		if (source->elements[i].type == dns_aclelementtype_ipcountry &&
327
		   source->elements[i].country != NULL) {
328
			strncpy(dest->elements[nelem + i].country, source->elements[i].country, 3);
329
		}
330
#endif
319
		/* Duplicate nested acl. */
331
		/* Duplicate nested acl. */
320
		if (source->elements[i].type == dns_aclelementtype_nestedacl &&
332
		if (source->elements[i].type == dns_aclelementtype_nestedacl &&
321
		   source->elements[i].nestedacl != NULL)
333
		   source->elements[i].nestedacl != NULL)
 Lines 376-382    Link Here 
376
	int indirectmatch;
388
	int indirectmatch;
377
	isc_result_t result;
389
	isc_result_t result;
378
390
391
	#ifdef SUPPORT_GEOIP
392
	static GeoIP *geoip = NULL;
393
	static isc_boolean_t geoip_init_tried = ISC_FALSE;
394
	#ifdef GEOIP_V6
395
	static GeoIP *geoip6 = NULL;
396
	static isc_boolean_t geoip6_init_tried = ISC_FALSE;
397
	#endif
398
	#endif
399
379
	switch (e->type) {
400
	switch (e->type) {
401
#ifdef SUPPORT_GEOIP
402
	case dns_aclelementtype_ipcountry:
403
		/* Country match */
404
		if (NULL == geoip && !geoip_init_tried) {
405
			geoip_init_tried = ISC_TRUE;
406
			if (GeoIP_db_avail(GEOIP_COUNTRY_EDITION)) {
407
				geoip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_MEMORY_CACHE);
408
				if (NULL == geoip)
409
					isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
410
						      DNS_LOGMODULE_ACL, ISC_LOG_NOTICE,
411
						      "Failed to open geoip database for ipv4");
412
			} else {
413
				isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
414
					      DNS_LOGMODULE_ACL, ISC_LOG_NOTICE,
415
					      "geoip database for ipv4 is not available");
416
			}
417
		}
418
#ifdef GEOIP_V6
419
		if (NULL == geoip6 && !geoip6_init_tried) {
420
			geoip6_init_tried = ISC_TRUE;
421
			if (GeoIP_db_avail(GEOIP_COUNTRY_EDITION_V6)) {
422
				geoip6 = GeoIP_open_type(GEOIP_COUNTRY_EDITION_V6, GEOIP_MEMORY_CACHE);
423
				if (NULL == geoip6)
424
					isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
425
						      DNS_LOGMODULE_ACL, ISC_LOG_NOTICE,
426
						      "Failed to open geoip database for ipv6");
427
			} else {
428
				isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
429
					      DNS_LOGMODULE_ACL, ISC_LOG_NOTICE,
430
					      "geoip database for ipv6 is not available");
431
			}
432
		}
433
#endif
434
435
                const char *value = NULL;
436
437
		if (reqaddr->family == AF_INET && geoip) {
438
			value = GeoIP_country_code_by_addr(geoip,inet_ntoa(reqaddr->type.in));
439
#ifdef GEOIP_V6
440
		} else if (reqaddr->family == AF_INET6 && geoip6) {
441
			value = GeoIP_country_code_by_ipnum_v6(geoip6, (geoipv6_t)reqaddr->type.in6);
442
#endif
443
		}
444
                
445
		if ((NULL != value) && (2 == strlen(value))) {
446
			if ((e->country[0] == value[0]) && (e->country[1] == value[1])) {
447
				return (ISC_TRUE);
448
			}
449
		}
450
		return (ISC_FALSE);
451
#endif
452
380
	case dns_aclelementtype_keyname:
453
	case dns_aclelementtype_keyname:
381
		if (reqsigner != NULL &&
454
		if (reqsigner != NULL &&
382
		    dns_name_equal(reqsigner, &e->keyname)) {
455
		    dns_name_equal(reqsigner, &e->keyname)) {
383
-- bind9-9.7.3.dfsg.orig/lib/dns/ncache.c
456
++ bind9-9.7.3.dfsg/lib/dns/ncache.c
 Lines 93-109    Link Here 
93
93
94
isc_result_t
94
isc_result_t
95
dns_ncache_add(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
95
dns_ncache_add(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
96
	       dns_rdatatype_t covers, isc_stdtime_t now, dns_ttl_t maxttl,
96
	       dns_rdatatype_t covers, isc_stdtime_t now, dns_ttl_t minttl, dns_ttl_t maxttl,
97
	       dns_rdataset_t *addedrdataset)
97
	       dns_rdataset_t *addedrdataset)
98
{
98
{
99
	return (dns_ncache_addoptout(message, cache, node, covers, now, maxttl,
99
	return (dns_ncache_addoptout(message, cache, node, covers, now, minttl, maxttl,
100
				    ISC_FALSE, addedrdataset));
100
				    ISC_FALSE, addedrdataset));
101
}
101
}
102
102
103
isc_result_t
103
isc_result_t
104
dns_ncache_addoptout(dns_message_t *message, dns_db_t *cache,
104
dns_ncache_addoptout(dns_message_t *message, dns_db_t *cache,
105
		     dns_dbnode_t *node, dns_rdatatype_t covers,
105
		     dns_dbnode_t *node, dns_rdatatype_t covers,
106
		     isc_stdtime_t now, dns_ttl_t maxttl,
106
		     isc_stdtime_t now, dns_ttl_t minttl, dns_ttl_t maxttl,
107
		     isc_boolean_t optout, dns_rdataset_t *addedrdataset)
107
		     isc_boolean_t optout, dns_rdataset_t *addedrdataset)
108
{
108
{
109
	isc_result_t result;
109
	isc_result_t result;
 Lines 171-176    Link Here 
171
				    type == dns_rdatatype_nsec3) {
171
				    type == dns_rdatatype_nsec3) {
172
					if (ttl > rdataset->ttl)
172
					if (ttl > rdataset->ttl)
173
						ttl = rdataset->ttl;
173
						ttl = rdataset->ttl;
174
					if (ttl < minttl)
175
						ttl = minttl;
174
					if (trust > rdataset->trust)
176
					if (trust > rdataset->trust)
175
						trust = rdataset->trust;
177
						trust = rdataset->trust;
176
					/*
178
					/*
177
-- bind9-9.7.3.dfsg.orig/lib/dns/include/dns/ncache.h
179
++ bind9-9.7.3.dfsg/lib/dns/include/dns/ncache.h
 Lines 61-72    Link Here 
61
61
62
isc_result_t
62
isc_result_t
63
dns_ncache_add(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
63
dns_ncache_add(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
64
	       dns_rdatatype_t covers, isc_stdtime_t now, dns_ttl_t maxttl,
64
	       dns_rdatatype_t covers, isc_stdtime_t now, dns_ttl_t minttl, dns_ttl_t maxttl,
65
	       dns_rdataset_t *addedrdataset);
65
	       dns_rdataset_t *addedrdataset);
66
isc_result_t
66
isc_result_t
67
dns_ncache_addoptout(dns_message_t *message, dns_db_t *cache,
67
dns_ncache_addoptout(dns_message_t *message, dns_db_t *cache,
68
		     dns_dbnode_t *node, dns_rdatatype_t covers,
68
		     dns_dbnode_t *node, dns_rdatatype_t covers,
69
		     isc_stdtime_t now, dns_ttl_t maxttl,
69
		     isc_stdtime_t now, dns_ttl_t minttl, dns_ttl_t maxttl,
70
		     isc_boolean_t optout, dns_rdataset_t *addedrdataset);
70
		     isc_boolean_t optout, dns_rdataset_t *addedrdataset);
71
/*%<
71
/*%<
72
 * Convert the authority data from 'message' into a negative cache
72
 * Convert the authority data from 'message' into a negative cache
73
-- bind9-9.7.3.dfsg.orig/lib/dns/include/dns/rdataset.h
73
++ bind9-9.7.3.dfsg/lib/dns/include/dns/rdataset.h
 Lines 204-209    Link Here 
204
#define DNS_RDATASETATTR_CLOSEST	0x00080000
204
#define DNS_RDATASETATTR_CLOSEST	0x00080000
205
#define DNS_RDATASETATTR_OPTOUT		0x00100000	/*%< OPTOUT proof */
205
#define DNS_RDATASETATTR_OPTOUT		0x00100000	/*%< OPTOUT proof */
206
#define DNS_RDATASETATTR_NEGATIVE	0x00200000
206
#define DNS_RDATASETATTR_NEGATIVE	0x00200000
207
#define DNS_RDATASETATTR_SINGLE		0x10000000	/* Only return 1 answer */
207
208
208
/*%
209
/*%
209
 * _OMITDNSSEC:
210
 * _OMITDNSSEC:
210
-- bind9-9.7.3.dfsg.orig/lib/dns/include/dns/view.h
211
++ bind9-9.7.3.dfsg/lib/dns/include/dns/view.h
 Lines 145-150    Link Here 
145
	isc_boolean_t			requestnsid;
145
	isc_boolean_t			requestnsid;
146
	dns_ttl_t			maxcachettl;
146
	dns_ttl_t			maxcachettl;
147
	dns_ttl_t			maxncachettl;
147
	dns_ttl_t			maxncachettl;
148
	dns_ttl_t			mincachettl;
149
	dns_ttl_t			minncachettl;
148
	in_port_t			dstport;
150
	in_port_t			dstport;
149
	dns_aclenv_t			aclenv;
151
	dns_aclenv_t			aclenv;
150
	dns_rdatatype_t			preferred_glue;
152
	dns_rdatatype_t			preferred_glue;
151
-- bind9-9.7.3.dfsg.orig/lib/dns/include/dns/acl.h
153
++ bind9-9.7.3.dfsg/lib/dns/include/dns/acl.h
 Lines 53-60    Link Here 
53
	dns_aclelementtype_localhost,
53
	dns_aclelementtype_localhost,
54
	dns_aclelementtype_localnets,
54
	dns_aclelementtype_localnets,
55
	dns_aclelementtype_any
55
	dns_aclelementtype_any
56
#ifdef SUPPORT_GEOIP
57
          ,
58
	dns_aclelementtype_ipcountry
59
#endif
56
} dns_aclelemettype_t;
60
} dns_aclelemettype_t;
57
61
62
#ifdef SUPPORT_GEOIP
63
typedef char dns_aclipcountry[3];
64
#endif
65
58
typedef struct dns_aclipprefix dns_aclipprefix_t;
66
typedef struct dns_aclipprefix dns_aclipprefix_t;
59
67
60
struct dns_aclipprefix {
68
struct dns_aclipprefix {
 Lines 68-73    Link Here 
68
	dns_name_t		keyname;
76
	dns_name_t		keyname;
69
	dns_acl_t		*nestedacl;
77
	dns_acl_t		*nestedacl;
70
	int			node_num;
78
	int			node_num;
79
#ifdef SUPPORT_GEOIP
80
	dns_aclipcountry        country;
81
#endif
71
};
82
};
72
83
73
struct dns_acl {
84
struct dns_acl {
74
-- bind9-9.7.3.dfsg.orig/bin/tests/named.conf
85
++ bind9-9.7.3.dfsg/bin/tests/named.conf
 Lines 54-59    Link Here 
54
	memstatistics-file "named.memstats";	// _PATH_MEMSTATS
54
	memstatistics-file "named.memstats";	// _PATH_MEMSTATS
55
55
56
	max-cache-ttl 999;
56
	max-cache-ttl 999;
57
	min-cache-ttl 666;
57
	auth-nxdomain yes;		// always set AA on NXDOMAIN.
58
	auth-nxdomain yes;		// always set AA on NXDOMAIN.
58
					// don't set this to 'no' unless
59
					// don't set this to 'no' unless
59
					// you know what you're doing -- older
60
					// you know what you're doing -- older
 Lines 155-160    Link Here 
155
	min-refresh-time 777;
156
	min-refresh-time 777;
156
 
157
 
157
	max-ncache-ttl 333;
158
	max-ncache-ttl 333;
159
	min-ncache-ttl 222;
158
	min-roots 15;
160
	min-roots 15;
159
	serial-queries 34;
161
	serial-queries 34;
160
162
161
-- bind9-9.7.3.dfsg.orig/bin/named/config.c
163
++ bind9-9.7.3.dfsg/bin/named/config.c
 Lines 142-147    Link Here 
142
	lame-ttl 600;\n\
142
	lame-ttl 600;\n\
143
	max-ncache-ttl 10800; /* 3 hours */\n\
143
	max-ncache-ttl 10800; /* 3 hours */\n\
144
	max-cache-ttl 604800; /* 1 week */\n\
144
	max-cache-ttl 604800; /* 1 week */\n\
145
	min-ncache-ttl 0; /* 0 hours */\n\
146
	min-cache-ttl 0; /* 0 seconds */\n\
145
	transfer-format many-answers;\n\
147
	transfer-format many-answers;\n\
146
	max-cache-size 0;\n\
148
	max-cache-size 0;\n\
147
	check-names master fail;\n\
149
	check-names master fail;\n\
148
-- bind9-9.7.3.dfsg.orig/bin/named/server.c
150
++ bind9-9.7.3.dfsg/bin/named/server.c
 Lines 948-953    Link Here 
948
		mode = DNS_RDATASETATTR_FIXEDORDER;
948
		mode = DNS_RDATASETATTR_FIXEDORDER;
949
	else if (!strcasecmp(str, "random"))
949
	else if (!strcasecmp(str, "random"))
950
		mode = DNS_RDATASETATTR_RANDOMIZE;
950
		mode = DNS_RDATASETATTR_RANDOMIZE;
951
	else if (!strcasecmp(str, "random_1"))
952
		mode = DNS_RDATASETATTR_RANDOMIZE|DNS_RDATASETATTR_SINGLE;
951
	else if (!strcasecmp(str, "cyclic"))
953
	else if (!strcasecmp(str, "cyclic"))
952
		mode = 0;
954
		mode = 0;
953
	else
955
	else
 Lines 2291-2296    Link Here 
2291
		CHECK(mustbesecure(obj, view->resolver));
2293
		CHECK(mustbesecure(obj, view->resolver));
2292
2294
2293
	obj = NULL;
2295
	obj = NULL;
2296
	result = ns_config_get(maps, "max-cache-ttl", &obj);
2297
	INSIST(result == ISC_R_SUCCESS);
2298
	view->maxcachettl = cfg_obj_asuint32(obj);
2299
2300
	obj = NULL;
2301
	result = ns_config_get(maps, "max-ncache-ttl", &obj);
2302
	INSIST(result == ISC_R_SUCCESS);
2303
	view->maxncachettl = cfg_obj_asuint32(obj);
2304
	if (view->maxncachettl > 7 * 24 * 3600)
2305
		view->maxncachettl = 7 * 24 * 3600;
2306
2307
	obj = NULL;
2308
	result = ns_config_get(maps, "min-cache-ttl", &obj);
2309
	INSIST(result == ISC_R_SUCCESS);
2310
	view->mincachettl = cfg_obj_asuint32(obj);
2311
2312
	obj = NULL;
2313
	result = ns_config_get(maps, "min-ncache-ttl", &obj);
2314
	INSIST(result == ISC_R_SUCCESS);
2315
	view->minncachettl = cfg_obj_asuint32(obj);
2316
	if (view->maxncachettl > 7 * 24 * 3600)
2317
		view->maxncachettl = 7 * 24 * 3600;
2318
2319
	obj = NULL;
2294
	result = ns_config_get(maps, "preferred-glue", &obj);
2320
	result = ns_config_get(maps, "preferred-glue", &obj);
2295
	if (result == ISC_R_SUCCESS) {
2321
	if (result == ISC_R_SUCCESS) {
2296
		str = cfg_obj_asstring(obj);
2322
		str = cfg_obj_asstring(obj);
2297
-- bind9-9.7.3.dfsg.orig/contrib/sdb/bdb/bdb.h
2323
++ bind9-9.7.3.dfsg/contrib/sdb/bdb/bdb.h
 Lines 15-21    Link Here 
15
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16
 */
16
 */
17
17
18
/* $Id: bdb.h,v 1.1 2002-05-16 04:25:22 marka Exp $ */
18
/* $Id: bdb.h,v 1.1 2002/05/16 04:25:22 marka Exp $ */
19
19
20
#ifndef BDB_H
20
#ifndef BDB_H
21
#define BDB_H	1
21
#define BDB_H	1
22
-- bind9-9.7.3.dfsg.orig/contrib/sdb/bdb/bdb.c
22
++ bind9-9.7.3.dfsg/contrib/sdb/bdb/bdb.c
 Lines 15-21    Link Here 
15
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16
 */
16
 */
17
17
18
/* $Id: bdb.c,v 1.1 2002-05-16 04:25:22 marka Exp $ */
18
/* $Id: bdb.c,v 1.1 2002/05/16 04:25:22 marka Exp $ */
19
19
20
/*
20
/*
21
 * BIND 9.1.x simple database driver
21
 * BIND 9.1.x simple database driver
22
-- bind9-9.7.3.dfsg.orig/contrib/queryperf/README
22
++ bind9-9.7.3.dfsg/contrib/queryperf/README
 Lines 1-5    Link Here 
1
1
2
$Id: README,v 1.1.1.1 2001-07-12 02:02:09 gson Exp $
2
$Id: README,v 1.1.1.1 2001/07/12 02:02:09 gson Exp $
3
3
4
This is queryperf, a DNS server query performance testing tool.
4
This is queryperf, a DNS server query performance testing tool.
5
5
6
-- bind9-9.7.3.dfsg.orig/contrib/dlz/config.dlz.in
6
++ bind9-9.7.3.dfsg/contrib/dlz/config.dlz.in
 Lines 271-277    Link Here 
271
			# Look for libname other than libdb.so.
271
			# Look for libname other than libdb.so.
272
			# Order is important (sigh).
272
			# Order is important (sigh).
273
273
274
			bdb_libnames="db42 db-4.2 db41 db-4.1 db"
274
			bdb_libnames="db-4.6 db42 db-4.2 db41 db-4.1 db"
275
			for d in $bdb_libnames
275
			for d in $bdb_libnames
276
			do
276
			do
277
				if test -f "$dd/lib/lib${d}.so"
277
				if test -f "$dd/lib/lib${d}.so"
278
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/README.ja
278
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/README.ja
 Lines 148-151    Link Here 
148
$B$X$*4j$$$7$^$9!#(B
148
$B$X$*4j$$$7$^$9!#(B
149
149
150
150
151
; $Id: README.ja,v 1.1.1.1 2003-06-04 00:24:59 marka Exp $
151
; $Id: README.ja,v 1.1.1.1 2003/06/04 00:24:59 marka Exp $
152
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/INSTALL.ja
152
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/INSTALL.ja
 Lines 307-310    Link Here 
307
$B$F$/$@$5$$!#(B
307
$B$F$/$@$5$$!#(B
308
308
309
309
310
; $Id: INSTALL.ja,v 1.1.1.1 2003-06-04 00:25:00 marka Exp $
310
; $Id: INSTALL.ja,v 1.1.1.1 2003/06/04 00:25:00 marka Exp $
311
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/NEWS
311
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/NEWS
 Lines 1-4    Link Here 
1
; $Id: NEWS,v 1.1.1.1 2003-06-04 00:25:03 marka Exp $
1
; $Id: NEWS,v 1.1.1.1 2003/06/04 00:25:03 marka Exp $
2
2
3
Major changes in idnkit version 1.0:
3
Major changes in idnkit version 1.0:
4
4
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/DISTFILES
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/DISTFILES
 Lines 1-4    Link Here 
1
# $Id: DISTFILES,v 1.1.1.1 2003-06-04 00:25:02 marka Exp $
1
# $Id: DISTFILES,v 1.1.1.1 2003/06/04 00:25:02 marka Exp $
2
README
2
README
3
README.ja
3
README.ja
4
INSTALL
4
INSTALL
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/configure.in
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/configure.in
 Lines 1-4    Link Here 
1
dnl $Id: configure.in,v 1.1.1.1 2003-06-04 00:25:25 marka Exp $
1
dnl $Id: configure.in,v 1.1.1.1 2003/06/04 00:25:25 marka Exp $
2
dnl Process this file with autoconf to produce a configure script.
2
dnl Process this file with autoconf to produce a configure script.
3
dnl
3
dnl
4
dnl Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
dnl Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/INSTALL
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/INSTALL
 Lines 306-309    Link Here 
306
version of the command (http://www.gnu.org/software/patch/) and use
306
version of the command (http://www.gnu.org/software/patch/) and use
307
it.
307
it.
308
308
309
; $Id: INSTALL,v 1.1.1.1 2003-06-04 00:24:59 marka Exp $
309
; $Id: INSTALL,v 1.1.1.1 2003/06/04 00:24:59 marka Exp $
310
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/README
310
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/README
 Lines 156-159    Link Here 
156
respectively.
156
respectively.
157
157
158
158
159
; $Id: README,v 1.1.1.1 2003-06-04 00:24:58 marka Exp $
159
; $Id: README,v 1.1.1.1 2003/06/04 00:24:58 marka Exp $
160
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/aclocal.m4
160
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/aclocal.m4
 Lines 1-5    Link Here 
1
##
1
##
2
## $Id: aclocal.m4,v 1.1.1.1 2003-06-04 00:25:05 marka Exp $
2
## $Id: aclocal.m4,v 1.1.1.1 2003/06/04 00:25:05 marka Exp $
3
##
3
##
4
AC_DEFUN(AC_FIND_SYSTEM_SHOBJ,[
4
AC_DEFUN(AC_FIND_SYSTEM_SHOBJ,[
5
AC_MSG_CHECKING(for $1 shared object)
5
AC_MSG_CHECKING(for $1 shared object)
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/acconfig.h
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/acconfig.h
 Lines 1-4    Link Here 
1
/* $Id: acconfig.h,v 1.1.1.1 2003-06-04 00:25:03 marka Exp $ */
1
/* $Id: acconfig.h,v 1.1.1.1 2003/06/04 00:25:03 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/make.wnt
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/make.wnt
 Lines 1-4    Link Here 
1
# $Id: make.wnt,v 1.1.1.1 2003-06-04 00:25:03 marka Exp $
1
# $Id: make.wnt,v 1.1.1.1 2003/06/04 00:25:03 marka Exp $
2
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
2
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
#  
3
#  
4
# By using this file, you agree to the terms and conditions set forth bellow.
4
# By using this file, you agree to the terms and conditions set forth bellow.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/config.sub
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/config.sub
 Lines 1-9    Link Here 
1
#! /bin/sh
1
#! /bin/sh
2
# Configuration validation subroutine script.
2
# Configuration validation subroutine script.
3
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
3
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
4
#   Free Software Foundation, Inc.
5
#   Free Software Foundation, Inc.
5
6
6
timestamp='2001-09-07'
7
timestamp='2009-04-17'
7
8
8
# This file is (in principle) common to ALL GNU software.
9
# This file is (in principle) common to ALL GNU software.
9
# The presence of a machine in this file suggests that SOME GNU software
10
# The presence of a machine in this file suggests that SOME GNU software
 Lines 21-35    Link Here 
21
#
22
#
22
# You should have received a copy of the GNU General Public License
23
# You should have received a copy of the GNU General Public License
23
# along with this program; if not, write to the Free Software
24
# along with this program; if not, write to the Free Software
24
# Foundation, Inc., 59 Temple Place - Suite 330,
25
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
25
# Boston, MA 02111-1307, USA.
26
# 02110-1301, USA.
26
27
#
27
# As a special exception to the GNU General Public License, if you
28
# As a special exception to the GNU General Public License, if you
28
# distribute this file as part of a program that contains a
29
# distribute this file as part of a program that contains a
29
# configuration script generated by Autoconf, you may include it under
30
# configuration script generated by Autoconf, you may include it under
30
# the same distribution terms that you use for the rest of that program.
31
# the same distribution terms that you use for the rest of that program.
31
32
32
# Please send patches to <config-patches@gnu.org>.
33
34
# Please send patches to <config-patches@gnu.org>.  Submit a context
35
# diff and a properly formatted ChangeLog entry.
33
#
36
#
34
# Configuration subroutine to validate and canonicalize a configuration type.
37
# Configuration subroutine to validate and canonicalize a configuration type.
35
# Supply the specified configuration type as an argument.
38
# Supply the specified configuration type as an argument.
 Lines 69-76    Link Here 
69
version="\
72
version="\
70
GNU config.sub ($timestamp)
73
GNU config.sub ($timestamp)
71
74
72
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
75
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
73
Free Software Foundation, Inc.
76
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
74
77
75
This is free software; see the source for copying conditions.  There is NO
78
This is free software; see the source for copying conditions.  There is NO
76
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
79
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 Lines 82-92    Link Here 
82
while test $# -gt 0 ; do
85
while test $# -gt 0 ; do
83
  case $1 in
86
  case $1 in
84
    --time-stamp | --time* | -t )
87
    --time-stamp | --time* | -t )
85
       echo "$timestamp" ; exit 0 ;;
88
       echo "$timestamp" ; exit ;;
86
    --version | -v )
89
    --version | -v )
87
       echo "$version" ; exit 0 ;;
90
       echo "$version" ; exit ;;
88
    --help | --h* | -h )
91
    --help | --h* | -h )
89
       echo "$usage"; exit 0 ;;
92
       echo "$usage"; exit ;;
90
    -- )     # Stop option processing
93
    -- )     # Stop option processing
91
       shift; break ;;
94
       shift; break ;;
92
    - )	# Use stdin as input.
95
    - )	# Use stdin as input.
 Lines 98-104    Link Here 
98
    *local*)
101
    *local*)
99
       # First pass through any local machine types.
102
       # First pass through any local machine types.
100
       echo $1
103
       echo $1
101
       exit 0;;
104
       exit ;;
102
105
103
    * )
106
    * )
104
       break ;;
107
       break ;;
 Lines 117-123    Link Here 
117
# Here we must recognize all the valid KERNEL-OS combinations.
120
# Here we must recognize all the valid KERNEL-OS combinations.
118
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
121
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
119
case $maybe_os in
122
case $maybe_os in
120
  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
123
  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
124
  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
125
  kopensolaris*-gnu* | \
126
  storm-chaos* | os2-emx* | rtmk-nova*)
121
    os=-$maybe_os
127
    os=-$maybe_os
122
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
128
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
123
    ;;
129
    ;;
 Lines 143-149    Link Here 
143
	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
149
	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
144
	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
150
	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
145
	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
151
	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
146
	-apple | -axis)
152
	-apple | -axis | -knuth | -cray)
147
		os=
153
		os=
148
		basic_machine=$1
154
		basic_machine=$1
149
		;;
155
		;;
 Lines 168-173    Link Here 
168
	-hiux*)
174
	-hiux*)
169
		os=-hiuxwe2
175
		os=-hiuxwe2
170
		;;
176
		;;
177
	-sco6)
178
		os=-sco5v6
179
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
180
		;;
171
	-sco5)
181
	-sco5)
172
		os=-sco3.2v5
182
		os=-sco3.2v5
173
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
183
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 Lines 184-189    Link Here 
184
		# Don't forget version if it is 3.2v4 or newer.
194
		# Don't forget version if it is 3.2v4 or newer.
185
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
195
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
186
		;;
196
		;;
197
	-sco5v6*)
198
		# Don't forget version if it is 3.2v4 or newer.
199
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
200
		;;
187
	-sco*)
201
	-sco*)
188
		os=-sco3.2v2
202
		os=-sco3.2v2
189
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
203
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 Lines 226-258    Link Here 
226
	1750a | 580 \
240
	1750a | 580 \
227
	| a29k \
241
	| a29k \
228
	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
242
	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
229
	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
243
	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
244
	| am33_2.0 \
245
	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
246
	| bfin \
230
	| c4x | clipper \
247
	| c4x | clipper \
231
	| d10v | d30v | dsp16xx \
248
	| d10v | d30v | dlx | dsp16xx \
232
	| fr30 \
249
	| fido | fr30 | frv \
233
	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
250
	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
234
	| i370 | i860 | i960 | ia64 \
251
	| i370 | i860 | i960 | ia64 \
235
	| m32r | m68000 | m68k | m88k | mcore \
252
	| ip2k | iq2000 \
236
	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
253
	| lm32 \
237
	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
254
	| m32c | m32r | m32rle | m68000 | m68k | m88k \
238
	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
255
	| maxq | mb | microblaze | mcore | mep | metag \
239
	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
256
	| mips | mipsbe | mipseb | mipsel | mipsle \
240
	| mipsisa32 \
257
	| mips16 \
258
	| mips64 | mips64el \
259
	| mips64octeon | mips64octeonel \
260
	| mips64orion | mips64orionel \
261
	| mips64r5900 | mips64r5900el \
262
	| mips64vr | mips64vrel \
263
	| mips64vr4100 | mips64vr4100el \
264
	| mips64vr4300 | mips64vr4300el \
265
	| mips64vr5000 | mips64vr5000el \
266
	| mips64vr5900 | mips64vr5900el \
267
	| mipsisa32 | mipsisa32el \
268
	| mipsisa32r2 | mipsisa32r2el \
269
	| mipsisa64 | mipsisa64el \
270
	| mipsisa64r2 | mipsisa64r2el \
271
	| mipsisa64sb1 | mipsisa64sb1el \
272
	| mipsisa64sr71k | mipsisa64sr71kel \
273
	| mipstx39 | mipstx39el \
241
	| mn10200 | mn10300 \
274
	| mn10200 | mn10300 \
275
	| moxie \
276
	| mt \
277
	| msp430 \
278
	| nios | nios2 \
242
	| ns16k | ns32k \
279
	| ns16k | ns32k \
243
	| openrisc \
280
	| or32 \
244
	| pdp10 | pdp11 | pj | pjl \
281
	| pdp10 | pdp11 | pj | pjl \
245
	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
282
	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
246
	| pyramid \
283
	| pyramid \
247
	| s390 | s390x \
284
	| score \
248
	| sh | sh[34] | sh[34]eb | shbe | shle \
285
	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
249
	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
286
	| sh64 | sh64le \
250
	| stormy16 | strongarm \
287
	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
251
	| tahoe | thumb | tic80 | tron \
288
	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
252
	| v850 \
289
	| spu | strongarm \
290
	| tahoe | thumb | tic4x | tic80 | tron \
291
	| v850 | v850e \
253
	| we32k \
292
	| we32k \
254
	| x86 | xscale \
293
	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
255
	| z8k)
294
	| z8k | z80)
256
		basic_machine=$basic_machine-unknown
295
		basic_machine=$basic_machine-unknown
257
		;;
296
		;;
258
	m6811 | m68hc11 | m6812 | m68hc12)
297
	m6811 | m68hc11 | m6812 | m68hc12)
 Lines 262-267    Link Here 
262
		;;
301
		;;
263
	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
302
	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
264
		;;
303
		;;
304
	ms1)
305
		basic_machine=mt-unknown
306
		;;
265
307
266
	# We use `pc' rather than `unknown'
308
	# We use `pc' rather than `unknown'
267
	# because (1) that's what they normally are, and
309
	# because (1) that's what they normally are, and
 Lines 278-317    Link Here 
278
	580-* \
320
	580-* \
279
	| a29k-* \
321
	| a29k-* \
280
	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
322
	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
281
	| alphapca5[67]-* | arc-* \
323
	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
282
	| arm-*  | armbe-* | armle-* | armv*-* \
324
	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
283
	| bs2000-* \
325
	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
284
	| c[123]* | c30-* | [cjt]90-* | c54x-* \
326
	| avr-* | avr32-* \
285
	| clipper-* | cray2-* | cydra-* \
327
	| bfin-* | bs2000-* \
286
	| d10v-* | d30v-* \
328
	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
329
	| clipper-* | craynv-* | cydra-* \
330
	| d10v-* | d30v-* | dlx-* \
287
	| elxsi-* \
331
	| elxsi-* \
288
	| f30[01]-* | f700-* | fr30-* | fx80-* \
332
	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
289
	| h8300-* | h8500-* \
333
	| h8300-* | h8500-* \
290
	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
334
	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
291
	| i*86-* | i860-* | i960-* | ia64-* \
335
	| i*86-* | i860-* | i960-* | ia64-* \
292
	| m32r-* \
336
	| ip2k-* | iq2000-* \
293
	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
337
	| lm32-* \
294
	| m88110-* | m88k-* | mcore-* \
338
	| m32c-* | m32r-* | m32rle-* \
295
	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
339
	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
296
	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
340
	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
297
	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
341
	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
298
	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
342
	| mips16-* \
343
	| mips64-* | mips64el-* \
344
	| mips64octeon-* | mips64octeonel-* \
345
	| mips64orion-* | mips64orionel-* \
346
	| mips64r5900-* | mips64r5900el-* \
347
	| mips64vr-* | mips64vrel-* \
348
	| mips64vr4100-* | mips64vr4100el-* \
349
	| mips64vr4300-* | mips64vr4300el-* \
350
	| mips64vr5000-* | mips64vr5000el-* \
351
	| mips64vr5900-* | mips64vr5900el-* \
352
	| mipsisa32-* | mipsisa32el-* \
353
	| mipsisa32r2-* | mipsisa32r2el-* \
354
	| mipsisa64-* | mipsisa64el-* \
355
	| mipsisa64r2-* | mipsisa64r2el-* \
356
	| mipsisa64sb1-* | mipsisa64sb1el-* \
357
	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
358
	| mipstx39-* | mipstx39el-* \
359
	| mmix-* \
360
	| mt-* \
361
	| msp430-* \
362
	| nios-* | nios2-* \
299
	| none-* | np1-* | ns16k-* | ns32k-* \
363
	| none-* | np1-* | ns16k-* | ns32k-* \
300
	| orion-* \
364
	| orion-* \
301
	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
365
	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
302
	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
366
	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
303
	| pyramid-* \
367
	| pyramid-* \
304
	| romp-* | rs6000-* \
368
	| romp-* | rs6000-* \
305
	| s390-* | s390x-* \
369
	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
306
	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
370
	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
307
	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
371
	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
308
	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
372
	| sparclite-* \
309
	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
373
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
310
	| v850-* | vax-* \
374
	| tahoe-* | thumb-* \
375
	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
376
	| tron-* \
377
	| v850-* | v850e-* | vax-* \
311
	| we32k-* \
378
	| we32k-* \
312
	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
379
	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
380
	| xstormy16-* | xtensa*-* \
313
	| ymp-* \
381
	| ymp-* \
314
	| z8k-*)
382
	| z8k-* | z80-*)
383
		;;
384
	# Recognize the basic CPU types without company name, with glob match.
385
	xtensa*)
386
		basic_machine=$basic_machine-unknown
315
		;;
387
		;;
316
	# Recognize the various machine names and aliases which stand
388
	# Recognize the various machine names and aliases which stand
317
	# for a CPU type and a company and sometimes even an OS.
389
	# for a CPU type and a company and sometimes even an OS.
 Lines 329-334    Link Here 
329
		basic_machine=a29k-amd
401
		basic_machine=a29k-amd
330
		os=-udi
402
		os=-udi
331
		;;
403
		;;
404
    	abacus)
405
		basic_machine=abacus-unknown
406
		;;
332
	adobe68k)
407
	adobe68k)
333
		basic_machine=m68010-adobe
408
		basic_machine=m68010-adobe
334
		os=-scout
409
		os=-scout
 Lines 343-348    Link Here 
343
		basic_machine=a29k-none
418
		basic_machine=a29k-none
344
		os=-bsd
419
		os=-bsd
345
		;;
420
		;;
421
	amd64)
422
		basic_machine=x86_64-pc
423
		;;
424
	amd64-*)
425
		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
426
		;;
346
	amdahl)
427
	amdahl)
347
		basic_machine=580-amdahl
428
		basic_machine=580-amdahl
348
		os=-sysv
429
		os=-sysv
 Lines 366-371    Link Here 
366
		basic_machine=m68k-apollo
447
		basic_machine=m68k-apollo
367
		os=-bsd
448
		os=-bsd
368
		;;
449
		;;
450
	aros)
451
		basic_machine=i386-pc
452
		os=-aros
453
		;;
369
	aux)
454
	aux)
370
		basic_machine=m68k-apple
455
		basic_machine=m68k-apple
371
		os=-aux
456
		os=-aux
 Lines 374-379    Link Here 
374
		basic_machine=ns32k-sequent
459
		basic_machine=ns32k-sequent
375
		os=-dynix
460
		os=-dynix
376
		;;
461
		;;
462
	blackfin)
463
		basic_machine=bfin-unknown
464
		os=-linux
465
		;;
466
	blackfin-*)
467
		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
468
		os=-linux
469
		;;
470
	c90)
471
		basic_machine=c90-cray
472
		os=-unicos
473
		;;
474
        cegcc)
475
		basic_machine=arm-unknown
476
		os=-cegcc
477
		;;
377
	convex-c1)
478
	convex-c1)
378
		basic_machine=c1-convex
479
		basic_machine=c1-convex
379
		os=-bsd
480
		os=-bsd
 Lines 394-423    Link Here 
394
		basic_machine=c38-convex
495
		basic_machine=c38-convex
395
		os=-bsd
496
		os=-bsd
396
		;;
497
		;;
397
	cray | ymp)
498
	cray | j90)
398
		basic_machine=ymp-cray
499
		basic_machine=j90-cray
399
		os=-unicos
500
		os=-unicos
400
		;;
501
		;;
401
	cray2)
502
	craynv)
402
		basic_machine=cray2-cray
503
		basic_machine=craynv-cray
403
		os=-unicos
504
		os=-unicosmp
404
		;;
505
		;;
405
	[cjt]90)
506
	cr16)
406
		basic_machine=${basic_machine}-cray
507
		basic_machine=cr16-unknown
407
		os=-unicos
508
		os=-elf
408
		;;
509
		;;
409
	crds | unos)
510
	crds | unos)
410
		basic_machine=m68k-crds
511
		basic_machine=m68k-crds
411
		;;
512
		;;
513
	crisv32 | crisv32-* | etraxfs*)
514
		basic_machine=crisv32-axis
515
		;;
412
	cris | cris-* | etrax*)
516
	cris | cris-* | etrax*)
413
		basic_machine=cris-axis
517
		basic_machine=cris-axis
414
		;;
518
		;;
519
	crx)
520
		basic_machine=crx-unknown
521
		os=-elf
522
		;;
415
	da30 | da30-*)
523
	da30 | da30-*)
416
		basic_machine=m68k-da30
524
		basic_machine=m68k-da30
417
		;;
525
		;;
418
	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
526
	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
419
		basic_machine=mips-dec
527
		basic_machine=mips-dec
420
		;;
528
		;;
529
	decsystem10* | dec10*)
530
		basic_machine=pdp10-dec
531
		os=-tops10
532
		;;
533
	decsystem20* | dec20*)
534
		basic_machine=pdp10-dec
535
		os=-tops20
536
		;;
421
	delta | 3300 | motorola-3300 | motorola-delta \
537
	delta | 3300 | motorola-3300 | motorola-delta \
422
	      | 3300-motorola | delta-motorola)
538
	      | 3300-motorola | delta-motorola)
423
		basic_machine=m68k-motorola
539
		basic_machine=m68k-motorola
 Lines 426-431    Link Here 
426
		basic_machine=m88k-motorola
542
		basic_machine=m88k-motorola
427
		os=-sysv3
543
		os=-sysv3
428
		;;
544
		;;
545
	dicos)
546
		basic_machine=i686-pc
547
		os=-dicos
548
		;;
549
	djgpp)
550
		basic_machine=i586-pc
551
		os=-msdosdjgpp
552
		;;
429
	dpx20 | dpx20-*)
553
	dpx20 | dpx20-*)
430
		basic_machine=rs6000-bull
554
		basic_machine=rs6000-bull
431
		os=-bosx
555
		os=-bosx
 Lines 576-581    Link Here 
576
		basic_machine=m68k-isi
700
		basic_machine=m68k-isi
577
		os=-sysv
701
		os=-sysv
578
		;;
702
		;;
703
	m68knommu)
704
		basic_machine=m68k-unknown
705
		os=-linux
706
		;;
707
	m68knommu-*)
708
		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
709
		os=-linux
710
		;;
579
	m88k-omron*)
711
	m88k-omron*)
580
		basic_machine=m88k-omron
712
		basic_machine=m88k-omron
581
		;;
713
		;;
 Lines 591-596    Link Here 
591
		basic_machine=i386-pc
723
		basic_machine=i386-pc
592
		os=-mingw32
724
		os=-mingw32
593
		;;
725
		;;
726
	mingw32ce)
727
		basic_machine=arm-unknown
728
		os=-mingw32ce
729
		;;
594
	miniframe)
730
	miniframe)
595
		basic_machine=m68000-convergent
731
		basic_machine=m68000-convergent
596
		;;
732
		;;
 Lines 598-629    Link Here 
598
		basic_machine=m68k-atari
734
		basic_machine=m68k-atari
599
		os=-mint
735
		os=-mint
600
		;;
736
		;;
601
	mipsel*-linux*)
602
		basic_machine=mipsel-unknown
603
		os=-linux-gnu
604
		;;
605
	mips*-linux*)
606
		basic_machine=mips-unknown
607
		os=-linux-gnu
608
		;;
609
	mips3*-*)
737
	mips3*-*)
610
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
738
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
611
		;;
739
		;;
612
	mips3*)
740
	mips3*)
613
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
741
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
614
		;;
742
		;;
615
	mmix*)
616
		basic_machine=mmix-knuth
617
		os=-mmixware
618
		;;
619
	monitor)
743
	monitor)
620
		basic_machine=m68k-rom68k
744
		basic_machine=m68k-rom68k
621
		os=-coff
745
		os=-coff
622
		;;
746
		;;
747
	morphos)
748
		basic_machine=powerpc-unknown
749
		os=-morphos
750
		;;
623
	msdos)
751
	msdos)
624
		basic_machine=i386-pc
752
		basic_machine=i386-pc
625
		os=-msdos
753
		os=-msdos
626
		;;
754
		;;
755
	ms1-*)
756
		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
757
		;;
627
	mvs)
758
	mvs)
628
		basic_machine=i370-ibm
759
		basic_machine=i370-ibm
629
		os=-mvs
760
		os=-mvs
 Lines 699-704    Link Here 
699
		basic_machine=hppa1.1-oki
830
		basic_machine=hppa1.1-oki
700
		os=-proelf
831
		os=-proelf
701
		;;
832
		;;
833
	openrisc | openrisc-*)
834
		basic_machine=or32-unknown
835
		;;
836
	os400)
837
		basic_machine=powerpc-ibm
838
		os=-os400
839
		;;
702
	OSE68000 | ose68000)
840
	OSE68000 | ose68000)
703
		basic_machine=m68000-ericsson
841
		basic_machine=m68000-ericsson
704
		os=-ose
842
		os=-ose
 Lines 715-769    Link Here 
715
		basic_machine=i860-intel
853
		basic_machine=i860-intel
716
		os=-osf
854
		os=-osf
717
		;;
855
		;;
856
	parisc)
857
		basic_machine=hppa-unknown
858
		os=-linux
859
		;;
860
	parisc-*)
861
		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
862
		os=-linux
863
		;;
718
	pbd)
864
	pbd)
719
		basic_machine=sparc-tti
865
		basic_machine=sparc-tti
720
		;;
866
		;;
721
	pbb)
867
	pbb)
722
		basic_machine=m68k-tti
868
		basic_machine=m68k-tti
723
		;;
869
		;;
724
        pc532 | pc532-*)
870
	pc532 | pc532-*)
725
		basic_machine=ns32k-pc532
871
		basic_machine=ns32k-pc532
726
		;;
872
		;;
727
	pentium | p5 | k5 | k6 | nexgen)
873
	pc98)
874
		basic_machine=i386-pc
875
		;;
876
	pc98-*)
877
		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
878
		;;
879
	pentium | p5 | k5 | k6 | nexgen | viac3)
728
		basic_machine=i586-pc
880
		basic_machine=i586-pc
729
		;;
881
		;;
730
	pentiumpro | p6 | 6x86 | athlon)
882
	pentiumpro | p6 | 6x86 | athlon | athlon_*)
731
		basic_machine=i686-pc
883
		basic_machine=i686-pc
732
		;;
884
		;;
733
	pentiumii | pentium2)
885
	pentiumii | pentium2 | pentiumiii | pentium3)
734
		basic_machine=i686-pc
886
		basic_machine=i686-pc
735
		;;
887
		;;
736
	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
888
	pentium4)
889
		basic_machine=i786-pc
890
		;;
891
	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
737
		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
892
		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
738
		;;
893
		;;
739
	pentiumpro-* | p6-* | 6x86-* | athlon-*)
894
	pentiumpro-* | p6-* | 6x86-* | athlon-*)
740
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
895
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
741
		;;
896
		;;
742
	pentiumii-* | pentium2-*)
897
	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
743
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
898
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
744
		;;
899
		;;
900
	pentium4-*)
901
		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
902
		;;
745
	pn)
903
	pn)
746
		basic_machine=pn-gould
904
		basic_machine=pn-gould
747
		;;
905
		;;
748
	power)	basic_machine=power-ibm
906
	power)	basic_machine=power-ibm
749
		;;
907
		;;
750
	ppc)	basic_machine=powerpc-unknown
908
	ppc)	basic_machine=powerpc-unknown
751
	        ;;
909
		;;
752
	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
910
	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
753
		;;
911
		;;
754
	ppcle | powerpclittle | ppc-le | powerpc-little)
912
	ppcle | powerpclittle | ppc-le | powerpc-little)
755
		basic_machine=powerpcle-unknown
913
		basic_machine=powerpcle-unknown
756
	        ;;
914
		;;
757
	ppcle-* | powerpclittle-*)
915
	ppcle-* | powerpclittle-*)
758
		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
916
		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
759
		;;
917
		;;
760
	ppc64)	basic_machine=powerpc64-unknown
918
	ppc64)	basic_machine=powerpc64-unknown
761
	        ;;
919
		;;
762
	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
920
	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
763
		;;
921
		;;
764
	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
922
	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
765
		basic_machine=powerpc64le-unknown
923
		basic_machine=powerpc64le-unknown
766
	        ;;
924
		;;
767
	ppc64le-* | powerpc64little-*)
925
	ppc64le-* | powerpc64little-*)
768
		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
926
		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
769
		;;
927
		;;
 Lines 774-779    Link Here 
774
		basic_machine=i586-unknown
932
		basic_machine=i586-unknown
775
		os=-pw32
933
		os=-pw32
776
		;;
934
		;;
935
	rdos)
936
		basic_machine=i386-pc
937
		os=-rdos
938
		;;
777
	rom68k)
939
	rom68k)
778
		basic_machine=m68k-rom68k
940
		basic_machine=m68k-rom68k
779
		os=-coff
941
		os=-coff
 Lines 784-793    Link Here 
784
	rtpc | rtpc-*)
946
	rtpc | rtpc-*)
785
		basic_machine=romp-ibm
947
		basic_machine=romp-ibm
786
		;;
948
		;;
949
	s390 | s390-*)
950
		basic_machine=s390-ibm
951
		;;
952
	s390x | s390x-*)
953
		basic_machine=s390x-ibm
954
		;;
787
	sa29200)
955
	sa29200)
788
		basic_machine=a29k-amd
956
		basic_machine=a29k-amd
789
		os=-udi
957
		os=-udi
790
		;;
958
		;;
959
	sb1)
960
		basic_machine=mipsisa64sb1-unknown
961
		;;
962
	sb1el)
963
		basic_machine=mipsisa64sb1el-unknown
964
		;;
965
	sde)
966
		basic_machine=mipsisa32-sde
967
		os=-elf
968
		;;
969
	sei)
970
		basic_machine=mips-sei
971
		os=-seiux
972
		;;
791
	sequent)
973
	sequent)
792
		basic_machine=i386-sequent
974
		basic_machine=i386-sequent
793
		;;
975
		;;
 Lines 795-801    Link Here 
795
		basic_machine=sh-hitachi
977
		basic_machine=sh-hitachi
796
		os=-hms
978
		os=-hms
797
		;;
979
		;;
798
	sparclite-wrs)
980
	sh5el)
981
		basic_machine=sh5le-unknown
982
		;;
983
	sh64)
984
		basic_machine=sh64-unknown
985
		;;
986
	sparclite-wrs | simso-wrs)
799
		basic_machine=sparclite-wrs
987
		basic_machine=sparclite-wrs
800
		os=-vxworks
988
		os=-vxworks
801
		;;
989
		;;
 Lines 862-883    Link Here 
862
		os=-dynix
1050
		os=-dynix
863
		;;
1051
		;;
864
	t3e)
1052
	t3e)
865
		basic_machine=t3e-cray
1053
		basic_machine=alphaev5-cray
1054
		os=-unicos
1055
		;;
1056
	t90)
1057
		basic_machine=t90-cray
866
		os=-unicos
1058
		os=-unicos
867
		;;
1059
		;;
868
	tic54x | c54x*)
1060
	tic54x | c54x*)
869
		basic_machine=tic54x-unknown
1061
		basic_machine=tic54x-unknown
870
		os=-coff
1062
		os=-coff
871
		;;
1063
		;;
1064
	tic55x | c55x*)
1065
		basic_machine=tic55x-unknown
1066
		os=-coff
1067
		;;
1068
	tic6x | c6x*)
1069
		basic_machine=tic6x-unknown
1070
		os=-coff
1071
		;;
1072
	tile*)
1073
		basic_machine=tile-unknown
1074
		os=-linux-gnu
1075
		;;
872
	tx39)
1076
	tx39)
873
		basic_machine=mipstx39-unknown
1077
		basic_machine=mipstx39-unknown
874
		;;
1078
		;;
875
	tx39el)
1079
	tx39el)
876
		basic_machine=mipstx39el-unknown
1080
		basic_machine=mipstx39el-unknown
877
		;;
1081
		;;
1082
	toad1)
1083
		basic_machine=pdp10-xkl
1084
		os=-tops20
1085
		;;
878
	tower | tower-32)
1086
	tower | tower-32)
879
		basic_machine=m68k-ncr
1087
		basic_machine=m68k-ncr
880
		;;
1088
		;;
1089
	tpf)
1090
		basic_machine=s390x-ibm
1091
		os=-tpf
1092
		;;
881
	udi29k)
1093
	udi29k)
882
		basic_machine=a29k-amd
1094
		basic_machine=a29k-amd
883
		os=-udi
1095
		os=-udi
 Lines 899-906    Link Here 
899
		os=-vms
1111
		os=-vms
900
		;;
1112
		;;
901
	vpp*|vx|vx-*)
1113
	vpp*|vx|vx-*)
902
               basic_machine=f301-fujitsu
1114
		basic_machine=f301-fujitsu
903
               ;;
1115
		;;
904
	vxworks960)
1116
	vxworks960)
905
		basic_machine=i960-wrs
1117
		basic_machine=i960-wrs
906
		os=-vxworks
1118
		os=-vxworks
 Lines 921-941    Link Here 
921
		basic_machine=hppa1.1-winbond
1133
		basic_machine=hppa1.1-winbond
922
		os=-proelf
1134
		os=-proelf
923
		;;
1135
		;;
924
	windows32)
1136
	xbox)
925
		basic_machine=i386-pc
1137
		basic_machine=i686-pc
926
		os=-windows32-msvcrt
1138
		os=-mingw32
927
		;;
928
	xmp)
929
		basic_machine=xmp-cray
930
		os=-unicos
931
		;;
1139
		;;
932
        xps | xps100)
1140
	xps | xps100)
933
		basic_machine=xps100-honeywell
1141
		basic_machine=xps100-honeywell
934
		;;
1142
		;;
1143
	ymp)
1144
		basic_machine=ymp-cray
1145
		os=-unicos
1146
		;;
935
	z8k-*-coff)
1147
	z8k-*-coff)
936
		basic_machine=z8k-unknown
1148
		basic_machine=z8k-unknown
937
		os=-sim
1149
		os=-sim
938
		;;
1150
		;;
1151
	z80-*-coff)
1152
		basic_machine=z80-unknown
1153
		os=-sim
1154
		;;
939
	none)
1155
	none)
940
		basic_machine=none-none
1156
		basic_machine=none-none
941
		os=-none
1157
		os=-none
 Lines 952-967    Link Here 
952
	op60c)
1168
	op60c)
953
		basic_machine=hppa1.1-oki
1169
		basic_machine=hppa1.1-oki
954
		;;
1170
		;;
955
	mips)
956
		if [ x$os = x-linux-gnu ]; then
957
			basic_machine=mips-unknown
958
		else
959
			basic_machine=mips-mips
960
		fi
961
		;;
962
	romp)
1171
	romp)
963
		basic_machine=romp-ibm
1172
		basic_machine=romp-ibm
964
		;;
1173
		;;
1174
	mmix)
1175
		basic_machine=mmix-knuth
1176
		;;
965
	rs6000)
1177
	rs6000)
966
		basic_machine=rs6000-ibm
1178
		basic_machine=rs6000-ibm
967
		;;
1179
		;;
 Lines 978-990    Link Here 
978
	we32k)
1190
	we32k)
979
		basic_machine=we32k-att
1191
		basic_machine=we32k-att
980
		;;
1192
		;;
981
	sh3 | sh4 | sh3eb | sh4eb)
1193
	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
982
		basic_machine=sh-unknown
1194
		basic_machine=sh-unknown
983
		;;
1195
		;;
984
	sparc | sparcv9 | sparcv9b)
1196
	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
985
		basic_machine=sparc-sun
1197
		basic_machine=sparc-sun
986
		;;
1198
		;;
987
        cydra)
1199
	cydra)
988
		basic_machine=cydra-cydrome
1200
		basic_machine=cydra-cydrome
989
		;;
1201
		;;
990
	orion)
1202
	orion)
 Lines 999-1008    Link Here 
999
	pmac | pmac-mpw)
1211
	pmac | pmac-mpw)
1000
		basic_machine=powerpc-apple
1212
		basic_machine=powerpc-apple
1001
		;;
1213
		;;
1002
	c4x*)
1003
		basic_machine=c4x-none
1004
		os=-coff
1005
		;;
1006
	*-unknown)
1214
	*-unknown)
1007
		# Make sure to match an already-canonicalized machine name.
1215
		# Make sure to match an already-canonicalized machine name.
1008
		;;
1216
		;;
 Lines 1054-1074    Link Here 
1054
	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1262
	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1055
	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
1263
	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
1056
	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1264
	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1265
	      | -kopensolaris* \
1057
	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1266
	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1058
	      | -aos* \
1267
	      | -aos* | -aros* \
1059
	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1268
	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1060
	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1269
	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1061
	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
1270
	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1062
	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1271
	      | -openbsd* | -solidbsd* \
1272
	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1273
	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1063
	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1274
	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1064
	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1275
	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1065
	      | -chorusos* | -chorusrdb* \
1276
	      | -chorusos* | -chorusrdb* | -cegcc* \
1066
	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1277
	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1067
	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
1278
	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1068
	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
1279
	      | -uxpv* | -beos* | -mpeix* | -udk* \
1280
	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1069
	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1281
	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1070
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1282
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1071
	      | -os2* | -vos*)
1283
	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1284
	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1285
	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1286
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
1072
	# Remember, each alternative MUST END IN *, to match a version number.
1287
	# Remember, each alternative MUST END IN *, to match a version number.
1073
		;;
1288
		;;
1074
	-qnx*)
1289
	-qnx*)
 Lines 1080-1095    Link Here 
1080
			;;
1295
			;;
1081
		esac
1296
		esac
1082
		;;
1297
		;;
1298
	-nto-qnx*)
1299
		;;
1083
	-nto*)
1300
	-nto*)
1084
		os=-nto-qnx
1301
		os=`echo $os | sed -e 's|nto|nto-qnx|'`
1085
		;;
1302
		;;
1086
	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1303
	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1087
	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
1304
	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
1088
	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
1305
	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
1089
		;;
1306
		;;
1090
	-mac*)
1307
	-mac*)
1091
		os=`echo $os | sed -e 's|mac|macos|'`
1308
		os=`echo $os | sed -e 's|mac|macos|'`
1092
		;;
1309
		;;
1310
	-linux-dietlibc)
1311
		os=-linux-dietlibc
1312
		;;
1093
	-linux*)
1313
	-linux*)
1094
		os=`echo $os | sed -e 's|linux|linux-gnu|'`
1314
		os=`echo $os | sed -e 's|linux|linux-gnu|'`
1095
		;;
1315
		;;
 Lines 1102-1107    Link Here 
1102
	-opened*)
1322
	-opened*)
1103
		os=-openedition
1323
		os=-openedition
1104
		;;
1324
		;;
1325
        -os400*)
1326
		os=-os400
1327
		;;
1105
	-wince*)
1328
	-wince*)
1106
		os=-wince
1329
		os=-wince
1107
		;;
1330
		;;
 Lines 1120-1133    Link Here 
1120
	-acis*)
1343
	-acis*)
1121
		os=-aos
1344
		os=-aos
1122
		;;
1345
		;;
1346
	-atheos*)
1347
		os=-atheos
1348
		;;
1349
	-syllable*)
1350
		os=-syllable
1351
		;;
1123
	-386bsd)
1352
	-386bsd)
1124
		os=-bsd
1353
		os=-bsd
1125
		;;
1354
		;;
1126
	-ctix* | -uts*)
1355
	-ctix* | -uts*)
1127
		os=-sysv
1356
		os=-sysv
1128
		;;
1357
		;;
1358
	-nova*)
1359
		os=-rtmk-nova
1360
		;;
1129
	-ns2 )
1361
	-ns2 )
1130
	        os=-nextstep2
1362
		os=-nextstep2
1131
		;;
1363
		;;
1132
	-nsk*)
1364
	-nsk*)
1133
		os=-nsk
1365
		os=-nsk
 Lines 1139-1144    Link Here 
1139
	-sinix*)
1371
	-sinix*)
1140
		os=-sysv4
1372
		os=-sysv4
1141
		;;
1373
		;;
1374
        -tpf*)
1375
		os=-tpf
1376
		;;
1142
	-triton*)
1377
	-triton*)
1143
		os=-sysv3
1378
		os=-sysv3
1144
		;;
1379
		;;
 Lines 1166-1173    Link Here 
1166
	-xenix)
1401
	-xenix)
1167
		os=-xenix
1402
		os=-xenix
1168
		;;
1403
		;;
1169
        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1404
	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1170
	        os=-mint
1405
		os=-mint
1406
		;;
1407
	-aros*)
1408
		os=-aros
1409
		;;
1410
	-kaos*)
1411
		os=-kaos
1412
		;;
1413
	-zvmoe)
1414
		os=-zvmoe
1415
		;;
1416
	-dicos*)
1417
		os=-dicos
1171
		;;
1418
		;;
1172
	-none)
1419
	-none)
1173
		;;
1420
		;;
 Lines 1191-1196    Link Here 
1191
# system, and we'll never get to this point.
1438
# system, and we'll never get to this point.
1192
1439
1193
case $basic_machine in
1440
case $basic_machine in
1441
        score-*)
1442
		os=-elf
1443
		;;
1444
        spu-*)
1445
		os=-elf
1446
		;;
1194
	*-acorn)
1447
	*-acorn)
1195
		os=-riscix1.2
1448
		os=-riscix1.2
1196
		;;
1449
		;;
 Lines 1200-1209    Link Here 
1200
	arm*-semi)
1453
	arm*-semi)
1201
		os=-aout
1454
		os=-aout
1202
		;;
1455
		;;
1456
        c4x-* | tic4x-*)
1457
        	os=-coff
1458
		;;
1459
	# This must come before the *-dec entry.
1203
	pdp10-*)
1460
	pdp10-*)
1204
		os=-tops20
1461
		os=-tops20
1205
		;;
1462
		;;
1206
        pdp11-*)
1463
	pdp11-*)
1207
		os=-none
1464
		os=-none
1208
		;;
1465
		;;
1209
	*-dec | vax-*)
1466
	*-dec | vax-*)
 Lines 1224-1235    Link Here 
1224
	m68*-cisco)
1481
	m68*-cisco)
1225
		os=-aout
1482
		os=-aout
1226
		;;
1483
		;;
1484
        mep-*)
1485
		os=-elf
1486
		;;
1227
	mips*-cisco)
1487
	mips*-cisco)
1228
		os=-elf
1488
		os=-elf
1229
		;;
1489
		;;
1230
	mips*-*)
1490
	mips*-*)
1231
		os=-elf
1491
		os=-elf
1232
		;;
1492
		;;
1493
	or32-*)
1494
		os=-coff
1495
		;;
1233
	*-tti)	# must be before sparc entry or we get the wrong os.
1496
	*-tti)	# must be before sparc entry or we get the wrong os.
1234
		os=-sysv3
1497
		os=-sysv3
1235
		;;
1498
		;;
 Lines 1239-1247    Link Here 
1239
	*-be)
1502
	*-be)
1240
		os=-beos
1503
		os=-beos
1241
		;;
1504
		;;
1505
	*-haiku)
1506
		os=-haiku
1507
		;;
1242
	*-ibm)
1508
	*-ibm)
1243
		os=-aix
1509
		os=-aix
1244
		;;
1510
		;;
1511
    	*-knuth)
1512
		os=-mmixware
1513
		;;
1245
	*-wec)
1514
	*-wec)
1246
		os=-proelf
1515
		os=-proelf
1247
		;;
1516
		;;
 Lines 1293-1311    Link Here 
1293
	*-next)
1562
	*-next)
1294
		os=-nextstep3
1563
		os=-nextstep3
1295
		;;
1564
		;;
1296
        *-gould)
1565
	*-gould)
1297
		os=-sysv
1566
		os=-sysv
1298
		;;
1567
		;;
1299
        *-highlevel)
1568
	*-highlevel)
1300
		os=-bsd
1569
		os=-bsd
1301
		;;
1570
		;;
1302
	*-encore)
1571
	*-encore)
1303
		os=-bsd
1572
		os=-bsd
1304
		;;
1573
		;;
1305
        *-sgi)
1574
	*-sgi)
1306
		os=-irix
1575
		os=-irix
1307
		;;
1576
		;;
1308
        *-siemens)
1577
	*-siemens)
1309
		os=-sysv4
1578
		os=-sysv4
1310
		;;
1579
		;;
1311
	*-masscomp)
1580
	*-masscomp)
 Lines 1374-1383    Link Here 
1374
			-mvs* | -opened*)
1643
			-mvs* | -opened*)
1375
				vendor=ibm
1644
				vendor=ibm
1376
				;;
1645
				;;
1646
			-os400*)
1647
				vendor=ibm
1648
				;;
1377
			-ptx*)
1649
			-ptx*)
1378
				vendor=sequent
1650
				vendor=sequent
1379
				;;
1651
				;;
1380
			-vxsim* | -vxworks*)
1652
			-tpf*)
1653
				vendor=ibm
1654
				;;
1655
			-vxsim* | -vxworks* | -windiss*)
1381
				vendor=wrs
1656
				vendor=wrs
1382
				;;
1657
				;;
1383
			-aux*)
1658
			-aux*)
 Lines 1401-1407    Link Here 
1401
esac
1676
esac
1402
1677
1403
echo $basic_machine$os
1678
echo $basic_machine$os
1404
exit 0
1679
exit
1405
1680
1406
# Local variables:
1681
# Local variables:
1407
# eval: (add-hook 'write-file-hooks 'time-stamp)
1682
# eval: (add-hook 'write-file-hooks 'time-stamp)
1408
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/config.guess
1683
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/config.guess
 Lines 1-9    Link Here 
1
#! /bin/sh
1
#! /bin/sh
2
# Attempt to guess a canonical system name.
2
# Attempt to guess a canonical system name.
3
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
3
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
4
#   Free Software Foundation, Inc.
5
#   Free Software Foundation, Inc.
5
6
6
timestamp='2001-09-04'
7
timestamp='2009-04-27'
7
8
8
# This file is free software; you can redistribute it and/or modify it
9
# This file is free software; you can redistribute it and/or modify it
9
# under the terms of the GNU General Public License as published by
10
# under the terms of the GNU General Public License as published by
 Lines 17-31    Link Here 
17
#
18
#
18
# You should have received a copy of the GNU General Public License
19
# You should have received a copy of the GNU General Public License
19
# along with this program; if not, write to the Free Software
20
# along with this program; if not, write to the Free Software
20
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
21
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
22
# 02110-1301, USA.
21
#
23
#
22
# As a special exception to the GNU General Public License, if you
24
# As a special exception to the GNU General Public License, if you
23
# distribute this file as part of a program that contains a
25
# distribute this file as part of a program that contains a
24
# configuration script generated by Autoconf, you may include it under
26
# configuration script generated by Autoconf, you may include it under
25
# the same distribution terms that you use for the rest of that program.
27
# the same distribution terms that you use for the rest of that program.
26
28
27
# Written by Per Bothner <bothner@cygnus.com>.
29
28
# Please send patches to <config-patches@gnu.org>.
30
# Originally written by Per Bothner <per@bothner.com>.
31
# Please send patches to <config-patches@gnu.org>.  Submit a context
32
# diff and a properly formatted ChangeLog entry.
29
#
33
#
30
# This script attempts to guess a canonical system name similar to
34
# This script attempts to guess a canonical system name similar to
31
# config.sub.  If it succeeds, it prints the system name on stdout, and
35
# config.sub.  If it succeeds, it prints the system name on stdout, and
 Lines 52-59    Link Here 
52
GNU config.guess ($timestamp)
56
GNU config.guess ($timestamp)
53
57
54
Originally written by Per Bothner.
58
Originally written by Per Bothner.
55
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
59
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
56
Free Software Foundation, Inc.
60
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
57
61
58
This is free software; see the source for copying conditions.  There is NO
62
This is free software; see the source for copying conditions.  There is NO
59
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
63
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 Lines 65-75    Link Here 
65
while test $# -gt 0 ; do
69
while test $# -gt 0 ; do
66
  case $1 in
70
  case $1 in
67
    --time-stamp | --time* | -t )
71
    --time-stamp | --time* | -t )
68
       echo "$timestamp" ; exit 0 ;;
72
       echo "$timestamp" ; exit ;;
69
    --version | -v )
73
    --version | -v )
70
       echo "$version" ; exit 0 ;;
74
       echo "$version" ; exit ;;
71
    --help | --h* | -h )
75
    --help | --h* | -h )
72
       echo "$usage"; exit 0 ;;
76
       echo "$usage"; exit ;;
73
    -- )     # Stop option processing
77
    -- )     # Stop option processing
74
       shift; break ;;
78
       shift; break ;;
75
    - )	# Use stdin as input.
79
    - )	# Use stdin as input.
 Lines 87-116    Link Here 
87
  exit 1
91
  exit 1
88
fi
92
fi
89
93
94
trap 'exit 1' 1 2 15
90
95
91
dummy=dummy-$$
96
# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
92
trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
97
# compiler to aid in system detection is discouraged as it requires
98
# temporary files to be created and, as you can see below, it is a
99
# headache to deal with in a portable fashion.
93
100
94
# CC_FOR_BUILD -- compiler used by this script.
95
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
101
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
96
# use `HOST_CC' if defined, but it is deprecated.
102
# use `HOST_CC' if defined, but it is deprecated.
97
103
98
set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
104
# Portable tmp directory creation inspired by the Autoconf team.
99
 ,,)    echo "int dummy(){}" > $dummy.c ;
105
100
	for c in cc gcc c89 ; do
106
set_cc_for_build='
101
	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
107
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
102
	  if test $? = 0 ; then
108
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
109
: ${TMPDIR=/tmp} ;
110
 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
111
 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
112
 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
113
 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
114
dummy=$tmp/dummy ;
115
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
116
case $CC_FOR_BUILD,$HOST_CC,$CC in
117
 ,,)    echo "int x;" > $dummy.c ;
118
	for c in cc gcc c89 c99 ; do
119
	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
103
	     CC_FOR_BUILD="$c"; break ;
120
	     CC_FOR_BUILD="$c"; break ;
104
	  fi ;
121
	  fi ;
105
	done ;
122
	done ;
106
	rm -f $dummy.c $dummy.o $dummy.rel ;
107
	if test x"$CC_FOR_BUILD" = x ; then
123
	if test x"$CC_FOR_BUILD" = x ; then
108
	  CC_FOR_BUILD=no_compiler_found ;
124
	  CC_FOR_BUILD=no_compiler_found ;
109
	fi
125
	fi
110
	;;
126
	;;
111
 ,,*)   CC_FOR_BUILD=$CC ;;
127
 ,,*)   CC_FOR_BUILD=$CC ;;
112
 ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
128
 ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
113
esac'
129
esac ; set_cc_for_build= ;'
114
130
115
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
131
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
116
# (ghazi@noc.rutgers.edu 1994-08-24)
132
# (ghazi@noc.rutgers.edu 1994-08-24)
 Lines 127-155    Link Here 
127
143
128
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
144
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
129
    *:NetBSD:*:*)
145
    *:NetBSD:*:*)
130
	# Netbsd (nbsd) targets should (where applicable) match one or
146
	# NetBSD (nbsd) targets should (where applicable) match one or
131
	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
147
	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
132
	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
148
	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
133
	# switched to ELF, *-*-netbsd* would select the old
149
	# switched to ELF, *-*-netbsd* would select the old
134
	# object file format.  This provides both forward
150
	# object file format.  This provides both forward
135
	# compatibility and a consistent mechanism for selecting the
151
	# compatibility and a consistent mechanism for selecting the
136
	# object file format.
152
	# object file format.
137
	# Determine the machine/vendor (is the vendor relevant).
153
	#
138
	case "${UNAME_MACHINE}" in
154
	# Note: NetBSD doesn't particularly care about the vendor
139
	    amiga) machine=m68k-unknown ;;
155
	# portion of the name.  We always set it to "unknown".
140
	    arm32) machine=arm-unknown ;;
156
	sysctl="sysctl -n hw.machine_arch"
141
	    atari*) machine=m68k-atari ;;
157
	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
142
	    sun3*) machine=m68k-sun ;;
158
	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
143
	    mac68k) machine=m68k-apple ;;
159
	case "${UNAME_MACHINE_ARCH}" in
144
	    macppc) machine=powerpc-apple ;;
160
	    armeb) machine=armeb-unknown ;;
145
	    hp3[0-9][05]) machine=m68k-hp ;;
161
	    arm*) machine=arm-unknown ;;
146
	    ibmrt|romp-ibm) machine=romp-ibm ;;
162
	    sh3el) machine=shl-unknown ;;
147
	    *) machine=${UNAME_MACHINE}-unknown ;;
163
	    sh3eb) machine=sh-unknown ;;
164
	    sh5el) machine=sh5le-unknown ;;
165
	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
148
	esac
166
	esac
149
	# The Operating System including object format, if it has switched
167
	# The Operating System including object format, if it has switched
150
	# to ELF recently, or will in the future.
168
	# to ELF recently, or will in the future.
151
	case "${UNAME_MACHINE}" in
169
	case "${UNAME_MACHINE_ARCH}" in
152
	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
170
	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
153
		eval $set_cc_for_build
171
		eval $set_cc_for_build
154
		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
172
		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
155
			| grep __ELF__ >/dev/null
173
			| grep __ELF__ >/dev/null
 Lines 166-285    Link Here 
166
		;;
184
		;;
167
	esac
185
	esac
168
	# The OS release
186
	# The OS release
169
	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
187
	# Debian GNU/NetBSD machines have a different userland, and
188
	# thus, need a distinct triplet. However, they do not need
189
	# kernel version information, so it can be replaced with a
190
	# suitable tag, in the style of linux-gnu.
191
	case "${UNAME_VERSION}" in
192
	    Debian*)
193
		release='-gnu'
194
		;;
195
	    *)
196
		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
197
		;;
198
	esac
170
	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
199
	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
171
	# contains redundant information, the shorter form:
200
	# contains redundant information, the shorter form:
172
	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
201
	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
173
	echo "${machine}-${os}${release}"
202
	echo "${machine}-${os}${release}"
174
	exit 0 ;;
203
	exit ;;
204
    *:OpenBSD:*:*)
205
	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
206
	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
207
	exit ;;
208
    *:ekkoBSD:*:*)
209
	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
210
	exit ;;
211
    *:SolidBSD:*:*)
212
	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
213
	exit ;;
214
    macppc:MirBSD:*:*)
215
	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
216
	exit ;;
217
    *:MirBSD:*:*)
218
	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
219
	exit ;;
175
    alpha:OSF1:*:*)
220
    alpha:OSF1:*:*)
176
	if test $UNAME_RELEASE = "V4.0"; then
221
	case $UNAME_RELEASE in
222
	*4.0)
177
		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
223
		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
178
	fi
224
		;;
225
	*5.*)
226
	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
227
		;;
228
	esac
229
	# According to Compaq, /usr/sbin/psrinfo has been available on
230
	# OSF/1 and Tru64 systems produced since 1995.  I hope that
231
	# covers most systems running today.  This code pipes the CPU
232
	# types through head -n 1, so we only detect the type of CPU 0.
233
	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
234
	case "$ALPHA_CPU_TYPE" in
235
	    "EV4 (21064)")
236
		UNAME_MACHINE="alpha" ;;
237
	    "EV4.5 (21064)")
238
		UNAME_MACHINE="alpha" ;;
239
	    "LCA4 (21066/21068)")
240
		UNAME_MACHINE="alpha" ;;
241
	    "EV5 (21164)")
242
		UNAME_MACHINE="alphaev5" ;;
243
	    "EV5.6 (21164A)")
244
		UNAME_MACHINE="alphaev56" ;;
245
	    "EV5.6 (21164PC)")
246
		UNAME_MACHINE="alphapca56" ;;
247
	    "EV5.7 (21164PC)")
248
		UNAME_MACHINE="alphapca57" ;;
249
	    "EV6 (21264)")
250
		UNAME_MACHINE="alphaev6" ;;
251
	    "EV6.7 (21264A)")
252
		UNAME_MACHINE="alphaev67" ;;
253
	    "EV6.8CB (21264C)")
254
		UNAME_MACHINE="alphaev68" ;;
255
	    "EV6.8AL (21264B)")
256
		UNAME_MACHINE="alphaev68" ;;
257
	    "EV6.8CX (21264D)")
258
		UNAME_MACHINE="alphaev68" ;;
259
	    "EV6.9A (21264/EV69A)")
260
		UNAME_MACHINE="alphaev69" ;;
261
	    "EV7 (21364)")
262
		UNAME_MACHINE="alphaev7" ;;
263
	    "EV7.9 (21364A)")
264
		UNAME_MACHINE="alphaev79" ;;
265
	esac
266
	# A Pn.n version is a patched version.
179
	# A Vn.n version is a released version.
267
	# A Vn.n version is a released version.
180
	# A Tn.n version is a released field test version.
268
	# A Tn.n version is a released field test version.
181
	# A Xn.n version is an unreleased experimental baselevel.
269
	# A Xn.n version is an unreleased experimental baselevel.
182
	# 1.2 uses "1.2" for uname -r.
270
	# 1.2 uses "1.2" for uname -r.
183
	cat <<EOF >$dummy.s
271
	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
184
	.data
272
	exit ;;
185
\$Lformat:
186
	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
187
188
	.text
189
	.globl main
190
	.align 4
191
	.ent main
192
main:
193
	.frame \$30,16,\$26,0
194
	ldgp \$29,0(\$27)
195
	.prologue 1
196
	.long 0x47e03d80 # implver \$0
197
	lda \$2,-1
198
	.long 0x47e20c21 # amask \$2,\$1
199
	lda \$16,\$Lformat
200
	mov \$0,\$17
201
	not \$1,\$18
202
	jsr \$26,printf
203
	ldgp \$29,0(\$26)
204
	mov 0,\$16
205
	jsr \$26,exit
206
	.end main
207
EOF
208
	eval $set_cc_for_build
209
	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
210
	if test "$?" = 0 ; then
211
		case `./$dummy` in
212
			0-0)
213
				UNAME_MACHINE="alpha"
214
				;;
215
			1-0)
216
				UNAME_MACHINE="alphaev5"
217
				;;
218
			1-1)
219
				UNAME_MACHINE="alphaev56"
220
				;;
221
			1-101)
222
				UNAME_MACHINE="alphapca56"
223
				;;
224
			2-303)
225
				UNAME_MACHINE="alphaev6"
226
				;;
227
			2-307)
228
				UNAME_MACHINE="alphaev67"
229
				;;
230
			2-1307)
231
				UNAME_MACHINE="alphaev68"
232
				;;
233
		esac
234
	fi
235
	rm -f $dummy.s $dummy
236
	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
237
	exit 0 ;;
238
    Alpha\ *:Windows_NT*:*)
273
    Alpha\ *:Windows_NT*:*)
239
	# How do we know it's Interix rather than the generic POSIX subsystem?
274
	# How do we know it's Interix rather than the generic POSIX subsystem?
240
	# Should we change UNAME_MACHINE based on the output of uname instead
275
	# Should we change UNAME_MACHINE based on the output of uname instead
241
	# of the specific Alpha model?
276
	# of the specific Alpha model?
242
	echo alpha-pc-interix
277
	echo alpha-pc-interix
243
	exit 0 ;;
278
	exit ;;
244
    21064:Windows_NT:50:3)
279
    21064:Windows_NT:50:3)
245
	echo alpha-dec-winnt3.5
280
	echo alpha-dec-winnt3.5
246
	exit 0 ;;
281
	exit ;;
247
    Amiga*:UNIX_System_V:4.0:*)
282
    Amiga*:UNIX_System_V:4.0:*)
248
	echo m68k-unknown-sysv4
283
	echo m68k-unknown-sysv4
249
	exit 0;;
284
	exit ;;
250
    amiga:OpenBSD:*:*)
251
	echo m68k-unknown-openbsd${UNAME_RELEASE}
252
	exit 0 ;;
253
    *:[Aa]miga[Oo][Ss]:*:*)
285
    *:[Aa]miga[Oo][Ss]:*:*)
254
	echo ${UNAME_MACHINE}-unknown-amigaos
286
	echo ${UNAME_MACHINE}-unknown-amigaos
255
	exit 0 ;;
287
	exit ;;
256
    arc64:OpenBSD:*:*)
288
    *:[Mm]orph[Oo][Ss]:*:*)
257
	echo mips64el-unknown-openbsd${UNAME_RELEASE}
289
	echo ${UNAME_MACHINE}-unknown-morphos
258
	exit 0 ;;
290
	exit ;;
259
    arc:OpenBSD:*:*)
260
	echo mipsel-unknown-openbsd${UNAME_RELEASE}
261
	exit 0 ;;
262
    hkmips:OpenBSD:*:*)
263
	echo mips-unknown-openbsd${UNAME_RELEASE}
264
	exit 0 ;;
265
    pmax:OpenBSD:*:*)
266
	echo mipsel-unknown-openbsd${UNAME_RELEASE}
267
	exit 0 ;;
268
    sgi:OpenBSD:*:*)
269
	echo mips-unknown-openbsd${UNAME_RELEASE}
270
	exit 0 ;;
271
    wgrisc:OpenBSD:*:*)
272
	echo mipsel-unknown-openbsd${UNAME_RELEASE}
273
	exit 0 ;;
274
    *:OS/390:*:*)
291
    *:OS/390:*:*)
275
	echo i370-ibm-openedition
292
	echo i370-ibm-openedition
276
	exit 0 ;;
293
	exit ;;
294
    *:z/VM:*:*)
295
	echo s390-ibm-zvmoe
296
	exit ;;
297
    *:OS400:*:*)
298
        echo powerpc-ibm-os400
299
	exit ;;
277
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
300
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
278
	echo arm-acorn-riscix${UNAME_RELEASE}
301
	echo arm-acorn-riscix${UNAME_RELEASE}
279
	exit 0;;
302
	exit ;;
303
    arm:riscos:*:*|arm:RISCOS:*:*)
304
	echo arm-unknown-riscos
305
	exit ;;
280
    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
306
    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
281
	echo hppa1.1-hitachi-hiuxmpp
307
	echo hppa1.1-hitachi-hiuxmpp
282
	exit 0;;
308
	exit ;;
283
    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
309
    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
284
	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
310
	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
285
	if test "`(/bin/universe) 2>/dev/null`" = att ; then
311
	if test "`(/bin/universe) 2>/dev/null`" = att ; then
 Lines 287-311    Link Here 
287
	else
313
	else
288
		echo pyramid-pyramid-bsd
314
		echo pyramid-pyramid-bsd
289
	fi
315
	fi
290
	exit 0 ;;
316
	exit ;;
291
    NILE*:*:*:dcosx)
317
    NILE*:*:*:dcosx)
292
	echo pyramid-pyramid-svr4
318
	echo pyramid-pyramid-svr4
293
	exit 0 ;;
319
	exit ;;
320
    DRS?6000:unix:4.0:6*)
321
	echo sparc-icl-nx6
322
	exit ;;
323
    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
324
	case `/usr/bin/uname -p` in
325
	    sparc) echo sparc-icl-nx7; exit ;;
326
	esac ;;
327
    s390x:SunOS:*:*)
328
	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
329
	exit ;;
294
    sun4H:SunOS:5.*:*)
330
    sun4H:SunOS:5.*:*)
295
	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
331
	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
296
	exit 0 ;;
332
	exit ;;
297
    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
333
    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
298
	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
334
	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
299
	exit 0 ;;
335
	exit ;;
300
    i86pc:SunOS:5.*:*)
336
    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
301
	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
337
	eval $set_cc_for_build
302
	exit 0 ;;
338
	SUN_ARCH="i386"
339
	# If there is a compiler, see if it is configured for 64-bit objects.
340
	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
341
	# This test works for both compilers.
342
	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
343
	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
344
		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
345
		grep IS_64BIT_ARCH >/dev/null
346
	    then
347
		SUN_ARCH="x86_64"
348
	    fi
349
	fi
350
	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
351
	exit ;;
303
    sun4*:SunOS:6*:*)
352
    sun4*:SunOS:6*:*)
304
	# According to config.sub, this is the proper way to canonicalize
353
	# According to config.sub, this is the proper way to canonicalize
305
	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
354
	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
306
	# it's likely to be more like Solaris than SunOS4.
355
	# it's likely to be more like Solaris than SunOS4.
307
	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
356
	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
308
	exit 0 ;;
357
	exit ;;
309
    sun4*:SunOS:*:*)
358
    sun4*:SunOS:*:*)
310
	case "`/usr/bin/arch -k`" in
359
	case "`/usr/bin/arch -k`" in
311
	    Series*|S4*)
360
	    Series*|S4*)
 Lines 314-325    Link Here 
314
	esac
363
	esac
315
	# Japanese Language versions have a version number like `4.1.3-JL'.
364
	# Japanese Language versions have a version number like `4.1.3-JL'.
316
	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
365
	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
317
	exit 0 ;;
366
	exit ;;
318
    sun3*:SunOS:*:*)
367
    sun3*:SunOS:*:*)
319
	echo m68k-sun-sunos${UNAME_RELEASE}
368
	echo m68k-sun-sunos${UNAME_RELEASE}
320
	exit 0 ;;
369
	exit ;;
321
    sun*:*:4.2BSD:*)
370
    sun*:*:4.2BSD:*)
322
	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
371
	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
323
	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
372
	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
324
	case "`/bin/arch`" in
373
	case "`/bin/arch`" in
325
	    sun3)
374
	    sun3)
 Lines 329-344    Link Here 
329
		echo sparc-sun-sunos${UNAME_RELEASE}
378
		echo sparc-sun-sunos${UNAME_RELEASE}
330
		;;
379
		;;
331
	esac
380
	esac
332
	exit 0 ;;
381
	exit ;;
333
    aushp:SunOS:*:*)
382
    aushp:SunOS:*:*)
334
	echo sparc-auspex-sunos${UNAME_RELEASE}
383
	echo sparc-auspex-sunos${UNAME_RELEASE}
335
	exit 0 ;;
384
	exit ;;
336
    sparc*:NetBSD:*)
337
	echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
338
	exit 0 ;;
339
    atari*:OpenBSD:*:*)
340
	echo m68k-unknown-openbsd${UNAME_RELEASE}
341
	exit 0 ;;
342
    # The situation for MiNT is a little confusing.  The machine name
385
    # The situation for MiNT is a little confusing.  The machine name
343
    # can be virtually everything (everything which is not
386
    # can be virtually everything (everything which is not
344
    # "atarist" or "atariste" at least should have a processor
387
    # "atarist" or "atariste" at least should have a processor
 Lines 349-397    Link Here 
349
    # be no problem.
392
    # be no problem.
350
    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
393
    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
351
        echo m68k-atari-mint${UNAME_RELEASE}
394
        echo m68k-atari-mint${UNAME_RELEASE}
352
	exit 0 ;;
395
	exit ;;
353
    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
396
    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
354
	echo m68k-atari-mint${UNAME_RELEASE}
397
	echo m68k-atari-mint${UNAME_RELEASE}
355
        exit 0 ;;
398
        exit ;;
356
    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
399
    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
357
        echo m68k-atari-mint${UNAME_RELEASE}
400
        echo m68k-atari-mint${UNAME_RELEASE}
358
	exit 0 ;;
401
	exit ;;
359
    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
402
    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
360
        echo m68k-milan-mint${UNAME_RELEASE}
403
        echo m68k-milan-mint${UNAME_RELEASE}
361
        exit 0 ;;
404
        exit ;;
362
    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
405
    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
363
        echo m68k-hades-mint${UNAME_RELEASE}
406
        echo m68k-hades-mint${UNAME_RELEASE}
364
        exit 0 ;;
407
        exit ;;
365
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
408
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
366
        echo m68k-unknown-mint${UNAME_RELEASE}
409
        echo m68k-unknown-mint${UNAME_RELEASE}
367
        exit 0 ;;
410
        exit ;;
368
    sun3*:OpenBSD:*:*)
411
    m68k:machten:*:*)
369
	echo m68k-unknown-openbsd${UNAME_RELEASE}
412
	echo m68k-apple-machten${UNAME_RELEASE}
370
	exit 0 ;;
413
	exit ;;
371
    mac68k:OpenBSD:*:*)
372
	echo m68k-unknown-openbsd${UNAME_RELEASE}
373
	exit 0 ;;
374
    mvme68k:OpenBSD:*:*)
375
	echo m68k-unknown-openbsd${UNAME_RELEASE}
376
	exit 0 ;;
377
    mvme88k:OpenBSD:*:*)
378
	echo m88k-unknown-openbsd${UNAME_RELEASE}
379
	exit 0 ;;
380
    powerpc:machten:*:*)
414
    powerpc:machten:*:*)
381
	echo powerpc-apple-machten${UNAME_RELEASE}
415
	echo powerpc-apple-machten${UNAME_RELEASE}
382
	exit 0 ;;
416
	exit ;;
383
    RISC*:Mach:*:*)
417
    RISC*:Mach:*:*)
384
	echo mips-dec-mach_bsd4.3
418
	echo mips-dec-mach_bsd4.3
385
	exit 0 ;;
419
	exit ;;
386
    RISC*:ULTRIX:*:*)
420
    RISC*:ULTRIX:*:*)
387
	echo mips-dec-ultrix${UNAME_RELEASE}
421
	echo mips-dec-ultrix${UNAME_RELEASE}
388
	exit 0 ;;
422
	exit ;;
389
    VAX*:ULTRIX*:*:*)
423
    VAX*:ULTRIX*:*:*)
390
	echo vax-dec-ultrix${UNAME_RELEASE}
424
	echo vax-dec-ultrix${UNAME_RELEASE}
391
	exit 0 ;;
425
	exit ;;
392
    2020:CLIX:*:* | 2430:CLIX:*:*)
426
    2020:CLIX:*:* | 2430:CLIX:*:*)
393
	echo clipper-intergraph-clix${UNAME_RELEASE}
427
	echo clipper-intergraph-clix${UNAME_RELEASE}
394
	exit 0 ;;
428
	exit ;;
395
    mips:*:*:UMIPS | mips:*:*:RISCos)
429
    mips:*:*:UMIPS | mips:*:*:RISCos)
396
	eval $set_cc_for_build
430
	eval $set_cc_for_build
397
	sed 's/^	//' << EOF >$dummy.c
431
	sed 's/^	//' << EOF >$dummy.c
 Lines 415-441    Link Here 
415
	  exit (-1);
449
	  exit (-1);
416
	}
450
	}
417
EOF
451
EOF
418
	$CC_FOR_BUILD $dummy.c -o $dummy \
452
	$CC_FOR_BUILD -o $dummy $dummy.c &&
419
	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
453
	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
420
	  && rm -f $dummy.c $dummy && exit 0
454
	  SYSTEM_NAME=`$dummy $dummyarg` &&
421
	rm -f $dummy.c $dummy
455
	    { echo "$SYSTEM_NAME"; exit; }
422
	echo mips-mips-riscos${UNAME_RELEASE}
456
	echo mips-mips-riscos${UNAME_RELEASE}
423
	exit 0 ;;
457
	exit ;;
424
    Motorola:PowerMAX_OS:*:*)
458
    Motorola:PowerMAX_OS:*:*)
425
	echo powerpc-motorola-powermax
459
	echo powerpc-motorola-powermax
426
	exit 0 ;;
460
	exit ;;
461
    Motorola:*:4.3:PL8-*)
462
	echo powerpc-harris-powermax
463
	exit ;;
464
    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
465
	echo powerpc-harris-powermax
466
	exit ;;
427
    Night_Hawk:Power_UNIX:*:*)
467
    Night_Hawk:Power_UNIX:*:*)
428
	echo powerpc-harris-powerunix
468
	echo powerpc-harris-powerunix
429
	exit 0 ;;
469
	exit ;;
430
    m88k:CX/UX:7*:*)
470
    m88k:CX/UX:7*:*)
431
	echo m88k-harris-cxux7
471
	echo m88k-harris-cxux7
432
	exit 0 ;;
472
	exit ;;
433
    m88k:*:4*:R4*)
473
    m88k:*:4*:R4*)
434
	echo m88k-motorola-sysv4
474
	echo m88k-motorola-sysv4
435
	exit 0 ;;
475
	exit ;;
436
    m88k:*:3*:R3*)
476
    m88k:*:3*:R3*)
437
	echo m88k-motorola-sysv3
477
	echo m88k-motorola-sysv3
438
	exit 0 ;;
478
	exit ;;
439
    AViiON:dgux:*:*)
479
    AViiON:dgux:*:*)
440
        # DG/UX returns AViiON for all architectures
480
        # DG/UX returns AViiON for all architectures
441
        UNAME_PROCESSOR=`/usr/bin/uname -p`
481
        UNAME_PROCESSOR=`/usr/bin/uname -p`
 Lines 451-479    Link Here 
451
	else
491
	else
452
	    echo i586-dg-dgux${UNAME_RELEASE}
492
	    echo i586-dg-dgux${UNAME_RELEASE}
453
	fi
493
	fi
454
 	exit 0 ;;
494
 	exit ;;
455
    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
495
    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
456
	echo m88k-dolphin-sysv3
496
	echo m88k-dolphin-sysv3
457
	exit 0 ;;
497
	exit ;;
458
    M88*:*:R3*:*)
498
    M88*:*:R3*:*)
459
	# Delta 88k system running SVR3
499
	# Delta 88k system running SVR3
460
	echo m88k-motorola-sysv3
500
	echo m88k-motorola-sysv3
461
	exit 0 ;;
501
	exit ;;
462
    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
502
    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
463
	echo m88k-tektronix-sysv3
503
	echo m88k-tektronix-sysv3
464
	exit 0 ;;
504
	exit ;;
465
    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
505
    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
466
	echo m68k-tektronix-bsd
506
	echo m68k-tektronix-bsd
467
	exit 0 ;;
507
	exit ;;
468
    *:IRIX*:*:*)
508
    *:IRIX*:*:*)
469
	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
509
	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
470
	exit 0 ;;
510
	exit ;;
471
    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
511
    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
472
	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
512
	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
473
	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
513
	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
474
    i*86:AIX:*:*)
514
    i*86:AIX:*:*)
475
	echo i386-ibm-aix
515
	echo i386-ibm-aix
476
	exit 0 ;;
516
	exit ;;
477
    ia64:AIX:*:*)
517
    ia64:AIX:*:*)
478
	if [ -x /usr/bin/oslevel ] ; then
518
	if [ -x /usr/bin/oslevel ] ; then
479
		IBM_REV=`/usr/bin/oslevel`
519
		IBM_REV=`/usr/bin/oslevel`
 Lines 481-487    Link Here 
481
		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
521
		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
482
	fi
522
	fi
483
	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
523
	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
484
	exit 0 ;;
524
	exit ;;
485
    *:AIX:2:3)
525
    *:AIX:2:3)
486
	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
526
	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
487
		eval $set_cc_for_build
527
		eval $set_cc_for_build
 Lines 496-512    Link Here 
496
			exit(0);
536
			exit(0);
497
			}
537
			}
498
EOF
538
EOF
499
		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
539
		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
500
		rm -f $dummy.c $dummy
540
		then
501
		echo rs6000-ibm-aix3.2.5
541
			echo "$SYSTEM_NAME"
542
		else
543
			echo rs6000-ibm-aix3.2.5
544
		fi
502
	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
545
	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
503
		echo rs6000-ibm-aix3.2.4
546
		echo rs6000-ibm-aix3.2.4
504
	else
547
	else
505
		echo rs6000-ibm-aix3.2
548
		echo rs6000-ibm-aix3.2
506
	fi
549
	fi
507
	exit 0 ;;
550
	exit ;;
508
    *:AIX:*:[45])
551
    *:AIX:*:[456])
509
	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
552
	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
510
	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
553
	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
511
		IBM_ARCH=rs6000
554
		IBM_ARCH=rs6000
512
	else
555
	else
 Lines 518-555    Link Here 
518
		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
561
		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
519
	fi
562
	fi
520
	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
563
	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
521
	exit 0 ;;
564
	exit ;;
522
    *:AIX:*:*)
565
    *:AIX:*:*)
523
	echo rs6000-ibm-aix
566
	echo rs6000-ibm-aix
524
	exit 0 ;;
567
	exit ;;
525
    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
568
    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
526
	echo romp-ibm-bsd4.4
569
	echo romp-ibm-bsd4.4
527
	exit 0 ;;
570
	exit ;;
528
    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
571
    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
529
	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
572
	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
530
	exit 0 ;;                           # report: romp-ibm BSD 4.3
573
	exit ;;                             # report: romp-ibm BSD 4.3
531
    *:BOSX:*:*)
574
    *:BOSX:*:*)
532
	echo rs6000-bull-bosx
575
	echo rs6000-bull-bosx
533
	exit 0 ;;
576
	exit ;;
534
    DPX/2?00:B.O.S.:*:*)
577
    DPX/2?00:B.O.S.:*:*)
535
	echo m68k-bull-sysv3
578
	echo m68k-bull-sysv3
536
	exit 0 ;;
579
	exit ;;
537
    9000/[34]??:4.3bsd:1.*:*)
580
    9000/[34]??:4.3bsd:1.*:*)
538
	echo m68k-hp-bsd
581
	echo m68k-hp-bsd
539
	exit 0 ;;
582
	exit ;;
540
    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
583
    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
541
	echo m68k-hp-bsd4.4
584
	echo m68k-hp-bsd4.4
542
	exit 0 ;;
585
	exit ;;
543
    9000/[34678]??:HP-UX:*:*)
586
    9000/[34678]??:HP-UX:*:*)
544
	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
587
	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
545
	case "${UNAME_MACHINE}" in
588
	case "${UNAME_MACHINE}" in
546
	    9000/31? )            HP_ARCH=m68000 ;;
589
	    9000/31? )            HP_ARCH=m68000 ;;
547
	    9000/[34]?? )         HP_ARCH=m68k ;;
590
	    9000/[34]?? )         HP_ARCH=m68k ;;
548
	    9000/[678][0-9][0-9])
591
	    9000/[678][0-9][0-9])
549
              case "${HPUX_REV}" in
592
		if [ -x /usr/bin/getconf ]; then
550
                11.[0-9][0-9])
593
		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
551
                  if [ -x /usr/bin/getconf ]; then
552
                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
553
                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
594
                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
554
                    case "${sc_cpu_version}" in
595
                    case "${sc_cpu_version}" in
555
                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
596
                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
 Lines 558-570    Link Here 
558
                        case "${sc_kernel_bits}" in
599
                        case "${sc_kernel_bits}" in
559
                          32) HP_ARCH="hppa2.0n" ;;
600
                          32) HP_ARCH="hppa2.0n" ;;
560
                          64) HP_ARCH="hppa2.0w" ;;
601
                          64) HP_ARCH="hppa2.0w" ;;
602
			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
561
                        esac ;;
603
                        esac ;;
562
                    esac
604
                    esac
563
                  fi ;;
605
		fi
564
              esac
606
		if [ "${HP_ARCH}" = "" ]; then
565
              if [ "${HP_ARCH}" = "" ]; then
607
		    eval $set_cc_for_build
566
	      eval $set_cc_for_build
608
		    sed 's/^              //' << EOF >$dummy.c
567
              sed 's/^              //' << EOF >$dummy.c
568
609
569
              #define _HPUX_SOURCE
610
              #define _HPUX_SOURCE
570
              #include <stdlib.h>
611
              #include <stdlib.h>
 Lines 597-613    Link Here 
597
                  exit (0);
638
                  exit (0);
598
              }
639
              }
599
EOF
640
EOF
600
	    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
641
		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
601
	    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
642
		    test -z "$HP_ARCH" && HP_ARCH=hppa
602
	    rm -f $dummy.c $dummy
643
		fi ;;
603
	fi ;;
604
	esac
644
	esac
645
	if [ ${HP_ARCH} = "hppa2.0w" ]
646
	then
647
	    eval $set_cc_for_build
648
649
	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
650
	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
651
	    # generating 64-bit code.  GNU and HP use different nomenclature:
652
	    #
653
	    # $ CC_FOR_BUILD=cc ./config.guess
654
	    # => hppa2.0w-hp-hpux11.23
655
	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
656
	    # => hppa64-hp-hpux11.23
657
658
	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
659
		grep __LP64__ >/dev/null
660
	    then
661
		HP_ARCH="hppa2.0w"
662
	    else
663
		HP_ARCH="hppa64"
664
	    fi
665
	fi
605
	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
666
	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
606
	exit 0 ;;
667
	exit ;;
607
    ia64:HP-UX:*:*)
668
    ia64:HP-UX:*:*)
608
	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
669
	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
609
	echo ia64-hp-hpux${HPUX_REV}
670
	echo ia64-hp-hpux${HPUX_REV}
610
	exit 0 ;;
671
	exit ;;
611
    3050*:HI-UX:*:*)
672
    3050*:HI-UX:*:*)
612
	eval $set_cc_for_build
673
	eval $set_cc_for_build
613
	sed 's/^	//' << EOF >$dummy.c
674
	sed 's/^	//' << EOF >$dummy.c
 Lines 635-792    Link Here 
635
	  exit (0);
696
	  exit (0);
636
	}
697
	}
637
EOF
698
EOF
638
	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
699
	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
639
	rm -f $dummy.c $dummy
700
		{ echo "$SYSTEM_NAME"; exit; }
640
	echo unknown-hitachi-hiuxwe2
701
	echo unknown-hitachi-hiuxwe2
641
	exit 0 ;;
702
	exit ;;
642
    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
703
    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
643
	echo hppa1.1-hp-bsd
704
	echo hppa1.1-hp-bsd
644
	exit 0 ;;
705
	exit ;;
645
    9000/8??:4.3bsd:*:*)
706
    9000/8??:4.3bsd:*:*)
646
	echo hppa1.0-hp-bsd
707
	echo hppa1.0-hp-bsd
647
	exit 0 ;;
708
	exit ;;
648
    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
709
    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
649
	echo hppa1.0-hp-mpeix
710
	echo hppa1.0-hp-mpeix
650
	exit 0 ;;
711
	exit ;;
651
    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
712
    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
652
	echo hppa1.1-hp-osf
713
	echo hppa1.1-hp-osf
653
	exit 0 ;;
714
	exit ;;
654
    hp8??:OSF1:*:*)
715
    hp8??:OSF1:*:*)
655
	echo hppa1.0-hp-osf
716
	echo hppa1.0-hp-osf
656
	exit 0 ;;
717
	exit ;;
657
    i*86:OSF1:*:*)
718
    i*86:OSF1:*:*)
658
	if [ -x /usr/sbin/sysversion ] ; then
719
	if [ -x /usr/sbin/sysversion ] ; then
659
	    echo ${UNAME_MACHINE}-unknown-osf1mk
720
	    echo ${UNAME_MACHINE}-unknown-osf1mk
660
	else
721
	else
661
	    echo ${UNAME_MACHINE}-unknown-osf1
722
	    echo ${UNAME_MACHINE}-unknown-osf1
662
	fi
723
	fi
663
	exit 0 ;;
724
	exit ;;
664
    parisc*:Lites*:*:*)
725
    parisc*:Lites*:*:*)
665
	echo hppa1.1-hp-lites
726
	echo hppa1.1-hp-lites
666
	exit 0 ;;
727
	exit ;;
667
    hppa*:OpenBSD:*:*)
668
	echo hppa-unknown-openbsd
669
	exit 0 ;;
670
    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
728
    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
671
	echo c1-convex-bsd
729
	echo c1-convex-bsd
672
        exit 0 ;;
730
        exit ;;
673
    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
731
    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
674
	if getsysinfo -f scalar_acc
732
	if getsysinfo -f scalar_acc
675
	then echo c32-convex-bsd
733
	then echo c32-convex-bsd
676
	else echo c2-convex-bsd
734
	else echo c2-convex-bsd
677
	fi
735
	fi
678
        exit 0 ;;
736
        exit ;;
679
    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
737
    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
680
	echo c34-convex-bsd
738
	echo c34-convex-bsd
681
        exit 0 ;;
739
        exit ;;
682
    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
740
    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
683
	echo c38-convex-bsd
741
	echo c38-convex-bsd
684
        exit 0 ;;
742
        exit ;;
685
    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
743
    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
686
	echo c4-convex-bsd
744
	echo c4-convex-bsd
687
        exit 0 ;;
745
        exit ;;
688
    CRAY*X-MP:*:*:*)
689
	echo xmp-cray-unicos
690
        exit 0 ;;
691
    CRAY*Y-MP:*:*:*)
746
    CRAY*Y-MP:*:*:*)
692
	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
747
	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
693
	exit 0 ;;
748
	exit ;;
694
    CRAY*[A-Z]90:*:*:*)
749
    CRAY*[A-Z]90:*:*:*)
695
	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
750
	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
696
	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
751
	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
697
	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
752
	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
698
	      -e 's/\.[^.]*$/.X/'
753
	      -e 's/\.[^.]*$/.X/'
699
	exit 0 ;;
754
	exit ;;
700
    CRAY*TS:*:*:*)
755
    CRAY*TS:*:*:*)
701
	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
756
	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
702
	exit 0 ;;
757
	exit ;;
703
    CRAY*T3D:*:*:*)
704
	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
705
	exit 0 ;;
706
    CRAY*T3E:*:*:*)
758
    CRAY*T3E:*:*:*)
707
	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
759
	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
708
	exit 0 ;;
760
	exit ;;
709
    CRAY*SV1:*:*:*)
761
    CRAY*SV1:*:*:*)
710
	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
762
	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
711
	exit 0 ;;
763
	exit ;;
712
    CRAY-2:*:*:*)
764
    *:UNICOS/mp:*:*)
713
	echo cray2-cray-unicos
765
	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
714
        exit 0 ;;
766
	exit ;;
715
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
767
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
716
	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
768
	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
717
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
769
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
718
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
770
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
719
        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
771
        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
720
        exit 0 ;;
772
        exit ;;
721
    hp300:OpenBSD:*:*)
773
    5000:UNIX_System_V:4.*:*)
722
	echo m68k-unknown-openbsd${UNAME_RELEASE}
774
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
723
	exit 0 ;;
775
        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
776
        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
777
	exit ;;
724
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
778
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
725
	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
779
	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
726
	exit 0 ;;
780
	exit ;;
727
    sparc*:BSD/OS:*:*)
781
    sparc*:BSD/OS:*:*)
728
	echo sparc-unknown-bsdi${UNAME_RELEASE}
782
	echo sparc-unknown-bsdi${UNAME_RELEASE}
729
	exit 0 ;;
783
	exit ;;
730
    *:BSD/OS:*:*)
784
    *:BSD/OS:*:*)
731
	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
785
	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
732
	exit 0 ;;
786
	exit ;;
733
    *:FreeBSD:*:*)
787
    *:FreeBSD:*:*)
734
	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
788
	case ${UNAME_MACHINE} in
735
	exit 0 ;;
789
	    pc98)
736
    *:OpenBSD:*:*)
790
		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
737
	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
791
	    amd64)
738
	exit 0 ;;
792
		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
793
	    *)
794
		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
795
	esac
796
	exit ;;
739
    i*:CYGWIN*:*)
797
    i*:CYGWIN*:*)
740
	echo ${UNAME_MACHINE}-pc-cygwin
798
	echo ${UNAME_MACHINE}-pc-cygwin
741
	exit 0 ;;
799
	exit ;;
742
    i*:MINGW*:*)
800
    *:MINGW*:*)
743
	echo ${UNAME_MACHINE}-pc-mingw32
801
	echo ${UNAME_MACHINE}-pc-mingw32
744
	exit 0 ;;
802
	exit ;;
803
    i*:windows32*:*)
804
    	# uname -m includes "-pc" on this system.
805
    	echo ${UNAME_MACHINE}-mingw32
806
	exit ;;
745
    i*:PW*:*)
807
    i*:PW*:*)
746
	echo ${UNAME_MACHINE}-pc-pw32
808
	echo ${UNAME_MACHINE}-pc-pw32
747
	exit 0 ;;
809
	exit ;;
810
    *:Interix*:[3456]*)
811
    	case ${UNAME_MACHINE} in
812
	    x86)
813
		echo i586-pc-interix${UNAME_RELEASE}
814
		exit ;;
815
	    EM64T | authenticamd | genuineintel)
816
		echo x86_64-unknown-interix${UNAME_RELEASE}
817
		exit ;;
818
	    IA64)
819
		echo ia64-unknown-interix${UNAME_RELEASE}
820
		exit ;;
821
	esac ;;
822
    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
823
	echo i${UNAME_MACHINE}-pc-mks
824
	exit ;;
748
    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
825
    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
749
	# How do we know it's Interix rather than the generic POSIX subsystem?
826
	# How do we know it's Interix rather than the generic POSIX subsystem?
750
	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
827
	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
751
	# UNAME_MACHINE based on the output of uname instead of i386?
828
	# UNAME_MACHINE based on the output of uname instead of i386?
752
	echo i386-pc-interix
829
	echo i586-pc-interix
753
	exit 0 ;;
830
	exit ;;
754
    i*:UWIN*:*)
831
    i*:UWIN*:*)
755
	echo ${UNAME_MACHINE}-pc-uwin
832
	echo ${UNAME_MACHINE}-pc-uwin
756
	exit 0 ;;
833
	exit ;;
834
    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
835
	echo x86_64-unknown-cygwin
836
	exit ;;
757
    p*:CYGWIN*:*)
837
    p*:CYGWIN*:*)
758
	echo powerpcle-unknown-cygwin
838
	echo powerpcle-unknown-cygwin
759
	exit 0 ;;
839
	exit ;;
760
    prep*:SunOS:5.*:*)
840
    prep*:SunOS:5.*:*)
761
	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
841
	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
762
	exit 0 ;;
842
	exit ;;
763
    *:GNU:*:*)
843
    *:GNU:*:*)
844
	# the GNU system
764
	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
845
	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
765
	exit 0 ;;
846
	exit ;;
847
    *:GNU/*:*:*)
848
	# other systems with GNU libc and userland
849
	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
850
	exit ;;
766
    i*86:Minix:*:*)
851
    i*86:Minix:*:*)
767
	echo ${UNAME_MACHINE}-pc-minix
852
	echo ${UNAME_MACHINE}-pc-minix
768
	exit 0 ;;
853
	exit ;;
769
    arm*:Linux:*:*)
854
    arm*:Linux:*:*)
855
	eval $set_cc_for_build
856
	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
857
	    | grep -q __ARM_EABI__
858
	then
859
	    echo ${UNAME_MACHINE}-unknown-linux-gnu
860
	else
861
	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
862
	fi
863
	exit ;;
864
    avr32*:Linux:*:*)
770
	echo ${UNAME_MACHINE}-unknown-linux-gnu
865
	echo ${UNAME_MACHINE}-unknown-linux-gnu
771
	exit 0 ;;
866
	exit ;;
867
    cris:Linux:*:*)
868
	echo cris-axis-linux-gnu
869
	exit ;;
870
    crisv32:Linux:*:*)
871
	echo crisv32-axis-linux-gnu
872
	exit ;;
873
    frv:Linux:*:*)
874
    	echo frv-unknown-linux-gnu
875
	exit ;;
772
    ia64:Linux:*:*)
876
    ia64:Linux:*:*)
773
	echo ${UNAME_MACHINE}-unknown-linux
877
	echo ${UNAME_MACHINE}-unknown-linux-gnu
774
	exit 0 ;;
878
	exit ;;
879
    m32r*:Linux:*:*)
880
	echo ${UNAME_MACHINE}-unknown-linux-gnu
881
	exit ;;
775
    m68*:Linux:*:*)
882
    m68*:Linux:*:*)
776
	echo ${UNAME_MACHINE}-unknown-linux-gnu
883
	echo ${UNAME_MACHINE}-unknown-linux-gnu
777
	exit 0 ;;
884
	exit ;;
778
    mips:Linux:*:*)
885
    mips:Linux:*:*)
779
	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
886
	eval $set_cc_for_build
780
	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
887
	sed 's/^	//' << EOF >$dummy.c
781
	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
888
	#undef CPU
782
	esac
889
	#undef mips
890
	#undef mipsel
891
	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
892
	CPU=mipsel
893
	#else
894
	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
895
	CPU=mips
896
	#else
897
	CPU=
898
	#endif
899
	#endif
900
EOF
901
	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
902
	    /^CPU/{
903
		s: ::g
904
		p
905
	    }'`"
906
	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
907
	;;
908
    mips64:Linux:*:*)
909
	eval $set_cc_for_build
910
	sed 's/^	//' << EOF >$dummy.c
911
	#undef CPU
912
	#undef mips64
913
	#undef mips64el
914
	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
915
	CPU=mips64el
916
	#else
917
	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
918
	CPU=mips64
919
	#else
920
	CPU=
921
	#endif
922
	#endif
923
EOF
924
	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
925
	    /^CPU/{
926
		s: ::g
927
		p
928
	    }'`"
929
	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
783
	;;
930
	;;
931
    or32:Linux:*:*)
932
	echo or32-unknown-linux-gnu
933
	exit ;;
784
    ppc:Linux:*:*)
934
    ppc:Linux:*:*)
785
	echo powerpc-unknown-linux-gnu
935
	echo powerpc-unknown-linux-gnu
786
	exit 0 ;;
936
	exit ;;
787
    ppc64:Linux:*:*)
937
    ppc64:Linux:*:*)
788
	echo powerpc64-unknown-linux-gnu
938
	echo powerpc64-unknown-linux-gnu
789
	exit 0 ;;
939
	exit ;;
790
    alpha:Linux:*:*)
940
    alpha:Linux:*:*)
791
	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
941
	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
792
	  EV5)   UNAME_MACHINE=alphaev5 ;;
942
	  EV5)   UNAME_MACHINE=alphaev5 ;;
 Lines 800-806    Link Here 
800
	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
950
	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
801
	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
951
	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
802
	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
952
	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
803
	exit 0 ;;
953
	exit ;;
954
    padre:Linux:*:*)
955
	echo sparc-unknown-linux-gnu
956
	exit ;;
804
    parisc:Linux:*:* | hppa:Linux:*:*)
957
    parisc:Linux:*:* | hppa:Linux:*:*)
805
	# Look for CPU level
958
	# Look for CPU level
806
	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
959
	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
 Lines 808-834    Link Here 
808
	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
961
	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
809
	  *)    echo hppa-unknown-linux-gnu ;;
962
	  *)    echo hppa-unknown-linux-gnu ;;
810
	esac
963
	esac
811
	exit 0 ;;
964
	exit ;;
812
    parisc64:Linux:*:* | hppa64:Linux:*:*)
965
    parisc64:Linux:*:* | hppa64:Linux:*:*)
813
	echo hppa64-unknown-linux-gnu
966
	echo hppa64-unknown-linux-gnu
814
	exit 0 ;;
967
	exit ;;
815
    s390:Linux:*:* | s390x:Linux:*:*)
968
    s390:Linux:*:* | s390x:Linux:*:*)
816
	echo ${UNAME_MACHINE}-ibm-linux
969
	echo ${UNAME_MACHINE}-ibm-linux
817
	exit 0 ;;
970
	exit ;;
971
    sh64*:Linux:*:*)
972
    	echo ${UNAME_MACHINE}-unknown-linux-gnu
973
	exit ;;
818
    sh*:Linux:*:*)
974
    sh*:Linux:*:*)
819
	echo ${UNAME_MACHINE}-unknown-linux-gnu
975
	echo ${UNAME_MACHINE}-unknown-linux-gnu
820
	exit 0 ;;
976
	exit ;;
821
    sparc:Linux:*:* | sparc64:Linux:*:*)
977
    sparc:Linux:*:* | sparc64:Linux:*:*)
822
	echo ${UNAME_MACHINE}-unknown-linux-gnu
978
	echo ${UNAME_MACHINE}-unknown-linux-gnu
823
	exit 0 ;;
979
	exit ;;
980
    vax:Linux:*:*)
981
	echo ${UNAME_MACHINE}-dec-linux-gnu
982
	exit ;;
824
    x86_64:Linux:*:*)
983
    x86_64:Linux:*:*)
825
	echo x86_64-unknown-linux-gnu
984
	echo x86_64-unknown-linux-gnu
826
	exit 0 ;;
985
	exit ;;
986
    xtensa*:Linux:*:*)
987
    	echo ${UNAME_MACHINE}-unknown-linux-gnu
988
	exit ;;
827
    i*86:Linux:*:*)
989
    i*86:Linux:*:*)
828
	# The BFD linker knows what the default object file format is, so
990
	# The BFD linker knows what the default object file format is, so
829
	# first see if it will tell us. cd to the root directory to prevent
991
	# first see if it will tell us. cd to the root directory to prevent
830
	# problems with other programs or directories called `ld' in the path.
992
	# problems with other programs or directories called `ld' in the path.
831
	ld_supported_targets=`cd /; ld --help 2>&1 \
993
	# Set LC_ALL=C to ensure ld outputs messages in English.
994
	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
832
			 | sed -ne '/supported targets:/!d
995
			 | sed -ne '/supported targets:/!d
833
				    s/[ 	][ 	]*/ /g
996
				    s/[ 	][ 	]*/ /g
834
				    s/.*supported targets: *//
997
				    s/.*supported targets: *//
 Lines 840-891    Link Here 
840
		;;
1003
		;;
841
	  a.out-i386-linux)
1004
	  a.out-i386-linux)
842
		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
1005
		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
843
		exit 0 ;;		
1006
		exit ;;
844
	  coff-i386)
845
		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
846
		exit 0 ;;
847
	  "")
1007
	  "")
848
		# Either a pre-BFD a.out linker (linux-gnuoldld) or
1008
		# Either a pre-BFD a.out linker (linux-gnuoldld) or
849
		# one that does not give us useful --help.
1009
		# one that does not give us useful --help.
850
		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
1010
		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
851
		exit 0 ;;
1011
		exit ;;
852
	esac
1012
	esac
853
	# Determine whether the default compiler is a.out or elf
1013
	# Determine whether the default compiler is a.out or elf
854
	eval $set_cc_for_build
1014
	eval $set_cc_for_build
855
	cat >$dummy.c <<EOF
1015
	sed 's/^	//' << EOF >$dummy.c
856
#include <features.h>
1016
	#include <features.h>
857
#ifdef __cplusplus
1017
	#ifdef __ELF__
858
#include <stdio.h>  /* for printf() prototype */
1018
	# ifdef __GLIBC__
859
	int main (int argc, char *argv[]) {
1019
	#  if __GLIBC__ >= 2
860
#else
1020
	LIBC=gnu
861
	int main (argc, argv) int argc; char *argv[]; {
1021
	#  else
862
#endif
1022
	LIBC=gnulibc1
863
#ifdef __ELF__
1023
	#  endif
864
# ifdef __GLIBC__
1024
	# else
865
#  if __GLIBC__ >= 2
1025
	LIBC=gnulibc1
866
    printf ("%s-pc-linux-gnu\n", argv[1]);
1026
	# endif
867
#  else
1027
	#else
868
    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
1028
	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
869
#  endif
1029
	LIBC=gnu
870
# else
1030
	#else
871
   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
1031
	LIBC=gnuaout
872
# endif
1032
	#endif
873
#else
1033
	#endif
874
  printf ("%s-pc-linux-gnuaout\n", argv[1]);
1034
	#ifdef __dietlibc__
875
#endif
1035
	LIBC=dietlibc
876
  return 0;
1036
	#endif
877
}
878
EOF
1037
EOF
879
	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
1038
	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
880
	rm -f $dummy.c $dummy
1039
	    /^LIBC/{
881
	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
1040
		s: ::g
1041
		p
1042
	    }'`"
1043
	test x"${LIBC}" != x && {
1044
		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
1045
		exit
1046
	}
1047
	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
882
	;;
1048
	;;
883
    i*86:DYNIX/ptx:4*:*)
1049
    i*86:DYNIX/ptx:4*:*)
884
	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1050
	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
885
	# earlier versions are messed up and put the nodename in both
1051
	# earlier versions are messed up and put the nodename in both
886
	# sysname and nodename.
1052
	# sysname and nodename.
887
	echo i386-sequent-sysv4
1053
	echo i386-sequent-sysv4
888
	exit 0 ;;
1054
	exit ;;
889
    i*86:UNIX_SV:4.2MP:2.*)
1055
    i*86:UNIX_SV:4.2MP:2.*)
890
        # Unixware is an offshoot of SVR4, but it has its own version
1056
        # Unixware is an offshoot of SVR4, but it has its own version
891
        # number series starting with 2...
1057
        # number series starting with 2...
 Lines 893-899    Link Here 
893
	# I just have to hope.  -- rms.
1059
	# I just have to hope.  -- rms.
894
        # Use sysv4.2uw... so that sysv4* matches it.
1060
        # Use sysv4.2uw... so that sysv4* matches it.
895
	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
1061
	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
896
	exit 0 ;;
1062
	exit ;;
1063
    i*86:OS/2:*:*)
1064
	# If we were able to find `uname', then EMX Unix compatibility
1065
	# is probably installed.
1066
	echo ${UNAME_MACHINE}-pc-os2-emx
1067
	exit ;;
1068
    i*86:XTS-300:*:STOP)
1069
	echo ${UNAME_MACHINE}-unknown-stop
1070
	exit ;;
1071
    i*86:atheos:*:*)
1072
	echo ${UNAME_MACHINE}-unknown-atheos
1073
	exit ;;
1074
    i*86:syllable:*:*)
1075
	echo ${UNAME_MACHINE}-pc-syllable
1076
	exit ;;
1077
    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
1078
	echo i386-unknown-lynxos${UNAME_RELEASE}
1079
	exit ;;
1080
    i*86:*DOS:*:*)
1081
	echo ${UNAME_MACHINE}-pc-msdosdjgpp
1082
	exit ;;
897
    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
1083
    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
898
	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
1084
	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
899
	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
1085
	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
 Lines 901-999    Link Here 
901
	else
1087
	else
902
		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
1088
		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
903
	fi
1089
	fi
904
	exit 0 ;;
1090
	exit ;;
905
    i*86:*:5:[78]*)
1091
    i*86:*:5:[678]*)
1092
    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
906
	case `/bin/uname -X | grep "^Machine"` in
1093
	case `/bin/uname -X | grep "^Machine"` in
907
	    *486*)	     UNAME_MACHINE=i486 ;;
1094
	    *486*)	     UNAME_MACHINE=i486 ;;
908
	    *Pentium)	     UNAME_MACHINE=i586 ;;
1095
	    *Pentium)	     UNAME_MACHINE=i586 ;;
909
	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
1096
	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
910
	esac
1097
	esac
911
	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
1098
	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
912
	exit 0 ;;
1099
	exit ;;
913
    i*86:*:3.2:*)
1100
    i*86:*:3.2:*)
914
	if test -f /usr/options/cb.name; then
1101
	if test -f /usr/options/cb.name; then
915
		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
1102
		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
916
		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
1103
		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
917
	elif /bin/uname -X 2>/dev/null >/dev/null ; then
1104
	elif /bin/uname -X 2>/dev/null >/dev/null ; then
918
		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
1105
		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
919
		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
1106
		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
920
		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
1107
		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
921
			&& UNAME_MACHINE=i586
1108
			&& UNAME_MACHINE=i586
922
		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
1109
		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
923
			&& UNAME_MACHINE=i686
1110
			&& UNAME_MACHINE=i686
924
		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
1111
		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
925
			&& UNAME_MACHINE=i686
1112
			&& UNAME_MACHINE=i686
926
		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
1113
		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
927
	else
1114
	else
928
		echo ${UNAME_MACHINE}-pc-sysv32
1115
		echo ${UNAME_MACHINE}-pc-sysv32
929
	fi
1116
	fi
930
	exit 0 ;;
1117
	exit ;;
931
    i*86:*DOS:*:*)
932
	echo ${UNAME_MACHINE}-pc-msdosdjgpp
933
	exit 0 ;;
934
    pc:*:*:*)
1118
    pc:*:*:*)
935
	# Left here for compatibility:
1119
	# Left here for compatibility:
936
        # uname -m prints for DJGPP always 'pc', but it prints nothing about
1120
        # uname -m prints for DJGPP always 'pc', but it prints nothing about
937
        # the processor, so we play safe by assuming i386.
1121
        # the processor, so we play safe by assuming i586.
938
	echo i386-pc-msdosdjgpp
1122
	# Note: whatever this is, it MUST be the same as what config.sub
939
        exit 0 ;;
1123
	# prints for the "djgpp" host, or else GDB configury will decide that
1124
	# this is a cross-build.
1125
	echo i586-pc-msdosdjgpp
1126
        exit ;;
940
    Intel:Mach:3*:*)
1127
    Intel:Mach:3*:*)
941
	echo i386-pc-mach3
1128
	echo i386-pc-mach3
942
	exit 0 ;;
1129
	exit ;;
943
    paragon:*:*:*)
1130
    paragon:*:*:*)
944
	echo i860-intel-osf1
1131
	echo i860-intel-osf1
945
	exit 0 ;;
1132
	exit ;;
946
    i860:*:4.*:*) # i860-SVR4
1133
    i860:*:4.*:*) # i860-SVR4
947
	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1134
	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
948
	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
1135
	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
949
	else # Add other i860-SVR4 vendors below as they are discovered.
1136
	else # Add other i860-SVR4 vendors below as they are discovered.
950
	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
1137
	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
951
	fi
1138
	fi
952
	exit 0 ;;
1139
	exit ;;
953
    mini*:CTIX:SYS*5:*)
1140
    mini*:CTIX:SYS*5:*)
954
	# "miniframe"
1141
	# "miniframe"
955
	echo m68010-convergent-sysv
1142
	echo m68010-convergent-sysv
956
	exit 0 ;;
1143
	exit ;;
957
    M68*:*:R3V[567]*:*)
1144
    mc68k:UNIX:SYSTEM5:3.51m)
958
	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
1145
	echo m68k-convergent-sysv
959
    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
1146
	exit ;;
1147
    M680?0:D-NIX:5.3:*)
1148
	echo m68k-diab-dnix
1149
	exit ;;
1150
    M68*:*:R3V[5678]*:*)
1151
	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
1152
    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)
960
	OS_REL=''
1153
	OS_REL=''
961
	test -r /etc/.relid \
1154
	test -r /etc/.relid \
962
	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1155
	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
963
	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1156
	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
964
	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
1157
	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
965
	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1158
	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
966
	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
1159
	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
967
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1160
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
968
        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1161
        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
969
          && echo i486-ncr-sysv4 && exit 0 ;;
1162
          && { echo i486-ncr-sysv4; exit; } ;;
1163
    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
1164
	OS_REL='.3'
1165
	test -r /etc/.relid \
1166
	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1167
	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1168
	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1169
	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1170
	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
1171
	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1172
	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
970
    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1173
    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
971
	echo m68k-unknown-lynxos${UNAME_RELEASE}
1174
	echo m68k-unknown-lynxos${UNAME_RELEASE}
972
	exit 0 ;;
1175
	exit ;;
973
    mc68030:UNIX_System_V:4.*:*)
1176
    mc68030:UNIX_System_V:4.*:*)
974
	echo m68k-atari-sysv4
1177
	echo m68k-atari-sysv4
975
	exit 0 ;;
1178
	exit ;;
976
    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
977
	echo i386-unknown-lynxos${UNAME_RELEASE}
978
	exit 0 ;;
979
    TSUNAMI:LynxOS:2.*:*)
1179
    TSUNAMI:LynxOS:2.*:*)
980
	echo sparc-unknown-lynxos${UNAME_RELEASE}
1180
	echo sparc-unknown-lynxos${UNAME_RELEASE}
981
	exit 0 ;;
1181
	exit ;;
982
    rs6000:LynxOS:2.*:*)
1182
    rs6000:LynxOS:2.*:*)
983
	echo rs6000-unknown-lynxos${UNAME_RELEASE}
1183
	echo rs6000-unknown-lynxos${UNAME_RELEASE}
984
	exit 0 ;;
1184
	exit ;;
985
    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
1185
    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
986
	echo powerpc-unknown-lynxos${UNAME_RELEASE}
1186
	echo powerpc-unknown-lynxos${UNAME_RELEASE}
987
	exit 0 ;;
1187
	exit ;;
988
    SM[BE]S:UNIX_SV:*:*)
1188
    SM[BE]S:UNIX_SV:*:*)
989
	echo mips-dde-sysv${UNAME_RELEASE}
1189
	echo mips-dde-sysv${UNAME_RELEASE}
990
	exit 0 ;;
1190
	exit ;;
991
    RM*:ReliantUNIX-*:*:*)
1191
    RM*:ReliantUNIX-*:*:*)
992
	echo mips-sni-sysv4
1192
	echo mips-sni-sysv4
993
	exit 0 ;;
1193
	exit ;;
994
    RM*:SINIX-*:*:*)
1194
    RM*:SINIX-*:*:*)
995
	echo mips-sni-sysv4
1195
	echo mips-sni-sysv4
996
	exit 0 ;;
1196
	exit ;;
997
    *:SINIX-*:*:*)
1197
    *:SINIX-*:*:*)
998
	if uname -p 2>/dev/null >/dev/null ; then
1198
	if uname -p 2>/dev/null >/dev/null ; then
999
		UNAME_MACHINE=`(uname -p) 2>/dev/null`
1199
		UNAME_MACHINE=`(uname -p) 2>/dev/null`
 Lines 1001-1082    Link Here 
1001
	else
1201
	else
1002
		echo ns32k-sni-sysv
1202
		echo ns32k-sni-sysv
1003
	fi
1203
	fi
1004
	exit 0 ;;
1204
	exit ;;
1005
    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1205
    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1006
                      # says <Richard.M.Bartel@ccMail.Census.GOV>
1206
                      # says <Richard.M.Bartel@ccMail.Census.GOV>
1007
        echo i586-unisys-sysv4
1207
        echo i586-unisys-sysv4
1008
        exit 0 ;;
1208
        exit ;;
1009
    *:UNIX_System_V:4*:FTX*)
1209
    *:UNIX_System_V:4*:FTX*)
1010
	# From Gerald Hewes <hewes@openmarket.com>.
1210
	# From Gerald Hewes <hewes@openmarket.com>.
1011
	# How about differentiating between stratus architectures? -djm
1211
	# How about differentiating between stratus architectures? -djm
1012
	echo hppa1.1-stratus-sysv4
1212
	echo hppa1.1-stratus-sysv4
1013
	exit 0 ;;
1213
	exit ;;
1014
    *:*:*:FTX*)
1214
    *:*:*:FTX*)
1015
	# From seanf@swdc.stratus.com.
1215
	# From seanf@swdc.stratus.com.
1016
	echo i860-stratus-sysv4
1216
	echo i860-stratus-sysv4
1017
	exit 0 ;;
1217
	exit ;;
1218
    i*86:VOS:*:*)
1219
	# From Paul.Green@stratus.com.
1220
	echo ${UNAME_MACHINE}-stratus-vos
1221
	exit ;;
1018
    *:VOS:*:*)
1222
    *:VOS:*:*)
1019
	# From Paul.Green@stratus.com.
1223
	# From Paul.Green@stratus.com.
1020
	echo hppa1.1-stratus-vos
1224
	echo hppa1.1-stratus-vos
1021
	exit 0 ;;
1225
	exit ;;
1022
    mc68*:A/UX:*:*)
1226
    mc68*:A/UX:*:*)
1023
	echo m68k-apple-aux${UNAME_RELEASE}
1227
	echo m68k-apple-aux${UNAME_RELEASE}
1024
	exit 0 ;;
1228
	exit ;;
1025
    news*:NEWS-OS:6*:*)
1229
    news*:NEWS-OS:6*:*)
1026
	echo mips-sony-newsos6
1230
	echo mips-sony-newsos6
1027
	exit 0 ;;
1231
	exit ;;
1028
    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1232
    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1029
	if [ -d /usr/nec ]; then
1233
	if [ -d /usr/nec ]; then
1030
	        echo mips-nec-sysv${UNAME_RELEASE}
1234
	        echo mips-nec-sysv${UNAME_RELEASE}
1031
	else
1235
	else
1032
	        echo mips-unknown-sysv${UNAME_RELEASE}
1236
	        echo mips-unknown-sysv${UNAME_RELEASE}
1033
	fi
1237
	fi
1034
        exit 0 ;;
1238
        exit ;;
1035
    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
1239
    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
1036
	echo powerpc-be-beos
1240
	echo powerpc-be-beos
1037
	exit 0 ;;
1241
	exit ;;
1038
    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
1242
    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
1039
	echo powerpc-apple-beos
1243
	echo powerpc-apple-beos
1040
	exit 0 ;;
1244
	exit ;;
1041
    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
1245
    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
1042
	echo i586-pc-beos
1246
	echo i586-pc-beos
1043
	exit 0 ;;
1247
	exit ;;
1248
    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
1249
	echo i586-pc-haiku
1250
	exit ;;
1044
    SX-4:SUPER-UX:*:*)
1251
    SX-4:SUPER-UX:*:*)
1045
	echo sx4-nec-superux${UNAME_RELEASE}
1252
	echo sx4-nec-superux${UNAME_RELEASE}
1046
	exit 0 ;;
1253
	exit ;;
1047
    SX-5:SUPER-UX:*:*)
1254
    SX-5:SUPER-UX:*:*)
1048
	echo sx5-nec-superux${UNAME_RELEASE}
1255
	echo sx5-nec-superux${UNAME_RELEASE}
1049
	exit 0 ;;
1256
	exit ;;
1257
    SX-6:SUPER-UX:*:*)
1258
	echo sx6-nec-superux${UNAME_RELEASE}
1259
	exit ;;
1260
    SX-7:SUPER-UX:*:*)
1261
	echo sx7-nec-superux${UNAME_RELEASE}
1262
	exit ;;
1263
    SX-8:SUPER-UX:*:*)
1264
	echo sx8-nec-superux${UNAME_RELEASE}
1265
	exit ;;
1266
    SX-8R:SUPER-UX:*:*)
1267
	echo sx8r-nec-superux${UNAME_RELEASE}
1268
	exit ;;
1050
    Power*:Rhapsody:*:*)
1269
    Power*:Rhapsody:*:*)
1051
	echo powerpc-apple-rhapsody${UNAME_RELEASE}
1270
	echo powerpc-apple-rhapsody${UNAME_RELEASE}
1052
	exit 0 ;;
1271
	exit ;;
1053
    *:Rhapsody:*:*)
1272
    *:Rhapsody:*:*)
1054
	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1273
	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1055
	exit 0 ;;
1274
	exit ;;
1056
    *:Darwin:*:*)
1275
    *:Darwin:*:*)
1057
	echo `uname -p`-apple-darwin${UNAME_RELEASE}
1276
	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1058
	exit 0 ;;
1277
	case $UNAME_PROCESSOR in
1278
	    unknown) UNAME_PROCESSOR=powerpc ;;
1279
	esac
1280
	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1281
	exit ;;
1059
    *:procnto*:*:* | *:QNX:[0123456789]*:*)
1282
    *:procnto*:*:* | *:QNX:[0123456789]*:*)
1060
	if test "${UNAME_MACHINE}" = "x86pc"; then
1283
	UNAME_PROCESSOR=`uname -p`
1284
	if test "$UNAME_PROCESSOR" = "x86"; then
1285
		UNAME_PROCESSOR=i386
1061
		UNAME_MACHINE=pc
1286
		UNAME_MACHINE=pc
1062
	fi
1287
	fi
1063
	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
1288
	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1064
	exit 0 ;;
1289
	exit ;;
1065
    *:QNX:*:4*)
1290
    *:QNX:*:4*)
1066
	echo i386-pc-qnx
1291
	echo i386-pc-qnx
1067
	exit 0 ;;
1292
	exit ;;
1068
    NSR-[KW]:NONSTOP_KERNEL:*:*)
1293
    NSE-?:NONSTOP_KERNEL:*:*)
1294
	echo nse-tandem-nsk${UNAME_RELEASE}
1295
	exit ;;
1296
    NSR-?:NONSTOP_KERNEL:*:*)
1069
	echo nsr-tandem-nsk${UNAME_RELEASE}
1297
	echo nsr-tandem-nsk${UNAME_RELEASE}
1070
	exit 0 ;;
1298
	exit ;;
1071
    *:NonStop-UX:*:*)
1299
    *:NonStop-UX:*:*)
1072
	echo mips-compaq-nonstopux
1300
	echo mips-compaq-nonstopux
1073
	exit 0 ;;
1301
	exit ;;
1074
    BS2000:POSIX*:*:*)
1302
    BS2000:POSIX*:*:*)
1075
	echo bs2000-siemens-sysv
1303
	echo bs2000-siemens-sysv
1076
	exit 0 ;;
1304
	exit ;;
1077
    DS/*:UNIX_System_V:*:*)
1305
    DS/*:UNIX_System_V:*:*)
1078
	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1306
	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1079
	exit 0 ;;
1307
	exit ;;
1080
    *:Plan9:*:*)
1308
    *:Plan9:*:*)
1081
	# "uname -m" is not consistent, so use $cputype instead. 386
1309
	# "uname -m" is not consistent, so use $cputype instead. 386
1082
	# is converted to i386 for consistency with other x86
1310
	# is converted to i386 for consistency with other x86
 Lines 1087-1122    Link Here 
1087
	    UNAME_MACHINE="$cputype"
1315
	    UNAME_MACHINE="$cputype"
1088
	fi
1316
	fi
1089
	echo ${UNAME_MACHINE}-unknown-plan9
1317
	echo ${UNAME_MACHINE}-unknown-plan9
1090
	exit 0 ;;
1318
	exit ;;
1091
    i*86:OS/2:*:*)
1092
	# If we were able to find `uname', then EMX Unix compatibility
1093
	# is probably installed.
1094
	echo ${UNAME_MACHINE}-pc-os2-emx
1095
	exit 0 ;;
1096
    *:TOPS-10:*:*)
1319
    *:TOPS-10:*:*)
1097
	echo pdp10-unknown-tops10
1320
	echo pdp10-unknown-tops10
1098
	exit 0 ;;
1321
	exit ;;
1099
    *:TENEX:*:*)
1322
    *:TENEX:*:*)
1100
	echo pdp10-unknown-tenex
1323
	echo pdp10-unknown-tenex
1101
	exit 0 ;;
1324
	exit ;;
1102
    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
1325
    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
1103
	echo pdp10-dec-tops20
1326
	echo pdp10-dec-tops20
1104
	exit 0 ;;
1327
	exit ;;
1105
    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
1328
    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
1106
	echo pdp10-xkl-tops20
1329
	echo pdp10-xkl-tops20
1107
	exit 0 ;;
1330
	exit ;;
1108
    *:TOPS-20:*:*)
1331
    *:TOPS-20:*:*)
1109
	echo pdp10-unknown-tops20
1332
	echo pdp10-unknown-tops20
1110
	exit 0 ;;
1333
	exit ;;
1111
    *:ITS:*:*)
1334
    *:ITS:*:*)
1112
	echo pdp10-unknown-its
1335
	echo pdp10-unknown-its
1113
	exit 0 ;;
1336
	exit ;;
1114
    i*86:XTS-300:*:STOP)
1337
    SEI:*:*:SEIUX)
1115
	echo ${UNAME_MACHINE}-unknown-stop
1338
        echo mips-sei-seiux${UNAME_RELEASE}
1116
	exit 0 ;;
1339
	exit ;;
1117
    i*86:atheos:*:*)
1340
    *:DragonFly:*:*)
1118
	echo ${UNAME_MACHINE}-unknown-atheos
1341
	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1119
	exit 0 ;;
1342
	exit ;;
1343
    *:*VMS:*:*)
1344
    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
1345
	case "${UNAME_MACHINE}" in
1346
	    A*) echo alpha-dec-vms ; exit ;;
1347
	    I*) echo ia64-dec-vms ; exit ;;
1348
	    V*) echo vax-dec-vms ; exit ;;
1349
	esac ;;
1350
    *:XENIX:*:SysV)
1351
	echo i386-pc-xenix
1352
	exit ;;
1353
    i*86:skyos:*:*)
1354
	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1355
	exit ;;
1356
    i*86:rdos:*:*)
1357
	echo ${UNAME_MACHINE}-pc-rdos
1358
	exit ;;
1359
    i*86:AROS:*:*)
1360
	echo ${UNAME_MACHINE}-pc-aros
1361
	exit ;;
1120
esac
1362
esac
1121
1363
1122
#echo '(No uname command or uname output not recognized.)' 1>&2
1364
#echo '(No uname command or uname output not recognized.)' 1>&2
 Lines 1148-1154    Link Here 
1148
#endif
1390
#endif
1149
1391
1150
#if defined (__arm) && defined (__acorn) && defined (__unix)
1392
#if defined (__arm) && defined (__acorn) && defined (__unix)
1151
  printf ("arm-acorn-riscix"); exit (0);
1393
  printf ("arm-acorn-riscix\n"); exit (0);
1152
#endif
1394
#endif
1153
1395
1154
#if defined (hp300) && !defined (hpux)
1396
#if defined (hp300) && !defined (hpux)
 Lines 1237-1248    Link Here 
1237
}
1479
}
1238
EOF
1480
EOF
1239
1481
1240
$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
1482
$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1241
rm -f $dummy.c $dummy
1483
	{ echo "$SYSTEM_NAME"; exit; }
1242
1484
1243
# Apollos put the system type in the environment.
1485
# Apollos put the system type in the environment.
1244
1486
1245
test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
1487
test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1246
1488
1247
# Convex versions that predate uname can use getsysinfo(1)
1489
# Convex versions that predate uname can use getsysinfo(1)
1248
1490
 Lines 1251-1272    Link Here 
1251
    case `getsysinfo -f cpu_type` in
1493
    case `getsysinfo -f cpu_type` in
1252
    c1*)
1494
    c1*)
1253
	echo c1-convex-bsd
1495
	echo c1-convex-bsd
1254
	exit 0 ;;
1496
	exit ;;
1255
    c2*)
1497
    c2*)
1256
	if getsysinfo -f scalar_acc
1498
	if getsysinfo -f scalar_acc
1257
	then echo c32-convex-bsd
1499
	then echo c32-convex-bsd
1258
	else echo c2-convex-bsd
1500
	else echo c2-convex-bsd
1259
	fi
1501
	fi
1260
	exit 0 ;;
1502
	exit ;;
1261
    c34*)
1503
    c34*)
1262
	echo c34-convex-bsd
1504
	echo c34-convex-bsd
1263
	exit 0 ;;
1505
	exit ;;
1264
    c38*)
1506
    c38*)
1265
	echo c38-convex-bsd
1507
	echo c38-convex-bsd
1266
	exit 0 ;;
1508
	exit ;;
1267
    c4*)
1509
    c4*)
1268
	echo c4-convex-bsd
1510
	echo c4-convex-bsd
1269
	exit 0 ;;
1511
	exit ;;
1270
    esac
1512
    esac
1271
fi
1513
fi
1272
1514
 Lines 1277-1283    Link Here 
1277
the operating system you are using. It is advised that you
1519
the operating system you are using. It is advised that you
1278
download the most up to date version of the config scripts from
1520
download the most up to date version of the config scripts from
1279
1521
1280
    ftp://ftp.gnu.org/pub/gnu/config/
1522
  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1523
and
1524
  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1281
1525
1282
If the version you run ($0) is already up to date, please
1526
If the version you run ($0) is already up to date, please
1283
send the following data and any information you think might be
1527
send the following data and any information you think might be
1284
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/Makefile.in
1528
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/Makefile.in
 Lines 1-4    Link Here 
1
# $Id: Makefile.in,v 1.1.1.1 2003-06-04 00:25:03 marka Exp $
1
# $Id: Makefile.in,v 1.1.1.1 2003/06/04 00:25:03 marka Exp $
2
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
2
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
#  
3
#  
4
# By using this file, you agree to the terms and conditions set forth bellow.
4
# By using this file, you agree to the terms and conditions set forth bellow.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/mkinstalldirs
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/mkinstalldirs
 Lines 4-10    Link Here 
4
# Created: 1993-05-16
4
# Created: 1993-05-16
5
# Public domain
5
# Public domain
6
6
7
# $Id: mkinstalldirs,v 1.1.1.1 2003-06-04 00:25:33 marka Exp $
7
# $Id: mkinstalldirs,v 1.1.1.1 2003/06/04 00:25:33 marka Exp $
8
8
9
errstatus=0
9
errstatus=0
10
10
11
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/man/idn.conf.5.in
11
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/man/idn.conf.5.in
 Lines 1-4    Link Here 
1
.\" $Id: idn.conf.5.in,v 1.1.1.1 2003-06-04 00:27:16 marka Exp $"
1
.\" $Id: idn.conf.5.in,v 1.1.1.1 2003/06/04 00:27:16 marka Exp $"
2
.\"
2
.\"
3
.\" Copyright (c) 2000,2001 Japan Network Information Center.
3
.\" Copyright (c) 2000,2001 Japan Network Information Center.
4
.\" All rights reserved.
4
.\" All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/man/Makefile.in
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/man/Makefile.in
 Lines 1-4    Link Here 
1
# $Id: Makefile.in,v 1.1.1.1 2003-06-04 00:27:14 marka Exp $
1
# $Id: Makefile.in,v 1.1.1.1 2003/06/04 00:27:14 marka Exp $
2
#
2
#
3
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
#  
4
#  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/man/libidnkit.3.in
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/man/libidnkit.3.in
 Lines 1-4    Link Here 
1
.\" $Id: libidnkit.3.in,v 1.1.1.1 2003-06-04 00:27:15 marka Exp $
1
.\" $Id: libidnkit.3.in,v 1.1.1.1 2003/06/04 00:27:15 marka Exp $
2
.\"
2
.\"
3
.\" Copyright (c) 2001,2002 Japan Network Information Center.
3
.\" Copyright (c) 2001,2002 Japan Network Information Center.
4
.\" All rights reserved.
4
.\" All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/wsock/config/idnconf.tcl
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/wsock/config/idnconf.tcl
 Lines 1-4    Link Here 
1
# $Id: idnconf.tcl,v 1.1.1.1 2003-06-04 00:27:42 marka Exp $
1
# $Id: idnconf.tcl,v 1.1.1.1 2003/06/04 00:27:42 marka Exp $
2
#
2
#
3
# idnconf.tcl - configure idn wrapper
3
# idnconf.tcl - configure idn wrapper
4
#
4
#
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/wsock/wsock20/dllstub.c
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/wsock/wsock20/dllstub.c
 Lines 1-4    Link Here 
1
/* $Id: dllstub.c,v 1.1.1.1 2003-06-04 00:27:51 marka Exp $ */
1
/* $Id: dllstub.c,v 1.1.1.1 2003/06/04 00:27:51 marka Exp $ */
2
2
3
SOCKET   PASCAL
3
SOCKET   PASCAL
4
accept(SOCKET a0, struct sockaddr* a1, int* a2)
4
accept(SOCKET a0, struct sockaddr* a1, int* a2)
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/wsock/wsock11/dllstub.c
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/wsock/wsock11/dllstub.c
 Lines 1-4    Link Here 
1
/* $Id: dllstub.c,v 1.1.1.1 2003-06-04 00:27:45 marka Exp $ */
1
/* $Id: dllstub.c,v 1.1.1.1 2003/06/04 00:27:45 marka Exp $ */
2
2
3
SOCKET   PASCAL
3
SOCKET   PASCAL
4
accept(SOCKET a0, struct sockaddr* a1, int* a2)
4
accept(SOCKET a0, struct sockaddr* a1, int* a2)
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/nameprep.c
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/nameprep.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: nameprep.c,v 1.1.1.1 2003-06-04 00:25:56 marka Exp $";
2
static char *rcsid = "$Id: nameprep.c,v 1.1.1.1 2003/06/04 00:25:56 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/ucs4.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/ucs4.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: ucs4.c,v 1.1.1.1 2003-06-04 00:26:14 marka Exp $";
2
static char *rcsid = "$Id: ucs4.c,v 1.1.1.1 2003/06/04 00:26:14 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/normalizer.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/normalizer.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: normalizer.c,v 1.1.1.1 2003-06-04 00:26:05 marka Exp $";
2
static char *rcsid = "$Id: normalizer.c,v 1.1.1.1 2003/06/04 00:26:05 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/strhash.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/strhash.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: strhash.c,v 1.1.1.1 2003-06-04 00:26:13 marka Exp $";
2
static char *rcsid = "$Id: strhash.c,v 1.1.1.1 2003/06/04 00:26:13 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/resconf.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/resconf.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: resconf.c,v 1.1.1.1 2003-06-04 00:26:12 marka Exp $";
2
static char *rcsid = "$Id: resconf.c,v 1.1.1.1 2003/06/04 00:26:12 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/unormalize.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/unormalize.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: unormalize.c,v 1.1.1.1 2003-06-04 00:26:43 marka Exp $";
2
static char *rcsid = "$Id: unormalize.c,v 1.1.1.1 2003/06/04 00:26:43 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/race.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/race.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: race.c,v 1.1.1.1 2003-06-04 00:26:07 marka Exp $";
2
static char *rcsid = "$Id: race.c,v 1.1.1.1 2003/06/04 00:26:07 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/res.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/res.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: res.c,v 1.1.1.1 2003-06-04 00:26:10 marka Exp $";
2
static char *rcsid = "$Id: res.c,v 1.1.1.1 2003/06/04 00:26:10 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/localencoding.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/localencoding.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: localencoding.c,v 1.1.1.1 2003-06-04 00:25:53 marka Exp $";
2
static char *rcsid = "$Id: localencoding.c,v 1.1.1.1 2003/06/04 00:25:53 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/filechecker.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/filechecker.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: filechecker.c,v 1.1.1.1 2003-06-04 00:25:52 marka Exp $";
2
static char *rcsid = "$Id: filechecker.c,v 1.1.1.1 2003/06/04 00:25:52 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/mapselector.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/mapselector.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: mapselector.c,v 1.1.1.1 2003-06-04 00:25:56 marka Exp $";
2
static char *rcsid = "$Id: mapselector.c,v 1.1.1.1 2003/06/04 00:25:56 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/log.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/log.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: log.c,v 1.1.1.1 2003-06-04 00:25:53 marka Exp $";
2
static char *rcsid = "$Id: log.c,v 1.1.1.1 2003/06/04 00:25:53 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/mapper.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/mapper.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: mapper.c,v 1.1.1.1 2003-06-04 00:25:55 marka Exp $";
2
static char *rcsid = "$Id: mapper.c,v 1.1.1.1 2003/06/04 00:25:55 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/checker.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/checker.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: checker.c,v 1.1.1.1 2003-06-04 00:25:49 marka Exp $";
2
static char *rcsid = "$Id: checker.c,v 1.1.1.1 2003/06/04 00:25:49 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/debug.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/debug.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: debug.c,v 1.1.1.1 2003-06-04 00:25:51 marka Exp $";
2
static char *rcsid = "$Id: debug.c,v 1.1.1.1 2003/06/04 00:25:51 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/unicode.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/unicode.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: unicode.c,v 1.1.1.1 2003-06-04 00:26:16 marka Exp $";
2
static char *rcsid = "$Id: unicode.c,v 1.1.1.1 2003/06/04 00:26:16 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/nameprep_template.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/nameprep_template.c
 Lines 1-4    Link Here 
1
/* $Id: nameprep_template.c,v 1.1.1.1 2003-06-04 00:25:57 marka Exp $ */
1
/* $Id: nameprep_template.c,v 1.1.1.1 2003/06/04 00:25:57 marka Exp $ */
2
2
3
/*
3
/*
4
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
4
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/nameprepdata.c
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/nameprepdata.c
 Lines 1-4    Link Here 
1
/* $Id: nameprepdata.c,v 1.1.1.1 2003-06-04 00:26:05 marka Exp $ */
1
/* $Id: nameprepdata.c,v 1.1.1.1 2003/06/04 00:26:05 marka Exp $ */
2
/* $-Id: generate_nameprep_data.pl,v 1.9 2002/11/29 09:08:13 ishisone Exp -$ */
2
/* $-Id: generate_nameprep_data.pl,v 1.9 2002/11/29 09:08:13 ishisone Exp -$ */
3
/*
3
/*
4
 * Do not edit this file!
4
 * Do not edit this file!
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/make.wnt
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/make.wnt
 Lines 1-4    Link Here 
1
# $Id: make.wnt,v 1.1.1.1 2003-06-04 00:25:54 marka Exp $
1
# $Id: make.wnt,v 1.1.1.1 2003/06/04 00:25:54 marka Exp $
2
# Makefile for MDN library, manually configured for WIN-NT (VC5.0)
2
# Makefile for MDN library, manually configured for WIN-NT (VC5.0)
3
#
3
#
4
# Copyright (c) 2000,2002 Japan Network Information Center.  All rights reserved.
4
# Copyright (c) 2000,2002 Japan Network Information Center.  All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/result.c
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/result.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: result.c,v 1.1.1.1 2003-06-04 00:26:12 marka Exp $";
2
static char *rcsid = "$Id: result.c,v 1.1.1.1 2003/06/04 00:26:12 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/version.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/version.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: version.c,v 1.1.1.1 2003-06-04 00:26:45 marka Exp $";
2
static char *rcsid = "$Id: version.c,v 1.1.1.1 2003/06/04 00:26:45 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/aliaslist.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/aliaslist.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: aliaslist.c,v 1.1.1.1 2003-06-04 00:25:47 marka Exp $";
2
static char *rcsid = "$Id: aliaslist.c,v 1.1.1.1 2003/06/04 00:25:47 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/delimitermap.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/delimitermap.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: delimitermap.c,v 1.1.1.1 2003-06-04 00:25:52 marka Exp $";
2
static char *rcsid = "$Id: delimitermap.c,v 1.1.1.1 2003/06/04 00:25:52 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/unicode_template.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/unicode_template.c
 Lines 1-4    Link Here 
1
/* $Id: unicode_template.c,v 1.1.1.1 2003-06-04 00:26:16 marka Exp $ */
1
/* $Id: unicode_template.c,v 1.1.1.1 2003/06/04 00:26:16 marka Exp $ */
2
2
3
/*
3
/*
4
 * Copyright (c) 2000,2001 Japan Network Information Center.
4
 * Copyright (c) 2000,2001 Japan Network Information Center.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/unicodedata_320.c
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/unicodedata_320.c
 Lines 1-4    Link Here 
1
/* $Id: unicodedata_320.c,v 1.1.1.1 2003-06-04 00:26:43 marka Exp $ */
1
/* $Id: unicodedata_320.c,v 1.1.1.1 2003/06/04 00:26:43 marka Exp $ */
2
/* $-Id: generate_normalize_data.pl,v 1.8 2001/10/31 08:51:30 m-kasahr Exp -$ */
2
/* $-Id: generate_normalize_data.pl,v 1.8 2001/10/31 08:51:30 m-kasahr Exp -$ */
3
/*
3
/*
4
 * Do not edit this file!
4
 * Do not edit this file!
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/ucsset.c
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/ucsset.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: ucsset.c,v 1.1.1.1 2003-06-04 00:26:15 marka Exp $";
2
static char *rcsid = "$Id: ucsset.c,v 1.1.1.1 2003/06/04 00:26:15 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/idn.conf.sample.in
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/idn.conf.sample.in
 Lines 1-4    Link Here 
1
# $Id: idn.conf.sample.in,v 1.1.1.1 2003-06-04 00:26:45 marka Exp $
1
# $Id: idn.conf.sample.in,v 1.1.1.1 2003/06/04 00:26:45 marka Exp $
2
#
2
#
3
# Sample file for idnkit configuration file (idn.conf).
3
# Sample file for idnkit configuration file (idn.conf).
4
#
4
#
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/api.c
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/api.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: api.c,v 1.1.1.1 2003-06-04 00:25:48 marka Exp $";
2
static char *rcsid = "$Id: api.c,v 1.1.1.1 2003/06/04 00:25:48 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/converter.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/converter.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: converter.c,v 1.1.1.1 2003-06-04 00:25:51 marka Exp $";
2
static char *rcsid = "$Id: converter.c,v 1.1.1.1 2003/06/04 00:25:51 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/punycode.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/punycode.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: punycode.c,v 1.1.1.1 2003-06-04 00:26:06 marka Exp $";
2
static char *rcsid = "$Id: punycode.c,v 1.1.1.1 2003/06/04 00:26:06 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/utf8.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/utf8.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: utf8.c,v 1.1.1.1 2003-06-04 00:26:44 marka Exp $";
2
static char *rcsid = "$Id: utf8.c,v 1.1.1.1 2003/06/04 00:26:44 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/util.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/util.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: util.c,v 1.1.1.1 2003-06-04 00:26:45 marka Exp $";
2
static char *rcsid = "$Id: util.c,v 1.1.1.1 2003/06/04 00:26:45 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/ucsmap.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/ucsmap.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: ucsmap.c,v 1.1.1.1 2003-06-04 00:26:14 marka Exp $";
2
static char *rcsid = "$Id: ucsmap.c,v 1.1.1.1 2003/06/04 00:26:14 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/filemapper.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/filemapper.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: filemapper.c,v 1.1.1.1 2003-06-04 00:25:53 marka Exp $";
2
static char *rcsid = "$Id: filemapper.c,v 1.1.1.1 2003/06/04 00:25:53 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/nameprep.tsy
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/nameprep.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: nameprep.tsy,v 1.1.1.1 2003-06-04 00:26:56 marka Exp $";
2
static char *rcsid = "$Id: nameprep.tsy,v 1.1.1.1 2003/06/04 00:26:56 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/api-init5-2.tsy
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/api-init5-2.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: api-init5-2.tsy,v 1.1.1.1 2003-06-04 00:26:48 marka Exp $";
2
static char *rcsid = "$Id: api-init5-2.tsy,v 1.1.1.1 2003/06/04 00:26:48 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/resconf.tsy
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/resconf.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: resconf.tsy,v 1.1.1.1 2003-06-04 00:27:00 marka Exp $";
2
static char *rcsid = "$Id: resconf.tsy,v 1.1.1.1 2003/06/04 00:27:00 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/api-init4-1.tsy
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/api-init4-1.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: api-init4-1.tsy,v 1.1.1.1 2003-06-04 00:26:47 marka Exp $";
2
static char *rcsid = "$Id: api-init4-1.tsy,v 1.1.1.1 2003/06/04 00:26:47 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/setenv.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/setenv.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: setenv.c,v 1.1.1.1 2003-06-04 00:27:01 marka Exp $";
2
static char *rcsid = "$Id: setenv.c,v 1.1.1.1 2003/06/04 00:27:01 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/api.tsy
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/api.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: api.tsy,v 1.1.1.1 2003-06-04 00:26:50 marka Exp $";
2
static char *rcsid = "$Id: api.tsy,v 1.1.1.1 2003/06/04 00:26:50 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/normalizer.tsy
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/normalizer.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: normalizer.tsy,v 1.1.1.1 2003-06-04 00:26:57 marka Exp $";
2
static char *rcsid = "$Id: normalizer.tsy,v 1.1.1.1 2003/06/04 00:26:57 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/codeset.h
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/codeset.h
 Lines 1-4    Link Here 
1
/* $Id: codeset.h,v 1.1.1.1 2003-06-04 00:26:51 marka Exp $ */
1
/* $Id: codeset.h,v 1.1.1.1 2003/06/04 00:26:51 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2002 Japan Network Information Center.
3
 * Copyright (c) 2002 Japan Network Information Center.
4
 * All rights reserved.
4
 * All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/api-init2.tsy
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/api-init2.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: api-init2.tsy,v 1.1.1.1 2003-06-04 00:26:47 marka Exp $";
2
static char *rcsid = "$Id: api-init2.tsy,v 1.1.1.1 2003/06/04 00:26:47 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/api-init5-1.tsy
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/api-init5-1.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: api-init5-1.tsy,v 1.1.1.1 2003-06-04 00:26:48 marka Exp $";
2
static char *rcsid = "$Id: api-init5-1.tsy,v 1.1.1.1 2003/06/04 00:26:48 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/mapper.tsy
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/mapper.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: mapper.tsy,v 1.1.1.1 2003-06-04 00:26:54 marka Exp $";
2
static char *rcsid = "$Id: mapper.tsy,v 1.1.1.1 2003/06/04 00:26:54 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/api-init3.tsy
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/api-init3.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: api-init3.tsy,v 1.1.1.1 2003-06-04 00:26:47 marka Exp $";
2
static char *rcsid = "$Id: api-init3.tsy,v 1.1.1.1 2003/06/04 00:26:47 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/api-init4-2.tsy
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/api-init4-2.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: api-init4-2.tsy,v 1.1.1.1 2003-06-04 00:26:47 marka Exp $";
2
static char *rcsid = "$Id: api-init4-2.tsy,v 1.1.1.1 2003/06/04 00:26:47 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/delimitermap.tsy
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/delimitermap.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: delimitermap.tsy,v 1.1.1.1 2003-06-04 00:26:53 marka Exp $";
2
static char *rcsid = "$Id: delimitermap.tsy,v 1.1.1.1 2003/06/04 00:26:53 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/ucs4.tsy
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/ucs4.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: ucs4.tsy,v 1.1.1.1 2003-06-04 00:27:04 marka Exp $";
2
static char *rcsid = "$Id: ucs4.tsy,v 1.1.1.1 2003/06/04 00:27:04 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/testutil.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/testutil.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: testutil.c,v 1.1.1.1 2003-06-04 00:27:03 marka Exp $";
2
static char *rcsid = "$Id: testutil.c,v 1.1.1.1 2003/06/04 00:27:03 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/testutil.h
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/testutil.h
 Lines 1-4    Link Here 
1
/* $Id: testutil.h,v 1.1.1.1 2003-06-04 00:27:03 marka Exp $ */
1
/* $Id: testutil.h,v 1.1.1.1 2003/06/04 00:27:03 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2002 Japan Network Information Center.
3
 * Copyright (c) 2002 Japan Network Information Center.
4
 * All rights reserved.
4
 * All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/checker.tsy
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/checker.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: checker.tsy,v 1.1.1.1 2003-06-04 00:26:51 marka Exp $";
2
static char *rcsid = "$Id: checker.tsy,v 1.1.1.1 2003/06/04 00:26:51 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/converter.tsy
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/converter.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: converter.tsy,v 1.1.1.1 2003-06-04 00:26:53 marka Exp $";
2
static char *rcsid = "$Id: converter.tsy,v 1.1.1.1 2003/06/04 00:26:53 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/setenv.h
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/setenv.h
 Lines 1-4    Link Here 
1
/* $Id: setenv.h,v 1.1.1.1 2003-06-04 00:27:01 marka Exp $ */
1
/* $Id: setenv.h,v 1.1.1.1 2003/06/04 00:27:01 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2002 Japan Network Information Center.
3
 * Copyright (c) 2002 Japan Network Information Center.
4
 * All rights reserved.
4
 * All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/mapselector.tsy
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/mapselector.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: mapselector.tsy,v 1.1.1.1 2003-06-04 00:26:55 marka Exp $";
2
static char *rcsid = "$Id: mapselector.tsy,v 1.1.1.1 2003/06/04 00:26:55 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/res.tsy
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/res.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: res.tsy,v 1.1.1.1 2003-06-04 00:26:59 marka Exp $";
2
static char *rcsid = "$Id: res.tsy,v 1.1.1.1 2003/06/04 00:26:59 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/iconvchk.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/iconvchk.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: iconvchk.c,v 1.1.1.1 2003-06-04 00:26:54 marka Exp $";
2
static char *rcsid = "$Id: iconvchk.c,v 1.1.1.1 2003/06/04 00:26:54 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/testsuite.h
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/testsuite.h
 Lines 1-4    Link Here 
1
/* $Id: testsuite.h,v 1.1.1.1 2003-06-04 00:27:03 marka Exp $ */
1
/* $Id: testsuite.h,v 1.1.1.1 2003/06/04 00:27:03 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2002 Japan Network Information Center.
3
 * Copyright (c) 2002 Japan Network Information Center.
4
 * All rights reserved.
4
 * All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/api-init4-3.tsy
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/api-init4-3.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: api-init4-3.tsy,v 1.1.1.1 2003-06-04 00:26:47 marka Exp $";
2
static char *rcsid = "$Id: api-init4-3.tsy,v 1.1.1.1 2003/06/04 00:26:47 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/api-init1.tsy
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/api-init1.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: api-init1.tsy,v 1.1.1.1 2003-06-04 00:26:46 marka Exp $";
2
static char *rcsid = "$Id: api-init1.tsy,v 1.1.1.1 2003/06/04 00:26:46 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/lib/tests/api-init5-3.tsy
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/lib/tests/api-init5-3.tsy
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: api-init5-3.tsy,v 1.1.1.1 2003-06-04 00:26:48 marka Exp $";
2
static char *rcsid = "$Id: api-init5-3.tsy,v 1.1.1.1 2003/06/04 00:26:48 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/map/jp.map
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/map/jp.map
 Lines 1-4    Link Here 
1
# $Id: jp.map,v 1.1.1.1 2003-06-04 00:27:55 marka Exp $
1
# $Id: jp.map,v 1.1.1.1 2003/06/04 00:27:55 marka Exp $
2
# Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
2
# Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
3
#  
3
#  
4
# By using this file, you agree to the terms and conditions set forth bellow.
4
# By using this file, you agree to the terms and conditions set forth bellow.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/map/Makefile.in
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/map/Makefile.in
 Lines 1-4    Link Here 
1
# $Id: Makefile.in,v 1.1.1.1 2003-06-04 00:27:55 marka Exp $
1
# $Id: Makefile.in,v 1.1.1.1 2003/06/04 00:27:55 marka Exp $
2
#
2
#
3
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
#  
4
#  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/patch/bind9/bind-9.2.2-patch
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/patch/bind9/bind-9.2.2-patch
 Lines 135-141    Link Here 
135
+ mdnkit-bugs@nic.ad.jp and idn-cmt@nic.ad.jp, respectively.
135
+ mdnkit-bugs@nic.ad.jp and idn-cmt@nic.ad.jp, respectively.
136
+ 
136
+ 
137
+ 
137
+ 
138
+ ; $Id: bind-9.2.2-patch,v 1.1.1.1 2003-06-04 00:27:32 marka Exp $
138
+ ; $Id: bind-9.2.2-patch,v 1.1.1.1 2003/06/04 00:27:32 marka Exp $
139
Index: config.h.in
139
Index: config.h.in
140
diff -c mdn/othersrc/bind9/config.h.in:1.1.1.6 mdn/othersrc/bind9/config.h.in:1.12
140
diff -c mdn/othersrc/bind9/config.h.in:1.1.1.6 mdn/othersrc/bind9/config.h.in:1.12
141
*** config.h.in	Tue Nov 27 16:55:45 2001
141
*** config.h.in	Tue Nov 27 16:55:45 2001
142
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/patch/bind9/bind-9.2.1-patch
142
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/patch/bind9/bind-9.2.1-patch
 Lines 135-141    Link Here 
135
+ mdnkit-bugs@nic.ad.jp and mdn-cmt@nic.ad.jp, respectively.
135
+ mdnkit-bugs@nic.ad.jp and mdn-cmt@nic.ad.jp, respectively.
136
+ 
136
+ 
137
+ 
137
+ 
138
+ ; $Id: bind-9.2.1-patch,v 1.1.1.1 2003-06-04 00:27:30 marka Exp $
138
+ ; $Id: bind-9.2.1-patch,v 1.1.1.1 2003/06/04 00:27:30 marka Exp $
139
Index: config.h.in
139
Index: config.h.in
140
diff -c mdn/othersrc/bind9/config.h.in:1.1.1.6 mdn/othersrc/bind9/config.h.in:1.12
140
diff -c mdn/othersrc/bind9/config.h.in:1.1.1.6 mdn/othersrc/bind9/config.h.in:1.12
141
*** config.h.in	Tue Nov 27 16:55:45 2001
141
*** config.h.in	Tue Nov 27 16:55:45 2001
142
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/win/README.WIN
142
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/win/README.WIN
 Lines 14-17    Link Here 
14
14
15
	nmake -f make.wnt
15
	nmake -f make.wnt
16
16
17
; $Id: README.WIN,v 1.1.1.1 2003-06-04 00:27:32 marka Exp $
17
; $Id: README.WIN,v 1.1.1.1 2003/06/04 00:27:32 marka Exp $
18
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl
18
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/util/generate_normalize_data.pl
 Lines 1-5    Link Here 
1
#! /usr/local/bin/perl -w
1
#! /usr/local/bin/perl -w
2
# $Id: generate_normalize_data.pl,v 1.1.1.1 2003-06-04 00:27:55 marka Exp $
2
# $Id: generate_normalize_data.pl,v 1.1.1.1 2003/06/04 00:27:55 marka Exp $
3
#
3
#
4
# Copyright (c) 2000,2001 Japan Network Information Center.
4
# Copyright (c) 2000,2001 Japan Network Information Center.
5
# All rights reserved.
5
# All rights reserved.
 Lines 68-74    Link Here 
68
my $LETTER_BIT = 1;
68
my $LETTER_BIT = 1;
69
my $NSPMARK_BIT = 2;
69
my $NSPMARK_BIT = 2;
70
70
71
(my $myid = '$Id: generate_normalize_data.pl,v 1.1.1.1 2003-06-04 00:27:55 marka Exp $') =~ s/\$([^\$]+)\$/\$-$1-\$/;
71
(my $myid = '$Id: generate_normalize_data.pl,v 1.1.1.1 2003/06/04 00:27:55 marka Exp $') =~ s/\$([^\$]+)\$/\$-$1-\$/;
72
72
73
my @default_bits = (9, 7, 5);
73
my @default_bits = (9, 7, 5);
74
#my @default_bits = (7, 7, 7);
74
#my @default_bits = (7, 7, 7);
75
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/util/SparseMap.pm
75
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/util/SparseMap.pm
 Lines 1-4    Link Here 
1
# $Id: SparseMap.pm,v 1.1.1.1 2003-06-04 00:27:53 marka Exp $
1
# $Id: SparseMap.pm,v 1.1.1.1 2003/06/04 00:27:53 marka Exp $
2
#
2
#
3
# Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
3
# Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
4
#
4
#
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/util/Makefile
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/util/Makefile
 Lines 1-4    Link Here 
1
# $Id: Makefile,v 1.1.1.1 2003-06-04 00:27:52 marka Exp $
1
# $Id: Makefile,v 1.1.1.1 2003/06/04 00:27:52 marka Exp $
2
2
3
PERL = /usr/local/bin/perl -w
3
PERL = /usr/local/bin/perl -w
4
4
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/util/UCD.pm
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/util/UCD.pm
 Lines 1-4    Link Here 
1
# $Id: UCD.pm,v 1.1.1.1 2003-06-04 00:27:53 marka Exp $
1
# $Id: UCD.pm,v 1.1.1.1 2003/06/04 00:27:53 marka Exp $
2
#
2
#
3
# Copyright (c) 2000,2001 Japan Network Information Center.
3
# Copyright (c) 2000,2001 Japan Network Information Center.
4
# All rights reserved.
4
# All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/util/generate_nameprep_data.pl
 Lines 1-5    Link Here 
1
#! /usr/local/bin/perl -w
1
#! /usr/local/bin/perl -w
2
# $Id: generate_nameprep_data.pl,v 1.1.1.1 2003-06-04 00:27:54 marka Exp $
2
# $Id: generate_nameprep_data.pl,v 1.1.1.1 2003/06/04 00:27:54 marka Exp $
3
#
3
#
4
# Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
4
# Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
5
#  
5
#  
 Lines 50-56    Link Here 
50
use SparseMap;
50
use SparseMap;
51
use Getopt::Long;
51
use Getopt::Long;
52
52
53
(my $myid = '$Id: generate_nameprep_data.pl,v 1.1.1.1 2003-06-04 00:27:54 marka Exp $') =~ s/\$([^\$]+)\$/\$-$1-\$/;
53
(my $myid = '$Id: generate_nameprep_data.pl,v 1.1.1.1 2003/06/04 00:27:54 marka Exp $') =~ s/\$([^\$]+)\$/\$-$1-\$/;
54
54
55
my @map_bits = (9, 7, 5);
55
my @map_bits = (9, 7, 5);
56
my @proh_bits = (7, 7, 7);
56
my @proh_bits = (7, 7, 7);
57
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/tools/make.wnt
57
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/tools/make.wnt
 Lines 1-4    Link Here 
1
# $Id: make.wnt,v 1.1.1.1 2003-06-04 00:27:05 marka Exp $
1
# $Id: make.wnt,v 1.1.1.1 2003/06/04 00:27:05 marka Exp $
2
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
2
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
#  
3
#  
4
# By using this file, you agree to the terms and conditions set forth bellow.
4
# By using this file, you agree to the terms and conditions set forth bellow.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/tools/Makefile.in
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/tools/Makefile.in
 Lines 1-4    Link Here 
1
# $Id: Makefile.in,v 1.1.1.1 2003-06-04 00:27:05 marka Exp $
1
# $Id: Makefile.in,v 1.1.1.1 2003/06/04 00:27:05 marka Exp $
2
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
2
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
#  
3
#  
4
# By using this file, you agree to the terms and conditions set forth bellow.
4
# By using this file, you agree to the terms and conditions set forth bellow.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/tools/idnconv/idnconv.c
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/tools/idnconv/idnconv.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: idnconv.c,v 1.1.1.1 2003-06-04 00:27:07 marka Exp $";
2
static char *rcsid = "$Id: idnconv.c,v 1.1.1.1 2003/06/04 00:27:07 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/tools/idnconv/selectiveencode.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/tools/idnconv/selectiveencode.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: selectiveencode.c,v 1.1.1.1 2003-06-04 00:27:07 marka Exp $";
2
static char *rcsid = "$Id: selectiveencode.c,v 1.1.1.1 2003/06/04 00:27:07 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/tools/idnconv/idnslookup.in
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/tools/idnconv/idnslookup.in
 Lines 1-5    Link Here 
1
#! /bin/sh
1
#! /bin/sh
2
# $Id: idnslookup.in,v 1.1.1.1 2003-06-04 00:27:10 marka Exp $
2
# $Id: idnslookup.in,v 1.1.1.1 2003/06/04 00:27:10 marka Exp $
3
#
3
#
4
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
5
#  
5
#  
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/tools/idnconv/make.wnt
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/tools/idnconv/make.wnt
 Lines 1-4    Link Here 
1
# $Id: make.wnt,v 1.1.1.1 2003-06-04 00:27:06 marka Exp $
1
# $Id: make.wnt,v 1.1.1.1 2003/06/04 00:27:06 marka Exp $
2
# Makefile for idnconv, manually configured for WIN-NT (VC5.0)
2
# Makefile for idnconv, manually configured for WIN-NT (VC5.0)
3
#
3
#
4
# Copyright (c) 2000,2002 Japan Network Information Center.  All rights reserved.
4
# Copyright (c) 2000,2002 Japan Network Information Center.  All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/tools/idnconv/util.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/tools/idnconv/util.h
 Lines 1-4    Link Here 
1
/* $Id: util.h,v 1.1.1.1 2003-06-04 00:27:09 marka Exp $ */
1
/* $Id: util.h,v 1.1.1.1 2003/06/04 00:27:09 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000,2001 Japan Network Information Center.
3
 * Copyright (c) 2000,2001 Japan Network Information Center.
4
 * All rights reserved.
4
 * All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/tools/idnconv/Makefile.in
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/tools/idnconv/Makefile.in
 Lines 1-4    Link Here 
1
# $Id: Makefile.in,v 1.1.1.1 2003-06-04 00:27:05 marka Exp $
1
# $Id: Makefile.in,v 1.1.1.1 2003/06/04 00:27:05 marka Exp $
2
# Copyright (c) 2000, 2002 Japan Network Information Center.
2
# Copyright (c) 2000, 2002 Japan Network Information Center.
3
# All rights reserved.
3
# All rights reserved.
4
#  
4
#  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/tools/idnconv/util.c
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/tools/idnconv/util.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: util.c,v 1.1.1.1 2003-06-04 00:27:08 marka Exp $";
2
static char *rcsid = "$Id: util.c,v 1.1.1.1 2003/06/04 00:27:08 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/tools/idnconv/idnconv.1
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/tools/idnconv/idnconv.1
 Lines 1-4    Link Here 
1
.\" $Id: idnconv.1,v 1.1.1.1 2003-06-04 00:27:10 marka Exp $
1
.\" $Id: idnconv.1,v 1.1.1.1 2003/06/04 00:27:10 marka Exp $
2
.\"
2
.\"
3
.\" Copyright (c) 2000,2001,2002 Japan Network Information Center.
3
.\" Copyright (c) 2000,2001,2002 Japan Network Information Center.
4
.\" All rights reserved.
4
.\" All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/tools/runidn/runidn.in
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/tools/runidn/runidn.in
 Lines 1-5    Link Here 
1
#! /bin/sh
1
#! /bin/sh
2
# $Id: runidn.in,v 1.1.1.1 2003-06-04 00:27:14 marka Exp $
2
# $Id: runidn.in,v 1.1.1.1 2003/06/04 00:27:14 marka Exp $
3
#
3
#
4
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
5
#  
5
#  
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/tools/runidn/stub.h
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/tools/runidn/stub.h
 Lines 1-4    Link Here 
1
/* $Id: stub.h,v 1.1.1.1 2003-06-04 00:27:13 marka Exp $ */
1
/* $Id: stub.h,v 1.1.1.1 2003/06/04 00:27:13 marka Exp $ */
2
2
3
#ifndef STUB_H
3
#ifndef STUB_H
4
#define STUB_H
4
#define STUB_H
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/tools/runidn/resolver.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/tools/runidn/resolver.h
 Lines 1-4    Link Here 
1
/* $Id: resolver.h,v 1.1.1.1 2003-06-04 00:27:13 marka Exp $ */
1
/* $Id: resolver.h,v 1.1.1.1 2003/06/04 00:27:13 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/tools/runidn/resolver.c
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/tools/runidn/resolver.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: resolver.c,v 1.1.1.1 2003-06-04 00:27:12 marka Exp $";
2
static char *rcsid = "$Id: resolver.c,v 1.1.1.1 2003/06/04 00:27:12 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/tools/runidn/stub.c
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/tools/runidn/stub.c
 Lines 1-5    Link Here 
1
#ifndef lint
1
#ifndef lint
2
static char *rcsid = "$Id: stub.c,v 1.1.1.1 2003-06-04 00:27:13 marka Exp $";
2
static char *rcsid = "$Id: stub.c,v 1.1.1.1 2003/06/04 00:27:13 marka Exp $";
3
#endif
3
#endif
4
4
5
/*
5
/*
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/tools/runidn/runidn.1
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/tools/runidn/runidn.1
 Lines 1-4    Link Here 
1
.\" $Id: runidn.1,v 1.1.1.1 2003-06-04 00:27:14 marka Exp $
1
.\" $Id: runidn.1,v 1.1.1.1 2003/06/04 00:27:14 marka Exp $
2
.\"
2
.\"
3
.\" Copyright (c) 2000,2001 Japan Network Information Center.
3
.\" Copyright (c) 2000,2001 Japan Network Information Center.
4
.\" All rights reserved.
4
.\" All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/tools/runidn/Makefile.in
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/tools/runidn/Makefile.in
 Lines 1-4    Link Here 
1
# $Id: Makefile.in,v 1.1.1.1 2003-06-04 00:27:11 marka Exp $
1
# $Id: Makefile.in,v 1.1.1.1 2003/06/04 00:27:11 marka Exp $
2
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
2
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
#  
3
#  
4
# By using this file, you agree to the terms and conditions set forth bellow.
4
# By using this file, you agree to the terms and conditions set forth bellow.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/config.h.win
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/config.h.win
 Lines 1-4    Link Here 
1
/* $Id: config.h.win,v 1.1.1.1 2003-06-04 00:25:34 marka Exp $ */
1
/* $Id: config.h.win,v 1.1.1.1 2003/06/04 00:25:34 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/config.h.in
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/config.h.in
 Lines 1-5    Link Here 
1
/* include/config.h.in.  Generated automatically from configure.in by autoheader.  */
1
/* include/config.h.in.  Generated automatically from configure.in by autoheader.  */
2
/* $Id: config.h.in,v 1.1.1.1 2003-06-04 00:25:34 marka Exp $ */
2
/* $Id: config.h.in,v 1.1.1.1 2003/06/04 00:25:34 marka Exp $ */
3
/*
3
/*
4
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
5
 *  
5
 *  
6
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/Makefile.in
6
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/Makefile.in
 Lines 1-4    Link Here 
1
# $Id: Makefile.in,v 1.1.1.1 2003-06-04 00:25:33 marka Exp $
1
# $Id: Makefile.in,v 1.1.1.1 2003/06/04 00:25:33 marka Exp $
2
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
2
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
#  
3
#  
4
# By using this file, you agree to the terms and conditions set forth bellow.
4
# By using this file, you agree to the terms and conditions set forth bellow.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/mdn/version.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/mdn/version.h
 Lines 1-4    Link Here 
1
/* $Id: version.h,v 1.1.1.1 2003-06-04 00:25:46 marka Exp $ */
1
/* $Id: version.h,v 1.1.1.1 2003/06/04 00:25:46 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/mdn/resconf.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/mdn/resconf.h
 Lines 1-4    Link Here 
1
/* $Id: resconf.h,v 1.1.1.1 2003-06-04 00:25:46 marka Exp $ */
1
/* $Id: resconf.h,v 1.1.1.1 2003/06/04 00:25:46 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/mdn/log.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/mdn/log.h
 Lines 1-4    Link Here 
1
/* $Id: log.h,v 1.1.1.1 2003-06-04 00:25:45 marka Exp $ */
1
/* $Id: log.h,v 1.1.1.1 2003/06/04 00:25:45 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/mdn/utf8.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/mdn/utf8.h
 Lines 1-4    Link Here 
1
/* $Id: utf8.h,v 1.1.1.1 2003-06-04 00:25:46 marka Exp $ */
1
/* $Id: utf8.h,v 1.1.1.1 2003/06/04 00:25:46 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/mdn/result.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/mdn/result.h
 Lines 1-4    Link Here 
1
/* $Id: result.h,v 1.1.1.1 2003-06-04 00:25:46 marka Exp $ */
1
/* $Id: result.h,v 1.1.1.1 2003/06/04 00:25:46 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/mdn/res.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/mdn/res.h
 Lines 1-4    Link Here 
1
/* $Id: res.h,v 1.1.1.1 2003-06-04 00:25:45 marka Exp $ */
1
/* $Id: res.h,v 1.1.1.1 2003/06/04 00:25:45 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2001,2002 Japan Network Information Center.
3
 * Copyright (c) 2001,2002 Japan Network Information Center.
4
 * All rights reserved.
4
 * All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/mdn/Makefile.in
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/mdn/Makefile.in
 Lines 1-4    Link Here 
1
# $Id: Makefile.in,v 1.1.1.1 2003-06-04 00:25:45 marka Exp $
1
# $Id: Makefile.in,v 1.1.1.1 2003/06/04 00:25:45 marka Exp $
2
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
2
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
#  
3
#  
4
# By using this file, you agree to the terms and conditions set forth bellow.
4
# By using this file, you agree to the terms and conditions set forth bellow.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/mdn/api.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/mdn/api.h
 Lines 1-4    Link Here 
1
/* $Id: api.h,v 1.1.1.1 2003-06-04 00:25:45 marka Exp $ */
1
/* $Id: api.h,v 1.1.1.1 2003/06/04 00:25:45 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2001,2002 Japan Network Information Center.
3
 * Copyright (c) 2001,2002 Japan Network Information Center.
4
 * All rights reserved.
4
 * All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/mdn/localencoding.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/mdn/localencoding.h
 Lines 1-4    Link Here 
1
/* $Id: localencoding.h,v 1.1.1.1 2003-06-04 00:25:45 marka Exp $ */
1
/* $Id: localencoding.h,v 1.1.1.1 2003/06/04 00:25:45 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/version.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/version.h
 Lines 1-4    Link Here 
1
/* $Id: version.h,v 1.1.1.1 2003-06-04 00:25:44 marka Exp $ */
1
/* $Id: version.h,v 1.1.1.1 2003/06/04 00:25:44 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/resconf.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/resconf.h
 Lines 1-4    Link Here 
1
/* $Id: resconf.h,v 1.1.1.1 2003-06-04 00:25:41 marka Exp $ */
1
/* $Id: resconf.h,v 1.1.1.1 2003/06/04 00:25:41 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/strhash.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/strhash.h
 Lines 1-4    Link Here 
1
/* $Id: strhash.h,v 1.1.1.1 2003-06-04 00:25:42 marka Exp $ */
1
/* $Id: strhash.h,v 1.1.1.1 2003/06/04 00:25:42 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/unicode.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/unicode.h
 Lines 1-4    Link Here 
1
/* $Id: unicode.h,v 1.1.1.1 2003-06-04 00:25:43 marka Exp $ */
1
/* $Id: unicode.h,v 1.1.1.1 2003/06/04 00:25:43 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000,2001 Japan Network Information Center.
3
 * Copyright (c) 2000,2001 Japan Network Information Center.
4
 * All rights reserved.
4
 * All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/unormalize.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/unormalize.h
 Lines 1-4    Link Here 
1
/* $Id: unormalize.h,v 1.1.1.1 2003-06-04 00:25:44 marka Exp $ */
1
/* $Id: unormalize.h,v 1.1.1.1 2003/06/04 00:25:44 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000,2001 Japan Network Information Center.
3
 * Copyright (c) 2000,2001 Japan Network Information Center.
4
 * All rights reserved.
4
 * All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/ucsmap.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/ucsmap.h
 Lines 1-4    Link Here 
1
/* $Id: ucsmap.h,v 1.1.1.1 2003-06-04 00:25:42 marka Exp $ */
1
/* $Id: ucsmap.h,v 1.1.1.1 2003/06/04 00:25:42 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/log.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/log.h
 Lines 1-4    Link Here 
1
/* $Id: log.h,v 1.1.1.1 2003-06-04 00:25:38 marka Exp $ */
1
/* $Id: log.h,v 1.1.1.1 2003/06/04 00:25:38 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/debug.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/debug.h
 Lines 1-4    Link Here 
1
/* $Id: debug.h,v 1.1.1.1 2003-06-04 00:25:36 marka Exp $ */
1
/* $Id: debug.h,v 1.1.1.1 2003/06/04 00:25:36 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/race.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/race.h
 Lines 1-4    Link Here 
1
/* $Id: race.h,v 1.1.1.1 2003-06-04 00:25:40 marka Exp $ */
1
/* $Id: race.h,v 1.1.1.1 2003/06/04 00:25:40 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/utf8.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/utf8.h
 Lines 1-4    Link Here 
1
/* $Id: utf8.h,v 1.1.1.1 2003-06-04 00:25:44 marka Exp $ */
1
/* $Id: utf8.h,v 1.1.1.1 2003/06/04 00:25:44 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/converter.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/converter.h
 Lines 1-4    Link Here 
1
/* $Id: converter.h,v 1.1.1.1 2003-06-04 00:25:36 marka Exp $ */
1
/* $Id: converter.h,v 1.1.1.1 2003/06/04 00:25:36 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/mapper.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/mapper.h
 Lines 1-4    Link Here 
1
/* $Id: mapper.h,v 1.1.1.1 2003-06-04 00:25:38 marka Exp $ */
1
/* $Id: mapper.h,v 1.1.1.1 2003/06/04 00:25:38 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/mapselector.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/mapselector.h
 Lines 1-4    Link Here 
1
/* $Id: mapselector.h,v 1.1.1.1 2003-06-04 00:25:39 marka Exp $ */
1
/* $Id: mapselector.h,v 1.1.1.1 2003/06/04 00:25:39 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/result.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/result.h
 Lines 1-4    Link Here 
1
/* $Id: result.h,v 1.1.1.1 2003-06-04 00:25:42 marka Exp $ */
1
/* $Id: result.h,v 1.1.1.1 2003/06/04 00:25:42 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/checker.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/checker.h
 Lines 1-4    Link Here 
1
/* $Id: checker.h,v 1.1.1.1 2003-06-04 00:25:36 marka Exp $ */
1
/* $Id: checker.h,v 1.1.1.1 2003/06/04 00:25:36 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/normalizer.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/normalizer.h
 Lines 1-4    Link Here 
1
/* $Id: normalizer.h,v 1.1.1.1 2003-06-04 00:25:40 marka Exp $ */
1
/* $Id: normalizer.h,v 1.1.1.1 2003/06/04 00:25:40 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/util.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/util.h
 Lines 1-4    Link Here 
1
/* $Id: util.h,v 1.1.1.1 2003-06-04 00:25:44 marka Exp $ */
1
/* $Id: util.h,v 1.1.1.1 2003/06/04 00:25:44 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000,2002 Japan Network Information Center.
3
 * Copyright (c) 2000,2002 Japan Network Information Center.
4
 * All rights reserved.
4
 * All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/logmacro.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/logmacro.h
 Lines 1-4    Link Here 
1
/* $Id: logmacro.h,v 1.1.1.1 2003-06-04 00:25:38 marka Exp $ */
1
/* $Id: logmacro.h,v 1.1.1.1 2003/06/04 00:25:38 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/res.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/res.h
 Lines 1-4    Link Here 
1
/* $Id: res.h,v 1.1.1.1 2003-06-04 00:25:41 marka Exp $ */
1
/* $Id: res.h,v 1.1.1.1 2003/06/04 00:25:41 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2001,2002 Japan Network Information Center.
3
 * Copyright (c) 2001,2002 Japan Network Information Center.
4
 * All rights reserved.
4
 * All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/filemapper.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/filemapper.h
 Lines 1-4    Link Here 
1
/* $Id: filemapper.h,v 1.1.1.1 2003-06-04 00:25:38 marka Exp $ */
1
/* $Id: filemapper.h,v 1.1.1.1 2003/06/04 00:25:38 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/export.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/export.h
 Lines 1-4    Link Here 
1
/* $Id: export.h,v 1.1.1.1 2003-06-04 00:25:37 marka Exp $ */
1
/* $Id: export.h,v 1.1.1.1 2003/06/04 00:25:37 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2002 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2002 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/Makefile.in
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/Makefile.in
 Lines 1-4    Link Here 
1
# $Id: Makefile.in,v 1.1.1.1 2003-06-04 00:25:34 marka Exp $
1
# $Id: Makefile.in,v 1.1.1.1 2003/06/04 00:25:34 marka Exp $
2
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
2
# Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
#  
3
#  
4
# By using this file, you agree to the terms and conditions set forth bellow.
4
# By using this file, you agree to the terms and conditions set forth bellow.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/delimitermap.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/delimitermap.h
 Lines 1-4    Link Here 
1
/* $Id: delimitermap.h,v 1.1.1.1 2003-06-04 00:25:37 marka Exp $ */
1
/* $Id: delimitermap.h,v 1.1.1.1 2003/06/04 00:25:37 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/aliaslist.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/aliaslist.h
 Lines 1-4    Link Here 
1
/* $Id: aliaslist.h,v 1.1.1.1 2003-06-04 00:25:34 marka Exp $ */
1
/* $Id: aliaslist.h,v 1.1.1.1 2003/06/04 00:25:34 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2002 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2002 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/filechecker.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/filechecker.h
 Lines 1-4    Link Here 
1
/* $Id: filechecker.h,v 1.1.1.1 2003-06-04 00:25:37 marka Exp $ */
1
/* $Id: filechecker.h,v 1.1.1.1 2003/06/04 00:25:37 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/api.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/api.h
 Lines 1-4    Link Here 
1
/* $Id: api.h,v 1.1.1.1 2003-06-04 00:25:35 marka Exp $ */
1
/* $Id: api.h,v 1.1.1.1 2003/06/04 00:25:35 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2001,2002 Japan Network Information Center.
3
 * Copyright (c) 2001,2002 Japan Network Information Center.
4
 * All rights reserved.
4
 * All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/assert.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/assert.h
 Lines 1-4    Link Here 
1
/* $Id: assert.h,v 1.1.1.1 2003-06-04 00:25:35 marka Exp $ */
1
/* $Id: assert.h,v 1.1.1.1 2003/06/04 00:25:35 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/ucsset.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/ucsset.h
 Lines 1-4    Link Here 
1
/* $Id: ucsset.h,v 1.1.1.1 2003-06-04 00:25:43 marka Exp $ */
1
/* $Id: ucsset.h,v 1.1.1.1 2003/06/04 00:25:43 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/ucs4.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/ucs4.h
 Lines 1-4    Link Here 
1
/* $Id: ucs4.h,v 1.1.1.1 2003-06-04 00:25:42 marka Exp $ */
1
/* $Id: ucs4.h,v 1.1.1.1 2003/06/04 00:25:42 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2002 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2002 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/punycode.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/punycode.h
 Lines 1-4    Link Here 
1
/* $Id: punycode.h,v 1.1.1.1 2003-06-04 00:25:40 marka Exp $ */
1
/* $Id: punycode.h,v 1.1.1.1 2003/06/04 00:25:40 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/nameprep.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/nameprep.h
 Lines 1-4    Link Here 
1
/* $Id: nameprep.h,v 1.1.1.1 2003-06-04 00:25:39 marka Exp $ */
1
/* $Id: nameprep.h,v 1.1.1.1 2003/06/04 00:25:39 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2001 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/idn/idnkit-1.0-src/include/idn/localencoding.h
5
++ bind9-9.7.3.dfsg/contrib/idn/idnkit-1.0-src/include/idn/localencoding.h
 Lines 1-4    Link Here 
1
/* $Id: localencoding.h,v 1.1.1.1 2003-06-04 00:25:38 marka Exp $ */
1
/* $Id: localencoding.h,v 1.1.1.1 2003/06/04 00:25:38 marka Exp $ */
2
/*
2
/*
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
3
 * Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
4
 *  
4
 *  
5
-- bind9-9.7.3.dfsg.orig/contrib/nslint-2.1a3/nslint.c
5
++ bind9-9.7.3.dfsg/contrib/nslint-2.1a3/nslint.c
 Lines 23-29    Link Here 
23
    "@(#) Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001\n\
23
    "@(#) Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001\n\
24
The Regents of the University of California.  All rights reserved.\n";
24
The Regents of the University of California.  All rights reserved.\n";
25
static const char rcsid[] =
25
static const char rcsid[] =
26
    "@(#) $Id: nslint.c,v 1.1 2001-12-21 04:12:04 marka Exp $ (LBL)";
26
    "@(#) $Id: nslint.c,v 1.1 2001/12/21 04:12:04 marka Exp $ (LBL)";
27
#endif
27
#endif
28
/*
28
/*
29
 * nslint - perform consistency checks on dns files
29
 * nslint - perform consistency checks on dns files
30
-- bind9-9.7.3.dfsg.orig/contrib/nslint-2.1a3/CHANGES
30
++ bind9-9.7.3.dfsg/contrib/nslint-2.1a3/CHANGES
 Lines 1-4    Link Here 
1
@(#) $Id: CHANGES,v 1.1 2001-12-21 04:12:02 marka Exp $ (LBL)
1
@(#) $Id: CHANGES,v 1.1 2001/12/21 04:12:02 marka Exp $ (LBL)
2
2
3
v2.1 Wed Aug 22 18:30:35 PDT 2001
3
v2.1 Wed Aug 22 18:30:35 PDT 2001
4
4
5
-- bind9-9.7.3.dfsg.orig/contrib/nslint-2.1a3/configure.in
5
++ bind9-9.7.3.dfsg/contrib/nslint-2.1a3/configure.in
 Lines 1-4    Link Here 
1
dnl @(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/configure.in,v 1.1 2001-12-21 04:12:03 marka Exp $ (LBL)
1
dnl @(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/configure.in,v 1.1 2001/12/21 04:12:03 marka Exp $ (LBL)
2
dnl
2
dnl
3
dnl Copyright (c) 1995, 1996, 1997
3
dnl Copyright (c) 1995, 1996, 1997
4
dnl	The Regents of the University of California.  All rights reserved.
4
dnl	The Regents of the University of California.  All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/nslint-2.1a3/INSTALL
5
++ bind9-9.7.3.dfsg/contrib/nslint-2.1a3/INSTALL
 Lines 1-4    Link Here 
1
@(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/INSTALL,v 1.1 2001-12-21 04:12:02 marka Exp $ (LBL)
1
@(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/INSTALL,v 1.1 2001/12/21 04:12:02 marka Exp $ (LBL)
2
2
3
You will need an ANSI C compiler to build nslint. The configure
3
You will need an ANSI C compiler to build nslint. The configure
4
script will abort if your compiler is not ANSI compliant. If this
4
script will abort if your compiler is not ANSI compliant. If this
5
-- bind9-9.7.3.dfsg.orig/contrib/nslint-2.1a3/README
5
++ bind9-9.7.3.dfsg/contrib/nslint-2.1a3/README
 Lines 1-4    Link Here 
1
@(#) $Id: README,v 1.1 2001-12-21 04:12:02 marka Exp $ (LBL)
1
@(#) $Id: README,v 1.1 2001/12/21 04:12:02 marka Exp $ (LBL)
2
2
3
NSLINT 2.0
3
NSLINT 2.0
4
Lawrence Berkeley National Laboratory
4
Lawrence Berkeley National Laboratory
5
-- bind9-9.7.3.dfsg.orig/contrib/nslint-2.1a3/aclocal.m4
5
++ bind9-9.7.3.dfsg/contrib/nslint-2.1a3/aclocal.m4
 Lines 1-4    Link Here 
1
dnl @(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/aclocal.m4,v 1.1 2001-12-21 04:12:03 marka Exp $ (LBL)
1
dnl @(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/aclocal.m4,v 1.1 2001/12/21 04:12:03 marka Exp $ (LBL)
2
dnl
2
dnl
3
dnl Copyright (c) 1995, 1996, 1997, 1998, 1999
3
dnl Copyright (c) 1995, 1996, 1997, 1998, 1999
4
dnl	The Regents of the University of California.  All rights reserved.
4
dnl	The Regents of the University of California.  All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/nslint-2.1a3/savestr.c
5
++ bind9-9.7.3.dfsg/contrib/nslint-2.1a3/savestr.c
 Lines 21-27    Link Here 
21
21
22
#ifndef lint
22
#ifndef lint
23
static const char rcsid[] =
23
static const char rcsid[] =
24
    "@(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/savestr.c,v 1.1 2001-12-21 04:12:04 marka Exp $ (LBL)";
24
    "@(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/savestr.c,v 1.1 2001/12/21 04:12:04 marka Exp $ (LBL)";
25
#endif
25
#endif
26
26
27
#include <sys/types.h>
27
#include <sys/types.h>
28
-- bind9-9.7.3.dfsg.orig/contrib/nslint-2.1a3/savestr.h
28
++ bind9-9.7.3.dfsg/contrib/nslint-2.1a3/savestr.h
 Lines 18-24    Link Here 
18
 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
18
 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
19
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20
 *
20
 *
21
 * @(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/savestr.h,v 1.1 2001-12-21 04:12:05 marka Exp $ (LBL)
21
 * @(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/savestr.h,v 1.1 2001/12/21 04:12:05 marka Exp $ (LBL)
22
 */
22
 */
23
23
24
extern char *savestr(const char *);
24
extern char *savestr(const char *);
25
-- bind9-9.7.3.dfsg.orig/contrib/nslint-2.1a3/config.sub
25
++ bind9-9.7.3.dfsg/contrib/nslint-2.1a3/config.sub
 Lines 1-6    Link Here 
1
#! /bin/sh
1
#! /bin/sh
2
# Configuration validation subroutine script, version 1.1.
2
# Configuration validation subroutine script.
3
#   Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
3
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
5
#   Free Software Foundation, Inc.
6
7
timestamp='2009-04-17'
8
4
# This file is (in principle) common to ALL GNU software.
9
# This file is (in principle) common to ALL GNU software.
5
# The presence of a machine in this file suggests that SOME GNU software
10
# The presence of a machine in this file suggests that SOME GNU software
6
# can handle that machine.  It does not imply ALL GNU software can.
11
# can handle that machine.  It does not imply ALL GNU software can.
 Lines 17-30    Link Here 
17
#
22
#
18
# You should have received a copy of the GNU General Public License
23
# You should have received a copy of the GNU General Public License
19
# along with this program; if not, write to the Free Software
24
# along with this program; if not, write to the Free Software
20
# Foundation, Inc., 59 Temple Place - Suite 330,
25
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
21
# Boston, MA 02111-1307, USA.
26
# 02110-1301, USA.
22
27
#
23
# As a special exception to the GNU General Public License, if you
28
# As a special exception to the GNU General Public License, if you
24
# distribute this file as part of a program that contains a
29
# distribute this file as part of a program that contains a
25
# configuration script generated by Autoconf, you may include it under
30
# configuration script generated by Autoconf, you may include it under
26
# the same distribution terms that you use for the rest of that program.
31
# the same distribution terms that you use for the rest of that program.
27
32
33
34
# Please send patches to <config-patches@gnu.org>.  Submit a context
35
# diff and a properly formatted ChangeLog entry.
36
#
28
# Configuration subroutine to validate and canonicalize a configuration type.
37
# Configuration subroutine to validate and canonicalize a configuration type.
29
# Supply the specified configuration type as an argument.
38
# Supply the specified configuration type as an argument.
30
# If it is invalid, we print an error message on stderr and exit with code 1.
39
# If it is invalid, we print an error message on stderr and exit with code 1.
 Lines 45-74    Link Here 
45
#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
54
#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
46
# It is wrong to echo any other type of specification.
55
# It is wrong to echo any other type of specification.
47
56
48
if [ x$1 = x ]
57
me=`echo "$0" | sed -e 's,.*/,,'`
49
then
50
	echo Configuration name missing. 1>&2
51
	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
52
	echo "or     $0 ALIAS" 1>&2
53
	echo where ALIAS is a recognized configuration type. 1>&2
54
	exit 1
55
fi
56
58
57
# First pass through any local machine types.
59
usage="\
58
case $1 in
60
Usage: $0 [OPTION] CPU-MFR-OPSYS
59
	*local*)
61
       $0 [OPTION] ALIAS
60
		echo $1
62
61
		exit 0
63
Canonicalize a configuration name.
62
		;;
64
63
	*)
65
Operation modes:
64
	;;
66
  -h, --help         print this help, then exit
67
  -t, --time-stamp   print date of last modification, then exit
68
  -v, --version      print version number, then exit
69
70
Report bugs and patches to <config-patches@gnu.org>."
71
72
version="\
73
GNU config.sub ($timestamp)
74
75
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
76
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
77
78
This is free software; see the source for copying conditions.  There is NO
79
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
80
81
help="
82
Try \`$me --help' for more information."
83
84
# Parse command line
85
while test $# -gt 0 ; do
86
  case $1 in
87
    --time-stamp | --time* | -t )
88
       echo "$timestamp" ; exit ;;
89
    --version | -v )
90
       echo "$version" ; exit ;;
91
    --help | --h* | -h )
92
       echo "$usage"; exit ;;
93
    -- )     # Stop option processing
94
       shift; break ;;
95
    - )	# Use stdin as input.
96
       break ;;
97
    -* )
98
       echo "$me: invalid option $1$help"
99
       exit 1 ;;
100
101
    *local*)
102
       # First pass through any local machine types.
103
       echo $1
104
       exit ;;
105
106
    * )
107
       break ;;
108
  esac
109
done
110
111
case $# in
112
 0) echo "$me: missing argument$help" >&2
113
    exit 1;;
114
 1) ;;
115
 *) echo "$me: too many arguments$help" >&2
116
    exit 1;;
65
esac
117
esac
66
118
67
# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
119
# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
68
# Here we must recognize all the valid KERNEL-OS combinations.
120
# Here we must recognize all the valid KERNEL-OS combinations.
69
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
121
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
70
case $maybe_os in
122
case $maybe_os in
71
  linux-gnu*)
123
  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
124
  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
125
  kopensolaris*-gnu* | \
126
  storm-chaos* | os2-emx* | rtmk-nova*)
72
    os=-$maybe_os
127
    os=-$maybe_os
73
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
128
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
74
    ;;
129
    ;;
 Lines 94-108    Link Here 
94
	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
149
	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
95
	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
150
	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
96
	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
151
	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
97
	-apple)
152
	-apple | -axis | -knuth | -cray)
98
		os=
153
		os=
99
		basic_machine=$1
154
		basic_machine=$1
100
		;;
155
		;;
156
	-sim | -cisco | -oki | -wec | -winbond)
157
		os=
158
		basic_machine=$1
159
		;;
160
	-scout)
161
		;;
162
	-wrs)
163
		os=-vxworks
164
		basic_machine=$1
165
		;;
166
	-chorusos*)
167
		os=-chorusos
168
		basic_machine=$1
169
		;;
170
 	-chorusrdb)
171
 		os=-chorusrdb
172
		basic_machine=$1
173
 		;;
101
	-hiux*)
174
	-hiux*)
102
		os=-hiuxwe2
175
		os=-hiuxwe2
103
		;;
176
		;;
177
	-sco6)
178
		os=-sco5v6
179
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
180
		;;
104
	-sco5)
181
	-sco5)
105
		os=sco3.2v5
182
		os=-sco3.2v5
106
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
183
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
107
		;;
184
		;;
108
	-sco4)
185
	-sco4)
 Lines 117-126    Link Here 
117
		# Don't forget version if it is 3.2v4 or newer.
194
		# Don't forget version if it is 3.2v4 or newer.
118
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
195
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
119
		;;
196
		;;
197
	-sco5v6*)
198
		# Don't forget version if it is 3.2v4 or newer.
199
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
200
		;;
120
	-sco*)
201
	-sco*)
121
		os=-sco3.2v2
202
		os=-sco3.2v2
122
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
203
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
123
		;;
204
		;;
205
	-udk*)
206
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
207
		;;
124
	-isc)
208
	-isc)
125
		os=-isc2.2
209
		os=-isc2.2
126
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
210
		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 Lines 143-167    Link Here 
143
	-psos*)
227
	-psos*)
144
		os=-psos
228
		os=-psos
145
		;;
229
		;;
230
	-mint | -mint[0-9]*)
231
		basic_machine=m68k-atari
232
		os=-mint
233
		;;
146
esac
234
esac
147
235
148
# Decode aliases for certain CPU-COMPANY combinations.
236
# Decode aliases for certain CPU-COMPANY combinations.
149
case $basic_machine in
237
case $basic_machine in
150
	# Recognize the basic CPU types without company name.
238
	# Recognize the basic CPU types without company name.
151
	# Some are omitted here because they have special meanings below.
239
	# Some are omitted here because they have special meanings below.
152
	tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \
240
	1750a | 580 \
153
		| arme[lb] | pyramid \
241
	| a29k \
154
		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
242
	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
155
		| alpha | we32k | ns16k | clipper | i370 | sh \
243
	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
156
		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
244
	| am33_2.0 \
157
		| pdp11 | mips64el | mips64orion | mips64orionel \
245
	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
158
		| sparc | sparclet | sparclite | sparc64)
246
	| bfin \
247
	| c4x | clipper \
248
	| d10v | d30v | dlx | dsp16xx \
249
	| fido | fr30 | frv \
250
	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
251
	| i370 | i860 | i960 | ia64 \
252
	| ip2k | iq2000 \
253
	| lm32 \
254
	| m32c | m32r | m32rle | m68000 | m68k | m88k \
255
	| maxq | mb | microblaze | mcore | mep | metag \
256
	| mips | mipsbe | mipseb | mipsel | mipsle \
257
	| mips16 \
258
	| mips64 | mips64el \
259
	| mips64octeon | mips64octeonel \
260
	| mips64orion | mips64orionel \
261
	| mips64r5900 | mips64r5900el \
262
	| mips64vr | mips64vrel \
263
	| mips64vr4100 | mips64vr4100el \
264
	| mips64vr4300 | mips64vr4300el \
265
	| mips64vr5000 | mips64vr5000el \
266
	| mips64vr5900 | mips64vr5900el \
267
	| mipsisa32 | mipsisa32el \
268
	| mipsisa32r2 | mipsisa32r2el \
269
	| mipsisa64 | mipsisa64el \
270
	| mipsisa64r2 | mipsisa64r2el \
271
	| mipsisa64sb1 | mipsisa64sb1el \
272
	| mipsisa64sr71k | mipsisa64sr71kel \
273
	| mipstx39 | mipstx39el \
274
	| mn10200 | mn10300 \
275
	| moxie \
276
	| mt \
277
	| msp430 \
278
	| nios | nios2 \
279
	| ns16k | ns32k \
280
	| or32 \
281
	| pdp10 | pdp11 | pj | pjl \
282
	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
283
	| pyramid \
284
	| score \
285
	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
286
	| sh64 | sh64le \
287
	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
288
	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
289
	| spu | strongarm \
290
	| tahoe | thumb | tic4x | tic80 | tron \
291
	| v850 | v850e \
292
	| we32k \
293
	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
294
	| z8k | z80)
295
		basic_machine=$basic_machine-unknown
296
		;;
297
	m6811 | m68hc11 | m6812 | m68hc12)
298
		# Motorola 68HC11/12.
159
		basic_machine=$basic_machine-unknown
299
		basic_machine=$basic_machine-unknown
300
		os=-none
160
		;;
301
		;;
302
	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
303
		;;
304
	ms1)
305
		basic_machine=mt-unknown
306
		;;
307
161
	# We use `pc' rather than `unknown'
308
	# We use `pc' rather than `unknown'
162
	# because (1) that's what they normally are, and
309
	# because (1) that's what they normally are, and
163
	# (2) the word "unknown" tends to confuse beginning users.
310
	# (2) the word "unknown" tends to confuse beginning users.
164
	i[3456]86)
311
	i*86 | x86_64)
165
	  basic_machine=$basic_machine-pc
312
	  basic_machine=$basic_machine-pc
166
	  ;;
313
	  ;;
167
	# Object if more than one company name word.
314
	# Object if more than one company name word.
 Lines 170-192    Link Here 
170
		exit 1
317
		exit 1
171
		;;
318
		;;
172
	# Recognize the basic CPU types with company name.
319
	# Recognize the basic CPU types with company name.
173
	vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
320
	580-* \
174
	      | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
321
	| a29k-* \
175
	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
322
	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
176
	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
323
	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
177
	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
324
	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
178
	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
325
	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
179
	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
326
	| avr-* | avr32-* \
180
	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
327
	| bfin-* | bs2000-* \
328
	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
329
	| clipper-* | craynv-* | cydra-* \
330
	| d10v-* | d30v-* | dlx-* \
331
	| elxsi-* \
332
	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
333
	| h8300-* | h8500-* \
334
	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
335
	| i*86-* | i860-* | i960-* | ia64-* \
336
	| ip2k-* | iq2000-* \
337
	| lm32-* \
338
	| m32c-* | m32r-* | m32rle-* \
339
	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
340
	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
341
	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
342
	| mips16-* \
343
	| mips64-* | mips64el-* \
344
	| mips64octeon-* | mips64octeonel-* \
345
	| mips64orion-* | mips64orionel-* \
346
	| mips64r5900-* | mips64r5900el-* \
347
	| mips64vr-* | mips64vrel-* \
348
	| mips64vr4100-* | mips64vr4100el-* \
349
	| mips64vr4300-* | mips64vr4300el-* \
350
	| mips64vr5000-* | mips64vr5000el-* \
351
	| mips64vr5900-* | mips64vr5900el-* \
352
	| mipsisa32-* | mipsisa32el-* \
353
	| mipsisa32r2-* | mipsisa32r2el-* \
354
	| mipsisa64-* | mipsisa64el-* \
355
	| mipsisa64r2-* | mipsisa64r2el-* \
356
	| mipsisa64sb1-* | mipsisa64sb1el-* \
357
	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
358
	| mipstx39-* | mipstx39el-* \
359
	| mmix-* \
360
	| mt-* \
361
	| msp430-* \
362
	| nios-* | nios2-* \
363
	| none-* | np1-* | ns16k-* | ns32k-* \
364
	| orion-* \
365
	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
366
	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
367
	| pyramid-* \
368
	| romp-* | rs6000-* \
369
	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
370
	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
371
	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
372
	| sparclite-* \
373
	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
374
	| tahoe-* | thumb-* \
375
	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
376
	| tron-* \
377
	| v850-* | v850e-* | vax-* \
378
	| we32k-* \
379
	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
380
	| xstormy16-* | xtensa*-* \
381
	| ymp-* \
382
	| z8k-* | z80-*)
383
		;;
384
	# Recognize the basic CPU types without company name, with glob match.
385
	xtensa*)
386
		basic_machine=$basic_machine-unknown
181
		;;
387
		;;
182
	# Recognize the various machine names and aliases which stand
388
	# Recognize the various machine names and aliases which stand
183
	# for a CPU type and a company and sometimes even an OS.
389
	# for a CPU type and a company and sometimes even an OS.
390
	386bsd)
391
		basic_machine=i386-unknown
392
		os=-bsd
393
		;;
184
	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
394
	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
185
		basic_machine=m68000-att
395
		basic_machine=m68000-att
186
		;;
396
		;;
187
	3b*)
397
	3b*)
188
		basic_machine=we32k-att
398
		basic_machine=we32k-att
189
		;;
399
		;;
400
	a29khif)
401
		basic_machine=a29k-amd
402
		os=-udi
403
		;;
404
    	abacus)
405
		basic_machine=abacus-unknown
406
		;;
407
	adobe68k)
408
		basic_machine=m68010-adobe
409
		os=-scout
410
		;;
190
	alliant | fx80)
411
	alliant | fx80)
191
		basic_machine=fx80-alliant
412
		basic_machine=fx80-alliant
192
		;;
413
		;;
 Lines 197-221    Link Here 
197
		basic_machine=a29k-none
418
		basic_machine=a29k-none
198
		os=-bsd
419
		os=-bsd
199
		;;
420
		;;
421
	amd64)
422
		basic_machine=x86_64-pc
423
		;;
424
	amd64-*)
425
		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
426
		;;
200
	amdahl)
427
	amdahl)
201
		basic_machine=580-amdahl
428
		basic_machine=580-amdahl
202
		os=-sysv
429
		os=-sysv
203
		;;
430
		;;
204
	amiga | amiga-*)
431
	amiga | amiga-*)
205
		basic_machine=m68k-cbm
432
		basic_machine=m68k-unknown
206
		;;
433
		;;
207
	amigados)
434
	amigaos | amigados)
208
		basic_machine=m68k-cbm
435
		basic_machine=m68k-unknown
209
		os=-amigados
436
		os=-amigaos
210
		;;
437
		;;
211
	amigaunix | amix)
438
	amigaunix | amix)
212
		basic_machine=m68k-cbm
439
		basic_machine=m68k-unknown
213
		os=-sysv4
440
		os=-sysv4
214
		;;
441
		;;
215
	apollo68)
442
	apollo68)
216
		basic_machine=m68k-apollo
443
		basic_machine=m68k-apollo
217
		os=-sysv
444
		os=-sysv
218
		;;
445
		;;
446
	apollo68bsd)
447
		basic_machine=m68k-apollo
448
		os=-bsd
449
		;;
450
	aros)
451
		basic_machine=i386-pc
452
		os=-aros
453
		;;
219
	aux)
454
	aux)
220
		basic_machine=m68k-apple
455
		basic_machine=m68k-apple
221
		os=-aux
456
		os=-aux
 Lines 224-229    Link Here 
224
		basic_machine=ns32k-sequent
459
		basic_machine=ns32k-sequent
225
		os=-dynix
460
		os=-dynix
226
		;;
461
		;;
462
	blackfin)
463
		basic_machine=bfin-unknown
464
		os=-linux
465
		;;
466
	blackfin-*)
467
		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
468
		os=-linux
469
		;;
470
	c90)
471
		basic_machine=c90-cray
472
		os=-unicos
473
		;;
474
        cegcc)
475
		basic_machine=arm-unknown
476
		os=-cegcc
477
		;;
227
	convex-c1)
478
	convex-c1)
228
		basic_machine=c1-convex
479
		basic_machine=c1-convex
229
		os=-bsd
480
		os=-bsd
 Lines 244-270    Link Here 
244
		basic_machine=c38-convex
495
		basic_machine=c38-convex
245
		os=-bsd
496
		os=-bsd
246
		;;
497
		;;
247
	cray | ymp)
498
	cray | j90)
248
		basic_machine=ymp-cray
499
		basic_machine=j90-cray
249
		os=-unicos
500
		os=-unicos
250
		;;
501
		;;
251
	cray2)
502
	craynv)
252
		basic_machine=cray2-cray
503
		basic_machine=craynv-cray
253
		os=-unicos
504
		os=-unicosmp
254
		;;
505
		;;
255
	[ctj]90-cray)
506
	cr16)
256
		basic_machine=c90-cray
507
		basic_machine=cr16-unknown
257
		os=-unicos
508
		os=-elf
258
		;;
509
		;;
259
	crds | unos)
510
	crds | unos)
260
		basic_machine=m68k-crds
511
		basic_machine=m68k-crds
261
		;;
512
		;;
513
	crisv32 | crisv32-* | etraxfs*)
514
		basic_machine=crisv32-axis
515
		;;
516
	cris | cris-* | etrax*)
517
		basic_machine=cris-axis
518
		;;
519
	crx)
520
		basic_machine=crx-unknown
521
		os=-elf
522
		;;
262
	da30 | da30-*)
523
	da30 | da30-*)
263
		basic_machine=m68k-da30
524
		basic_machine=m68k-da30
264
		;;
525
		;;
265
	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
526
	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
266
		basic_machine=mips-dec
527
		basic_machine=mips-dec
267
		;;
528
		;;
529
	decsystem10* | dec10*)
530
		basic_machine=pdp10-dec
531
		os=-tops10
532
		;;
533
	decsystem20* | dec20*)
534
		basic_machine=pdp10-dec
535
		os=-tops20
536
		;;
268
	delta | 3300 | motorola-3300 | motorola-delta \
537
	delta | 3300 | motorola-3300 | motorola-delta \
269
	      | 3300-motorola | delta-motorola)
538
	      | 3300-motorola | delta-motorola)
270
		basic_machine=m68k-motorola
539
		basic_machine=m68k-motorola
 Lines 273-278    Link Here 
273
		basic_machine=m88k-motorola
542
		basic_machine=m88k-motorola
274
		os=-sysv3
543
		os=-sysv3
275
		;;
544
		;;
545
	dicos)
546
		basic_machine=i686-pc
547
		os=-dicos
548
		;;
549
	djgpp)
550
		basic_machine=i586-pc
551
		os=-msdosdjgpp
552
		;;
276
	dpx20 | dpx20-*)
553
	dpx20 | dpx20-*)
277
		basic_machine=rs6000-bull
554
		basic_machine=rs6000-bull
278
		os=-bosx
555
		os=-bosx
 Lines 292-297    Link Here 
292
	encore | umax | mmax)
569
	encore | umax | mmax)
293
		basic_machine=ns32k-encore
570
		basic_machine=ns32k-encore
294
		;;
571
		;;
572
	es1800 | OSE68k | ose68k | ose | OSE)
573
		basic_machine=m68k-ericsson
574
		os=-ose
575
		;;
295
	fx2800)
576
	fx2800)
296
		basic_machine=i860-alliant
577
		basic_machine=i860-alliant
297
		;;
578
		;;
 Lines 302-307    Link Here 
302
		basic_machine=tron-gmicro
583
		basic_machine=tron-gmicro
303
		os=-sysv
584
		os=-sysv
304
		;;
585
		;;
586
	go32)
587
		basic_machine=i386-pc
588
		os=-go32
589
		;;
305
	h3050r* | hiux*)
590
	h3050r* | hiux*)
306
		basic_machine=hppa1.1-hitachi
591
		basic_machine=hppa1.1-hitachi
307
		os=-hiuxwe2
592
		os=-hiuxwe2
 Lines 310-315    Link Here 
310
		basic_machine=h8300-hitachi
595
		basic_machine=h8300-hitachi
311
		os=-hms
596
		os=-hms
312
		;;
597
		;;
598
	h8300xray)
599
		basic_machine=h8300-hitachi
600
		os=-xray
601
		;;
602
	h8500hms)
603
		basic_machine=h8500-hitachi
604
		os=-hms
605
		;;
313
	harris)
606
	harris)
314
		basic_machine=m88k-harris
607
		basic_machine=m88k-harris
315
		os=-sysv3
608
		os=-sysv3
 Lines 325-337    Link Here 
325
		basic_machine=m68k-hp
618
		basic_machine=m68k-hp
326
		os=-hpux
619
		os=-hpux
327
		;;
620
		;;
621
	hp3k9[0-9][0-9] | hp9[0-9][0-9])
622
		basic_machine=hppa1.0-hp
623
		;;
328
	hp9k2[0-9][0-9] | hp9k31[0-9])
624
	hp9k2[0-9][0-9] | hp9k31[0-9])
329
		basic_machine=m68000-hp
625
		basic_machine=m68000-hp
330
		;;
626
		;;
331
	hp9k3[2-9][0-9])
627
	hp9k3[2-9][0-9])
332
		basic_machine=m68k-hp
628
		basic_machine=m68k-hp
333
		;;
629
		;;
334
	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
630
	hp9k6[0-9][0-9] | hp6[0-9][0-9])
631
		basic_machine=hppa1.0-hp
632
		;;
633
	hp9k7[0-79][0-9] | hp7[0-79][0-9])
634
		basic_machine=hppa1.1-hp
635
		;;
636
	hp9k78[0-9] | hp78[0-9])
637
		# FIXME: really hppa2.0-hp
638
		basic_machine=hppa1.1-hp
639
		;;
640
	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
641
		# FIXME: really hppa2.0-hp
642
		basic_machine=hppa1.1-hp
643
		;;
644
	hp9k8[0-9][13679] | hp8[0-9][13679])
335
		basic_machine=hppa1.1-hp
645
		basic_machine=hppa1.1-hp
336
		;;
646
		;;
337
	hp9k8[0-9][0-9] | hp8[0-9][0-9])
647
	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 Lines 340-366    Link Here 
340
	hppa-next)
650
	hppa-next)
341
		os=-nextstep3
651
		os=-nextstep3
342
		;;
652
		;;
653
	hppaosf)
654
		basic_machine=hppa1.1-hp
655
		os=-osf
656
		;;
657
	hppro)
658
		basic_machine=hppa1.1-hp
659
		os=-proelf
660
		;;
343
	i370-ibm* | ibm*)
661
	i370-ibm* | ibm*)
344
		basic_machine=i370-ibm
662
		basic_machine=i370-ibm
345
		os=-mvs
346
		;;
663
		;;
347
# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
664
# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
348
	i[3456]86v32)
665
	i*86v32)
349
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
666
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
350
		os=-sysv32
667
		os=-sysv32
351
		;;
668
		;;
352
	i[3456]86v4*)
669
	i*86v4*)
353
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
670
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
354
		os=-sysv4
671
		os=-sysv4
355
		;;
672
		;;
356
	i[3456]86v)
673
	i*86v)
357
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
674
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
358
		os=-sysv
675
		os=-sysv
359
		;;
676
		;;
360
	i[3456]86sol2)
677
	i*86sol2)
361
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
678
		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
362
		os=-solaris2
679
		os=-solaris2
363
		;;
680
		;;
681
	i386mach)
682
		basic_machine=i386-mach
683
		os=-mach
684
		;;
685
	i386-vsta | vsta)
686
		basic_machine=i386-unknown
687
		os=-vsta
688
		;;
364
	iris | iris4d)
689
	iris | iris4d)
365
		basic_machine=mips-sgi
690
		basic_machine=mips-sgi
366
		case $os in
691
		case $os in
 Lines 375-380    Link Here 
375
		basic_machine=m68k-isi
700
		basic_machine=m68k-isi
376
		os=-sysv
701
		os=-sysv
377
		;;
702
		;;
703
	m68knommu)
704
		basic_machine=m68k-unknown
705
		os=-linux
706
		;;
707
	m68knommu-*)
708
		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
709
		os=-linux
710
		;;
378
	m88k-omron*)
711
	m88k-omron*)
379
		basic_machine=m88k-omron
712
		basic_machine=m88k-omron
380
		;;
713
		;;
 Lines 386-404    Link Here 
386
		basic_machine=ns32k-utek
719
		basic_machine=ns32k-utek
387
		os=-sysv
720
		os=-sysv
388
		;;
721
		;;
722
	mingw32)
723
		basic_machine=i386-pc
724
		os=-mingw32
725
		;;
726
	mingw32ce)
727
		basic_machine=arm-unknown
728
		os=-mingw32ce
729
		;;
389
	miniframe)
730
	miniframe)
390
		basic_machine=m68000-convergent
731
		basic_machine=m68000-convergent
391
		;;
732
		;;
733
	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
734
		basic_machine=m68k-atari
735
		os=-mint
736
		;;
392
	mips3*-*)
737
	mips3*-*)
393
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
738
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
394
		;;
739
		;;
395
	mips3*)
740
	mips3*)
396
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
741
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
397
		;;
742
		;;
743
	monitor)
744
		basic_machine=m68k-rom68k
745
		os=-coff
746
		;;
747
	morphos)
748
		basic_machine=powerpc-unknown
749
		os=-morphos
750
		;;
751
	msdos)
752
		basic_machine=i386-pc
753
		os=-msdos
754
		;;
755
	ms1-*)
756
		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
757
		;;
758
	mvs)
759
		basic_machine=i370-ibm
760
		os=-mvs
761
		;;
398
	ncr3000)
762
	ncr3000)
399
		basic_machine=i486-ncr
763
		basic_machine=i486-ncr
400
		os=-sysv4
764
		os=-sysv4
401
		;;
765
		;;
766
	netbsd386)
767
		basic_machine=i386-unknown
768
		os=-netbsd
769
		;;
770
	netwinder)
771
		basic_machine=armv4l-rebel
772
		os=-linux
773
		;;
402
	news | news700 | news800 | news900)
774
	news | news700 | news800 | news900)
403
		basic_machine=m68k-sony
775
		basic_machine=m68k-sony
404
		os=-newsos
776
		os=-newsos
 Lines 411-416    Link Here 
411
		basic_machine=mips-sony
783
		basic_machine=mips-sony
412
		os=-newsos
784
		os=-newsos
413
		;;
785
		;;
786
	necv70)
787
		basic_machine=v70-nec
788
		os=-sysv
789
		;;
414
	next | m*-next )
790
	next | m*-next )
415
		basic_machine=m68k-next
791
		basic_machine=m68k-next
416
		case $os in
792
		case $os in
 Lines 436-444    Link Here 
436
		basic_machine=i960-intel
812
		basic_machine=i960-intel
437
		os=-nindy
813
		os=-nindy
438
		;;
814
		;;
815
	mon960)
816
		basic_machine=i960-intel
817
		os=-mon960
818
		;;
819
	nonstopux)
820
		basic_machine=mips-compaq
821
		os=-nonstopux
822
		;;
439
	np1)
823
	np1)
440
		basic_machine=np1-gould
824
		basic_machine=np1-gould
441
		;;
825
		;;
826
	nsr-tandem)
827
		basic_machine=nsr-tandem
828
		;;
829
	op50n-* | op60c-*)
830
		basic_machine=hppa1.1-oki
831
		os=-proelf
832
		;;
833
	openrisc | openrisc-*)
834
		basic_machine=or32-unknown
835
		;;
836
	os400)
837
		basic_machine=powerpc-ibm
838
		os=-os400
839
		;;
840
	OSE68000 | ose68000)
841
		basic_machine=m68000-ericsson
842
		os=-ose
843
		;;
844
	os68k)
845
		basic_machine=m68k-none
846
		os=-os68k
847
		;;
442
	pa-hitachi)
848
	pa-hitachi)
443
		basic_machine=hppa1.1-hitachi
849
		basic_machine=hppa1.1-hitachi
444
		os=-hiuxwe2
850
		os=-hiuxwe2
 Lines 447-505    Link Here 
447
		basic_machine=i860-intel
853
		basic_machine=i860-intel
448
		os=-osf
854
		os=-osf
449
		;;
855
		;;
856
	parisc)
857
		basic_machine=hppa-unknown
858
		os=-linux
859
		;;
860
	parisc-*)
861
		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
862
		os=-linux
863
		;;
450
	pbd)
864
	pbd)
451
		basic_machine=sparc-tti
865
		basic_machine=sparc-tti
452
		;;
866
		;;
453
	pbb)
867
	pbb)
454
		basic_machine=m68k-tti
868
		basic_machine=m68k-tti
455
		;;
869
		;;
456
        pc532 | pc532-*)
870
	pc532 | pc532-*)
457
		basic_machine=ns32k-pc532
871
		basic_machine=ns32k-pc532
458
		;;
872
		;;
459
	pentium | p5)
873
	pc98)
460
		basic_machine=i586-intel
874
		basic_machine=i386-pc
875
		;;
876
	pc98-*)
877
		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
878
		;;
879
	pentium | p5 | k5 | k6 | nexgen | viac3)
880
		basic_machine=i586-pc
881
		;;
882
	pentiumpro | p6 | 6x86 | athlon | athlon_*)
883
		basic_machine=i686-pc
461
		;;
884
		;;
462
	pentiumpro | p6)
885
	pentiumii | pentium2 | pentiumiii | pentium3)
463
		basic_machine=i686-intel
886
		basic_machine=i686-pc
464
		;;
887
		;;
465
	pentium-* | p5-*)
888
	pentium4)
889
		basic_machine=i786-pc
890
		;;
891
	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
466
		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
892
		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
467
		;;
893
		;;
468
	pentiumpro-* | p6-*)
894
	pentiumpro-* | p6-* | 6x86-* | athlon-*)
895
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
896
		;;
897
	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
469
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
898
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
470
		;;
899
		;;
471
	k5)
900
	pentium4-*)
472
		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
901
		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
473
		basic_machine=i586-amd
474
		;;
475
	nexen)
476
		# We don't have specific support for Nexgen yet, so just call it a Pentium
477
		basic_machine=i586-nexgen
478
		;;
902
		;;
479
	pn)
903
	pn)
480
		basic_machine=pn-gould
904
		basic_machine=pn-gould
481
		;;
905
		;;
482
	power)	basic_machine=rs6000-ibm
906
	power)	basic_machine=power-ibm
483
		;;
907
		;;
484
	ppc)	basic_machine=powerpc-unknown
908
	ppc)	basic_machine=powerpc-unknown
485
	        ;;
909
		;;
486
	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
910
	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
487
		;;
911
		;;
488
	ppcle | powerpclittle | ppc-le | powerpc-little)
912
	ppcle | powerpclittle | ppc-le | powerpc-little)
489
		basic_machine=powerpcle-unknown
913
		basic_machine=powerpcle-unknown
490
	        ;;
914
		;;
491
	ppcle-* | powerpclittle-*)
915
	ppcle-* | powerpclittle-*)
492
		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
916
		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
493
		;;
917
		;;
918
	ppc64)	basic_machine=powerpc64-unknown
919
		;;
920
	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
921
		;;
922
	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
923
		basic_machine=powerpc64le-unknown
924
		;;
925
	ppc64le-* | powerpc64little-*)
926
		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
927
		;;
494
	ps2)
928
	ps2)
495
		basic_machine=i386-ibm
929
		basic_machine=i386-ibm
496
		;;
930
		;;
931
	pw32)
932
		basic_machine=i586-unknown
933
		os=-pw32
934
		;;
935
	rdos)
936
		basic_machine=i386-pc
937
		os=-rdos
938
		;;
939
	rom68k)
940
		basic_machine=m68k-rom68k
941
		os=-coff
942
		;;
497
	rm[46]00)
943
	rm[46]00)
498
		basic_machine=mips-siemens
944
		basic_machine=mips-siemens
499
		;;
945
		;;
500
	rtpc | rtpc-*)
946
	rtpc | rtpc-*)
501
		basic_machine=romp-ibm
947
		basic_machine=romp-ibm
502
		;;
948
		;;
949
	s390 | s390-*)
950
		basic_machine=s390-ibm
951
		;;
952
	s390x | s390x-*)
953
		basic_machine=s390x-ibm
954
		;;
955
	sa29200)
956
		basic_machine=a29k-amd
957
		os=-udi
958
		;;
959
	sb1)
960
		basic_machine=mipsisa64sb1-unknown
961
		;;
962
	sb1el)
963
		basic_machine=mipsisa64sb1el-unknown
964
		;;
965
	sde)
966
		basic_machine=mipsisa32-sde
967
		os=-elf
968
		;;
969
	sei)
970
		basic_machine=mips-sei
971
		os=-seiux
972
		;;
503
	sequent)
973
	sequent)
504
		basic_machine=i386-sequent
974
		basic_machine=i386-sequent
505
		;;
975
		;;
 Lines 507-512    Link Here 
507
		basic_machine=sh-hitachi
977
		basic_machine=sh-hitachi
508
		os=-hms
978
		os=-hms
509
		;;
979
		;;
980
	sh5el)
981
		basic_machine=sh5le-unknown
982
		;;
983
	sh64)
984
		basic_machine=sh64-unknown
985
		;;
986
	sparclite-wrs | simso-wrs)
987
		basic_machine=sparclite-wrs
988
		os=-vxworks
989
		;;
510
	sps7)
990
	sps7)
511
		basic_machine=m68k-bull
991
		basic_machine=m68k-bull
512
		os=-sysv2
992
		os=-sysv2
 Lines 514-519    Link Here 
514
	spur)
994
	spur)
515
		basic_machine=spur-unknown
995
		basic_machine=spur-unknown
516
		;;
996
		;;
997
	st2000)
998
		basic_machine=m68k-tandem
999
		;;
1000
	stratus)
1001
		basic_machine=i860-stratus
1002
		os=-sysv4
1003
		;;
517
	sun2)
1004
	sun2)
518
		basic_machine=m68000-sun
1005
		basic_machine=m68000-sun
519
		;;
1006
		;;
 Lines 554-566    Link Here 
554
	sun386 | sun386i | roadrunner)
1041
	sun386 | sun386i | roadrunner)
555
		basic_machine=i386-sun
1042
		basic_machine=i386-sun
556
		;;
1043
		;;
1044
	sv1)
1045
		basic_machine=sv1-cray
1046
		os=-unicos
1047
		;;
557
	symmetry)
1048
	symmetry)
558
		basic_machine=i386-sequent
1049
		basic_machine=i386-sequent
559
		os=-dynix
1050
		os=-dynix
560
		;;
1051
		;;
1052
	t3e)
1053
		basic_machine=alphaev5-cray
1054
		os=-unicos
1055
		;;
1056
	t90)
1057
		basic_machine=t90-cray
1058
		os=-unicos
1059
		;;
1060
	tic54x | c54x*)
1061
		basic_machine=tic54x-unknown
1062
		os=-coff
1063
		;;
1064
	tic55x | c55x*)
1065
		basic_machine=tic55x-unknown
1066
		os=-coff
1067
		;;
1068
	tic6x | c6x*)
1069
		basic_machine=tic6x-unknown
1070
		os=-coff
1071
		;;
1072
	tile*)
1073
		basic_machine=tile-unknown
1074
		os=-linux-gnu
1075
		;;
1076
	tx39)
1077
		basic_machine=mipstx39-unknown
1078
		;;
1079
	tx39el)
1080
		basic_machine=mipstx39el-unknown
1081
		;;
1082
	toad1)
1083
		basic_machine=pdp10-xkl
1084
		os=-tops20
1085
		;;
561
	tower | tower-32)
1086
	tower | tower-32)
562
		basic_machine=m68k-ncr
1087
		basic_machine=m68k-ncr
563
		;;
1088
		;;
1089
	tpf)
1090
		basic_machine=s390x-ibm
1091
		os=-tpf
1092
		;;
564
	udi29k)
1093
	udi29k)
565
		basic_machine=a29k-amd
1094
		basic_machine=a29k-amd
566
		os=-udi
1095
		os=-udi
 Lines 569-574    Link Here 
569
		basic_machine=a29k-nyu
1098
		basic_machine=a29k-nyu
570
		os=-sym1
1099
		os=-sym1
571
		;;
1100
		;;
1101
	v810 | necv810)
1102
		basic_machine=v810-nec
1103
		os=-none
1104
		;;
572
	vaxv)
1105
	vaxv)
573
		basic_machine=vax-dec
1106
		basic_machine=vax-dec
574
		os=-sysv
1107
		os=-sysv
 Lines 577-585    Link Here 
577
		basic_machine=vax-dec
1110
		basic_machine=vax-dec
578
		os=-vms
1111
		os=-vms
579
		;;
1112
		;;
580
       vpp*|vx|vx-*)
1113
	vpp*|vx|vx-*)
581
               basic_machine=f301-fujitsu
1114
		basic_machine=f301-fujitsu
582
               ;;
1115
		;;
583
	vxworks960)
1116
	vxworks960)
584
		basic_machine=i960-wrs
1117
		basic_machine=i960-wrs
585
		os=-vxworks
1118
		os=-vxworks
 Lines 592-604    Link Here 
592
		basic_machine=a29k-wrs
1125
		basic_machine=a29k-wrs
593
		os=-vxworks
1126
		os=-vxworks
594
		;;
1127
		;;
595
	xmp)
1128
	w65*)
596
		basic_machine=xmp-cray
1129
		basic_machine=w65-wdc
597
		os=-unicos
1130
		os=-none
598
		;;
1131
		;;
599
        xps | xps100)
1132
	w89k-*)
1133
		basic_machine=hppa1.1-winbond
1134
		os=-proelf
1135
		;;
1136
	xbox)
1137
		basic_machine=i686-pc
1138
		os=-mingw32
1139
		;;
1140
	xps | xps100)
600
		basic_machine=xps100-honeywell
1141
		basic_machine=xps100-honeywell
601
		;;
1142
		;;
1143
	ymp)
1144
		basic_machine=ymp-cray
1145
		os=-unicos
1146
		;;
1147
	z8k-*-coff)
1148
		basic_machine=z8k-unknown
1149
		os=-sim
1150
		;;
1151
	z80-*-coff)
1152
		basic_machine=z80-unknown
1153
		os=-sim
1154
		;;
602
	none)
1155
	none)
603
		basic_machine=none-none
1156
		basic_machine=none-none
604
		os=-none
1157
		os=-none
 Lines 606-633    Link Here 
606
1159
607
# Here we handle the default manufacturer of certain CPU types.  It is in
1160
# Here we handle the default manufacturer of certain CPU types.  It is in
608
# some cases the only manufacturer, in others, it is the most popular.
1161
# some cases the only manufacturer, in others, it is the most popular.
609
	mips)
1162
	w89k)
610
		basic_machine=mips-mips
1163
		basic_machine=hppa1.1-winbond
1164
		;;
1165
	op50n)
1166
		basic_machine=hppa1.1-oki
1167
		;;
1168
	op60c)
1169
		basic_machine=hppa1.1-oki
611
		;;
1170
		;;
612
	romp)
1171
	romp)
613
		basic_machine=romp-ibm
1172
		basic_machine=romp-ibm
614
		;;
1173
		;;
1174
	mmix)
1175
		basic_machine=mmix-knuth
1176
		;;
615
	rs6000)
1177
	rs6000)
616
		basic_machine=rs6000-ibm
1178
		basic_machine=rs6000-ibm
617
		;;
1179
		;;
618
	vax)
1180
	vax)
619
		basic_machine=vax-dec
1181
		basic_machine=vax-dec
620
		;;
1182
		;;
1183
	pdp10)
1184
		# there are many clones, so DEC is not a safe bet
1185
		basic_machine=pdp10-unknown
1186
		;;
621
	pdp11)
1187
	pdp11)
622
		basic_machine=pdp11-dec
1188
		basic_machine=pdp11-dec
623
		;;
1189
		;;
624
	we32k)
1190
	we32k)
625
		basic_machine=we32k-att
1191
		basic_machine=we32k-att
626
		;;
1192
		;;
627
	sparc)
1193
	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
1194
		basic_machine=sh-unknown
1195
		;;
1196
	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
628
		basic_machine=sparc-sun
1197
		basic_machine=sparc-sun
629
		;;
1198
		;;
630
        cydra)
1199
	cydra)
631
		basic_machine=cydra-cydrome
1200
		basic_machine=cydra-cydrome
632
		;;
1201
		;;
633
	orion)
1202
	orion)
 Lines 636-641    Link Here 
636
	orion105)
1205
	orion105)
637
		basic_machine=clipper-highlevel
1206
		basic_machine=clipper-highlevel
638
		;;
1207
		;;
1208
	mac | mpw | mac-mpw)
1209
		basic_machine=m68k-apple
1210
		;;
1211
	pmac | pmac-mpw)
1212
		basic_machine=powerpc-apple
1213
		;;
1214
	*-unknown)
1215
		# Make sure to match an already-canonicalized machine name.
1216
		;;
639
	*)
1217
	*)
640
		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
1218
		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
641
		exit 1
1219
		exit 1
 Lines 668-676    Link Here 
668
	-solaris)
1246
	-solaris)
669
		os=-solaris2
1247
		os=-solaris2
670
		;;
1248
		;;
671
	-unixware* | svr4*)
1249
	-svr4*)
672
		os=-sysv4
1250
		os=-sysv4
673
		;;
1251
		;;
1252
	-unixware*)
1253
		os=-sysv4.2uw
1254
		;;
674
	-gnu/linux*)
1255
	-gnu/linux*)
675
		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
1256
		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
676
		;;
1257
		;;
 Lines 681-697    Link Here 
681
	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1262
	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
682
	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
1263
	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
683
	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1264
	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
684
	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
1265
	      | -kopensolaris* \
1266
	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1267
	      | -aos* | -aros* \
685
	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1268
	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
686
	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1269
	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
687
	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
1270
	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
688
	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
1271
	      | -openbsd* | -solidbsd* \
1272
	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1273
	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
689
	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1274
	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
690
	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1275
	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
691
	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1276
	      | -chorusos* | -chorusrdb* | -cegcc* \
692
	      | -linux-gnu* | -uxpv*)
1277
	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1278
	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1279
	      | -uxpv* | -beos* | -mpeix* | -udk* \
1280
	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1281
	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1282
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1283
	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1284
	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1285
	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1286
	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
693
	# Remember, each alternative MUST END IN *, to match a version number.
1287
	# Remember, each alternative MUST END IN *, to match a version number.
694
		;;
1288
		;;
1289
	-qnx*)
1290
		case $basic_machine in
1291
		    x86-* | i*86-*)
1292
			;;
1293
		    *)
1294
			os=-nto$os
1295
			;;
1296
		esac
1297
		;;
1298
	-nto-qnx*)
1299
		;;
1300
	-nto*)
1301
		os=`echo $os | sed -e 's|nto|nto-qnx|'`
1302
		;;
1303
	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1304
	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
1305
	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
1306
		;;
1307
	-mac*)
1308
		os=`echo $os | sed -e 's|mac|macos|'`
1309
		;;
1310
	-linux-dietlibc)
1311
		os=-linux-dietlibc
1312
		;;
695
	-linux*)
1313
	-linux*)
696
		os=`echo $os | sed -e 's|linux|linux-gnu|'`
1314
		os=`echo $os | sed -e 's|linux|linux-gnu|'`
697
		;;
1315
		;;
 Lines 701-706    Link Here 
701
	-sunos6*)
1319
	-sunos6*)
702
		os=`echo $os | sed -e 's|sunos6|solaris3|'`
1320
		os=`echo $os | sed -e 's|sunos6|solaris3|'`
703
		;;
1321
		;;
1322
	-opened*)
1323
		os=-openedition
1324
		;;
1325
        -os400*)
1326
		os=-os400
1327
		;;
1328
	-wince*)
1329
		os=-wince
1330
		;;
704
	-osfrose*)
1331
	-osfrose*)
705
		os=-osfrose
1332
		os=-osfrose
706
		;;
1333
		;;
 Lines 716-726    Link Here 
716
	-acis*)
1343
	-acis*)
717
		os=-aos
1344
		os=-aos
718
		;;
1345
		;;
1346
	-atheos*)
1347
		os=-atheos
1348
		;;
1349
	-syllable*)
1350
		os=-syllable
1351
		;;
1352
	-386bsd)
1353
		os=-bsd
1354
		;;
719
	-ctix* | -uts*)
1355
	-ctix* | -uts*)
720
		os=-sysv
1356
		os=-sysv
721
		;;
1357
		;;
1358
	-nova*)
1359
		os=-rtmk-nova
1360
		;;
722
	-ns2 )
1361
	-ns2 )
723
	        os=-nextstep2
1362
		os=-nextstep2
1363
		;;
1364
	-nsk*)
1365
		os=-nsk
724
		;;
1366
		;;
725
	# Preserve the version number of sinix5.
1367
	# Preserve the version number of sinix5.
726
	-sinix5.*)
1368
	-sinix5.*)
 Lines 729-734    Link Here 
729
	-sinix*)
1371
	-sinix*)
730
		os=-sysv4
1372
		os=-sysv4
731
		;;
1373
		;;
1374
        -tpf*)
1375
		os=-tpf
1376
		;;
732
	-triton*)
1377
	-triton*)
733
		os=-sysv3
1378
		os=-sysv3
734
		;;
1379
		;;
 Lines 747-755    Link Here 
747
	# This must come after -sysvr4.
1392
	# This must come after -sysvr4.
748
	-sysv*)
1393
	-sysv*)
749
		;;
1394
		;;
1395
	-ose*)
1396
		os=-ose
1397
		;;
1398
	-es1800*)
1399
		os=-ose
1400
		;;
750
	-xenix)
1401
	-xenix)
751
		os=-xenix
1402
		os=-xenix
752
		;;
1403
		;;
1404
	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1405
		os=-mint
1406
		;;
1407
	-aros*)
1408
		os=-aros
1409
		;;
1410
	-kaos*)
1411
		os=-kaos
1412
		;;
1413
	-zvmoe)
1414
		os=-zvmoe
1415
		;;
1416
	-dicos*)
1417
		os=-dicos
1418
		;;
753
	-none)
1419
	-none)
754
		;;
1420
		;;
755
	*)
1421
	*)
 Lines 772-784    Link Here 
772
# system, and we'll never get to this point.
1438
# system, and we'll never get to this point.
773
1439
774
case $basic_machine in
1440
case $basic_machine in
1441
        score-*)
1442
		os=-elf
1443
		;;
1444
        spu-*)
1445
		os=-elf
1446
		;;
775
	*-acorn)
1447
	*-acorn)
776
		os=-riscix1.2
1448
		os=-riscix1.2
777
		;;
1449
		;;
1450
	arm*-rebel)
1451
		os=-linux
1452
		;;
778
	arm*-semi)
1453
	arm*-semi)
779
		os=-aout
1454
		os=-aout
780
		;;
1455
		;;
781
        pdp11-*)
1456
        c4x-* | tic4x-*)
1457
        	os=-coff
1458
		;;
1459
	# This must come before the *-dec entry.
1460
	pdp10-*)
1461
		os=-tops20
1462
		;;
1463
	pdp11-*)
782
		os=-none
1464
		os=-none
783
		;;
1465
		;;
784
	*-dec | vax-*)
1466
	*-dec | vax-*)
 Lines 796-810    Link Here 
796
		# default.
1478
		# default.
797
		# os=-sunos4
1479
		# os=-sunos4
798
		;;
1480
		;;
1481
	m68*-cisco)
1482
		os=-aout
1483
		;;
1484
        mep-*)
1485
		os=-elf
1486
		;;
1487
	mips*-cisco)
1488
		os=-elf
1489
		;;
1490
	mips*-*)
1491
		os=-elf
1492
		;;
1493
	or32-*)
1494
		os=-coff
1495
		;;
799
	*-tti)	# must be before sparc entry or we get the wrong os.
1496
	*-tti)	# must be before sparc entry or we get the wrong os.
800
		os=-sysv3
1497
		os=-sysv3
801
		;;
1498
		;;
802
	sparc-* | *-sun)
1499
	sparc-* | *-sun)
803
		os=-sunos4.1.1
1500
		os=-sunos4.1.1
804
		;;
1501
		;;
1502
	*-be)
1503
		os=-beos
1504
		;;
1505
	*-haiku)
1506
		os=-haiku
1507
		;;
805
	*-ibm)
1508
	*-ibm)
806
		os=-aix
1509
		os=-aix
807
		;;
1510
		;;
1511
    	*-knuth)
1512
		os=-mmixware
1513
		;;
1514
	*-wec)
1515
		os=-proelf
1516
		;;
1517
	*-winbond)
1518
		os=-proelf
1519
		;;
1520
	*-oki)
1521
		os=-proelf
1522
		;;
808
	*-hp)
1523
	*-hp)
809
		os=-hpux
1524
		os=-hpux
810
		;;
1525
		;;
 Lines 815-821    Link Here 
815
		os=-sysv
1530
		os=-sysv
816
		;;
1531
		;;
817
	*-cbm)
1532
	*-cbm)
818
		os=-amigados
1533
		os=-amigaos
819
		;;
1534
		;;
820
	*-dg)
1535
	*-dg)
821
		os=-dgux
1536
		os=-dgux
 Lines 847-873    Link Here 
847
	*-next)
1562
	*-next)
848
		os=-nextstep3
1563
		os=-nextstep3
849
		;;
1564
		;;
850
        *-gould)
1565
	*-gould)
851
		os=-sysv
1566
		os=-sysv
852
		;;
1567
		;;
853
        *-highlevel)
1568
	*-highlevel)
854
		os=-bsd
1569
		os=-bsd
855
		;;
1570
		;;
856
	*-encore)
1571
	*-encore)
857
		os=-bsd
1572
		os=-bsd
858
		;;
1573
		;;
859
        *-sgi)
1574
	*-sgi)
860
		os=-irix
1575
		os=-irix
861
		;;
1576
		;;
862
        *-siemens)
1577
	*-siemens)
863
		os=-sysv4
1578
		os=-sysv4
864
		;;
1579
		;;
865
	*-masscomp)
1580
	*-masscomp)
866
		os=-rtu
1581
		os=-rtu
867
		;;
1582
		;;
868
	f301-fujitsu)
1583
	f30[01]-fujitsu | f700-fujitsu)
869
		os=-uxpv
1584
		os=-uxpv
870
		;;
1585
		;;
1586
	*-rom68k)
1587
		os=-coff
1588
		;;
1589
	*-*bug)
1590
		os=-coff
1591
		;;
1592
	*-apple)
1593
		os=-macos
1594
		;;
1595
	*-atari*)
1596
		os=-mint
1597
		;;
871
	*)
1598
	*)
872
		os=-none
1599
		os=-none
873
		;;
1600
		;;
 Lines 889-897    Link Here 
889
			-aix*)
1616
			-aix*)
890
				vendor=ibm
1617
				vendor=ibm
891
				;;
1618
				;;
1619
			-beos*)
1620
				vendor=be
1621
				;;
892
			-hpux*)
1622
			-hpux*)
893
				vendor=hp
1623
				vendor=hp
894
				;;
1624
				;;
1625
			-mpeix*)
1626
				vendor=hp
1627
				;;
895
			-hiux*)
1628
			-hiux*)
896
				vendor=hitachi
1629
				vendor=hitachi
897
				;;
1630
				;;
 Lines 907-927    Link Here 
907
			-genix*)
1640
			-genix*)
908
				vendor=ns
1641
				vendor=ns
909
				;;
1642
				;;
910
			-mvs*)
1643
			-mvs* | -opened*)
1644
				vendor=ibm
1645
				;;
1646
			-os400*)
911
				vendor=ibm
1647
				vendor=ibm
912
				;;
1648
				;;
913
			-ptx*)
1649
			-ptx*)
914
				vendor=sequent
1650
				vendor=sequent
915
				;;
1651
				;;
916
			-vxsim* | -vxworks*)
1652
			-tpf*)
1653
				vendor=ibm
1654
				;;
1655
			-vxsim* | -vxworks* | -windiss*)
917
				vendor=wrs
1656
				vendor=wrs
918
				;;
1657
				;;
919
			-aux*)
1658
			-aux*)
920
				vendor=apple
1659
				vendor=apple
921
				;;
1660
				;;
1661
			-hms*)
1662
				vendor=hitachi
1663
				;;
1664
			-mpw* | -macos*)
1665
				vendor=apple
1666
				;;
1667
			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1668
				vendor=atari
1669
				;;
1670
			-vos*)
1671
				vendor=stratus
1672
				;;
922
		esac
1673
		esac
923
		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
1674
		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
924
		;;
1675
		;;
925
esac
1676
esac
926
1677
927
echo $basic_machine$os
1678
echo $basic_machine$os
928
-- bind9-9.7.3.dfsg.orig/contrib/nslint-2.1a3/config.guess
1679
exit
1680
1681
# Local variables:
1682
# eval: (add-hook 'write-file-hooks 'time-stamp)
1683
# time-stamp-start: "timestamp='"
1684
# time-stamp-format: "%:y-%02m-%02d"
1685
# time-stamp-end: "'"
1686
# End:
1687
++ bind9-9.7.3.dfsg/contrib/nslint-2.1a3/config.guess
 Lines 1-7    Link Here 
1
#! /bin/sh
1
#! /bin/sh
2
# Attempt to guess a canonical system name.
2
# Attempt to guess a canonical system name.
3
#   Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc.
3
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
#
4
#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
5
#   Free Software Foundation, Inc.
6
7
timestamp='2009-04-27'
8
5
# This file is free software; you can redistribute it and/or modify it
9
# This file is free software; you can redistribute it and/or modify it
6
# under the terms of the GNU General Public License as published by
10
# under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 2 of the License, or
11
# the Free Software Foundation; either version 2 of the License, or
 Lines 14-101    Link Here 
14
#
18
#
15
# You should have received a copy of the GNU General Public License
19
# You should have received a copy of the GNU General Public License
16
# along with this program; if not, write to the Free Software
20
# along with this program; if not, write to the Free Software
17
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
21
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
22
# 02110-1301, USA.
18
#
23
#
19
# As a special exception to the GNU General Public License, if you
24
# As a special exception to the GNU General Public License, if you
20
# distribute this file as part of a program that contains a
25
# distribute this file as part of a program that contains a
21
# configuration script generated by Autoconf, you may include it under
26
# configuration script generated by Autoconf, you may include it under
22
# the same distribution terms that you use for the rest of that program.
27
# the same distribution terms that you use for the rest of that program.
23
28
24
# Written by Per Bothner <bothner@cygnus.com>.
29
25
# The master version of this file is at the FSF in /home/gd/gnu/lib.
30
# Originally written by Per Bothner <per@bothner.com>.
31
# Please send patches to <config-patches@gnu.org>.  Submit a context
32
# diff and a properly formatted ChangeLog entry.
26
#
33
#
27
# This script attempts to guess a canonical system name similar to
34
# This script attempts to guess a canonical system name similar to
28
# config.sub.  If it succeeds, it prints the system name on stdout, and
35
# config.sub.  If it succeeds, it prints the system name on stdout, and
29
# exits with 0.  Otherwise, it exits with 1.
36
# exits with 0.  Otherwise, it exits with 1.
30
#
37
#
31
# The plan is that this can be called by configure scripts if you
38
# The plan is that this can be called by configure scripts if you
32
# don't specify an explicit system type (host/target name).
39
# don't specify an explicit build system type.
33
#
40
34
# Only a few systems have been added to this list; please add others
41
me=`echo "$0" | sed -e 's,.*/,,'`
35
# (but try to keep the structure clean).
42
36
#
43
usage="\
44
Usage: $0 [OPTION]
45
46
Output the configuration name of the system \`$me' is run on.
47
48
Operation modes:
49
  -h, --help         print this help, then exit
50
  -t, --time-stamp   print date of last modification, then exit
51
  -v, --version      print version number, then exit
52
53
Report bugs and patches to <config-patches@gnu.org>."
54
55
version="\
56
GNU config.guess ($timestamp)
57
58
Originally written by Per Bothner.
59
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
60
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
61
62
This is free software; see the source for copying conditions.  There is NO
63
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
64
65
help="
66
Try \`$me --help' for more information."
67
68
# Parse command line
69
while test $# -gt 0 ; do
70
  case $1 in
71
    --time-stamp | --time* | -t )
72
       echo "$timestamp" ; exit ;;
73
    --version | -v )
74
       echo "$version" ; exit ;;
75
    --help | --h* | -h )
76
       echo "$usage"; exit ;;
77
    -- )     # Stop option processing
78
       shift; break ;;
79
    - )	# Use stdin as input.
80
       break ;;
81
    -* )
82
       echo "$me: invalid option $1$help" >&2
83
       exit 1 ;;
84
    * )
85
       break ;;
86
  esac
87
done
88
89
if test $# != 0; then
90
  echo "$me: too many arguments$help" >&2
91
  exit 1
92
fi
93
94
trap 'exit 1' 1 2 15
95
96
# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
97
# compiler to aid in system detection is discouraged as it requires
98
# temporary files to be created and, as you can see below, it is a
99
# headache to deal with in a portable fashion.
100
101
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
102
# use `HOST_CC' if defined, but it is deprecated.
103
104
# Portable tmp directory creation inspired by the Autoconf team.
105
106
set_cc_for_build='
107
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
108
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
109
: ${TMPDIR=/tmp} ;
110
 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
111
 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
112
 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
113
 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
114
dummy=$tmp/dummy ;
115
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
116
case $CC_FOR_BUILD,$HOST_CC,$CC in
117
 ,,)    echo "int x;" > $dummy.c ;
118
	for c in cc gcc c89 c99 ; do
119
	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
120
	     CC_FOR_BUILD="$c"; break ;
121
	  fi ;
122
	done ;
123
	if test x"$CC_FOR_BUILD" = x ; then
124
	  CC_FOR_BUILD=no_compiler_found ;
125
	fi
126
	;;
127
 ,,*)   CC_FOR_BUILD=$CC ;;
128
 ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
129
esac ; set_cc_for_build= ;'
37
130
38
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
131
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
39
# (ghazi@noc.rutgers.edu 8/24/94.)
132
# (ghazi@noc.rutgers.edu 1994-08-24)
40
if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
133
if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
41
	PATH=$PATH:/.attbin ; export PATH
134
	PATH=$PATH:/.attbin ; export PATH
42
fi
135
fi
43
136
44
UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
137
UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
45
UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
138
UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
46
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
139
UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
47
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
140
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
48
141
49
trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
50
51
# Note: order is significant - the case branches are not exclusive.
142
# Note: order is significant - the case branches are not exclusive.
52
143
53
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
144
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
145
    *:NetBSD:*:*)
146
	# NetBSD (nbsd) targets should (where applicable) match one or
147
	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
148
	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
149
	# switched to ELF, *-*-netbsd* would select the old
150
	# object file format.  This provides both forward
151
	# compatibility and a consistent mechanism for selecting the
152
	# object file format.
153
	#
154
	# Note: NetBSD doesn't particularly care about the vendor
155
	# portion of the name.  We always set it to "unknown".
156
	sysctl="sysctl -n hw.machine_arch"
157
	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
158
	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
159
	case "${UNAME_MACHINE_ARCH}" in
160
	    armeb) machine=armeb-unknown ;;
161
	    arm*) machine=arm-unknown ;;
162
	    sh3el) machine=shl-unknown ;;
163
	    sh3eb) machine=sh-unknown ;;
164
	    sh5el) machine=sh5le-unknown ;;
165
	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
166
	esac
167
	# The Operating System including object format, if it has switched
168
	# to ELF recently, or will in the future.
169
	case "${UNAME_MACHINE_ARCH}" in
170
	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
171
		eval $set_cc_for_build
172
		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
173
			| grep __ELF__ >/dev/null
174
		then
175
		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
176
		    # Return netbsd for either.  FIX?
177
		    os=netbsd
178
		else
179
		    os=netbsdelf
180
		fi
181
		;;
182
	    *)
183
	        os=netbsd
184
		;;
185
	esac
186
	# The OS release
187
	# Debian GNU/NetBSD machines have a different userland, and
188
	# thus, need a distinct triplet. However, they do not need
189
	# kernel version information, so it can be replaced with a
190
	# suitable tag, in the style of linux-gnu.
191
	case "${UNAME_VERSION}" in
192
	    Debian*)
193
		release='-gnu'
194
		;;
195
	    *)
196
		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
197
		;;
198
	esac
199
	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
200
	# contains redundant information, the shorter form:
201
	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
202
	echo "${machine}-${os}${release}"
203
	exit ;;
204
    *:OpenBSD:*:*)
205
	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
206
	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
207
	exit ;;
208
    *:ekkoBSD:*:*)
209
	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
210
	exit ;;
211
    *:SolidBSD:*:*)
212
	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
213
	exit ;;
214
    macppc:MirBSD:*:*)
215
	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
216
	exit ;;
217
    *:MirBSD:*:*)
218
	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
219
	exit ;;
54
    alpha:OSF1:*:*)
220
    alpha:OSF1:*:*)
221
	case $UNAME_RELEASE in
222
	*4.0)
223
		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
224
		;;
225
	*5.*)
226
	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
227
		;;
228
	esac
229
	# According to Compaq, /usr/sbin/psrinfo has been available on
230
	# OSF/1 and Tru64 systems produced since 1995.  I hope that
231
	# covers most systems running today.  This code pipes the CPU
232
	# types through head -n 1, so we only detect the type of CPU 0.
233
	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
234
	case "$ALPHA_CPU_TYPE" in
235
	    "EV4 (21064)")
236
		UNAME_MACHINE="alpha" ;;
237
	    "EV4.5 (21064)")
238
		UNAME_MACHINE="alpha" ;;
239
	    "LCA4 (21066/21068)")
240
		UNAME_MACHINE="alpha" ;;
241
	    "EV5 (21164)")
242
		UNAME_MACHINE="alphaev5" ;;
243
	    "EV5.6 (21164A)")
244
		UNAME_MACHINE="alphaev56" ;;
245
	    "EV5.6 (21164PC)")
246
		UNAME_MACHINE="alphapca56" ;;
247
	    "EV5.7 (21164PC)")
248
		UNAME_MACHINE="alphapca57" ;;
249
	    "EV6 (21264)")
250
		UNAME_MACHINE="alphaev6" ;;
251
	    "EV6.7 (21264A)")
252
		UNAME_MACHINE="alphaev67" ;;
253
	    "EV6.8CB (21264C)")
254
		UNAME_MACHINE="alphaev68" ;;
255
	    "EV6.8AL (21264B)")
256
		UNAME_MACHINE="alphaev68" ;;
257
	    "EV6.8CX (21264D)")
258
		UNAME_MACHINE="alphaev68" ;;
259
	    "EV6.9A (21264/EV69A)")
260
		UNAME_MACHINE="alphaev69" ;;
261
	    "EV7 (21364)")
262
		UNAME_MACHINE="alphaev7" ;;
263
	    "EV7.9 (21364A)")
264
		UNAME_MACHINE="alphaev79" ;;
265
	esac
266
	# A Pn.n version is a patched version.
55
	# A Vn.n version is a released version.
267
	# A Vn.n version is a released version.
56
	# A Tn.n version is a released field test version.
268
	# A Tn.n version is a released field test version.
57
	# A Xn.n version is an unreleased experimental baselevel.
269
	# A Xn.n version is an unreleased experimental baselevel.
58
	# 1.2 uses "1.2" for uname -r.
270
	# 1.2 uses "1.2" for uname -r.
59
	echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
271
	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
60
	exit 0 ;;
272
	exit ;;
273
    Alpha\ *:Windows_NT*:*)
274
	# How do we know it's Interix rather than the generic POSIX subsystem?
275
	# Should we change UNAME_MACHINE based on the output of uname instead
276
	# of the specific Alpha model?
277
	echo alpha-pc-interix
278
	exit ;;
61
    21064:Windows_NT:50:3)
279
    21064:Windows_NT:50:3)
62
	echo alpha-dec-winnt3.5
280
	echo alpha-dec-winnt3.5
63
	exit 0 ;;
281
	exit ;;
64
    Amiga*:UNIX_System_V:4.0:*)
282
    Amiga*:UNIX_System_V:4.0:*)
65
	echo m68k-cbm-sysv4
283
	echo m68k-unknown-sysv4
66
	exit 0;;
284
	exit ;;
67
    amiga:NetBSD:*:*)
285
    *:[Aa]miga[Oo][Ss]:*:*)
68
      echo m68k-cbm-netbsd${UNAME_RELEASE}
286
	echo ${UNAME_MACHINE}-unknown-amigaos
69
      exit 0 ;;
287
	exit ;;
70
    amiga:OpenBSD:*:*)
288
    *:[Mm]orph[Oo][Ss]:*:*)
71
      echo m68k-cbm-openbsd${UNAME_RELEASE}
289
	echo ${UNAME_MACHINE}-unknown-morphos
72
      exit 0 ;;
290
	exit ;;
291
    *:OS/390:*:*)
292
	echo i370-ibm-openedition
293
	exit ;;
294
    *:z/VM:*:*)
295
	echo s390-ibm-zvmoe
296
	exit ;;
297
    *:OS400:*:*)
298
        echo powerpc-ibm-os400
299
	exit ;;
73
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
300
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
74
	echo arm-acorn-riscix${UNAME_RELEASE}
301
	echo arm-acorn-riscix${UNAME_RELEASE}
75
	exit 0;;
302
	exit ;;
76
    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
303
    arm:riscos:*:*|arm:RISCOS:*:*)
304
	echo arm-unknown-riscos
305
	exit ;;
306
    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
307
	echo hppa1.1-hitachi-hiuxmpp
308
	exit ;;
309
    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
77
	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
310
	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
78
	if test "`(/bin/universe) 2>/dev/null`" = att ; then
311
	if test "`(/bin/universe) 2>/dev/null`" = att ; then
79
		echo pyramid-pyramid-sysv3
312
		echo pyramid-pyramid-sysv3
80
	else
313
	else
81
		echo pyramid-pyramid-bsd
314
		echo pyramid-pyramid-bsd
82
	fi
315
	fi
83
	exit 0 ;;
316
	exit ;;
84
    NILE:*:*:dcosx)
317
    NILE*:*:*:dcosx)
85
	echo pyramid-pyramid-svr4
318
	echo pyramid-pyramid-svr4
86
	exit 0 ;;
319
	exit ;;
320
    DRS?6000:unix:4.0:6*)
321
	echo sparc-icl-nx6
322
	exit ;;
323
    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
324
	case `/usr/bin/uname -p` in
325
	    sparc) echo sparc-icl-nx7; exit ;;
326
	esac ;;
327
    s390x:SunOS:*:*)
328
	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
329
	exit ;;
330
    sun4H:SunOS:5.*:*)
331
	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
332
	exit ;;
87
    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
333
    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
88
	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
334
	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
89
	exit 0 ;;
335
	exit ;;
90
    i86pc:SunOS:5.*:*)
336
    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
91
	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
337
	eval $set_cc_for_build
92
	exit 0 ;;
338
	SUN_ARCH="i386"
339
	# If there is a compiler, see if it is configured for 64-bit objects.
340
	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
341
	# This test works for both compilers.
342
	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
343
	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
344
		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
345
		grep IS_64BIT_ARCH >/dev/null
346
	    then
347
		SUN_ARCH="x86_64"
348
	    fi
349
	fi
350
	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
351
	exit ;;
93
    sun4*:SunOS:6*:*)
352
    sun4*:SunOS:6*:*)
94
	# According to config.sub, this is the proper way to canonicalize
353
	# According to config.sub, this is the proper way to canonicalize
95
	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
354
	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
96
	# it's likely to be more like Solaris than SunOS4.
355
	# it's likely to be more like Solaris than SunOS4.
97
	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
356
	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
98
	exit 0 ;;
357
	exit ;;
99
    sun4*:SunOS:*:*)
358
    sun4*:SunOS:*:*)
100
	case "`/usr/bin/arch -k`" in
359
	case "`/usr/bin/arch -k`" in
101
	    Series*|S4*)
360
	    Series*|S4*)
 Lines 104-149    Link Here 
104
	esac
363
	esac
105
	# Japanese Language versions have a version number like `4.1.3-JL'.
364
	# Japanese Language versions have a version number like `4.1.3-JL'.
106
	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
365
	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
107
	exit 0 ;;
366
	exit ;;
108
    sun3*:SunOS:*:*)
367
    sun3*:SunOS:*:*)
109
	echo m68k-sun-sunos${UNAME_RELEASE}
368
	echo m68k-sun-sunos${UNAME_RELEASE}
110
	exit 0 ;;
369
	exit ;;
370
    sun*:*:4.2BSD:*)
371
	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
372
	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
373
	case "`/bin/arch`" in
374
	    sun3)
375
		echo m68k-sun-sunos${UNAME_RELEASE}
376
		;;
377
	    sun4)
378
		echo sparc-sun-sunos${UNAME_RELEASE}
379
		;;
380
	esac
381
	exit ;;
111
    aushp:SunOS:*:*)
382
    aushp:SunOS:*:*)
112
	echo sparc-auspex-sunos${UNAME_RELEASE}
383
	echo sparc-auspex-sunos${UNAME_RELEASE}
113
	exit 0 ;;
384
	exit ;;
114
    atari*:NetBSD:*:*)
385
    # The situation for MiNT is a little confusing.  The machine name
115
	echo m68k-atari-netbsd${UNAME_RELEASE}
386
    # can be virtually everything (everything which is not
116
	exit 0 ;;
387
    # "atarist" or "atariste" at least should have a processor
117
    atari*:OpenBSD:*:*)
388
    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
118
	echo m68k-atari-openbsd${UNAME_RELEASE}
389
    # to the lowercase version "mint" (or "freemint").  Finally
119
	exit 0 ;;
390
    # the system name "TOS" denotes a system which is actually not
120
    sun3*:NetBSD:*:*)
391
    # MiNT.  But MiNT is downward compatible to TOS, so this should
121
	echo m68k-sun-netbsd${UNAME_RELEASE}
392
    # be no problem.
122
	exit 0 ;;
393
    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
123
    sun3*:OpenBSD:*:*)
394
        echo m68k-atari-mint${UNAME_RELEASE}
124
	echo m68k-sun-openbsd${UNAME_RELEASE}
395
	exit ;;
125
	exit 0 ;;
396
    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
126
    mac68k:NetBSD:*:*)
397
	echo m68k-atari-mint${UNAME_RELEASE}
127
	echo m68k-apple-netbsd${UNAME_RELEASE}
398
        exit ;;
128
	exit 0 ;;
399
    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
129
    mac68k:OpenBSD:*:*)
400
        echo m68k-atari-mint${UNAME_RELEASE}
130
	echo m68k-apple-openbsd${UNAME_RELEASE}
401
	exit ;;
131
	exit 0 ;;
402
    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
403
        echo m68k-milan-mint${UNAME_RELEASE}
404
        exit ;;
405
    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
406
        echo m68k-hades-mint${UNAME_RELEASE}
407
        exit ;;
408
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
409
        echo m68k-unknown-mint${UNAME_RELEASE}
410
        exit ;;
411
    m68k:machten:*:*)
412
	echo m68k-apple-machten${UNAME_RELEASE}
413
	exit ;;
132
    powerpc:machten:*:*)
414
    powerpc:machten:*:*)
133
	echo powerpc-apple-machten${UNAME_RELEASE}
415
	echo powerpc-apple-machten${UNAME_RELEASE}
134
	exit 0 ;;
416
	exit ;;
135
    RISC*:Mach:*:*)
417
    RISC*:Mach:*:*)
136
	echo mips-dec-mach_bsd4.3
418
	echo mips-dec-mach_bsd4.3
137
	exit 0 ;;
419
	exit ;;
138
    RISC*:ULTRIX:*:*)
420
    RISC*:ULTRIX:*:*)
139
	echo mips-dec-ultrix${UNAME_RELEASE}
421
	echo mips-dec-ultrix${UNAME_RELEASE}
140
	exit 0 ;;
422
	exit ;;
141
    VAX*:ULTRIX*:*:*)
423
    VAX*:ULTRIX*:*:*)
142
	echo vax-dec-ultrix${UNAME_RELEASE}
424
	echo vax-dec-ultrix${UNAME_RELEASE}
143
	exit 0 ;;
425
	exit ;;
426
    2020:CLIX:*:* | 2430:CLIX:*:*)
427
	echo clipper-intergraph-clix${UNAME_RELEASE}
428
	exit ;;
144
    mips:*:*:UMIPS | mips:*:*:RISCos)
429
    mips:*:*:UMIPS | mips:*:*:RISCos)
145
	sed 's/^	//' << EOF >dummy.c
430
	eval $set_cc_for_build
146
	int main (argc, argv) int argc; char **argv; {
431
	sed 's/^	//' << EOF >$dummy.c
432
#ifdef __cplusplus
433
#include <stdio.h>  /* for printf() prototype */
434
	int main (int argc, char *argv[]) {
435
#else
436
	int main (argc, argv) int argc; char *argv[]; {
437
#endif
147
	#if defined (host_mips) && defined (MIPSEB)
438
	#if defined (host_mips) && defined (MIPSEB)
148
	#if defined (SYSTYPE_SYSV)
439
	#if defined (SYSTYPE_SYSV)
149
	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
440
	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
 Lines 158-219    Link Here 
158
	  exit (-1);
449
	  exit (-1);
159
	}
450
	}
160
EOF
451
EOF
161
	${CC-cc} dummy.c -o dummy \
452
	$CC_FOR_BUILD -o $dummy $dummy.c &&
162
	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
453
	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
163
	  && rm dummy.c dummy && exit 0
454
	  SYSTEM_NAME=`$dummy $dummyarg` &&
164
	rm -f dummy.c dummy
455
	    { echo "$SYSTEM_NAME"; exit; }
165
	echo mips-mips-riscos${UNAME_RELEASE}
456
	echo mips-mips-riscos${UNAME_RELEASE}
166
	exit 0 ;;
457
	exit ;;
458
    Motorola:PowerMAX_OS:*:*)
459
	echo powerpc-motorola-powermax
460
	exit ;;
461
    Motorola:*:4.3:PL8-*)
462
	echo powerpc-harris-powermax
463
	exit ;;
464
    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
465
	echo powerpc-harris-powermax
466
	exit ;;
167
    Night_Hawk:Power_UNIX:*:*)
467
    Night_Hawk:Power_UNIX:*:*)
168
	echo powerpc-harris-powerunix
468
	echo powerpc-harris-powerunix
169
	exit 0 ;;
469
	exit ;;
170
    m88k:CX/UX:7*:*)
470
    m88k:CX/UX:7*:*)
171
	echo m88k-harris-cxux7
471
	echo m88k-harris-cxux7
172
	exit 0 ;;
472
	exit ;;
173
    m88k:*:4*:R4*)
473
    m88k:*:4*:R4*)
174
	echo m88k-motorola-sysv4
474
	echo m88k-motorola-sysv4
175
	exit 0 ;;
475
	exit ;;
176
    m88k:*:3*:R3*)
476
    m88k:*:3*:R3*)
177
	echo m88k-motorola-sysv3
477
	echo m88k-motorola-sysv3
178
	exit 0 ;;
478
	exit ;;
179
    AViiON:dgux:*:*)
479
    AViiON:dgux:*:*)
180
        # DG/UX returns AViiON for all architectures
480
        # DG/UX returns AViiON for all architectures
181
        UNAME_PROCESSOR=`/usr/bin/uname -p`
481
        UNAME_PROCESSOR=`/usr/bin/uname -p`
182
        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
482
	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
183
	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
483
	then
184
	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
484
	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
485
	       [ ${TARGET_BINARY_INTERFACE}x = x ]
486
	    then
185
		echo m88k-dg-dgux${UNAME_RELEASE}
487
		echo m88k-dg-dgux${UNAME_RELEASE}
186
	else
488
	    else
187
		echo m88k-dg-dguxbcs${UNAME_RELEASE}
489
		echo m88k-dg-dguxbcs${UNAME_RELEASE}
490
	    fi
491
	else
492
	    echo i586-dg-dgux${UNAME_RELEASE}
188
	fi
493
	fi
189
        else echo i586-dg-dgux${UNAME_RELEASE}
494
 	exit ;;
190
        fi
191
 	exit 0 ;;
192
    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
495
    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
193
	echo m88k-dolphin-sysv3
496
	echo m88k-dolphin-sysv3
194
	exit 0 ;;
497
	exit ;;
195
    M88*:*:R3*:*)
498
    M88*:*:R3*:*)
196
	# Delta 88k system running SVR3
499
	# Delta 88k system running SVR3
197
	echo m88k-motorola-sysv3
500
	echo m88k-motorola-sysv3
198
	exit 0 ;;
501
	exit ;;
199
    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
502
    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
200
	echo m88k-tektronix-sysv3
503
	echo m88k-tektronix-sysv3
201
	exit 0 ;;
504
	exit ;;
202
    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
505
    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
203
	echo m68k-tektronix-bsd
506
	echo m68k-tektronix-bsd
204
	exit 0 ;;
507
	exit ;;
205
    *:IRIX*:*:*)
508
    *:IRIX*:*:*)
206
	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
509
	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
207
	exit 0 ;;
510
	exit ;;
208
    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
511
    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
209
	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
512
	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
210
	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
513
	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
211
    i?86:AIX:*:*)
514
    i*86:AIX:*:*)
212
	echo i386-ibm-aix
515
	echo i386-ibm-aix
213
	exit 0 ;;
516
	exit ;;
517
    ia64:AIX:*:*)
518
	if [ -x /usr/bin/oslevel ] ; then
519
		IBM_REV=`/usr/bin/oslevel`
520
	else
521
		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
522
	fi
523
	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
524
	exit ;;
214
    *:AIX:2:3)
525
    *:AIX:2:3)
215
	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
526
	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
216
		sed 's/^		//' << EOF >dummy.c
527
		eval $set_cc_for_build
528
		sed 's/^		//' << EOF >$dummy.c
217
		#include <sys/systemcfg.h>
529
		#include <sys/systemcfg.h>
218
530
219
		main()
531
		main()
 Lines 224-240    Link Here 
224
			exit(0);
536
			exit(0);
225
			}
537
			}
226
EOF
538
EOF
227
		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
539
		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
228
		rm -f dummy.c dummy
540
		then
229
		echo rs6000-ibm-aix3.2.5
541
			echo "$SYSTEM_NAME"
542
		else
543
			echo rs6000-ibm-aix3.2.5
544
		fi
230
	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
545
	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
231
		echo rs6000-ibm-aix3.2.4
546
		echo rs6000-ibm-aix3.2.4
232
	else
547
	else
233
		echo rs6000-ibm-aix3.2
548
		echo rs6000-ibm-aix3.2
234
	fi
549
	fi
235
	exit 0 ;;
550
	exit ;;
236
    *:AIX:*:4)
551
    *:AIX:*:[456])
237
	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
552
	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
553
	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
238
		IBM_ARCH=rs6000
554
		IBM_ARCH=rs6000
239
	else
555
	else
240
		IBM_ARCH=powerpc
556
		IBM_ARCH=powerpc
 Lines 242-284    Link Here 
242
	if [ -x /usr/bin/oslevel ] ; then
558
	if [ -x /usr/bin/oslevel ] ; then
243
		IBM_REV=`/usr/bin/oslevel`
559
		IBM_REV=`/usr/bin/oslevel`
244
	else
560
	else
245
		IBM_REV=4.${UNAME_RELEASE}
561
		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
246
	fi
562
	fi
247
	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
563
	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
248
	exit 0 ;;
564
	exit ;;
249
    *:AIX:*:*)
565
    *:AIX:*:*)
250
	echo rs6000-ibm-aix
566
	echo rs6000-ibm-aix
251
	exit 0 ;;
567
	exit ;;
252
    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
568
    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
253
	echo romp-ibm-bsd4.4
569
	echo romp-ibm-bsd4.4
254
	exit 0 ;;
570
	exit ;;
255
    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
571
    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
256
	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
572
	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
257
	exit 0 ;;                           # report: romp-ibm BSD 4.3
573
	exit ;;                             # report: romp-ibm BSD 4.3
258
    *:BOSX:*:*)
574
    *:BOSX:*:*)
259
	echo rs6000-bull-bosx
575
	echo rs6000-bull-bosx
260
	exit 0 ;;
576
	exit ;;
261
    DPX/2?00:B.O.S.:*:*)
577
    DPX/2?00:B.O.S.:*:*)
262
	echo m68k-bull-sysv3
578
	echo m68k-bull-sysv3
263
	exit 0 ;;
579
	exit ;;
264
    9000/[34]??:4.3bsd:1.*:*)
580
    9000/[34]??:4.3bsd:1.*:*)
265
	echo m68k-hp-bsd
581
	echo m68k-hp-bsd
266
	exit 0 ;;
582
	exit ;;
267
    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
583
    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
268
	echo m68k-hp-bsd4.4
584
	echo m68k-hp-bsd4.4
269
	exit 0 ;;
585
	exit ;;
270
    9000/[3478]??:HP-UX:*:*)
586
    9000/[34678]??:HP-UX:*:*)
587
	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
271
	case "${UNAME_MACHINE}" in
588
	case "${UNAME_MACHINE}" in
272
	    9000/31? )            HP_ARCH=m68000 ;;
589
	    9000/31? )            HP_ARCH=m68000 ;;
273
	    9000/[34]?? )         HP_ARCH=m68k ;;
590
	    9000/[34]?? )         HP_ARCH=m68k ;;
274
	    9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
591
	    9000/[678][0-9][0-9])
275
	    9000/8?? )            HP_ARCH=hppa1.0 ;;
592
		if [ -x /usr/bin/getconf ]; then
593
		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
594
                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
595
                    case "${sc_cpu_version}" in
596
                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
597
                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
598
                      532)                      # CPU_PA_RISC2_0
599
                        case "${sc_kernel_bits}" in
600
                          32) HP_ARCH="hppa2.0n" ;;
601
                          64) HP_ARCH="hppa2.0w" ;;
602
			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
603
                        esac ;;
604
                    esac
605
		fi
606
		if [ "${HP_ARCH}" = "" ]; then
607
		    eval $set_cc_for_build
608
		    sed 's/^              //' << EOF >$dummy.c
609
610
              #define _HPUX_SOURCE
611
              #include <stdlib.h>
612
              #include <unistd.h>
613
614
              int main ()
615
              {
616
              #if defined(_SC_KERNEL_BITS)
617
                  long bits = sysconf(_SC_KERNEL_BITS);
618
              #endif
619
                  long cpu  = sysconf (_SC_CPU_VERSION);
620
621
                  switch (cpu)
622
              	{
623
              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
624
              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
625
              	case CPU_PA_RISC2_0:
626
              #if defined(_SC_KERNEL_BITS)
627
              	    switch (bits)
628
              		{
629
              		case 64: puts ("hppa2.0w"); break;
630
              		case 32: puts ("hppa2.0n"); break;
631
              		default: puts ("hppa2.0"); break;
632
              		} break;
633
              #else  /* !defined(_SC_KERNEL_BITS) */
634
              	    puts ("hppa2.0"); break;
635
              #endif
636
              	default: puts ("hppa1.0"); break;
637
              	}
638
                  exit (0);
639
              }
640
EOF
641
		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
642
		    test -z "$HP_ARCH" && HP_ARCH=hppa
643
		fi ;;
276
	esac
644
	esac
277
	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
645
	if [ ${HP_ARCH} = "hppa2.0w" ]
646
	then
647
	    eval $set_cc_for_build
648
649
	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
650
	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
651
	    # generating 64-bit code.  GNU and HP use different nomenclature:
652
	    #
653
	    # $ CC_FOR_BUILD=cc ./config.guess
654
	    # => hppa2.0w-hp-hpux11.23
655
	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
656
	    # => hppa64-hp-hpux11.23
657
658
	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
659
		grep __LP64__ >/dev/null
660
	    then
661
		HP_ARCH="hppa2.0w"
662
	    else
663
		HP_ARCH="hppa64"
664
	    fi
665
	fi
278
	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
666
	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
279
	exit 0 ;;
667
	exit ;;
668
    ia64:HP-UX:*:*)
669
	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
670
	echo ia64-hp-hpux${HPUX_REV}
671
	exit ;;
280
    3050*:HI-UX:*:*)
672
    3050*:HI-UX:*:*)
281
	sed 's/^	//' << EOF >dummy.c
673
	eval $set_cc_for_build
674
	sed 's/^	//' << EOF >$dummy.c
282
	#include <unistd.h>
675
	#include <unistd.h>
283
	int
676
	int
284
	main ()
677
	main ()
 Lines 303-526    Link Here 
303
	  exit (0);
696
	  exit (0);
304
	}
697
	}
305
EOF
698
EOF
306
	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
699
	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
307
	rm -f dummy.c dummy
700
		{ echo "$SYSTEM_NAME"; exit; }
308
	echo unknown-hitachi-hiuxwe2
701
	echo unknown-hitachi-hiuxwe2
309
	exit 0 ;;
702
	exit ;;
310
    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
703
    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
311
	echo hppa1.1-hp-bsd
704
	echo hppa1.1-hp-bsd
312
	exit 0 ;;
705
	exit ;;
313
    9000/8??:4.3bsd:*:*)
706
    9000/8??:4.3bsd:*:*)
314
	echo hppa1.0-hp-bsd
707
	echo hppa1.0-hp-bsd
315
	exit 0 ;;
708
	exit ;;
709
    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
710
	echo hppa1.0-hp-mpeix
711
	exit ;;
316
    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
712
    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
317
	echo hppa1.1-hp-osf
713
	echo hppa1.1-hp-osf
318
	exit 0 ;;
714
	exit ;;
319
    hp8??:OSF1:*:*)
715
    hp8??:OSF1:*:*)
320
	echo hppa1.0-hp-osf
716
	echo hppa1.0-hp-osf
321
	exit 0 ;;
717
	exit ;;
322
    i?86:OSF1:*:*)
718
    i*86:OSF1:*:*)
323
	if [ -x /usr/sbin/sysversion ] ; then
719
	if [ -x /usr/sbin/sysversion ] ; then
324
	    echo ${UNAME_MACHINE}-unknown-osf1mk
720
	    echo ${UNAME_MACHINE}-unknown-osf1mk
325
	else
721
	else
326
	    echo ${UNAME_MACHINE}-unknown-osf1
722
	    echo ${UNAME_MACHINE}-unknown-osf1
327
	fi
723
	fi
328
	exit 0 ;;
724
	exit ;;
329
    parisc*:Lites*:*:*)
725
    parisc*:Lites*:*:*)
330
	echo hppa1.1-hp-lites
726
	echo hppa1.1-hp-lites
331
	exit 0 ;;
727
	exit ;;
332
    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
728
    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
333
	echo c1-convex-bsd
729
	echo c1-convex-bsd
334
        exit 0 ;;
730
        exit ;;
335
    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
731
    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
336
	if getsysinfo -f scalar_acc
732
	if getsysinfo -f scalar_acc
337
	then echo c32-convex-bsd
733
	then echo c32-convex-bsd
338
	else echo c2-convex-bsd
734
	else echo c2-convex-bsd
339
	fi
735
	fi
340
        exit 0 ;;
736
        exit ;;
341
    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
737
    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
342
	echo c34-convex-bsd
738
	echo c34-convex-bsd
343
        exit 0 ;;
739
        exit ;;
344
    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
740
    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
345
	echo c38-convex-bsd
741
	echo c38-convex-bsd
346
        exit 0 ;;
742
        exit ;;
347
    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
743
    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
348
	echo c4-convex-bsd
744
	echo c4-convex-bsd
349
        exit 0 ;;
745
        exit ;;
350
    CRAY*X-MP:*:*:*)
351
	echo xmp-cray-unicos
352
        exit 0 ;;
353
    CRAY*Y-MP:*:*:*)
746
    CRAY*Y-MP:*:*:*)
354
	echo ymp-cray-unicos${UNAME_RELEASE}
747
	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
355
	exit 0 ;;
748
	exit ;;
356
    CRAY*[A-Z]90:*:*:*)
749
    CRAY*[A-Z]90:*:*:*)
357
	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
750
	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
358
	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
751
	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
359
	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
752
	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
360
	exit 0 ;;
753
	      -e 's/\.[^.]*$/.X/'
754
	exit ;;
361
    CRAY*TS:*:*:*)
755
    CRAY*TS:*:*:*)
362
	echo t90-cray-unicos${UNAME_RELEASE}
756
	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
363
	exit 0 ;;
757
	exit ;;
364
    CRAY-2:*:*:*)
758
    CRAY*T3E:*:*:*)
365
	echo cray2-cray-unicos
759
	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
366
        exit 0 ;;
760
	exit ;;
367
    F300:UNIX_System_V:*:*)
761
    CRAY*SV1:*:*:*)
368
        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
762
	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
763
	exit ;;
764
    *:UNICOS/mp:*:*)
765
	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
766
	exit ;;
767
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
768
	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
769
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
369
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
770
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
370
        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
771
        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
371
        exit 0 ;;
772
        exit ;;
372
    F301:UNIX_System_V:*:*)
773
    5000:UNIX_System_V:4.*:*)
373
       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
774
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
374
       exit 0 ;;
775
        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
375
    hp3[0-9][05]:NetBSD:*:*)
776
        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
376
	echo m68k-hp-netbsd${UNAME_RELEASE}
777
	exit ;;
377
	exit 0 ;;
778
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
378
    hp3[0-9][05]:OpenBSD:*:*)
379
	echo m68k-hp-openbsd${UNAME_RELEASE}
380
	exit 0 ;;
381
    i?86:BSD/386:*:* | *:BSD/OS:*:*)
382
	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
779
	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
383
	exit 0 ;;
780
	exit ;;
781
    sparc*:BSD/OS:*:*)
782
	echo sparc-unknown-bsdi${UNAME_RELEASE}
783
	exit ;;
784
    *:BSD/OS:*:*)
785
	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
786
	exit ;;
384
    *:FreeBSD:*:*)
787
    *:FreeBSD:*:*)
385
	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
788
	case ${UNAME_MACHINE} in
386
	exit 0 ;;
789
	    pc98)
387
    *:NetBSD:*:*)
790
		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
388
	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
791
	    amd64)
389
	exit 0 ;;
792
		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
390
    *:OpenBSD:*:*)
793
	    *)
391
	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
794
		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
392
	exit 0 ;;
795
	esac
796
	exit ;;
393
    i*:CYGWIN*:*)
797
    i*:CYGWIN*:*)
394
	echo i386-pc-cygwin32
798
	echo ${UNAME_MACHINE}-pc-cygwin
395
	exit 0 ;;
799
	exit ;;
800
    *:MINGW*:*)
801
	echo ${UNAME_MACHINE}-pc-mingw32
802
	exit ;;
803
    i*:windows32*:*)
804
    	# uname -m includes "-pc" on this system.
805
    	echo ${UNAME_MACHINE}-mingw32
806
	exit ;;
807
    i*:PW*:*)
808
	echo ${UNAME_MACHINE}-pc-pw32
809
	exit ;;
810
    *:Interix*:[3456]*)
811
    	case ${UNAME_MACHINE} in
812
	    x86)
813
		echo i586-pc-interix${UNAME_RELEASE}
814
		exit ;;
815
	    EM64T | authenticamd | genuineintel)
816
		echo x86_64-unknown-interix${UNAME_RELEASE}
817
		exit ;;
818
	    IA64)
819
		echo ia64-unknown-interix${UNAME_RELEASE}
820
		exit ;;
821
	esac ;;
822
    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
823
	echo i${UNAME_MACHINE}-pc-mks
824
	exit ;;
825
    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
826
	# How do we know it's Interix rather than the generic POSIX subsystem?
827
	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
828
	# UNAME_MACHINE based on the output of uname instead of i386?
829
	echo i586-pc-interix
830
	exit ;;
831
    i*:UWIN*:*)
832
	echo ${UNAME_MACHINE}-pc-uwin
833
	exit ;;
834
    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
835
	echo x86_64-unknown-cygwin
836
	exit ;;
396
    p*:CYGWIN*:*)
837
    p*:CYGWIN*:*)
397
	echo powerpcle-unknown-cygwin32
838
	echo powerpcle-unknown-cygwin
398
	exit 0 ;;
839
	exit ;;
399
    prep*:SunOS:5.*:*)
840
    prep*:SunOS:5.*:*)
400
	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
841
	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
401
	exit 0 ;;
842
	exit ;;
402
    *:GNU:*:*)
843
    *:GNU:*:*)
403
	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
844
	# the GNU system
404
	exit 0 ;;
845
	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
405
    *:Linux:*:*)
846
	exit ;;
847
    *:GNU/*:*:*)
848
	# other systems with GNU libc and userland
849
	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
850
	exit ;;
851
    i*86:Minix:*:*)
852
	echo ${UNAME_MACHINE}-pc-minix
853
	exit ;;
854
    arm*:Linux:*:*)
855
	eval $set_cc_for_build
856
	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
857
	    | grep -q __ARM_EABI__
858
	then
859
	    echo ${UNAME_MACHINE}-unknown-linux-gnu
860
	else
861
	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
862
	fi
863
	exit ;;
864
    avr32*:Linux:*:*)
865
	echo ${UNAME_MACHINE}-unknown-linux-gnu
866
	exit ;;
867
    cris:Linux:*:*)
868
	echo cris-axis-linux-gnu
869
	exit ;;
870
    crisv32:Linux:*:*)
871
	echo crisv32-axis-linux-gnu
872
	exit ;;
873
    frv:Linux:*:*)
874
    	echo frv-unknown-linux-gnu
875
	exit ;;
876
    ia64:Linux:*:*)
877
	echo ${UNAME_MACHINE}-unknown-linux-gnu
878
	exit ;;
879
    m32r*:Linux:*:*)
880
	echo ${UNAME_MACHINE}-unknown-linux-gnu
881
	exit ;;
882
    m68*:Linux:*:*)
883
	echo ${UNAME_MACHINE}-unknown-linux-gnu
884
	exit ;;
885
    mips:Linux:*:*)
886
	eval $set_cc_for_build
887
	sed 's/^	//' << EOF >$dummy.c
888
	#undef CPU
889
	#undef mips
890
	#undef mipsel
891
	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
892
	CPU=mipsel
893
	#else
894
	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
895
	CPU=mips
896
	#else
897
	CPU=
898
	#endif
899
	#endif
900
EOF
901
	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
902
	    /^CPU/{
903
		s: ::g
904
		p
905
	    }'`"
906
	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
907
	;;
908
    mips64:Linux:*:*)
909
	eval $set_cc_for_build
910
	sed 's/^	//' << EOF >$dummy.c
911
	#undef CPU
912
	#undef mips64
913
	#undef mips64el
914
	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
915
	CPU=mips64el
916
	#else
917
	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
918
	CPU=mips64
919
	#else
920
	CPU=
921
	#endif
922
	#endif
923
EOF
924
	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
925
	    /^CPU/{
926
		s: ::g
927
		p
928
	    }'`"
929
	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
930
	;;
931
    or32:Linux:*:*)
932
	echo or32-unknown-linux-gnu
933
	exit ;;
934
    ppc:Linux:*:*)
935
	echo powerpc-unknown-linux-gnu
936
	exit ;;
937
    ppc64:Linux:*:*)
938
	echo powerpc64-unknown-linux-gnu
939
	exit ;;
940
    alpha:Linux:*:*)
941
	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
942
	  EV5)   UNAME_MACHINE=alphaev5 ;;
943
	  EV56)  UNAME_MACHINE=alphaev56 ;;
944
	  PCA56) UNAME_MACHINE=alphapca56 ;;
945
	  PCA57) UNAME_MACHINE=alphapca56 ;;
946
	  EV6)   UNAME_MACHINE=alphaev6 ;;
947
	  EV67)  UNAME_MACHINE=alphaev67 ;;
948
	  EV68*) UNAME_MACHINE=alphaev68 ;;
949
        esac
950
	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
951
	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
952
	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
953
	exit ;;
954
    padre:Linux:*:*)
955
	echo sparc-unknown-linux-gnu
956
	exit ;;
957
    parisc:Linux:*:* | hppa:Linux:*:*)
958
	# Look for CPU level
959
	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
960
	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
961
	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
962
	  *)    echo hppa-unknown-linux-gnu ;;
963
	esac
964
	exit ;;
965
    parisc64:Linux:*:* | hppa64:Linux:*:*)
966
	echo hppa64-unknown-linux-gnu
967
	exit ;;
968
    s390:Linux:*:* | s390x:Linux:*:*)
969
	echo ${UNAME_MACHINE}-ibm-linux
970
	exit ;;
971
    sh64*:Linux:*:*)
972
    	echo ${UNAME_MACHINE}-unknown-linux-gnu
973
	exit ;;
974
    sh*:Linux:*:*)
975
	echo ${UNAME_MACHINE}-unknown-linux-gnu
976
	exit ;;
977
    sparc:Linux:*:* | sparc64:Linux:*:*)
978
	echo ${UNAME_MACHINE}-unknown-linux-gnu
979
	exit ;;
980
    vax:Linux:*:*)
981
	echo ${UNAME_MACHINE}-dec-linux-gnu
982
	exit ;;
983
    x86_64:Linux:*:*)
984
	echo x86_64-unknown-linux-gnu
985
	exit ;;
986
    xtensa*:Linux:*:*)
987
    	echo ${UNAME_MACHINE}-unknown-linux-gnu
988
	exit ;;
989
    i*86:Linux:*:*)
406
	# The BFD linker knows what the default object file format is, so
990
	# The BFD linker knows what the default object file format is, so
407
	# first see if it will tell us.
991
	# first see if it will tell us. cd to the root directory to prevent
408
	ld_help_string=`ld --help 2>&1`
992
	# problems with other programs or directories called `ld' in the path.
409
	if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then
993
	# Set LC_ALL=C to ensure ld outputs messages in English.
410
	  echo "${UNAME_MACHINE}-pc-linux-gnu" ; exit 0
994
	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
411
	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then
995
			 | sed -ne '/supported targets:/!d
412
	  echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0
996
				    s/[ 	][ 	]*/ /g
413
	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then
997
				    s/.*supported targets: *//
414
	  echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0
998
				    s/ .*//
415
	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
999
				    p'`
416
	  echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0
1000
        case "$ld_supported_targets" in
417
	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
1001
	  elf32-i386)
418
	  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0
1002
		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
419
	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then
1003
		;;
420
	  echo "powerpc-unknown-linux-gnu" ; exit 0
1004
	  a.out-i386-linux)
421
	elif test "${UNAME_MACHINE}" = "alpha" ; then
1005
		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
422
	  echo alpha-unknown-linux-gnu ; exit 0
1006
		exit ;;
423
	elif test "${UNAME_MACHINE}" = "sparc" ; then
1007
	  "")
424
	  echo sparc-unknown-linux-gnu ; exit 0
1008
		# Either a pre-BFD a.out linker (linux-gnuoldld) or
425
	else
1009
		# one that does not give us useful --help.
426
	  # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us
1010
		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
427
	  # useful --help.  Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout.
1011
		exit ;;
428
	  test ! -d /usr/lib/ldscripts/. \
1012
	esac
429
	    && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
1013
	# Determine whether the default compiler is a.out or elf
430
	  # Determine whether the default compiler is a.out or elf
1014
	eval $set_cc_for_build
431
	  cat >dummy.c <<EOF
1015
	sed 's/^	//' << EOF >$dummy.c
432
main(argc, argv)
1016
	#include <features.h>
433
int argc;
1017
	#ifdef __ELF__
434
char *argv[];
1018
	# ifdef __GLIBC__
435
{
1019
	#  if __GLIBC__ >= 2
436
#ifdef __ELF__
1020
	LIBC=gnu
437
  printf ("%s-pc-linux-gnu\n", argv[1]);
1021
	#  else
438
#else
1022
	LIBC=gnulibc1
439
  printf ("%s-pc-linux-gnuaout\n", argv[1]);
1023
	#  endif
440
#endif
1024
	# else
441
  return 0;
1025
	LIBC=gnulibc1
442
}
1026
	# endif
1027
	#else
1028
	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
1029
	LIBC=gnu
1030
	#else
1031
	LIBC=gnuaout
1032
	#endif
1033
	#endif
1034
	#ifdef __dietlibc__
1035
	LIBC=dietlibc
1036
	#endif
443
EOF
1037
EOF
444
	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
1038
	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
445
	  rm -f dummy.c dummy
1039
	    /^LIBC/{
446
	fi ;;
1040
		s: ::g
447
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
1041
		p
448
# are messed up and put the nodename in both sysname and nodename.
1042
	    }'`"
449
    i?86:DYNIX/ptx:4*:*)
1043
	test x"${LIBC}" != x && {
1044
		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
1045
		exit
1046
	}
1047
	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
1048
	;;
1049
    i*86:DYNIX/ptx:4*:*)
1050
	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1051
	# earlier versions are messed up and put the nodename in both
1052
	# sysname and nodename.
450
	echo i386-sequent-sysv4
1053
	echo i386-sequent-sysv4
451
	exit 0 ;;
1054
	exit ;;
452
    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
1055
    i*86:UNIX_SV:4.2MP:2.*)
1056
        # Unixware is an offshoot of SVR4, but it has its own version
1057
        # number series starting with 2...
1058
        # I am not positive that other SVR4 systems won't match this,
1059
	# I just have to hope.  -- rms.
1060
        # Use sysv4.2uw... so that sysv4* matches it.
1061
	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
1062
	exit ;;
1063
    i*86:OS/2:*:*)
1064
	# If we were able to find `uname', then EMX Unix compatibility
1065
	# is probably installed.
1066
	echo ${UNAME_MACHINE}-pc-os2-emx
1067
	exit ;;
1068
    i*86:XTS-300:*:STOP)
1069
	echo ${UNAME_MACHINE}-unknown-stop
1070
	exit ;;
1071
    i*86:atheos:*:*)
1072
	echo ${UNAME_MACHINE}-unknown-atheos
1073
	exit ;;
1074
    i*86:syllable:*:*)
1075
	echo ${UNAME_MACHINE}-pc-syllable
1076
	exit ;;
1077
    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
1078
	echo i386-unknown-lynxos${UNAME_RELEASE}
1079
	exit ;;
1080
    i*86:*DOS:*:*)
1081
	echo ${UNAME_MACHINE}-pc-msdosdjgpp
1082
	exit ;;
1083
    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
1084
	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
453
	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
1085
	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
454
		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
1086
		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
455
	else
1087
	else
456
		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
1088
		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
457
	fi
1089
	fi
458
	exit 0 ;;
1090
	exit ;;
459
    i?86:*:3.2:*)
1091
    i*86:*:5:[678]*)
1092
    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
1093
	case `/bin/uname -X | grep "^Machine"` in
1094
	    *486*)	     UNAME_MACHINE=i486 ;;
1095
	    *Pentium)	     UNAME_MACHINE=i586 ;;
1096
	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
1097
	esac
1098
	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
1099
	exit ;;
1100
    i*86:*:3.2:*)
460
	if test -f /usr/options/cb.name; then
1101
	if test -f /usr/options/cb.name; then
461
		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
1102
		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
462
		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
1103
		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
463
	elif /bin/uname -X 2>/dev/null >/dev/null ; then
1104
	elif /bin/uname -X 2>/dev/null >/dev/null ; then
464
		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
1105
		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
465
		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
1106
		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
466
		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
1107
		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
467
			&& UNAME_MACHINE=i586
1108
			&& UNAME_MACHINE=i586
1109
		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
1110
			&& UNAME_MACHINE=i686
1111
		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
1112
			&& UNAME_MACHINE=i686
468
		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
1113
		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
469
	else
1114
	else
470
		echo ${UNAME_MACHINE}-pc-sysv32
1115
		echo ${UNAME_MACHINE}-pc-sysv32
471
	fi
1116
	fi
472
	exit 0 ;;
1117
	exit ;;
1118
    pc:*:*:*)
1119
	# Left here for compatibility:
1120
        # uname -m prints for DJGPP always 'pc', but it prints nothing about
1121
        # the processor, so we play safe by assuming i586.
1122
	# Note: whatever this is, it MUST be the same as what config.sub
1123
	# prints for the "djgpp" host, or else GDB configury will decide that
1124
	# this is a cross-build.
1125
	echo i586-pc-msdosdjgpp
1126
        exit ;;
473
    Intel:Mach:3*:*)
1127
    Intel:Mach:3*:*)
474
	echo i386-pc-mach3
1128
	echo i386-pc-mach3
475
	exit 0 ;;
1129
	exit ;;
476
    paragon:*:*:*)
1130
    paragon:*:*:*)
477
	echo i860-intel-osf1
1131
	echo i860-intel-osf1
478
	exit 0 ;;
1132
	exit ;;
479
    i860:*:4.*:*) # i860-SVR4
1133
    i860:*:4.*:*) # i860-SVR4
480
	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1134
	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
481
	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
1135
	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
482
	else # Add other i860-SVR4 vendors below as they are discovered.
1136
	else # Add other i860-SVR4 vendors below as they are discovered.
483
	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
1137
	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
484
	fi
1138
	fi
485
	exit 0 ;;
1139
	exit ;;
486
    mini*:CTIX:SYS*5:*)
1140
    mini*:CTIX:SYS*5:*)
487
	# "miniframe"
1141
	# "miniframe"
488
	echo m68010-convergent-sysv
1142
	echo m68010-convergent-sysv
489
	exit 0 ;;
1143
	exit ;;
490
    M68*:*:R3V[567]*:*)
1144
    mc68k:UNIX:SYSTEM5:3.51m)
491
	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
1145
	echo m68k-convergent-sysv
492
    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
1146
	exit ;;
1147
    M680?0:D-NIX:5.3:*)
1148
	echo m68k-diab-dnix
1149
	exit ;;
1150
    M68*:*:R3V[5678]*:*)
1151
	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
1152
    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)
493
	OS_REL=''
1153
	OS_REL=''
494
	test -r /etc/.relid \
1154
	test -r /etc/.relid \
495
	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1155
	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
496
	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1156
	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
497
	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
1157
	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
498
	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1158
	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
499
	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
1159
	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
500
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1160
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
501
        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1161
        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
502
          && echo i486-ncr-sysv4 && exit 0 ;;
1162
          && { echo i486-ncr-sysv4; exit; } ;;
503
    m68*:LynxOS:2.*:*)
1163
    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
1164
	OS_REL='.3'
1165
	test -r /etc/.relid \
1166
	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1167
	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1168
	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1169
	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1170
	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
1171
	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1172
	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1173
    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
504
	echo m68k-unknown-lynxos${UNAME_RELEASE}
1174
	echo m68k-unknown-lynxos${UNAME_RELEASE}
505
	exit 0 ;;
1175
	exit ;;
506
    mc68030:UNIX_System_V:4.*:*)
1176
    mc68030:UNIX_System_V:4.*:*)
507
	echo m68k-atari-sysv4
1177
	echo m68k-atari-sysv4
508
	exit 0 ;;
1178
	exit ;;
509
    i?86:LynxOS:2.*:*)
510
	echo i386-unknown-lynxos${UNAME_RELEASE}
511
	exit 0 ;;
512
    TSUNAMI:LynxOS:2.*:*)
1179
    TSUNAMI:LynxOS:2.*:*)
513
	echo sparc-unknown-lynxos${UNAME_RELEASE}
1180
	echo sparc-unknown-lynxos${UNAME_RELEASE}
514
	exit 0 ;;
1181
	exit ;;
515
    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
1182
    rs6000:LynxOS:2.*:*)
516
	echo rs6000-unknown-lynxos${UNAME_RELEASE}
1183
	echo rs6000-unknown-lynxos${UNAME_RELEASE}
517
	exit 0 ;;
1184
	exit ;;
1185
    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
1186
	echo powerpc-unknown-lynxos${UNAME_RELEASE}
1187
	exit ;;
518
    SM[BE]S:UNIX_SV:*:*)
1188
    SM[BE]S:UNIX_SV:*:*)
519
	echo mips-dde-sysv${UNAME_RELEASE}
1189
	echo mips-dde-sysv${UNAME_RELEASE}
520
	exit 0 ;;
1190
	exit ;;
1191
    RM*:ReliantUNIX-*:*:*)
1192
	echo mips-sni-sysv4
1193
	exit ;;
521
    RM*:SINIX-*:*:*)
1194
    RM*:SINIX-*:*:*)
522
	echo mips-sni-sysv4
1195
	echo mips-sni-sysv4
523
	exit 0 ;;
1196
	exit ;;
524
    *:SINIX-*:*:*)
1197
    *:SINIX-*:*:*)
525
	if uname -p 2>/dev/null >/dev/null ; then
1198
	if uname -p 2>/dev/null >/dev/null ; then
526
		UNAME_MACHINE=`(uname -p) 2>/dev/null`
1199
		UNAME_MACHINE=`(uname -p) 2>/dev/null`
 Lines 528-563    Link Here 
528
	else
1201
	else
529
		echo ns32k-sni-sysv
1202
		echo ns32k-sni-sysv
530
	fi
1203
	fi
531
	exit 0 ;;
1204
	exit ;;
1205
    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1206
                      # says <Richard.M.Bartel@ccMail.Census.GOV>
1207
        echo i586-unisys-sysv4
1208
        exit ;;
532
    *:UNIX_System_V:4*:FTX*)
1209
    *:UNIX_System_V:4*:FTX*)
533
	# From Gerald Hewes <hewes@openmarket.com>.
1210
	# From Gerald Hewes <hewes@openmarket.com>.
534
	# How about differentiating between stratus architectures? -djm
1211
	# How about differentiating between stratus architectures? -djm
535
	echo hppa1.1-stratus-sysv4
1212
	echo hppa1.1-stratus-sysv4
536
	exit 0 ;;
1213
	exit ;;
537
    *:*:*:FTX*)
1214
    *:*:*:FTX*)
538
	# From seanf@swdc.stratus.com.
1215
	# From seanf@swdc.stratus.com.
539
	echo i860-stratus-sysv4
1216
	echo i860-stratus-sysv4
540
	exit 0 ;;
1217
	exit ;;
1218
    i*86:VOS:*:*)
1219
	# From Paul.Green@stratus.com.
1220
	echo ${UNAME_MACHINE}-stratus-vos
1221
	exit ;;
1222
    *:VOS:*:*)
1223
	# From Paul.Green@stratus.com.
1224
	echo hppa1.1-stratus-vos
1225
	exit ;;
541
    mc68*:A/UX:*:*)
1226
    mc68*:A/UX:*:*)
542
	echo m68k-apple-aux${UNAME_RELEASE}
1227
	echo m68k-apple-aux${UNAME_RELEASE}
543
	exit 0 ;;
1228
	exit ;;
544
    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
1229
    news*:NEWS-OS:6*:*)
1230
	echo mips-sony-newsos6
1231
	exit ;;
1232
    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
545
	if [ -d /usr/nec ]; then
1233
	if [ -d /usr/nec ]; then
546
	        echo mips-nec-sysv${UNAME_RELEASE}
1234
	        echo mips-nec-sysv${UNAME_RELEASE}
547
	else
1235
	else
548
	        echo mips-unknown-sysv${UNAME_RELEASE}
1236
	        echo mips-unknown-sysv${UNAME_RELEASE}
549
	fi
1237
	fi
550
        exit 0 ;;
1238
        exit ;;
551
    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1239
    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
552
                           # says <Richard.M.Bartel@ccMail.Census.GOV>
1240
	echo powerpc-be-beos
553
        echo i586-unisys-sysv4
1241
	exit ;;
554
        exit 0 ;;
1242
    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
1243
	echo powerpc-apple-beos
1244
	exit ;;
1245
    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
1246
	echo i586-pc-beos
1247
	exit ;;
1248
    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
1249
	echo i586-pc-haiku
1250
	exit ;;
1251
    SX-4:SUPER-UX:*:*)
1252
	echo sx4-nec-superux${UNAME_RELEASE}
1253
	exit ;;
1254
    SX-5:SUPER-UX:*:*)
1255
	echo sx5-nec-superux${UNAME_RELEASE}
1256
	exit ;;
1257
    SX-6:SUPER-UX:*:*)
1258
	echo sx6-nec-superux${UNAME_RELEASE}
1259
	exit ;;
1260
    SX-7:SUPER-UX:*:*)
1261
	echo sx7-nec-superux${UNAME_RELEASE}
1262
	exit ;;
1263
    SX-8:SUPER-UX:*:*)
1264
	echo sx8-nec-superux${UNAME_RELEASE}
1265
	exit ;;
1266
    SX-8R:SUPER-UX:*:*)
1267
	echo sx8r-nec-superux${UNAME_RELEASE}
1268
	exit ;;
1269
    Power*:Rhapsody:*:*)
1270
	echo powerpc-apple-rhapsody${UNAME_RELEASE}
1271
	exit ;;
1272
    *:Rhapsody:*:*)
1273
	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1274
	exit ;;
1275
    *:Darwin:*:*)
1276
	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1277
	case $UNAME_PROCESSOR in
1278
	    unknown) UNAME_PROCESSOR=powerpc ;;
1279
	esac
1280
	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1281
	exit ;;
1282
    *:procnto*:*:* | *:QNX:[0123456789]*:*)
1283
	UNAME_PROCESSOR=`uname -p`
1284
	if test "$UNAME_PROCESSOR" = "x86"; then
1285
		UNAME_PROCESSOR=i386
1286
		UNAME_MACHINE=pc
1287
	fi
1288
	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1289
	exit ;;
1290
    *:QNX:*:4*)
1291
	echo i386-pc-qnx
1292
	exit ;;
1293
    NSE-?:NONSTOP_KERNEL:*:*)
1294
	echo nse-tandem-nsk${UNAME_RELEASE}
1295
	exit ;;
1296
    NSR-?:NONSTOP_KERNEL:*:*)
1297
	echo nsr-tandem-nsk${UNAME_RELEASE}
1298
	exit ;;
1299
    *:NonStop-UX:*:*)
1300
	echo mips-compaq-nonstopux
1301
	exit ;;
1302
    BS2000:POSIX*:*:*)
1303
	echo bs2000-siemens-sysv
1304
	exit ;;
1305
    DS/*:UNIX_System_V:*:*)
1306
	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1307
	exit ;;
1308
    *:Plan9:*:*)
1309
	# "uname -m" is not consistent, so use $cputype instead. 386
1310
	# is converted to i386 for consistency with other x86
1311
	# operating systems.
1312
	if test "$cputype" = "386"; then
1313
	    UNAME_MACHINE=i386
1314
	else
1315
	    UNAME_MACHINE="$cputype"
1316
	fi
1317
	echo ${UNAME_MACHINE}-unknown-plan9
1318
	exit ;;
1319
    *:TOPS-10:*:*)
1320
	echo pdp10-unknown-tops10
1321
	exit ;;
1322
    *:TENEX:*:*)
1323
	echo pdp10-unknown-tenex
1324
	exit ;;
1325
    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
1326
	echo pdp10-dec-tops20
1327
	exit ;;
1328
    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
1329
	echo pdp10-xkl-tops20
1330
	exit ;;
1331
    *:TOPS-20:*:*)
1332
	echo pdp10-unknown-tops20
1333
	exit ;;
1334
    *:ITS:*:*)
1335
	echo pdp10-unknown-its
1336
	exit ;;
1337
    SEI:*:*:SEIUX)
1338
        echo mips-sei-seiux${UNAME_RELEASE}
1339
	exit ;;
1340
    *:DragonFly:*:*)
1341
	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1342
	exit ;;
1343
    *:*VMS:*:*)
1344
    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
1345
	case "${UNAME_MACHINE}" in
1346
	    A*) echo alpha-dec-vms ; exit ;;
1347
	    I*) echo ia64-dec-vms ; exit ;;
1348
	    V*) echo vax-dec-vms ; exit ;;
1349
	esac ;;
1350
    *:XENIX:*:SysV)
1351
	echo i386-pc-xenix
1352
	exit ;;
1353
    i*86:skyos:*:*)
1354
	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1355
	exit ;;
1356
    i*86:rdos:*:*)
1357
	echo ${UNAME_MACHINE}-pc-rdos
1358
	exit ;;
1359
    i*86:AROS:*:*)
1360
	echo ${UNAME_MACHINE}-pc-aros
1361
	exit ;;
555
esac
1362
esac
556
1363
557
#echo '(No uname command or uname output not recognized.)' 1>&2
1364
#echo '(No uname command or uname output not recognized.)' 1>&2
558
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
1365
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
559
1366
560
cat >dummy.c <<EOF
1367
eval $set_cc_for_build
1368
cat >$dummy.c <<EOF
561
#ifdef _SEQUENT_
1369
#ifdef _SEQUENT_
562
# include <sys/types.h>
1370
# include <sys/types.h>
563
# include <sys/utsname.h>
1371
# include <sys/utsname.h>
 Lines 582-588    Link Here 
582
#endif
1390
#endif
583
1391
584
#if defined (__arm) && defined (__acorn) && defined (__unix)
1392
#if defined (__arm) && defined (__acorn) && defined (__unix)
585
  printf ("arm-acorn-riscix"); exit (0);
1393
  printf ("arm-acorn-riscix\n"); exit (0);
586
#endif
1394
#endif
587
1395
588
#if defined (hp300) && !defined (hpux)
1396
#if defined (hp300) && !defined (hpux)
 Lines 595-601    Link Here 
595
#endif
1403
#endif
596
  int version;
1404
  int version;
597
  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
1405
  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
598
  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
1406
  if (version < 4)
1407
    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
1408
  else
1409
    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
599
  exit (0);
1410
  exit (0);
600
#endif
1411
#endif
601
1412
 Lines 640-650    Link Here 
640
#endif
1451
#endif
641
1452
642
#if defined (vax)
1453
#if defined (vax)
643
#if !defined (ultrix)
1454
# if !defined (ultrix)
644
  printf ("vax-dec-bsd\n"); exit (0);
1455
#  include <sys/param.h>
645
#else
1456
#  if defined (BSD)
646
  printf ("vax-dec-ultrix\n"); exit (0);
1457
#   if BSD == 43
647
#endif
1458
      printf ("vax-dec-bsd4.3\n"); exit (0);
1459
#   else
1460
#    if BSD == 199006
1461
      printf ("vax-dec-bsd4.3reno\n"); exit (0);
1462
#    else
1463
      printf ("vax-dec-bsd\n"); exit (0);
1464
#    endif
1465
#   endif
1466
#  else
1467
    printf ("vax-dec-bsd\n"); exit (0);
1468
#  endif
1469
# else
1470
    printf ("vax-dec-ultrix\n"); exit (0);
1471
# endif
648
#endif
1472
#endif
649
1473
650
#if defined (alliant) && defined (i860)
1474
#if defined (alliant) && defined (i860)
 Lines 655-666    Link Here 
655
}
1479
}
656
EOF
1480
EOF
657
1481
658
${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
1482
$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
659
rm -f dummy.c dummy
1483
	{ echo "$SYSTEM_NAME"; exit; }
660
1484
661
# Apollos put the system type in the environment.
1485
# Apollos put the system type in the environment.
662
1486
663
test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
1487
test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
664
1488
665
# Convex versions that predate uname can use getsysinfo(1)
1489
# Convex versions that predate uname can use getsysinfo(1)
666
1490
 Lines 669-693    Link Here 
669
    case `getsysinfo -f cpu_type` in
1493
    case `getsysinfo -f cpu_type` in
670
    c1*)
1494
    c1*)
671
	echo c1-convex-bsd
1495
	echo c1-convex-bsd
672
	exit 0 ;;
1496
	exit ;;
673
    c2*)
1497
    c2*)
674
	if getsysinfo -f scalar_acc
1498
	if getsysinfo -f scalar_acc
675
	then echo c32-convex-bsd
1499
	then echo c32-convex-bsd
676
	else echo c2-convex-bsd
1500
	else echo c2-convex-bsd
677
	fi
1501
	fi
678
	exit 0 ;;
1502
	exit ;;
679
    c34*)
1503
    c34*)
680
	echo c34-convex-bsd
1504
	echo c34-convex-bsd
681
	exit 0 ;;
1505
	exit ;;
682
    c38*)
1506
    c38*)
683
	echo c38-convex-bsd
1507
	echo c38-convex-bsd
684
	exit 0 ;;
1508
	exit ;;
685
    c4*)
1509
    c4*)
686
	echo c4-convex-bsd
1510
	echo c4-convex-bsd
687
	exit 0 ;;
1511
	exit ;;
688
    esac
1512
    esac
689
fi
1513
fi
690
1514
691
#echo '(Unable to guess system type)' 1>&2
1515
cat >&2 <<EOF
1516
$0: unable to guess system type
1517
1518
This script, last modified $timestamp, has failed to recognize
1519
the operating system you are using. It is advised that you
1520
download the most up to date version of the config scripts from
1521
1522
  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1523
and
1524
  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1525
1526
If the version you run ($0) is already up to date, please
1527
send the following data and any information you think might be
1528
pertinent to <config-patches@gnu.org> in order to provide the needed
1529
information to handle your system.
1530
1531
config.guess timestamp = $timestamp
1532
1533
uname -m = `(uname -m) 2>/dev/null || echo unknown`
1534
uname -r = `(uname -r) 2>/dev/null || echo unknown`
1535
uname -s = `(uname -s) 2>/dev/null || echo unknown`
1536
uname -v = `(uname -v) 2>/dev/null || echo unknown`
1537
1538
/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
1539
/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
1540
1541
hostinfo               = `(hostinfo) 2>/dev/null`
1542
/bin/universe          = `(/bin/universe) 2>/dev/null`
1543
/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
1544
/bin/arch              = `(/bin/arch) 2>/dev/null`
1545
/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
1546
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
1547
1548
UNAME_MACHINE = ${UNAME_MACHINE}
1549
UNAME_RELEASE = ${UNAME_RELEASE}
1550
UNAME_SYSTEM  = ${UNAME_SYSTEM}
1551
UNAME_VERSION = ${UNAME_VERSION}
1552
EOF
692
1553
693
exit 1
1554
exit 1
694
-- bind9-9.7.3.dfsg.orig/contrib/nslint-2.1a3/nslint.8
1555
1556
# Local variables:
1557
# eval: (add-hook 'write-file-hooks 'time-stamp)
1558
# time-stamp-start: "timestamp='"
1559
# time-stamp-format: "%:y-%02m-%02d"
1560
# time-stamp-end: "'"
1561
# End:
1562
++ bind9-9.7.3.dfsg/contrib/nslint-2.1a3/nslint.8
 Lines 1-4    Link Here 
1
.\" @(#) $Id: nslint.8,v 1.1 2001-12-21 04:12:03 marka Exp $ (LBL)
1
.\" @(#) $Id: nslint.8,v 1.1 2001/12/21 04:12:03 marka Exp $ (LBL)
2
.\"
2
.\"
3
.\" Copyright (c) 1994, 1996, 1997, 1999, 2001
3
.\" Copyright (c) 1994, 1996, 1997, 1999, 2001
4
.\"	The Regents of the University of California.  All rights reserved.
4
.\"	The Regents of the University of California.  All rights reserved.
5
-- bind9-9.7.3.dfsg.orig/contrib/nslint-2.1a3/lbl/gnuc.h
5
++ bind9-9.7.3.dfsg/contrib/nslint-2.1a3/lbl/gnuc.h
 Lines 1-4    Link Here 
1
/* @(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/lbl/gnuc.h,v 1.1 2001-12-21 04:12:05 marka Exp $ (LBL) */
1
/* @(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/lbl/gnuc.h,v 1.1 2001/12/21 04:12:05 marka Exp $ (LBL) */
2
2
3
/* Define __P() macro, if necessary */
3
/* Define __P() macro, if necessary */
4
#ifndef __P
4
#ifndef __P
5
-- bind9-9.7.3.dfsg.orig/contrib/nslint-2.1a3/lbl/os-irix5.h
5
++ bind9-9.7.3.dfsg/contrib/nslint-2.1a3/lbl/os-irix5.h
 Lines 18-24    Link Here 
18
 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
18
 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
19
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20
 *
20
 *
21
 * @(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/lbl/os-irix5.h,v 1.1 2001-12-21 04:12:05 marka Exp $ (LBL)
21
 * @(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/lbl/os-irix5.h,v 1.1 2001/12/21 04:12:05 marka Exp $ (LBL)
22
 */
22
 */
23
23
24
/* Prototypes missing in IRIX 5 */
24
/* Prototypes missing in IRIX 5 */
25
-- bind9-9.7.3.dfsg.orig/contrib/nslint-2.1a3/lbl/os-osf3.h
25
++ bind9-9.7.3.dfsg/contrib/nslint-2.1a3/lbl/os-osf3.h
 Lines 18-24    Link Here 
18
 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
18
 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
19
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20
 *
20
 *
21
 * @(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/lbl/os-osf3.h,v 1.1 2001-12-21 04:12:05 marka Exp $ (LBL)
21
 * @(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/lbl/os-osf3.h,v 1.1 2001/12/21 04:12:05 marka Exp $ (LBL)
22
 */
22
 */
23
23
24
/* Prototypes missing in osf3 */
24
/* Prototypes missing in osf3 */
25
-- bind9-9.7.3.dfsg.orig/contrib/nslint-2.1a3/lbl/os-solaris2.h
25
++ bind9-9.7.3.dfsg/contrib/nslint-2.1a3/lbl/os-solaris2.h
 Lines 18-24    Link Here 
18
 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
18
 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
19
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20
 *
20
 *
21
 * @(#) $Id: os-solaris2.h,v 1.1 2001-12-21 04:12:05 marka Exp $ (LBL)
21
 * @(#) $Id: os-solaris2.h,v 1.1 2001/12/21 04:12:05 marka Exp $ (LBL)
22
 */
22
 */
23
23
24
/* Prototypes missing in SunOS 5 */
24
/* Prototypes missing in SunOS 5 */
25
-- bind9-9.7.3.dfsg.orig/contrib/nslint-2.1a3/lbl/os-sunos4.h
25
++ bind9-9.7.3.dfsg/contrib/nslint-2.1a3/lbl/os-sunos4.h
 Lines 18-24    Link Here 
18
 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
18
 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
19
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20
 *
20
 *
21
 * @(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/lbl/os-sunos4.h,v 1.1 2001-12-21 04:12:05 marka Exp $ (LBL)
21
 * @(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/lbl/os-sunos4.h,v 1.1 2001/12/21 04:12:05 marka Exp $ (LBL)
22
 */
22
 */
23
23
24
/* Prototypes missing in SunOS 4 */
24
/* Prototypes missing in SunOS 4 */
25
-- bind9-9.7.3.dfsg.orig/contrib/nslint-2.1a3/lbl/os-ultrix4.h
25
++ bind9-9.7.3.dfsg/contrib/nslint-2.1a3/lbl/os-ultrix4.h
 Lines 18-24    Link Here 
18
 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
18
 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
19
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20
 *
20
 *
21
 * @(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/lbl/os-ultrix4.h,v 1.1 2001-12-21 04:12:05 marka Exp $ (LBL)
21
 * @(#) $Header: /proj/cvs/prod/bind9/contrib/nslint-2.1a3/lbl/os-ultrix4.h,v 1.1 2001/12/21 04:12:05 marka Exp $ (LBL)
22
 */
22
 */
23
23
24
/* Prototypes missing in Ultrix 4 */
24
/* Prototypes missing in Ultrix 4 */
25
-- bind9-9.7.3.dfsg.orig/doc/arm/README-SGML
25
++ bind9-9.7.3.dfsg/doc/arm/README-SGML
 Lines 4-10    Link Here 
4
4
5
The BIND v9 ARM master document is now kept in DocBook XML format.
5
The BIND v9 ARM master document is now kept in DocBook XML format.
6
6
7
Version: $Id: README-SGML,v 1.17 2004-03-05 05:04:43 marka Exp $
7
Version: $Id: README-SGML,v 1.17 2004/03/05 05:04:43 marka Exp $
8
8
9
The entire ARM is in the single file:
9
The entire ARM is in the single file:
10
10
11
-- bind9-9.7.3.dfsg.orig/doc/misc/sdb
11
++ bind9-9.7.3.dfsg/doc/misc/sdb
 Lines 166-169    Link Here 
166
A future release may support dynamic loading of sdb drivers.
166
A future release may support dynamic loading of sdb drivers.
167
167
168
168
169
$Id: sdb,v 1.6 2004-03-05 05:04:54 marka Exp $
169
$Id: sdb,v 1.6 2004/03/05 05:04:54 marka Exp $
170
-- bind9-9.7.3.dfsg.orig/doc/misc/roadmap
170
++ bind9-9.7.3.dfsg/doc/misc/roadmap
 Lines 2-8    Link Here 
2
Copyright (C) 2000, 2001  Internet Software Consortium.
2
Copyright (C) 2000, 2001  Internet Software Consortium.
3
See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
3
See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
4
4
5
$Id: roadmap,v 1.2 2004-03-05 05:04:54 marka Exp $
5
$Id: roadmap,v 1.2 2004/03/05 05:04:54 marka Exp $
6
6
7
Road Map to the BIND 9 Source Tree
7
Road Map to the BIND 9 Source Tree
8
8
9
-- bind9-9.7.3.dfsg.orig/doc/misc/rfc-compliance
9
++ bind9-9.7.3.dfsg/doc/misc/rfc-compliance
 Lines 2-8    Link Here 
2
Copyright (C) 2001  Internet Software Consortium.
2
Copyright (C) 2001  Internet Software Consortium.
3
See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
3
See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
4
4
5
$Id: rfc-compliance,v 1.4 2004-03-05 05:04:53 marka Exp $
5
$Id: rfc-compliance,v 1.4 2004/03/05 05:04:53 marka Exp $
6
6
7
BIND 9 is striving for strict compliance with IETF standards.  We
7
BIND 9 is striving for strict compliance with IETF standards.  We
8
believe this release of BIND 9 complies with the following RFCs, with
8
believe this release of BIND 9 complies with the following RFCs, with
9
-- bind9-9.7.3.dfsg.orig/doc/misc/migration-4to9
9
++ bind9-9.7.3.dfsg/doc/misc/migration-4to9
 Lines 2-8    Link Here 
2
Copyright (C) 2001  Internet Software Consortium.
2
Copyright (C) 2001  Internet Software Consortium.
3
See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
3
See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
4
4
5
$Id: migration-4to9,v 1.4 2004-03-05 05:04:53 marka Exp $
5
$Id: migration-4to9,v 1.4 2004/03/05 05:04:53 marka Exp $
6
6
7
		   BIND 4 to BIND 9 Migration Notes
7
		   BIND 4 to BIND 9 Migration Notes
8
8
9
-- bind9-9.7.3.dfsg.orig/doc/misc/dnssec
9
++ bind9-9.7.3.dfsg/doc/misc/dnssec
 Lines 81-84    Link Here 
81
ensure the integrity of zone transfers.
81
ensure the integrity of zone transfers.
82
82
83
83
84
$Id: dnssec,v 1.19 2004-03-05 05:04:53 marka Exp $
84
$Id: dnssec,v 1.19 2004/03/05 05:04:53 marka Exp $
85
-- bind9-9.7.3.dfsg.orig/debian/named.conf.local
85
++ bind9-9.7.3.dfsg/debian/named.conf.local
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/lwresd.install
1
//
2
// Do any local configuration here
3
//
4
5
// Consider adding the 1918 zones here, if they are not used in your
6
// organization
7
//include "/etc/bind/zones.rfc1918";
8
9
++ bind9-9.7.3.dfsg/debian/lwresd.install
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/named.conf
1
usr/sbin/lwresd
2
usr/share/man/man8/lwresd.8*
3
++ bind9-9.7.3.dfsg/debian/named.conf
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9-default.md5sum
1
// This is the primary configuration file for the BIND DNS server named.
2
//
3
// Please read /usr/share/doc/bind9/README.Debian.gz for information on the 
4
// structure of BIND configuration files in Debian, *BEFORE* you customize 
5
// this configuration file.
6
//
7
// If you are just adding zones, please do that in /etc/bind/named.conf.local
8
9
include "/etc/bind/named.conf.options";
10
include "/etc/bind/named.conf.local";
11
include "/etc/bind/named.conf.default-zones";
12
++ bind9-9.7.3.dfsg/debian/bind9-default.md5sum
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/named.conf.default-zones
1
1229a956d3c6ca11fa344d69f082d7ca  /etc/default/bind9
2
++ bind9-9.7.3.dfsg/debian/named.conf.default-zones
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/libdns69.install
1
// prime the server with knowledge of the root servers
2
zone "." {
3
	type hint;
4
	file "/etc/bind/db.root";
5
};
6
7
// be authoritative for the localhost forward and reverse zones, and for
8
// broadcast zones as per RFC 1912
9
10
zone "localhost" {
11
	type master;
12
	file "/etc/bind/db.local";
13
};
14
15
zone "127.in-addr.arpa" {
16
	type master;
17
	file "/etc/bind/db.127";
18
};
19
20
zone "0.in-addr.arpa" {
21
	type master;
22
	file "/etc/bind/db.0";
23
};
24
25
zone "255.in-addr.arpa" {
26
	type master;
27
	file "/etc/bind/db.255";
28
};
29
30
31
++ bind9-9.7.3.dfsg/debian/libdns69.install
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/dnsutils.dirs
1
usr/lib/libdns.so.69*
2
++ bind9-9.7.3.dfsg/debian/dnsutils.dirs
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/libbind-dev.README.Debian
1
usr/bin
2
usr/share/doc/dnsutils
3
usr/share/man/man1
4
++ bind9-9.7.3.dfsg/debian/libbind-dev.README.Debian
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/db.root
1
The include files for BIND are in /usr/include/{isc,dns,dst,lwres}.  If 
2
you're compiling something that uses them, use something like 
3
4
	'-I/usr/include/isc' 
5
6
and so on in the call to the compiler to pick up the BIND versions before 
7
the normal system versions for files that have conflicting filenames.
8
9
10
++ bind9-9.7.3.dfsg/debian/db.root
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/rules
1
;       This file holds the information on root name servers needed to
2
;       initialize cache of Internet domain name servers
3
;       (e.g. reference this file in the "cache  .  <file>"
4
;       configuration file of BIND domain name servers).
5
;
6
;       This file is made available by InterNIC 
7
;       under anonymous FTP as
8
;           file                /domain/named.cache
9
;           on server           FTP.INTERNIC.NET
10
;       -OR-                    RS.INTERNIC.NET
11
;
12
;       last update:    Jun 17, 2010
13
;       related version of root zone:   2010061700
14
;
15
; formerly NS.INTERNIC.NET
16
;
17
.                        3600000  IN  NS    A.ROOT-SERVERS.NET.
18
A.ROOT-SERVERS.NET.      3600000      A     198.41.0.4
19
A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:BA3E::2:30
20
;
21
; FORMERLY NS1.ISI.EDU
22
;
23
.                        3600000      NS    B.ROOT-SERVERS.NET.
24
B.ROOT-SERVERS.NET.      3600000      A     192.228.79.201
25
;
26
; FORMERLY C.PSI.NET
27
;
28
.                        3600000      NS    C.ROOT-SERVERS.NET.
29
C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
30
;
31
; FORMERLY TERP.UMD.EDU
32
;
33
.                        3600000      NS    D.ROOT-SERVERS.NET.
34
D.ROOT-SERVERS.NET.      3600000      A     128.8.10.90
35
;
36
; FORMERLY NS.NASA.GOV
37
;
38
.                        3600000      NS    E.ROOT-SERVERS.NET.
39
E.ROOT-SERVERS.NET.      3600000      A     192.203.230.10
40
;
41
; FORMERLY NS.ISC.ORG
42
;
43
.                        3600000      NS    F.ROOT-SERVERS.NET.
44
F.ROOT-SERVERS.NET.      3600000      A     192.5.5.241
45
F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2F::F
46
;
47
; FORMERLY NS.NIC.DDN.MIL
48
;
49
.                        3600000      NS    G.ROOT-SERVERS.NET.
50
G.ROOT-SERVERS.NET.      3600000      A     192.112.36.4
51
;
52
; FORMERLY AOS.ARL.ARMY.MIL
53
;
54
.                        3600000      NS    H.ROOT-SERVERS.NET.
55
H.ROOT-SERVERS.NET.      3600000      A     128.63.2.53
56
H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::803F:235
57
;
58
; FORMERLY NIC.NORDU.NET
59
;
60
.                        3600000      NS    I.ROOT-SERVERS.NET.
61
I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
62
I.ROOT-SERVERS.NET.      3600000      AAAA  2001:7FE::53
63
;
64
; OPERATED BY VERISIGN, INC.
65
;
66
.                        3600000      NS    J.ROOT-SERVERS.NET.
67
J.ROOT-SERVERS.NET.      3600000      A     192.58.128.30
68
J.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:C27::2:30
69
;
70
; OPERATED BY RIPE NCC
71
;
72
.                        3600000      NS    K.ROOT-SERVERS.NET.
73
K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129
74
K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7FD::1
75
;
76
; OPERATED BY ICANN
77
;
78
.                        3600000      NS    L.ROOT-SERVERS.NET.
79
L.ROOT-SERVERS.NET.      3600000      A     199.7.83.42
80
L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:3::42
81
;
82
; OPERATED BY WIDE
83
;
84
.                        3600000      NS    M.ROOT-SERVERS.NET.
85
M.ROOT-SERVERS.NET.      3600000      A     202.12.27.33
86
M.ROOT-SERVERS.NET.      3600000      AAAA  2001:DC3::35
87
; End of File
88
++ bind9-9.7.3.dfsg/debian/rules
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/lwresd.dirs
1
#!/usr/bin/make -f
2
# Sample debian/rules that uses debhelper.
3
# GNU copyright 1997 to 1999 by Joey Hess.
4
5
export DEB_BUILD_HARDENING=1
6
# Uncomment this to turn on verbose mode.
7
#export DH_VERBOSE=1
8
9
ifndef DEB_HOST_ARCH
10
DEB_BUILD_ARCH := $(shell dpkg --print-architecture)
11
endif
12
export arch = $(DEB_HOST_ARCH)
13
14
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
15
DEBUG = -g
16
endif
17
18
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
19
OPT = 
20
else
21
OPT = -O2
22
endif
23
24
export CFLAGS=-fno-strict-aliasing -DDIG_SIGCHASE $(DEBUG) $(OPT)
25
26
ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
27
EXTRA_FEATURES=--disable-linux-caps --disable-threads
28
endif
29
30
configure: configure-stamp
31
configure-stamp:
32
	libtoolize --automake --copy --force
33
	aclocal
34
	#automake
35
	autoheader
36
	autoconf
37
	rm -rf autom4te.cache
38
	dh_testdir
39
	./configure --prefix=/usr \
40
		--mandir=\$${prefix}/share/man \
41
		--infodir=\$${prefix}/share/info \
42
		--sysconfdir=/etc/bind \
43
		--localstatedir=/var \
44
		--enable-threads \
45
		--enable-largefile \
46
		--with-libtool \
47
		--enable-shared \
48
		--enable-static \
49
		--with-openssl=/usr \
50
		--with-gssapi=/usr \
51
		--with-gnu-ld \
52
		--with-dlz-postgres=no \
53
		--with-dlz-mysql=no \
54
		--with-dlz-bdb=yes \
55
		--with-dlz-filesystem=yes \
56
		--with-dlz-ldap=yes \
57
		--with-dlz-stub=yes \
58
		--with-geoip=/usr \
59
		--enable-ipv6 \
60
		$(EXTRA_FEATURES)
61
62
	touch configure-stamp
63
64
build: configure-stamp build-stamp
65
build-stamp:
66
	dh_testdir
67
	LD_LIBRARY_PATH=$$(pwd)/lib/isc/.libs:$$(pwd)/lib/isccc/.libs:$$(pwd)/isccfg/.libs:$${LD_LIBRARY_PATH} $(MAKE)
68
	touch build-stamp
69
70
autofiles:
71
	libtoolize --automake --copy --force
72
	aclocal
73
	#automake
74
	autoheader
75
	autoconf
76
	rm -rf autom4te.cache
77
78
clean:
79
	dh_testdir
80
	dh_testroot
81
	-$(MAKE) distclean
82
	find . -name \*.o -exec rm {} \;
83
	rm -f build-stamp configure-stamp
84
	rm -f debian/substvars lib/bind/include/isc/platform.h
85
	rm -f contrib/dlz/bin/dlzbdb/Makefile contrib/dlz/drivers/rules
86
	rm -f doc/arm/Bv9ARM.pdf
87
	dh_clean
88
89
newtemplate:
90
	debconf-updatepo
91
92
msgstats:
93
	@cd debian/po && for i in *.po; do x=$$(msgfmt --statistics $$i 2>&1); echo $$i $$x; done; rm -f messages.mo *.po~
94
95
msg-email:
96
	@podebconf-report-po
97
98
ETCBIND=debian/bind9/etc/bind
99
ETCAPP=debian/bind9/etc/apparmor.d
100
install: build
101
	dh_testdir
102
	dh_testroot
103
	dh_clean -k
104
	dh_installdirs
105
	$(MAKE) install DESTDIR=`pwd`/debian/bind9
106
	rm -f debian/bind9/usr/lib/*.la
107
	install -c -o bin -g bin -m 444 debian/db.0 ${ETCBIND}/db.0
108
	install -c -o bin -g bin -m 444 debian/db.0 ${ETCBIND}/db.255
109
	install -c -o bin -g bin -m 444 debian/db.empty ${ETCBIND}
110
	install -c -o bin -g bin -m 444 debian/zones.rfc1918 ${ETCBIND}
111
	install -c -o bin -g bin -m 444 debian/db.127 ${ETCBIND}
112
	install -c -o bin -g bin -m 444 debian/db.local ${ETCBIND}
113
	install -c -o bin -g bin -m 444 debian/db.root ${ETCBIND}
114
	install -c -o bin -g bin -m 440 debian/named.conf ${ETCBIND}
115
	install -c -o bin -g bin -m 440 debian/named.conf.local ${ETCBIND}
116
	install -c -o bin -g bin -m 440 debian/named.conf.default-zones ${ETCBIND}
117
	install -c -o bin -g bin -m 440 debian/named.conf.options ${ETCBIND}
118
	install -c -o bin -g bin -m 644 debian/bind9-default.md5sum debian/bind9/usr/share/bind9/
119
	cp doc/arm/*.html debian/bind9-doc/usr/share/doc/bind9-doc/arm
120
	install -m 644 -o root -g root debian/apparmor-profile ${ETCAPP}/usr.sbin.named
121
122
	install debian/ip-up.d debian/bind9/etc/ppp/ip-up.d/bind9
123
	install debian/ip-down.d debian/bind9/etc/ppp/ip-down.d/bind9
124
	install debian/ip-up.d debian/bind9/etc/network/if-up.d/bind9
125
	install debian/ip-down.d debian/bind9/etc/network/if-down.d/bind9
126
	install -m644 debian/bind9.ufw.profile debian/bind9/etc/ufw/applications.d/bind9
127
128
# Build architecture-independent files here.
129
binary-indep: build install
130
	dh_testdir -i
131
	dh_testroot -i
132
	dh_installdocs -i
133
	dh_installexamples -i
134
	dh_installmenu -i
135
	dh_installcron -i
136
	dh_installinfo -i
137
	dh_installchangelogs -i # CHANGES # upstream changelog only in bind9-doc
138
	dh_installchangelogs -pbind9-doc CHANGES
139
	dh_link -i
140
	dh_compress -i
141
	dh_fixperms -i
142
	dh_installdeb -i
143
	for i in $$(sed -n '/^Package:/s/^.* //p' debian/control); do cat debian/vars.in >> debian/$$i.substvars; done
144
	cat debian/vars.in >> debian/substvars
145
	dh_gencontrol -i
146
	dh_md5sums -i
147
	dh_builddeb -i
148
149
# Build architecture-dependent files here.
150
binary-arch: build install
151
	dh_testdir -a
152
	dh_testroot -a
153
	dh_installdocs -a
154
	dh_installexamples -a
155
	dh_installmenu -a
156
	dh_installinit -a --no-start -- defaults 15 85
157
	dh_installcron -a
158
	dh_installdebconf -pbind9
159
	dh_installinfo -a
160
	dh_installchangelogs -a # CHANGES # upstream changelog only in bind9-doc
161
	dh_install --sourcedir=debian/bind9 -a
162
	(cd debian/bind9/ && rm -rf $$(cat ../*.install) )
163
	rm -f debian/bind9/usr/share/man/man1/query-loc.1
164
	# install apport hook on Ubuntu
165
	if dpkg-vendor --is ubuntu; then \
166
	    install -m 644 -D debian/bind9.apport debian/bind9/usr/share/apport/package-hooks/bind9.py; \
167
	fi
168
	dh_link -a
169
	dh_strip -a
170
	dh_compress -a
171
	dh_fixperms -a
172
	dh_makeshlibs -a
173
	dh_installdeb -a
174
	dh_shlibdeps -l"debian/libbind9-60/usr/lib:debian/libbind-dev/usr/lib:debian/libdns69/usr/lib:debian/libisc62/usr/lib:debian/libisccc60/usr/lib:debian/libisccfg62/usr/lib:debian/liblwres60/usr/lib:/usr/lib/libfakeroot" -a
175
	for i in $$(sed -n '/^Package:/s/^.* //p' debian/control); do cat debian/vars.in >> debian/$$i.substvars; done
176
	cat debian/vars.in >> debian/substvars
177
	dh_gencontrol -a
178
	dh_md5sums -a
179
	dh_builddeb -a
180
181
binary: binary-indep binary-arch
182
.PHONY: build clean binary-indep binary-arch binary install configure
183
++ bind9-9.7.3.dfsg/debian/lwresd.dirs
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/libisc62.install
1
etc/bind
2
usr/sbin
3
usr/share/man/man8
4
usr/share/doc/lwresd
5
var/run/named
6
++ bind9-9.7.3.dfsg/debian/libisc62.install
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9-host.install
1
usr/lib/libisc.so.62*
2
++ bind9-9.7.3.dfsg/debian/bind9-host.install
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/lwresd.init
1
usr/bin/host
2
usr/share/man/man1/host.1*
3
++ bind9-9.7.3.dfsg/debian/lwresd.init
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/db.127
1
#!/bin/sh
2
3
### BEGIN INIT INFO
4
# Provides:          lwresd
5
# Required-Start:    $remote_fs
6
# Should-Start:	     $syslog $network
7
# Required-Stop:     $remote_fs
8
# Should-Stop:	     $syslog $network
9
# Default-Start:     2 3 4 5
10
# Default-Stop:      0 1 6
11
# Short-Description: Start and stop the Lightweight Resolver Daemon.
12
### END INIT INFO
13
14
. /lib/lsb/init-functions
15
16
PATH=/sbin:/bin:/usr/sbin:/usr/bin
17
NAME=lwresd
18
DAEMON=/usr/sbin/lwresd
19
PIDFILE=/var/run/lwresd/lwresd.pid
20
21
# Don't modify this line, change or create /etc/default/lwresd.
22
OPTIONS=""
23
24
test -f /etc/default/lwresd && . /etc/default/lwresd
25
26
test -x $DAEMON || exit 0
27
28
case "$1" in
29
    start)
30
	modprobe capability >/dev/null 2>&1 || true
31
32
	# dirs under /var/run can go away on reboots.
33
	mkdir -p ${PIDFILE%/*}
34
	chmod 775 ${PIDFILE%/*}
35
	chown root:bind ${PIDFILE%/*} >/dev/null 2>&1 || true
36
37
	log_daemon_msg "Starting domain name service" $NAME
38
	if start-stop-daemon --start --quiet --exec $DAEMON  -- $OPTIONS; then
39
	    log_end_msg 0
40
	else
41
	    log_end_msg 1
42
	fi
43
    ;;
44
45
    stop)
46
	log_daemon_msg "Stopping domain name service" $NAME
47
	if start-stop-daemon --stop --quiet  \
48
	    --pidfile ${PIDFILE} --exec $DAEMON; then
49
	    log_end_msg 0
50
	else
51
	    log_end_msg 1
52
	fi
53
    ;;
54
55
    restart|force-reload)
56
	$0 stop
57
	sleep 2
58
	$0 start
59
    ;;
60
    
61
    *)
62
	log_action_msg "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}"
63
	exit 1
64
    ;;
65
esac
66
67
exit 0
68
++ bind9-9.7.3.dfsg/debian/db.127
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/libisccc60.postinst
1
;
2
; BIND reverse data file for local loopback interface
3
;
4
$TTL	604800
5
@	IN	SOA	localhost. root.localhost. (
6
			      1		; Serial
7
			 604800		; Refresh
8
			  86400		; Retry
9
			2419200		; Expire
10
			 604800 )	; Negative Cache TTL
11
;
12
@	IN	NS	localhost.
13
1.0.0	IN	PTR	localhost.
14
++ bind9-9.7.3.dfsg/debian/libisccc60.postinst
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/ip-up.d
1
#!/bin/sh
2
3
set -e
4
5
#DEBHELPER#
6
++ bind9-9.7.3.dfsg/debian/ip-up.d
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/compat
1
#!/bin/sh -e
2
# Called when a new interface comes up
3
# Written by LaMont Jones <lamont@debian.org>
4
5
# kick named as needed
6
7
# If /usr isn't mounted yet, silently bail.
8
if [ ! -d /usr/sbin ]; then
9
	exit 0
10
fi
11
12
# if named is running, reconfig it.
13
rndc reconfig >/dev/null 2>&1 || true
14
15
exit 0
16
++ bind9-9.7.3.dfsg/debian/compat
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/vars.in
1
5
2
++ bind9-9.7.3.dfsg/debian/vars.in
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9.dirs
1
Description=The Berkeley Internet Name Domain (BIND) implements an Internet domain${Newline}name server.  BIND is the most widely-used name server software on the${Newline}Internet, and is supported by the Internet Software Consortium, www.isc.org.
2
++ bind9-9.7.3.dfsg/debian/bind9.dirs
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/libirs60.install
1
etc/ufw/applications.d
2
etc/apparmor.d/force-complain
3
etc/bind
4
usr/bin
5
usr/sbin
6
var/cache/bind
7
var/run/named
8
usr/share/bind9
9
etc/ppp/ip-up.d
10
etc/ppp/ip-down.d
11
etc/network/if-up.d
12
etc/network/if-down.d
13
++ bind9-9.7.3.dfsg/debian/libirs60.install
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9.prerm
1
usr/lib/libirs.so.60*
2
++ bind9-9.7.3.dfsg/debian/bind9.prerm
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9.config
1
#!/bin/sh
2
set -e
3
4
case "$1" in
5
    remove)
6
	# if bind is running, stop it before removing
7
	if pidof named >/dev/null 2>&1; then
8
		# test if invoke-rc.d command is present on this system
9
		if command -v invoke-rc.d >/dev/null 2>&1; then
10
		    invoke-rc.d bind9 stop
11
		# if really not, use initscript
12
		else
13
		    /etc/init.d/bind9 stop
14
		fi
15
	fi
16
    ;;
17
18
    upgrade)
19
	# leave bind running during the upgrade
20
    ;;
21
22
    *)
23
	echo "prerm called with unknown argument \`$1'" >&2
24
	exit 1
25
    ;;
26
esac
27
28
#DEBHELPER#
29
30
exit 0
31
++ bind9-9.7.3.dfsg/debian/bind9.config
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9.postrm
1
#!/bin/sh
2
3
set -e 
4
5
. /usr/share/debconf/confmodule
6
7
db_input low bind9/start-as-user || true
8
db_go
9
10
db_input low bind9/different-configuration-file || true
11
db_go
12
13
db_input low bind9/run-resolvconf || true
14
db_go
15
++ bind9-9.7.3.dfsg/debian/bind9.postrm
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/libbind9-60.install
1
#!/bin/sh
2
3
if [ "$1" = "purge" ]; then
4
	rm -f /etc/bind/rndc.key /etc/default/bind9
5
	rmdir /etc/bind >/dev/null 2>&1 || true
6
	rm -f /etc/apparmor.d/force-complain/usr.sbin.named >/dev/null 2>&1 || true
7
	rmdir /var/lib/bind
8
	# delete bind daemon user, if it exists
9
	if getent passwd bind > /dev/null ; then
10
	    echo "Deleting bind user"
11
	    deluser  --quiet bind > /dev/null || true
12
	fi
13
fi
14
15
#DEBHELPER#
16
++ bind9-9.7.3.dfsg/debian/libbind9-60.install
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9.init
1
usr/lib/libbind9.so.60*
2
++ bind9-9.7.3.dfsg/debian/bind9.init
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/control
1
#!/bin/sh -e
2
3
### BEGIN INIT INFO
4
# Provides:          bind9
5
# Required-Start:    $remote_fs
6
# Required-Stop:     $remote_fs
7
# Should-Start:      $network $syslog
8
# Should-Stop:       $network $syslog
9
# Default-Start:     2 3 4 5
10
# Default-Stop:      0 1 6
11
# Short-Description: Start and stop bind9
12
# Description:       bind9 is a Domain Name Server (DNS)
13
#        which translates ip addresses to and from internet names
14
### END INIT INFO
15
16
PATH=/sbin:/bin:/usr/sbin:/usr/bin
17
18
# for a chrooted server: "-u bind -t /var/lib/named"
19
# Don't modify this line, change or create /etc/default/bind9.
20
OPTIONS=""
21
RESOLVCONF=no
22
23
test -f /etc/default/bind9 && . /etc/default/bind9
24
25
test -x /usr/sbin/rndc || exit 0
26
27
. /lib/lsb/init-functions
28
PIDFILE=/var/run/named/named.pid
29
30
check_network() {
31
    if [ -x /usr/bin/uname ] && [ "X$(/usr/bin/uname -o)" = XSolaris ]; then
32
	IFCONFIG_OPTS="-au"
33
    else
34
	IFCONFIG_OPTS=""
35
    fi
36
    if [ -z "$(/sbin/ifconfig $IFCONFIG_OPTS)" ]; then
37
       #log_action_msg "No networks configured."
38
       return 1
39
    fi
40
    return 0
41
}
42
43
case "$1" in
44
    start)
45
	log_daemon_msg "Starting domain name service..." "bind9"
46
47
	modprobe capability >/dev/null 2>&1 || true
48
49
	# dirs under /var/run can go away on reboots.
50
	mkdir -p /var/run/named
51
	chmod 775 /var/run/named
52
	chown root:bind /var/run/named >/dev/null 2>&1 || true
53
54
	if [ ! -x /usr/sbin/named ]; then
55
	    log_action_msg "named binary missing - not starting"
56
	    log_end_msg 1
57
	fi
58
59
	if ! check_network; then
60
	    log_action_msg "no networks configured"
61
	    log_end_msg 1
62
	fi
63
64
	if start-stop-daemon --start --oknodo --quiet --exec /usr/sbin/named \
65
		--pidfile ${PIDFILE} -- $OPTIONS; then
66
	    if [ "X$RESOLVCONF" != "Xno" ] && [ -x /sbin/resolvconf ] ; then
67
		echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo.named
68
	    fi
69
	    log_end_msg 0
70
	else
71
	    log_end_msg 1
72
	fi
73
    ;;
74
75
    stop)
76
	log_daemon_msg "Stopping domain name service..." "bind9"
77
	if ! check_network; then
78
	    log_action_msg "no networks configured"
79
	    log_end_msg 1
80
	fi
81
82
	if [ "X$RESOLVCONF" != "Xno" ] && [ -x /sbin/resolvconf ] ; then
83
	    /sbin/resolvconf -d lo.named
84
	fi
85
	pid=$(/usr/sbin/rndc stop -p | awk '/^pid:/ {print $2}') || true
86
	if [ -z "$pid" ]; then		# no pid found, so either not running, or error
87
	    pid=$(pgrep -f ^/usr/sbin/named) || true
88
	    start-stop-daemon --stop --oknodo --quiet --exec /usr/sbin/named \
89
		    --pidfile ${PIDFILE} -- $OPTIONS
90
	fi
91
	if [ -n $pid ]; then
92
	  while kill -0 $pid 2>/dev/null; do
93
	    log_progress_msg "waiting for pid $pid to die"
94
	    sleep 1
95
	  done
96
	fi
97
	log_end_msg 0
98
    ;;
99
100
    reload|force-reload)
101
	log_daemon_msg "Reloading domain name service..." "bind9"
102
	if ! check_network; then
103
	    log_action_msg "no networks configured"
104
	    log_end_msg 1
105
	fi
106
107
	/usr/sbin/rndc reload >/dev/null && log_end_msg 0 || log_end_msg 1
108
    ;;
109
110
    restart)
111
	if ! check_network; then
112
	    log_action_msg "no networks configured"
113
	    exit 1
114
	fi
115
116
	$0 stop
117
	$0 start
118
    ;;
119
    
120
    status)
121
    	ret=0
122
	status_of_proc -p ${PIDFILE} /usr/sbin/named bind9 2>/dev/null || ret=$?
123
	exit $ret
124
	;;
125
126
    *)
127
	log_action_msg "Usage: /etc/init.d/bind9 {start|stop|reload|restart|force-reload|status}"
128
	exit 1
129
    ;;
130
esac
131
132
exit 0
133
++ bind9-9.7.3.dfsg/debian/control
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/libirs60.postinst
1
Source: bind9
2
Section: net
3
Priority: optional
4
Maintainer: LaMont Jones <lamont@debian.org>
5
Uploaders: Bdale Garbee <bdale@gag.com>
6
Build-Depends: libkrb5-dev, debhelper (>= 5), libssl-dev, libtool, bison, libdb-dev (>>4.6), libldap2-dev, libxml2-dev, libcap2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], hardening-wrapper, libgeoip-dev (>= 1.4.6.dfsg-5), dpkg-dev (>= 1.15.5), automake
7
Build-Conflicts: libdb4.2-dev
8
Standards-Version: 3.7.3.0
9
XS-Vcs-Browser: http://git.debian.org/?p=users/lamont/bind9.git
10
XS-Vcs-Git: git://git.debian.org/~lamont/bind9.git
11
12
Package: bind9
13
Architecture: any
14
Depends: ${shlibs:Depends}, ${misc:Depends}, debconf | debconf-2.0, netbase, adduser, libdns69 (=${binary:Version}), libisccfg62 (=${binary:Version}), libisc62 (=${binary:Version}), libisccc60 (=${binary:Version}), lsb-base (>= 3.2-14), bind9utils (=${binary:Version}), liblwres60 (=${binary:Version}), libbind9-60 (=${binary:Version}), net-tools
15
Conflicts: bind, apparmor-profiles (<< 2.1+1075-0ubuntu4)
16
Replaces: bind, dnsutils (<< 1:9.1.0-3), apparmor-profiles (<< 2.1+1075-0ubuntu4)
17
Suggests: dnsutils, bind9-doc, resolvconf, ufw
18
Description: Internet Domain Name Server
19
 ${Description}
20
 .
21
 This package provides the server and related configuration files.
22
23
Package: bind9utils
24
Architecture: any
25
Replaces: bind9 (<= 1:9.5.0~b2-1)
26
Depends: ${shlibs:Depends}, ${misc:Depends}
27
Description: Utilities for BIND
28
 This package provides various utilities that are useful for maintaining a
29
 working BIND installation.
30
31
Package: bind9-doc
32
Architecture: all
33
Section: doc
34
Depends: ${misc:Depends}
35
Description: Documentation for BIND
36
 This package provides various documents that are useful for maintaining a
37
 working BIND installation.
38
39
Package: host
40
Priority: standard
41
Architecture: all
42
Depends: ${misc:Depends}, bind9-host
43
Description: Transitional package
44
 This dummy package is provided for a smooth transition from the previous
45
 host package.  It may safely be removed after installation.
46
47
Package: bind9-host
48
Priority: standard
49
Architecture: any
50
Depends: ${shlibs:Depends}, ${misc:Depends}, libdns69 (=${binary:Version}), libisccfg62 (=${binary:Version}), libisc62 (=${binary:Version}), liblwres60 (=${binary:Version}), libbind9-60 (=${binary:Version})
51
Conflicts: host (<<1:9.7.0), dnsutils (<< 1:9.0.0)
52
Replaces: dnsutils (<< 1:9.0.0), host (<< 1:9.7.0)
53
Provides: host
54
Description: Version of 'host' bundled with BIND 9.X
55
 This package provides the 'host' program in the form that is bundled with
56
 the BIND 9.X sources.
57
58
Package: libbind-dev
59
Section: libdevel
60
Architecture: any
61
Conflicts: bind-dev
62
Replaces: bind-dev
63
Depends: ${shlibs:Depends}, ${misc:Depends}, libdns69 (=${binary:Version}), libisccfg62 (=${binary:Version}), libisc62 (=${binary:Version}), liblwres60 (=${binary:Version}), libbind9-60 (=${binary:Version})
64
Description: Static Libraries and Headers used by BIND
65
 This package delivers archive-style libraries, header files, and API man
66
 pages for libbind, libdns, libisc, and liblwres.  These are only needed 
67
 if you want to compile other packages that need more nameserver API than the 
68
 resolver code provided in libc.
69
70
Package: libbind9-60
71
Section: libs
72
Priority: standard
73
Architecture: any
74
Conflicts: libbind0, libbind9-41
75
Replaces: libbind0
76
Depends: ${shlibs:Depends}, ${misc:Depends}, libdns69, libisccfg62, libisc62
77
Description: BIND9 Shared Library used by BIND
78
 ${Description}
79
 .
80
 This package delivers the libbind9 shared library used by BIND's daemons and
81
 clients.
82
83
Package: libdns69
84
Section: libs
85
Priority: standard
86
Architecture: any
87
Conflicts: libbind0, libbind9-41
88
Replaces: libbind0
89
Depends: ${shlibs:Depends}, ${misc:Depends}, libisc62
90
Description: DNS Shared Library used by BIND
91
 ${Description}
92
 .
93
 This package delivers the libdns shared library used by BIND's daemons and
94
 clients.
95
96
Package: libisc62
97
Section: libs
98
Priority: standard
99
Architecture: any
100
Conflicts: libbind0, libbind9-41
101
Replaces: libbind0
102
Depends: ${shlibs:Depends}, ${misc:Depends}
103
Description: ISC Shared Library used by BIND
104
 ${Description}
105
 .
106
 This package delivers the libisc shared library used by BIND's daemons and
107
 clients.
108
109
Package: liblwres60
110
Section: libs
111
Priority: standard
112
Architecture: any
113
Replaces: libbind0
114
Conflicts: libbind0
115
Depends: ${shlibs:Depends}, ${misc:Depends}
116
Description: Lightweight Resolver Library used by BIND
117
 ${Description}
118
 .
119
 This package delivers the liblwres shared library used by BIND's daemons
120
 and clients.
121
122
Package: libisccc60
123
Section: libs
124
Architecture: any
125
Conflicts: libbind0, libbind9-41
126
Replaces: libbind0
127
Depends: ${shlibs:Depends}, ${misc:Depends}, libisc62
128
Description: Command Channel Library used by BIND
129
 ${Description}
130
 .
131
 This package delivers the libisccc shared library used by BIND's daemons
132
 and clients, particularly rndc.
133
134
Package: libisccfg62
135
Section: libs
136
Architecture: any
137
Conflicts: libbind0, libbind9-41
138
Replaces: libbind0
139
Depends: ${shlibs:Depends}, ${misc:Depends}, libdns69, libisccc60, libisc62
140
Description: Config File Handling Library used by BIND
141
 ${Description}
142
 .
143
 This package delivers the libisccfg shared library used by BIND's daemons
144
 and clients to read and write ISC-style configuration files like named.conf
145
 and rndc.conf.
146
147
Package: dnsutils
148
Priority: standard
149
Architecture: any
150
Depends: ${shlibs:Depends}, ${misc:Depends}, bind9-host | host, libdns69 (=${binary:Version}), libisccfg62 (=${binary:Version}), libisc62 (=${binary:Version}), liblwres60 (=${binary:Version}), libbind9-60 (=${binary:Version})
151
Suggests: rblcheck
152
Conflicts: netstd (<< 2.00)
153
Replaces: bind, bind9 (<< 1:9.1.0-3)
154
Description: Clients provided with BIND
155
 ${Description}
156
 .
157
 This package delivers various client programs related to DNS that are 
158
 derived from the BIND source tree.
159
 .
160
  - dig - query the DNS in various ways
161
  - nslookup - the older way to do it
162
  - nsupdate - perform dynamic updates (See RFC2136)
163
164
Package: lwresd
165
Architecture: any
166
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libdns69 (=${binary:Version}), libisccfg62 (=${binary:Version}), libisccc60 (=${binary:Version}), libisc62 (=${binary:Version}), liblwres60 (=${binary:Version}), libbind9-60 (=${binary:Version})
167
Recommends: libnss-lwres
168
Suggests: bind9utils
169
Description: Lightweight Resolver Daemon
170
 lwresd is the daemon providing name lookup services to clients that use
171
 the BIND 9 lightweight resolver library.  It is essentially a stripped-
172
 down, caching-only name server that answers queries using the BIND 9
173
 lightweight resolver protocol rather than the DNS protocol.
174
175
++ bind9-9.7.3.dfsg/debian/libirs60.postinst
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/libbind-dev.install
1
#!/bin/sh
2
3
set -e
4
5
#DEBHELPER#
6
++ bind9-9.7.3.dfsg/debian/libbind-dev.install
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9.NEWS
1
usr/include
2
usr/lib/libbind9.a
3
usr/lib/libbind9.so
4
usr/lib/libdns.a
5
usr/lib/libdns.so
6
usr/lib/libisc.a
7
usr/lib/libisc.so
8
usr/lib/liblwres.a
9
usr/lib/liblwres.so
10
usr/lib/libisccc.a
11
usr/lib/libisccc.so
12
usr/lib/libisccfg.a
13
usr/lib/libisccfg.so
14
usr/share/man/man3
15
usr/bin/isc-config.sh
16
++ bind9-9.7.3.dfsg/debian/bind9.NEWS
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/dnsutils.install
1
bind9 (1:9.4.0-1) experimental; urgency=low
2
3
  As of bind 9.4, allow-query-cache and allow-recursion default to the
4
  builtin acls 'localnets' and 'localhost'.  If you are setting up a
5
  name server for a network, you will almost certainly need to change
6
  this.
7
8
  The change in default has been done to make caching servers less
9
  attractive as reflective amplifying targets for spoofed traffic.
10
  This still leaves authoritative servers exposed.
11
12
  The best fix is for full BCP 38 deployment to remove spoofed traffic.
13
14
 -- LaMont Jones <lamont@debian.org>  Wed, 03 Oct 2007 00:52:44 -0600
15
++ bind9-9.7.3.dfsg/debian/dnsutils.install
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/zones.rfc1918
1
usr/bin/dig
2
usr/bin/nslookup
3
usr/bin/nsupdate
4
usr/share/man/man1/dig.1*
5
usr/share/man/man1/nslookup.1*
6
usr/share/man/man1/nsupdate.1*
7
++ bind9-9.7.3.dfsg/debian/zones.rfc1918
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/templates
1
zone "10.in-addr.arpa"      { type master; file "/etc/bind/db.empty"; };
2
 
3
zone "16.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
4
zone "17.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
5
zone "18.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
6
zone "19.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
7
zone "20.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
8
zone "21.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
9
zone "22.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
10
zone "23.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
11
zone "24.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
12
zone "25.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
13
zone "26.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
14
zone "27.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
15
zone "28.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
16
zone "29.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
17
zone "30.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
18
zone "31.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
19
20
zone "168.192.in-addr.arpa" { type master; file "/etc/bind/db.empty"; };
21
++ bind9-9.7.3.dfsg/debian/templates
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9.apport
1
Template: bind9/start-as-user
2
Type: string
3
Default: bind
4
_Description: User account for running the BIND9 daemon:
5
 The default is to run the BIND9 daemon (named) under the 'bind'
6
 user account. To use a different account, please enter the
7
 appropriate username.
8
9
Template: bind9/different-configuration-file
10
Type: string
11
_Description: Other startup options for named:
12
 Please provide any additional options (other than username) that should
13
 be passed to the BIND9 daemon (named) on startup.
14
15
Template: bind9/run-resolvconf
16
Type: boolean
17
Default: true
18
_Description: Should resolv.conf settings be overridden?
19
 Please choose whether the resolver should be forced to use the
20
 local BIND9 daemon (named) rather than what the current connection
21
 recommends, when this machine moves around.
22
++ bind9-9.7.3.dfsg/debian/bind9.apport
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9.postinst
1
#!/usr/bin/python
2
3
'''apport hook for bind9
4
5
(c) 2010 Andres Rodriguez.
6
Author: Andres Rodriguez <andreserl@ubuntu.com>
7
8
This program is free software; you can redistribute it and/or modify it
9
under the terms of the GNU General Public License as published by the
10
Free Software Foundation; either version 2 of the License, or (at your
11
option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
12
the full text of the license.
13
'''
14
15
from apport.hookutils import *
16
import re
17
18
def add_info(report, ui):
19
    response = ui.yesno("The contents of your /etc/bind/named.conf file "
20
                        "may help developers diagnose your bug more "
21
                        "quickly.  However, it may contain sensitive "
22
                        "information.  Do you want to include it in your "
23
                        "bug report?")
24
25
    if response == None: # user cancelled
26
        raise StopIteration
27
    elif response == True:
28
        attach_conffiles(report,'bind9')
29
30
    # getting syslog stuff
31
    report['SyslogBind9'] = recent_syslog(re.compile(r'named\['))
32
33
    # Attaching related packages info
34
    attach_related_packages(report, ['bind9utils', 'apparmor'])
35
++ bind9-9.7.3.dfsg/debian/bind9.postinst
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/db.empty
1
#!/bin/sh
2
3
set -e
4
5
. /usr/share/debconf/confmodule
6
7
if [ "$1" = configure ]; then
8
    lastversion="$2";
9
10
    # lets give them a bind user/group in all cases.
11
    getent group bind >/dev/null 2>&1 || addgroup --system bind
12
    getent passwd bind >/dev/null 2>&1 ||
13
	adduser --system --home /var/cache/bind --no-create-home \
14
		--disabled-password --ingroup bind bind
15
16
    if [ -z "$lastversion" ] || dpkg --compare-versions "$lastversion" lt 1:9.4.2-2 ; then
17
	mkdir -p /var/lib/bind
18
	chown root:bind /var/lib/bind
19
	chmod 775 /var/lib/bind
20
    fi
21
22
    if [ ! -s /etc/bind/rndc.key ]; then
23
	rndc-confgen -r /dev/urandom -a
24
    fi
25
26
    if [ -f /etc/default/bind9 ] && \
27
       [ "$(cat /usr/share/bind9/bind9-default.md5sum)" = "$(md5sum /etc/default/bind9)" ]; then
28
        config="/etc/default/bind9"
29
    elif [ ! -e /etc/default/bind9 ]; then
30
        config="/etc/default/bind9"
31
    else 
32
        config="/etc/default/bind9.dpkg-dist"
33
    fi
34
35
    localconf=""
36
    if [ ! -f $config ]; then
37
	CONF=/etc/bind/named.conf
38
	for file in ${CONF} ${CONF}.local ${CONF}.default-zones; do
39
	    if [ -f ${file} ]; then
40
		theirs=$(md5sum $file | sed 's/ .*$//')
41
		mine=$(dpkg --status bind9 | grep "^ $file " | sed -n 's/.* //p')
42
		if [ "$mine" != "$theirs" ]; then
43
		    localconf="y"
44
		fi
45
	    else
46
		localconf="y"
47
	    fi
48
	done
49
	if [ -n "$localconf" ]; then
50
                db_reset bind9/start-as-user
51
	else
52
                db_set bind9/start-as-user bind || true
53
	fi
54
   
55
        echo '#' 
56
        echo '# run resolvconf?' >> $config
57
        db_get bind9/run-resolvconf
58
        if [ ! -z "$RET" ] && [ "$RET" = "true" ]; then
59
                echo "RESOLVCONF=yes" >> $config
60
        else
61
                echo "RESOLVCONF=no" >> $config
62
        fi
63
64
        db_get bind9/start-as-user
65
        USER=$RET
66
        db_get bind9/different-configuration-file
67
        CONFFILE=$RET
68
        
69
        echo '' >> $config
70
        echo '# startup options for the server' >> $config
71
        if [ ! -z "$USER" ] && [ ! -z "$CONFFILE" ]; then
72
                echo "OPTIONS=\"-u $USER -c $CONFFILE\"" >> $config
73
        elif [ ! -z "$USER" ]; then
74
                echo "OPTIONS=\"-u $USER\"" >> $config
75
        elif [ ! -z "$CONFFILE" ]; then
76
                echo "OPTIONS=\"-c $CONFFILE\"" >> $config
77
        else
78
                echo "OPTIONS=\"\"" >> $config
79
        fi
80
    else
81
        db_get bind9/run-resolvconf
82
         if [ ! -z "$RET" ] && [ "$RET" = "true" ]; then
83
	        sed -e "s#^\([[:space:]]*\)\(RESOLVCONF=[[:space:]]*\)[^ ]*#\1\2yes#g" -i $config
84
        else
85
	        sed -e "s#^\([[:space:]]*\)\(RESOLVCONF=[[:space:]]*\)[^ ]*#\1\2no#g" -i $config
86
        fi
87
        db_get bind9/start-as-user
88
        if [ ! -z "$RET" ]; then
89
            if [ ! -z "`grep OPTIONS $config`" ]; then
90
                if [ ! -z "`grep OPTIONS $config | grep '\-u'`" ]; then
91
                        sed -e "s#\([[:space:]]*OPTIONS[[:space:]]*\)=\"\([^\"]*\)-u[[:space:]]*[^\" ]*\([^\"]*\)\"#\1=\"\2-u $RET\3\"#g" -i $config
92
                else 
93
                        sed -e "s#\([[:space:]]*OPTIONS[[:space:]]*\)=\"\([^\"]*\)\"#\1=\"\2 -u $RET\"#g" -i $config
94
                fi
95
            else
96
                echo "OPTIONS=\"-u $RET\""
97
            fi
98
        fi
99
        db_get bind9/different-configuration-file
100
        if [ ! -z "$RET" ]; then
101
            if [ ! -z "`grep OPTIONS $config | grep '\-c'`" ]; then
102
                sed -e "s#\([[:space:]]*OPTIONS[[:space:]]*\)=\"\([^\"]*\)-c[[:space:]]*[^\" ]*\([^\"]*\)\"#\1=\"\2-c $RET\3\"#g" -i $config
103
            else 
104
                sed -e "s#\([[:space:]]*OPTIONS[[:space:]]*\)=\"\([^\"]*\)\"#\1=\"\2 -c $RET\"#g" -i $config
105
            fi
106
        fi
107
    fi
108
109
    if [ "$config" = "/etc/default/bind9" ]; then
110
        md5sum /etc/default/bind9 > /usr/share/bind9/bind9-default.md5sum
111
    fi
112
113
    uid=$(ls -ln /etc/bind/rndc.key | awk '{print $3}')
114
    if [ "$uid" = "0" ]; then
115
	[ -n "$localconf" ] || chown bind /etc/bind/rndc.key
116
	chgrp bind /etc/bind
117
	chmod g+s /etc/bind
118
	chgrp bind /etc/bind/rndc.key /var/run/named /var/cache/bind
119
	chgrp bind /etc/bind/named.conf* || true
120
	chmod g+r /etc/bind/rndc.key /etc/bind/named.conf* || true
121
	chmod g+rwx /var/run/named /var/cache/bind
122
    fi
123
124
    # Reload AppArmor profile
125
    APP_PROFILE="/etc/apparmor.d/usr.sbin.named"
126
    if [ -f "$APP_PROFILE" ] && aa-status --enabled 2>/dev/null; then
127
        apparmor_parser -r "$APP_PROFILE" || true
128
    fi
129
130
    if /bin/pidof /usr/sbin/named >/dev/null 2>&1; then
131
	invoke-rc.d bind9 restart
132
    else
133
    	invoke-rc.d bind9 start
134
    fi
135
fi
136
137
db_stop
138
139
#DEBHELPER#
140
++ bind9-9.7.3.dfsg/debian/db.empty
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/named.conf.options
1
; BIND reverse data file for empty rfc1918 zone
2
;
3
; DO NOT EDIT THIS FILE - it is used for multiple zones.
4
; Instead, copy it, edit named.conf, and use that copy.
5
;
6
$TTL	86400
7
@	IN	SOA	localhost. root.localhost. (
8
			      1		; Serial
9
			 604800		; Refresh
10
			  86400		; Retry
11
			2419200		; Expire
12
			  86400 )	; Negative Cache TTL
13
;
14
@	IN	NS	localhost.
15
++ bind9-9.7.3.dfsg/debian/named.conf.options
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/changelog
1
options {
2
	directory "/var/cache/bind";
3
4
	// If there is a firewall between you and nameservers you want
5
	// to talk to, you may need to fix the firewall to allow multiple
6
	// ports to talk.  See http://www.kb.cert.org/vuls/id/800113
7
8
	// If your ISP provided one or more IP addresses for stable 
9
	// nameservers, you probably want to use them as forwarders.  
10
	// Uncomment the following block, and insert the addresses replacing 
11
	// the all-0's placeholder.
12
13
	// forwarders {
14
	// 	0.0.0.0;
15
	// };
16
17
	auth-nxdomain no;    # conform to RFC1035
18
	listen-on-v6 { any; };
19
};
20
21
++ bind9-9.7.3.dfsg/debian/changelog
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/libdns69.postinst
1
bind9 (1:9.7.3.dfsg-1~squeeze3) squeeze-security; urgency=high
2
3
  * Apply patch from ISC BIND 9.7.3-P3 to address CVE-2011-2464.
4
5
 -- Florian Weimer <fw@deneb.enyo.de>  Tue, 05 Jul 2011 18:47:02 +0200
6
7
bind9 (1:9.7.3.dfsg-1~squeeze2) squeeze-security; urgency=high
8
9
  * Apply patches from 9.7.3-P1 to address crasher in negative caching
10
    (CVE-2011-1910) and resolution failures in DLV mode.
11
12
 -- Florian Weimer <fw@deneb.enyo.de>  Fri, 27 May 2011 20:04:04 +0200
13
14
bind9 (1:9.7.3.dfsg-1~squeeze1) stable-security; urgency=high
15
16
  * Build for squeeze-security
17
18
 -- Florian Weimer <fw@deneb.enyo.de>  Tue, 29 Mar 2011 22:24:54 +0200
19
20
bind9 (1:9.7.3.dfsg-1) unstable; urgency=low
21
22
  [Peter Palfrader]
23
24
  * Add db-4.6 to bdb_libnames in dlz/config.dlz.in so that it finds the right
25
    db.
26
27
  [Internet Systems Consortium, Inc]
28
29
  * 9.7.3 - Closes: #612287
30
31
  [Mahyuddin Susanto]
32
33
  * Updated Indonesian debconf templates.  Closes: #608559
34
35
  [LaMont Jones]
36
37
  * soname changes
38
39
 -- LaMont Jones <lamont@debian.org>  Wed, 23 Feb 2011 09:14:36 -0700
40
41
bind9 (1:9.7.3.dfsg~rc1-1) unstable; urgency=low
42
43
  [Internet Software Consortium, Inc]
44
45
  * New upstream
46
47
  [Peter Palfrader]
48
49
  * Add db-4.6 to bdb_libnames in dlz/config.dlz.in so that it finds the right
50
    db.
51
52
  [Mahyuddin Susanto]
53
54
  * Updated Indonesian debconf templates.  Closes: #608559
55
56
  [LaMont Jones]
57
58
  * soname changes for new upstream
59
60
 -- LaMont Jones <lamont@debian.org>  Fri, 04 Feb 2011 21:20:05 -0700
61
62
bind9 (1:9.7.2.dfsg.P3-1) unstable; urgency=high
63
64
  [ISC]
65
  * Fix denial of service via ncache entry and a rrsig for the
66
    same type (CVE-2010-3613)
67
  * answers were incorrectly marked as insecure during key algorithm
68
    rollover (CVE-2010-3614)
69
  * Using "allow-query" in the "options" or "view" statements to
70
    restrict access to authoritative zones had no effect.
71
    (CVE-2010-3615)
72
73
  [LaMont Jones]
74
75
  * Adjust indentation for dpkg change.  Closes: #597171
76
77
 -- LaMont Jones <lamont@debian.org>  Wed, 01 Dec 2010 16:32:48 -0700
78
79
bind9 (1:9.7.2.dfsg.P2-3) unstable; urgency=low
80
81
  [LaMont Jones]
82
83
  * Adjust indentation for dpkg change.  Closes: #597171
84
  * acknowledge and incorporate ubuntu change.
85
86
 -- LaMont Jones <lamont@debian.org>  Fri, 26 Nov 2010 05:18:43 -0700
87
88
bind9 (1:9.7.2.dfsg.P2-2ubuntu1) natty; urgency=low
89
90
  [ Andres Rodriguez ]
91
  * Add apport hook (LP: #533601):
92
    - debian/bind9.apport: Added.
93
94
  [ Martin Pitt ]
95
  * debian/rules: Install Apport hook when building on Ubuntu.
96
97
 -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 26 Nov 2010 10:50:17 +0100
98
99
bind9 (1:9.7.2.dfsg.P2-2) unstable; urgency=low
100
101
  [Roy Jamison]
102
103
  * lib/isc/unix/resource.c was missing inttypes.h include.  LP: #674199
104
105
 -- LaMont Jones <lamont@debian.org>  Fri, 12 Nov 2010 10:52:32 -0700
106
107
bind9 (1:9.7.2.dfsg.P2-1) unstable; urgency=low
108
109
  [Joe Dalton]
110
111
  * Add Danish translation of debconf templates.  Closes: #599431
112
113
  [Internet Software Consortium, Inc]
114
115
  * v9.7.2-P2
116
117
  [José Figueiredo]
118
119
  * Add Brazilian Portuguese debconf templates translation.  Closes: #597616
120
121
  [LaMont Jones]
122
123
  * drop this v3 (quilt) source format idea.  Closes: #589916
124
125
 -- LaMont Jones <lamont@debian.org>  Sun, 10 Oct 2010 19:01:57 -0600
126
127
bind9 (1:9.7.1.dfsg.P2-2) unstable; urgency=low
128
129
  * Correct conflicts for bind9-host
130
131
 -- LaMont Jones <lamont@debian.org>  Fri, 16 Jul 2010 05:24:38 -0600
132
133
bind9 (1:9.7.1.dfsg.P2-1) unstable; urgency=low
134
135
  [Internet Software Consortium, Inc]
136
137
  * Temporarily and partially disable change 2864 because it would cause
138
    inifinite attempts of RRSIG queries.  This is an urgent care fix; we'll
139
    revisit the issue and complete the fix later.  [RT #21710]
140
  * Temporarially rollback change 2748. [RT #21594]
141
  * Named failed to accept uncachable negative responses from insecure zones.
142
    [RT# 21555]
143
144
  [LaMont Jones]
145
146
  * freshen copyright file
147
148
 -- LaMont Jones <lamont@debian.org>  Thu, 15 Jul 2010 15:07:54 -0600
149
150
bind9 (1:9.7.1.dfsg.0-1) unstable; urgency=low
151
152
  * Repack to drop zkt/doc/{draft,rfc}*  Closes: #588055
153
154
 -- LaMont Jones <lamont@debian.org>  Mon, 05 Jul 2010 07:21:34 -0600
155
156
bind9 (1:9.7.1.dfsg-2) unstable; urgency=low
157
158
  [Regid Ichira]
159
160
  * explicitly add nsupdate to dynamic updates in README.Debian. 
161
    Closes: #577398
162
163
  [LaMont Jones]
164
165
  * Cleanup bind9-host description.  Closes: #579421
166
  * switch to 3.0 (quilt) source format, but not to quilt.  Closes: #578210
167
168
  [Stephen Gran]
169
170
  * updated geoip patch for ipv6, based on work by John 'Warthog9' Hawley
171
    <warthog9@eaglescrag.net>.  Closes: #584603
172
173
 -- LaMont Jones <lamont@debian.org>  Fri, 02 Jul 2010 08:19:29 -0600
174
175
bind9 (1:9.7.1.dfsg-1) unstable; urgency=low
176
177
  [Internet Software Consortium, Inc]
178
179
  * 9.7.1
180
181
  [LaMont Jones]
182
183
  * Add freebsd support.  Closes: #578447
184
  * soname changes
185
  * freshen root cache.  LP: #596363
186
187
 -- LaMont Jones <lamont@debian.org>  Mon, 21 Jun 2010 09:53:30 -0600
188
189
bind9 (1:9.7.0.dfsg.P1-1) unstable; urgency=low
190
191
  [Internet Software Consortium, Inc]
192
193
  * 9.7.0-P1
194
    - 2852. [bug] Handle broken DNSSEC trust chains better. [RT #15619]
195
196
 -- LaMont Jones <lamont@debian.org>  Wed, 17 Mar 2010 08:06:42 -0600
197
198
bind9 (1:9.7.0.dfsg.1-1) unstable; urgency=low
199
200
  [Niko Tyni]
201
202
  * fix mips/mipsel startup.  Closes: #516616
203
204
  [LaMont Jones]
205
206
  * ignore failures due to a lack of /etc/bind/named.conf*.  LP: #422968
207
  * ldap API changed regarding % sign.  LP: #227344
208
  * Drop more rfc and draft files.  Closes: #572606
209
  * update config.guess, config.sub.  Closes: #572528
210
211
 -- LaMont Jones <lamont@debian.org>  Fri, 12 Mar 2010 14:56:08 -0700
212
213
bind9 (1:9.7.0.dfsg-2) unstable; urgency=low
214
215
  [Aurelien Jarno]
216
217
  * kfreebsd has linux threads.  Closes: #470500
218
219
  [LaMont Jones]
220
221
  * do not error out on initial install.  Closes: #572443
222
223
 -- LaMont Jones <lamont@debian.org>  Thu, 04 Mar 2010 09:32:13 -0700
224
225
bind9 (1:9.7.0.dfsg-1) unstable; urgency=low
226
227
  * New upstream release
228
229
 -- LaMont Jones <lamont@debian.org>  Wed, 17 Feb 2010 14:53:36 -0700
230
231
bind9 (1:9.7.0.dfsg~rc2-1) experimental; urgency=low
232
233
  * New upstream release
234
235
 -- LaMont Jones <lamont@debian.org>  Thu, 28 Jan 2010 05:46:50 -0700
236
237
bind9 (1:9.7.0.dfsg~b3-2) experimental; urgency=low
238
239
  * merge changes from 9.6.1.dfsg.P2-1
240
  * meta: drop verisoned depends from library packages, for less upgrade pain
241
  * apparmor: allow named to create /var/run/named/session.key
242
243
 -- LaMont Jones <lamont@debian.org>  Sun, 06 Dec 2009 11:46:17 -0700
244
245
bind9 (1:9.7.0.dfsg~b3-1) experimental; urgency=low
246
247
  [Internet Software Consortium, Inc]
248
249
  * 9.7.0b3
250
251
  [LaMont Jones]
252
253
  * Merge remote branch 'origin/master'
254
  * soname changes
255
256
 -- LaMont Jones <lamont@debian.org>  Mon, 30 Nov 2009 21:07:58 -0700
257
258
bind9 (1:9.6.1.dfsg.P2-1) unstable; urgency=low
259
260
  [Internet Software Consortium, Inc]
261
262
  * 9.6.1-P2
263
    - When validating, track whether pending data was from the
264
      additional section or not and only return it if validates
265
      as secure. [RT #20438] CVE-2009-4022
266
267
  [LaMont Jones]
268
269
  * prerm: do not stop named on upgrade.  Closes: #542888
270
  * Drop some RFCs that crept into the diff.
271
  * meta: add ${misc:Depends}
272
  * lintian: update config.guess, config.sub in idnkit-1.0 tree
273
  * dnsutils: remove pre-sarge dpkg-divert calls in postinst
274
  * meta: soname changes
275
  * l10n: missing newline in pofile.
276
277
 -- LaMont Jones <lamont@debian.org>  Fri, 27 Nov 2009 10:07:10 -0700
278
279
bind9 (1:9.7.0.dfsg~b2-2) experimental; urgency=low
280
281
  * dnsutils: remove pre-sarge dpkg-divert calls in postinst
282
283
 -- LaMont Jones <lamont@debian.org>  Tue, 17 Nov 2009 22:42:40 -0600
284
285
bind9 (1:9.7.0.dfsg~b2-1) experimental; urgency=low
286
287
  [Internet Software Consortium, Inc]
288
289
  * 9.7.0b2
290
291
  [LaMont Jones]
292
293
  * /etc/bind/bind.keys need not be executable.
294
  * bind9: drop old stale code from postinst
295
  * prerm: do not stop named on upgrade.  Closes: #542888
296
  * Drop some RFCs that crept into the diff.
297
  * meta: add ${misc:Depends}
298
  * lintian: update config.guess, config.sub in idnkit-1.0 tree
299
  * l10n: missing newline in pofile.
300
301
 -- LaMont Jones <lamont@debian.org>  Mon, 16 Nov 2009 18:53:24 -0700
302
303
bind9 (1:9.7.0~a1.dfsg-0) experimental; urgency=low
304
305
  [Internet Software Consortium, Inc]
306
307
  * 9.7.0a1
308
309
 -- LaMont Jones <lamont@debian.org>  Wed, 24 Jun 2009 15:10:08 -0600
310
311
bind9 (1:9.6.1.dfsg.P1-3) unstable; urgency=low
312
313
  * Build-Depend on the fixed libgeoip-dev.  Closes: #540973
314
315
 -- LaMont Jones <lamont@debian.org>  Mon, 17 Aug 2009 06:53:11 -0600
316
317
bind9 (1:9.6.1.dfsg.P1-2) unstable; urgency=low
318
319
  [Jamie Strandboge]
320
321
  * reload individual named profile, not all of apparmor.  LP: #412751
322
323
  [Guillaume Delacour]
324
325
  * bind9 did not purge cleanly.  Closes: #497959
326
327
  [LaMont Jones]
328
329
  * postinst: do not append a blank line to /etc/default/bind9. 
330
    Closes: #541469
331
  * init.d stop needs to not error out.  LP: #398033
332
  * meta: fix build-depends.  Closes: #539230
333
334
 -- LaMont Jones <lamont@debian.org>  Fri, 14 Aug 2009 17:03:31 -0600
335
336
bind9 (1:9.6.1.dfsg.P1-1) unstable; urgency=low
337
338
  [Internet Software Consortium, Inc]
339
340
  * A specially crafted update packet will cause named to exit. 
341
    CVE-2009-0696, CERT VU#725188.  Closes: #538975
342
343
  [InterNIC]
344
345
  * Update db.root hints file.
346
347
  [LaMont Jones]
348
349
  * Move default zone definitions from named.conf to named.conf.default-zones.
350
     Closes: #492308
351
  * use start-stop-daemon if rndc stop fails.  Closes: #536487
352
  * lwresd: pidfile name was wrong in init script.  Closes: #527137
353
354
 -- LaMont Jones <lamont@debian.org>  Tue, 28 Jul 2009 22:03:14 -0600
355
356
bind9 (1:9.6.1.dfsg-2) unstable; urgency=low
357
358
  * ia64: fix atomic.h
359
360
 -- LaMont Jones <lamont@debian.org>  Tue, 23 Jun 2009 01:56:35 -0600
361
362
bind9 (1:9.6.1.dfsg-1) unstable; urgency=low
363
364
  [Internet Software Consortium, Inc]
365
366
  * 9.6.1
367
368
 -- LaMont Jones <lamont@debian.org>  Mon, 22 Jun 2009 14:33:20 -0600
369
370
bind9 (1:9.6.0.dfsg.P1-3) unstable; urgency=low
371
372
  [Martin Zobel-Helas]
373
374
  * GEO-IP Patch from
375
    git://git.kernel.org/pub/scm/network/bind/bind-geodns.git.  Closes: #395191
376
377
  [LaMont Jones]
378
379
  * Remove /var/lib/bind on purge.  Closes: #527613
380
  * Build-Depend: libdb-dev (>4.6).  Closes: #527877, #528772
381
  * init.d: detect rndc errors better.  LP: #380962
382
  * init.d: clean up exit status.  Closes: #523454
383
  * Enable pkcs11 support, and then Revert - causes assertion failures
384
    c.f.: #516552
385
386
 -- LaMont Jones <lamont@debian.org>  Mon, 22 Jun 2009 13:58:32 -0600
387
388
bind9 (1:9.6.0.dfsg.P1-2) unstable; urgency=low
389
390
  * random_1 broke memory usage assertions.
391
392
 -- LaMont Jones <lamont@debian.org>  Thu, 23 Apr 2009 05:15:45 -0600
393
394
bind9 (1:9.6.0.dfsg.P1-1) experimental; urgency=low
395
396
  [Michael Milligan]
397
398
  * Add min-cache-ttl and min-ncache-ttl keywords
399
400
  [LaMont Jones]
401
  
402
  * Fix merge errors from 9.6.0.dfsg.P1-0
403
404
 -- LaMont Jones <lamont@debian.org>  Fri, 20 Mar 2009 15:50:50 -0600
405
406
bind9 (1:9.6.0.dfsg.P1-0) experimental; urgency=low
407
408
  [Internet Software Consortium, Inc]
409
410
  * 9.6.0-P1
411
412
  [LaMont Jones]
413
414
  * meta: fix override disparity
415
  * meta: soname package fixups for 9.6.0
416
  * meta: update Standards-Version: 3.7.3.0
417
  * upstream now uses a bind subdir.  Closes: #212659
418
419
  [Sven Joachim]
420
421
  * meta: pass host and build into configure for hybrid build machines. 
422
    Closes: #515110
423
424
 -- LaMont Jones <lamont@debian.org>  Fri, 20 Mar 2009 11:54:55 -0600
425
426
bind9 (1:9.5.1.dfsg.P1-3) unstable; urgency=low
427
428
  * package -2 for unstable
429
430
 -- LaMont Jones <lamont@debian.org>  Wed, 18 Mar 2009 09:40:18 -0600
431
432
bind9 (1:9.5.1.dfsg.P1-2) stable; urgency=low
433
434
  [Juhana Helovuo]
435
436
  * fix atomic operations on alpha.  Closes: #512285
437
438
  [Dann Frazier]
439
440
  * fix atomic operations on ia64.  Closes: #520179
441
442
  [LaMont Jones]
443
444
  * build-conflict: libdb4.2-dev.  Closes: #515074, #507013
445
446
  [localization folks]
447
448
  * l10n: Basque debconf template.  Closes: #516549 (Piarres Beobide)
449
450
 -- LaMont Jones <lamont@debian.org>  Wed, 18 Mar 2009 05:30:22 -0600
451
452
bind9 (1:9.5.1.dfsg.P1-1) unstable; urgency=low
453
454
  * New upstream patch release
455
    - supportable version of fix from 9.5.0.dfsg.P2-5.1
456
    - CVE-2009-0025:  Closes: #511936
457
    - 2475: Overly agressive cache entry removal.  Closes: #511768
458
    - other bug fixes worthy of patch-release inclusion
459
460
 -- LaMont Jones <lamont@debian.org>  Mon, 26 Jan 2009 10:33:42 -0700
461
462
bind9 (1:9.5.0.dfsg.P2-5.1) unstable; urgency=low
463
464
  * Non-maintainer upload.
465
  * Apply upstream ACL fixes from 9.5.1 to fix RC bug. Patch was provided
466
    by Evan Hunt (upstream bind9 developer) after Emmanuel Bouthenot
467
    contacted him. Closes: #496954, #501800.
468
  * Remove obsolete dh_installmanpages invocation which was adding
469
    unwanted manual pages to bind9. Closes: #486196.
470
471
 -- Ben Hutchings <ben@decadent.org.uk>  Fri, 02 Jan 2009 16:51:42 +0000
472
473
bind9 (1:9.5.0.dfsg.P2-5) unstable; urgency=low
474
475
  [ISC]
476
477
  * 2463: IPv6 Advanced Socket API broken on linux.  LP: #249824
478
479
  [Jamie Strandboge]
480
481
  * apparmor: add capability sys_resource
482
  * apparmor: add krb keytab access.  LP: #277370
483
484
  [LaMont Jones]
485
486
  * apparmor: allow proc/*/net/if_inet6 read access too.  LP: #289060
487
  * apparmor: add /var/log/named/* entries.  LP: #294935
488
489
  [Ben Hutchings]
490
491
  * meta: Add dependency of bind9 on net-tools (ifconfig used in init script)
492
  * meta: Fix bind9utils Depends.
493
  * meta: fix typo in package description
494
495
  [localization folks]
496
497
  * l10n: add polish debconf translations.  Closes: #506856 (L)
498
499
 -- LaMont Jones <lamont@debian.org>  Sun, 07 Dec 2008 21:03:29 -0700
500
501
bind9 (1:9.5.0.dfsg.P2-4) unstable; urgency=low
502
503
  * meta: fix typo in Depends: lsb-base.  Closes: #501365
504
505
 -- LaMont Jones <lamont@debian.org>  Tue, 07 Oct 2008 17:20:11 -0600
506
507
bind9 (1:9.5.0.dfsg.P2-3) unstable; urgency=low
508
509
  [LaMont Jones]
510
511
  * enable largefile support.  Closes: #497040
512
513
  [localization folks]
514
515
  * l10n: Dutch translation.  Closes: #499977 (Paul Gevers)
516
  * l10n: simplified chinese debconf template.  Closes: #501103 (LI Daobing)
517
  * l10n: Update spanish template.  Closes: #493775 (Ignacio Mondino)
518
519
 -- LaMont Jones <lamont@debian.org>  Sun, 05 Oct 2008 20:20:00 -0600
520
521
bind9 (1:9.5.0.dfsg.P2-2) unstable; urgency=low
522
523
  [Kees Cook]
524
525
  * debian/{control,rules}: enable PIE hardening (from -1ubuntu1)
526
527
  [Nicolas Valcárcel]
528
529
  * Add ufw integration (from -1ubuntu2)
530
531
  [Dustin Kirkland]
532
533
  * use pid file in init.d/bind9 status.  LP: #247084
534
535
  [LaMont Jones]
536
537
  * dig: add -DDIG_SIGCHASE to compile options.  LP: #257682
538
  * apparmor profile: add /var/log/named
539
540
  [Nikita Ofitserov]
541
542
  * ipv6 support requires _GNU_SOURCE definition.  LP: #249824
543
544
 -- LaMont Jones <lamont@debian.org>  Thu, 28 Aug 2008 23:08:36 -0600
545
546
bind9 (1:9.5.0.dfsg.P2-1) unstable; urgency=low
547
548
  [LaMont Jones]
549
550
  * default to using resolvconf if it is installed
551
  * fix sonames and dependencies.  Closes: #149259, #492418
552
  * Do not build-depend libcap2-dev on non-linux.  Closes: #493392
553
  * drop unused query-loc manpage.  Closes: #492564
554
  * lwresd: Deliver /etc/bind directory.  Closes: #490027
555
  * fix query-source comment in default install
556
557
  [Internet Software Consortium, Inc]
558
559
  * 9.5.0-P2.  Closes: #492949
560
561
  [localization folks]
562
563
  * l10n: Spanish debconf translation.  Closes: #492425 (Ignacio Mondino)
564
  * l10n: Swedish debconf templates.  Closes: #491369 (Martin Ågren)
565
  * l10n: Japanese debconf translations.  Closes: #492048 (Hideki Yamane
566
    (Debian-JP))
567
  * l10n: Finnish translation.  Closes: #490630 (Esko Arajärvi)
568
  * l10n: Italian debconf translations.  Closes: #492587 (Alessandro Vietta)
569
570
 -- LaMont Jones <lamont@debian.org>  Sat, 02 Aug 2008 14:20:20 -0600
571
572
bind9 (1:9.5.0.dfsg.P1-2) unstable; urgency=low
573
574
  * Revert "meta: merge the mess of single-lib packages back into one large
575
    one." - That way lies madness and pain.
576
  * init.d/bind9: implement status function.  LP: #203169
577
578
 -- LaMont Jones <lamont@debian.org>  Tue, 08 Jul 2008 21:56:58 -0600
579
580
bind9 (1:9.5.0.dfsg.P1-1) unstable; urgency=low
581
582
  * Repackage 9.5.0.dfsg-5 with the -P1 tarball.
583
584
 -- LaMont Jones <lamont@debian.org>  Tue, 08 Jul 2008 15:06:07 -0600
585
586
bind9 (1:9.5.0.dfsg-5) unstable; urgency=low
587
588
  [Internet Software Consortium, Inc]
589
590
  * Randomize UDP query source ports to improve forgery resilience.
591
    (CVE-2008-1447)                                                                              
592
593
  [LaMont Jones]
594
595
  * add build-depends: texlive-latex-base, xsltproc, remove Bv9ARM.pdf in clean
596
  * fix sonames
597
  * drop unneeded build-deps, since we do not actually deliver B9vARM.pdf
598
  * meta: cleanup libbind9-41 Provides/Conflicts
599
  * build: fix sonames for new libraries
600
  * postinst: really restart bind/lwresd in postinst
601
602
 -- LaMont Jones <lamont@debian.org>  Sun, 06 Jul 2008 21:34:18 -0600
603
604
bind9 (1:9.5.0.dfsg-4) unstable; urgency=low
605
606
  [LaMont Jones]
607
608
  * control: fix dnsutils description to avoid list reformatting. 
609
    Closes: #480317
610
  * lwresd: restart in postinst.  Closes: #486481
611
  * meta: merge the mess of single-lib packages back into one large one.
612
  * apparmor: allow bind to create files in /var/{lib,cache}/bind
613
  * build: drop .la files.  Closes: #486969
614
  * build: drop the extra lib path from the library-package merge
615
  * meta: liblwres40 does not conflict with the libbind9-40-provided libbind0
616
617
  [localization folks]
618
619
  * l10n: German debconf translation.  Closes: #486547 (Helge Kreutzmann)
620
  * l10n: Indonesian debconf translations.  Closes: #486503 (Arief S Fitrianto)
621
  * l10n: Slovak po-debconf translation Closes: #488905 (helix84)
622
  * l10n: Turkish debconf template.  Closes: #486479 (Mert Dirik)
623
624
 -- LaMont Jones <lamont@debian.org>  Mon, 30 Jun 2008 11:22:05 -0600
625
626
bind9 (1:9.4.2-12) unstable; urgency=low
627
628
  * apparmor: allow bind to create files in /var/{lib,cache}/bind
629
630
 -- LaMont Jones <lamont@debian.org>  Mon, 30 Jun 2008 11:17:53 -0600
631
632
bind9 (1:9.4.2-11) unstable; urgency=low
633
634
  * apparmor: add dnscvsutil package files
635
  * lwresd Depends: adduser
636
  * control: fix dnsutils description to avoid list reformatting. 
637
    Closes: #480317
638
639
 -- LaMont Jones <lamont@debian.org>  Tue, 17 Jun 2008 21:30:12 -0600
640
641
bind9 (1:9.5.0.dfsg-3) unstable; urgency=low
642
643
  [LaMont Jones]
644
645
  * bind9utils Depends: libbind9-40.  Closes: #486194
646
  * bind9 should not deliver manpages for nonexistant binaries. 
647
    Closes: #486196
648
649
  [localization folks]
650
651
  * l10n: Vietnamese debconf templates translation update.  Closes: #486185
652
    (Clytie Siddall)
653
  * l10n: Russian debconf templates translation.  Closes: #486191 (Yuri Kozlov)
654
  * l10n: Galician debconf template.  Closes: #486215 (Jacobo Tarrio)
655
  * l10n: French debconf templates.  Closes: #486325 (CALARESU Luc)
656
  * l10n: Czech debconf translation.  Closes: #486337 (Miroslav Kure)
657
  * l10n: Updated Portuguese translation.  Closes: #486267 (Traduz -
658
    Portuguese Translation Team)
659
660
 -- LaMont Jones <lamont@debian.org>  Sun, 15 Jun 2008 18:25:02 -0600
661
662
bind9 (1:9.5.0.dfsg-2) unstable; urgency=low
663
664
  [Tim Spriggs]
665
666
  * init.d: Nexenta has different ifconfig arguments
667
668
  [LaMont Jones]
669
670
  * templates rework from debian-l10n-english
671
  * reload named when an interface goes up or down.  LP: #226495
672
  * build: need to create the directories for interface restart triggering
673
  * Build-Depends: libcap2-dev.  Closes: #485747
674
  * Leave named running during update.  Closes: #453765
675
  * Fix path to uname, cleaning up the nexenta checks.
676
  * l10n: avoid double-question in templates.
677
678
  [localization folks]
679
680
  * l10n: Vietnamese debconf translations.  Closes: #483911 (Clytie Siddall)
681
  * l10n: Portuguese debconf translations.  Closes: #483872 (Traduz -
682
    Portuguese Translation Team)
683
684
 -- LaMont Jones <lamont@debian.org>  Fri, 13 Jun 2008 16:54:42 -0600
685
686
bind9 (1:9.5.0.dfsg-1) unstable; urgency=low
687
688
  [LaMont Jones]
689
690
  * manpages: fix references that should say /etc/bind
691
  * meta: build-depend libxml2-dev for statistics support
692
693
 -- LaMont Jones <lamont@debian.org>  Sat, 31 May 2008 12:17:21 -0600
694
695
bind9 (1:9.5.0.dfsg-0) experimental; urgency=low
696
697
  [Internet Software Consortium, Inc]
698
699
  * 9.5.0 release
700
701
  [LaMont Jones]
702
703
  * Only use capabilities if they are present: reprise.  Closes: #360339, #212226
704
  * control: fix dnsutils description to avoid list reformatting.  Closes: #480317
705
  * build: use the correct directories in dh_shlibdeps invocation
706
  * build: turn on dlz.  No pgsql or mysql support yet.  LP: #227344
707
708
 -- LaMont Jones <lamont@debian.org>  Thu, 29 May 2008 22:05:19 -0600
709
710
bind9 (1:9.5.0~rc1-2~0ubuntu2) intrepid; urgency=low
711
712
  * build: use the correct directories in dh_shlibdeps invocation
713
  * build: turn on dlz.  LP: #227344
714
715
 -- LaMont Jones <lamont@ubuntu.com>  Tue, 27 May 2008 21:43:06 -0600
716
717
bind9 (1:9.5.0~rc1-2~0ubuntu1) intrepid; urgency=low
718
719
  * Upload what will become (maybe an ancestor of) -2 to intrepid.
720
    - Only use capabilities if they are present: reprise.  Closes: #360339, #212226
721
    - control: fix dnsutils description to avoid list reformatting.  Closes: #480317
722
723
 -- LaMont Jones <lamont@ubuntu.com>  Mon, 26 May 2008 11:46:27 -0600
724
725
bind9 (1:9.5.0~rc1-1) experimental; urgency=low
726
727
  [Patrick Winnertz]
728
729
  * postinst: make add debconf support.  Closes: #473460
730
731
  [Jamie Strandboge]
732
733
  * debian/bind9.preinst: Apparmor force-complain on upgrade without
734
    existing profile.  LP: #204658
735
736
  [LaMont Jones]
737
738
  * bind9utils: fix typos in .install
739
  * host: manpage inaccurately describes default query.  LP: #203087
740
  * apparmor: add dnscvsutil package files
741
  * Revert "Only use capabilities if they are present." for merge of 9.5.0rc1.
742
  * soname: libdns41 -> 42
743
  * fix typos in debconf patch, #473460
744
  * cleanup more files in clean target
745
  * lwresd Depends: adduser
746
747
 -- LaMont Jones <lamont@debian.org>  Thu, 15 May 2008 17:59:54 -0600
748
749
bind9 (1:9.5.0~b2-2) experimental; urgency=low
750
751
  * meta: add bind9utils binary package, with various useful utilities.  Closes: #151957, #130445, #160483
752
753
 -- LaMont Jones <lamont@debian.org>  Thu, 03 Apr 2008 07:01:42 -0600
754
755
bind9 (1:9.4.2-10) unstable; urgency=low
756
757
  [Jamie Strandboge]
758
759
  * debian/bind9.preinst: AA force-complain on upgrade without existing
760
    profile.  LP: #204658
761
762
  [LaMont Jones]
763
764
  * host: manpage inaccurately describes default query.  LP: #203087
765
766
 -- LaMont Jones <lamont@debian.org>  Tue, 08 Apr 2008 22:45:57 -0600
767
768
bind9 (1:9.4.2-9) unstable; urgency=low
769
770
  * apparmor: allow subdirs in {/etc,/var/cache,/var/lib}/bind
771
  * apparmor: make profile match README.Debian
772
773
 -- LaMont Jones <lamont@debian.org>  Tue, 01 Apr 2008 21:13:05 -0600
774
775
bind9 (1:9.4.2-8) unstable; urgency=low
776
777
  [ISC]
778
779
  * CVE-2008-0122: off by one error in (unused) inet_network function.
780
    Closes: #462783  LP: #203476
781
782
  [Michael Milligan]
783
784
  * Fix min-cache-ttl and min-ncache-ttl keywords
785
786
  [Jamie Strandboge]
787
788
  * apparmor: force complain-mode for apparmor on certain upgrades.  LP: #203528
789
  * debian/bind9.postrm: purge /etc/apparmor.d/force-complain/usr.sbin.named
790
791
 -- LaMont Jones <lamont@debian.org>  Tue, 18 Mar 2008 18:35:15 -0600
792
793
bind9 (1:9.4.2-7) unstable; urgency=low
794
795
  [Jamie Strandboge]
796
797
  * Allow rw access to /var/lib/bind/* in apparmor-profile.  LP: #201954
798
799
  [LaMont Jones]
800
801
  * Drop root-delegation comments from named.conf.  Closes: #217829, #297219
802
803
 -- LaMont Jones <lamont@debian.org>  Sat, 15 Mar 2008 09:48:10 -0600
804
805
bind9 (1:9.4.2-6) unstable; urgency=low
806
807
  * Correct apparmor profile filename.  LP: #200739
808
809
 -- LaMont Jones <lamont@debian.org>  Mon, 10 Mar 2008 14:28:01 -0600
810
811
bind9 (1:9.4.2-5) unstable; urgency=low
812
813
  * add "order random_1" support (return one random RR)
814
  * Fix doc pathnames in README.Debian.  Closes: #266891
815
  * Add AAAA ::1 entry to db.local.  Closes: #230088
816
817
 -- LaMont Jones <lamont@debian.org>  Mon, 10 Mar 2008 13:51:28 -0600
818
819
bind9 (1:9.5.0~b2-1) experimental; urgency=low
820
821
  [Thiemo Seufer]
822
823
  * mips:atomic.h: improve implementation of atomic ops, fix mips{el,64}
824
825
  [LaMont Jones]
826
827
  * manpages: call it /etc/bind/named.conf throughout, and typos.  Closes: #419750
828
  * named.conf.5: correct filename.  Closes: #428015
829
  * manpages: fix typo errors.  Closes: #395834
830
  * Makefile.in: be explicit about library paths
831
  * build: Turn on GSS-TSIG support.  LP: #158197
832
  * build: soname changes
833
  * db.root: include AAAA RRs.  Closes: #464111
834
  * soname: lib{dns,isc}40 -> 41
835
  * meta: use binary:Version instead of Source-Version
836
837
  [Andreas John]
838
839
  * Only use capabilities if they are present.  Closes: #360339, #212226
840
841
 -- LaMont Jones <lamont@debian.org>  Sat, 23 Feb 2008 08:06:17 -0700
842
843
bind9 (1:9.4.2-4) unstable; urgency=low
844
845
  * incorporate ubuntu apparmor change from Jamie Strandboge,
846
    with changes:
847
    - Add apparmor profile, reload apparmor profile on config
848
    - Add a note about apparmor to README.Debian
849
    - conflicts/replaces old apparmor versions
850
  * db.root: include AAAA RRs.  Closes: #464111
851
  * Don't die when /var/lib/bind already exists.  LP: #191685
852
  * build: turn on optimization.  Closes: #435194
853
854
 -- LaMont Jones <lamont@debian.org>  Fri, 22 Feb 2008 22:05:25 -0700
855
856
bind9 (1:9.4.2-3ubuntu1) hardy; urgency=low
857
858
  * add AppArmor profile
859
    + debian/apparmor-profile
860
    + debian/bind9.postinst: Reload AA profile on configuration
861
  * updated debian/README.Debian for note on AppArmor
862
  * debian/control: Replaces apparmor-profiles << 2.1+1075-0ubuntu4 as we
863
    should now take control
864
  * debian/control: Conflicts with apparmor-profiles << 2.1+1075-0ubuntu4
865
    to make sure that if earlier version of apparmor-profiles gets installed
866
    it won't overwrite our profile
867
  * Modify Maintainer value to match the DebianMaintainerField
868
    specification.
869
870
 -- Jamie Strandboge <jamie@ubuntu.com>  Wed, 13 Feb 2008 17:30:45 +0000
871
872
bind9 (1:9.4.2-3) unstable; urgency=low
873
874
  * don't run rndc-confgen when it's not there.  Closes: #459551
875
  * control: drop use of ${Source-Version}
876
877
 -- LaMont Jones <lamont@debian.org>  Mon, 07 Jan 2008 10:16:06 -0700
878
879
bind9 (1:9.4.2-2) unstable; urgency=low
880
881
  * init.d: add --oknodo to start-stop-daemon.  Closes: #411881
882
  * init: LSB dependency info.  Closes: #459421, #448006
883
  * meta: bind9 Suggests: resolvconf.  Closes: #252285
884
  * bind9: deliver /var/lib/bind directory, and document.
885
    Closes: #248771, #200253, #202981, #209022
886
  * lwresd: create bind user/group and rndc key if needed, at install.
887
    Closes: #190742
888
  * dnsutils: update long description.  Closes: #236901
889
890
 -- LaMont Jones <lamont@debian.org>  Sun, 06 Jan 2008 12:25:31 -0700
891
892
bind9 (1:9.4.2-1) unstable; urgency=low
893
894
  [Mike O'Connor]
895
896
  * bind9.init: LSB compliance.  Closes: #448006
897
898
  [Internet Software Consortium, Inc]
899
900
  * New release: 9.4.2
901
902
  [LaMont Jones]
903
904
  * soname shifts for new release
905
906
 -- LaMont Jones <lamont@debian.org>  Sat, 17 Nov 2007 10:50:07 -0700
907
908
bind9 (1:9.4.2~rc2-1) experimental; urgency=low
909
910
  * New upstream release
911
912
 -- LaMont Jones <lamont@debian.org>  Fri, 12 Oct 2007 18:33:57 -0600
913
914
bind9 (1:9.4.1-P1-4) unstable; urgency=low
915
916
  [Thomas Antepoth]
917
918
  * unix/socket.c: don't send to a socket with pending_send.  Closes: #430065
919
920
  [LaMont Jones]
921
922
  * document git repositories
923
  * db.root: l.root-servers.net changed IP address.  Closes: #449148  LP: #160176
924
  * init.d: if there are no networks configured, error out quickly
925
926
 -- LaMont Jones <lamont@debian.org>  Thu, 08 Nov 2007 21:31:55 -0700
927
928
bind9 (1:9.4.1-P1-3) unstable; urgency=low
929
930
  * Only deliver upstream changes with bind9-doc
931
932
 -- LaMont Jones <lamont@debian.org>  Thu, 04 Oct 2007 08:30:55 -0600
933
934
bind9 (1:9.4.1-P1-2) unstable; urgency=low
935
936
  * manpages: fix typo errors.  Closes: #395834
937
  * manpages: call it /etc/bind/named.conf throughout, and typos.  Closes: #419750
938
  * named.conf.5: correct filename.  Closes: #428015
939
  * bind9.NEWS: update version for ACL change doc.  Closes: #435225
940
  * build: don't have dnsutils deliver man pages that it shouldn't.  LP: #82178
941
  * nslookup.1: some of the manpage was not visible.  LP: #131415
942
  * document git repositories
943
  * unix/socket.c: don't send to a socket with pending_send.  Closes: #430065
944
945
 -- LaMont Jones <lamont@debian.org>  Wed, 03 Oct 2007 01:10:59 -0600
946
947
bind9 (1:9.4.1-P1-1) unstable; urgency=high
948
949
  * New upstream version, addresses CVE-2007-2926 and CVE-2007-2925 
950
951
 -- Bdale Garbee <bdale@gag.com>  Thu, 26 Jul 2007 16:41:50 -0600
952
953
bind9 (1:9.4.1-1) unstable; urgency=low
954
955
  * New upstream version
956
957
 -- LaMont Jones <lamont@debian.org>  Mon, 30 Apr 2007 16:59:05 -0600
958
959
bind9 (1:9.4.0-2) unstable; urgency=low
960
961
  * upload to unstable
962
963
 -- LaMont Jones <lamont@debian.org>  Tue, 10 Apr 2007 11:12:16 -0600
964
965
bind9 (1:9.4.0-1) experimental; urgency=low
966
967
  * New upstream version
968
  * more mipsel patch.  Closes: #406409
969
970
 -- LaMont Jones <lamont@debian.org>  Sun, 25 Feb 2007 11:44:11 -0700
971
972
bind9 (1:9.4.0~rc2-1) experimental; urgency=low
973
974
  * New upstream version.  Addresses CVE-2007-0493 CVE-2007-0494
975
976
 -- LaMont Jones <lamont@debian.org>  Thu, 25 Jan 2007 14:26:12 -0700
977
978
bind9 (1:9.4.0~rc1.0-3) experimental; urgency=low
979
980
  * add NEWS file talking about the change in defaults:
981
    As of bind 9.4, allow-query-cache and allow-recursion default to the
982
    builtin acls 'localnets' and 'localhost'.  If you are setting up a
983
    name server for a network, you will almost certainly need to change
984
    this.
985
986
    The change in default has been done to make caching servers less
987
    attractive as reflective amplifying targets for spoofed traffic.
988
    This still leaves authoritative servers exposed.
989
990
 -- LaMont Jones <lamont@debian.org>  Wed, 24 Jan 2007 09:35:06 -0700
991
992
bind9 (1:9.4.0~rc1.0-2) experimental; urgency=low
993
994
  * Fix mips64.  Closes: #406409
995
996
 -- LaMont Jones <lamont@debian.org>  Sun, 21 Jan 2007 15:32:27 -0700
997
998
bind9 (1:9.4.0~rc1.0-1) experimental; urgency=low
999
1000
  * Broken orig.tar.gz.
1001
1002
 -- LaMont Jones <lamont@debian.org>  Thu, 28 Dec 2006 23:04:05 -0700
1003
1004
bind9 (1:9.4.0~rc1-1) experimental; urgency=low
1005
1006
  * New upstream
1007
1008
 -- LaMont Jones <lamont@debian.org>  Thu, 28 Dec 2006 19:00:37 -0700
1009
1010
bind9 (1:9.3.4-2etch2) stable-proposed-updates; urgency=low
1011
1012
  [Thomas Antepoth]
1013
1014
  * unix/socket.c: don't send to a socket with pending_send.  Closes: #430065
1015
1016
  [LaMont Jones]
1017
1018
  * document git repositories
1019
  * db.root: l.root-servers.net changed IP address.  Closes: #449148
1020
1021
 -- LaMont Jones <lamont@debian.org>  Mon, 05 Nov 2007 19:48:23 -0700
1022
1023
bind9 (1:9.3.4-2etch1) stable-security; urgency=high
1024
1025
  * Fix DNS cache poisoning through predictable query IDs. (CVE-2007-2926)
1026
1027
 -- Moritz Muehlenhoff <jmm@debian.org>  Tue, 24 Jul 2007 22:09:35 +0000
1028
1029
bind9 (1:9.3.4-2) unstable; urgency=high
1030
1031
  * Actually really do the merge of 9.3.4.  Sigh.  Closes: #408925
1032
1033
 -- LaMont Jones <lamont@debian.org>  Mon, 29 Jan 2007 06:09:03 -0700
1034
1035
bind9 (1:9.3.4-1) unstable; urgency=high
1036
1037
  * New upstream version.  Addresses CVE-2007-0493 CVE-2007-0494
1038
1039
 -- LaMont Jones <lamont@debian.org>  Thu, 25 Jan 2007 14:31:09 -0700
1040
1041
bind9 (1:9.3.3-1) unstable; urgency=low
1042
1043
  * New upstream version
1044
1045
 -- LaMont Jones <lamont@debian.org>  Tue, 12 Dec 2006 23:31:51 -0700
1046
1047
bind9 (1:9.3.2-P1.0-1) unstable; urgency=low
1048
1049
  * Fix README.Debian to point to the URL.  Closes: #387437
1050
  * Strip rfc's from orig.tar.gz.  Closes: #393359
1051
1052
 -- LaMont Jones <lamont@mmjgroup.com>  Mon, 16 Oct 2006 06:38:22 -0600
1053
1054
bind9 (1:9.3.2-P1-2) unstable; urgency=low
1055
1056
  * Fix init script output.  Closes: #354192
1057
    Thanks to Joey Hess for the patch.
1058
  * Default install should listen on ipv6 interfaces.  Closes: #382438
1059
1060
 -- LaMont Jones <lamont@debian.org>  Sat,  9 Sep 2006 19:01:53 -0600
1061
1062
bind9 (1:9.3.2-P1-1) unstable; urgency=high
1063
1064
  * New upstream, fixes CVE-2006-4095 and CVE-2006-4096.
1065
    Closes: #386237, #386245
1066
  * Drop gcc-3.4 [powerpc] dependency.  Closes: #342957, #372203
1067
  * Add -fno-strict-aliasing for type-punned pointer aliasing issues
1068
    Closes: #386224
1069
  * Use getent in postinst instead of chown/chgrp.  Closes: #386091, #239665
1070
  * Drop redundant update-rc.d calls.  Closes: #356914
1071
1072
 -- LaMont Jones <lamont@debian.org>  Wed,  6 Sep 2006 08:07:13 -0600
1073
1074
bind9 (1:9.3.2-2) unstable; urgency=low
1075
1076
  * correct force-reload.  Closes: #333841
1077
  * Fix init.d's usage message.  Closes: #331090
1078
  * resolvconf tweaks.  Closes: #252232, #275412
1079
1080
 -- LaMont Jones <lamont@debian.org>  Mon, 16 Jan 2006 15:17:04 -0700
1081
1082
bind9 (1:9.3.2-1) unstable; urgency=low
1083
1084
  * New upstream
1085
  * use lsb-base for start/stop messages in init.d.
1086
  * switch to debhelper 4
1087
1088
 -- LaMont Jones <lamont@debian.org>  Thu,  5 Jan 2006 12:29:28 -0700
1089
1090
bind9 (1:9.3.1-2) unstable; urgency=low
1091
1092
  * Getting good reports from experimental, uploading to sid.
1093
    Release team, please consider this package for sarge.  Thanks.
1094
  * correct pidfile name in init.d/lwresd.  Closes: #298100
1095
1096
 -- LaMont Jones <lamont@debian.org>  Sat, 19 Mar 2005 17:46:31 -0700
1097
1098
bind9 (1:9.3.1-1) experimental; urgency=low
1099
1100
  * Build with gcc-3.4 on powerpc, to work around #292958.
1101
1102
 -- LaMont Jones <lamont@debian.org>  Sat, 19 Mar 2005 11:40:06 -0700
1103
1104
bind9 (1:9.3.1-0) experimental; urgency=low
1105
1106
  * New upstream version.
1107
1108
 -- LaMont Jones <lamont@debian.org>  Sun, 13 Mar 2005 21:44:57 -0700
1109
1110
bind9 (1:9.3.0+9.3.1beta2-1) experimental; urgency=low
1111
1112
  * new upstream version
1113
1114
 -- LaMont Jones <lamont@debian.org>  Tue, 25 Jan 2005 14:21:51 -0700
1115
1116
bind9 (1:9.3.0-1) experimental; urgency=low
1117
1118
  * New upstream version
1119
1120
 -- LaMont Jones <lamont@debian.org>  Sat, 25 Sep 2004 21:35:46 -0600
1121
1122
bind9 (1:9.2.4-1) unstable; urgency=high
1123
1124
  * New upstream version.  Closes: #269157 and others.
1125
  * Version debhelper build-dep.  Closes: #262720
1126
1127
 -- LaMont Jones <lamont@mmjgroup.com>  Thu, 23 Sep 2004 09:11:37 -0600
1128
1129
bind9 (1:9.2.3+9.2.4-rc7-1) unstable; urgency=low
1130
1131
  * New upstream
1132
1133
 -- LaMont Jones <lamont@mmjgroup.com>  Wed,  1 Sep 2004 00:04:55 -0600
1134
1135
bind9 (1:9.2.3+9.2.4-rc6-1) unstable; urgency=low
1136
1137
  * New upstream.
1138
  * Comment out delegation-only directives in named.conf
1139
1140
 -- LaMont Jones <lamont@debian.org>  Mon,  2 Aug 2004 10:00:38 -0600
1141
1142
bind9 (1:9.2.3+9.2.4-rc5-1) unstable; urgency=low
1143
1144
  * New upstream release candidate
1145
1146
 -- LaMont Jones <lamont@debian.org>  Thu, 17 Jun 2004 19:50:37 -0600
1147
1148
bind9 (1:9.2.3+9.2.4-rc2-1) unstable; urgency=low
1149
1150
  * New upstream release candidate
1151
  * Remove shared library symlinks in clean.  Closes: #243109
1152
  * Deal with capset being a module.  Closes: #245043, #240874, #241605
1153
  * deliver /var/run/bind/run in lwresd as well.  Closes: #186569
1154
1155
 -- LaMont Jones <lamont@debian.org>  Thu, 22 Apr 2004 12:20:05 -0600
1156
1157
bind9 (1:9.2.3-3) unstable; urgency=low
1158
1159
  * new IP for b.root-servers.net.  Closes: #234278
1160
  * Fix RC linkages to match bind8.  Closes: #218007
1161
1162
 -- LaMont Jones <lamont@debian.org>  Mon,  1 Mar 2004 15:00:44 -0700
1163
1164
bind9 (1:9.2.3-2) unstable; urgency=low
1165
1166
  * Rebuild autoconf files for mips.  Closes: #221419
1167
1168
 -- LaMont Jones <lamont@debian.org>  Tue, 18 Nov 2003 06:33:34 -0700
1169
1170
bind9 (1:9.2.3-1) unstable; urgency=low
1171
1172
  * New upstream.
1173
  * cleanup zones.rfc1918/db.empty stuff.
1174
  * Fix Makefiles to work even if the build environment is unclean.
1175
    Closes: #211503
1176
  * Add comments about root-delegation-only to named.conf.  Closes: #212243
1177
  * Add resolvconf support.  Closes: #199255
1178
  * more SO_BSDCOMPAT hacks for linux.  Closes: #220735, #214460
1179
1180
 -- LaMont Jones <lamont@debian.org>  Mon, 17 Nov 2003 21:30:33 -0700
1181
1182
bind9 (1:9.2.2+9.2.3rc4-1) unstable; urgency=low
1183
1184
  * Yet another new upstream release.
1185
1186
 -- LaMont Jones <lamont@debian.org>  Mon, 22 Sep 2003 09:39:50 -0600
1187
1188
bind9 (1:9.2.2+9.2.3rc3-1) unstable; urgency=low
1189
1190
  * New upstream.  Closes: #211752. #211503. #211496, #211520
1191
1192
 -- LaMont Jones <lamont@debian.org>  Sat, 20 Sep 2003 12:22:59 -0600
1193
1194
bind9 (1:9.2.2+9.2.3rc2-4) unstable; urgency=low
1195
1196
  * Really fix versioned depends.  Closes: #211590
1197
1198
 -- LaMont Jones <lamont@debian.org>  Thu, 18 Sep 2003 17:29:47 -0600
1199
1200
bind9 (1:9.2.2+9.2.3rc2-3) unstable; urgency=low
1201
1202
  * Version depends for all the libraries. sigh.  Closes: #211412,#210293
1203
1204
 -- LaMont Jones <lamont@debian.org>  Wed, 17 Sep 2003 10:56:36 -0600
1205
1206
bind9 (1:9.2.2+9.2.3rc2-2) unstable; urgency=low
1207
1208
  * Need a versioned depend. sigh.
1209
1210
 -- LaMont Jones <lamont@debian.org>  Wed, 17 Sep 2003 10:25:35 -0600
1211
1212
bind9 (1:9.2.2+9.2.3rc2-1) unstable; urgency=low
1213
1214
  * New upstream release.  Closes: #211373
1215
  * Remove RFC's from package, per policy.
1216
  * Make com and net zones delegation-only by default.
1217
1218
 -- LaMont Jones <lamont@debian.org>  Wed, 17 Sep 2003 07:15:37 -0600
1219
1220
bind9 (1:9.2.2+9.2.3rc1-3) unstable; urgency=low
1221
1222
  * A bit more cleanup of descriptions.
1223
  * fix package sections
1224
  * Fix b0rkage with dependencies.
1225
1226
 -- LaMont Jones <lamont@debian.org>  Sun, 14 Sep 2003 09:05:10 -0600
1227
1228
bind9 (1:9.2.2+9.2.3rc1-2) unstable; urgency=low
1229
1230
  * Explicitly link libraries.  Closes: #210653
1231
  * Fix descriptions.  Closes: #209563, #209853, #210063
1232
1233
 -- LaMont Jones <lamont@debian.org>  Sat, 13 Sep 2003 19:29:05 -0600
1234
1235
bind9 (1:9.2.2+9.2.3rc1-1) unstable; urgency=low
1236
1237
  * New upstream release candidate.
1238
  * Quit using SO_BSDCOMPAT (why is it still in the header files??) so
1239
    that the kernel will shut up about it's advertised, obsolete option.
1240
    Closes: #201293, #204282, #205590
1241
1242
 -- LaMont Jones <lamont@debian.org>  Thu, 28 Aug 2003 14:44:28 -0600
1243
1244
bind9 (1:9.2.2-2) unstable; urgency=low
1245
1246
  * Fix libtool.m4. Closes: #183791
1247
  * move lib packages into Section: libs.  Closes: #184788
1248
  * make sure it's libssl0.9.7.  Closes: #182363
1249
  * Add /etc/default/lwresd.  Closes: #169727
1250
  * Add fakeroot dir to dh_shlibdeps.  Closes: #169622
1251
  * Fix rndc manpage.  Closes: #179353
1252
  * Deliver /usr/bin/isc-config.sh (in libbind-dev).  Closes: #178186
1253
1254
 -- LaMont Jones <lamont@debian.org>  Sat, 15 Mar 2003 16:34:15 -0700
1255
1256
bind9 (1:9.2.2-1) unstable; urgency=low
1257
1258
  * New upstream version
1259
  * Document /etc/default/bind9 in init.d script.  Closes: #170267
1260
1261
 -- LaMont Jones <lamont@debian.org>  Tue,  4 Mar 2003 22:43:58 -0700
1262
1263
bind9 (1:9.2.1-7) unstable; urgency=low
1264
1265
  * One more overrides disparity.
1266
  * Fix bashism in postinst.  Closes: #169531
1267
1268
 -- LaMont Jones <lamont@debian.org>  Sun, 17 Nov 2002 19:22:58 -0700
1269
1270
bind9 (1:9.2.1-6) unstable; urgency=low
1271
1272
  * The "I give up for now" release.
1273
  *   Only convert to running as bind if named.conf hasn't been modified.
1274
  *   Closes: #163552, #164352
1275
  * Fix overrides
1276
  * Cleanup README.Debian wrt non-root-by-default.
1277
  * Make sure that /var/run/bind/run exists in init.d script.  Closes: #168912
1278
  * New IP for j.root-servers.net.  Closes: #167818
1279
  * Check for 2.2.18 kernel in preinst.  Closes: #164349
1280
  * Move local options to /etc/default/bind9.  Closes: #169132, #163073
1281
  * Cleanup old bugs (fixed in -5, really).  Closes: #165864
1282
  * Add /etc/bind/named.conf.local, included from named.conf.  Closes: #129576
1283
  * Do options definitions in /etc/bind/named.conf.options, makes life
1284
    easier in the face of named.conf changes from upstream.
1285
  * Add missing Depends: adduser
1286
1287
 -- LaMont Jones <lamont@debian.org>  Sat, 16 Nov 2002 17:05:45 -0700
1288
1289
bind9 (1:9.2.1-5) unstable; urgency=low
1290
1291
  * Run named a non-privileged user by default.  Closes: #149059
1292
1293
 -- LaMont Jones <lamont@debian.org>  Thu, 12 Sep 2002 16:57:37 -0600
1294
1295
bind9 (1:9.2.1-4) unstable; urgency=low
1296
1297
  * swap maintainer/uploader status so LaMont is primary and Bdale is backup
1298
  * Deal with bind/bind9 collisions better.  Closes: #149580
1299
  * Fix some documentation.  Closes: #151579
1300
1301
 -- LaMont Jones <lamont@debian.org>  Wed,  4 Sep 2002 23:25:33 -0600
1302
1303
bind9 (1:9.2.1-3) unstable; urgency=high
1304
1305
  * fold in lib/bind/resolv from 8.3.3 to resolve buffer overlow issue in
1306
    resolver library, closes: #151342, #151431
1307
1308
 -- Bdale Garbee <bdale@gag.com>  Mon,  1 Jul 2002 00:16:31 -0600
1309
1310
bind9 (1:9.2.1-1.woody.1) testing-security woody-proposed-updates; urgency=high
1311
1312
  * backport to woody (simple rebuild) since 9.2.1 resolves a security issue
1313
1314
 -- Bdale Garbee <bdale@gag.com>  Tue,  4 Jun 2002 10:30:57 -0600
1315
1316
bind9 (1:9.2.1-2) unstable; urgency=low
1317
1318
  * don't include nslint man page, closes: #148695
1319
  * fix typo in rndc.8, closes: #139602
1320
  * add a section to README.Debian explaining the rndc key mode that has been
1321
    our default since 9.2.0-2, closes: #129849
1322
  * fix paths for named.conf in named.8 to reflect our default, closes: #143443
1323
  * upstream fixed the nsupdate man page at some point, closes: #121108
1324
1325
 -- Bdale Garbee <bdale@gag.com>  Mon,  3 Jun 2002 15:44:37 -0600
1326
1327
bind9 (1:9.2.1-1) unstable; urgency=medium
1328
1329
  * new upstream version
1330
  * have bind9-host provide host, closes: #140174
1331
  * move bind9-host to priority standard since dnsutils depends on it or host,
1332
    and we prefer bind9-host over host.
1333
  * move libdns5 and libisc4 to priority standard since dnsutils depends on
1334
    them and is priority standard
1335
1336
 -- Bdale Garbee <bdale@gag.com>  Thu, 30 May 2002 10:38:39 -0600
1337
1338
bind9 (1:9.2.0-6) unstable; urgency=low
1339
1340
  * move to US main!  Yippee!  Closes: #123969
1341
  * add info to README.Debian about 2.5 kernels vs --disable-linux-caps
1342
1343
 -- Bdale Garbee <bdale@gag.com>  Sat, 23 Mar 2002 00:18:05 -0700
1344
1345
bind9 (1:9.2.0-5) unstable; urgency=medium
1346
1347
  * clean up various issues in the rules file
1348
  * make bind9-host conflict/replace old dnsutils as host does, otherwise we
1349
    can have problems upgrading from potato to woody, closes: #136686
1350
  * use /dev/urandom for rndc-confgen in postinst, it should be good enough for
1351
    this purpose, and will keep the postinst from blocking arbitrarily.
1352
    closes: #130372
1353
  * add fresh pointers to chroot howto to README.Debian, closes: #135774
1354
1355
 -- Bdale Garbee <bdale@gag.com>  Sun,  3 Mar 2002 16:47:12 -0700
1356
1357
bind9 (1:9.2.0-4) unstable; urgency=low
1358
1359
  * bind9-host needs to conflict with host, closes: #127395
1360
1361
 -- Bdale Garbee <bdale@gag.com>  Tue,  1 Jan 2002 20:12:14 -0700
1362
1363
bind9 (1:9.2.0-3) unstable; urgency=low
1364
1365
  * force removal of old diverted files, closes: #126236
1366
  * change priority of liblwres1 from optional to standard per ftp admins
1367
  * add a bind9-host package so that the 'host' provided with the BIND 9.X
1368
    source tree can be an alternative to the aging NIKHEF version packaged
1369
    separately.  Update dnsutils dependencies to depend on one of the two,
1370
    with preference to this one since it has fewer bugs (but fewer features,
1371
    too).
1372
1373
 -- Bdale Garbee <bdale@gag.com>  Sun, 23 Dec 2001 00:59:15 -0700
1374
1375
bind9 (1:9.2.0-2) unstable; urgency=medium
1376
1377
  * change rc.d links to ensure daemon starts before and stops after other
1378
    daemons that may fail if name service is not working (bug was filed 
1379
    against 8.X bind packages, but is just as relevant here!)
1380
  * use rndc for daemon shutdown instead of start-stop-daemon, closes: #111935
1381
  * add a postinst to dnsutils to remove any lingering diversions from old 
1382
    dnsutils packages, closes: #122227
1383
  * not much point in delivering zone2ldap.1 since we aren't delivering 
1384
    zone2ldap right now (though we might someday?), closes: #124058
1385
  * be more verbose with shared library descriptions, closes: #123426, #123428
1386
  * 9.2.0 added a new rndc.key file that both named and rndc will read to 
1387
    obtain a shared key, and rndc-confgen will easily create this file with 
1388
    a unique-per-system key.  Modify named.conf and remove rndc.conf
1389
    to take advantage of this mechanism and stop delivering a pre-determined 
1390
    static key to all Debian systems (which has been a mild security risk).  
1391
    Create the key in postinst if the key file doesn't already exist, and 
1392
    remove the file in postrm if purging.
1393
    Closes: #86718, #87208
1394
1395
 -- Bdale Garbee <bdale@gag.com>  Fri, 21 Dec 2001 04:04:30 -0700
1396
1397
bind9 (1:9.2.0-1) unstable; urgency=low
1398
1399
  * new upstream version, closes: #108243, #112266, #114250, #119506, #120657
1400
  * /etc/bind/rndc.conf is now a conffile
1401
  * minor hacks to the README.Debian since the chroot instructions it points
1402
    to are 8.X specific, part of addressing bug 111868.
1403
  * libomapi is gone, replaced by libisccc and libisccfg
1404
  * a few lintian-motivated cosmetic cleanups
1405
  * lose task-dns-server meta package, since tasksel doesn't need it now
1406
  * dig problem not reproducible in this version, closes: #89526
1407
  * named-checkconf now uses $sysconfdir, closes: #107835
1408
  * no longer deliver man pages for contributed binaries we're not including
1409
    in dnsutils, closes: #108220
1410
  * fix section in nslookup man page, though that's the least of the man
1411
    page's problems...  glitch reported is unreproducible
1412
    closes: #103630, #120946
1413
  * update libbind-dev README.Debian, closes: #121050
1414
1415
 -- Bdale Garbee <bdale@gag.com>  Tue, 27 Nov 2001 01:41:00 -0700
1416
1417
bind9 (1:9.1.3-1) unstable; urgency=low
1418
1419
  * new upstream version, closes: #96483, #99824, #100647, #101568, #103429
1420
  * update config.sub/guess for hppa/ia64 support
1421
  * small init.d patch from Marco d'Itri to ease adding options on invocation
1422
  * stop having bind9-doc conflict/replace bind-doc since they don't really
1423
    conflict and there's no reason to prevent having both installed at the
1424
    same time, closes: #90994
1425
  * the CHANGES file documents fixes since 9.1.1 that probably cured the
1426
    reported assertion failure.  If it turns out that I'm wrong, the bug can
1427
    be re-opened or a new one filed.  I can't see any way to reproduce the bug 
1428
    in a test case here.  Closes: #99352
1429
  * have libbind-dev depend on the runtime library packages it delivers 
1430
    compile-time symlinks for, closes: #100898, #103855
1431
  * fix lwres man pages to source man3/* instead of * so all the page content
1432
    can actually be found, closes: #85450, #103865
1433
1434
 -- Bdale Garbee <bdale@gag.com>  Mon,  9 Jul 2001 11:30:39 -0600
1435
1436
bind9 (1:9.1.1-1) unstable; urgency=low
1437
1438
  * new upstream release
1439
  * update build-depends for libssl-dev
1440
  * add build-depends on bison, closes: #90150, #90752, #90159
1441
  * split up libbind0 since libdns is changing so numbers
1442
  * downgrade rblcheck from a depends to a suggests, closes: #90783
1443
  * bind9 mkdep creates files in the current working directory, closes: #58353
1444
1445
 -- Bdale Garbee <bdale@gag.com>  Wed, 25 Apr 2001 22:53:21 -0600
1446
1447
bind9 (1:9.1.0-3) unstable; urgency=low
1448
1449
  * merge patch from Zack Weinberg that solves compilation problem, and 
1450
    reduces the memory footprint of applications by making configure.in
1451
    smarter.  Closes: #86776, #86910
1452
  * the bind-doc package includes all relevant documentation from the bind9
1453
    source tree, including HTML content in /usr/share/doc/bind9-doc/arm,
1454
    closes: #85718
1455
  * default named.conf and rndc.conf to not world-readable.  This is an
1456
    interim step towards addressing the concerns about security raised by 
1457
    bugs 86718 and closes: #86836  A better long-term solution would be for
1458
    rndc.conf to allow includes, so that both named.conf and rndc.conf could
1459
    include a key file built on the fly during installation while themselves
1460
    retaining conffile status.  The required functionality has been requested
1461
    of the bind9 upstream, this will limit vulnerability in the meantime.
1462
  * add replaces logic to the dnsutils package to avoid complaints about the
1463
    delivery of nsupdate.8.gz, closes: #86759
1464
  * move a couple of man pages back from dnsutils to bind9 that really belong
1465
    there.  sigh.
1466
1467
 -- Bdale Garbee <bdale@gag.com>  Thu, 22 Feb 2001 16:39:02 -0700
1468
1469
bind9 (1:9.1.0-2) unstable; urgency=low
1470
1471
  * merge patch from Luca Filipozzi <lfilipoz@debian.org> - thanks!
1472
    + bind9:  ships with a working rndc.conf file, closes: #84572
1473
    + bind9:  init.d calls rndc rather than ndc on reload, closes: #85481
1474
    + bind9:  named.conf ships with 'key' and 'control' sections
1475
    + bind9:  correctly creates /var/cache/bind, closes: #85457
1476
    + lwresd: lwresd is split off into its own package, closes: #85627
1477
  * nsupdate is delivered by the dnsutils package, but the (wrong) man page 
1478
    was accidentally also included in the bind9 package, closes: #85717
1479
  * freshen config.sub and config.guess for ia64 and hppa support
1480
1481
 -- Bdale Garbee <bdale@gag.com>  Mon, 12 Feb 2001 23:43:55 -0700
1482
1483
bind9 (1:9.1.0-1) unstable; urgency=low
1484
1485
  * Initial packaging of BIND 9.1.0.  Must use epoch so that meta packages 
1486
    retain their sequencing from the bind 8 package version stream.
1487
  * snarf a couple of man pages from the 8.X tree for now
1488
1489
 -- Bdale Garbee <bdale@gag.com>  Thu,  1 Feb 2001 16:30:35 -0700
1490
1491
++ bind9-9.7.3.dfsg/debian/libdns69.postinst
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/nslookup.1
1
#!/bin/sh
2
3
set -e
4
5
#DEBHELPER#
6
++ bind9-9.7.3.dfsg/debian/nslookup.1
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/db.local
1
.\"
2
.\" ++Copyright++ 1985, 1989
3
.\" -
4
.\" Copyright (c) 1985, 1989
5
.\"    The Regents of the University of California.  All rights reserved.
6
.\" 
7
.\" Redistribution and use in source and binary forms, with or without
8
.\" modification, are permitted provided that the following conditions
9
.\" are met:
10
.\" 1. Redistributions of source code must retain the above copyright
11
.\"    notice, this list of conditions and the following disclaimer.
12
.\" 2. Redistributions in binary form must reproduce the above copyright
13
.\"    notice, this list of conditions and the following disclaimer in the
14
.\"    documentation and/or other materials provided with the distribution.
15
.\" 3. All advertising materials mentioning features or use of this software
16
.\"    must display the following acknowledgement:
17
.\" 	This product includes software developed by the University of
18
.\" 	California, Berkeley and its contributors.
19
.\" 4. Neither the name of the University nor the names of its contributors
20
.\"    may be used to endorse or promote products derived from this software
21
.\"    without specific prior written permission.
22
.\" 
23
.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
24
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
25
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26
.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
27
.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
28
.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29
.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30
.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33
.\" SUCH DAMAGE.
34
.\" -
35
.\" Portions Copyright (c) 1993 by Digital Equipment Corporation.
36
.\" 
37
.\" Permission to use, copy, modify, and distribute this software for any
38
.\" purpose with or without fee is hereby granted, provided that the above
39
.\" copyright notice and this permission notice appear in all copies, and that
40
.\" the name of Digital Equipment Corporation not be used in advertising or
41
.\" publicity pertaining to distribution of the document or software without
42
.\" specific, written prior permission.
43
.\" 
44
.\" THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
45
.\" WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
46
.\" OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
47
.\" CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
48
.\" DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
49
.\" PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
50
.\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
51
.\" SOFTWARE.
52
.\" -
53
.\" --Copyright--
54
.\"
55
.\"	@(#)nslookup.8	5.3 (Berkeley) 6/24/90
56
.\"
57
.Dd June 24, 1990
58
.Dt NSLOOKUP 1
59
.Os BSD 4
60
.Sh NAME
61
.Nm nslookup 
62
.Nd query Internet name servers interactively
63
.Sh SYNOPSIS
64
.Nm nslookup
65
.Op Fl option Ar ...
66
.Op Ar host-to-find | Fl Op Ar server
67
.Sh DESCRIPTION
68
.Ic Nslookup
69
is a program to query Internet domain name servers. 
70
.Ic Nslookup 
71
has two modes: interactive and non-interactive.
72
Interactive mode allows the user to query name servers for
73
information about various hosts and domains or to print a list of hosts 
74
in a domain. 
75
Non-interactive mode is used to print just the name and requested information
76
for a host or domain.
77
.Sh ARGUMENTS
78
Interactive mode is entered in the following cases:
79
.Bl -tag -width "a)  " 
80
.It a)
81
when no arguments are given (the default name server will be used),
82
.It b)
83
when the first argument is a hyphen (-) and the second argument
84
is the host name or Internet address of a name server.
85
.El
86
.Pp
87
Non-interactive mode is used when the name or Internet address 
88
of the host to be looked up
89
is given as the first argument. The optional second argument specifies
90
the host name or address of a name server.
91
.Pp
92
The options listed under the 
93
.Dq Li set 
94
command below can be specified in
95
the 
96
.Pa .nslookuprc 
97
file in the user's home directory if they are listed 
98
one per line.  Options can also be specified
99
on the command line if they precede the arguments and are prefixed with
100
a hyphen.  For example, to change the default query type to host information,
101
and the initial timeout to 10 seconds, type:
102
.Bd -literal -offset indent
103
	nslookup -query=hinfo  -timeout=10
104
.Ed
105
.Sh INTERACTIVE COMMANDS
106
Commands may be interrupted at any time by typing a control-C.
107
To exit, type a control-D 
108
.Pq Dv EOF 
109
or type 
110
.Li exit .
111
The command line length must be less than 256 characters.
112
To treat a built-in command as a host name, 
113
precede it with an escape character 
114
.Pq .&\\ . 
115
.Sy N.B.:  An unrecognized command will be interpreted as a host name.
116
.Bl -tag -width "lserver" 
117
.It Ar host Op Ar server
118
Look up information for 
119
.Ar host 
120
using the current default server or using 
121
.Ar server , 
122
if specified.
123
If 
124
.Ar host 
125
is an Internet address and the query type is 
126
.Dv A 
127
or 
128
.Dv PTR , 
129
the name of the host is returned.
130
If 
131
.Ar host 
132
is a name and does not have a trailing period, the default 
133
domain name is appended to the name.  (This behavior depends on the state of the
134
.Ic set
135
options 
136
.Ic domain , srchlist , defname , 
137
and 
138
.Ic search . )
139
.Pp
140
To look up a host not in the current domain, append a period to 
141
the name.
142
.It Ic server Ar domain
143
.It Ic lserver Ar domain
144
Change the default server to 
145
.Ar domain ; 
146
.Ic lserver 
147
uses the initial server to look up information about 
148
.Ar domain ,
149
while 
150
.Ic server
151
uses the current default server. 
152
If an authoritative answer can't be found, the names of servers
153
that might have the answer are returned.
154
.It Ic root
155
Changes the default server to the server for the root of the domain name space.
156
Currently, the host 
157
.Li ns.internic.net 
158
is used.
159
(This command is a synonym for 
160
.Dq Ic lserver ns.internic.net . )
161
The name of the root server can be changed with the 
162
.Dq Ic set root 
163
command.
164
.It Xo Ic finger Op Ar name 
165
.Op Ic > Ar filename
166
.Xc
167
.It Xo Ic finger Op Ar name 
168
.Op Ic >> Ar filename
169
.Xc
170
Connects with the finger server on the current host. 
171
The current host is defined when a previous lookup for a host
172
was successful and returned address information (see the 
173
.Dq Ic set querytype=A 
174
command).
175
The 
176
.Ar name 
177
is optional. 
178
.Ic > 
179
and 
180
.Ic >> 
181
can be used to redirect output in the usual manner.
182
.It Xo Ic ls Op Ar option 
183
.Ar domain Op Ic > Ar filename
184
.Xc
185
.It Xo Ic ls Op Ar option 
186
.Ar domain Op Ic >> Ar filename
187
.Xc
188
List the information available for 
189
.Ar domain , 
190
optionally creating or appending to 
191
.Ar filename .
192
The default output contains host names and their Internet addresses. 
193
.Ar Option 
194
can be one of the following:
195
.Bl -tag -width "-a  "
196
.It Fl t Ar querytype
197
lists all records of the specified type (see 
198
.Ar querytype 
199
below).
200
.It Fl a
201
lists aliases of hosts in the domain;
202
synonym for 
203
.Dq Fl t Dv CNAME .
204
.It Fl d
205
lists all records for the domain;
206
synonym for 
207
.Dq Fl t Dv ANY .
208
.It Fl h
209
lists CPU and operating system information for the domain;
210
synonym for 
211
.Dq Fl t Dv HINFO .
212
.It Fl s
213
lists well-known services of hosts in the domain;
214
synonym for 
215
.Dq Fl t Dv WKS .
216
.El
217
.Pp
218
When output is directed to a file, hash marks are printed for every
219
50 records received from the server.
220
.It Ic view Ar filename
221
Sorts and lists the output of previous 
222
.Ic ls 
223
command(s) with 
224
.Xr more @CMD_EXT@ .
225
.It Ic help
226
.It Ic ?
227
Prints a brief summary of commands.
228
.It Ic exit
229
Exits the program.
230
.It Xo Ic set Ar keyword 
231
.Ns Op = Ns Ar value
232
.Xc
233
This command is used to change state information that affects the lookups.
234
Valid keywords are:
235
.Bl -tag -width "class=v"
236
.It Ic all
237
Prints the current values of the frequently-used options to 
238
.Ic set .
239
Information about the  current default server and host is also printed.
240
.It Ic class= Ns Ar value
241
Change the query class to one of:
242
.Bl -tag -width "HESIOD  "
243
.It Dv IN
244
the Internet class
245
.It Dv CHAOS
246
the Chaos class
247
.It Dv HESIOD
248
the MIT Athena Hesiod class
249
.It Dv ANY
250
wildcard (any of the above)
251
.El
252
.Pp
253
The class specifies the protocol group of the information.
254
.Pp
255
(Default = 
256
.Dv IN ; 
257
abbreviation = 
258
.Ic cl )
259
.It Xo Op Ic no 
260
.Ns Ic debug
261
.Xc
262
Turn debugging mode on.  A lot more information is printed about the
263
packet sent to the server and the resulting answer.
264
.Pp
265
(Default = 
266
.Ic nodebug ; 
267
abbreviation = 
268
.Xo Op Ic no
269
.Ns Ic deb )
270
.Xc
271
.It Xo Op Ic no 
272
.Ns Ic d2
273
.Xc
274
Turn exhaustive debugging mode on.
275
Essentially all fields of every packet are printed.
276
.Pp
277
(Default = 
278
.Ic nod2 )
279
.It Ic domain= Ns Ar name
280
Change the default domain name to 
281
.Ar name . 
282
The default domain name is appended to a lookup request depending on the
283
state of the 
284
.Ic defname 
285
and 
286
.Ic search 
287
options.
288
The domain search list contains the parents of the default domain if it has 
289
at least two components in its name. 
290
For example, if the default domain
291
is CC.Berkeley.EDU, the search list is CC.Berkeley.EDU and Berkeley.EDU.
292
Use the 
293
.Dq Ic set srchlist 
294
command to specify a different list.
295
Use the 
296
.Dq Ic set all 
297
command to display the list.
298
.Pp
299
(Default = value from 
300
.Xr hostname @CMD_EXT@ , 
301
.Pa /etc/resolv.conf ,
302
or 
303
.Ev LOCALDOMAIN;
304
abbreviation = 
305
.Ic do )
306
.It Ic srchlist= Ns Ar name1/name2/...
307
Change the default domain name to 
308
.Ar name1 
309
and the domain search list
310
to 
311
.Ar name1 , name2 , 
312
etc.  A maximum of 6 names separated by slashes (/)
313
can be specified.
314
For example,
315
.Bd -literal -offset indent
316
set srchlist=lcs.MIT.EDU/ai.MIT.EDU/MIT.EDU
317
.Ed
318
.Pp
319
sets the domain to lcs.MIT.EDU and the search list to the three names.
320
This command overrides the
321
default domain name and search list of the 
322
.Dq Ic set domain 
323
command.
324
Use the 
325
.Dq Ic set all 
326
command to display the list.
327
.Pp
328
(Default = value based on 
329
.Xr hostname @CMD_EXT@ , 
330
.Pa /etc/resolv.conf ,
331
or 
332
.Ev LOCALDOMAIN;
333
abbreviation = 
334
.Ic srchl )
335
.It Xo Op Ic no
336
.Ns Ic defname
337
.Xc
338
If set, append the default domain name to a single-component lookup request 
339
(i.e., one that does not contain a period).
340
.Pp
341
(Default = 
342
.Ic defname ; 
343
abbreviation = 
344
.Xo Op Ic no
345
.Ns Ic defname )
346
.Xc
347
.It Xo Op Ic no 
348
.Ns Ic search
349
.Xc
350
If the lookup request contains at least one period but 
351
.Em doesn't 
352
end with a trailing period, append the domain names in the domain search list
353
to the request until an answer is received.
354
.Pp
355
(Default = 
356
.Ic search ; 
357
abbreviation = 
358
.Xo Op Ic no 
359
.Ns Ic sea )
360
.Xc
361
.It Ic port= Ns Ar value
362
Change the default TCP/UDP name server port to 
363
.Ar value .
364
.Pp
365
(Default = 53; 
366
abbreviation = 
367
.Ic \&po )
368
.It Ic querytype= Ns Ar value
369
.It Ic type= Ns Ar value
370
Change the type of information query to one of:
371
.Bl -tag -width "HINFO   "
372
.It Dv A
373
the host's Internet address.
374
.It Dv CNAME
375
the canonical name for an alias.
376
.It Dv HINFO
377
the host CPU and operating system type.
378
.It Dv MINFO
379
the mailbox or mail list information.
380
.It Dv MX
381
the mail exchanger.
382
.It Dv NS
383
the name server for the named zone.
384
.It Dv PTR
385
the host name if the query is an Internet address;
386
otherwise, the pointer to other information.
387
.It Dv SOA
388
the domain's 
389
.Dq start-of-authority 
390
information.
391
.It Dv TXT
392
the text information.
393
.It Dv UINFO
394
the user information.
395
.It Dv WKS
396
the supported well-known services.
397
.El
398
.Pp
399
Other types 
400
.Pq Dv ANY, AXFR, MB, MD, MF, NULL 
401
are described in the RFC-1035 document.
402
.Pp
403
(Default = 
404
.Dv A ; 
405
abbreviations = 
406
.Ic q , ty )
407
.It Xo Op Ic no
408
.Ns Ic recurse
409
.Xc
410
Tell the name server to query other servers if it does not have the
411
information.
412
.Pp
413
(Default = 
414
.Ic recurse ; 
415
abbreviation =
416
.Xo Op Ic no
417
.Ns Ic rec )
418
.Xc
419
.It Ic retry= Ns Ar number
420
Set the number of retries to 
421
.Ar number .
422
When a reply to a request is not received within a certain 
423
amount of time (changed with 
424
.Dq Ic set timeout ) , 
425
the timeout period is doubled and the request is resent. 
426
The retry value controls how many times a request is resent before giving up.
427
.Pp
428
(Default = 4, abbreviation = 
429
.Ic ret )
430
.It Ic root= Ns Ar host
431
Change the name of the root server to 
432
.Ar host . 
433
This affects the 
434
.Dq Ic root 
435
command. 
436
.Pp
437
(Default = 
438
.Ic ns.internic.net. ;
439
abbreviation = 
440
.Ic ro )
441
.It Ic timeout= Ns Ar number
442
Change the initial timeout interval for waiting for a reply to 
443
.Ar number 
444
seconds. Each retry doubles the timeout period.
445
.Pp
446
(Default = 5 seconds; abbreviation = 
447
.Ic ti )
448
.It Xo Op Ic no
449
.Ns Ic vc
450
.Xc
451
Always use a virtual circuit when sending requests to the server.
452
.Pp
453
(Default = 
454
.Ic novc ; 
455
abbreviation = 
456
.Xo Op Ic no
457
.Ns Ic v )
458
.Xc
459
.It Xo Op Ic no
460
.Ns Ic ignoretc
461
.Xc 
462
Ignore packet truncation errors.
463
.Pp
464
(Default = 
465
.Ic noignoretc ; 
466
abbreviation = 
467
.Xo Op Ic no
468
.Ns Ic ig )
469
.Xc 
470
.El
471
.El
472
.Sh DIAGNOSTICS
473
If the lookup request was not successful, an error message is printed.
474
Possible errors are:
475
.Bl -tag -width "Timed"
476
.It Li Timed out
477
The server did not respond to a request after a certain amount of
478
time (changed with 
479
.Dq Ic set timeout= Ns Ar value ) 
480
and a certain number of retries (changed with 
481
.Dq Ic set retry= Ns Ar value ) .
482
.It Li \&No response from server
483
No name server is running on the server machine.
484
.It Li \&No records
485
The server does not have resource records of the current query type for the
486
host, although the host name is valid.
487
The query type is specified with the 
488
.Dq Ic set querytype 
489
command.
490
.It Li Non-existent domain
491
The host or domain name does not exist.
492
.It Li Connection refused
493
.It Li Network is unreachable
494
The connection to the name or finger server could not be made 
495
at the current time.
496
This error commonly occurs with 
497
.Ic ls 
498
and 
499
.Ic finger 
500
requests. 
501
.It Li Server failure
502
The name server found an internal inconsistency in its database
503
and could not return a valid answer.
504
.It Li Refused
505
The name server refused to service the request.
506
.It Li Format error
507
The name server found that the request packet was not in the proper format.
508
It may indicate an error in 
509
.Nm nslookup .
510
.El
511
.Sh FILES
512
.Bl -tag -width "/usr/share/misc/nslookup.helpXXX" -compact
513
.It Pa /etc/resolv.conf
514
initial domain name and name server addresses
515
.It Pa $HOME/.nslookuprc
516
user's initial options
517
.It Pa /usr/share/misc/nslookup.help
518
summary of commands
519
.El
520
.Sh ENVIRONMENT
521
.Bl -tag -width "HOSTALIASESXXXX" -compact
522
.It Ev HOSTALIASES
523
file containing host aliases
524
.It Ev LOCALDOMAIN
525
overrides default domain
526
.El
527
.Sh SEE ALSO
528
.Xr @INDOT@named @SYS_OPS_EXT@ ,
529
.Xr resolver @LIB_NETWORK_EXT@ , 
530
.Xr resolver @FORMAT_EXT@ ;
531
RFC-1034,
532
.Dq Domain Names - Concepts and Facilities ;
533
RFC-1035,
534
.Dq Domain Names - Implementation and Specification .
535
.Sh AUTHOR
536
Andrew Cherenson
537
++ bind9-9.7.3.dfsg/debian/db.local
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9utils.install
1
;
2
; BIND data file for local loopback interface
3
;
4
$TTL	604800
5
@	IN	SOA	localhost. root.localhost. (
6
			      2		; Serial
7
			 604800		; Refresh
8
			  86400		; Retry
9
			2419200		; Expire
10
			 604800 )	; Negative Cache TTL
11
;
12
@	IN	NS	localhost.
13
@	IN	A	127.0.0.1
14
@	IN	AAAA	::1
15
++ bind9-9.7.3.dfsg/debian/bind9utils.install
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9.ufw.profile
1
usr/sbin/dnssec-keygen
2
usr/sbin/dnssec-signzone
3
usr/sbin/named-checkconf
4
usr/sbin/named-checkzone
5
usr/sbin/named-compilezone
6
usr/sbin/rndc
7
usr/sbin/rndc-confgen
8
usr/share/man/man8/dnssec-keygen.8
9
usr/share/man/man8/dnssec-signzone.8
10
usr/share/man/man8/named-checkconf.8
11
usr/share/man/man8/named-checkzone.8
12
usr/share/man/man8/named-compilezone.8
13
usr/share/man/man8/rndc-confgen.8
14
usr/share/man/man8/rndc.8
15
++ bind9-9.7.3.dfsg/debian/bind9.ufw.profile
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/liblwres60.install
1
[Bind9]
2
title=Internet Domain Name Server
3
description=The Berkeley Internet Name Domain (BIND) implements an Internet domain name server.
4
ports=53
5
6
++ bind9-9.7.3.dfsg/debian/liblwres60.install
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/ip-down.d
1
usr/lib/liblwres.so.60*
2
++ bind9-9.7.3.dfsg/debian/ip-down.d
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/libisc62.postinst
1
#!/bin/sh -e
2
# Called when an interface disconnects
3
# Written by LaMont Jones <lamont@debian.org>
4
5
# kick named as needed
6
7
# If /usr isn't mounted yet, silently bail.
8
if [ ! -d /usr/sbin ]; then
9
	exit 0
10
fi
11
12
# if named is running, reconfig it.
13
rndc reconfig >/dev/null 2>&1 || true
14
15
exit 0
16
++ bind9-9.7.3.dfsg/debian/libisc62.postinst
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9-doc.dirs
1
#!/bin/sh
2
3
set -e
4
5
#DEBHELPER#
6
++ bind9-9.7.3.dfsg/debian/bind9-doc.dirs
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/libisccfg62.postinst
1
usr/share/doc/bind9-doc/arm
2
++ bind9-9.7.3.dfsg/debian/libisccfg62.postinst
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9-host.dirs
1
#!/bin/sh
2
3
set -e
4
5
#DEBHELPER#
6
++ bind9-9.7.3.dfsg/debian/bind9-host.dirs
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/liblwres60.postinst
1
usr/bin
2
usr/share/man/man1
3
++ bind9-9.7.3.dfsg/debian/liblwres60.postinst
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9.preinst
1
#!/bin/sh
2
3
set -e
4
5
#DEBHELPER#
6
++ bind9-9.7.3.dfsg/debian/bind9.preinst
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/libisccc60.install
1
#!/bin/sh
2
# pre install script for the Debian bind9 package
3
4
set -e
5
6
# Check if we are upgrading while running a kernel before 2.2.18. If so abort
7
# immediately since we don't support those kernels anymore.
8
if [ "$1" = "upgrade" ] && dpkg --compare-versions "`uname -r`" lt 2.2.18 ; then
9
        cat <<EOF
10
ERROR: you are running a pre-2.2.18 kernel on this machine. Recent
11
versions of bind9 no longer support those kernels.
12
To prevent breaking nameservices on this system bind9 upgrade will abort.
13
EOF
14
        exit 1
15
fi
16
17
APP_PROFILE="usr.sbin.named"
18
APP_CONFFILE="/etc/apparmor.d/$APP_PROFILE"
19
APP_COMPLAIN="/etc/apparmor.d/force-complain/$APP_PROFILE"
20
if [ "$1" = "upgrade" ]; then
21
    mkdir -p `dirname $APP_COMPLAIN` 2>/dev/null || true
22
    if dpkg --compare-versions $2 lt 1:9.3.4-2ubuntu2 ; then
23
        # force-complain for pre-apparmor upgrades
24
        ln -sf $APP_CONFFILE $APP_COMPLAIN
25
    elif dpkg --compare-versions $2 lt 1:9.4.2-3ubuntu1 ; then
26
        if [ -e "$APP_CONFFILE" ]; then
27
            md5sum="`md5sum \"$APP_CONFFILE\" | sed -e \"s/ .*//\"`"
28
            pkg_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $APP_CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
29
            if [ "$md5sum" = "$pkg_md5sum" ]; then
30
		# force-complain when upgrade from pre-shipped profile and an existing
31
                # profile is same as in conffiles
32
                ln -sf $APP_CONFFILE $APP_COMPLAIN
33
            fi
34
        else
35
            # force-complain on upgrade from pre-shipped profile and
36
            # there is no existing profile
37
            ln -sf $APP_CONFFILE $APP_COMPLAIN
38
        fi
39
    fi
40
fi
41
42
43
#DEBHELPER#
44
exit 0
45
++ bind9-9.7.3.dfsg/debian/libisccc60.install
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/libbind-dev.dirs
1
usr/lib/libisccc.so.60*
2
++ bind9-9.7.3.dfsg/debian/libbind-dev.dirs
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/copyright
1
usr/include
2
usr/lib
3
++ bind9-9.7.3.dfsg/debian/copyright
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9-doc.docs
1
This package was debianized by Bdale Garbee <bdale@gag.com> on
2
Tue, 12 Dec 2000 02:42:56 -0700.
3
4
It was downloaded from http://www.isc.org/products/BIND/ and can be fetched
5
from git with:
6
    git clone git://git.debian.org/users/lamont/bind9.git
7
ISC releases can be cloned from git with:
8
    git clone git://git.debian.org/users/lamont/bind9-isc.git
9
10
Upstream Author: Internet Systems Consortium, Inc. ("ISC")
11
12
Copyright:
13
14
Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
15
Copyright (C) 1996-2003  Internet Software Consortium.
16
17
Permission to use, copy, modify, and/or distribute this software for any
18
purpose with or without fee is hereby granted, provided that the above
19
copyright notice and this permission notice appear in all copies.
20
21
THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
22
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
23
AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
24
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
25
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
26
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
27
PERFORMANCE OF THIS SOFTWARE.
28
29
Portions Copyright (C) 1996-2001  Nominum, Inc.
30
31
Permission to use, copy, modify, and distribute this software for any
32
purpose with or without fee is hereby granted, provided that the above
33
copyright notice and this permission notice appear in all copies.
34
35
THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
36
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
37
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
38
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
39
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
40
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
41
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
42
43
Portions Copyright (c) 2000 Japan Network Information Center.  All rights reserved.
44
 
45
By using this file, you agree to the terms and conditions set forth bellow.
46
47
			LICENSE TERMS AND CONDITIONS 
48
49
The following License Terms and Conditions apply, unless a different
50
license is obtained from Japan Network Information Center ("JPNIC"),
51
a Japanese association, Kokusai-Kougyou-Kanda Bldg 6F, 2-3-4 Uchi-Kanda,
52
Chiyoda-ku, Tokyo 101-0047, Japan.
53
54
1. Use, Modification and Redistribution (including distribution of any
55
   modified or derived work) in source and/or binary forms is permitted
56
   under this License Terms and Conditions.
57
58
2. Redistribution of source code must retain the copyright notices as they
59
   appear in each source code file, this License Terms and Conditions.
60
61
3. Redistribution in binary form must reproduce the Copyright Notice,
62
   this License Terms and Conditions, in the documentation and/or other
63
   materials provided with the distribution.  For the purposes of binary
64
   distribution the "Copyright Notice" refers to the following language:
65
   "Copyright (c) 2000-2002 Japan Network Information Center.  All rights reserved."
66
67
4. The name of JPNIC may not be used to endorse or promote products
68
   derived from this Software without specific prior written approval of
69
   JPNIC.
70
71
5. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY JPNIC
72
   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
73
   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
74
   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL JPNIC BE LIABLE
75
   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
76
   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
77
   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
78
   BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
79
   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
80
   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
81
   ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
82
83
Portions Copyright (c) 2005 - 2008, Holger Zuleger HZnet. All rights reserved.
84
85
This software is open source.
86
87
Redistribution and use in source and binary forms, with or without
88
modification, are permitted provided that the following conditions
89
are met:
90
91
Redistributions of source code must retain the above copyright notice,
92
this list of conditions and the following disclaimer.
93
94
Redistributions in binary form must reproduce the above copyright notice,
95
this list of conditions and the following disclaimer in the documentation
96
and/or other materials provided with the distribution.
97
98
Neither the name of Holger Zuleger HZnet nor the names of its contributors may
99
be used to endorse or promote products derived from this software without
100
specific prior written permission.
101
102
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
103
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
104
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
105
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
106
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
107
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
108
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
109
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
110
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
111
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
112
POSSIBILITY OF SUCH DAMAGE.
113
114
Portions Copyright(C) Jason Vas Dias, Red Hat Inc., 2005
115
Modified by Adam Tkac, Red Hat Inc., 2007
116
117
This program is free software; you can redistribute it and/or modify
118
it under the terms of the GNU General Public License as published by
119
the Free Software Foundation at 
120
         http://www.fsf.org/licensing/licenses/gpl.txt
121
and found in /usr/share/common-licenses.
122
++ bind9-9.7.3.dfsg/debian/bind9-doc.docs
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/lwresd.postinst
1
doc/misc
2
++ bind9-9.7.3.dfsg/debian/lwresd.postinst
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9utils.dirs
1
#!/bin/sh
2
set -e
3
4
#DEBHELPER#
5
6
case "$1" in
7
    configure)
8
	OLDVERSION="$2"
9
	# see below
10
	;;
11
12
    abort-upgrade)
13
	exit 0
14
	;;
15
16
    abort-remove|abort-deconfigure)
17
	exit 0
18
	;;
19
20
    *)
21
	echo "postinst called with unknown argument \`$1'" >&2
22
	exit 1
23
	;;
24
esac
25
26
# lets give them a bind user/group in all cases.
27
getent group bind >/dev/null 2>&1 || addgroup --system bind
28
getent passwd bind >/dev/null 2>&1 ||
29
    adduser --system --home /var/cache/bind --no-create-home \
30
	    --disabled-password --ingroup bind bind
31
32
if [ ! -s /etc/bind/rndc.key ] && [ -x /usr/sbin/rndc-confgen ]; then
33
    /usr/sbin/rndc-confgen -r /dev/urandom -a
34
fi
35
36
if /bin/pidof /usr/sbin/lwresd >/dev/null 2>&1; then
37
    invoke-rc.d lwresd restart
38
else
39
    invoke-rc.d lwresd start
40
fi
41
++ bind9-9.7.3.dfsg/debian/bind9utils.dirs
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/README.Debian
1
usr
2
usr/sbin
3
usr/share/man/man8
4
++ bind9-9.7.3.dfsg/debian/README.Debian
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/libisccfg62.install
1
Upgrading from BIND 8.X:
2
-----------------------
3
4
If you are upgrading an authoritative server from BIND 8.X, please install
5
the bind9-doc package and read /usr/share/doc/bind9-doc/misc/migration.gz,
6
which contains a set of notes from the BIND maintainers on what changed
7
that is likely to need your attention during an upgrade.
8
9
10
Upgrading from earlier bind9 packages:
11
-------------------------------------
12
13
If you installed an early version of the Debian bind9 packages, prior to 
14
version 1:9.2.0-2 to be more precise, you may have an /etc/bind/rndc.conf 
15
configuration file still on your system.  There's nothing wrong with that,
16
and if you've explicitly configured keys for using rndc you may well want to
17
leave things exactly as they are!
18
19
However, since 9.2.0 BIND 9.X has supported an rndc.key file that both named
20
and rndc will read to obtain a shared key for rndc use against a daemon on 
21
the same host.  The rndc-confgen program will easily create a suitable key
22
file.  To take advantage of this mechanism, you may want to:
23
24
	remove the /etc/bind/rndc.conf file
25
	remove the rndc key specification in the /etc/bind/named.conf file
26
27
	rndc-confgen -r /dev/urandom -a
28
29
Alternatively, you can 'purge' the bind9 packages and reinstall them and you
30
will end up with the new behavior since it is now the default.
31
32
This is more secure than using a static key that isn't generated on a per-host
33
basis, and is an easy alternative to more complex key schemes if you only need
34
to use rndc to talk to named on the same host.
35
36
37
Known Issues:
38
------------
39
40
I've had a report that lwresd, at least, fails to work with some recent 2.5
41
kernels.  If you see something in your logs like 
42
43
	loading configuration from '/etc/bind/lwresd.conf'
44
	none:0: open: /etc/bind/lwresd.conf: permission denied
45
46
Try rebuilding with --disable-linux-caps added to the configure call in the 
47
rules file.  I'm hoping this is a temporary problem in the 2.5 kernel series,
48
but we'll see.
49
50
51
Configuration Schema:
52
--------------------
53
54
The Debian BIND package ships with a config that will work for the majority 
55
of leaf servers with no user input required.
56
57
The named configuration file named.conf is located in /etc/bind, so that all 
58
static configuration files relating to bind are in one place.  If you really 
59
really don't want named.conf in /etc/bind, then the best way to handle it is 
60
probably to replace /etc/bind/named.conf with a symlink to the location you 
61
want to use.  You could also use an option to named in the init.d script,
62
but that only works for named, not for things like ndc.
63
64
Zone data files for the root servers, and the forward and reverse localhost
65
zones are also provided in /etc/bind.
66
67
The working directory for named is now /var/cache/bind.  Thus, any transient
68
files generated by named, such as database files for zones the daemon is
69
secondary for, will be written to the /var filesystem, where they belong.
70
71
To make this work, the named.conf provided uses explicitly fully-qualified
72
pathnames to reference the files in /etc/bind. 
73
74
Unlike previous BIND packages for Debian, the named.conf and provided db.*
75
files are tagged as conffiles.  Thus, if you just want a "caching mostly"
76
server configuration for a server that does not need to be authoritative for
77
anything else, you can run the provided configuration as-is.  If you want to
78
hack on named.conf, or even the init.d fragment, you can feel free to.  Future
79
package upgrades will treat your configuration changes sanely, as all Debian
80
packages should.
81
82
While you are free to craft whatever structure you wish for servers which need
83
to be authoritative for additional zones, what we suggest is that you put the
84
db files for any zones you are master for in /etc/bind (perhaps even in a
85
subdirectory structure depending on complexity), using full pathnames in the
86
named.conf file.  Any zones you are secondary for should be configured in
87
named.conf with simple filenames (relative to /var/cache/bind), so the data
88
files will be stored in BIND's working directory (defaults to /var/cache/bind).
89
Zones subject to automatic updates (such as via DHCP and/or nsupdate) should be
90
stored in /var/lib/bind, and specified with full pathnames.
91
92
93
Running Chroot'ed:
94
-----------------
95
96
Several users have asked for Debian BIND to run in a "chroot jail".  There are
97
various issues associated with making this the default configuration for the
98
package in Debian.  In the meantime, reasonable instructions on how to do
99
this yourself are available on the web from:
100
101
	http://www.tldp.org/HOWTO/Chroot-BIND-HOWTO.html
102
103
104
Running Non-Root:
105
-----------------
106
107
Recent versions of named can be invoked with options that specify a non-root
108
user and/or group for named.  Read the named man page for more information.
109
Note that when running named as a user other than root, it will not be able
110
to find new interfaces that appear dynamically, such as during a PCMCIA card
111
insertion, or if you're running some flavors of IPSEC and/or IP over IP
112
tunnels.  If you cannot live with those limitations, feel free to edit the
113
/etc/init.d/bind9 script to change the invocation of named.
114
115
The default is now to run as the user 'bind' (which is automatically created
116
in the group 'bind', if it doesn't exist), unless named.conf has been changed.
117
To change this, edit /etc/default/bind9
118
119
Please note that 'ndc restart' doesn't honor all the original command line
120
options to named, so we explicitly don't use it in the init.d script provided
121
with the package, and you should be careful about using it if you decide to
122
run named non-root.
123
124
125
PPP Control Script:
126
-----------------
127
128
Unfortunately, 'ndc reload' will not honor any command line options that were 
129
fed to named on the initial invocation.  If you can live with that, and
130
want to wiggle your DNS configuration when your PPP link goes up or down, the
131
following script fragment from Francesco Potorti` <pot@gnu.org> may be helpful
132
to you:
133
   
134
   I suggest adding this as bot /etc/ppp/ip-up.d/bind and
135
   /etc/ppp/ip-down.d/bind:
136
   
137
   ================================================================
138
   #!/bin/sh
139
   if [ -x /usr/sbin/ndc -a -x /usr/sbin/named ]
140
   then
141
           /usr/sbin/ndc reload > /dev/null
142
   fi
143
   ================================================================
144
   
145
   This should cause no harm in any case, and should be helpful in these
146
   cases:
147
   - you configure bind as a forwarder.  When ppp is down, it cannot access
148
     the network.  As soon as ppp is up, it is forced by the script to try
149
     again, and it succeeds.
150
   - someone writes a clever script that, coupled with the `usepeerdns'
151
     command of pppd, makes a forwarding-only bind use the right servers by
152
     rewriting the configuration file after ppp goes up.  Then the script
153
     above makes bind reload the configuration.
154
   
155
   Now, someone should write that clever script :-)
156
   
157
   By the way, this is a  badly wanted feature, that should help setting up
158
   a ppp connection automatically.   Currently, setting up a ppp connection
159
   is much easier on a windows system than on linux, and there is really no
160
   reason why it should be so, given that all the tools are there.
161
162
163
Apparmor Profile
164
----------------
165
If your system uses apparmor, please note that the shipped enforcing profile
166
works with the default installation, and changes in your configuration may
167
require changes to the installed apparmor profile. Please see
168
https://wiki.ubuntu.com/DebuggingApparmor before filing a bug against this
169
software.
170
++ bind9-9.7.3.dfsg/debian/libisccfg62.install
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/dnsutils.postinst
1
usr/lib/libisccfg.so.62*
2
++ bind9-9.7.3.dfsg/debian/dnsutils.postinst
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/db.0
1
#!/bin/sh
2
3
set -e
4
5
#DEBHELPER#
6
++ bind9-9.7.3.dfsg/debian/db.0
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/apparmor-profile
1
;
2
; BIND reverse data file for broadcast zone
3
;
4
$TTL	604800
5
@	IN	SOA	localhost. root.localhost. (
6
			      1		; Serial
7
			 604800		; Refresh
8
			  86400		; Retry
9
			2419200		; Expire
10
			 604800 )	; Negative Cache TTL
11
;
12
@	IN	NS	localhost.
13
++ bind9-9.7.3.dfsg/debian/apparmor-profile
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/libbind9-60.postinst
1
# vim:syntax=apparmor
2
# Last Modified: Fri Jun  1 16:43:22 2007
3
#include <tunables/global>
4
5
/usr/sbin/named {
6
  #include <abstractions/base>
7
  #include <abstractions/nameservice>
8
9
  capability net_bind_service,
10
  capability setgid,
11
  capability setuid,
12
  capability sys_chroot,
13
  capability sys_resource,
14
15
  # /etc/bind should be read-only for bind
16
  # /var/lib/bind is for dynamically updated zone (and journal) files.
17
  # /var/cache/bind is for slave/stub data, since we're not the origin of it.
18
  # See /usr/share/doc/bind9/README.Debian.gz
19
  /etc/bind/** r,
20
  /var/lib/bind/** rw,
21
  /var/lib/bind/ rw,
22
  /var/cache/bind/** rw,
23
  /var/cache/bind/ rw,
24
25
  # gssapi
26
  /etc/krb5.keytab kr,
27
  /etc/bind/krb5.keytab kr,
28
29
  # ssl
30
  /etc/ssl/openssl.cnf r,
31
32
  # dnscvsutil package
33
  /var/lib/dnscvsutil/compiled/** rw,
34
35
  /proc/net/if_inet6 r,
36
  /proc/*/net/if_inet6 r,
37
  /usr/sbin/named mr,
38
  /var/run/named/named.pid w,
39
  /var/run/named/session.key w,
40
  # support for resolvconf
41
  /var/run/named/named.options r,
42
43
  # some people like to put logs in /var/log/named/ instead of having
44
  # syslog do the heavy lifting.
45
  /var/log/named/** rw,
46
  /var/log/named/ rw,
47
}
48
++ bind9-9.7.3.dfsg/debian/libbind9-60.postinst
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/bind9.docs
1
#!/bin/sh
2
3
set -e
4
5
#DEBHELPER#
6
++ bind9-9.7.3.dfsg/debian/bind9.docs
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/da.po
1
FAQ
2
README
3
++ bind9-9.7.3.dfsg/debian/po/da.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/pt_BR.po
1
# Danish translation bind9.
2
# Copyright (C) 2010 bind9 & Joe Hansen.
3
# This file is distributed under the same license as the bind9 package.
4
# Joe Hansen <joedalton2@yahoo.dk>, 2010.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bind9\n"
9
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
10
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
11
"PO-Revision-Date: 2010-10-07 17:30+01:00\n"
12
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
13
"Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
18
#. Type: string
19
#. Description
20
#: ../templates:1001
21
msgid "User account for running the BIND9 daemon:"
22
msgstr "Brugerkonto til k??rsel af BIND9-d??monen:"
23
24
#. Type: string
25
#. Description
26
#: ../templates:1001
27
msgid ""
28
"The default is to run the BIND9 daemon (named) under the 'bind' user "
29
"account. To use a different account, please enter the appropriate username."
30
msgstr ""
31
"Standarden er at k??re BIND9-d??monen (navngivet) under brugerkontoen ??bind??. "
32
"For at bruge en anden konto, s?? indtast venligst et passende brugernavn."
33
34
#. Type: string
35
#. Description
36
#: ../templates:2001
37
msgid "Other startup options for named:"
38
msgstr "Andre opstartsindstillinger for navngivet:"
39
40
#. Type: string
41
#. Description
42
#: ../templates:2001
43
msgid ""
44
"Please provide any additional options (other than username) that should be "
45
"passed to the BIND9 daemon (named) on startup."
46
msgstr ""
47
"Angiv venligst eventuelle yderligere indstillinger (udover brugernavnet) som "
48
"skal videresendes til BIND9-d??monen (navngivet) ved opstart."
49
50
#. Type: boolean
51
#. Description
52
#: ../templates:3001
53
msgid "Should resolv.conf settings be overridden?"
54
msgstr "Skal ops??tningen af resolv.conf overskrives?"
55
56
#. Type: boolean
57
#. Description
58
#: ../templates:3001
59
msgid ""
60
"Please choose whether the resolver should be forced to use the local BIND9 "
61
"daemon (named) rather than what the current connection recommends, when this "
62
"machine moves around."
63
msgstr ""
64
"V??lg venligst hvorvidt opl??seren skal tvinges til at bruge den lokale "
65
"BIND9-d??mon (navngivet), frem for hvad den aktuelle forbindelse anbefaler, n??r "
66
"denne maskine flytter rundt."
67
++ bind9-9.7.3.dfsg/debian/po/pt_BR.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/templates.pot
1
# bind9 Brazilian Portuguese translation
2
# Copyright (C) 2009 bind9's COPYRIGHT HOLDER
3
# This file is distributed under the same license as the bind9 package.
4
# Luís Gustavo Pessoa Sales <vatsu@gmx.net>, 2009.
5
# José Figueiredo <deb.gnulinux@gmail.com>, 2010.
6
# 
7
# 
8
msgid ""
9
msgstr ""
10
"Project-Id-Version: bind9\n"
11
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
12
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
13
"PO-Revision-Date: 2010-09-10 22:37-0300\n"
14
"Last-Translator: José de Figueiredo <deb.gnulinux@gmail.com>\n"
15
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
16
"org>\n"
17
"MIME-Version: 1.0\n"
18
"Content-Type: text/plain; charset=UTF-8\n"
19
"Content-Transfer-Encoding: 8bit\n"
20
"pt_BR utf-8\n"
21
22
#. Type: string
23
#. Description
24
#: ../templates:1001
25
msgid "User account for running the BIND9 daemon:"
26
msgstr "Conta de usuário para execução do daemon do BIND9:"
27
28
#. Type: string
29
#. Description
30
#: ../templates:1001
31
msgid ""
32
"The default is to run the BIND9 daemon (named) under the 'bind' user "
33
"account. To use a different account, please enter the appropriate username."
34
msgstr ""
35
"O padrão é executar o daemon do BIND9 (named) com a conta de usuário 'bind'. "
36
"Para usar uma conta diferente, por favor informe o nome do usuário."
37
38
#. Type: string
39
#. Description
40
#: ../templates:2001
41
msgid "Other startup options for named:"
42
msgstr "Outras opções de inicialização para o named:"
43
44
#. Type: string
45
#. Description
46
#: ../templates:2001
47
msgid ""
48
"Please provide any additional options (other than username) that should be "
49
"passed to the BIND9 daemon (named) on startup."
50
msgstr ""
51
"Por favor, forneça outras opções adicionais (além de nome de usuário), que "
52
"devam ser passadas ao daemon do BIND9 (named) na inicialização."
53
54
#. Type: boolean
55
#. Description
56
#: ../templates:3001
57
msgid "Should resolv.conf settings be overridden?"
58
msgstr "As configurações do resolv.conf devem ser sobrescritas?"
59
60
#. Type: boolean
61
#. Description
62
#: ../templates:3001
63
msgid ""
64
"Please choose whether the resolver should be forced to use the local BIND9 "
65
"daemon (named) rather than what the current connection recommends, when this "
66
"machine moves around."
67
msgstr ""
68
"Por favor, escolha se o resolvedor de nomes deve ser forçado a usar o daemon "
69
"do BIND9 local (named) em vez daquele que a conexão atual recomendar, quando "
70
"esta máquina for movida."
71
++ bind9-9.7.3.dfsg/debian/po/templates.pot
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/pt.po
1
# SOME DESCRIPTIVE TITLE.
2
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3
# This file is distributed under the same license as the PACKAGE package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5
#
6
#, fuzzy
7
msgid ""
8
msgstr ""
9
"Project-Id-Version: PACKAGE VERSION\n"
10
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
11
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
15
"MIME-Version: 1.0\n"
16
"Content-Type: text/plain; charset=CHARSET\n"
17
"Content-Transfer-Encoding: 8bit\n"
18
19
#. Type: string
20
#. Description
21
#: ../templates:1001
22
msgid "User account for running the BIND9 daemon:"
23
msgstr ""
24
25
#. Type: string
26
#. Description
27
#: ../templates:1001
28
msgid ""
29
"The default is to run the BIND9 daemon (named) under the 'bind' user "
30
"account. To use a different account, please enter the appropriate username."
31
msgstr ""
32
33
#. Type: string
34
#. Description
35
#: ../templates:2001
36
msgid "Other startup options for named:"
37
msgstr ""
38
39
#. Type: string
40
#. Description
41
#: ../templates:2001
42
msgid ""
43
"Please provide any additional options (other than username) that should be "
44
"passed to the BIND9 daemon (named) on startup."
45
msgstr ""
46
47
#. Type: boolean
48
#. Description
49
#: ../templates:3001
50
msgid "Should resolv.conf settings be overridden?"
51
msgstr ""
52
53
#. Type: boolean
54
#. Description
55
#: ../templates:3001
56
msgid ""
57
"Please choose whether the resolver should be forced to use the local BIND9 "
58
"daemon (named) rather than what the current connection recommends, when this "
59
"machine moves around."
60
msgstr ""
61
++ bind9-9.7.3.dfsg/debian/po/pt.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/es.po
1
# translation of bind9_1:9.5.0.dfsg-2_pt debconf to Portuguese
2
# Copyright (C) 2008 Américo Monteiro
3
# This file is distributed under the same license as the bind9 package.
4
#
5
# Américo Monteiro <a_monteiro@netcabo.pt>, 2008.
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bind9_1:9.5.0.dfsg-2_pt\n"
9
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
10
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
11
"PO-Revision-Date: 2008-06-14 11:55+0100\n"
12
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
13
"Language-Team: Portuguese <traduz@debianpt.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"X-Generator: KBabel 1.11.4\n"
18
19
#. Type: string
20
#. Description
21
#: ../templates:1001
22
msgid "User account for running the BIND9 daemon:"
23
msgstr "Conta de utilizador para correr o deamon BIND9:"
24
25
#. Type: string
26
#. Description
27
#: ../templates:1001
28
#| msgid ""
29
#| "The default is to start bind9 as bind user, if you would  like to change "
30
#| "that, please give here the username as which  bind9 should start as."
31
msgid ""
32
"The default is to run the BIND9 daemon (named) under the 'bind' user "
33
"account. To use a different account, please enter the appropriate username."
34
msgstr ""
35
"A pré-definição é correr o deamon BIND9 (named) sob a conta de utilizador "
36
"'bind'. Para usar uma conta diferente, por favor indique o nome de utilizador "
37
"apropriado."
38
39
#. Type: string
40
#. Description
41
#: ../templates:2001
42
msgid "Other startup options for named:"
43
msgstr "Outras opções de arranque para o named:"
44
45
#. Type: string
46
#. Description
47
#: ../templates:2001
48
#| msgid ""
49
#| "Please enter here the options which should be passed to the bind9-daemon "
50
#| "on startup."
51
msgid ""
52
"Please provide any additional options (other than username) that should be "
53
"passed to the BIND9 daemon (named) on startup."
54
msgstr ""
55
"Por favor forneça quaisquer opções adicionais (além do nome de utilizador) que "
56
"deverão ser enviadas ao deamon BIND9 (named) durante o arranque. "
57
58
#. Type: boolean
59
#. Description
60
#: ../templates:3001
61
#| msgid "Should resolvconf be executed on startup?"
62
msgid "Should resolv.conf settings be overridden?"
63
msgstr "Devem as configurações de resolv.conf ser substituidas?"
64
65
#. Type: boolean
66
#. Description
67
#: ../templates:3001
68
msgid ""
69
"Please choose whether the resolver should be forced to use the local BIND9 "
70
"daemon (named) rather than what the current connection recommends, when this "
71
"machine moves around."
72
msgstr ""
73
"Por favor escolha se a resolução de nomes deverá ser forçada a usar o deamon "
74
"local BIND9 (named) em vez do que a corrente ligação recomenda, quando esta "
75
"máquina está ligada."
76
77
++ bind9-9.7.3.dfsg/debian/po/es.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/tr.po
1
# bind9 translation to spanish
2
# Copyright (C) 2008 Software in the Public Interest
3
# This file is distributed under the same license as the bind9 package.
4
# Changes:
5
# - Initial translation
6
# Ignacio Mondino <ignacio.mondino@gmail.com>, 2008
7
# Traductores, si no conoce el formato PO, merece la pena leer la 
8
# documentación de gettext, especialmente las secciones dedicadas a este
9
# formato, por ejemplo ejecutando:
10
# info -n '(gettext)PO Files'
11
# info -n '(gettext)Header Entry'
12
# Equipo de traducción al español, por favor lean antes de traducir
13
# los siguientes documentos:
14
# - El proyecto de traducción de Debian al español
15
# http://www.debian.org/intl/spanish
16
# especialmente las notas de traducción en
17
# http://www.debian.org/intl/spanish/notas
18
# - La guía de traducción de po's de debconf:
19
# /usr/share/doc/po-debconf/README-trans
20
# o http://www.debian.org/intl/l10n/po-debconf/README-trans
21
# 
22
# 
23
msgid ""
24
msgstr ""
25
"Project-Id-Version: bind9_1:9.5.0.dfsg-3\n"
26
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
27
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
28
"PO-Revision-Date: 2008-07-08 20:18-0300\n"
29
"Last-Translator: Ignacio Mondino <ignacio.mondino@gmail.com>\n"
30
"Language-Team: Debian Spanish team <debian-l10n-spanish@lists.debian.org>\n"
31
"MIME-Version: 1.0\n"
32
"Content-Type: text/plain; charset=UTF-8\n"
33
"Content-Transfer-Encoding: 8bit\n"
34
35
#. Type: string
36
#. Description
37
#: ../templates:1001
38
msgid "User account for running the BIND9 daemon:"
39
msgstr "Cuenta de usuario que ejecuta el demonio BIND9:"
40
41
#. Type: string
42
#. Description
43
#: ../templates:1001
44
msgid ""
45
"The default is to run the BIND9 daemon (named) under the 'bind' user "
46
"account. To use a different account, please enter the appropriate username."
47
msgstr ""
48
"La cuenta de usuario por omisión que ejecuta el demonio BIND9 («named») es "
49
"«bind». Para usar una cuenta diferente, por favor ingrese el nombre de "
50
"usuario apropiado."
51
52
#. Type: string
53
#. Description
54
#: ../templates:2001
55
msgid "Other startup options for named:"
56
msgstr "Otras opciones de inicio para «named»:"
57
58
#. Type: string
59
#. Description
60
#: ../templates:2001
61
msgid ""
62
"Please provide any additional options (other than username) that should be "
63
"passed to the BIND9 daemon (named) on startup."
64
msgstr ""
65
"Ingrese cualquier opción adicional (además del nombre de usuario) que "
66
"debiera pasarse como parámetro al demonio BIND9 («named») al inicio del "
67
"sistema."
68
69
#. Type: boolean
70
#. Description
71
#: ../templates:3001
72
msgid "Should resolv.conf settings be overridden?"
73
msgstr "¿Debería sobreescribirse el archivo «resolv.conf»?"
74
75
#. Type: boolean
76
#. Description
77
#: ../templates:3001
78
msgid ""
79
"Please choose whether the resolver should be forced to use the local BIND9 "
80
"daemon (named) rather than what the current connection recommends, when this "
81
"machine moves around."
82
msgstr ""
83
"Indique si se debería forzar al cliente a utilizar el demonio BIND9 («named») "
84
"local en lugar de lo que la conexión actual recomiende, cuando este equipo "
85
"este en movimiento."
86
++ bind9-9.7.3.dfsg/debian/po/tr.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/sk.po
1
# turkish translation of bind9 debconf template
2
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3
# This file is distributed under the same license as the PACKAGE package.
4
# Mert Dirik <mertdirik@gmail.com>, 2008.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bind9\n"
9
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
10
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
11
"PO-Revision-Date: 2008-06-15 23:31+0200\n"
12
"Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
13
"Language-Team: Debian L10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=utf-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=1; plural=0;\n"
18
"X-Poedit-Language: Turkish\n"
19
20
#. Type: string
21
#. Description
22
#: ../templates:1001
23
msgid "User account for running the BIND9 daemon:"
24
msgstr "BIND9 bekletici programının (named) kullanacağı kullanıcı hesabı:"
25
26
#. Type: string
27
#. Description
28
#: ../templates:1001
29
msgid "The default is to run the BIND9 daemon (named) under the 'bind' user account. To use a different account, please enter the appropriate username."
30
msgstr "Öntanımlı olarak BIND9 bekletici (daemon) programı 'bind' kullanıcı hesabıyla çalışır. Farklı bir hesap kullanmak için kullanmak istediğiniz hesabın adını girin."
31
32
#. Type: string
33
#. Description
34
#: ../templates:2001
35
msgid "Other startup options for named:"
36
msgstr "'named'in kullanacağı diğer başlatma seçenekleri:"
37
38
#. Type: string
39
#. Description
40
#: ../templates:2001
41
msgid "Please provide any additional options (other than username) that should be passed to the BIND9 daemon (named) on startup."
42
msgstr "Lütfen BIND9 bekletici programına (named) geçilmesini istediğiniz, kullanıcı adı dışındaki ek seçenekleri yazın."
43
44
#. Type: boolean
45
#. Description
46
#: ../templates:3001
47
msgid "Should resolv.conf settings be overridden?"
48
msgstr "'resolv.conf' ayarları ezilmeli mi (override)?"
49
50
#. Type: boolean
51
#. Description
52
#: ../templates:3001
53
msgid "Please choose whether the resolver should be forced to use the local BIND9 daemon (named) rather than what the current connection recommends, when this machine moves around."
54
msgstr "Lütfen bu makine gezerken; çözümleyicinin o anda kullanılan bağlantının önerdiği sunucu yerine yerel BIND9 bekletici programını (named) kullanmaya zorlanması gerekip gerekmediğini seçin."
55
56
++ bind9-9.7.3.dfsg/debian/po/sk.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/fr.po
1
# Slovak translation of bind9
2
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3
# This file is distributed under the same license as the bind9 package.
4
# Ivan Masár <helix84@centrum.sk>, 2008.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bind9\n"
9
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
10
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
11
"PO-Revision-Date: \n"
12
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
13
"Language-Team: \n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
18
#. Type: string
19
#. Description
20
#: ../templates:1001
21
msgid "User account for running the BIND9 daemon:"
22
msgstr "Používateľský účet démona BIND9:"
23
24
#. Type: string
25
#. Description
26
#: ../templates:1001
27
msgid "The default is to run the BIND9 daemon (named) under the 'bind' user account. To use a different account, please enter the appropriate username."
28
msgstr "Štandardne sa démon BIND9 (named) spúšťa s používateľským účtom „bind”. Ak chcete použiť iný účet, prosím zadajte príslušný názov účtu."
29
30
#. Type: string
31
#. Description
32
#: ../templates:2001
33
msgid "Other startup options for named:"
34
msgstr "Ďalšie spúšťacie voľby pre named:"
35
36
#. Type: string
37
#. Description
38
#: ../templates:2001
39
msgid "Please provide any additional options (other than username) that should be passed to the BIND9 daemon (named) on startup."
40
msgstr "Zadajte ďalšie voľby (okrem používateľského mena), ktoré sa majú odovzdať démonovi BIND9 (named) pri spustení."
41
42
#. Type: boolean
43
#. Description
44
#: ../templates:3001
45
msgid "Should resolv.conf settings be overridden?"
46
msgstr "Má sa nastaviť priorita pred resolv.conf?"
47
48
#. Type: boolean
49
#. Description
50
#: ../templates:3001
51
msgid "Please choose whether the resolver should be forced to use the local BIND9 daemon (named) rather than what the current connection recommends, when this machine moves around."
52
msgstr "Zvoľte, či má sa má vynútiť, aby prekladač adries používal lokálneho démona BIND9 (named) namiesto toho, čo odporúča aktuálne pripojenie, keď sa umiestnenie tohto počítača mení."
53
54
++ bind9-9.7.3.dfsg/debian/po/fr.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/zh_CN.po
1
# Translation of bind9 debconf templates to French
2
# Copyright (C) 2008 CALARESU Luc <luc.calaresu@gmail.com>
3
# This file is distributed under the same license as the bind9 package.
4
# CALARESU Luc <luc.calaresu@gmail.com>, 2008.
5
#
6
#
7
msgid ""
8
msgstr ""
9
"Project-Id-Version: bind9\n"
10
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
11
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
12
"PO-Revision-Date: 2008-06-14 14:26+0200\n"
13
"Last-Translator: CALARESU Luc <luc.calaresu@gmail.com>\n"
14
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
15
"MIME-Version: 1.0\n"
16
"Content-Type: text/plain; charset=UTF-8\n"
17
"Content-Transfer-Encoding: 8bit"
18
19
#. Type: string
20
#. Description
21
#: ../templates:1001
22
msgid "User account for running the BIND9 daemon:"
23
msgstr "Identifiant pour l'exécution du démon de BIND9 :"
24
25
#. Type: string
26
#. Description
27
#: ../templates:1001
28
msgid ""
29
"The default is to run the BIND9 daemon (named) under the 'bind' user "
30
"account. To use a different account, please enter the appropriate username."
31
msgstr ""
32
"Par défaut, le démon de BIND9 est lancé avec les privilèges de l'identifiant "
33
"« bind ». Si vous souhaitez utiliser un autre identifiant, veuillez "
34
"l'indiquer ici."
35
36
#. Type: string
37
#. Description
38
#: ../templates:2001
39
msgid "Other startup options for named:"
40
msgstr "Autres options à transmettre pour « named » :"
41
42
#. Type: string
43
#. Description
44
#: ../templates:2001
45
msgid ""
46
"Please provide any additional options (other than username) that should be "
47
"passed to the BIND9 daemon (named) on startup."
48
msgstr ""
49
"Veuillez indiquer toute option supplémentaire (autre que l'identifiant) qui "
50
"doit être transmise au démarrage du démon de BIND9 (« named »)."
51
52
#. Type: boolean
53
#. Description
54
#: ../templates:3001
55
msgid "Should resolv.conf settings be overridden?"
56
msgstr "Faut-il écraser les paramètres de resolv.conf ?"
57
58
#. Type: boolean
59
#. Description
60
#: ../templates:3001
61
msgid ""
62
"Please choose whether the resolver should be forced to use the local BIND9 "
63
"daemon (named) rather than what the current connection recommends, when this "
64
"machine moves around."
65
msgstr ""
66
"Veuillez choisir si la résolution de noms doit utiliser le démon BIND9 local "
67
"(« named ») plutôt que les paramètres recommandés pour la connexion actuelle, "
68
"lorsque cette machine est déplacée."
69
++ bind9-9.7.3.dfsg/debian/po/zh_CN.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/vi.po
1
# Chinese translations for bind package.
2
# Copyright (C) 2008 THE bind'S COPYRIGHT HOLDER
3
# This file is distributed under the same license as the bind package.
4
# LI Daobing <lidaobing@gmail.com>, 2008.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bind 9-9.5.0.dfsg.P2\n"
9
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
10
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
11
"PO-Revision-Date: 2008-10-04 14:36+0800\n"
12
"Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
13
"Language-Team: Chinese (simplified)\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
18
#. Type: string
19
#. Description
20
#: ../templates:1001
21
msgid "User account for running the BIND9 daemon:"
22
msgstr "运行 BIND9 服务的用户账号:"
23
24
#. Type: string
25
#. Description
26
#: ../templates:1001
27
msgid ""
28
"The default is to run the BIND9 daemon (named) under the 'bind' user "
29
"account. To use a different account, please enter the appropriate username."
30
msgstr "缺省使用 'bind' 用户来运行 BIND9 服务(named)。 想使用其他的账号, 请输入合适的用户名。"
31
32
#. Type: string
33
#. Description
34
#: ../templates:2001
35
msgid "Other startup options for named:"
36
msgstr "named 的其他启动选项:"
37
38
#. Type: string
39
#. Description
40
#: ../templates:2001
41
msgid ""
42
"Please provide any additional options (other than username) that should be "
43
"passed to the BIND9 daemon (named) on startup."
44
msgstr "请提供需要传给 BIND9 服务(named)的启动选项(用户名除外)。"
45
46
#. Type: boolean
47
#. Description
48
#: ../templates:3001
49
msgid "Should resolv.conf settings be overridden?"
50
msgstr "是否覆盖 resolv.conf 的设置?"
51
52
#. Type: boolean
53
#. Description
54
#: ../templates:3001
55
msgid ""
56
"Please choose whether the resolver should be forced to use the local BIND9 "
57
"daemon (named) rather than what the current connection recommends, when this "
58
"machine moves around."
59
msgstr "请选择是否强制使用本地 BIND9 服务(named)来做域名解析, 而不是使用当前连接所推荐的域名解析服务器, 特别是当机器需要移动时。"
60
++ bind9-9.7.3.dfsg/debian/po/vi.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/cs.po
1
# Vietnamese translation for Bind 9.
2
# Copyright © 2008 Free Software Foundation, Inc.
3
# Clytie Siddall <clytie@riverland.net.au>, 2008.
4
#
5
msgid ""
6
msgstr ""
7
"Project-Id-Version: bind9 1:9.5.0.dfsg-2\n"
8
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
9
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
10
"PO-Revision-Date: 2008-06-14 15:35+0930\n"
11
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
12
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
13
"MIME-Version: 1.0\n"
14
"Content-Type: text/plain; charset=UTF-8\n"
15
"Content-Transfer-Encoding: 8bit\n"
16
"Plural-Forms: nplurals=1; plural=0;\n"
17
"X-Generator: LocFactoryEditor 1.7b3\n"
18
19
#: ../templates:1001
20
#. Type: string
21
#. Description
22
msgid "User account for running the BIND9 daemon:"
23
msgstr "Tài khoản người dùng để chạy trình nền BIND9:"
24
25
#: ../templates:1001
26
#. Type: string
27
#. Description
28
msgid ""
29
"The default is to run the BIND9 daemon (named) under the 'bind' user "
30
"account. To use a different account, please enter the appropriate username."
31
msgstr "Mặc định là chạy trình nền BIND9 (đặt tên) dưới tài khoản người dùng « bind ». Để sử dụng tài khoản khác, hãy nhập tên người dùng thích hợp."
32
33
#: ../templates:2001
34
#. Type: string
35
#. Description
36
msgid "Other startup options for named:"
37
msgstr "Tùy chọn khởi chạy khác cần đặt tên:"
38
39
#: ../templates:2001
40
#. Type: string
41
#. Description
42
#| msgid ""
43
#| "Please enter here the options which should be passed to the bind9-daemon "
44
#| "on startup."
45
msgid ""
46
"Please provide any additional options (other than username) that should be "
47
"passed to the BIND9 daemon (named) on startup."
48
msgstr ""
49
"Hãy nhập vào đây bất kỳ tùy chọn bổ sung (khác với tên người dùng) nên gửi cho trình nền BIND9 vào lúc khởi chạy."
50
51
#: ../templates:3001
52
#. Type: boolean
53
#. Description
54
#| msgid "Should resolvconf be executed on startup?"
55
msgid "Should resolv.conf settings be overridden?"
56
msgstr "Co nên ghi đè lên thiết lập « resolv.conf » không?"
57
58
#: ../templates:3001
59
#. Type: boolean
60
#. Description
61
msgid ""
62
"Please choose whether the resolver should be forced to use the local BIND9 "
63
"daemon (named) rather than what the current connection recommends, when this "
64
"machine moves around."
65
msgstr "Hãy chọn có nên ép buộc trình giải quyết sử dụng trình nền BIND9 cục bộ (đặt tên) hơn là kết nối hiện thời đề nghị gì khi máy này ở nơi khác."
66
++ bind9-9.7.3.dfsg/debian/po/cs.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/gl.po
1
# Czech translation of bind9 debconf messages.
2
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3
# This file is distributed under the same license as the bind9 package.
4
# Miroslav Kure <kurem@debian.cz>, 2008
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bind9\n"
9
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
10
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
11
"PO-Revision-Date: 2008-06-15 14:38+0200\n"
12
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
13
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
18
#. Type: string
19
#. Description
20
#: ../templates:1001
21
msgid "User account for running the BIND9 daemon:"
22
msgstr "Uživatelský účet pro běh daemona BIND9:"
23
24
#. Type: string
25
#. Description
26
#: ../templates:1001
27
msgid ""
28
"The default is to run the BIND9 daemon (named) under the 'bind' user "
29
"account. To use a different account, please enter the appropriate username."
30
msgstr ""
31
"Ve výchozím nastavení se daemon BINDu9 (named) spouští pod účtem uživatele "
32
"„bind“. Pro použití jiného účtu zadejte jeho jméno."
33
34
#. Type: string
35
#. Description
36
#: ../templates:2001
37
msgid "Other startup options for named:"
38
msgstr "Další spouštěcí parametry pro named:"
39
40
#. Type: string
41
#. Description
42
#: ../templates:2001
43
msgid ""
44
"Please provide any additional options (other than username) that should be "
45
"passed to the BIND9 daemon (named) on startup."
46
msgstr ""
47
"Zadejte prosím případné další parametry (mimo uživatelského účtu), které se "
48
"mají předat daemonu BINDu9 (named) při každém spuštění."
49
50
#. Type: boolean
51
#. Description
52
#: ../templates:3001
53
msgid "Should resolv.conf settings be overridden?"
54
msgstr "Má se přepsat nastavení v resolv.conf?"
55
56
#. Type: boolean
57
#. Description
58
#: ../templates:3001
59
msgid ""
60
"Please choose whether the resolver should be forced to use the local BIND9 "
61
"daemon (named) rather than what the current connection recommends, when this "
62
"machine moves around."
63
msgstr ""
64
"Rozhodněte se, zda se má přepsat nastavení resolveru tak, aby vždy používal "
65
"lokální daemon BINDu9 (named) namísto serveru, který doporučí aktuální "
66
"připojení."
67
++ bind9-9.7.3.dfsg/debian/po/gl.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/nl.po
1
# Galician translation of bind9's debconf templates
2
# This file is distributed under the same license as the bind9 package.
3
# Jacobo Tarrio <jtarrio@debian.org>, 2008.
4
#
5
msgid ""
6
msgstr ""
7
"Project-Id-Version: bind9\n"
8
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
9
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
10
"PO-Revision-Date: 2008-06-14 11:36+0100\n"
11
"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
12
"Language-Team: Galician <proxecto@trasno.net>\n"
13
"MIME-Version: 1.0\n"
14
"Content-Type: text/plain; charset=UTF-8\n"
15
"Content-Transfer-Encoding: 8bit\n"
16
17
#. Type: string
18
#. Description
19
#: ../templates:1001
20
msgid "User account for running the BIND9 daemon:"
21
msgstr "Conta de usuario que executa o servizo de BIND9:"
22
23
#. Type: string
24
#. Description
25
#: ../templates:1001
26
msgid ""
27
"The default is to run the BIND9 daemon (named) under the 'bind' user "
28
"account. To use a different account, please enter the appropriate username."
29
msgstr ""
30
"A elección por defecto é executar o servizo de BIND9 (named) baixo a conta "
31
"de usuario \"bind\". Para empregar unha conta diferente, introduza o nome."
32
33
#. Type: string
34
#. Description
35
#: ../templates:2001
36
msgid "Other startup options for named:"
37
msgstr "Outras opcións de inicio para named:"
38
39
#. Type: string
40
#. Description
41
#: ../templates:2001
42
msgid ""
43
"Please provide any additional options (other than username) that should be "
44
"passed to the BIND9 daemon (named) on startup."
45
msgstr ""
46
"Forneza as opcións adicionais (que non sexan o nome de usuario) que se deban "
47
"pasar ao servizo de BIND9 (named) no inicio."
48
49
#. Type: boolean
50
#. Description
51
#: ../templates:3001
52
msgid "Should resolv.conf settings be overridden?"
53
msgstr "¿Quere substituír a configuración de resolv.conf?"
54
55
#. Type: boolean
56
#. Description
57
#: ../templates:3001
58
msgid ""
59
"Please choose whether the resolver should be forced to use the local BIND9 "
60
"daemon (named) rather than what the current connection recommends, when this "
61
"machine moves around."
62
msgstr ""
63
"Indique se quere forzar o resolvedor a que empregue o servizo de BIND9 local "
64
"(named) no canto do que recomenda a conexión actual, cando esta máquina "
65
"estea en movemento."
66
++ bind9-9.7.3.dfsg/debian/po/nl.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/ja.po
1
# translation of bind9_1:9.5.0.dfsg.P2-1_nl.po to Dutch
2
# translation of bind9 debconf template to Dutch
3
# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
4
# This file is distributed under the same license as the bind9 package.
5
#
6
# Paul Gevers <paul@climbing.nl>, 2008.
7
msgid ""
8
msgstr ""
9
"Project-Id-Version: bind9_1:9.5.0.dfsg.P2-1_nl\n"
10
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
11
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
12
"PO-Revision-Date: 2008-09-17 21:15-0500\n"
13
"Last-Translator: Paul Gevers <paul@climbing.nl>\n"
14
"Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
15
"MIME-Version: 1.0\n"
16
"Content-Type: text/plain; charset=UTF-8\n"
17
"Content-Transfer-Encoding: 8bit\n"
18
"X-Generator: KBabel 1.11.4\n"
19
"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
20
21
#. Type: string
22
#. Description
23
#: ../templates:1001
24
msgid "User account for running the BIND9 daemon:"
25
msgstr "Gebruikersaccount waaronder de BIND9 achtergronddienst dient te draaien:"
26
27
#. Type: string
28
#. Description
29
#: ../templates:1001
30
msgid ""
31
"The default is to run the BIND9 daemon (named) under the 'bind' user "
32
"account. To use a different account, please enter the appropriate username."
33
msgstr ""
34
"Standaard wordt 'named', de BIND9-achtergronddienst, uitgevoerd onder de "
35
"'bind' gebruikersaccount. Als u een andere account wilt gebruiken kunt hier de "
36
"geschikte gebruikersnaam invullen."
37
38
#. Type: string
39
#. Description
40
#: ../templates:2001
41
msgid "Other startup options for named:"
42
msgstr "Andere opstartopties voor 'named':"
43
44
#. Type: string
45
#. Description
46
#: ../templates:2001
47
msgid ""
48
"Please provide any additional options (other than username) that should be "
49
"passed to the BIND9 daemon (named) on startup."
50
msgstr ""
51
"Welke aanvullende opties (anders dan de gebruikersnaam) wilt u bij het opstarten "
52
"meegeven aan 'named', de BIND9 achtergronddienst?"
53
54
#. Type: boolean
55
#. Description
56
#: ../templates:3001
57
msgid "Should resolv.conf settings be overridden?"
58
msgstr "Wilt u dat de 'resolv.conf' instellingen omzeild worden?"
59
60
#. Type: boolean
61
#. Description
62
#: ../templates:3001
63
msgid ""
64
"Please choose whether the resolver should be forced to use the local BIND9 "
65
"daemon (named) rather than what the current connection recommends, when this "
66
"machine moves around."
67
msgstr ""
68
"Wilt u afdwingen dat de 'resolver' gebruik maakt van de lokale BIND9 achtergronddienst "
69
"(named), in plaats van de aanbevelingen van de huidige connectie. Bijvoorbeeld, "
70
"wanneer deze computer veel verplaatst wordt."
71
72
++ bind9-9.7.3.dfsg/debian/po/ja.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/eu.po
1
# Copyright (C) 2008 LaMont Jones <lamont@debian.org>
2
# This file is distributed under the same license as the bind9 package.
3
# Hideki Yamane <henrich@debian.or.jp>, 2008.
4
#
5
msgid ""
6
msgstr ""
7
"Project-Id-Version: bind9 1:9.5.0.dfsg.P1-2\n"
8
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
9
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
10
"PO-Revision-Date: 2008-07-22 00:03+0900\n"
11
"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
12
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
13
"MIME-Version: 1.0\n"
14
"Content-Type: text/plain; charset=UTF-8\n"
15
"Content-Transfer-Encoding: 8bit\n"
16
17
#. Type: string
18
#. Description
19
#: ../templates:1001
20
msgid "User account for running the BIND9 daemon:"
21
msgstr "BIND9 デーモンの動作に使うユーザアカウント:"
22
23
#. Type: string
24
#. Description
25
#: ../templates:1001
26
msgid ""
27
"The default is to run the BIND9 daemon (named) under the 'bind' user "
28
"account. To use a different account, please enter the appropriate username."
29
msgstr ""
30
"デフォルトでは BIND9 デーモン (named) は「bind」ユーザアカウントで動作します。"
31
"異なるアカウントを使いたい場合は、適切なユーザ名を入力してください。"
32
33
#. Type: string
34
#. Description
35
#: ../templates:2001
36
msgid "Other startup options for named:"
37
msgstr "起動時に named に指定するオプション:"
38
39
#. Type: string
40
#. Description
41
#: ../templates:2001
42
msgid ""
43
"Please provide any additional options (other than username) that should be "
44
"passed to the BIND9 daemon (named) on startup."
45
msgstr ""
46
"BIND9 デーモン (named) の起動時に指定したい (ユーザ名以外の) 追加オプションを"
47
"入力してください。"
48
49
#. Type: boolean
50
#. Description
51
#: ../templates:3001
52
msgid "Should resolv.conf settings be overridden?"
53
msgstr "resolv.conf の設定を上書きしますか?"
54
55
#. Type: boolean
56
#. Description
57
#: ../templates:3001
58
msgid ""
59
"Please choose whether the resolver should be forced to use the local BIND9 "
60
"daemon (named) rather than what the current connection recommends, when this "
61
"machine moves around."
62
msgstr ""
63
"このマシンを移動した際、リゾルバがローカルの BIND9 デーモン (named) を使うようにする"
64
"か、現在の接続先で推奨されるネームサーバを使うようにするかを選んでください。"
65
66
67
++ bind9-9.7.3.dfsg/debian/po/eu.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/de.po
1
# translation of eu.po to Euskara
2
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3
# This file is distributed under the same license as the PACKAGE package.
4
#
5
# Piarres Beobide <pi@beobide.net>, 2009.
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: eu\n"
9
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
10
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
11
"PO-Revision-Date: 2009-02-22 10:36+0100\n"
12
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
13
"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"X-Generator: KBabel 1.11.4\n"
18
19
#. Type: string
20
#. Description
21
#: ../templates:1001
22
msgid "User account for running the BIND9 daemon:"
23
msgstr "BIND9 exekutatuko duen erabiltzaile kontua:"
24
25
#. Type: string
26
#. Description
27
#: ../templates:1001
28
msgid ""
29
"The default is to run the BIND9 daemon (named) under the 'bind' user "
30
"account. To use a different account, please enter the appropriate username."
31
msgstr ""
32
"Lehenetsia BIND9 deabrua (named) 'bind' erabiltzaile kontuarekin "
33
"exekutatzea da. Beste kontu bat erabiltzeko, idatzi dagokion "
34
"erabiltzaile-izena"
35
36
#. Type: string
37
#. Description
38
#: ../templates:2001
39
msgid "Other startup options for named:"
40
msgstr "Beste abio aukera batzuek named-rentzat:"
41
42
#. Type: string
43
#. Description
44
#: ../templates:2001
45
msgid ""
46
"Please provide any additional options (other than username) that should be "
47
"passed to the BIND9 daemon (named) on startup."
48
msgstr ""
49
"Mesedez zehaztu BIND9 deabruari abioan pasa behar zaizkion beste aukera "
50
"gehigarriak (erabiltzaile-izenaz beste)."
51
52
#. Type: boolean
53
#. Description
54
#: ../templates:3001
55
msgid "Should resolv.conf settings be overridden?"
56
msgstr "resolv.conf ezarpenak gainidatzi behar al dira?"
57
58
#. Type: boolean
59
#. Description
60
#: ../templates:3001
61
msgid ""
62
"Please choose whether the resolver should be forced to use the local BIND9 "
63
"daemon (named) rather than what the current connection recommends, when this "
64
"machine moves around."
65
msgstr ""
66
"Mesedez hautatu ebazlea nola behartu behar den BIND9 deabru kopia lokala erabiltzeko "
67
"ekipo hau mugitzen ari denean konexioak gomendatzen dionaren ordez."
68
69
++ bind9-9.7.3.dfsg/debian/po/de.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/ru.po
1
# Translation of bind9 debconf templates to German
2
# (C) Helge Kreutzmann <debian@helgefjell.de>, 2008.
3
# This file is distributed under the same license as the bind9 package.
4
#
5
msgid ""
6
msgstr ""
7
"Project-Id-Version: bind9 1:9.5.0.dfsg-2\n"
8
"Report-Msgid-Bugs-To: bind9@packages.debian.org\n"
9
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
10
"PO-Revision-Date: 2008-06-16 20:22+0200\n"
11
"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
12
"Language-Team: de <debian-l10n-german@lists.debian.org>\n"
13
"MIME-Version: 1.0\n"
14
"Content-Type: text/plain; charset=iso-8859-15\n"
15
"Content-Transfer-Encoding: 8bit\n"
16
17
#. Type: string
18
#. Description
19
#: ../templates:1001
20
msgid "User account for running the BIND9 daemon:"
21
msgstr "Benutzerkonto, unter dessen Kennung der BIND9-Daemon laufen soll:"
22
23
#. Type: string
24
#. Description
25
#: ../templates:1001
26
msgid ""
27
"The default is to run the BIND9 daemon (named) under the 'bind' user "
28
"account. To use a different account, please enter the appropriate username."
29
msgstr ""
30
"Standardmäßig wird der BIND9-Daemon (Named) unter der Kennung des Benutzers "
31
"»bind« betrieben. Um ein anderes Benutzerkonto auszuwählen, geben Sie bitte "
32
"den entsprechenden Benutzernamen ein."
33
34
#. Type: string
35
#. Description
36
#: ../templates:2001
37
msgid "Other startup options for named:"
38
msgstr "Weitere Optionen für den Start des Named:"
39
40
#. Type: string
41
#. Description
42
#: ../templates:2001
43
msgid ""
44
"Please provide any additional options (other than username) that should be "
45
"passed to the BIND9 daemon (named) on startup."
46
msgstr ""
47
"Bitte geben Sie hier die zusätzlichen Optionen (außer dem Benutzernamen) ein, "
48
"die dem Bind9-Daemon (Named) beim Starten übergeben werden sollen."
49
50
#. Type: boolean
51
#. Description
52
#: ../templates:3001
53
msgid "Should resolv.conf settings be overridden?"
54
msgstr "Sollen die Einstellungen in resolv.conf ignoriert werden?"
55
56
#. Type: boolean
57
#. Description
58
#: ../templates:3001
59
msgid ""
60
"Please choose whether the resolver should be forced to use the local BIND9 "
61
"daemon (named) rather than what the current connection recommends, when this "
62
"machine moves around."
63
msgstr ""
64
"Bitte wählen Sie aus, ob der Namensauflöser (Resolver) dazu gezwungen werden "
65
"soll, den lokalen BIND9-Daemon (Named) zu verwenden, statt den aktuellen "
66
"Verbindungsempfehlungen zu folgen, wenn diese Maschine bewegt wird."
67
68
#~ msgid "Options that should be passed at startup to bind9"
69
#~ msgstr "Optionen, die beim Starten an Bind9 weitergegeben werden sollen"
70
71
#~ msgid "which user should bind9 run as?"
72
#~ msgstr "Unter welcher Benutzerkennung soll Bind9 laufen?"
73
74
#~ msgid ""
75
#~ "The default is to start bind9 as bind user, if you would  like to change "
76
#~ "that, please give here the username as which  bind9 should start as."
77
#~ msgstr ""
78
#~ "Standardmäßig startet Bind9 unter der Benutzerkennung »bind«. Falls Sie "
79
#~ "dies ändern möchten geben Sie hier bitte den Benutzernamen ein, unter "
80
#~ "dessen Kennung Bind9 starten soll."
81
82
#~ msgid "Should resolvconf run when bind9 starts up?"
83
#~ msgstr "Soll Resolvconf laufen, wenn Bind9 startet?"
84
++ bind9-9.7.3.dfsg/debian/po/ru.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/fi.po
1
# translation of ru.po to Russian
2
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3
# This file is distributed under the same license as the PACKAGE package.
4
#
5
# Yuri Kozlov <kozlov.y@gmail.com>, 2008.
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bind9 1:9.5.0.dfsg-2\n"
9
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
10
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
11
"PO-Revision-Date: 2008-06-14 11:08+0400\n"
12
"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
13
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"X-Generator: KBabel 1.11.4\n"
18
"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
19
20
#. Type: string
21
#. Description
22
#: ../templates:1001
23
msgid "User account for running the BIND9 daemon:"
24
msgstr "Учётная запись для запуска службы BIND9:"
25
26
#. Type: string
27
#. Description
28
#: ../templates:1001
29
msgid ""
30
"The default is to run the BIND9 daemon (named) under the 'bind' user "
31
"account. To use a different account, please enter the appropriate username."
32
msgstr ""
33
"По умолчанию, служба BIND9 (файл named) запускается с правами учётной "
34
"записи 'bind'. Если вы хотите использовать другую учётную запись, то "
35
"введите это имя здесь."
36
37
#. Type: string
38
#. Description
39
#: ../templates:2001
40
msgid "Other startup options for named:"
41
msgstr "Другие параметры запуска named:"
42
43
#. Type: string
44
#. Description
45
#: ../templates:2001
46
msgid ""
47
"Please provide any additional options (other than username) that should be "
48
"passed to the BIND9 daemon (named) on startup."
49
msgstr ""
50
"Укажите любые дополнительные параметры (кроме имени учётной записи), которые "
51
"нужно передать службе BIND9 (файлу named) при запуске."
52
53
#. Type: boolean
54
#. Description
55
#: ../templates:3001
56
msgid "Should resolv.conf settings be overridden?"
57
msgstr "Переписать настройки resolv.conf?"
58
59
#. Type: boolean
60
#. Description
61
#: ../templates:3001
62
msgid ""
63
"Please choose whether the resolver should be forced to use the local BIND9 "
64
"daemon (named) rather than what the current connection recommends, when this "
65
"machine moves around."
66
msgstr ""
67
"Укажите, хотите ли вы, чтобы определитель имён машины использовал "
68
"локальную службу BIND9 (named), а не настройки имеющегося подключения."
69
70
++ bind9-9.7.3.dfsg/debian/po/fi.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/id.po
1
msgid ""
2
msgstr ""
3
"Project-Id-Version: bind9\n"
4
"POT-Creation-Date: \n"
5
"PO-Revision-Date: 2008-07-13 08:08-0000\n"
6
"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
7
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
8
"MIME-Version: 1.0\n"
9
"Content-Type: text/plain; charset=utf-8\n"
10
"Content-Transfer-Encoding: 8bit\n"
11
"X-Poedit-Language: Finnish\n"
12
"X-Poedit-Country: FINLAND\n"
13
14
#. Type: string
15
#. Description
16
#: ../templates:1001
17
msgid "User account for running the BIND9 daemon:"
18
msgstr "Käyttäjätunnus, jolla BIND9-taustaohjelmaa ajetaan:"
19
20
#. Type: string
21
#. Description
22
#: ../templates:1001
23
msgid "The default is to run the BIND9 daemon (named) under the 'bind' user account. To use a different account, please enter the appropriate username."
24
msgstr "Oletuksena BIND9-taustaohjelmaa (named) ajetaan käyttäjätunnuksella ”bind”. Jos halutaan käyttää jotain muuta tunnusta, syötä se tähän."
25
26
#. Type: string
27
#. Description
28
#: ../templates:2001
29
msgid "Other startup options for named:"
30
msgstr "Ohjelman named muut käynnistysvalitsimet:"
31
32
#. Type: string
33
#. Description
34
#: ../templates:2001
35
msgid "Please provide any additional options (other than username) that should be passed to the BIND9 daemon (named) on startup."
36
msgstr "Anna mahdolliset muut valitsimet (muut kuin käyttäjätunnus), jotka BIND9-taustaohjelmalle (named) tulisi antaa käynnistyksessä."
37
38
#. Type: boolean
39
#. Description
40
#: ../templates:3001
41
msgid "Should resolv.conf settings be overridden?"
42
msgstr "Tulisiko tiedoston resolv.conf asetukset jättää huomioitta?"
43
44
#. Type: boolean
45
#. Description
46
#: ../templates:3001
47
msgid "Please choose whether the resolver should be forced to use the local BIND9 daemon (named) rather than what the current connection recommends, when this machine moves around."
48
msgstr "Valitse tulisiko selvittäjä pakottaa käyttämään paikallista BIND9-taustaohjelmaa (named) sen sijaan mitä nykyinen yhteys suosittelee, kun konetta siirrellään eri paikkoihin."
49
50
++ bind9-9.7.3.dfsg/debian/po/id.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/POTFILES.in
1
msgid ""
2
msgstr ""
3
"Project-Id-Version: bind9\n"
4
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
5
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
6
"PO-Revision-Date: \n"
7
"Last-Translator: Mahyuddin Susanto <udienz@gmail.com>\n"
8
"Language-Team: Debian Indonesia Translator <debian-l10n-indonesian@lists.debian.org>\n"
9
"Language: \n"
10
"MIME-Version: 1.0\n"
11
"Content-Type: text/plain; charset=UTF-8\n"
12
"Content-Transfer-Encoding: 8bit\n"
13
"X-Poedit-Language: Indonesian\n"
14
"X-Poedit-Country: INDONESIA\n"
15
16
#. Type: string
17
#. Description
18
#: ../templates:1001
19
msgid "User account for running the BIND9 daemon:"
20
msgstr "Akun pengguna untuk menjalankan daemon BIND9:"
21
22
#. Type: string
23
#. Description
24
#: ../templates:1001
25
msgid "The default is to run the BIND9 daemon (named) under the 'bind' user account. To use a different account, please enter the appropriate username."
26
msgstr "Bawaan dari daemon BIND9 adalah menjalankan dengan user akun 'bind'. Untuk menggunakan akun berbeda, silakan masukkan nama pengguna yang sesuai."
27
28
#. Type: string
29
#. Description
30
#: ../templates:2001
31
msgid "Other startup options for named:"
32
msgstr "Opsi lain startup untuk named:"
33
34
#. Type: string
35
#. Description
36
#: ../templates:2001
37
msgid "Please provide any additional options (other than username) that should be passed to the BIND9 daemon (named) on startup."
38
msgstr "Harap menyediakan opsi tambahan (selain nama pengguna) yang digunakan daemon BIND9 untuk startup"
39
40
#. Type: boolean
41
#. Description
42
#: ../templates:3001
43
msgid "Should resolv.conf settings be overridden?"
44
msgstr "haruskah resolv.conf ditimpa?"
45
46
#. Type: boolean
47
#. Description
48
#: ../templates:3001
49
msgid "Please choose whether the resolver should be forced to use the local BIND9 daemon (named) rather than what the current connection recommends, when this machine moves around."
50
msgstr "Silakan tentukan resolver mana yang akan digunakan untuk daemon lokal BIND9 (named) dari koneksi sekarang yang digunakan, ketika mesin ini berjalan"
51
52
++ bind9-9.7.3.dfsg/debian/po/POTFILES.in
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/pl.po
1
[type: gettext/rfc822deb] templates
2
++ bind9-9.7.3.dfsg/debian/po/pl.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/sv.po
1
# debconf templates for bind9 package
2
# Polish translation
3
# Copyright (C) 2008
4
# This file is distributed under the same license as the bind9 package.
5
# Łukasz Paździora <lukpaz@gmail.com>, 2008
6
#
7
msgid ""
8
msgstr ""
9
"Project-Id-Version: bind9 9.5.0.dfsg.P2-4\n"
10
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
11
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
12
"PO-Revision-Date: 2008-11-24 18:30+0100\n"
13
"Last-Translator: Łukasz Paździora <lukpaz@gmail.com>\n"
14
"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
15
"MIME-Version: 1.0\n"
16
"Content-Type: text/plain; charset=UTF-8\n"
17
"Content-Transfer-Encoding: 8bit\n"
18
19
#. Type: string
20
#. Description
21
#: ../templates:1001
22
msgid "User account for running the BIND9 daemon:"
23
msgstr "Konto użytkownika, jako który powinien działać BIND9:"
24
25
#. Type: string
26
#. Description
27
#: ../templates:1001
28
msgid ""
29
"The default is to run the BIND9 daemon (named) under the 'bind' user "
30
"account. To use a different account, please enter the appropriate username."
31
msgstr ""
32
"Domyślnie demon BIND9 (named) działa jako użytkownik 'bind'. "
33
"Aby użyć innego konta podaj inną nazwę użytkownika."
34
35
#. Type: string
36
#. Description
37
#: ../templates:2001
38
msgid "Other startup options for named:"
39
msgstr "Inne opcje startowe dla named:"
40
41
#. Type: string
42
#. Description
43
#: ../templates:2001
44
msgid ""
45
"Please provide any additional options (other than username) that should be "
46
"passed to the BIND9 daemon (named) on startup."
47
msgstr ""
48
"Proszę podać dodatkowe opcje (inne niż nazwa użytkownika), które powinny "
49
"zostać podane demonowi BIND9 (named) przy starcie."
50
51
#. Type: boolean
52
#. Description
53
#: ../templates:3001
54
msgid "Should resolv.conf settings be overridden?"
55
msgstr "Czy ustawienia resolv.conf mają zostać nadpisane?"
56
57
#. Type: boolean
58
#. Description
59
#: ../templates:3001
60
msgid ""
61
"Please choose whether the resolver should be forced to use the local BIND9 "
62
"daemon (named) rather than what the current connection recommends, when this "
63
"machine moves around."
64
msgstr ""
65
"Proszę wybrać czy do rozwiązywania nazw powinna być używana lokalna "
66
"usługa BIND9 (named), kiedy maszyna zmienia miejsce, czy też powinien "
67
"korzystać z zalecanych ustawień aktualnego połączenia."
68
++ bind9-9.7.3.dfsg/debian/po/sv.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/po/it.po
1
# translation of bind9_1:9.5.0.dfsg.P1-2_sv.po to Swedish
2
# Copyright (C) 2008
3
# This file is distributed under the same license as the bind9 package.
4
#
5
# Martin Ågren <martin.agren@gmail.com>, 2008.
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bind9_1:9.5.0.dfsg.P1-2_sv\n"
9
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
10
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
11
"PO-Revision-Date: 2008-07-18 19:24+0200\n"
12
"Last-Translator: Martin Ågren <martin.agren@gmail.com>\n"
13
"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"X-Generator: KBabel 1.11.4\n"
18
"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
19
20
#. Type: string
21
#. Description
22
#: ../templates:1001
23
msgid "User account for running the BIND9 daemon:"
24
msgstr "Användarkonto att köra BIND9-demonen under:"
25
26
#. Type: string
27
#. Description
28
#: ../templates:1001
29
msgid ""
30
"The default is to run the BIND9 daemon (named) under the 'bind' user "
31
"account. To use a different account, please enter the appropriate username."
32
msgstr ""
33
"Standardvalet är att köra BIND9-demonen (named) under användarkontot 'bind'. "
34
"För att använda ett annat konto, var vänlig ange användarnamnet."
35
36
#. Type: string
37
#. Description
38
#: ../templates:2001
39
msgid "Other startup options for named:"
40
msgstr "Övriga uppstartsval för named:"
41
42
#. Type: string
43
#. Description
44
#: ../templates:2001
45
msgid ""
46
"Please provide any additional options (other than username) that should be "
47
"passed to the BIND9 daemon (named) on startup."
48
msgstr ""
49
"Var vänlig ange eventuella ytterligare val (förutom användarnamn) som ska "
50
"skickas till BIND9-demonen (named) vid uppstart."
51
52
#. Type: boolean
53
#. Description
54
#: ../templates:3001
55
msgid "Should resolv.conf settings be overridden?"
56
msgstr "Ska resolv.conf-inställningar hoppas över?"
57
58
#. Type: boolean
59
#. Description
60
#: ../templates:3001
61
msgid ""
62
"Please choose whether the resolver should be forced to use the local BIND9 "
63
"daemon (named) rather than what the current connection recommends, when this "
64
"machine moves around."
65
msgstr ""
66
"Var vänlig välj huruvida uppslagaren ska tvingas använda den lokala BIND9-demonen "
67
"(named) snarare än vad den aktuella uppkopplingen rekommenderar när den här "
68
"maskinen flyttar runt."
69
70
++ bind9-9.7.3.dfsg/debian/po/it.po
Line 0    Link Here 
0
-- bind9-9.7.3.dfsg.orig/debian/source/format
1
# translation of bind9_1:9.5.0.dfsg.P1-2_templates.po to Italian
2
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3
# This file is distributed under the same license as the PACKAGE package.
4
#
5
# Alex <animainvendita@gmail.com>, 2008.
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bind9_1:9.5.0.dfsg.P1-2_templates\n"
9
"Report-Msgid-Bugs-To: Source: bind9@packages.debian.org\n"
10
"POT-Creation-Date: 2008-06-13 16:56-0600\n"
11
"PO-Revision-Date: 2008-07-27 16:10+0200\n"
12
"Last-Translator: Alex <animainvendita@gmail.com>\n"
13
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"X-Generator: KBabel 1.11.4\n"
18
19
#. Type: string
20
#. Description
21
#: ../templates:1001
22
msgid "User account for running the BIND9 daemon:"
23
msgstr "Account utente con cui eseguire il demone BIND9:"
24
25
#. Type: string
26
#. Description
27
#: ../templates:1001
28
msgid ""
29
"The default is to run the BIND9 daemon (named) under the 'bind' user "
30
"account. To use a different account, please enter the appropriate username."
31
msgstr "L'opzione predefinita prevede l'esecuzione del demone BIND9 (named) utilizzando l'utente 'bind'. Se si desidera utilizzare un differente account utente, inserire il nome corrispondente."
32
33
#. Type: string
34
#. Description
35
#: ../templates:2001
36
msgid "Other startup options for named:"
37
msgstr "Altre opzioni di avvio per named:"
38
39
#. Type: string
40
#. Description
41
#: ../templates:2001
42
msgid ""
43
"Please provide any additional options (other than username) that should be "
44
"passed to the BIND9 daemon (named) on startup."
45
msgstr "Inserire qualsiasi opzione addizionale (differente dal nome utente) che dovrebbe essere inviata al demone BIND9 (named) durante l'avvio."
46
47
#. Type: boolean
48
#. Description
49
#: ../templates:3001
50
msgid "Should resolv.conf settings be overridden?"
51
msgstr "Si desidera non tener conto delle impostazioni in resolv.conf?"
52
53
#. Type: boolean
54
#. Description
55
#: ../templates:3001
56
msgid ""
57
"Please choose whether the resolver should be forced to use the local BIND9 "
58
"daemon (named) rather than what the current connection recommends, when this "
59
"machine moves around."
60
msgstr "Scegliere se si desidera forzare la risoluzione di tutte le query DNS con il demone BIND9 locale (named) non utilizzando i server raccomandati dalla connessione attiva."
61
62
++ bind9-9.7.3.dfsg/debian/source/format
Line 0    Link Here 
1
1.0

Return to bug 22478