[csw-devel] SF.net SVN: gar:[10678] csw/mgar/pkg/postfix/branches
skayser at users.sourceforge.net
skayser at users.sourceforge.net
Fri Jul 30 16:17:01 CEST 2010
Revision: 10678
http://gar.svn.sourceforge.net/gar/?rev=10678&view=rev
Author: skayser
Date: 2010-07-30 14:17:00 +0000 (Fri, 30 Jul 2010)
Log Message:
-----------
postfix: work towards 2.7
Modified Paths:
--------------
csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswpostfix
Added Paths:
-----------
csw/mgar/pkg/postfix/branches/postfix-2.7/
csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile
csw/mgar/pkg/postfix/branches/postfix-2.7/checksums
csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.CSW
csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.upgradefrom.24
csw/mgar/pkg/postfix/branches/postfix-2.7/files/changelog.CSW
csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswusergroup
csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh
Removed Paths:
-------------
csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile
csw/mgar/pkg/postfix/branches/postfix-2.7/checksums
csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.CSW
csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.upgradefrom.24
csw/mgar/pkg/postfix/branches/postfix-2.7/files/changelog.CSW
csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswusergroup
csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh
Deleted: csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile 2010-04-30 22:45:13 UTC (rev 9798)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile 2010-07-30 14:17:00 UTC (rev 10678)
@@ -1,282 +0,0 @@
-# TODO (release-critical prefixed with !, non release-critical with *)
-# ! Build, install and test package (works? spool permissions ok?)
-# WRT to permissions, run "postfix set-permissions" and compare
-# * Ship simple default configuration
-#
-# NICE TO KNOW
-# - 2.4.6,REV=2008.05.28 preserves modified configuration files via
-# package-shipped CAS class csw_conf.
-#
-GARNAME = postfix
-GARVERSION = 2.6.5
-CATEGORIES = server
-
-DESCRIPTION = A high-performance mail transport agent
-define BLURB
- What is Postfix? It is Wietse Venema's mailer that started life as an
- alternative to the widely-used Sendmail program.
-
- Postfix attempts to be fast, easy to administer, and secure, while at
- the same time being sendmail compatible enough to not upset existing
- users. Thus, the outside has a sendmail-ish flavor, but the inside is
- completely different.
-endef
-
-VENDOR_URL = http://www.postfix.org
-MASTER_SITES = ftp://ftp.porcupine.org/mirrors/postfix-release/official/
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-LICENSE = LICENSE TLS_LICENSE
-
-# Tag configuration files for handling via cswclassutils
-CONFIG_BASE := /etc/opt/csw/postfix/
-CONFIG_FILES := access
-CONFIG_FILES += aliases
-CONFIG_FILES += canonical
-CONFIG_FILES += generic
-CONFIG_FILES += header_checks
-CONFIG_FILES += main.cf
-CONFIG_FILES += master.cf
-CONFIG_FILES += relocated
-CONFIG_FILES += transport
-CONFIG_FILES += virtual
-SAMPLECONF := $(addprefix $(CONFIG_BASE), $(CONFIG_FILES))
-
-sysconfdir = /etc/opt/csw
-INITSMF = $(sysconfdir)/init.d/csw$(GARNAME)
-USERGROUP = $(sysconfdir)/pkg/CSW$(GARNAME)/cswusergroup
-
-# For the sake of simplicity and user choice we dropped the automatic
-# replacement of the /usr/{lib,bin} sendmail binaries. Ref.
-# http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5313
-POSTMSG = $(DOCDIR)/$(GARNAME)/README.upgradefrom.24
-
-# For file permissions reference and verification purposes, postfix ships
-# /opt/csw/libexec/postfix/postfix-files which contains a list of the
-# desired settings. "postfix check" can be used to verify the permissions,
-# "postfix set-permissions" can be used to adjust them (which shouldn't
-# be necessary from a user standpoint, it's our job to ship the right perms).
-
-# Make postdrop setgid so that it can deliver to $(DEF_QUEUE_DIR)/maildrop
-PROTOTYPE_MODIFIERS = makesgid
-PROTOTYPE_FILES_makesgid = $(sbindir)/post(drop|queue)
-PROTOTYPE_GROUP_makesgid = postdrop
-PROTOTYPE_PERMS_makesgid = 2755
-
-# Make $(DEF_QUEUE_DIR) subdirs accessible/writable to postfix only
-PROTOTYPE_MODIFIERS += spooldir
-PROTOTYPE_FILES_spooldir = $(DEF_QUEUE_DIR)/.*
-PROTOTYPE_USER_spooldir = postfix
-PROTOTYPE_PERMS_spooldir = 0700
-PROTOTYPE_CLASS_spooldir = ugfiles
-
-# Make $(DEF_QUEUE_DIR)/maildrop accessible by postdrop group
-PROTOTYPE_MODIFIERS += maildrop
-PROTOTYPE_FILES_maildrop = $(DEF_QUEUE_DIR)/maildrop
-PROTOTYPE_GROUP_maildrop = postdrop
-PROTOTYPE_PERMS_maildrop = 0730
-PROTOTYPE_CLASS_maildrop = ugfiles
-
-# Make $(DEF_QUEUE_DIR)/public accessible by postdrop group, likely
-# used for IPC with other processes (public contains sockets).
-PROTOTYPE_MODIFIERS += public
-PROTOTYPE_FILES_public = $(DEF_QUEUE_DIR)/public
-PROTOTYPE_GROUP_public = postdrop
-PROTOTYPE_PERMS_public = 2710
-PROTOTYPE_CLASS_public = ugfiles
-
-# IMPORTANT! Make $(DEF_QUEUE_DIR)/pid accessible by root only
-# http://www.openwall.com/lists/oss-security/2009/09/18/6
-PROTOTYPE_MODIFIERS += pid
-PROTOTYPE_FILES_pid = $(DEF_QUEUE_DIR)/pid
-PROTOTYPE_USER_pid = root
-PROTOTYPE_GROUP_pid = bin
-PROTOTYPE_PERMS_pid = 0755
-PROTOTYPE_CLASS_pid = ugfiles
-
-EXTRA_MERGE_EXCLUDE_FILES = /etc/opt/csw/postfix/LICENSE
-EXTRA_MERGE_EXCLUDE_FILES += /etc/opt/csw/postfix/TLS_LICENSE
-EXTRA_MERGE_EXCLUDE_FILES += /etc/opt/csw/postfix/makedefs.out
-
-STRIP_DIRS = $(DESTDIR)$(libexecdir)/postfix
-
-CONFIGURE_SCRIPTS = custom
-TEST_SCRIPTS =
-INSTALL_SCRIPTS = custom
-
-# Supporting documentation for building postfix
-# - Postfix Installation From Source Code
-# http://www.postfix.org/INSTALL.html
-# - Guidelines for Package Builders
-# http://www.postfix.org/PACKAGE_README.html
-
-DEF_COMMAND_DIR = /opt/csw/sbin
-DEF_CONFIG_DIR = /etc/opt/csw/postfix
-DEF_DAEMON_DIR = /opt/csw/libexec/postfix
-DEF_MAILQ_PATH = /opt/csw/bin/mailq
-DEF_HTML_DIR = /opt/csw/share/doc/postfix/html
-DEF_MANPAGE_DIR = /opt/csw/share/man
-DEF_NEWALIAS_PATH = /opt/csw/bin/newaliases
-DEF_QUEUE_DIR = /var/opt/csw/spool/postfix
-DEF_DATA_DIR = /var/opt/csw/lib/postfix
-DEF_README_DIR = /opt/csw/share/doc/postfix/README_FILES
-
-DEFAULTS=\
- -DDEF_MANPAGE_DIR=\"$(DEF_MANPAGE_DIR)\" \
- -DDEF_COMMAND_DIR=\"$(DEF_COMMAND_DIR)\" \
- -DDEF_CONFIG_DIR=\"$(DEF_CONFIG_DIR)\" \
- -DDEF_DAEMON_DIR=\"$(DEF_DAEMON_DIR)\" \
- -DDEF_MAILQ_PATH=\"$(DEF_MAILQ_PATH)\" \
- -DDEF_HTML_DIR=\"$(DEF_HTML_DIR)\" \
- -DDEF_NEWALIAS_PATH=\"$(DEF_NEWALIAS_PATH)\" \
- -DDEF_QUEUE_DIR=\"$(DEF_QUEUE_DIR)\" \
- -DDEF_DATA_DIR=\"$(DEF_DATA_DIR)\" \
- -DDEF_README_DIR=\"$(DEF_README_DIR)\"
-
-# By setting BUILDTYPE=simple on the command line you can produce a
-# bare-bones postfix package without any dependencies to other CSW pkgs.
-# This is currently for on demand personal use, as Phil insists on the
-# possibility of "pkg-get -i all" and two postfix's would clash.
-# Eventually it might be nice two have a bare-bones postfix in the catalog
-# as not everyone might want to pull in all the extra deps from CSWpostfix.
-ifeq ($(BUILDTYPE),simple)
-PACKAGES = CSW$(GARNAME)-simple
-CATALOGNAME = $(GARNAME)_simple
-else
-# Make sure libraries in the default location can be found
-AUXLIBS = $(LDFLAGS)
-
-# Activate support for PCRE
-# http://www.postfix.org/PCRE_README.html
-FEATURES += -DHAS_PCRE
-AUXLIBS += -lpcre
-BUILD_DEP_PKGS += CSWpcre
-RUNTIME_DEP_PKGS += CSWpcrert
-
-# Activate support for hash and btree lookup tables
-# http://www.postfix.org/DB_README.html
-FEATURES += -DHAS_DB
-INCLUDES += -I/opt/csw/bdb42/include
-AUXLIBS += -L/opt/csw/bdb42/lib -R/opt/csw/bdb42/lib -ldb-4.2
-BUILD_DEP_PKGS += CSWbdb42devel
-RUNTIME_DEP_PKGS += CSWbdb42
-
-# Activate support for SSL/TLS
-# http://www.postfix.org/TLS_README.html
-FEATURES += -DUSE_TLS
-AUXLIBS += -lssl -lcrypto
-BUILD_DEP_PKGS += CSWossldevel
-RUNTIME_DEP_PKGS += CSWosslrt
-
-# Activate support for Cyrus SASL (dovecot is incl. automatically)
-# http://www.postfix.org/SASL_README.html
-FEATURES += -DUSE_SASL_AUTH -DUSE_CYRUS_SASL
-INCLUDES += -I/opt/csw/include/sasl/
-AUXLIBS += -lsasl2
-BUILD_DEP_PKGS += CSWsasl
-RUNTIME_DEP_PKGS += CSWsasl
-
-# Activate support for OpenLDAP
-# http://www.postfix.org/LDAP_README.html
-FEATURES += -DHAS_LDAP
-AUXLIBS += -lldap -llber
-BUILD_DEP_PKGS += CSWoldapdevel
-RUNTIME_DEP_PKGS += CSWoldaprt
-
-# Activate support for MySQL
-# http://www.postfix.org/MYSQL_README.html
-FEATURES += -DHAS_MYSQL
-INCLUDES += -I/opt/csw/mysql5/include/mysql
-AUXLIBS += -L/opt/csw/mysql5/lib/mysql -R/opt/csw/mysql5/lib/mysql
-AUXLIBS += -lmysqlclient
-BUILD_DEP_PKGS += CSWmysql5devel
-RUNTIME_DEP_PKGS += CSWmysql5rt
-
-# Activate support for PostgreSQL
-# http://www.postfix.org/PGSQL_README.html
-FEATURES += -DHAS_PGSQL
-INCLUDES += -I/opt/csw/postgresql/include/
-AUXLIBS += -L/opt/csw/postgresql/lib/ -R/opt/csw/postgresql/lib/
-AUXLIBS += -lpq
-BUILD_DEP_PKGS += CSWlibpq
-RUNTIME_DEP_PKGS += CSWlibpq
-endif
-
-include gar/category.mk
-
-# Postfix's build system relies on CCARGS, populate it with the defaults from
-# GAR. For the bare-bones build don't leak anything located in */csw/* to the
-# build (we want to rely on as little additional CSW pkgs as possible).
-ifeq ($(BUILDTYPE),simple)
-LD_OPTIONS =
-CCARGS = $(CFLAGS)
-CCARGS += $(filter-out -I/opt/csw/include,$(CPPFLAGS))
-CCARGS += $(filter-out -I/opt/csw/%,$(INCLUDES))
-CCARGS += -DNO_PCRE # on by default, would trigger our pcre-config
-CCARGS += $(DEFAULTS)
-else
-CCARGS=$(CFLAGS) $(CPPFLAGS) $(INCLUDES) $(FEATURES) $(DEFAULTS)
-endif
-
-# Postfix doesn't use autoconf, but it's own tool called makedefs. It's
-# triggered by "gmake makefiles" in the source root and expects it's options
-# via environment variables CC CCARGS AUXLIBS DEBUG OPT. For us there is no
-# need to use DEBUG and OPT. The relevant flags are (amongst others) contained
-# in GAR's CFLAGS which we already pushed into CCARGS (see above).
-configure-custom:
- echo $(MAKE) -C $(WORKSRC) makefiles CC=$(CC) CCARGS='$(CCARGS)'
- $(MAKE) -C $(WORKSRC) makefiles \
- CC=$(CC) \
- CCARGS='$(CCARGS)' \
- AUXLIBS='$(AUXLIBS)' \
- DEBUG= \
- OPT=
- @$(MAKECOOIE)
-
-install-custom:
- $(MAKE) -C $(WORKSRC) non-interactive-package install_root=$(DESTDIR) \
- config_directory=$(DEF_CONFIG_DIR) \
- daemon_directory=$(DEF_DAEMON_DIR) \
- command_directory=$(DEF_COMMAND_DIR) \
- queue_directory=$(DEF_QUEUE_DIR) \
- sendmail_path=$(DEF_COMMAND_DIR)/sendmail \
- newaliases_path=$(DEF_NEWALIAS_PATH) \
- mailq_path=$(DEF_MAILQ_PATH) \
- manpage_directory=$(DEF_MANPAGE_DIR) \
- setgid_group=postdrop \
- sample_directory=/opt/csw/share/doc/postfix/samples \
- readme_directory=$(DEF_README_DIR) \
- html_directory=$(DEF_HTML_DIR)
-
- # Files for cswinitsmf and cswusergroup
- ginstall -Dm 755 $(FILEDIR)/cswpostfix \
- $(DESTDIR)/etc/opt/csw/init.d/cswpostfix
- ginstall -D $(FILEDIR)/cswusergroup \
- $(DESTDIR)$(sysconfdir)/pkg/CSWpostfix/cswusergroup
-
- # Helper script for spool location migration (2.4.x -> 2.6.x)
- ginstall -Dm 755 $(FILEDIR)/migrate-queuefiles.sh \
- $(DESTDIR)$(docdir)/$(GARNAME)/scripts/migrate-queuefiles.sh
- @$(MAKECOOKIE)
-
-# Fails. A subsequent manual verify-config run is successfull,
-# seems as if there might be some delay required.
-#post-merge-modulated: verify-config
-
-# Warn if there are any files in $(sysconfdir)/postfix which are not
-# covered by cswsampleconf. This is a safety net in case new config file
-# get introduced by more recent postfix versions. I know this runs for
-# most bloated awkwardness. Feel free to trim it down.
-#verify-config: SHIPPED_CFGFILES = $(wildcard $(PKGROOT)$(CONFIG_BASE)*)
-#verify-config: SHIPPED_CFGFILES := $(subst $(PKGROOT),,$(SHIPPED_CFGFILES))
-#verify-config: IGNORE_FILES += /etc/opt/csw/postfix/bounce.cf.default
-#verify-config: IGNORE_FILES += /etc/opt/csw/postfix/main.cf.default
-#verify-config: IGNORE_FILES += $(addsuffix .CSW, $(SAMPLECONF))
-#verify-config: SHELL=/bin/bash
-#verify-config:
-# @echo "Checking for files in $(CONFIG_BASE) not covered by cswsampleconf"
-# @gdiff \
-# <( echo $(IGNORE_FILES) | tr " " "\n" | sort) \
-# <( echo $(SHIPPED_CFGFILES) | tr " " "\n" | sort )
-# @echo "OK"
-# @$(MAKECOOKIE)
Copied: csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile (from rev 8544, csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile)
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile (rev 0)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile 2010-07-30 14:17:00 UTC (rev 10678)
@@ -0,0 +1,285 @@
+# TODO (release-critical prefixed with !, non release-critical with *)
+# ! Build, install and test package (works? spool permissions ok?)
+# WRT to permissions, run "postfix set-permissions" and compare
+# * Ship simple default configuration
+#
+# NICE TO KNOW
+# - 2.4.6,REV=2008.05.28 preserves modified configuration files via
+# package-shipped CAS class csw_conf.
+#
+GARNAME = postfix
+GARVERSION = 2.7.1
+CATEGORIES = server
+
+DESCRIPTION = A high-performance mail transport agent
+define BLURB
+ What is Postfix? It is Wietse Venema's mailer that started life as an
+ alternative to the widely-used Sendmail program.
+
+ Postfix attempts to be fast, easy to administer, and secure, while at
+ the same time being sendmail compatible enough to not upset existing
+ users. Thus, the outside has a sendmail-ish flavor, but the inside is
+ completely different.
+endef
+
+VENDOR_URL = http://www.postfix.org
+MASTER_SITES = ftp://ftp.porcupine.org/mirrors/postfix-release/official/
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+LICENSE = LICENSE TLS_LICENSE
+
+# Tag configuration files for handling via cswclassutils
+CONFIG_BASE := /etc/opt/csw/postfix/
+CONFIG_FILES := access
+CONFIG_FILES += aliases
+CONFIG_FILES += canonical
+CONFIG_FILES += generic
+CONFIG_FILES += header_checks
+CONFIG_FILES += main.cf
+CONFIG_FILES += master.cf
+CONFIG_FILES += relocated
+CONFIG_FILES += transport
+CONFIG_FILES += virtual
+SAMPLECONF := $(addprefix $(CONFIG_BASE), $(CONFIG_FILES))
+
+sysconfdir = /etc/opt/csw
+INITSMF = $(sysconfdir)/init.d/csw$(GARNAME)
+USERGROUP = $(sysconfdir)/pkg/CSW$(GARNAME)/cswusergroup
+
+# For the sake of simplicity and user choice we dropped the automatic
+# replacement of the /usr/{lib,bin} sendmail binaries. Ref.
+# http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5313
+POSTMSG = $(DOCDIR)/$(GARNAME)/README.upgradefrom.24
+
+# For file permissions reference and verification purposes, postfix ships
+# /opt/csw/libexec/postfix/postfix-files which contains a list of the
+# desired settings. "postfix check" can be used to verify the permissions,
+# "postfix set-permissions" can be used to adjust them (which shouldn't
+# be necessary from a user standpoint, it's our job to ship the right perms).
+
+# Make postdrop setgid so that it can deliver to $(DEF_QUEUE_DIR)/maildrop
+PROTOTYPE_MODIFIERS = makesgid
+PROTOTYPE_FILES_makesgid = $(sbindir)/post(drop|queue)
+PROTOTYPE_GROUP_makesgid = postdrop
+PROTOTYPE_PERMS_makesgid = 2755
+
+# Make $(DEF_QUEUE_DIR) subdirs accessible/writable to postfix only
+PROTOTYPE_MODIFIERS += spooldir
+PROTOTYPE_FILES_spooldir = $(DEF_QUEUE_DIR)/.*
+PROTOTYPE_USER_spooldir = postfix
+PROTOTYPE_PERMS_spooldir = 0700
+PROTOTYPE_CLASS_spooldir = ugfiles
+
+# Make $(DEF_QUEUE_DIR)/maildrop accessible by postdrop group
+PROTOTYPE_MODIFIERS += maildrop
+PROTOTYPE_FILES_maildrop = $(DEF_QUEUE_DIR)/maildrop
+PROTOTYPE_GROUP_maildrop = postdrop
+PROTOTYPE_PERMS_maildrop = 0730
+PROTOTYPE_CLASS_maildrop = ugfiles
+
+# Make $(DEF_QUEUE_DIR)/public accessible by postdrop group, likely
+# used for IPC with other processes (public contains sockets).
+PROTOTYPE_MODIFIERS += public
+PROTOTYPE_FILES_public = $(DEF_QUEUE_DIR)/public
+PROTOTYPE_GROUP_public = postdrop
+PROTOTYPE_PERMS_public = 2710
+PROTOTYPE_CLASS_public = ugfiles
+
+# IMPORTANT! Make $(DEF_QUEUE_DIR)/pid accessible by root only
+# http://www.openwall.com/lists/oss-security/2009/09/18/6
+PROTOTYPE_MODIFIERS += pid
+PROTOTYPE_FILES_pid = $(DEF_QUEUE_DIR)/pid
+PROTOTYPE_USER_pid = root
+PROTOTYPE_GROUP_pid = bin
+PROTOTYPE_PERMS_pid = 0755
+PROTOTYPE_CLASS_pid = ugfiles
+
+EXTRA_MERGE_EXCLUDE_FILES = /etc/opt/csw/postfix/LICENSE
+EXTRA_MERGE_EXCLUDE_FILES += /etc/opt/csw/postfix/TLS_LICENSE
+EXTRA_MERGE_EXCLUDE_FILES += /etc/opt/csw/postfix/makedefs.out
+
+STRIP_DIRS = $(DESTDIR)$(libexecdir)/postfix
+
+CONFIGURE_SCRIPTS = custom
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+# Supporting documentation for building postfix
+# - Postfix Installation From Source Code
+# http://www.postfix.org/INSTALL.html
+# - Guidelines for Package Builders
+# http://www.postfix.org/PACKAGE_README.html
+
+DEF_COMMAND_DIR = /opt/csw/sbin
+DEF_CONFIG_DIR = /etc/opt/csw/postfix
+DEF_DAEMON_DIR = /opt/csw/libexec/postfix
+DEF_MAILQ_PATH = /opt/csw/bin/mailq
+DEF_HTML_DIR = /opt/csw/share/doc/postfix/html
+DEF_MANPAGE_DIR = /opt/csw/share/man
+DEF_NEWALIAS_PATH = /opt/csw/bin/newaliases
+DEF_QUEUE_DIR = /var/opt/csw/spool/postfix
+DEF_DATA_DIR = /var/opt/csw/lib/postfix
+DEF_README_DIR = /opt/csw/share/doc/postfix/README_FILES
+
+DEFAULTS=\
+ -DDEF_MANPAGE_DIR=\"$(DEF_MANPAGE_DIR)\" \
+ -DDEF_COMMAND_DIR=\"$(DEF_COMMAND_DIR)\" \
+ -DDEF_CONFIG_DIR=\"$(DEF_CONFIG_DIR)\" \
+ -DDEF_DAEMON_DIR=\"$(DEF_DAEMON_DIR)\" \
+ -DDEF_MAILQ_PATH=\"$(DEF_MAILQ_PATH)\" \
+ -DDEF_HTML_DIR=\"$(DEF_HTML_DIR)\" \
+ -DDEF_NEWALIAS_PATH=\"$(DEF_NEWALIAS_PATH)\" \
+ -DDEF_QUEUE_DIR=\"$(DEF_QUEUE_DIR)\" \
+ -DDEF_DATA_DIR=\"$(DEF_DATA_DIR)\" \
+ -DDEF_README_DIR=\"$(DEF_README_DIR)\"
+
+# By setting BUILDTYPE=simple on the command line you can produce a
+# bare-bones postfix package without any dependencies to other CSW pkgs.
+# This is currently for on demand personal use, as Phil insists on the
+# possibility of "pkg-get -i all" and two postfix's would clash.
+# Eventually it might be nice two have a bare-bones postfix in the catalog
+# as not everyone might want to pull in all the extra deps from CSWpostfix.
+ifeq ($(BUILDTYPE),simple)
+PACKAGES = CSW$(GARNAME)-simple
+CATALOGNAME = $(GARNAME)_simple
+else
+# Make sure libraries in the default location can be found
+AUXLIBS = $(LDFLAGS)
+
+# Activate support for PCRE
+# http://www.postfix.org/PCRE_README.html
+FEATURES += -DHAS_PCRE
+AUXLIBS += -lpcre
+BUILD_DEP_PKGS += CSWpcre
+RUNTIME_DEP_PKGS += CSWpcrert
+
+# Activate support for hash and btree lookup tables
+# http://www.postfix.org/DB_README.html
+FEATURES += -DHAS_DB
+INCLUDES += -I/opt/csw/bdb42/include
+AUXLIBS += -L/opt/csw/bdb42/lib -R/opt/csw/bdb42/lib -ldb-4.2
+BUILD_DEP_PKGS += CSWbdb42devel
+RUNTIME_DEP_PKGS += CSWbdb42
+
+# Activate support for SSL/TLS
+# http://www.postfix.org/TLS_README.html
+FEATURES += -DUSE_TLS
+AUXLIBS += -lssl -lcrypto
+BUILD_DEP_PKGS += CSWossldevel
+RUNTIME_DEP_PKGS += CSWosslrt
+
+# Activate support for Cyrus SASL (dovecot is incl. automatically)
+# http://www.postfix.org/SASL_README.html
+FEATURES += -DUSE_SASL_AUTH -DUSE_CYRUS_SASL
+INCLUDES += -I/opt/csw/include/sasl/
+AUXLIBS += -lsasl2
+BUILD_DEP_PKGS += CSWsasl
+RUNTIME_DEP_PKGS += CSWsasl
+
+# Activate support for OpenLDAP
+# http://www.postfix.org/LDAP_README.html
+FEATURES += -DHAS_LDAP
+AUXLIBS += -lldap -llber
+BUILD_DEP_PKGS += CSWoldapdevel
+RUNTIME_DEP_PKGS += CSWoldaprt
+
+# Activate support for MySQL
+# http://www.postfix.org/MYSQL_README.html
+FEATURES += -DHAS_MYSQL
+INCLUDES += -I/opt/csw/mysql5/include/mysql
+AUXLIBS += -L/opt/csw/mysql5/lib/mysql -R/opt/csw/mysql5/lib/mysql
+AUXLIBS += -lmysqlclient
+BUILD_DEP_PKGS += CSWmysql5devel
+RUNTIME_DEP_PKGS += CSWmysql5rt
+
+# Activate support for PostgreSQL
+# http://www.postfix.org/PGSQL_README.html
+FEATURES += -DHAS_PGSQL
+INCLUDES += -I/opt/csw/postgresql/include/
+AUXLIBS += -L/opt/csw/postgresql/lib/ -R/opt/csw/postgresql/lib/
+AUXLIBS += -lpq
+BUILD_DEP_PKGS += CSWlibpq
+RUNTIME_DEP_PKGS += CSWlibpq
+endif
+
+# Postgres package outdated, libs aren't located below /opt/csw/lib/
+CHECKPKG_OVERRIDES_CSWpostfix += bad-rpath-entry
+
+include gar/category.mk
+
+# Postfix's build system relies on CCARGS, populate it with the defaults from
+# GAR. For the bare-bones build don't leak anything located in */csw/* to the
+# build (we want to rely on as little additional CSW pkgs as possible).
+ifeq ($(BUILDTYPE),simple)
+LD_OPTIONS =
+CCARGS = $(CFLAGS)
+CCARGS += $(filter-out -I/opt/csw/include,$(CPPFLAGS))
+CCARGS += $(filter-out -I/opt/csw/%,$(INCLUDES))
+CCARGS += -DNO_PCRE # on by default, would trigger our pcre-config
+CCARGS += $(DEFAULTS)
+else
+CCARGS=$(CFLAGS) $(CPPFLAGS) $(INCLUDES) $(FEATURES) $(DEFAULTS)
+endif
+
+# Postfix doesn't use autoconf, but it's own tool called makedefs. It's
+# triggered by "gmake makefiles" in the source root and expects it's options
+# via environment variables CC CCARGS AUXLIBS DEBUG OPT. For us there is no
+# need to use DEBUG and OPT. The relevant flags are (amongst others) contained
+# in GAR's CFLAGS which we already pushed into CCARGS (see above).
+configure-custom:
+ echo $(MAKE) -C $(WORKSRC) makefiles CC=$(CC) CCARGS='$(CCARGS)'
+ $(MAKE) -C $(WORKSRC) makefiles \
+ CC=$(CC) \
+ CCARGS='$(CCARGS)' \
+ AUXLIBS='$(AUXLIBS)' \
+ DEBUG= \
+ OPT=
+ @$(MAKECOOIE)
+
+install-custom:
+ $(MAKE) -C $(WORKSRC) non-interactive-package install_root=$(DESTDIR) \
+ config_directory=$(DEF_CONFIG_DIR) \
+ daemon_directory=$(DEF_DAEMON_DIR) \
+ command_directory=$(DEF_COMMAND_DIR) \
+ queue_directory=$(DEF_QUEUE_DIR) \
+ sendmail_path=$(DEF_COMMAND_DIR)/sendmail \
+ newaliases_path=$(DEF_NEWALIAS_PATH) \
+ mailq_path=$(DEF_MAILQ_PATH) \
+ manpage_directory=$(DEF_MANPAGE_DIR) \
+ setgid_group=postdrop \
+ sample_directory=/opt/csw/share/doc/postfix/samples \
+ readme_directory=$(DEF_README_DIR) \
+ html_directory=$(DEF_HTML_DIR)
+
+ # Files for cswinitsmf and cswusergroup
+ ginstall -Dm 755 $(FILEDIR)/cswpostfix \
+ $(DESTDIR)/etc/opt/csw/init.d/cswpostfix
+ ginstall -D $(FILEDIR)/cswusergroup \
+ $(DESTDIR)$(sysconfdir)/pkg/CSWpostfix/cswusergroup
+
+ # Helper script for spool location migration (2.4.x -> 2.6.x)
+ ginstall -Dm 755 $(FILEDIR)/migrate-queuefiles.sh \
+ $(DESTDIR)$(docdir)/$(GARNAME)/scripts/migrate-queuefiles.sh
+ @$(MAKECOOKIE)
+
+# Fails. A subsequent manual verify-config run is successfull,
+# seems as if there might be some delay required.
+#post-merge-modulated: verify-config
+
+# Warn if there are any files in $(sysconfdir)/postfix which are not
+# covered by cswsampleconf. This is a safety net in case new config file
+# get introduced by more recent postfix versions. I know this runs for
+# most bloated awkwardness. Feel free to trim it down.
+#verify-config: SHIPPED_CFGFILES = $(wildcard $(PKGROOT)$(CONFIG_BASE)*)
+#verify-config: SHIPPED_CFGFILES := $(subst $(PKGROOT),,$(SHIPPED_CFGFILES))
+#verify-config: IGNORE_FILES += /etc/opt/csw/postfix/bounce.cf.default
+#verify-config: IGNORE_FILES += /etc/opt/csw/postfix/main.cf.default
+#verify-config: IGNORE_FILES += $(addsuffix .CSW, $(SAMPLECONF))
+#verify-config: SHELL=/bin/bash
+#verify-config:
+# @echo "Checking for files in $(CONFIG_BASE) not covered by cswsampleconf"
+# @gdiff \
+# <( echo $(IGNORE_FILES) | tr " " "\n" | sort) \
+# <( echo $(SHIPPED_CFGFILES) | tr " " "\n" | sort )
+# @echo "OK"
+# @$(MAKECOOKIE)
Deleted: csw/mgar/pkg/postfix/branches/postfix-2.7/checksums
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/checksums 2010-04-30 22:45:13 UTC (rev 9798)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/checksums 2010-07-30 14:17:00 UTC (rev 10678)
@@ -1 +0,0 @@
-6b954cfb3eb6141dac1e773281211717 postfix-2.6.5.tar.gz
Copied: csw/mgar/pkg/postfix/branches/postfix-2.7/checksums (from rev 8528, csw/mgar/pkg/postfix/branches/postfix-2.6/checksums)
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.7/checksums (rev 0)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/checksums 2010-07-30 14:17:00 UTC (rev 10678)
@@ -0,0 +1 @@
+b7a5c3ccd309156a65d6f8d2683d4fa1 postfix-2.7.1.tar.gz
Deleted: csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.CSW
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/files/README.CSW 2010-04-30 22:45:13 UTC (rev 9798)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.CSW 2010-07-30 14:17:00 UTC (rev 10678)
@@ -1,75 +0,0 @@
-Replacing the system sendmail binaries
---------------------------------------
-This package will not automatically substitute the common sendmail binaries
-with links to the postfix binaries. 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,
-there are two approaches (both currently _not_ supported in in shared zones):
-
-#1: For testing purposes - allows for quick rollback, possibly harmful
-
-This approach temporarily moves away the system sendmail binaries and replaces
-them with links to the postfix binaries. This lets you test this postfix
-package and easily roll back to the system sendmail in case you need to. It is
-_not_ suited for long term operations as system sendmail patches will possibly
-break those symlinks or worse, overwrite your postfix binaries with patched
-sendmail versions.
-
-Put in place:
-
- mv /usr/lib/sendmail /usr/lib/sendmail.SYSTEM
- mv /usr/bin/mailq /usr/bin/mailq.SYSTEM
- mv /usr/bin/newaliases /usr/bin/newaliases.SYSTEM
-
- ln -s /opt/csw/sbin/sendmail /usr/lib/sendmail
- ln -s /opt/csw/bin/newaliases /usr/bin/newaliases
- ln -s /opt/csw/bin/mailq /usr/bin/mailq
-
-Roll back:
-
- rm /usr/lib/sendmail /usr/bin/newaliases /usr/bin/mailq
- mv /usr/lib/sendmail.SYSTEM /usr/lib/sendmail
- mv /usr/bin/mailq.SYSTEM /usr/bin/mailq
- mv /usr/bin/newaliases.SYSTEM /usr/bin/newaliases
-
-#2: Recommended for production systems and long term operations
-
-This approach fully removes the system sendmail packages and replaces the
-binaries with links to the postfix binaries. Patches for the system sendmail
-will be skipped and won't harm your setup. Keep your Solaris media available
-in case you want to re-install the system sendmail packages.
-
-Remove system sendmail:
-
- echo "rdepend=nocheck" > ~/admin-postfix
- echo "action=nocheck" >> ~/admin-postfix
- pkgrm -na ~/admin-postfix SUNWsndmr SUNWsndmu
- rm ~/admin-postfix
-
-Depending on the speed of your system the pkgrm might take a while.
-
-Put in place:
-
- ln -s /opt/csw/sbin/sendmail /usr/lib/sendmail
- ln -s /opt/csw/bin/newaliases /usr/bin/newaliases
- ln -s /opt/csw/bin/mailq /usr/bin/mailq
-
-Roll back:
-
- echo "idepend=nocheck" > ~/admin-postfix
- echo "action=nocheck" >> ~/admin-postfix
- rm /usr/lib/sendmail /usr/bin/newaliases /usr/bin/mailq
- pkgadd -na ~/admin-postfix \
- -d <path_to_solaris_media>/Solaris_X/Products/ SUNWsndmr SUNWsndmu
- rm ~/admin-postfix
-
-You might want to apply additional system sendmail patches that have been
-released since the Solaris release from which you install those sendmail
-packages.
Copied: csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.CSW (from rev 8528, csw/mgar/pkg/postfix/branches/postfix-2.6/files/README.CSW)
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.CSW (rev 0)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.CSW 2010-07-30 14:17:00 UTC (rev 10678)
@@ -0,0 +1,75 @@
+Replacing the system sendmail binaries
+--------------------------------------
+This package will not automatically substitute the common sendmail binaries
+with links to the postfix binaries. 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,
+there are two approaches (both currently _not_ supported in in shared zones):
+
+#1: For testing purposes - allows for quick rollback, possibly harmful
+
+This approach temporarily moves away the system sendmail binaries and replaces
+them with links to the postfix binaries. This lets you test this postfix
+package and easily roll back to the system sendmail in case you need to. It is
+_not_ suited for long term operations as system sendmail patches will possibly
+break those symlinks or worse, overwrite your postfix binaries with patched
+sendmail versions.
+
+Put in place:
+
+ mv /usr/lib/sendmail /usr/lib/sendmail.SYSTEM
+ mv /usr/bin/mailq /usr/bin/mailq.SYSTEM
+ mv /usr/bin/newaliases /usr/bin/newaliases.SYSTEM
+
+ ln -s /opt/csw/sbin/sendmail /usr/lib/sendmail
+ ln -s /opt/csw/bin/newaliases /usr/bin/newaliases
+ ln -s /opt/csw/bin/mailq /usr/bin/mailq
+
+Roll back:
+
+ rm /usr/lib/sendmail /usr/bin/newaliases /usr/bin/mailq
+ mv /usr/lib/sendmail.SYSTEM /usr/lib/sendmail
+ mv /usr/bin/mailq.SYSTEM /usr/bin/mailq
+ mv /usr/bin/newaliases.SYSTEM /usr/bin/newaliases
+
+#2: Recommended for production systems and long term operations
+
+This approach fully removes the system sendmail packages and replaces the
+binaries with links to the postfix binaries. Patches for the system sendmail
+will be skipped and won't harm your setup. Keep your Solaris media available
+in case you want to re-install the system sendmail packages.
+
+Remove system sendmail:
+
+ echo "rdepend=nocheck" > ~/admin-postfix
+ echo "action=nocheck" >> ~/admin-postfix
+ pkgrm -na ~/admin-postfix SUNWsndmr SUNWsndmu
+ rm ~/admin-postfix
+
+Depending on the speed of your system the pkgrm might take a while.
+
+Put in place:
+
+ ln -s /opt/csw/sbin/sendmail /usr/lib/sendmail
+ ln -s /opt/csw/bin/newaliases /usr/bin/newaliases
+ ln -s /opt/csw/bin/mailq /usr/bin/mailq
+
+Roll back:
+
+ echo "idepend=nocheck" > ~/admin-postfix
+ echo "action=nocheck" >> ~/admin-postfix
+ rm /usr/lib/sendmail /usr/bin/newaliases /usr/bin/mailq
+ pkgadd -na ~/admin-postfix \
+ -d <path_to_solaris_media>/Solaris_X/Products/ SUNWsndmr SUNWsndmu
+ rm ~/admin-postfix
+
+You might want to apply additional system sendmail patches that have been
+released since the Solaris release from which you install those sendmail
+packages.
Deleted: csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.upgradefrom.24
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/files/README.upgradefrom.24 2010-04-30 22:45:13 UTC (rev 9798)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.upgradefrom.24 2010-07-30 14:17:00 UTC (rev 10678)
@@ -1,27 +0,0 @@
-Note for users upgrading from postfix 2.4.6 and previous
---------------------------------------------------------
-
-- Starting with postfix 2.6.x the spool location has changed from
-
- /opt/csw/var/spool/postfix to
- /var/opt/csw/spool/postfix
-
- 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.
-
-- 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.
Copied: csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.upgradefrom.24 (from rev 8528, csw/mgar/pkg/postfix/branches/postfix-2.6/files/README.upgradefrom.24)
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.upgradefrom.24 (rev 0)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.upgradefrom.24 2010-07-30 14:17:00 UTC (rev 10678)
@@ -0,0 +1,27 @@
+Note for users upgrading from postfix 2.4.6 and previous
+--------------------------------------------------------
+
+- Starting with postfix 2.6.x the spool location has changed from
+
+ /opt/csw/var/spool/postfix to
+ /var/opt/csw/spool/postfix
+
+ 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.
+
+- 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.
Deleted: csw/mgar/pkg/postfix/branches/postfix-2.7/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW 2010-04-30 22:45:13 UTC (rev 9798)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/changelog.CSW 2010-07-30 14:17:00 UTC (rev 10678)
@@ -1,13 +0,0 @@
-postfix (2.6.5,REV=2010.02.15)
-
- * Adopted and updated to 2.6.5. (Closes #3580, #3700, #3970)
- * Moved spool directory to /var/opt/csw/spool/postfix. (Closes #3946)
- * Added Cyrus SASL support. (Closes #2843)
- * Added hash table support via bdb. (Closes #2097)
- * Init / SMF handling now done with cswclassutils. (Closes #3946)
- * Now depends on pcre_rt instead of pcre. (Closes #3017)
- * Binaries in /opt/csw/libexec/postfix are now stripped. (Closes #3063)
- * Doesn't automatically substitute system sendmail binaries any more.
- Please refer to README.CSW instead. (Closes #1943, #2964, #3060)
-
- -- Sebastian Kayser <skayser at opencsw.org> Mon, 15 Feb 2010 00:23:59 +0100
Copied: csw/mgar/pkg/postfix/branches/postfix-2.7/files/changelog.CSW (from rev 8545, csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW)
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.7/files/changelog.CSW (rev 0)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/changelog.CSW 2010-07-30 14:17:00 UTC (rev 10678)
@@ -0,0 +1,13 @@
+postfix (2.7.1,REV=2010.07.30)
+
+ * Adopted and updated to 2.7.1. (Closes #3580, #3700, #3970)
+ * Moved spool directory to /var/opt/csw/spool/postfix. (Closes #3946)
+ * Added Cyrus SASL support. (Closes #2843)
+ * Added hash table support via bdb. (Closes #2097)
+ * Init / SMF handling now done with cswclassutils. (Closes #3946)
+ * Now depends on pcre_rt instead of pcre. (Closes #3017)
+ * Binaries in /opt/csw/libexec/postfix are now stripped. (Closes #3063)
+ * Doesn't automatically substitute system sendmail binaries any more.
+ Please refer to README.CSW instead. (Closes #1943, #2964, #3060)
+
+ -- Sebastian Kayser <skayser at opencsw.org> Fri, 30 Jul 2010 15:10:26 +0200
Modified: csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswpostfix
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix 2010-04-30 22:45:13 UTC (rev 9798)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswpostfix 2010-07-30 14:17:00 UTC (rev 10678)
@@ -80,7 +80,7 @@
;;
*)
- echo "Usage: /etc/init.d/postfix {start|stop|restart|reload|flush|check|status|force-reload}"
+ echo "Usage: cswpostfix {start|stop|restart|reload|flush|check|status|force-reload}"
exit 1
;;
esac
Deleted: csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswusergroup
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswusergroup 2010-04-30 22:45:13 UTC (rev 9798)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswusergroup 2010-07-30 14:17:00 UTC (rev 10678)
@@ -1,2 +0,0 @@
-:postdrop:::::
-postfix:postfix:Postfix daemon user:/var/opt/csw/spool/postfix:/usr/bin/pfsh::
Copied: csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswusergroup (from rev 8528, csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswusergroup)
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswusergroup (rev 0)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswusergroup 2010-07-30 14:17:00 UTC (rev 10678)
@@ -0,0 +1,2 @@
+:postdrop:::::
+postfix:postfix:Postfix daemon user:/var/opt/csw/spool/postfix:/usr/bin/pfsh::
Deleted: csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/files/migrate-queuefiles.sh 2010-04-30 22:45:13 UTC (rev 9798)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh 2010-07-30 14:17:00 UTC (rev 10678)
@@ -1,27 +0,0 @@
-#!/bin/bash
-#
-# move-spool.sh:
-# helper script to move possible queue files from the CSWpostfix 2.4.x
-# spool location to the CSWpostfix >= 2.6.x spool location.
-#
-# $Id$
-
-
-SPOOL_OLD=/opt/csw/var/spool/postfix
-SPOOL_NEW=/var/opt/csw/spool/postfix
-QDIRS="incoming active deferred corrupt hold bounce defer trace"
-
-[ -x /usr/bin/zonename ] && ZONEOPT="-z `/usr/bin/zonename`"
-if pgrep $ZONEOPT master; then
- echo "Make sure postfix is not running! Exiting."
- exit 1
-fi
-
-for qdir in $QDIRS; do
- [ -d ${SPOOL_OLD}/$qdir ] || continue
- echo "Moving from ${SPOOL_OLD}/$qdir to ${SPOOL_NEW}/$qdir"
- cd ${SPOOLDIR_NEW}/$qdir && \
- find ${SPOOLDIR_OLD}/$qdir -type f -exec mv '{}' . +
-done
-
-echo "No errors so far? Then please run postsuper now."
Copied: csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh (from rev 8528, csw/mgar/pkg/postfix/branches/postfix-2.6/files/migrate-queuefiles.sh)
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh (rev 0)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh 2010-07-30 14:17:00 UTC (rev 10678)
@@ -0,0 +1,27 @@
+#!/bin/bash
+#
+# move-spool.sh:
+# helper script to move possible queue files from the CSWpostfix 2.4.x
+# spool location to the CSWpostfix >= 2.6.x spool location.
+#
+# $Id$
+
+
+SPOOL_OLD=/opt/csw/var/spool/postfix
+SPOOL_NEW=/var/opt/csw/spool/postfix
+QDIRS="incoming active deferred corrupt hold bounce defer trace"
+
+[ -x /usr/bin/zonename ] && ZONEOPT="-z `/usr/bin/zonename`"
+if pgrep $ZONEOPT -lf /opt/csw/libexec/postfix/master; then
+ echo "Make sure postfix is not running! Exiting."
+ exit 1
+fi
+
+for qdir in $QDIRS; do
+ [ -d ${SPOOL_OLD}/$qdir ] || continue
+ echo "Moving from ${SPOOL_OLD}/$qdir to ${SPOOL_NEW}/$qdir"
+ cd ${SPOOLDIR_NEW}/$qdir && \
+ find ${SPOOLDIR_OLD}/$qdir -type f -exec mv '{}' . +
+done
+
+echo "No errors so far? Then please run postsuper now."
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