[.joined/pkgsrc/trunk]: .joined/pkgsrc/mail/qremote In addition to "qmail-tcp...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/.joined/pkgsrc/rev/f60287f494fe
branches:  trunk
changeset: 371096:f60287f494fe
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Tue Jan 04 21:03:22 2022 +0000

description:
In addition to "qmail-tcpclient" being identical to ucspi-tcp's
tcpclient, the author suggests we rely on the curvecpclient and
curvecpmessage binaries provided by NaCl. Bump PKGREVISION.

diffstat:

 mail/qremote/Makefile                       |   5 +++--
 mail/qremote/PLIST                          |   4 +---
 mail/qremote/distinfo                       |   7 +++----
 mail/qremote/patches/patch-Makefile         |  24 ++++++++++--------------
 mail/qremote/patches/patch-nacl-20110221_do |  27 ---------------------------
 mail/qremote/patches/patch-qmail-remote.c   |  21 ++++++++++++++++++---
 6 files changed, 35 insertions(+), 53 deletions(-)

diffs (144 lines):

diff -r cb69d95a5d2b -r f60287f494fe mail/qremote/Makefile
--- a/mail/qremote/Makefile     Tue Jan 04 20:53:26 2022 +0000
+++ b/mail/qremote/Makefile     Tue Jan 04 21:03:22 2022 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2020/11/19 09:35:42 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/04 21:03:22 schmonz Exp $
 
 DISTNAME=              qremote-20131231
+PKGREVISION=           1
 CATEGORIES=            mail
 MASTER_SITES=          ${HOMEPAGE}
 EXTRACT_SUFX=          .tar.bz2
@@ -24,7 +25,7 @@
        cd ${WRKSRC} && ${MV} qmail-remote qmail-qremote
 
 do-install:
-       for i in qremote curvecpclient curvecpmessage rsmtp; do \
+       for i in qremote rsmtp; do \
          ${INSTALL_PROGRAM} ${WRKSRC}/qmail-$${i} ${DESTDIR}${PREFIX}/bin; \
        done
        ${INSTALL_PROGRAM} ${WRKSRC}/showdnsmx ${DESTDIR}${PREFIX}/bin
diff -r cb69d95a5d2b -r f60287f494fe mail/qremote/PLIST
--- a/mail/qremote/PLIST        Tue Jan 04 20:53:26 2022 +0000
+++ b/mail/qremote/PLIST        Tue Jan 04 21:03:22 2022 +0000
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/11/02 10:53:04 schmonz Exp $
-bin/qmail-curvecpclient
-bin/qmail-curvecpmessage
+@comment $NetBSD: PLIST,v 1.3 2022/01/04 21:03:22 schmonz Exp $
 bin/qmail-qremote
 bin/qmail-rsmtp
 bin/showdnsmx
diff -r cb69d95a5d2b -r f60287f494fe mail/qremote/distinfo
--- a/mail/qremote/distinfo     Tue Jan 04 20:53:26 2022 +0000
+++ b/mail/qremote/distinfo     Tue Jan 04 21:03:22 2022 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 10:54:25 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/01/04 21:03:22 schmonz Exp $
 
 BLAKE2s (qremote-20131231.tar.bz2) = 9832f87a3b4e627c85a4fa57ef44c2473b382826b139cbeb91b57a0a86781701
 SHA512 (qremote-20131231.tar.bz2) = 234691baf85c2256ac4a2dcfc23a3e136fecf22ecabac2b992dd157439d8bf83813c7ee2a1a8430386bbea6ce8526469cb407b67860605cb6a09963ec96df10c
 Size (qremote-20131231.tar.bz2) = 217306 bytes
-SHA1 (patch-Makefile) = d327047caa52b974e6017eb5e7b393a82059cdd4
-SHA1 (patch-nacl-20110221_do) = 0f11d6a2d0c452de457f3b5e565527b5f4a689ec
-SHA1 (patch-qmail-remote.c) = 0fd024911347d12e854b6f7aaefd4e234262c2c1
+SHA1 (patch-Makefile) = 80d89a479902eeeeb55628d92613bb73ca5308cc
+SHA1 (patch-qmail-remote.c) = aa6de1fc40b38c163a720e921bf02124d013c5ed
diff -r cb69d95a5d2b -r f60287f494fe mail/qremote/patches/patch-Makefile
--- a/mail/qremote/patches/patch-Makefile       Tue Jan 04 20:53:26 2022 +0000
+++ b/mail/qremote/patches/patch-Makefile       Tue Jan 04 21:03:22 2022 +0000
@@ -1,20 +1,16 @@
-$NetBSD: patch-Makefile,v 1.1 2020/11/02 10:24:58 schmonz Exp $
+$NetBSD: patch-Makefile,v 1.2 2022/01/04 21:03:22 schmonz Exp $
 
