Merge pull request #3792 from hadfl/7zip

7zip: fix build

build/7zip/build.sh

@@ -45,7 +45,7 @@ pre_configure() {
             # we would need either `asmc` or `uasm`. For now, use
             # plain `gcc` which skips the assembly.
             tmpl=gcc
-            odir=b
+            odir=g
             ;;
         aarch64)
             # On the other hand, in aarch64 we /can/ use the optimised

build/dma/build.sh

@@ -17,7 +17,7 @@
 . ../../lib/build.sh
 
 PROG=dma
-VER=0.13
+VER=0.14
 PKG=service/network/smtp/dma
 SUMMARY="The DragonFly Mail Agent"
 DESC="A small lightweight Mail Transport Agent (MTA)"

build/dma/patches/closefrom.patch

@@ -2,7 +2,7 @@
 A user reported DMA spinning closing millions of file descriptors when
 attempting to create a mailbox.
 
-diff -wpruN '--exclude=*.orig' a~/local.c a/local.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/local.c a/local.c
 --- a~/local.c	1970-01-01 00:00:00
 +++ a/local.c	1970-01-01 00:00:00
 @@ -75,12 +75,16 @@ create_mbox(const char *name)
@@ -20,5 +20,5 @@ diff -wpruN '--exclude=*.orig' a~/local.c a/local.c
 +		closefrom(3);
 +#endif
 
- 		execl(LIBEXEC_PATH "/dma-mbox-create", "dma-mbox-create", name, NULL);
+ 		execl(LIBEXEC_PATH "/dma-mbox-create", "dma-mbox-create", name, (char *)NULL);
  		syslog(LOG_ERR, "cannot execute "LIBEXEC_PATH"/dma-mbox-create: %m");

build/dma/patches/dma-illumos-port.patch

@@ -4,7 +4,7 @@ Date:   Fri Feb 5 17:18:53 2016 -0500
 
     Port DMA to illumos
 
-diff -wpruN '--exclude=*.orig' a~/Makefile a/Makefile
+diff -wpruN --no-dereference '--exclude=*.orig' a~/Makefile a/Makefile
 --- a~/Makefile	1970-01-01 00:00:00
 +++ a/Makefile	1970-01-01 00:00:00
 @@ -50,8 +50,8 @@ clean:
@@ -48,10 +48,10 @@ diff -wpruN '--exclude=*.orig' a~/Makefile a/Makefile
  	fi
 
  aliases_parse.c: aliases_parse.y
-diff -wpruN '--exclude=*.orig' a~/crypto.c a/crypto.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/crypto.c a/crypto.c
 --- a~/crypto.c	1970-01-01 00:00:00
 +++ a/crypto.c	1970-01-01 00:00:00
