CVS commit: pkgsrc/net/delegate

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Sun Sep 18 22:46:25 UTC 2022

Modified Files:
        pkgsrc/net/delegate: Makefile distinfo
Added Files:
        pkgsrc/net/delegate/patches: patch-mimekit_mimehead.c
            patch-rary_credhy.c

Log Message:
net/delegate: fix the build by spreading some unsigned-ness.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/net/delegate/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/delegate/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/delegate/patches/patch-mimekit_mimehead.c \
    pkgsrc/net/delegate/patches/patch-rary_credhy.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/delegate/Makefile
diff -u pkgsrc/net/delegate/Makefile:1.47 pkgsrc/net/delegate/Makefile:1.48
--- pkgsrc/net/delegate/Makefile:1.47   Sun May  3 17:22:50 2020
+++ pkgsrc/net/delegate/Makefile        Sun Sep 18 22:46:25 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2020/05/03 17:22:50 rillig Exp $
+# $NetBSD: Makefile,v 1.48 2022/09/18 22:46:25 he Exp $
 
 DISTNAME=      delegate9.9.1
 PKGNAME=       delegate-9.9.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    net
 MASTER_SITES=  http://www.delegate.org/anonftp/DeleGate/
 MASTER_SITES+= ftp://ftp.u-aizu.ac.jp/pub/net/DeleGate/delegate.org/

Index: pkgsrc/net/delegate/distinfo
diff -u pkgsrc/net/delegate/distinfo:1.16 pkgsrc/net/delegate/distinfo:1.17
--- pkgsrc/net/delegate/distinfo:1.16   Tue Oct 26 11:05:30 2021
+++ pkgsrc/net/delegate/distinfo        Sun Sep 18 22:46:25 2022
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 11:05:30 nia Exp $
+$NetBSD: distinfo,v 1.17 2022/09/18 22:46:25 he Exp $
 
 BLAKE2s (delegate9.9.1.tar.gz) = 5c2691c941b17c4d2fe359ab3b686848249e6e23f6e2480a181f6ea906f5933e
 SHA512 (delegate9.9.1.tar.gz) = 85e316de1eaef7f1e69ae767c6aba7e58a43dd8f41b508ce8dcb84a381829879f99be87b54440e339d5e0858c6ef87349223364a4d3ec786dba04af7111c87f4
 Size (delegate9.9.1.tar.gz) = 1944670 bytes
+SHA1 (patch-mimekit_mimehead.c) = 73f63930acd4eabb6854d96cf8792c5c33a09822
+SHA1 (patch-rary_credhy.c) = d4788506a9f177eeb2568091089ccb823813035b
 SHA1 (patch-rary_pstitle_c) = 3b30e698749b5ed6a9cc197b0ab6a1e013de2673
 SHA1 (patch-resolvy_resconf_c) = d090d26542a3197fb48514652f3b421b6282a6cc
 SHA1 (patch-resolvy_resolv_c) = d903447c60f1c79b7bc596cba9d3c8070298a1e2

Added files:

