pool/xdm
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1161094 from X11:XOrg

Browse Source 
- 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/request/show/1161094
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xdm?expand=0&rev=104
This commit is contained in:
Ana Guerrero 2024-03-25 20:07:03 +00:00 committed by Git OBS Bridge
commit cd1f4bcd08
6 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
u_gcc14-fix.patch
View File

@ -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;

BIN
xdm-1.1.14.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

3
xdm-1.1.15.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4bb028de68fa3ca918d46109123095c8ba89bea97c965ccc79c6387bfd84b172
size 420844

28
xdm-tolerant-hostname-changes.diff
View File

@ -1,6 +1,8 @@
--- xdm/auth.c.orig 2011-09-25 09:35:47.000000000 +0200 Index: xdm/auth.c
+++ xdm/auth.c 2014-07-18 14:55:03.244300844 +0200 ===================================================================
@@ -767,7 +767,7 @@ writeAddr ( --- xdm.orig/auth.c
+++ xdm/auth.c
@@ -744,7 +744,7 @@ writeAddr (
} }
static void static void
@ -9,8 +11,8 @@
{ {
char displayname[100]; char displayname[100];
int len = _XGetHostname (displayname, sizeof(displayname)); int len = _XGetHostname (displayname, sizeof(displayname));
@@ -803,6 +803,9 @@ DefineLocal (FILE *file, Xauth *auth) @@ -759,6 +759,9 @@ DefineLocal (FILE *file, Xauth *auth)
#endif
writeAddr (FamilyLocal, len, displayname, file, auth); writeAddr (FamilyLocal, len, displayname, file, auth);
+ +
@ -19,7 +21,7 @@
} }
#ifdef HAVE_GETIFADDRS #ifdef HAVE_GETIFADDRS
@@ -1236,7 +1239,7 @@ setAuthNumber (Xauth *auth, char *name) @@ -1019,7 +1022,7 @@ setAuthNumber (Xauth *auth, char *name)
} }
static void static void
@ -28,7 +30,7 @@
{ {
int fd; int fd;
@@ -1263,13 +1266,13 @@ writeLocalAuth (FILE *file, Xauth *auth, @@ -1034,13 +1037,13 @@ writeLocalAuth (FILE *file, Xauth *auth,
DefineSelf (fd, file, auth); DefineSelf (fd, file, auth);
close (fd); close (fd);
#endif #endif
@ -44,7 +46,7 @@
{ {
int family = FamilyLocal; int family = FamilyLocal;
char *addr; char *addr;
@@ -1288,7 +1291,7 @@ writeRemoteAuth (FILE *file, Xauth *auth @@ -1059,7 +1062,7 @@ writeRemoteAuth (FILE *file, Xauth *auth
} }
else else
{ {
@ -53,7 +55,7 @@
} }
} }
@@ -1312,6 +1315,7 @@ SetUserAuthorization (struct display *d, @@ -1083,6 +1086,7 @@ SetUserAuthorization (struct display *d,
#ifdef HAVE_MKSTEMP #ifdef HAVE_MKSTEMP
int fd; int fd;
#endif #endif
@ -61,7 +63,7 @@
Debug ("SetUserAuthorization\n"); Debug ("SetUserAuthorization\n");
auths = d->authorizations; auths = d->authorizations;
@@ -1404,10 +1408,10 @@ SetUserAuthorization (struct display *d, @@ -1175,10 +1179,10 @@ SetUserAuthorization (struct display *d,
{ {
magicCookie = i; magicCookie = i;
if (d->displayType.location == Local) if (d->displayType.location == Local)
@ -74,7 +76,7 @@
#endif #endif
break; 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)) !strncmp (auths[i]->name, "MIT-KERBEROS-5", 14))
auths[i]->data_length = 0; auths[i]->data_length = 0;
if (d->displayType.location == Local) if (d->displayType.location == Local)
@ -87,7 +89,7 @@
#endif #endif
auths[i]->data_length = data_len; 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, verify->systemEnviron = setEnv (verify->systemEnviron,
"XAUTHORITY", envname); "XAUTHORITY", envname);
} }
@ -100,7 +102,7 @@
XauUnlockAuth (name); XauUnlockAuth (name);
if (envname) if (envname)
chown (envname, verify->uid, verify->gid); 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++) for (i = 0; i < d->authNum; i++)
{ {
if (d->displayType.location == Local) if (d->displayType.location == Local)

12
xdm.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sun Mar 24 08:32:09 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
- 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 <sndirsch@suse.com> Wed Mar 6 09:21:36 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>

4
xdm.spec
View File

@ -25,7 +25,7 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates %define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif %endif
Name: xdm Name: xdm
Version: 1.1.14 Version: 1.1.15
Release: 0 Release: 0
Summary: X Display Manager Summary: X Display Manager
License: MIT License: MIT
@ -40,7 +40,6 @@ Patch1: xdm-tolerant-hostname-changes.diff
Patch2: xdm-tarball.patch Patch2: xdm-tarball.patch
Patch3: n_Allow-the-greeter-to-set-the-input-fields-bg-color.patch Patch3: n_Allow-the-greeter-to-set-the-input-fields-bg-color.patch
Patch4: xinit-UsrEtcMove.patch Patch4: xinit-UsrEtcMove.patch
Patch5: u_gcc14-fix.patch
BuildRequires: firewall-macros BuildRequires: firewall-macros
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pam-devel BuildRequires: pam-devel
@ -105,7 +104,6 @@ pushd xdm
popd popd
# reverse apply (boo#1130321) # reverse apply (boo#1130321)
%patch -P 3 -p1 -R %patch -P 3 -p1 -R
%patch -P 5 -p1
%build %build
# needed for patch0 # needed for patch0