[Lunar-commits] CVS: moonbase/mail/sendmail CONFIGURE, NONE, 1.1 BUILD, 1.8, 1.9 POST_INSTALL, 1.2, 1.3

[Jon South]

Update of /var/cvs/lunar/moonbase/mail/sendmail
In directory dbguin.lunar-linux.org:/tmp/cvs-serv16677

Modified Files:
	BUILD POST_INSTALL 
Added Files:
	CONFIGURE 
Log Message:
Adding support for libmilter (required for use with spamassassin)


--- NEW FILE: CONFIGURE ---
#FOO=""
#if ! grep -q "$FOO" $MODULE_CONFIG; then
#  if query "" y; then
#     echo "$FOO=y" >> $MODULE_CONFIG
#  else
#     echo "$FOO=n" >> $MODULE_CONFIG
#  fi
#fi

FOO="MILTER"
if ! grep -q "$FOO" $MODULE_CONFIG; then
  if query "Build libmilter extension (required for spamassassin)?" y; then
     echo "$FOO=y" >> $MODULE_CONFIG
  else
     echo "$FOO=n" >> $MODULE_CONFIG
  fi
fi

Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/mail/sendmail/BUILD,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- BUILD	27 Feb 2004 09:27:31 -0000	1.8
+++ BUILD	23 Apr 2004 20:40:38 -0000	1.9
@@ -6,6 +6,11 @@
   echo "define(\`confTRUSTED_USER', \`mail')" >> devtools/Site/site.config.m4  &&
   echo "define(\`confRUN_AS_USER', \`mail:mail')"  >> devtools/Site/site.config.m4  &&
   echo "define(\`confMANROOT', \`/usr/share/man/man')" >> devtools/Site/site.config.m4  &&
+
+  if [ "$MILTER" == "y" ] ; then
+    echo "APPENDDEF(\`conf_sendmail_ENVDEF', \`-DMILTER')" >> devtools/Site/site.config.m4
+  fi  &&
+
   # global stuff for submit.mc:
   echo "define(\`confTRUSTED_USER', \`mail')" >> cf/cf/submit.mc  &&
   echo "define(\`confRUN_AS_USER', \`mail:mail')" >> cf/cf/submit.mc  &&
@@ -16,6 +21,10 @@
 
   sh Build  &&
 
+  cd libmilter  &&
+  sh Build  &&
+  cd ..  &&
+
   prepare_install  &&
 
   # users to be created:
@@ -23,6 +32,10 @@
   
   sh Build install
 
+  cd libmilter  &&
+  sh Build install  &&
+  cd ..  &&
+
   # directories and files:
   mkdir -p /etc/mail  &&
   mkdir -p /var/spool/mail  &&

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/mail/sendmail/POST_INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- POST_INSTALL	7 Jan 2004 14:14:15 -0000	1.2
+++ POST_INSTALL	23 Apr 2004 20:40:38 -0000	1.3
@@ -1,16 +1,27 @@
+
+MAIL_MAKE=0
+
 if [ ! -f /etc/mail/local-host-names ] ; then
   touch /etc/mail/local-host-names
+  MAIL_MAKE=1
 fi  &&
 if [ ! -f /etc/mail/aliases ] ; then
   touch /etc/mail/aliases
+  MAIL_MAKE=1
 fi  &&
 if [ ! -f /etc/mail/sendmail.mc ] ; then
   install -m 0640 -g mail -o root $SOURCE_DIRECTORY/cf/cf/sendmail.mc /etc/mail/
   ( cd /etc/mail && make sendmail.cf )
+  MAIL_MAKE=1
 fi  &&
 if [ ! -f /etc/mail/submit.mc ] ; then
   install -m 0640 -g mail -o root $SOURCE_DIRECTORY/cf/cf/submit.mc /etc/mail/
   ( cd /etc/mail && make submit.cf )
+  MAIL_MAKE=1
 fi  &&
-( cd /etc/mail && make all )
 
+# Prevent nuking a CURRENT installation of sendmail ... grumble grumble
+#
+if [ "$MAIL_MAKE" == "1" ] ; then
+  ( cd /etc/mail && make all )
+fi