pkg/47550: changed patches for news/trn

[rhialto%falu.nl@localhost]

>Number:         47550
>Category:       pkg
>Synopsis:       new patches for news/trn
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Feb 09 16:10:00 +0000 2013
>Originator:     Rhialto
>Release:        NetBSD 6.0.1
>Organization:
        
>Environment:
        
        
System: NetBSD murthe.falu.nl 6.0.1 NetBSD 6.0.1 (GENERIC) amd64
Architecture: x86_64
Machine: amd64
>Description:
        news/trn doesn't link any more on NetBSD 6.0.1.
        Also I have included a patch to make trn work on the articles
        from nntp.olduse.net which have different date stamps (B-news style
        perhaps?).
        I have 2 new patches for this: patch-term.h patch-parsedate.y.
        There is also one changed patch: patch-ac.
        There are additional differences because the patches were regenerated
        using mkpatches.
>How-To-Repeat:
        See above
>Fix:
        All patches as diff and as shar.
        Thew new files are only in the shar.

? patches/patch-parsedate.y
? patches/patch-term.h
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/news/trn/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo    12 Nov 2008 18:53:52 -0000      1.10
+++ distinfo    9 Feb 2013 15:53:33 -0000
@@ -3,8 +3,10 @@
 SHA1 (trn-4.0-test76.tar.gz) = 4741d506d4c2d62a8dbaa5d4fd62cce656abcf3b
 RMD160 (trn-4.0-test76.tar.gz) = f60478f8808b9c0d46a22ac924821cf2edd1fe87
 Size (trn-4.0-test76.tar.gz) = 565528 bytes
-SHA1 (patch-aa) = fe2d378d3600938025846998f222d1f239549045
-SHA1 (patch-ab) = 683c2ac9d34ca0d6220752218646cbf9e359f23d
-SHA1 (patch-ac) = 96dd4bd4ca73baf552c4d8172f7ad6d6a600bd7f
-SHA1 (patch-ad) = 78c18d634cb0861754e1d555a0e514299136ecbc
-SHA1 (patch-ae) = 979c560ef89c4eaca2216fd78a1ac2e8085759f6
+SHA1 (patch-aa) = 17d95f62b3c0ffa33ad329068f97838b676d584a
+SHA1 (patch-ab) = 4cb84cc7d941f188d3e31216b7c4180624319db4
+SHA1 (patch-ac) = e8ed4948c428d595f62d1feaa17702cff580bb1c
+SHA1 (patch-ad) = f6d102af2b6e3095ea765f622085464193d94835
+SHA1 (patch-ae) = 6cc777ff94540345a433e88ab355fe18a23d60d1
+SHA1 (patch-parsedate.y) = 5e41c067cf90e78b502ff070247460e07fa0a29d
+SHA1 (patch-term.h) = 00876d171ed7325122a5ebb171cc11bb02528b45
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/news/trn/patches/patch-aa,v
retrieving revision 1.4
diff -u -r1.4 patch-aa
--- patches/patch-aa    1 Nov 2006 17:12:21 -0000       1.4
+++ patches/patch-aa    9 Feb 2013 15:53:33 -0000
@@ -1,7 +1,7 @@
 $NetBSD: patch-aa,v 1.4 2006/11/01 17:12:21 christos Exp $
 
---- datasrc.c.orig     2001-01-16 16:12:50.000000000 -0500
-+++ datasrc.c  2006-10-31 20:10:50.000000000 -0500
+--- datasrc.c.orig     2001-01-16 21:12:50.000000000 +0000
++++ datasrc.c
 @@ -12,8 +12,8 @@
  #include "nntpclient.h"
  #include "term.h"
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/news/trn/patches/patch-ab,v
retrieving revision 1.3
diff -u -r1.3 patch-ab
--- patches/patch-ab    1 Nov 2006 17:12:21 -0000       1.3
+++ patches/patch-ab    9 Feb 2013 15:53:33 -0000
@@ -1,7 +1,7 @@
 $NetBSD: patch-ab,v 1.3 2006/11/01 17:12:21 christos Exp $
 
