From nobody Fri Dec 31 04:27:34 2021 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 52700192003E for ; Fri, 31 Dec 2021 04:27:47 +0000 (UTC) (envelope-from ericturgeon.bsd@gmail.com) Received: from mail-ua1-x92f.google.com (mail-ua1-x92f.google.com [IPv6:2607:f8b0:4864:20::92f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JQBvQ2hyzz3rX4; Fri, 31 Dec 2021 04:27:46 +0000 (UTC) (envelope-from ericturgeon.bsd@gmail.com) Received: by mail-ua1-x92f.google.com with SMTP id c36so20099240uae.13; Thu, 30 Dec 2021 20:27:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=LJ/8k4z6tnz4x/EBd+jFk7RJvfjO8EN/xi6irsmTwF8=; b=OD8FCSAarhFtwKWPyxyvU/XRt21274G1rrYjZWk5y11CagMacdN1811zHUknvpqKBY UQlXEPymums/C4Ky/+XNnMWniEiIkjl1zxWeW25nowq78NS842zBylRv0fNb7dQe0onv fHiEhn/JyEzEbVXOTp3Q+soU5Vg+68WVpz0wJia8o1bV6kX3QYI5Clr91RGzEaCEFqYl 2AzSaxOCmK1tavPeMbLsti8Bhnvqhc1Xxv00RimQvqSpoWaR7+GK0sDkP0FkAARPzLib nR96pSr3cmTUFFyv1uGse+FseeCUCnssxkBku9TRI4sVU0MQXSAPkzuixS9RvHEkWst0 e49A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=LJ/8k4z6tnz4x/EBd+jFk7RJvfjO8EN/xi6irsmTwF8=; b=gP9y2I/EgCq+uabUIFaL73Iwse/32XXmR/rbCMBEvqJSDIGHbZM8ld+8v/8rzL4qjX Juni0vvUS0HQZXNDGyk1q8A7Rwqzeu3Q2v0pYhecrFIOAVDfwhWyo6bgeCuT6/Menl2F gKR5MRtj22CP+E7x1wRmhaJazMVQpsItkLcUc692v2Bc3KrkW530YupYIZ5ByAQweDvu zJgJtQ5BF0zBYlqPgX+isAk41eZptTfth6FDcwnbKFTjaHnixh0pH3wyUxNyr69Q8LHU 5b4Ijg+v/phwgF17SQ1oTcwydyysqsGRPilLrLLw6yngeU3B0vAzeAdcs99BoHmeHgrv 2Mjg== X-Gm-Message-State: AOAM530x58WrCJwpUaWM4fjZ2ck1sTJCBul/hp0WpwhAVh2HoeSWSfWV hMHvnDGdTlh/DWsYAOSs2wd7jxTMZNxYoUdiTW6/zI8GVao= X-Google-Smtp-Source: ABdhPJwnNm5Bw6hnpByoyrBNMTuIbZfIkb3w38tJoOOlwfbT5m4uwHneGsUk9EPnj7JO71X/YXNogfAcycJG8cOjx4I= X-Received: by 2002:ab0:a8d:: with SMTP id d13mr195427uak.24.1640924865772; Thu, 30 Dec 2021 20:27:45 -0800 (PST) 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 References: <20211230110857.1c0ac0e19e8206cb64a040d7@dec.sakura.ne.jp> <202112300342.1BU3gPt9003879@slippy.cwsent.com> <202112301701.1BUH1dji009235@slippy.cwsent.com> <202112310402.1BV42p3C036429@slippy.cwsent.com> In-Reply-To: <202112310402.1BV42p3C036429@slippy.cwsent.com> From: Eric Turgeon Date: Fri, 31 Dec 2021 00:27:34 -0400 Message-ID: Subject: Re: git: f3caf742108b - main - x11/mate-screensaver: Fix PAM build To: Cy Schubert Cc: Tomoaki AOKI , dev-commits-ports-main@freebsd.org, Cy Schubert Content-Type: multipart/alternative; boundary="000000000000ba3e2005d46997a0" X-Rspamd-Queue-Id: 4JQBvQ2hyzz3rX4 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=OD8FCSAa; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of ericturgeonbsd@gmail.com designates 2607:f8b0:4864:20::92f as permitted sender) smtp.mailfrom=ericturgeonbsd@gmail.com X-Spamd-Result: default: False [-4.00 / 15.00]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; NEURAL_HAM_LONG(-1.00)[-1.000]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::92f:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; TAGGED_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Spam: Yes X-ThisMailContainsUnwantedMimeParts: N --000000000000ba3e2005d46997a0 Content-Type: text/plain; charset="UTF-8" It is most likely this commit https://github.com/mate-desktop/mate-screensaver/commit/ed6e6065bf0e85b64317b5a34b9f7a36a0c839a6 . *Eric Turgeon* On Fri, Dec 31, 2021 at 12:02 AM Cy Schubert wrote: > I can confirm PAM authentication is broken by this new release. Like > layers > of an onion, this problem will need to be investigated further. I doubt > simply adding additional macros would resolve the problem. The reason I > believe this is that the macros are likely a small part of something > larger. > > Having said that, ports/security/pecl-pam includes a copy of the file with > a reference to the URL from whence it came (suggesting a GPL violation in > the ports tree). > > I think the path forward is to engage our upstream. Then look at a number > of short-term or longer-term options to get us over this hump. > > If upstream is open to fixing the problem temporarily marking the PAM > option broken or temporarily rolling back the upgrade may suffice. > > Alternatively, if upstream isn't open to remediation we may want to > consider importing Linux-pam on github as a port. Be aware that multiple > PAM stacks can coexist however similar problems we have with three KRB5s > will require getting linking just right. This option does have the > advantage of supporting other software written for Linux-PAM (instead of > OpenPAM or Solaris PAM -- FreeBSD PAM is based on OpenPAM). > > Another alternative is dump mate-screensaver for xscreensaver. IIRC > xscreensaver was the original screen saver for Gnome back in the day. (IMO > xscreensaver is superior to the Gnome and mate screensavers, though this > is > just a personal preference. I've also used it to replace the CDE > screensaver on a per-user basis.) Anyhow, just a thought for anyone. > > Until we look at the code we won't have a good idea of what kind of work > is > involved. > > Strategically a Linux-PAM port might be something we might want to think > about long term. Tactically, any of the other options could work. > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > The need of the many outweighs the greed of the few. > > > In message <202112301701.1BUH1dji009235@slippy.cwsent.com>, Cy Schubert > writes: > > No. It's a bunch of inline macros that perform memory and other > functions. > > All could have been made to be actual functions. On my Fedora VM at $JOB > > they're part of the pam-devel.rpm. > > > > > > -- > > Cheers, > > Cy Schubert > > FreeBSD UNIX: Web: https://FreeBSD.org > > NTP: Web: https://nwtime.org > > > > The need of the many outweighs the greed of the few. > > > > > > In message > > om> > > , Eric Turgeon writes: > > > --00000000000063b43405d45dfc6d > > > Content-Type: text/plain; charset="UTF-8" > > > > > > Do we have an equivalent of security/_pam_macros.h? > > > > > > *Eric Turgeon* > > > > > > > > > On Wed, Dec 29, 2021 at 11:42 PM Cy Schubert < > Cy.Schubert@cschubert.com> > > > wrote: > > > > > > > This commit only fixed a compile time error, include file > > > > security/_pam_macros.h not found (discovered by my poudriere build). > > > > security/_pam_macros is an include file found only on some distros of > > > > Linux, a Linuxism. Try it without PAM enabled; the file not found > error > > > > may > > > > just be the beginning of a multitude of PAM issues. > > > > > > > > I'll try to look at it over the next couple days. > > > > > > > > > > > > -- > > > > Cheers, > > > > Cy Schubert > > > > FreeBSD UNIX: Web: https://FreeBSD.org > > > > NTP: Web: https://nwtime.org > > > > > > > > The need of the many outweighs the greed of the few. > > > > > > > > > > > > In message <20211230110857.1c0ac0e19e8206cb64a040d7@dec.sakura.ne.jp > >, > > > > Tomoaki > > > > AOKI writes: > > > > > Hi. > > > > > Wondered whih commit to comment but decided to latest. > > > > > mate-screensaver no longer opens login panel after upgrading from > > > > > 1.26.0 to 1.26.1. > > > > > > > > > > Created Bug 260811 [1]. > > > > > > > > > > [1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=260811 > > > > > > > > > > > > > > > > The branch main has been updated by cy: > > > > > > > > > > > > URL: > > > > > > > > > > https://cgit.FreeBSD.org/ports/commit/?id=f3caf742108bb552724d4c4dae74b28 > > ea > > > 26 > > > > > 6a6a3 > > > > > > > > > > > > commit f3caf742108bb552724d4c4dae74b28ea266a6a3 > > > > > > Author: Cy Schubert > > > > > > AuthorDate: 2021-12-29 03:12:39 +0000 > > > > > > Commit: Cy Schubert > > > > > > CommitDate: 2021-12-29 03:12:39 +0000 > > > > > > > > > > > > x11/mate-screensaver: Fix PAM build > > > > > > > > > > > > Fix build when PAM enabled; is a > Linuxis > > m. > > > > > > --- > > > > > > x11/mate-screensaver/files/patch-helper_pam-helper.c | 10 > ++++++++++ > > > > > > 1 file changed, 10 insertions(+) > > > > > > > > > > > > diff --git a/x11/mate-screensaver/files/patch-helper_pam-helper.c > > > > > b/x11/mate-screensaver/files/patch-helper_pam-helper.c > > > > > > new file mode 100644 > > > > > > index 000000000000..605141fb0e54 > > > > > > --- /dev/null > > > > > > +++ b/x11/mate-screensaver/files/patch-helper_pam-helper.c > > > > > > _at__at_ -0,0 +1,10 _at__at_ > > > > > > +--- helper/pam-helper.c.orig 2021-11-15 > 14:28:47.000000000 -08 > > 00 > > > > > > ++++ helper/pam-helper.c 2021-12-28 19:09:39.501645000 -0800 > > > > > > +_at__at_ -33,7 +33,6 _at__at_ > > > > > > + */ > > > > > > + > > > > > > + #include > > > > > > +-#include > > > > > > + > > > > > > + #include > > > > > > + #include > > > > > > > > > > -- > > > > > Tomoaki AOKI > > > > > > > > > > > > > > > > > > --00000000000063b43405d45dfc6d > > > Content-Type: text/html; charset="UTF-8" > > > Content-Transfer-Encoding: quoted-printable > > > > > >
Do we have an equivalent of > security/_pam_macros.h? > = > > > div>

class=3D"gmail_signature" dat > > = > > > a-smartmail=3D"gmail_signature">
dir=3D"ltr">
> = > > > >
color= > > > =3D"#888888">Eric > Turgeon > = > > > > >
> = > > > >


class= > > > =3D"gmail_quote">
On Wed, Dec 29, > 2021 > > = > > > at 11:42 PM Cy Schubert < Cy.Schubert@cschubert.com">C > > = > > > y.Schubert@cschubert.com> wrote:
class=3D"gmail > > = > > > _quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid > rgb(204,204 > > = > > > ,204);padding-left:1ex">This commit only fixed a compile time error, > includ > > = > > > e file
> > > security/_pam_macros.h not found (discovered by my poudriere build). >
> > > security/_pam_macros is an include file found only on some distros of >
> > > Linux, a Linuxism. Try it without PAM enabled; the file not found > error may > > = > > >
> > > just be the beginning of a multitude of PAM issues.
> > >
> > > I'll try to look at it over the next couple days.
> > >
> > >
> > > --
> > > Cheers,
> > > Cy Schubert < target=3D"_bla > > = > > > nk">Cy.Schubert@cschubert.com>
> > > FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 href= > > > =3D"https://FreeBSD.org" rel=3D"noreferrer" target=3D"_blank"> > https://FreeB > > = > > > SD.org
> > > NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0< cy@nwtim > > = > > > e.org" target=3D"_blank">cy@nwtime.org>=C2=A0 =C2=A0 > Web:=C2=A0 > = > > > ref=3D"https://nwtime.org" rel=3D"noreferrer" target=3D"_blank"> > https://nwt > > = > > > ime.org
> > >
> > > =C2=A0 =C2=A0 =C2=A0 =C2=A0 The need of the many outweighs the greed > of the > > = > > > few.
> > >
> > >
> > > In message < 20211230110857.1c0ac0e19e8206cb64a040d7@de > > = > > > c.sakura.ne.jp" > target=3D"_blank">20211230110857.1c0ac0e19e8206cb64a040d7@d > > = > > > ec.sakura.ne.jp>,
> > > Tomoaki
> > > AOKI writes:
> > > > Hi.
> > > > Wondered whih commit to comment but decided to latest.
> > > > mate-screensaver no longer opens login panel after upgrading > from
> > > > 1.26.0 to 1.26.1.
> > > >
> > > > Created Bug 260811 [1].
> > > >
> > > > [1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D260 > > = > > > 811" rel=3D"noreferrer" target=3D"_blank"> > https://bugs.freebsd.org/bugzilla > > = > > > /show_bug.cgi?id=3D260811
> > > >
> > > >
> > > > > The branch main has been updated by cy:
> > > > >
> > > > > URL:
> > > > https://cgit.FreeBSD.org/ports/commit/?id=3Df3caf742108bb55 > > = > > > 2724d4c4dae74b28ea26" rel=3D"noreferrer" target=3D"_blank"> > https://cgit.Fre > > = > > > eBSD.org/ports/commit/?id=3Df3caf742108bb552724d4c4dae74b28ea26
> > > > 6a6a3
> > > > >
> > > > > commit f3caf742108bb552724d4c4dae74b28ea266a6a3
> > > > > Author:=C2=A0 =C2=A0 =C2=A0Cy Schubert > <cy_at_FreeBSD.org>< > > = > > > br> > > > > > AuthorDate: 2021-12-29 03:12:39 +0000
> > > > > Commit:=C2=A0 =C2=A0 =C2=A0Cy Schubert > <cy_at_FreeBSD.org>< > > = > > > br> > > > > > CommitDate: 2021-12-29 03:12:39 +0000
> > > > >
> > > > >=C2=A0 =C2=A0 =C2=A0x11/mate-screensaver: Fix PAM build
> > > > >=C2=A0 =C2=A0 =C2=A0
> > > > >=C2=A0 =C2=A0 =C2=A0Fix build when PAM enabled; > <security/_pam_ > > = > > > macros.h> is a Linuxism.
> > > > > ---
> > > > >=C2=A0 x11/mate-screensaver/files/patch-helper_pam-helper.c | > 10 + > > = > > > +++++++++
> > > > >=C2=A0 1 file changed, 10 insertions(+)
> > > > >
> > > > > diff --git > a/x11/mate-screensaver/files/patch-helper_pam-helper.c > > = > > >
> > > > b/x11/mate-screensaver/files/patch-helper_pam-helper.c
> > > > > new file mode 100644
> > > > > index 000000000000..605141fb0e54
> > > > > --- /dev/null
> > > > > +++ > b/x11/mate-screensaver/files/patch-helper_pam-helper.c
> > > > > _at__at_ -0,0 +1,10 _at__at_
> > > > > +--- helper/pam-helper.c.orig=C2=A0 =C2=A0 =C2=A0 > =C2=A02021-11-1 > > = > > > 5 14:28:47.000000000 -0800
> > > > > ++++ helper/pam-helper.c=C2=A0 =C2=A0 2021-12-28 > 19:09:39.5016450 > > = > > > 00 -0800
> > > > > +_at__at_ -33,7 +33,6 _at__at_
> > > > > +=C2=A0 */
> > > > > +
> > > > > + #include <security/pam_appl.h>
> > > > > +-#include <security/_pam_macros.h>
> > > > > +
> > > > > + #include <sys/types.h>
> > > > > + #include <stdarg.h>
> > > >
> > > > --
> > > > Tomoaki AOKI=C2=A0 =C2=A0 < junchoon@dec.sakura.ne > > = > > > .jp" target=3D"_blank">junchoon@dec.sakura.ne.jp>
> > >
> > >
> > >
> > > > > > --00000000000063b43405d45dfc6d-- > > > > > --000000000000ba3e2005d46997a0 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

On Fri, Dec 31, 2021 at 12:02 AM Cy Schubert <Cy.Schubert@cschubert.com> wrote:=
I can confirm P= AM authentication is broken by this new release. Like layers
of an onion, this problem will need to be investigated further. I doubt simply adding additional macros would resolve the problem. The reason I believe this is that the macros are likely a small part of something larger= .

Having said that, ports/security/pecl-pam includes a copy of the file with =
a reference to the URL from whence it came (suggesting a GPL violation in <= br> the ports tree).

I think the path forward is to engage our upstream. Then look at a number <= br> of short-term or longer-term options to get us over this hump.

If upstream is open to fixing the problem temporarily marking the PAM
option broken or temporarily rolling back the upgrade may suffice.

Alternatively, if upstream isn't open to remediation we may want to consider importing Linux-pam on github as a port. Be aware that multiple PAM stacks can coexist however similar problems we have with three KRB5s will require getting linking just right. This option does have the
advantage of supporting other software written for Linux-PAM (instead of OpenPAM or Solaris PAM -- FreeBSD PAM is based on OpenPAM).

Another alternative is dump mate-screensaver for xscreensaver. IIRC
xscreensaver was the original screen saver for Gnome back in the day. (IMO =
xscreensaver is superior to the Gnome and mate screensavers, though this is=
just a personal preference. I've also used it to replace the CDE
screensaver on a per-user basis.) Anyhow, just a thought for anyone.

Until we look at the code we won't have a good idea of what kind of wor= k is
involved.

Strategically a Linux-PAM port might be something we might want to think about long term. Tactically, any of the other options could work.


--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://FreeB= SD.org
NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<cy@nwtime.org>=C2=A0 =C2=A0 Web:=C2=A0 https://nwt= ime.org

=C2=A0 =C2=A0 =C2=A0 =C2=A0 The need of the many outweighs the greed of the= few.


In message <202112301701.1BUH1dji009235@slippy.cwsent.com>= ;, Cy Schubert
writes:
> No. It's a bunch of inline macros that perform memory and other fu= nctions.
> All could have been made to be actual functions. On my Fedora VM at $J= OB
> they're part of the pam-devel.rpm.
>
>
> --
> Cheers,
> Cy Schubert <Cy.Schubert@cschubert.com>
> FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
> NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<cy@nwtime.org>=C2=A0 =C2=A0 Web:=C2=A0= https:= //nwtime.org
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0The need of the many outweighs the greed of = the few.
>
>
> In message <CADRZFmrE8avprf7NZPcU+tbsgVBzk9=3Dqp4zHKgxLXSOK60QQQw@m= ail.gmail.c
> om>
> , Eric Turgeon writes:
> > --00000000000063b43405d45dfc6d
> > Content-Type: text/plain; charset=3D"UTF-8"
> >
> > Do we have an equivalent of security/_pam_macros.h?
> >
> > *Eric Turgeon*
> >
> >
> > On Wed, Dec 29, 2021 at 11:42 PM Cy Schubert <Cy.Schubert@cschubert.com>
> > wrote:
> >
> > > This commit only fixed a compile time error, include file > > > security/_pam_macros.h not found (discovered by my poudriere= build).
> > > security/_pam_macros is an include file found only on some d= istros of
> > > Linux, a Linuxism. Try it without PAM enabled; the file not = found error
> > > may
> > > just be the beginning of a multitude of PAM issues.
> > >
> > > I'll try to look at it over the next couple days.
> > >
> > >
> > > --
> > > Cheers,
> > > Cy Schubert <Cy.Schubert@cschubert.com>
> > > FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:= =C2=A0 https://FreeBSD.org
> > > NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<cy@nwtime.org>=C2=A0 =C2=A0 = Web:=C2=A0 https://nwtime.org
> > >
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0The need of the many outwei= ghs the greed of the few.
> > >
> > >
> > > In message <20211230110857.1c0ac0e19e8= 206cb64a040d7@dec.sakura.ne.jp>,
> > > Tomoaki
> > > AOKI writes:
> > > > Hi.
> > > > Wondered whih commit to comment but decided to latest.<= br> > > > > mate-screensaver no longer opens login panel after upgr= ading from
> > > > 1.26.0 to 1.26.1.
> > > >
> > > > Created Bug 260811 [1].
> > > >
> > > > [1] https://bugs.freeb= sd.org/bugzilla/show_bug.cgi?id=3D260811
> > > >
> > > >
> > > > > The branch main has been updated by cy:
> > > > >
> > > > > URL:
> > > >
> > > https://cg= it.FreeBSD.org/ports/commit/?id=3Df3caf742108bb552724d4c4dae74b28
> ea
> > 26
> > > > 6a6a3
> > > > >
> > > > > commit f3caf742108bb552724d4c4dae74b28ea266a6a3 > > > > > Author:=C2=A0 =C2=A0 =C2=A0Cy Schubert <cy_at_F= reeBSD.org>
> > > > > AuthorDate: 2021-12-29 03:12:39 +0000
> > > > > Commit:=C2=A0 =C2=A0 =C2=A0Cy Schubert <cy_at_F= reeBSD.org>
> > > > > CommitDate: 2021-12-29 03:12:39 +0000
> > > > >
> > > > >=C2=A0 =C2=A0 =C2=A0x11/mate-screensaver: Fix PAM b= uild
> > > > >
> > > > >=C2=A0 =C2=A0 =C2=A0Fix build when PAM enabled; <= ;security/_pam_macros.h> is a Linuxis
> m.
> > > > > ---
> > > > >=C2=A0 x11/mate-screensaver/files/patch-helper_pam-= helper.c | 10 ++++++++++
> > > > >=C2=A0 1 file changed, 10 insertions(+)
> > > > >
> > > > > diff --git a/x11/mate-screensaver/files/patch-help= er_pam-helper.c
> > > > b/x11/mate-screensaver/files/patch-helper_pam-helper.c<= br> > > > > > new file mode 100644
> > > > > index 000000000000..605141fb0e54
> > > > > --- /dev/null
> > > > > +++ b/x11/mate-screensaver/files/patch-helper_pam-= helper.c
> > > > > _at__at_ -0,0 +1,10 _at__at_
> > > > > +--- helper/pam-helper.c.orig=C2=A0 =C2=A0 =C2=A0 = =C2=A02021-11-15 14:28:47.000000000 -08
> 00
> > > > > ++++ helper/pam-helper.c=C2=A0 =C2=A0 2021-12-28 1= 9:09:39.501645000 -0800
> > > > > +_at__at_ -33,7 +33,6 _at__at_
> > > > > +=C2=A0 */
> > > > > +
> > > > > + #include <security/pam_appl.h>
> > > > > +-#include <security/_pam_macros.h>
> > > > > +
> > > > > + #include <sys/types.h>
> > > > > + #include <stdarg.h>
> > > >
> > > > --
> > > > Tomoaki AOKI=C2=A0 =C2=A0 <junchoon@dec.sakura.ne.jp>
> > >
> > >
> > >
> >
> > --00000000000063b43405d45dfc6d
> > Content-Type: text/html; charset=3D"UTF-8"
> > Content-Transfer-Encoding: quoted-printable
> >
> > <div dir=3D3D"ltr"><div>Do we have an equiv= alent of security/_pam_macros.h?</
> =3D
> > div><div><br></div><div><div><= ;div dir=3D3D"ltr" class=3D3D"gmail_signature" dat
> =3D
> > a-smartmail=3D3D"gmail_signature"><div dir=3D3D&q= uot;ltr"><div><div dir=3D3D"ltr"><div
> =3D
> > ><div dir=3D3D"ltr"><div><div dir=3D3= D"ltr"><div dir=3D3D"ltr"><span><font= color=3D
> > =3D3D"#888888"><font><font color=3D3D"= #000000"><b>Eric Turgeon</b></font></font
> =3D
> > ></font></span><span></span><cite&g= t;</cite><br></div><span></span></div>&= lt;/div
> =3D
> > ></div></div></div></div></div>&= lt;/div></div><br></div></div><br><div = class=3D
> > =3D3D"gmail_quote"><div dir=3D3D"ltr" c= lass=3D3D"gmail_attr">On Wed, Dec 29, 2021
> =3D
> >=C2=A0 at 11:42 PM Cy Schubert &lt;<a href=3D3D"mailto= :Cy.Schubert= @cschubert.com">C
> =3D
> > y.S= chubert@cschubert.com</a>&gt; wrote:<br></div><= ;blockquote class=3D3D"gmail
> =3D
> > _quote" style=3D3D"margin:0px 0px 0px 0.8ex;border-left= :1px solid rgb(204,204
> =3D
> > ,204);padding-left:1ex">This commit only fixed a compile = time error, includ
> =3D
> > e file <br>
> > security/_pam_macros.h not found (discovered by my poudriere buil= d). <br>
> > security/_pam_macros is an include file found only on some distro= s of <br>
> > Linux, a Linuxism. Try it without PAM enabled; the file not found= error may
> =3D
> >=C2=A0 <br>
> > just be the beginning of a multitude of PAM issues.<br>
> > <br>
> > I&#39;ll try to look at it over the next couple days.<br&g= t;
> > <br>
> > <br>
> > -- <br>
> > Cheers,<br>
> > Cy Schubert &lt;<a href=3D3D"mailto:Cy.Schubert@cschubert.com= " target=3D3D"_bla
> =3D
> > nk">Cy.Schubert@cschubert.com</a>&gt;<br>
> > FreeBSD UNIX:=3DC2=3DA0 &lt;cy@FreeBSD.org&gt;=3DC2=3DA0 = =3DC2=3DA0Web:=3DC2=3DA0 <a href=3D
> > =3D3D"https://FreeBSD.org" rel=3D3D"noreferrer"= target=3D3D"_blank">https://FreeB
> =3D
> > SD.org</a><br>
> > NTP:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= =3DA0&lt;<a href=3D3D"mailto:cy@nwtim
> =3D
> > e.o= rg" target=3D3D"_blank">cy@nwtime.org</a>&gt;=3DC2=3DA0 =3DC2= =3DA0 Web:=3DC2=3DA0 <a h
> =3D
> > ref=3D3D"https://nwtime.org" rel=3D3D"noreferrer"= ; target=3D3D"_blank">https://nwt
> =3D
> > i= me.org</a><br>
> > <br>
> > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 The need of the many = outweighs the greed of the
> =3D
> >=C2=A0 few.<br>
> > <br>
> > <br>
> > In message &lt;<a href=3D3D"mailto:2021123011085= 7.1c0ac0e19e8206cb64a040d7@de
> =3D
> > c.sakura.ne.jp" target=3D3D"_blank">20211230110= 857.1c0ac0e19e8206cb64a040d7@d
> =3D
> > ec.sakura.ne.jp</a>&gt;, <br>
> > Tomoaki<br>
> > AOKI writes:<br>
> > &gt; Hi.<br>
> > &gt; Wondered whih commit to comment but decided to latest.&l= t;br>
> > &gt; mate-screensaver no longer opens login panel after upgra= ding from<br>
> > &gt; 1.26.0 to 1.26.1.<br>
> > &gt;<br>
> > &gt; Created Bug 260811 [1].<br>
> > &gt;<br>
> > &gt; [1] <a href=3D3D"https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D3D260
> =3D
> > 811" rel=3D3D"noreferrer" target=3D3D"_blank&= quot;>https://bugs.freebsd.org/bugzilla
> =3D
> > /show_bug.cgi?id=3D3D260811</a><br>
> > &gt;<br>
> > &gt;<br>
> > &gt; &gt; The branch main has been updated by cy:<br&g= t;
> > &gt; &gt; <br>
> > &gt; &gt; URL:<br>
> > &gt; <a href=3D3D"https://cgit.FreeBSD.org/ports/commit/?id=3D3Df3caf742108bb55
> =3D
> > 2724d4c4dae74b28ea26" rel=3D3D"noreferrer" target= =3D3D"_blank">https://cgit.Fre
> =3D
> > eBSD.org/ports/commit/?id=3D3Df3caf742108bb552724d4c4dae74b28ea26= </a><br>
> > &gt; 6a6a3<br>
> > &gt; &gt; <br>
> > &gt; &gt; commit f3caf742108bb552724d4c4dae74b28ea266a6a3= <br>
> > &gt; &gt; Author:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0Cy Schub= ert &lt;cy_at_FreeBSD.org&gt;<
> =3D
> > br>
> > &gt; &gt; AuthorDate: 2021-12-29 03:12:39 +0000<br>=
> > &gt; &gt; Commit:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0Cy Schub= ert &lt;cy_at_FreeBSD.org&gt;<
> =3D
> > br>
> > &gt; &gt; CommitDate: 2021-12-29 03:12:39 +0000<br>=
> > &gt; &gt; <br>
> > &gt; &gt;=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0x11/mate-screens= aver: Fix PAM build<br>
> > &gt; &gt;=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0<br>
> > &gt; &gt;=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0Fix build when P= AM enabled; &lt;security/_pam_
> =3D
> > macros.h&gt; is a Linuxism.<br>
> > &gt; &gt; ---<br>
> > &gt; &gt;=3DC2=3DA0 x11/mate-screensaver/files/patch-help= er_pam-helper.c | 10 +
> =3D
> > +++++++++<br>
> > &gt; &gt;=3DC2=3DA0 1 file changed, 10 insertions(+)<b= r>
> > &gt; &gt; <br>
> > &gt; &gt; diff --git a/x11/mate-screensaver/files/patch-h= elper_pam-helper.c
> =3D
> > <br>
> > &gt; b/x11/mate-screensaver/files/patch-helper_pam-helper.c&l= t;br>
> > &gt; &gt; new file mode 100644<br>
> > &gt; &gt; index 000000000000..605141fb0e54<br>
> > &gt; &gt; --- /dev/null<br>
> > &gt; &gt; +++ b/x11/mate-screensaver/files/patch-helper_p= am-helper.c<br>
> > &gt; &gt; _at__at_ -0,0 +1,10 _at__at_<br>
> > &gt; &gt; +--- helper/pam-helper.c.orig=3DC2=3DA0 =3DC2= =3DA0 =3DC2=3DA0 =3DC2=3DA02021-11-1
> =3D
> > 5 14:28:47.000000000 -0800<br>
> > &gt; &gt; ++++ helper/pam-helper.c=3DC2=3DA0 =3DC2=3DA0 2= 021-12-28 19:09:39.5016450
> =3D
> > 00 -0800<br>
> > &gt; &gt; +_at__at_ -33,7 +33,6 _at__at_<br>
> > &gt; &gt; +=3DC2=3DA0 */<br>
> > &gt; &gt; + <br>
> > &gt; &gt; + #include &lt;security/pam_appl.h&gt;&= lt;br>
> > &gt; &gt; +-#include &lt;security/_pam_macros.h&g= t;<br>
> > &gt; &gt; + <br>
> > &gt; &gt; + #include &lt;sys/types.h&gt;<br>= ;
> > &gt; &gt; + #include &lt;stdarg.h&gt;<br> > > &gt;<br>
> > &gt; -- <br>
> > &gt; Tomoaki AOKI=3DC2=3DA0 =3DC2=3DA0 &lt;<a href=3D3= D"mailto:j= unchoon@dec.sakura.ne
> =3D
> > .jp" target=3D3D"_blank">junchoon@dec.sakura.ne.jp</= a>&gt;<br>
> > <br>
> > <br>
> > </blockquote></div>
> >
> > --00000000000063b43405d45dfc6d--
>


--000000000000ba3e2005d46997a0--