From nobody Sun Mar 17 23:48:45 2024 X-Original-To: dev-commits-ports-all@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 4TyZSZ12Xmz5F7hg; Sun, 17 Mar 2024 23:48:46 +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 4TyZSZ0W6nz4xWK; Sun, 17 Mar 2024 23:48:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710719326; 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=+VUffv8CWKR5QiF54KRfEutnmmQIw23EAyzfwjsTekU=; b=TPHPQgvA3/y66w1iIFjfudKTTK6req+bJQAMMIFLYWNFfFX1NE04cTcpjZScpN6A9hp4Pp vYySFqsbMRazuSbDgYF5szzvdFZ3Tq5Xm4LwiWPk7/zYoO72Wcgfas4mfiIdeSL7tq1f+W Qv2JG5scq4po5FUCh6HipG61593G11h62pMmvMLC4baEsMZ2ViY2S4dWt4zSv9N7vK3aQj bUnGE7n4iaHFzvJ0uiU9J2BFwubCO8FbiKwpWvVMc2cUCmJh7wTLT1JVK49CoDv0Hw6NHB be0uKWgi4sOZEXsM1QJdwO99tCRwai8LKscHyzsNyYf6KofQopebt1m65Mp3ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710719326; a=rsa-sha256; cv=none; b=t1kVJ+A+NmKS+IrIkhV/qITssnQAMUDrx1rQtzGx5kII/InY0TqS4kMLStuvtqdHziY+Er YQ/He6FdHMsCb7lXeSJAdpIGBRTIFi8ZoVYWKk06oQ+vqt2/ZPGEPAAlhoMIRzLJeBf7BS 983STGJ84iZQDslzTrUjQilhaV99YkKpEAPIyff8fPkvdp+IiGBVHC6TDkV5Ig4TYyAEz8 8JgyxyFkVTsMUzpl8ZGIN3iEdZCoGKfAMkV11IquppxLgBiW7C8EtS2JNSVGMVXJesm5xA z/MFG6rfnJiovs2BiJ0J8ILN4VI653gsIbzlBCPLBKLOclb2CxmHyIxmPngMsw== 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=1710719326; 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=+VUffv8CWKR5QiF54KRfEutnmmQIw23EAyzfwjsTekU=; b=MF+jMiSvDFv3I0+9i5RXEv7tiQDBsnpaHDU8QjtBdYzAqWJ9ac15ICSS6vNPhf44DEOAcr FbIORH9IpYIO04CZFMp9P6231dTZBMg89QiskYdhD6A/IApJNQEpG/6PR2yIXz8g0QAVx8 jWZS/+vtFra4MJBbxNuSFBd+GlUmCSTPLFWBb7bcT9fP7VHNjxjD/SnDkGMQHnlwOnU978 NswJ+unvJonvmxuYvJrz/rzBKI5J2WVbbN1gevrFrTvV3MCgzGGI1U13G2in8xm1r5xNTc jaQI4UVz+cyIo+z/DqPxxS53O4XeZCUF4wV9v7GKrrcz33jeimhBfi654WqScg== 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 4TyZSY72YDz1034; Sun, 17 Mar 2024 23:48:45 +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 42HNmjMN059669; Sun, 17 Mar 2024 23:48:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42HNmjAs059666; Sun, 17 Mar 2024 23:48:45 GMT (envelope-from git) Date: Sun, 17 Mar 2024 23:48:45 GMT Message-Id: <202403172348.42HNmjAs059666@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: fdb5363efcb5 - main - x11/xfce4-screensaver: UPdate patch to match upstreamed one List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: fdb5363efcb59716c000abd59f66692ec4244d8d Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=fdb5363efcb59716c000abd59f66692ec4244d8d commit fdb5363efcb59716c000abd59f66692ec4244d8d Author: Guido Falsi AuthorDate: 2024-03-17 23:46:34 +0000 Commit: Guido Falsi CommitDate: 2024-03-17 23:46:34 +0000 x11/xfce4-screensaver: UPdate patch to match upstreamed one PR: 277763 Obtained from: https://gitlab.xfce.org/apps/xfce4-screensaver/-/commit/cd212e0e964af794eb98c6a0c1108204cee9ef32 --- x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c b/x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c index 65dcf88e7068..59b7fd556fd1 100644 --- a/x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c +++ b/x11/xfce4-screensaver/files/patch-src_gs-auth-pwent.c @@ -1,19 +1,13 @@ --- src/gs-auth-pwent.c.orig 2023-03-20 15:38:27 UTC +++ src/gs-auth-pwent.c -@@ -37,10 +37,12 @@ - # include +@@ -38,7 +38,9 @@ #endif --#ifdef HAVE_LIBCRYPT + #ifdef HAVE_LIBCRYPT -# include --#else --# define crypt(a, b) NULL -+#if !defined(__FreeBSD__) -+# ifdef HAVE_LIBCRYPT ++# ifndef __FreeBSD__ +# include -+# else -+# define crypt(a, b) NULL +# endif + #else + # define crypt(a, b) NULL #endif - - #ifdef __bsdi__