Friday, May 23, 2025

Re: MAINTAINER REGRESSION FIX: x11/emwm-utils

diff --git a/Makefile b/Makefile
index 6a5e5822b36..127fceca498 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ COMMENT = session manager and a toolchest-like application launcher
V = 1.3
DISTNAME = emwm-utils-src-${V}
PKGNAME = emwm-utils-${V}
-REVISION = 0
+REVISION = 1

CATEGORIES = x11
HOMEPAGE = https://fastestcode.org/emwm.html
diff --git a/patches/patch-src_smmain_c b/patches/patch-src_smmain_c
index cf6ad7122bf..32ca62c615b 100644
--- a/patches/patch-src_smmain_c
+++ b/patches/patch-src_smmain_c
@@ -61,21 +61,18 @@ Index: src/smmain.c

memset(pwb,0,strlen(pwb));
XmTextFieldSetString(wpasswd,"");
-@@ -988,7 +1009,8 @@ static Boolean set_privileges(Boolean elevate)
+@@ -988,10 +1009,13 @@ static Boolean set_privileges(Boolean elevate)
if(!initialized){
orig_uid = geteuid();
orig_gid = getegid();
-
-+ /* BSD-auth handles authentication, no SUID needed. */
-+#ifndef __OpenBSD__
if(orig_uid != 0){
++ /* BSD-auth handles authentication, no SUID needed. */
++#ifndef __OpenBSD__
log_msg("%s must be setuid root to enable "
"screen locking capabilities.\n",bin_name);
-@@ -996,6 +1018,7 @@ static Boolean set_privileges(Boolean elevate)
++#endif /* __OpenBSD__ */
++
+ initialized = True;
can_elevate = False;
return False;
- }
-+#endif /* __OpenBSD__ */
- initialized = True;
- can_elevate = True;
- }
On Fri, 23 May 2025 02:44:38 +0000
Lucas Gabriel Vuotto <lucas@sexy.is> wrote:

> Hi izzy,
>
> On Thu, May 22, 2025 at 12:08:52PM -0500, izzy Meyer wrote:
> > I said this in a previous mail [2], but I think it got overlooked:
> >
> > > Is it possible to backport this to -stable as the bsd-auth patch
> > > and REBOOT_CMD fix breaking bugs in the port? Without these two
> > > changes, the locking mechanism freezes up the xsession and
> > > reboot/shutdown/halt do the same. I have a machine that I run
> > > -stable on, and it'd be nice to have these fixes on that machine.
> > > I understand port updates usually don't get backported to
> > > -stable, but would this be a valid enough exception?
> >
> > Ideally, x11/emwm should be updated in tandem with x11/emwm-utils as
> > they work as a team, so could that be backported as well?
>
> I sent my reply to you privately on Sun, 18 May 2025 06:33:36 +0000:
>
> | Backports to -stable are reserved for security or serious bugs. The
> fix | freezings does fall in that category, but that's the work of
> your patch | and not the release. In fact, the release is marked as
> "small fixes". |
> | Because of that, I'll need that you send me auth patches backported
> to | 1.2 and then I can merge it.

Thanks, I'll look into doing this for -stable.

>
> > In a previous mail, I was asked to suppress a warning about xmsm
> > lacking suid root. [1]
> >
> > I patched too much in my #ifndef/

No comments:

Post a Comment