diff options
29 files changed, 300 insertions, 107 deletions
diff --git a/net/Makefile b/net/Makefile index 18a151e3e2f..cbcc092eedf 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1083 2015/09/12 22:54:29 joerg Exp $ +# $NetBSD: Makefile,v 1.1084 2015/09/25 10:01:36 wiedi Exp $ # COMMENT= Networking tools @@ -553,6 +553,13 @@ SUBDIR+= powerdns-recursor SUBDIR+= pppd SUBDIR+= pptp SUBDIR+= proftpd +SUBDIR+= proftpd-geoip +SUBDIR+= proftpd-ldap +SUBDIR+= proftpd-memcached +SUBDIR+= proftpd-mysql +SUBDIR+= proftpd-odbc +SUBDIR+= proftpd-postgresql +SUBDIR+= proftpd-sqlite SUBDIR+= proxycheck SUBDIR+= proxytunnel SUBDIR+= publicfile diff --git a/net/proftpd-geoip/DESCR b/net/proftpd-geoip/DESCR new file mode 100644 index 00000000000..5f123ba728d --- /dev/null +++ b/net/proftpd-geoip/DESCR @@ -0,0 +1,5 @@ +The ProFTPD mod_geoip module allows sites to quickly look up geolocation +information such as country, continent, region, timezone, etc based on +the connecting client's IP address. This information can be logged for +tracking purposes, and used to configure access controls in order to +reduce/prevent connections from locations unauthorized by site policy. diff --git a/net/proftpd-geoip/Makefile b/net/proftpd-geoip/Makefile new file mode 100644 index 00000000000..207a49f1e76 --- /dev/null +++ b/net/proftpd-geoip/Makefile @@ -0,0 +1,12 @@ +# $NetBSD: Makefile,v 1.1 2015/09/25 10:01:36 wiedi Exp $ + +.include "../../net/proftpd/Makefile.module" + +PROFTPD_MOD= geoip +PKGNAME= ${DISTNAME:S/proftpd/proftpd-${PROFTPD_MOD}/} +COMMENT= Geolocation module for proftpd + +CONFIGURE_ARGS+= --with-shared=mod_geoip + +.include "../../net/GeoIP/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/net/proftpd-geoip/PLIST b/net/proftpd-geoip/PLIST new file mode 100644 index 00000000000..8b1c8c4d889 --- /dev/null +++ b/net/proftpd-geoip/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1 2015/09/25 10:01:36 wiedi Exp $ +libexec/proftpd/mod_geoip.la diff --git a/net/proftpd-ldap/DESCR b/net/proftpd-ldap/DESCR new file mode 100644 index 00000000000..c89d3797628 --- /dev/null +++ b/net/proftpd-ldap/DESCR @@ -0,0 +1,4 @@ +The ProFTPD mod_conf_ldap module can be used to store configuration +information, as would normally be found in the proftpd.conf file, in LDAP +directories, and to have proftpd consequently retrieve that configuration +information. diff --git a/net/proftpd-ldap/Makefile b/net/proftpd-ldap/Makefile new file mode 100644 index 00000000000..d65f3b8919f --- /dev/null +++ b/net/proftpd-ldap/Makefile @@ -0,0 +1,12 @@ +# $NetBSD: Makefile,v 1.1 2015/09/25 10:01:36 wiedi Exp $ + +.include "../../net/proftpd/Makefile.module" + +PROFTPD_MOD= ldap +PKGNAME= ${DISTNAME:S/proftpd/proftpd-${PROFTPD_MOD}/} +COMMENT= LDAP module for ProFTPD + +CONFIGURE_ARGS+= --with-shared=mod_ldap:mod_quotatab_ldap + +.include "../../databases/openldap-client/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/net/proftpd-ldap/PLIST b/net/proftpd-ldap/PLIST new file mode 100644 index 00000000000..8c359863af0 --- /dev/null +++ b/net/proftpd-ldap/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1 2015/09/25 10:01:36 wiedi Exp $ +libexec/proftpd/mod_ldap.la +libexec/proftpd/mod_quotatab_ldap.la diff --git a/net/proftpd-memcached/DESCR b/net/proftpd-memcached/DESCR new file mode 100644 index 00000000000..dfb07a453db --- /dev/null +++ b/net/proftpd-memcached/DESCR @@ -0,0 +1,2 @@ +The ProFTPD mod_memcache module enables support for caching data in +memcached servers. diff --git a/net/proftpd-memcached/Makefile b/net/proftpd-memcached/Makefile new file mode 100644 index 00000000000..2e497e11296 --- /dev/null +++ b/net/proftpd-memcached/Makefile @@ -0,0 +1,12 @@ +# $NetBSD: Makefile,v 1.1 2015/09/25 10:01:36 wiedi Exp $ + +.include "../../net/proftpd/Makefile.module" + +PROFTPD_MOD= memcache +PKGNAME= ${DISTNAME:S/proftpd/proftpd-${PROFTPD_MOD}/} +COMMENT= Memcache module for ProFTPD + +CONFIGURE_ARGS+= --with-shared=mod_memcache:mod_tls_memcache + +.include "../../devel/libmemcached/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/net/proftpd-memcached/PLIST b/net/proftpd-memcached/PLIST new file mode 100644 index 00000000000..00caf288fb0 --- /dev/null +++ b/net/proftpd-memcached/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1 2015/09/25 10:01:36 wiedi Exp $ +libexec/proftpd/mod_memcache.la +libexec/proftpd/mod_tls_memcache.la diff --git a/net/proftpd-mysql/DESCR b/net/proftpd-mysql/DESCR new file mode 100644 index 00000000000..3c6b1d69997 --- /dev/null +++ b/net/proftpd-mysql/DESCR @@ -0,0 +1,2 @@ +ProFTPD module that provides the MySQL (and compatible) backend for SQL +database authentication. diff --git a/net/proftpd-mysql/Makefile b/net/proftpd-mysql/Makefile new file mode 100644 index 00000000000..84a7236a94e --- /dev/null +++ b/net/proftpd-mysql/Makefile @@ -0,0 +1,12 @@ +# $NetBSD: Makefile,v 1.1 2015/09/25 10:01:36 wiedi Exp $ + +.include "../../net/proftpd/Makefile.module" + +PROFTPD_MOD= mysql +PKGNAME= ${DISTNAME:S/proftpd/proftpd-${PROFTPD_MOD}/} +COMMENT= MySQL module for proftpd + +CONFIGURE_ARGS+= --with-shared=mod_sql_mysql + +.include "../../mk/mysql.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/net/proftpd-mysql/PLIST b/net/proftpd-mysql/PLIST new file mode 100644 index 00000000000..ae76d6f8ab5 --- /dev/null +++ b/net/proftpd-mysql/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1 2015/09/25 10:01:36 wiedi Exp $ +libexec/proftpd/mod_sql_mysql.la diff --git a/net/proftpd-odbc/DESCR b/net/proftpd-odbc/DESCR new file mode 100644 index 00000000000..eb336774e8f --- /dev/null +++ b/net/proftpd-odbc/DESCR @@ -0,0 +1,2 @@ +The purpose of the mod_sql_odbc module is to allow ProFTPD's mod_sql module to +connect to any database that supports ODBC. diff --git a/net/proftpd-odbc/Makefile b/net/proftpd-odbc/Makefile new file mode 100644 index 00000000000..1589b83bfe9 --- /dev/null +++ b/net/proftpd-odbc/Makefile @@ -0,0 +1,12 @@ +# $NetBSD: Makefile,v 1.1 2015/09/25 10:01:37 wiedi Exp $ + +.include "../../net/proftpd/Makefile.module" + +PROFTPD_MOD= odbc +PKGNAME= ${DISTNAME:S/proftpd/proftpd-${PROFTPD_MOD}/} +COMMENT= ODBC module for ProFTPD + +CONFIGURE_ARGS+= --with-shared=mod_sql_odbc + +.include "../../databases/unixodbc/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/net/proftpd-odbc/PLIST b/net/proftpd-odbc/PLIST new file mode 100644 index 00000000000..d8e5a7e321d --- /dev/null +++ b/net/proftpd-odbc/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1 2015/09/25 10:01:37 wiedi Exp $ +libexec/proftpd/mod_sql_odbc.la diff --git a/net/proftpd-postgresql/DESCR b/net/proftpd-postgresql/DESCR new file mode 100644 index 00000000000..76f15d50091 --- /dev/null +++ b/net/proftpd-postgresql/DESCR @@ -0,0 +1,2 @@ +ProFTPD module that provides the PostgreSQL backend for SQL database +authentication. diff --git a/net/proftpd-postgresql/Makefile b/net/proftpd-postgresql/Makefile new file mode 100644 index 00000000000..2de32484c87 --- /dev/null +++ b/net/proftpd-postgresql/Makefile @@ -0,0 +1,12 @@ +# $NetBSD: Makefile,v 1.1 2015/09/25 10:01:37 wiedi Exp $ + +.include "../../net/proftpd/Makefile.module" + +PROFTPD_MOD= postgresql +PKGNAME= ${DISTNAME:S/proftpd/proftpd-${PROFTPD_MOD}${PGSQL_VERSION}/} +COMMENT= PostgreSQL module for ProFTPD + +CONFIGURE_ARGS+= --with-shared=mod_sql_postgres + +.include "../../mk/pgsql.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/net/proftpd-postgresql/PLIST b/net/proftpd-postgresql/PLIST new file mode 100644 index 00000000000..cf55f64c6dc --- /dev/null +++ b/net/proftpd-postgresql/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1 2015/09/25 10:01:37 wiedi Exp $ +libexec/proftpd/mod_sql_postgres.la diff --git a/net/proftpd-sqlite/DESCR b/net/proftpd-sqlite/DESCR new file mode 100644 index 00000000000..6ea0de4cfa4 --- /dev/null +++ b/net/proftpd-sqlite/DESCR @@ -0,0 +1,2 @@ +The mod_sql_sqlite module is designed to let ProFTPD's mod_sql module connect +to and use a SQLite database. diff --git a/net/proftpd-sqlite/Makefile b/net/proftpd-sqlite/Makefile new file mode 100644 index 00000000000..e356e397df3 --- /dev/null +++ b/net/proftpd-sqlite/Makefile @@ -0,0 +1,12 @@ +# $NetBSD: Makefile,v 1.1 2015/09/25 10:01:37 wiedi Exp $ + +.include "../../net/proftpd/Makefile.module" + +PROFTPD_MOD= sqlite +PKGNAME= ${DISTNAME:S/proftpd/proftpd-${PROFTPD_MOD}/} +COMMENT= SQLite module for ProFTPD + +CONFIGURE_ARGS+= --with-shared=mod_sql_sqlite + +.include "../../databases/sqlite3/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/net/proftpd-sqlite/PLIST b/net/proftpd-sqlite/PLIST new file mode 100644 index 00000000000..462eeae9ace --- /dev/null +++ b/net/proftpd-sqlite/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1 2015/09/25 10:01:37 wiedi Exp $ +libexec/proftpd/mod_sql_sqlite.la diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile index aefc36d058f..4a9f78cf400 100644 --- a/net/proftpd/Makefile +++ b/net/proftpd/Makefile @@ -1,30 +1,44 @@ -# $NetBSD: Makefile,v 1.80 2015/08/18 07:31:15 wiz Exp $ +# $NetBSD: Makefile,v 1.81 2015/09/25 10:01:37 wiedi Exp $ -DISTNAME= proftpd-1.3.5a -PKGREVISION= 1 -CATEGORIES= net -MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ - ftp://ftp.servus.at/ProFTPD/distrib/source/ \ - ftp://ftp.fsn.hu/pub/proftpd/distrib/source/ +.include "../../net/proftpd/Makefile.common" -MAINTAINER= kim@tac.nyc.ny.us -HOMEPAGE= http://www.proftpd.org/ -COMMENT= FTP server with Apache like configuration -LICENSE= gnu-gpl-v2 +PKGREVISION= 2 +COMMENT= Highly configurable FTP server software -WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} +MODULES+= \ + mod_ban \ + mod_copy \ + mod_ctrls_admin \ + mod_deflate \ + mod_dnsbl \ + mod_dynmasq \ + mod_exec \ + mod_ifsession \ + mod_ifversion \ + mod_load \ + 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_sql \ + mod_shaper \ + mod_site_misc \ + mod_sql \ + mod_sql_passwd \ + mod_tls \ + mod_tls_shmcache \ + mod_unique_id \ + mod_wrap2 \ + mod_wrap2_file \ + mod_wrap2_sql -USE_TOOLS+= gmake intltool msgfmt perl:run -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --localstatedir=${VARBASE}/run -CONFIGURE_ARGS+= --disable-sendfile -CONFIGURE_ARGS+= --enable-ctrls -CONFIGURE_ARGS+= --enable-nls -CONFIGURE_ENV+= install_group=${ROOT_GROUP} -CONFIGURE_ENV+= install_user=${ROOT_USER} - -BUILD_DEFS+= VARBASE +CONFIGURE_ARGS+= --with-shared=${MODULES:ts:} RCD_SCRIPTS= proftpd REPLACE_PERL+= contrib/ftpasswd @@ -39,15 +53,6 @@ INSTALLATION_DIRS+= lib/proftpd INSTALLATION_DIRS+= share/doc/proftpd INSTALLATION_DIRS+= share/examples/proftpd -PLIST_SRC+= ${PKGDIR}/PLIST - -.include "options.mk" - -SUBST_CLASSES+= libwrap -SUBST_STAGE.libwrap= post-patch -SUBST_FILES.libwrap= contrib/mod_wrap.c -SUBST_SED.libwrap= -e '/^...\$$Libraries: /s/ -lnsl\$$$$/$$/' - post-install: .for i in NEWS README README.IPv6 README.LDAP README.PAM README.capabilities \ README.classes README.controls README.facl README.modules @@ -61,6 +66,4 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/contrib/ftpasswd \ ${DESTDIR}${PREFIX}/share/examples/proftpd -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/proftpd/Makefile.common b/net/proftpd/Makefile.common new file mode 100644 index 00000000000..95cf1c7e86b --- /dev/null +++ b/net/proftpd/Makefile.common @@ -0,0 +1,42 @@ +# $NetBSD: Makefile.common,v 1.1 2015/09/25 10:01:37 wiedi Exp $ + +# used by net/proftpd/Makefile +# used by net/proftpd/Makefile.module + +DISTNAME= proftpd-1.3.5a +CATEGORIES= net +MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ + ftp://ftp.servus.at/ProFTPD/distrib/source/ \ + ftp://ftp.fsn.hu/pub/proftpd/distrib/source/ + +MAINTAINER= kim@tac.nyc.ny.us +HOMEPAGE= http://www.proftpd.org/ +LICENSE= gnu-gpl-v2 + +DISTINFO_FILE= ${.CURDIR}/../../net/proftpd/distinfo +PATCHDIR= ${.CURDIR}/../../net/proftpd/patches + + +USE_TOOLS+= gmake intltool msgfmt perl:run +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/proftpd +CONFIGURE_ARGS+= --localstatedir=${VARBASE}/run +CONFIGURE_ARGS+= --disable-sendfile +CONFIGURE_ARGS+= --disable-strip +CONFIGURE_ARGS+= --enable-ctrls +CONFIGURE_ARGS+= --enable-nls +CONFIGURE_ARGS+= --enable-dso +CONFIGURE_ENV+= install_group=${ROOT_GROUP} +CONFIGURE_ENV+= install_user=${ROOT_USER} + +BUILD_DEFS+= VARBASE + +CHECK_SHLIBS_SKIP=libexec/proftpd/*.a + +.include "options.mk" + +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" diff --git a/net/proftpd/Makefile.module b/net/proftpd/Makefile.module new file mode 100644 index 00000000000..8adf76d6ca8 --- /dev/null +++ b/net/proftpd/Makefile.module @@ -0,0 +1,22 @@ +# $NetBSD: Makefile.module,v 1.1 2015/09/25 10:01:37 wiedi Exp $ + +# used by net/proftpd-geoip/Makefile +# used by net/proftpd-ldap/Makefile +# used by net/proftpd-memcached/Makefile +# used by net/proftpd-mysql/Makefile +# used by net/proftpd-odbc/Makefile +# used by net/proftpd-postgresql/Makefile +# used by net/proftpd-sqlite/Makefile + +.include "../../net/proftpd/Makefile.common" + +BUILD_TARGET= shared +BUILD_DIRS= modules +INSTALLATION_DIRS+= libexec/proftpd + +DEPENDS+= proftpd>=${PKGVERSION_NOREV}:../../net/proftpd + +CPPFLAGS+= -I${WRKSRC}/include -I${WRKSRC}/contrib + +pre-build: + cd ${WRKSRC} && ${MAKE} include/buildstamp.h diff --git a/net/proftpd/PLIST b/net/proftpd/PLIST index e8a8ea624f8..11a7af52a9e 100644 --- a/net/proftpd/PLIST +++ b/net/proftpd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2015/07/13 15:39:27 he Exp $ +@comment $NetBSD: PLIST,v 1.27 2015/09/25 10:01:37 wiedi Exp $ bin/ftpasswd bin/ftpcount bin/ftpdctl @@ -7,6 +7,7 @@ bin/ftpquota bin/ftptop bin/ftpwho bin/prxs +include/proftpd/ascii.h include/proftpd/auth.h include/proftpd/bindings.h include/proftpd/buildstamp.h @@ -31,19 +32,22 @@ include/proftpd/fsio.h include/proftpd/ftp.h include/proftpd/glibc-glob.h include/proftpd/help.h +include/proftpd/ident.h include/proftpd/inet.h +include/proftpd/lastlog.h include/proftpd/libsupp.h include/proftpd/log.h include/proftpd/memcache.h include/proftpd/mkhome.h include/proftpd/mod_ctrls.h -${PLIST.quota}include/proftpd/mod_quotatab.h -${PLIST.sql}include/proftpd/mod_sql.h -${PLIST.tls}include/proftpd/mod_tls.h -include/proftpd/ascii.h -include/proftpd/ident.h -include/proftpd/lastlog.h +include/proftpd/mod_dnsbl.h +include/proftpd/mod_load.h include/proftpd/mod_log.h +include/proftpd/mod_quotatab.h +include/proftpd/mod_sftp.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 @@ -75,6 +79,38 @@ include/proftpd/var.h include/proftpd/version.h include/proftpd/xferlog.h lib/pkgconfig/proftpd.pc +libexec/proftpd/mod_ban.la +libexec/proftpd/mod_copy.la +libexec/proftpd/mod_ctrls_admin.la +libexec/proftpd/mod_deflate.la +libexec/proftpd/mod_dnsbl.la +libexec/proftpd/mod_dynmasq.la +libexec/proftpd/mod_exec.la +libexec/proftpd/mod_ifsession.la +libexec/proftpd/mod_ifversion.la +libexec/proftpd/mod_load.la +libexec/proftpd/mod_qos.la +libexec/proftpd/mod_quotatab.la +libexec/proftpd/mod_quotatab_file.la +libexec/proftpd/mod_quotatab_radius.la +libexec/proftpd/mod_quotatab_sql.la +libexec/proftpd/mod_radius.la +libexec/proftpd/mod_ratio.la +libexec/proftpd/mod_readme.la +libexec/proftpd/mod_rewrite.la +libexec/proftpd/mod_sftp.la +${PLIST.pam}libexec/proftpd/mod_sftp_pam.la +libexec/proftpd/mod_sftp_sql.la +libexec/proftpd/mod_shaper.la +libexec/proftpd/mod_site_misc.la +libexec/proftpd/mod_sql.la +libexec/proftpd/mod_sql_passwd.la +libexec/proftpd/mod_tls.la +libexec/proftpd/mod_tls_shmcache.la +libexec/proftpd/mod_unique_id.la +libexec/proftpd/mod_wrap2.la +libexec/proftpd/mod_wrap2_file.la +libexec/proftpd/mod_wrap2_sql.la man/man1/ftpasswd.1 man/man1/ftpcount.1 man/man1/ftpmail.1 @@ -106,7 +142,9 @@ share/doc/proftpd/faq.html share/doc/proftpd/license.txt share/examples/proftpd/anonymous.conf share/examples/proftpd/basic.conf +share/examples/proftpd/blacklist.dat share/examples/proftpd/complex-virtual.conf +share/examples/proftpd/dhparams.pem share/examples/proftpd/ftpasswd share/examples/proftpd/mod_sql.conf share/examples/proftpd/virtual.conf diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo index d78342deb53..8bfcaaa2583 100644 --- a/net/proftpd/distinfo +++ b/net/proftpd/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.42 2015/07/13 15:39:27 he Exp $ +$NetBSD: distinfo,v 1.43 2015/09/25 10:01:37 wiedi Exp $ SHA1 (proftpd-1.3.5a.tar.gz) = 7c4027c207bdfe7c88b859810c7fa9b978b0524d RMD160 (proftpd-1.3.5a.tar.gz) = ff9050ee8c0fb741eb84ef815ad0974bf237193a Size (proftpd-1.3.5a.tar.gz) = 29988477 bytes SHA1 (patch-Makefile.in) = 332dcd9d773770c10d876dc9da1dc7f6b1c15421 +SHA1 (patch-contrib_mod__sftp_Makefile.in) = 8a805d777597b4fb06a45b484373880e535a0cee SHA1 (patch-contrib_mod_tls.c) = e36dfa9427804b41eb2ad49378b62890325d50ed diff --git a/net/proftpd/options.mk b/net/proftpd/options.mk index fa759d99454..77a2c27319c 100644 --- a/net/proftpd/options.mk +++ b/net/proftpd/options.mk @@ -1,18 +1,20 @@ -# $NetBSD: options.mk,v 1.12 2013/10/23 15:46:22 jperkin Exp $ +# $NetBSD: options.mk,v 1.13 2015/09/25 10:01:37 wiedi Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.proftpd -PKG_SUPPORTED_OPTIONS= pam inet6 wrap tls quota ldap proftpd-readme ban -PKG_OPTIONS_OPTIONAL_GROUPS+= sql -PKG_OPTIONS_GROUP.sql= mysql pgsql +PKG_SUPPORTED_OPTIONS= pam inet6 PKG_SUGGESTED_OPTIONS= pam inet6 .include "../../mk/bsd.options.mk" -PLIST_VARS+= quota sql tls +PLIST_VARS+= pam + +MODULES= # empty .if !empty(PKG_OPTIONS:Mpam) CONFIGURE_ARGS+= --enable-auth-pam .include "../../mk/pam.buildlink3.mk" +MODULES+= mod_sftp_pam +PLIST.pam= yes .else CONFIGURE_ARGS+= --disable-auth-pam .endif @@ -22,62 +24,3 @@ CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif - -MODULES= # empty - -.if !empty(PKG_OPTIONS:Mwrap) -MODULES:= ${MODULES}:mod_wrap -.include "../../security/tcp_wrappers/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mtls) -MODULES:= ${MODULES}:mod_tls -PLIST.tls= yes -.include "../../security/openssl/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mquota) -MODULES:= ${MODULES}:mod_quotatab:mod_quotatab_file -PLIST.quota= yes -.endif - -.if !empty(PKG_OPTIONS:Mquota) && !empty(PKG_OPTIONS:Mmysql) -MODULES:= ${MODULES}:mod_quotatab_sql -.endif - -.if !empty(PKG_OPTIONS:Mquota) && !empty(PKG_OPTIONS:Mpgsql) -MODULES:= ${MODULES}:mod_quotatab_sql -.endif - -.if !empty(PKG_OPTIONS:Mquota) && !empty(PKG_OPTIONS:Mldap) -MODULES:= ${MODULES}:mod_quotatab_ldap -.endif - -.if !empty(PKG_OPTIONS:Mldap) -MODULES:= ${MODULES}:mod_ldap -.include "../../databases/openldap-client/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mmysql) -MODULES:= ${MODULES}:mod_sql:mod_sql_mysql -PLIST.sql= yes -.include "../../mk/mysql.buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mpgsql) -MODULES:= ${MODULES}:mod_sql:mod_sql_postgres -PLIST.sql= yes -.include "../../mk/pgsql.buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mproftpd-readme) -MODULES:= ${MODULES}:mod_readme -.endif - -.if !empty(PKG_OPTIONS:Mban) -MODULES:= ${MODULES}:mod_ban -.endif - -.if !empty(MODULES) -CONFIGURE_ARGS+= --with-modules=${MODULES:C/^://} -.endif diff --git a/net/proftpd/patches/patch-contrib_mod__sftp_Makefile.in b/net/proftpd/patches/patch-contrib_mod__sftp_Makefile.in new file mode 100644 index 00000000000..77b1af80a21 --- /dev/null +++ b/net/proftpd/patches/patch-contrib_mod__sftp_Makefile.in @@ -0,0 +1,18 @@ +$NetBSD: patch-contrib_mod__sftp_Makefile.in,v 1.1 2015/09/25 10:01:37 wiedi Exp $ + +Install mod_sftp misc files into examples folder + +--- contrib/mod_sftp/Makefile.in.orig 2015-05-28 00:25:54.000000000 +0000 ++++ contrib/mod_sftp/Makefile.in +@@ -46,8 +46,9 @@ install: install-misc + fi + + install-misc: +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 dhparams.pem $(DESTDIR)$(sysconfdir)/dhparams.pem +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 blacklist.dat $(DESTDIR)$(sysconfdir)/blacklist.dat ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/examples/proftpd ++ $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 dhparams.pem $(DESTDIR)$(PREFIX)/share/examples/proftpd/dhparams.pem ++ $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 blacklist.dat $(DESTDIR)$(PREFIX)/share/examples/proftpd/blacklist.dat + + clean: + $(LIBTOOL) --mode=clean $(RM) $(MODULE_NAME).a $(MODULE_NAME).la *.o *.lo .libs/*.o |