[csw-devel] SF.net SVN: gar:[6031] csw/mgar/pkg/sendmail/trunk
valholla at users.sourceforge.net
valholla at users.sourceforge.net
Fri Aug 14 23:17:33 CEST 2009
Revision: 6031
http://gar.svn.sourceforge.net/gar/?rev=6031&view=rev
Author: valholla
Date: 2009-08-14 21:17:32 +0000 (Fri, 14 Aug 2009)
Log Message:
-----------
tweaks
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.postinstall
csw/mgar/pkg/sendmail/trunk/files/sendmail.cf.CSW
csw/mgar/pkg/sendmail/trunk/files/site.config.m4
csw/mgar/pkg/sendmail/trunk/files/submit.cf.CSW
Modified: csw/mgar/pkg/sendmail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sendmail/trunk/Makefile 2009-08-14 20:34:56 UTC (rev 6030)
+++ csw/mgar/pkg/sendmail/trunk/Makefile 2009-08-14 21:17:32 UTC (rev 6031)
@@ -101,7 +101,7 @@
ginstall -d $(DESTDIR)/var/opt/csw/spool/clientmqueue
ginstall -d $(DESTDIR)$(sharedstatedir)/mail
ginstall -d $(DESTDIR)/etc/opt/csw/init.d
- ginstall -d $(DESTDIR)/etc/mail
+ ginstall -d $(DESTDIR)$(sysconfdir)/mail
@# install the libraries
@( for file in $(LIBFILES) ; do \
@@ -147,9 +147,9 @@
@# install configurations, XXX missing submit.cf/sendmail.cf
( for file in `cd $(DOWNLOADDIR) && ls *.CSW`; do \
ginstall -m 644 $(DOWNLOADDIR)/$$file \
- $(DESTDIR)/etc/mail/$$file; \
+ $(DESTDIR)$(sysconfdir)/mail/$$file; \
done )
- ( mv $(DESTDIR)/etc/mail/sm-client.st.CSW \
+ ( mv $(DESTDIR)$(sysconfdir)/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 20:34:56 UTC (rev 6030)
+++ csw/mgar/pkg/sendmail/trunk/checksums 2009-08-14 21:17:32 UTC (rev 6031)
@@ -1,8 +1,8 @@
a9885ac08bd1f1d08e1e6fe0c5608408 download/CSWsendmail.checkinstall
-0aab5819ec16ce027de89639ab07b92b download/CSWsendmail.i.sol10
-f7f3ab3921489804a0101689113eb1fd download/CSWsendmail.i.sol8
-d3a9427469f567764de86282d1df4666 download/CSWsendmail.i.sol9
-4481ed1568f2b46138aeaa3ef54567f6 download/CSWsendmail.postinstall
+255bd920bcc53ac59c77baaddaef4a9a download/CSWsendmail.i.sol10
+03b75dfa8a856c960798b9080ec665b6 download/CSWsendmail.i.sol8
+e81aadce9e5c295e3aed9c06dff25426 download/CSWsendmail.i.sol9
+a1d58264002e59e2f3ee6694a925c154 download/CSWsendmail.postinstall
4c53e32ed6b4ac66c35d5079ebcb548d download/CSWsendmail.preinstall
644a174b1a1e74ef8655ea0002aff8f7 download/CSWsendmail.preremove
f49c3339aa897df97abf1baf54582fb8 download/CSWsendmail.space
@@ -15,10 +15,10 @@
d41d8cd98f00b204e9800998ecf8427e download/local-host-names.CSW
95c787a371c63caebc5d76faddba08e4 download/patch-CC-M.m4
a5ee5d26e1f546a2da5fb9a513bd6bce download/sendmail.8.14.3.tar.gz
-c4519ecd5cfddf608928f002f5bca295 download/sendmail.cf.CSW
+83532fac66f749a1532d461ce6bb2791 download/sendmail.cf.CSW
48851e45dca2a65a77f64f738bbf8d20 download/sendmail.schema
-ae82c974452cfdc7b4c5be2576154cdf download/site.config.m4
+4dd792981f89ffa8b4602999a7c79441 download/site.config.m4
d41d8cd98f00b204e9800998ecf8427e download/sm-client.st.CSW
d41d8cd98f00b204e9800998ecf8427e download/statistics.CSW
-d26b6dfacd01430158a881c026f61dab download/submit.cf.CSW
+3fe39c11ac0598f3f9fa26b2676a2704 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 20:34:56 UTC (rev 6030)
+++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol10 2009-08-14 21:17:32 UTC (rev 6031)
@@ -1,14 +1,3 @@
-# PKGINST parameter provided by installation services
-# Move the Solaris 9 version specific files to the base directory.
-# The files specific to Solaris release are:
-# bin/vacation
-# sbin/editmap
-# sbin/mailstats
-# sbin/makemap
-# sbin/praliases
-# lib/mail.local
-# lib/sendmail
-# lib/smrsh
#
echo "Installing class <sol10>."
while read src dest
@@ -18,8 +7,10 @@
# Copy the version specific file to the original name
dest2="`echo $dest | sed 's/sol10.//g'`" || exit 2
echo $dest2
- /usr/bin/cp $src $dest2 || exit 2
- /usr/bin/chmod 0755 $dest2
+ /usr/bin/mv $src $dest2 || exit 2
+ /usr/bin/chmod 0755 $dest2 || exit 2
+ /usr/sbin/removef -c sol10 $PKGINST $src >/dev/null || exit 2
done | /usr/sbin/installf -c sol10 $PKGINST -
/usr/sbin/installf -f -c sol10 $PKGINST
+/usr/sbin/removef -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 20:34:56 UTC (rev 6030)
+++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol8 2009-08-14 21:17:32 UTC (rev 6031)
@@ -1,14 +1,3 @@
-# PKGINST parameter provided by installation services
-# Move the Solaris 9 version specific files to the base directory.
-# The files specific to Solaris release are:
-# bin/vacation
-# sbin/editmap
-# sbin/mailstats
-# sbin/makemap
-# sbin/praliases
-# lib/mail.local
-# lib/sendmail
-# lib/smrsh
#
echo "Installing class <sol8>."
while read src dest
@@ -19,7 +8,9 @@
dest2="`echo $dest | sed 's/sol8.//g'`" || exit 2
echo $dest2
/usr/bin/cp $src $dest2 || exit 2
- /usr/bin/chmod 0755 $dest2
+ /usr/bin/chmod 0755 $dest2 || exit 2
+ /usr/sbin/removef -c sol8 $PKGINST $src >/dev/null || exit 2
done | /usr/sbin/installf -c sol8 $PKGINST -
/usr/sbin/installf -f -c sol8 $PKGINST
+/usr/sbin/removef -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 20:34:56 UTC (rev 6030)
+++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.i.sol9 2009-08-14 21:17:32 UTC (rev 6031)
@@ -1,14 +1,3 @@
-# PKGINST parameter provided by installation services
-# Move the Solaris 9 version specific files to the base directory.
-# The files specific to Solaris release are:
-# bin/vacation
-# sbin/editmap
-# sbin/mailstats
-# sbin/makemap
-# sbin/praliases
-# lib/mail.local
-# lib/sendmail
-# lib/smrsh
#
echo "Installing class <sol9>."
while read src dest
@@ -19,8 +8,10 @@
dest2="`echo $dest | sed 's/sol9.//g'`" || exit 2
echo $dest2
/usr/bin/cp $src $dest2 || exit 2
- /usr/bin/chmod 0755 $dest2
+ /usr/bin/chmod 0755 $dest2 || exit 2
+ /usr/sbin/removef -c sol9 $PKGINST $src >/dev/null || exit 2
done | /usr/sbin/installf -c sol9 $PKGINST -
/usr/sbin/installf -f -c sol9 $PKGINST
+/usr/sbin/removef -f -c sol9 $PKGINST
exit 0
Modified: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postinstall
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postinstall 2009-08-14 20:34:56 UTC (rev 6030)
+++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postinstall 2009-08-14 21:17:32 UTC (rev 6031)
@@ -1,7 +1,7 @@
#!/bin/sh
PATH=/bin:/usr/bin:/opt/csw/bin:/sbin:/usr/sbin:/opt/csw/sbin
-CONFDIR=/etc/mail
+CONFDIR=/opt/csw/etc/mail
for file in `cd ${CONFDIR} && ls *.CSW 2>/dev/null`
do
@@ -14,6 +14,11 @@
fi
done
+echo "** IMPORTANT **"
+echo "This package no longer replaces Sun's sendmail files."
+echo "Be sure to Deactivate Sun's Sendmail program."
+echo
+
exit 0
Modified: csw/mgar/pkg/sendmail/trunk/files/sendmail.cf.CSW
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/sendmail.cf.CSW 2009-08-14 20:34:56 UTC (rev 6030)
+++ csw/mgar/pkg/sendmail/trunk/files/sendmail.cf.CSW 2009-08-14 21:17:32 UTC (rev 6031)
@@ -44,7 +44,7 @@
##### $Id: proto.m4,v 8.734 2008/01/24 23:42:01 ca Exp $ #####
# level 10 config file format
-V10
+V10/Berkeley
# override file safeties - setting this option compromises system security,
# addressing the actual file configuration problem is preferred
Modified: csw/mgar/pkg/sendmail/trunk/files/site.config.m4
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/site.config.m4 2009-08-14 20:34:56 UTC (rev 6030)
+++ csw/mgar/pkg/sendmail/trunk/files/site.config.m4 2009-08-14 21:17:32 UTC (rev 6031)
@@ -21,14 +21,14 @@
APPENDDEF(`confLIBDIRS', `-L/opt/csw/lib -R/opt/csw/lib')
APPENDDEF(`confINCDIRS', `-I/opt/csw/include')
APPENDDEF(`conf_sendmail_ENVDEF', `-I/opt/csw/include')
-dnl we should not need this..
-dnl APPENDDEF(`confLIBDIRS', `-L/opt/csw/bdb44/lib -R/opt/csw/bdb44/lib')
-dnl APPENDDEF(`confINCDIRS', `-I/opt/csw/bdb44/include')
dnl ### add NIS/NIS+ support
APPENDDEF(`confENVDEF', `-DNIS')
APPENDDEF(`confENVDEF', `-DNISPLUS')
+dnl ### use our sendmail.cf path
+APPENDDEF(`confENVDEF', `-DUSE_VENDOR_CF_PATH')
+
dnl ### add LDAP support
APPENDDEF(`conf_libsm_ENVDEF', `-DLDAPMAP')
APPENDDEF(`conf_sendmail_ENVDEF', `-DLDAPMAP')
Modified: csw/mgar/pkg/sendmail/trunk/files/submit.cf.CSW
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/submit.cf.CSW 2009-08-14 20:34:56 UTC (rev 6030)
+++ csw/mgar/pkg/sendmail/trunk/files/submit.cf.CSW 2009-08-14 21:17:32 UTC (rev 6031)
@@ -38,7 +38,7 @@
##### $Id: proto.m4,v 8.734 2008/01/24 23:42:01 ca Exp $ #####
# level 10 config file format
-V10
+V10/Berkeley
# 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