From ab86098dd19e65991db279ec77c24b186942d27fd9d701e9570589af67dc0ea0 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sun, 24 Mar 2024 08:46:34 +0000 Subject: [PATCH] - Update to release 1.1.15 * This release fixes a failure to build with the upcoming gcc 14, cleans up several other compiler warnings, fixes a bug in the generation of the xdm.service file for systemd, and removes a lot of dead code checks for platforms & features that have not been supported since the conversion from Imake to autoconf in 2005. - supersedes u_gcc14-fix.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=271 --- u_gcc14-fix.patch | 12 ------------ xdm-1.1.14.tar.xz | 3 --- xdm-1.1.15.tar.xz | 3 +++ xdm-tolerant-hostname-changes.diff | 28 +++++++++++++++------------- xdm.changes | 12 ++++++++++++ xdm.spec | 4 +--- 6 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 u_gcc14-fix.patch delete mode 100644 xdm-1.1.14.tar.xz create mode 100644 xdm-1.1.15.tar.xz diff --git a/u_gcc14-fix.patch b/u_gcc14-fix.patch deleted file mode 100644 index f9ed78a..0000000 --- a/u_gcc14-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r -p xdm-1.1.14.old/chooser/chooser.c xdm-1.1.14/chooser/chooser.c ---- xdm-1.1.14.old/chooser/chooser.c 2024-03-06 09:11:44.928220105 +0000 -+++ xdm-1.1.14/chooser/chooser.c 2024-03-06 09:18:17.760108455 +0000 -@@ -277,7 +277,7 @@ RebuildTable (int size) - newTable[i] = names->fullname; - qsort (newTable, size, sizeof (char *), HostnameCompare); - } -- XawListChange (list, newTable, size, 0, TRUE); -+ XawListChange (list, (_Xconst char **) newTable, size, 0, TRUE); - free (NameTable); - NameTable = newTable; - NameTableSize = size; diff --git a/xdm-1.1.14.tar.xz b/xdm-1.1.14.tar.xz deleted file mode 100644 index 33aa308..0000000 --- a/xdm-1.1.14.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e9bf25636797ec9e595286dd6820ecc33901439f07705eaf608ecda012c3d5f -size 419324 diff --git a/xdm-1.1.15.tar.xz b/xdm-1.1.15.tar.xz new file mode 100644 index 0000000..8f6896a --- /dev/null +++ b/xdm-1.1.15.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bb028de68fa3ca918d46109123095c8ba89bea97c965ccc79c6387bfd84b172 +size 420844 diff --git a/xdm-tolerant-hostname-changes.diff b/xdm-tolerant-hostname-changes.diff index edfa410..fb4b500 100644 --- a/xdm-tolerant-hostname-changes.diff +++ b/xdm-tolerant-hostname-changes.diff @@ -1,6 +1,8 @@ ---- xdm/auth.c.orig 2011-09-25 09:35:47.000000000 +0200 -+++ xdm/auth.c 2014-07-18 14:55:03.244300844 +0200 -@@ -767,7 +767,7 @@ writeAddr ( +Index: xdm/auth.c +=================================================================== +--- xdm.orig/auth.c ++++ xdm/auth.c +@@ -744,7 +744,7 @@ writeAddr ( } static void @@ -9,8 +11,8 @@ { char displayname[100]; int len = _XGetHostname (displayname, sizeof(displayname)); -@@ -803,6 +803,9 @@ DefineLocal (FILE *file, Xauth *auth) - #endif +@@ -759,6 +759,9 @@ DefineLocal (FILE *file, Xauth *auth) + writeAddr (FamilyLocal, len, displayname, file, auth); + @@ -19,7 +21,7 @@ } #ifdef HAVE_GETIFADDRS -@@ -1236,7 +1239,7 @@ setAuthNumber (Xauth *auth, char *name) +@@ -1019,7 +1022,7 @@ setAuthNumber (Xauth *auth, char *name) } static void @@ -28,7 +30,7 @@ { int fd; -@@ -1263,13 +1266,13 @@ writeLocalAuth (FILE *file, Xauth *auth, +@@ -1034,13 +1037,13 @@ writeLocalAuth (FILE *file, Xauth *auth, DefineSelf (fd, file, auth); close (fd); #endif @@ -44,7 +46,7 @@ { int family = FamilyLocal; char *addr; -@@ -1288,7 +1291,7 @@ writeRemoteAuth (FILE *file, Xauth *auth +@@ -1059,7 +1062,7 @@ writeRemoteAuth (FILE *file, Xauth *auth } else { @@ -53,7 +55,7 @@ } } -@@ -1312,6 +1315,7 @@ SetUserAuthorization (struct display *d, +@@ -1083,6 +1086,7 @@ SetUserAuthorization (struct display *d, #ifdef HAVE_MKSTEMP int fd; #endif @@ -61,7 +63,7 @@ Debug ("SetUserAuthorization\n"); auths = d->authorizations; -@@ -1404,10 +1408,10 @@ SetUserAuthorization (struct display *d, +@@ -1175,10 +1179,10 @@ SetUserAuthorization (struct display *d, { magicCookie = i; if (d->displayType.location == Local) @@ -74,7 +76,7 @@ #endif break; } -@@ -1425,10 +1429,10 @@ SetUserAuthorization (struct display *d, +@@ -1196,10 +1200,10 @@ SetUserAuthorization (struct display *d, !strncmp (auths[i]->name, "MIT-KERBEROS-5", 14)) auths[i]->data_length = 0; if (d->displayType.location == Local) @@ -87,7 +89,7 @@ #endif auths[i]->data_length = data_len; } -@@ -1473,6 +1477,12 @@ SetUserAuthorization (struct display *d, +@@ -1244,6 +1248,12 @@ SetUserAuthorization (struct display *d, verify->systemEnviron = setEnv (verify->systemEnviron, "XAUTHORITY", envname); } @@ -100,7 +102,7 @@ XauUnlockAuth (name); if (envname) chown (envname, verify->uid, verify->gid); -@@ -1511,10 +1521,10 @@ RemoveUserAuthorization (struct display +@@ -1282,10 +1292,10 @@ RemoveUserAuthorization (struct display for (i = 0; i < d->authNum; i++) { if (d->displayType.location == Local) diff --git a/xdm.changes b/xdm.changes index da491ed..3fd313e 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Mar 24 08:32:09 UTC 2024 - Stefan Dirsch + +- Update to release 1.1.15 + * This release fixes a failure to build with the upcoming gcc 14, + cleans up several other compiler warnings, fixes a bug in the + generation of the xdm.service file for systemd, and removes a + lot of dead code checks for platforms & features that have not + been supported since the conversion from Imake to autoconf in + 2005. +- supersedes u_gcc14-fix.patch + ------------------------------------------------------------------- Wed Mar 6 09:21:36 UTC 2024 - Stefan Dirsch diff --git a/xdm.spec b/xdm.spec index f0c9e5d..c0271ba 100644 --- a/xdm.spec +++ b/xdm.spec @@ -25,7 +25,7 @@ %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: xdm -Version: 1.1.14 +Version: 1.1.15 Release: 0 Summary: X Display Manager License: MIT @@ -40,7 +40,6 @@ Patch1: xdm-tolerant-hostname-changes.diff Patch2: xdm-tarball.patch Patch3: n_Allow-the-greeter-to-set-the-input-fields-bg-color.patch Patch4: xinit-UsrEtcMove.patch -Patch5: u_gcc14-fix.patch BuildRequires: firewall-macros BuildRequires: libtool BuildRequires: pam-devel @@ -105,7 +104,6 @@ pushd xdm popd # reverse apply (boo#1130321) %patch -P 3 -p1 -R -%patch -P 5 -p1 %build # needed for patch0