From 396af9e2c8a8b7ad8d49566350d79f05898734a7 Mon Sep 17 00:00:00 2001 From: Constantin Musca Date: Fri, 24 Aug 2012 13:07:31 +0300 Subject: wget: upgrade to 1.14 remove-gets.patch: removed - included in the new version Signed-off-by: Constantin Musca Signed-off-by: Saul Wold --- .../wget/wget-1.13.4/fix_makefile.patch | 46 ---------------------- .../wget/wget-1.13.4/remove-gets.patch | 23 ----------- .../wget/wget-1.14/fix_makefile.patch | 46 ++++++++++++++++++++++ meta/recipes-extended/wget/wget_1.13.4.bb | 10 ----- meta/recipes-extended/wget/wget_1.14.bb | 9 +++++ 5 files changed, 55 insertions(+), 79 deletions(-) delete mode 100644 meta/recipes-extended/wget/wget-1.13.4/fix_makefile.patch delete mode 100644 meta/recipes-extended/wget/wget-1.13.4/remove-gets.patch create mode 100644 meta/recipes-extended/wget/wget-1.14/fix_makefile.patch delete mode 100644 meta/recipes-extended/wget/wget_1.13.4.bb create mode 100644 meta/recipes-extended/wget/wget_1.14.bb (limited to 'meta') diff --git a/meta/recipes-extended/wget/wget-1.13.4/fix_makefile.patch b/meta/recipes-extended/wget/wget-1.13.4/fix_makefile.patch deleted file mode 100644 index b76a017df6..0000000000 --- a/meta/recipes-extended/wget/wget-1.13.4/fix_makefile.patch +++ /dev/null @@ -1,46 +0,0 @@ - -Upstream-Status: Pending - -Signed-off-by: Saul Wold - -Index: wget-1.12/po/Makefile.in.in -=================================================================== ---- wget-1.12.orig/po/Makefile.in.in 2009-09-04 09:31:54.000000000 -0700 -+++ wget-1.12/po/Makefile.in.in 2011-10-19 20:32:53.714812160 -0700 -@@ -8,8 +8,8 @@ - # Please note that the actual code of GNU gettext is covered by the GNU - # General Public License and is *not* in the public domain. - # --# Origin: gettext-0.17 --GETTEXT_MACRO_VERSION = 0.17 -+# Origin: gettext-0.18 -+GETTEXT_MACRO_VERSION = 0.18 - - PACKAGE = @PACKAGE@ - VERSION = @VERSION@ -Index: wget-1.12/configure.ac -=================================================================== ---- wget-1.12.orig/configure.ac 2009-09-22 09:39:49.000000000 -0700 -+++ wget-1.12/configure.ac 2011-10-19 20:32:53.714812160 -0700 -@@ -110,7 +110,7 @@ - dnl Gettext - dnl - AM_GNU_GETTEXT([external],[need-ngettext]) --AM_GNU_GETTEXT_VERSION([0.17]) -+AM_GNU_GETTEXT_VERSION([0.18]) - - AC_PROG_RANLIB - -Index: wget-1.12/m4/po.m4 -=================================================================== ---- wget-1.12.orig/m4/po.m4 2009-09-04 09:31:54.000000000 -0700 -+++ wget-1.12/m4/po.m4 2011-10-19 20:33:53.426812176 -0700 -@@ -30,7 +30,7 @@ - - dnl Release version of the gettext macros. This is used to ensure that - dnl the gettext macros and po/Makefile.in.in are in sync. -- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) -+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) - - dnl Perform the following tests also if --disable-nls has been given, - dnl because they are needed for "make dist" to work. diff --git a/meta/recipes-extended/wget/wget-1.13.4/remove-gets.patch b/meta/recipes-extended/wget/wget-1.13.4/remove-gets.patch deleted file mode 100644 index ed1d019383..0000000000 --- a/meta/recipes-extended/wget/wget-1.13.4/remove-gets.patch +++ /dev/null @@ -1,23 +0,0 @@ -ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it - -Signed-off-by: Khem Raj - -Upstream-Status: Pending -Index: wget-1.13.4/lib/stdio.in.h -=================================================================== ---- wget-1.13.4.orig/lib/stdio.in.h 2011-09-13 01:15:14.000000000 -0700 -+++ wget-1.13.4/lib/stdio.in.h 2012-07-04 12:22:45.749092515 -0700 -@@ -693,11 +693,13 @@ - _GL_CXXALIAS_SYS (gets, char *, (char *s)); - # undef gets - # endif -+# if defined gets - _GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+# endif - #endif - - diff --git a/meta/recipes-extended/wget/wget-1.14/fix_makefile.patch b/meta/recipes-extended/wget/wget-1.14/fix_makefile.patch new file mode 100644 index 0000000000..b76a017df6 --- /dev/null +++ b/meta/recipes-extended/wget/wget-1.14/fix_makefile.patch @@ -0,0 +1,46 @@ + +Upstream-Status: Pending + +Signed-off-by: Saul Wold + +Index: wget-1.12/po/Makefile.in.in +=================================================================== +--- wget-1.12.orig/po/Makefile.in.in 2009-09-04 09:31:54.000000000 -0700 ++++ wget-1.12/po/Makefile.in.in 2011-10-19 20:32:53.714812160 -0700 +@@ -8,8 +8,8 @@ + # Please note that the actual code of GNU gettext is covered by the GNU + # General Public License and is *not* in the public domain. + # +-# Origin: gettext-0.17 +-GETTEXT_MACRO_VERSION = 0.17 ++# Origin: gettext-0.18 ++GETTEXT_MACRO_VERSION = 0.18 + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ +Index: wget-1.12/configure.ac +=================================================================== +--- wget-1.12.orig/configure.ac 2009-09-22 09:39:49.000000000 -0700 ++++ wget-1.12/configure.ac 2011-10-19 20:32:53.714812160 -0700 +@@ -110,7 +110,7 @@ + dnl Gettext + dnl + AM_GNU_GETTEXT([external],[need-ngettext]) +-AM_GNU_GETTEXT_VERSION([0.17]) ++AM_GNU_GETTEXT_VERSION([0.18]) + + AC_PROG_RANLIB + +Index: wget-1.12/m4/po.m4 +=================================================================== +--- wget-1.12.orig/m4/po.m4 2009-09-04 09:31:54.000000000 -0700 ++++ wget-1.12/m4/po.m4 2011-10-19 20:33:53.426812176 -0700 +@@ -30,7 +30,7 @@ + + dnl Release version of the gettext macros. This is used to ensure that + dnl the gettext macros and po/Makefile.in.in are in sync. +- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) ++ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) + + dnl Perform the following tests also if --disable-nls has been given, + dnl because they are needed for "make dist" to work. diff --git a/meta/recipes-extended/wget/wget_1.13.4.bb b/meta/recipes-extended/wget/wget_1.13.4.bb deleted file mode 100644 index 9a9441eafc..0000000000 --- a/meta/recipes-extended/wget/wget_1.13.4.bb +++ /dev/null @@ -1,10 +0,0 @@ -PR = "${INC_PR}.3" - -SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ - file://fix_makefile.patch \ - file://remove-gets.patch \ - " -SRC_URI[md5sum] = "1df489976a118b9cbe1b03502adbfc27" -SRC_URI[sha256sum] = "24c7710bc9f220ce23d8a9e0f5673b0efc1cace62db6de0239b5863ecc934dcd" - -require wget.inc diff --git a/meta/recipes-extended/wget/wget_1.14.bb b/meta/recipes-extended/wget/wget_1.14.bb new file mode 100644 index 0000000000..f26b884be6 --- /dev/null +++ b/meta/recipes-extended/wget/wget_1.14.bb @@ -0,0 +1,9 @@ +PR = "${INC_PR}.0" + +SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ + file://fix_makefile.patch \ + " +SRC_URI[md5sum] = "12edc291dba8127f2e9696e69f36299e" +SRC_URI[sha256sum] = "f3a6898e3a765bb94435b04a6668db9e5d19b3e90e0c69a503a2773ae936c269" + +require wget.inc -- cgit 1.2.3-korg