FreeBSD Bugzilla – Attachment 167067 Details for
Bug 206357
[feature request] [PATCH] mail/opensmtpd-devel: add libressl support, sync with mail/opensmtpd
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch-Makefile and files
opensmtpd-devel-201602131907.diff (text/plain), 7.38 KB, created by
Andrey Fesenko
on 2016-02-16 04:23:56 UTC
(
hide
)
Description:
patch-Makefile and files
Filename:
MIME Type:
Creator:
Andrey Fesenko
Created:
2016-02-16 04:23:56 UTC
Size:
7.38 KB
patch
obsolete
>diff -r d6045d82f36c -r e063777d0aae mail/opensmtpd-devel/Makefile >--- a/mail/opensmtpd-devel/Makefile Thu Jan 07 01:59:40 2016 +0300 >+++ b/mail/opensmtpd-devel/Makefile Tue Feb 16 07:11:28 2016 +0300 >@@ -2,13 +2,13 @@ > # $FreeBSD: head/mail/opensmtpd-devel/Makefile 390363 2015-06-23 10:43:59Z ashish $ > > PORTNAME= opensmtpd >-PORTVERSION= 201506112227 >+PORTVERSION= 201602131907 > PORTEPOCH= 1 > CATEGORIES= mail > MASTER_SITES= http://www.opensmtpd.org/archives/ \ > http://distfiles.pirateparty.in/ashish/ > PKGNAMESUFFIX= -devel >-DISTNAME= ${PORTNAME}-${PORTVERSION}p1 >+DISTVERSIONSUFFIX= p1 > > MAINTAINER= ashish@FreeBSD.org > COMMENT= Security- and simplicity-focused SMTP server from OpenBSD >@@ -18,17 +18,24 @@ > > LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 > >-OPTIONS_DEFINE= CA_BUNDLE LIBASR MAILERCONF >+OPTIONS_DEFINE= CA_BUNDLE LIBASR MAILERCONF PAM SSL_PORT > > OPTIONS_DEFAULT= CA_BUNDLE PAM > >-CA_BUNDLE_DESC= Install CA bundle for OpenSSL >-LIBASR_DESC= Use stable version of libasr >+CA_BUNDLE_DESC= Install CA bundle for SSL >+LIBASR_DESC= Use stable version of libasr > MAILERCONF_DESC= Activate OpenSMTPD in mailer.conf(5) >+SSL_PORT_DESC= SSL/TLS support via OpenSSL/LibreSSL from port > >+USES= cpe libtool >+USE_OPENSSL= yes > GNU_CONFIGURE= yes >-CONFIGURE_ARGS= --with-libevent-dir=${LOCALBASE} --sysconfdir=${PREFIX}/etc/mail/ \ >- --with-mailwrapper --with-ssl-dir=${OPENSSLBASE} --enable-table-db >+CONFIGURE_ARGS= --with-table-db \ >+ --sysconfdir=${PREFIX}/etc/mail/ \ >+ --with-libasr=${LOCALBASE} \ >+ --with-libevent=${LOCALBASE} \ >+ --with-libssl=${OPENSSLBASE} \ >+ --with-group-queue=${GROUPS} > > USE_RC_SUBR= smtpd > SUB_FILES= pkg-install pkg-deinstall >@@ -43,13 +50,19 @@ > 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_CONFIGURE_WITH= path-CAfile=${LOCALBASE}/share/certs/ca-root-nss.crt > CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss > >-USE_OPENSSL= yes >+PAM_CONFIGURE_WITH= auth-pam=smtpd >+ >+.include <bsd.port.options.mk> >+ >+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ! ${PORT_OPTIONS:MSSL_PORT} > WITH_OPENSSL_PORT= yes >+.endif > >-post-deinstall: >- @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-DEINSTALL >+.if ${PORT_OPTIONS:MSSL_PORT} >+WITH_OPENSSL_PORT= yes >+.endif > > .include <bsd.port.mk> >diff -r d6045d82f36c -r e063777d0aae mail/opensmtpd-devel/distinfo >--- a/mail/opensmtpd-devel/distinfo Thu Jan 07 01:59:40 2016 +0300 >+++ b/mail/opensmtpd-devel/distinfo Tue Feb 16 07:11:28 2016 +0300 >@@ -1,2 +1,2 @@ >-SHA256 (opensmtpd-201506112227p1.tar.gz) = f938796d2655f554e695adff6a3f3bbc4b1326912327b98acc7e29f705b9cf63 >-SIZE (opensmtpd-201506112227p1.tar.gz) = 706259 >+SHA256 (opensmtpd-201602131907p1.tar.gz) = 0fd10cff59719523e41fe489ff5c1490c2898a2ce47b98e4bf39f07ba3562252 >+SIZE (opensmtpd-201602131907p1.tar.gz) = 686726 >diff -r d6045d82f36c -r e063777d0aae mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in >--- a/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in Thu Jan 07 01:59:40 2016 +0300 >+++ b/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in Tue Feb 16 07:11:28 2016 +0300 >@@ -1,6 +1,6 @@ >---- mk/smtpd/Makefile.in.orig 2015-06-20 04:17:57.656811000 +0000 >-+++ mk/smtpd/Makefile.in 2015-06-20 04:19:53.711103000 +0000 >-@@ -1366,11 +1366,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP >+--- mk/smtpd/Makefile.in.orig 2016-02-07 00:04:24 UTC >++++ mk/smtpd/Makefile.in >+@@ -1339,12 +1339,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP > $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 > $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 > >@@ -9,7 +9,8 @@ > - else \ > - echo "$(DESTDIR)$(sysconfdir)/smtpd.conf already exists, install will not overwrite"; \ > - fi >-+ $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf.sample >- >+- >++ $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf.sample > $(INSTALL) -m 644 aliases.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/aliases.5 > $(INSTALL) -m 644 forward.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/forward.5 >+ $(INSTALL) -m 644 table.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/table.5 >diff -r d6045d82f36c -r e063777d0aae mail/opensmtpd-devel/files/patch-openbsd-compat_defines.h >--- a/mail/opensmtpd-devel/files/patch-openbsd-compat_defines.h Thu Jan 07 01:59:40 2016 +0300 >+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 >@@ -1,17 +0,0 @@ >-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 >diff -r d6045d82f36c -r e063777d0aae mail/opensmtpd-devel/files/patch-usernamelen >--- /dev/null Thu Jan 01 00:00:00 1970 +0000 >+++ b/mail/opensmtpd-devel/files/patch-usernamelen Tue Feb 16 07:11:28 2016 +0300 >@@ -0,0 +1,13 @@ >+diff --git a/smtpd/smtp_session.c b/smtpd/smtp_session.c >+index 3a0ca2a..404ee50 100644 >+--- smtpd/smtp_session.c >++++ smtpd/smtp_session.c >+@@ -84,6 +84,7 @@ enum session_flags { >+ SF_BADINPUT = 0x0080, >+ SF_FILTERCONN = 0x0100, >+ SF_FILTERDATA = 0x0200, >++ SF_USERTOOLONG = 0x0400, >+ }; >+ >+ enum message_flags { >+ >diff -r d6045d82f36c -r e063777d0aae mail/opensmtpd-devel/files/pkg-install.in >--- a/mail/opensmtpd-devel/files/pkg-install.in Thu Jan 07 01:59:40 2016 +0300 >+++ b/mail/opensmtpd-devel/files/pkg-install.in Tue Feb 16 07:11:28 2016 +0300 >@@ -9,8 +9,8 @@ > sendmail %%PREFIX%%/sbin/smtpctl > send-mail %%PREFIX%%/sbin/smtpctl > mailq %%PREFIX%%/sbin/smtpctl >-makemap %%PREFIX%%/libexec/opensmtpd/makemap >-newaliases %%PREFIX%%/libexec/opensmtpd/makemap >+makemap %%PREFIX%%/sbin/smtpctl >+newaliases %%PREFIX%%/sbin/smtpctl > EOF > fi > >diff -r d6045d82f36c -r e063777d0aae mail/opensmtpd-devel/files/pkg-message.in >--- /dev/null Thu Jan 01 00:00:00 1970 +0000 >+++ b/mail/opensmtpd-devel/files/pkg-message.in Tue Feb 16 07:11:28 2016 +0300 >@@ -0,0 +1,18 @@ >+If you are upgrading from OpenSMTPD version 201303011853 or earlier, please >+follow the procedure below to update the permissions on the OpenSMTPD >+spool directories: >+ >+ 1. Stop 'smtpd' service: >+ >+ # %%PREFIX%%/etc/rc.d/smtpd stop >+ >+ 2. Update permissions: >+ >+ # chown -R _smtpq:wheel /var/spool/smtpd/corrupt >+ # chown -R _smtpq:wheel /var/spool/smtpd/purge >+ # chown -R _smtpq:wheel /var/spool/smtpd/queue >+ # chown -R _smtpq:wheel /var/spool/smtpd/temporary >+ >+ 3. Start 'smtpd' service: >+ >+ # %%PREFIX%%/etc/rc.d/smtpd start >diff -r d6045d82f36c -r e063777d0aae mail/opensmtpd-devel/pkg-plist >--- a/mail/opensmtpd-devel/pkg-plist Thu Jan 07 01:59:40 2016 +0300 >+++ b/mail/opensmtpd-devel/pkg-plist Tue Feb 16 07:11:28 2016 +0300 >@@ -1,15 +1,14 @@ >-etc/mail/smtpd.conf.sample >+@sample etc/mail/smtpd.conf.sample >+libexec/opensmtpd/encrypt > libexec/opensmtpd/mail.local >-libexec/opensmtpd/makemap >-libexec/opensmtpd/encrypt > sbin/smtpctl > sbin/smtpd >+man/man5/aliases.5.gz >+man/man5/forward.5.gz >+man/man5/smtpd.conf.5.gz >+man/man5/table.5.gz >+man/man8/makemap.8.gz > man/man8/newaliases.8.gz > man/man8/sendmail.8.gz >+man/man8/smtpctl.8.gz > man/man8/smtpd.8.gz >-man/man8/makemap.8.gz >-man/man8/smtpctl.8.gz >-man/man5/table.5.gz >-man/man5/smtpd.conf.5.gz >-man/man5/forward.5.gz >-man/man5/aliases.5.gz
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
andrey
:
maintainer-approval?
(
ashish
)
Actions:
View
|
Diff
Attachments on
bug 206357
:
165739
|
165740
|
166679
|
166680
| 167067 |
167068
|
167069