From owner-svn-ports-all@freebsd.org Thu Apr 28 01:01:39 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 05072B1E3B2; Thu, 28 Apr 2016 01:01:39 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 D12551656; Thu, 28 Apr 2016 01:01:38 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3S11bHW012354; Thu, 28 Apr 2016 01:01:37 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3S11bs4012352; Thu, 28 Apr 2016 01:01:37 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201604280101.u3S11bs4012352@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Thu, 28 Apr 2016 01:01:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414151 - branches/2016Q2/ftp/proftpd X-SVN-Group: ports-branches 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.21 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: Thu, 28 Apr 2016 01:01:39 -0000 Author: junovitch Date: Thu Apr 28 01:01:37 2016 New Revision: 414151 URL: https://svnweb.freebsd.org/changeset/ports/414151 Log: MFH: r413681 Update proftpd to 1.3.5b Optionsify port PR: 208909 Security: CVE-2016-3125 Security: https://vuxml.FreeBSD.org/freebsd/a733b5ca-06eb-11e6-817f-3085a9a4510d.html Approved by: ports-secteam (with hat) Modified: branches/2016Q2/ftp/proftpd/Makefile branches/2016Q2/ftp/proftpd/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/ftp/proftpd/Makefile ============================================================================== --- branches/2016Q2/ftp/proftpd/Makefile Thu Apr 28 00:56:34 2016 (r414150) +++ branches/2016Q2/ftp/proftpd/Makefile Thu Apr 28 01:01:37 2016 (r414151) @@ -26,7 +26,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/sbin/proftp RUN_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd .endif -PROFTPD_VERSION= 1.3.5a +PROFTPD_VERSION= 1.3.5b .if defined(_BUILDING_PROFTPD_MODULE) DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} @@ -93,11 +93,10 @@ HTMLDOCS_DESC= Include HTML documentati MEMCACHE_DESC= Memcache support using libmemcached PLIST_SUB+= LOCALSTATEDIR="${LOCALSTATEDIR}" +OPTIONS_SUB= yes .endif #!defined(_BUILDING_PROFTPD_MODULE) -.include - .if !defined(_BUILDING_PROFTPD_MODULE) CPPFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC} LIBS+= -lssl -lcrypto -L${OPENSSLLIB} @@ -142,38 +141,18 @@ MODULES+= mod_ban \ mod_wrap2_file \ mod_wrap2_sql -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif +IPV6_CONFIGURE_ENABLE=ipv6 -.if ${PORT_OPTIONS:MNLS} -CONFIGURE_ARGS+= --enable-nls -USES+= gettext iconv -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif +NLS_CONFIGURE_ON= --enable-nls +NLS_USES= gettext iconv -.if ${PORT_OPTIONS:MPCRE} -LIB_DEPENDS+= libpcre.so:devel/pcre -CONFIGURE_ARGS+= --enable-pcre -.else -CONFIGURE_ARGS+= --disable-pcre -.endif +PCRE_CONFIGURE_ENABLE= pcre +PCRE_LIB_DEPENDS= libpcre.so:devel/pcre -.if ${PORT_OPTIONS:MMEMCACHE} -MODULES+= mod_memcache \ - mod_tls_memcache -LIB_DEPENDS+= libmemcached.so:databases/libmemcached -CONFIGURE_ARGS+= --enable-memcache -LIBS+= -L${LOCALBASE}/lib -lmemcached -lmemcachedutil -PLIST_SUB+= MEMCACHE="" -.else -CONFIGURE_ARGS+= --disable-memcache -PLIST_SUB+= MEMCACHE="@comment " -.endif +MEMCACHE_LIB_DEPENDS= libmemcached.so:databases/libmemcached +MEMCACHE_CONFIGURE_ENABLE= memcache +MEMCACHE_VARS= MODULES+="mod_memcache mod_tls_memcache" \ + LIBS+="-L${LOCALBASE}/lib -lmemcached -lmemcachedutil" # Generate modules configuration string .for m in ${MODULES} @@ -192,7 +171,7 @@ CONFIGURE_ARGS+= --with-libraries=${LIBD .if !defined(_BUILDING_PROFTPD_MODULE) -.if empty(ICONV_LIB) +.if empty(ICONV_PREFIX) CONFIGURE_ARGS+= ac_cv_lib_iconv_iconv_open=no \ ac_cv_lib_iconv_libiconv_open=no .endif Modified: branches/2016Q2/ftp/proftpd/distinfo ============================================================================== --- branches/2016Q2/ftp/proftpd/distinfo Thu Apr 28 00:56:34 2016 (r414150) +++ branches/2016Q2/ftp/proftpd/distinfo Thu Apr 28 01:01:37 2016 (r414151) @@ -1,5 +1,5 @@ -SHA256 (proftpd-1.3.5a.tar.gz) = a1f48df8539c414ec56e0cea63dcf4b8e16e606c05f10156f030a4a67fae5696 -SIZE (proftpd-1.3.5a.tar.gz) = 29988477 +SHA256 (proftpd-1.3.5b.tar.gz) = afc1789f2478acf88dfdc7d70da90a4fa2786d628218e9574273295d044b4fc8 +SIZE (proftpd-1.3.5b.tar.gz) = 29992107 SHA256 (mod_clamav-v0.13.tar.gz) = 7f60bebbb58836319bf249be77540efc6667a55caca8aaba164e6a61cd0c3db7 SIZE (mod_clamav-v0.13.tar.gz) = 11683 SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08