cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gdm-2.20.11.

Browse Source 
* includes a security fix that we already patched for > 14 months ago
This commit is contained in:
ajacoutot 2010-06-04 07:45:56 +00:00
parent 626d397285
commit 56652f99ed
7 changed files with 71 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/gnome/gdm/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.72 2010/04/25 08:48:31 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.73 2010/06/04 07:45:56 ajacoutot Exp $
COMMENT= GNOME display manager
GNOME_PROJECT= gdm
GNOME_VERSION= 2.20.10
PKGNAME= ${DISTNAME}p13
GNOME_VERSION= 2.20.11
HOMEPAGE= http://projects.gnome.org/gdm/

10
x11/gnome/gdm/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/gdm-2.20.10.tar.bz2) = mBx+5/vkUwYeCVq1KjUT+A==
RMD160 (gnome/gdm-2.20.10.tar.bz2) = S7UDddMGOBQ7R7eIRAXpmZ4wTaU=
SHA1 (gnome/gdm-2.20.10.tar.bz2) = QunlIYQ5M1LwBfFzWEOjD3ZK7xg=
SHA256 (gnome/gdm-2.20.10.tar.bz2) = XUouWXOneIccm/uR12WAdHpO9Adx/UNoFppYaLstsSc=
SIZE (gnome/gdm-2.20.10.tar.bz2) = 3940077
MD5 (gnome/gdm-2.20.11.tar.bz2) = Z2lrZMgcMX9hBlgQoy6LNg==
RMD160 (gnome/gdm-2.20.11.tar.bz2) = 5AC7igt4ouiw2pjt0uDzp6AmfwQ=
SHA1 (gnome/gdm-2.20.11.tar.bz2) = viO98yt6QlSsgJg/Tt8lyvqEf/M=
SHA256 (gnome/gdm-2.20.11.tar.bz2) = LiHJpElBzQAzqqazgbVjSIu90K0aKO8F9+AXiJHx6qI=
SIZE (gnome/gdm-2.20.11.tar.bz2) = 4013059

33
x11/gnome/gdm/patches/patch-common_gdm-common_c
View File

