diff --git a/www/obhttpd/Makefile b/www/obhttpd/Makefile index 3bb48a5e8d45..bcfccddb0962 100644 --- a/www/obhttpd/Makefile +++ b/www/obhttpd/Makefile @@ -1,81 +1,81 @@ PORTNAME= obhttpd -PORTVERSION= 7.1.20220923 -PORTREVISION= 1 +DISTVERSION= 7.3.20230714 CATEGORIES= www MASTER_SITES= OPENBSD/LibreSSL:libressl DISTFILES= libressl-${SSL}.tar.gz:libressl MAINTAINER= koue@chaosophia.net COMMENT= OpenBSD http server WWW= https://github.com/koue/httpd 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.5.3 -LIBEVENT= 6.6.20191030 -LIBIMSG= 7.1.20220916 +SSL= 3.8.0 +LIBEVENT= 7.3.20230714 +LIBIMSG= 7.3.20230714 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} ac_cv_header_endian_h=no ./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' \ + ${REINPLACE_CMD} 's|../../../libevent/src/lib/libevent/libevent.a|${WRKSRC_libevent}/src/lib/libevent/libevent.a|g' \ + ${WRKSRC}/src/usr.sbin/httpd/Makefile + ${REINPLACE_CMD} 's|../../../libimsg/src/lib/libutil/libimsg.a|${WRKSRC_libimsg}/src/lib/libutil/libimsg.a|g' \ + ${WRKSRC}/src/usr.sbin/httpd/Makefile + ${REINPLACE_CMD} 's|/usr/local/lib/libtls.a|${WRKDIR}/libressl-${SSL}/tls/.libs/libtls.a|g' \ + ${WRKSRC}/src/usr.sbin/httpd/Makefile + ${REINPLACE_CMD} 's|/usr/local/lib/libssl.a|${WRKDIR}/libressl-${SSL}/ssl/.libs/libssl.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' \ + ${REINPLACE_CMD} 's|/usr/local/lib/libcrypto.a|${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' \ + ${REINPLACE_CMD} 's|/usr/local/lib/libcrypto.a|${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 ddded699b8b9..ea8059f0566a 100644 --- a/www/obhttpd/distinfo +++ b/www/obhttpd/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1664476755 -SHA256 (libressl-3.5.3.tar.gz) = 3ab5e5eaef69ce20c6b170ee64d785b42235f48f2e62b095fca5d7b6672b8b28 -SIZE (libressl-3.5.3.tar.gz) = 4039561 -SHA256 (koue-httpd-7.1.20220923_GH0.tar.gz) = 7b32a7ad182d8361116f9cedb0b568b62503da72be3e3548769f42ffa8721c23 -SIZE (koue-httpd-7.1.20220923_GH0.tar.gz) = 174739 -SHA256 (koue-libevent-6.6.20191030_GH0.tar.gz) = 20ae6a4eb59875a3550d7a63edb6b082caf04920fa2a52df6755a5da5af5303e -SIZE (koue-libevent-6.6.20191030_GH0.tar.gz) = 67565 -SHA256 (koue-libimsg-7.1.20220916_GH0.tar.gz) = 2cdb91c9f99954cbf8c68592b90ee65a2af75e6e82db1f0b18e7838285492b66 -SIZE (koue-libimsg-7.1.20220916_GH0.tar.gz) = 16128 +TIMESTAMP = 1689353656 +SHA256 (libressl-3.8.0.tar.gz) = 12531c1ec808c5c6abeb311899664b0cfed04d4648f456dc959bb93c5f21acac +SIZE (libressl-3.8.0.tar.gz) = 4419357 +SHA256 (koue-httpd-7.3.20230714_GH0.tar.gz) = 82e1147d7c1d184d6049a4ce64c110705848bb7b5461929404383a2c0cffbd8d +SIZE (koue-httpd-7.3.20230714_GH0.tar.gz) = 175337 +SHA256 (koue-libevent-7.3.20230714_GH0.tar.gz) = 84fffbead795fd00ca758c460a2540bcb2f34bbc80b7837dbc94e18dc49ceebb +SIZE (koue-libevent-7.3.20230714_GH0.tar.gz) = 92458 +SHA256 (koue-libimsg-7.3.20230714_GH0.tar.gz) = 553082eb214882141d4492cf8f5384940b222f6ce9c91688bcd3608a5b9a6fc6 +SIZE (koue-libimsg-7.3.20230714_GH0.tar.gz) = 17822