update to 0.7.1.2 from henning@
This commit is contained in:
couderc
parent
57b51798d8
commit
e18b2de38d
@ -1,8 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.12 2003/02/19 14:41:01 couderc Exp $
|
||||
# $OpenBSD: Makefile,v 1.13 2003/04/28 18:20:53 couderc Exp $
|
||||
|
||||
COMMENT= "Fast and light gtk-based web browser"
|
||||
|
||||
DISTNAME= dillo-0.7.0
|
||||
VERSION= 0.7.1
|
||||
DISTNAME= dillo-${VERSION}
|
||||
DISTFILES= ${DISTNAME}.2.tar.gz
|
||||
CATEGORIES= www
|
||||
|
||||
HOMEPAGE= http://dillo.auriga.wearlab.de/
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (dillo-0.7.0.tar.gz) = 5cd0c6b17462329b988db417c475f048
|
||||
RMD160 (dillo-0.7.0.tar.gz) = 507dd55dfa5447f55072fdd42a7353ec274aa158
|
||||
SHA1 (dillo-0.7.0.tar.gz) = 6231f8c895fc4f46c18c9554dd07ea9d6b3761c7
|
||||
MD5 (dillo-0.7.1.2.tar.gz) = b6b340d30657e51a48dc32f926be45c0
|
||||
RMD160 (dillo-0.7.1.2.tar.gz) = b7a139868981e1ff9f117fdc5304b45fd7acd366
|
||||
SHA1 (dillo-0.7.1.2.tar.gz) = eb6ed7af0cb0f0d68f0f3411cbba0606d1dec242
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_IO_dpi_c,v 1.2 2003/03/02 19:15:42 pvalchev Exp $
|
||||
--- src/IO/dpi.c.orig Thu Feb 13 14:56:14 2003
|
||||
+++ src/IO/dpi.c Sun Mar 2 12:08:18 2003
|
||||
$OpenBSD: patch-src_IO_dpi_c,v 1.3 2003/04/28 18:20:53 couderc Exp $
|
||||
--- src/IO/dpi.c.orig Fri Feb 28 20:43:06 2003
|
||||
+++ src/IO/dpi.c Wed Apr 23 20:25:28 2003
|
||||
@@ -305,9 +305,9 @@ static gint Dpi_launch_server()
|
||||
if (pid == 0) {
|
||||
/* This is the child process. Execute the command. */
|
||||
@ -13,12 +13,12 @@ $OpenBSD: patch-src_IO_dpi_c,v 1.2 2003/03/02 19:15:42 pvalchev Exp $
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
} else if (pid < 0) {
|
||||
@@ -362,7 +362,7 @@ static gint Dpi_connect_socket()
|
||||
return -1;
|
||||
}
|
||||
@@ -358,7 +358,7 @@ static gint Dpi_connect_socket(gint retr
|
||||
|
||||
- if (connect(SockFD, (void*)&pun, D_SUN_LEN(&pun)) == -1) {
|
||||
+ if (connect(SockFD, (void*)&pun, SUN_LEN(&pun)) == -1) {
|
||||
perror("[connect]");
|
||||
return -1;
|
||||
}
|
||||
if ((SockFD = socket(AF_LOCAL, SOCK_STREAM, 0)) == -1)
|
||||
perror("[dpi::socket]");
|
||||
- else if (connect(SockFD, (void*)&pun, D_SUN_LEN(&pun)) == -1) {
|
||||
+ else if (connect(SockFD, (void*)&pun, SUN_LEN(&pun)) == -1) {
|
||||
err = errno;
|
||||
SockFD = -1;
|
||||
g_print("[dpi::connect] errno:%d %s\n", errno, g_strerror(errno));
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_IO_http_c,v 1.5 2003/02/19 14:41:02 couderc Exp $
|
||||
--- src/IO/http.c.orig Sun Jan 12 01:30:30 2003
|
||||
+++ src/IO/http.c Wed Feb 19 16:24:51 2003
|
||||
$OpenBSD: patch-src_IO_http_c,v 1.6 2003/04/28 18:20:53 couderc Exp $
|
||||
--- src/IO/http.c.orig Tue Mar 4 20:34:59 2003
|
||||
+++ src/IO/http.c Wed Apr 23 20:24:09 2003
|
||||
@@ -43,7 +43,6 @@
|
||||
(a_Web_valid(web) && (!(root) || (web)->flags & WEB_RootUrl)) ? \
|
||||
a_Interface_msg((web)->bw, fmt) : (root)
|
||||
@ -18,7 +18,7 @@ $OpenBSD: patch-src_IO_http_c,v 1.5 2003/02/19 14:41:02 couderc Exp $
|
||||
#else
|
||||
struct sockaddr_in name;
|
||||
#endif
|
||||
@@ -274,6 +273,7 @@ static int Http_connect_socket(ChainLink
|
||||
@@ -276,6 +275,7 @@ static int Http_connect_socket(ChainLink
|
||||
{
|
||||
struct sockaddr_in *sin = (struct sockaddr_in *)&name;
|
||||
sin->sin_family = dh->af;
|
||||
@ -26,7 +26,7 @@ $OpenBSD: patch-src_IO_http_c,v 1.5 2003/02/19 14:41:02 couderc Exp $
|
||||
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))
|
||||
@@ -286,6 +286,7 @@ static int Http_connect_socket(ChainLink
|
||||
@@ -288,6 +288,7 @@ static int Http_connect_socket(ChainLink
|
||||
char buf[128];
|
||||
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&name;
|
||||
sin6->sin6_family = dh->af;
|
||||
@ -34,7 +34,7 @@ $OpenBSD: patch-src_IO_http_c,v 1.5 2003/02/19 14:41:02 couderc Exp $
|
||||
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));
|
||||
@@ -300,7 +301,8 @@ static int Http_connect_socket(ChainLink
|
||||
@@ -302,7 +303,8 @@ 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);
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_bookmark_c,v 1.2 2003/02/18 15:53:18 couderc Exp $
|
||||
--- src/bookmark.c.orig Tue Feb 18 15:54:29 2003
|
||||
+++ src/bookmark.c Tue Feb 18 15:55:17 2003
|
||||
$OpenBSD: patch-src_bookmark_c,v 1.3 2003/04/28 18:20:53 couderc Exp $
|
||||
--- src/bookmark.c.orig Tue Mar 11 01:18:34 2003
|
||||
+++ src/bookmark.c Wed Apr 23 20:26:37 2003
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "menu.h"
|
||||
#include "capi.h"
|
||||
@ -14,8 +14,8 @@ $OpenBSD: patch-src_bookmark_c,v 1.2 2003/02/18 15:53:18 couderc Exp $
|
||||
static BrowserWindow *bw = NULL;
|
||||
static gchar *cmd4 = NULL;
|
||||
|
||||
- g_print("a_Bookmarks_chat_add\n answer=%s\n", answer);
|
||||
+ DEBUG_MSG(3, "a_Bookmarks_chat_add\n answer=%s\n", answer);
|
||||
- g_print("a_Bookmarks_chat_add\n answer=%s\n", answer ? answer : "(null)");
|
||||
+ DEBUG_MSG(3, "a_Bookmarks_chat_add\n answer=%s\n", answer ? answer : "(null)");
|
||||
|
||||
if (Bw)
|
||||
bw = Bw;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_dns_c,v 1.4 2003/02/22 17:11:05 couderc Exp $
|
||||
--- src/dns.c.orig Thu Dec 26 13:39:57 2002
|
||||
+++ src/dns.c Sat Feb 22 18:47:04 2003
|
||||
$OpenBSD: patch-src_dns_c,v 1.5 2003/04/28 18:20:53 couderc Exp $
|
||||
--- src/dns.c.orig Tue Mar 4 21:50:40 2003
|
||||
+++ src/dns.c Wed Apr 23 20:29:36 2003
|
||||
@@ -30,14 +30,13 @@
|
||||
#include "dns.h"
|
||||
#include "list.h"
|
||||
@ -26,7 +26,7 @@ $OpenBSD: patch-src_dns_c,v 1.4 2003/02/22 17:11:05 couderc Exp $
|
||||
gint index;
|
||||
GSList *hosts = NULL;
|
||||
|
||||
@@ -313,18 +312,28 @@ static void Dns_blocking_server(void)
|
||||
@@ -313,12 +312,22 @@ static void Dns_blocking_server(void)
|
||||
DEBUG_MSG(3, "Dns_blocking_server: dns_server[%d].hostname = %s\n",
|
||||
index, dns_server[index].hostname);
|
||||
|
||||
@ -55,10 +55,3 @@ $OpenBSD: patch-src_dns_c,v 1.4 2003/02/22 17:11:05 couderc Exp $
|
||||
}
|
||||
|
||||
/* write IP to server data channel */
|
||||
DEBUG_MSG(3, "Dns_blocking_server: IP of %s is %p\n",
|
||||
dns_server[index].hostname, hosts);
|
||||
- dns_server[index].ip_addr = hosts;
|
||||
+ dns_server[index].addr_list = hosts;
|
||||
dns_server[index].ip_ready = TRUE;
|
||||
|
||||
DEBUG_MSG(3, "Dns_blocking_server: leaving...\n");
|
||||
|
||||
Loading…
Reference in New Issue
Block a user