From 07858ee067f97282ebf3fa88ebd89138b550a00f Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Fri, 4 Jul 2014 14:00:15 +0200 Subject: [PATCH 1/7] Import of oldpackages/libidn Signed-off-by: Marcel Denia --- libs/libidn/Makefile | 59 +++++++++++++++++++ .../002-disable-po-docs-examples.patch | 22 +++++++ 2 files changed, 81 insertions(+) create mode 100644 libs/libidn/Makefile create mode 100644 libs/libidn/patches/002-disable-po-docs-examples.patch diff --git a/libs/libidn/Makefile b/libs/libidn/Makefile new file mode 100644 index 000000000..c23ce7088 --- /dev/null +++ b/libs/libidn/Makefile @@ -0,0 +1,59 @@ +# +# Copyright (C) 2009-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libidn +PKG_VERSION:=1.18 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@GNU/libidn +PKG_MD5SUM:=66f115347439f56386f37a3ad92c1da2 + +PKG_FIXUP:=autoreconf +PKG_REMOVE_FILES:=GNUmakefile aclocal.m4 + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/libidn + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Stringprep, Punycode and IDNA implementation + URL:=http://www.gnu.org/software/libidn/ +endef + +define Package/libidn/description + GNU Libidn is a fully documented implementation of the Stringprep, + Punycode and IDNA specifications. Libidn's purpose is to encode and + decode internationalized domain names. +endef + +TARGET_CFLAGS += $(FPIC) + +CONFIGURE_ARGS += \ + --enable-shared \ + --enable-static \ + +MAKE_FLAGS += \ + CC="$(TARGET_CC)" \ + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libidn.{a,so*} $(1)/usr/lib/ +endef + +define Package/libidn/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libidn.so.* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libidn)) diff --git a/libs/libidn/patches/002-disable-po-docs-examples.patch b/libs/libidn/patches/002-disable-po-docs-examples.patch new file mode 100644 index 000000000..817749ef1 --- /dev/null +++ b/libs/libidn/patches/002-disable-po-docs-examples.patch @@ -0,0 +1,22 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -16,7 +16,7 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see . + +-SUBDIRS = gl lib/gl lib po src doc gltests lib/gltests tests examples \ ++SUBDIRS = gl lib/gl lib src \ + java csharp + + EXTRA_DIST = cfg.mk maint.mk .clcopying +--- a/configure.ac ++++ b/configure.ac +@@ -46,8 +46,6 @@ gl_EARLY + AC_PROG_LIBTOOL + AM_MISSING_PROG(PERL, perl, $missing_dir) + AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) +-AM_GNU_GETTEXT(external) +-AM_GNU_GETTEXT_VERSION(0.17) + AM_ICONV + AM_PATH_LISPDIR + From 46ef95e2860e5227eb7406672b205752d67b31a8 Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Fri, 4 Jul 2014 14:00:48 +0200 Subject: [PATCH 2/7] libs/libidn: Add 010-fix-idn-error-usage.patch Signed-off-by: Marcel Denia --- .../patches/010-fix-idn-error-usage.patch | 119 ++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 libs/libidn/patches/010-fix-idn-error-usage.patch diff --git a/libs/libidn/patches/010-fix-idn-error-usage.patch b/libs/libidn/patches/010-fix-idn-error-usage.patch new file mode 100644 index 000000000..f07a42396 --- /dev/null +++ b/libs/libidn/patches/010-fix-idn-error-usage.patch @@ -0,0 +1,119 @@ +--- a/src/idn.c ++++ b/src/idn.c +@@ -171,7 +171,7 @@ main (int argc, char *argv[]) + (args_info.idna_to_unicode_given ? 1 : 0) + + (args_info.nfkc_given ? 1 : 0) != 1) + { +- error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified")); ++ error (0, 0, "%s", _("only one of -s, -e, -d, -a, -u or -n can be specified")); + usage (EXIT_FAILURE); + } + +@@ -182,7 +182,7 @@ main (int argc, char *argv[]) + fprintf (stderr, _("Charset `%s'.\n"), stringprep_locale_charset ()); + + if (!args_info.quiet_given && args_info.inputs_num == 0) +- fprintf (stderr, _("Type each input string on a line by itself, " ++ fprintf (stderr, "%s", _("Type each input string on a line by itself, " + "terminated by a newline character.\n")); + + do +@@ -197,7 +197,7 @@ main (int argc, char *argv[]) + if (feof (stdin)) + break; + +- error (EXIT_FAILURE, errno, _("input error")); ++ error (EXIT_FAILURE, errno, "%s", _("input error")); + } + + if (readbuf[strlen (readbuf) - 1] == '\n') +@@ -214,7 +214,7 @@ main (int argc, char *argv[]) + if (!q) + { + free (p); +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UTF-8 to UCS-4")); + } + +@@ -239,7 +239,7 @@ main (int argc, char *argv[]) + if (!q) + { + free (r); +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UTF-8 to UCS-4")); + } + +@@ -275,7 +275,7 @@ main (int argc, char *argv[]) + q = stringprep_utf8_to_ucs4 (p, -1, &len); + free (p); + if (!q) +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UTF-8 to UCS-4")); + + if (args_info.debug_given) +@@ -334,7 +334,7 @@ main (int argc, char *argv[]) + r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); + free (q); + if (!r) +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UCS-4 to UTF-8")); + + p = stringprep_utf8_to_locale (r); +@@ -358,7 +358,7 @@ main (int argc, char *argv[]) + q = stringprep_utf8_to_ucs4 (p, -1, NULL); + free (p); + if (!q) +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UCS-4 to UTF-8")); + + if (args_info.debug_given) +@@ -436,7 +436,7 @@ main (int argc, char *argv[]) + if (!q) + { + free (p); +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UCS-4 to UTF-8")); + } + +@@ -492,7 +492,7 @@ main (int argc, char *argv[]) + r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); + free (q); + if (!r) +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UTF-8 to UCS-4")); + + p = stringprep_utf8_to_locale (r); +@@ -521,7 +521,7 @@ main (int argc, char *argv[]) + if (!q) + { + free (p); +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UTF-8 to UCS-4")); + } + +@@ -535,7 +535,7 @@ main (int argc, char *argv[]) + r = stringprep_utf8_nfkc_normalize (p, -1); + free (p); + if (!r) +- error (EXIT_FAILURE, 0, _("could not do NFKC normalization")); ++ error (EXIT_FAILURE, 0, "%s", _("could not do NFKC normalization")); + + if (args_info.debug_given) + { +@@ -545,7 +545,7 @@ main (int argc, char *argv[]) + if (!q) + { + free (r); +- error (EXIT_FAILURE, 0, ++ error (EXIT_FAILURE, 0, "%s", + _("could not convert from UTF-8 to UCS-4")); + } + From 0f72ba34978589f70cecc8ed763d5c6af413c83b Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Fri, 4 Jul 2014 14:14:17 +0200 Subject: [PATCH 3/7] libs/libidn: Update to 1.28 Signed-off-by: Marcel Denia --- libs/libidn/Makefile | 4 +-- .../002-disable-po-docs-examples.patch | 6 ++-- .../patches/010-fix-idn-error-usage.patch | 32 +++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/libs/libidn/Makefile b/libs/libidn/Makefile index c23ce7088..e7254c29b 100644 --- a/libs/libidn/Makefile +++ b/libs/libidn/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libidn -PKG_VERSION:=1.18 +PKG_VERSION:=1.28 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/libidn -PKG_MD5SUM:=66f115347439f56386f37a3ad92c1da2 +PKG_MD5SUM:=43a6f14b16559e10a492acc65c4b0acc PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=GNUmakefile aclocal.m4 diff --git a/libs/libidn/patches/002-disable-po-docs-examples.patch b/libs/libidn/patches/002-disable-po-docs-examples.patch index 817749ef1..27a6f947e 100644 --- a/libs/libidn/patches/002-disable-po-docs-examples.patch +++ b/libs/libidn/patches/002-disable-po-docs-examples.patch @@ -11,12 +11,12 @@ EXTRA_DIST = cfg.mk maint.mk .clcopying --- a/configure.ac +++ b/configure.ac -@@ -46,8 +46,6 @@ gl_EARLY - AC_PROG_LIBTOOL +@@ -51,8 +51,6 @@ AC_PROG_LIBTOOL + # Checks for programs. AM_MISSING_PROG(PERL, perl, $missing_dir) AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) -AM_GNU_GETTEXT(external) --AM_GNU_GETTEXT_VERSION(0.17) +-AM_GNU_GETTEXT_VERSION(0.18.3) AM_ICONV AM_PATH_LISPDIR diff --git a/libs/libidn/patches/010-fix-idn-error-usage.patch b/libs/libidn/patches/010-fix-idn-error-usage.patch index f07a42396..9b7ab2cca 100644 --- a/libs/libidn/patches/010-fix-idn-error-usage.patch +++ b/libs/libidn/patches/010-fix-idn-error-usage.patch @@ -1,6 +1,6 @@ --- a/src/idn.c +++ b/src/idn.c -@@ -171,7 +171,7 @@ main (int argc, char *argv[]) +@@ -169,7 +169,7 @@ main (int argc, char *argv[]) (args_info.idna_to_unicode_given ? 1 : 0) + (args_info.nfkc_given ? 1 : 0) != 1) { @@ -9,16 +9,16 @@ usage (EXIT_FAILURE); } -@@ -182,7 +182,7 @@ main (int argc, char *argv[]) - fprintf (stderr, _("Charset `%s'.\n"), stringprep_locale_charset ()); - - if (!args_info.quiet_given && args_info.inputs_num == 0) +@@ -184,7 +184,7 @@ main (int argc, char *argv[]) + if (!args_info.quiet_given + && args_info.inputs_num == 0 + && isatty (fileno (stdin))) - fprintf (stderr, _("Type each input string on a line by itself, " + fprintf (stderr, "%s", _("Type each input string on a line by itself, " "terminated by a newline character.\n")); do -@@ -197,7 +197,7 @@ main (int argc, char *argv[]) +@@ -199,7 +199,7 @@ main (int argc, char *argv[]) if (feof (stdin)) break; @@ -27,7 +27,7 @@ } if (readbuf[strlen (readbuf) - 1] == '\n') -@@ -214,7 +214,7 @@ main (int argc, char *argv[]) +@@ -216,7 +216,7 @@ main (int argc, char *argv[]) if (!q) { free (p); @@ -36,7 +36,7 @@ _("could not convert from UTF-8 to UCS-4")); } -@@ -239,7 +239,7 @@ main (int argc, char *argv[]) +@@ -241,7 +241,7 @@ main (int argc, char *argv[]) if (!q) { free (r); @@ -45,7 +45,7 @@ _("could not convert from UTF-8 to UCS-4")); } -@@ -275,7 +275,7 @@ main (int argc, char *argv[]) +@@ -277,7 +277,7 @@ main (int argc, char *argv[]) q = stringprep_utf8_to_ucs4 (p, -1, &len); free (p); if (!q) @@ -54,7 +54,7 @@ _("could not convert from UTF-8 to UCS-4")); if (args_info.debug_given) -@@ -334,7 +334,7 @@ main (int argc, char *argv[]) +@@ -336,7 +336,7 @@ main (int argc, char *argv[]) r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); free (q); if (!r) @@ -63,7 +63,7 @@ _("could not convert from UCS-4 to UTF-8")); p = stringprep_utf8_to_locale (r); -@@ -358,7 +358,7 @@ main (int argc, char *argv[]) +@@ -360,7 +360,7 @@ main (int argc, char *argv[]) q = stringprep_utf8_to_ucs4 (p, -1, NULL); free (p); if (!q) @@ -72,7 +72,7 @@ _("could not convert from UCS-4 to UTF-8")); if (args_info.debug_given) -@@ -436,7 +436,7 @@ main (int argc, char *argv[]) +@@ -438,7 +438,7 @@ main (int argc, char *argv[]) if (!q) { free (p); @@ -81,7 +81,7 @@ _("could not convert from UCS-4 to UTF-8")); } -@@ -492,7 +492,7 @@ main (int argc, char *argv[]) +@@ -494,7 +494,7 @@ main (int argc, char *argv[]) r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL); free (q); if (!r) @@ -90,7 +90,7 @@ _("could not convert from UTF-8 to UCS-4")); p = stringprep_utf8_to_locale (r); -@@ -521,7 +521,7 @@ main (int argc, char *argv[]) +@@ -523,7 +523,7 @@ main (int argc, char *argv[]) if (!q) { free (p); @@ -99,7 +99,7 @@ _("could not convert from UTF-8 to UCS-4")); } -@@ -535,7 +535,7 @@ main (int argc, char *argv[]) +@@ -537,7 +537,7 @@ main (int argc, char *argv[]) r = stringprep_utf8_nfkc_normalize (p, -1); free (p); if (!r) @@ -108,7 +108,7 @@ if (args_info.debug_given) { -@@ -545,7 +545,7 @@ main (int argc, char *argv[]) +@@ -547,7 +547,7 @@ main (int argc, char *argv[]) if (!q) { free (r); From 4314527f2221e7f1678b7e57517aa95e5c70c3db Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Fri, 4 Jul 2014 14:17:05 +0200 Subject: [PATCH 4/7] libs/libidn: Bump copyright message Signed-off-by: Marcel Denia --- libs/libidn/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libidn/Makefile b/libs/libidn/Makefile index e7254c29b..ca106ffbd 100644 --- a/libs/libidn/Makefile +++ b/libs/libidn/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2010 OpenWrt.org +# Copyright (C) 2009-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. From 0e3181b5f27e9dabbc436fd33eb2f1b352a8adf5 Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sat, 5 Jul 2014 16:29:39 +0200 Subject: [PATCH 5/7] libs/libidn: Add myself as maintainer Signed-off-by: Marcel Denia --- libs/libidn/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libidn/Makefile b/libs/libidn/Makefile index ca106ffbd..9fc507f0f 100644 --- a/libs/libidn/Makefile +++ b/libs/libidn/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/libidn PKG_MD5SUM:=43a6f14b16559e10a492acc65c4b0acc - +PKG_MAINTAINER:=Marcel Denia PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=GNUmakefile aclocal.m4 From 48be96966604160a821839522862ad484d74b5cc Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sun, 6 Jul 2014 14:40:31 +0200 Subject: [PATCH 6/7] libs/libidn: Add licensing information Signed-off-by: Marcel Denia --- libs/libidn/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/libidn/Makefile b/libs/libidn/Makefile index 9fc507f0f..567cdda0a 100644 --- a/libs/libidn/Makefile +++ b/libs/libidn/Makefile @@ -14,10 +14,14 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/libidn PKG_MD5SUM:=43a6f14b16559e10a492acc65c4b0acc -PKG_MAINTAINER:=Marcel Denia + PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=GNUmakefile aclocal.m4 +PKG_LICENSE:=GPLv2 GPLv3 LGPLv2.1 LGPLv3 APACHEv2 +PKG_LICENSE_FILES:=COPYING COPYING.LESSERv2 COPYING.LESSERv3 COPYINGv2 COPYINGv3 java/LICENSE-2.0.txt +PKG_MAINTAINER:=Marcel Denia + PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk From 5f32fb454fd1385b46e1905dbde08f8950f314db Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sun, 6 Jul 2014 14:42:00 +0200 Subject: [PATCH 7/7] libs/libidn: Reorder stuff Signed-off-by: Marcel Denia --- libs/libidn/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libs/libidn/Makefile b/libs/libidn/Makefile index 567cdda0a..659b3f26c 100644 --- a/libs/libidn/Makefile +++ b/libs/libidn/Makefile @@ -15,13 +15,12 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/libidn PKG_MD5SUM:=43a6f14b16559e10a492acc65c4b0acc -PKG_FIXUP:=autoreconf -PKG_REMOVE_FILES:=GNUmakefile aclocal.m4 - PKG_LICENSE:=GPLv2 GPLv3 LGPLv2.1 LGPLv3 APACHEv2 -PKG_LICENSE_FILES:=COPYING COPYING.LESSERv2 COPYING.LESSERv3 COPYINGv2 COPYINGv3 java/LICENSE-2.0.txt +PKG_LICENSE_FILES:=COPYING COPYINGv2 COPYINGv3 COPYING.LESSERv2 COPYING.LESSERv3 java/LICENSE-2.0.txt PKG_MAINTAINER:=Marcel Denia +PKG_FIXUP:=autoreconf +PKG_REMOVE_FILES:=GNUmakefile aclocal.m4 PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk