[arch-commits] Commit in xorg-xdm/trunk (PKGBUILD xdm-call-early.patch)

[Jan de Groot]

    Date: Sunday, May 9, 2010 @ 14:34:26
  Author: jgc
Revision: 79953

upgpkg: xorg-xdm 1.1.10-1
Update to 1.1.10, should fix segfaults (FS#17095?)

Modified:
  xorg-xdm/trunk/PKGBUILD
Deleted:
  xorg-xdm/trunk/xdm-call-early.patch

----------------------+
 PKGBUILD             |    9 +++------
 xdm-call-early.patch |   46 ----------------------------------------------
 2 files changed, 3 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-09 18:26:02 UTC (rev 79952)
+++ PKGBUILD	2010-05-09 18:34:26 UTC (rev 79953)
@@ -2,8 +2,8 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xorg-xdm
-pkgver=1.1.9
-pkgrel=3
+pkgver=1.1.10
+pkgrel=1
 pkgdesc="X Display Manager"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -15,19 +15,16 @@
 source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2
         Xsession-loginshell.patch
         Xsession-xsm.patch
-	xdm-call-early.patch
         xdm.pam)
-md5sums=('030ae4bd9b8d428749d68bfdf56ce8a5'
+md5sums=('329383040cdbda5b5c8ce6c7e1120c97'
          '234ae568e7b22cbc09433bb396ff3d80'
          '2c30078c50bc653d72eb5114506eb313'
-	 '682570ce8a27e11fab33028b3ffd02a0'
          '419d6289ba6f851135f5c70c0e3cbec4')
 
 build() {
   cd "${srcdir}/xdm-${pkgver}"
   patch -Np0 -i "${srcdir}/Xsession-loginshell.patch" || return 1
   patch -Np1 -i "${srcdir}/Xsession-xsm.patch" || return 1
-  patch -Np1 -i "${srcdir}/xdm-call-early.patch" || return 1
   ./configure --prefix=/usr \
       --disable-xdm-auth \
       --disable-static \

Deleted: xdm-call-early.patch
===================================================================
--- xdm-call-early.patch	2010-05-09 18:26:02 UTC (rev 79952)
+++ xdm-call-early.patch	2010-05-09 18:34:26 UTC (rev 79953)
@@ -1,46 +0,0 @@
-diff --git a/dm.c b/dm.c
-index abe4453..8186424 100644
---- a/dm.c
-+++ b/dm.c
-@@ -75,6 +75,16 @@ from The Open Group.
- # endif
- #endif
- 
-+#if defined(HAVE_OPENLOG) && defined(HAVE_SYSLOG_H)
-+# define USE_SYSLOG
-+# include <syslog.h>
-+# ifndef LOG_AUTHPRIV
-+#  define LOG_AUTHPRIV LOG_AUTH
-+# endif
-+# ifndef LOG_PID
-+#  define LOG_PID 0
-+# endif
-+#endif
- 
- #if defined(SVR4) && !defined(sun)
- extern FILE    *fdopen();
-@@ -749,6 +759,9 @@ StartDisplay (struct display *d)
- 	    CleanUpChild ();
- 	    (void) Signal (SIGPIPE, SIG_IGN);
- 	}
-+#ifdef USE_SYSLOG
-+	openlog("xdm", LOG_PID, LOG_AUTHPRIV);
-+#endif
- 	LoadSessionResources (d);
- 	SetAuthorization (d);
- 	if (!WaitForServer (d))
-diff --git a/greeter/greet.c b/greeter/greet.c
-index 17d21c8..61c7a52 100644
---- a/greeter/greet.c
-+++ b/greeter/greet.c
-@@ -489,9 +489,6 @@ greet_user_rtn GreetUser(
- 	LogError ("Cannot reopen display %s for greet window\n", d->name);
- 	exit (RESERVER_DISPLAY);
-     }
--#ifdef USE_SYSLOG
--    openlog("xdm", LOG_ODELAY|LOG_PID, LOG_AUTHPRIV);
--#endif
- 
-     for (;;) {
- #ifdef USE_PAM
-