Source Mage code commit list

[Ismael Luceno <ismael AT iodev.co.uk>]

Shouldn't netqmail be moved to test grimoire too? or are (some of) the
patches non-free as well?

On 10/Jul/2021 19:35, Vlad Glagolev wrote:
> GIT changes to master z-rejected grimoire by Vlad Glagolev 
> <stealth AT sourcemage.org>:
> 
>  ChangeLog                             |    3 
>  z-mail/netqmail/CONFLICTS             |    4 
>  z-mail/netqmail/HISTORY               |    3 
>  z-mail/qmail/BUILD                    |    8 -
>  z-mail/qmail/CONFIGURE                |    3 
>  z-mail/qmail/CONFLICTS                |    5 -
>  z-mail/qmail/DEPENDS                  |    1 
>  z-mail/qmail/DETAILS                  |   53 ----------
>  z-mail/qmail/HISTORY                  |   14 --
>  z-mail/qmail/INSTALL                  |   16 ---
>  z-mail/qmail/PRE_BUILD                |   33 ------
>  z-mail/qmail/PROVIDES                 |    2 
>  z-mail/qmail/init.d/qmail             |   32 ------
>  z-mail/qmail/patches/local-bind       |  170 
> ----------------------------------
>  z-mail/qmail/patches/qmail-dns-patch  |   63 ------------
>  z-mail/qmail/patches/qmailqueue-patch |   72 --------------
>  z-mail/qmail/xinetd.d/qmail-smtpd     |   11 --
>  17 files changed, 9 insertions(+), 484 deletions(-)
> 
> New commits:
> commit 3d3da7257c9175b5ac3eaa7453e4a1c13606ae8b
> Author: Vlad Glagolev <stealth AT sourcemage.org>
> Commit: Vlad Glagolev <stealth AT sourcemage.org>
> 
>     qmail: removed duplicate spell (present in test grimoire)
> 
> commit 2ca00b59d4e2e0e30b4657bbbdc6cea42459afac
> Author: Vlad Glagolev <stealth AT sourcemage.org>
> Commit: Vlad Glagolev <stealth AT sourcemage.org>
> 
>     netqmail: conflicts with dma, ssmtp
> 
> diff --git a/ChangeLog b/ChangeLog
> index 017cc75..78fd01c 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,6 @@
> +2021-07-10 Vlad Glagolev <stealth AT sourcemage.org>
> +     * z-mail/qmail: removed duplicate spell (present in test grimoire)
> +
>  2021-02-03 Eric Sandall <sandalle AT sourcemage.org>
>       * z-java/jdk11-bin: Added JDK 11 spell
>  
> diff --git a/z-mail/netqmail/CONFLICTS b/z-mail/netqmail/CONFLICTS
> index 9421e67..8b169f3 100755
> --- a/z-mail/netqmail/CONFLICTS
> +++ b/z-mail/netqmail/CONFLICTS
> @@ -3,7 +3,9 @@ conflicts  courier    &&
>  conflicts  exim       &&
>  conflicts  esmtp      &&
>  conflicts  msmtp      &&
> +conflicts  ssmtp      &&
>  conflicts  qmail      &&
>  conflicts  sendmail   &&
>  conflicts  opensmtpd  &&
> -conflicts  postfix
> +conflicts  postfix    &&
> +conflicts  dma
> diff --git a/z-mail/netqmail/HISTORY b/z-mail/netqmail/HISTORY
> index fb5cd0f..9b01f78 100644
> --- a/z-mail/netqmail/HISTORY
> +++ b/z-mail/netqmail/HISTORY
> @@ -1,3 +1,6 @@
> +2021-07-10 Vlad Glagolev <stealth AT sourcemage.org>
> +     * CONFLICTS: conflicts with dma, ssmtp
> +
>  2015-07-02 Vlad Glagolev <stealth AT sourcemage.org>
>       * CONFLICTS: added opensmtpd
>  
> diff --git a/z-mail/qmail/BUILD b/z-mail/qmail/BUILD
> deleted file mode 100755
> index 31a255c..0000000
> --- a/z-mail/qmail/BUILD
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -echo  "gcc ${CFLAGS} -include /usr/include/errno.h"  >conf-cc  &&
> -echo  "gcc ${LDFLAGS}"                               >conf-ld  &&
> -
> -make  &&
> -
> -if  is_depends_enabled  $SPELL  groff;  then
> -  make man
> -fi
> diff --git a/z-mail/qmail/CONFIGURE b/z-mail/qmail/CONFIGURE
> deleted file mode 100755
> index 4aad3da..0000000
> --- a/z-mail/qmail/CONFIGURE
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -config_query  QMAIL_PATCH_QMAILQUEUE  "Apply the qmailqueue patch?"    n  
> &&
> -config_query  QMAIL_PATCH_LOCALBIND   "Apply the local-bind patch?"    n  
> &&
> -config_query  QMAIL_PATCH_OVERSIZEDNS "Apply the oversize DNS patch?"  n
> diff --git a/z-mail/qmail/CONFLICTS b/z-mail/qmail/CONFLICTS
> deleted file mode 100755
> index 3c0a6f0..0000000
> --- a/z-mail/qmail/CONFLICTS
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -conflicts  masqmail   &&
> -conflicts  exim       &&
> -conflicts  netqmail   &&
> -conflicts  sendmail   &&
> -conflicts  postfix
> diff --git a/z-mail/qmail/DEPENDS b/z-mail/qmail/DEPENDS
> deleted file mode 100755
> index 04a8b8a..0000000
> --- a/z-mail/qmail/DEPENDS
> +++ /dev/null
> @@ -1 +0,0 @@
> -optional_depends  groff  ""  ""  "to build man pages"
> diff --git a/z-mail/qmail/DETAILS b/z-mail/qmail/DETAILS
> deleted file mode 100755
> index c2744eb..0000000
> --- a/z-mail/qmail/DETAILS
> +++ /dev/null
> @@ -1,53 +0,0 @@
> -           SPELL=qmail
> -         VERSION=1.03
> -          SOURCE=$SPELL-$VERSION.tar.gz
> -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
> -   SOURCE_URL[0]=http://cr.yp.to/software/$SOURCE
> -   
> SOURCE_URL[1]=ftp://ftp.net.ohio-state.edu/pub/networking/mail/qmail/$SOURCE
> -   SOURCE_URL[2]=ftp://ftp.ntnu.no/pub/unix/mail/qmail/$SOURCE
> -   SOURCE_URL[3]=ftp://ftp.eu.uu.net/pub/unix/mail/qmail/$SOURCE
> -   SOURCE_URL[4]=ftp://ftp.jp.qmail.org/qmail/$SOURCE
> -        WEB_SITE=http://cr.yp.to/qmail.html
> -         ENTERED=20051013
> -     
> SOURCE_HASH=sha512:f2cc47c3ef4a3595d5953f216811a9b60f505cf8cbfd31ae31a888ee04916936210ef1c23d59e8d280a5f0e1c3794b90ee212b2b0f36361c5eff842598c8aee2
> -      LICENSE[0]=http://cr.yp.to/qmail/dist.html
> -      LICENSE[1]=http://cr.yp.to/softwarelaw.html
> -          REJECT="has license issues"
> -           SHORT="Qmail Mail Transfer Agent"
> -           DOCS="$DOCS BLURB* INSTALL* INTERNALS PIC.* REMOVE.* SECURITY 
> SENDMAIL TEST.* THANKS THOUGHTS"
> -cat << EOF
> -qmail is a secure, reliable, efficient, simple message transfer agent. It 
> is
> -designed for typical Internet-connected UNIX hosts.
> -
> -Secure: Security isn't just a goal, but an absolute requirement. Mail 
> delivery
> -is critical for users; it cannot be turned off, so it must be completely
> -secure.
> -
> -Reliable: qmail's straight-paper-path philosophy guarantees that a message,
> -once accepted into the system, will never be lost. qmail also optionally
> -supports maildir.
> -
> -Efficient: On a Pentium under BSD/OS, qmail can easily sustain 200000 local
> -messages per day.
> -
> -Simple: qmail is vastly smaller than any other Internet MTA. Some reasons 
> why:
> -(1) Other MTAs have separate forwarding, aliasing, and mailing list 
> mechanisms.
> -qmail has one simple forwarding mechanism that lets users handle their own
> -mailing lists. (2) Other MTAs offer a spectrum of delivery modes, from
> -fast+unsafe to slow+queued. qmail-send is instantly triggered by new items 
> in
> -the queue, so the qmail system has just one delivery mode: fast+queued. (3)
> -Other MTAs include, in effect, a specialized version of inetd that watches 
> the
> -load average. qmail's design inherently limits the machine load, so 
> qmail-smtpd
> -can safely run from your system's inetd.
> -
> -Replacement for sendmail: qmail supports host and user masquerading, full 
> host
> -hiding, virtual domains, null clients, list-owner rewriting, relay control,
> -double-bounce recording, arbitrary RFC 822 address lists, cross-host 
> mailing
> -list loop detection, per-recipient checkpointing, downed host backoffs,
> -independent message retry schedules, etc. qmail also includes a drop-in
> -"sendmail" wrapper so that it will be used transparently by your current 
> UAs.
> -
> -NOTE: This spell installs according to DJB's required default paths.  
> Also, it
> -runs via regular init.d, with smtp provided by xinetd.  It does not yet
> -automatically configure itself for daemontools or ucspi-tcp.
> -EOF
> diff --git a/z-mail/qmail/HISTORY b/z-mail/qmail/HISTORY
> deleted file mode 100644
> index f8ced40..0000000
> --- a/z-mail/qmail/HISTORY
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
> -     * CONFLICTS: added masqmail
> -
> -2007-04-07 Jeremy Blosser <jblosser-smgl AT firinn.org>
> -     * CONFIGURE, PRE_BUILD, patches/qmail-dns-patch: Add oversized DNS
> -       response patch.
> -
> -2007-04-01 Jeremy Blosser <jblosser-smgl AT firinn.org>
> -     * CONFLICTS: Add.
> -     * DEPENDS, PRE_BUILD, BUILD: Make groff dependency / man pages
> -       optional.
> -
> -2007-04-01 Jeremy Blosser <jblosser-smgl AT firinn.org>
> -     * ALL: Initial spell commit.
> diff --git a/z-mail/qmail/INSTALL b/z-mail/qmail/INSTALL
> deleted file mode 100755
> index b01b9da..0000000
> --- a/z-mail/qmail/INSTALL
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -./install    &&
> -./instcheck  &&
> -
> -# TODO: Update CONFIGURE to prompt for host names and use 
> install_config_file
> -# here
> -if  [  !  -s  $INSTALL_ROOT/var/qmail/control/me  ];  then
> -  ./config-fast `hostname --fqdn`
> -fi  &&
> -
> -(cd ~alias; touch .qmail-postmaster .qmail-mailer-daemon .qmail-root)  &&
> -chmod 644 ~alias/.qmail*  &&
> -
> -ln -sf /var/qmail/bin/sendmail /usr/lib/sendmail   &&
> -ln -sf /var/qmail/bin/sendmail /usr/sbin/sendmail  &&
> -
> -cp /var/qmail/boot/home /var/qmail/rc
> diff --git a/z-mail/qmail/PRE_BUILD b/z-mail/qmail/PRE_BUILD
> deleted file mode 100755
> index bac5961..0000000
> --- a/z-mail/qmail/PRE_BUILD
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -default_pre_build     &&
> -cd $SOURCE_DIRECTORY  &&
> -
> -if  [  "$QMAIL_PATCH_QMAILQUEUE"  ==  "y"  ];  then
> -  patch -p1 <$SCRIPT_DIRECTORY/patches/qmailqueue-patch
> -fi  &&
> -if  [  "$QMAIL_PATCH_LOCALBIND"  ==  "y"  ];  then
> -  patch -p0 <$SCRIPT_DIRECTORY/patches/local-bind
> -fi  &&
> -if  [  "$QMAIL_PATCH_OVERSIZEDNS"  ==  "y"  ];  then
> -  patch -p1 <$SCRIPT_DIRECTORY/patches/qmail-dns-patch
> -fi  &&
> -
> -if  !  is_depends_enabled  $SPELL  groff;  then
> -  sed  -i  -e  '/auto_qmail,"man\//d'  hier.c  &&
> -  sed  -i  -e  '/auto_qmail,"man\//d'  install-big.c
> -fi  &&
> -
> -mkdir  -p  /var/qmail  &&
> -
> -create_account  alias   /var/qmail/alias  /bin/false  &&
> -create_account  qmaild  /var/qmail        /bin/false  &&
> -create_account  qmaill  /var/qmail        /bin/false  &&
> -create_account  qmailp  /var/qmail        /bin/false  &&
> -create_account  qmailq  /var/qmail        /bin/false  &&
> -create_account  qmailr  /var/qmail        /bin/false  &&
> -create_account  qmails  /var/qmail        /bin/false  &&
> -
> -sedit '/echo Putting "$fqdn" into control\/locals.../i  \
> -echo Putting `hostname --short` into control/defaulthost... \
> -hostname --short > /var/qmail/control/defaulthost \
> -chmod 644 QMAIL/control/defaulthost
> -' config-fast.sh
> diff --git a/z-mail/qmail/PROVIDES b/z-mail/qmail/PROVIDES
> deleted file mode 100755
> index bebbaa4..0000000
> --- a/z-mail/qmail/PROVIDES
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -MAIL-TRANSPORT-AGENT
> -SENDMAIL
> diff --git a/z-mail/qmail/init.d/qmail b/z-mail/qmail/init.d/qmail
> deleted file mode 100644
> index 4820461..0000000
> --- a/z-mail/qmail/init.d/qmail
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -#!/bin/bash
> -
> -NAME=qmail-send
> -PROGRAM=/var/qmail/bin/qmail-send
> -RUNLEVEL=3
> -NEEDS="+network +remote_fs"
> -
> -. /etc/init.d/smgl_init
> -
> -loadproc()
> -{
> -  if [ $# = 0 ] ; then
> -    echo "Usage: loadproc {program}"
> -    exit 1
> -  fi
> -
> -  getpids $1
> -
> -  if [ -z "$pidlist" ] ; then
> -    ( unset -f echo ; exec "$@" & )
> -    evaluate_retval
> -  else
> -    $SET_WCOL
> -    print_status warning running
> -  fi
> -}
> -
> -start()
> -{
> -  echo "Starting $NAME..."
> -  loadproc /var/qmail/rc
> -}
> diff --git a/z-mail/qmail/patches/local-bind 
> b/z-mail/qmail/patches/local-bind
> deleted file mode 100644
> index 9a9b84b..0000000
> --- a/z-mail/qmail/patches/local-bind
> +++ /dev/null
> @@ -1,170 +0,0 @@
> -From: Chuck Foster <Chuck.Foster AT uk.uu.net>
> -To: djb-qmail AT koobera.math.uic.edu
> -Subject: binding to local interfaces
> -Date: Mon, 19 Jan 1998 09:40:42 +0000 (GMT)
> -
> -Hi,
> -
> -Well it finally reached the stage where I needed to do this on one of our
> -hosts, as I wanted mail to go out using the virtual interface ip address
> -and not the default one. (sigh).
> -
> -Anyways, if anyone thinks they'll have a use for it, I've included the
> -patch to timeoutconn.c to bind to the interface, and an optional
> -qmail-remote.c patch to print errors returned from it (if you don't use
> -that then the 'standard' SMTP connection failed message gets used).
> -
> -I used a file called /var/qmail/control/bindroutes, using the same
> -ip-address matching as tcpcontrol, ie. 1.2.3.4, 1.2.3., 1.2., 1., none.
> -The LHS is the outbound IP (ie. the host you're going to), and the RHS
> -is the interface on the local machine to bind to (ie. needs to be
> -valid on the host).
> -
> -Eg.
> -
> -# Send this on the internal net
> -10.:10.0.0.1
> -# Rest goes on external "mail" address (yes, its bogus!)
> -:301.32.1.1
> -# Hey, we could 'cheat' on stopping qmail-remote sending to this host
> -555.123.123.123:this-isnt-an-ip-address
> -
> -The define should be either 0 or 1; 0 means if the bind() fails then go
> -ahead and connect() with the os bind; 1 means that a temp error is
> -generated and the mail requeued.
> -
> -
> -As usual, if you use these patches yourself it's at your own risk; all
> -seems to work fine on my (Solaris 2.5.1) boxes, but if something busts cos
> -you've used them then you're on your own (but feel free to tell me!).
> -
> -C.
> -
> -From: Bill Nugent <whn AT topelo.lopi.com>
> -To: Chuck.Fostera AT auk.uu.net
> -cc: nelson AT qmail.org
> -Subject: Updated your local bind patch for qmail 1.03
> -Date: Tue, 08 Sep 1998 10:10:15 -0400
> -
> -Howdy Chuck,
> -
> -I had some minor trouble compiling your local bind patch for qmail 1.03 - 
> -I had to make a change to the Makefile in addition to applying your patch 
> -to timeoutconn.c.  I've enclosed the diff of the Makefile.  It will be a 
> -few days before I have a chance to test the change.
> -
> -     Thanks for the patch!
> -     Bill
> -
> -
> -*** timeoutconn.c    1998/01/18 12:52:28     1.1
> ---- timeoutconn.c    1998/01/19 09:29:57
> -***************
> -*** 10,15 ****
> ---- 10,63 ----
> -  #include "byte.h"
> -  #include "timeoutconn.h"
> -  
> -+ #define BIND_SOCKET 1 /* 0 to ignore bind fail, 1 to tempfail and 
> requeue */
> -+ #ifdef BIND_SOCKET
> -+ #include "control.h"
> -+ #include "constmap.h"
> -+ #include "stralloc.h"
> -+ 
> -+ int bind_socket(s,ip)
> -+ int s;
> -+ struct ip_address *ip;
> -+ {
> -+   struct sockaddr_in salocal;
> -+   struct ip_address iplocal;
> -+   char *ipstr, ipstring[IPFMT+1];
> -+   int iplen;
> -+   stralloc routes = {0};
> -+   struct constmap bindroutes;
> -+   char *bindroute = (char *)0;
> -+ 
> -+   /* Right, do we actually have any bind routes? */
> -+   switch(control_readfile(&routes,"control/bindroutes",0))
> -+    {
> -+     case 0: return 0; /* no file, no bind to worry about */
> -+     case -1: return -2; /* buggered up somewhere, urgh! */
> -+     case 1: if (!constmap_init(&bindroutes,routes.s,routes.len,1)) 
> return -3;
> -+    }
> -+ 
> -+   ipstring[0] = '.'; /* "cheating", but makes the loop check easier 
> below! */
> -+   ipstr = ipstring+1;
> -+   iplen = ip_fmt(ipstr,ip); /* Well, Dan seems to trust its output! */
> -+ 
> -+   /* check d.d.d.d, d.d.d., d.d., d., none */
> -+   bindroute = constmap(&bindroutes,ipstr,iplen);
> -+   if (!bindroute) while (iplen--)  /* no worries - the lost char must be 
> 0-9 */
> -+     if (ipstring[iplen] == '.') 
> -+       if (bindroute = constmap(&bindroutes,ipstr,iplen)) break;
> -+   if (!bindroute || !*bindroute) return 0; /* no bind required */
> -+   if (!ip_scan(bindroute,&iplocal)) return -4; /* wasn't an ip returned 
> */
> -+ 
> -+   byte_zero(&salocal,sizeof(salocal));
> -+   salocal.sin_family = AF_INET;
> -+   byte_copy(&salocal.sin_addr,4,&iplocal);
> -+ 
> -+   if (bind(s, (struct sockaddr *)&salocal,sizeof(salocal))) return 
> BIND_SOCKET;
> -+   return 0;
> -+ }
> -+ 
> -+ #endif
> -+ 
> -  int timeoutconn(s,ip,port,timeout)
> -  int s;
> -  struct ip_address *ip;
> -***************
> -*** 31,36 ****
> ---- 79,87 ----
> -    if (ndelay_on(s) == -1) return -1;
> -   
> -    /* XXX: could bind s */
> -+ #ifdef BIND_SOCKET
> -+   if (ch = bind_socket(s,ip)) return ch;
> -+ #endif
> -   
> -    if (connect(s,(struct sockaddr *) &sin,sizeof(sin)) == 0) {
> -      ndelay_off(s);
> ---- Makefile.orig       Mon Sep  7 20:44:52 1998
> -+++ Makefile    Mon Sep  7 21:04:33 1998
> -@@ -1333,10 +1333,12 @@
> -
> - qmail-qmqpc: \
> - load qmail-qmqpc.o slurpclose.o timeoutread.o timeoutwrite.o \
> --timeoutconn.o ip.o control.o auto_qmail.o sig.a ndelay.a open.a \
> --getln.a substdio.a stralloc.a alloc.a error.a str.a fs.a socket.lib
> -+timeoutconn.o constmap.o  case_diffb.o ip.o control.o auto_qmail.o \
> -+sig.a ndelay.a open.a getln.a substdio.a stralloc.a alloc.a error.a \
> -+str.a fs.a socket.lib
> -     ./load qmail-qmqpc slurpclose.o timeoutread.o \
> --    timeoutwrite.o timeoutconn.o ip.o control.o auto_qmail.o \
> -+    timeoutwrite.o timeoutconn.o constmap.o case_diffb.o \
> -+    ip.o control.o auto_qmail.o \
> -     sig.a ndelay.a open.a getln.a substdio.a stralloc.a alloc.a \
> -     error.a str.a fs.a  `cat socket.lib`
> -
> -@@ -2066,12 +2068,14 @@
> -
> - tcp-env: \
> - load tcp-env.o dns.o remoteinfo.o timeoutread.o timeoutwrite.o \
> --timeoutconn.o ip.o ipalloc.o case.a ndelay.a sig.a env.a getopt.a \
> --stralloc.a alloc.a substdio.a error.a str.a fs.a dns.lib socket.lib
> -+timeoutconn.o constmap.o control.o ip.o ipalloc.o case.a open.a \
> -+getln.a ndelay.a sig.a env.a getopt.a stralloc.a alloc.a \
> -+substdio.a error.a str.a fs.a dns.lib socket.lib
> -     ./load tcp-env dns.o remoteinfo.o timeoutread.o \
> --    timeoutwrite.o timeoutconn.o ip.o ipalloc.o case.a ndelay.a \
> --    sig.a env.a getopt.a stralloc.a alloc.a substdio.a error.a \
> --    str.a fs.a  `cat dns.lib` `cat socket.lib`
> -+    timeoutwrite.o timeoutconn.o constmap.o control.o ip.o ipalloc.o \
> -+    case.a open.a getln.a ndelay.a sig.a env.a getopt.a stralloc.a \
> -+    alloc.a substdio.a error.a str.a fs.a \
> -+    `cat dns.lib` `cat socket.lib`
> -
> - tcp-env.0: \
> - tcp-env.1
> -
> -
> diff --git a/z-mail/qmail/patches/qmail-dns-patch 
> b/z-mail/qmail/patches/qmail-dns-patch
> deleted file mode 100644
> index 60f7641..0000000
> --- a/z-mail/qmail/patches/qmail-dns-patch
> +++ /dev/null
> @@ -1,63 +0,0 @@
> ---- qmail-1.03/dns.c.103        Mon Aug 17 16:06:58 1998
> -+++ qmail-1.03/dns.c    Wed Aug 26 16:28:56 1998
> -@@ -21,10 +21,12 @@
> - static unsigned short getshort(c) unsigned char *c;
> - { unsigned short u; u = c[0]; return (u << 8) + c[1]; }
> - 
> --static union { HEADER hdr; unsigned char buf[PACKETSZ]; } response;
> -+static struct { unsigned char *buf; } response;
> -+static int responsebuflen = 0;
> - static int responselen;
> - static unsigned char *responseend;
> - static unsigned char *responsepos;
> -+static u_long saveresoptions;
> - 
> - static int numanswers;
> - static char name[MAXDNAME];
> -@@ -45,18 +47,33 @@
> -  errno = 0;
> -  if (!stralloc_copy(&glue,domain)) return DNS_MEM;
> -  if (!stralloc_0(&glue)) return DNS_MEM;
> -- responselen = lookup(glue.s,C_IN,type,response.buf,sizeof(response));
> -+ if (!responsebuflen)
> -+  if (response.buf = (unsigned char *)alloc(PACKETSZ+1))
> -+   responsebuflen = PACKETSZ+1;
> -+  else return DNS_MEM;
> -+
> -+ responselen = lookup(glue.s,C_IN,type,response.buf,responsebuflen);
> -+ if ((responselen >= responsebuflen) ||
> -+     (responselen > 0 && (((HEADER *)response.buf)->tc)))
> -+  {
> -+   if (responsebuflen < 65536)
> -+    if (alloc_re(&response.buf, responsebuflen, 65536))
> -+     responsebuflen = 65536;
> -+    else return DNS_MEM;
> -+    saveresoptions = _res.options;
> -+    _res.options |= RES_USEVC;
> -+    responselen = lookup(glue.s,C_IN,type,response.buf,responsebuflen);
> -+    _res.options = saveresoptions;
> -+  }
> -  if (responselen <= 0)
> -   {
> -    if (errno == ECONNREFUSED) return DNS_SOFT;
> -    if (h_errno == TRY_AGAIN) return DNS_SOFT;
> -    return DNS_HARD;
> -   }
> -- if (responselen >= sizeof(response))
> --   responselen = sizeof(response);
> -  responseend = response.buf + responselen;
> -  responsepos = response.buf + sizeof(HEADER);
> -- n = ntohs(response.hdr.qdcount);
> -+ n = ntohs(((HEADER *)response.buf)->qdcount);
> -  while (n-- > 0)
> -   {
> -    i = dn_expand(response.buf,responseend,responsepos,name,MAXDNAME);
> -@@ -66,7 +83,7 @@
> -    if (i < QFIXEDSZ) return DNS_SOFT;
> -    responsepos += QFIXEDSZ;
> -   }
> -- numanswers = ntohs(response.hdr.ancount);
> -+ numanswers = ntohs(((HEADER *)response.buf)->ancount);
> -  return 0;
> - }
> - 
> diff --git a/z-mail/qmail/patches/qmailqueue-patch 
> b/z-mail/qmail/patches/qmailqueue-patch
> deleted file mode 100644
> index ec304b6..0000000
> --- a/z-mail/qmail/patches/qmailqueue-patch
> +++ /dev/null
> @@ -1,72 +0,0 @@
> -From: Bruce Guenter <bguenter-djb-qmail AT qcc.sk.ca>
> -To: qmail AT list.cr.yp.to
> -Subject: QMAILQUEUE patch for qmail-1.03
> -Date: Mon, 25 Jan 1999 15:37:21 -0600
> -
> -Greetings.
> -
> -Appended is a patch to qmail-1.03 that causes any program that would run
> -qmail-queue to look for an environment variable QMAILQUEUE.  If it is
> -present, it is used in place of the string "bin/qmail-queue" when
> -running qmail-queue.  This could be used, for example, to add a program
> -into the qmail-smtpd->qmail-queue pipeline that could do filtering,
> -rewrite broken headers, etc. (this is my planned usage for it).
> -
> -This has undergone virtually no testing, but it looks so simple that it
> -almost has to be correct.  No warranties, etc.  Note that the chdir to
> -/var/qmail is always done before exec'ing the program.
> -
> -Does this look like a reasonable thing to do?
> --- 
> -Bruce Guenter, QCC Communications Corp.  EMail: bruce.guenter AT qcc.sk.ca
> -Phone: (306)249-0220               WWW: http://www.qcc.sk.ca/~bguenter/
> -
> -diff -u qmail-1.03-orig/Makefile qmail-1.03/Makefile
> ---- qmail-1.03-orig/Makefile Mon Jun 15 04:53:16 1998
> -+++ qmail-1.03/Makefile      Tue Jan 19 10:52:24 1999
> -@@ -1483,12 +1483,12 @@
> - trigger.o fmtqfn.o quote.o now.o readsubdir.o qmail.o date822fmt.o \
> - datetime.a case.a ndelay.a getln.a wait.a seek.a fd.a sig.a open.a \
> - lock.a stralloc.a alloc.a substdio.a error.a str.a fs.a auto_qmail.o \
> --auto_split.o
> -+auto_split.o env.a
> -     ./load qmail-send qsutil.o control.o constmap.o newfield.o \
> -     prioq.o trigger.o fmtqfn.o quote.o now.o readsubdir.o \
> -     qmail.o date822fmt.o datetime.a case.a ndelay.a getln.a \
> -     wait.a seek.a fd.a sig.a open.a lock.a stralloc.a alloc.a \
> --    substdio.a error.a str.a fs.a auto_qmail.o auto_split.o 
> -+    substdio.a error.a str.a fs.a auto_qmail.o auto_split.o env.a
> - 
> - qmail-send.0: \
> - qmail-send.8
> -diff -u qmail-1.03-orig/qmail.c qmail-1.03/qmail.c
> ---- qmail-1.03-orig/qmail.c  Mon Jun 15 04:53:16 1998
> -+++ qmail-1.03/qmail.c       Tue Jan 19 09:57:36 1999
> -@@ -6,14 +6,25 @@
> - #include "fd.h"
> - #include "qmail.h"
> - #include "auto_qmail.h"
> -+#include "env.h"
> - 
> --static char *binqqargs[2] = { "bin/qmail-queue", 0 } ;
> -+static char *binqqargs[2] = { 0, 0 } ;
> -+
> -+static void setup_qqargs()
> -+{
> -+  if(!binqqargs[0])
> -+    binqqargs[0] = env_get("QMAILQUEUE");
> -+  if(!binqqargs[0])
> -+    binqqargs[0] = "bin/qmail-queue";
> -+}
> - 
> - int qmail_open(qq)
> - struct qmail *qq;
> - {
> -   int pim[2];
> -   int pie[2];
> -+
> -+  setup_qqargs();
> - 
> -   if (pipe(pim) == -1) return -1;
> -   if (pipe(pie) == -1) { close(pim[0]); close(pim[1]); return -1; }
> -
> diff --git a/z-mail/qmail/xinetd.d/qmail-smtpd 
> b/z-mail/qmail/xinetd.d/qmail-smtpd
> deleted file mode 100644
> index 6a983ef..0000000
> --- a/z-mail/qmail/xinetd.d/qmail-smtpd
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -service smtp
> -{
> -    socket_type             = stream
> -    protocol                = tcp
> -    wait                    = no
> -    user                    = qmaild
> -    server                  = /var/qmail/bin/tcp-env
> -    server_args             = /var/qmail/bin/qmail-smtpd
> -    log_on_success          = PID HOST USERID EXIT DURATION
> -    log_on_failure          = HOST USERID ATTEMPT
> -}
> _______________________________________________
> SM-Commit mailing list
> SM-Commit AT lists.ibiblio.org
> https://lists.ibiblio.org/mailman/listinfo/sm-commit

-- 
Ismael Luceno
http://iodev.co.uk/