[csw-devel] SF.net SVN: gar:[16968] csw/mgar/pkg/sendmail/trunk
bonivart at users.sourceforge.net
bonivart at users.sourceforge.net
Wed Feb 1 19:13:42 CET 2012
Revision: 16968
http://gar.svn.sourceforge.net/gar/?rev=16968&view=rev
Author: bonivart
Date: 2012-02-01 18:13:41 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
sendmail/trunk: add sendmail.mc, solaris9csw.m4 and a symlink
Modified Paths:
--------------
csw/mgar/pkg/sendmail/trunk/Makefile
csw/mgar/pkg/sendmail/trunk/files/site.config.m4
Added Paths:
-----------
csw/mgar/pkg/sendmail/trunk/files/0003-fix-Makefile-in-cf-dir.patch
csw/mgar/pkg/sendmail/trunk/files/sendmail.mc
csw/mgar/pkg/sendmail/trunk/files/solaris9csw.m4
Modified: csw/mgar/pkg/sendmail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sendmail/trunk/Makefile 2012-02-01 15:08:43 UTC (rev 16967)
+++ csw/mgar/pkg/sendmail/trunk/Makefile 2012-02-01 18:13:41 UTC (rev 16968)
@@ -4,6 +4,10 @@
# - Build separate 9/10 packages?
# - One big "mta" switch in alternatives between sendmail/postfix
+# + add symlink from /etc/opt/csw/mail/cf to /opt/csw/share/mail/cf/cf
+# + add ostype solaris9csw.m4
+# + add sendmail.mc in cf dir
+# + /opt/csw/lib/sendmail 2555 root smmsp (Rafael Ostertag)
# + remove statistics
# + csw-sm-client.pid, csw-sendmail.pid
# + smmsp:smmsp /var/opt/csw/spool/clientmqueue
@@ -45,6 +49,7 @@
DISTFILES += README.CSW sendmail.schema site.config.m4
DISTFILES += oracle-sendmail-deactivate.sh oracle-sendmail-reactivate.sh
DISTFILES += cswsendmail cswusergroup
+DISTFILES += sendmail.mc solaris9csw.m4
LICENSE = LICENSE
@@ -106,9 +111,10 @@
# Do not remove the static libs from libmilter
MERGE_EXCLUDE_STATICLIBS =
-# Patch away GNUism
+# Patches
PATCHFILES += 0001-add-libmilter-to-the-Makefile.patch
PATCHFILES += 0002-no-gnuism.patch
+PATCHFILES += 0003-fix-Makefile-in-cf-dir.patch
MIGRATE_FILES_CSWsendmail = aliases helpfile local-host-names sendmail.cf
MIGRATE_FILES_CSWsendmail += submit.cf trusted-users
@@ -139,30 +145,30 @@
ALTERNATIVE_sendmail += $(mandir)/man5/aliases.5 aliases.5 $(mandir)/man5/aliases.5.sendmail
# Look thru these to see if they are harmless, e.g. examples
-CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/README
-CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/share|root/opt/csw/share/mail/cf/README
-CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/smrsh.8
-CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/sendmail.8
-CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/ostype/freebsd6.m4
-CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/ostype/freebsd5.m4
-CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/ostype/powerux.m4
-CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/ostype/dragonfly.m4
-CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/feature/local_procmail.m4
-CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/cf/mail.cs.mc
-CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/cf/mail.eecs.mc
-CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/cf/knecht.mc
-CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/mail/cf/mailer/qpage.m4
-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/bounce-resender.pl
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/re-mqueue.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/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
+CHECKPKG_OVERRIDES_CSWsendmail-contrib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sendmail_contrib/mmuegel
+CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/README
+CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/mailer/fax.m4
+CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/mailer/qpage.m4
+CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/mailer/procmail.m4
+CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/mailer/phquery.m4
+CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/ostype/dragonfly.m4
+CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/ostype/freebsd5.m4
+CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/ostype/freebsd6.m4
+CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/ostype/powerux.m4
+CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/cf/mail.cs.mc
+CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/cf/mail.eecs.mc
+CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/cf/knecht.mc
+CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/sendmail/cf/feature/local_procmail.m4
+CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/sendmail.8
+CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/smrsh.8
+CHECKPKG_OVERRIDES_CSWsendmail += file-with-bad-content|/usr/share|root/opt/csw/share/sendmail/cf/README
# The static libs from libmilter
CHECKPKG_OVERRIDES_CSWlibmilter += discouraged-path-in-pkgmap|/opt/csw/lib/libsmutil.a
@@ -224,7 +230,7 @@
ginstall -d $(DESTDIR)$(mandir)/man5
ginstall -d $(DESTDIR)$(mandir)/man8
ginstall -d $(DESTDIR)/var/opt/csw/spool/clientmqueue
- ginstall -d $(DESTDIR)$(sharedstatedir)/mail
+ ginstall -d $(DESTDIR)$(sharedstatedir)/sendmail
ginstall -d $(DESTDIR)/etc/opt/csw/init.d
ginstall -d $(DESTDIR)$(sysconfdir)/mail
ginstall -d $(DESTDIR)/opt/csw/include
@@ -274,7 +280,9 @@
@# Install m4/cf macros
find $(WORKSRC)/cf -type f -exec chmod 644 {} +
- cp -r $(WORKSRC)/cf $(DESTDIR)$(sharedstatedir)/mail
+ cp -r $(WORKSRC)/cf $(DESTDIR)$(sharedstatedir)/sendmail
+ cp -p $(DOWNLOADDIR)/sendmail.mc $(DESTDIR)$(sharedstatedir)/sendmail/cf/cf/
+ cp -p $(DOWNLOADDIR)/solaris9csw.m4 $(DESTDIR)$(sharedstatedir)/sendmail/cf/ostype/
@# Install startup script
chmod +x $(DOWNLOADDIR)/cswsendmail && \
@@ -285,6 +293,7 @@
ginstall -m 644 $(DOWNLOADDIR)/$$file \
$(DESTDIR)$(sysconfdir)/mail/$$file; \
done )
+ ln -s $(sharedstatedir)/sendmail/cf $(DESTDIR)$(sysconfdir)/mail/cf
@# usergroup
ginstall -m 444 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWsendmail/
Added: csw/mgar/pkg/sendmail/trunk/files/0003-fix-Makefile-in-cf-dir.patch
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/0003-fix-Makefile-in-cf-dir.patch (rev 0)
+++ csw/mgar/pkg/sendmail/trunk/files/0003-fix-Makefile-in-cf-dir.patch 2012-02-01 18:13:41 UTC (rev 16968)
@@ -0,0 +1,34 @@
+From 921cb8295bd8d0e17a067f0782e20437e4b11d53 Mon Sep 17 00:00:00 2001
+From: Peter Bonivart <bonivart at opencsw.org>
+Date: Wed, 1 Feb 2012 17:40:08 +0100
+Subject: [PATCH] fix-Makefile-in-cf-dir
+
+---
+ cf/cf/Makefile | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cf/cf/Makefile b/cf/cf/Makefile
+index 2b0f4b3..6e25162 100644
+--- a/cf/cf/Makefile
++++ b/cf/cf/Makefile
+@@ -16,7 +16,7 @@ CF= sendmail
+ # name of source for submit.cf (without extension)
+ SUBMIT= submit
+ # directory for .cf files
+-MAILDIR=/etc/mail
++MAILDIR=/etc/opt/csw/mail
+ M4= m4
+ CFDIR= ..
+ SED= sed
+@@ -25,7 +25,7 @@ CHMOD= chmod
+ ROMODE= 444
+ RM= rm -f
+ # use our own install program; should be really confINSTALL
+-INSTALL=../../devtools/bin/install.sh
++INSTALL=/usr/sbin/install
+ # CF file ownership/permissions
+ CFOWN=root
+ CFGRP=bin
+--
+1.7.8.3
+
Added: csw/mgar/pkg/sendmail/trunk/files/sendmail.mc
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/sendmail.mc (rev 0)
+++ csw/mgar/pkg/sendmail/trunk/files/sendmail.mc 2012-02-01 18:13:41 UTC (rev 16968)
@@ -0,0 +1,19 @@
+VERSIONID(`$Id: sendmail.mc,v 1.0 2012/02/01 15:19:30 bonivart Exp $')
+OSTYPE(`solaris9csw')
+DOMAIN(`generic')
+define(`SMART_HOST',`smarthost.mydomain.com')
+define(`STATUS_FILE',`/etc/opt/csw/mail/statistics')
+define(`MAIL_SETTINGS_DIR',`/etc/opt/csw/mail/')
+FEATURE(`mailertable', `hash -o /etc/opt/csw/mail/mailertable')
+FEATURE(`genericstable', `hash -o /etc/opt/csw/mail/genericstable')
+FEATURE(`access_db', `hash -T<TMPF> /etc/opt/csw/mail/access')
+FEATURE(`virtusertable', `hash /etc/opt/csw/mail/virtusertable')
+MASQUERADE_AS(`mydomain.com')
+MASQUERADE_DOMAIN(`mydomain.com')
+FEATURE(`masquerade_entire_domain')
+FEATURE(`masquerade_envelope')
+define(`confSMTP_LOGIN_MSG', `$j server ready at $b')
+define(`confTO_IDENT', `0')
+define(`confBIND_OPTS', `WorkAroundBrokenAAAA')
+MAILER(`local')dnl
+MAILER(`smtp')dnl
Modified: csw/mgar/pkg/sendmail/trunk/files/site.config.m4
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/site.config.m4 2012-02-01 15:08:43 UTC (rev 16967)
+++ csw/mgar/pkg/sendmail/trunk/files/site.config.m4 2012-02-01 18:13:41 UTC (rev 16968)
@@ -15,7 +15,7 @@
dnl define(`confMANROOT', `/opt/csw/share/man/cat')
dnl define(`confMANROOTMAN', `/opt/csw/share/man/man')
define(`confNO_STATISTICS_INSTALL',`True')
-define(`confHFDIR', `/opt/csw/share/mail')
+define(`confHFDIR', `/opt/csw/share/sendmail')
define(`confMSP_QUEUE_DIR', `/var/opt/csw/spool/clientmqueue')
dnl ### add OpenCSW lib and include directories
APPENDDEF(`confLIBDIRS', `-L/opt/csw/lib -R/opt/csw/lib')
Added: csw/mgar/pkg/sendmail/trunk/files/solaris9csw.m4
===================================================================
--- csw/mgar/pkg/sendmail/trunk/files/solaris9csw.m4 (rev 0)
+++ csw/mgar/pkg/sendmail/trunk/files/solaris9csw.m4 2012-02-01 18:13:41 UTC (rev 16968)
@@ -0,0 +1,12 @@
+divert(-1)
+#
+# Copyright (c) 2012 OpenCSW.
+#
+
+divert(0)
+VERSIONID(`$Id: solaris9csw.m4,v 1.0 2012/02/01 15:04:08 bonivart Exp $')
+divert(-1)
+
+define(`confEBINDIR', `/opt/csw/lib')dnl
+define(`confPID_FILE', `/var/run/csw-sendmail.pid')dnl
+define(`_NETINET6_')dnl
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