diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index 505a5da1d8b7..d992216205b7 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -1,246 +1,246 @@ PORTNAME?= proftpd .if !defined(DISTVERSION) PORTVERSION?= ${PROFTPD_VERSION} .endif -PORTREVISION?= 2 CATEGORIES?= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ https://github.com/downloads/proftpd/proftpd.github.com/ \ ftp://ftpmirror.uk/ftp.proftpd.org/distrib/source/ \ http://www.mirrorservice.org/sites/ftp.proftpd.org/distrib/source/ .if defined(_BUILDING_PROFTPD_MODULE) DISTNAME= proftpd-${PROFTPD_VERSION} .endif MAINTAINER?= mm@FreeBSD.org COMMENT?= Highly configurable FTP daemon WWW?= http://www.proftpd.org/ LICENSE?= GPLv2 LICENSE_FILE?= ${WRKSRC}/COPYING .if defined(_BUILDING_PROFTPD_MODULE) BUILD_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd RUN_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd .endif -PROFTPD_VERSION= 1.3.8b +PROFTPD_VERSION= 1.3.8c CPE_VENDOR= proftpd CPE_PRODUCT= proftpd .if defined(_BUILDING_PROFTPD_MODULE) DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY+= ${DISTNAME}${EXTRACT_SUFX} WRKSRC= ${WRKDIR}/proftpd-${PROFTPD_VERSION} . if defined(_PROFTPD_MODULE_EXTRACT_ONLY) EXTRACT_ONLY+= ${_PROFTPD_MODULE_EXTRACT_ONLY} . endif . if defined(_PROFTPD_MODULE_DISTFILES) DISTFILES+= ${_PROFTPD_MODULE_DISTFILES} DISTINFO_FILE= ${.CURDIR}/distinfo . endif . if defined(_PROFTPD_MODULE_MASTER_SITES) MASTER_SITES+= ${_PROFTPD_MODULE_MASTER_SITES} . endif .endif .if !defined(_BUILDING_PROFTPD_MODULE) PORTDOCS= * .endif MAKE_JOBS_UNSAFE= yes -USES+= gmake libtool +USES= gmake libtool perl5 +USE_PERL5= run GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share .if !defined(_BUILDING_PROFTPD_MODULE) USES+= cpe ssl USE_RC_SUBR= proftpd .endif LOCALSTATEDIR?= /var/run CONFIGURE_ARGS=--localstatedir=${LOCALSTATEDIR} \ --libexecdir=${PREFIX}/libexec/proftpd \ --with-pkgconfig=libdata/pkgconfig \ --sysconfdir=${PREFIX}/etc \ --enable-ctrls \ --enable-dso \ --disable-sendfile CONFIGURE_ENV+= install_user=`${ID} -u` \ install_group=`${ID} -g` .if defined(_BUILDING_PROFTPD_MODULE) MODULES= ${_BUILDING_PROFTPD_MODULE} .for m in ${MODULES} __MODULES:=${__MODULES}:${m} .endfor CONFIGURE_ARGS+= --with-shared=${__MODULES:C/^://g} INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include/proftpd ALL_TARGET= shared BUILD_WRKSRC= ${WRKSRC}/modules INSTALL_WRKSRC= ${WRKSRC}/modules PLIST= ${WRKDIR}/PLIST .for m in ${MODULES} PLIST_FILES+= libexec/proftpd/${m}.a \ libexec/proftpd/${m}.so .endfor .else OPTIONS_DEFINE= DOCS HTMLDOCS IPV6 NLS MEMCACHE REDIS LIBSODIUM OPTIONS_DEFAULT= PCRE2 LIBSODIUM OPTIONS_RADIO+= PCREVER OPTIONS_RADIO_PCREVER= PCRE1 PCRE2 HTMLDOCS_DESC= Include HTML documentation MEMCACHE_DESC= Memcache support using libmemcached PCREVER_DESC= PCRE library to use PCRE1_DESC= ${PCRE_DESC} PCRE2_DESC= ${PCRE_DESC} version 2 REDIS_DESC= Redis support using hiredis LIBSODIUM_DESC= Stronger key algorithm support using libsodium PLIST_SUB+= LOCALSTATEDIR="${LOCALSTATEDIR}" OPTIONS_SUB= yes .endif #!defined(_BUILDING_PROFTPD_MODULE) .if !defined(_BUILDING_PROFTPD_MODULE) CPPFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC} LIBS+= -lssl -lcrypto -L${OPENSSLLIB} LDFLAGS+= -lpthread .endif .if !defined(_BUILDING_PROFTPD_MODULE) LIBDIRS?= ${LOCALBASE}/lib INCLUDEDIRS?= ${LOCALBASE}/include # Always built modules MODULES+= mod_ban \ mod_copy \ mod_ctrls_admin \ mod_deflate \ mod_dnsbl \ mod_dynmasq \ mod_exec \ mod_ifsession \ mod_ifversion \ mod_qos \ mod_quotatab \ mod_quotatab_file \ mod_quotatab_radius \ mod_quotatab_sql \ mod_radius \ mod_ratio \ mod_readme \ mod_rewrite \ mod_sftp \ mod_sftp_pam \ mod_sftp_sql \ mod_shaper \ mod_site_misc \ mod_snmp \ mod_sql \ mod_sql_passwd \ mod_tls \ mod_tls_shmcache \ mod_unique_id \ mod_wrap2 \ mod_wrap2_file \ mod_wrap2_sql IPV6_CONFIGURE_ENABLE=ipv6 NLS_CONFIGURE_ON= --enable-nls NLS_USES= gettext iconv PCRE1_CONFIGURE_ENABLE= pcre PCRE1_CONFIGURE_ON= --disable-pcre2 PCRE1_LIB_DEPENDS= libpcre.so:devel/pcre PCRE2_CONFIGURE_ENABLE= pcre2 PCRE2_CONFIGURE_ON= --disable-pcre PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 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" REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis REDIS_CONFIGURE_ENABLE= redis REDIS_VARS= MODULES+="mod_redis mod_tls_redis mod_wrap2_redis" \ LIBS+="-L${LOCALBASE}/lib -lhiredis" LIBSODIUM_CONFIGURE_ENABLE= sodium LIBSODIUM_LIB_DEPENDS= libsodium.so:security/libsodium LIBSODIUM_VARS= LIBS+="-L${LOCALBASE}/lib -lsodium" .include # Generate modules configuration string .for m in ${MODULES} _MODULES:=${_MODULES}:${m} .endfor # Keep this here below, in case similar constructs need to be made CONFIGURE_ARGS+= --with-shared=${_MODULES:C/^://g} .endif #!defined(_BUILDING_PROFTPD_MODULE) CONFIGURE_ARGS+= --with-includes=${INCLUDEDIRS} CONFIGURE_ARGS+= --with-libraries=${LIBDIRS} .include .if !defined(_BUILDING_PROFTPD_MODULE) .if empty(ICONV_PREFIX) CONFIGURE_ARGS+= ac_cv_lib_iconv_iconv_open=no \ ac_cv_lib_iconv_libiconv_open=no .endif post-patch: @${REINPLACE_CMD} -e 's|proftpd\.conf |proftpd.conf.sample |g' ${WRKSRC}/Makefile.in pre-configure: @${ECHO_MSG} "==> Configuring with following modules:" @${ECHO_MSG} "${MODULES:C/^://g}" post-configure: ${REINPLACE_CMD} -e 's: -lnsl::' ${WRKSRC}/Make.rules ${REINPLACE_CMD} -e 's:/usr/sbin:${PREFIX}/sbin:' \ -e 's:/usr/bin:${PREFIX}/bin:' \ ${WRKSRC}/src/proftpd.8 ${WRKSRC}/utils/ftpshut.8 \ ${WRKSRC}/utils/ftpcount.1 .endif #!defined(_BUILDING_PROFTPD_MODULE) .if defined(_BUILDING_PROFTPD_MODULE) pre-build: @cd ${WRKSRC} && ${MAKE_CMD} include/buildstamp.h pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/proftpd .else post-install: @${MKDIR} ${STAGEDIR}/var/run/proftpd .if ${PORT_OPTIONS:MDOCS} @${INSTALL} -d ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC} && ${CP} README* RELEASE_NOTES ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} license.txt ${STAGEDIR}${DOCSDIR} . if ${PORT_OPTIONS:MHTMLDOCS} @${INSTALL} -d ${STAGEDIR}${DOCSDIR}/html @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} faq.html ${STAGEDIR}${DOCSDIR}/html @${CP} -RP ${WRKSRC}/doc/contrib ${STAGEDIR}${DOCSDIR}/html/contrib @${CP} -RP ${WRKSRC}/doc/modules ${STAGEDIR}${DOCSDIR}/html/modules @${CP} -RP ${WRKSRC}/doc/howto ${STAGEDIR}${DOCSDIR}/html/howto . endif .endif @${INSTALL_MAN} ${WRKSRC}/src/ftpdctl.8 ${STAGEDIR}${PREFIX}/share/man/man8/ .endif #!defined(_BUILDING_PROFTPD_MODULE) .include diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo index 79f324d42cbc..d13f0dd411b4 100644 --- a/ftp/proftpd/distinfo +++ b/ftp/proftpd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1704667613 -SHA256 (proftpd-1.3.8b.tar.gz) = 183ab7c6107de271a2959ff268f55c9b6c76b2cf0029e6584fccc019686601e0 -SIZE (proftpd-1.3.8b.tar.gz) = 19752808 +TIMESTAMP = 1734635541 +SHA256 (proftpd-1.3.8c.tar.gz) = 2a48f2ca338456e750d2373bf671025ed799e04e0baa16c7bb8dbfd67d8734d2 +SIZE (proftpd-1.3.8c.tar.gz) = 19751847 diff --git a/ftp/proftpd/pkg-plist b/ftp/proftpd/pkg-plist index 7bc0258eaf27..607550b30ce0 100644 --- a/ftp/proftpd/pkg-plist +++ b/ftp/proftpd/pkg-plist @@ -1,227 +1,227 @@ bin/ftpasswd bin/ftpcount bin/ftpdctl bin/ftpmail bin/ftpquota bin/ftptop bin/ftpwho bin/prxs etc/PROFTPD-MIB.txt -@sample etc/proftpd.conf.sample -@sample etc/proftpd/dhparams.pem.sample -@sample etc/proftpd/blacklist.dat.sample +@sample %%ETCDIR%%.conf.sample +@sample %%ETCDIR%%/blacklist.dat.sample +@sample %%ETCDIR%%/dhparams.pem.sample +include/proftpd/Make.rules include/proftpd/acconfig.h include/proftpd/ascii.h include/proftpd/auth.h +include/proftpd/base.h include/proftpd/bindings.h include/proftpd/buildstamp.h include/proftpd/ccan-json.h include/proftpd/child.h include/proftpd/class.h include/proftpd/cmd.h include/proftpd/compat.h include/proftpd/conf.h include/proftpd/config.h include/proftpd/configdb.h include/proftpd/ctrls.h include/proftpd/data.h include/proftpd/default_paths.h include/proftpd/dirtree.h include/proftpd/display.h include/proftpd/encode.h include/proftpd/env.h include/proftpd/error.h include/proftpd/event.h include/proftpd/expr.h include/proftpd/feat.h include/proftpd/filter.h include/proftpd/fsio.h include/proftpd/ftp.h include/proftpd/glibc-glob.h include/proftpd/hanson-tpl.h include/proftpd/help.h include/proftpd/ident.h include/proftpd/inet.h include/proftpd/jot.h include/proftpd/json.h include/proftpd/lastlog.h include/proftpd/log.h include/proftpd/logfmt.h include/proftpd/memcache.h include/proftpd/mkhome.h include/proftpd/mod_ctrls.h include/proftpd/mod_dnsbl.h include/proftpd/mod_quotatab.h -include/proftpd/Make.rules -include/proftpd/base.h +include/proftpd/mod_sftp.h include/proftpd/mod_sftp/agent.h include/proftpd/mod_sftp/auth.h include/proftpd/mod_sftp/bcrypt.h include/proftpd/mod_sftp/blacklist.h include/proftpd/mod_sftp/channel.h include/proftpd/mod_sftp/cipher.h include/proftpd/mod_sftp/compress.h include/proftpd/mod_sftp/crypto.h include/proftpd/mod_sftp/date.h include/proftpd/mod_sftp/disconnect.h include/proftpd/mod_sftp/display.h include/proftpd/mod_sftp/fxp.h include/proftpd/mod_sftp/interop.h include/proftpd/mod_sftp/kbdint.h include/proftpd/mod_sftp/kex.h include/proftpd/mod_sftp/keys.h include/proftpd/mod_sftp/keystore.h include/proftpd/mod_sftp/mac.h include/proftpd/mod_sftp/misc.h include/proftpd/mod_sftp/msg.h include/proftpd/mod_sftp/packet.h include/proftpd/mod_sftp/rfc4716.h include/proftpd/mod_sftp/scp.h include/proftpd/mod_sftp/service.h include/proftpd/mod_sftp/session.h include/proftpd/mod_sftp/ssh2.h include/proftpd/mod_sftp/tap.h include/proftpd/mod_sftp/umac.h include/proftpd/mod_sftp/utf8.h -include/proftpd/mod_sftp.h include/proftpd/mod_snmp.h include/proftpd/mod_sql.h include/proftpd/mod_tls.h include/proftpd/mod_wrap2.h include/proftpd/modules.h include/proftpd/netacl.h include/proftpd/netaddr.h include/proftpd/netio.h include/proftpd/openbsd-blowfish.h include/proftpd/options.h include/proftpd/os.h include/proftpd/parser.h include/proftpd/pidfile.h include/proftpd/pool.h include/proftpd/pr-syslog.h include/proftpd/privs.h include/proftpd/proctitle.h include/proftpd/proftpd.h include/proftpd/random.h include/proftpd/redis.h include/proftpd/regexp.h include/proftpd/response.h include/proftpd/rlimit.h include/proftpd/scoreboard.h include/proftpd/session.h include/proftpd/sets.h include/proftpd/signals.h include/proftpd/stash.h include/proftpd/str.h include/proftpd/support.h include/proftpd/table.h include/proftpd/throttle.h include/proftpd/timers.h include/proftpd/trace.h include/proftpd/utf8.h include/proftpd/var.h include/proftpd/version.h include/proftpd/xferlog.h libdata/pkgconfig/proftpd.pc libexec/proftpd/mod_ban.a libexec/proftpd/mod_ban.so libexec/proftpd/mod_copy.a libexec/proftpd/mod_copy.so libexec/proftpd/mod_ctrls_admin.a libexec/proftpd/mod_ctrls_admin.so libexec/proftpd/mod_deflate.a libexec/proftpd/mod_deflate.so libexec/proftpd/mod_dnsbl.a libexec/proftpd/mod_dnsbl.so libexec/proftpd/mod_dynmasq.a libexec/proftpd/mod_dynmasq.so libexec/proftpd/mod_exec.a libexec/proftpd/mod_exec.so -libexec/proftpd/mod_ifversion.a -libexec/proftpd/mod_ifversion.so libexec/proftpd/mod_ifsession.a libexec/proftpd/mod_ifsession.so +libexec/proftpd/mod_ifversion.a +libexec/proftpd/mod_ifversion.so %%MEMCACHE%%libexec/proftpd/mod_memcache.a %%MEMCACHE%%libexec/proftpd/mod_memcache.so libexec/proftpd/mod_qos.a libexec/proftpd/mod_qos.so libexec/proftpd/mod_quotatab.a libexec/proftpd/mod_quotatab.so libexec/proftpd/mod_quotatab_file.a libexec/proftpd/mod_quotatab_file.so -libexec/proftpd/mod_quotatab_sql.a -libexec/proftpd/mod_quotatab_sql.so libexec/proftpd/mod_quotatab_radius.a libexec/proftpd/mod_quotatab_radius.so +libexec/proftpd/mod_quotatab_sql.a +libexec/proftpd/mod_quotatab_sql.so libexec/proftpd/mod_radius.a libexec/proftpd/mod_radius.so libexec/proftpd/mod_ratio.a libexec/proftpd/mod_ratio.so libexec/proftpd/mod_readme.a libexec/proftpd/mod_readme.so +%%REDIS%%libexec/proftpd/mod_redis.a +%%REDIS%%libexec/proftpd/mod_redis.so libexec/proftpd/mod_rewrite.a libexec/proftpd/mod_rewrite.so -libexec/proftpd/mod_shaper.a -libexec/proftpd/mod_shaper.so libexec/proftpd/mod_sftp.a libexec/proftpd/mod_sftp.so libexec/proftpd/mod_sftp_pam.a libexec/proftpd/mod_sftp_pam.so libexec/proftpd/mod_sftp_sql.a libexec/proftpd/mod_sftp_sql.so +libexec/proftpd/mod_shaper.a +libexec/proftpd/mod_shaper.so libexec/proftpd/mod_site_misc.a libexec/proftpd/mod_site_misc.so libexec/proftpd/mod_snmp.a libexec/proftpd/mod_snmp.so -%%REDIS%%libexec/proftpd/mod_redis.a -%%REDIS%%libexec/proftpd/mod_redis.so libexec/proftpd/mod_sql.a libexec/proftpd/mod_sql.so libexec/proftpd/mod_sql_passwd.a libexec/proftpd/mod_sql_passwd.so libexec/proftpd/mod_tls.a libexec/proftpd/mod_tls.so %%MEMCACHE%%libexec/proftpd/mod_tls_memcache.a %%MEMCACHE%%libexec/proftpd/mod_tls_memcache.so %%REDIS%%libexec/proftpd/mod_tls_redis.a %%REDIS%%libexec/proftpd/mod_tls_redis.so libexec/proftpd/mod_tls_shmcache.a libexec/proftpd/mod_tls_shmcache.so libexec/proftpd/mod_unique_id.a libexec/proftpd/mod_unique_id.so libexec/proftpd/mod_wrap2.a libexec/proftpd/mod_wrap2.so libexec/proftpd/mod_wrap2_file.a libexec/proftpd/mod_wrap2_file.so %%REDIS%%libexec/proftpd/mod_wrap2_redis.a %%REDIS%%libexec/proftpd/mod_wrap2_redis.so libexec/proftpd/mod_wrap2_sql.a libexec/proftpd/mod_wrap2_sql.so -share/man/man1/ftpcount.1.gz -share/man/man1/ftpmail.1.gz -share/man/man1/ftpasswd.1.gz -share/man/man1/ftpquota.1.gz -share/man/man1/ftpwho.1.gz -share/man/man1/ftptop.1.gz -share/man/man5/proftpd.conf.5.gz -share/man/man5/xferlog.5.gz -share/man/man8/proftpd.8.gz -share/man/man8/ftpscrub.8.gz -share/man/man8/ftpshut.8.gz -share/man/man8/ftpdctl.8.gz sbin/ftpscrub sbin/ftpshut sbin/in.proftpd sbin/proftpd -%%NLS%%share/locale/zh_CN/LC_MESSAGES/proftpd.mo -%%NLS%%share/locale/zh_TW/LC_MESSAGES/proftpd.mo +%%NLS%%share/locale/bg_BG/LC_MESSAGES/proftpd.mo %%NLS%%share/locale/en_US/LC_MESSAGES/proftpd.mo %%NLS%%share/locale/es_ES/LC_MESSAGES/proftpd.mo +%%NLS%%share/locale/fr_FR/LC_MESSAGES/proftpd.mo %%NLS%%share/locale/it_IT/LC_MESSAGES/proftpd.mo %%NLS%%share/locale/ja_JP/LC_MESSAGES/proftpd.mo -%%NLS%%share/locale/ru_RU/LC_MESSAGES/proftpd.mo -%%NLS%%share/locale/bg_BG/LC_MESSAGES/proftpd.mo -%%NLS%%share/locale/fr_FR/LC_MESSAGES/proftpd.mo %%NLS%%share/locale/ko_KR/LC_MESSAGES/proftpd.mo +%%NLS%%share/locale/ru_RU/LC_MESSAGES/proftpd.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/proftpd.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/proftpd.mo +share/man/man1/ftpasswd.1.gz +share/man/man1/ftpcount.1.gz +share/man/man1/ftpmail.1.gz +share/man/man1/ftpquota.1.gz +share/man/man1/ftptop.1.gz +share/man/man1/ftpwho.1.gz +share/man/man5/proftpd.conf.5.gz +share/man/man5/xferlog.5.gz +share/man/man8/ftpdctl.8.gz +share/man/man8/ftpscrub.8.gz +share/man/man8/ftpshut.8.gz +share/man/man8/proftpd.8.gz @dir lib/proftpd @dir %%LOCALSTATEDIR%%/proftpd