From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BC6B7139345 for ; Sat, 3 Jul 2021 15:46:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8605AE0844; Sat, 3 Jul 2021 15:46:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68B9EE0844 for ; Sat, 3 Jul 2021 15:46:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4FF06335D9F for ; Sat, 3 Jul 2021 15:46:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC4DB7C3 for ; Sat, 3 Jul 2021 15:46:19 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1625326939.386e519bafff8c44a4b04a0f658b6bf382b0c095.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/lighttpd/files/, www-servers/lighttpd/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/lighttpd/files/lighttpd-1.4.59-nspr-header.patch www-servers/lighttpd/lighttpd-1.4.59.ebuild X-VCS-Directories: www-servers/lighttpd/ www-servers/lighttpd/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 386e519bafff8c44a4b04a0f658b6bf382b0c095 X-VCS-Branch: master Date: Sat, 3 Jul 2021 15:46:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c78b6e9d-7bd1-40f8-a033-7a39492ed9bc X-Archives-Hash: 3af848bbb10f03ad57c7ab8f017632a2 commit: 386e519bafff8c44a4b04a0f658b6bf382b0c095 Author: Herb Miller Jr hlmjr com> AuthorDate: Thu May 20 21:05:19 2021 +0000 Commit: Joonas Niilola gentoo 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. hlmjr.com> Closes: https://github.com/gentoo/gentoo/pull/20900 Signed-off-by: Joonas Niilola 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"