Accepting request 1161094 from X11:XOrg
- 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:
commit
cd1f4bcd08
@ -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)
BIN
xdm-1.1.14.tar.xz
(Stored with Git LFS)
Binary file not shown.
3
xdm-1.1.15.tar.xz
Normal file
3
xdm-1.1.15.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4bb028de68fa3ca918d46109123095c8ba89bea97c965ccc79c6387bfd84b172
|
||||
size 420844
|
@ -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)
|
||||
|
12
xdm.changes
12
xdm.changes
@ -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>
|
||||
|
||||
|
4
xdm.spec
4
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
|
||||
|
Loading…
Reference in New Issue
Block a user