Date: Fri, 31 Dec 2021 00:27:34 -0400 From: Eric Turgeon <ericturgeon.bsd@gmail.com> To: Cy Schubert <Cy.Schubert@cschubert.com> Cc: Tomoaki AOKI <junchoon@dec.sakura.ne.jp>, dev-commits-ports-main@freebsd.org, Cy Schubert <cy@freebsd.org> Subject: Re: git: f3caf742108b - main - x11/mate-screensaver: Fix PAM build Message-ID: <CADRZFmqsPFD8GS1H8W4pKC%2BoRUu4yJ%2BZ9WMBaSo7GsOH8K7XOQ@mail.gmail.com> In-Reply-To: <202112310402.1BV42p3C036429@slippy.cwsent.com> References: <20211230110857.1c0ac0e19e8206cb64a040d7@dec.sakura.ne.jp> <202112300342.1BU3gPt9003879@slippy.cwsent.com> <CADRZFmrE8avprf7NZPcU%2BtbsgVBzk9=qp4zHKgxLXSOK60QQQw@mail.gmail.com> <202112301701.1BUH1dji009235@slippy.cwsent.com> <202112310402.1BV42p3C036429@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <Cy.Schubert@cschubert.com> 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 <Cy.Schubert@cschubert.com> > FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org > NTP: <cy@nwtime.org> 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 <Cy.Schubert@cschubert.com> > > FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org > > NTP: <cy@nwtime.org> Web: https://nwtime.org > > > > The need of the many outweighs the greed of the few. > > > > > > In message > <CADRZFmrE8avprf7NZPcU+tbsgVBzk9=qp4zHKgxLXSOK60QQQw@mail.gmail.c > > 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 <Cy.Schubert@cschubert.com> > > > > FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org > > > > NTP: <cy@nwtime.org> 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 <cy_at_FreeBSD.org> > > > > > > AuthorDate: 2021-12-29 03:12:39 +0000 > > > > > > Commit: Cy Schubert <cy_at_FreeBSD.org> > > > > > > CommitDate: 2021-12-29 03:12:39 +0000 > > > > > > > > > > > > x11/mate-screensaver: Fix PAM build > > > > > > > > > > > > Fix build when PAM enabled; <security/_pam_macros.h> 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 <security/pam_appl.h> > > > > > > +-#include <security/_pam_macros.h> > > > > > > + > > > > > > + #include <sys/types.h> > > > > > > + #include <stdarg.h> > > > > > > > > > > -- > > > > > Tomoaki AOKI <junchoon@dec.sakura.ne.jp> > > > > > > > > > > > > > > > > > > --00000000000063b43405d45dfc6d > > > Content-Type: text/html; charset="UTF-8" > > > Content-Transfer-Encoding: quoted-printable > > > > > > <div dir=3D"ltr"><div>Do we have an equivalent of > security/_pam_macros.h?</ > > = > > > div><div><br></div><div><div><div dir=3D"ltr" > class=3D"gmail_signature" dat > > = > > > a-smartmail=3D"gmail_signature"><div dir=3D"ltr"><div><div > dir=3D"ltr"><div > > = > > > ><div dir=3D"ltr"><div><div dir=3D"ltr"><div dir=3D"ltr"><span><font > color= > > > =3D"#888888"><font><font color=3D"#000000"><b>Eric > Turgeon</b></font></font > > = > > > > ></font></span><span></span><cite></cite><br></div><span></span></div></div > > = > > > ></div></div></div></div></div></div></div><br></div></div><br><div > class= > > > =3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">On Wed, Dec 29, > 2021 > > = > > > at 11:42 PM Cy Schubert <<a href=3D"mailto: > Cy.Schubert@cschubert.com">C > > = > > > y.Schubert@cschubert.com</a>> wrote:<br></div><blockquote > 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 <br> > > > security/_pam_macros.h not found (discovered by my poudriere build). > <br> > > > security/_pam_macros is an include file found only on some distros of > <br> > > > Linux, a Linuxism. Try it without PAM enabled; the file not found > error may > > = > > > <br> > > > just be the beginning of a multitude of PAM issues.<br> > > > <br> > > > I'll try to look at it over the next couple days.<br> > > > <br> > > > <br> > > > -- <br> > > > Cheers,<br> > > > Cy Schubert <<a href=3D"mailto:Cy.Schubert@cschubert.com" > target=3D"_bla > > = > > > nk">Cy.Schubert@cschubert.com</a>><br> > > > FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 <a > href= > > > =3D"https://FreeBSD.org" rel=3D"noreferrer" target=3D"_blank"> > https://FreeB > > = > > > SD.org</a><br> > > > NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<<a href=3D"mailto: > cy@nwtim > > = > > > e.org" target=3D"_blank">cy@nwtime.org</a>>=C2=A0 =C2=A0 > Web:=C2=A0 <a h > > = > > > ref=3D"https://nwtime.org" rel=3D"noreferrer" target=3D"_blank"> > https://nwt > > = > > > ime.org</a><br> > > > <br> > > > =C2=A0 =C2=A0 =C2=A0 =C2=A0 The need of the many outweighs the greed > of the > > = > > > few.<br> > > > <br> > > > <br> > > > In message <<a href=3D"mailto: > 20211230110857.1c0ac0e19e8206cb64a040d7@de > > = > > > c.sakura.ne.jp" > target=3D"_blank">20211230110857.1c0ac0e19e8206cb64a040d7@d > > = > > > ec.sakura.ne.jp</a>>, <br> > > > Tomoaki<br> > > > AOKI writes:<br> > > > > Hi.<br> > > > > Wondered whih commit to comment but decided to latest.<br> > > > > mate-screensaver no longer opens login panel after upgrading > from<br> > > > > 1.26.0 to 1.26.1.<br> > > > ><br> > > > > Created Bug 260811 [1].<br> > > > ><br> > > > > [1] <a href=3D" > 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</a><br> > > > ><br> > > > ><br> > > > > > The branch main has been updated by cy:<br> > > > > > <br> > > > > > URL:<br> > > > > <a href=3D" > https://cgit.FreeBSD.org/ports/commit/?id=3Df3caf742108bb55 > > = > > > 2724d4c4dae74b28ea26" rel=3D"noreferrer" target=3D"_blank"> > https://cgit.Fre > > = > > > eBSD.org/ports/commit/?id=3Df3caf742108bb552724d4c4dae74b28ea26</a><br> > > > > 6a6a3<br> > > > > > <br> > > > > > commit f3caf742108bb552724d4c4dae74b28ea266a6a3<br> > > > > > Author:=C2=A0 =C2=A0 =C2=A0Cy Schubert > <cy_at_FreeBSD.org>< > > = > > > br> > > > > > AuthorDate: 2021-12-29 03:12:39 +0000<br> > > > > > Commit:=C2=A0 =C2=A0 =C2=A0Cy Schubert > <cy_at_FreeBSD.org>< > > = > > > br> > > > > > CommitDate: 2021-12-29 03:12:39 +0000<br> > > > > > <br> > > > > >=C2=A0 =C2=A0 =C2=A0x11/mate-screensaver: Fix PAM build<br> > > > > >=C2=A0 =C2=A0 =C2=A0<br> > > > > >=C2=A0 =C2=A0 =C2=A0Fix build when PAM enabled; > <security/_pam_ > > = > > > macros.h> is a Linuxism.<br> > > > > > ---<br> > > > > >=C2=A0 x11/mate-screensaver/files/patch-helper_pam-helper.c | > 10 + > > = > > > +++++++++<br> > > > > >=C2=A0 1 file changed, 10 insertions(+)<br> > > > > > <br> > > > > > diff --git > a/x11/mate-screensaver/files/patch-helper_pam-helper.c > > = > > > <br> > > > > b/x11/mate-screensaver/files/patch-helper_pam-helper.c<br> > > > > > new file mode 100644<br> > > > > > index 000000000000..605141fb0e54<br> > > > > > --- /dev/null<br> > > > > > +++ > b/x11/mate-screensaver/files/patch-helper_pam-helper.c<br> > > > > > _at__at_ -0,0 +1,10 _at__at_<br> > > > > > +--- helper/pam-helper.c.orig=C2=A0 =C2=A0 =C2=A0 > =C2=A02021-11-1 > > = > > > 5 14:28:47.000000000 -0800<br> > > > > > ++++ helper/pam-helper.c=C2=A0 =C2=A0 2021-12-28 > 19:09:39.5016450 > > = > > > 00 -0800<br> > > > > > +_at__at_ -33,7 +33,6 _at__at_<br> > > > > > +=C2=A0 */<br> > > > > > + <br> > > > > > + #include <security/pam_appl.h><br> > > > > > +-#include <security/_pam_macros.h><br> > > > > > + <br> > > > > > + #include <sys/types.h><br> > > > > > + #include <stdarg.h><br> > > > ><br> > > > > -- <br> > > > > Tomoaki AOKI=C2=A0 =C2=A0 <<a href=3D"mailto: > junchoon@dec.sakura.ne > > = > > > .jp" target=3D"_blank">junchoon@dec.sakura.ne.jp</a>><br> > > > <br> > > > <br> > > > </blockquote></div> > > > > > > --00000000000063b43405d45dfc6d-- > > > > > --000000000000ba3e2005d46997a0 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div>It is most likely this commit <a href=3D"https://gith= ub.com/mate-desktop/mate-screensaver/commit/ed6e6065bf0e85b64317b5a34b9f7a3= 6a0c839a6">https://github.com/mate-desktop/mate-screensaver/commit/ed6e6065= bf0e85b64317b5a34b9f7a36a0c839a6</a>.</div><div><br></div><div><div><div di= r=3D"ltr" class=3D"gmail_signature" data-smartmail=3D"gmail_signature"><div= dir=3D"ltr"><div><div dir=3D"ltr"><div><div dir=3D"ltr"><div><div dir=3D"l= tr"><div dir=3D"ltr"><span><font color=3D"#888888"><font><font color=3D"#00= 0000"><b>Eric Turgeon</b></font></font></font></span><span></span><cite></c= ite><br></div><span></span></div></div></div></div></div></div></div></div>= </div><br></div></div><br><div class=3D"gmail_quote"><div dir=3D"ltr" class= =3D"gmail_attr">On Fri, Dec 31, 2021 at 12:02 AM Cy Schubert <<a href=3D= "mailto:Cy.Schubert@cschubert.com">Cy.Schubert@cschubert.com</a>> wrote:= <br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8= ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">I can confirm P= AM authentication is broken by this new release. Like layers <br> of an onion, this problem will need to be investigated further. I doubt <br= > simply adding additional macros would resolve the problem. The reason I <br= > believe this is that the macros are likely a small part of something larger= .<br> <br> Having said that, ports/security/pecl-pam includes a copy of the file with = <br> a reference to the URL from whence it came (suggesting a GPL violation in <= br> the ports tree).<br> <br> 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.<br> <br> If upstream is open to fixing the problem temporarily marking the PAM <br> option broken or temporarily rolling back the upgrade may suffice.<br> <br> Alternatively, if upstream isn't open to remediation we may want to <br= > consider importing Linux-pam on github as a port. Be aware that multiple <b= r> PAM stacks can coexist however similar problems we have with three KRB5s <b= r> will require getting linking just right. This option does have the <br> advantage of supporting other software written for Linux-PAM (instead of <b= r> OpenPAM or Solaris PAM -- FreeBSD PAM is based on OpenPAM).<br> <br> Another alternative is dump mate-screensaver for xscreensaver. IIRC <br> xscreensaver was the original screen saver for Gnome back in the day. (IMO = <br> xscreensaver is superior to the Gnome and mate screensavers, though this is= <br> just a personal preference. I've also used it to replace the CDE <br> screensaver on a per-user basis.) Anyhow, just a thought for anyone.<br> <br> Until we look at the code we won't have a good idea of what kind of wor= k is <br> involved.<br> <br> Strategically a Linux-PAM port might be something we might want to think <b= r> about long term. Tactically, any of the other options could work.<br> <br> <br> -- <br> Cheers,<br> Cy Schubert <<a href=3D"mailto:Cy.Schubert@cschubert.com" target=3D"_bla= nk">Cy.Schubert@cschubert.com</a>><br> FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 <a href= =3D"https://FreeBSD.org" rel=3D"noreferrer" target=3D"_blank">https://FreeB= SD.org</a><br> NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<<a href=3D"mailto:cy@nwtim= e.org" target=3D"_blank">cy@nwtime.org</a>>=C2=A0 =C2=A0 Web:=C2=A0 <a h= ref=3D"https://nwtime.org" rel=3D"noreferrer" target=3D"_blank">https://nwt= ime.org</a><br> <br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 The need of the many outweighs the greed of the= few.<br> <br> <br> In message <<a href=3D"mailto:202112301701.1BUH1dji009235@slippy.cwsent.= com" target=3D"_blank">202112301701.1BUH1dji009235@slippy.cwsent.com</a>>= ;, Cy Schubert <br> writes:<br> > No. It's a bunch of inline macros that perform memory and other fu= nctions. <br> > All could have been made to be actual functions. On my Fedora VM at $J= OB <br> > they're part of the pam-devel.rpm.<br> ><br> ><br> > -- <br> > Cheers,<br> > Cy Schubert <<a href=3D"mailto:Cy.Schubert@cschubert.com" target=3D= "_blank">Cy.Schubert@cschubert.com</a>><br> > FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 <a h= ref=3D"https://FreeBSD.org" rel=3D"noreferrer" target=3D"_blank">https://Fr= eeBSD.org</a><br> > NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<<a href=3D"mailto:cy@= nwtime.org" target=3D"_blank">cy@nwtime.org</a>>=C2=A0 =C2=A0 Web:=C2=A0= <a href=3D"https://nwtime.org" rel=3D"noreferrer" target=3D"_blank">https:= //nwtime.org</a><br> ><br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0The need of the many outweighs the greed of = the few.<br> ><br> ><br> > In message <CADRZFmrE8avprf7NZPcU+tbsgVBzk9=3Dqp4zHKgxLXSOK60QQQw@m= ail.gmail.c<br> > om><br> > , Eric Turgeon writes:<br> > > --00000000000063b43405d45dfc6d<br> > > Content-Type: text/plain; charset=3D"UTF-8"<br> > ><br> > > Do we have an equivalent of security/_pam_macros.h?<br> > ><br> > > *Eric Turgeon*<br> > ><br> > ><br> > > On Wed, Dec 29, 2021 at 11:42 PM Cy Schubert <<a href=3D"mailt= o:Cy.Schubert@cschubert.com" target=3D"_blank">Cy.Schubert@cschubert.com</a= >><br> > > wrote:<br> > ><br> > > > This commit only fixed a compile time error, include file<br= > > > > security/_pam_macros.h not found (discovered by my poudriere= build).<br> > > > security/_pam_macros is an include file found only on some d= istros of<br> > > > Linux, a Linuxism. Try it without PAM enabled; the file not = found error<br> > > > may<br> > > > just be the beginning of a multitude of PAM issues.<br> > > ><br> > > > I'll try to look at it over the next couple days.<br> > > ><br> > > ><br> > > > --<br> > > > Cheers,<br> > > > Cy Schubert <<a href=3D"mailto:Cy.Schubert@cschubert.com"= target=3D"_blank">Cy.Schubert@cschubert.com</a>><br> > > > FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:= =C2=A0 <a href=3D"https://FreeBSD.org" rel=3D"noreferrer" target=3D"_blank"= >https://FreeBSD.org</a><br>; > > > NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<<a href=3D"= mailto:cy@nwtime.org" target=3D"_blank">cy@nwtime.org</a>>=C2=A0 =C2=A0 = Web:=C2=A0 <a href=3D"https://nwtime.org" rel=3D"noreferrer" target=3D"_bla= nk">https://nwtime.org</a><br>; > > ><br> > > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0The need of the many outwei= ghs the greed of the few.<br> > > ><br> > > ><br> > > > In message <<a href=3D"mailto:20211230110857.1c0ac0e19e82= 06cb64a040d7@dec.sakura.ne.jp" target=3D"_blank">20211230110857.1c0ac0e19e8= 206cb64a040d7@dec.sakura.ne.jp</a>>,<br> > > > Tomoaki<br> > > > AOKI writes:<br> > > > > Hi.<br> > > > > Wondered whih commit to comment but decided to latest.<= br> > > > > mate-screensaver no longer opens login panel after upgr= ading from<br> > > > > 1.26.0 to 1.26.1.<br> > > > ><br> > > > > Created Bug 260811 [1].<br> > > > ><br> > > > > [1] <a href=3D"https://bugs.freebsd.org/bugzilla/show_b= ug.cgi?id=3D260811" rel=3D"noreferrer" target=3D"_blank">https://bugs.freeb= sd.org/bugzilla/show_bug.cgi?id=3D260811</a><br> > > > ><br> > > > ><br> > > > > > The branch main has been updated by cy:<br> > > > > ><br> > > > > > URL:<br> > > > ><br> > > > <a href=3D"https://cgit.FreeBSD.org/ports/commit/?id=3Df3caf= 742108bb552724d4c4dae74b28" rel=3D"noreferrer" target=3D"_blank">https://cg= it.FreeBSD.org/ports/commit/?id=3Df3caf742108bb552724d4c4dae74b28</a><br> > ea<br> > > 26<br> > > > > 6a6a3<br> > > > > ><br> > > > > > commit f3caf742108bb552724d4c4dae74b28ea266a6a3<br= > > > > > > Author:=C2=A0 =C2=A0 =C2=A0Cy Schubert <cy_at_F= reeBSD.org><br> > > > > > AuthorDate: 2021-12-29 03:12:39 +0000<br> > > > > > Commit:=C2=A0 =C2=A0 =C2=A0Cy Schubert <cy_at_F= reeBSD.org><br> > > > > > CommitDate: 2021-12-29 03:12:39 +0000<br> > > > > ><br> > > > > >=C2=A0 =C2=A0 =C2=A0x11/mate-screensaver: Fix PAM b= uild<br> > > > > ><br> > > > > >=C2=A0 =C2=A0 =C2=A0Fix build when PAM enabled; <= ;security/_pam_macros.h> is a Linuxis<br> > m.<br> > > > > > ---<br> > > > > >=C2=A0 x11/mate-screensaver/files/patch-helper_pam-= helper.c | 10 ++++++++++<br> > > > > >=C2=A0 1 file changed, 10 insertions(+)<br> > > > > ><br> > > > > > diff --git a/x11/mate-screensaver/files/patch-help= er_pam-helper.c<br> > > > > b/x11/mate-screensaver/files/patch-helper_pam-helper.c<= br> > > > > > new file mode 100644<br> > > > > > index 000000000000..605141fb0e54<br> > > > > > --- /dev/null<br> > > > > > +++ b/x11/mate-screensaver/files/patch-helper_pam-= helper.c<br> > > > > > _at__at_ -0,0 +1,10 _at__at_<br> > > > > > +--- helper/pam-helper.c.orig=C2=A0 =C2=A0 =C2=A0 = =C2=A02021-11-15 14:28:47.000000000 -08<br> > 00<br> > > > > > ++++ helper/pam-helper.c=C2=A0 =C2=A0 2021-12-28 1= 9:09:39.501645000 -0800<br> > > > > > +_at__at_ -33,7 +33,6 _at__at_<br> > > > > > +=C2=A0 */<br> > > > > > +<br> > > > > > + #include <security/pam_appl.h><br> > > > > > +-#include <security/_pam_macros.h><br> > > > > > +<br> > > > > > + #include <sys/types.h><br> > > > > > + #include <stdarg.h><br> > > > ><br> > > > > --<br> > > > > Tomoaki AOKI=C2=A0 =C2=A0 <<a href=3D"mailto:junchoo= n@dec.sakura.ne.jp" target=3D"_blank">junchoon@dec.sakura.ne.jp</a>><br> > > ><br> > > ><br> > > ><br> > ><br> > > --00000000000063b43405d45dfc6d<br> > > Content-Type: text/html; charset=3D"UTF-8"<br> > > Content-Transfer-Encoding: quoted-printable<br> > ><br> > > <div dir=3D3D"ltr"><div>Do we have an equiv= alent of security/_pam_macros.h?</<br> > =3D<br> > > div><div><br></div><div><div><= ;div dir=3D3D"ltr" class=3D3D"gmail_signature" dat<br> > =3D<br> > > a-smartmail=3D3D"gmail_signature"><div dir=3D3D&q= uot;ltr"><div><div dir=3D3D"ltr"><div<br> > =3D<br> > > ><div dir=3D3D"ltr"><div><div dir=3D3= D"ltr"><div dir=3D3D"ltr"><span><font= color=3D<br> > > =3D3D"#888888"><font><font color=3D3D"= #000000"><b>Eric Turgeon</b></font></font<br> > =3D<br> > > ></font></span><span></span><cite&g= t;</cite><br></div><span></span></div>&= lt;/div<br> > =3D<br> > > ></div></div></div></div></div>&= lt;/div></div><br></div></div><br><div = class=3D<br> > > =3D3D"gmail_quote"><div dir=3D3D"ltr" c= lass=3D3D"gmail_attr">On Wed, Dec 29, 2021<br> > =3D<br> > >=C2=A0 at 11:42 PM Cy Schubert &lt;<a href=3D3D"mailto= :<a href=3D"mailto:Cy.Schubert@cschubert.com" target=3D"_blank">Cy.Schubert= @cschubert.com</a>">C<br> > =3D<br> > > <a href=3D"mailto:y.Schubert@cschubert.com" target=3D"_blank">y.S= chubert@cschubert.com</a></a>&gt; wrote:<br></div><= ;blockquote class=3D3D"gmail<br> > =3D<br> > > _quote" style=3D3D"margin:0px 0px 0px 0.8ex;border-left= :1px solid rgb(204,204<br> > =3D<br> > > ,204);padding-left:1ex">This commit only fixed a compile = time error, includ<br> > =3D<br> > > e file <br><br> > > security/_pam_macros.h not found (discovered by my poudriere buil= d). <br><br> > > security/_pam_macros is an include file found only on some distro= s of <br><br> > > Linux, a Linuxism. Try it without PAM enabled; the file not found= error may<br> > =3D<br> > >=C2=A0 <br><br> > > just be the beginning of a multitude of PAM issues.<br><br> > > <br><br> > > I&#39;ll try to look at it over the next couple days.<br&g= t;<br> > > <br><br> > > <br><br> > > -- <br><br> > > Cheers,<br><br> > > Cy Schubert &lt;<a href=3D3D"mailto:<a href=3D"mailto= :Cy.Schubert@cschubert.com" target=3D"_blank">Cy.Schubert@cschubert.com</a>= " target=3D3D"_bla<br> > =3D<br> > > nk"><a href=3D"mailto:Cy.Schubert@cschubert.com" target= =3D"_blank">Cy.Schubert@cschubert.com</a></a>&gt;<br><br> > > FreeBSD UNIX:=3DC2=3DA0 &lt;cy@FreeBSD.org&gt;=3DC2=3DA0 = =3DC2=3DA0Web:=3DC2=3DA0 <a href=3D<br> > > =3D3D"<a href=3D"https://FreeBSD.org" rel=3D"noreferrer" tar= get=3D"_blank">https://FreeBSD.org</a>" rel=3D3D"noreferrer"= target=3D3D"_blank"><a href=3D"https://FreeB" rel=3D"noreferr= er" target=3D"_blank">https://FreeB</a><br>; > =3D<br> > > SD.org</a><br><br> > > NTP:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2= =3DA0&lt;<a href=3D3D"mailto:<a href=3D"mailto:cy@nwtim" target= =3D"_blank">cy@nwtim</a><br> > =3D<br> > > <a href=3D"http://e.org" rel=3D"noreferrer" target=3D"_blank">e.o= rg</a>" target=3D3D"_blank"><a href=3D"mailto:cy@nwtime.o= rg" target=3D"_blank">cy@nwtime.org</a></a>&gt;=3DC2=3DA0 =3DC2= =3DA0 Web:=3DC2=3DA0 <a h<br> > =3D<br> > > ref=3D3D"<a href=3D"https://nwtime.org" rel=3D"noreferrer" t= arget=3D"_blank">https://nwtime.org</a>" rel=3D3D"noreferrer"= ; target=3D3D"_blank"><a href=3D"https://nwt" rel=3D"noreferre= r" target=3D"_blank">https://nwt</a><br>; > =3D<br> > > <a href=3D"http://ime.org" rel=3D"noreferrer" target=3D"_blank">i= me.org</a></a><br><br> > > <br><br> > > =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0 The need of the many = outweighs the greed of the<br> > =3D<br> > >=C2=A0 few.<br><br> > > <br><br> > > <br><br> > > In message &lt;<a href=3D3D"mailto:<a href=3D"mailto:= 20211230110857.1c0ac0e19e8206cb64a040d7@de" target=3D"_blank">2021123011085= 7.1c0ac0e19e8206cb64a040d7@de</a><br> > =3D<br> > > <a href=3D"http://c.sakura.ne.jp" rel=3D"noreferrer" target=3D"_b= lank">c.sakura.ne.jp</a>" target=3D3D"_blank">20211230110= 857.1c0ac0e19e8206cb64a040d7@d<br> > =3D<br> > > <a href=3D"http://ec.sakura.ne.jp" rel=3D"noreferrer" target=3D"_= blank">ec.sakura.ne.jp</a></a>&gt;, <br><br> > > Tomoaki<br><br> > > AOKI writes:<br><br> > > &gt; Hi.<br><br> > > &gt; Wondered whih commit to comment but decided to latest.&l= t;br><br> > > &gt; mate-screensaver no longer opens login panel after upgra= ding from<br><br> > > &gt; 1.26.0 to 1.26.1.<br><br> > > &gt;<br><br> > > &gt; Created Bug 260811 [1].<br><br> > > &gt;<br><br> > > &gt; [1] <a href=3D3D"<a href=3D"https://bugs.freebsd= .org/bugzilla/show_bug.cgi?id=3D3D260" rel=3D"noreferrer" target=3D"_blank"= >https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D3D260</a><br>; > =3D<br> > > 811" rel=3D3D"noreferrer" target=3D3D"_blank&= quot;><a href=3D"https://bugs.freebsd.org/bugzilla" rel=3D"noreferrer" t= arget=3D"_blank">https://bugs.freebsd.org/bugzilla</a><br>; > =3D<br> > > /show_bug.cgi?id=3D3D260811</a><br><br> > > &gt;<br><br> > > &gt;<br><br> > > &gt; &gt; The branch main has been updated by cy:<br&g= t;<br> > > &gt; &gt; <br><br> > > &gt; &gt; URL:<br><br> > > &gt; <a href=3D3D"<a href=3D"https://cgit.FreeBSD.org= /ports/commit/?id=3D3Df3caf742108bb55" rel=3D"noreferrer" target=3D"_blank"= >https://cgit.FreeBSD.org/ports/commit/?id=3D3Df3caf742108bb55</a><br>; > =3D<br> > > 2724d4c4dae74b28ea26" rel=3D3D"noreferrer" target= =3D3D"_blank"><a href=3D"https://cgit.Fre" rel=3D"noreferrer" = target=3D"_blank">https://cgit.Fre</a><br>; > =3D<br> > > eBSD.org/ports/commit/?id=3D3Df3caf742108bb552724d4c4dae74b28ea26= </a><br><br> > > &gt; 6a6a3<br><br> > > &gt; &gt; <br><br> > > &gt; &gt; commit f3caf742108bb552724d4c4dae74b28ea266a6a3= <br><br> > > &gt; &gt; Author:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0Cy Schub= ert &lt;cy_at_FreeBSD.org&gt;<<br> > =3D<br> > > br><br> > > &gt; &gt; AuthorDate: 2021-12-29 03:12:39 +0000<br>= <br> > > &gt; &gt; Commit:=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0Cy Schub= ert &lt;cy_at_FreeBSD.org&gt;<<br> > =3D<br> > > br><br> > > &gt; &gt; CommitDate: 2021-12-29 03:12:39 +0000<br>= <br> > > &gt; &gt; <br><br> > > &gt; &gt;=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0x11/mate-screens= aver: Fix PAM build<br><br> > > &gt; &gt;=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0<br><br> > > &gt; &gt;=3DC2=3DA0 =3DC2=3DA0 =3DC2=3DA0Fix build when P= AM enabled; &lt;security/_pam_<br> > =3D<br> > > macros.h&gt; is a Linuxism.<br><br> > > &gt; &gt; ---<br><br> > > &gt; &gt;=3DC2=3DA0 x11/mate-screensaver/files/patch-help= er_pam-helper.c | 10 +<br> > =3D<br> > > +++++++++<br><br> > > &gt; &gt;=3DC2=3DA0 1 file changed, 10 insertions(+)<b= r><br> > > &gt; &gt; <br><br> > > &gt; &gt; diff --git a/x11/mate-screensaver/files/patch-h= elper_pam-helper.c<br> > =3D<br> > > <br><br> > > &gt; b/x11/mate-screensaver/files/patch-helper_pam-helper.c&l= t;br><br> > > &gt; &gt; new file mode 100644<br><br> > > &gt; &gt; index 000000000000..605141fb0e54<br><br> > > &gt; &gt; --- /dev/null<br><br> > > &gt; &gt; +++ b/x11/mate-screensaver/files/patch-helper_p= am-helper.c<br><br> > > &gt; &gt; _at__at_ -0,0 +1,10 _at__at_<br><br> > > &gt; &gt; +--- helper/pam-helper.c.orig=3DC2=3DA0 =3DC2= =3DA0 =3DC2=3DA0 =3DC2=3DA02021-11-1<br> > =3D<br> > > 5 14:28:47.000000000 -0800<br><br> > > &gt; &gt; ++++ helper/pam-helper.c=3DC2=3DA0 =3DC2=3DA0 2= 021-12-28 19:09:39.5016450<br> > =3D<br> > > 00 -0800<br><br> > > &gt; &gt; +_at__at_ -33,7 +33,6 _at__at_<br><br> > > &gt; &gt; +=3DC2=3DA0 */<br><br> > > &gt; &gt; + <br><br> > > &gt; &gt; + #include &lt;security/pam_appl.h&gt;&= lt;br><br> > > &gt; &gt; +-#include &lt;security/_pam_macros.h&g= t;<br><br> > > &gt; &gt; + <br><br> > > &gt; &gt; + #include &lt;sys/types.h&gt;<br>= ;<br> > > &gt; &gt; + #include &lt;stdarg.h&gt;<br><b= r> > > &gt;<br><br> > > &gt; -- <br><br> > > &gt; Tomoaki AOKI=3DC2=3DA0 =3DC2=3DA0 &lt;<a href=3D3= D"mailto:<a href=3D"mailto:junchoon@dec.sakura.ne" target=3D"_blank">j= unchoon@dec.sakura.ne</a><br> > =3D<br> > > .jp" target=3D3D"_blank"><a href=3D"mailto:junc= hoon@dec.sakura.ne.jp" target=3D"_blank">junchoon@dec.sakura.ne.jp</a></= a>&gt;<br><br> > > <br><br> > > <br><br> > > </blockquote></div><br> > ><br> > > --00000000000063b43405d45dfc6d--<br> ><br> <br> <br> </blockquote></div> --000000000000ba3e2005d46997a0--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CADRZFmqsPFD8GS1H8W4pKC%2BoRUu4yJ%2BZ9WMBaSo7GsOH8K7XOQ>