wget: update to version 1.11.4

The actual version was released in 2003, so I think it's time to update it.
This patch prepares the transition and allows other to test the latest release.

Regards,
Matthieu.

Signed-off-by: Matthieu Poullet <matthieu.poullet@gmail.com>
Signed-off-by: Koen Kooi <koen@openembedded.org>

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 245875d..6069789 100644 (file)
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -24038,6 +24038,10 @@ sha256=87caf592bd81922908e7ee6ff356c7d46cf5a2cbe46847df7d64aff537ca16b6
 md5=e6051f1e1487ec0ebfdbda72bedc70ad
 sha256=69044b87c517b986dbc17a5f7e4de430cb56e605330c19c6bb0d384d5c37e638
 
+[ftp://ftp.gnu.org/gnu/wget/wget-1.11.4.tar.gz]
+md5=69e8a7296c0e12c53bd9ffd786462e87
+sha256=7315963b6eefb7530b4a4f63a5d5ccdab30078784cf41ccb5297873f9adea2f3
+
 [ftp://ftp.debian.org/debian/pool/main/w/whois/whois_4.5.25.tar.gz]
 md5=516fc54ce709e874133fc3b3c7c05447
 sha256=99979ff161ee209da21ae118eff9ca6de7c5cb1b0dc3397de18df534e0afaf76

diff --git a/recipes/wget/wget.inc b/recipes/wget/wget.inc
new file mode 100644 (file)
index 0000000..21814c8
--- /dev/null
+++ b/recipes/wget/wget.inc
@@ -0,0 +1,34 @@
+DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more."
+SECTION = "console/network"
+DEPENDS = ""
+INC_PR = "r7"
+LICENSE = "GPL"
+
+S = "${WORKDIR}/wget-${PV}"
+
+inherit autotools gettext
+
+# Disable checking for SSL since that searches the system paths
+EXTRA_OECONF = "--enable-ipv6 --without-ssl"
+
+# The unslung kernel does not support ipv6
+EXTRA_OECONF_unslung = "--without-ssl"
+# SlugOS kernels do not support ipv6. Can be loaded as a module.
+EXTRA_OECONF_slugos = "--without-ssl"
+
+do_configure() {
+       autotools_do_configure
+}
+
+do_install () {
+       autotools_do_install
+       mv ${D}${bindir}/wget ${D}${bindir}/wget.${PN}
+}
+
+pkg_postinst_${PN} () {
+       update-alternatives --install ${bindir}/wget wget wget.${PN} 100
+}
+
+pkg_prerm_${PN} () {
+       update-alternatives --remove wget wget.${PN}
+}

diff --git a/recipes/wget/wget_1.11.4.bb b/recipes/wget/wget_1.11.4.bb
new file mode 100644 (file)
index 0000000..4a20bab
--- /dev/null
+++ b/recipes/wget/wget_1.11.4.bb
@@ -0,0 +1,8 @@
+PR="${INC_PR}.1"
+
+DEFAULT_PREFERENCE="-1"
+SRC_URI = " \
+       ${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
+"
+
+require wget.inc

diff --git a/recipes/wget/wget_1.9.1.bb b/recipes/wget/wget_1.9.1.bb
index b1e9404..50974ed 100644 (file)
--- a/recipes/wget/wget_1.9.1.bb
+++ b/recipes/wget/wget_1.9.1.bb
@@ -1,40 +1,19 @@
-DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more."
-SECTION = "console/network"
-DEPENDS = ""
-PR = "r7"
-LICENSE = "GPL"
+PR = "${INC_PR}.1"
 
-SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
-          file://m4macros.patch;patch=1 \
-          file://autotools.patch;patch=1 \
-           file://ipv6-fix.patch;patch=1"
-S = "${WORKDIR}/wget-${PV}"
-
-inherit autotools gettext
-
-# Disable checking for SSL since that searches the system paths
-EXTRA_OECONF = "--enable-ipv6 --without-ssl"
+SRC_URI = " \
+       ${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
+       file://m4macros.patch;patch=1 \
+       file://autotools.patch;patch=1 \
+        file://ipv6-fix.patch;patch=1 \
+"
 
-# SlugOS kernels do not support ipv6. Can be loaded as a module.
-EXTRA_OECONF_slugos = "--without-ssl"
+S = "${WORKDIR}/wget-${PV}"
 
-do_configure () {
+do_configure_prepend () {
        if [ ! -e acinclude.m4 ]; then
                mv aclocal.m4 acinclude.m4
        fi
        rm -f libtool.m4
-       autotools_do_configure
 }
 
-do_install () {
-       autotools_do_install
-       mv ${D}${bindir}/wget ${D}${bindir}/wget.${PN}
-}
-
-pkg_postinst_${PN} () {
-       update-alternatives --install ${bindir}/wget wget wget.${PN} 100
-}
-
-pkg_prerm_${PN} () {
-       update-alternatives --remove wget wget.${PN}
-}
+require wget.inc