---- rt-page.c.orig     2000-05-25 01:04:40.000000000 -0400
-+++ rt-page.c  2006-10-31 20:11:24.000000000 -0500
+--- rt-page.c.orig     2000-05-25 05:04:40.000000000 +0000
++++ rt-page.c
 @@ -14,9 +14,9 @@
  #include "datasrc.h"
  #include "nntp.h"
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/news/trn/patches/patch-ac,v
retrieving revision 1.6
diff -u -r1.6 patch-ac
--- patches/patch-ac    26 Sep 2006 20:35:16 -0000      1.6
+++ patches/patch-ac    9 Feb 2013 15:53:33 -0000
@@ -1,8 +1,17 @@
 $NetBSD: patch-ac,v 1.6 2006/09/26 20:35:16 christos Exp $
 
---- Configure.orig     2001-02-22 14:17:39.000000000 -0500
-+++ Configure  2006-09-26 15:17:42.033788587 -0400
-@@ -2540,7 +2540,7 @@
+--- Configure.orig     2013-01-23 19:10:00.000000000 +0000
++++ Configure
+@@ -1507,7 +1507,7 @@ case "$config_sh" in
+ myuname=`( ($uname -a) 2>/dev/null || hostname) 2>&1`
+ # tr '[A-Z]' '[a-z]' would not work in EBCDIC
+ # because the A-Z/a-z are not consecutive.
+-myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e 's/\///g' | \
++myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e "s/['/]//g" | \
+       ./tr '[A-Z]' '[a-z]' | tr $trnl ' '`
+ newmyuname="$myuname"
+ dflt=n
+@@ -2540,7 +2540,7 @@ EOM
      esac
      ;;
  *)  case "$d_inews" in
@@ -11,7 +20,7 @@
      "$define")
        set dflt installinews bin
        eval $prefixit
-@@ -4412,6 +4412,9 @@
+@@ -4412,6 +4412,9 @@ case "$nm_so_opt" in
                        nm_so_opt='--dynamic'
                fi
                ;;
@@ -21,7 +30,7 @@
        esac
        ;;
  esac
-@@ -4882,6 +4885,25 @@
+@@ -4882,6 +4885,25 @@ case "$xxx" in
  esac
  case "$xxx" in
  x)
@@ -47,7 +56,7 @@
        xxx=`./loc libtermlib$_a x $libpth`
        case "$xxx" in
        /usr/lib*|/lib*)
-@@ -4939,6 +4961,25 @@
+@@ -4939,6 +4961,25 @@ x)
  esac
  case "$xxx" in
  x)
@@ -73,7 +82,7 @@
        xxx=`./loc libtermlib.$so'*' x $libpth`
        case "$xxx" in
        /usr/lib*|/lib*)
-@@ -6223,14 +6264,14 @@
+@@ -6223,14 +6264,14 @@ active='$active'
  acttimes='$acttimes'
  aphostcmd='$aphostcmd'
  archobjs='$archobjs'
@@ -91,7 +100,7 @@
  cc='$cc'
  ccflags='$ccflags'
  cf_by='$cf_by'
-@@ -6240,7 +6281,7 @@
+@@ -6240,7 +6281,7 @@ cntrydist='$cntrydist'
  comm='$comm'
  contains='$contains'
  contdist='$contdist'
@@ -100,7 +109,7 @@
  cpp='$cpp'
  cppflags='$cppflags'
  cpplast='$cpplast'
-@@ -6305,21 +6346,21 @@
+@@ -6305,21 +6346,21 @@ d_xenix='$d_xenix'
  d_xthread='$d_xthread'
  date='$date'
  defeditor='$defeditor'
@@ -127,7 +136,7 @@
  groupdesc='$groupdesc'
  hint='$hint'
  hostbits='$hostbits'
-@@ -6376,10 +6417,10 @@
+@@ -6376,10 +6417,10 @@ mboxchar='$mboxchar'
  mimecap='$mimecap'
  mips='$mips'
  mips_type='$mips_type'
@@ -140,7 +149,7 @@
  myactive='$myactive'
  myuname='$myuname'
  n='$n'
-@@ -6417,11 +6458,11 @@
+@@ -6417,11 +6458,11 @@ prefixexp='$prefixexp'
  prefshell='$prefshell'
  privlib='$privlib'
  privlibexp='$privlibexp'
@@ -154,7 +163,7 @@
  sendmail='$sendmail'
  servername='$servername'
  sharpbang='$sharpbang'
-@@ -6442,7 +6483,7 @@
+@@ -6442,7 +6483,7 @@ strings='$strings'
  strn='$strn'
  subscriptions='$subscriptions'
  sysman='$sysman'
@@ -163,7 +172,7 @@
  tee='$tee'
  termlib='$termlib'
  test='$test'
-@@ -6450,7 +6491,7 @@
+@@ -6450,7 +6491,7 @@ threaddir='$threaddir'
  tk='$tk'
  tkinc='$tkinc'
  tklibs='$tklibs'
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/news/trn/patches/patch-ad,v
retrieving revision 1.1
diff -u -r1.1 patch-ad
--- patches/patch-ad    18 Mar 2000 19:51:33 -0000      1.1
+++ patches/patch-ad    9 Feb 2013 15:53:33 -0000
@@ -1,8 +1,8 @@
 $NetBSD: patch-ad,v 1.1 2000/03/18 19:51:33 wiz Exp $
 
---- Pnews.SH.orig      Sun Jan 17 20:01:22 1999
-+++ Pnews.SH   Sat Mar 18 13:47:13 2000
-@@ -911,7 +911,12 @@
+--- Pnews.SH.orig      2000-10-31 22:43:16.000000000 +0000
++++ Pnews.SH
+@@ -911,7 +911,12 @@ usg)
  esac
  
  case $orgname in
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/news/trn/patches/patch-ae,v
retrieving revision 1.1
diff -u -r1.1 patch-ae
--- patches/patch-ae    12 Nov 2008 18:53:52 -0000      1.1
+++ patches/patch-ae    9 Feb 2013 15:53:33 -0000
@@ -1,7 +1,7 @@
 $NetBSD: patch-ae,v 1.1 2008/11/12 18:53:52 chuck Exp $
 
---- /dev/null  2008-11-12 13:40:59.000000000 -0500
-+++ hints/darwin.sh    2008-11-12 13:19:30.000000000 -0500
+--- hints/darwin.sh.orig       2013-01-23 19:09:43.000000000 +0000
++++ hints/darwin.sh
 @@ -0,0 +1,2 @@
 +so='dylib'
 +libs='-lresolv'



# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#       patches/patch-aa
#       patches/patch-ab
#       patches/patch-ac
#       patches/patch-ad
#       patches/patch-ae
#       patches/patch-parsedate.y
#       patches/patch-term.h
#
echo x - patches/patch-aa
sed 's/^X//' >patches/patch-aa << 'END-of-patches/patch-aa'
X$NetBSD: patch-aa,v 1.4 2006/11/01 17:12:21 christos Exp $
X
X--- datasrc.c.orig     2001-01-16 21:12:50.000000000 +0000
X+++ datasrc.c
X@@ -12,8 +12,8 @@
X #include "nntpclient.h"
X #include "term.h"
X #include "env.h"
X-#include "opt.h"
X #include "util.h"
X+#include "opt.h"
X #include "util2.h"
X #include "intrp.h"
X #include "init.h"
END-of-patches/patch-aa
echo x - patches/patch-ab
sed 's/^X//' >patches/patch-ab << 'END-of-patches/patch-ab'
X$NetBSD: patch-ab,v 1.3 2006/11/01 17:12:21 christos Exp $
X
X--- rt-page.c.orig     2000-05-25 05:04:40.000000000 +0000
X+++ rt-page.c
X@@ -14,9 +14,9 @@
X #include "datasrc.h"
X #include "nntp.h"
X #include "trn.h"
X+#include "util.h"
X #include "opt.h"
X #include "env.h"
X-#include "util.h"
X #include "util2.h"
X #include "only.h"
X #include "addng.h"
END-of-patches/patch-ab
echo x - patches/patch-ac
sed 's/^X//' >patches/patch-ac << 'END-of-patches/patch-ac'
X$NetBSD: patch-ac,v 1.6 2006/09/26 20:35:16 christos Exp $
X
X--- Configure.orig     2013-01-23 19:10:00.000000000 +0000
X+++ Configure
X@@ -1507,7 +1507,7 @@ case "$config_sh" in
X myuname=`( ($uname -a) 2>/dev/null || hostname) 2>&1`
X # tr '[A-Z]' '[a-z]' would not work in EBCDIC
X # because the A-Z/a-z are not consecutive.
X-myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e 's/\///g' | \
X+myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e "s/['/]//g" | \
X       ./tr '[A-Z]' '[a-z]' | tr $trnl ' '`
X newmyuname="$myuname"
X dflt=n
X@@ -2540,7 +2540,7 @@ EOM
X     esac
X     ;;
X *)  case "$d_inews" in
X-    '') dflt="$prefix/bin";;
X+    '') dflt=none;;
X     "$define")
X       set dflt installinews bin
X       eval $prefixit
X@@ -4412,6 +4412,9 @@ case "$nm_so_opt" in
X                       nm_so_opt='--dynamic'
X               fi
X               ;;
X+      *dragonfly*)
X+              nm_so_opt='-D'
X+              ;;
X       esac
X       ;;
X esac
X@@ -4882,6 +4885,25 @@ case "$xxx" in
X esac
X case "$xxx" in
X x)
X+      xxx=`./loc libncurses$_a x $libpth`
X+      case "$xxx" in
X+      /usr/lib*|/lib*)
X+              termlib='-lncurses'
X+              d_havetlib="$define"
X+              echo "Termlib library found." >&4
X+              ;;
X+      /*)
X+              termlib="$xxx"
X+              d_havetlib="$define"
X+              echo "Termlib library found." >&4
X+              ;;
X+      *)
X+              xxx=x
X+      esac
X+      ;;
X+esac
X+case "$xxx" in
X+x)
X       xxx=`./loc libtermlib$_a x $libpth`
X       case "$xxx" in
X       /usr/lib*|/lib*)
X@@ -4939,6 +4961,25 @@ x)
X esac
X case "$xxx" in
X x)
X+      xxx=`./loc libncurses.$so'*' x $libpth`
X+      case "$xxx" in
X+      /usr/lib*|/lib*)
X+              termlib='-lncurses'
X+              d_havetlib="$define"
X+              echo "Terminfo library found." >&4
X+              ;;
X+      /*)
X+              termlib="$xxx"
X+              d_havetlib="$define"
X+              echo "Terminfo library found." >&4
X+              ;;
X+      *)
X+              xxx=x
X+      esac
X+      ;;
X+esac
X+case "$xxx" in
X+x)
X       xxx=`./loc libtermlib.$so'*' x $libpth`
X       case "$xxx" in
X       /usr/lib*|/lib*)
X@@ -6223,14 +6264,14 @@ active='$active'
X acttimes='$acttimes'
X aphostcmd='$aphostcmd'
X archobjs='$archobjs'
X-awk='$awk'
X-basename='$basename'
X+awk='$TOOLS_AWK'
X+basename='$TOOLS_BASENAME'
X bash='$bash'
X bin='$bin'
X binexp='$binexp'
X byacc='$byacc'
X c='$c'
X-cat='$cat'
X+cat='$TOOLS_CAT'
X cc='$cc'
X ccflags='$ccflags'
X cf_by='$cf_by'
X@@ -6240,7 +6281,7 @@ cntrydist='$cntrydist'
X comm='$comm'
X contains='$contains'
X contdist='$contdist'
X-cp='$cp'
X+cp='$TOOLS_CP'
X cpp='$cpp'
X cppflags='$cppflags'
X cpplast='$cpplast'
X@@ -6305,21 +6346,21 @@ d_xenix='$d_xenix'
X d_xthread='$d_xthread'
X date='$date'
X defeditor='$defeditor'
X-diff='$diff'
X+diff='$TOOLS_DIFF'
X direntrytype='$direntrytype'
X-echo='$echo'
X+echo='$TOOLS_ECHO'
X ed='$ed'
X-egrep='$egrep'
X+egrep='$TOOLS_EGREP'
X eunicefix='$eunicefix'
X exe_ext='$exe_ext'
X-expr='$expr'
X+expr='$TOOLS_EXPR'
X extrainews='$extrainews'
X filexp='$filexp'
X find='$find'
X firstmakefile='$firstmakefile'
X gccversion='$gccversion'
X glibpth='$glibpth'
X-grep='$grep'
X+grep='$TOOLS_GREP'
X groupdesc='$groupdesc'
X hint='$hint'
X hostbits='$hostbits'
X@@ -6376,10 +6417,10 @@ mboxchar='$mboxchar'
X mimecap='$mimecap'
X mips='$mips'
X mips_type='$mips_type'
X-mkdir='$mkdir'
X+mkdir='$TOOLS_MKDIR'
X more='$more'
X multistatedist='$multistatedist'
X-mv='$mv'
X+mv='$TOOLS_MV'
X myactive='$myactive'
X myuname='$myuname'
X n='$n'
X@@ -6417,11 +6458,11 @@ prefixexp='$prefixexp'
X prefshell='$prefshell'
X privlib='$privlib'
X privlibexp='$privlibexp'
X-rm='$rm'
X+rm='$TOOLS_RM'
X rmail='$rmail'
X rootid='$rootid'
X runnm='$runnm'
X-sed='$sed'
X+sed='$TOOLS_SED'
X sendmail='$sendmail'
X servername='$servername'
X sharpbang='$sharpbang'
X@@ -6442,7 +6483,7 @@ strings='$strings'
X strn='$strn'
X subscriptions='$subscriptions'
X sysman='$sysman'
X-tail='$tail'
X+tail='$TOOLS_TAIL'
X tee='$tee'
X termlib='$termlib'
X test='$test'
X@@ -6450,7 +6491,7 @@ threaddir='$threaddir'
X tk='$tk'
X tkinc='$tkinc'
X tklibs='$tklibs'
X-tr='$tr'
X+tr='$TOOLS_TR'
X trn_init='$trn_init'
X trn_select='$trn_select'
X trnl='$trnl'
END-of-patches/patch-ac
echo x - patches/patch-ad
sed 's/^X//' >patches/patch-ad << 'END-of-patches/patch-ad'
X$NetBSD: patch-ad,v 1.1 2000/03/18 19:51:33 wiz Exp $
X
X--- Pnews.SH.orig      2000-10-31 22:43:16.000000000 +0000
X+++ Pnews.SH
X@@ -911,7 +911,12 @@ usg)
X esac
X 
X case $orgname in
X-/*) orgname=`$cat $orgname` ;;
X+/*) if $test -r $orgname; then
X+      orgname=`$cat $orgname`
X+    else
X+      orgname=""
X+    fi
X+    ;;
X esac
X 
X $sed -e '/^Reply-To: $/d' > $tmpart <<EOHeader
END-of-patches/patch-ad
echo x - patches/patch-ae
sed 's/^X//' >patches/patch-ae << 'END-of-patches/patch-ae'
X$NetBSD: patch-ae,v 1.1 2008/11/12 18:53:52 chuck Exp $
X
X--- hints/darwin.sh.orig       2013-01-23 19:09:43.000000000 +0000
X+++ hints/darwin.sh
X@@ -0,0 +1,2 @@
X+so='dylib'
X+libs='-lresolv'
END-of-patches/patch-ae
echo x - patches/patch-parsedate.y
sed 's/^X//' >patches/patch-parsedate.y << 'END-of-patches/patch-parsedate.y'
X$NetBSD$
X
XFor articles from olduse.net.
X
X--- parsedate.y.orig   2000-05-27 00:31:17.000000000 +0000
X+++ parsedate.y
X@@ -134,6 +134,10 @@ item      : time {
X       | rel {
X           yyHaveRel = 1;
X       }
X+      | unixdatestamp {
X+          yyHaveTime++;
X+          yyHaveDate++;
X+      }
X       ;
X 
X time  : tUNUMBER o_merid {
X@@ -283,6 +287,21 @@ o_merid   : /* NULL */ {
X       }
X       ;
X 
X+      /* Sat Apr 24 10:49:30 1982 */
X+unixdatestamp: tDAY tMONTH tUNUMBER udtime tUNUMBER {
X+          yyDay = $3;
X+          yyMonth = $2;
X+          yyYear = $5;
X+      }
X+      ;
X+
X+udtime        : tUNUMBER ':' tUNUMBER ':' tUNUMBER {
X+          yyHour = $1;
X+          yyMinutes = $3;
X+          yySeconds = $5;
X+          yyMeridian = MER24;
X+          yyDSTmode = DSToff;
X+      }
X %%
X 
X /* Month and day table. */
X@@ -799,7 +818,7 @@ main(ac, av)
X           continue;
X       }
X #endif /* YYDEBUG */
X-      d = parsedate(buff, (TIMEINFO *)NULL);
X+      d = parsedate(buff);
X       if (d == -1)
X           (void)printf("Bad format - couldn't convert.\n");
X       else
END-of-patches/patch-parsedate.y
echo x - patches/patch-term.h
sed 's/^X//' >patches/patch-term.h << 'END-of-patches/patch-term.h'
X$NetBSD$
X
XThese symbols are now defined in termlib.
X
X--- term.h.orig        2000-11-11 17:38:10.000000000 +0000
X+++ term.h
X@@ -109,8 +109,8 @@ EXT int lflusho INIT(LFLUSHO);
X 
X #ifdef HAS_TERMLIB
X EXT int GT;                           /* hardware tabs */
X-EXT char* BC INIT(NULL);              /* backspace character */
X-EXT char* UP INIT(NULL);              /* move cursor up one line */
X+extern char* BC;                      /* backspace character */
X+extern char* UP;                      /* move cursor up one line */
X EXT char* CR INIT(NULL);              /* get to left margin, somehow */
X EXT char* VB INIT(NULL);              /* visible bell */
X EXT char* CL INIT(NULL);              /* home and clear screen */
X@@ -135,7 +135,7 @@ EXT bool AM INIT(FALSE);           /* does termin
X                                                                margins? */
X EXT bool XN INIT(FALSE);              /* does it eat 1st newline after
X                                                        automatic wrap? */
X-EXT char PC INIT(0);                  /* pad character for use by tputs() */
X+extern char PC;                               /* pad character for use by 
tputs() */
X 
X #ifdef _POSIX_SOURCE
X EXT speed_t outspeed INIT(0);         /* terminal output speed, */
X@@ -144,7 +144,7 @@ EXT long outspeed INIT(0);         /*      for use 
X #endif
X 
X EXT int fire_is_out INIT(1);
X-EXT int LINES INIT(0), COLS INIT(0);  /* size of screen */
X+extern int LINES, COLS;                       /* size of screen */
X EXT int term_line, term_col;          /* position of cursor */
X EXT int term_scrolled;                        /* how many lines scrolled away 
*/
X EXT int just_a_sec INIT(960);         /* 1 sec at current baud rate */
END-of-patches/patch-term.h
exit


-Olaf.
-- 
___ Olaf 'Rhialto' Seibert  -- The Doctor: No, 'eureka' is Greek for
\X/ rhialto/at/xs4all.nl    -- 'this bath is too hot.'

>Unformatted: