Skip to content

Commit 75e0c6e

Browse files
BjarneDMBjarneDM
committed
proftpd : updated to v/ 1.3.8c ; more databases ; config changes
* update to version 1.3.8c * sysconfir & localstatedir into own subdirs * mysql8 & postgresql17 variants added * DRY changes Changes to be committed: modified: net/proftpd/Portfile new file: net/proftpd/files/-Wimplicit-function-declaration to-do file
1 parent 2dd63d2 commit 75e0c6e

File tree

2 files changed

+75
-29
lines changed

2 files changed

+75
-29
lines changed

‎net/proftpd/Portfile

Lines changed: 55 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ PortGroup legacysupport 1.1
77
legacysupport.newest_darwin_requires_legacy 10
88

99
name proftpd
10-
version 1.3.8b
10+
version 1.3.8c
1111
revision 0
12-
checksums rmd160 c5b29f1198beaec2a1191059b56f765b417ab904 \
13-
sha256 183ab7c6107de271a2959ff268f55c9b6c76b2cf0029e6584fccc019686601e0 \
14-
size 19752808
12+
checksums rmd160 133e55d2d58f6478aa6e4079b656be81caf63e1c \
13+
sha256 2a48f2ca338456e750d2373bf671025ed799e04e0baa16c7bb8dbfd67d8734d2 \
14+
size 19751847
1515

1616
categories net
1717
license GPL-2+
@@ -41,8 +41,8 @@ depends_lib port:libidn \
4141

4242
patchfiles dynamic_lookup-11.patch
4343