-@@ -256,10 +256,10 @@ hmac_md5(unsigned char *text, int text_l
+@@ -330,10 +330,10 @@ hmac_md5(unsigned char *text, int text_l
           */
 
          /* start out by storing key in pads */
@@ -66,18 +66,18 @@ diff -wpruN '--exclude=*.orig' a~/crypto.c a/crypto.c
 
          /* XOR key with ipad and opad values */
          for (i=0; i<64; i++) {
-diff -wpruN '--exclude=*.orig' a~/dma.8 a/dma.8
+diff -wpruN --no-dereference '--exclude=*.orig' a~/dma.8 a/dma.8
 --- a~/dma.8	1970-01-01 00:00:00
 +++ a/dma.8	1970-01-01 00:00:00
-@@ -340,7 +340,6 @@ config file setting or the
+@@ -348,7 +348,6 @@ config file setting or the
  flag is used.
  .El
  .Sh SEE ALSO
 -.Xr mailaddr 7 ,
  .Xr mailwrapper 8 ,
  .Xr sendmail 8
  .Rs
-@@ -358,11 +357,6 @@ flag is used.
+@@ -366,11 +365,6 @@ flag is used.
  .%T "SMTP Service Extension for Secure SMTP over TLS"
  .%O RFC 2487
  .Re
@@ -89,7 +89,7 @@ diff -wpruN '--exclude=*.orig' a~/dma.8 a/dma.8
  .Sh AUTHORS
  .An -nosplit
  .Nm
-diff -wpruN '--exclude=*.orig' a~/dma.c a/dma.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/dma.c a/dma.c
 --- a~/dma.c	1970-01-01 00:00:00
 +++ a/dma.c	1970-01-01 00:00:00
 @@ -96,7 +96,7 @@ sighup_handler(int signo)
@@ -100,8 +100,8 @@ diff -wpruN '--exclude=*.orig' a~/dma.c a/dma.c
 +set_from(struct dma_queue *queue, const char *osender)
  {
  	const char *addr;
- 	char *sender;
-@@ -154,7 +154,7 @@ read_aliases(void)
+ 	const char *from_user = NULL;
+@@ -181,7 +181,7 @@ read_aliases(void)
  }
 
  static int
@@ -110,7 +110,7 @@ diff -wpruN '--exclude=*.orig' a~/dma.c a/dma.c
  {
  	struct alias *al;
          struct stritem *sit;
-@@ -174,7 +174,7 @@ do_alias(struct queue *queue, const char
+@@ -201,7 +201,7 @@ do_alias(struct queue *queue, const char
  }
 
  int
@@ -119,7 +119,7 @@ diff -wpruN '--exclude=*.orig' a~/dma.c a/dma.c
  {
  	struct qitem *it, *tit;
  	struct passwd *pw;
-@@ -241,7 +241,7 @@ out:
+@@ -268,7 +268,7 @@ out:
  }
 
  static struct qitem *
@@ -128,7 +128,7 @@ diff -wpruN '--exclude=*.orig' a~/dma.c a/dma.c
  {
  	struct sigaction sa;
  	struct qitem *it;
-@@ -253,7 +253,7 @@ go_background(struct queue *queue)
+@@ -280,7 +280,7 @@ go_background(struct queue *queue)
  	}
  	daemonize = 0;
 
@@ -137,7 +137,7 @@ diff -wpruN '--exclude=*.orig' a~/dma.c a/dma.c
  	sa.sa_handler = SIG_IGN;
  	sigaction(SIGCHLD, &sa, NULL);
 
-@@ -373,7 +373,7 @@ bounce:
+@@ -400,7 +400,7 @@ bounce:
  }
 
  void
@@ -146,7 +146,7 @@ diff -wpruN '--exclude=*.orig' a~/dma.c a/dma.c
  {
  	struct qitem *it;
 
-@@ -386,7 +386,7 @@ run_queue(struct queue *queue)
+@@ -413,7 +413,7 @@ run_queue(struct queue *queue)
  }
 
  static void
@@ -155,28 +155,28 @@ diff -wpruN '--exclude=*.orig' a~/dma.c a/dma.c
  {
  	struct qitem *it;
  	int locked = 0;	/* XXX */
-@@ -422,7 +422,7 @@ main(int argc, char **argv)
- {
+@@ -450,7 +450,7 @@ main(int argc, char **argv)
  	struct sigaction act;
  	char *sender = NULL;
+ 	char *own_name = NULL;
 -	struct queue queue;
 +	struct dma_queue queue;
  	int i, ch;
- 	int nodot = 0, showq = 0, queue_only = 0;
+ 	int nodot = 0, showq = 0, queue_only = 0, newaliases = 0;
  	int recp_from_header = 0;
-@@ -455,7 +455,7 @@ main(int argc, char **argv)
+@@ -483,7 +483,7 @@ main(int argc, char **argv)
  	atexit(deltmp);
  	init_random();
 
 -	bzero(&queue, sizeof(queue));
 +	memset(&queue, 0, sizeof (queue));
  	LIST_INIT(&queue.queue);
 
- 	if (strcmp(basename(argv[0]), "mailq") == 0) {
-diff -wpruN '--exclude=*.orig' a~/dma.h a/dma.h
+ 	own_name = basename(argv[0]);
+diff -wpruN --no-dereference '--exclude=*.orig' a~/dma.h a/dma.h
 --- a~/dma.h	1970-01-01 00:00:00
 +++ a/dma.h	1970-01-01 00:00:00
-@@ -82,7 +82,7 @@
+@@ -83,7 +83,7 @@
  #define SPOOL_FLUSHFILE	"flush"
 
  #ifndef DMA_ROOT_USER
@@ -185,7 +185,7 @@ diff -wpruN '--exclude=*.orig' a~/dma.h a/dma.h
  #endif
  #ifndef DMA_GROUP
  #define DMA_GROUP	"mail"
-@@ -119,7 +119,7 @@ struct qitem {
+@@ -120,7 +120,7 @@ struct qitem {
  };
  LIST_HEAD(queueh, qitem);
 
@@ -194,7 +194,7 @@ diff -wpruN '--exclude=*.orig' a~/dma.h a/dma.h
  	struct queueh queue;
  	char *id;
  	FILE *mailf;
-@@ -217,16 +217,16 @@ int base64_decode(const char *, void *);
+@@ -218,16 +218,16 @@ int base64_decode(const char *, void *);
  /* dma.c */
  #define EXPAND_ADDR	1
  #define EXPAND_WILDCARD	2
@@ -217,7 +217,7 @@ diff -wpruN '--exclude=*.orig' a~/dma.h a/dma.h
  int flushqueue_since(unsigned int);
  int flushqueue_signal(void);
 
-@@ -235,7 +235,7 @@ int deliver_local(struct qitem *);
+@@ -236,7 +236,7 @@ int deliver_local(struct qitem *);
 
  /* mail.c */
  void bounce(struct qitem *, const char *);
@@ -226,7 +226,7 @@ diff -wpruN '--exclude=*.orig' a~/dma.h a/dma.h
 
  /* util.c */
  const char *hostname(void);
-diff -wpruN '--exclude=*.orig' a~/dns.c a/dns.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/dns.c a/dns.c
 --- a~/dns.c	1970-01-01 00:00:00
 +++ a/dns.c	1970-01-01 00:00:00
 @@ -44,6 +44,10 @@
@@ -249,7 +249,7 @@ diff -wpruN '--exclude=*.orig' a~/dns.c a/dns.c
 
  		getnameinfo((struct sockaddr *)&p->sa, p->ai.ai_addrlen,
  			    p->addr, sizeof(p->addr),
-diff -wpruN '--exclude=*.orig' a~/local.c a/local.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/local.c a/local.c
 --- a~/local.c	1970-01-01 00:00:00
 +++ a/local.c	1970-01-01 00:00:00
 @@ -65,7 +65,7 @@ create_mbox(const char *name)
@@ -261,7 +261,7 @@ diff -wpruN '--exclude=*.orig' a~/local.c a/local.c
  	sa.sa_handler = SIG_DFL;
  	sigaction(SIGCHLD, &sa, &osa);
 
-diff -wpruN '--exclude=*.orig' a~/mail.c a/mail.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/mail.c a/mail.c
 --- a~/mail.c	1970-01-01 00:00:00
 +++ a/mail.c	1970-01-01 00:00:00
 @@ -46,7 +46,7 @@
@@ -309,7 +309,7 @@ diff -wpruN '--exclude=*.orig' a~/mail.c a/mail.c
  {
  	struct parse_state parse_state;
  	char line[1000];	/* by RFC2822 */
-diff -wpruN '--exclude=*.orig' a~/spool.c a/spool.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/spool.c a/spool.c
 --- a~/spool.c	1970-01-01 00:00:00
 +++ a/spool.c	1970-01-01 00:00:00
 @@ -72,7 +72,7 @@

build/dma/patches/mxpref.patch

@@ -3,7 +3,7 @@ From: Andy Fiddaman <[email protected]>
 Date: Wed, 6 Dec 2017 09:36:43 +0000
 Subject: [PATCH] Prefer IPv4 MX records over IPv6
 
-diff -wpruN '--exclude=*.orig' a~/build/dma/patches/mxpref.patch a/build/dma/patches/mxpref.patch
+diff -wpruN --no-dereference '--exclude=*.orig' a~/build/dma/patches/mxpref.patch a/build/dma/patches/mxpref.patch
 --- a~/build/dma/patches/mxpref.patch	1970-01-01 00:00:00
 +++ a/build/dma/patches/mxpref.patch	1970-01-01 00:00:00
 @@ -0,0 +1,14 @@

build/dma/patches/rcpt_domain.patch

@@ -1,7 +1,7 @@
-diff -wpruN '--exclude=*.orig' a~/conf.c a/conf.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/conf.c a/conf.c
 --- a~/conf.c	1970-01-01 00:00:00
 +++ a/conf.c	1970-01-01 00:00:00
-@@ -243,8 +243,10 @@ parse_conf(const char *config_path)
+@@ -244,8 +244,10 @@ parse_conf(const char *config_path)
  			config.features |= INSECURE;
  		else if (strcmp(word, "FULLBOUNCE") == 0 && data == NULL)
  			config.features |= FULLBOUNCE;
@@ -10,10 +10,10 @@ diff -wpruN '--exclude=*.orig' a~/conf.c a/conf.c
  			config.features |= NULLCLIENT;
 +			config.domain = data;
 +		}
+ 		else if (strcmp(word, "VERIFYCERT") == 0 && data == NULL)
+ 			config.features |= VERIFYCERT;
  		else {
- 			errlogx(EX_CONFIG, "syntax error in %s:%d", config_path, lineno);
- 			/* NOTREACHED */
-diff -wpruN '--exclude=*.orig' a~/dma.c a/dma.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/dma.c a/dma.c
 --- a~/dma.c	1970-01-01 00:00:00
 +++ a/dma.c	1970-01-01 00:00:00
 @@ -85,6 +85,7 @@ struct config config = {
@@ -24,7 +24,7 @@ diff -wpruN '--exclude=*.orig' a~/dma.c a/dma.c
  	.fingerprint = NULL,
  };
 
-@@ -230,6 +231,18 @@ add_recp(struct dma_queue *queue, const
+@@ -257,6 +258,18 @@ add_recp(struct dma_queue *queue, const
  		}
  	} else {
  		it->remote = 1;
@@ -43,7 +43,7 @@ diff -wpruN '--exclude=*.orig' a~/dma.c a/dma.c
  	}
 
  	return (0);
-diff -wpruN '--exclude=*.orig' a~/dma.conf a/dma.conf
+diff -wpruN --no-dereference '--exclude=*.orig' a~/dma.conf a/dma.conf
 --- a~/dma.conf	1970-01-01 00:00:00
 +++ a/dma.conf	1970-01-01 00:00:00
 @@ -1,9 +1,5 @@
@@ -56,7 +56,7 @@ diff -wpruN '--exclude=*.orig' a~/dma.conf a/dma.conf
  #SMARTHOST
 
  # Use this SMTP port.  Most users will be fine with the default (25)
-@@ -63,8 +59,15 @@
+@@ -67,8 +63,15 @@
  # Format: MASQUERADE [user@][host]
  # Examples:
  # MASQUERADE john@  on host "hamlet" will send all mails as john@hamlet
@@ -74,10 +74,10 @@ diff -wpruN '--exclude=*.orig' a~/dma.conf a/dma.conf
 +# sending to the smarthost.
 +#NULLCLIENT example.net
 +
-diff -wpruN '--exclude=*.orig' a~/dma.h a/dma.h
+diff -wpruN --no-dereference '--exclude=*.orig' a~/dma.h a/dma.h
 --- a~/dma.h	1970-01-01 00:00:00
 +++ a/dma.h	1970-01-01 00:00:00
-@@ -136,6 +136,7 @@ struct config {
+@@ -137,6 +137,7 @@ struct config {
  	const char *certfile;
  	int features;
  	const char *mailname;

build/dma/patches/series

@@ -1,5 +1,4 @@
 dma-illumos-port.patch
 mxpref.patch
-strlcpy.patch
 rcpt_domain.patch
 closefrom.patch

doc/packages.md

@@ -85,7 +85,7 @@
 | security/sudo				| 1.9.16p2		| https://www.sudo.ws/
 | service/network/chrony		| 4.5			| https://download.tuxfamily.org/chrony/
 | service/network/ntpsec		| 1.2.3			| https://github.com/ntpsec/ntpsec/tags https://blog.ntpsec.org/
-| service/network/smtp/dma		| 0.13			| https://github.com/corecode/dma/tags
+| service/network/smtp/dma		| 0.14			| https://github.com/corecode/dma/tags
 | shell/bash				| 5.2.37		| https://ftp.gnu.org/gnu/bash/
 | shell/bash5-patchlvl			| 037			| https://ftp.gnu.org/gnu/bash/bash-5.2-patches
 | shell/bash5-completions		| 2.14.0		| https://github.com/scop/bash-completion/releases