[xorg-x11-xdm] xdm 1.1.10
Adam Jackson
ajax at fedoraproject.org
Fri Apr 1 17:25:52 UTC 2011
commit 899af1200898525ced2d175e142b073076d56a8e
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Apr 1 13:33:14 2011 -0400
xdm 1.1.10
.gitignore | 1 +
sources | 1 +
...event.patch => xdm-1.1.10-add-audit-event.patch | 47 ++++++----
xdm-1.1.10-libdl.patch | 11 ++
xdm-1.1.6-add-needed.patch | 12 ---
xdm-1.1.6-authDir-var-bug388431.patch | 97 --------------------
xdm-1.1.6-redhat-Xresources-fix.patch | 11 --
xorg-x11-xdm.spec | 32 +++----
8 files changed, 53 insertions(+), 159 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b3d023a..716850f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
xdm-1.1.6.tar.bz2
+/xdm-1.1.10.tar.bz2
diff --git a/sources b/sources
index 4d00f11..b68d369 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
c89f8bc74fda4d19e5f374f59c88810f xdm-1.1.6.tar.bz2
+329383040cdbda5b5c8ce6c7e1120c97 xdm-1.1.10.tar.bz2
diff --git a/xdm-1.1.6-add-audit-event.patch b/xdm-1.1.10-add-audit-event.patch
similarity index 67%
rename from xdm-1.1.6-add-audit-event.patch
rename to xdm-1.1.10-add-audit-event.patch
index f867640..d2b7422 100644
--- a/xdm-1.1.6-add-audit-event.patch
+++ b/xdm-1.1.10-add-audit-event.patch
@@ -1,19 +1,21 @@
---- xdm-1.1.6.orig/config.h.in 2010-03-19 16:38:25.000000000 -0400
-+++ xdm-1.1.6.orig/config.h.in 2010-03-19 16:38:38.000000000 -0400
-@@ -171,6 +171,9 @@
+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 @@
/* Use PAM for authentication */
#undef USE_PAM
+/* Add linux audit support */
+#undef HAVE_LIBAUDIT
+
- /* Define to 1 to use Xft for text on greeter screen */
- #undef USE_XFT
-
---- xdm-1.1.6.orig/configure.ac 2010-03-19 16:38:25.000000000 -0400
-+++ xdm-1.1.6.orig/configure.ac 2010-03-19 16:38:38.000000000 -0400
-@@ -117,6 +117,29 @@ if test "x$USE_PAM" != "xno" ; then
- fi])
+ /* 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"
fi
+AC_ARG_WITH(libaudit,
@@ -38,14 +40,14 @@
+ 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)
---- xdm-1.1.6.orig/greeter/greet.c 2010-03-19 16:38:25.000000000 -0400
-+++ xdm-1.1.6.orig/greeter/greet.c 2010-03-19 16:42:30.000000000 -0400
-@@ -87,6 +87,13 @@ from The Open Group.
- #include <syslog.h>
+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
+@@ -86,6 +86,13 @@ from The Open Group.
+ # endif
#endif
+#ifdef HAVE_LIBAUDIT
@@ -55,10 +57,10 @@
+#define log_to_audit_system(l,h,s) do { ; } while (0)
+#endif
+
+ #include <string.h>
+
#if defined(SECURE_RPC) && defined(sun)
- /* Go figure, there's no getdomainname() prototype available */
- extern int getdomainname(char *name, size_t len);
-@@ -422,6 +429,29 @@ FailedLogin (struct display *d, struct g
+@@ -428,6 +435,29 @@ FailedLogin (struct display *d, struct g
#endif
}
@@ -88,14 +90,19 @@
_X_EXPORT
greet_user_rtn GreetUser(
struct display *d,
-@@ -585,8 +615,10 @@ greet_user_rtn GreetUser(
+@@ -588,6 +618,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);
+ log_to_audit_system(*pamhp, 1);
break;
} else {
+ /* Try to fill in username for failed login error log */
+@@ -600,6 +631,7 @@ greet_user_rtn GreetUser(
+ greet->name = username;
+ }
+ FailedLogin (d, greet);
+ log_to_audit_system(*pamhp, 0);
RUN_AND_CHECK_PAM_ERROR(pam_end,
(*pamhp, pam_error));
- FailedLogin (d, greet);
+ }
diff --git a/xdm-1.1.10-libdl.patch b/xdm-1.1.10-libdl.patch
new file mode 100644
index 0000000..bf87faa
--- /dev/null
+++ b/xdm-1.1.10-libdl.patch
@@ -0,0 +1,11 @@
+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
+ AM_CONDITIONAL(HAS_XDM_AUTH, test x$xdmauth = xyes -a x$xdmauth_enable != xno)
+
+ AC_SEARCH_LIBS(crypt, crypt)
++AC_SEARCH_LIBS([dlopen], [dl])
+
+ AC_SUBST(XDM_CFLAGS)
+ AC_SUBST(XDM_LIBS)
diff --git a/xorg-x11-xdm.spec b/xorg-x11-xdm.spec
index da22552..38a648b 100644
--- a/xorg-x11-xdm.spec
+++ b/xorg-x11-xdm.spec
@@ -2,8 +2,8 @@
Summary: X.Org X11 xdm - X Display Manager
Name: xorg-x11-%{pkgname}
-Version: 1.1.6
-Release: 22%{?dist}
+Version: 1.1.10
+Release: 1%{?dist}
# NOTE: Remove Epoch line if/when the package ever gets renamed.
Epoch: 1
License: MIT
@@ -22,17 +22,10 @@ Source11: xdm.pamd
Patch10: xdm-1.0.1-redhat-xdm-config-fix.patch
Patch11: xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
-# NOTE: Change authorization to be saved in /var/lib/xdm (for
-# cooperating with SELinux, see bug 388431 for more info)
-Patch12: xdm-1.1.6-authDir-var-bug388431.patch
-
-# Fix missing #endif in the Xresources (#470348)
-Patch13: xdm-1.1.6-redhat-Xresources-fix.patch
-
-Patch14: xdm-1.1.6-add-needed.patch
+Patch14: xdm-1.1.10-libdl.patch
# send a USER_LOGIN event like other login programs do.
-Patch15: xdm-1.1.6-add-audit-event.patch
+Patch15: xdm-1.1.10-add-audit-event.patch
# FIXME: Temporary build dependencies for autotool dependence.
BuildRequires: autoconf, automake, libtool
@@ -80,17 +73,15 @@ X.Org X11 xdm - X Display Manager
%patch10 -p0 -b .redhat-xdm-config-fix
%patch11 -p0 -b .redhat-sessreg-utmp-fix-bug177890
-%patch12 -p1 -b .authDir-var-bug388431
-%patch13 -p1 -b .redhat-xresources-bug470348
%patch14 -p1 -b .add-needed
%patch15 -p1 -b .add-audit-events
%build
-sed -i '/XAW_/ s/)/, xaw7)/; /XAW_/ s/XAW_CHECK_XPRINT_SUPPORT/PKG_CHECK_MODULES/' configure.ac
-aclocal ; libtoolize --force ; automake ; autoconf
+autoreconf -v --install
%configure \
--disable-static \
- --with-libaudit \
+ --with-libaudit \
+ --with-xdmlibdir=%{_libexecdir} \
--with-xdmconfigdir=%{_sysconfdir}/X11/xdm \
--with-xdmscriptdir=%{_sysconfdir}/X11/xdm \
--with-pixmapdir=%{_datadir}/xdm/pixmaps
@@ -147,13 +138,16 @@ mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/xdm
%dir %{_datadir}/xdm/pixmaps
%{_datadir}/xdm/pixmaps/xorg-bw.xpm
%{_datadir}/xdm/pixmaps/xorg.xpm
-%dir %{_libdir}/X11/xdm
%dir %{_sharedstatedir}/xdm
-%{_libdir}/X11/xdm/chooser
-%{_libdir}/X11/xdm/libXdmGreet.so
+%{_libexecdir}/chooser
+%{_libexecdir}/libXdmGreet.so
%{_mandir}/man1/*.1*
%changelog
+* Fri Apr 01 2011 Adam Jackson <ajax at redhat.com> 1.1.10-1
+- xdm 1.1.10
+- move chooser to %%_libexecdir
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.1.6-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list