Sun Jul 7 18:13:23 2019 UTC ()
snownews: Support OpenSSL 1.1.


(nia)
diff -r1.52 -r1.53 pkgsrc/www/snownews/Makefile
diff -r1.14 -r1.15 pkgsrc/www/snownews/distinfo
diff -r0 -r1.1 pkgsrc/www/snownews/patches/patch-conversions.c
diff -r0 -r1.1 pkgsrc/www/snownews/patches/patch-digcalc.c
cvs diff -r1.52 -r1.53 pkgsrc/www/snownews/Makefile (expand / switch to unified diff)

--- pkgsrc/www/snownews/Makefile 2018/08/22 09:47:58 1.52
+++ pkgsrc/www/snownews/Makefile 2019/07/07 18:13:23 1.53
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.52 2018/08/22 09:47:58 wiz Exp $ 1# $NetBSD: Makefile,v 1.53 2019/07/07 18:13:23 nia Exp $
2 2
3DISTNAME= snownews-1.5.12 3DISTNAME= snownews-1.5.12
4PKGREVISION= 14 4PKGREVISION= 15
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://kiza.kcore.de/software/snownews/download/ 6MASTER_SITES= http://kiza.kcore.de/software/snownews/download/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://kiza.kcore.de/software/snownews/ 9HOMEPAGE= http://kiza.kcore.de/software/snownews/
10COMMENT= Small, curses based RSS feed reader 10COMMENT= Small, curses based RSS feed reader
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13DEPENDS+= p5-XML-LibXML>=1.58:../../textproc/p5-XML-LibXML 13DEPENDS+= p5-XML-LibXML>=1.58:../../textproc/p5-XML-LibXML
14 14
15HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
16USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
17USE_TOOLS+= msgfmt perl 17USE_TOOLS+= msgfmt perl
cvs diff -r1.14 -r1.15 pkgsrc/www/snownews/distinfo (expand / switch to unified diff)

--- pkgsrc/www/snownews/distinfo 2015/11/04 02:47:39 1.14
+++ pkgsrc/www/snownews/distinfo 2019/07/07 18:13:23 1.15
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1$NetBSD: distinfo,v 1.14 2015/11/04 02:47:39 agc Exp $ 1$NetBSD: distinfo,v 1.15 2019/07/07 18:13:23 nia Exp $
2 2
3SHA1 (snownews-1.5.12.tar.gz) = b3addaac25c2c093aa5e60b8b89e50e7d7450bcf 3SHA1 (snownews-1.5.12.tar.gz) = b3addaac25c2c093aa5e60b8b89e50e7d7450bcf
4RMD160 (snownews-1.5.12.tar.gz) = dbe9c6b88e77ce37bb23e4d3ddc8d63f8bd66151 4RMD160 (snownews-1.5.12.tar.gz) = dbe9c6b88e77ce37bb23e4d3ddc8d63f8bd66151
5SHA512 (snownews-1.5.12.tar.gz) = 7a7ccd5ea57f8bbb73f1429ab931a38203e858c74a383c5347e66088b84f6a7240feeee99e179687ce0a7a89c6c1406ce20d6c5d6771d25a0a0301fa5526e220 5SHA512 (snownews-1.5.12.tar.gz) = 7a7ccd5ea57f8bbb73f1429ab931a38203e858c74a383c5347e66088b84f6a7240feeee99e179687ce0a7a89c6c1406ce20d6c5d6771d25a0a0301fa5526e220
6Size (snownews-1.5.12.tar.gz) = 167944 bytes 6Size (snownews-1.5.12.tar.gz) = 167944 bytes
 7SHA1 (patch-conversions.c) = 4ca23e1a1c6f1b98533c4f74eba2e7aa2bed8e75
 8SHA1 (patch-digcalc.c) = ce73645e350f8dad93c3801077ceb1628bbed5bd
7SHA1 (patch-os-support_c) = 144a9c0910618ddd64d5d56eb62aa8a9e8155145 9SHA1 (patch-os-support_c) = 144a9c0910618ddd64d5d56eb62aa8a9e8155145
File Added: pkgsrc/www/snownews/patches/Attic/patch-conversions.c
$NetBSD: patch-conversions.c,v 1.1 2019/07/07 18:13:23 nia Exp $

Support OpenSSL 1.1.

