[pkgsrc/pkgsrc-2008Q2]: pkgsrc/news/newsx pullup ticket #2465 - requested by ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee9431cad0c2
branches:  pkgsrc-2008Q2
changeset: 544214:ee9431cad0c2
user:      rtr <rtr%pkgsrc.org@localhost>
date:      Tue Jul 29 11:58:48 2008 +0000

description:
pullup ticket #2465 - requested by cube
newsx: fix to make build and cvs-2008-3252

revisions pulled up:
pkgsrc/news/newsx/Makefile              1.5
pkgsrc/news/newsx/distinfo              1.4
pkgsrc/news/newsx/patches/patch-ac      1.1

   Module Name: pkgsrc
   Committed By:        cube
   Date:                Mon Jul 28 16:27:42 UTC 2008

   Modified Files:
        pkgsrc/news/newsx: Makefile distinfo
   Added Files:
        pkgsrc/news/newsx/patches: patch-ac

   Log Message:
   - Make news/newsx build again after latest news/inn update.
   - Apply a patch from Fedora (by Dominik 'Rathann' Mierzejewski) to fix
     CVE-2008-3252.

   Bump package revision (security fix).

diffstat:

 news/newsx/Makefile         |   9 +++++----
 news/newsx/distinfo         |   3 ++-
 news/newsx/patches/patch-ac |  19 +++++++++++++++++++
 3 files changed, 26 insertions(+), 5 deletions(-)

diffs (62 lines):

diff -r 9766b9249436 -r ee9431cad0c2 news/newsx/Makefile
--- a/news/newsx/Makefile       Sat Jul 26 01:35:03 2008 +0000
+++ b/news/newsx/Makefile       Tue Jul 29 11:58:48 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:32 joerg Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2008/07/29 11:58:48 rtr Exp $
 #
 
 DISTNAME=      newsx-1.6
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    news
 MASTER_SITES=  ftp://ftp.kvaleberg.com/pub/
 
@@ -16,8 +16,9 @@
 
 .include "../../news/inn/Makefile.common"
 CONFIGURE_ARGS+=       --with-newshome=${INN_PREFIX}/lib
-CONFIGURE_ARGS+=       --with-rnews=${INN_PREFIX}/bin/rnews
-CONFIGURE_ARGS+=       --with-inews=${INN_PREFIX}/bin/inews
+CONFIGURE_ARGS+=       --with-newsinclude=${PREFIX}/include/inn
+CONFIGURE_ARGS+=       --with-rnews=${INN_PATHBIN}/rnews
+CONFIGURE_ARGS+=       --with-inews=${INN_PATHBIN}/inews
 CONFIGURE_ARGS+=       --with-history-mode=indexed
 
 .include "../../news/inn/buildlink3.mk"
diff -r 9766b9249436 -r ee9431cad0c2 news/newsx/distinfo
--- a/news/newsx/distinfo       Sat Jul 26 01:35:03 2008 +0000
+++ b/news/newsx/distinfo       Tue Jul 29 11:58:48 2008 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:19:55 agc Exp $
+$NetBSD: distinfo,v 1.3.30.1 2008/07/29 11:58:48 rtr Exp $
 
 SHA1 (newsx-1.6.tar.gz) = e128e89ba161ceb4ab6d652d8c132ae3a33fbb20
 RMD160 (newsx-1.6.tar.gz) = e9d1785ad94510055ffcd5d3d15aeafbc16c4f46
 Size (newsx-1.6.tar.gz) = 302821 bytes
 SHA1 (patch-aa) = b0996217c88e250ed38900ad1f706d16b9900550
 SHA1 (patch-ab) = d3ca5f2231f14b27ff4ee375c1b19b5c158b71be
+SHA1 (patch-ac) = bc188323938a83c8d5bfeefe389fd6c6f3720c2f
diff -r 9766b9249436 -r ee9431cad0c2 news/newsx/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/news/newsx/patches/patch-ac       Tue Jul 29 11:58:48 2008 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-ac,v 1.1.2.2 2008/07/29 11:58:49 rtr Exp $
+
+--- src/getarticle.c.orig      2003-01-21 10:47:25.000000000 +0100
++++ src/getarticle.c
+@@ -143,12 +143,12 @@ read_article(long where,char *group)
+     long len;
+     long bytecount = 0L; /* BUG: */
+ 
+-    line=linebuf;
+-    line[MAX_HEADER_SIZE] = '\0'; /* better safe than sorry */
++    linebuf[MAX_HEADER_SIZE] = '\0'; /* better safe than sorry */
+     path_line[0] = '\0';
+ 
+     /* fetch the article, header and body */
+     for (;;) {
++      line=linebuf;
+       if (!get_server_msg(line, MAX_HEADER_SIZE)) {
+           /* timeout: simply give up */
+           return 0;