CVS commit: pkgsrc/mail/exim

["Gavan Fantom" <gavan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gavan
Date:           Sat Apr 25 12:48:57 UTC 2020

Modified Files:
        pkgsrc/mail/exim: Makefile distinfo
Added Files:
        pkgsrc/mail/exim/patches: patch-src_exicyclog.src

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 pkgsrc/mail/exim/Makefile
cvs rdiff -u -r1.75 -r1.76 pkgsrc/mail/exim/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/exim/patches/patch-src_exicyclog.src

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

Modified files:

Index: pkgsrc/mail/exim/Makefile
diff -u pkgsrc/mail/exim/Makefile:1.177 pkgsrc/mail/exim/Makefile:1.178
--- pkgsrc/mail/exim/Makefile:1.177     Tue Apr 14 19:34:39 2020
+++ pkgsrc/mail/exim/Makefile   Sat Apr 25 12:48:57 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.177 2020/04/14 19:34:39 wiz Exp $
+# $NetBSD: Makefile,v 1.178 2020/04/25 12:48:57 gavan Exp $
 
 DISTNAME=      exim-4.93.0.4
+PKGREVISION=   1
 CATEGORIES=    mail net
 MASTER_SITES=  ftp://ftp.exim.org/pub/exim/exim4/
 MASTER_SITES+= https://ftp.exim.org/pub/exim/exim4/

Index: pkgsrc/mail/exim/distinfo
diff -u pkgsrc/mail/exim/distinfo:1.75 pkgsrc/mail/exim/distinfo:1.76
--- pkgsrc/mail/exim/distinfo:1.75      Tue Apr 14 19:34:39 2020
+++ pkgsrc/mail/exim/distinfo   Sat Apr 25 12:48:57 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.75 2020/04/14 19:34:39 wiz Exp $
+$NetBSD: distinfo,v 1.76 2020/04/25 12:48:57 gavan Exp $
 
 SHA1 (exim-4.93.0.4.tar.xz) = 890bdf2fe00bb6916c47ed9e77a84cf85b385a4c
 RMD160 (exim-4.93.0.4.tar.xz) = c2ae47ef89f062bd94c1444baa9af4164bb37c37
@@ -8,3 +8,4 @@ SHA1 (patch-Local_Makefile.pkgsrc) = 7d6
 SHA1 (patch-OS_Makefile-Default) = 6af17f036ed02a3bc37c1f303269eea447fcb691
 SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5
 SHA1 (patch-scripts_exim__install) = aa0a31e77d5f76e33bc92140c14d39c79f710b95
+SHA1 (patch-src_exicyclog.src) = cea5f04f52c9264fd7d279c046686dac2dc57a65

Added files:

Index: pkgsrc/mail/exim/patches/patch-src_exicyclog.src
diff -u /dev/null pkgsrc/mail/exim/patches/patch-src_exicyclog.src:1.1
--- /dev/null   Sat Apr 25 12:48:57 2020
+++ pkgsrc/mail/exim/patches/patch-src_exicyclog.src    Sat Apr 25 12:48:57 2020
@@ -0,0 +1,27 @@
+$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
+ #########################################################################