pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/news/slrn slrn: update to 1.0.3a.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f4c2d203047
branches:  trunk
changeset: 312998:3f4c2d203047
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Sep 21 14:27:37 2018 +0000

description:
slrn: update to 1.0.3a.

Update provided by Michael B?uerle via wip.

Version 1.0.3 release notes
===========================

  Version 1.0.3 is primarily a bug-fix release.  See changes.txt for
  details.

  Support for SSLv3 has been disabled since it is to POODLE attacks.

  On 32 bit systems, support has been added for files larger than 2GB.

  Support added for both 32 and 64 bit mingw and cygwin compilers.

Version 1.0.2 release notes
===========================

  Version 1.0.2 is primarily a bug-fix release.  See changes.txt for
  details.

  Note: slang version 2.2.3 or later is required.  Version 2.3.0 is
  the current version.

  The intrinsic function get_header_flags was modified to return the
  full set of flags when called with an optional argument.  Symbolic
  constants for the corresponding flags were added to the interpreter
  interface.

  The value for query_read_group_cutoff was increased to 1000.

  Support for building slrnpull on win32 systems was added.

diffstat:

 news/slrn/Makefile                        |  16 +++---
 news/slrn/distinfo                        |  21 +++++++--
 news/slrn/options.mk                      |  16 ++++++-
 news/slrn/patches/patch-af                |  15 -------
 news/slrn/patches/patch-changes.txt       |  29 +++++++++++++
 news/slrn/patches/patch-doc_manual.txt    |  32 +++++++++++++++
 news/slrn/patches/patch-doc_slrn.rc       |  28 +++++++++++++
 news/slrn/patches/patch-po_Makefile.in.in |  15 +++++++
 news/slrn/patches/patch-src_art.c         |  60 ++++++++++++++++++++++++++++
 news/slrn/patches/patch-src_misc.c        |  15 +++++++
 news/slrn/patches/patch-src_misc.h        |  14 ++++++
 news/slrn/patches/patch-src_post.c        |  66 +++++++++++++++++++++++++++++++
 news/slrn/patches/patch-src_slrnfeat.hin  |   2 +-
 news/slrn/patches/patch-src_startup.c     |  17 +++++++
 news/slrn/patches/patch-src_version.c     |  18 ++++++++
 15 files changed, 331 insertions(+), 33 deletions(-)

diffs (truncated from 457 to 300 lines):

diff -r 285cd921361e -r 3f4c2d203047 news/slrn/Makefile
--- a/news/slrn/Makefile        Fri Sep 21 14:20:11 2018 +0000
+++ b/news/slrn/Makefile        Fri Sep 21 14:27:37 2018 +0000
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.62 2018/03/22 08:14:52 adam Exp $
+# $NetBSD: Makefile,v 1.63 2018/09/21 14:27:37 wiz Exp $
 
-DISTNAME=      slrn-1.0.1
-PKGREVISION=   2
+DISTNAME=      slrn-1.0.3a
 CATEGORIES=    news
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=slrn/}
+MASTER_SITES=  http://jedsoft.org/releases/slrn/
+EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://slrn.sourceforge.net/
 COMMENT=       Highly customizable threaded newsreader
 LICENSE=       gnu-gpl-v2
 
-# gcc: error: art.o: No such file or directory
-# gcc: error: art_misc.o: No such file or directory
-# gcc: error: art_sort.o: No such file or directory
+EXTRACT_USING= bsdtar
+MAKE_JOBS_SAFE=        no
 
-MAKE_JOBS_SAFE=        no
+WRKSRC=                ${WRKDIR}/slrn-1.0.3
 
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
@@ -28,6 +27,7 @@
 
 LDFLAGS.SunOS+=        -lsocket -lnsl
 
+BUILDLINK_API_DEPENDS.libslang2+=      libslang2>=2.2.3
 .include "../../devel/libslang2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 285cd921361e -r 3f4c2d203047 news/slrn/distinfo
--- a/news/slrn/distinfo        Fri Sep 21 14:20:11 2018 +0000
+++ b/news/slrn/distinfo        Fri Sep 21 14:27:37 2018 +0000
@@ -1,8 +1,17 @@
-$NetBSD: distinfo,v 1.17 2015/11/02 23:49:47 agc Exp $
+$NetBSD: distinfo,v 1.18 2018/09/21 14:27:37 wiz Exp $
 
