[xorg-x11-xdm: 1/2] Don't download old tarball.
Matej Cepl
mcepl at fedoraproject.org
Mon Sep 26 18:09:46 UTC 2011
commit b2fac8b6f5aaed1b603a5785de75e4fd5090c4b4
Author: Matěj Cepl <mcepl at redhat.com>
Date: Mon Aug 8 21:33:15 2011 +0200
Don't download old tarball.
.gitignore | 1 +
sources | 3 +-
xdm-1.0.1-redhat-xdm-config-fix.patch | 11 -------
xdm-1.1.10-add-audit-event.patch | 49 +++++++++++++++++----------------
xdm-1.1.10-libdl.patch | 7 ++---
xorg-x11-xdm.spec | 13 ++++-----
6 files changed, 36 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 716850f..581fc15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
xdm-1.1.6.tar.bz2
/xdm-1.1.10.tar.bz2
+/xdm-1.1.11.tar.bz2
diff --git a/sources b/sources
index b68d369..3ffb06d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-c89f8bc74fda4d19e5f374f59c88810f xdm-1.1.6.tar.bz2
-329383040cdbda5b5c8ce6c7e1120c97 xdm-1.1.10.tar.bz2
+64a1af1f7eb69feae12e75d4cc3aaf19 xdm-1.1.11.tar.bz2
diff --git a/xdm-1.1.10-add-audit-event.patch b/xdm-1.1.10-add-audit-event.patch
index d2b7422..12a8ea8 100644
--- a/xdm-1.1.10-add-audit-event.patch
+++ b/xdm-1.1.10-add-audit-event.patch
@@ -1,21 +1,21 @@
-diff -up ./config.h.in.add-audit-events ./config.h.in
---- ./config.h.in.add-audit-events 2010-04-09 22:20:26.000000000 -0400
-+++ ./config.h.in 2011-04-01 12:40:49.000000000 -0400
-@@ -196,6 +196,9 @@
+diff -up xdm-1.1.11/config.h.in.add-audit-events xdm-1.1.11/config.h.in
+--- xdm-1.1.11/config.h.in.add-audit-events 2011-09-25 09:42:16.000000000 +0200
++++ xdm-1.1.11/config.h.in 2011-09-26 17:44:21.796495208 +0200
+@@ -193,6 +193,9 @@
/* Use PAM for authentication */
#undef USE_PAM
+/* Add linux audit support */
+#undef HAVE_LIBAUDIT
+
- /* Enable extensions on AIX 3, Interix. */
- #ifndef _ALL_SOURCE
- # undef _ALL_SOURCE
-diff -up ./configure.ac.add-audit-events ./configure.ac
---- ./configure.ac.add-audit-events 2010-04-09 21:49:03.000000000 -0400
-+++ ./configure.ac 2011-04-01 12:41:22.000000000 -0400
-@@ -148,6 +148,28 @@ if test "x$USE_SELINUX" != "xno" ; then
- LIBS="$old_LIBS"
+ /* Use Security-Enhanced Linux (SELinux) support */
+ #undef USE_SELINUX
+
+diff -up xdm-1.1.11/configure.ac.add-audit-events xdm-1.1.11/configure.ac
+--- xdm-1.1.11/configure.ac.add-audit-events 2011-09-25 09:41:19.000000000 +0200
++++ xdm-1.1.11/configure.ac 2011-09-26 17:43:30.616557363 +0200
+@@ -145,6 +145,29 @@ if test "x$USE_SELINUX" != "xno" ; then
+ )
fi
+AC_ARG_WITH(libaudit,
@@ -40,12 +40,13 @@ diff -up ./configure.ac.add-audit-events ./configure.ac
+ AC_DEFINE(HAVE_LIBAUDIT,1,[linux audit support])
+fi
+
- # FIXME: Find better test for which OS'es use su -m - for now, just try to
- # mirror the Imakefile setting of:
- # if defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(DarwinArchitecture)
-diff -up ./greeter/greet.c.add-audit-events ./greeter/greet.c
---- ./greeter/greet.c.add-audit-events 2010-04-09 21:49:03.000000000 -0400
-+++ ./greeter/greet.c 2011-04-01 12:43:21.000000000 -0400
++
+ # Check whether to install systemd unit files, as suggested in daemon(7).
+ AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
+ [Directory for systemd service files (default from the System and Service Manager)]),,
+diff -up xdm-1.1.11/greeter/greet.c.add-audit-events xdm-1.1.11/greeter/greet.c
+--- xdm-1.1.11/greeter/greet.c.add-audit-events 2011-09-25 09:35:47.000000000 +0200
++++ xdm-1.1.11/greeter/greet.c 2011-09-26 17:46:11.996361376 +0200
@@ -86,6 +86,13 @@ from The Open Group.
# endif
#endif
@@ -60,8 +61,8 @@ diff -up ./greeter/greet.c.add-audit-events ./greeter/greet.c
#include <string.h>
#if defined(SECURE_RPC) && defined(sun)
-@@ -428,6 +435,29 @@ FailedLogin (struct display *d, struct g
- #endif
+@@ -415,6 +422,29 @@ FailedLogin (struct display *d, const ch
+ DrawFail (login);
}
+#ifdef USE_PAM
@@ -90,7 +91,7 @@ diff -up ./greeter/greet.c.add-audit-events ./greeter/greet.c
_X_EXPORT
greet_user_rtn GreetUser(
struct display *d,
-@@ -588,6 +618,7 @@ greet_user_rtn GreetUser(
+@@ -600,6 +630,7 @@ greet_user_rtn GreetUser(
if ((pam_error == PAM_SUCCESS) && (Verify (d, greet, verify))) {
SetPrompt (login, 1, "Login Successful", LOGIN_TEXT_INFO, False);
SetValue (login, 1, NULL);
@@ -98,10 +99,10 @@ diff -up ./greeter/greet.c.add-audit-events ./greeter/greet.c
break;
} else {
/* Try to fill in username for failed login error log */
-@@ -600,6 +631,7 @@ greet_user_rtn GreetUser(
- greet->name = username;
+@@ -611,6 +642,7 @@ greet_user_rtn GreetUser(
+ (void *) &username));
}
- FailedLogin (d, greet);
+ FailedLogin (d, username);
+ log_to_audit_system(*pamhp, 0);
RUN_AND_CHECK_PAM_ERROR(pam_end,
(*pamhp, pam_error));
diff --git a/xdm-1.1.10-libdl.patch b/xdm-1.1.10-libdl.patch
index bf87faa..1aa672f 100644
--- a/xdm-1.1.10-libdl.patch
+++ b/xdm-1.1.10-libdl.patch
@@ -1,7 +1,6 @@
-diff -up xdm-1.1.10/configure.ac.jx xdm-1.1.10/configure.ac
---- xdm-1.1.10/configure.ac.jx 2010-04-09 21:49:03.000000000 -0400
-+++ xdm-1.1.10/configure.ac 2011-04-01 13:24:14.000000000 -0400
-@@ -454,6 +454,7 @@ fi
+--- configure.ac.jx 2010-04-09 21:49:03.000000000 -0400
++++ configure.ac 2011-04-01 13:24:14.000000000 -0400
+@@ -454,6 +454,7 @@
AM_CONDITIONAL(HAS_XDM_AUTH, test x$xdmauth = xyes -a x$xdmauth_enable != xno)
AC_SEARCH_LIBS(crypt, crypt)
diff --git a/xorg-x11-xdm.spec b/xorg-x11-xdm.spec
index 38a648b..7d728ad 100644
--- a/xorg-x11-xdm.spec
+++ b/xorg-x11-xdm.spec
@@ -2,7 +2,7 @@
Summary: X.Org X11 xdm - X Display Manager
Name: xorg-x11-%{pkgname}
-Version: 1.1.10
+Version: 1.1.11
Release: 1%{?dist}
# NOTE: Remove Epoch line if/when the package ever gets renamed.
Epoch: 1
@@ -16,12 +16,9 @@ Source10: xdm.init
Source11: xdm.pamd
# Following are Fedora specific patches
-
-# NOTE: Change xdm-config to invoke Xwilling with "-s /bin/bash" instead
-# of "-c" to fix bug (#86505)
-Patch10: xdm-1.0.1-redhat-xdm-config-fix.patch
Patch11: xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
+# FIXME Most likely not needed
Patch14: xdm-1.1.10-libdl.patch
# send a USER_LOGIN event like other login programs do.
@@ -71,9 +68,8 @@ X.Org X11 xdm - X Display Manager
%prep
%setup -q -n %{pkgname}-%{version}
-%patch10 -p0 -b .redhat-xdm-config-fix
%patch11 -p0 -b .redhat-sessreg-utmp-fix-bug177890
-%patch14 -p1 -b .add-needed
+#%_patch14 -p1 -b .add-needed
%patch15 -p1 -b .add-audit-events
%build
@@ -144,6 +140,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/xdm
%{_mandir}/man1/*.1*
%changelog
+* Mon Sep 26 2011 Matěj Cepl <mcepl at redhat.com> - 1.1.11-1
+- New upstream release (#741101)
+
* Fri Apr 01 2011 Adam Jackson <ajax at redhat.com> 1.1.10-1
- xdm 1.1.10
- move chooser to %%_libexecdir
More information about the scm-commits
mailing list