Index: pkgsrc/net/delegate/patches/patch-mimekit_mimehead.c
diff -u /dev/null pkgsrc/net/delegate/patches/patch-mimekit_mimehead.c:1.1
--- /dev/null   Sun Sep 18 22:46:25 2022
+++ pkgsrc/net/delegate/patches/patch-mimekit_mimehead.c        Sun Sep 18 22:46:25 2022
@@ -0,0 +1,25 @@
+$NetBSD: patch-mimekit_mimehead.c,v 1.1 2022/09/18 22:46:25 he Exp $
+
+Follow up spreading of unsigned-ness.
+
+--- ./mimekit/mimehead.c.orig  2009-01-13 02:14:09.000000000 +0000
++++ ./mimekit/mimehead.c
+@@ -879,7 +879,7 @@ int MIME_headerEncodeX(MimeConv *Mcv,FIL
+ static void DE_FPUTC1X(CHARx *CH,INOUT *Out)
+ {     FILE *out;
+       int cset;
+-      int ch;
++      unsigned int ch;
+ 
+       out = Out->out_file;
+       ch = CH->c_ch;
+@@ -914,7 +914,8 @@ static void DE_FPUTC1(int ch,INOUT *io)
+ }
+ 
+ static void dumpDECODER(CHARx *CH,INOUT *io)
+-{     int i,ch;
++{     int i;
++      unsigned int ch;
+       CStr(sym,16);
+ 
+       switch( ch = CH->c_ch ){
Index: pkgsrc/net/delegate/patches/patch-rary_credhy.c
diff -u /dev/null pkgsrc/net/delegate/patches/patch-rary_credhy.c:1.1
--- /dev/null   Sun Sep 18 22:46:25 2022
+++ pkgsrc/net/delegate/patches/patch-rary_credhy.c     Sun Sep 18 22:46:25 2022
@@ -0,0 +1,64 @@
+$NetBSD: patch-rary_credhy.c,v 1.1 2022/09/18 22:46:25 he Exp $
+
+Fix build by spreading some "unsigned"ness.
+
+--- ./rary/credhy.c.orig       2008-11-14 01:12:53.000000000 +0000
++++ ./rary/credhy.c
+@@ -103,10 +103,10 @@ static int DH_Px;
+  * 2^255+1351 ... a prime number in 256 bits
+  * http://www.utm.edu/research/primes/lists/2small/200bit.html
+  */
+-static int Pt[] = {
++static unsigned int Pt[] = {
+  103078511
+ };
+-static int P0[] = {
++static unsigned int P0[] = {
+ 0x80000000,0x00000000,0x00000000,0x00000000,
+ 0x00000000,0x00000000,0x00000000,0x00000547
+ };
+@@ -115,7 +115,7 @@ static int P0[] = {
+  * From RFC2409(IKE), RFC2539(DNSsec)
+  * 2^768 - 2^704 - 1 + 2^64 * { [2^638 pi] + 149686 }
+  */
+-static int P1[] = {
++static unsigned int P1[] = {
+  0xFFFFFFFF,0xFFFFFFFF,0xC90FDAA2,0x2168C234,
+  0xC4C6628B,0x80DC1CD1,0x29024E08,0x8A67CC74,
+  0x020BBEA6,0x3B139B22,0x514A0879,0x8E3404DD,
+@@ -128,7 +128,7 @@ static int P1[] = {
+  * From RFC2409, RFC2539
+  * 2^1024 - 2^960 - 1 + 2^64 * { [2-894 pi] + 129093 }
+  */ 
+-static int P2[32] = {
++static unsigned int P2[32] = {
+  0xFFFFFFFF,0xFFFFFFFF,0xC90FDAA2,0x2168C234,
+  0xC4C6628B,0x80DC1CD1,0x29024E08,0x8A67CC74,
+  0x020BBEA6,0x3B139B22,0x514A0879,0x8E3404DD,
+@@ -142,7 +142,7 @@ static int P2[32] = {
+ /*
+  * From RFC3526
+  */
+-static int P3[] ={
++static unsigned int P3[] ={
+  0xFFFFFFFF,0xFFFFFFFF,0xC90FDAA2,0x2168C234,
+  0xC4C6628B,0x80DC1CD1,0x29024E08,0x8A67CC74,
+  0x020BBEA6,0x3B139B22,0x514A0879,0x8E3404DD,
+@@ -159,7 +159,7 @@ static int P3[] ={
+ 
+ static struct {
+       int      p_size;
+-      int     *p_int;
++      unsigned int    *p_int;
+ } PX[] = {
+       { sizeof(P0),   P0 },
+       { sizeof(P1),   P1 },
+@@ -169,7 +169,7 @@ static struct {
+ };
+ void DH_init(int grp){
+       int i,k,s;
+-      int *p;
++      unsigned int *p;
+ 
+       if( DH_G[LSI] == 2 )
+               return;