CVS commit: pkgsrc/mail/qremote

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Nov  2 10:24:58 UTC 2020

Added Files:
        pkgsrc/mail/qremote: DESCR Makefile PLIST distinfo
        pkgsrc/mail/qremote/patches: patch-Makefile patch-nacl-20110221_do
            patch-qmail-remote.c

Log Message:
Initial import of qremote, an experimental qmail-remote replacement with
CurveCP support.

qmail-qremote resolves IP addresses for SMTP server and then calls
either tcpclient or qmail-curvecpclient for TCP or CurveCP connections,
respectively. Once the connection is established, qmail-rsmtp executes
to send mail via SMTP.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/qremote/DESCR pkgsrc/mail/qremote/Makefile \
    pkgsrc/mail/qremote/PLIST pkgsrc/mail/qremote/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/qremote/patches/patch-Makefile \
    pkgsrc/mail/qremote/patches/patch-nacl-20110221_do \
    pkgsrc/mail/qremote/patches/patch-qmail-remote.c

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

Added files:

Index: pkgsrc/mail/qremote/DESCR
diff -u /dev/null pkgsrc/mail/qremote/DESCR:1.1
--- /dev/null   Mon Nov  2 10:24:58 2020
+++ pkgsrc/mail/qremote/DESCR   Mon Nov  2 10:24:58 2020
@@ -0,0 +1,7 @@
+qremote is an experimental drop-in replacement for qmail's qmail-remote
+with CurveCP support.
+
+qmail-qremote resolves IP addresses for SMTP server and then calls
+either tcpclient or qmail-curvecpclient for TCP or CurveCP connections,
+respectively. Once the connection is established, qmail-rsmtp executes
+to send mail via SMTP.
Index: pkgsrc/mail/qremote/Makefile
diff -u /dev/null pkgsrc/mail/qremote/Makefile:1.1
--- /dev/null   Mon Nov  2 10:24:58 2020
+++ pkgsrc/mail/qremote/Makefile        Mon Nov  2 10:24:58 2020
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.1 2020/11/02 10:24:58 schmonz Exp $
+
+DISTNAME=              qremote-20131231
+CATEGORIES=            mail
+MASTER_SITES=          ${HOMEPAGE}
+EXTRACT_SUFX=          .tar.bz2
+
+MAINTAINER=            schmonz%NetBSD.org@localhost
+HOMEPAGE=              https://mojzis.com/software/qremote/
+COMMENT=               Experimental qmail-remote replacement with CurveCP support
+LICENSE=               public-domain
+
+DEPENDS+=              {ucspi-tcp6-[0-9]*,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp
+
+DJB_RESTRICTED=                no
+
+USE_LANGUAGES=         c c++
+
+MAKE_JOBS_SAFE=                no
+
+BUILD_DEFS+=           QMAILDIR
+
+INSTALLATION_DIRS=     bin
+
+post-build:
+       cd ${WRKSRC} && ${MV} qmail-remote qmail-qremote
+
+do-install:
+       for i in qremote curvecpclient curvecpmessage rsmtp; do \
+         ${INSTALL_PROGRAM} ${WRKSRC}/qmail-$${i} ${DESTDIR}${PREFIX}/bin; \
+       done
+
+.include "../../mk/djbware.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/mail/qremote/PLIST
diff -u /dev/null pkgsrc/mail/qremote/PLIST:1.1
--- /dev/null   Mon Nov  2 10:24:58 2020
+++ pkgsrc/mail/qremote/PLIST   Mon Nov  2 10:24:58 2020
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1 2020/11/02 10:24:58 schmonz Exp $
+bin/qmail-curvecpclient
+bin/qmail-curvecpmessage
+bin/qmail-qremote
+bin/qmail-rsmtp
Index: pkgsrc/mail/qremote/distinfo
diff -u /dev/null pkgsrc/mail/qremote/distinfo:1.1
--- /dev/null   Mon Nov  2 10:24:58 2020
+++ pkgsrc/mail/qremote/distinfo        Mon Nov  2 10:24:58 2020
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1 2020/11/02 10:24:58 schmonz Exp $
+
+SHA1 (qremote-20131231.tar.bz2) = 4d47ac62f1d570b4229c6132f460f70001f244e9
+RMD160 (qremote-20131231.tar.bz2) = 770a685bd91a9392b9225cc19319a0354eff5ba4
+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

Index: pkgsrc/mail/qremote/patches/patch-Makefile
diff -u /dev/null pkgsrc/mail/qremote/patches/patch-Makefile:1.1
--- /dev/null   Mon Nov  2 10:24:58 2020
+++ pkgsrc/mail/qremote/patches/patch-Makefile  Mon Nov  2 10:24:58 2020
@@ -0,0 +1,20 @@
+$NetBSD: patch-Makefile,v 1.1 2020/11/02 10:24:58 schmonz Exp $
+
+Find binaries where we built them.
+
+--- 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`
+ 
+ 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
+ 
+ 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
Index: pkgsrc/mail/qremote/patches/patch-nacl-20110221_do
diff -u /dev/null pkgsrc/mail/qremote/patches/patch-nacl-20110221_do:1.1
--- /dev/null   Mon Nov  2 10:24:58 2020
+++ pkgsrc/mail/qremote/patches/patch-nacl-20110221_do  Mon Nov  2 10:24:58 2020
@@ -0,0 +1,27 @@
+$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
Index: pkgsrc/mail/qremote/patches/patch-qmail-remote.c
diff -u /dev/null pkgsrc/mail/qremote/patches/patch-qmail-remote.c:1.1
--- /dev/null   Mon Nov  2 10:24:58 2020
+++ pkgsrc/mail/qremote/patches/patch-qmail-remote.c    Mon Nov  2 10:24:58 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-qmail-remote.c,v 1.1 2020/11/02 10:24:58 schmonz Exp $
+
+The bundled tcpclient isn't special; use an installed one.
+
+--- 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
+         run[i++] = "-c";
+     }
+     else {
+-        run[i++] = "qmail-tcpclient";
++        run[i++] = "tcpclient";
+         run[i++] = "-T";
+         run[i++] = strtimeout;
+         run[i++] = "-HDRl0";