casa / casa-mp-base / c38f5ce3f10

Commits

Chih-Hsuan Yen authored c38f5ce3f10 31 Oct 2019

cherokee: use OpenSSL 1.0

I don't quite understand the +ssl variant. It's not a default
variant, and cherokee is still built with SSL support without
+ssl. Also, --enable-tls and --with-openssl have no effects.
Simply removing that variant and enabling SSL support
unconditionally is the best fix out of my head.

Upstream has patches for OpenSSL 1.1 [1], while a newer version
is required for those patches to be applied. On the other hand,
tarballs for new versions require running ./autogen.sh, where
a `python2` command in $PATH is requested. That would be a
headache and I don't plan to invest more time into it.

Closes: https://trac.macports.org/ticket/59544

[1] https://github.com/cherokee/webserver/pull/1196

www/cherokee/Portfile

Modified

1 -	PortSystem 1.0
1 +	PortSystem 1.0
2 +	PortGroup old_openssl 1.0
2 3
3 4	name cherokee
4 5	version 1.2.101
5 6	revision 2
6 7	set branch [join [lrange [split ${version} .] 0 1] .]
7 8	categories www
8 9	platforms darwin
9 10	maintainers nomaintainer
10 11	license GPL-2
11 12

20 21
21 22	checksums md5 ef47003355a2e368e4d9596cd070ef23 \
22 23	sha1 b27f149c7d7111207ac8c3cd8a4856c05490d136 \
23 24	rmd160 dd3dedc352ba17bdcefd8e200143b8ffa19ad035
24 25
25 26	depends_lib port:pcre \
26 27	port:zlib \
27 28	port:libgeoip \
28 29	port:rrdtool
29 30
31 +	openssl.branch 1.0
32 +	openssl.configure build_flags
33 +
30 34	# Startup item.
31 35	set cherokee_config_name cherokee.conf
32 36	set cherokee_config ${prefix}/etc/${name}/${cherokee_config_name}
33 37	set cherokee_pidfile_name cherokee.pid
34 38	set cherokee_pidfile ${prefix}/var/run/${cherokee_pidfile_name}
35 39
36 40	startupitem.create yes
37 41	startupitem.init "PIDFILE=${cherokee_pidfile}"
38 42	startupitem.start "${prefix}/sbin/cherokee -C ${cherokee_config}"
39 43	startupitem.stop "kill \$(cat \$PIDFILE)"
40 44
41 45	variant no_startupitem description {Do not create a startup item} {
42 46	startupitem.create no
43 47	}
44 48
45 -	variant ssl description {Add SSL (HTTPS) support to the server} {
46 -	depends_lib-append path:lib/libssl.dylib:openssl
47 -	configure.args-append --enable-tls=openssl \
48 -	--with-openssl=${prefix}/include/openssl
49 -	}
50 -
51 49	variant no_ipv6 description {Disable IPv6 support} {
52 50	configure.args-append --disable-ipv6
53 51	}
54 52
55 53	variant no_pam description {Disable PAM support} {
56 54	configure.args-append --disable-pam
57 55	}
58 56
59 57	variant trace description {Allows debugging options} {
60 58	configure.args-append --enable-trace

casa-mp-base

Commits

Jira Issues

Add shortcut