Date: Thu, 27 Jul 2017 15:25:30 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446747 - in head: databases/proftpd-mod_sql_tds ftp/proftpd ftp/proftpd/files Message-ID: <201707271525.v6RFPU7L039442@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Thu Jul 27 15:25:30 2017 New Revision: 446747 URL: https://svnweb.freebsd.org/changeset/ports/446747 Log: Update ftp/proftpd to 1.3.6 Fix compatibility in databases/proftpd-mod_sql_tds Added: head/ftp/proftpd/files/patch-contrib_mod__sftp_Makefile.in - copied, changed from r446746, head/ftp/proftpd/files/patch-contrib-mod_sftp-Makefile.in head/ftp/proftpd/files/patch-doc_Configuration.html - copied, changed from r446746, head/ftp/proftpd/files/patch-doc__Configuration.html head/ftp/proftpd/files/patch-src_fsio.c - copied, changed from r446746, head/ftp/proftpd/files/patch-8-src-fsio.c Deleted: head/ftp/proftpd/files/patch-8-src-fsio.c head/ftp/proftpd/files/patch-contrib-mod_sftp-Makefile.in head/ftp/proftpd/files/patch-contrib_mod__tls.c head/ftp/proftpd/files/patch-doc__Configuration.html Modified: head/databases/proftpd-mod_sql_tds/Makefile head/ftp/proftpd/Makefile head/ftp/proftpd/distinfo head/ftp/proftpd/files/patch-sample-configurations_basic.conf head/ftp/proftpd/pkg-plist Modified: head/databases/proftpd-mod_sql_tds/Makefile ============================================================================== --- head/databases/proftpd-mod_sql_tds/Makefile Thu Jul 27 15:21:31 2017 (r446746) +++ head/databases/proftpd-mod_sql_tds/Makefile Thu Jul 27 15:25:30 2017 (r446747) @@ -30,4 +30,9 @@ _BUILDING_PROFTPD_MODULE= ${PORTNAME} post-extract: @${MV} ${WRKDIR}/mod_sql_tds.c ${WRKSRC}/contrib +post-patch: + @${REINPLACE_CMD} -e 's| ERROR_MSG| PR_ERROR_MSG|g' \ + -e 's| HANDLED| PR_HANDLED|g' \ + ${WRKSRC}/contrib/mod_sql_tds.c + .include "${MASTERDIR}/Makefile" Modified: head/ftp/proftpd/Makefile ============================================================================== --- head/ftp/proftpd/Makefile Thu Jul 27 15:21:31 2017 (r446746) +++ head/ftp/proftpd/Makefile Thu Jul 27 15:25:30 2017 (r446747) @@ -26,7 +26,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd RUN_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd .endif -PROFTPD_VERSION= 1.3.5e +PROFTPD_VERSION= 1.3.6 .if defined(_BUILDING_PROFTPD_MODULE) DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} @@ -86,11 +86,12 @@ PLIST_FILES+= libexec/proftpd/${m}.a \ libexec/proftpd/${m}.so .endfor .else -OPTIONS_DEFINE= DOCS HTMLDOCS IPV6 NLS MEMCACHE PCRE +OPTIONS_DEFINE= DOCS HTMLDOCS IPV6 NLS MEMCACHE PCRE REDIS OPTIONS_DEFAULT= PCRE HTMLDOCS_DESC= Include HTML documentation MEMCACHE_DESC= Memcache support using libmemcached +REDIS_DESC= Redis support using hiredis PLIST_SUB+= LOCALSTATEDIR="${LOCALSTATEDIR}" OPTIONS_SUB= yes @@ -153,6 +154,11 @@ MEMCACHE_LIB_DEPENDS= libmemcached.so:databases/libmem 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" .include <bsd.port.options.mk> Modified: head/ftp/proftpd/distinfo ============================================================================== --- head/ftp/proftpd/distinfo Thu Jul 27 15:21:31 2017 (r446746) +++ head/ftp/proftpd/distinfo Thu Jul 27 15:25:30 2017 (r446747) @@ -1,6 +1,6 @@ -TIMESTAMP = 1499982806 -SHA256 (proftpd-1.3.5e.tar.gz) = 8307dc0103a8e716b99745919be7f09b54708c57c7d5aa70262f7593dc56bc9d -SIZE (proftpd-1.3.5e.tar.gz) = 29968142 +TIMESTAMP = 1499982985 +SHA256 (proftpd-1.3.6.tar.gz) = 91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf +SIZE (proftpd-1.3.6.tar.gz) = 20251898 SHA256 (mod_clamav-v0.14rc2.tar.gz) = 0a865a659541f7ff5c46532c79aac652cdd004f604fb6a874f57dfb95bfe5a1e SIZE (mod_clamav-v0.14rc2.tar.gz) = 19721 SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08 Copied and modified: head/ftp/proftpd/files/patch-contrib_mod__sftp_Makefile.in (from r446746, head/ftp/proftpd/files/patch-contrib-mod_sftp-Makefile.in) ============================================================================== --- head/ftp/proftpd/files/patch-contrib-mod_sftp-Makefile.in Thu Jul 27 15:21:31 2017 (r446746, copy source) +++ head/ftp/proftpd/files/patch-contrib_mod__sftp_Makefile.in Thu Jul 27 15:25:30 2017 (r446747) @@ -1,6 +1,6 @@ ---- contrib/mod_sftp/Makefile.in.orig 2009-09-16 08:09:57.000000000 +0200 -+++ contrib/mod_sftp/Makefile.in 2010-03-24 17:38:46.947039120 +0100 -@@ -45,8 +45,9 @@ +--- contrib/mod_sftp/Makefile.in.orig 2017-04-10 02:31:02 UTC ++++ contrib/mod_sftp/Makefile.in +@@ -60,8 +60,9 @@ install: install-misc fi install-misc: @@ -11,4 +11,4 @@ + $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 blacklist.dat $(DESTDIR)$(sysconfdir)/proftpd/blacklist.dat.sample clean: - $(RM) $(MODULE_NAME).a *.o *.la *.lo + $(LIBTOOL) --mode=clean $(RM) $(MODULE_NAME).a $(MODULE_NAME).la *.o *.lo .libs/*.o Copied and modified: head/ftp/proftpd/files/patch-doc_Configuration.html (from r446746, head/ftp/proftpd/files/patch-doc__Configuration.html) ============================================================================== --- head/ftp/proftpd/files/patch-doc__Configuration.html Thu Jul 27 15:21:31 2017 (r446746, copy source) +++ head/ftp/proftpd/files/patch-doc_Configuration.html Thu Jul 27 15:25:30 2017 (r446747) @@ -1,6 +1,6 @@ ---- ./doc/Configuration.html.orig Wed Jan 29 12:27:24 2003 -+++ ./doc/Configuration.html Sat Mar 15 11:34:14 2003 -@@ -4226,7 +4226,7 @@ +--- doc/Configuration.html.orig 2017-04-10 02:31:02 UTC ++++ doc/Configuration.html +@@ -4359,7 +4359,7 @@ CLASS="SYNOPSIS" ></DT ><DD ><P @@ -9,8 +9,8 @@ ></DD ><DT ><PRE -@@ -32252,4 +32252,4 @@ - ></DIV +@@ -35399,4 +35399,4 @@ CLASS="LITERALLAYOUT" + ></TABLE ></BODY ></HTML -> Modified: head/ftp/proftpd/files/patch-sample-configurations_basic.conf ============================================================================== --- head/ftp/proftpd/files/patch-sample-configurations_basic.conf Thu Jul 27 15:21:31 2017 (r446746) +++ head/ftp/proftpd/files/patch-sample-configurations_basic.conf Thu Jul 27 15:25:30 2017 (r446747) @@ -1,5 +1,5 @@ ---- sample-configurations/basic.conf.orig 2008-01-21 08:44:06.000000000 -0900 -+++ sample-configurations/basic.conf 2009-01-28 11:25:31.000000000 -0900 +--- sample-configurations/basic.conf.orig 2017-04-10 02:31:02 UTC ++++ sample-configurations/basic.conf @@ -1,3 +1,7 @@ +# +# For more information about Proftpd configuration @@ -24,7 +24,7 @@ # Umask 022 is a good standard umask to prevent new dirs and files # from being group and world writable. -@@ -25,6 +30,8 @@ +@@ -25,6 +30,8 @@ Umask 022 # (such as xinetd). MaxInstances 30 @@ -33,41 +33,32 @@ # Set the user and group under which the server will run. User nobody Group nogroup -@@ -43,23 +50,31 @@ +@@ -43,23 +50,31 @@ AllowOverwrite on # A basic anonymous configuration, no upload directories. If you do not # want anonymous users, simply delete this entire <Anonymous> section. -<Anonymous ~ftp> - User ftp - Group ftp -- + - # We want clients to be able to login with "anonymous" as well as "ftp" - UserAlias anonymous ftp -- -- # Limit the maximum number of anonymous logins -- MaxClients 10 -- -- # We want 'welcome.msg' displayed at login, and '.message' displayed -- # in each newly chdired directory. -- DisplayLogin welcome.msg -- DisplayChdir .message -- -- # Limit WRITE everywhere in the anonymous chroot -- <Limit WRITE> -- DenyAll -- </Limit> --</Anonymous> -+ +######################################################################### +# # +# Uncomment lines with only one # to allow basic anonymous access # +# # +######################################################################### -+ + +- # Limit the maximum number of anonymous logins +- MaxClients 10 +#<Anonymous ~ftp> +# User ftp +# Group ftp -+ + +- # We want 'welcome.msg' displayed at login, and '.message' displayed +- # in each newly chdired directory. +- DisplayLogin welcome.msg +- DisplayChdir .message + ### We want clients to be able to login with "anonymous" as well as "ftp" + # UserAlias anonymous ftp + @@ -84,4 +75,9 @@ + # DenyAll + # </Limit> +#</Anonymous> -+ + +- # Limit WRITE everywhere in the anonymous chroot +- <Limit WRITE> +- DenyAll +- </Limit> +-</Anonymous> Copied and modified: head/ftp/proftpd/files/patch-src_fsio.c (from r446746, head/ftp/proftpd/files/patch-8-src-fsio.c) ============================================================================== --- head/ftp/proftpd/files/patch-8-src-fsio.c Thu Jul 27 15:21:31 2017 (r446746, copy source) +++ head/ftp/proftpd/files/patch-src_fsio.c Thu Jul 27 15:25:30 2017 (r446747) @@ -1,7 +1,7 @@ ---- src/fsio.c.orig 2010-04-12 21:00:00.000000000 +0200 -+++ src/fsio.c 2011-12-29 21:51:33.844925577 +0100 -@@ -50,6 +50,10 @@ - # include <acl/libacl.h> +--- src/fsio.c.orig 2017-04-10 02:31:02 UTC ++++ src/fsio.c +@@ -69,6 +69,10 @@ static size_t copy_iter_count = 0; + # define NFS_SUPER_MAGIC 0x6969 #endif +#if defined(__FreeBSD__) @@ -11,8 +11,8 @@ typedef struct fsopendir fsopendir_t; struct fsopendir { -@@ -284,7 +288,30 @@ - #endif +@@ -1041,7 +1045,30 @@ static int sys_fsetxattr(pool *p, pr_fh_ + return res; } +#if defined(__FreeBSD__) @@ -39,6 +39,6 @@ + if (enter_freebsd_restricted_mode() != 0) + return -1; +#endif - if (chroot(path) < 0) + if (chroot(path) < 0) { return -1; - + } Modified: head/ftp/proftpd/pkg-plist ============================================================================== --- head/ftp/proftpd/pkg-plist Thu Jul 27 15:21:31 2017 (r446746) +++ head/ftp/proftpd/pkg-plist Thu Jul 27 15:25:30 2017 (r446747) @@ -14,12 +14,14 @@ include/proftpd/ascii.h include/proftpd/auth.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 @@ -34,17 +36,19 @@ 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/json.h include/proftpd/lastlog.h include/proftpd/libsupp.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_log.h include/proftpd/mod_quotatab.h include/proftpd/mod_sftp.h include/proftpd/mod_snmp.h @@ -63,19 +67,20 @@ include/proftpd/pr-syslog.h include/proftpd/privs.h include/proftpd/proctitle.h include/proftpd/proftpd.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/tpl.h include/proftpd/trace.h include/proftpd/utf8.h include/proftpd/var.h @@ -132,6 +137,8 @@ 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 @@ -140,6 +147,8 @@ 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 @@ -148,6 +157,8 @@ 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 man/man1/ftpcount.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707271525.v6RFPU7L039442>