rpms
/
libidn
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:i8c
Branches Tags
rpms:i9ce
rpms:i8c
rpms:c8
rpms:c9
rpms:epel9
...
pull from: rpms:epel9
Branches Tags
rpms:i9ce
rpms:i8c
rpms:c8
rpms:c9
rpms:epel9

No commits in common. 'i8c' and 'epel9' have entirely different histories.
i8c ... epel9

9 changed files with 156 additions and 807 deletions
Show Stats

3
.gitignore vendored
Unescape View File

@ -1 +1,2 @@
SOURCES/libidn-1.34.tar.gz
/libidn-1.??
/libidn-1.38.tar.gz

1
.libidn.metadata
Unescape View File

@ -1 +0,0 @@
8701e3d01df25431802ce483756ecad698156835 SOURCES/libidn-1.34.tar.gz

758
SOURCES/libidn-tablesize-revert.patch
Unescape View File

@ -1,758 +0,0 @@
This is a revert of
commit 518b72c7273278d24cb79ac1485972e42cf98ed4
Author: Tim Rühsen <tim.ruehsen@gmx.de>
Date: Thu Jun 29 12:52:57 2017 +0200
Increase speed of stringprep by ~20x
diff -up libidn-1.34/lib/Makefile.am.tablesize-revert libidn-1.34/lib/Makefile.am
--- libidn-1.34/lib/Makefile.am.tablesize-revert 2017-07-14 20:18:42.000000000 +0200
+++ libidn-1.34/lib/Makefile.am 2018-05-04 12:45:38.293778700 +0200
@@ -28,7 +28,7 @@ lib_LTLIBRARIES = libidn.la
idn_int = idn-int.h
-BUILT_SOURCES = $(idn_int) gunibreak.h gunicomp.h gunidecomp.h rfc3454.c rfc3454.h tlds.c
+BUILT_SOURCES = $(idn_int) gunibreak.h gunicomp.h gunidecomp.h rfc3454.c tlds.c
DISTCLEANFILES = $(idn_int)
include_HEADERS = stringprep.h idna.h punycode.h idn-free.h pr29.h
if TLD
@@ -46,7 +46,7 @@ idn-int.h:
libidn_la_SOURCES = libidn.map \
gunibreak.h gunicomp.h gunidecomp.h \
nfkc.c toutf8.c version.c \
- stringprep.h stringprep.c rfc3454.c rfc3454.h profiles.c \
+ stringprep.h stringprep.c rfc3454.c profiles.c \
punycode.h punycode.c \
idna.h idna.c \
pr29.h pr29.c \
@@ -82,7 +82,7 @@ SPEC = $(top_srcdir)/doc/specifications
#gunibreak.h gunicomp.h gunidecomp.h: gen-unicode-tables.pl $(SPEC)/UnicodeData-3.2.0.txt $(SPEC)/LineBreak-3.2.0.txt $(SPEC)/SpecialCasing-3.2.0.txt $(SPEC)/CaseFolding-3.2.0.txt $(SPEC)/CompositionExclusions-3.2.0.txt
# $(PERL) $(srcdir)/gen-unicode-tables.pl -decomp 3.2 $(SPEC)
-rfc3454.c rfc3454.h: gen-stringprep-tables.pl
+rfc3454.c: gen-stringprep-tables.pl
$(PERL) $(srcdir)/gen-stringprep-tables.pl $(SPEC)/rfc3454.txt
tlds.c: gen-tld-tables.pl
diff -up libidn-1.34/lib/gen-stringprep-tables.pl.tablesize-revert libidn-1.34/lib/gen-stringprep-tables.pl
--- libidn-1.34/lib/gen-stringprep-tables.pl.tablesize-revert 2017-06-29 21:11:13.000000000 +0200
+++ libidn-1.34/lib/gen-stringprep-tables.pl 2018-05-04 12:44:24.696588209 +0200
@@ -22,13 +22,11 @@ use strict;
my ($tab) = 59;
my ($intable) = 0;
-my ($entries) = 0;
my ($tablename);
my ($varname);
my ($starheader, $header);
my ($profile) = "rfc3454";
my ($filename) = "$profile.c";
-my ($headername) = "$profile.h";
my ($line, $start, $end, @map);
open(FH, ">$filename") or die "cannot open $filename for writing";
@@ -39,10 +37,6 @@ print FH " Instead, edit gen-stringpre
print FH "#include <config.h>\n";
print FH "#include \"stringprep.h\"\n";
-open(FHH, ">$headername") or die "cannot open $headername for writing";
-print FHH "/* This file is automatically generated. DO NOT EDIT!\n";
-print FHH " Instead, edit gen-stringprep-tables.pl and re-run. */\n\n";
-
while(<>) {
s/^ (.*)/$1/g; # for rfc
$line = $_;
@@ -53,11 +47,9 @@ while(<>) {
if ($intable && m,^----- End Table (.*) -----,) {
die "table error" unless $1 eq $tablename ||
($1 eq "C.1.2" && $tablename eq "C.1.1"); # Typo in draft
+ $intable = 0;
print FH " { 0 },\n";
print FH "};\n\n";
- print FHH "#define N_STRINGPREP_${profile}_${varname} ${entries}\n";
- $intable = 0;
- $entries = 0;
}
if (m,^[A-Z],) {
@@ -92,28 +84,27 @@ while(<>) {
die "tables tried to map a range" if $end && $map[0];
if ($map[3]) {
- printf FH " { 0x%06s, 0x%06s, { 0x%06s,%*s/* %s */\n 0x%06s, 0x%06s, 0x%06s }},\n",
- $start, $start, $map[0], $tab-length($line)-13, " ", $line,
+ printf FH " { 0x%06s, 0, { 0x%06s,%*s/* %s */\n 0x%06s, 0x%06s, 0x%06s }},\n",
+ $start, $map[0], $tab-length($line)-13, " ", $line,
$map[1], $map[2], $map[3];
} elsif ($map[2]) {
- printf FH " { 0x%06s, 0x%06s, { 0x%06s,%*s/* %s */\n 0x%06s, 0x%06s }},\n",
- $start, $start, $map[0], $tab-length($line)-14, " ", $line,
+ printf FH " { 0x%06s, 0, { 0x%06s,%*s/* %s */\n 0x%06s, 0x%06s }},\n",
+ $start, $map[0], $tab-length($line)-14, " ", $line,
$map[1], $map[2];
} elsif ($map[1]) {
- printf FH " { 0x%06s, 0x%06s, { 0x%06s,%*s/* %s */\n 0x%06s }},\n",
- $start, $start, $map[0], $tab-length($line)-14, " ", $line,
+ printf FH " { 0x%06s, 0, { 0x%06s,%*s/* %s */\n 0x%06s }},\n",
+ $start, $map[0], $tab-length($line)-14, " ", $line,
$map[1];
} elsif ($map[0]) {
- printf FH " { 0x%06s, 0x%06s, { 0x%06s }},%*s/* %s */\n",
- $start, $start, $map[0], $tab-length($line)-17, " ", $line;
+ printf FH " { 0x%06s, 0, { 0x%06s }},%*s/* %s */\n",
+ $start, $map[0], $tab-length($line)-17, " ", $line;
} elsif ($end) {
printf FH " { 0x%06s, 0x%06s },%*s/* %s */\n",
$start, $end, $tab-length($line)-11, " ", $line;
} else {
- printf FH " { 0x%06s, 0x%06s },%*s/* %s */\n",
- $start, $start, $tab-length($line)-11, " ", $line;
+ printf FH " { 0x%06s },%*s/* %s */\n",
+ $start, $tab-length($line)-11, " ", $line;
}
- $entries++;
} else {
$intable = 1 if !$intable;
$tablename = $1;
@@ -126,5 +117,4 @@ while(<>) {
}
}
-close FHH or die "cannot close $headername";
close FH or die "cannot close $filename";
diff -up libidn-1.34/lib/profiles.c.tablesize-revert libidn-1.34/lib/profiles.c
--- libidn-1.34/lib/profiles.c.tablesize-revert 2017-06-29 21:11:13.000000000 +0200
+++ libidn-1.34/lib/profiles.c 2018-05-04 12:44:24.696588209 +0200
@@ -29,7 +29,6 @@
#include <config.h>
#include "stringprep.h"
-#include "rfc3454.h"
const Stringprep_profiles stringprep_profiles[] = {
{"Nameprep", stringprep_nameprep},
@@ -44,219 +43,280 @@ const Stringprep_profiles stringprep_pro
{NULL, NULL}
};
-/* number of elements within an array */
-#define countof(a) (sizeof(a)/sizeof(*(a)))
-
-/* helper for profile definitions */
-#define TABLE(x) stringprep_rfc3454_##x, N_STRINGPREP_rfc3454_##x
-
const Stringprep_profile stringprep_nameprep[] = {
- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)},
- {STRINGPREP_MAP_TABLE, 0, TABLE(B_2)},
- {STRINGPREP_NFKC, 0, 0, 0},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)},
- {STRINGPREP_BIDI, 0, 0, 0},
- {STRINGPREP_BIDI_PROHIBIT_TABLE, ~STRINGPREP_NO_BIDI, TABLE(C_8)},
- {STRINGPREP_BIDI_RAL_TABLE, 0, TABLE(D_1)},
- {STRINGPREP_BIDI_L_TABLE, 0, TABLE(D_2)},
- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)},
+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1},
+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_2},
+ {STRINGPREP_NFKC, 0, 0},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9},
+ {STRINGPREP_BIDI, 0, 0},
+ {STRINGPREP_BIDI_PROHIBIT_TABLE, ~STRINGPREP_NO_BIDI,
+ stringprep_rfc3454_C_8},
+ {STRINGPREP_BIDI_RAL_TABLE, 0, stringprep_rfc3454_D_1},
+ {STRINGPREP_BIDI_L_TABLE, 0, stringprep_rfc3454_D_2},
+ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED,
+ stringprep_rfc3454_A_1},
{0}
};
const Stringprep_profile stringprep_kerberos5[] = {
/* XXX this is likely to be wrong as the specification is
a rough draft. */
- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)},
- {STRINGPREP_MAP_TABLE, 0, TABLE(B_3)},
- {STRINGPREP_NFKC, 0, 0, 0},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)},
- {STRINGPREP_BIDI, 0, 0, 0},
- {STRINGPREP_BIDI_PROHIBIT_TABLE, ~STRINGPREP_NO_BIDI, TABLE(C_8)},
- {STRINGPREP_BIDI_RAL_TABLE, 0, TABLE(D_1)},
- {STRINGPREP_BIDI_L_TABLE, 0, TABLE(D_2)},
- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)},
+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1},
+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_3},
+ {STRINGPREP_NFKC, 0, 0},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9},
+ {STRINGPREP_BIDI, 0, 0},
+ {STRINGPREP_BIDI_PROHIBIT_TABLE, ~STRINGPREP_NO_BIDI,
+ stringprep_rfc3454_C_8},
+ {STRINGPREP_BIDI_RAL_TABLE, 0, stringprep_rfc3454_D_1},
+ {STRINGPREP_BIDI_L_TABLE, 0, stringprep_rfc3454_D_2},
+ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED,
+ stringprep_rfc3454_A_1},
{0}
};
const Stringprep_table_element stringprep_xmpp_nodeprep_prohibit[] = {
- {0x000022, 0x000022}, /* #x22 (") */
- {0x000026, 0x000026}, /* #x26 (&) */
- {0x000027, 0x000027}, /* #x27 (') */
- {0x00002F, 0x00002F}, /* #x2F (/) */
- {0x00003A, 0x00003A}, /* #x3A (:) */
- {0x00003C, 0x00003C}, /* #x3C (<) */
- {0x00003E, 0x00003E}, /* #x3E (>) */
- {0x000040, 0x000040}, /* #x40 (@) */
+ {0x000022}, /* #x22 (") */
+ {0x000026}, /* #x26 (&) */
+ {0x000027}, /* #x27 (') */
+ {0x00002F}, /* #x2F (/) */
+ {0x00003A}, /* #x3A (:) */
+ {0x00003C}, /* #x3C (<) */
+ {0x00003E}, /* #x3E (>) */
+ {0x000040}, /* #x40 (@) */
{0}
};
const Stringprep_profile stringprep_xmpp_nodeprep[] = {
- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)},
- {STRINGPREP_MAP_TABLE, 0, TABLE(B_2)},
- {STRINGPREP_NFKC, 0, 0, 0},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_1)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)},
- {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_xmpp_nodeprep_prohibit,
- countof(stringprep_xmpp_nodeprep_prohibit) - 1},
- {STRINGPREP_BIDI, 0, 0, 0},
- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)},
- {STRINGPREP_BIDI_RAL_TABLE, 0, TABLE(D_1)},
- {STRINGPREP_BIDI_L_TABLE, 0, TABLE(D_2)},
- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)},
+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1},
+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_2},
+ {STRINGPREP_NFKC, 0, 0},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_1},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_xmpp_nodeprep_prohibit},
+ {STRINGPREP_BIDI, 0, 0},
+ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8},
+ {STRINGPREP_BIDI_RAL_TABLE, 0, stringprep_rfc3454_D_1},
+ {STRINGPREP_BIDI_L_TABLE, 0, stringprep_rfc3454_D_2},
+ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED,
+ stringprep_rfc3454_A_1},
{0}
};
const Stringprep_profile stringprep_xmpp_resourceprep[] = {
- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)},
- {STRINGPREP_NFKC, 0, 0, 0},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)},
- {STRINGPREP_BIDI, 0, 0, 0},
- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)},
- {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1)},
- {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2)},
- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)},
+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1},
+ {STRINGPREP_NFKC, 0, 0},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9},
+ {STRINGPREP_BIDI, 0, 0},
+ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8},
+ {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_1},
+ {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_2},
+ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED,
+ stringprep_rfc3454_A_1},
{0}
};
const Stringprep_profile stringprep_plain[] = {
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)},
- {STRINGPREP_BIDI, 0, 0, 0},
- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)},
- {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1)},
- {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2)},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9},
+ {STRINGPREP_BIDI, 0, 0},
+ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8},
+ {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_1},
+ {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_2},
{0}
};
const Stringprep_profile stringprep_trace[] = {
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)},
- {STRINGPREP_BIDI, 0, 0, 0},
- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)},
- {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1)},
- {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2)},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9},
+ {STRINGPREP_BIDI, 0, 0},
+ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8},
+ {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_1},
+ {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_2},
{0}
};
const Stringprep_table_element stringprep_iscsi_prohibit[] = {
- {0x0000, 0x002C}, /* [ASCII CONTROL CHARACTERS and SPACE through ,] */
- {0x002F, 0x002F}, /* [ASCII /] */
- {0x003B, 0x0040}, /* [ASCII ; through @] */
- {0x005B, 0x0060}, /* [ASCII [ through `] */
- {0x007B, 0x007F}, /* [ASCII { through DEL] */
- {0x3002, 0x3002}, /* ideographic full stop */
+ /* NB, since start == 0, we must have that end != 0 for the
+ end-of-table logic to work. */
+ {0x0000, 1}, /* [ASCII CONTROL CHARACTERS and SPACE through ,] */
+ {0x0001},
+ {0x0002},
+ {0x0003},
+ {0x0004},
+ {0x0005},
+ {0x0006},
+ {0x0007},
+ {0x0008},
+ {0x0009},
+ {0x000A},
+ {0x000B},
+ {0x000C},
+ {0x000D},
+ {0x000E},
+ {0x000F},
+ {0x0010},
+ {0x0011},
+ {0x0012},
+ {0x0013},
+ {0x0014},
+ {0x0015},
+ {0x0016},
+ {0x0017},
+ {0x0018},
+ {0x0019},
+ {0x001A},
+ {0x001B},
+ {0x001C},
+ {0x001D},
+ {0x001E},
+ {0x001F},
+ {0x0020},
+ {0x0021},
+ {0x0022},
+ {0x0023},
+ {0x0024},
+ {0x0025},
+ {0x0026},
+ {0x0027},
+ {0x0028},
+ {0x0029},
+ {0x002A},
+ {0x002B},
+ {0x002C},
+ {0x002F}, /* [ASCII /] */
+ {0x003B}, /* [ASCII ; through @] */
+ {0x003C},
+ {0x003D},
+ {0x003E},
+ {0x003F},
+ {0x0040},
+ {0x005B}, /* [ASCII [ through `] */
+ {0x005C},
+ {0x005D},
+ {0x005E},
+ {0x005F},
+ {0x0060},
+ {0x007B}, /* [ASCII { through DEL] */
+ {0x007C},
+ {0x007D},
+ {0x007E},
+ {0x007F},
+ {0x3002}, /* ideographic full stop */
{0}
};
const Stringprep_profile stringprep_iscsi[] = {
- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)},
- {STRINGPREP_MAP_TABLE, 0, TABLE(B_2)},
- {STRINGPREP_NFKC, 0, 0, 0},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_1)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)},
- {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_iscsi_prohibit, countof(stringprep_iscsi_prohibit) - 1},
- {STRINGPREP_BIDI, 0, 0, 0},
- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)},
- {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1)},
- {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2)},
- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)},
+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1},
+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_2},
+ {STRINGPREP_NFKC, 0, 0},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_1},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_iscsi_prohibit},
+ {STRINGPREP_BIDI, 0, 0},
+ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8},
+ {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_1},
+ {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_2},
+ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED,
+ stringprep_rfc3454_A_1},
{0}
};
const Stringprep_table_element stringprep_saslprep_space_map[] = {
- {0x00A0, 0x00A0, {0x0020}}, /* 00A0; NO-BREAK SPACE */
- {0x1680, 0x1680, {0x0020}}, /* 1680; OGHAM SPACE MARK */
- {0x2000, 0x200B, {0x0020}}, /* 2000; EN QUAD */
- /* 2001; EM QUAD */
- /* 2002; EN SPACE */
- /* 2003; EM SPACE */
- /* 2004; THREE-PER-EM SPACE */
- /* 2005; FOUR-PER-EM SPACE */
- /* 2006; SIX-PER-EM SPACE */
- /* 2007; FIGURE SPACE */
- /* 2008; PUNCTUATION SPACE */
- /* 2009; THIN SPACE */
- /* 200A; HAIR SPACE */
- /* 200B; ZERO WIDTH SPACE */
- {0x202F, 0x202F, {0x0020}}, /* 202F; NARROW NO-BREAK SPACE */
- {0x205F, 0x205F, {0x0020}}, /* 205F; MEDIUM MATHEMATICAL SPACE */
- {0x3000, 0x3000, {0x0020}}, /* 3000; IDEOGRAPHIC SPACE */
+ {0x0000A0, 0, {0x0020}}, /* 00A0; NO-BREAK SPACE */
+ {0x001680, 0, {0x0020}}, /* 1680; OGHAM SPACE MARK */
+ {0x002000, 0, {0x0020}}, /* 2000; EN QUAD */
+ {0x002001, 0, {0x0020}}, /* 2001; EM QUAD */
+ {0x002002, 0, {0x0020}}, /* 2002; EN SPACE */
+ {0x002003, 0, {0x0020}}, /* 2003; EM SPACE */
+ {0x002004, 0, {0x0020}}, /* 2004; THREE-PER-EM SPACE */
+ {0x002005, 0, {0x0020}}, /* 2005; FOUR-PER-EM SPACE */
+ {0x002006, 0, {0x0020}}, /* 2006; SIX-PER-EM SPACE */
+ {0x002007, 0, {0x0020}}, /* 2007; FIGURE SPACE */
+ {0x002008, 0, {0x0020}}, /* 2008; PUNCTUATION SPACE */
+ {0x002009, 0, {0x0020}}, /* 2009; THIN SPACE */
+ {0x00200A, 0, {0x0020}}, /* 200A; HAIR SPACE */
+ {0x00200B, 0, {0x0020}}, /* 200B; ZERO WIDTH SPACE */
+ {0x00202F, 0, {0x0020}}, /* 202F; NARROW NO-BREAK SPACE */
+ {0x00205F, 0, {0x0020}}, /* 205F; MEDIUM MATHEMATICAL SPACE */
+ {0x003000, 0, {0x0020}}, /* 3000; IDEOGRAPHIC SPACE */
{0}
};
const Stringprep_profile stringprep_saslprep[] = {
- {STRINGPREP_MAP_TABLE, 0, stringprep_saslprep_space_map, countof(stringprep_saslprep_space_map) - 1},
- {STRINGPREP_MAP_TABLE, 0, TABLE(B_1)},
- {STRINGPREP_NFKC, 0, 0, 0},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8)},
- {STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9)},
- {STRINGPREP_BIDI, 0, 0, 0},
- {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8)},
- {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1)},
- {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2)},
- {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1)},
+ {STRINGPREP_MAP_TABLE, 0, stringprep_saslprep_space_map},
+ {STRINGPREP_MAP_TABLE, 0, stringprep_rfc3454_B_1},
+ {STRINGPREP_NFKC, 0, 0},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_1_2},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_1},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_2_2},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_3},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_4},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_5},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_6},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_7},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8},
+ {STRINGPREP_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_9},
+ {STRINGPREP_BIDI, 0, 0},
+ {STRINGPREP_BIDI_PROHIBIT_TABLE, 0, stringprep_rfc3454_C_8},
+ {STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_1},
+ {STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, stringprep_rfc3454_D_2},
+ {STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED,
+ stringprep_rfc3454_A_1},
{0}
};
diff -up libidn-1.34/lib/stringprep.c.tablesize-revert libidn-1.34/lib/stringprep.c
--- libidn-1.34/lib/stringprep.c.tablesize-revert 2017-07-12 21:40:56.000000000 +0200
+++ libidn-1.34/lib/stringprep.c 2018-05-04 12:44:24.697588211 +0200
@@ -36,20 +36,9 @@
#include "stringprep.h"
-static int
-_compare_table_element (const uint32_t * c, const Stringprep_table_element * e)
-{
- if (*c < e->start)
- return -1;
- if (*c > e->end)
- return 1;
- return 0;
-}
-
static ssize_t
stringprep_find_character_in_table (uint32_t ucs4,
- const Stringprep_table_element * table,
- size_t table_size)
+ const Stringprep_table_element * table)
{
/* This is where typical uses of Libidn spends very close to all CPU
time and causes most cache misses. One could easily do a binary
@@ -57,17 +46,8 @@ stringprep_find_character_in_table (uint
slowness is at all relevant in typical applications. (I don't
dispute optimization may improve matters significantly, I'm
mostly interested in having someone give real-world benchmark on
- the impact of libidn.)
- *
- * Answer (Tim Rühsen rockdaboot@gmx.de):
- * Testing the fuzz corpora just once via make check takes ~54 billion CPU cycles.
- * That is almost 20s on my Intel i3 3.1GHz !!!
- * That even makes fuzzing almost useless, eating up CPU cycles for nothing.
- *
- * The bsearch() approach takes ~3 billion CPU cycles.
- * Almost a factor of 20 faster (but still pretty slow).
- * There are still ~2 million calls to bsearch() which make ~30% of CPU time used.
- * Most time is spent in _g_utf8_normalize_wc().
+ the impact of libidn.) */
+
ssize_t i;
@@ -75,27 +55,21 @@ stringprep_find_character_in_table (uint
if (ucs4 >= table[i].start &&
ucs4 <= (table[i].end ? table[i].end : table[i].start))
return i;
- */
-
- const Stringprep_table_element * p =
- bsearch (&ucs4, table, table_size, sizeof(Stringprep_table_element),
- (int (*)(const void *, const void *)) _compare_table_element);
- return p ? (p - table) : -1;
+ return -1;
}
static ssize_t
stringprep_find_string_in_table (uint32_t * ucs4,
size_t ucs4len,
size_t * tablepos,
- const Stringprep_table_element * table,
- size_t table_size)
+ const Stringprep_table_element * table)
{
size_t j;
ssize_t pos;
for (j = 0; j < ucs4len; j++)
- if ((pos = stringprep_find_character_in_table (ucs4[j], table, table_size)) != -1)
+ if ((pos = stringprep_find_character_in_table (ucs4[j], table)) != -1)
{
if (tablepos)
*tablepos = pos;
@@ -109,8 +83,7 @@ static int
stringprep_apply_table_to_string (uint32_t * ucs4,
size_t * ucs4len,
size_t maxucs4len,
- const Stringprep_table_element * table,
- size_t table_size)
+ const Stringprep_table_element * table)
{
ssize_t pos;
size_t i, maplen;
@@ -118,7 +91,7 @@ stringprep_apply_table_to_string (uint32
size_t srclen = *ucs4len; /* length of unprocessed data */
while ((pos = stringprep_find_string_in_table (src, srclen,
- &i, table, table_size)) != -1)
+ &i, table)) != -1)
{
for (maplen = STRINGPREP_MAX_MAP_CHARS;
maplen > 0 && table[i].map[maplen - 1] == 0; maplen--)
@@ -220,7 +193,7 @@ stringprep_4i (uint32_t * ucs4, size_t *
case STRINGPREP_PROHIBIT_TABLE:
k = stringprep_find_string_in_table (ucs4, ucs4len,
- NULL, profile[i].table, profile[i].table_size);
+ NULL, profile[i].table);
if (k != -1)
return STRINGPREP_CONTAINS_PROHIBITED;
break;
@@ -231,7 +204,7 @@ stringprep_4i (uint32_t * ucs4, size_t *
if (flags & STRINGPREP_NO_UNASSIGNED)
{
k = stringprep_find_string_in_table
- (ucs4, ucs4len, NULL, profile[i].table, profile[i].table_size);
+ (ucs4, ucs4len, NULL, profile[i].table);
if (k != -1)
return STRINGPREP_CONTAINS_UNASSIGNED;
}
@@ -241,7 +214,7 @@ stringprep_4i (uint32_t * ucs4, size_t *
if (UNAPPLICAPLEFLAGS (flags, profile[i].flags))
break;
rc = stringprep_apply_table_to_string
- (ucs4, &ucs4len, maxucs4len, profile[i].table, profile[i].table_size);
+ (ucs4, &ucs4len, maxucs4len, profile[i].table);
if (rc != STRINGPREP_OK)
return rc;
break;
@@ -265,7 +238,7 @@ stringprep_4i (uint32_t * ucs4, size_t *
done_prohibited = 1;
k = stringprep_find_string_in_table (ucs4, ucs4len,
NULL,
- profile[j].table, profile[j].table_size);
+ profile[j].table);
if (k != -1)
return STRINGPREP_BIDI_CONTAINS_PROHIBITED;
}
@@ -273,14 +246,14 @@ stringprep_4i (uint32_t * ucs4, size_t *
{
done_ral = 1;
if (stringprep_find_string_in_table
- (ucs4, ucs4len, NULL, profile[j].table, profile[j].table_size) != -1)
+ (ucs4, ucs4len, NULL, profile[j].table) != -1)
contains_ral = j;
}
else if (profile[j].operation == STRINGPREP_BIDI_L_TABLE)
{
done_l = 1;
if (stringprep_find_string_in_table
- (ucs4, ucs4len, NULL, profile[j].table, profile[j].table_size) != -1)
+ (ucs4, ucs4len, NULL, profile[j].table) != -1)
contains_l = j;
}
@@ -293,9 +266,9 @@ stringprep_4i (uint32_t * ucs4, size_t *
if (contains_ral != SIZE_MAX)
{
if (!(stringprep_find_character_in_table
- (ucs4[0], profile[contains_ral].table, profile[contains_ral].table_size) != -1 &&
+ (ucs4[0], profile[contains_ral].table) != -1 &&
stringprep_find_character_in_table
- (ucs4[ucs4len - 1], profile[contains_ral].table, profile[contains_ral].table_size) != -1))
+ (ucs4[ucs4len - 1], profile[contains_ral].table) != -1))
return STRINGPREP_BIDI_LEADTRAIL_NOT_RAL;
}
}
diff -up libidn-1.34/lib/stringprep.h.tablesize-revert libidn-1.34/lib/stringprep.h
--- libidn-1.34/lib/stringprep.h.tablesize-revert 2017-06-29 21:11:13.000000000 +0200
+++ libidn-1.34/lib/stringprep.h 2018-05-04 12:44:24.697588211 +0200
@@ -110,7 +110,6 @@ extern "C"
Stringprep_profile_steps operation;
Stringprep_profile_flags flags;
const Stringprep_table_element *table;
- size_t table_size;
};
typedef struct Stringprep_table Stringprep_profile;

