Import of pkgsrc-2014Q1
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
# $NetBSD: Makefile,v 1.265 2013/06/07 16:30:25 jperkin Exp $
|
||||
# $NetBSD: Makefile,v 1.271 2014/02/12 23:18:09 tron Exp $
|
||||
|
||||
DISTNAME= postfix-2.9.6
|
||||
PKGREVISION= 4
|
||||
DISTNAME= postfix-2.11.0
|
||||
PKGREVISION= 1
|
||||
CATEGORIES= mail
|
||||
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/
|
||||
MASTER_SITES+= http://postfix.it-austria.net/releases/official/
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@comment $NetBSD: PLIST,v 1.26 2013/02/13 14:31:31 taca Exp $
|
||||
@comment $NetBSD: PLIST,v 1.28 2014/03/11 14:05:04 jperkin Exp $
|
||||
bin/mailq
|
||||
bin/newaliases
|
||||
libexec/postfix/anvil
|
||||
@@ -61,6 +61,7 @@ man/man5/cidr_table.5
|
||||
man/man5/generic.5
|
||||
man/man5/header_checks.5
|
||||
man/man5/ldap_table.5
|
||||
man/man5/lmdb_table.5
|
||||
man/man5/master.5
|
||||
man/man5/memcache_table.5
|
||||
man/man5/mysql_table.5
|
||||
@@ -71,6 +72,7 @@ man/man5/postconf.5
|
||||
man/man5/postfix-wrapper.5
|
||||
man/man5/regexp_table.5
|
||||
man/man5/relocated.5
|
||||
man/man5/socketmap_table.5
|
||||
man/man5/sqlite_table.5
|
||||
man/man5/tcp_table.5
|
||||
man/man5/transport.5
|
||||
@@ -134,10 +136,12 @@ share/doc/postfix/DEBUG_README
|
||||
share/doc/postfix/DSN_README
|
||||
share/doc/postfix/ETRN_README
|
||||
share/doc/postfix/FILTER_README
|
||||
share/doc/postfix/FORWARD_SECRECY_README
|
||||
share/doc/postfix/INSTALL
|
||||
share/doc/postfix/IPV6_README
|
||||
share/doc/postfix/LDAP_README
|
||||
share/doc/postfix/LINUX_README
|
||||
share/doc/postfix/LMDB_README
|
||||
share/doc/postfix/LOCAL_RECIPIENT_README
|
||||
share/doc/postfix/MAILDROP_README
|
||||
share/doc/postfix/MEMCACHE_README
|
||||
@@ -188,4 +192,3 @@ share/examples/postfix/relocated
|
||||
${PLIST.csasl}share/examples/postfix/smtpd.conf
|
||||
share/examples/postfix/transport
|
||||
share/examples/postfix/virtual
|
||||
share/examples/rc.d/postfix
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
$NetBSD: distinfo,v 1.149 2013/02/26 19:56:18 garbled Exp $
|
||||
$NetBSD: distinfo,v 1.153 2014/02/09 05:34:13 taca Exp $
|
||||
|
||||
SHA1 (postfix-2.9.6.tar.gz) = 9d7af8670fd13fd5e5290ff2e3f00d724178f0fb
|
||||
RMD160 (postfix-2.9.6.tar.gz) = e3148a42f246c4f54c82cf387b7467805edcd2cd
|
||||
Size (postfix-2.9.6.tar.gz) = 3767309 bytes
|
||||
SHA1 (patch-aa) = 2115fd7af5776a14fdbfc88a5ad3bc668a6762db
|
||||
SHA1 (patch-ag) = 60d752b6c8db971d92ca0017c63329ad446209c5
|
||||
SHA1 (patch-ai) = 1bd3682b74de11e5d420e453f3df088d965452d6
|
||||
SHA1 (patch-src_dns_dns__lookup.c) = 70147b43a683aa6fd99317d7bae36dfe9beb2d8d
|
||||
SHA1 (postfix-2.11.0.tar.gz) = bc1fd50412742d9c28232b07c7d2139e37d3de28
|
||||
RMD160 (postfix-2.11.0.tar.gz) = 4f53040c607339eee010e35bafd2792037279b3c
|
||||
Size (postfix-2.11.0.tar.gz) = 4034741 bytes
|
||||
SHA1 (patch-aa) = 6f7dc14d53e914e9cb72752fb3941c569cd2e8f9
|
||||
SHA1 (patch-ag) = 150007e901ad3b470b0800bb3e073bff06eb8190
|
||||
SHA1 (patch-ai) = 5f56b77a716bec1fce5dcdbbb2d589f3301cabd3
|
||||
SHA1 (patch-src_dns_dns__lookup.c) = 9c26686e5abd9aee36f042440e5f6a6ffca3df4a
|
||||
|
||||
43
mail/postfix/files/smf/manifest.xml
Normal file
43
mail/postfix/files/smf/manifest.xml
Normal file
@@ -0,0 +1,43 @@
|
||||
<?xml version='1.0'?>
|
||||
<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
|
||||
<service_bundle type='manifest' name='@SMF_NAME@'>
|
||||
<service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'>
|
||||
<create_default_instance enabled="false" />
|
||||
<single_instance />
|
||||
<dependency name='fs-local' grouping='require_all' restart_on='none' type='service'>
|
||||
<service_fmri value='svc:/system/filesystem/local' />
|
||||
</dependency>
|
||||
<dependency name='loopback' grouping='require_all' restart_on='error' type='service'>
|
||||
<service_fmri value='svc:/network/loopback:default' />
|
||||
</dependency>
|
||||
<dependency name='physical' grouping='require_all' restart_on='error' type='service'>
|
||||
<service_fmri value='svc:/network/physical:default' />
|
||||
</dependency>
|
||||
<dependency name='name-services' grouping='require_all' restart_on='refresh' type='service'>
|
||||
<service_fmri value='svc:/milestone/name-services' />
|
||||
</dependency>
|
||||
<dependency name='system-log' grouping='optional_all' restart_on='none' type='service'>
|
||||
<service_fmri value='svc:/system/system-log' />
|
||||
</dependency>
|
||||
<dependency name='config-files' grouping='require_all' restart_on='refresh' type='path'>
|
||||
<service_fmri value='file://@PKG_SYSCONFDIR@/main.cf' />
|
||||
<service_fmri value='file://@PKG_SYSCONFDIR@/master.cf' />
|
||||
</dependency>
|
||||
<exec_method name='start' type='method' exec='@PREFIX@/sbin/postfix start' timeout_seconds='60' />
|
||||
<exec_method name='stop' type='method' exec='@PREFIX@/sbin/postfix stop' timeout_seconds='60' />
|
||||
<exec_method name='refresh' type='method' exec='@PREFIX@/sbin/postfix reload' timeout_seconds='60' />
|
||||
<property_group name='startd' type='framework'>
|
||||
<propval name='ignore_error' type='astring' value='core,signal' />
|
||||
</property_group>
|
||||
<stability value='Evolving' />
|
||||
<template>
|
||||
<common_name>
|
||||
<loctext xml:lang='C'>Postfix SMTP Server</loctext>
|
||||
</common_name>
|
||||
<documentation>
|
||||
<manpage title='postfix' section='1' />
|
||||
<doc_link name='postfix.org' uri='http://www.postfix.org/documentation.html' />
|
||||
</documentation>
|
||||
</template>
|
||||
</service>
|
||||
</service_bundle>
|
||||
@@ -1,10 +1,10 @@
|
||||
$NetBSD: patch-aa,v 1.22 2013/02/13 14:31:31 taca Exp $
|
||||
$NetBSD: patch-aa,v 1.23 2014/02/09 05:34:13 taca Exp $
|
||||
|
||||
Make this pkgsrc friendly.
|
||||
|
||||
--- postfix-install.orig 2011-11-19 23:09:16.000000000 +0000
|
||||
--- postfix-install.orig 2012-05-22 19:40:29.000000000 +0000
|
||||
+++ postfix-install
|
||||
@@ -365,26 +365,6 @@ HTML files. Specify \"no\" if you do not
|
||||
@@ -370,26 +370,6 @@ HTML files. Specify \"no\" if you do not
|
||||
: ${tempdir=`pwd`}
|
||||
: ${config_directory=`bin/postconf -c conf -h -d config_directory`}
|
||||
|
||||
@@ -31,7 +31,7 @@ Make this pkgsrc friendly.
|
||||
# In case some systems special-case pathnames beginning with //.
|
||||
|
||||
case $install_root in
|
||||
@@ -739,10 +719,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
|
||||
@@ -744,10 +724,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
|
||||
"sample_directory = $sample_directory" \
|
||||
"readme_directory = $readme_directory" \
|
||||
|| exit 1
|
||||
|
||||
@@ -1,22 +1,9 @@
|
||||
$NetBSD: patch-ag,v 1.33 2012/02/27 03:01:30 taca Exp $
|
||||
$NetBSD: patch-ag,v 1.34 2014/02/09 05:34:13 taca Exp $
|
||||
|
||||
Only define HAS_DB if it hasn't been defined.
|
||||
Add support for NetBSD 5.x, NetBSD 6.x and DragonFly BSD.
|
||||
Handle closefrom() on FreeBSD.
|
||||
|
||||
--- src/util/sys_defs.h.orig 2011-11-02 23:46:22.000000000 +0000
|
||||
--- src/util/sys_defs.h.orig 2013-09-29 20:51:55.000000000 +0000
|
||||
+++ src/util/sys_defs.h
|
||||
@@ -30,8 +30,8 @@
|
||||
|| defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
|
||||
|| defined(OPENBSD5) \
|
||||
|| defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
|
||||
- || defined(NETBSD4) \
|
||||
- || defined(EKKOBSD1)
|
||||
+ || defined(NETBSD4) || defined(NETBSD5) || defined(NETBSD6) \
|
||||
+ || defined(EKKOBSD1) || defined(DRAGONFLY)
|
||||
#define SUPPORTED
|
||||
#include <sys/types.h>
|
||||
#include <sys/param.h>
|
||||
@@ -44,7 +44,9 @@
|
||||
#define DEF_MAILBOX_LOCK "flock, dotlock"
|
||||
#define HAS_SUN_LEN
|
||||
@@ -25,44 +12,5 @@ Handle closefrom() on FreeBSD.
|
||||
#define HAS_DB
|
||||
+#endif
|
||||
#define HAS_SA_LEN
|
||||
#define DEF_DB_TYPE "hash"
|
||||
#define NATIVE_DB_TYPE "hash"
|
||||
#if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
|
||||
@@ -165,9 +167,19 @@
|
||||
#define HAS_FUTIMES
|
||||
#endif
|
||||
|
||||
+#if defined(__DragonFly__)
|
||||
+#define HAS_DEV_URANDOM
|
||||
+#define HAS_ISSETUGID
|
||||
+#define HAS_FUTIMES
|
||||
+#define SOCKADDR_SIZE socklen_t
|
||||
+#define SOCKOPT_SIZE socklen_t
|
||||
+#define HAS_DUPLEX_PIPE
|
||||
+#endif
|
||||
+
|
||||
#if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 105000000) \
|
||||
|| (defined(__FreeBSD__) && __FreeBSD__ >= 4) \
|
||||
|| (defined(OpenBSD) && OpenBSD >= 200003) \
|
||||
+ || defined(__DragonFly__) \
|
||||
|| defined(USAGI_LIBINET6)
|
||||
#ifndef NO_IPV6
|
||||
# define HAS_IPV6
|
||||
@@ -176,14 +188,16 @@
|
||||
|
||||
#if (defined(__FreeBSD_version) && __FreeBSD_version >= 300000) \
|
||||
|| (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 103000000) \
|
||||
- || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */
|
||||
+ || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */ \
|
||||
+ || defined(__DragonFly__)
|
||||
# define USE_SYSV_POLL
|
||||
#endif
|
||||
|
||||
#ifndef NO_KQUEUE
|
||||
# if (defined(__FreeBSD_version) && __FreeBSD_version >= 410000) \
|
||||
|| (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 200000000) \
|
||||
- || (defined(OpenBSD) && OpenBSD >= 200105) /* OpenBSD 2.9 */
|
||||
+ || (defined(OpenBSD) && OpenBSD >= 200105) /* OpenBSD 2.9 */ \
|
||||
+ || defined(__DragonFly__)
|
||||
# define EVENTS_STYLE EVENTS_STYLE_KQUEUE
|
||||
# endif
|
||||
#endif
|
||||
|
||||
@@ -1,31 +1,10 @@
|
||||
$NetBSD: patch-ai,v 1.28 2012/12/13 16:23:14 taca Exp $
|
||||
$NetBSD: patch-ai,v 1.31 2014/02/09 05:34:13 taca Exp $
|
||||
|
||||
Make this pkgsrc friendly.
|
||||
Add support for NetBSD 5.x, NetBSD 6.x and DragonFly BSD.
|
||||
|
||||
--- makedefs.orig 2012-12-12 22:49:32.000000000 +0000
|
||||
--- makedefs.orig 2014-01-05 17:18:56.000000000 +0000
|
||||
+++ makedefs
|
||||
@@ -148,6 +148,8 @@ case "$SYSTEM.$RELEASE" in
|
||||
;;
|
||||
FreeBSD.9*) SYSTYPE=FREEBSD9
|
||||
;;
|
||||
+ DragonFly.*) SYSTYPE=DRAGONFLY
|
||||
+ ;;
|
||||
OpenBSD.2*) SYSTYPE=OPENBSD2
|
||||
;;
|
||||
OpenBSD.3*) SYSTYPE=OPENBSD3
|
||||
@@ -166,6 +168,10 @@ case "$SYSTEM.$RELEASE" in
|
||||
;;
|
||||
NetBSD.4*) SYSTYPE=NETBSD4
|
||||
;;
|
||||
+ NetBSD.5*) SYSTYPE=NETBSD5
|
||||
+ ;;
|
||||
+ NetBSD.6*) SYSTYPE=NETBSD6
|
||||
+ ;;
|
||||
BSD/OS.2*) SYSTYPE=BSDI2
|
||||
;;
|
||||
BSD/OS.3*) SYSTYPE=BSDI3
|
||||
@@ -218,13 +224,6 @@ case "$SYSTEM.$RELEASE" in
|
||||
@@ -239,13 +239,6 @@ case "$SYSTEM.$RELEASE" in
|
||||
esac
|
||||
;;
|
||||
ULTRIX.4*) SYSTYPE=ULTRIX4
|
||||
@@ -39,41 +18,92 @@ Add support for NetBSD 5.x, NetBSD 6.x and DragonFly BSD.
|
||||
for l in syslog resolv; do
|
||||
if [ -f /usr/local/lib/lib$l.a ]; then
|
||||
SYSLIBS="$SYSLIBS -l$l"
|
||||
@@ -262,25 +261,8 @@ case "$SYSTEM.$RELEASE" in
|
||||
@@ -283,33 +276,8 @@ case "$SYSTEM.$RELEASE" in
|
||||
esac;;
|
||||
# Tested with RedHat 3.03 on 20020729.
|
||||
Linux.1*) SYSTYPE=LINUX1
|
||||
- SYSLIBS="-ldb"
|
||||
- case "$CCARGS" in
|
||||
- *-DNO_DB*) ;;
|
||||
- *-DHAS_DB*) ;;
|
||||
- *) SYSLIBS="-ldb";;
|
||||
- esac
|
||||
;;
|
||||
Linux.2*) SYSTYPE=LINUX2
|
||||
- # Postfix no longer needs DB 1.85 compatibility
|
||||
- if [ -f /usr/include/db.h ]
|
||||
- then
|
||||
- : we are all set
|
||||
- elif [ -f /usr/include/db/db.h ]
|
||||
- then
|
||||
- CCARGS="$CCARGS -I/usr/include/db"
|
||||
- else
|
||||
- # No, we're not going to try db1 db2 db3 etc.
|
||||
- # On a properly installed system, Postfix builds
|
||||
- # by including <db.h> and by linking with -ldb
|
||||
- echo "No <db.h> include file found." 1>&2
|
||||
- echo "Install the appropriate db*-devel package first." 1>&2
|
||||
- echo "See the RELEASE_NOTES file for more information." 1>&2
|
||||
- exit 1
|
||||
- fi
|
||||
# GDBM locks the DBM .pag file after open. This breaks postmap.
|
||||
# if [ -f /usr/include/gdbm-ndbm.h ]
|
||||
# then
|
||||
@@ -291,7 +273,6 @@ case "$SYSTEM.$RELEASE" in
|
||||
# CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
|
||||
# GDBM_LIBS=gdbm
|
||||
# fi
|
||||
- SYSLIBS="-ldb"
|
||||
- case "$CCARGS" in
|
||||
- *-DNO_DB*) ;;
|
||||
- *-DHAS_DB*) ;;
|
||||
- *) if [ -f /usr/include/db.h ]
|
||||
- then
|
||||
- : we are all set
|
||||
- elif [ -f /usr/include/db/db.h ]
|
||||
- then
|
||||
- CCARGS="$CCARGS -I/usr/include/db"
|
||||
- else
|
||||
- # No, we're not going to try db1 db2 db3 etc.
|
||||
- # On a properly installed system, Postfix builds
|
||||
- # by including <db.h> and by linking with -ldb
|
||||
- echo "No <db.h> include file found." 1>&2
|
||||
- echo "Install the appropriate db*-devel package first." 1>&2
|
||||
- exit 1
|
||||
- fi
|
||||
- SYSLIBS="-ldb"
|
||||
- ;;
|
||||
- esac
|
||||
for name in nsl resolv $GDBM_LIBS
|
||||
do
|
||||
for lib in /usr/lib64 /lib64 /usr/lib /lib
|
||||
@@ -420,25 +401,13 @@ EOF
|
||||
@@ -363,25 +331,6 @@ EOF
|
||||
esac
|
||||
;;
|
||||
Linux.3*) SYSTYPE=LINUX3
|
||||
- case "$CCARGS" in
|
||||
- *-DNO_DB*) ;;
|
||||
- *-DHAS_DB*) ;;
|
||||
- *) if [ -f /usr/include/db.h ]
|
||||
- then
|
||||
- : we are all set
|
||||
- elif [ -f /usr/include/db/db.h ]
|
||||
- then
|
||||
- CCARGS="$CCARGS -I/usr/include/db"
|
||||
- else
|
||||
- # On a properly installed system, Postfix builds
|
||||
- # by including <db.h> and by linking with -ldb
|
||||
- echo "No <db.h> include file found." 1>&2
|
||||
- echo "Install the appropriate db*-devel package first." 1>&2
|
||||
- exit 1
|
||||
- fi
|
||||
- SYSLIBS="-ldb"
|
||||
- ;;
|
||||
- esac
|
||||
for name in nsl resolv
|
||||
do
|
||||
for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/*
|
||||
@@ -395,24 +344,6 @@ EOF
|
||||
;;
|
||||
GNU.0*|GNU/kFreeBSD.[567]*)
|
||||
SYSTYPE=GNU0
|
||||
- case "$CCARGS" in
|
||||
- *-DNO_DB*) ;;
|
||||
- *) if [ -f /usr/include/db.h ]
|
||||
- then
|
||||
- : we are all set
|
||||
- elif [ -f /usr/include/db/db.h ]
|
||||
- then
|
||||
- CCARGS="$CCARGS -I/usr/include/db"
|
||||
- else
|
||||
- # On a properly installed system, Postfix builds
|
||||
- # by including <db.h> and by linking with -ldb
|
||||
- echo "No <db.h> include file found." 1>&2
|
||||
- echo "Install the appropriate db*-devel package first." 1>&2
|
||||
- exit 1
|
||||
- fi
|
||||
- SYSLIBS="-ldb"
|
||||
- ;;
|
||||
- esac
|
||||
for name in nsl resolv
|
||||
do
|
||||
for lib in /usr/lib64 /lib64 /usr/lib /lib
|
||||
@@ -443,25 +374,13 @@ EOF
|
||||
HP-UX.A.09.*) SYSTYPE=HPUX9
|
||||
SYSLIBS=-ldbm
|
||||
CCARGS="$CCARGS -DMISSING_USLEEP"
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
$NetBSD: patch-src_dns_dns__lookup.c,v 1.1 2013/02/26 19:56:18 garbled Exp $
|
||||
$NetBSD: patch-src_dns_dns__lookup.c,v 1.3 2014/02/09 05:34:13 taca Exp $
|
||||
|
||||
--- src/dns/dns_lookup.c.orig 2013-02-26 19:34:50.000000000 +0000
|
||||
Fix runtime problem when mysql PKG_OPTIONS is enabled.
|
||||
|
||||
--- src/dns/dns_lookup.c.orig 2014-01-09 15:00:36.000000000 +0000
|
||||
+++ src/dns/dns_lookup.c
|
||||
@@ -153,6 +153,8 @@
|
||||
@@ -194,6 +194,8 @@
|
||||
|
||||
/* Local stuff. */
|
||||
|
||||
@@ -11,7 +13,7 @@ $NetBSD: patch-src_dns_dns__lookup.c,v 1.1 2013/02/26 19:56:18 garbled Exp $
|
||||
/*
|
||||
* Structure to keep track of things while decoding a name server reply.
|
||||
*/
|
||||
@@ -192,7 +194,7 @@ static int dns_query(const char *name, i
|
||||
@@ -235,7 +237,7 @@ static int dns_query(const char *name, i
|
||||
/*
|
||||
* Initialize the name service.
|
||||
*/
|
||||
@@ -20,11 +22,11 @@ $NetBSD: patch-src_dns_dns__lookup.c,v 1.1 2013/02/26 19:56:18 garbled Exp $
|
||||
if (why)
|
||||
vstring_strcpy(why, "Name service initialization failure");
|
||||
return (DNS_FAIL);
|
||||
@@ -206,18 +208,18 @@ static int dns_query(const char *name, i
|
||||
@@ -264,18 +266,18 @@ static int dns_query(const char *name, i
|
||||
*/
|
||||
#define SAVE_FLAGS (USER_FLAGS | XTRA_FLAGS)
|
||||
|
||||
if ((flags & USER_FLAGS) != flags)
|
||||
msg_panic("dns_query: bad flags: %d", flags);
|
||||
- saved_options = (_res.options & USER_FLAGS);
|
||||
- saved_options = (_res.options & SAVE_FLAGS);
|
||||
+ saved_options = (rstate.options & USER_FLAGS);
|
||||
|
||||
/*
|
||||
@@ -42,6 +44,6 @@ $NetBSD: patch-src_dns_dns__lookup.c,v 1.1 2013/02/26 19:56:18 garbled Exp $
|
||||
+ len = res_nsearch(&rstate, (char *) name, C_IN, type, reply->buf, reply->buf_len);
|
||||
+ rstate.options &= ~flags;
|
||||
+ rstate.options |= saved_options;
|
||||
reply_header = (HEADER *) reply->buf;
|
||||
reply->rcode = reply_header->rcode;
|
||||
if (len < 0) {
|
||||
if (why)
|
||||
vstring_sprintf(why, "Host or domain name not found. "
|
||||
|
||||
Reference in New Issue
Block a user