opensmtpd: update to 6.4.1p2.

This commit is contained in:
Leah Neukirchen 2018-12-17 14:13:46 +01:00
parent 33b571d591
commit 6eff2a9498
2 changed files with 2 additions and 33 deletions

View file

@ -1,29 +0,0 @@
--- mk/smtpctl/Makefile.am
+++ mk/smtpctl/Makefile.am
@@ -4,6 +4,7 @@ sbin_PROGRAMS= smtpctl
smtpctl_SOURCES= $(smtpd_srcdir)/enqueue.c
smtpctl_SOURCES+= $(smtpd_srcdir)/parser.c
+smtpctl_SOURCES+= $(smtpd_srcdir)/config.c
smtpctl_SOURCES+= $(smtpd_srcdir)/log.c
smtpctl_SOURCES+= $(smtpd_srcdir)/envelope.c
smtpctl_SOURCES+= $(smtpd_srcdir)/queue_backend.c
@@ -35,7 +36,7 @@
smtpctl_SOURCES+= $(smtpd_srcdir)/crypto.c
endif
-smtpctl_CFLAGS= -DNO_IO
+smtpctl_CFLAGS= -DNO_IO -DCONFIG_MINIMUM
smtpctl_CFLAGS+= -DPATH_GZCAT=\"$(ZCAT)\" \
-DPATH_ENCRYPT=\"$(pkglibexecdir)/encrypt\"
@@ -79,8 +80,6 @@
install-exec-hook: $(CONFIGFILES) $(MANPAGES)
$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
- chgrp $(SMTPD_QUEUE_USER) $(DESTDIR)$(sbindir)/smtpctl
- chmod 2555 $(DESTDIR)$(sbindir)/smtpctl
$(INSTALL) -m 644 smtpctl.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/smtpctl.8
$(INSTALL) -m 644 sendmail.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sendmail.8
$(INSTALL) -m 644 makemap.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/makemap.8

View file

@ -1,6 +1,6 @@
# Template file for 'opensmtpd'
pkgname=opensmtpd
version=6.4.0p2
version=6.4.1p2
revision=1
build_style=gnu-configure
configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
@ -28,7 +28,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD, ISC, MIT"
homepage="https://www.opensmtpd.org"
distfiles="https://www.opensmtpd.org/archives/${pkgname}-${version}.tar.gz"
checksum=76afcf7bf1af1fcb9475b937e304b4367bb8fc953c0ea1d43625369635b4faf8
checksum=b69b84934bcc4893ca334504411cd47f86ea04ac5e971a5746d44c473ac5f732
CFLAGS=-D_DEFAULT_SOURCE
@ -48,8 +48,6 @@ pre_configure() {
# XXX get this result.
sed -e 's,^\(libevent_major_version\)=.*$,\1=2,' -i configure
sed -ri 's,/etc/mail,/etc/smtpd,g' smtpd/smtpd.conf
sed -i 's,"/usr/libexec/,&opensmtpd/,g' smtpd/parse.y
}
post_install() {
for f in newaliases mailq makemap sendmail; do