diff -rupN obhttpd.orig/Makefile obhttpd/Makefile --- obhttpd.orig/Makefile 2020-09-02 08:52:51.000000000 +0000 +++ obhttpd/Makefile 2020-09-25 20:04:59.870688000 +0000 @@ -1,7 +1,7 @@ -# $FreeBSD: head/www/obhttpd/Makefile 547346 2020-09-02 08:52:51Z danfe $ +# $FreeBSD$ PORTNAME= obhttpd -PORTVERSION= 6.6.20191023 +PORTVERSION= 6.7.20200925 CATEGORIES= www MASTER_SITES= OPENBSD/LibreSSL:libressl DISTFILES= libressl-${SSL_VERSION}.tar.gz:libressl @@ -11,53 +11,66 @@ COMMENT= OpenBSD http server LICENSE= BSD3CLAUSE -WRKSRC_SUBDIR= src - USES= uidfix -SSL_VERSION= 3.0.2 +SSL_VERSION= 3.2.1 +LIBEVENT_VERSION= 6.6.20191030 +LIBIMSG_VERSION=6.5.20190710 USE_GITHUB= yes GH_ACCOUNT= koue -GH_PROJECT= httpd +GH_PROJECT= httpd \ + libevent:libevent \ + libimsg:libimsg +GH_TAGNAME= ${LIBIMSG_VERSION}:libimsg \ + ${LIBEVENT_VERSION}:libevent USE_RC_SUBR= obhttpd -CFLAGS+= -Wall -fcommon -CFLAGS+= -I${WRKDIR}/libressl-${SSL_VERSION}/include +CFLAGS+= -Wall -fcommon \ + -I${WRKDIR}/libressl-${SSL_VERSION}/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 + MAKE_ARGS+= MANDIR=${PREFIX}/man/man USERS= www GROUPS= www 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 ${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 + ${WRKSRC}/src/usr.sbin/httpd/Makefile ${REINPLACE_CMD} 's|-lssl|${WRKDIR}/libressl-${SSL_VERSION}/ssl/.libs/libssl.a|g' \ - ${WRKSRC}/usr.sbin/httpd/Makefile + ${WRKSRC}/src/usr.sbin/httpd/Makefile ${REINPLACE_CMD} 's|-lcrypto|${WRKDIR}/libressl-${SSL_VERSION}/crypto/.libs/libcrypto.a|g' \ - ${WRKSRC}/usr.sbin/httpd/Makefile + ${WRKSRC}/src/usr.sbin/httpd/Makefile ${REINPLACE_CMD} 's|-lcrypto|${WRKDIR}/libressl-${SSL_VERSION}/crypto/.libs/libcrypto.a|g' \ - ${WRKSRC}/usr.bin/htpasswd/Makefile + ${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 diff -rupN obhttpd.orig/distinfo obhttpd/distinfo --- obhttpd.orig/distinfo 2019-11-05 01:13:55.000000000 +0000 +++ obhttpd/distinfo 2020-09-25 19:18:29.760124000 +0000 @@ -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 = 1601057836 +SHA256 (libressl-3.2.1.tar.gz) = d28db224cfb6d18009b2a7e8cb213cd5c943bbec87550062fef6a38479250315 +SIZE (libressl-3.2.1.tar.gz) = 3798341 +SHA256 (koue-httpd-6.7.20200925_GH0.tar.gz) = bfa043a8bdc0ffd4d189051404b1cc5948748975d47c47e39a36cf17c55d23cb +SIZE (koue-httpd-6.7.20200925_GH0.tar.gz) = 165344 +SHA256 (koue-libevent-6.6.20191030_GH0.tar.gz) = 20ae6a4eb59875a3550d7a63edb6b082caf04920fa2a52df6755a5da5af5303e +SIZE (koue-libevent-6.6.20191030_GH0.tar.gz) = 67565 +SHA256 (koue-libimsg-6.5.20190710_GH0.tar.gz) = 59d658e0c4c7b961c78bb440abc3c4ad0f66f8aff5a7e29e4670ac763577fc9d +SIZE (koue-libimsg-6.5.20190710_GH0.tar.gz) = 15411 diff -rupN obhttpd.orig/files/patch-usr.bin_htpasswd_Makefile obhttpd/files/patch-usr.bin_htpasswd_Makefile --- obhttpd.orig/files/patch-usr.bin_htpasswd_Makefile 2018-07-10 20:22:10.000000000 +0000 +++ obhttpd/files/patch-usr.bin_htpasswd_Makefile 2020-09-25 19:18:29.760042000 +0000 @@ -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 -rupN obhttpd.orig/files/patch-usr.sbin_httpd_Makefile obhttpd/files/patch-usr.sbin_httpd_Makefile --- obhttpd.orig/files/patch-usr.sbin_httpd_Makefile 2018-07-10 20:22:10.000000000 +0000 +++ obhttpd/files/patch-usr.sbin_httpd_Makefile 2020-09-25 19:18:29.759873000 +0000 @@ -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 $