From nobody Sun Mar 17 23:05:23 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TyYVW3l63z5F52J; Sun, 17 Mar 2024 23:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TyYVW2s4zz4txX; Sun, 17 Mar 2024 23:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710716723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Yp/xXJJLfKLQomRs+/kyBzwMdb2OV5lcO8lstyKqUQ=; b=d6knu+fZWQcljVx05w5yl78Eh8vaB9/ofqOoxoDxc8jzjZOa7XYBEcylgacpDz47OZaZ5N XdLsijbF9rkq+ZKj533iH/tcxyLtCCWFnZbFG5doAiqQgXJK+c28Q6YX9o88LhFj32h6nR +Vwwk26Pt4wL29ddv6kAZV4xC6x/x1fwdPXUOKiqYrUgvnrIwt41t+8gmwXAVPUPU/6p77 KbnGxRwziisczJLxuhhIECaqm1w+58KbFttEIOA5zocvay7uC9GDbKic/896323nU0BJpb Bw7ocgiGttJx7+xlPJfaKaUa0d6lcZe6gFznC03hQ2M9r3j8Tuv3Q0+VFtpkQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710716723; a=rsa-sha256; cv=none; b=BDfev01ZRSpM1Lqf2m2u1qspZ/RiwehKNujaVxlkIkqsCxbvNTlkDnUYZ1RCrTLfqA7ahM 6tkgDakD+88E/NR76C8agLFeVFNbzYx1ddrQnbNYDRReUhz2I0Kh8zFBmZj8fiGs78Cnvi kDW9aWRAMp5CuSOlPBwvnBV7OjhrkRn/4n0DNi5N6RwrhMuI4g++be1AlTX7r9Q6B61gtm Ik3pvXl4AXVfEXprIMs1wrQYmGNGAr7bKxMXg52gkoqxgbcbUfI4rSohQ2JuRtcjAfpgnm eHTs4EHQ64Hq2Wank/IuPu+TuSkp+McNYGPlr3T7L/Tj64e0D4KoTJdQz19eIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710716723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Yp/xXJJLfKLQomRs+/kyBzwMdb2OV5lcO8lstyKqUQ=; b=x0UmyvCuDYyTmWBuyC3lAhDOSv/dj/jEq2uwk/ByWGDQw9pg4C9ob+SYORm8IYURDsiNNk cyeRAKzcwZ+jynzXVC/3irg+2mpIoS0UfBAjMnRUK5vKoiGkCdFu10AeuNEknKRoScWOLp o4QzbFu8NiNW0WxMfBGsKHExCCTWulEZyZbQIYzkmXiOKnXd8W9waw13qjiVwOLXvntxyz 6nMBxPR5aWVFcyihLLFQFUU71QkNh2ygBueM8kzBlmb55YPWNdrr3r5n6f0mpOptFbsJEs NsfKrwLdyWlYp3x4VIT4E4uhl8O5DmozGGuC6n+1Svnv5xGPf4YmDxb70ezWCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TyYVW2RbhzyJ2; Sun, 17 Mar 2024 23:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42HN5NO5092544; Sun, 17 Mar 2024 23:05:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42HN5N4J092541; Sun, 17 Mar 2024 23:05:23 GMT (envelope-from git) Date: Sun, 17 Mar 2024 23:05:23 GMT Message-Id: <202403172305.42HN5N4J092541@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: be487aebb944 - main - x11/xfce4-screensaver: Fix build when PAM option is off List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be487aebb9446495178c06f525a2e77987ae4352 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=be487aebb9446495178c06f525a2e77987ae4352 commit be487aebb9446495178c06f525a2e77987ae4352 Author: Guido Falsi AuthorDate: 2024-03-17 23:02:05 +0000 Commit: Guido Falsi CommitDate: 2024-03-17 23:05:18 +0000 x11/xfce4-screensaver: Fix build when PAM option is off When PAM option is off a different file is compiled, which, since version 4.18.3, tries to include crypt.h. Such file is not present in FreeBSD. The relevant definitions are in unistd.h. Fix by adding ifdef to skip such problematic include. Reported upstream: https://gitlab.xfce.org/apps/xfce4-screensaver/-/merge_requests/29 PR: 277763 --- x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c b/x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c new file mode 100644 index 000000000000..65dcf88e7068 --- /dev/null +++ b/x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c @@ -0,0 +1,19 @@ +--- src/gs-auth-pwent.c.orig 2023-03-20 15:38:27 UTC ++++ src/gs-auth-pwent.c +@@ -37,10 +37,12 @@ + # include + #endif + +-#ifdef HAVE_LIBCRYPT +-# include +-#else +-# define crypt(a, b) NULL ++#if !defined(__FreeBSD__) ++# ifdef HAVE_LIBCRYPT ++# include ++# else ++# define crypt(a, b) NULL ++# endif + #endif + + #ifdef __bsdi__