mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-15 08:10:07 +02:00
175 lines
4.2 KiB
Plaintext
175 lines
4.2 KiB
Plaintext
From bd11396e597c8a9e1134a56e85fe64de65a4641c Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Mon, 19 May 2014 15:38:37 +0000
|
|
Subject: apply wget-1.14.patch
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 686f040..9c3cdb5 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -238,6 +238,7 @@ AC_HEADER_STDBOOL
|
|
AC_CHECK_HEADERS(unistd.h sys/time.h)
|
|
AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h utime.h sys/utime.h)
|
|
AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h wchar.h)
|
|
+AC_CHECK_HEADERS(arpa/inet.h)
|
|
|
|
AC_CHECK_DECLS(h_errno,,,[#include <netdb.h>])
|
|
|
|
@@ -305,6 +306,9 @@ dnl
|
|
|
|
PKG_PROG_PKG_CONFIG
|
|
|
|
+AC_CHECK_LIB(network, gethostbyname)
|
|
+AC_CHECK_LIB(network, socket)
|
|
+
|
|
AS_IF([test "x$with_libpsl" != xno], [
|
|
PKG_CHECK_MODULES([LIBPSL], libpsl, [
|
|
with_libpsl=yes
|
|
diff --git a/src/config.h.in b/src/config.h.in
|
|
index afb806f..6628225 100644
|
|
--- a/src/config.h.in
|
|
+++ b/src/config.h.in
|
|
@@ -842,6 +842,9 @@
|
|
/* Define if libcares is available. */
|
|
#undef HAVE_LIBCARES
|
|
|
|
+/* Define to 1 if you have the `bind' library (-lbind). */
|
|
+#undef HAVE_LIBBIND
|
|
+
|
|
/* Define to 1 if you have the `dl' library (-ldl). */
|
|
#undef HAVE_LIBDL
|
|
|
|
@@ -854,6 +857,9 @@
|
|
/* Define to 1 if you have the <libintl.h> header file. */
|
|
#undef HAVE_LIBINTL_H
|
|
|
|
+/* Define to 1 if you have the `network' library (-lnetwork). */
|
|
+#undef HAVE_LIBNETWORK
|
|
+
|
|
/* Define if libpcre is available. */
|
|
#undef HAVE_LIBPCRE
|
|
|
|
diff --git a/src/connect.c b/src/connect.c
|
|
index 7e18171..b421306 100644
|
|
--- a/src/connect.c
|
|
+++ b/src/connect.c
|
|
@@ -47,7 +47,7 @@ as that of the covered work. */
|
|
# include <netdb.h>
|
|
# endif /* def __VMS [else] */
|
|
# include <netinet/in.h>
|
|
-# ifndef __BEOS__
|
|
+# ifdef HAVE_ARPA_INET_H
|
|
# include <arpa/inet.h>
|
|
# endif
|
|
#endif /* not WINDOWS */
|
|
diff --git a/src/host.h b/src/host.h
|
|
index 785a570..3ef63cd 100644
|
|
--- a/src/host.h
|
|
+++ b/src/host.h
|
|
@@ -42,9 +42,9 @@ as that of the covered work. */
|
|
# endif /* def __VMS [else] */
|
|
# include <sys/socket.h>
|
|
# include <netinet/in.h>
|
|
-#ifndef __BEOS__
|
|
-# include <arpa/inet.h>
|
|
-#endif
|
|
+# ifdef HAVE_ARPA_INET_H
|
|
+# include <arpa/inet.h>
|
|
+# endif
|
|
#endif
|
|
|
|
struct url;
|
|
--
|
|
2.7.0
|
|
|
|
|
|
From e25da0597937e8dcad6c6d2fce99536da79464e3 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Mon, 19 May 2014 15:47:24 +0000
|
|
Subject: apply and augment wget-1.14-build-fixes.patch
|
|
|
|
|
|
diff --git a/src/utils.c b/src/utils.c
|
|
index db89ae1..f2a11ff 100644
|
|
--- a/src/utils.c
|
|
+++ b/src/utils.c
|
|
@@ -63,7 +63,9 @@ as that of the covered work. */
|
|
|
|
/* For TIOCGWINSZ and friends: */
|
|
#ifndef WINDOWS
|
|
+#ifndef __HAIKU__
|
|
# include <sys/ioctl.h>
|
|
+#endif
|
|
# include <termios.h>
|
|
#endif
|
|
|
|
--
|
|
2.7.0
|
|
|
|
|
|
From d8074e2ce1894326fccf5932edc9e23b105dc7a4 Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
|
Date: Sun, 14 Feb 2016 11:05:10 +0100
|
|
Subject: Move wget-hsts out of home directory.
|
|
|
|
|
|
diff --git a/src/main.c b/src/main.c
|
|
index 581a33d..e8268c7 100644
|
|
--- a/src/main.c
|
|
+++ b/src/main.c
|
|
@@ -80,6 +80,10 @@ as that of the covered work. */
|
|
# include "vms.h"
|
|
#endif /* __VMS */
|
|
|
|
+#ifdef __HAIKU__
|
|
+#include "FindDirectory.h"
|
|
+#endif
|
|
+
|
|
#ifndef PATH_SEPARATOR
|
|
# define PATH_SEPARATOR '/'
|
|
#endif
|
|
@@ -163,6 +167,16 @@ get_hsts_database (void)
|
|
if (opt.hsts_file)
|
|
return xstrdup (opt.hsts_file);
|
|
|
|
+#ifdef __HAIKU__
|
|
+ {
|
|
+ char buffer[256];
|
|
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, 0, false, buffer, sizeof(buffer)) == B_OK) {
|
|
+ home = aprintf("%s/wget-hsts", buffer);
|
|
+ return home;
|
|
+ }
|
|
+ }
|
|
+#endif
|
|
+
|
|
home = home_dir ();
|
|
if (home)
|
|
{
|
|
--
|
|
2.7.0
|
|
|
|
|
|
From 3cb17cf7796926a75c57213b0995b06a96e352f1 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Mon, 22 May 2017 18:46:27 +0200
|
|
Subject: gcc2 patch
|
|
|
|
|
|
diff --git a/src/init.c b/src/init.c
|
|
index e6aa673..a705ff9 100644
|
|
--- a/src/init.c
|
|
+++ b/src/init.c
|
|
@@ -880,7 +880,7 @@ setval_internal (int comind, const char *com, const char *val)
|
|
assert (0 <= comind && ((size_t) comind) < countof (commands));
|
|
|
|
if ((unsigned) comind >= countof (commands))
|
|
- return NULL;
|
|
+ return false;
|
|
|
|
DEBUGP (("Setting %s (%s) to %s\n", com, commands[comind].name, val));
|
|
return commands[comind].action (com, val, commands[comind].place);
|
|
--
|
|
2.7.0
|
|
|