SF.net SVN: gar:[23868] csw/mgar/pkg/logwatch/trunk

[bdwalton at users.sourceforge.net]

Revision: 23868
          http://sourceforge.net/p/gar/code/23868
Author:   bdwalton
Date:     2014-07-27 09:35:11 +0000 (Sun, 27 Jul 2014)
Log Message:
-----------
logwatch/trunk: set /usr/lib/sendmail with a patch instead of a substitution

Modified Paths:
--------------
    csw/mgar/pkg/logwatch/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/logwatch/trunk/files/0006-Default-to-sendmail-in-the-expected-solaris-location.patch

Modified: csw/mgar/pkg/logwatch/trunk/Makefile
===================================================================
--- csw/mgar/pkg/logwatch/trunk/Makefile	2014-07-27 09:29:57 UTC (rev 23867)
+++ csw/mgar/pkg/logwatch/trunk/Makefile	2014-07-27 09:35:11 UTC (rev 23868)
@@ -19,6 +19,7 @@
 PATCHFILES += 0003-Patch-out-usr-share-paths-for-opt-csw-share.patch
 PATCHFILES += 0004-Change-usr-bin-refereces-to-opt-csw-bin.patch
 PATCHFILES += 0005-Change-etc-logwatch-references-to-etc-opt-csw-logwat.patch
+PATCHFILES += 0006-Default-to-sendmail-in-the-expected-solaris-location.patch
 
 # We define upstream file regex so we can be notifed of new upstream
 # software release
@@ -108,7 +109,6 @@
 		touch $(DESTDIR)$(CONFDIR)/conf/logwatch.conf; \
 		touch $(DESTDIR)$(CONFDIR)/conf/ignore.conf; \
 		touch $(DESTDIR)$(CONFDIR)/conf/override.conf; \
-		perl -pi -e "s%sendmail%/usr/lib/sendmail%" $(DESTDIR)$(SHAREDIR)/default.conf/logwatch.conf; \
 		$(INSTALLDIR) $(DESTDIR)$(TEMP_DIR); \
 		echo "TmpDir = $(TEMP_DIR)" >> $(DESTDIR)$(CONFDIR)/conf/logwatch.conf; \
 		$(INSTALLDIR) $(DESTDIR)$(MANDIR)/man8; \

Added: csw/mgar/pkg/logwatch/trunk/files/0006-Default-to-sendmail-in-the-expected-solaris-location.patch
===================================================================
--- csw/mgar/pkg/logwatch/trunk/files/0006-Default-to-sendmail-in-the-expected-solaris-location.patch	                        (rev 0)
+++ csw/mgar/pkg/logwatch/trunk/files/0006-Default-to-sendmail-in-the-expected-solaris-location.patch	2014-07-27 09:35:11 UTC (rev 23868)
@@ -0,0 +1,26 @@
+From 8cd7d408e9198cc5294300c3a68cd0ae88c3c257 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sun, 27 Jul 2014 10:32:59 +0100
+Subject: [PATCH] Default to sendmail in the expected solaris location
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ conf/logwatch.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/conf/logwatch.conf b/conf/logwatch.conf
+index 8eea90c..3d0f5ed 100644
+--- a/conf/logwatch.conf
++++ b/conf/logwatch.conf
+@@ -106,7 +106,7 @@ Service = "-eximstats"      # Prevents execution of eximstats service, which
+ # At this point you can change the mailer to any thing else that can handle that output
+ # stream. TODO test variables in the mailer string to see if the To/From/Subject can be set
+ # From here with out breaking anything. This would allow mail/mailx/nail etc..... -mgt 
+-mailer = "sendmail -t"
++mailer = "/usr/lib/sendmail -t"
+ 
+ #
+ # With this option set to 'Yes', only log entries for this particular host
+-- 
+2.0.0
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.