Pullup ticket #2815 - requested by obache dillo: security update Revisions pulled up: - www/dillo/Makefile 1.43-1.44 - www/dillo/PLIST 1.15 - www/dillo/distinfo 1.29 - www/dillo/patches/patch-aa 1.8 - www/dillo/patches/patch-ab 1.15 - www/dillo/patches/patch-ac 1.12 - www/dillo/patches/patch-ad 1.1 --- Module Name: pkgsrc Committed By: joerg Date: Tue Jul 7 14:24:05 UTC 2009 Modified Files: pkgsrc/www/dillo: Makefile Log Message: user-destdir support --- Module Name: pkgsrc Committed By: snj Date: Thu Jul 9 05:04:03 UTC 2009 Modified Files: pkgsrc/www/dillo: Makefile PLIST distinfo pkgsrc/www/dillo/patches: patch-aa patch-ab patch-ac Added Files: pkgsrc/www/dillo/patches: patch-ad Log Message: Update dillo to 2.1.1, partially from Matthew Mondor in PR pkg/41670. Changes: 2.1.1: Add additional size checks for images. Added support for css colors of the form rgb(255, 255, 255). Added the 'nop' keybinding (nop = NO_OPERATION; cancels a default hook). Added 'stop' key action (not bound by default). Reduced 'warning: ignoring return value of ...' 2.1: Implemented basic CSS infrastructure! Read user style from ~/.dillo/style.css. Added configurable keybindings! (in ~/.dillo/keysrc) Implemented "search previous" in string searches. Ported the command line interface from dillo1 Set middle click to submit in a new TAB. (Helps to keep form data!) Implemented Basic authentication! Implemented a close-tab button for the GUI. Implemented a tools menu. Added dillo(1) man page. Added "font_max_size", "font_min_size" dillorc options. Added instant client-side redirects (aka. zero-delay META refresh). Proxy support for HTTPS. Updated the URL resolver to comply with RFC-3986. Fixed Bookmarks modify's HTML so it wraps nicely on handhelds. Made cookierc parsing more robust. Fix: recover page focus when clicking outside of a widget. Added support for the Q element. BUG#343 Added a right-click menu to form controls (show hiddens, submit, reset) Added the "http_language" dillorc option for setting HTTP's Accept-Language. Replace image loading button and page menu option with a tools menu option. Implemented the "overline" text-decoration. Enhanced and cleaned up text decorations for SUB and SUP. Added "View Stylesheets" to the page menu. System config files have moved to sysconfdir/dillo/ Allowed compilation with older machines by removing a few C99isms. Switched SSL-enabled to configure.in (./configure --enable-ssl). Removed redundant caller NULL checks already in the API. Added use of inttypes.h when stdint.h isn't found. Made the parser recognize "[^ ]/>"-terminated XML elements. Brought in Sebastian's CSS parser from dillo-0.8.0-css-3. Support CSS @import directive. Improved CSS selector matching performance using hash tables. Added support for descendant and child selectors. Support selector specificity. Replace bg_color dillorc option. Remove text_color, link_color, and force_my_colors dillorc options. Replace visited_color dillorc option. Allow negative values for specific CSS properties only. Disable negative margins for now as dw/* does not support them yet. Disable form widgets while stylesheets are loading. Implement --xid command line option (used by claws mail client). Added the "middle_click_drags_page" dillorc option. Set the File menu label to hide when the File menu-button is shown. Made a big cleanup of cache.c WRT charset decoding (fixes bugs). Made an extensive cleanup/fixup of the whole image handling process. Fixed handling of META's content-type with no MIME type (e.g. only charset). Added support for a quoted URL in META refresh. Updated the GPL copyright note in the source files.diff -r1.42 -r1.42.6.1 pkgsrc/www/dillo/Makefile
(tron)
@@ -1,41 +1,46 @@ | @@ -1,41 +1,46 @@ | |||
1 | # $NetBSD: Makefile,v 1.42 2008/10/31 02:02:44 snj Exp $ | 1 | # $NetBSD: Makefile,v 1.42.6.1 2009/07/17 13:23:37 tron Exp $ | |
2 | 2 | |||
3 | DISTNAME= dillo-2.0 | 3 | DISTNAME= dillo-2.1.1 | |
4 | CATEGORIES= www | 4 | CATEGORIES= www | |
5 | MASTER_SITES= http://www.dillo.org/download/ | 5 | MASTER_SITES= http://www.dillo.org/download/ | |
6 | EXTRACT_SUFX= .tar.bz2 | 6 | EXTRACT_SUFX= .tar.bz2 | |
7 | 7 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= http://www.dillo.org/ | 9 | HOMEPAGE= http://www.dillo.org/ | |
10 | COMMENT= Very small and fast graphical web-browser | 10 | COMMENT= Very small and fast graphical web-browser | |
11 | 11 | |||
12 | PKG_DESTDIR_SUPPORT= user-destdir | |||
13 | ||||
12 | USE_LANGUAGES= c c++ | 14 | USE_LANGUAGES= c c++ | |
13 | GNU_CONFIGURE= yes | 15 | GNU_CONFIGURE= yes | |
14 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} | 16 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} | |
15 | 17 | |||
16 | REPLACE_PERL+= dpid/dpidc | 18 | REPLACE_PERL+= dpid/dpidc | |
17 | USE_TOOLS+= perl:run | 19 | USE_TOOLS+= perl:run | |
18 | 20 | |||
19 | DEPENDS+= wget-[0-9]*:../../net/wget | 21 | DEPENDS+= wget-[0-9]*:../../net/wget | |
20 | 22 | |||
23 | PKG_SYSCONFSUBDIR= dillo | |||
21 | EGDIR= ${PREFIX}/share/examples/dillo | 24 | EGDIR= ${PREFIX}/share/examples/dillo | |
22 | CONF_FILES= ${EGDIR}/dillorc ${PKG_SYSCONFDIR}/dillorc | 25 | CONF_FILES= ${EGDIR}/dillorc ${PKG_SYSCONFDIR}/dillorc | |
23 | CONF_FILES+= ${EGDIR}/dpidrc ${PKG_SYSCONFDIR}/dpidrc | 26 | CONF_FILES+= ${EGDIR}/dpidrc ${PKG_SYSCONFDIR}/dpidrc | |
27 | CONF_FILES+= ${EGDIR}/keysrc ${PKG_SYSCONFDIR}/keysrc | |||
28 | ||||
29 | INSTALLATION_DIRS= share/doc/dillo ${EGDIR} | |||
24 | 30 | |||
25 | .include "options.mk" | 31 | .include "options.mk" | |
26 | 32 | |||
27 | post-install: | 33 | post-install: | |
28 | ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dillo | 34 | ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/dillo | |
29 | ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/dillo | 35 | ${INSTALL_DATA} ${WRKSRC}/doc/README ${DESTDIR}${PREFIX}/share/doc/dillo | |
30 | ${INSTALL_DATA} ${WRKSRC}/doc/README ${PREFIX}/share/doc/dillo | 36 | ${INSTALL_DATA} ${WRKSRC}/dillorc ${DESTDIR}${EGDIR} | |
31 | ${INSTALL_DATA_DIR} ${EGDIR} | 37 | ${INSTALL_DATA} ${WRKSRC}/src/keysrc ${DESTDIR}${EGDIR} | |
32 | ${INSTALL_DATA} ${WRKSRC}/dillorc ${EGDIR} | |||
33 | 38 | |||
34 | .include "../../converters/libiconv/buildlink3.mk" | 39 | .include "../../converters/libiconv/buildlink3.mk" | |
35 | .include "../../devel/zlib/buildlink3.mk" | 40 | .include "../../devel/zlib/buildlink3.mk" | |
36 | .include "../../graphics/jpeg/buildlink3.mk" | 41 | .include "../../graphics/jpeg/buildlink3.mk" | |
37 | .include "../../graphics/png/buildlink3.mk" | 42 | .include "../../graphics/png/buildlink3.mk" | |
38 | .include "../../x11/fltk2/buildlink3.mk" | 43 | .include "../../x11/fltk2/buildlink3.mk" | |
39 | 44 | |||
40 | .include "../../mk/pthread.buildlink3.mk" | 45 | .include "../../mk/pthread.buildlink3.mk" | |
41 | .include "../../mk/bsd.pkg.mk" | 46 | .include "../../mk/bsd.pkg.mk" |
@@ -1,26 +1,28 @@ | @@ -1,26 +1,28 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.14 2009/06/14 22:00:20 joerg Exp $ | 1 | @comment $NetBSD: PLIST,v 1.14.2.1 2009/07/17 13:23:37 tron Exp $ | |
2 | bin/dillo | 2 | bin/dillo | |
3 | bin/dpid | 3 | bin/dpid | |
4 | bin/dpidc | 4 | bin/dpidc | |
5 | lib/dillo/dpi/bookmarks/bookmarks.dpi | 5 | lib/dillo/dpi/bookmarks/bookmarks.dpi | |
6 | lib/dillo/dpi/cookies/cookies.dpi | 6 | lib/dillo/dpi/cookies/cookies.dpi | |
7 | lib/dillo/dpi/datauri/datauri.filter.dpi | 7 | lib/dillo/dpi/datauri/datauri.filter.dpi | |
8 | lib/dillo/dpi/downloads/downloads.dpi | 8 | lib/dillo/dpi/downloads/downloads.dpi | |
9 | lib/dillo/dpi/file/file.dpi | 9 | lib/dillo/dpi/file/file.dpi | |
10 | lib/dillo/dpi/ftp/ftp.filter.dpi | 10 | lib/dillo/dpi/ftp/ftp.filter.dpi | |
11 | lib/dillo/dpi/hello/hello.filter.dpi | 11 | lib/dillo/dpi/hello/hello.filter.dpi | |
12 | lib/dillo/dpi/https/https.filter.dpi | 12 | lib/dillo/dpi/https/https.filter.dpi | |
13 | man/man1/dillo.1 | |||
13 | share/doc/dillo/Cache.txt | 14 | share/doc/dillo/Cache.txt | |
14 | share/doc/dillo/Cookies.txt | 15 | share/doc/dillo/Cookies.txt | |
15 | share/doc/dillo/Dillo.txt | 16 | share/doc/dillo/Dillo.txt | |
16 | share/doc/dillo/Dpid.txt | 17 | share/doc/dillo/Dpid.txt | |
17 | share/doc/dillo/Dw.txt | 18 | share/doc/dillo/Dw.txt | |
18 | share/doc/dillo/HtmlParser.txt | 19 | share/doc/dillo/HtmlParser.txt | |
19 | share/doc/dillo/IO.txt | 20 | share/doc/dillo/IO.txt | |
20 | share/doc/dillo/Imgbuf.txt | 21 | share/doc/dillo/Imgbuf.txt | |
21 | share/doc/dillo/Images.txt | 22 | share/doc/dillo/Images.txt | |
22 | share/doc/dillo/NC_design.txt | 23 | share/doc/dillo/NC_design.txt | |
23 | share/doc/dillo/README | 24 | share/doc/dillo/README | |
24 | share/doc/dillo/Selection.txt | 25 | share/doc/dillo/Selection.txt | |
25 | share/examples/dillo/dillorc | 26 | share/examples/dillo/dillorc | |
26 | share/examples/dillo/dpidrc | 27 | share/examples/dillo/dpidrc | |
28 | share/examples/dillo/keysrc |
@@ -1,8 +1,9 @@ | @@ -1,8 +1,9 @@ | |||
1 | $NetBSD: distinfo,v 1.28 2008/10/31 02:02:44 snj Exp $ | 1 | $NetBSD: distinfo,v 1.28.6.1 2009/07/17 13:23:37 tron Exp $ | |
2 | 2 | |||
3 | SHA1 (dillo-2.0.tar.bz2) = 9bde7eab5c835e13508d63a190a8bcec4e94553a | 3 | SHA1 (dillo-2.1.1.tar.bz2) = eb252663b9480e53e0376d75b81130404ccf40ce | |
4 | RMD160 (dillo-2.0.tar.bz2) = f457e5a031d8a0e682be50ee16cbfba3fea34eaa | 4 | RMD160 (dillo-2.1.1.tar.bz2) = 4b8fe423e3a0fd0e461cc8e1795bac39ad47d3b6 | |
5 | Size (dillo-2.0.tar.bz2) = 551569 bytes | 5 | Size (dillo-2.1.1.tar.bz2) = 612711 bytes | |
6 | SHA1 (patch-aa) = ea8a2b930eefed4f6384dc57623d1993d4cd7247 | 6 | SHA1 (patch-aa) = 3a7b8d9e70d82edebf63cd5a715754dfad935832 | |
7 | SHA1 (patch-ab) = 8090c554c52dc0133bf725bacc172f7d08071929 | 7 | SHA1 (patch-ab) = 37bbf07cb5120cbc677ad12d4d9f3ab07a02722e | |
8 | SHA1 (patch-ac) = ede656975ae077568a432245a9705c70e40a74fc | 8 | SHA1 (patch-ac) = f129ed7bb341211895fc51a7b70a81c94e70b158 | |
9 | SHA1 (patch-ad) = 005df4881ecea7b1a7aff51ea06697e9949547dd |
@@ -1,25 +1,20 @@ | @@ -1,25 +1,20 @@ | |||
1 | $NetBSD: patch-aa,v 1.7 2008/10/31 02:02:44 snj Exp $ | 1 | $NetBSD: patch-aa,v 1.7.6.1 2009/07/17 13:23:37 tron Exp $ | |
2 | 2 | |||
3 | --- ./dpid/Makefile.in.orig 2008-10-30 07:40:38.000000000 -0700 | 3 | --- dpid/Makefile.in.orig 2009-07-01 10:56:37.000000000 -0700 | |
4 | +++ dpid/Makefile.in 2008-10-30 07:46:09.000000000 -0700 | 4 | +++ dpid/Makefile.in 2009-07-08 20:42:08.000000000 -0700 | |
5 | @@ -485,13 +485,13 @@ | 5 | @@ -320,12 +320,12 @@ distclean-compile: | |
6 | uninstall-info-am: | |||
7 | install-sysconfDATA: $(sysconf_DATA) | |||
8 | @$(NORMAL_INSTALL) | |||
9 | - test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" | |||
10 | + test -z "$(datadir)/examples/$(PACKAGE)" || $(mkdir_p) "$(DESTDIR)$(datadir)/examples/$(PACKAGE)" | |||
11 | @list='$(sysconf_DATA)'; for p in $$list; do \ | |||
12 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | |||
13 | f=$(am__strip_dir) \ | |||
14 | - echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ | |||
15 | - $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ | |||
16 | + echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/examples/$(PACKAGE)/$$f'"; \ | |||
17 | + $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/examples/$(PACKAGE)/$$f"; \ | |||
18 | done | |||
6 | 19 | |||
7 | 20 | uninstall-sysconfDATA: | ||
8 | install-data-local : | |||
9 | - $(mkinstalldirs) $(DESTDIR)$(sysconfdir) | |||
10 | - echo dpi_dir=$(libdir)/dillo/dpi > $(DESTDIR)$(sysconfdir)/dpidrc | |||
11 | - echo >> $(DESTDIR)$(sysconfdir)/dpidrc | |||
12 | - echo "proto.file=file/file.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc | |||
13 | - echo "proto.ftp=ftp/ftp.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc | |||
14 | - echo "proto.https=https/https.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc | |||
15 | - echo "proto.data=datauri/datauri.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc | |||
16 | + $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/$(PACKAGE) | |||
17 | + echo dpi_dir=$(libdir)/dillo/dpi > $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc | |||
18 | + echo >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc | |||
19 | + echo "proto.file=file/file.dpi" >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc | |||
20 | + echo "proto.ftp=ftp/ftp.filter.dpi" >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc | |||
21 | + echo "proto.https=https/https.filter.dpi" >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc | |||
22 | + echo "proto.data=datauri/datauri.filter.dpi" >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc | |||
23 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | |||
24 | # Otherwise a system limit (for SysV at least) may be exceeded. | |||
25 | .NOEXPORT: |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-ab,v 1.14 2008/10/31 02:02:44 snj Exp $ | 1 | $NetBSD: patch-ab,v 1.14.6.1 2009/07/17 13:23:37 tron Exp $ | |
2 | 2 | |||
3 | --- ./Makefile.in.orig 2008-10-30 07:47:58.000000000 -0700 | 3 | --- Makefile.in.orig 2009-07-01 10:56:55.000000000 -0700 | |
4 | +++ ./Makefile.in 2008-10-30 07:48:05.000000000 -0700 | 4 | +++ Makefile.in 2009-07-08 15:30:55.000000000 -0700 | |
5 | @@ -197,7 +197,7 @@ | 5 | @@ -194,7 +194,7 @@ target_os = @target_os@ | |
6 | top_srcdir = @top_srcdir@ | 6 | target_vendor = @target_vendor@ | |
7 | SUBDIRS = lout dw dlib dpip src doc dpid dpi test | 7 | SUBDIRS = lout dw dlib dpip src doc dpid dpi test | |
8 | EXTRA_DIST = Doxyfile dillorc install-dpi-local | 8 | EXTRA_DIST = Doxyfile dillorc install-dpi-local | |
9 | -sysconf_DATA = dillorc | 9 | -sysconf_DATA = dillorc | |
10 | +sysconf_DATA = | 10 | +sysconf_DATA = | |
11 | all: config.h | 11 | all: config.h | |
12 | $(MAKE) $(AM_MAKEFLAGS) all-recursive | 12 | $(MAKE) $(AM_MAKEFLAGS) all-recursive | |
13 | 13 |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-ac,v 1.11 2008/10/31 02:02:44 snj Exp $ | 1 | $NetBSD: patch-ac,v 1.11.6.1 2009/07/17 13:23:37 tron Exp $ | |
2 | 2 | |||
3 | --- dpi/https.c.orig 2008-10-13 07:49:46.000000000 -0700 | 3 | --- src/Makefile.in.orig 2009-07-08 20:27:51.000000000 -0700 | |
4 | +++ dpi/https.c 2008-10-30 07:52:45.000000000 -0700 | 4 | +++ src/Makefile.in 2009-07-08 20:28:37.000000000 -0700 | |
5 | @@ -68,8 +68,6 @@ | 5 | @@ -321,7 +321,7 @@ dillo_SOURCES = \ | |
6 | #define MSG(...) printf("[https dpi]: " __VA_ARGS__) | 6 | xembed.hh | |
7 | 7 | |||
8 | EXTRA_DIST = chg srch keysrc | |||
9 | -sysconf_DATA = keysrc | |||
10 | +sysconf_DATA = | |||
11 | all: all-recursive | |||
8 | 12 | |||
9 | -#define ENABLE_SSL | 13 | .SUFFIXES: | |
10 | -#undef ENABLE_SSL | |||
11 | #ifdef ENABLE_SSL | |||
12 | ||||
13 | #include <openssl/ssl.h> |
$NetBSD: patch-ad,v 1.1.2.2 2009/07/17 13:23:37 tron Exp $
--- configure.orig 2009-07-08 21:32:56.000000000 -0700
+++ configure 2009-07-08 21:33:06.000000000 -0700
@@ -2346,7 +2346,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
ac_config_headers="$ac_config_headers config.h"
-sysconfdir=${sysconfdir}/${PACKAGE}
+sysconfdir=${sysconfdir}