CVS commit: pkgsrc/mail/fdm

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Thu Sep  3 10:46:39 UTC 2020

Modified Files:
        pkgsrc/mail/fdm: Makefile distinfo
        pkgsrc/mail/fdm/patches: patch-imap-common.c

Log Message:
fdm: Sync OAUTHBEARER patch with the version applied upstream

server.port is a string, not an integer.

PKGREVISION++


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mail/fdm/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/mail/fdm/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/fdm/patches/patch-imap-common.c

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

Modified files:

Index: pkgsrc/mail/fdm/Makefile
diff -u pkgsrc/mail/fdm/Makefile:1.16 pkgsrc/mail/fdm/Makefile:1.17
--- pkgsrc/mail/fdm/Makefile:1.16       Sat Aug 29 13:43:54 2020
+++ pkgsrc/mail/fdm/Makefile    Thu Sep  3 10:46:38 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2020/08/29 13:43:54 leot Exp $
+# $NetBSD: Makefile,v 1.17 2020/09/03 10:46:38 leot Exp $
 
 DISTNAME=      fdm-2.0
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=nicm/}
 

Index: pkgsrc/mail/fdm/distinfo
diff -u pkgsrc/mail/fdm/distinfo:1.14 pkgsrc/mail/fdm/distinfo:1.15
--- pkgsrc/mail/fdm/distinfo:1.14       Sat Aug 29 13:43:54 2020
+++ pkgsrc/mail/fdm/distinfo    Thu Sep  3 10:46:38 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2020/08/29 13:43:54 leot Exp $
+$NetBSD: distinfo,v 1.15 2020/09/03 10:46:38 leot Exp $
 
 SHA1 (fdm-2.0.tar.gz) = 4da70cca5791457489d9e0a018706a6696609eab
 RMD160 (fdm-2.0.tar.gz) = b07dc4ee0b8de3362177d74bd935d1ae4dad961d
@@ -10,7 +10,7 @@ SHA1 (patch-deliver-imap.c) = 3be95a6ef4
 SHA1 (patch-deliver.h) = 618d73f8fa2d69112ae85d858261d7f77a4e5c98
 SHA1 (patch-fdm.conf.5) = 4d43169edec6958ff591487be34f041054bfb476
 SHA1 (patch-fetch.h) = 225c3d83282057781cacd7ba84af1d16bd4b7616
-SHA1 (patch-imap-common.c) = e45a163e7ee4c8e386157babea8c43a7b26b77d1
+SHA1 (patch-imap-common.c) = 264f43c3703fa282f4431d7ba4b9fced08df1968
 SHA1 (patch-lex.c) = 457abcef58add76cd4b76351a1961c45abc2f783
 SHA1 (patch-parse.y) = 56e27e155b6d99e3539d4dfe7f90d5c607fb4153
 SHA1 (patch-shm-mmap.c) = 3cd0c54c982ddd4702ad921ebf5f1b890b503cd4

Index: pkgsrc/mail/fdm/patches/patch-imap-common.c
diff -u pkgsrc/mail/fdm/patches/patch-imap-common.c:1.1 pkgsrc/mail/fdm/patches/patch-imap-common.c:1.2
--- pkgsrc/mail/fdm/patches/patch-imap-common.c:1.1     Sat Aug 29 13:43:54 2020
+++ pkgsrc/mail/fdm/patches/patch-imap-common.c Thu Sep  3 10:46:39 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-imap-common.c,v 1.1 2020/08/29 13:43:54 leot Exp $
+$NetBSD: patch-imap-common.c,v 1.2 2020/09/03 10:46:39 leot Exp $
 
 Add support for OAUTHBEARER (OAuth 2.0 bearer tokens, as documented by
 RFC 7628) for IMAP.
@@ -52,7 +52,7 @@ Patch shared upstream via:
 +      char                    *src, *b64;
 +
 +      xasprintf(&src,
-+          "n,a=%s,\001host=%s\001port=%d\001auth=Bearer %s\001\001",
++          "n,a=%s,\001host=%s\001port=%s\001auth=Bearer %s\001\001",
 +          data->user, data->server.host, data->server.port, data->pass);
 +      b64 = imap_base64_encode(src);
 +      xfree(src);