Sat Apr 25 12:48:57 2020 UTC ()
Patch exicyclog to work when commands have spaces in them

By default, pkgsrc uses 'mv -f' as MV_COMMAND. exicyclog is not resilient
to this, and breaks as a result. This patch quotes the command names
that are substituted into this script.


(gavan)
diff -r1.177 -r1.178 pkgsrc/mail/exim/Makefile
diff -r1.75 -r1.76 pkgsrc/mail/exim/distinfo
diff -r0 -r1.1 pkgsrc/mail/exim/patches/patch-src_exicyclog.src
cvs diff -r1.177 -r1.178 pkgsrc/mail/exim/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/exim/Makefile 2020/04/14 19:34:39 1.177
+++ pkgsrc/mail/exim/Makefile 2020/04/25 12:48:57 1.178
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.177 2020/04/14 19:34:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.178 2020/04/25 12:48:57 gavan Exp $
2 2
3DISTNAME= exim-4.93.0.4 3DISTNAME= exim-4.93.0.4
 4PKGREVISION= 1
4CATEGORIES= mail net 5CATEGORIES= mail net
5MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ 6MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/
6MASTER_SITES+= https://ftp.exim.org/pub/exim/exim4/ 7MASTER_SITES+= https://ftp.exim.org/pub/exim/exim4/
7MASTER_SITES+= ftp://ftp.exim.org/pub/exim/exim4/fixes/ 8MASTER_SITES+= ftp://ftp.exim.org/pub/exim/exim4/fixes/
8MASTER_SITES+= https://ftp.exim.org/pub/exim/exim4/fixes/ 9MASTER_SITES+= https://ftp.exim.org/pub/exim/exim4/fixes/
9EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
10 11
11MAINTAINER= abs@NetBSD.org 12MAINTAINER= abs@NetBSD.org
12HOMEPAGE= https://www.exim.org/ 13HOMEPAGE= https://www.exim.org/
13COMMENT= The Exim mail transfer agent, a replacement for sendmail 14COMMENT= The Exim mail transfer agent, a replacement for sendmail
14LICENSE= gnu-gpl-v2 15LICENSE= gnu-gpl-v2
15 16
16CONFLICTS+= exim-exiscan-[0-9]* 17CONFLICTS+= exim-exiscan-[0-9]*
cvs diff -r1.75 -r1.76 pkgsrc/mail/exim/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/exim/distinfo 2020/04/14 19:34:39 1.75
+++ pkgsrc/mail/exim/distinfo 2020/04/25 12:48:57 1.76
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.75 2020/04/14 19:34:39 wiz Exp $ 1$NetBSD: distinfo,v 1.76 2020/04/25 12:48:57 gavan Exp $
2 2
3SHA1 (exim-4.93.0.4.tar.xz) = 890bdf2fe00bb6916c47ed9e77a84cf85b385a4c 3SHA1 (exim-4.93.0.4.tar.xz) = 890bdf2fe00bb6916c47ed9e77a84cf85b385a4c
4RMD160 (exim-4.93.0.4.tar.xz) = c2ae47ef89f062bd94c1444baa9af4164bb37c37 4RMD160 (exim-4.93.0.4.tar.xz) = c2ae47ef89f062bd94c1444baa9af4164bb37c37
5SHA512 (exim-4.93.0.4.tar.xz) = 84951849b69399d6f187d2801760dc0cb9e61c88c7c88aaca4e07e48120199a6be94b2236d058ffeacb8d611dd84056b610d480353c301a3ad5799768dd39d96 5SHA512 (exim-4.93.0.4.tar.xz) = 84951849b69399d6f187d2801760dc0cb9e61c88c7c88aaca4e07e48120199a6be94b2236d058ffeacb8d611dd84056b610d480353c301a3ad5799768dd39d96
6Size (exim-4.93.0.4.tar.xz) = 1804696 bytes 6Size (exim-4.93.0.4.tar.xz) = 1804696 bytes
7SHA1 (patch-Local_Makefile.pkgsrc) = 7d6971cfe6f6fecf854926e90460b1a8bcd6a79d 7SHA1 (patch-Local_Makefile.pkgsrc) = 7d6971cfe6f6fecf854926e90460b1a8bcd6a79d
8SHA1 (patch-OS_Makefile-Default) = 6af17f036ed02a3bc37c1f303269eea447fcb691 8SHA1 (patch-OS_Makefile-Default) = 6af17f036ed02a3bc37c1f303269eea447fcb691
9SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5 9SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5
10SHA1 (patch-scripts_exim__install) = aa0a31e77d5f76e33bc92140c14d39c79f710b95 10SHA1 (patch-scripts_exim__install) = aa0a31e77d5f76e33bc92140c14d39c79f710b95
 11SHA1 (patch-src_exicyclog.src) = cea5f04f52c9264fd7d279c046686dac2dc57a65
File Added: pkgsrc/mail/exim/patches/patch-src_exicyclog.src
$NetBSD: patch-src_exicyclog.src,v 1.1 2020/04/25 12:48:57 gavan Exp $

--- src/exicyclog.src.orig	2020-01-03 12:08:52.000000000 +0000
+++ src/exicyclog.src
@@ -49,15 +49,15 @@
 # varies from OS to OS. Sigh.
 
 keep=EXICYCLOG_MAX
-compress=COMPRESS_COMMAND
+compress='COMPRESS_COMMAND'
 suffix=COMPRESS_SUFFIX
 
-chgrp=CHGRP_COMMAND
-chmod=CHMOD_COMMAND
-chown=CHOWN_COMMAND
-mv=MV_COMMAND
-rm=RM_COMMAND
-touch=TOUCH_COMMAND
+chgrp='CHGRP_COMMAND'
+chmod='CHMOD_COMMAND'
+chown='CHOWN_COMMAND'
+mv='MV_COMMAND'
+rm='RM_COMMAND'
+touch='TOUCH_COMMAND'
 
 # End of editable lines
 #########################################################################