Date: Thu, 6 Jun 2013 11:04:12 GMT From: Emmanuel Vadot <elbarto@bocal.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/179364: [UPDATE] mail/opensmtpd to 5.3.3p1 Message-ID: <201306061104.r56B4Ccb074533@oldred.freebsd.org> Resent-Message-ID: <201306061110.r56BA1Nt063881@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179364 >Category: ports >Synopsis: [UPDATE] mail/opensmtpd to 5.3.3p1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Jun 06 11:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Emmanuel Vadot >Release: 9.1-RELEASE-p3 amd64 >Organization: Bocal >Environment: FreeBSD zero 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: - Update to 5.3.3p1 - Remove patch-smtpd_Makefile.am (use configure flag instead) >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== --- Makefile (revision 320081) +++ Makefile (working copy) @@ -6,7 +6,7 @@ # PORTNAME= opensmtpd -PORTVERSION= 5.3.2 +PORTVERSION= 5.3.3 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://www.opensmtpd.org/archives/ \ @@ -45,7 +45,7 @@ USE_OPENSSL= yes .if ${PORT_OPTIONS:MPAM} -CONFIGURE_ARGS+= --with-pam +CONFIGURE_ARGS+= --with-pam --sysconfdir=${LOCALBASE}/etc/mail/ .endif # FreeBSD 7.3 and earlier need to use OpenSSL from ports Index: distinfo =================================================================== --- distinfo (revision 320081) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (opensmtpd-5.3.2p1.tar.gz) = 512a80333d267a3cecf858b5106200a386e96894907e18e105b69cbd27699a08 -SIZE (opensmtpd-5.3.2p1.tar.gz) = 345468 +SHA256 (opensmtpd-5.3.3p1.tar.gz) = 34f0e208e6fdde5c5c25bb11f468436c4d6148a8b640c32117869cad140b823c +SIZE (opensmtpd-5.3.3p1.tar.gz) = 343733 Index: files/patch-smtpd_Makefile.am =================================================================== --- files/patch-smtpd_Makefile.am (revision 320081) +++ files/patch-smtpd_Makefile.am (working copy) @@ -1,42 +0,0 @@ - -$FreeBSD$ - ---- smtpd/Makefile.am.orig -+++ smtpd/Makefile.am -@@ -97,7 +97,7 @@ - CFLAGS+= -D_GNU_SOURCE - CPPFLAGS= -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ - --PATHS= -DSMTPD_CONFDIR=\"$(sysconfdir)\" \ -+PATHS= -DSMTPD_CONFDIR=\"$(sysconfdir)/mail\" \ - -DPATH_SMTPCTL=\"$(sbindir)/smtpctl\" \ - -DPATH_MAILLOCAL=\"$(libexecdir)/mail.local\" - -@@ -116,7 +116,7 @@ - ../contrib/lib/libc/asr/asr_private.h \ - $(CONFIGFILES_IN) $(MANPAGES_IN) - --PATHSUBS= -e 's|/etc/mail/|$(sysconfdir)/|g' \ -+PATHSUBS= -e 's|/etc/mail/|$(sysconfdir)/mail/|g' \ - -e 's|/usr/libexec|$(libexecdir)|g' \ - -e 's|/var/run/smtpd.sock|$(sockdir)/smtpd.sock|g' - -@@ -142,16 +142,12 @@ - # smtpd.conf - # newaliases makemap - install-exec-hook: $(CONFIGFILES) $(MANPAGES) -- $(MKDIR_P) $(DESTDIR)$(sysconfdir) -+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/mail - $(MKDIR_P) $(DESTDIR)$(bindir) - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 - -- @if [ ! -f $(DESTDIR)$(sysconfdir)/smtpd.conf ]; then \ -- $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf; \ -- else \ -- echo "$(DESTDIR)$(sysconfdir)/smtpd.conf already exists, install will not overwrite"; \ -- fi -+ $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/mail/smtpd.conf.sample - - ln -f $(DESTDIR)$(sbindir)/smtpctl$(EXEEXT) \ - $(DESTDIR)$(bindir)/mailq$(EXEEXT); >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306061104.r56B4Ccb074533>