intermediate changes

ref:fb7ad851ba1976a5ebbb58c649dad3fda69b7111

48 files changed, 26 insertions, 25 deletions

diff --git a/contrib/libs/libidn/c-ctype.c b/contrib/libs/libidn/lib/gl/c-ctype.c
index 984992e4ce..984992e4ce 100644
--- a/contrib/libs/libidn/c-ctype.c
+++ b/contrib/libs/libidn/lib/gl/c-ctype.c
diff --git a/contrib/libs/libidn/c-ctype.h b/contrib/libs/libidn/lib/gl/c-ctype.h
index 8775918e29..8775918e29 100644
--- a/contrib/libs/libidn/c-ctype.h
+++ b/contrib/libs/libidn/lib/gl/c-ctype.h
diff --git a/contrib/libs/libidn/c-strcase.h b/contrib/libs/libidn/lib/gl/c-strcase.h
index 6d92e2699a..6d92e2699a 100644
--- a/contrib/libs/libidn/c-strcase.h
+++ b/contrib/libs/libidn/lib/gl/c-strcase.h
diff --git a/contrib/libs/libidn/c-strcasecmp.c b/contrib/libs/libidn/lib/gl/c-strcasecmp.c
index 7c07aabc9b..7c07aabc9b 100644
--- a/contrib/libs/libidn/c-strcasecmp.c
+++ b/contrib/libs/libidn/lib/gl/c-strcasecmp.c
diff --git a/contrib/libs/libidn/gettext.h b/contrib/libs/libidn/lib/gl/gettext.h
index 9631f02870..9631f02870 100644
--- a/contrib/libs/libidn/gettext.h
+++ b/contrib/libs/libidn/lib/gl/gettext.h
diff --git a/contrib/libs/libidn/striconv.c b/contrib/libs/libidn/lib/gl/striconv.c
index 4969cfc953..4969cfc953 100644
--- a/contrib/libs/libidn/striconv.c
+++ b/contrib/libs/libidn/lib/gl/striconv.c
diff --git a/contrib/libs/libidn/striconv.h b/contrib/libs/libidn/lib/gl/striconv.h
index 3f1b107ea3..3f1b107ea3 100644
--- a/contrib/libs/libidn/striconv.h
+++ b/contrib/libs/libidn/lib/gl/striconv.h
diff --git a/contrib/libs/libidn/strverscmp.c b/contrib/libs/libidn/lib/gl/strverscmp.c
index 58002a66f1..58002a66f1 100644
--- a/contrib/libs/libidn/strverscmp.c
+++ b/contrib/libs/libidn/lib/gl/strverscmp.c
diff --git a/contrib/libs/libidn/strverscmp.h b/contrib/libs/libidn/lib/gl/strverscmp.h
index d95d7b31a7..d95d7b31a7 100644
--- a/contrib/libs/libidn/strverscmp.h
+++ b/contrib/libs/libidn/lib/gl/strverscmp.h
diff --git a/contrib/libs/libidn/gunibreak.h b/contrib/libs/libidn/lib/gunibreak.h
index 4f401bc069..4f401bc069 100644
--- a/contrib/libs/libidn/gunibreak.h
+++ b/contrib/libs/libidn/lib/gunibreak.h
diff --git a/contrib/libs/libidn/gunicomp.h b/contrib/libs/libidn/lib/gunicomp.h
index b5fa880169..b5fa880169 100644
--- a/contrib/libs/libidn/gunicomp.h
+++ b/contrib/libs/libidn/lib/gunicomp.h
diff --git a/contrib/libs/libidn/gunidecomp.h b/contrib/libs/libidn/lib/gunidecomp.h
index 1c48c21ef8..1c48c21ef8 100644
--- a/contrib/libs/libidn/gunidecomp.h
+++ b/contrib/libs/libidn/lib/gunidecomp.h
diff --git a/contrib/libs/libidn/idn-free.c b/contrib/libs/libidn/lib/idn-free.c
index cc68f834b1..cc68f834b1 100644
--- a/contrib/libs/libidn/idn-free.c
+++ b/contrib/libs/libidn/lib/idn-free.c
diff --git a/contrib/libs/libidn/idn-free.h b/contrib/libs/libidn/lib/idn-free.h
index e2be4bbb21..e2be4bbb21 100644
--- a/contrib/libs/libidn/idn-free.h
+++ b/contrib/libs/libidn/lib/idn-free.h
diff --git a/contrib/libs/libidn/idn-int.h b/contrib/libs/libidn/lib/idn-int.h
index 3aec0bbe67..3aec0bbe67 100644
--- a/contrib/libs/libidn/idn-int.h
+++ b/contrib/libs/libidn/lib/idn-int.h
diff --git a/contrib/libs/libidn/idn_config.h b/contrib/libs/libidn/lib/idn_config.h
index 6f616eebd2..6f616eebd2 100644
--- a/contrib/libs/libidn/idn_config.h
+++ b/contrib/libs/libidn/lib/idn_config.h
diff --git a/contrib/libs/libidn/idna.c b/contrib/libs/libidn/lib/idna.c
index af3f24d58e..af3f24d58e 100644
--- a/contrib/libs/libidn/idna.c
+++ b/contrib/libs/libidn/lib/idna.c
diff --git a/contrib/libs/libidn/idna.h b/contrib/libs/libidn/lib/idna.h
index afbfc737ca..afbfc737ca 100644
--- a/contrib/libs/libidn/idna.h
+++ b/contrib/libs/libidn/lib/idna.h
diff --git a/contrib/libs/libidn/nfkc.c b/contrib/libs/libidn/lib/nfkc.c
index 2bb2e62fbc..2bb2e62fbc 100644
--- a/contrib/libs/libidn/nfkc.c
+++ b/contrib/libs/libidn/lib/nfkc.c
diff --git a/contrib/libs/libidn/pr29.c b/contrib/libs/libidn/lib/pr29.c
index fc75267df4..fc75267df4 100644
--- a/contrib/libs/libidn/pr29.c
+++ b/contrib/libs/libidn/lib/pr29.c
diff --git a/contrib/libs/libidn/pr29.h b/contrib/libs/libidn/lib/pr29.h
index 03e6f46b2b..03e6f46b2b 100644
--- a/contrib/libs/libidn/pr29.h
+++ b/contrib/libs/libidn/lib/pr29.h
diff --git a/contrib/libs/libidn/profiles.c b/contrib/libs/libidn/lib/profiles.c
index f59305f058..f59305f058 100644
--- a/contrib/libs/libidn/profiles.c
+++ b/contrib/libs/libidn/lib/profiles.c
diff --git a/contrib/libs/libidn/punycode.c b/contrib/libs/libidn/lib/punycode.c
index 36ffee0aee..36ffee0aee 100644
--- a/contrib/libs/libidn/punycode.c
+++ b/contrib/libs/libidn/lib/punycode.c
diff --git a/contrib/libs/libidn/punycode.h b/contrib/libs/libidn/lib/punycode.h
index 03f6e481eb..03f6e481eb 100644
--- a/contrib/libs/libidn/punycode.h
+++ b/contrib/libs/libidn/lib/punycode.h
diff --git a/contrib/libs/libidn/rfc3454.c b/contrib/libs/libidn/lib/rfc3454.c
index 856b67a869..856b67a869 100644
--- a/contrib/libs/libidn/rfc3454.c
+++ b/contrib/libs/libidn/lib/rfc3454.c
diff --git a/contrib/libs/libidn/strerror-idna.c b/contrib/libs/libidn/lib/strerror-idna.c
index faf966af8b..faf966af8b 100644
--- a/contrib/libs/libidn/strerror-idna.c
+++ b/contrib/libs/libidn/lib/strerror-idna.c
diff --git a/contrib/libs/libidn/strerror-pr29.c b/contrib/libs/libidn/lib/strerror-pr29.c
index 6aca028359..6aca028359 100644
--- a/contrib/libs/libidn/strerror-pr29.c
+++ b/contrib/libs/libidn/lib/strerror-pr29.c
diff --git a/contrib/libs/libidn/strerror-punycode.c b/contrib/libs/libidn/lib/strerror-punycode.c
index 8048699956..8048699956 100644
--- a/contrib/libs/libidn/strerror-punycode.c
+++ b/contrib/libs/libidn/lib/strerror-punycode.c
diff --git a/contrib/libs/libidn/strerror-stringprep.c b/contrib/libs/libidn/lib/strerror-stringprep.c
index a57ae3a76a..a57ae3a76a 100644
--- a/contrib/libs/libidn/strerror-stringprep.c
+++ b/contrib/libs/libidn/lib/strerror-stringprep.c
diff --git a/contrib/libs/libidn/strerror-tld.c b/contrib/libs/libidn/lib/strerror-tld.c
index 5a81022456..5a81022456 100644
--- a/contrib/libs/libidn/strerror-tld.c
+++ b/contrib/libs/libidn/lib/strerror-tld.c
diff --git a/contrib/libs/libidn/stringprep.c b/contrib/libs/libidn/lib/stringprep.c
index ad9ff8b278..ad9ff8b278 100644
--- a/contrib/libs/libidn/stringprep.c
+++ b/contrib/libs/libidn/lib/stringprep.c
diff --git a/contrib/libs/libidn/stringprep.h b/contrib/libs/libidn/lib/stringprep.h
index 9b977d3142..9b977d3142 100644
--- a/contrib/libs/libidn/stringprep.h
+++ b/contrib/libs/libidn/lib/stringprep.h
diff --git a/contrib/libs/libidn/tld.c b/contrib/libs/libidn/lib/tld.c
index 4e894663fb..4e894663fb 100644
--- a/contrib/libs/libidn/tld.c
+++ b/contrib/libs/libidn/lib/tld.c
diff --git a/contrib/libs/libidn/tld.h b/contrib/libs/libidn/lib/tld.h
index a78798faaf..a78798faaf 100644
--- a/contrib/libs/libidn/tld.h
+++ b/contrib/libs/libidn/lib/tld.h
diff --git a/contrib/libs/libidn/tlds.c b/contrib/libs/libidn/lib/tlds.c
index 14263a4480..14263a4480 100644
--- a/contrib/libs/libidn/tlds.c
+++ b/contrib/libs/libidn/lib/tlds.c
diff --git a/contrib/libs/libidn/toutf8.c b/contrib/libs/libidn/lib/toutf8.c
index b4ac9c6d7c..b4ac9c6d7c 100644
--- a/contrib/libs/libidn/toutf8.c
+++ b/contrib/libs/libidn/lib/toutf8.c
diff --git a/contrib/libs/libidn/unix/ac-stdint.h b/contrib/libs/libidn/lib/unix/ac-stdint.h
index b80507276a..b80507276a 100644
--- a/contrib/libs/libidn/unix/ac-stdint.h
+++ b/contrib/libs/libidn/lib/unix/ac-stdint.h
diff --git a/contrib/libs/libidn/unix/config.h b/contrib/libs/libidn/lib/unix/config.h
index 0b4dad46a2..0b4dad46a2 100644
--- a/contrib/libs/libidn/unix/config.h
+++ b/contrib/libs/libidn/lib/unix/config.h
diff --git a/contrib/libs/libidn/unix/idn-int.h b/contrib/libs/libidn/lib/unix/idn-int.h
index 3339e2de1d..3339e2de1d 100644
--- a/contrib/libs/libidn/unix/idn-int.h
+++ b/contrib/libs/libidn/lib/unix/idn-int.h
diff --git a/contrib/libs/libidn/version.c b/contrib/libs/libidn/lib/version.c
index df72d11c2a..df72d11c2a 100644
--- a/contrib/libs/libidn/version.c
+++ b/contrib/libs/libidn/lib/version.c
diff --git a/contrib/libs/libidn/win/ac-stdint.h b/contrib/libs/libidn/lib/win/ac-stdint.h
index a3560eb49a..a3560eb49a 100644
--- a/contrib/libs/libidn/win/ac-stdint.h
+++ b/contrib/libs/libidn/lib/win/ac-stdint.h
diff --git a/contrib/libs/libidn/win/config.h b/contrib/libs/libidn/lib/win/config.h
index 8282ad9e6d..8282ad9e6d 100644
--- a/contrib/libs/libidn/win/config.h
+++ b/contrib/libs/libidn/lib/win/config.h
diff --git a/contrib/libs/libidn/win/idn-int.h b/contrib/libs/libidn/lib/win/idn-int.h
index 3339e2de1d..3339e2de1d 100644
--- a/contrib/libs/libidn/win/idn-int.h
+++ b/contrib/libs/libidn/lib/win/idn-int.h
diff --git a/contrib/libs/libidn/win/stdbool.h b/contrib/libs/libidn/lib/win/stdbool.h
index a4302b9d2c..a4302b9d2c 100644
--- a/contrib/libs/libidn/win/stdbool.h
+++ b/contrib/libs/libidn/lib/win/stdbool.h
diff --git a/contrib/libs/libidn/win/unistd.h b/contrib/libs/libidn/lib/win/unistd.h
index a0351cff2b..a0351cff2b 100644
--- a/contrib/libs/libidn/win/unistd.h
+++ b/contrib/libs/libidn/lib/win/unistd.h
diff --git a/contrib/libs/libidn/static/ya.make b/contrib/libs/libidn/static/ya.make
index a927d7918e..cff8b08182 100644
--- a/contrib/libs/libidn/static/ya.make
+++ b/contrib/libs/libidn/static/ya.make
@@ -24,7 +24,8 @@ NO_RUNTIME()
 NO_COMPILER_WARNINGS()
 
 ADDINCL(
-    contrib/libs/libidn
+    contrib/libs/libidn/lib
+    contrib/libs/libidn/lib/gl
 )
 
 CFLAGS(
@@ -46,27 +47,27 @@ ENDIF()
 SRCDIR(contrib/libs/libidn)
 
 SRCS(
-    idn-free.c
-    idna.c
-    nfkc.c
-    pr29.c
-    profiles.c
-    punycode.c
-    rfc3454.c
-    strerror-idna.c
-    strerror-pr29.c
-    strerror-punycode.c
-    strerror-stringprep.c
-    strerror-tld.c
-    stringprep.c
-    tld.c
-    tlds.c
-    toutf8.c
-    version.c
-    strverscmp.c
-    striconv.c
-    c-strcasecmp.c
-    c-ctype.c
+    lib/idn-free.c
+    lib/idna.c
+    lib/nfkc.c
+    lib/pr29.c
+    lib/profiles.c
+    lib/punycode.c
+    lib/rfc3454.c
+    lib/strerror-idna.c
+    lib/strerror-pr29.c
+    lib/strerror-punycode.c
+    lib/strerror-stringprep.c
+    lib/strerror-tld.c
+    lib/stringprep.c
+    lib/tld.c
+    lib/tlds.c
+    lib/toutf8.c
+    lib/version.c
+    lib/gl/strverscmp.c
+    lib/gl/striconv.c
+    lib/gl/c-strcasecmp.c
+    lib/gl/c-ctype.c
 )
 
 END()
diff --git a/library/cpp/unicode/punycode/punycode.cpp b/library/cpp/unicode/punycode/punycode.cpp
index 800d1f19fe..54edfe4579 100644
--- a/library/cpp/unicode/punycode/punycode.cpp
+++ b/library/cpp/unicode/punycode/punycode.cpp
@@ -1,6 +1,6 @@
 #include "punycode.h"
-#include <contrib/libs/libidn/idna.h>
-#include <contrib/libs/libidn/punycode.h>
+#include <contrib/libs/libidn/lib/idna.h>
+#include <contrib/libs/libidn/lib/punycode.h>
 #include <util/charset/wide.h>
 #include <util/generic/ptr.h>
 #include <util/generic/vector.h>
diff --git a/library/cpp/uri/assign.cpp b/library/cpp/uri/assign.cpp
index ae9125c727..622e70a542 100644
--- a/library/cpp/uri/assign.cpp
+++ b/library/cpp/uri/assign.cpp
@@ -1,7 +1,7 @@
 #include "uri.h"
 #include "parse.h"
 
-#include <contrib/libs/libidn/idna.h>
+#include <contrib/libs/libidn/lib/idna.h>
 
 #include <library/cpp/charset/recyr.hh>
 #include <util/charset/wide.h>