summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Tkac <atkac@redhat.com>2012-12-20 14:40:30 +0100
committerAdam Tkac <atkac@redhat.com>2012-12-20 14:40:30 +0100
commit151d963a404cd70242aaaae38b15673b2f193a10 (patch)
tree163c38dbebd8f25a9a31952ddb3e4a9c12d49a02
parent0f7d49832f9d425653f62b4ec13235e5b998997e (diff)
Fix IDN related statement in dig.1 manpage
Signed-off-by: Adam Tkac <atkac@redhat.com>
-rw-r--r--bind.spec3
-rw-r--r--bind99-libidn4.patch14
2 files changed, 17 insertions, 0 deletions
diff --git a/bind.spec b/bind.spec
index 2cff571..9385a55 100644
--- a/bind.spec
+++ b/bind.spec
@@ -95,6 +95,7 @@ Patch73: bind-9.5-libidn.patch
Patch83: bind-9.5-libidn2.patch
Patch85: bind-9.5-libidn3.patch
Patch94: bind95-rh461409.patch
+Patch135:bind99-libidn4.patch
#
Requires(preun): systemd
@@ -314,6 +315,7 @@ cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
%patch132 -p1 -b .stat
%patch133 -p1 -b .rh640538
%patch134 -p1 -b .rh669163
+%patch135 -p1 -b .libidn4
# Sparc and s390 arches need to use -fPIE
%ifarch sparcv9 sparc64 s390 s390x
@@ -775,6 +777,7 @@ rm -rf ${RPM_BUILD_ROOT}
* Thu Dec 20 2012 Adam Tkac <atkac redhat com> 32:9.9.2-6.P1
- generate /etc/rndc.key during named service startup if doesn't exist
- increase startup timeout in systemd units to 90sec (default)
+- fix IDN related statement in dig.1 manpage
* Wed Dec 05 2012 Tomas Hozza <thozza@redhat.com> 32:9.9.2-5.P1
- update to bind-9.9.2-P1
diff --git a/bind99-libidn4.patch b/bind99-libidn4.patch
new file mode 100644
index 0000000..99c1f13
--- /dev/null
+++ b/bind99-libidn4.patch
@@ -0,0 +1,14 @@
+diff -up bind-9.7.0-P2/bin/dig/dig.docbook.rh811566 bind-9.7.0-P2/bin/dig/dig.docbook
+--- bind-9.7.0-P2/bin/dig/dig.docbook.rh811566 2012-06-20 15:50:03.206839118 +0200
++++ bind-9.7.0-P2/bin/dig/dig.docbook 2012-06-20 15:50:28.368558830 +0200
+@@ -912,8 +912,8 @@ dig +qr www.isc.org any -x 127.0.0.1 isc
+ <command>dig</command> appropriately converts character encoding of
+ domain name before sending a request to DNS server or displaying a
+ reply from the server.
+- If you'd like to turn off the IDN support for some reason, defines
+- the <envar>IDN_DISABLE</envar> environment variable.
++ If you'd like to turn off the IDN support for some reason, define
++ the <envar>CHARSET=ASCII</envar> environment variable.
+ The IDN support is disabled if the variable is set when
+ <command>dig</command> runs.
+ </para>