$ git diff --patch-with-stat --summary 4fa9bbd064df8435a16e6319d46a1385c7972919..8a2f658adac8e6cd80e79adfbf99998e20e56993
.abf.yml | 2 +-
libidn2-2.0.4-std3-ascii-rules.patch | 82 ------------------------------------
libidn2.spec | 8 ++--
3 files changed, 5 insertions(+), 87 deletions(-)
delete mode 100644 libidn2-2.0.4-std3-ascii-rules.patch
diff --git a/.abf.yml b/.abf.yml
index e3aa000..f4e77f1 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- libidn2-2.2.0.tar.lz: 48c9c74ef8e2029e807aa306dcaea251dfa183d9
+ libidn2-2.3.0.tar.lz: 49ff57f4d745f921c1fa25d2e9e97c7fd3b2bd5f
diff --git a/libidn2-2.0.4-std3-ascii-rules.patch b/libidn2-2.0.4-std3-ascii-rules.patch
deleted file mode 100644
index 006223e..0000000
--- a/libidn2-2.0.4-std3-ascii-rules.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 31b11be35dd841dc1a97c45321b22c3376b01031 Mon Sep 17 00:00:00 2001
-From: Tim Rühsen <tim.ruehsen@gmx.de>
-Date: Thu, 8 Feb 2018 12:52:06 +0100
-Subject: [PATCH] Fix STD3 ASCII rules
-
----
- lib/idna.c | 15 ++++++++++++++-
- lib/lookup.c | 5 ++++-
- tests/test-lookup.c | 9 ++++++++-
- 3 files changed, 26 insertions(+), 3 deletions(-)
-
-diff --git a/lib/idna.c b/lib/idna.c
-index 5434492..c961332 100644
---- a/lib/idna.c
-+++ b/lib/idna.c
-@@ -180,7 +180,20 @@ _idn2_label_test (int what, const uint32_t * label, size_t llen)
- size_t i;
- for (i = 0; i < llen; i++)
- if (_idn2_disallowed_p (label[i]))
-- return IDN2_DISALLOWED;
-+ {
-+ if ((what & (TEST_TRANSITIONAL | TEST_NONTRANSITIONAL)) &&
-+ (what & TEST_ALLOW_STD3_DISALLOWED))
-+ {
-+ IDNAMap map;
-+ get_idna_map (label[i], &map);
-+ if (map_is (&map, TR46_FLG_DISALLOWED_STD3_VALID) ||
-+ map_is (&map, TR46_FLG_DISALLOWED_STD3_MAPPED))
-+ continue;
-+
-+ }
-+
-+ return IDN2_DISALLOWED;
-+ }
- }
-
- if (what & TEST_CONTEXTJ)
-diff --git a/lib/lookup.c b/lib/lookup.c
-index 10b004f..9094aeb 100644
---- a/lib/lookup.c
-+++ b/lib/lookup.c
-@@ -89,7 +89,10 @@ label (const uint8_t * src, size_t srclen, uint8_t * dst, size_t * dstlen,
- TEST_DISALLOWED |
- TEST_CONTEXTJ_RULE |
- TEST_CONTEXTO_WITH_RULE |
-- TEST_UNASSIGNED | TEST_BIDI, p, plen);
-+ TEST_UNASSIGNED | TEST_BIDI |
-+ ((flags & IDN2_NONTRANSITIONAL) ? TEST_NONTRANSITIONAL : 0) |
-+ ((flags & IDN2_USE_STD3_ASCII_RULES) ? 0 : TEST_ALLOW_STD3_DISALLOWED),
-+ p, plen);
-
- if (rc != IDN2_OK)
- {
-diff --git a/tests/test-lookup.c b/tests/test-lookup.c
-index 03d8396..fb23427 100644
---- a/tests/test-lookup.c
-+++ b/tests/test-lookup.c
-@@ -814,13 +814,20 @@ static const struct idna idna[] = {
- },
- /* √.com */
- {"\xe2\x88\x9a.com", "xn--19g.com", IDN2_OK, IDN2_TRANSITIONAL},
-- /* domains with non-STD3 characters (removed by default when using TR46 transitional/non-trnasitional */
-+ /* domains with non-STD3 characters (removed by default when using TR46 transitional/non-transitional */
- {"_443._tcp.example.com", "_443._tcp.example.com", IDN2_OK, 0},
- {"_443._tcp.example.com", "_443._tcp.example.com", IDN2_OK, IDN2_TRANSITIONAL},
- {"_443._tcp.example.com", "_443._tcp.example.com", IDN2_OK, IDN2_NONTRANSITIONAL},
- {"_443._tcp.example.com", "443.tcp.example.com", IDN2_OK, IDN2_USE_STD3_ASCII_RULES|IDN2_NONTRANSITIONAL},
- {"_443._tcp.example.com", "443.tcp.example.com", IDN2_OK, IDN2_USE_STD3_ASCII_RULES|IDN2_TRANSITIONAL},
- {"_443._tcp.example.com", "_443._tcp.example.com", IDN2_OK, IDN2_USE_STD3_ASCII_RULES}, /* flag is ignored when not using TR46 */
-+ /* _üˆš */
-+ {"_\xc3\xbc", "xn--_-eha", IDN2_DISALLOWED, 0},
-+ {"_\xc3\xbc", "xn--_-eha", IDN2_OK, IDN2_TRANSITIONAL},
-+ {"_\xc3\xbc", "xn--_-eha", IDN2_OK, IDN2_NONTRANSITIONAL},
-+ {"_\xc3\xbc", "xn--tda", IDN2_OK, IDN2_USE_STD3_ASCII_RULES|IDN2_NONTRANSITIONAL},
-+ {"_\xc3\xbc", "xn--tda", IDN2_OK, IDN2_USE_STD3_ASCII_RULES|IDN2_TRANSITIONAL},
-+ {"_\xc3\xbc", "xn--_-eha", IDN2_DISALLOWED, IDN2_USE_STD3_ASCII_RULES}, /* flag is ignored when not using TR46 */
- };
-
- static int ok = 0, failed = 0;
---
-libgit2 0.26.0
-
diff --git a/libidn2.spec b/libidn2.spec
index 32d38a3..a67e7af 100644
--- a/libidn2.spec
+++ b/libidn2.spec
@@ -4,7 +4,7 @@
Summary: Library to support IDNA2008 internationalized domain names
Name: libidn2
-Version: 2.2.0
+Version: 2.3.0
Release: 1
License: LGPLv2+
Group: System/Libraries
@@ -13,7 +13,7 @@ Source0: http://ftp.gnu.org/gnu/libidn/%{name}-%{version}.tar.lz
Patch0: libidn2-2.0.0-rpath.patch
BuildRequires: lzip
BuildRequires: gettext-devel
-BuildRequires: libunistring-devel
+BuildRequires: pkgconfig(libunistring)
BuildRequires: texinfo
%description
@@ -89,11 +89,11 @@ rm -f %{buildroot}%{_datadir}/info/dir
# Remove example-only binaries for now
rm -f %{buildroot}%{_bindir}/{lookup,register}
+%find_lang libidn2
+
%check
make -C tests check
-%find_lang libidn2
-
%files -n idn2
%doc AUTHORS NEWS README.md COPYING COPYING.unicode
%{_bindir}/idn2