rpms/gdm/devel gdm-2.15.6-security-tokens.patch,1.4,1.5

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jul 19 18:20:21 UTC 2006


Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19796

Modified Files:
	gdm-2.15.6-security-tokens.patch 
Log Message:
remove aclocal changes from security patch


gdm-2.15.6-security-tokens.patch:
 config/Makefile.am            |   35 +
 config/gdm                    |   16 
 config/gdm-autologin          |   17 
 config/gdm-securitytokens     |   10 
 config/gdm.conf.in            |    7 
 config/securitytokens.conf.in |    5 
 configure.ac                  |    3 
 daemon/Makefile.am            |    7 
 daemon/gdm.c                  |  163 ++++++++
 daemon/gdmconfig.c            |   26 +
 daemon/gdmconfig.h            |    3 
 daemon/securitytoken.c        |  602 ++++++++++++++++++++++++++++++
 daemon/securitytoken.h        |  101 +++++
 daemon/securitytokenmonitor.c |  840 ++++++++++++++++++++++++++++++++++++++++++
 daemon/securitytokenmonitor.h |   81 ++++
 daemon/verify-pam.c           |    5 
 16 files changed, 1900 insertions(+), 21 deletions(-)

Index: gdm-2.15.6-security-tokens.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.15.6-security-tokens.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdm-2.15.6-security-tokens.patch	19 Jul 2006 02:38:06 -0000	1.4
+++ gdm-2.15.6-security-tokens.patch	19 Jul 2006 18:20:18 -0000	1.5
@@ -1,307 +1,3 @@
---- gdm-2.15.6/aclocal.m4
-+++ gdm-2.15.6/aclocal.m4
-@@ -552,6 +552,228 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
-   AC_SUBST(WARN_CXXFLAGS)
- ])
- 
-+dnl GNOME_DOC_INIT([MINIMUM-VERSION])
-+
-+AC_DEFUN([GNOME_DOC_INIT],
-+[
-+dnl Only apply the version check if we're not configuring ourselves!
-+if test "x$PACKAGE" != "xgnome-doc-utils"; then
-+  GDU_REQUIRED_VERSION=0.3.2
-+  if test -n "$1"; then
-+    GDU_REQUIRED_VERSION=$1
-+  fi
-+
-+  PKG_CHECK_MODULES([GDU_MODULE_VERSION_CHECK],[gnome-doc-utils >= $GDU_REQUIRED_VERSION])
-+fi
-+
-+AC_ARG_WITH([help-dir],
-+  AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
-+  [with_help_dir='${datadir}/gnome/help'])
-+HELP_DIR="$with_help_dir"
-+AC_SUBST(HELP_DIR)
-+
-+AC_ARG_WITH([omf-dir],
-+  AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
-+  [with_omf_dir='${datadir}/omf'])
-+OMF_DIR="$with_omf_dir"
-+AC_SUBST(OMF_DIR)
-+
-+AC_ARG_WITH([help-formats],
-+  AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
-+  [with_help_formats=''])
-+DOC_USER_FORMATS="$with_help_formats"
-+AC_SUBST(DOC_USER_FORMATS)
-+
-+AC_ARG_ENABLE([scrollkeeper],
-+	[AC_HELP_STRING([--disable-scrollkeeper],
-+			[do not make updates to the scrollkeeper database])],,
-+	enable_scrollkeeper=yes)
-+AM_CONDITIONAL(ENABLE_SK, test "x$enable_scrollkeeper" = "xyes")
-+
-+])
-+
-+
-+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-+# serial 35 IT_PROG_INTLTOOL
-+AC_DEFUN([IT_PROG_INTLTOOL],
-+[AC_PREREQ([2.50])dnl
-+
-+case "$am__api_version" in
-+    1.[01234])
-+	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-+    ;;
-+    *)
-+    ;;
-+esac
-+
-+if test -n "$1"; then
-+    AC_MSG_CHECKING(for intltool >= $1)
-+
-+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-+    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
-+    [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
-+    ]
-+    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-+    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-+	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
-+fi
-+
-+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
-+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+
-+AC_SUBST(INTLTOOL_DESKTOP_RULE)
-+AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-+AC_SUBST(INTLTOOL_KEYS_RULE)
-+AC_SUBST(INTLTOOL_PROP_RULE)
-+AC_SUBST(INTLTOOL_OAF_RULE)
-+AC_SUBST(INTLTOOL_PONG_RULE)
-+AC_SUBST(INTLTOOL_SERVER_RULE)
-+AC_SUBST(INTLTOOL_SHEET_RULE)
-+AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
-+AC_SUBST(INTLTOOL_UI_RULE)
-+AC_SUBST(INTLTOOL_XAM_RULE)
-+AC_SUBST(INTLTOOL_KBD_RULE)
-+AC_SUBST(INTLTOOL_XML_RULE)
-+AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-+AC_SUBST(INTLTOOL_CAVES_RULE)
-+AC_SUBST(INTLTOOL_SCHEMAS_RULE)
-+AC_SUBST(INTLTOOL_THEME_RULE)
-+AC_SUBST(INTLTOOL_SERVICE_RULE)
-+
-+# Use the tools built into the package, not the ones that are installed.
-+AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-+AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
-+AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
-+
-+AC_PATH_PROG(INTLTOOL_PERL, perl)
-+if test -z "$INTLTOOL_PERL"; then
-+   AC_MSG_ERROR([perl not found; required for intltool])
-+fi
-+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-+   AC_MSG_ERROR([perl 5.x required for intltool])
-+fi
-+if test "x$2" != "xno-xml"; then
-+   AC_MSG_CHECKING([for XML::Parser])
-+   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-+       AC_MSG_RESULT([ok])
-+   else
-+       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-+   fi
-+fi
-+
-+AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
-+AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
-+AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
-+AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
-+
-+# Substitute ALL_LINGUAS so we can use it in po/Makefile
-+AC_SUBST(ALL_LINGUAS)
-+    
-+IT_PO_SUBDIR([po])
-+
-+dnl The following is very similar to
-+dnl
-+dnl	AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
-+dnl
-+dnl with the following slight differences:
-+dnl  - the *.in files are in ac_aux_dir,
-+dnl  - if the file haven't changed upon reconfigure, it's not touched,
-+dnl  - the evaluation of the third parameter enables a hack which computes
-+dnl    the actual value of $libdir,
-+dnl  - the user sees "executing intltool commands", instead of
-+dnl    "creating intltool-extract" and such.
-+dnl
-+dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
-+dnl a reason for it.
-+
-+AC_CONFIG_COMMANDS([intltool], [
-+
-+for file in intltool-extract intltool-merge intltool-update; do
-+  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-+      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
-+      -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
-+      -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
-+      -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
-+      -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
-+      -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
-+	< ${ac_aux_dir}/${file}.in > ${file}.out
-+  if cmp -s ${file} ${file}.out 2>/dev/null; then
-+    rm -f ${file}.out
-+  else
-+    mv -f ${file}.out ${file}
-+  fi
-+  chmod ugo+x ${file}
-+  chmod u+w ${file}
-+done
-+
-+],
-+[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
-+prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" 
-+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-+INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-+INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
-+
-+])
-+
-+
-+# IT_PO_SUBDIR(DIRNAME)
-+# ---------------------
-+# All po subdirs have to be declared with this macro; the subdir "po" is
-+# declared by IT_PROG_INTLTOOL.
-+#
-+AC_DEFUN([IT_PO_SUBDIR],
-+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-+dnl
-+dnl The following CONFIG_COMMANDS should be exetuted at the very end
-+dnl of config.status.
-+AC_CONFIG_COMMANDS_PRE([
-+  AC_CONFIG_COMMANDS([$1/stamp-it], [
-+    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-+    >"$1/stamp-it.tmp"
-+    [sed '/^#/d
-+	 s/^[[].*] *//
-+	 /^[ 	]*$/d
-+	'"s|^|	$ac_top_srcdir/|" \
-+      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-+    ]
-+    if test ! -f "$1/Makefile"; then
-+      AC_MSG_ERROR([$1/Makefile is not ready.])
-+    fi
-+    mv "$1/Makefile" "$1/Makefile.tmp"
-+    [sed '/^POTFILES =/,/[^\\]$/ {
-+		/^POTFILES =/!d
-+		r $1/POTFILES
-+	  }
-+	 ' "$1/Makefile.tmp" >"$1/Makefile"]
-+    rm -f "$1/Makefile.tmp"
-+    mv "$1/stamp-it.tmp" "$1/stamp-it"
-+  ])
-+])dnl
-+])
-+
-+
-+# deprecated macros
-+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-+# A hint is needed for aclocal from Automake <= 1.9.4:
-+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-+
-+
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- 
- # serial 48 AC_PROG_LIBTOOL
-@@ -2138,7 +2360,7 @@ linux*)
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-   fi
- 
-@@ -4846,6 +5068,9 @@ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
- # Is the compiler the GNU C compiler?
- with_gcc=$_LT_AC_TAGVAR(GCC, $1)
- 
-+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-+gcc_ver=\`gcc -dumpversion\`
-+
- # An ERE matcher.
- EGREP=$lt_EGREP
- 
-@@ -4979,11 +5204,11 @@ striplib=$lt_striplib
- 
- # Dependencies to place before the objects being linked to create a
- # shared library.
--predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-+predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
- 
- # Dependencies to place after the objects being linked to create a
- # shared library.
--postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-+postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
- 
- # Dependencies to place before the objects being linked to create a
- # shared library.
-@@ -4995,7 +5220,7 @@ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $
- 
- # The library search path used internally by the compiler when linking
- # a shared library.
--compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-+compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
- 
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-@@ -5075,7 +5300,7 @@ # Whether libtool must link a program ag
- link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
- 
- # Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
- 
- # Run-time system search path for libraries
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-@@ -6911,6 +7136,7 @@ do
-     done
-   done
- done
-+IFS=$as_save_IFS
- lt_ac_max=0
- lt_ac_count=0
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -6943,6 +7169,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp
- done
- ])
- SED=$lt_cv_path_SED
-+AC_SUBST([SED])
- AC_MSG_RESULT([$SED])
- ])
- 
-@@ -7981,5 +8208,3 @@ AC_SUBST([am__tar])
- AC_SUBST([am__untar])
- ]) # _AM_PROG_TAR
- 
--m4_include([m4/gnome-doc-utils.m4])
--m4_include([m4/intltool.m4])
 --- gdm-2.15.6/config/Makefile.am
 +++ gdm-2.15.6/config/Makefile.am
 @@ -26,6 +26,7 @@ EXTRA_DIST = \




More information about the fedora-cvs-commits mailing list