10
SOURCES/libidn-1.33-Allow-disabling-Emacs-support.patch → libidn-emacsopt.patch
Unescape View File

@ -19,14 +19,14 @@ diff --git a/configure.ac b/configure.ac
index 649ddcd..a6dc9ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,6 @@ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
AM_GNU_GETTEXT(external)
AM_GNU_GETTEXT_VERSION(0.19.3)
@@ -51,7 +51,6 @@ LT_INIT([win32-dll])
AM_MISSING_PROG(PERL, perl, $missing_dir)
AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
AM_ICONV
-AM_PATH_LISPDIR
if test "$am_cv_func_iconv" != "yes"; then
AC_MSG_NOTICE([
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.19.3])
@@ -100,6 +99,14 @@ AM_CONDITIONAL(JAVA, test "$enable_java" != "no")
AC_MSG_CHECKING([if implementation in Java should be built])
AC_MSG_RESULT($enable_java)

118
SPECS/libidn.spec → libidn.spec
Unescape View File

@ -1,33 +1,30 @@
# Build with Emacs support
%bcond_without libidn_enables_emacs
# Build with Java support
%bcond_with libidn_enables_java
%bcond_without libidn_enables_java
Summary: Internationalized Domain Name support library
Name: libidn
Version: 1.34
Release: 5%{?dist}
Version: 1.38
Release: 4%{?dist}
URL: http://www.gnu.org/software/libidn/
License: LGPLv2+ and GPLv3+ and GFDL
Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz
# Allow disabling Emacs support
Patch0: libidn-1.33-Allow-disabling-Emacs-support.patch
# Fix ABI compatibility with libidn-1.33 and earlier
Patch1: libidn-tablesize-revert.patch
Patch0: libidn-emacsopt.patch
BuildRequires: autoconf
BuildRequires: autoconf autoconf-archive
BuildRequires: automake
BuildRequires: libtool
BuildRequires: texinfo
BuildRequires: gcc
BuildRequires: gettext gettext-devel
BuildRequires: gtk-doc
%if %{with libidn_enables_emacs}
BuildRequires: emacs
%endif
BuildRequires: pkgconfig
BuildRequires: help2man
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
# gnulib is a copylib, bundling is allowed
Provides: bundled(gnulib)
%if %{with libidn_enables_emacs}
@ -57,9 +54,9 @@ developing programs which use the GNU libidn library.
Summary: Java port of the GNU Libidn library
BuildRequires: java-devel
BuildRequires: javapackages-local
BuildRequires: mvn(com.google.code.findbugs:annotations)
BuildRequires: mvn(com.google.guava:guava)
BuildRequires: mvn(junit:junit)
BuildRequires: make
BuildArch: noarch
%description java
@ -79,8 +76,7 @@ This package contains javadoc for %{name}-java.
%prep
%setup -q
%patch0 -p1
%patch1 -p1 -b .tablesize-revert
%patch0 -p1 -b .emacsopt
autoreconf -vif
# Prevent from regenerating sources by gengetopt because it's broken.
touch src/idn_cmd.c src/idn_cmd.h
@ -92,13 +88,10 @@ find . -name '*.class' -print -delete
%if %{with libidn_enables_java}
# Not available test dep
%pom_remove_dep com.google.caliper:caliper java/pom.xml.in
%endif
# Name directory sections consistently in the info file, #209491
sed -i '/^INFO-DIR-SECTION/{s/GNU Libraries/Libraries/;s/GNU utilities/Utilities/;}' doc/libidn.info
iconv -f ISO-8859-1 -t UTF-8 doc/libidn.info > iconv.tmp
mv iconv.tmp doc/libidn.info
# Unused dependency
%pom_remove_dep com.google.code.findbugs:annotations java/pom.xml.in
%endif
%build
%configure --disable-csharp --disable-static \
@ -121,22 +114,22 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
# without RPATH this needs to be set for idn executed by help2man
export LD_LIBRARY_PATH=$(pwd)/lib/.libs
make %{?_smp_mflags} V=1
%make_build
%check
# without RPATH this needs to be set to test the compiled library
export LD_LIBRARY_PATH=$(pwd)/lib/.libs
make %{?_smp_mflags} -C tests check VALGRIND=env
%make_build -C tests check VALGRIND=env
%install
make install DESTDIR=$RPM_BUILD_ROOT pkgconfigdir=%{_libdir}/pkgconfig \
%make_install pkgconfigdir=%{_libdir}/pkgconfig \
%if %{with libidn_enables_java}
libidn_jardir=%{_javadir} \
%endif
;
# provide more examples
make %{?_smp_mflags} -C examples distclean
%make_build -C examples distclean
# clean up docs
find doc -name "Makefile*" | xargs rm
@ -155,7 +148,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \
%if %{with libidn_enables_java}
# regenerate java documentation
rm -rf doc/java/*
%javadoc -source 1.6 -d doc/java $(find java/src/main/java -name "*.java")
%javadoc -d doc/java $(find java/src/main/java -name "*.java")
# generate maven depmap
rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar
%mvn_artifact java/pom.xml java/libidn-%{version}.jar
@ -165,16 +158,7 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar
%find_lang %{name}
%post
/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
%?ldconfig
%preun
if [ $1 = 0 ]; then
/sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
fi
%ldconfig_postun
%ldconfig_scriptlets
%files -f %{name}.lang
%{!?_licensedir:%global license %%doc}
@ -182,14 +166,14 @@ fi
%doc AUTHORS NEWS FAQ README THANKS
%{_bindir}/idn
%{_mandir}/man1/idn.1*
%{_libdir}/libidn.so.11*
%{_infodir}/%{name}.info.gz
%{_libdir}/libidn.so.12*
%{_infodir}/%{name}.info*
%if %{with libidn_enables_emacs}
%{_emacs_sitelispdir}/%{name}
%endif
%files devel
%doc doc/libidn.html examples
%doc examples
%{_libdir}/libidn.so
%{_includedir}/*.h
%{_libdir}/pkgconfig/*.pc
@ -204,14 +188,64 @@ fi
%endif
%changelog
* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1.34-5
- Rebuilt for MSVSphere 8.8
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.38-4
- Rebuilt for java-17-openjdk as system jdk
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.38-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Dec 02 2021 Miroslav Lichvar <mlichvar@redhat.com> - 1.38-2
- fix building with new java
* Mon Jul 26 2021 Miroslav Lichvar <mlichvar@redhat.com> - 1.38-1
- update to 1.38
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jun 01 2021 Richard Fearn <richardfearn@gmail.com> - 1.37-2
- Remove unnecessary findbugs dependency (#1966769)
* Mon May 17 2021 Miroslav Lichvar <mlichvar@redhat.com> - 1.37-1
- update to 1.37
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.36-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
- add gtk-doc to build requirements (#1942967)
* Tue Jul 28 2020 Miroslav Lichvar <mlichvar@redhat.com> - 1.36-1
- update to 1.36
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.35-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.35-9
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Thu Jun 25 2020 Miroslav Lichvar <mlichvar@redhat.com> - 1.35-8
- fix build with JDK11
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.35-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.35-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.35-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Sep 18 2018 Owen Taylor <otaylor@redhat.com> - 1.35-4
- Handle uncompressed info pages
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.35-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed May 30 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.34-5
- disable Java support (#1584067)
* Thu Jun 21 2018 Miroslav Lichvar <mlichvar@redhat.com> - 1.35-2
- drop obsolete fixes of info file
- drop obsolete install-info scriptlets
* Tue May 22 2018 Miroslav Lichvar <mlichvar@redhat.com> - 1.34-4
- fix building with no libidn in build root (#1580762)
* Tue May 15 2018 Miroslav Lichvar <mlichvar@redhat.com> - 1.35-1
- update to 1.35
* Mon May 14 2018 Miroslav Lichvar <mlichvar@redhat.com> - 1.34-3
- ignore install-info errors in post scriptlet (#1573966)

1
mirrors
Unescape View File

@ -0,0 +1 @@
http://ftp.gnu.org/gnu/libidn/

1
sources
Unescape View File

@ -0,0 +1 @@
SHA512 (libidn-1.38.tar.gz) = 5e59b2263fde44d1463b47b516347b17a4e3e3696ebba66ab5fe464d567e2ec81f769fa7cf72ed51cfb501e32221813bb375373713a47e2f599fc6122850e419

1
upstream
Unescape View File

@ -0,0 +1 @@
libidn-1.29.tar.gz

70
upstream-key.gpg
Unescape View File

@ -0,0 +1,70 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.3.90-cvs (GNU/Linux)
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
=pOF7
-----END PGP PUBLIC KEY BLOCK-----
Write Preview
Loading…
Cancel
Save