[pkgsrc/pkgsrc-2004Q4]: pkgsrc/www/dillo Pullup ticket 266 - requested by Adr...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/89d1f7da1c72
branches:  pkgsrc-2004Q4
changeset: 485876:89d1f7da1c72
user:      salo <salo%pkgsrc.org@localhost>
date:      Thu Feb 03 23:30:17 2005 +0000

description:
Pullup ticket 266 - requested by Adrian Portelli
security fix for dillo

Revisions pulled up:
- pkgsrc/www/dillo/Makefile         1.23-1.24
- pkgsrc/www/dillo/PLIST            1.10
- pkgsrc/www/dillo/distinfo         1.20-1.21
- pkgsrc/www/dillo/patches/patch-aa 1.5
- pkgsrc/www/dillo/patches/patch-ac 1.6

   Module Name:         pkgsrc
   Committed By:        jmmv
   Date:                Tue Jan  4 14:09:17 UTC 2005

   Modified Files:
        pkgsrc/www/dillo: Makefile PLIST distinfo
   Added Files:
        pkgsrc/www/dillo/patches: patch-aa

   Log Message:
   Properly handle the dpidrc configuration file.  Bump PKGREVISION to 1.
   Closes PR pkg/28854 by Alexander Becher.
---
   Module Name:         pkgsrc
   Committed By:        adrianp
   Date:                Mon Jan 10 21:54:36 UTC 2005

   Modified Files:
        pkgsrc/www/dillo: Makefile distinfo
   Added Files:
        pkgsrc/www/dillo/patches: patch-ac

   Log Message:
   Patch for recent security issue - bump to nb2
   http://secunia.com/advisories/13760/

diffstat:

 www/dillo/Makefile         |   4 +++-
 www/dillo/PLIST            |   3 ++-
 www/dillo/distinfo         |   4 +++-
 www/dillo/patches/patch-aa |  15 +++++++++++++++
 www/dillo/patches/patch-ac |  16 ++++++++++++++++
 5 files changed, 39 insertions(+), 3 deletions(-)

diffs (88 lines):

diff -r 7ac2f916d7fb -r 89d1f7da1c72 www/dillo/Makefile
--- a/www/dillo/Makefile        Thu Feb 03 23:12:05 2005 +0000
+++ b/www/dillo/Makefile        Thu Feb 03 23:30:17 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2004/11/08 11:00:24 adam Exp $
+# $NetBSD: Makefile,v 1.22.2.1 2005/02/03 23:30:17 salo Exp $
 
 DISTNAME=      dillo-0.8.3
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  http://dillo.auriga.wearlab.de/download/
 EXTRACT_SUFX=  .tar.bz2
@@ -18,6 +19,7 @@
 
 EGDIR=         ${PREFIX}/share/examples/dillo
 CONF_FILES=    ${EGDIR}/dillorc.default ${PKG_SYSCONFDIR}/dillorc
+CONF_FILES+=   ${EGDIR}/dpidrc ${PKG_SYSCONFDIR}/dpidrc
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r 7ac2f916d7fb -r 89d1f7da1c72 www/dillo/PLIST
--- a/www/dillo/PLIST   Thu Feb 03 23:12:05 2005 +0000
+++ b/www/dillo/PLIST   Thu Feb 03 23:30:17 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/11/08 11:00:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.9.2.1 2005/02/03 23:30:17 salo Exp $
 bin/dillo
 bin/dpid
 bin/dpidc
@@ -28,6 +28,7 @@
 share/doc/dillo/README
 share/doc/dillo/Selection.txt
 share/examples/dillo/dillorc.default
+share/examples/dillo/dpidrc
 @dirrm share/examples/dillo
 @dirrm share/doc/dillo
 @dirrm lib/dillo/dpi/https
diff -r 7ac2f916d7fb -r 89d1f7da1c72 www/dillo/distinfo
--- a/www/dillo/distinfo        Thu Feb 03 23:12:05 2005 +0000
+++ b/www/dillo/distinfo        Thu Feb 03 23:30:17 2005 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.19 2004/11/08 11:00:24 adam Exp $
+$NetBSD: distinfo,v 1.19.2.1 2005/02/03 23:30:17 salo Exp $
 
 SHA1 (dillo-0.8.3.tar.bz2) = c023eface4516c89ba9a2818cfd24f3ef5d24dae
 Size (dillo-0.8.3.tar.bz2) = 418714 bytes
+SHA1 (patch-aa) = 2c89724fa0846d154292f983db86b3cc1d117343
 SHA1 (patch-ab) = 682f85d285d64f85a9b34d0177a8c6ef5cafd31c
+SHA1 (patch-ac) = c3149428f1e756121eddfcac837b4b0a9b8b32b3
diff -r 7ac2f916d7fb -r 89d1f7da1c72 www/dillo/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/dillo/patches/patch-aa        Thu Feb 03 23:30:17 2005 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.4.10.1 2005/02/03 23:30:17 salo Exp $
+
+--- dpid/Makefile.in.orig      2004-10-25 13:12:18.000000000 +0200
++++ dpid/Makefile.in
+@@ -475,8 +475,8 @@ uninstall-am: uninstall-binPROGRAMS unin
+ 
+ 
+ install-data-local :
+-      $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+-      echo dpi_dir=$(libdir)/dillo/dpi > $(DESTDIR)$(sysconfdir)/dpidrc
++      $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/$(PACKAGE)
++      echo dpi_dir=$(libdir)/dillo/dpi > $(DESTDIR)$(datadir)/examples/$(PACKAGE)/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:
diff -r 7ac2f916d7fb -r 89d1f7da1c72 www/dillo/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/dillo/patches/patch-ac        Thu Feb 03 23:30:17 2005 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.5.10.1 2005/02/03 23:30:17 salo Exp $
+
+--- src/capi.c.orig    2005-01-10 21:48:03.000000000 +0000
++++ src/capi.c 2005-01-10 21:50:42.000000000 +0000
+@@ -492,9 +492,9 @@
+                a_Chain_bcb(OpStop, Info, conn->url, NULL);
+ 
+             } else if (strcmp(Data2, "send_status_message") == 0) {
+-               a_Interface_msg(conn->bw, Data1);
++               a_Interface_msg(conn->bw, "%s", Data1);
+             } else if (strcmp(Data2, "chat") == 0) {
+-               a_Interface_msg(conn->bw, Data1);
++               a_Interface_msg(conn->bw, "%s", Data1);
+                a_Bookmarks_chat_add(NULL, NULL, Data1);
+             } else if (strcmp(Data2, "dialog") == 0) {
+                a_Dpiapi_dialog(conn->bw, conn->server, Data1);