-SHA1 (slrn-1.0.1.tar.gz) = 9ad41ec3894d2b6b1ae8f158e994a8f138540baa
-RMD160 (slrn-1.0.1.tar.gz) = 4a1aa5b3a209e8aac50df0e5557eabfe22b13622
-SHA512 (slrn-1.0.1.tar.gz) = fd2eecb7a82c078b401a8cf8c0e54166d508418f4064c3b074a33dcf2aa1c7a38ce324fee108c5d14e63a385fb6e45b82477f24f9a359870160d12ecb39440b5
-Size (slrn-1.0.1.tar.gz) = 1529545 bytes
-SHA1 (patch-af) = 7b9507c68cefa913ebeb0e44c4ca0ad70956a3bd
+SHA1 (slrn-1.0.3a.tar.bz2) = 898d09685f5fe159f23829cd21e15308f5dce822
+RMD160 (slrn-1.0.3a.tar.bz2) = dd5f5df5d508b8e0c5b136093f24121af31d3432
+SHA512 (slrn-1.0.3a.tar.bz2) = 11cef2dfe41f441af15acc22fb675cf607e932f0dd6d4a998e51ecda05c9a50d7abf10a3e693ffc857ad77e09634f460404e4d5b289169e7bbffdaf5d6d565a3
+Size (slrn-1.0.3a.tar.bz2) = 997138 bytes
+SHA1 (patch-changes.txt) = 185a9b2f918f15b1b66f492412883d77e57bab40
+SHA1 (patch-doc_manual.txt) = 216f8696b44b59c56a83655a868116932fe76e1d
+SHA1 (patch-doc_slrn.rc) = b2a3cf7c21f291c9b75f27596ae31e268a8275e8
+SHA1 (patch-po_Makefile.in.in) = 2b91ae3934b3b2b52a264129af08078ac622ce6a
+SHA1 (patch-src_art.c) = 70e4408827d3c67010ccb5b515c8d037f3f3b6b8
+SHA1 (patch-src_misc.c) = db64dad237e7eb348e32b772e1546e8b5440593c
+SHA1 (patch-src_misc.h) = a65145ecf87e7a9380940963aaeb81c35b9cb3b5
+SHA1 (patch-src_post.c) = e2f16323b2b0119e8d76779619f774dc0df663af
 SHA1 (patch-src_slrnfeat.hin) = a115a2f7de61acd5c296fb3696a3cb97226ea121
+SHA1 (patch-src_startup.c) = bab29e395d2710acb7f9db4911873b5c8073aff8
+SHA1 (patch-src_version.c) = d622ec61fbd1c8db2a124bae63f68251a7885327
diff -r 285cd921361e -r 3f4c2d203047 news/slrn/options.mk
--- a/news/slrn/options.mk      Fri Sep 21 14:20:11 2018 +0000
+++ b/news/slrn/options.mk      Fri Sep 21 14:27:37 2018 +0000
@@ -1,12 +1,22 @@
-# $NetBSD: options.mk,v 1.2 2014/08/23 09:34:48 obache Exp $
+# $NetBSD: options.mk,v 1.3 2018/09/21 14:27:37 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.slrn
-PKG_SUPPORTED_OPTIONS=         ssl uulib
-PKG_SUGGESTED_OPTIONS=         ssl
+PKG_SUPPORTED_OPTIONS=         canlock ssl uulib
+PKG_SUGGESTED_OPTIONS=         canlock ssl uulib
 
 .include "../../mk/bsd.options.mk"
 
 ###
+### canlock support
+###
+.if !empty(PKG_OPTIONS:Mcanlock)
+.  include "../../news/libcanlock/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-canlock=${BUILDLINK_PREFIX.libcanlock}
+.else
+CONFIGURE_ARGS+=       --without-canlock
+.endif
+
+###
 ### SSL support
 ###
 .if !empty(PKG_OPTIONS:Mssl)
