pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
slrn: remove, used for updating news/slrn
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <tk%giga.or.at@localhost>
Pushed By: wiz
Date: Fri Sep 21 16:28:05 2018 +0200
Changeset: dad68b3065c582487bfa194b3818628921a6c602
Modified Files:
Makefile
Removed Files:
slrn/DESCR
slrn/Makefile
slrn/PLIST
slrn/README
slrn/distinfo
slrn/options.mk
slrn/patches/patch-changes.txt
slrn/patches/patch-doc_manual.txt
slrn/patches/patch-doc_slrn.rc
slrn/patches/patch-po_Makefile.in.in
slrn/patches/patch-src_art.c
slrn/patches/patch-src_misc.c
slrn/patches/patch-src_misc.h
slrn/patches/patch-src_post.c
slrn/patches/patch-src_slrnfeat.hin
slrn/patches/patch-src_startup.c
slrn/patches/patch-src_version.c
Log Message:
slrn: remove, used for updating news/slrn
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dad68b3065c582487bfa194b3818628921a6c602
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 5 ++-
slrn/DESCR | 9 -----
slrn/Makefile | 32 -----------------
slrn/PLIST | 61 ---------------------------------
slrn/README | 8 -----
slrn/distinfo | 17 ----------
slrn/options.mk | 37 --------------------
slrn/patches/patch-changes.txt | 29 ----------------
slrn/patches/patch-doc_manual.txt | 32 -----------------
slrn/patches/patch-doc_slrn.rc | 28 ---------------
slrn/patches/patch-po_Makefile.in.in | 15 --------
slrn/patches/patch-src_art.c | 60 --------------------------------
slrn/patches/patch-src_misc.c | 15 --------
slrn/patches/patch-src_misc.h | 14 --------
slrn/patches/patch-src_post.c | 66 ------------------------------------
slrn/patches/patch-src_slrnfeat.hin | 16 ---------
slrn/patches/patch-src_startup.c | 17 ----------
slrn/patches/patch-src_version.c | 18 ----------
18 files changed, 4 insertions(+), 475 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index e3e76f47f6..cc1bc9add0 100644
--- a/Makefile
+++ b/Makefile
@@ -266,6 +266,7 @@ SUBDIR+= boost-test-suite
SUBDIR+= boost-threadpool
SUBDIR+= boost-yap
SUBDIR+= boringssl
+SUBDIR+= bosh
SUBDIR+= bowtie
SUBDIR+= bowtie2
SUBDIR+= bpcscripts
@@ -940,6 +941,9 @@ SUBDIR+= gambas3-gb-qt4-ext
SUBDIR+= gambas3-gb-qt4-opengl
SUBDIR+= gambas3-gb-qt4-webkit
SUBDIR+= gambas3-gb-qt5
+SUBDIR+= gambas3-gb-qt5-ext
+SUBDIR+= gambas3-gb-qt5-opengl
+SUBDIR+= gambas3-gb-qt5-webkit
SUBDIR+= gambas3-gb-report
SUBDIR+= gambas3-gb-report2
SUBDIR+= gambas3-gb-scanner
@@ -4280,7 +4284,6 @@ SUBDIR+= slicot
SUBDIR+= slideml
SUBDIR+= slime
SUBDIR+= slowhttptest
-SUBDIR+= slrn
SUBDIR+= slune
SUBDIR+= slurm
SUBDIR+= slurm-spank-x11
diff --git a/slrn/DESCR b/slrn/DESCR
deleted file mode 100644
index af299fc6ee..0000000000
--- a/slrn/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-slrn ('S-Lang read news') is a newsreader, i.e. a program that accesses a
-newsserver to read messages from the Internet News service (also known as
-'Usenet'). It runs in console mode on various Unix-like systems (including
-Linux), 32-bit Windows, OS/2, BeOS and VMS. Beside the usual features of a
-newsreader slrn supports scoring rules to highlight, sort or kill articles
-based on information from their header. It is highly customizable, allows
-free key-bindings and can easily be extended using the sophisticated
-S-Lang macro language. Offline reading is possible by using either
-slrnpull (shipped with slrn) or a local newsserver (like leafnode or INN).
diff --git a/slrn/Makefile b/slrn/Makefile
deleted file mode 100644
index 1b89d3d138..0000000000
--- a/slrn/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD$
-
-DISTNAME= slrn-1.0.3a
-CATEGORIES= news
-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
-
-EXTRACT_USING= bsdtar
-MAKE_JOBS_SAFE= no
-
-WRKSRC= ${WRKDIR}/slrn-1.0.3
-
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-inews --with-slrnpull --enable-spool \
- --enable-grouplens --with-libdir=${PREFIX}/lib/slrn \
- --enable-mid-cache \
- --with-slang=${BUILDLINK_PREFIX.libslang2} \
- --with-localedir=${PREFIX}/${PKGLOCALEDIR}/locale
-
-.include "options.mk"
-
-LDFLAGS.SunOS+= -lsocket -lnsl
-
-.include "../../devel/libslang2/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/slrn/PLIST b/slrn/PLIST
deleted file mode 100644
index f8b1d47158..0000000000
--- a/slrn/PLIST
+++ /dev/null
@@ -1,61 +0,0 @@
-@comment $NetBSD: PLIST,v 1.11 2014/08/23 09:34:48 obache Exp $
-bin/slrn
-bin/slrnpull
-man/man1/slrn.1
-man/man1/slrnpull.1
-share/doc/slrn/COPYING
-share/doc/slrn/COPYRIGHT
-share/doc/slrn/FAQ
-share/doc/slrn/FIRST_STEPS
-share/doc/slrn/README
-share/doc/slrn/README.GroupLens
-share/doc/slrn/README.SSL
-share/doc/slrn/README.macros
-share/doc/slrn/README.multiuser
-share/doc/slrn/THANKS
-share/doc/slrn/changes.txt
-share/doc/slrn/help.txt
-share/doc/slrn/manual.txt
-share/doc/slrn/score.sl
-share/doc/slrn/score.txt
-share/doc/slrn/slrn-doc.html
-share/doc/slrn/slrn.rc
-share/doc/slrn/slrnfuns.txt
-share/doc/slrn/slrnpull/README
-share/doc/slrn/slrnpull/README.offline
-share/doc/slrn/slrnpull/SETUP
-share/doc/slrn/slrnpull/score
-share/doc/slrn/slrnpull/setgid.txt
-share/doc/slrn/slrnpull/slrn.rc
-share/doc/slrn/slrnpull/slrnpull.conf
-share/doc/slrn/slrnpull/slrnpull.sh
-share/locale/be/LC_MESSAGES/slrn.mo
-share/locale/da/LC_MESSAGES/slrn.mo
-share/locale/de/LC_MESSAGES/slrn.mo
-share/locale/es/LC_MESSAGES/slrn.mo
-share/locale/fi/LC_MESSAGES/slrn.mo
-share/locale/fr/LC_MESSAGES/slrn.mo
-share/locale/it/LC_MESSAGES/slrn.mo
-share/locale/ko/LC_MESSAGES/slrn.mo
-share/locale/nl/LC_MESSAGES/slrn.mo
-share/locale/pl/LC_MESSAGES/slrn.mo
-share/locale/ru/LC_MESSAGES/slrn.mo
-share/locale/sv/LC_MESSAGES/slrn.mo
-share/locale/tr/LC_MESSAGES/slrn.mo
-share/slrn/slang/color.sl
-share/slrn/slang/gsort.sl
-share/slrn/slang/ispell.sl
-share/slrn/slang/latin2.sl
-share/slrn/slang/mailcap.sl
-share/slrn/slang/mime.sl
-share/slrn/slang/multipart.sl
-share/slrn/slang/nn.sl
-share/slrn/slang/posthook.sl
-share/slrn/slang/search.sl
-share/slrn/slang/slrn.sl
-share/slrn/slang/tin-art.sl
-share/slrn/slang/tin-group.sl
-share/slrn/slang/ttyprint.sl
-share/slrn/slang/util.sl
-share/slrn/slang/varset.sl
-share/slrn/slang/xcomment.sl
diff --git a/slrn/README b/slrn/README
deleted file mode 100644
index 8e4816c291..0000000000
--- a/slrn/README
+++ /dev/null
@@ -1,8 +0,0 @@
-This package contains slrn 1.0.3a patched for the libcanlock V3 API.
-pkgsrc option "canlock" added.
-
-The Cancel-Lock hash algorithm can now be configured with the "canlock_algo"
-variable (default value: SHA256).
-Updated documentation is installed (see Section 6.7.1 of manual).
-
-Patches (rewritten for 1.0.4) sent to upstream.
diff --git a/slrn/distinfo b/slrn/distinfo
deleted file mode 100644
index f55a33ac5d..0000000000
--- a/slrn/distinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: distinfo,v 1.17 2015/11/02 23:49:47 agc Exp $
-
-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 --git a/slrn/options.mk b/slrn/options.mk
deleted file mode 100644
index 1be1448ea7..0000000000
--- a/slrn/options.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD$
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.slrn
-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)
-. include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
-.else
-CONFIGURE_ARGS+= --without-ssl
-.endif
-
-###
-### uulib support
-###
-.if !empty(PKG_OPTIONS:Muulib)
-. include "../../converters/uulib/buildlink3.mk"
-CONFIGURE_ARGS+= --with-uu=${BUILDLINK_PREFIX.uulib}
-.else
-CONFIGURE_ARGS+= --without-uu
-.endif
diff --git a/slrn/patches/patch-changes.txt b/slrn/patches/patch-changes.txt
deleted file mode 100644
index 53581c40e8..0000000000
--- a/slrn/patches/patch-changes.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-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 --git a/slrn/patches/patch-doc_manual.txt b/slrn/patches/patch-doc_manual.txt
deleted file mode 100644
index 2d292ea0d9..0000000000
--- a/slrn/patches/patch-doc_manual.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-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 --git a/slrn/patches/patch-doc_slrn.rc b/slrn/patches/patch-doc_slrn.rc
deleted file mode 100644
index e0e6f090ac..0000000000
--- a/slrn/patches/patch-doc_slrn.rc
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-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 --git a/slrn/patches/patch-po_Makefile.in.in b/slrn/patches/patch-po_Makefile.in.in
deleted file mode 100644
index 627512159a..0000000000
--- a/slrn/patches/patch-po_Makefile.in.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-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 --git a/slrn/patches/patch-src_art.c b/slrn/patches/patch-src_art.c
deleted file mode 100644
index 2d0be701e6..0000000000
--- a/slrn/patches/patch-src_art.c
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD$
-
-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 --git a/slrn/patches/patch-src_misc.c b/slrn/patches/patch-src_misc.c
deleted file mode 100644
index 54a30b035a..0000000000
--- a/slrn/patches/patch-src_misc.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Added default value for new config option "canlock_algo".
-
---- src/misc.c.orig 2016-10-23 22:34:16.000000000 +0000
-+++ src/misc.c
-@@ -2828,6 +2828,8 @@ void slrn_get_user_info (void) /*{{{*/
-
- #if SLRN_HAS_CANLOCK
- Slrn_User_Info.cancelsecret = slrn_safe_strmalloc ("");
-+ /* SHA256 ist the mandatory algorithm defined by RFC 8315 */
-+ Slrn_User_Info.canlock_algo = slrn_safe_strmalloc ("SHA256");
- #endif
- #ifdef SLRN_SENDMAIL_COMMAND
- Slrn_SendMail_Command = slrn_safe_strmalloc (SLRN_SENDMAIL_COMMAND);
diff --git a/slrn/patches/patch-src_misc.h b/slrn/patches/patch-src_misc.h
deleted file mode 100644
index 4bcba8f5f9..0000000000
--- a/slrn/patches/patch-src_misc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Added config structure element for Cancel-Lock hash algorithm.
-
---- src/misc.h.orig 2016-10-23 22:34:16.000000000 +0000
-+++ src/misc.h
-@@ -80,6 +80,7 @@ typedef struct
- char *signature;
- #if SLRN_HAS_CANLOCK
- char *cancelsecret;
-+ char *canlock_algo;
- #endif
- char *posting_host; /* FQDN or NULL */
- char *login_name;
diff --git a/slrn/patches/patch-src_post.c b/slrn/patches/patch-src_post.c
deleted file mode 100644
index 839101ad89..0000000000
--- a/slrn/patches/patch-src_post.c
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD$
-
-Switched <c-lock> element generation to libcanlock API V3.
-
---- src/post.c.orig 2016-10-23 22:34:16.000000000 +0000
-+++ src/post.c
-@@ -50,7 +50,7 @@
- #endif
-
- #if SLRN_HAS_CANLOCK
--# include <canlock.h>
-+# include <libcanlock-3/canlock.h>
- #endif
-
- #include "slrn.h"
-@@ -821,7 +821,7 @@ static int prepare_header (VFILE *vp, un
-
- if ((NULL == (tmp = slrn_gen_date_header ()))
- || (NULL == slrn_append_to_header (a, tmp, 1))
-- || (NULL == (tmp = slrn_strdup_printf("User-Agent: slrn/%s (%s)", Slrn_Version_String, system_os_name)))
-+ || (NULL == (tmp = slrn_strdup_printf("User-Agent: slrn/%s (Patched for libcanlock3) (%s)", Slrn_Version_String, system_os_name)))
- || (NULL == slrn_append_to_header (a, tmp, 1))
- || (NULL == slrn_append_to_header (a, NULL,0))) /* separator */
- {
-@@ -1297,6 +1297,7 @@ static char *gen_cancel_lock (char *msgi
- char *buf, *canlock;
- unsigned int filelen;
- char canfile[SLRN_MAX_PATH_LEN];
-+ cl_hash_version algo;
-
- cansecret = slrn_open_home_file (file, "r", canfile, SLRN_MAX_PATH_LEN, 0);
- if (cansecret == NULL)
-@@ -1323,11 +1324,28 @@ static char *gen_cancel_lock (char *msgi
- (void) fread (buf, filelen, 1, cansecret);
- (void) fclose(cansecret);
-
--# if 0
-- canlock = md5_lock(buf, filelen, msgid, strlen(msgid));
--# else /* by default we use SHA-1 */
-- canlock = sha_lock ((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;
-+ }
-+ canlock = cl_get_lock (algo, (unsigned char *) buf, filelen, (unsigned char *)msgid, strlen(msgid));
-+ /* Try to overwrite secret in memory */
-+ cl_clear_secret((void *) buf, filelen, filelen+1);
-+
- slrn_free (buf);
- return canlock;
- }
diff --git a/slrn/patches/patch-src_slrnfeat.hin b/slrn/patches/patch-src_slrnfeat.hin
deleted file mode 100644
index dfbd864c17..0000000000
--- a/slrn/patches/patch-src_slrnfeat.hin
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Fix compiled-in default path to sendmail; it should be /usr/sbin/sendmail
-on essentially all even halfway modern systems.
-
---- src/slrnfeat.hin~ 2008-02-09 18:32:17.000000000 +0000
-+++ src/slrnfeat.hin
-@@ -179,7 +179,7 @@
- # define SLRN_SIGNATURE_FILE ".signature"
- /* Changing these here has no effect when using ./configure */
- # ifndef SLRN_SENDMAIL_COMMAND
--# define SLRN_SENDMAIL_COMMAND "/usr/lib/sendmail -oi -t -oem -odb"
-+# define SLRN_SENDMAIL_COMMAND "/usr/sbin/sendmail -oi -t -oem -odb"
- # endif
- # endif /* unix */
- # endif /* os2 */
diff --git a/slrn/patches/patch-src_startup.c b/slrn/patches/patch-src_startup.c
deleted file mode 100644
index c91c1a310e..0000000000
--- a/slrn/patches/patch-src_startup.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Added variable for Cancel-Lock hash algorithm.
-
---- src/startup.c.orig 2016-10-23 22:34:16.000000000 +0000
-+++ src/startup.c
-@@ -731,8 +731,10 @@ Slrn_Str_Var_Type Slrn_Str_Variables []
- #endif
- #if SLRN_HAS_CANLOCK
- {"cansecret_file", &Slrn_User_Info.cancelsecret, NULL},
-+ {"canlock_algo", &Slrn_User_Info.canlock_algo, NULL},
- #else
- {"cansecret_file", NULL, NULL},
-+ {"canlock_algo", NULL, NULL},
- #endif
- {"art_help_line", &Slrn_Art_Help_Line, NULL},
- {"art_status_line", &Slrn_Art_Status_Line, NULL},
diff --git a/slrn/patches/patch-src_version.c b/slrn/patches/patch-src_version.c
deleted file mode 100644
index e00380e96a..0000000000
--- a/slrn/patches/patch-src_version.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Added notes that this is a modified version.
-
---- src/version.c.orig 2016-10-23 22:34:16.000000000 +0000
-+++ src/version.c
-@@ -132,6 +132,11 @@ void slrn_show_version (FILE *fp) /*{{{*
- fprintf (fp, "slrn %s\n", Slrn_Version_String);
- if (*Slrn_Version_String == 'p')
- fprintf (fp, _("\t* Note: This version is a developer preview.\n"));
-+
-+ /* To be removed if patch is accepted upstream */
-+ fprintf (fp, _("\t* Note: This is a modified version! (do not bother the author with questions)\n"));
-+ fprintf (fp, _("\t* Patched to support libcanlock3 (see documentation)\n"));
-+
- fprintf (fp, _("S-Lang Library Version: %s\n"), SLang_Version_String);
- if (SLANG_VERSION != SLang_Version)
- {
Home |
Main Index |
Thread Index |
Old Index