From nobody Wed Jan 19 11:58:49 2022 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 AA64F19588FC; Wed, 19 Jan 2022 11:58:50 +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 4Jf4161VQ3z3hHS; Wed, 19 Jan 2022 11:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642593530; 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=4xnrO9o8CdEwsxezViGwUGlY2gOlrKyUUoDjYmpb2UM=; b=VXTxwaHQtrw3GRG4N87EHkVCQ55aVHlNlgOi4tuwDokTCD47S81FJbZp8/Fgy2baseNjg3 Lm+5J6C4R3Soo2tEN9eF+0hnEH2GyyGkXeVzVzZEeB8X+gItyORg33X1Mo/9hIeeCLIQew 1l0LhMgcwgS0lRJWZBCiEUJnCBxxd7OOxsZDFWAWaNjgqP0f/5qvJzHeZx8C/47Uu1gNOq yVwVW7MkX9WNbgUQIbjbSWgIVN6bSHV4pwqD4cLdCwXVVy6RKYbUH+aPlycokZl9jNCviY cmP83Htbts7N4wQg+k5LQNtvaC2Ft54g4OKuX2e5AmilddAPcLniQ76DOQ1YLw== 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 09E3E148FB; Wed, 19 Jan 2022 11:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20JBwnBd009724; Wed, 19 Jan 2022 11:58:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20JBwnka009723; Wed, 19 Jan 2022 11:58:49 GMT (envelope-from git) Date: Wed, 19 Jan 2022 11:58:49 GMT Message-Id: <202201191158.20JBwnka009723@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eric Turgeon Subject: git: 52d8ef3c4f57 - main - x11/mate-screensaver: changed helper 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: ericbsd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52d8ef3c4f5758c726f17f44b41b8948c9023e05 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642593530; 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=4xnrO9o8CdEwsxezViGwUGlY2gOlrKyUUoDjYmpb2UM=; b=IdULbME6iRHtTCN0EfGnsiM8tF6P6nTmHPYyFqOiJlRL4x62rqZFwUB0PsG3pvwnyk1Yeg bVc6Ep1ycjPQuADXjZKA4TqN6Ky8S58sylhylohTQZz2/DzywH/AZKhy5bynq0hj7CWEpY PuWyNSGiOr+ncfHud/2Z69Je85jhxqAhZo4kth9q/4cJhOJJPi00Q+kww9K3MqzZ8k3QUM sV+pO2uPkBHULbClMHcZdNSy3H2+LboV7TNfZNsMcQyJbHKsU31vrK68pcQZMRnrjzRe55 jJZzUt+jc1JKFYJnbmoWZGhWlTFhtAOPvylYEEtINCebKsvLaPtBkGtXHXKxvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642593530; a=rsa-sha256; cv=none; b=RuOBVP1IBT5WIDKkPWVJAHqAc66l8sxuI/sX9ObbmrnRD9etyRsiVtNErROCQgvNnWakOz UP5HomEiKuKL+8tSa28H+FdYq06RnYI6Ql1+Y5mWIIFsnDGGNlcDWLMSNw+5ec69lA4AE6 Fx+Qte6pEC4DIgYGQilQxOuRcbPNdjI4diQP5KPjy5zDmIJyYi2t5I/7JcpggsCxMrJnrS SE4n91owSMNN8VaJHM6FJBvNg01VUplWHfkxN/IJo2kp5UMZml3f+Ow1BzDcURxFIT5PMO ZKVNjnrsaol3NZEGrghMdRmuLyoKXw7mfo8bVHKt1IDPR8KmOjPgPK7T/v0VaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ericbsd: URL: https://cgit.FreeBSD.org/ports/commit/?id=52d8ef3c4f5758c726f17f44b41b8948c9023e05 commit 52d8ef3c4f5758c726f17f44b41b8948c9023e05 Author: Eric Turgeon AuthorDate: 2022-01-19 11:56:09 +0000 Commit: Eric Turgeon CommitDate: 2022-01-19 11:58:48 +0000 x11/mate-screensaver: changed helper I replaced the pam_helper with the mate-pam-helper. --- x11/mate-screensaver/Makefile | 6 +- x11/mate-screensaver/files/patch-src_Makefile.am | 11 ++ .../files/patch-src_gs-auth-helper.c | 211 --------------------- 3 files changed, 14 insertions(+), 214 deletions(-) diff --git a/x11/mate-screensaver/Makefile b/x11/mate-screensaver/Makefile index 3ca02330cdfd..5c490d3752a8 100644 --- a/x11/mate-screensaver/Makefile +++ b/x11/mate-screensaver/Makefile @@ -2,7 +2,7 @@ PORTNAME= mate-screensaver PORTVERSION= 1.26.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 mate MASTER_SITES= MATE DIST_SUBDIR= mate @@ -42,9 +42,9 @@ OPTIONS_DEFINE= PAM OPTIONS_DEFAULT=PAM OPTIONS_SUB= yes -PAM_RUN_DEPENDS= pam_helper:security/pam_helper +PAM_RUN_DEPENDS= mate_pam_helper:security/mate-pam-helper PAM_CONFIGURE_ON= --enable-authentication-scheme=helper \ - --with-passwd-helper=${LOCALBASE}/bin/pam_helper + --with-passwd-helper=${LOCALBASE}/bin/mate_pam_helper PAM_CONFIGURE_OFF= --disable-pam .include diff --git a/x11/mate-screensaver/files/patch-src_Makefile.am b/x11/mate-screensaver/files/patch-src_Makefile.am new file mode 100644 index 000000000000..a282de71c749 --- /dev/null +++ b/x11/mate-screensaver/files/patch-src_Makefile.am @@ -0,0 +1,11 @@ +--- src/Makefile.am.orig 2022-01-18 23:58:33 UTC ++++ src/Makefile.am +@@ -172,7 +172,7 @@ if HAVE_PASSWD_HELPER + mate_screensaver_dialog_LDADD += \ + ../helper/libhelper-proto.a + ../helper/libhelper-proto.a: +- $(MAKE) -C ../helper ++ $(MAKE) -C ../helper libhelper-proto.a + endif + + BUILT_SOURCES = \ diff --git a/x11/mate-screensaver/files/patch-src_gs-auth-helper.c b/x11/mate-screensaver/files/patch-src_gs-auth-helper.c deleted file mode 100644 index df40c211e3aa..000000000000 --- a/x11/mate-screensaver/files/patch-src_gs-auth-helper.c +++ /dev/null @@ -1,211 +0,0 @@ ---- src/gs-auth-helper.c.orig 2021-12-31 23:57:08 UTC -+++ src/gs-auth-helper.c -@@ -51,9 +51,6 @@ - #include "gs-auth.h" - #include "subprocs.h" - --#include "../helper/helper_proto.h" --#define MAXLEN 1024 -- - static gboolean verbose_enabled = FALSE; - - GQuark -@@ -82,105 +79,85 @@ gs_auth_get_verbose (void) - - static gboolean - ext_run (const char *user, -- GSAuthMessageFunc func, -- gpointer data) -+ const char *typed_passwd, -+ gboolean verbose) - { -- int pfd[2], r_pfd[2], status; -- pid_t pid; -- gboolean verbose = gs_auth_get_verbose (); -+ int pfd[2], status; -+ pid_t pid; - -- if (pipe (pfd) < 0 || pipe (r_pfd) < 0) -- { -- return FALSE; -- } -+ if (pipe (pfd) < 0) -+ { -+ return 0; -+ } - -- if (verbose) -- { -- g_message ("ext_run (%s, %s)", -- PASSWD_HELPER_PROGRAM, user); -- } -+ if (verbose) -+ { -+ g_message ("ext_run (%s, %s)", -+ PASSWD_HELPER_PROGRAM, user); -+ } - -- block_sigchld (); -+ block_sigchld (); - -- if ((pid = fork ()) < 0) -- { -- close (pfd [0]); -- close (pfd [1]); -- close (r_pfd [0]); -- close (r_pfd [1]); -- return FALSE; -- } -+ if ((pid = fork ()) < 0) -+ { -+ close (pfd [0]); -+ close (pfd [1]); -+ return FALSE; -+ } - -- if (pid == 0) -- { -- close (pfd [1]); -- close (r_pfd [0]); -- if (pfd [0] != 0) -- { -- dup2 (pfd [0], 0); -- } -- if (r_pfd [1] != 1) -- { -- dup2 (r_pfd [1], 1); -- } -+ if (pid == 0) -+ { -+ close (pfd [1]); -+ if (pfd [0] != 0) -+ { -+ dup2 (pfd [0], 0); -+ } - -- /* Helper is invoked as helper service-name [user] */ -- execlp (PASSWD_HELPER_PROGRAM, PASSWD_HELPER_PROGRAM, "mate-screensaver", user, NULL); -- if (verbose) -- { -- g_message ("%s: %s", PASSWD_HELPER_PROGRAM, g_strerror (errno)); -- } -+ /* Helper is invoked as helper service-name [user] */ -+ execlp (PASSWD_HELPER_PROGRAM, PASSWD_HELPER_PROGRAM, "mate-screensaver", user, NULL); -+ if (verbose) -+ { -+ g_message ("%s: %s", PASSWD_HELPER_PROGRAM, g_strerror (errno)); -+ } - -- exit (1); -- } -+ exit (1); -+ } - -- close (pfd [0]); -- close (r_pfd [1]); -+ close (pfd [0]); - -- gboolean ret = FALSE; -- while (waitpid (pid, &status, WNOHANG) == 0) -- { -- int msg_type; -- char buf[MAXLEN]; -- size_t msg_len = MAXLEN; -+ /* Write out password to helper process */ -+ if (!typed_passwd) -+ { -+ typed_passwd = ""; -+ } -+ write (pfd [1], typed_passwd, strlen (typed_passwd)); -+ close (pfd [1]); - -- msg_type = read_prompt (r_pfd [0], buf, &msg_len); -- if (0 == msg_type) continue; -- if (msg_type < 0) -- { -- g_message ("Error reading prompt (%d)", msg_type); -- ret = FALSE; -- goto exit; -- } -+ while (waitpid (pid, &status, 0) < 0) -+ { -+ if (errno == EINTR) -+ { -+ continue; -+ } - -- char *input = NULL; -- func (msg_type, buf, &input, data); -+ if (verbose) -+ { -+ g_message ("ext_run: waitpid failed: %s\n", -+ g_strerror (errno)); -+ } - -- unsigned int input_len = input ? strlen (input) : 0; -- ssize_t wt; -+ unblock_sigchld (); -+ return FALSE; -+ } - -- wt = write_msg (pfd [1], input, input_len); -- if (wt < 0) -- { -- g_message ("Error writing prompt reply (%li)", wt); -- ret = FALSE; -- goto exit; -- } -- } -+ unblock_sigchld (); - -- close (pfd [1]); -- close (r_pfd [0]); -- unblock_sigchld (); -+ if (! WIFEXITED (status) || WEXITSTATUS (status) != 0) -+ { -+ return FALSE; -+ } - -- if (! WIFEXITED (status) || WEXITSTATUS (status) != 0) -- { -- ret = FALSE; -- } -- else -- ret = TRUE; -- -- exit: -- return ret; -+ return TRUE; - } - - gboolean -@@ -190,7 +167,28 @@ gs_auth_verify_user (const char *username, - gpointer data, - GError **error) - { -- return ext_run (username, func, data); -+ gboolean res = FALSE; -+ char *password; -+ -+ password = NULL; -+ -+ /* ask for the password for user */ -+ if (func != NULL) -+ { -+ func (GS_AUTH_MESSAGE_PROMPT_ECHO_OFF, -+ "Password: ", -+ &password, -+ data); -+ } -+ -+ if (password == NULL) -+ { -+ return FALSE; -+ } -+ -+ res = ext_run (username, password, gs_auth_get_verbose ()); -+ -+ return res; - } - - gboolean