diff -r 285cd921361e -r 3f4c2d203047 news/slrn/patches/patch-af
--- a/news/slrn/patches/patch-af        Fri Sep 21 14:20:11 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.2 2014/08/23 09:34:48 obache Exp $
-
-Directly use INSTALL_DATA as ${mkdir_p}.
-
---- po/Makefile.in.in.orig     2008-02-11 19:04:23.000000000 +0100
-+++ po/Makefile.in.in
-@@ -46,7 +46,7 @@ INSTALL_DATA = @INSTALL_DATA@
- # versions, $(mkinstalldirs) and $(install_sh) are unused.
- #mkinstalldirs = $(SHELL) @install_sh@ -d
- #install_sh = $(SHELL) @install_sh@
--mkdir_p = @mkdir_p@
-+mkdir_p = $(INSTALL_DATA) -m 755 -d
- 
- GMSGFMT_ = @GMSGFMT@
- GMSGFMT_no = @GMSGFMT@
diff -r 285cd921361e -r 3f4c2d203047 news/slrn/patches/patch-changes.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/news/slrn/patches/patch-changes.txt       Fri Sep 21 14:27:37 2018 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-changes.txt,v 1.1 2018/09/21 14:27:37 wiz Exp $
+
+Changelog updated.
+
+--- changes.txt.orig   2016-10-23 22:34:16.000000000 +0000
++++ changes.txt
+@@ -1,4 +1,12 @@
+ -*- mode: text; mode: fold -*-
++
++Changes since 1.0.3
++1. Cancel-Locks now using API version 3 of the canlock library (--with-canlock).
++   The hash algorithm can be configured with the new variable "canlock_algo".
++   (Michael Baeuerle)
++
++{{{ Previous Versions
++
+ Changes since 1.0.2
+ 1. src/parse2822.c: A quoted-string in the display portion of an
+    address was not being marked as allowing mime-encoded text.
+@@ -30,9 +38,6 @@ Changes since 1.0.2
+ 15. Updates for mingw and cygwin 32 and 64 bit systems.
+ 16. src/mime.c: rfc1522_encode_word: max_nbytes was not being properly
+     limit checked.
+-
+-{{{ Previous Versions
+-
+ Changes since 1.0.1
+ 1. src/misc.c: slrn_verror needed va_copy when writing to the log file.
+ 2. src/post.c: Move the cursor to the end of the line when querying
diff -r 285cd921361e -r 3f4c2d203047 news/slrn/patches/patch-doc_manual.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/news/slrn/patches/patch-doc_manual.txt    Fri Sep 21 14:27:37 2018 +0000
@@ -0,0 +1,32 @@
+$NetBSD: patch-doc_manual.txt,v 1.1 2018/09/21 14:27:37 wiz Exp $
+
+Added documentation for new config option "canlock_algo".
+
+--- doc/manual.txt.orig        2016-10-23 22:34:16.000000000 +0000
++++ doc/manual.txt
+@@ -63,6 +63,7 @@
+      6.5 beep
+      6.6 broken_xref
+      6.7 cansecret_file
++     6.7.1 canlock_algo
+      6.8 cc_followup
+      6.9 cc_post_string
+      6.10 charset
+@@ -1652,6 +1653,17 @@
+   canlock) and that cancel locks only have an effect if the server
+   supports them.
+ 
++  6.7.1.  canlock_algo
++
++  Type: string
++  Default: "SHA256"
++
++  If slrn is configured to put cancel-locks into the articles you post,
++  then this variable is used to select the hash algorithm for <scheme>
++  and HMAC (used as recommended in Section 4 of RFC 8315).
++
++  The default value is the mandatory hash algorithm defined by RFC 8315.
++
+   6.8.  cc_followup
+ 
+   Type: integer
diff -r 285cd921361e -r 3f4c2d203047 news/slrn/patches/patch-doc_slrn.rc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/news/slrn/patches/patch-doc_slrn.rc       Fri Sep 21 14:27:37 2018 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-doc_slrn.rc,v 1.1 2018/09/21 14:27:37 wiz Exp $
+
+Example rc file extended with Cancel-Lock related options.
+
+--- doc/slrn.rc.orig   2016-10-23 22:34:16.000000000 +0000
++++ doc/slrn.rc
+@@ -540,3 +540,21 @@ setkey readline trim               "<Esc>/"       % Trim w
+ setkey readline quoted_insert  "^Q"           % Quoted insert
+ setkey readline complete       "<Tab>"        % Complete filename
+ setkey readline cycle          " "            % Cycle among filenames
++
++%
++%% Cancel-Lock related
++%
++
++% The Message-ID is required to calculate Cancel-Locks. One option is to enable
++% "generate_message_id" option above. "posting_host" can be set if your machine
++% has no FQDN.
++%posting_host "domain.example"                        % Domain under your control
++
++% File containing the secret. This file can be shared with other newsreaders
++% that use the recommended algorithm from Section 4 of RFC 8315.
++%set cansecret_file "/home/user/.cancelsecret"
++
++% Hash algorithm to use for <scheme> and HMAC according to RFC 8315.
++% Supported values: "SHA1", "SHA256", "SHA512".
++% If this option is not specified, "SHA256" is used as default.
++%set canlock_algo "SHA256"
diff -r 285cd921361e -r 3f4c2d203047 news/slrn/patches/patch-po_Makefile.in.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/news/slrn/patches/patch-po_Makefile.in.in Fri Sep 21 14:27:37 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-po_Makefile.in.in,v 1.1 2018/09/21 14:27:37 wiz Exp $
+
+Directly use INSTALL_DATA as ${mkdir_p}.
+
+--- po/Makefile.in.in.orig     2008-02-11 19:04:23.000000000 +0100
++++ po/Makefile.in.in
+@@ -47,7 +47,7 @@ INSTALL_DATA = @INSTALL_DATA@
+ # versions, $(mkinstalldirs) and $(install_sh) are unused.
+ #mkinstalldirs = $(SHELL) @install_sh@ -d
+ #install_sh = $(SHELL) @install_sh@
+-mkdir_p = @mkdir_p@
++mkdir_p = $(INSTALL_DATA) -m 755 -d
+ 
+ GMSGFMT_ = @GMSGFMT@
+ GMSGFMT_no = @GMSGFMT@
diff -r 285cd921361e -r 3f4c2d203047 news/slrn/patches/patch-src_art.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/news/slrn/patches/patch-src_art.c Fri Sep 21 14:27:37 2018 +0000
@@ -0,0 +1,60 @@
+$NetBSD: patch-src_art.c,v 1.1 2018/09/21 14:27:37 wiz Exp $
+
+Switched <c-key> element generation to libcanlock API V3.
+
+--- src/art.c.orig     2016-10-23 22:34:16.000000000 +0000
++++ src/art.c
+@@ -74,7 +74,7 @@
+ #include "decode.h"
+ 
+ #if SLRN_HAS_CANLOCK
+-# include <canlock.h>
++# include <libcanlock-3/canlock.h>
+ #endif
+ 
+ #if SLRN_HAS_GROUPLENS
+@@ -3660,6 +3660,7 @@ static char* gen_cancel_key (char* msgid
+    char *buf, *cankey;
+    unsigned int filelen;
+    char canfile[SLRN_MAX_PATH_LEN];
++   cl_hash_version algo;
+ 
+    if (0 == *Slrn_User_Info.cancelsecret)
+      return NULL;
+@@ -3686,14 +3687,30 @@ static char* gen_cancel_key (char* msgid
+      }
+    (void) fseek (cansecret, 0, SEEK_SET);
+    (void) fread (buf, filelen, 1, cansecret);
++   (void) fclose (cansecret);
+ 
+-# if 0
+-   cankey = md5_key (buf, filelen, msgid, strlen(msgid));
+-# else /* by default we use SHA-1 */
+-   cankey = sha_key ((unsigned char *) buf, filelen, (unsigned char *)msgid, strlen(msgid));
+-# endif
++   /* Fixme: This check is used twice, should be moved to a central location */
++   if (0 == slrn_case_strcmp (Slrn_User_Info.canlock_algo, "SHA1"))
++   {
++      algo = CL_SHA1;
++   }
++   else if (0 == slrn_case_strcmp (Slrn_User_Info.canlock_algo, "SHA256"))
++   {
++      algo = CL_SHA256;
++   }
++   else if (0 == slrn_case_strcmp (Slrn_User_Info.canlock_algo, "SHA512"))
++   {
++      algo = CL_SHA512;
++   }
++   else
++   {
++      slrn_error (_("Cancel-Lock algorithm not supported: %s"), Slrn_User_Info.canlock_algo);
++      return NULL;
++   }
++   cankey = cl_get_key (algo, (unsigned char *) buf, filelen, (unsigned char *)msgid, strlen(msgid));
++   /* Try to overwrite secret in memory */
++   cl_clear_secret((void *) buf, filelen, filelen+1);
+ 
+-   fclose (cansecret);
+    slrn_free (buf);
+    return cankey;
+ }
diff -r 285cd921361e -r 3f4c2d203047 news/slrn/patches/patch-src_misc.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000



Home | Main Index | Thread Index | Old Index