Date: Tue, 11 May 2021 05:17:30 GMT From: Neel Chauhan <nc@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 08d7bc66f5d1 - main - www/obhttpd: Update to 6.9.20210510 Message-ID: <202105110517.14B5HUQg063974@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=08d7bc66f5d1ce3c74d9c2d67e4ae9c87efee673 commit 08d7bc66f5d1ce3c74d9c2d67e4ae9c87efee673 Author: Nikola Kolev <koue@chaosophia.net> AuthorDate: 2021-05-11 05:15:20 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> CommitDate: 2021-05-11 05:17:26 +0000 www/obhttpd: Update to 6.9.20210510 Changes: https://github.com/koue/httpd/blob/master/ChangeLog PR: 249894 --- www/obhttpd/Makefile | 67 +++++++++++++--------- www/obhttpd/distinfo | 14 +++-- www/obhttpd/files/extra-patch-libressl_tls_tls.c | 20 +++++++ ...akefile => patch-src.usr.bin_htpasswd_Makefile} | 4 +- ..._Makefile => patch-src.usr.sbin_httpd_Makefile} | 4 +- 5 files changed, 74 insertions(+), 35 deletions(-) diff --git a/www/obhttpd/Makefile b/www/obhttpd/Makefile index c3b1895fa67d..304ad16bd43c 100644 --- a/www/obhttpd/Makefile +++ b/www/obhttpd/Makefile @@ -1,64 +1,79 @@ PORTNAME= obhttpd -PORTVERSION= 6.6.20191023 +PORTVERSION= 6.9.20210510 CATEGORIES= www MASTER_SITES= OPENBSD/LibreSSL:libressl -DISTFILES= libressl-${SSL_VERSION}.tar.gz:libressl +DISTFILES= libressl-${SSL}.tar.gz:libressl MAINTAINER= koue@chaosophia.net COMMENT= OpenBSD http server LICENSE= BSD3CLAUSE -WRKSRC_SUBDIR= src - USES= uidfix -SSL_VERSION= 3.0.2 USE_GITHUB= yes GH_ACCOUNT= koue -GH_PROJECT= httpd +GH_PROJECT= httpd \ + libevent:libevent \ + libimsg:libimsg +GH_TAGNAME= ${LIBIMSG}:libimsg \ + ${LIBEVENT}:libevent USE_RC_SUBR= obhttpd -CFLAGS+= -Wall -fcommon -CFLAGS+= -I${WRKDIR}/libressl-${SSL_VERSION}/include - MAKE_ARGS+= MANDIR=${PREFIX}/man/man # XXX Static libraries with PIE are currently unsupported. MAKE_ARGS+= WITHOUT_PIE=true +CFLAGS+= -Wall -fcommon \ + -I${WRKDIR}/libressl-${SSL}/include \ + -I${WRKSRC_libimsg}/src/lib/libutil \ + -I${WRKSRC_libevent}/src/lib/libevent + +LDFLAGS+= -L${WRKSRC_libimsg}/src/lib/libutil \ + -L${WRKSRC_libevent}/src/lib/libevent + USERS= www GROUPS= www +SSL= 3.3.3 +LIBEVENT= 6.6.20191030 +LIBIMSG= 6.9.20210510 + post-patch: + ${REINPLACE_CMD} -e 's|libimsg/src||g' \ + -e 's|libevent||g' ${WRKSRC}/Makefile ${REINPLACE_CMD} -e 's|httpd$$|obhttpd|g' \ -e 's|httpd.conf.5|obhttpd.conf.5|g' \ - -e 's|httpd.8|obhttpd.8|g' ${WRKSRC}/usr.sbin/httpd/Makefile + -e 's|httpd.8|obhttpd.8|g' ${WRKSRC}/src/usr.sbin/httpd/Makefile ${REINPLACE_CMD} -e 's|htpasswd$$|obhtpasswd|g' \ - -e 's|htpasswd.1|obhtpasswd.1|g' ${WRKSRC}/usr.bin/htpasswd/Makefile - ${MV} ${WRKSRC}/usr.bin/htpasswd/htpasswd.1 ${WRKSRC}/usr.bin/htpasswd/obhtpasswd.1 - ${MV} ${WRKSRC}/usr.sbin/httpd/httpd.conf.5 ${WRKSRC}/usr.sbin/httpd/obhttpd.conf.5 - ${MV} ${WRKSRC}/usr.sbin/httpd/httpd.8 ${WRKSRC}/usr.sbin/httpd/obhttpd.8 + -e 's|htpasswd.1|obhtpasswd.1|g' ${WRKSRC}/src/usr.bin/htpasswd/Makefile + ${MV} ${WRKSRC}/src/usr.bin/htpasswd/htpasswd.1 ${WRKSRC}/src/usr.bin/htpasswd/obhtpasswd.1 + ${MV} ${WRKSRC}/src/usr.sbin/httpd/httpd.conf.5 ${WRKSRC}/src/usr.sbin/httpd/obhttpd.conf.5 + ${MV} ${WRKSRC}/src/usr.sbin/httpd/httpd.8 ${WRKSRC}/src/usr.sbin/httpd/obhttpd.8 ${REINPLACE_CMD} -e 's|/etc/httpd.conf|${PREFIX}/etc/obhttpd.conf|g' \ - ${WRKSRC}/usr.sbin/httpd/httpd.h + ${WRKSRC}/src/usr.sbin/httpd/httpd.h pre-configure: - @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/libressl-${SSL_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS}) - @(cd ${WRKDIR}/libressl-${SSL_VERSION} && ${SETENV} ./configure && ${SETENV} ${MAKE_ENV} ${MAKE}) + @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/libressl-${SSL}.tar.gz ${EXTRACT_AFTER_ARGS}) + @(${PATCH} -d ${WRKDIR}/libressl-${SSL} < ${PATCHDIR}/extra-patch-libressl_tls_tls.c) + @(cd ${WRKDIR}/libressl-${SSL} && ${SETENV} ./configure && ${SETENV} ${MAKE_ENV} ${MAKE}) + @(cd ${WRKSRC_libimsg} && ${SETENV} ${MAKE_ENV} ${MAKE}) + @(cd ${WRKSRC_libevent} && ${SETENV} ${MAKE_ENV} ${MAKE}) post-configure: - ${REINPLACE_CMD} 's|-ltls|${WRKDIR}/libressl-${SSL_VERSION}/tls/.libs/libtls.a|g' \ - ${WRKSRC}/usr.sbin/httpd/Makefile - ${REINPLACE_CMD} 's|-lssl|${WRKDIR}/libressl-${SSL_VERSION}/ssl/.libs/libssl.a|g' \ - ${WRKSRC}/usr.sbin/httpd/Makefile - ${REINPLACE_CMD} 's|-lcrypto|${WRKDIR}/libressl-${SSL_VERSION}/crypto/.libs/libcrypto.a|g' \ - ${WRKSRC}/usr.sbin/httpd/Makefile - ${REINPLACE_CMD} 's|-lcrypto|${WRKDIR}/libressl-${SSL_VERSION}/crypto/.libs/libcrypto.a|g' \ - ${WRKSRC}/usr.bin/htpasswd/Makefile + ${REINPLACE_CMD} 's|-ltls|${WRKDIR}/libressl-${SSL}/tls/.libs/libtls.a|g' \ + ${WRKSRC}/src/usr.sbin/httpd/Makefile + ${REINPLACE_CMD} 's|-lssl|${WRKDIR}/libressl-${SSL}/ssl/.libs/libssl.a|g' \ + ${WRKSRC}/src/usr.sbin/httpd/Makefile + ${REINPLACE_CMD} 's|-lcrypto|${WRKDIR}/libressl-${SSL}/crypto/.libs/libcrypto.a|g' \ + ${WRKSRC}/src/usr.sbin/httpd/Makefile + ${REINPLACE_CMD} 's|-lcrypto|${WRKDIR}/libressl-${SSL}/crypto/.libs/libcrypto.a|g' \ + ${WRKSRC}/src/usr.bin/htpasswd/Makefile post-install: - ${INSTALL_DATA} ${WRKSRC}/etc/examples/httpd.conf \ + ${INSTALL_DATA} ${WRKSRC}/src/etc/examples/httpd.conf \ ${STAGEDIR}${PREFIX}/etc/obhttpd.conf.sample .include <bsd.port.mk> diff --git a/www/obhttpd/distinfo b/www/obhttpd/distinfo index 0812e1204b60..9c38c4972944 100644 --- a/www/obhttpd/distinfo +++ b/www/obhttpd/distinfo @@ -1,5 +1,9 @@ -TIMESTAMP = 1571950082 -SHA256 (libressl-3.0.2.tar.gz) = df7b172bf79b957dd27ef36dcaa1fb162562c0e8999e194aa8c1a3df2f15398e -SIZE (libressl-3.0.2.tar.gz) = 3669468 -SHA256 (koue-httpd-6.6.20191023_GH0.tar.gz) = 80d78d2badbda1ed5b119316df7fe5e81b0fcbe1321ec3cae0d34c2edb450ac2 -SIZE (koue-httpd-6.6.20191023_GH0.tar.gz) = 224662 +TIMESTAMP = 1620680257 +SHA256 (libressl-3.3.3.tar.gz) = a471565b36ccd1a70d0bd7d37c6e95c43a26a62829b487d9d2cdebfe58be3066 +SIZE (libressl-3.3.3.tar.gz) = 3848064 +SHA256 (koue-httpd-6.9.20210510_GH0.tar.gz) = 864b2cb2f5097bd64b1ce01b196d750523f43c6ca4e94bc1b6495410786a2829 +SIZE (koue-httpd-6.9.20210510_GH0.tar.gz) = 168270 +SHA256 (koue-libevent-6.6.20191030_GH0.tar.gz) = 20ae6a4eb59875a3550d7a63edb6b082caf04920fa2a52df6755a5da5af5303e +SIZE (koue-libevent-6.6.20191030_GH0.tar.gz) = 67565 +SHA256 (koue-libimsg-6.9.20210510_GH0.tar.gz) = 0e93eeb5a167ee4d80ed5f4d53923ae5de9be9742ac1ef1cac3973fad2a3cd26 +SIZE (koue-libimsg-6.9.20210510_GH0.tar.gz) = 15767 diff --git a/www/obhttpd/files/extra-patch-libressl_tls_tls.c b/www/obhttpd/files/extra-patch-libressl_tls_tls.c new file mode 100644 index 000000000000..822da5bdfc00 --- /dev/null +++ b/www/obhttpd/files/extra-patch-libressl_tls_tls.c @@ -0,0 +1,20 @@ +--- tls/tls.c.orig 2021-05-10 21:00:13.463847000 +0000 ++++ tls/tls.c 2021-05-10 21:02:18.217054000 +0000 +@@ -57,10 +57,13 @@ tls_do_init(void) + int + tls_init(void) + { +- static pthread_once_t once = PTHREAD_ONCE_INIT; +- +- if (pthread_once(&once, tls_do_init) != 0) +- return -1; ++ // fail if statically-linked ++ // ++ //static pthread_once_t once = PTHREAD_ONCE_INIT; ++ // ++ //if (pthread_once(&once, tls_do_init) != 0) ++ // return -1; ++ tls_do_init(); + + return tls_init_rv; + } diff --git a/www/obhttpd/files/patch-usr.bin_htpasswd_Makefile b/www/obhttpd/files/patch-src.usr.bin_htpasswd_Makefile similarity index 62% rename from www/obhttpd/files/patch-usr.bin_htpasswd_Makefile rename to www/obhttpd/files/patch-src.usr.bin_htpasswd_Makefile index ad6f3102bec5..b5b6f16f190b 100644 --- a/www/obhttpd/files/patch-usr.bin_htpasswd_Makefile +++ b/www/obhttpd/files/patch-src.usr.bin_htpasswd_Makefile @@ -1,5 +1,5 @@ ---- usr.bin/htpasswd/Makefile.orig 2018-07-10 10:58:14 UTC -+++ usr.bin/htpasswd/Makefile +--- src/usr.bin/htpasswd/Makefile.orig 2018-07-10 10:58:14 UTC ++++ src/usr.bin/htpasswd/Makefile @@ -1,5 +1,6 @@ # $OpenBSD: Makefile,v 1.4 2017/07/09 21:23:19 espie Exp $ LOCALBASE?= /usr/local diff --git a/www/obhttpd/files/patch-usr.sbin_httpd_Makefile b/www/obhttpd/files/patch-src.usr.sbin_httpd_Makefile similarity index 71% rename from www/obhttpd/files/patch-usr.sbin_httpd_Makefile rename to www/obhttpd/files/patch-src.usr.sbin_httpd_Makefile index aedb43904339..96fc0028ee8f 100644 --- a/www/obhttpd/files/patch-usr.sbin_httpd_Makefile +++ b/www/obhttpd/files/patch-src.usr.sbin_httpd_Makefile @@ -1,5 +1,5 @@ ---- usr.sbin/httpd/Makefile.orig 2018-07-10 10:58:32 UTC -+++ usr.sbin/httpd/Makefile +--- src/usr.sbin/httpd/Makefile.orig 2018-07-10 10:58:32 UTC ++++ src/usr.sbin/httpd/Makefile @@ -1,6 +1,7 @@ # $OpenBSD: Makefile,v 1.30 2017/07/03 22:21:47 espie Exp $
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105110517.14B5HUQg063974>