44-
configure.args --sysconfdir=${prefix}/etc \
45-
--localstatedir=${prefix}/var/run \
44+
configure.args --sysconfdir=${prefix}/etc/${name} \
45+
--localstatedir=${prefix}/var/run/${name} \
4646
--mandir=${prefix}/share/man \
4747
--enable-ctrls \
4848
--enable-dso \
@@ -57,6 +57,10 @@ set modules [list mod_tls mod_sftp mod_sftp_pam mod_ban mod_ctrls_admin \
5757
set includes {}
5858
set libs {}
5959
pre-configure {
60+
if {[lsearch -glob ${modules} mod_sql_*] != -1} {
61+
lappend modules mod_sql mod_sql_passwd
62+
configure.args-append --enable-openssl
63+
}
6064
configure.args-append --with-modules=[join $modules :]
6165
configure.args-append --with-shared=[join $modules :]
6266
if {$includes != {}} {
@@ -69,45 +73,67 @@ pre-configure {
6973

7074
pre-destroot {
7175
reinplace "s|nogroup|nobody|g" ${worksrcpath}/sample-configurations/basic.conf
72-
xinstall -m 755 -d ${destroot}${prefix}/var/run/proftpd
73-
touch ${destroot}${prefix}/var/run/proftpd/proftpd.scoreboard
76+
xinstall -m 755 -d ${destroot}${prefix}/var/run/${name}
77+
touch ${destroot}${prefix}/var/run/${name}/${name}.scoreboard
7478
}
7579

7680
post-destroot {
77-
move ${destroot}${prefix}/etc/proftpd.conf ${destroot}${prefix}/etc/proftpd.conf.dist
78-
move ${destroot}${prefix}/var/run/proftpd/proftpd.scoreboard ${destroot}${prefix}/var/run/proftpd/proftpd.scoreboard.dist
81+
move ${destroot}${prefix}/etc/${name}/${name}.conf ${destroot}${prefix}/etc/${name}/${name}.conf.dist
82+
move ${destroot}${prefix}/var/run/${name}/${name}.scoreboard ${destroot}${prefix}/var/run/${name}/${name}.scoreboard.dist
7983
}
8084

8185
post-activate {
82-
if {![file exists ${prefix}/etc/proftpd.conf]} {
83-
copy ${prefix}/etc/proftpd.conf.dist ${prefix}/etc/proftpd.conf
86+
# move the .conf from an old install
87+
if {[file exists ${prefix}/etc/${name}.conf]} {
88+
move ${prefix}/etc/${name}.conf ${prefix}/etc/${name}/${name}.conf
89+
}
90+
if {![file exists ${prefix}/etc/${name}/${name}.conf]} {
91+
copy ${prefix}/etc/${name}/${name}.conf.dist ${prefix}/etc/${name}/${name}.conf
8492
}
8593
}
8694

87-
variant mysql57 conflicts postgresql11 sqlite3 description {Build with mysql 5.7 support} {
88-
depends_lib-append port:mysql57
89-
lappend modules mod_sql mod_sql_mysql
90-
lappend includes ${prefix}/include/mysql57/mysql
91-
lappend libs ${prefix}/lib/mysql57/mysql
95+
variant mysql57 conflicts mysql8 postgresql11 postgresql17 sqlite3 description {Build with mysql 5.7 support} {
96+
set my_db mysql57
97+
depends_lib-append port:${my_db}
98+
lappend modules mod_sql_mysql
99+
lappend includes ${prefix}/include/${my_db}/mysql
100+
lappend libs ${prefix}/lib/${my_db}/mysql
101+
}
102+
103+
variant mysql8 conflicts mysql57 postgresql11 postgresql17 sqlite3 description {Build with mysql 8 support} {
104+
set my_db mysql8
105+
depends_lib-append port:${my_db}
106+
lappend modules mod_sql_mysql
107+
lappend includes ${prefix}/include/${my_db}/mysql
108+
lappend libs ${prefix}/lib/${my_db}/mysql
109+
}
110+
111+
variant postgresql11 conflicts mysql57 mysql8 sqlite3 postgresql17 description {Build with PostgreSQL 11 support} {
112+
set my_db postgresql11
113+
depends_lib-append port:${my_db}
114+
lappend modules mod_sql_postgres
115+
lappend includes ${prefix}/include/${my_db}
116+
lappend libs ${prefix}/lib/${my_db}
92117
}
93118

94-
variant postgresql11 conflicts mysql57 sqlite3 description {Build with PostgreSQL 11 support} {
95-
depends_lib-append port:postgresql11
96-
lappend modules mod_sql mod_sql_postgres
97-
lappend includes ${prefix}/include/postgresql11
98-
lappend libs ${prefix}/lib/postgresql11
119+
variant postgresql17 conflicts mysql57 mysql8 postgresql11 sqlite3 description {Build with PostgreSQL 17 support} {
120+
set my_db postgresql17
121+
depends_lib-append port:${my_db}
122+
lappend modules mod_sql_postgres
123+
lappend includes ${prefix}/include/${my_db}
124+
lappend libs ${prefix}/lib/${my_db}
99125
}
100126

101-
variant sqlite3 conflicts mysql57 postgresql11 description {Build with sqlite3 support} {
127+
variant sqlite3 conflicts mysql57 mysql8 postgresql11 postgresql17 description {Build with sqlite3 support} {
102128
depends_lib-append port:sqlite3
103-
lappend modules mod_sql mod_sql_sqlite
129+
lappend modules mod_sql_sqlite
104130
}
105131

106-
variant quotatab description {Build with SQL quota support} {
107-
lappend modules mod_quotatab mod_quotatab_sql
132+
variant quotasql description {Build with SQL quota support} {
133+
lappend modules mod_quotatab_sql
108134
}
109135

110136
startupitem.create yes
111-
startupitem.start "${prefix}/sbin/proftpd"
112-
startupitem.restart "/bin/kill -HUP \$(/bin/cat ${prefix}/var/run/proftpd.pid)"
113-
startupitem.stop "/bin/kill -15 \$(/bin/cat ${prefix}/var/run/proftpd.pid)"
137+
startupitem.start "${prefix}/sbin/${name}"
138+
startupitem.restart "/bin/kill -HUP \$(/bin/cat ${prefix}/var/run/${name}/${name}.pid)"
139+
startupitem.stop "/bin/kill -15 \$(/bin/cat ${prefix}/var/run/${name}/${name}.pid)"

‎net/proftpd/files/-Wimplicit-function-declaration

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Warning: Configuration logfiles contain indications of -Wimplicit-function-declaration; check that features were not accidentally disabled:
2+
crypt: found in proftpd-1.3.8c/config.log
3+
gethostbyname: found in proftpd-1.3.8c/config.log
4+
inet_aton: found in proftpd-1.3.8c/config.log
5+
gethostent: found in proftpd-1.3.8c/config.log
6+
bind: found in proftpd-1.3.8c/config.log
7+
authenticate: found in proftpd-1.3.8c/config.log
8+
loginfailed: found in proftpd-1.3.8c/config.log
9+
loginsuccess: found in proftpd-1.3.8c/config.log
10+
acl_get_perm: found in proftpd-1.3.8c/config.log
11+
send_file: found in proftpd-1.3.8c/config.log
12+
lgetxattr: found in proftpd-1.3.8c/config.log
13+
llistxattr: found in proftpd-1.3.8c/config.log
14+
lremovexattr: found in proftpd-1.3.8c/config.log
15+
lsetxattr: found in proftpd-1.3.8c/config.log
16+
make_scrambled_password: found in proftpd-1.3.8c/config.log
17+
make_scrambled_password_323: found in proftpd-1.3.8c/config.log
18+
my_make_scrambled_password: found in proftpd-1.3.8c/config.log
19+
my_make_scrambled_password_323: found in proftpd-1.3.8c/config.log
20+
SSLeay_add_all_algorithms: found in proftpd-1.3.8c/config.log, proftpd-1.3.8c/contrib/mod_sftp/config.log

0 commit comments

Comments
 (0)