[csw-devel] SF.net SVN: gar:[14865] csw/mgar/pkg/sendmail/trunk
bonivart at users.sourceforge.net
bonivart at users.sourceforge.net
Thu Jun 23 18:31:50 CEST 2011
Revision: 14865
http://gar.svn.sourceforge.net/gar/?rev=14865&view=rev
Author: bonivart
Date: 2011-06-23 16:31:50 +0000 (Thu, 23 Jun 2011)
Log Message:
-----------
sendmail/trunk: fix ownership of client queue, include Makefile, rename pid files
Modified Paths:
--------------
csw/mgar/pkg/sendmail/trunk/Makefile
csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg
csw/mgar/pkg/sendmail/trunk/files/cswsendmail
csw/mgar/pkg/sendmail/trunk/files/sendmail.cf
csw/mgar/pkg/sendmail/trunk/files/site.config.m4
csw/mgar/pkg/sendmail/trunk/files/submit.cf
Added Paths:
-----------
csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.Makefile
Modified: csw/mgar/pkg/sendmail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-23 14:52:54 UTC (rev 14864)
+++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-23 16:31:50 UTC (rev 14865)
@@ -2,7 +2,13 @@
# TODO
# - Build separate 9/10 packages?
+# - One big "mta" switch in alternatives between sendmail/postfix
+# - csw-sm-client.pid, csw-sendmail.pid
+# - smmsp:smmsp /var/opt/csw/spool/clientmqueue
+# - -rw-r--r-- 1 smmsp smmsp 47 2011-06-22 23:53 sm-client.pid
+# - Include Makefile in /etc/opt/csw/mail
+
# + post message
# + Fix paths in sendmail.cf and cswsendmail
# + #4486 Provide sendmail's contrib/ tools as a separate package?
@@ -35,7 +41,7 @@
DISTFILES = $(NAME).$(VERSION).tar.gz
DISTFILES += aliases helpfile local-host-names sendmail.cf
-DISTFILES += sm-client.st statistics submit.cf trusted-users
+DISTFILES += statistics submit.cf trusted-users
DISTFILES += README.CSW sendmail.schema site.config.m4
DISTFILES += oracle-sendmail-deactivate.sh oracle-sendmail-reactivate.sh
DISTFILES += cswsendmail cswusergroup
@@ -88,7 +94,6 @@
INITSMF = /etc/opt/csw/init.d/cswsendmail
SAMPLECONF = $(addprefix /etc/opt/csw/mail/,$(CONFFILES))
-SAMPLECONF += /var/opt/csw/spool/clientmqueue/sm-client.st
USERGROUP = /etc/opt/csw/pkg/CSWsendmail/cswusergroup
POSTMSG = $(docdir)/sendmail/README.postinstall
@@ -107,6 +112,11 @@
MIGRATE_SOURCE_DIR_CSWsendmail = /opt/csw/etc/mail
MIGRATE_DEST_DIR_CSWsendmail = /etc/opt/csw/mail
+PROTOTYPE_MODIFIERS = 1
+PROTOTYPE_FILES_1 = /var/opt/csw/spool/clientmqueue
+PROTOTYPE_USER_1 = smmsp
+PROTOTYPE_GROUP_1 = smmsp
+
CONFIGURE_SCRIPTS = custom
BUILD_SCRIPTS = custom
TEST_SCRIPTS = custom
@@ -260,8 +270,6 @@
ginstall -m 644 $(DOWNLOADDIR)/$$file \
$(DESTDIR)$(sysconfdir)/mail/$$file; \
done )
- ( ginstall -m 644 $(DOWNLOADDIR)/sm-client.st \
- $(DESTDIR)/var/opt/csw/spool/clientmqueue/ )
@# usergroup
ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail/
@@ -309,4 +317,7 @@
ginstall -m 755 $(DOWNLOADDIR)/oracle-sendmail-deactivate.sh $(DESTDIR)$(docdir)/sendmail
ginstall -m 755 $(DOWNLOADDIR)/oracle-sendmail-reactivate.sh $(DESTDIR)$(docdir)/sendmail
+ @# Makefile for databases
+ ginstall -m 644 $(FILEDIR)/CSWsendmail.Makefile $(DESTDIR)$(sysconfdir)/mail/Makefile
+
@$(MAKECOOKIE)
Added: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.Makefile
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.Makefile (rev 0)
+++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.Makefile 2011-06-23 16:31:50 UTC (rev 14865)
@@ -0,0 +1,9 @@
+# Simple Makefile to help with updating the databases
+
+all: sendmail.cf virtusertable.db access.db domaintable.db mailertable.db
+
+%.db: %
+ /opt/csw/sbin/makemap hash $@ < $<
+
+%.cf: %.mc
+ m4 $< > $@;
Modified: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg 2011-06-23 14:52:54 UTC (rev 14864)
+++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg 2011-06-23 16:31:50 UTC (rev 14865)
@@ -1,3 +1,4 @@
+
Notes for users of previous versions of CSWsendmail
===================================================
Modified: csw/mgar/pkg/sendmail/trunk/files/cswsendmail
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/cswsendmail 2011-06-23 14:52:54 UTC (rev 14864)
+++ csw/mgar/pkg/sendmail/trunk/files/cswsendmail 2011-06-23 16:31:50 UTC (rev 14865)
@@ -11,8 +11,8 @@
ERRMSG1='WARNING: /var/mail is NFS-mounted without setting actimeo=0,'
ERRMSG2='this can cause mailbox locking and access problems.'
-SERVER_PID_FILE="/var/run/sendmail.pid"
-CLIENT_PID_FILE="/var/opt/csw/spool/clientmqueue/sm-client.pid"
+SERVER_PID_FILE="/var/run/csw-sendmail.pid"
+CLIENT_PID_FILE="/var/run/csw-sm-client.pid"
DEFAULT_FILE="/etc/opt/csw/default/sendmail"
ALIASES_FILE="/etc/opt/csw/mail/aliases"
@@ -74,7 +74,7 @@
# the :client part is optional; see etrn(1M) for details.
# server is the name of the server to prod; a mail queue run
# is requested for each client name. This is comparable to
- # running "/usr/lib/sendmail -qRclient" on the host server.
+ # running "/opt/csw/lib/sendmail -qRclient" on the host server.
#
# See RFC 1985 for more information.
#
Modified: csw/mgar/pkg/sendmail/trunk/files/sendmail.cf
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/sendmail.cf 2011-06-23 14:52:54 UTC (rev 14864)
+++ csw/mgar/pkg/sendmail/trunk/files/sendmail.cf 2011-06-23 16:31:50 UTC (rev 14865)
@@ -473,7 +473,7 @@
#O MaxAliasRecursion=10
# location of pid file
-#O PidFile=/var/run/sendmail.pid
+O PidFile=/var/run/csw-sendmail.pid
# Prefix string for the process title shown on 'ps' listings
#O ProcessTitlePrefix=prefix
Modified: csw/mgar/pkg/sendmail/trunk/files/site.config.m4
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/site.config.m4 2011-06-23 14:52:54 UTC (rev 14864)
+++ csw/mgar/pkg/sendmail/trunk/files/site.config.m4 2011-06-23 16:31:50 UTC (rev 14865)
@@ -4,16 +4,16 @@
define(`confCC', `%OCSWCC%')
APPENDDEF(`confCCOPTS', `%CFLAGS%')
define(`confEBINDIR',`/opt/csw/lib')
-define(`confMANROOT',`/usr/csw/share/man')
-define(`confMANROOTMAN',`/usr/csw/share/man')
+define(`confMANROOT',`/opt/csw/share/man')
+define(`confMANROOTMAN',`/opt/csw/share/man')
define(`confMBINDIR',`/opt/csw/lib')
define(`confEBINDIR',`/opt/csw/lib')
define(`confUBINDIR',`/opt/csw/bin')
define(`confSBINDIR',`/opt/csw/sbin')
define(`confSTDIR', `/etc/opt/csw/mail')
define(`confSHAREDLIBDIR', `/opt/csw/lib')
-define(`confMANROOT', `/opt/csw/share/man/cat')
-define(`confMANROOTMAN', `/opt/csw/share/man/man')
+dnl define(`confMANROOT', `/opt/csw/share/man/cat')
+dnl define(`confMANROOTMAN', `/opt/csw/share/man/man')
define(`confNO_STATISTICS_INSTALL',`True')
define(`confHFDIR', `/opt/csw/share/mail')
define(`confMSP_QUEUE_DIR', `/var/opt/csw/spool/clientmqueue')
Modified: csw/mgar/pkg/sendmail/trunk/files/submit.cf
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/submit.cf 2011-06-23 14:52:54 UTC (rev 14864)
+++ csw/mgar/pkg/sendmail/trunk/files/submit.cf 2011-06-23 16:31:50 UTC (rev 14865)
@@ -465,7 +465,7 @@
#O MaxAliasRecursion=10
# location of pid file
-O PidFile=/var/run/sm-client.pid
+O PidFile=/var/run/csw-sm-client.pid
# Prefix string for the process title shown on 'ps' listings
#O ProcessTitlePrefix=prefix
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list