svn commit: r378611 - in head: . mail/opensmtpd mail/opensmtpd-devel mail/opensmtpd-devel/files mail/opensmtpd/files
Ashish SHUKLA
ashish at FreeBSD.org
Sat Feb 7 19:04:19 UTC 2015
Author: ashish
Date: Sat Feb 7 19:04:15 2015
New Revision: 378611
URL: https://svnweb.freebsd.org/changeset/ports/378611
QAT: https://qat.redports.org/buildarchive/r378611/
Log:
OpenSMTPD port updates
mail/opensmtpd:
- Update to 5.4.4p1
- Add LIBASRDEVEL option to depend on dns/libasr-devel
- Use OpenSSL from ports, should help with migration to LibreSSL
- Explicitly provide path to OpenSSL[1]
mail/opensmtpd-devel:
- Update to 201502012312
- Add LIBASR option to depend on dns/libasr
- Remove MYSQL, PGSQL, LDAP, and REDIS options as they're removed
upstream
- Add a note for above to UPDATING
- Explicitly provide path to OpenSSL[1]
- Add a diff to fix build failure on FreeBSD[2]
Reported by: TJ <tj at mrsk.me> (via private email)
Submitted by: Herbert J. Skuhra <herbert at oslo.ath.cx> (via list)
Added:
head/mail/opensmtpd-devel/files/patch-openbsd-compat_defines.h (contents, props changed)
Modified:
head/UPDATING
head/mail/opensmtpd-devel/Makefile
head/mail/opensmtpd-devel/distinfo
head/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in
head/mail/opensmtpd-devel/pkg-plist
head/mail/opensmtpd/Makefile
head/mail/opensmtpd/distinfo
head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in
head/mail/opensmtpd/pkg-plist
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Sat Feb 7 17:22:03 2015 (r378610)
+++ head/UPDATING Sat Feb 7 19:04:15 2015 (r378611)
@@ -5,6 +5,21 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20150207:
+ AFFECTS: users of mail/opensmtpd-devel
+ AUTHOR: ashish at FreeBSD.org
+
+ MYSQL, PGSQL, LDAP, and REDIS options are removed from port, as
+ they're moved upstream to a separate project, which is yet to
+ release snapshots. If you need those options, then please install
+ "mail/opensmtpd" port instead. To do that:
+
+ If using portupgrade:
+ # portupgrade -o mail/opensmtpd mail/opensmtpd-devel
+
+ If using portmaster:
+ # portmaster -o mail/opensmtpd mail/opensmtpd-devel
+
20150206:
AFFECTS: users of net/serviio
AUTHOR: netchild at FreeBSD.org
Modified: head/mail/opensmtpd-devel/Makefile
==============================================================================
--- head/mail/opensmtpd-devel/Makefile Sat Feb 7 17:22:03 2015 (r378610)
+++ head/mail/opensmtpd-devel/Makefile Sat Feb 7 19:04:15 2015 (r378611)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= opensmtpd
-PORTVERSION= 201405202105
-PORTREVISION= 4
+PORTVERSION= 201502012312
PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= http://www.opensmtpd.org/archives/ \
@@ -19,17 +18,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2
-OPENSMTPD_SNAPSHOT_VER= p1
+OPTIONS_DEFINE= CA_BUNDLE LIBASR
-OPTIONS_DEFINE= CA_BUNDLE PAM SQLITE MYSQL PGSQL LDAP REDIS
-OPTIONS_DEFAULT=CA_BUNDLE PAM
-OPTIONS_SUB= yes
+OPTIONS_DEFAULT= CA_BUNDLE PAM
CA_BUNDLE_DESC= Install CA bundle for OpenSSL
+LIBASR_DESC= Use stable version of libasr
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libevent-dir=${LOCALBASE} --sysconfdir=${PREFIX}/etc/mail/ \
- --with-mailwrapper
+ --with-mailwrapper --with-ssl-dir=${OPENSSLBASE}
USE_RC_SUBR= smtpd
SUB_FILES= pkg-install pkg-deinstall
@@ -39,29 +37,12 @@ CONFLICTS_INSTALL= postfix-[0-9]* sendma
USERS= _smtpd _smtpq
GROUPS= _smtpd
+LIBASR_LIB_DEPENDS_OFF= libasr.so:${PORTSDIR}/dns/libasr-devel
+LIBASR_LIB_DEPENDS= libasr.so:${PORTSDIR}/dns/libasr
+
CA_BUNDLE_CONFIGURE_ON= --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-MYSQL_USE= MYSQL=yes
-MYSQL_CFLAGS= -I${LOCALBASE}/include/mysql
-MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
-MYSQL_CONFIGURE_ON= --with-experimental-mysql
-
-SQLITE_USE= SQLITE=3
-SQLITE_CFLAGS= -I${LOCALBASE}/include
-SQLITE_LDFLAGS= -L${LOCALBASE}/lib
-SQLITE_CONFIGURE_ON= --with-experimental-sqlite
-
-PGSQL_USES= pgsql
-PGSQL_CONFIGURE_ON= --with-experimental-postgres
-
-LDAP_CONFIGURE_ON= --with-experimental-ldap
-
-PAM_CONFIGURE_ON= --with-pam --with-pam-service=smtpd
-
-REDIS_LIB_DEPENDS= libhiredis.so:${PORTSDIR}/databases/hiredis
-REDIS_CONFIGURE_ON= --with-experimental-redis
-
USE_OPENSSL= yes
WITH_OPENSSL_PORT= yes
Modified: head/mail/opensmtpd-devel/distinfo
==============================================================================
--- head/mail/opensmtpd-devel/distinfo Sat Feb 7 17:22:03 2015 (r378610)
+++ head/mail/opensmtpd-devel/distinfo Sat Feb 7 19:04:15 2015 (r378611)
@@ -1,2 +1,2 @@
-SHA256 (opensmtpd-201405202105p1.tar.gz) = 87c9ab2abe6fa85cdd7217239965df5ac08f6a9460426e9d50986744a087c14b
-SIZE (opensmtpd-201405202105p1.tar.gz) = 929962
+SHA256 (opensmtpd-201502012312p1.tar.gz) = e35b30861ac65c280b6c705bda9dad0f82eb846a1064e46bb18b4a3a1c78c2df
+SIZE (opensmtpd-201502012312p1.tar.gz) = 764585
Modified: head/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in
==============================================================================
--- head/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in Sat Feb 7 17:22:03 2015 (r378610)
+++ head/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in Sat Feb 7 19:04:15 2015 (r378611)
@@ -3,7 +3,7 @@ $FreeBSD$
--- mk/smtpd/Makefile.in.orig
+++ mk/smtpd/Makefile.in
-@@ -1837,11 +1837,7 @@
+@@ -1796,11 +1796,7 @@
$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
Added: head/mail/opensmtpd-devel/files/patch-openbsd-compat_defines.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/opensmtpd-devel/files/patch-openbsd-compat_defines.h Sat Feb 7 19:04:15 2015 (r378611)
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+Fix for a build failure, taken from
+
+http://article.gmane.org/gmane.mail.opensmtpd.general/2291
+
+--- openbsd-compat/defines.h.orig
++++ openbsd-compat/defines.h
+@@ -79,6 +79,10 @@
+ # define MAXHOSTNAMELEN 64
+ #endif
+
++#ifndef HOST_NAME_MAX
++# define HOST_NAME_MAX 255
++#endif
++
+ #ifndef LOGIN_NAME_MAX
+ # define LOGIN_NAME_MAX 9
+ #endif
Modified: head/mail/opensmtpd-devel/pkg-plist
==============================================================================
--- head/mail/opensmtpd-devel/pkg-plist Sat Feb 7 17:22:03 2015 (r378610)
+++ head/mail/opensmtpd-devel/pkg-plist Sat Feb 7 19:04:15 2015 (r378611)
@@ -1,22 +1,6 @@
etc/mail/smtpd.conf.sample
libexec/opensmtpd/mail.local
libexec/opensmtpd/makemap
-libexec/opensmtpd/queue-null
-libexec/opensmtpd/queue-ram
-libexec/opensmtpd/queue-stub
-libexec/opensmtpd/table-stub
-libexec/opensmtpd/table-passwd
-%%MYSQL%%libexec/opensmtpd/table-mysql
-%%SQLITE%%libexec/opensmtpd/table-sqlite
-%%LDAP%%libexec/opensmtpd/table-ldap
-%%PGSQL%%libexec/opensmtpd/table-postgres
-%%REDIS%%libexec/opensmtpd/table-redis
-libexec/opensmtpd/scheduler-ram
-libexec/opensmtpd/scheduler-stub
-libexec/opensmtpd/filter-dnsbl
-libexec/opensmtpd/filter-monkey
-libexec/opensmtpd/filter-stub
-libexec/opensmtpd/filter-trace
libexec/opensmtpd/encrypt
sbin/smtpctl
sbin/smtpd
@@ -29,3 +13,5 @@ man/man5/table.5.gz
man/man5/smtpd.conf.5.gz
man/man5/forward.5.gz
man/man5/aliases.5.gz
+ at dir libexec/opensmtpd
+ at dirrmtry etc/mail
Modified: head/mail/opensmtpd/Makefile
==============================================================================
--- head/mail/opensmtpd/Makefile Sat Feb 7 17:22:03 2015 (r378610)
+++ head/mail/opensmtpd/Makefile Sat Feb 7 19:04:15 2015 (r378611)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= opensmtpd
-PORTVERSION= 5.4.2
-PORTREVISION= 4
+PORTVERSION= 5.4.4
PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= http://www.opensmtpd.org/archives/ \
@@ -17,17 +16,19 @@ LICENSE= ISCL
LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2
-OPTIONS_DEFINE= CA_BUNDLE PAM SQLITE MYSQL PGSQL LDAP REDIS
+OPTIONS_DEFINE= CA_BUNDLE PAM SQLITE MYSQL PGSQL LDAP REDIS LIBASRDEVEL
OPTIONS_DEFAULT= CA_BUNDLE PAM
CA_BUNDLE_DESC= Install CA bundle for OpenSSL
+LIBASRDEVEL_DESC= Use development version of libasr
USES= libtool
USE_OPENSSL= yes
+WITH_OPENSSL_PORT= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libevent-dir=${LOCALBASE} --sysconfdir=${PREFIX}/etc/mail/ \
- --with-mailwrapper
+ --with-mailwrapper --with-ssl-dir=${OPENSSLBASE}
USE_RC_SUBR= smtpd
SUB_FILES= pkg-install pkg-deinstall pkg-message
@@ -39,6 +40,9 @@ GROUPS= _smtpd
OPTIONS_SUB= yes
+LIBASRDEVEL_LIB_DEPENDS_OFF= libasr.so:${PORTSDIR}/dns/libasr
+LIBASRDEVEL_LIB_DEPENDS= libasr.so:${PORTSDIR}/dns/libasr-devel
+
CA_BUNDLE_CONFIGURE_ON= --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
Modified: head/mail/opensmtpd/distinfo
==============================================================================
--- head/mail/opensmtpd/distinfo Sat Feb 7 17:22:03 2015 (r378610)
+++ head/mail/opensmtpd/distinfo Sat Feb 7 19:04:15 2015 (r378611)
@@ -1,2 +1,2 @@
-SHA256 (opensmtpd-5.4.2p1.tar.gz) = 4ffaf48d3d044ef8be1bd80c8972c87ba830a21bb330b85a59f6a70da5fbd9a2
-SIZE (opensmtpd-5.4.2p1.tar.gz) = 881853
+SHA256 (opensmtpd-5.4.4p1.tar.gz) = 1118330aa54e9a8a30914a1f2e129a83f2954a5956300eade522a1396f6d8ebd
+SIZE (opensmtpd-5.4.4p1.tar.gz) = 798968
Modified: head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in
==============================================================================
--- head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in Sat Feb 7 17:22:03 2015 (r378610)
+++ head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in Sat Feb 7 19:04:15 2015 (r378611)
@@ -3,7 +3,7 @@ $FreeBSD$
--- mk/smtpd/Makefile.in.orig
+++ mk/smtpd/Makefile.in
-@@ -1906,11 +1906,7 @@
+@@ -1782,11 +1782,7 @@
$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
Modified: head/mail/opensmtpd/pkg-plist
==============================================================================
--- head/mail/opensmtpd/pkg-plist Sat Feb 7 17:22:03 2015 (r378610)
+++ head/mail/opensmtpd/pkg-plist Sat Feb 7 19:04:15 2015 (r378611)
@@ -2,22 +2,6 @@ etc/mail/smtpd.conf.sample
libexec/opensmtpd/encrypt
libexec/opensmtpd/mail.local
libexec/opensmtpd/makemap
-libexec/opensmtpd/queue-null
-libexec/opensmtpd/queue-ram
-libexec/opensmtpd/queue-stub
-libexec/opensmtpd/table-stub
-libexec/opensmtpd/table-passwd
-%%MYSQL%%libexec/opensmtpd/table-mysql
-%%SQLITE%%libexec/opensmtpd/table-sqlite
-%%LDAP%%libexec/opensmtpd/table-ldap
-%%PGSQL%%libexec/opensmtpd/table-postgres
-%%REDIS%%libexec/opensmtpd/table-redis
-libexec/opensmtpd/scheduler-ram
-libexec/opensmtpd/scheduler-stub
-libexec/opensmtpd/filter-dnsbl
-libexec/opensmtpd/filter-monkey
-libexec/opensmtpd/filter-stub
-libexec/opensmtpd/filter-trace
sbin/smtpctl
sbin/smtpd
man/man8/newaliases.8.gz
More information about the svn-ports-head
mailing list