-Find binaries where we built them.
+The bundled tcpclient, curvecpclient, and curvecpmessage aren't special.
+Use whatever's installed.
 
 --- Makefile.orig      2013-04-16 06:11:06.000000000 +0000
 +++ Makefile
-@@ -1199,9 +1199,9 @@ load qmail-tcpclient.o library.a socket.
-       ./load qmail-tcpclient library.a `cat socket.lib`
+@@ -1084,7 +1084,7 @@ wait_pid.o 
+       uint16_pack.o uint16_unpack.o uint32_unpack.o \
+       wait_pid.o 
  
- qmail-curvecpclient:
--      test -f "nacl-20110221/build/`hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]'`/bin/curvecpclient" || ( cd nacl-20110221; ./do )
--      cp "nacl-20110221/build/`hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]'`/bin/curvecpclient" qmail-curvecpclient
-+      test -f "nacl-20110221/build/pkgsrchostname/bin/curvecpclient" || ( cd nacl-20110221; ./do )
-+      cp "nacl-20110221/build/pkgsrchostname/bin/curvecpclient" qmail-curvecpclient
+-it:  showdnsmx qmail-remote qmail-rsmtp ipmeprint qmail-tcpclient qmail-curvecpclient qmail-curvecpmessage
++it:  showdnsmx qmail-remote qmail-rsmtp ipmeprint
  
- qmail-curvecpmessage:
--      test -f "nacl-20110221/build/`hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]'`/bin/curvecpmessage" || ( cd nacl-20110221; ./do )
--      cp "nacl-20110221/build/`hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]'`/bin/curvecpmessage" qmail-curvecpmessage
-+      test -f "nacl-20110221/build/pkgsrchostname/bin/curvecpmessage" || ( cd nacl-20110221; ./do )
-+      cp "nacl-20110221/build/pkgsrchostname/bin/curvecpmessage" qmail-curvecpmessage
+ load: \
+ warn-auto.sh conf-ld
diff -r cb69d95a5d2b -r f60287f494fe mail/qremote/patches/patch-nacl-20110221_do
--- a/mail/qremote/patches/patch-nacl-20110221_do       Tue Jan 04 20:53:26 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-nacl-20110221_do,v 1.1 2020/11/02 10:24:58 schmonz Exp $
-
-Taken from security/nacl:
-
-Don't bake build host into anything.
-Show build output.
-
---- nacl-20110221/do.orig      2012-08-25 06:57:17.000000000 +0000
-+++ nacl-20110221/do
-@@ -6,7 +6,7 @@
- 
- version=`cat version`
- project=nacl
--shorthostname=`hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]'`
-+shorthostname='pkgsrchostname'
- 
- top="`pwd`/build/$shorthostname"
- bin="$top/bin"
-@@ -38,7 +38,7 @@ mkdir -p "$bin"
- mkdir -p "$lib"
- mkdir -p "$include"
- 
--exec >"$top/log"
-+exec | tee "$top/log"
- exec 2>&1
- exec 5>"$top/data"
- exec </dev/null
diff -r cb69d95a5d2b -r f60287f494fe mail/qremote/patches/patch-qmail-remote.c
--- a/mail/qremote/patches/patch-qmail-remote.c Tue Jan 04 20:53:26 2022 +0000
+++ b/mail/qremote/patches/patch-qmail-remote.c Tue Jan 04 21:03:22 2022 +0000
@@ -1,10 +1,25 @@
-$NetBSD: patch-qmail-remote.c,v 1.1 2020/11/02 10:24:58 schmonz Exp $
+$NetBSD: patch-qmail-remote.c,v 1.2 2022/01/04 21:03:22 schmonz Exp $
 
-The bundled tcpclient isn't special; use an installed one.
+The bundled tcpclient, curvecpclient, and curvecpmessage aren't special.
+Use whatever's installed.
 
 --- qmail-remote.c.orig        2013-04-14 10:07:50.000000000 +0000
 +++ qmail-remote.c
-@@ -139,7 +139,7 @@ void child(stralloc *d1, stralloc *d2, s
+@@ -124,7 +124,7 @@ void child(stralloc *d1, stralloc *d2, s
+ 
+     i = 0;
+     if (ix->haskey) {
+-        run[i++] = "qmail-curvecpclient";
++        run[i++] = "curvecpclient";
+         if (flagkeydir) {
+             run[i++] = "-c";
+             run[i++] = keydir.s;
+@@ -135,11 +135,11 @@ void child(stralloc *d1, stralloc *d2, s
+         run[i++] = ipstr;
+         run[i++] = strport;
+         run[i++] = ix->ext;
+-        run[i++] = "qmail-curvecpmessage";
++        run[i++] = "curvecpmessage";
          run[i++] = "-c";
      }
      else {