diff options
| author | Jason Unovitch <junovitch@FreeBSD.org> | 2016-04-28 01:01:37 +0000 |
|---|---|---|
| committer | Jason Unovitch <junovitch@FreeBSD.org> | 2016-04-28 01:01:37 +0000 |
| commit | c69b1a2745f7cffff6385197fa12a0e7a9f550cc (patch) | |
| tree | e4e9d12e2f4f9baf9790c90b96f8cbdb8e7d1be2 /ftp | |
| parent | c3ab79e70857fcf80c2a3819ca6799d98466c8ec (diff) | |
| download | ports-c69b1a2745f7cffff6385197fa12a0e7a9f550cc.tar.gz ports-c69b1a2745f7cffff6385197fa12a0e7a9f550cc.zip | |
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)
Notes
Notes:
svn path=/branches/2016Q2/; revision=414151
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/proftpd/Makefile | 45 | ||||
| -rw-r--r-- | ftp/proftpd/distinfo | 4 |
2 files changed, 14 insertions, 35 deletions
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index d150d4300952..e4456972b416 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -26,7 +26,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd 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 documentation MEMCACHE_DESC= Memcache support using libmemcached PLIST_SUB+= LOCALSTATEDIR="${LOCALSTATEDIR}" +OPTIONS_SUB= yes .endif #!defined(_BUILDING_PROFTPD_MODULE) -.include <bsd.port.options.mk> - .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=${LIBDIRS} .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 diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo index 5c2b3173a44c..1763a07b5759 100644 --- a/ftp/proftpd/distinfo +++ b/ftp/proftpd/distinfo @@ -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 |