diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-07-26 10:40:43 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-07-26 10:40:43 +0800 |
| commit | 860e35f8b342812183df7661307533f2a5b78497 (patch) | |
| tree | efa0709c3cbc4a1a0d90041869eac08f0bd6d02e | |
| parent | dbb82f0a6ae6d43ac520d6d07b6e2992b11fd867 (diff) | |
| download | marcuscom-ports-860e35f8b342812183df7661307533f2a5b78497.tar marcuscom-ports-860e35f8b342812183df7661307533f2a5b78497.tar.gz marcuscom-ports-860e35f8b342812183df7661307533f2a5b78497.tar.bz2 marcuscom-ports-860e35f8b342812183df7661307533f2a5b78497.tar.lz marcuscom-ports-860e35f8b342812183df7661307533f2a5b78497.tar.xz marcuscom-ports-860e35f8b342812183df7661307533f2a5b78497.tar.zst marcuscom-ports-860e35f8b342812183df7661307533f2a5b78497.zip | |
Sync with the FreeBSD ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11180 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11/gdm/Makefile | 4 | ||||
| -rw-r--r-- | x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c | 20 |
2 files changed, 22 insertions, 2 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 331257e59..263c51284 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.123 2008/06/08 19:27:06 marcus Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.124 2008/06/09 05:34:29 marcus Exp $ # PORTNAME= gdm PORTVERSION= 2.22.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c new file mode 100644 index 000000000..7307e0998 --- /dev/null +++ b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c @@ -0,0 +1,20 @@ +--- gui/simple-chooser/gdm-host-chooser-widget.c.orig 2008-07-25 22:18:58.000000000 -0400 ++++ gui/simple-chooser/gdm-host-chooser-widget.c 2008-07-25 22:36:43.000000000 -0400 +@@ -442,7 +442,7 @@ find_broadcast_addresses (GdmHostChooser + /* paranoia */ + ifreq.ifr_name[sizeof (ifreq.ifr_name) - 1] = '\0'; + +- if (ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) { ++ if ((ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) && (errno != ENXIO)) + g_warning ("Could not get SIOCGIFFLAGS for %s", ifr[i].ifr_name); + } + +@@ -542,6 +542,8 @@ xdmcp_init (GdmHostChooserWidget *widget + #ifdef ENABLE_IPV6 + widget->priv->socket_fd = socket (AF_INET6, SOCK_DGRAM, 0); + if (widget->priv->socket_fd != -1) { ++ int no = 0; ++ setsockopt(widget->priv->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no)); + widget->priv->have_ipv6 = TRUE; + } + #endif |