[csw-devel] SF.net SVN: gar:[14847] csw/mgar/pkg/sendmail/trunk
bonivart at users.sourceforge.net
bonivart at users.sourceforge.net
Tue Jun 21 10:57:46 CEST 2011
Revision: 14847
http://gar.svn.sourceforge.net/gar/?rev=14847&view=rev
Author: bonivart
Date: 2011-06-21 08:57:45 +0000 (Tue, 21 Jun 2011)
Log Message:
-----------
sendmail/trunk: build contrib package, migrate config
Modified Paths:
--------------
csw/mgar/pkg/sendmail/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/sendmail/trunk/files/oracle-sendmail-deactivate.sh
csw/mgar/pkg/sendmail/trunk/files/oracle-sendmail-reactivate.sh
Removed Paths:
-------------
csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-deactivate.sh
csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-reactivate.sh
csw/mgar/pkg/sendmail/trunk/files/patch-CC-M.m4
Modified: csw/mgar/pkg/sendmail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-21 01:31:06 UTC (rev 14846)
+++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-21 08:57:45 UTC (rev 14847)
@@ -1,16 +1,12 @@
# $Id$
# TODO
-# - Include activate/deactivate scripts
-# - Tests?
# - Build separate 9/10 packages?
-# - migrate conf from /opt/csw/etc/mail
-# - try to fix bugs
-# - 2915 Must stop built-in sendmail manually
-# - 3864 Sendmail must be relinked with new berekeley db
-# - 4150 Sendmail 8.14.4 released
-# - 4486 Provide sendmail's contrib/ tools as a separate package?
+# + #4486 Provide sendmail's contrib/ tools as a separate package?
+# + Include activate/deactivate scripts
+# + migrate conf from /opt/csw/etc/mail
+# + Tests? Not really possible to test during build
# + libmilter
# + use alternatives to clear collisions with postfix, see sudo as example
# + post message
@@ -20,6 +16,9 @@
# + cpsample conf files
# + remove COPYING file
# + copy usergroup file into place
+# + #3864 Sendmail must be relinked with new berkeley db -> bdb48
+# + #2915 Must stop built-in sendmail manually -> n/a
+# + #4150 Sendmail 8.14.4 released -> this is 8.14.5
NAME = sendmail
VERSION = 8.14.5
@@ -41,11 +40,11 @@
#MY_CLASSES = CSWsendmail.i.sol9 CSWsendmail.i.sol10
DISTFILES = $(NAME).$(VERSION).tar.gz
-DISTFILES += Sun-sendmail-deactivate.sh Sun-sendmail-reactivate.sh
DISTFILES += aliases helpfile local-host-names sendmail.cf
DISTFILES += sm-client.st statistics submit.cf trusted-users
-DISTFILES += README.CSW sendmail.schema
-DISTFILES += cswsendmail site.config.m4
+DISTFILES += README.CSW sendmail.schema site.config.m4
+DISTFILES += oracle-sendmail-deactivate.sh oracle-sendmail-reactivate.sh
+DISTFILES += cswsendmail cswusergroup
#DISTFILES += $(foreach FILE,$(shell cd $(FILEDIR) && ls *.CSW),$(FILE))
#DISTFILES += CSWsendmail.preremove CSWsendmail.preinstall CSWsendmail.space
#DISTFILES += cswsendmail site.config.m4 $(MY_CLASSES) CSWsendmail.checkinstall
@@ -62,16 +61,41 @@
RUNTIME_DEP_PKGS_CSWsendmail += CSWtcpwrap
RUNTIME_DEP_PKGS_CSWsendmail += CSWbdb48
-PACKAGES += CSWlibmilter
-CATALOGNAME_CSWlibmilter = libmilter
-SPKG_DESC_CSWlibmilter = Sendmail MTA milter
-PKGFILES_CSWlibmilter = $(docdir)/libmilter/.*
-PKGFILES_CSWlibmilter += /opt/csw/include/libmilter.h
-PKGFILES_CSWlibmilter += $(libdir)/libmilter.a
-PKGFILES_CSWlibmilter += $(libdir)/libsm.a
-PKGFILES_CSWlibmilter += $(libdir)/libsmdb.a
-PKGFILES_CSWlibmilter += $(libdir)/libsmutil.a
+PACKAGES += CSWlibmilter
+CATALOGNAME_CSWlibmilter = libmilter
+SPKG_DESC_CSWlibmilter = Sendmail MTA milter
+PKGFILES_CSWlibmilter = $(docdir)/libmilter/.*
+PKGFILES_CSWlibmilter += /opt/csw/include/libmilter.h
+PKGFILES_CSWlibmilter += $(libdir)/libmilter.a
+PKGFILES_CSWlibmilter += $(libdir)/libsm.a
+PKGFILES_CSWlibmilter += $(libdir)/libsmdb.a
+PKGFILES_CSWlibmilter += $(libdir)/libsmutil.a
+PACKAGES += CSWsendmail-contrib
+CATALOGNAME_CSWsendmail-contrib = sendmail_contrib
+SPKG_DESC_CSWsendmail-contrib = Sendmail MTA contrib
+RUNTIME_DEP_PKGS_CSWsendmail-contrib = CSWperl
+ARCHALL_CSWsendmail-contrib = 1
+PKGFILES_CSWsendmail-contrib = $(docdir)/sendmail_contrib/.*
+PKGFILES_CSWsendmail-contrib += $(bindir)/link_hash.sh
+PKGFILES_CSWsendmail-contrib += $(bindir)/movemail.pl
+PKGFILES_CSWsendmail-contrib += $(bindir)/smcontrol.pl
+PKGFILES_CSWsendmail-contrib += $(bindir)/passwd-to-alias.pl
+PKGFILES_CSWsendmail-contrib += $(bindir)/socketmapClient.pl
+PKGFILES_CSWsendmail-contrib += $(bindir)/bounce-resender.pl
+PKGFILES_CSWsendmail-contrib += $(bindir)/doublebounce.pl
+PKGFILES_CSWsendmail-contrib += $(bindir)/mailprio
+PKGFILES_CSWsendmail-contrib += $(bindir)/socketmapServer.pl
+PKGFILES_CSWsendmail-contrib += $(bindir)/qtool.pl
+PKGFILES_CSWsendmail-contrib += $(bindir)/buildvirtuser
+PKGFILES_CSWsendmail-contrib += $(bindir)/etrn.pl
+PKGFILES_CSWsendmail-contrib += $(bindir)/re-mqueue.pl
+PKGFILES_CSWsendmail-contrib += $(bindir)/cidrexpand
+PKGFILES_CSWsendmail-contrib += $(bindir)/expn.pl
+PKGFILES_CSWsendmail-contrib += $(mandir)/man1/etrn.0
+PKGFILES_CSWsendmail-contrib += $(mandir)/man8/qtool.8
+PKGFILES_CSWsendmail-contrib += $(sysconfdir)/movemail.conf
+
INITSMF = /etc/opt/csw/init.d/cswsendmail
SAMPLECONF = $(addprefix /etc/opt/csw/mail/,$(CONFFILES))
SAMPLECONF += /var/opt/csw/spool/clientmqueue/sm-client.st
@@ -94,14 +118,15 @@
# END { { print "i i.sol9=CSWsendmail.i.sol9" } \
# { print "i i.sol10=CSWsendmail.i.sol10" } }'
-#ENABLE_CHECK = 0
-
# Patch away GNUism
-#PATCHFILES = patch-CC-M.m4
-
PATCHFILES += 0001-add-libmilter-to-the-Makefile.patch
PATCHFILES += 0002-no-gnuism.patch
+MIGRATE_FILES_CSWsendmail = aliases helpfile local-host-names sendmail.cf
+MIGRATE_FILES_CSWsendmail += statistics submit.cf trusted-users
+MIGRATE_SOURCE_DIR_CSWsendmail = /opt/csw/etc/mail
+MIGRATE_DEST_DIR_CSWsendmail = /etc/opt/csw/mail
+
CONFIGURE_SCRIPTS = custom
BUILD_SCRIPTS = custom
TEST_SCRIPTS = custom
@@ -133,6 +158,14 @@
CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/mailer/fax.m4
CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/mailer/procmail.m4
CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/mailer/phquery.m4
+CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/etc/opt/csw/movemail.conf
+CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sendmail_contrib/mmuegel
+CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/etrn.pl
+CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/doublebounce.pl
+CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/movemail.pl
+CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/expn.pl
+CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/bounce-resender.pl
+CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/bin/re-mqueue.pl
# The static libs from libmilter
CHECKPKG_OVERRIDES_CSWlibmilter += discouraged-path-in-pkgmap|/opt/csw/lib/libsmutil.a
@@ -160,6 +193,15 @@
CONFFILES = aliases helpfile local-host-names sendmail.cf \
statistics submit.cf trusted-users
INCLFILES = libmilter/libmilter.h
+CONTBIN = link_hash.sh movemail.pl smcontrol.pl \
+ passwd-to-alias.pl socketmapClient.pl bounce-resender.pl \
+ doublebounce.pl mailprio socketmapServer.pl \
+ qtool.pl buildvirtuser etrn.pl re-mqueue.pl \
+ cidrexpand expn.pl
+CONTDOC = dnsblaccess.m4 domainmap.m4 mmuegel
+CONTMAN1 = etrn.0
+CONTMAN8 = qtool.8
+CONTCONF = movemail.conf
configure-custom:
@echo " ==> Configuring $(NAME) (custom)"
@@ -178,8 +220,9 @@
@$(MAKECOOKIE)
install-custom:
+ @echo " ==> Installing $(NAME) (custom)"
+
@# Install dirs
- @echo " ==> Installing $(NAME) (custom)"
ginstall -d $(DESTDIR)$(libdir)
ginstall -d $(DESTDIR)$(bindir)
ginstall -d $(DESTDIR)$(sbindir)
@@ -191,6 +234,10 @@
ginstall -d $(DESTDIR)/etc/opt/csw/init.d
ginstall -d $(DESTDIR)$(sysconfdir)/mail
ginstall -d $(DESTDIR)/opt/csw/include
+ ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME)
+ ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME)_contrib
+ ginstall -m 755 -d $(DESTDIR)$(docdir)/libmilter
+ ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail
@# Install the libraries
( for file in $(LIBFILES) ; do \
@@ -252,11 +299,9 @@
$(DESTDIR)/var/opt/csw/spool/clientmqueue/ )
@# usergroup
- ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail
ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail/
@# README
- ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME)
ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(NAME)/
@# Create links in bindir
@@ -276,9 +321,29 @@
ginstall -m 444 $(FILEDIR)/CSWsendmail.postmsg $(DESTDIR)$(docdir)/sendmail/README.postinstall
@# Milter doc files
- ginstall -m 755 -d $(DESTDIR)$(docdir)/libmilter
ginstall -m 644 $(WORKSRC)/libmilter/docs/* $(DESTDIR)$(docdir)/libmilter
+ @# Contrib files
+ ( for file in $(CONTBIN) ; do \
+ ginstall -m 755 $(WORKSRC)/contrib/$$file $(DESTDIR)$(bindir) ; \
+ done )
+ ( for file in $(CONTCONF) ; do \
+ ginstall -m 644 $(WORKSRC)/contrib/$$file $(DESTDIR)$(sysconfdir) ; \
+ done )
+ ( for file in $(CONTDOC) ; do \
+ ginstall -m 444 $(WORKSRC)/contrib/$$file $(DESTDIR)$(docdir)/sendmail_contrib ; \
+ done )
+ ( for file in $(CONTMAN1) ; do \
+ ginstall -m 644 $(WORKSRC)/contrib/$$file $(DESTDIR)$(mandir)/man1 ; \
+ done )
+ ( for file in $(CONTMAN8) ; do \
+ ginstall -m 644 $(WORKSRC)/contrib/$$file $(DESTDIR)$(mandir)/man8 ; \
+ done )
+
+ @# Deactivate/reactivate scripts
+ ginstall -m 755 $(DOWNLOADDIR)/oracle-sendmail-deactivate.sh $(DESTDIR)$(docdir)/sendmail
+ ginstall -m 755 $(DOWNLOADDIR)/oracle-sendmail-reactivate.sh $(DESTDIR)$(docdir)/sendmail
+
@$(MAKECOOKIE)
merge-OS:
Deleted: csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-deactivate.sh
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-deactivate.sh 2011-06-21 01:31:06 UTC (rev 14846)
+++ csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-deactivate.sh 2011-06-21 08:57:45 UTC (rev 14847)
@@ -1,106 +0,0 @@
-#!/bin/sh
-# 2007-12-09 Initial version created from old CSWsendmail Postinstall script
-#
-
-# Make backup of Sun sendmail files
-# /usr/sbin/newaliases or /usr/bin/newaliases
- if /bin/test ! -L /usr/sbin/newaliases.OFF && /bin/test -L /usr/sbin/newaliases ; then
- echo "Moving /usr/sbin/newaliases to newaliases.OFF"
- mv /usr/sbin/newaliases /usr/sbin/newaliases.OFF
- fi
- if /bin/test ! -L /usr/bin/newaliases.OFF && /bin/test -L /usr/bin/newaliases ; then
- echo "Moving /usr/bin/newaliases to newaliases.OFF"
- mv /usr/bin/newaliases /usr/bin/newaliases.OFF
- fi
-# /usr/bin/mailq. In Solaris 8, mailq is a file. In Solaris 9,
-# mailq is a symlink. In CSW sendmail, mailq is symlink.
- if /bin/test ! -f /usr/bin/mailq.OFF && /bin/test -f /usr/bin/mailq ; then
- echo "Moving /usr/bin/mailq to mailq.OFF"
- mv /usr/bin/mailq /usr/bin/mailq.OFF
- fi
- if /bin/test ! -L /usr/bin/mailq.OFF && /bin/test -L /usr/bin/mailq ; then
- echo "Moving /usr/bin/mailq to mailq.OFF"
- mv /usr/bin/mailq /usr/bin/mailq.OFF
- fi
-# /usr/bin/vacation
- if /bin/test ! -f /usr/bin/vacation.OFF && /bin/test -f /usr/bin/vacation ; then
- echo "Moving /usr/bin/vacation to vacation.OFF"
- mv /usr/bin/vacation /usr/bin/vacation.OFF
- fi
-# /usr/bin/mailstats
- if /bin/test ! -f /usr/bin/mailstats.OFF && /bin/test -f /usr/bin/mailstats ; then
- echo "Moving /usr/bin/mailstats to mailstats.OFF"
- mv /usr/bin/mailstats /usr/bin/mailstats.OFF
- fi
-# /usr/sbin/makemap
- if /bin/test ! -f /usr/sbin/makemap.OFF && /bin/test -f /usr/sbin/makemap ; then
- echo "Moving /usr/sbin/makemap to makemap.OFF"
- mv /usr/sbin/makemap /usr/sbin/makemap.OFF
- fi
-# /usr/bin/praliases
- if /bin/test ! -f /usr/bin/praliases.OFF && /bin/test -f /usr/bin/praliases ; then
- echo "Moving /usr/bin/praliases to praliases.OFF"
- mv /usr/bin/praliases /usr/bin/praliases.OFF
- fi
-# /usr/lib/smrsh
- if /bin/test ! -f /usr/lib/smrsh.OFF && /bin/test -f /usr/lib/smrsh ; then
- echo "Moving /usr/lib/smrsh to smrsh.OFF"
- mv /usr/lib/smrsh /usr/lib/smrsh.OFF
- fi
-# /usr/lib/mail.local
- if /bin/test ! -f /usr/lib/mail.local.OFF && /bin/test -f /usr/lib/mail.local ; then
- echo "Moving /usr/lib/mail.local to mail.local.OFF"
- mv /usr/lib/mail.local /usr/lib/mail.local.OFF
- fi
-# /etc/mail/sendmail.cf
- if /bin/test ! -f /etc/mail/sendmail.cf.OFF && /bin/test -f /etc/mail/sendmail.cf ; then
- echo "Moving /etc/mail/sendmail.cf to sendmail.cf.OFF"
- mv /etc/mail/sendmail.cf /etc/mail/sendmail.cf.OFF
- fi
-# /usr/lib/sendmail
- if /bin/test ! -f /usr/lib/sendmail.OFF && /bin/test -f /usr/lib/sendmail ; then
- echo "Moving /usr/lib/sendmail to sendmail.OFF"
- mv /usr/lib/sendmail /usr/lib/sendmail.OFF
- fi
-#
- echo "Making symbolic links in /usr for CSWsendmail files."
- if /bin/test -L /usr/bin/newaliases.OFF ; then
- echo "Making symlink /usr/bin/newaliases"
- ln -s /opt/csw/lib/sendmail /usr/bin/newaliases
- fi
- if /bin/test -L /usr/sbin/newaliases.OFF ; then
- echo "Making symlink /usr/sbin/newaliases"
- ln -s /opt/csw/lib/sendmail /usr/sbin/newaliases
- fi
- if /bin/test ! -L /usr/bin/mailq ; then
- echo "Making symlink /usr/bin/mailq"
- ln -s /opt/csw/lib/sendmail /usr/bin/mailq
- fi
- if /bin/test ! -L /usr/bin/vacation ; then
- echo "Making symlink /usr/bin/vacation"
- ln -s /opt/csw/bin/vacation /usr/bin/vacation
- fi
- if /bin/test ! -L /usr/bin/mailstats ; then
- echo "Making symlink /usr/bin/mailstats"
- ln -s /opt/csw/sbin/mailstats /usr/bin/mailstats
- fi
- if /bin/test ! -L /usr/sbin/makemap ; then
- echo "Making symlink /usr/sbin/makemap"
- ln -s /opt/csw/sbin/makemap /usr/sbin/makemap
- fi
- if /bin/test ! -L /usr/bin/praliases ; then
- echo "Making symlink /usr/bin/praliases"
- ln -s /opt/csw/sbin/praliases /usr/bin/praliases
- fi
- if /bin/test ! -L /usr/lib/smrsh ; then
- echo "Making symlink /usr/lib/smrsh"
- ln -s /opt/csw/lib/smrsh /usr/lib/smrsh
- fi
- if /bin/test ! -L /usr/lib/mail.local ; then
- echo "Making symlink /usr/lib/mail.local"
- ln -s /opt/csw/lib/mail.local /usr/lib/mail.local
- fi
- if /bin/test ! -L /usr/lib/sendmail ; then
- echo "Making symlink /usr/lib/sendmail"
- ln -s /opt/csw/lib/sendmail /usr/lib/sendmail
- fi
Deleted: csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-reactivate.sh
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-reactivate.sh 2011-06-21 01:31:06 UTC (rev 14846)
+++ csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-reactivate.sh 2011-06-21 08:57:45 UTC (rev 14847)
@@ -1,75 +0,0 @@
-#!/bin/sh
-# 2007-12-09 Initial version created from the old CSWsendmail preremove script
-#
-# Remove the symlinks for using CSWsendmail and return filesystem to
-# using Sun's sendmail.
-
-# Remove the symlinks to CSW files
- echo "Removing the symlinks to CSW files."
-# /usr/bin/newaliases or /usr/sbin/newaliases
- if /bin/test -L /usr/bin/newaliases ; then rm -f /usr/bin/newaliases ; fi
- if /bin/test -L /usr/sbin/newaliases ; then rm -f /usr/sbin/newaliases ; fi
-# /usr/bin/mailq. mailq is either a symlink or a file, depending
-# on the version of Solaris
- if /bin/test -L /usr/bin/mailq ; then rm -f /usr/bin/mailq ; fi
-# /usr/bin/vacation
- if /bin/test -L /usr/bin/vacation ; then rm -f /usr/bin/vacation ; fi
-# /usr/bin/mailstats
- if /bin/test -L /usr/bin/mailstats ; then rm -f /usr/bin/mailstats ; fi
-# /usr/sbin/makemap
- if /bin/test -L /usr/sbin/makemap ; then rm -f /usr/sbin/makemap ; fi
-# /usr/bin/praliases
- if /bin/test -L /usr/bin/praliases ; then rm -f /usr/bin/praliases ; fi
-# /usr/lib/smrsh
- if /bin/test -L /usr/lib/smrsh ; then rm -f /usr/lib/smrsh ; fi
-# /usr/lib/mail.local
- if /bin/test -L /usr/lib/mail.local ; then rm -f /usr/lib/mail.local ; fi
-# /usr/lib/sendmail
- if /bin/test -L /usr/lib/sendmail ; then rm -f /usr/lib/sendmail ; fi
-#
- echo "Symlinks to CSW files removed."
-#
-# Return to Sun files
-# /usr/bin/newaliases or /usr/sbin/newaliases
- if /bin/test -L /usr/bin/newaliases.OFF ; then
- mv -f /usr/bin/newaliases.OFF /usr/bin/newaliases
- fi
- if /bin/test -L /usr/sbin/newaliases.OFF ; then
- mv -f /usr/sbin/newaliases.OFF /usr/sbin/newaliases
- fi
- if /bin/test -L /usr/bin/mailq.OFF || /bin/test -f /usr/bin/mailq.OFF ; then
- mv -f /usr/bin/mailq.OFF /usr/bin/mailq
- fi
-# /usr/bin/vacation
- if /bin/test -f /usr/bin/vacation.OFF ; then
- mv -f /usr/bin/vacation.OFF /usr/bin/vacation
- fi
-# /usr/bin/mailstats
- if /bin/test -f /usr/bin/mailstats.OFF ; then
- mv -f /usr/bin/mailstats.OFF /usr/bin/mailstats
- fi
-# /usr/sbin/makemap
- if /bin/test -f /usr/sbin/makemap.OFF ; then
- mv -f /usr/sbin/makemap.OFF /usr/sbin/makemap
- fi
-# /usr/bin/praliases
- if /bin/test -f /usr/bin/praliases.OFF ; then
- mv -f /usr/bin/praliases.OFF /usr/bin/praliases
- fi
-# /usr/lib/smrsh
- if /bin/test -f /usr/lib/smrsh.OFF ; then
- mv -f /usr/lib/smrsh.OFF /usr/lib/smrsh
- fi
-# /usr/lib/mail.local
- if /bin/test -f /usr/lib/mail.local.OFF ; then
- mv -f /usr/lib/mail.local.OFF /usr/lib/mail.local
- fi
-# /usr/lib/sendmail
- if /bin/test -f /usr/lib/sendmail.OFF ; then
- mv -f /usr/lib/sendmail.OFF /usr/lib/sendmail
- fi
-# /etc/mail/sendmail.cf
- if /bin/test -f /etc/mail/sendmail.cf.OFF ; then
- mv -f /etc/mail/sendmail.cf.OFF /etc/mail/sendmail.cf
- fi
- echo "Sun sendmail files restored."
Copied: csw/mgar/pkg/sendmail/trunk/files/oracle-sendmail-deactivate.sh (from rev 14839, csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-deactivate.sh)
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/oracle-sendmail-deactivate.sh (rev 0)
+++ csw/mgar/pkg/sendmail/trunk/files/oracle-sendmail-deactivate.sh 2011-06-21 08:57:45 UTC (rev 14847)
@@ -0,0 +1,106 @@
+#!/bin/sh
+# 2007-12-09 Initial version created from old CSWsendmail Postinstall script
+#
+
+# Make backup of Sun sendmail files
+# /usr/sbin/newaliases or /usr/bin/newaliases
+ if /bin/test ! -L /usr/sbin/newaliases.OFF && /bin/test -L /usr/sbin/newaliases ; then
+ echo "Moving /usr/sbin/newaliases to newaliases.OFF"
+ mv /usr/sbin/newaliases /usr/sbin/newaliases.OFF
+ fi
+ if /bin/test ! -L /usr/bin/newaliases.OFF && /bin/test -L /usr/bin/newaliases ; then
+ echo "Moving /usr/bin/newaliases to newaliases.OFF"
+ mv /usr/bin/newaliases /usr/bin/newaliases.OFF
+ fi
+# /usr/bin/mailq. In Solaris 8, mailq is a file. In Solaris 9,
+# mailq is a symlink. In CSW sendmail, mailq is symlink.
+ if /bin/test ! -f /usr/bin/mailq.OFF && /bin/test -f /usr/bin/mailq ; then
+ echo "Moving /usr/bin/mailq to mailq.OFF"
+ mv /usr/bin/mailq /usr/bin/mailq.OFF
+ fi
+ if /bin/test ! -L /usr/bin/mailq.OFF && /bin/test -L /usr/bin/mailq ; then
+ echo "Moving /usr/bin/mailq to mailq.OFF"
+ mv /usr/bin/mailq /usr/bin/mailq.OFF
+ fi
+# /usr/bin/vacation
+ if /bin/test ! -f /usr/bin/vacation.OFF && /bin/test -f /usr/bin/vacation ; then
+ echo "Moving /usr/bin/vacation to vacation.OFF"
+ mv /usr/bin/vacation /usr/bin/vacation.OFF
+ fi
+# /usr/bin/mailstats
+ if /bin/test ! -f /usr/bin/mailstats.OFF && /bin/test -f /usr/bin/mailstats ; then
+ echo "Moving /usr/bin/mailstats to mailstats.OFF"
+ mv /usr/bin/mailstats /usr/bin/mailstats.OFF
+ fi
+# /usr/sbin/makemap
+ if /bin/test ! -f /usr/sbin/makemap.OFF && /bin/test -f /usr/sbin/makemap ; then
+ echo "Moving /usr/sbin/makemap to makemap.OFF"
+ mv /usr/sbin/makemap /usr/sbin/makemap.OFF
+ fi
+# /usr/bin/praliases
+ if /bin/test ! -f /usr/bin/praliases.OFF && /bin/test -f /usr/bin/praliases ; then
+ echo "Moving /usr/bin/praliases to praliases.OFF"
+ mv /usr/bin/praliases /usr/bin/praliases.OFF
+ fi
+# /usr/lib/smrsh
+ if /bin/test ! -f /usr/lib/smrsh.OFF && /bin/test -f /usr/lib/smrsh ; then
+ echo "Moving /usr/lib/smrsh to smrsh.OFF"
+ mv /usr/lib/smrsh /usr/lib/smrsh.OFF
+ fi
+# /usr/lib/mail.local
+ if /bin/test ! -f /usr/lib/mail.local.OFF && /bin/test -f /usr/lib/mail.local ; then
+ echo "Moving /usr/lib/mail.local to mail.local.OFF"
+ mv /usr/lib/mail.local /usr/lib/mail.local.OFF
+ fi
+# /etc/mail/sendmail.cf
+ if /bin/test ! -f /etc/mail/sendmail.cf.OFF && /bin/test -f /etc/mail/sendmail.cf ; then
+ echo "Moving /etc/mail/sendmail.cf to sendmail.cf.OFF"
+ mv /etc/mail/sendmail.cf /etc/mail/sendmail.cf.OFF
+ fi
+# /usr/lib/sendmail
+ if /bin/test ! -f /usr/lib/sendmail.OFF && /bin/test -f /usr/lib/sendmail ; then
+ echo "Moving /usr/lib/sendmail to sendmail.OFF"
+ mv /usr/lib/sendmail /usr/lib/sendmail.OFF
+ fi
+#
+ echo "Making symbolic links in /usr for CSWsendmail files."
+ if /bin/test -L /usr/bin/newaliases.OFF ; then
+ echo "Making symlink /usr/bin/newaliases"
+ ln -s /opt/csw/lib/sendmail /usr/bin/newaliases
+ fi
+ if /bin/test -L /usr/sbin/newaliases.OFF ; then
+ echo "Making symlink /usr/sbin/newaliases"
+ ln -s /opt/csw/lib/sendmail /usr/sbin/newaliases
+ fi
+ if /bin/test ! -L /usr/bin/mailq ; then
+ echo "Making symlink /usr/bin/mailq"
+ ln -s /opt/csw/lib/sendmail /usr/bin/mailq
+ fi
+ if /bin/test ! -L /usr/bin/vacation ; then
+ echo "Making symlink /usr/bin/vacation"
+ ln -s /opt/csw/bin/vacation /usr/bin/vacation
+ fi
+ if /bin/test ! -L /usr/bin/mailstats ; then
+ echo "Making symlink /usr/bin/mailstats"
+ ln -s /opt/csw/sbin/mailstats /usr/bin/mailstats
+ fi
+ if /bin/test ! -L /usr/sbin/makemap ; then
+ echo "Making symlink /usr/sbin/makemap"
+ ln -s /opt/csw/sbin/makemap /usr/sbin/makemap
+ fi
+ if /bin/test ! -L /usr/bin/praliases ; then
+ echo "Making symlink /usr/bin/praliases"
+ ln -s /opt/csw/sbin/praliases /usr/bin/praliases
+ fi
+ if /bin/test ! -L /usr/lib/smrsh ; then
+ echo "Making symlink /usr/lib/smrsh"
+ ln -s /opt/csw/lib/smrsh /usr/lib/smrsh
+ fi
+ if /bin/test ! -L /usr/lib/mail.local ; then
+ echo "Making symlink /usr/lib/mail.local"
+ ln -s /opt/csw/lib/mail.local /usr/lib/mail.local
+ fi
+ if /bin/test ! -L /usr/lib/sendmail ; then
+ echo "Making symlink /usr/lib/sendmail"
+ ln -s /opt/csw/lib/sendmail /usr/lib/sendmail
+ fi
Copied: csw/mgar/pkg/sendmail/trunk/files/oracle-sendmail-reactivate.sh (from rev 14839, csw/mgar/pkg/sendmail/trunk/files/Sun-sendmail-reactivate.sh)
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/oracle-sendmail-reactivate.sh (rev 0)
+++ csw/mgar/pkg/sendmail/trunk/files/oracle-sendmail-reactivate.sh 2011-06-21 08:57:45 UTC (rev 14847)
@@ -0,0 +1,75 @@
+#!/bin/sh
+# 2007-12-09 Initial version created from the old CSWsendmail preremove script
+#
+# Remove the symlinks for using CSWsendmail and return filesystem to
+# using Sun's sendmail.
+
+# Remove the symlinks to CSW files
+ echo "Removing the symlinks to CSW files."
+# /usr/bin/newaliases or /usr/sbin/newaliases
+ if /bin/test -L /usr/bin/newaliases ; then rm -f /usr/bin/newaliases ; fi
+ if /bin/test -L /usr/sbin/newaliases ; then rm -f /usr/sbin/newaliases ; fi
+# /usr/bin/mailq. mailq is either a symlink or a file, depending
+# on the version of Solaris
+ if /bin/test -L /usr/bin/mailq ; then rm -f /usr/bin/mailq ; fi
+# /usr/bin/vacation
+ if /bin/test -L /usr/bin/vacation ; then rm -f /usr/bin/vacation ; fi
+# /usr/bin/mailstats
+ if /bin/test -L /usr/bin/mailstats ; then rm -f /usr/bin/mailstats ; fi
+# /usr/sbin/makemap
+ if /bin/test -L /usr/sbin/makemap ; then rm -f /usr/sbin/makemap ; fi
+# /usr/bin/praliases
+ if /bin/test -L /usr/bin/praliases ; then rm -f /usr/bin/praliases ; fi
+# /usr/lib/smrsh
+ if /bin/test -L /usr/lib/smrsh ; then rm -f /usr/lib/smrsh ; fi
+# /usr/lib/mail.local
+ if /bin/test -L /usr/lib/mail.local ; then rm -f /usr/lib/mail.local ; fi
+# /usr/lib/sendmail
+ if /bin/test -L /usr/lib/sendmail ; then rm -f /usr/lib/sendmail ; fi
+#
+ echo "Symlinks to CSW files removed."
+#
+# Return to Sun files
+# /usr/bin/newaliases or /usr/sbin/newaliases
+ if /bin/test -L /usr/bin/newaliases.OFF ; then
+ mv -f /usr/bin/newaliases.OFF /usr/bin/newaliases
+ fi
+ if /bin/test -L /usr/sbin/newaliases.OFF ; then
+ mv -f /usr/sbin/newaliases.OFF /usr/sbin/newaliases
+ fi
+ if /bin/test -L /usr/bin/mailq.OFF || /bin/test -f /usr/bin/mailq.OFF ; then
+ mv -f /usr/bin/mailq.OFF /usr/bin/mailq
+ fi
+# /usr/bin/vacation
+ if /bin/test -f /usr/bin/vacation.OFF ; then
+ mv -f /usr/bin/vacation.OFF /usr/bin/vacation
+ fi
+# /usr/bin/mailstats
+ if /bin/test -f /usr/bin/mailstats.OFF ; then
+ mv -f /usr/bin/mailstats.OFF /usr/bin/mailstats
+ fi
+# /usr/sbin/makemap
+ if /bin/test -f /usr/sbin/makemap.OFF ; then
+ mv -f /usr/sbin/makemap.OFF /usr/sbin/makemap
+ fi
+# /usr/bin/praliases
+ if /bin/test -f /usr/bin/praliases.OFF ; then
+ mv -f /usr/bin/praliases.OFF /usr/bin/praliases
+ fi
+# /usr/lib/smrsh
+ if /bin/test -f /usr/lib/smrsh.OFF ; then
+ mv -f /usr/lib/smrsh.OFF /usr/lib/smrsh
+ fi
+# /usr/lib/mail.local
+ if /bin/test -f /usr/lib/mail.local.OFF ; then
+ mv -f /usr/lib/mail.local.OFF /usr/lib/mail.local
+ fi
+# /usr/lib/sendmail
+ if /bin/test -f /usr/lib/sendmail.OFF ; then
+ mv -f /usr/lib/sendmail.OFF /usr/lib/sendmail
+ fi
+# /etc/mail/sendmail.cf
+ if /bin/test -f /etc/mail/sendmail.cf.OFF ; then
+ mv -f /etc/mail/sendmail.cf.OFF /etc/mail/sendmail.cf
+ fi
+ echo "Sun sendmail files restored."
Deleted: csw/mgar/pkg/sendmail/trunk/files/patch-CC-M.m4
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/patch-CC-M.m4 2011-06-21 01:31:06 UTC (rev 14846)
+++ csw/mgar/pkg/sendmail/trunk/files/patch-CC-M.m4 2011-06-21 08:57:45 UTC (rev 14847)
@@ -1,10 +0,0 @@
---- sendmail-8.14.3.orig/devtools/M4/depend/CC-M.m4 1999-05-28 00:03:28.000000000 +0200
-+++ sendmail-8.14.3/devtools/M4/depend/CC-M.m4 2009-07-30 17:49:02.234202786 +0200
-@@ -3,6 +3,6 @@
- @mv Makefile Makefile.old
- @sed -e '/^# Do not edit or remove this line or anything below it.$$/,$$d' < Makefile.old > Makefile
- @echo "# Do not edit or remove this line or anything below it." >> Makefile
-- ${CC} -M ${COPTS} ${SRCS} >> Makefile
-+ ${CC} -xM ${COPTS} ${SRCS} >> Makefile
-
- # End of $RCSfile: CC-M.m4,v $
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