1916. [func] Integrate contibuted IDN code from JPNIC. [RT #15383]

diff --git a/CHANGES b/CHANGES
index bde9363751d0fd1a8ece5d30657c1ed2b96eea5c..f0e3299615cc53dfa60f2464530744f047163192 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1916.  [func]          Integrate contibuted IDN code from JPNIC. [RT #15383]
+
 1915.  [bug]           dig +ndots was broken. [RT #15215]
 
 1914.  [protocol]      DS is required to accept mnemonic algorithms

diff --git a/README.idnkit b/README.idnkit
new file mode 100644 (file)
index 0000000..bb20b68
--- /dev/null
+++ b/README.idnkit
@@ -0,0 +1,112 @@
+
+                       BIND-9 IDN patch
+
+              Japan Network Information Center (JPNIC)
+
+
+* What is this patch for?
+
+This patch adds internationalized domain name (IDN) support to BIND-9.
+You'll get internationalized version of dig/host/nslookup commands.
+
+    + internationalized dig/host/nslookup
+       dig/host/nslookup accepts non-ASCII domain names in the local
+       codeset (such as Shift JIS, Big5 or ISO8859-1) determined by
+       the locale information.  The domain names are normalized and
+       converted to the encoding on the DNS protocol, and sent to DNS
+       servers.  The replies are converted back to the local codeset
+       and displayed.
+
+
+* Compilation & installation
+
+0. Prerequisite
+
+You have to build and install idnkit before building this patched version
+of bind-9.
+
+1. Running configure script
+
+Run `configure' in the top directory.  See `README' for the
+configuration options.
+
+This patch adds the following 4 options to `configure'.  You should
+at least specify `--with-idn' option to enable IDN support.
+
+    --with-idn[=IDN_PREFIX]
+       To enable IDN support, you have to specify `--with-idn' option.
+       The argument IDN_PREFIX is the install prefix of idnkit.  If
+       IDN_PREFIX is omitted, PREFIX (derived from `--prefix=PREFIX')
+       is assumed.
+
+    --with-libiconv[=LIBICONV_PREFIX]
+       Specify this option if idnkit you have installed links GNU
+       libiconv.  The argument LIBICONV_PREFIX is install prefix of
+       GNU libiconv.  If the argument is omitted, PREFIX (derived
+       from `--prefix=PREFIX') is assumed.
+
+       `--with-libiconv' is shorthand option for GNU libiconv.
+
+           --with-libiconv=/usr/local
+
+       This is equivalent to:
+
+           --with-iconv='-L/usr/local/lib -R/usr/local/lib -liconv'
+
+       `--with-libiconv' assumes that your C compiler has `-R'
+       option, and that the option adds the specified run-time path
+       to an exacutable binary.  If `-R' option of your compiler has
+       different meaning, or your compiler lacks the option, you
+       should use `--with-iconv' option instead.  Binary command
+       without run-time path information might be unexecutable.
+       In that case, you would see an error message like:
+
+           error in loading shared libraries: libiconv.so.2: cannot
+           open shared object file
+
+       If both `--with-libiconv' and `--with-iconv' options are
+       specified, `--with-iconv' is prior to `--with-libiconv'.
+
+    --with-iconv=ICONV_LIBSPEC
+       If your libc doens't provide iconv(), you need to specify the
+       library containing iconv() with this option.  `ICONV_LIBSPEC'
+       is the argument(s) to `cc' or `ld' to link the library, for
+       example, `--with-iconv="-L/usr/local/lib -liconv"'.
+       You don't need to specify the header file directory for "iconv.h"
+       to the compiler, as it isn't included directly by bind-9 with
+       this patch.
+
+    --with-idnlib=IDN_LIBSPEC
+       With this option, you can explicitly specify the argument(s)
+       to `cc' or `ld' to link the idnkit's library, `libidnkit'.  If
+       this option is not specified, `-L${PREFIX}/lib -lidnkit' is
+       assumed, where ${PREFIX} is the installation prefix specified
+       with `--with-idn' option above.  You may need to use this
+       option to specify extra argments, for example,
+       `--with-idnlib="-L/usr/local/lib -R/usr/local/lib -lidnkit"'.
+
+Please consult `README' for other configuration options.
+
+Note that if you want to specify some extra header file directories,
+you should use the environment variable STD_CINCLUDES instead of
+CFLAGS, as described in README.
+
+2. Compilation and installation
+
+After running "configure", just do
+
+       make
+       make install
+
+for compiling and installing.
+
+
+* Contact information
+
+Please see http//www.nic.ad.jp/en/idn/ for the latest news
+about idnkit and this patch.
+
+Bug reports and comments on this kit should be sent to
+mdnkit-bugs@nic.ad.jp and idn-cmt@nic.ad.jp, respectively.
+
+; $Id: README.idnkit,v 1.2 2005/09/09 06:13:57 marka Exp $

diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index 624f9434fca8a0818146bee44233b44460448e9a..732993d1f3a86995e3778fcc09e100cfe239e050 100644 (file)
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.37 2004/08/16 04:20:58 marka Exp $
+# $Id: Makefile.in,v 1.38 2005/09/09 06:13:58 marka Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -45,7 +45,7 @@ DEPLIBS =     ${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} ${ISCCFGDEPLIBS} \
                ${LWRESDEPLIBS}
 
 LIBS =         ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCLIBS} \
-               ${ISCCFGLIBS} @LIBS@
+               ${ISCCFGLIBS} @IDNLIBS@ @LIBS@
 
 SUBDIRS =
 

diff --git a/config.h.in b/config.h.in
index d9c1dd256af763efb565edd8a237e43eaf0ab3a2..78e559c8a1b57aa40e739dd5790b41e1a81b1bf1 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h.in,v 1.70 2005/07/27 04:22:58 marka Exp $ */
+/* $Id: config.h.in,v 1.71 2005/09/09 06:13:57 marka Exp $ */
 
 /*! \file */
 
@@ -180,12 +180,18 @@ int sigwait(const unsigned int *set, int *sig);
 /* Define to 1 if you have the <linux/capability.h> header file. */
 #undef HAVE_LINUX_CAPABILITY_H
 
+/* Define to 1 if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
 /* Define to 1 if you have the <net/if6.h> header file. */
 #undef HAVE_NET_IF6_H
 
+/* Define to 1 if you have the `setlocale' function. */
+#undef HAVE_SETLOCALE
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -267,6 +273,9 @@ int sigwait(const unsigned int *set, int *sig);
    non-blocking. */
 #undef USE_FIONBIO_IOCTL
 
+/* define if idnkit support is to be included. */
+#undef WITH_IDN
+
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #undef WORDS_BIGENDIAN