@ -1,10 +1,19 @@
$OpenBSD: patch-common_gdm-common_c,v 1.1 2009/02/15 16:05:14 ajacoutot Exp $
$OpenBSD: patch-common_gdm-common_c,v 1.2 2010/06/04 07:45:56 ajacoutot Exp $
Make sure user password does not end-up in /var/log/messages.
GNOME bug #571846
--- common/gdm-common.c.orig Sun Feb 15 16:49:17 2009
+++ common/gdm-common.c Sun Feb 15 16:49:58 2009
--- common/gdm-common.c.orig Thu Jun 3 03:06:25 2010
+++ common/gdm-common.c Fri Jun 4 08:10:50 2010
@@ -217,7 +217,7 @@ ve_locale_to_utf8 (const char *str)
char *ret = g_locale_to_utf8 (str, -1, NULL, NULL, NULL);
if (ret == NULL) {
- g_warning ("string not in proper locale encoding: \"%s\"", str);
+ g_warning ("string not in proper locale encoding");
return g_strdup (str);
} else {
return ret;
@@ -230,7 +230,7 @@ ve_locale_from_utf8 (const char *str)
char *ret = g_locale_from_utf8 (str, -1, NULL, NULL, NULL);
@ -14,3 +23,21 @@ GNOME bug #571846
return g_strdup (str);
} else {
return ret;
@@ -242,7 +242,7 @@ ve_filename_to_utf8 (const char *str)
{
char *ret = g_filename_to_utf8 (str, -1, NULL, NULL, NULL);
if (ret == NULL) {
- g_warning ("string not in proper locale encoding: \"%s\"", str);
+ g_warning ("string not in proper locale encoding");
return g_strdup (str);
} else {
return ret;
@@ -254,7 +254,7 @@ ve_filename_from_utf8 (const char *str)
{
char *ret = g_filename_from_utf8 (str, -1, NULL, NULL, NULL);
if (ret == NULL) {
- g_warning ("string not in proper utf8 encoding: \"%s\"", str);
+ g_warning ("string not in proper utf8 encoding");
return g_strdup (str);
} else {
return ret;

8
x11/gnome/gdm/patches/patch-config_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_Makefile_in,v 1.13 2009/03/19 08:26:42 ajacoutot Exp $
--- config/Makefile.in.orig Thu Mar 19 06:00:25 2009
+++ config/Makefile.in Thu Mar 19 09:01:36 2009
@@ -709,18 +709,6 @@ install-data-hook: gdm.conf gdm.conf-custom Xsession I
$OpenBSD: patch-config_Makefile_in,v 1.14 2010/06/04 07:45:56 ajacoutot Exp $
--- config/Makefile.in.orig Thu Jun 3 22:34:35 2010
+++ config/Makefile.in Fri Jun 4 08:07:19 2010
@@ -694,18 +694,6 @@ install-data-hook: gdm.conf gdm.conf-custom Xsession I
chmod 755 $(DESTDIR)$(gnomercdir); \
fi

20
x11/gnome/gdm/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.16 2009/02/04 18:50:02 ajacoutot Exp $
--- configure.orig Wed Dec 10 23:26:30 2008
+++ configure Sat Jan 31 10:48:03 2009
@@ -31009,7 +31009,6 @@ fi
$OpenBSD: patch-configure,v 1.17 2010/06/04 07:45:56 ajacoutot Exp $
--- configure.orig Thu Jun 3 22:34:33 2010
+++ configure Fri Jun 4 08:07:19 2010
@@ -32153,7 +32153,6 @@ fi
if test x$with_tcp_wrappers = xno ; then
echo "TCP wrappers disabled"
else
@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.16 2009/02/04 18:50:02 ajacoutot Exp $
case "$host" in
*-*-solaris*)
if test -f /usr/lib/libwrap.so; then
@@ -31064,6 +31063,8 @@ cat >>conftest.$ac_ext <<_ACEOF
@@ -32208,6 +32207,8 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@ -18,15 +18,15 @@ $OpenBSD: patch-configure,v 1.16 2009/02/04 18:50:02 ajacoutot Exp $
char hosts_ctl ();
int
main ()
@@ -31219,7 +31220,6 @@ else
echo "$as_me: failed program was:" >&5
@@ -32373,7 +32374,6 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- LIBWRAP_PATH=""
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -33715,9 +33715,9 @@ case "$host" in
rm -rf conftest.dSYM
@@ -34956,9 +34956,9 @@ case "$host" in
;;
*openbsd*)
HOST_GDM_USER_PATH="/bin:/usr/bin"
@ -39,7 +39,7 @@ $OpenBSD: patch-configure,v 1.16 2009/02/04 18:50:02 ajacoutot Exp $
HOST_XSESSION_SHELL=/bin/sh
HOST_SOUND_PROGRAM="$real_gdm_prefix/bin/play"
HOST_GDMGNOMESESSIONCMD=gnome-session
@@ -33834,6 +33834,12 @@ else
@@ -35075,6 +35075,12 @@ else
GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
X_CONFIG_OPTIONS="-audit 0"
fi

16
x11/gnome/gdm/patches/patch-gui_gdmcommon_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-gui_gdmcommon_c,v 1.1 2010/06/04 07:45:56 ajacoutot Exp $
Make sure user password does not end-up in /var/log/messages.
GNOME bug #571846
--- gui/gdmcommon.c.orig Fri Jun 4 08:32:39 2010
+++ gui/gdmcommon.c Fri Jun 4 08:32:54 2010
@@ -812,7 +812,7 @@ ve_strftime (struct tm *the_tm, const char *format)
loc_format = g_locale_from_utf8 (format, -1, NULL, NULL, NULL);
if (loc_format == NULL) {
- g_warning ("string not in proper utf8 encoding: \"%s\"", format);
+ g_warning ("string not in proper utf8 encoding");
return NULL;
}

8
x11/gnome/gdm/patches/patch-gui_gdmsetup_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gui_gdmsetup_c,v 1.6 2008/11/21 17:43:02 jasper Exp $
--- gui/gdmsetup.c.orig Mon Jun 30 19:53:05 2008
+++ gui/gdmsetup.c Tue Nov 18 22:55:23 2008
$OpenBSD: patch-gui_gdmsetup_c,v 1.7 2010/06/04 07:45:56 ajacoutot Exp $
--- gui/gdmsetup.c.orig Thu Jun 3 03:06:25 2010
+++ gui/gdmsetup.c Fri Jun 4 08:07:19 2010
@@ -26,7 +26,6 @@
#include <string.h>
#include <unistd.h>
@ -9,7 +9,7 @@ $OpenBSD: patch-gui_gdmsetup_c,v 1.6 2008/11/21 17:43:02 jasper Exp $
#include <ctype.h>
#include <sys/socket.h>
#include <sys/types.h>
@@ -5454,7 +5453,7 @@ install_theme_file (gchar *filename, GtkListStore *sto
@@ -5456,7 +5455,7 @@ install_theme_file (gchar *filename, GtkListStore *sto
/* HACK! */
argv[0] = chown;
argv[1] = "-R";