mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-03 01:23:49 +00:00
Fix several incompatibilities with FreeBSD. This makes gdm working, at least
on my 5-CURRENT with XFree86-3.3.6. PR: 31309 Submitted by: Heath Nielson <heath@cs.byu.edu>
This commit is contained in:
parent
fa238b71c0
commit
68257a672e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=48834
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= gdm
|
||||
PORTVERSION= 2.2.4.2
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= x11 gnome
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME}
|
||||
MASTER_SITE_SUBDIR= stable/sources/gdm
|
||||
|
19
x11/gdm/files/patch-ar
Normal file
19
x11/gdm/files/patch-ar
Normal file
@ -0,0 +1,19 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- daemon/gdm-net.c.orig Sun Aug 26 04:56:37 2001
|
||||
+++ daemon/gdm-net.c Tue Oct 16 09:35:36 2001
|
||||
@@ -238,11 +243,11 @@
|
||||
return NULL;
|
||||
}
|
||||
|
||||
+ bzero(&addr, sizeof(addr));
|
||||
strcpy (addr.sun_path, sockname);
|
||||
addr.sun_family = AF_UNIX;
|
||||
if (bind (fd,
|
||||
- (struct sockaddr *) &addr, strlen (addr.sun_path) +
|
||||
- sizeof (addr.sun_family)) < 0) {
|
||||
+ (struct sockaddr *) &addr, sizeof(addr)) < 0) {
|
||||
gdm_error (_("%s: Could not bind socket"),
|
||||
"gdm_connection_open_unix");
|
||||
close (fd);
|
17
x11/gdm/files/patch-daemon::slave.c
Normal file
17
x11/gdm/files/patch-daemon::slave.c
Normal file
@ -0,0 +1,17 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- daemon/slave.c 2001/10/16 06:36:10 1.1
|
||||
+++ daemon/slave.c 2001/10/16 06:38:57
|
||||
@@ -1088,7 +1088,10 @@
|
||||
/* this is again informal only, if the greeter does time out it will
|
||||
* not actually login a user if it's not enabled for this display */
|
||||
if (d->timed_login_ok) {
|
||||
- ve_setenv ("GDM_TIMED_LOGIN_OK", ParsedTimedLogin, TRUE);
|
||||
+ if (ParsedTimedLogin == NULL)
|
||||
+ ve_setenv ("GDM_TIMED_LOGIN_OK", "", TRUE);
|
||||
+ else
|
||||
+ ve_setenv ("GDM_TIMED_LOGIN_OK", ParsedTimedLogin, TRUE);
|
||||
} else {
|
||||
ve_unsetenv ("GDM_TIMED_LOGIN_OK");
|
||||
}
|
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= gdm
|
||||
PORTVERSION= 2.2.4.2
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= x11 gnome
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME}
|
||||
MASTER_SITE_SUBDIR= stable/sources/gdm
|
||||
|
19
x11/gdm2/files/patch-ar
Normal file
19
x11/gdm2/files/patch-ar
Normal file
@ -0,0 +1,19 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- daemon/gdm-net.c.orig Sun Aug 26 04:56:37 2001
|
||||
+++ daemon/gdm-net.c Tue Oct 16 09:35:36 2001
|
||||
@@ -238,11 +243,11 @@
|
||||
return NULL;
|
||||
}
|
||||
|
||||
+ bzero(&addr, sizeof(addr));
|
||||
strcpy (addr.sun_path, sockname);
|
||||
addr.sun_family = AF_UNIX;
|
||||
if (bind (fd,
|
||||
- (struct sockaddr *) &addr, strlen (addr.sun_path) +
|
||||
- sizeof (addr.sun_family)) < 0) {
|
||||
+ (struct sockaddr *) &addr, sizeof(addr)) < 0) {
|
||||
gdm_error (_("%s: Could not bind socket"),
|
||||
"gdm_connection_open_unix");
|
||||
close (fd);
|
17
x11/gdm2/files/patch-daemon::slave.c
Normal file
17
x11/gdm2/files/patch-daemon::slave.c
Normal file
@ -0,0 +1,17 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- daemon/slave.c 2001/10/16 06:36:10 1.1
|
||||
+++ daemon/slave.c 2001/10/16 06:38:57
|
||||
@@ -1088,7 +1088,10 @@
|
||||
/* this is again informal only, if the greeter does time out it will
|
||||
* not actually login a user if it's not enabled for this display */
|
||||
if (d->timed_login_ok) {
|
||||
- ve_setenv ("GDM_TIMED_LOGIN_OK", ParsedTimedLogin, TRUE);
|
||||
+ if (ParsedTimedLogin == NULL)
|
||||
+ ve_setenv ("GDM_TIMED_LOGIN_OK", "", TRUE);
|
||||
+ else
|
||||
+ ve_setenv ("GDM_TIMED_LOGIN_OK", ParsedTimedLogin, TRUE);
|
||||
} else {
|
||||
ve_unsetenv ("GDM_TIMED_LOGIN_OK");
|
||||
}
|
Loading…
Reference in New Issue
Block a user