From owner-svn-ports-all@FreeBSD.ORG Sun May 31 14:16:23 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9DF37345; Sun, 31 May 2015 14:16:23 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 801D81820; Sun, 31 May 2015 14:16:23 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4VEGNNa071392; Sun, 31 May 2015 14:16:23 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4VEGK4N071367; Sun, 31 May 2015 14:16:20 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201505311416.t4VEGK4N071367@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 31 May 2015 14:16:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r388093 - in head: . mail mail/smfsav mail/smfsav/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2015 14:16:23 -0000 Author: amdmi3 Date: Sun May 31 14:16:19 2015 New Revision: 388093 URL: https://svnweb.freebsd.org/changeset/ports/388093 Log: - Revive mail/smfsav - Fix staging - Add LICENSE_FILE - Modernize pthread flags usage - Modernize user/group handling - Regenerate patches - Pass maintainership to submitter PR: 199081 Submitted by: sasaki@fcc.ad.jp Added: head/mail/smfsav/ - copied from r366958, head/mail/smfsav/ head/mail/smfsav/pkg-plist (contents, props changed) Deleted: head/mail/smfsav/pkg-deinstall head/mail/smfsav/pkg-install Modified: head/GIDs head/MOVED head/UIDs head/mail/Makefile head/mail/smfsav/Makefile head/mail/smfsav/distinfo head/mail/smfsav/files/patch-readme head/mail/smfsav/files/patch-smf-sav.c head/mail/smfsav/files/patch-smf-sav.conf head/mail/smfsav/files/pkg-message.in head/mail/smfsav/files/smfsav.in Modified: head/GIDs ============================================================================== --- head/GIDs Sun May 31 14:06:41 2015 (r388092) +++ head/GIDs Sun May 31 14:16:19 2015 (r388093) @@ -158,6 +158,7 @@ rancid:*:286: backuppc:*:300: _sphinx:*:312: dkfilter:*:325: +smfs:*:326: daapd:*:337: murmur:*:338: wildfire:*:340: Modified: head/MOVED ============================================================================== --- head/MOVED Sun May 31 14:06:41 2015 (r388092) +++ head/MOVED Sun May 31 14:16:19 2015 (r388093) @@ -6675,7 +6675,6 @@ mail/rabl_server||2014-09-01|Not staged mail/relay-ctrl||2014-09-01|Not staged mail/reply-o-matic||2014-09-01|Not staged mail/sccmilter||2014-09-01|Not staged -mail/smfsav||2014-09-01|Not staged mail/softfail||2014-09-01|Not staged mail/spmfilter-spamassassin||2014-09-01|Not staged mail/synonym||2014-09-01|Not staged Modified: head/UIDs ============================================================================== --- head/UIDs Sun May 31 14:06:41 2015 (r388092) +++ head/UIDs Sun May 31 14:16:19 2015 (r388093) @@ -164,6 +164,7 @@ rancid:*:286:286::0:0:RANCID daemon user backuppc:*:300:300::0:0:BackupPC pseudo-user:/nonexistent:/usr/sbin/nologin _sphinx:*:312:312::0:0:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin dkfilter:*:325:325::0:0:DK Filter Owner:/nonexistent:/usr/sbin/nologin +smfs:*:326:326::0:0:SMFSAV Owner:/nonexistent:/usr/sbin/nologin _pma:*:336:80::0:0:phpMyAdmin Owner:/nonexistent:/usr/sbin/nologin daapd:*:337:337::0:0:daapd User:/nonexistent:/usr/sbin/nologin murmur:*:338:338::0:0:& User:/nonexistent:/usr/sbin/nologin Modified: head/mail/Makefile ============================================================================== --- head/mail/Makefile Sun May 31 14:06:41 2015 (r388092) +++ head/mail/Makefile Sun May 31 14:16:19 2015 (r388093) @@ -599,6 +599,7 @@ SUBDIR += simscan SUBDIR += slapd-cyrus SUBDIR += sma + SUBDIR += smfsav SUBDIR += smtp-cli SUBDIR += smtp-gated SUBDIR += smtpfeed Modified: head/mail/smfsav/Makefile ============================================================================== --- head/mail/smfsav/Makefile Mon Sep 1 21:24:52 2014 (r366958) +++ head/mail/smfsav/Makefile Sun May 31 14:16:19 2015 (r388093) @@ -9,45 +9,36 @@ MASTER_SITES= SF/smfs DISTNAME= smf-sav-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sasaki@fcc.ad.jp COMMENT= Sendmail Sender Address Validator LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +USERS= smfs +GROUPS= smfs OPTIONS_DEFINE= DOCS USE_RC_SUBR= smfsav -CPPFLAGS+= -D_REENTRANT ${PTHREAD_CFLAGS} -LDFLAGS+= -lmilter ${PTHREAD_LIBS} - -SUB_FILES= pkg-message - -PORTDOCS= CHANGES README -PLIST_FILES= sbin/smfsav \ - etc/smfsav.conf-dist +CPPFLAGS+= -D_REENTRANT +LDFLAGS+= -lmilter -lpthread -NO_STAGE= yes -.include +SMFSAV_RUN_DIR?=/var/run/smfsav +SUB_FILES+= pkg-message post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/readme do-build: - (cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o smf-sav smf-sav.c \ - ${LDFLAGS}) + cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o smf-sav smf-sav.c ${LDFLAGS} do-install: - (cd ${WRKSRC} \ - && ${INSTALL_PROGRAM} smf-sav ${PREFIX}/sbin/smfsav \ - && ${INSTALL_DATA} smf-sav.conf ${PREFIX}/etc/smfsav.conf-dist) -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} \ - && ${INSTALL_DATA} ChangeLog ${DOCSDIR}/CHANGES \ - && ${INSTALL_DATA} readme ${DOCSDIR}/README) -.endif - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} + ${INSTALL_PROGRAM} ${WRKSRC}/smf-sav ${STAGEDIR}${PREFIX}/sbin/smfsav + ${INSTALL_DATA} ${WRKSRC}/smf-sav.conf ${STAGEDIR}${PREFIX}/etc/smfsav.conf.sample + @${MKDIR} ${STAGEDIR}${SMFSAV_RUN_DIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ChangeLog readme ${STAGEDIR}${DOCSDIR} -.include +.include Modified: head/mail/smfsav/distinfo ============================================================================== --- head/mail/smfsav/distinfo Mon Sep 1 21:24:52 2014 (r366958) +++ head/mail/smfsav/distinfo Sun May 31 14:16:19 2015 (r388093) @@ -1,4 +1,2 @@ SHA256 (smfsav/smf-sav-1.4.0.tar.gz) = 77a28d012330581b5ecaf126a153f049731c399e294aab0ded53c1b0abab68cc SIZE (smfsav/smf-sav-1.4.0.tar.gz) = 21968 -SHA256 (smfsav/bind-src.tar.gz) = a0ef8506227797ee57a6c9488fc9ef355ba2fc1fa4616fe68abf0ed6cd009b68 -SIZE (smfsav/bind-src.tar.gz) = 1484718 Modified: head/mail/smfsav/files/patch-readme ============================================================================== --- head/mail/smfsav/files/patch-readme Mon Sep 1 21:24:52 2014 (r366958) +++ head/mail/smfsav/files/patch-readme Sun May 31 14:16:19 2015 (r388093) @@ -1,6 +1,6 @@ ---- readme.orig 2006-10-25 23:15:10.000000000 +0300 -+++ readme 2008-02-17 14:50:09.000000000 +0200 -@@ -38,21 +38,18 @@ +--- readme.orig 2006-10-25 20:15:10 UTC ++++ readme +@@ -38,21 +38,18 @@ Under FreeBSD the BIND v8 is required (p make make install Modified: head/mail/smfsav/files/patch-smf-sav.c ============================================================================== --- head/mail/smfsav/files/patch-smf-sav.c Mon Sep 1 21:24:52 2014 (r366958) +++ head/mail/smfsav/files/patch-smf-sav.c Sun May 31 14:16:19 2015 (r388093) @@ -1,5 +1,5 @@ ---- smf-sav.c.orig Wed Oct 25 23:15:10 2006 -+++ smf-sav.c Wed Aug 29 15:54:13 2007 +--- smf-sav.c.orig 2006-10-25 20:15:10 UTC ++++ smf-sav.c @@ -20,11 +20,7 @@ #endif Modified: head/mail/smfsav/files/patch-smf-sav.conf ============================================================================== --- head/mail/smfsav/files/patch-smf-sav.conf Mon Sep 1 21:24:52 2014 (r366958) +++ head/mail/smfsav/files/patch-smf-sav.conf Sun May 31 14:16:19 2015 (r388093) @@ -1,12 +1,12 @@ ---- smf-sav.conf.orig 2006-10-25 23:15:10.000000000 +0300 -+++ smf-sav.conf 2008-02-17 14:25:26.000000000 +0200 +--- smf-sav.conf.orig 2006-10-25 20:15:10 UTC ++++ smf-sav.conf @@ -1,4 +1,4 @@ -# /etc/mail/smfs/smf-sav.conf +# /usr/local/etc/smfsav.conf # # smf-sav configuration file v1.4.0 (it's read at start) # -@@ -97,15 +97,15 @@ +@@ -97,15 +97,15 @@ SafeCallBack postmaster@yourdomain.tld # # Run as a selected user (smf-sav must be started by root) # Modified: head/mail/smfsav/files/pkg-message.in ============================================================================== --- head/mail/smfsav/files/pkg-message.in Mon Sep 1 21:24:52 2014 (r366958) +++ head/mail/smfsav/files/pkg-message.in Sun May 31 14:16:19 2015 (r388093) @@ -5,5 +5,5 @@ define(`confMILTER_MACROS_HELO', confMILTER_MACROS_HELO`, {verify}')dnl INPUT_MAIL_FILTER(`smfsav', `S=unix:/var/run/smfsav/smfsav.sock, T=S:30s;R:4m')dnl 3. Put line smfsav_enable="YES" to /etc/rc.conf file -4. Run %%PREFIX%%/etc/rc.d/smfsav start +4. Run `service smfsav start` ===================================================================================== Modified: head/mail/smfsav/files/smfsav.in ============================================================================== --- head/mail/smfsav/files/smfsav.in Mon Sep 1 21:24:52 2014 (r366958) +++ head/mail/smfsav/files/smfsav.in Sun May 31 14:16:19 2015 (r388093) @@ -21,4 +21,3 @@ command="%%PREFIX%%/sbin/smfsav" load_rc_config ${name} run_rc_command "$1" - Added: head/mail/smfsav/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/smfsav/pkg-plist Sun May 31 14:16:19 2015 (r388093) @@ -0,0 +1,5 @@ +sbin/smfsav +etc/smfsav.conf.sample +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/readme +@dir(smfs,smfs,700) /var/run/smfsav