Hi,
This diff updates dillo to the latest release 2.1.1.
Tested on amd64/sparc64.
Comments ? OK ?
Cheers,
benoit
? patches/patch-src_Makefile_in
Index: Makefile
===================================================================
RCS file: /cvs/openbsd/ports/www/dillo/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- Makefile 10 Aug 2009 18:46:49 -0000 1.31
+++ Makefile 28 Sep 2009 10:06:50 -0000
@@ -2,20 +2,21 @@
COMMENT= fast and light graphical web browser
-DISTNAME= dillo-2.0
-PKGNAME= ${DISTNAME}p3
+DISTNAME= dillo-2.1.1
CATEGORIES= www
HOMEPAGE= http://www.dillo.org/
+MAINTAINER= Benoit Lecocq <[email protected]>
+
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= X11 Xext Xft Xi Xinerama Xrender c crypto fontconfig m \
- pthread pthread-stubs ssl stdc++ xcb z
+WANTLIB= X11 Xcursor Xext Xft Xi Xinerama Xrender c crypto fontconfig \
+ m pthread pthread-stubs ssl stdc++ xcb z
MODULES= converters/libiconv
@@ -33,12 +34,14 @@
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --enable-ipv6 \
- --disable-threaded-dns
+ --disable-threaded-dns \
+ --enable-ssl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng" \
LDFLAGS="-L${LOCALBASE}/lib"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dillo
${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/dillo
+ ${INSTALL_DATA} ${WRKSRC}/dpid/dpidrc ${PREFIX}/share/examples/dillo
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/openbsd/ports/www/dillo/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 19 Oct 2008 08:42:55 -0000 1.13
+++ distinfo 28 Sep 2009 10:06:50 -0000
@@ -1,5 +1,5 @@
-MD5 (dillo-2.0.tar.bz2) = u5mZyr602z2RVofeRl2+sA==
-RMD160 (dillo-2.0.tar.bz2) = 9FfloDHYoOaCvlDuFsv7o/6jTqo=
-SHA1 (dillo-2.0.tar.bz2) = m95+q1yDXhNQjWOhkKi87E6UVTo=
-SHA256 (dillo-2.0.tar.bz2) = hH0dsxvWirmrlLZCsM1ArI08+BaQD11WUhJJhmAd8ek=
-SIZE (dillo-2.0.tar.bz2) = 551569
+MD5 (dillo-2.1.1.tar.bz2) = k/Z08qQtkKHNuIppcjJZVA==
+RMD160 (dillo-2.1.1.tar.bz2) = S4/kI+Og/Q5GHMjheVusOa1H07Y=
+SHA1 (dillo-2.1.1.tar.bz2) = 6yUmY7lIDlPgN211uBEwQEzPQM4=
+SHA256 (dillo-2.1.1.tar.bz2) = juwCWHIDD8FBn7k+5B2984Cm0fdfTVGuxe7pqaSqRHc=
+SIZE (dillo-2.1.1.tar.bz2) = 612711
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/openbsd/ports/www/dillo/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 19 Oct 2008 08:42:55 -0000 1.4
+++ patches/patch-Makefile_in 28 Sep 2009 10:06:50 -0000
@@ -1,11 +1,10 @@
-$OpenBSD: patch-Makefile_in,v 1.4 2008/10/19 08:42:55 ajacoutot Exp $
---- Makefile.in.orig Fri Oct 17 07:13:44 2008
-+++ Makefile.in Fri Oct 17 07:14:31 2008
-@@ -254,12 +254,12 @@ distclean-hdr:
- -rm -f config.h stamp-h1
+--- Makefile.in.orig Wed Jul 1 19:56:55 2009
++++ Makefile.in Tue Sep 22 15:57:01 2009
+@@ -252,12 +252,12 @@
+ uninstall-info-am:
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
-- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
+- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
+ $(mkdir_p) $(PREFIX)/share/examples/dillo/
@list='$(sysconf_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
Index: patches/patch-configure
===================================================================
RCS file: /cvs/openbsd/ports/www/dillo/patches/patch-configure,v
retrieving revision 1.4
diff -u -r1.4 patch-configure
--- patches/patch-configure 19 Oct 2008 08:42:55 -0000 1.4
+++ patches/patch-configure 28 Sep 2009 10:06:50 -0000
@@ -1,12 +1,13 @@
-$OpenBSD: patch-configure,v 1.4 2008/10/19 08:42:55 ajacoutot Exp $
---- configure.orig Fri Oct 17 06:47:30 2008
-+++ configure Fri Oct 17 06:47:46 2008
-@@ -7604,14 +7604,6 @@ cat >d_size.h <<_______EOF
+--- configure.orig Wed Jul 1 19:57:05 2009
++++ configure Tue Sep 22 15:59:54 2009
+@@ -8344,16 +8344,6 @@
#include "config.h"
-#if HAVE_STDINT_H == 0
-#include <stdint.h>
+-#elif defined(HAVE_INTTYPES_H)
+-#include <inttypes.h>
-#else
-typedef signed $gint16 int16_t;
-typedef unsigned $gint16 uint16_t;
Index: patches/patch-dillorc
===================================================================
RCS file: /cvs/openbsd/ports/www/dillo/patches/patch-dillorc,v
retrieving revision 1.1
diff -u -r1.1 patch-dillorc
--- patches/patch-dillorc 3 Nov 2008 11:05:25 -0000 1.1
+++ patches/patch-dillorc 28 Sep 2009 10:06:50 -0000
@@ -1,19 +1,19 @@
-$OpenBSD: patch-dillorc,v 1.1 2008/11/03 11:05:25 ajacoutot Exp $
---- dillorc.orig Mon Nov 3 11:45:40 2008
-+++ dillorc Mon Nov 3 11:46:03 2008
-@@ -39,13 +39,13 @@
- # vw_fontname="new century schoolbook"
- # vw_fontname="helvetica"
- # vw_fontname="times"
--# vw_fontname="Bitstream vera Serif"
-+vw_fontname="Bitstream vera Serif"
- # vw_fontname="arial"
- #vw_fontname="DejaVu Sans"
-
- # Fontname for fixed width rendering (mainly text quoted with <pre>)
- # fw_fontname=courier
--# fw_fontname="Bitstream Vera Sans Mono"
-+fw_fontname="Bitstream Vera Sans Mono"
- # fw_fontname="Andale Mono"
- #fw_fontname="DejaVu Sans Mono"
+--- dillorc.orig Wed Jun 10 05:35:25 2009
++++ dillorc Tue Sep 22 17:43:18 2009
+@@ -45,11 +45,11 @@
+ # Ex. {helvetica, lucida, times, "new century schoolbook", utopia, ...}
+ # The values below represent the defaults.
+ #
+-#font_serif="DejaVu Serif"
+-#font_sans_serif="DejaVu Sans"
+-#font_cursive="DejaVu Sans"
+-#font_fantasy="DejaVu Sans"
+-#font_monospace="DejaVu Sans Mono"
++font_serif="Bitstream vera Serif"
++font_sans_serif="Bitstream vera Serif"
++font_cursive="Bitstream vera Serif"
++font_fantasy="Bitstream vera Serif"
++font_monospace="Bitstream Vera Sans Mono"
+ # All font sizes are scaled by this value
+ # font_factor=1.5
Index: patches/patch-dpi_https_c
===================================================================
RCS file: /cvs/openbsd/ports/www/dillo/patches/patch-dpi_https_c,v
retrieving revision 1.2
diff -u -r1.2 patch-dpi_https_c
--- patches/patch-dpi_https_c 21 Oct 2008 07:14:20 -0000 1.2
+++ patches/patch-dpi_https_c 28 Sep 2009 10:06:50 -0000
@@ -1,15 +1,6 @@
-$OpenBSD: patch-dpi_https_c,v 1.2 2008/10/21 07:14:20 ajacoutot Exp $
---- dpi/https.c.orig Mon Oct 13 16:49:46 2008
-+++ dpi/https.c Tue Oct 21 09:12:22 2008
-@@ -69,7 +69,6 @@
-
-
- #define ENABLE_SSL
--#undef ENABLE_SSL
- #ifdef ENABLE_SSL
-
- #include <openssl/ssl.h>
-@@ -155,7 +154,7 @@ static void yes_ssl_support(void)
+--- dpi/https.c.orig Sun Jun 7 05:40:49 2009
++++ dpi/https.c Tue Sep 22 16:03:34 2009
+@@ -159,7 +159,7 @@
/*FIXME - provide for sysconfdir variables and such*/
if (exit_error == 0){
if (SSL_CTX_load_verify_locations(
Index: patches/patch-dpid_Makefile_in
===================================================================
RCS file: /cvs/openbsd/ports/www/dillo/patches/patch-dpid_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-dpid_Makefile_in
--- patches/patch-dpid_Makefile_in 19 Oct 2008 08:42:55 -0000 1.3
+++ patches/patch-dpid_Makefile_in 28 Sep 2009 10:06:50 -0000
@@ -1,24 +1,11 @@
-$OpenBSD: patch-dpid_Makefile_in,v 1.3 2008/10/19 08:42:55 ajacoutot Exp $
---- dpid/Makefile.in.orig Fri Oct 10 16:48:19 2008
-+++ dpid/Makefile.in Fri Oct 17 07:25:33 2008
-@@ -485,13 +485,13 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIP
-
-
- install-data-local :
-- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-- echo dpi_dir=$(libdir)/dillo/dpi > $(DESTDIR)$(sysconfdir)/dpidrc
-- echo >> $(DESTDIR)$(sysconfdir)/dpidrc
-- echo "proto.file=file/file.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
-- echo "proto.ftp=ftp/ftp.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
-- echo "proto.https=https/https.filter.dpi" >>
$(DESTDIR)$(sysconfdir)/dpidrc
-- echo "proto.data=datauri/datauri.filter.dpi" >>
$(DESTDIR)$(sysconfdir)/dpidrc
-+ $(mkinstalldirs) $(PREFIX)/share/examples/dillo/
-+ echo dpi_dir=$(libdir)/dillo/dpi > $(PREFIX)/share/examples/dillo/dpidrc
-+ echo >> $(PREFIX)/share/examples/dillo/dpidrc
-+ echo "proto.file=file/file.dpi" >> $(PREFIX)/share/examples/dillo/dpidrc
-+ echo "proto.ftp=ftp/ftp.filter.dpi" >>
$(PREFIX)/share/examples/dillo/dpidrc
-+ echo "proto.https=https/https.filter.dpi" >>
$(PREFIX)/share/examples/dillo/dpidrc
-+ echo "proto.data=datauri/datauri.filter.dpi" >>
$(PREFIX)/share/examples/dillo/dpidrc
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
+--- dpid/Makefile.in.orig Tue Sep 22 17:44:57 2009
++++ dpid/Makefile.in Tue Sep 22 17:45:30 2009
+@@ -415,7 +415,7 @@
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
+ installdirs:
+- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
"$(DESTDIR)$(sysconfdir)"; do \
++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
"$(PREFIX)/share/examples/dillo"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
Index: patches/patch-src_IO_http_c
===================================================================
RCS file: /cvs/openbsd/ports/www/dillo/patches/patch-src_IO_http_c,v
retrieving revision 1.10
diff -u -r1.10 patch-src_IO_http_c
--- patches/patch-src_IO_http_c 19 Oct 2008 08:42:55 -0000 1.10
+++ patches/patch-src_IO_http_c 28 Sep 2009 10:06:50 -0000
@@ -1,125 +0,0 @@
-$OpenBSD: patch-src_IO_http_c,v 1.10 2008/10/19 08:42:55 ajacoutot Exp $
---- src/IO/http.c.orig Sun Sep 28 14:57:42 2008
-+++ src/IO/http.c Sat Oct 18 22:26:06 2008
-@@ -311,7 +311,7 @@ static void Http_send_query(ChainLink *Info, SocketDat
- */
- static int Http_connect_socket(ChainLink *Info)
- {
-- int status;
-+ int i, status;
- #ifdef ENABLE_IPV6
- struct sockaddr_in6 name;
- #else
-@@ -324,61 +324,63 @@ static int Http_connect_socket(ChainLink *Info)
- S = a_Klist_get_data(ValidSocks, VOIDP2INT(Info->LocalKey));
-
- /* TODO: iterate this address list until success, or end-of-list */
-- dh = dList_nth_data(S->addr_list, 0);
-+ for (i = 0; (dh = dList_nth_data(S->addr_list, i)); ++i) {
-+ if ((S->SockFD = socket(dh->af, SOCK_STREAM, IPPROTO_TCP)) < 0) {
-+ S->Err = errno;
-+ MSG("Http_connect_socket ERROR: %s\n", dStrerror(errno));
-+ continue;
-+ }
-+ /* set NONBLOCKING and close on exec. */
-+ fcntl(S->SockFD, F_SETFL, O_NONBLOCK | fcntl(S->SockFD, F_GETFL));
-+ fcntl(S->SockFD, F_SETFD, FD_CLOEXEC | fcntl(S->SockFD, F_GETFD));
-
-- if ((S->SockFD = socket(dh->af, SOCK_STREAM, IPPROTO_TCP)) < 0) {
-- S->Err = errno;
-- MSG("Http_connect_socket ERROR: %s\n", dStrerror(errno));
-- return -1;
-- }
-- /* set NONBLOCKING and close on exec. */
-- fcntl(S->SockFD, F_SETFL, O_NONBLOCK | fcntl(S->SockFD, F_GETFL));
-- fcntl(S->SockFD, F_SETFD, FD_CLOEXEC | fcntl(S->SockFD, F_GETFD));
--
-- /* Some OSes require this... */
-- memset(&name, 0, sizeof(name));
-- /* Set remaining parms. */
-- switch (dh->af) {
-- case AF_INET:
-- {
-- struct sockaddr_in *sin = (struct sockaddr_in *)&name;
-- socket_len = sizeof(struct sockaddr_in);
-- sin->sin_family = dh->af;
-- sin->sin_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT);
-- memcpy(&sin->sin_addr, dh->data, (size_t)dh->alen);
-- if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
-- MSG("Connecting to %s\n", inet_ntoa(sin->sin_addr));
-- break;
-- }
-+ /* Some OSes require this... */
-+ memset(&name, 0, sizeof(name));
-+ /* Set remaining parms. */
-+ switch (dh->af) {
-+ case AF_INET:
-+ {
-+ struct sockaddr_in *sin = (struct sockaddr_in *)&name;
-+ socket_len = sizeof(struct sockaddr_in);
-+ sin->sin_family = dh->af;
-+ sin->sin_len = socket_len;
-+ sin->sin_port = S->port ? htons(S->port) :
htons(DILLO_URL_HTTP_PORT);
-+ memcpy(&sin->sin_addr, dh->data, (size_t)dh->alen);
-+ if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
-+ MSG("Connecting to %s\n", inet_ntoa(sin->sin_addr));
-+ break;
-+ }
- #ifdef ENABLE_IPV6
-- case AF_INET6:
-- {
-- char buf[128];
-- struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&name;
-- socket_len = sizeof(struct sockaddr_in6);
-- 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))
-- MSG("Connecting to %s\n", buf);
-- break;
-- }
-+ case AF_INET6:
-+ {
-+ char buf[128];
-+ struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&name;
-+ socket_len = sizeof(struct sockaddr_in6);
-+ sin6->sin6_family = dh->af;
-+ sin6->sin6_port = S->port ? htons(S->port) :
htons(DILLO_URL_HTTP_PORT);
-+ sin6->sin6_len = socket_len;
-+ 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))
-+ MSG("Connecting to %s\n", buf);
-+ break;
-+ }
- #endif
-- }/*switch*/
-+ }/*switch*/
-
-- MSG_BW(S->web, 1, "Contacting host...");
-- status = connect(S->SockFD, (struct sockaddr *)&name, socket_len);
-- if (status == -1 && errno != EINPROGRESS) {
-- S->Err = errno;
-- Http_socket_close(S);
-- MSG("Http_connect_socket ERROR: %s\n", dStrerror(S->Err));
-- return -1;
-- } else {
-- Http_send_query(S->Info, S);
-+ MSG_BW(S->web, 1, "Contacting host...");
-+ status = connect(S->SockFD, (struct sockaddr *)&name, socket_len);
-+ if (status == -1 && errno != EINPROGRESS) {
-+ S->Err = errno;
-+ Http_socket_close(S);
-+ MSG("Http_connect_socket ERROR: %s\n", dStrerror(S->Err));
-+ } else {
-+ Http_send_query(S->Info, S);
-+ return 0; /* Success */
-+ }
- }
-
-- return 0; /* Success */
-+ return -1;
- }
-
- /*
Index: pkg/PLIST
===================================================================
RCS file: /cvs/openbsd/ports/www/dillo/pkg/PLIST,v
retrieving revision 1.9
diff -u -r1.9 PLIST
--- pkg/PLIST 19 Oct 2008 08:42:55 -0000 1.9
+++ pkg/PLIST 28 Sep 2009 10:06:50 -0000
@@ -20,6 +20,7 @@
@bin lib/dillo/dpi/hello/hello.filter.dpi
lib/dillo/dpi/https/
@bin lib/dillo/dpi/https/https.filter.dpi
+...@man man/man1/dillo.1
share/doc/dillo/
share/doc/dillo/Cache.txt
share/doc/dillo/Cookies.txt
@@ -37,3 +38,4 @@
@sample ${SYSCONFDIR}/dillorc
share/examples/dillo/dpidrc
@sample ${SYSCONFDIR}/dpidrc
+share/examples/dillo/keysrc
