diff --git a/net/proftpd/Portfile b/net/proftpd/Portfile index 5bb11393448e7..665f6239044e7 100644 --- a/net/proftpd/Portfile +++ b/net/proftpd/Portfile @@ -7,11 +7,11 @@ PortGroup legacysupport 1.1 legacysupport.newest_darwin_requires_legacy 10 name proftpd -version 1.3.8b +version 1.3.8c revision 0 -checksums rmd160 c5b29f1198beaec2a1191059b56f765b417ab904 \ - sha256 183ab7c6107de271a2959ff268f55c9b6c76b2cf0029e6584fccc019686601e0 \ - size 19752808 +checksums rmd160 133e55d2d58f6478aa6e4079b656be81caf63e1c \ + sha256 2a48f2ca338456e750d2373bf671025ed799e04e0baa16c7bb8dbfd67d8734d2 \ + size 19751847 categories net license GPL-2+ @@ -41,8 +41,8 @@ depends_lib port:libidn \ patchfiles dynamic_lookup-11.patch -configure.args --sysconfdir=${prefix}/etc \ - --localstatedir=${prefix}/var/run \ +configure.args --sysconfdir=${prefix}/etc/${name} \ + --localstatedir=${prefix}/var/run/${name} \ --mandir=${prefix}/share/man \ --enable-ctrls \ --enable-dso \ @@ -57,6 +57,10 @@ set modules [list mod_tls mod_sftp mod_sftp_pam mod_ban mod_ctrls_admin \ set includes {} set libs {} pre-configure { + if {[lsearch -glob $modules mod_sql_*]} { + lappend modules mod_sql mod_sql_passwd + configure.args-append --enable-openssl + } configure.args-append --with-modules=[join $modules :] configure.args-append --with-shared=[join $modules :] if {$includes != {}} { @@ -69,45 +73,67 @@ pre-configure { pre-destroot { reinplace "s|nogroup|nobody|g" ${worksrcpath}/sample-configurations/basic.conf - xinstall -m 755 -d ${destroot}${prefix}/var/run/proftpd - touch ${destroot}${prefix}/var/run/proftpd/proftpd.scoreboard + xinstall -m 755 -d ${destroot}${prefix}/var/run/${name} + touch ${destroot}${prefix}/var/run/${name}/${name}.scoreboard } post-destroot { - move ${destroot}${prefix}/etc/proftpd.conf ${destroot}${prefix}/etc/proftpd.conf.dist - move ${destroot}${prefix}/var/run/proftpd/proftpd.scoreboard ${destroot}${prefix}/var/run/proftpd/proftpd.scoreboard.dist + move ${destroot}${prefix}/etc/${name}/${name}.conf ${destroot}${prefix}/etc/${name}/${name}.conf.dist + move ${destroot}${prefix}/var/run/${name}/${name}.scoreboard ${destroot}${prefix}/var/run/${name}/${name}.scoreboard.dist } post-activate { - if {![file exists ${prefix}/etc/proftpd.conf]} { - copy ${prefix}/etc/proftpd.conf.dist ${prefix}/etc/proftpd.conf + # move the .conf from an old install + if {[file exists ${prefix}/etc/${name}.conf]} { + move ${prefix}/etc/${name}.conf ${prefix}/etc/${name}/${name}.conf + } + if {![file exists ${prefix}/etc/${name}/${name}.conf]} { + copy ${prefix}/etc/${name}/${name}.conf.dist ${prefix}/etc/${name}/${name}.conf } } -variant mysql57 conflicts postgresql11 sqlite3 description {Build with mysql 5.7 support} { - depends_lib-append port:mysql57 - lappend modules mod_sql mod_sql_mysql - lappend includes ${prefix}/include/mysql57/mysql - lappend libs ${prefix}/lib/mysql57/mysql +variant mysql57 conflicts mysql8 postgresql11 postgresql17 sqlite3 description {Build with mysql 5.7 support} { + set my_db mysql57 + depends_lib-append port:${my_db} + lappend modules mod_sql_mysql + lappend includes ${prefix}/include/${my_db}/mysql + lappend libs ${prefix}/lib/${my_db}/mysql +} + +variant mysql8 conflicts mysql57 postgresql11 postgresql17 sqlite3 description {Build with mysql 8 support} { + set my_db mysql8 + depends_lib-append port:${my_db} + lappend modules mod_sql_mysql + lappend includes ${prefix}/include/${my_db}/mysql + lappend libs ${prefix}/lib/${my_db}/mysql +} + +variant postgresql11 conflicts mysql57 mysql8 sqlite3 postgresql17 description {Build with PostgreSQL 11 support} { + set my_db postgresql11 + depends_lib-append port:${my_db} + lappend modules mod_sql_postgres + lappend includes ${prefix}/include/${my_db} + lappend libs ${prefix}/lib/${my_db} } -variant postgresql11 conflicts mysql57 sqlite3 description {Build with PostgreSQL 11 support} { - depends_lib-append port:postgresql11 - lappend modules mod_sql mod_sql_postgres - lappend includes ${prefix}/include/postgresql11 - lappend libs ${prefix}/lib/postgresql11 +variant postgresql17 conflicts mysql57 mysql8 postgresql11 sqlite3 description {Build with PostgreSQL 17 support} { + set my_db postgresql17 + depends_lib-append port:${my_db} + lappend modules mod_sql_postgres + lappend includes ${prefix}/include/${my_db} + lappend libs ${prefix}/lib/${my_db} } -variant sqlite3 conflicts mysql57 postgresql11 description {Build with sqlite3 support} { +variant sqlite3 conflicts mysql57 mysql8 postgresql11 postgresql17 description {Build with sqlite3 support} { depends_lib-append port:sqlite3 - lappend modules mod_sql mod_sql_sqlite + lappend modules mod_sql_sqlite } -variant quotatab description {Build with SQL quota support} { - lappend modules mod_quotatab mod_quotatab_sql +variant quotasql description {Build with SQL quota support} { + lappend modules mod_quotatab_sql } startupitem.create yes -startupitem.start "${prefix}/sbin/proftpd" -startupitem.restart "/bin/kill -HUP \$(/bin/cat ${prefix}/var/run/proftpd.pid)" -startupitem.stop "/bin/kill -15 \$(/bin/cat ${prefix}/var/run/proftpd.pid)" +startupitem.start "${prefix}/sbin/${name}" +startupitem.restart "/bin/kill -HUP \$(/bin/cat ${prefix}/var/run/${name}/${name}.pid)" +startupitem.stop "/bin/kill -15 \$(/bin/cat ${prefix}/var/run/${name}/${name}.pid)" diff --git a/net/proftpd/files/-Wimplicit-function-declaration b/net/proftpd/files/-Wimplicit-function-declaration new file mode 100644 index 0000000000000..30e20bc0669be --- /dev/null +++ b/net/proftpd/files/-Wimplicit-function-declaration @@ -0,0 +1,20 @@ +Warning: Configuration logfiles contain indications of -Wimplicit-function-declaration; check that features were not accidentally disabled: + crypt: found in proftpd-1.3.8c/config.log + gethostbyname: found in proftpd-1.3.8c/config.log + inet_aton: found in proftpd-1.3.8c/config.log + gethostent: found in proftpd-1.3.8c/config.log + bind: found in proftpd-1.3.8c/config.log + authenticate: found in proftpd-1.3.8c/config.log + loginfailed: found in proftpd-1.3.8c/config.log + loginsuccess: found in proftpd-1.3.8c/config.log + acl_get_perm: found in proftpd-1.3.8c/config.log + send_file: found in proftpd-1.3.8c/config.log + lgetxattr: found in proftpd-1.3.8c/config.log + llistxattr: found in proftpd-1.3.8c/config.log + lremovexattr: found in proftpd-1.3.8c/config.log + lsetxattr: found in proftpd-1.3.8c/config.log + make_scrambled_password: found in proftpd-1.3.8c/config.log + make_scrambled_password_323: found in proftpd-1.3.8c/config.log + my_make_scrambled_password: found in proftpd-1.3.8c/config.log + my_make_scrambled_password_323: found in proftpd-1.3.8c/config.log + SSLeay_add_all_algorithms: found in proftpd-1.3.8c/config.log, proftpd-1.3.8c/contrib/mod_sftp/config.log