wget: update to 1.14
This commit is contained in:
Tom G. Christensen
parent
fb43e427f5
commit
c8b4a8863a
@ -6,11 +6,13 @@
|
|||||||
###########################################################
|
###########################################################
|
||||||
# Check the following 4 variables before running the script
|
# Check the following 4 variables before running the script
|
||||||
topdir=wget
|
topdir=wget
|
||||||
version=1.11.3
|
version=1.14
|
||||||
pkgver=1
|
pkgver=1
|
||||||
source[0]=$topdir-$version.tar.bz2
|
source[0]=ftp://ftp.sunet.se/pub/gnu/wget/$topdir-$version.tar.xz
|
||||||
# If there are no patches, simply comment this
|
# If there are no patches, simply comment this
|
||||||
#patch[0]=
|
patch[0]=wget-1.14-fix-gnulib-locale_h.patch
|
||||||
|
patch[1]=wget-1.14-no-ipv6.patch
|
||||||
|
patch[2]=wget-1.14-fix-gnulib-sys_time.patch
|
||||||
|
|
||||||
# Source function library
|
# Source function library
|
||||||
. ${BUILDPKG_SCRIPTS}/buildpkg.functions
|
. ${BUILDPKG_SCRIPTS}/buildpkg.functions
|
||||||
@ -18,6 +20,7 @@ source[0]=$topdir-$version.tar.bz2
|
|||||||
# Global settings
|
# Global settings
|
||||||
export CPPFLAGS="-I$prefix/include"
|
export CPPFLAGS="-I$prefix/include"
|
||||||
export LDFLAGS="-L$prefix/lib -R$prefix/lib"
|
export LDFLAGS="-L$prefix/lib -R$prefix/lib"
|
||||||
|
configure_args+=(--with-ssl=openssl)
|
||||||
|
|
||||||
reg prep
|
reg prep
|
||||||
prep()
|
prep()
|
||||||
@ -42,6 +45,7 @@ install()
|
|||||||
{
|
{
|
||||||
generic_install DESTDIR
|
generic_install DESTDIR
|
||||||
doc AUTHORS COPYING NEWS README MAILING-LIST
|
doc AUTHORS COPYING NEWS README MAILING-LIST
|
||||||
|
rmdir ${stagedir}${prefix}/lib
|
||||||
}
|
}
|
||||||
|
|
||||||
reg pack
|
reg pack
|
||||||
|
|||||||
4
wget/meta/ChangeLog
Normal file
4
wget/meta/ChangeLog
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
CHANGELOG
|
||||||
|
---------
|
||||||
|
* Sat Nov 16 2013 Tom G. Christensen <swpkg@jupiterrise.com> - 1.14-1
|
||||||
|
- Update to 1.14
|
||||||
@ -1,27 +0,0 @@
|
|||||||
PACKAGE DETAILS
|
|
||||||
---------------
|
|
||||||
Name: %%PKGNAME%%
|
|
||||||
Version: %%SOURCE_AND_VER%%
|
|
||||||
Vendor: %%VENDOR%%
|
|
||||||
Packager: %%PKGEDBY%%
|
|
||||||
|
|
||||||
Source (sha1sum):
|
|
||||||
%%SOURCE_SHA1SUM%%
|
|
||||||
|
|
||||||
BUILD DETAILS
|
|
||||||
-------------
|
|
||||||
Compiler:
|
|
||||||
%%COMPILER%%
|
|
||||||
|
|
||||||
Environment:
|
|
||||||
%%ENVIRONMENT%%
|
|
||||||
|
|
||||||
Configure:
|
|
||||||
%%CONFIGURE%%
|
|
||||||
|
|
||||||
KNOWN DEPENDENCIES
|
|
||||||
------------------
|
|
||||||
%%DEPENDENCIES%%
|
|
||||||
|
|
||||||
ERRORS/MISCELLANEOUS
|
|
||||||
--------------------
|
|
||||||
42
wget/src/wget-1.14-fix-gnulib-locale_h.patch
Normal file
42
wget/src/wget-1.14-fix-gnulib-locale_h.patch
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
diff -up wget-1.14/lib/locale.in.h.orig wget-1.14/lib/locale.in.h
|
||||||
|
--- wget-1.14/lib/locale.in.h.orig 2012-08-05 22:16:29.000000000 +0200
|
||||||
|
+++ wget-1.14/lib/locale.in.h 2013-04-28 11:23:42.600595000 +0200
|
||||||
|
@@ -14,16 +14,30 @@
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
-#ifndef _@GUARD_PREFIX@_LOCALE_H
|
||||||
|
-
|
||||||
|
#if __GNUC__ >= 3
|
||||||
|
@PRAGMA_SYSTEM_HEADER@
|
||||||
|
#endif
|
||||||
|
@PRAGMA_COLUMNS@
|
||||||
|
|
||||||
|
+#ifdef _GL_ALREADY_INCLUDING_LOCALE_H
|
||||||
|
+
|
||||||
|
+/* Special invocation conventions to handle Solaris header files
|
||||||
|
+ (through Solaris 10) when combined with gettext's libintl.h. */
|
||||||
|
+
|
||||||
|
+#@INCLUDE_NEXT@ @NEXT_LOCALE_H@
|
||||||
|
+
|
||||||
|
+#else
|
||||||
|
+/* Normal invocation convention. */
|
||||||
|
+
|
||||||
|
+#ifndef _@GUARD_PREFIX@_LOCALE_H
|
||||||
|
+
|
||||||
|
+#define _GL_ALREADY_INCLUDING_LOCALE_H
|
||||||
|
+
|
||||||
|
/* The include_next requires a split double-inclusion guard. */
|
||||||
|
#@INCLUDE_NEXT@ @NEXT_LOCALE_H@
|
||||||
|
|
||||||
|
+#undef _GL_ALREADY_INCLUDING_LOCALE_H
|
||||||
|
+
|
||||||
|
#ifndef _@GUARD_PREFIX@_LOCALE_H
|
||||||
|
#define _@GUARD_PREFIX@_LOCALE_H
|
||||||
|
|
||||||
|
@@ -198,4 +212,5 @@ _GL_WARN_ON_USE (duplocale, "duplocale i
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* _@GUARD_PREFIX@_LOCALE_H */
|
||||||
|
+#endif /* ! _GL_ALREADY_INCLUDING_LOCALE_H */
|
||||||
|
#endif /* _@GUARD_PREFIX@_LOCALE_H */
|
||||||
295
wget/src/wget-1.14-fix-gnulib-sys_time.patch
Normal file
295
wget/src/wget-1.14-fix-gnulib-sys_time.patch
Normal file
@ -0,0 +1,295 @@
|
|||||||
|
--- wget-1.14/lib/sys_select.in.h.sys_time_h 2012-08-05 22:16:30.000000000 +0200
|
||||||
|
+++ wget-1.14/lib/sys_select.in.h 2013-11-16 21:59:16.072892000 +0100
|
||||||
|
@@ -19,14 +19,25 @@
|
||||||
|
# endif
|
||||||
|
@PRAGMA_COLUMNS@
|
||||||
|
|
||||||
|
-/* On OSF/1, <sys/types.h> and <sys/time.h> include <sys/select.h>.
|
||||||
|
+/* On OSF/1 and Solaris 2.6, <sys/types.h> and <sys/time.h>
|
||||||
|
+ both include <sys/select.h>.
|
||||||
|
Simply delegate to the system's header in this case. */
|
||||||
|
-#if @HAVE_SYS_SELECT_H@ && defined __osf__ && (defined _SYS_TYPES_H_ && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H) && defined _OSF_SOURCE
|
||||||
|
+#if (@HAVE_SYS_SELECT_H@ \
|
||||||
|
+ && ((defined __osf__ && defined _SYS_TYPES_H_ && defined _OSF_SOURCE) \
|
||||||
|
+ || (defined __sun && defined _SYS_TYPES_H \
|
||||||
|
+ && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \
|
||||||
|
+ || defined __EXTENSIONS__))) \
|
||||||
|
+ && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H)
|
||||||
|
|
||||||
|
# define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H
|
||||||
|
# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
|
||||||
|
|
||||||
|
-#elif @HAVE_SYS_SELECT_H@ && defined __osf__ && (defined _SYS_TIME_H_ && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H) && defined _OSF_SOURCE
|
||||||
|
+#elif (@HAVE_SYS_SELECT_H@ \
|
||||||
|
+ && ((defined __osf__ && defined _SYS_TIME_H_ && defined _OSF_SOURCE) \
|
||||||
|
+ || (defined __sun && defined _SYS_TIME_H \
|
||||||
|
+ && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \
|
||||||
|
+ || defined __EXTENSIONS__))) \
|
||||||
|
+ && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H)
|
||||||
|
|
||||||
|
# define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H
|
||||||
|
# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
|
||||||
|
--- wget-1.14/lib/sys_time.in.h.sys_time_h 2012-08-05 22:16:30.000000000 +0200
|
||||||
|
+++ wget-1.14/lib/sys_time.in.h 2013-11-16 21:59:16.142894000 +0100
|
||||||
|
@@ -17,37 +17,34 @@
|
||||||
|
|
||||||
|
/* Written by Paul Eggert. */
|
||||||
|
|
||||||
|
+#ifndef _@GUARD_PREFIX@_SYS_TIME_H
|
||||||
|
+
|
||||||
|
#if __GNUC__ >= 3
|
||||||
|
@PRAGMA_SYSTEM_HEADER@
|
||||||
|
#endif
|
||||||
|
@PRAGMA_COLUMNS@
|
||||||
|
|
||||||
|
-#if defined _@GUARD_PREFIX@_SYS_TIME_H
|
||||||
|
-
|
||||||
|
-/* Simply delegate to the system's header, without adding anything. */
|
||||||
|
-# if @HAVE_SYS_TIME_H@
|
||||||
|
-# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
|
||||||
|
-# endif
|
||||||
|
-
|
||||||
|
-#else
|
||||||
|
+/* The include_next requires a split double-inclusion guard. */
|
||||||
|
+#if @HAVE_SYS_TIME_H@
|
||||||
|
+# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
-# define _@GUARD_PREFIX@_SYS_TIME_H
|
||||||
|
+#ifndef _@GUARD_PREFIX@_SYS_TIME_H
|
||||||
|
+#define _@GUARD_PREFIX@_SYS_TIME_H
|
||||||
|
|
||||||
|
-# if @HAVE_SYS_TIME_H@
|
||||||
|
-# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
|
||||||
|
-# else
|
||||||
|
-# include <time.h>
|
||||||
|
-# endif
|
||||||
|
+#if ! @HAVE_SYS_TIME_H@
|
||||||
|
+# include <time.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* On native Windows with MSVC, get the 'struct timeval' type.
|
||||||
|
Also, on native Windows with a 64-bit time_t, where we are overriding the
|
||||||
|
'struct timeval' type, get all declarations of system functions whose
|
||||||
|
signature contains 'struct timeval'. */
|
||||||
|
-# if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H
|
||||||
|
-# define _GL_INCLUDING_WINSOCK2_H
|
||||||
|
-# include <winsock2.h>
|
||||||
|
-# undef _GL_INCLUDING_WINSOCK2_H
|
||||||
|
-# endif
|
||||||
|
+#if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H
|
||||||
|
+# define _GL_INCLUDING_WINSOCK2_H
|
||||||
|
+# include <winsock2.h>
|
||||||
|
+# undef _GL_INCLUDING_WINSOCK2_H
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
|
||||||
|
|
||||||
|
@@ -55,112 +52,112 @@
|
||||||
|
|
||||||
|
/* The definition of _GL_WARN_ON_USE is copied here. */
|
||||||
|
|
||||||
|
-# ifdef __cplusplus
|
||||||
|
+#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
-# endif
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
-# if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@
|
||||||
|
+#if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@
|
||||||
|
|
||||||
|
-# if @REPLACE_STRUCT_TIMEVAL@
|
||||||
|
-# define timeval rpl_timeval
|
||||||
|
-# endif
|
||||||
|
+# if @REPLACE_STRUCT_TIMEVAL@
|
||||||
|
+# define timeval rpl_timeval
|
||||||
|
+# endif
|
||||||
|
|
||||||
|
-# if !GNULIB_defined_struct_timeval
|
||||||
|
+# if !GNULIB_defined_struct_timeval
|
||||||
|
struct timeval
|
||||||
|
{
|
||||||
|
time_t tv_sec;
|
||||||
|
long int tv_usec;
|
||||||
|
};
|
||||||
|
-# define GNULIB_defined_struct_timeval 1
|
||||||
|
-# endif
|
||||||
|
-
|
||||||
|
+# define GNULIB_defined_struct_timeval 1
|
||||||
|
# endif
|
||||||
|
|
||||||
|
-# ifdef __cplusplus
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
-# endif
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
-# if @GNULIB_GETTIMEOFDAY@
|
||||||
|
-# if @REPLACE_GETTIMEOFDAY@
|
||||||
|
-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||||
|
-# undef gettimeofday
|
||||||
|
-# define gettimeofday rpl_gettimeofday
|
||||||
|
-# endif
|
||||||
|
+#if @GNULIB_GETTIMEOFDAY@
|
||||||
|
+# if @REPLACE_GETTIMEOFDAY@
|
||||||
|
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||||
|
+# undef gettimeofday
|
||||||
|
+# define gettimeofday rpl_gettimeofday
|
||||||
|
+# endif
|
||||||
|
_GL_FUNCDECL_RPL (gettimeofday, int,
|
||||||
|
(struct timeval *restrict, void *restrict)
|
||||||
|
_GL_ARG_NONNULL ((1)));
|
||||||
|
_GL_CXXALIAS_RPL (gettimeofday, int,
|
||||||
|
(struct timeval *restrict, void *restrict));
|
||||||
|
-# else
|
||||||
|
-# if !@HAVE_GETTIMEOFDAY@
|
||||||
|
+# else
|
||||||
|
+# if !@HAVE_GETTIMEOFDAY@
|
||||||
|
_GL_FUNCDECL_SYS (gettimeofday, int,
|
||||||
|
(struct timeval *restrict, void *restrict)
|
||||||
|
_GL_ARG_NONNULL ((1)));
|
||||||
|
-# endif
|
||||||
|
+# endif
|
||||||
|
/* Need to cast, because on glibc systems, by default, the second argument is
|
||||||
|
struct timezone *. */
|
||||||
|
_GL_CXXALIAS_SYS_CAST (gettimeofday, int,
|
||||||
|
(struct timeval *restrict, void *restrict));
|
||||||
|
-# endif
|
||||||
|
+# endif
|
||||||
|
_GL_CXXALIASWARN (gettimeofday);
|
||||||
|
-# elif defined GNULIB_POSIXCHECK
|
||||||
|
-# undef gettimeofday
|
||||||
|
-# if HAVE_RAW_DECL_GETTIMEOFDAY
|
||||||
|
+#elif defined GNULIB_POSIXCHECK
|
||||||
|
+# undef gettimeofday
|
||||||
|
+# if HAVE_RAW_DECL_GETTIMEOFDAY
|
||||||
|
_GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - "
|
||||||
|
"use gnulib module gettimeofday for portability");
|
||||||
|
-# endif
|
||||||
|
# endif
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* Hide some function declarations from <winsock2.h>. */
|
||||||
|
|
||||||
|
-# if defined _MSC_VER && @HAVE_WINSOCK2_H@
|
||||||
|
-# if !defined _@GUARD_PREFIX@_UNISTD_H
|
||||||
|
-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||||
|
-# undef close
|
||||||
|
-# define close close_used_without_including_unistd_h
|
||||||
|
-# else
|
||||||
|
+#if defined _MSC_VER && @HAVE_WINSOCK2_H@
|
||||||
|
+# if !defined _@GUARD_PREFIX@_UNISTD_H
|
||||||
|
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||||
|
+# undef close
|
||||||
|
+# define close close_used_without_including_unistd_h
|
||||||
|
+# else
|
||||||
|
_GL_WARN_ON_USE (close,
|
||||||
|
"close() used without including <unistd.h>");
|
||||||
|
-# endif
|
||||||
|
-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||||
|
-# undef gethostname
|
||||||
|
-# define gethostname gethostname_used_without_including_unistd_h
|
||||||
|
-# else
|
||||||
|
+# endif
|
||||||
|
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||||
|
+# undef gethostname
|
||||||
|
+# define gethostname gethostname_used_without_including_unistd_h
|
||||||
|
+# else
|
||||||
|
_GL_WARN_ON_USE (gethostname,
|
||||||
|
"gethostname() used without including <unistd.h>");
|
||||||
|
-# endif
|
||||||
|
# endif
|
||||||
|
-# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
|
||||||
|
-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||||
|
-# undef socket
|
||||||
|
-# define socket socket_used_without_including_sys_socket_h
|
||||||
|
-# undef connect
|
||||||
|
-# define connect connect_used_without_including_sys_socket_h
|
||||||
|
-# undef accept
|
||||||
|
-# define accept accept_used_without_including_sys_socket_h
|
||||||
|
-# undef bind
|
||||||
|
-# define bind bind_used_without_including_sys_socket_h
|
||||||
|
-# undef getpeername
|
||||||
|
-# define getpeername getpeername_used_without_including_sys_socket_h
|
||||||
|
-# undef getsockname
|
||||||
|
-# define getsockname getsockname_used_without_including_sys_socket_h
|
||||||
|
-# undef getsockopt
|
||||||
|
-# define getsockopt getsockopt_used_without_including_sys_socket_h
|
||||||
|
-# undef listen
|
||||||
|
-# define listen listen_used_without_including_sys_socket_h
|
||||||
|
-# undef recv
|
||||||
|
-# define recv recv_used_without_including_sys_socket_h
|
||||||
|
-# undef send
|
||||||
|
-# define send send_used_without_including_sys_socket_h
|
||||||
|
-# undef recvfrom
|
||||||
|
-# define recvfrom recvfrom_used_without_including_sys_socket_h
|
||||||
|
-# undef sendto
|
||||||
|
-# define sendto sendto_used_without_including_sys_socket_h
|
||||||
|
-# undef setsockopt
|
||||||
|
-# define setsockopt setsockopt_used_without_including_sys_socket_h
|
||||||
|
-# undef shutdown
|
||||||
|
-# define shutdown shutdown_used_without_including_sys_socket_h
|
||||||
|
-# else
|
||||||
|
+# endif
|
||||||
|
+# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
|
||||||
|
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||||
|
+# undef socket
|
||||||
|
+# define socket socket_used_without_including_sys_socket_h
|
||||||
|
+# undef connect
|
||||||
|
+# define connect connect_used_without_including_sys_socket_h
|
||||||
|
+# undef accept
|
||||||
|
+# define accept accept_used_without_including_sys_socket_h
|
||||||
|
+# undef bind
|
||||||
|
+# define bind bind_used_without_including_sys_socket_h
|
||||||
|
+# undef getpeername
|
||||||
|
+# define getpeername getpeername_used_without_including_sys_socket_h
|
||||||
|
+# undef getsockname
|
||||||
|
+# define getsockname getsockname_used_without_including_sys_socket_h
|
||||||
|
+# undef getsockopt
|
||||||
|
+# define getsockopt getsockopt_used_without_including_sys_socket_h
|
||||||
|
+# undef listen
|
||||||
|
+# define listen listen_used_without_including_sys_socket_h
|
||||||
|
+# undef recv
|
||||||
|
+# define recv recv_used_without_including_sys_socket_h
|
||||||
|
+# undef send
|
||||||
|
+# define send send_used_without_including_sys_socket_h
|
||||||
|
+# undef recvfrom
|
||||||
|
+# define recvfrom recvfrom_used_without_including_sys_socket_h
|
||||||
|
+# undef sendto
|
||||||
|
+# define sendto sendto_used_without_including_sys_socket_h
|
||||||
|
+# undef setsockopt
|
||||||
|
+# define setsockopt setsockopt_used_without_including_sys_socket_h
|
||||||
|
+# undef shutdown
|
||||||
|
+# define shutdown shutdown_used_without_including_sys_socket_h
|
||||||
|
+# else
|
||||||
|
_GL_WARN_ON_USE (socket,
|
||||||
|
"socket() used without including <sys/socket.h>");
|
||||||
|
_GL_WARN_ON_USE (connect,
|
||||||
|
@@ -189,17 +186,18 @@
|
||||||
|
"setsockopt() used without including <sys/socket.h>");
|
||||||
|
_GL_WARN_ON_USE (shutdown,
|
||||||
|
"shutdown() used without including <sys/socket.h>");
|
||||||
|
-# endif
|
||||||
|
# endif
|
||||||
|
-# if !defined _@GUARD_PREFIX@_SYS_SELECT_H
|
||||||
|
-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||||
|
-# undef select
|
||||||
|
-# define select select_used_without_including_sys_select_h
|
||||||
|
-# else
|
||||||
|
+# endif
|
||||||
|
+# if !defined _@GUARD_PREFIX@_SYS_SELECT_H
|
||||||
|
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||||
|
+# undef select
|
||||||
|
+# define select select_used_without_including_sys_select_h
|
||||||
|
+# else
|
||||||
|
_GL_WARN_ON_USE (select,
|
||||||
|
"select() used without including <sys/select.h>");
|
||||||
|
-# endif
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#endif /* _@GUARD_PREFIX@_SYS_TIME_H */
|
||||||
|
+#endif /* _@GUARD_PREFIX@_SYS_TIME_H */
|
||||||
31
wget/src/wget-1.14-no-ipv6.patch
Normal file
31
wget/src/wget-1.14-no-ipv6.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
diff -up wget-1.14/src/connect.c.ipv6 wget-1.14/src/connect.c
|
||||||
|
--- wget-1.14/src/connect.c.ipv6 2012-06-02 19:36:09.000000000 +0200
|
||||||
|
+++ wget-1.14/src/connect.c 2013-04-28 11:39:39.610656000 +0200
|
||||||
|
@@ -294,8 +294,10 @@ connect_to_ip (const ip_address *ip, int
|
||||||
|
{
|
||||||
|
if (ip->family == AF_INET)
|
||||||
|
logprintf (LOG_VERBOSE, _("Connecting to %s:%d... "), txt_addr, port);
|
||||||
|
+#ifdef ENABLE_IPV6
|
||||||
|
else if (ip->family == AF_INET6)
|
||||||
|
logprintf (LOG_VERBOSE, _("Connecting to [%s]:%d... "), txt_addr, port);
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -up wget-1.14/src/http.c.ipv6 wget-1.14/src/http.c
|
||||||
|
--- wget-1.14/src/http.c.ipv6 2012-07-07 10:57:20.000000000 +0200
|
||||||
|
+++ wget-1.14/src/http.c 2013-04-28 11:56:49.332090000 +0200
|
||||||
|
@@ -1962,11 +1962,13 @@ gethttp (struct url *u, struct http_stat
|
||||||
|
int family = socket_family (pconn.socket, ENDPOINT_PEER);
|
||||||
|
sock = pconn.socket;
|
||||||
|
using_ssl = pconn.ssl;
|
||||||
|
+#ifdef ENABLE_IPV6
|
||||||
|
if (family == AF_INET6)
|
||||||
|
logprintf (LOG_VERBOSE, _("Reusing existing connection to [%s]:%d.\n"),
|
||||||
|
quotearg_style (escape_quoting_style, pconn.host),
|
||||||
|
pconn.port);
|
||||||
|
else
|
||||||
|
+#endif
|
||||||
|
logprintf (LOG_VERBOSE, _("Reusing existing connection to %s:%d.\n"),
|
||||||
|
quotearg_style (escape_quoting_style, pconn.host),
|
||||||
|
pconn.port);
|
||||||
Loading…
x
Reference in New Issue
Block a user