[pkgsrc/trunk]: pkgsrc/sysutils/logrotate Back out suggested fix to ship args...

[he <he%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ec39f5e5bd9e
branches:  trunk
changeset: 331571:ec39f5e5bd9e
user:      he <he%pkgsrc.org@localhost>
date:      Wed Mar 20 12:29:37 2019 +0000

description:
Back out suggested fix to ship args to scripts.
It was not accepted upstream; use "$@" in the script section to ship args.
We'll see if a documentation improvement can be suggested instead.
Bump PKGREVISION.

diffstat:

 sysutils/logrotate/Makefile                  |   3 ++-
 sysutils/logrotate/distinfo                  |   3 +--
 sysutils/logrotate/patches/patch-logrotate.c |  19 -------------------
 3 files changed, 3 insertions(+), 22 deletions(-)

diffs (49 lines):

diff -r 71de94e51b81 -r ec39f5e5bd9e sysutils/logrotate/Makefile
--- a/sysutils/logrotate/Makefile       Wed Mar 20 12:19:38 2019 +0000
+++ b/sysutils/logrotate/Makefile       Wed Mar 20 12:29:37 2019 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2019/03/20 10:34:10 he Exp $
+# $NetBSD: Makefile,v 1.18 2019/03/20 12:29:37 he Exp $
 
 DISTNAME=              logrotate-3.15.0
+PKGREVISION=           1
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=logrotate/}
 
diff -r 71de94e51b81 -r ec39f5e5bd9e sysutils/logrotate/distinfo
--- a/sysutils/logrotate/distinfo       Wed Mar 20 12:19:38 2019 +0000
+++ b/sysutils/logrotate/distinfo       Wed Mar 20 12:29:37 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2019/03/20 10:34:10 he Exp $
+$NetBSD: distinfo,v 1.16 2019/03/20 12:29:37 he Exp $
 
 SHA1 (logrotate-3.15.0.tar.gz) = d5ec365a07d1c64f4ba086e12fcbb7911281058d
 RMD160 (logrotate-3.15.0.tar.gz) = bd1801423d2f7729703db1f354cdb7d0dbae3a1d
@@ -7,4 +7,3 @@
 SHA1 (patch-config.c) = 75fea98d120cf1bb8f5f90af9648959a133914aa
 SHA1 (patch-examples_logrotate.conf) = 4d0aad215e66850e8ae1a005764f8bd109fb76c9
 SHA1 (patch-examples_logrotate.cron) = 31a19e1b697e945299bbbe6701674d886379a49c
-SHA1 (patch-logrotate.c) = 4a3a17d51972c9cf11da35b681d1f0f13c8f22e7
diff -r 71de94e51b81 -r ec39f5e5bd9e sysutils/logrotate/patches/patch-logrotate.c
--- a/sysutils/logrotate/patches/patch-logrotate.c      Wed Mar 20 12:19:38 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-logrotate.c,v 1.4 2019/03/20 10:34:10 he Exp $
-
-Fix the running of scripts:
- * the "-c" option to "sh" causes subsequent args to not be passed
-   to the script (oops!)
- * the "logrotate_script" arg ends up as arg1, not arg0 of the script,
-   and is not documented, so get rid of it
-
---- logrotate.c.orig   2018-10-05 15:01:21.000000000 +0000
-+++ logrotate.c
-@@ -451,7 +451,7 @@ static int runScript(struct logInfo *log
-                 exit(1);
-             }
-         }
--        execl("/bin/sh", "sh", "-c", script, "logrotate_script", logfn, logrotfn, (char *) NULL);
-+        execl("/bin/sh", "sh", script, logfn, logrotfn, (char *) NULL);
-         exit(1);
-     }
-