diff --git a/www/obhttpd/Makefile b/www/obhttpd/Makefile index d2caac235cae..189270631568 100644 --- a/www/obhttpd/Makefile +++ b/www/obhttpd/Makefile @@ -1,79 +1,79 @@ PORTNAME= obhttpd -PORTVERSION= 7.0.20211108 +PORTVERSION= 7.0.20211221 CATEGORIES= www MASTER_SITES= OPENBSD/LibreSSL:libressl DISTFILES= libressl-${SSL}.tar.gz:libressl MAINTAINER= koue@chaosophia.net COMMENT= OpenBSD http server LICENSE= BSD3CLAUSE USES= uidfix USE_GITHUB= yes GH_ACCOUNT= koue GH_PROJECT= httpd \ libevent:libevent \ libimsg:libimsg GH_TAGNAME= ${LIBIMSG}:libimsg \ ${LIBEVENT}:libevent USE_RC_SUBR= obhttpd 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.4.1 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}/src/usr.sbin/httpd/Makefile ${REINPLACE_CMD} -e 's|htpasswd$$|obhtpasswd|g' \ -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}/src/usr.sbin/httpd/httpd.h pre-configure: @(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}/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}/src/etc/examples/httpd.conf \ ${STAGEDIR}${PREFIX}/etc/obhttpd.conf.sample .include diff --git a/www/obhttpd/distinfo b/www/obhttpd/distinfo index dd8b57d98119..79235fc86abb 100644 --- a/www/obhttpd/distinfo +++ b/www/obhttpd/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1636430215 +TIMESTAMP = 1640249912 SHA256 (libressl-3.4.1.tar.gz) = 107ceae6ca800e81cb563584c16afa36d6c7138fade94a2b3e9da65456f7c61c SIZE (libressl-3.4.1.tar.gz) = 3917346 -SHA256 (koue-httpd-7.0.20211108_GH0.tar.gz) = 7b382eb9f7e46f523323eb1980988b14742797acf16ce794da29271ff6ab04fb -SIZE (koue-httpd-7.0.20211108_GH0.tar.gz) = 172022 +SHA256 (koue-httpd-7.0.20211221_GH0.tar.gz) = 20adcfc2e1c98d3d94018da2662b23f22cb593650dfb542f605fa47843e968ab +SIZE (koue-httpd-7.0.20211221_GH0.tar.gz) = 172284 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