[csw-devel] SF.net SVN: gar:[6028] csw/mgar/pkg/sendmail/trunk
valholla at users.sourceforge.net
valholla at users.sourceforge.net
Fri Aug 14 21:48:18 CEST 2009
Revision: 6028
http://gar.svn.sourceforge.net/gar/?rev=6028&view=rev
Author: valholla
Date: 2009-08-14 19:48:18 +0000 (Fri, 14 Aug 2009)
Log Message:
-----------
tweak pacakge install
Modified Paths:
--------------
csw/mgar/pkg/sendmail/trunk/Makefile
csw/mgar/pkg/sendmail/trunk/checksums
csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol10
csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol8
csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol9
csw/mgar/pkg/sendmail/trunk/files/cswsendmail
csw/mgar/pkg/sendmail/trunk/files/sendmail.cf.CSW
csw/mgar/pkg/sendmail/trunk/files/submit.cf.CSW
Added Paths:
-----------
csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postinstall
Modified: csw/mgar/pkg/sendmail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sendmail/trunk/Makefile 2009-08-14 00:50:54 UTC (rev 6027)
+++ csw/mgar/pkg/sendmail/trunk/Makefile 2009-08-14 19:48:18 UTC (rev 6028)
@@ -17,26 +17,24 @@
MY_CLASSES = CSWsendmail.i.sol8 CSWsendmail.i.sol9 CSWsendmail.i.sol10
DISTFILES = $(GARNAME).$(GARVERSION).tar.gz
-DISTFILES += README.CSW sendmail.schema
+DISTFILES += README.CSW sendmail.schema CSWsendmail.postinstall
DISTFILES += Sun-sendmail-deactivate.sh Sun-sendmail-reactivate.sh
DISTFILES += cswsendmail site.config.m4 $(MY_CLASSES) CSWsendmail.checkinstall
DISTFILES += CSWsendmail.preremove CSWsendmail.preinstall CSWsendmail.space
DISTFILES += $(foreach FILE,$(shell cd $(FILEDIR) && ls *.CSW),$(FILE))
-# We define upstream file regex so we can be notifed of new upstream software release
+# We define upstream file regex so we can be notifed of
+# new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
# we require
-PACKAGES = CSWsendmail CSWsendmailcommon
+PACKAGES = CSWsendmail
SPKG_SOURCEURL = http://www.sendmail.org/
SPKG_DESC_CSWsendmail = $(DESCRIPTION)
-SPKG_DESC_CSWsendmailcommon = $(DESCRIPTION) common files
CATALOGNAME_CSWsendmail = sendmail
-CATALOGNAME_CSWsendmailcommon = sendmail_common
-REQUIRED_PKGS_CSWsendmail = CSWbdb CSWoldaprt CSWosslrt CSWsasl CSWtcpwrap CSWcswclassutils CSWsendmailcommon
-REQUIRED_PKGS_CSWsendmailcommon = CSWbdb CSWoldaprt CSWosslrt CSWsasl CSWtcpwrap CSWcswclassutils
-ARCHALL_CSWsendmailcommon = 1
+REQUIRED_PKGS_CSWsendmail = CSWbdb CSWoldaprt CSWosslrt CSWsasl CSWtcpwrap
+REQUIRED_PKGS_CSWsendmail = CSWcswclassutils
PROTOTYPE_FILTER = awk \
'$$$$2 ~/i.sol8/ { next } \
@@ -52,11 +50,6 @@
{ print "i i.sol9=CSWsendmail.i.sol9" } \
{ print "i i.sol10=CSWsendmail.i.sol10" } } '
-PKGFILES_CSWsendmailcommon = .*$(sharedstatedir)/.*
-PKGFILES_CSWsendmailcommon += .*$(mandir)/.*
-PKGFILES_CSWsendmailcommon += .*$(sysconfdir)/.*
-PKGFILES_CSWsendmailcommon += .*/clientmqueue/.*
-
ENABLE_CHECK = 0
# patch away GNUism
@@ -108,7 +101,6 @@
ginstall -d $(DESTDIR)/var/opt/csw/spool/clientmqueue
ginstall -d $(DESTDIR)$(sharedstatedir)/mail
ginstall -d $(DESTDIR)/etc/opt/csw/init.d
- ginstall -d $(DESTDIR)$(sysconfdir)/mail
@# install the libraries
@( for file in $(LIBFILES) ; do \
@@ -154,9 +146,9 @@
@# install configurations, XXX missing submit.cf/sendmail.cf
( for file in `cd $(DOWNLOADDIR) && ls *.CSW`; do \
ginstall -m 644 $(DOWNLOADDIR)/$$file \
- $(DESTDIR)$(sysconfdir)/mail/$$file; \
+ $(DESTDIR)/etc/mail/$$file; \
done )
- ( mv $(DESTDIR)$(sysconfdir)/mail/sm-client.st.CSW \
+ ( mv $(DESTDIR)/etc/mail/sm-client.st.CSW \
$(DESTDIR)/var/opt/csw/spool/clientmqueue/ )
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/sendmail/trunk/checksums
===================================================================
--- csw/mgar/pkg/sendmail/trunk/checksums 2009-08-14 00:50:54 UTC (rev 6027)
+++ csw/mgar/pkg/sendmail/trunk/checksums 2009-08-14 19:48:18 UTC (rev 6028)
@@ -1,7 +1,8 @@
a9885ac08bd1f1d08e1e6fe0c5608408 download/CSWsendmail.checkinstall
-10454c9eb3d165f2f22c2b9455bcfdcc download/CSWsendmail.i.sol10
-54c255c3fce635ee7d8ac11a75ba25f7 download/CSWsendmail.i.sol8
-b78ddd9dc3835093e6994cd57d9e6824 download/CSWsendmail.i.sol9
+0aab5819ec16ce027de89639ab07b92b download/CSWsendmail.i.sol10
+f7f3ab3921489804a0101689113eb1fd download/CSWsendmail.i.sol8
+d3a9427469f567764de86282d1df4666 download/CSWsendmail.i.sol9
+4481ed1568f2b46138aeaa3ef54567f6 download/CSWsendmail.postinstall
4c53e32ed6b4ac66c35d5079ebcb548d download/CSWsendmail.preinstall
644a174b1a1e74ef8655ea0002aff8f7 download/CSWsendmail.preremove
f49c3339aa897df97abf1baf54582fb8 download/CSWsendmail.space
@@ -9,15 +10,15 @@
e89e68f3e0ae84d665c4ab898a8f3325 download/Sun-sendmail-deactivate.sh
1c3a63f98171aa28a2714995ee938a2c download/Sun-sendmail-reactivate.sh
2bfc78e0f774b7168e29628b6a18570a download/aliases.CSW
-f29185ffb69e60c500f4b791894a12fa download/cswsendmail
+f6aaf64942df693bfea12419f3746fc0 download/cswsendmail
c816378b3028cbab410f72168b571775 download/helpfile.CSW
d41d8cd98f00b204e9800998ecf8427e download/local-host-names.CSW
95c787a371c63caebc5d76faddba08e4 download/patch-CC-M.m4
a5ee5d26e1f546a2da5fb9a513bd6bce download/sendmail.8.14.3.tar.gz
-83532fac66f749a1532d461ce6bb2791 download/sendmail.cf.CSW
+c4519ecd5cfddf608928f002f5bca295 download/sendmail.cf.CSW
48851e45dca2a65a77f64f738bbf8d20 download/sendmail.schema
ae82c974452cfdc7b4c5be2576154cdf download/site.config.m4
d41d8cd98f00b204e9800998ecf8427e download/sm-client.st.CSW
d41d8cd98f00b204e9800998ecf8427e download/statistics.CSW
-3fe39c11ac0598f3f9fa26b2676a2704 download/submit.cf.CSW
+d26b6dfacd01430158a881c026f61dab download/submit.cf.CSW
d41d8cd98f00b204e9800998ecf8427e download/trusted-users.CSW
Modified: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol10
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol10 2009-08-14 00:50:54 UTC (rev 6027)
+++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol10 2009-08-14 19:48:18 UTC (rev 6028)
@@ -20,5 +20,6 @@
echo $dest2
/usr/bin/cp $src $dest2 || exit 2
/usr/bin/chmod 0755 $dest2
-done
+done | /usr/sbin/installf -c sol10 $PKGINST -
+/usr/sbin/installf -f -c sol10 $PKGINST
exit 0
Modified: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol8
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol8 2009-08-14 00:50:54 UTC (rev 6027)
+++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol8 2009-08-14 19:48:18 UTC (rev 6028)
@@ -20,5 +20,6 @@
echo $dest2
/usr/bin/cp $src $dest2 || exit 2
/usr/bin/chmod 0755 $dest2
-done
+done | /usr/sbin/installf -c sol8 $PKGINST -
+/usr/sbin/installf -f -c sol8 $PKGINST
exit 0
Modified: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol9
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol9 2009-08-14 00:50:54 UTC (rev 6027)
+++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol9 2009-08-14 19:48:18 UTC (rev 6028)
@@ -20,5 +20,7 @@
echo $dest2
/usr/bin/cp $src $dest2 || exit 2
/usr/bin/chmod 0755 $dest2
-done
+done | /usr/sbin/installf -c sol9 $PKGINST -
+/usr/sbin/installf -f -c sol9 $PKGINST
+
exit 0
Added: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postinstall
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postinstall (rev 0)
+++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postinstall 2009-08-14 19:48:18 UTC (rev 6028)
@@ -0,0 +1,19 @@
+#!/bin/sh
+PATH=/bin:/usr/bin:/opt/csw/bin:/sbin:/usr/sbin:/opt/csw/sbin
+
+CONFDIR=/etc/mail
+
+for file in `cd ${CONFDIR} && ls *.CSW 2>/dev/null`
+do
+ real_file="`echo ${file} |sed 's/\.CSW$//'`"
+ if [ ! -f ${CONFDIR}/${real_file} ]
+ then
+ cp ${CONFDIR}/${file} ${CONFDIR}/${real_file}
+ else
+ echo "Preserving ${real_file}..."
+ fi
+done
+
+exit 0
+
+
Modified: csw/mgar/pkg/sendmail/trunk/files/cswsendmail
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/cswsendmail 2009-08-14 00:50:54 UTC (rev 6027)
+++ csw/mgar/pkg/sendmail/trunk/files/cswsendmail 2009-08-14 19:48:18 UTC (rev 6028)
@@ -6,13 +6,12 @@
#ident "@(#)sendmail 1.19 01/12/05 SMI"
# Modified for CSW by Alex Moore 01/01/2004
-CSW_DIR="/opt/csw"
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${CSW_DIR}/spool/clientmqueue/sm-client.pid"
-DEFAULT_FILE="${CSW_DIR}/etc/default/sendmail"
-ALIASES_FILE="${CSW_DIR}/etc/mail/aliases"
+CLIENT_PID_FILE="/var/opt/csw/spool/clientmqueue/sm-client.pid"
+DEFAULT_FILE="/opt/csw/etc/default/sendmail"
+ALIASES_FILE="/opt/csw/etc/mail/aliases"
check_queue_interval_syntax()
{
@@ -34,14 +33,14 @@
;;
'start')
- if [ -f ${CSW_DIR}/lib/sendmail -a -f ${CSW_DIR}/etc/mail/sendmail.cf ]; then
- if [ ! -d /var${CSW_DIR}/spool/mqueue ]; then
- /usr/bin/mkdir -pm 0750 /var${CSW_DIR}/spool/mqueue
- /usr/bin/chown root:bin /var${CSW_DIR}/spool/mqueue
+ if [ -f /opt/csw/lib/sendmail -a -f /opt/csw/etc/mail/sendmail.cf ]; then
+ if [ ! -d /var/opt/csw/spool/mqueue ]; then
+ /usr/bin/mkdir -pm 0750 /var/opt/csw/spool/mqueue
+ /usr/bin/chown root:bin /var/opt/csw/spool/mqueue
fi
if [ ! -f $ALIASES_FILE.db ] && [ ! -f $ALIASES_FILE.dir ] \
&& [ ! -f $ALIASES_FILE.pag ]; then
- ${CSW_DIR}/bin/newaliases
+ /opt/csw/bin/newaliases
fi
MODE="-bd"
[ -f $DEFAULT_FILE ] && . $DEFAULT_FILE
@@ -62,8 +61,8 @@
fi
check_queue_interval_syntax $CLIENTQUEUEINTERVAL
CLIENTQUEUEINTERVAL=$answer
- ${CSW_DIR}/lib/sendmail -L sm-mta $MODE -q$QUEUEOPTION$QUEUEINTERVAL $OPTIONS &
- ${CSW_DIR}/lib/sendmail -L sm-msp -Ac -q$CLIENTQUEUEINTERVAL $CLIENTOPTIONS &
+ /opt/csw/lib/sendmail -L sm-mta $MODE -q$QUEUEOPTION$QUEUEINTERVAL $OPTIONS &
+ /opt/csw/lib/sendmail -L sm-msp -Ac -q$CLIENTQUEUEINTERVAL $CLIENTOPTIONS &
#
# ETRN_HOSTS should be of the form
# "s1:c1.1,c1.2 s2:c2.1 s3:c3.1,c3.2,c3.3"
@@ -99,7 +98,7 @@
kill `head -1 $CLIENT_PID_FILE`
rm -f $CLIENT_PID_FILE
fi
- /usr/bin/pkill -x -u 0 sendmail
+ /usr/bin/pkill -x -u smmsp sendmail
;;
*)
Modified: csw/mgar/pkg/sendmail/trunk/files/sendmail.cf.CSW
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/sendmail.cf.CSW 2009-08-14 00:50:54 UTC (rev 6027)
+++ csw/mgar/pkg/sendmail/trunk/files/sendmail.cf.CSW 2009-08-14 19:48:18 UTC (rev 6028)
@@ -44,7 +44,7 @@
##### $Id: proto.m4,v 8.734 2008/01/24 23:42:01 ca Exp $ #####
# level 10 config file format
-V10/Berkeley
+V10
# override file safeties - setting this option compromises system security,
# addressing the actual file configuration problem is preferred
Modified: csw/mgar/pkg/sendmail/trunk/files/submit.cf.CSW
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/submit.cf.CSW 2009-08-14 00:50:54 UTC (rev 6027)
+++ csw/mgar/pkg/sendmail/trunk/files/submit.cf.CSW 2009-08-14 19:48:18 UTC (rev 6028)
@@ -38,7 +38,7 @@
##### $Id: proto.m4,v 8.734 2008/01/24 23:42:01 ca Exp $ #####
# level 10 config file format
-V10/Berkeley
+V10
# override file safeties - setting this option compromises system security,
# addressing the actual file configuration problem is preferred
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