Commit 33313978 authored by Jérome Perrin's avatar Jérome Perrin

component/proftpd: version ↑ 1.3.6b

1.3.6a had a fix for building mod_sftp using OpenSSL 1.1.x, so we can
use default openssl again.
This should fix problems with proftpd-mod_auth_web that was linked
against curl which already used openssl 1.1
parent d0a88346
...@@ -22,11 +22,8 @@ recipe = collective.recipe.grp ...@@ -22,11 +22,8 @@ recipe = collective.recipe.grp
[proftpd] [proftpd]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
md5sum = 13270911c42aac842435f18205546a1b md5sum = 4040f6a6b86173e2a03f4ccdb9b9af6e
url = ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.6.tar.gz url = ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.6b.tar.gz
# 1.3.6 is not compatible with openssl 1.1.x
# https://github.com/proftpd/proftpd/issues/674
# (fix is in master, we are waiting for next release)
configure-options = configure-options =
--enable-openssl --enable-openssl
--enable-nls --enable-nls
...@@ -39,8 +36,8 @@ environment = ...@@ -39,8 +36,8 @@ environment =
LDFLAGS=${:ldflags} LDFLAGS=${:ldflags}
install_user=${proftpd-environment:USER} install_user=${proftpd-environment:USER}
install_group=${proftpd-grp:GROUP} install_group=${proftpd-grp:GROUP}
cppflags=-I${zlib:location}/include -I${openssl-1.0:location}/include cppflags=-I${zlib:location}/include -I${openssl:location}/include
ldflags=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl-1.0:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib ldflags=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
patch-binary = ${patch:location}/bin/patch patch-binary = ${patch:location}/bin/patch
patch-options = -p1 patch-options = -p1
patches = patches =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment