[csw-devel] SF.net SVN: gar:[14850] csw/mgar/pkg/sendmail/trunk
bonivart at users.sourceforge.net
bonivart at users.sourceforge.net
Tue Jun 21 14:26:49 CEST 2011
Revision: 14850
http://gar.svn.sourceforge.net/gar/?rev=14850&view=rev
Author: bonivart
Date: 2011-06-21 12:26:49 +0000 (Tue, 21 Jun 2011)
Log Message:
-----------
sendmail/trunk: clean up Makefile, adjust paths in sendmail.cf and init script, edit post message
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
Modified: csw/mgar/pkg/sendmail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-21 09:07:58 UTC (rev 14849)
+++ csw/mgar/pkg/sendmail/trunk/Makefile 2011-06-21 12:26:49 UTC (rev 14850)
@@ -3,13 +3,14 @@
# TODO
# - Build separate 9/10 packages?
+# + post message
+# + Fix paths in sendmail.cf and cswsendmail
# + #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
+# + build libmilter
# + use alternatives to clear collisions with postfix, see sudo as example
-# + post message
# + never start cswsendmail by default (collides with system sendmail)
# + path to sendmail.cf (/etc/opt/csw/mail)
# + bdb hash support
@@ -29,26 +30,15 @@
Sendmail MTA
endef
-#INSTALLISADIR = $(WORKROOTDIR)/install-$(GAROSREL)-$(MODULATION)
-#WORKDIR = $(WORKROOTDIR)/build-$(GAROSREL)-$(MODULATION)
-#WORKDIR_FIRSTMOD = $(WORKROOTDIR)/build-$(GAROSREL)-$(firstword $(MODULATIONS))
-#COOKIEDIR = $(COOKIEROOTDIR)/$(GAROSREL)-$(MODULATION)
-
MASTER_SITES = ftp://ftp.sendmail.org/pub/sendmail/
SPKG_SOURCEURL = http://www.sendmail.org
-#MY_CLASSES = CSWsendmail.i.sol9 CSWsendmail.i.sol10
-
DISTFILES = $(NAME).$(VERSION).tar.gz
DISTFILES += aliases helpfile local-host-names sendmail.cf
DISTFILES += sm-client.st 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
-#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
-#DISTFILES += README.CSW sendmail.schema CSWsendmail.postinstall
LICENSE = LICENSE
@@ -108,16 +98,6 @@
# Do not remove the static libs from libmilter
MERGE_EXCLUDE_STATICLIBS =
-#PROTOTYPE_FILTER = awk \
-# '$$$$2 ~/i.sol9/ { next } \
-# $$$$2 ~/i.sol10/ { next } \
-# $$$$3 ~/\/init\.d\/cswsendmail$$$$/ {$$$$2 = "cswinitsmf"} \
-# $$$$3 ~/sol9\./ { $$$$2 = "sol9" } \
-# $$$$3 ~/sol10\./ { $$$$2 = "sol10" } \
-# { print } \
-# END { { print "i i.sol9=CSWsendmail.i.sol9" } \
-# { print "i i.sol10=CSWsendmail.i.sol10" } }'
-
# Patch away GNUism
PATCHFILES += 0001-add-libmilter-to-the-Makefile.patch
PATCHFILES += 0002-no-gnuism.patch
@@ -131,7 +111,6 @@
BUILD_SCRIPTS = custom
TEST_SCRIPTS = custom
INSTALL_SCRIPTS = custom
-#EXTRA_MERGE_SCRIPTS = OS
# Some files collide with CSWpostfix
ALTERNATIVES_CSWsendmail = mailq newaliases mailq.1 newaliases.1 aliases.5
@@ -175,9 +154,6 @@
include gar/category.mk
-#ADMSCRIPTS = preremove preinstall space depend i.sol9 i.sol10
-
-#SOLVER = sol$(shell uname -r |sed 's/5\.//')
PLATFORM = $(shell if [ `uname -i` = "i86pc" ] ; then echo i86pc ; else echo sun4 ; fi )
OBJDIR = $(WORKDIR)/$(DISTNAME)/obj.SunOS.$(GAROSREL).$(PLATFORM)
LIBFILES = sendmail/sendmail mail.local/mail.local smrsh/smrsh rmail/rmail
@@ -250,17 +226,6 @@
ginstall -m 755 $(OBJDIR)/$$file $(DESTDIR)$(sbindir) ; \
done )
- @# rename libraries and binaries os-specific
-# ( for file in `ls $(DESTDIR)$(libdir)`; do \
-# mv $(DESTDIR)$(libdir)/$$file $(DESTDIR)$(libdir)/$(SOLVER).$$file; \
-# done )
-# ( for file in `ls $(DESTDIR)$(bindir)`; do \
-# mv $(DESTDIR)$(bindir)/$$file $(DESTDIR)$(bindir)/$(SOLVER).$$file; \
-# done )
-# ( for file in `ls $(DESTDIR)$(sbindir)`; do \
-# mv $(DESTDIR)$(sbindir)/$$file $(DESTDIR)$(sbindir)/$(SOLVER).$$file;\
-# done )
-
@# Install manpages
( for file in $(MANFILES1) ; do \
ginstall -m 644 $(OBJDIR)/$$file $(DESTDIR)$(mandir)/man1 ; \
@@ -345,23 +310,3 @@
ginstall -m 755 $(DOWNLOADDIR)/oracle-sendmail-reactivate.sh $(DESTDIR)$(docdir)/sendmail
@$(MAKECOOKIE)
-
-merge-OS:
- @echo " ==> Merging $(NAME) (custom)"
- @# create links in bindir
- ln -s $(libdir)/sendmail $(PKGROOT)$(bindir)/newaliases
- ln -s $(libdir)/sendmail $(PKGROOT)$(bindir)/mailq
- ln -s $(libdir)/sendmail $(PKGROOT)$(bindir)/purgestats
- ln -s $(libdir)/sendmail $(PKGROOT)$(bindir)/hoststat
-
- @# Install the other install trees
- ( for dir in `ls -d $(abspath $(WORKROOTDIR)/install*-$(MODULATION))` ; do \
- ( if [ "x`echo $$dir |sed "s/.*install-\(5.[0-9]*\)-$(MODULATION).*/\1/"`x" != "x$(GAROSREL)x" ]; then \
- cd $$dir$(bindir) && \
- /usr/bin/pax -rw -v * $(PKGROOT)$(bindir);\
- cd $$dir$(sbindir) && \
- /usr/bin/pax -rw -v * $(PKGROOT)$(sbindir);\
- cd $$dir$(libdir) && \
- /usr/bin/pax -rw -v * $(PKGROOT)$(libdir); \
- fi ) \
- done )
Modified: csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg 2011-06-21 09:07:58 UTC (rev 14849)
+++ csw/mgar/pkg/sendmail/trunk/files/CSWsendmail.postmsg 2011-06-21 12:26:49 UTC (rev 14850)
@@ -1,45 +1,67 @@
-=== SAMPLE FROM OTHER PACKAGES ===
+Notes for users of previous versions of CSWsendmail
+===================================================
---- POSTFIX ---
+Solaris built-in Sendmail
+-------------------------
-Note for users upgrading from postfix 2.4.6 and previous
---------------------------------------------------------
+The CSWsendmail package no longer tries to deactivate the built-in
+Sendmail in Solaris. Instead you get similar scripts that you can
+run yourself if you don't want to do the modifications manually.
-- Starting with postfix 2.6.x the spool location has changed from
+ * /opt/csw/share/doc/sendmail/oracle-sendmail-deactivate.sh
+ * /opt/csw/share/doc/sendmail/oracle-sendmail-reactivate.sh
- /opt/csw/var/spool/postfix to
- /var/opt/csw/spool/postfix
+You should, as a minimum, disable the built-in Sendmail from starting
+at boot to avoid port 25 conflicts. Also, many utilities using mail
+expect Sendmail to be located in /usr/lib/sendmail e.g.
- If you have any pending email in the old spool location, please move
- it to the new spool location and run "postsuper" before starting
- postfix. An example script on how this can be done is shipped with the
- package (migrate-queuefiles.sh). Make sure to understand what you are
- doing.
+If you disable the rc-script in Solaris 9 and create links to
+CSWsendmail binaries manually or with the above mentioned script
+please be aware that Oracle patches may very well restore this.
+You have to be aware of this when patching as long as the built-in
+Sendmail packages are on your system.
-- Starting with postfix 2.6.x this package will _not_ automatically
- substitute the common sendmail binaries with links to the postfix
- binaries any more. Thus, the following files will be untouched and
- possibly belong to the system sendmail installation.
-
- /usr/lib/sendmail
- /usr/bin/mailq
- /usr/bin/newaliases
-
- This makes the package installation less troublesome for shared zones
- and leaves the choice of fully replacing your system sendmail up to you.
- If you intend to replace those binaries above with the ones from this
- postfix package, please see README.CSW.
+Default paths
+-------------
---- MUTT ---
+The default paths are now:
-There are now two versions of mutt on the system installed:
+ * /etc/opt/csw/mail
+ * /var/opt/csw/spool
- * mutt-ncurses with ncurses interface
- * mutt-slang with slang interface (per default linked to 'mutt')
+Your configuration files in /opt/csw/etc/mail will be migrated to
+the new location automatically.
-You can easily select between the versions with the alternatives(8)
-system by executing
+You can of course control almost everything by building a new
+sendmail.cf, take a look in /opt/csw/share/mail/cf. The init script
+(/etc/opt/csw/init.d/cswsendmail) may also need modification if you
+want to use other paths.
- /opt/csw/sbin/alternatives --config mutt
+Alternatives
+------------
+A few files are provided by both the Sendmail and Postfix packages:
+
+ * /opt/csw/bin/mailq
+ * /opt/csw/bin/newaliases
+ * /opt/csw/share/man/man1/aliases.1
+ * /opt/csw/share/man/man1/mailq.1
+ * /opt/csw/share/man/man1/newaliases.1
+
+Normally you don't have both those packages on the same system but
+if you do you can easily select between the versions with the
+alternatives(8) system by executing e.g.:
+
+ # /opt/csw/sbin/alternatives --config mailq
+
See http://www.opencsw.org/packages/alternatives for details.
+
+Contrib
+-------
+
+There's a new package, CSWsendmail-contrib, which contains the
+contents of the contrib dir in the Sendmail source. There's some
+useful scripts there.
+
+--
+Peter Bonivart, OpenCSW, 2011-06-21
Modified: csw/mgar/pkg/sendmail/trunk/files/cswsendmail
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/cswsendmail 2011-06-21 09:07:58 UTC (rev 14849)
+++ csw/mgar/pkg/sendmail/trunk/files/cswsendmail 2011-06-21 12:26:49 UTC (rev 14850)
@@ -13,8 +13,8 @@
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"
-DEFAULT_FILE="/opt/csw/etc/default/sendmail"
-ALIASES_FILE="/opt/csw/etc/mail/aliases"
+DEFAULT_FILE="/etc/opt/csw/default/sendmail"
+ALIASES_FILE="/etc/opt/csw/mail/aliases"
check_queue_interval_syntax()
{
@@ -36,7 +36,7 @@
;;
'start')
- if [ -f /opt/csw/lib/sendmail -a -f /opt/csw/etc/mail/sendmail.cf ]; then
+ if [ -f /opt/csw/lib/sendmail -a -f /etc/opt/csw/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
Modified: csw/mgar/pkg/sendmail/trunk/files/sendmail.cf
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/sendmail.cf 2011-06-21 09:07:58 UTC (rev 14849)
+++ csw/mgar/pkg/sendmail/trunk/files/sendmail.cf 2011-06-21 12:26:49 UTC (rev 14850)
@@ -65,7 +65,7 @@
Cwlocalhost
# file containing names of hosts for which we receive email
-Fw/opt/csw/etc/mail/local-host-names
+Fw/etc/opt/csw/mail/local-host-names
# my official domain name
# ... define this only if sendmail cannot automatically determine your domain
@@ -94,7 +94,7 @@
# Hosts for which relaying is permitted ($=R)
-FR-o /opt/csw/etc/mail/relay-domains
+FR-o /etc/opt/csw/mail/relay-domains
# arithmetic map
Karith arith
@@ -139,7 +139,7 @@
O AliasWait=10
# location of alias file
-O AliasFile=/opt/csw/etc/mail/aliases
+O AliasFile=/etc/opt/csw/mail/aliases
# minimum number of free blocks on filesystem
O MinFreeBlocks=100
@@ -160,7 +160,7 @@
O DeliveryMode=background
# error message header/file
-#O ErrorHeader=/opt/csw/etc/mail/error-header
+#O ErrorHeader=/etc/opt/csw/mail/error-header
# error mode
#O ErrorMode=print
@@ -181,7 +181,7 @@
#O MaxHopCount=25
# location of help file
-O HelpFile=/opt/csw/etc/mail/helpfile
+O HelpFile=/etc/opt/csw/mail/helpfile
# ignore dots as terminators in incoming messages?
#O IgnoreDots=False
@@ -266,7 +266,7 @@
#O FastSplit=1
# queue directory
-O QueueDirectory=/var/spool/mqueue
+O QueueDirectory=/var/opt/csw/spool/mqueue
# key for shared memory; 0 to turn off, -1 to auto-select
#O SharedMemoryKey=0
@@ -335,7 +335,7 @@
#O DefaultUser=mailnull
# list of locations of user database file (null means no lookup)
-#O UserDatabaseSpec=/opt/csw/etc/mail/userdb
+#O UserDatabaseSpec=/etc/opt/csw/mail/userdb
# fallback MX host
#O FallbackMXhost=fall.back.host.net
@@ -383,7 +383,7 @@
#O DefaultCharSet=unknown-8bit
# service switch file (name hardwired on Solaris, Ultrix, OSF/1, others)
-#O ServiceSwitchFile=/opt/csw/etc/mail/service.switch
+#O ServiceSwitchFile=/etc/opt/csw/mail/service.switch
# hosts file (normally /etc/hosts)
#O HostsFile=/etc/hosts
@@ -461,7 +461,7 @@
#O TrustedUser=root
# Control socket for daemon management
-#O ControlSocketName=/var/spool/mqueue/.control
+#O ControlSocketName=/var/opt/csw/spool/mqueue/.control
# Maximum MIME header length to protect MUAs
#O MaxMimeHeaderLength=0/0
@@ -497,7 +497,7 @@
#O AuthRealm
# default authentication information for outgoing connections
-#O DefaultAuthInfo=/opt/csw/etc/mail/default-auth-info
+#O DefaultAuthInfo=/etc/opt/csw/mail/default-auth-info
# SMTP AUTH flags
#O AuthOptions
@@ -557,7 +557,7 @@
#####################
# this is equivalent to setting class "t"
-#Ft/opt/csw/etc/mail/trusted-users
+#Ft/etc/opt/csw/mail/trusted-users
Troot
Tdaemon
Tuucp
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