diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/wget | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/wget')
-rw-r--r-- | packages/wget/wget-1.9.1/autotools.patch | 71 | ||||
-rw-r--r-- | packages/wget/wget-1.9.1/ipv6-fix.patch | 31 | ||||
-rw-r--r-- | packages/wget/wget-1.9.1/m4macros.patch | 195 | ||||
-rw-r--r-- | packages/wget/wget_1.9.1.bb | 42 |
4 files changed, 0 insertions, 339 deletions
diff --git a/packages/wget/wget-1.9.1/autotools.patch b/packages/wget/wget-1.9.1/autotools.patch deleted file mode 100644 index d0b0b3b45a..0000000000 --- a/packages/wget/wget-1.9.1/autotools.patch +++ /dev/null @@ -1,71 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- wget-1.9.1/src/wget.h~prototypes -+++ wget-1.9.1/src/wget.h -@@ -45,7 +45,7 @@ - #undef DEBUG_MALLOC - - #ifndef PARAMS --# if PROTOTYPES -+# ifndef ANSI2KNR - # define PARAMS(args) args - # else - # define PARAMS(args) () ---- tmp/base/wget-1.9.1-r0/wget-1.9.1/configure.in 2003-11-08 13:15:35.000000000 -0600 -+++ wget-1.9.1/configure.in 2004-05-22 19:41:40.000000000 -0500 -@@ -46,11 +46,13 @@ - dnl Get cannonical host - dnl - AC_CANONICAL_HOST -+AH_TEMPLATE([OS_TYPE], [Define to the operating system we're building for]) - AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os") - - dnl - dnl Process features. - dnl -+AH_TEMPLATE([HAVE_SOCKS], [Define to use the socks library]) - AC_ARG_WITH(socks, - [ --with-socks use the socks library], - [AC_DEFINE(HAVE_SOCKS)]) -@@ -59,16 +61,19 @@ - [[ --with-ssl[=SSL-ROOT] link with SSL support [default=auto] - --without-ssl disable SSL autodetection]]) - -+AH_TEMPLATE([USE_OPIE], [Define to enable support for opie or s/key FTP login]) - AC_ARG_ENABLE(opie, - [ --disable-opie disable support for opie or s/key FTP login], - USE_OPIE=$enableval, USE_OPIE=yes) - test x"${USE_OPIE}" = xyes && AC_DEFINE(USE_OPIE) - -+AH_TEMPLATE([USE_DIGEST], [Define to enable support for HTTP digest authorization]) - AC_ARG_ENABLE(digest, - [ --disable-digest disable support for HTTP digest authorization], - USE_DIGEST=$enableval, USE_DIGEST=yes) - test x"${USE_DIGEST}" = xyes && AC_DEFINE(USE_DIGEST) - -+AH_TEMPLATE([ENABLE_DEBUG], [Define to enable debugging output]) - AC_ARG_ENABLE(debug, - [ --disable-debug disable support for debugging output], - ENABLE_DEBUG=$enableval, ENABLE_DEBUG=yes) -@@ -256,6 +261,7 @@ - dnl an AC_DEFUN so that we can reuse it for other third-party - dnl libraries. - -+AH_TEMPLATE([HAVE_SSL], [Define to build with SSL support]) - if test x"$with_ssl" != x"no"; then - - wget_force_ssl=no -@@ -413,6 +419,10 @@ - dnl Find an md5 implementation. - dnl - -+AH_TEMPLATE([HAVE_MD5], [Define if using an MD5 implementation]) -+AH_TEMPLATE([HAVE_SOLARIS_MD5], [Define if using the Solaris MD5 implementation]) -+AH_TEMPLATE([HAVE_OPENSSL_MD5], [Define if using the OpenSSL MD5 implementation]) -+AH_TEMPLATE([HAVE_BUILTIN_MD5], [Define if using the builtin GNU MD5 implementation]) - if test x"$wget_need_md5" = xyes - then - MD5_OBJ='gen-md5$o' diff --git a/packages/wget/wget-1.9.1/ipv6-fix.patch b/packages/wget/wget-1.9.1/ipv6-fix.patch deleted file mode 100644 index 315dd25c00..0000000000 --- a/packages/wget/wget-1.9.1/ipv6-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -If the kernel has IPv6 support then wget tries to create sockets using -AF_INET6 and then gets an EAFNOSUPPORT error, which it treats as a -connection failure, resulting in wget not being able to work. This patch -makes it switch it's default protocol to IPv4 when it sees that IPv6 isn't -supported in the kernel. - -Index: wget-1.9.1/src/connect.c -=================================================================== ---- wget-1.9.1.orig/src/connect.c 2003-11-02 01:08:22.000000000 +1100 -+++ wget-1.9.1/src/connect.c 2007-06-02 01:39:55.000000000 +1000 -@@ -244,12 +244,20 @@ - { - ip_address addr; - int sock; -+retry: - address_list_copy_one (al, i, &addr); - - sock = connect_to_one (&addr, port, silent); - if (sock >= 0) - /* Success. */ - return sock; -+ -+ if (errno == EAFNOSUPPORT && ip_default_family == AF_INET6) -+ { -+ DEBUGP (("No IPv6 support, changing default to IPv4.\n")); -+ ip_default_family = AF_INET; -+ goto retry; -+ } - - address_list_set_faulty (al, i); - diff --git a/packages/wget/wget-1.9.1/m4macros.patch b/packages/wget/wget-1.9.1/m4macros.patch deleted file mode 100644 index eb176750d8..0000000000 --- a/packages/wget/wget-1.9.1/m4macros.patch +++ /dev/null @@ -1,195 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- wget-1.9.1/aclocal.m4~m4macros.patch -+++ wget-1.9.1/aclocal.m4 -@@ -2,6 +2,7 @@ - dnl Check for `struct utimbuf'. - dnl - -+AH_TEMPLATE([HAVE_STRUCT_UTIMBUF], [Define if we have struct utimbuf]) - AC_DEFUN([WGET_STRUCT_UTIMBUF], - [AC_MSG_CHECKING([for struct utimbuf]) - if test x"$ac_cv_header_utime_h" = xyes; then -@@ -21,6 +22,7 @@ - dnl it. If socklen_t exists, we use it, else if accept() accepts - dnl size_t *, we use that, else we use int. - -+AH_TEMPLATE([socklen_t], [Set to the appropriate type to use for socklen_t]) - AC_DEFUN([WGET_SOCKLEN_T], [ - AC_MSG_CHECKING(for socklen_t) - AC_TRY_COMPILE([ -@@ -50,6 +52,7 @@ - dnl even on those because Apache installs its own fnmatch.h to - dnl /usr/local/include (!), which GCC uses before /usr/include. - -+AH_TEMPLATE([HAVE_WORKING_FNMATCH_H], [Define if we have a working fnmatch.h]) - AC_DEFUN([WGET_FNMATCH], [ - AC_MSG_CHECKING([for working fnmatch.h]) - AC_COMPILE_IFELSE([#include <fnmatch.h> -@@ -61,87 +64,6 @@ - ]) - ]) - --dnl --dnl ansi2knr support: check whether C prototypes are available. --dnl -- --AC_DEFUN(AM_C_PROTOTYPES, --[AC_REQUIRE([AM_PROG_CC_STDC]) --AC_BEFORE([$0], [AC_C_INLINE]) --AC_MSG_CHECKING([for function prototypes]) --if test "$am_cv_prog_cc_stdc" != no; then -- AC_MSG_RESULT(yes) -- AC_DEFINE(PROTOTYPES) -- U= ANSI2KNR= --else -- AC_MSG_RESULT(no) -- U=_ ANSI2KNR=./ansi2knr -- # Ensure some checks needed by ansi2knr itself. -- AC_HEADER_STDC -- AC_CHECK_HEADERS(string.h) --fi --AC_SUBST(U)dnl --AC_SUBST(ANSI2KNR)dnl --]) -- -- --# serial 1 -- --# @defmac AC_PROG_CC_STDC --# @maindex PROG_CC_STDC --# @ovindex CC --# If the C compiler in not in ANSI C mode by default, try to add an option --# to output variable @code{CC} to make it so. This macro tries various --# options that select ANSI C on some system or another. It considers the --# compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and --# handles function prototypes correctly. --# --# If you use this macro, you should check after calling it whether the C --# compiler has been set to accept ANSI C; if not, the shell variable --# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source --# code in ANSI C, you can make an un-ANSIfied copy of it by using the --# program @code{ansi2knr}, which comes with Ghostscript. --# @end defmac -- --AC_DEFUN(AM_PROG_CC_STDC, --[AC_REQUIRE([AC_PROG_CC]) --AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C]) --AC_CACHE_VAL(am_cv_prog_cc_stdc, --[am_cv_prog_cc_stdc=no --ac_save_CC="$CC" --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX -Aa -D_HPUX_SOURCE --for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" --do -- CC="$ac_save_CC $ac_arg" -- AC_TRY_COMPILE( --[#if !defined(__STDC__) --choke me --#endif --/* DYNIX/ptx V4.1.3 can't compile sys/stat.h with -Xc -D__EXTENSIONS__. */ --#ifdef _SEQUENT_ --# include <sys/types.h> --# include <sys/stat.h> --#endif --], [ --int test (int i, double x); --struct s1 {int (*f) (int a);}; --struct s2 {int (*f) (double a);};], --[am_cv_prog_cc_stdc="$ac_arg"; break]) --done --CC="$ac_save_CC" --]) --AC_MSG_RESULT($am_cv_prog_cc_stdc) --case "x$am_cv_prog_cc_stdc" in -- x|xno) ;; -- *) CC="$CC $am_cv_prog_cc_stdc" ;; --esac --]) -- -- - dnl ************************************************************ - dnl START OF IPv6 AUTOCONFIGURATION SUPPORT MACROS - dnl ************************************************************ -@@ -294,7 +216,8 @@ - - # This code originates from Ulrich Drepper's AM_WITH_NLS. - --AC_DEFUN(WGET_WITH_NLS, -+AH_TEMPLATE([HAVE_NLS], [Define to enable Native Language Support]) -+AC_DEFUN([WGET_WITH_NLS], - [AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, -@@ -387,7 +310,7 @@ - dnl This is not strictly an Autoconf macro, because it is run from - dnl within `config.status' rather than from within configure. This - dnl is why special rules must be applied for it. --AC_DEFUN(WGET_PROCESS_PO, -+AC_DEFUN([WGET_PROCESS_PO], - [ - dnl I wonder what the following several lines do... - if test "x$srcdir" != "x."; then -@@ -409,56 +332,3 @@ - echo "creating po/Makefile" - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - ]) -- --# Search path for a program which passes the given test. --# Ulrich Drepper <drepper@cygnus.com>, 1996. --# --# This file may be copied and used freely without restrictions. It --# can be used in projects which are not available under the GNU Public --# License but which still want to provide support for the GNU gettext --# functionality. Please note that the actual code is *not* freely --# available. -- --# serial 1 -- --dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, --dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) --AC_DEFUN(AM_PATH_PROG_WITH_TEST, --[# Extract the first word of "$2", so it can be a program name with args. --set dummy $2; ac_word=[$]2 --AC_MSG_CHECKING([for $ac_word]) --AC_CACHE_VAL(ac_cv_path_$1, --[case "[$]$1" in -- /*) -- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. -- ;; -- *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in ifelse([$5], , $PATH, [$5]); do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- if [$3]; then -- ac_cv_path_$1="$ac_dir/$ac_word" -- break -- fi -- fi -- done -- IFS="$ac_save_ifs" --dnl If no 4th arg is given, leave the cache variable unset, --dnl so AC_PATH_PROGS will keep looking. --ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" --])dnl -- ;; --esac])dnl --$1="$ac_cv_path_$1" --if test -n "[$]$1"; then -- AC_MSG_RESULT([$]$1) --else -- AC_MSG_RESULT(no) --fi --AC_SUBST($1)dnl --]) -- --# Include libtool code. -- --builtin(include, libtool.m4)dnl diff --git a/packages/wget/wget_1.9.1.bb b/packages/wget/wget_1.9.1.bb deleted file mode 100644 index d3858e4e47..0000000000 --- a/packages/wget/wget_1.9.1.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more." -SECTION = "console/network" -DEPENDS = "" -PR = "r7" -LICENSE = "GPL" - -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" - -# 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 () { - 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} -} |