diff options
author | jmmv <jmmv> | 2003-03-21 18:15:28 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2003-03-21 18:15:28 +0000 |
commit | 6aa1b06c7ed594cf80044cecf01a10e1982f9c4a (patch) | |
tree | dc215b3da7f901650b8f5c1df36e6665547c157f /www/dillo/patches | |
parent | 7c539c19304ece1a567031ac29cefcc0d1e9f066 (diff) | |
download | pkgsrc-6aa1b06c7ed594cf80044cecf01a10e1982f9c4a.tar.gz |
Update to 0.7.1.2. There are lots of new features, including plugin
support and IPv6; threads are now a must.
Patch provided in PR pkg/20672 by Quentin Garnier.
Diffstat (limited to 'www/dillo/patches')
-rw-r--r-- | www/dillo/patches/patch-aa | 78 | ||||
-rw-r--r-- | www/dillo/patches/patch-ab | 12 | ||||
-rw-r--r-- | www/dillo/patches/patch-ac | 8 |
3 files changed, 75 insertions, 23 deletions
diff --git a/www/dillo/patches/patch-aa b/www/dillo/patches/patch-aa index c7166e63262..a9f0c719ad1 100644 --- a/www/dillo/patches/patch-aa +++ b/www/dillo/patches/patch-aa @@ -1,15 +1,67 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/12/06 16:15:41 dillo Exp $ +$NetBSD: patch-aa,v 1.2 2003/03/21 18:15:29 jmmv Exp $ ---- src/dns.c.orig Fri Aug 31 14:26:21 2001 -+++ src/dns.c -@@ -37,7 +37,10 @@ - /* - * Note: comment the following line for debugging or gprof profiling. - */ -+/* No threads on NetBSD */ -+#ifndef __NetBSD__ - #define G_DNS_THREADED -+#endif +--- src/IO/http.c.orig 2003-03-04 20:34:59.000000000 +0100 ++++ src/IO/http.c +@@ -246,10 +246,11 @@ static int Http_connect_socket(ChainLink + { + gint status; + #ifdef ENABLE_IPV6 +- struct sockaddr_storage name; +-#else +- struct sockaddr_in name; ++ struct sockaddr_in6 name6; + #endif ++ struct sockaddr_in name4; ++ struct sockaddr *sa = NULL; ++ socklen_t sa_len = 0; + SocketData_t *S; + DilloHost *dh; - /* - * Uncomment the following line for libc5 optimization +@@ -269,30 +270,35 @@ static int Http_connect_socket(ChainLink + FD_CLOEXEC | fcntl(S->SockFD, F_GETFD)); + + /* Some OSes require this... */ +- memset(&name, 0, sizeof(name)); ++ memset(&name4, 0, sizeof(name4)); ++ memset(&name6, 0, sizeof(name6)); + /* Set remaining parms. */ + switch (dh->af) { + case AF_INET: + { +- struct sockaddr_in *sin = (struct sockaddr_in *)&name; ++ struct sockaddr_in *sin = (struct sockaddr_in *)&name4; + sin->sin_family = dh->af; + sin->sin_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT); + memcpy(&sin->sin_addr, dh->data, dh->alen); + if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl)) + DEBUG_MSG(5, "Connecting to %s\n", inet_ntoa(sin->sin_addr)); ++ sa = (struct sockaddr *)sin; ++ sa_len = sizeof(struct sockaddr_in); + break; + } + #ifdef ENABLE_IPV6 + case AF_INET6: + { + char buf[128]; +- struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&name; ++ struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&name6; + sin6->sin6_family = dh->af; + sin6->sin6_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT); + memcpy(&sin6->sin6_addr, dh->data, dh->alen); + inet_ntop(dh->af, dh->data, buf, sizeof(buf)); + if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl)) + DEBUG_MSG(5, "Connecting to %s\n", buf); ++ sa = (struct sockaddr *)sin6; ++ sa_len = sizeof(struct sockaddr_in6); + break; + } + #endif +@@ -302,7 +308,7 @@ static int Http_connect_socket(ChainLink + S->GioCh = g_io_channel_unix_new(S->SockFD); + g_io_add_watch(S->GioCh, G_IO_ERR | G_IO_HUP | G_IO_OUT, + Http_use_socket, Info->LocalKey); +- status = connect(S->SockFD, (struct sockaddr *)&name, sizeof(name)); ++ status = connect(S->SockFD, sa, sa_len); + if ( status == -1 && errno != EINPROGRESS ) { + S->Err = errno; + return -1; diff --git a/www/dillo/patches/patch-ab b/www/dillo/patches/patch-ab index c57d9c970bb..6da0a01c2b3 100644 --- a/www/dillo/patches/patch-ab +++ b/www/dillo/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2002/11/26 15:07:32 jmmv Exp $ +$NetBSD: patch-ab,v 1.7 2003/03/21 18:15:29 jmmv Exp $ ---- Makefile.in.orig Wed May 29 23:02:18 2002 +--- Makefile.in.orig 2003-03-10 13:44:49.000000000 +0100 +++ Makefile.in -@@ -23,7 +23,7 @@ bindir = @bindir@ +@@ -25,7 +25,7 @@ bindir = @bindir@ sbindir = @sbindir@ libexecdir = @libexecdir@ datadir = @datadir@ @@ -11,15 +11,15 @@ $NetBSD: patch-ab,v 1.6 2002/11/26 15:07:32 jmmv Exp $ sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ libdir = @libdir@ -@@ -358,10 +358,9 @@ mostlyclean distclean maintainer-clean +@@ -397,10 +397,9 @@ uninstall-info: uninstall-info-recursive install-data-local: dillorc + $(mkinstalldirs) $(DESTDIR)$(sysconfdir) -if [ -d $(DESTDIR)$(sysconfdir) ]; then \ -- $(INSTALL_DATA) --backup=t $(srcdir)/dillorc $(DESTDIR)$(sysconfdir)/; \ +- $(INSTALL_DATA) -b $(srcdir)/dillorc $(DESTDIR)$(sysconfdir)/; \ - elif [ -d /etc/ ]; then \ -- $(INSTALL_DATA) --backup=t $(srcdir)/dillorc /etc/; \ +- $(INSTALL_DATA) -b $(srcdir)/dillorc /etc/; \ + $(INSTALL_DATA) $(srcdir)/dillorc $(DESTDIR)$(sysconfdir)/; \ fi diff --git a/www/dillo/patches/patch-ac b/www/dillo/patches/patch-ac index bd177076d1d..4d0b0625cf4 100644 --- a/www/dillo/patches/patch-ac +++ b/www/dillo/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2002/11/26 15:07:32 jmmv Exp $ +$NetBSD: patch-ac,v 1.4 2003/03/21 18:15:29 jmmv Exp $ ---- src/prefs.c.orig Wed Apr 3 18:31:46 2002 +--- src/prefs.c.orig 2003-03-04 20:34:59.000000000 +0100 +++ src/prefs.c -@@ -243,8 +244,7 @@ static gint Prefs_load(void) +@@ -250,8 +250,7 @@ static gint Prefs_load(void) file = a_Misc_prepend_user_home(".dillo/dillorc"); fd = open(file, O_RDONLY); g_free(file); @@ -11,4 +11,4 @@ $NetBSD: patch-ac,v 1.3 2002/11/26 15:07:32 jmmv Exp $ + if (fd < 0 && (fd = open(PKG_SYSCONFDIR "/dillorc", O_RDONLY)) < 0) return FILE_NOT_FOUND; - scanner = g_scanner_new(NULL); + fcntl(fd, F_SETFD, FD_CLOEXEC | fcntl(fd, F_GETFD)); |