commit: 386e519bafff8c44a4b04a0f658b6bf382b0c095 Author: Herb Miller Jr <herb <AT> hlmjr <DOT> com> AuthorDate: Thu May 20 21:05:19 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sat Jul 3 15:42:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=386e519b
www-servers/lighttpd: Fix nspr header location Bug: https://bugs.gentoo.org/783936 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Herb Miller Jr. <herb <AT> hlmjr.com> Closes: https://github.com/gentoo/gentoo/pull/20900 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../lighttpd/files/lighttpd-1.4.59-nspr-header.patch | 16 ++++++++++++++++ www-servers/lighttpd/lighttpd-1.4.59.ebuild | 2 ++ 2 files changed, 18 insertions(+) diff --git a/www-servers/lighttpd/files/lighttpd-1.4.59-nspr-header.patch b/www-servers/lighttpd/files/lighttpd-1.4.59-nspr-header.patch new file mode 100644 index 00000000000..497ea36a167 --- /dev/null +++ b/www-servers/lighttpd/files/lighttpd-1.4.59-nspr-header.patch @@ -0,0 +1,16 @@ +diff --git a/configure.ac b/configure.ac +index 325a1b4b..3f32daa9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -887,7 +887,10 @@ if test "x$use_nss" = "xyes"; then + NSS_LIBS="-L$WITH_NSS/lib -lnss3" + else + PKG_CHECK_MODULES([NSS],[nss]) +- CPPFLAGS="$CPPFLAGS -I/usr/include/nspr4" ++ if test "x$CRYPTO_LIB" = "x"; then ++ PKG_CHECK_MODULES([NSPR],[nspr]) ++ CPPFLAGS="$CPPFLAGS $NSPR_CFLAGS" ++ fi + fi + AC_DEFINE([HAVE_NSS_NSS_H], [1], [nss/nss.h]) + AC_DEFINE([HAVE_NSS3_NSS_H], [1], [nss3/nss.h]) diff --git a/www-servers/lighttpd/lighttpd-1.4.59.ebuild b/www-servers/lighttpd/lighttpd-1.4.59.ebuild index b3d8e44ff79..86b8878e842 100644 --- a/www-servers/lighttpd/lighttpd-1.4.59.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.59.ebuild @@ -71,6 +71,8 @@ RDEPEND="${COMMON_DEPEND} selinux? ( sec-policy/selinux-apache ) " +PATCHES=( "${FILESDIR}"/${P}-nspr-header.patch ) + # update certain parts of lighttpd.conf based on conditionals update_config() { local config="${D}/etc/lighttpd/lighttpd.conf"