--- conversions.c.orig	2009-09-17 06:44:27.000000000 +0000
+++ conversions.c
@@ -618,20 +618,21 @@ char * Hashify (const char * url) {
 
 char * genItemHash (char ** hashitems, int items) {
 	int i;
-	EVP_MD_CTX mdctx;
+	EVP_MD_CTX *mdctx;
 	unsigned char md_value[EVP_MAX_MD_SIZE];
 	unsigned int md_len;
 	char md5_hex[33];
-
-	EVP_DigestInit(&mdctx, EVP_md5());
+	
+	mdctx = EVP_MD_CTX_new();
+	EVP_DigestInit(mdctx, EVP_md5());
 	
 	for (i = 0; i < items; i++) {
 		if (hashitems[i] != NULL)
-			EVP_DigestUpdate(&mdctx, hashitems[i], (size_t) strlen(hashitems[i]));
+			EVP_DigestUpdate(mdctx, hashitems[i], (size_t) strlen(hashitems[i]));
 	}
 	
-	EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
-	EVP_MD_CTX_cleanup(&mdctx);
+	EVP_DigestFinal_ex(mdctx, md_value, &md_len);
+	EVP_MD_CTX_free(mdctx);
 	
 	for (i = 0; i < md_len; i++) {
 		sprintf(&md5_hex[2*i], "%02x", md_value[i]);
File Added: pkgsrc/www/snownews/patches/Attic/patch-digcalc.c
$NetBSD: patch-digcalc.c,v 1.1 2019/07/07 18:13:23 nia Exp $

Support OpenSSL 1.1.

--- digcalc.c.orig	2009-09-17 06:44:27.000000000 +0000
+++ digcalc.c
@@ -27,30 +27,32 @@ void DigestCalcHA1(
     OUT HASHHEX SessionKey
     )
 {
-	EVP_MD_CTX mdctx;
+	EVP_MD_CTX *mdctx;
 	unsigned char md_value[EVP_MAX_MD_SIZE];
 	unsigned int md_len;
 	int i;
 	HASH HA1;
 	
-	EVP_DigestInit(&mdctx, EVP_md5());
-	EVP_DigestUpdate(&mdctx, pszUserName, strlen(pszUserName));
-	EVP_DigestUpdate(&mdctx, ":", 1);
-	EVP_DigestUpdate(&mdctx, pszRealm, strlen(pszRealm));
-	EVP_DigestUpdate(&mdctx, ":", 1);
-	EVP_DigestUpdate(&mdctx, pszPassword, strlen(pszPassword));
-	EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
-	EVP_MD_CTX_cleanup(&mdctx);
+	mdctx = EVP_MD_CTX_new();
+	EVP_DigestInit(mdctx, EVP_md5());
+	EVP_DigestUpdate(mdctx, pszUserName, strlen(pszUserName));
+	EVP_DigestUpdate(mdctx, ":", 1);
+	EVP_DigestUpdate(mdctx, pszRealm, strlen(pszRealm));
+	EVP_DigestUpdate(mdctx, ":", 1);
+	EVP_DigestUpdate(mdctx, pszPassword, strlen(pszPassword));
+	EVP_DigestFinal_ex(mdctx, md_value, &md_len);
+	EVP_MD_CTX_free(mdctx);
 	
 	if (strcmp(pszAlg, "md5-sess") == 0) {
-		EVP_DigestInit(&mdctx, EVP_md5());
-		EVP_DigestUpdate(&mdctx, HA1, HASHLEN);
-		EVP_DigestUpdate(&mdctx, ":", 1);
-		EVP_DigestUpdate(&mdctx, pszNonce, strlen(pszNonce));
-		EVP_DigestUpdate(&mdctx, ":", 1);
-		EVP_DigestUpdate(&mdctx, pszCNonce, strlen(pszCNonce));
-		EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
-		EVP_MD_CTX_cleanup(&mdctx);
+		mdctx = EVP_MD_CTX_new();
+		EVP_DigestInit(mdctx, EVP_md5());
+		EVP_DigestUpdate(mdctx, HA1, HASHLEN);
+		EVP_DigestUpdate(mdctx, ":", 1);
+		EVP_DigestUpdate(mdctx, pszNonce, strlen(pszNonce));
+		EVP_DigestUpdate(mdctx, ":", 1);
+		EVP_DigestUpdate(mdctx, pszCNonce, strlen(pszCNonce));
+		EVP_DigestFinal_ex(mdctx, md_value, &md_len);
+		EVP_MD_CTX_free(mdctx);
 	};
 	
 	for (i = 0; i < md_len; i++) {
@@ -71,45 +73,47 @@ void DigestCalcResponse(
     OUT HASHHEX Response      /* request-digest or response-digest */
     )
 {
-	EVP_MD_CTX mdctx;
+	EVP_MD_CTX *mdctx;
 	HASHHEX HA2Hex;
 	unsigned char md_value[EVP_MAX_MD_SIZE];
 	unsigned int md_len;
 	int i;
 	
 	/* calculate H(A2) */
-	EVP_DigestInit(&mdctx, EVP_md5());
-	EVP_DigestUpdate(&mdctx, pszMethod, strlen(pszMethod));
-	EVP_DigestUpdate(&mdctx, ":", 1);
-	EVP_DigestUpdate(&mdctx, pszDigestUri, strlen(pszDigestUri));
+	mdctx = EVP_MD_CTX_new();
+	EVP_DigestInit(mdctx, EVP_md5());
+	EVP_DigestUpdate(mdctx, pszMethod, strlen(pszMethod));
+	EVP_DigestUpdate(mdctx, ":", 1);
+	EVP_DigestUpdate(mdctx, pszDigestUri, strlen(pszDigestUri));
 	if (strcmp(pszQop, "auth-int") == 0) {
-		EVP_DigestUpdate(&mdctx, ":", 1);
-		EVP_DigestUpdate(&mdctx, HEntity, HASHHEXLEN);
+		EVP_DigestUpdate(mdctx, ":", 1);
+		EVP_DigestUpdate(mdctx, HEntity, HASHHEXLEN);
 	};
-	EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
-	EVP_MD_CTX_cleanup(&mdctx);
+	EVP_DigestFinal_ex(mdctx, md_value, &md_len);
+	EVP_MD_CTX_free(mdctx);
 	
 	for (i = 0; i < md_len; i++) {
 		sprintf(&HA2Hex[2*i], "%02x", md_value[i]);
 	}
 	
 	/* calculate response */
-	EVP_DigestInit(&mdctx, EVP_md5());
-	EVP_DigestUpdate(&mdctx, HA1, HASHHEXLEN);
-	EVP_DigestUpdate(&mdctx, ":", 1);
-	EVP_DigestUpdate(&mdctx, pszNonce, strlen(pszNonce));
-	EVP_DigestUpdate(&mdctx, ":", 1);
+	mdctx = EVP_MD_CTX_new();
+	EVP_DigestInit(mdctx, EVP_md5());
+	EVP_DigestUpdate(mdctx, HA1, HASHHEXLEN);
+	EVP_DigestUpdate(mdctx, ":", 1);
+	EVP_DigestUpdate(mdctx, pszNonce, strlen(pszNonce));
+	EVP_DigestUpdate(mdctx, ":", 1);
 	if (*pszQop) {
-		EVP_DigestUpdate(&mdctx, pszNonceCount, strlen(pszNonceCount));
-		EVP_DigestUpdate(&mdctx, ":", 1);
-		EVP_DigestUpdate(&mdctx, pszCNonce, strlen(pszCNonce));
-		EVP_DigestUpdate(&mdctx, ":", 1);
-		EVP_DigestUpdate(&mdctx, pszQop, strlen(pszQop));
-		EVP_DigestUpdate(&mdctx, ":", 1);
+		EVP_DigestUpdate(mdctx, pszNonceCount, strlen(pszNonceCount));
+		EVP_DigestUpdate(mdctx, ":", 1);
+		EVP_DigestUpdate(mdctx, pszCNonce, strlen(pszCNonce));
+		EVP_DigestUpdate(mdctx, ":", 1);
+		EVP_DigestUpdate(mdctx, pszQop, strlen(pszQop));
+		EVP_DigestUpdate(mdctx, ":", 1);
 	};
-	EVP_DigestUpdate(&mdctx, HA2Hex, HASHHEXLEN);
-	EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
-	EVP_MD_CTX_cleanup(&mdctx);
+	EVP_DigestUpdate(mdctx, HA2Hex, HASHHEXLEN);
+	EVP_DigestFinal_ex(mdctx, md_value, &md_len);
+	EVP_MD_CTX_free(mdctx);
 	
 	for (i = 0; i < md_len; i++) {
 		sprintf(&Response[2*i], "%02x", md_value[i]);