Update to sessreg 1.1.1

6 files changed, 83 insertions, 16 deletions

diff --git a/app/sessreg/ChangeLog b/app/sessreg/ChangeLog
index 1364ac783..efcc43505 100644
--- a/app/sessreg/ChangeLog
+++ b/app/sessreg/ChangeLog
@@ -1,3 +1,70 @@
+commit 5457109783ee82599aeb6c6a690cc921a881d6bf
+Author: Matt Turner <mattst88@gmail.com>
+Date:   Mon Feb 27 18:25:03 2017 -0800
+
+    sessreg 1.1.1
+    
+    Signed-off-by: Matt Turner <mattst88@gmail.com>
+
+commit 77befa7b9af5c69d1b715cba925f6e1e5e62ce68
+Author: Mihail Konev <k.mvc@ya.ru>
+Date:   Thu Jan 26 14:00:20 2017 +1000
+
+    autogen: add default patch prefix
+    
+    Signed-off-by: Mihail Konev <k.mvc@ya.ru>
+
+commit 7ebff8dedf3a0d67c475a1e216a0fb056e053c4e
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date:   Mon Mar 9 12:00:52 2015 +0000
+
+    autogen.sh: use quoted string variables
+    
+    Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
+    fall-outs, when they contain space.
+    
+    Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 37d8e5a28003e26b39e0fa6322acf8bcb8ca1823
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Jan 24 10:32:07 2017 +1000
+
+    autogen.sh: use exec instead of waiting for configure to finish
+    
+    Syncs the invocation of configure with the one from the server.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+    Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+
+commit eb41dc747ec4b0b4c40d6482081a0c7782dca8d9
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun May 29 23:56:29 2016 +0200
+
+    Use off_t instead of long to make largefile support work
+    
+    We already use the macro AC_SYS_LARGEFILE in configure.ac. This will only
+    work properly if the correct types are used as well: replace long by off_t
+    when calculating file offsets - which makes a difference on 32-bit systems.
+    
+    http://bugzilla.opensuse.org/show_bug.cgi?id=981522
+    
+    Signed-off-by: Egbert Eich <eich@suse.de>
+    Found-by: Herbert Kütz <herbert.kuetz@ofd-z.niedersachsen.de>
+    Reviewed-by: Stefan Dirsch <sndirsch@suse.de>
+
+commit 93f5d5abf6b214a4b36e00cd09174d24b2ed0a6d
+Author: Stefan Dirsch <sndirsch@suse.de>
+Date:   Wed Sep 9 23:44:06 2015 +0200
+
+    Pass -P to the preprocessor when generating filenames for the manpage.
+    
+    Fixes build with GCC 5. Patch by Richard Biener <rguenther@suse.com>
+    
+    Tested-by: Matt Turner <mattst88@gmail.com>
+    Signed-off-by: Matt Turner <mattst88@gmail.com>
+
 commit 0f904e33d53b0102e53685184bb59005be40fcf7
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Mon Jan 19 21:00:17 2015 -0800
diff --git a/app/sessreg/configure b/app/sessreg/configure
index 3767f3ea9..d3bf34a8d 100644
--- a/app/sessreg/configure
+++ b/app/sessreg/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sessreg 1.1.0.
+# Generated by GNU Autoconf 2.69 for sessreg 1.1.1.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -581,8 +581,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sessreg'
 PACKAGE_TARNAME='sessreg'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='sessreg 1.1.0'
+PACKAGE_VERSION='1.1.1'
+PACKAGE_STRING='sessreg 1.1.1'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 PACKAGE_URL=''
 
@@ -1319,7 +1319,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sessreg 1.1.0 to adapt to many kinds of systems.
+\`configure' configures sessreg 1.1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1389,7 +1389,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sessreg 1.1.0:";;
+     short | recursive ) echo "Configuration of sessreg 1.1.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1507,7 +1507,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sessreg configure 1.1.0
+sessreg configure 1.1.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2033,7 +2033,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sessreg $as_me 1.1.0, which was
+It was created by sessreg $as_me 1.1.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4373,7 +4373,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sessreg'
- VERSION='1.1.0'
+ VERSION='1.1.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11761,7 +11761,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sessreg $as_me 1.1.0, which was
+This file was extended by sessreg $as_me 1.1.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11827,7 +11827,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-sessreg config.status 1.1.0
+sessreg config.status 1.1.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/app/sessreg/configure.ac b/app/sessreg/configure.ac
index c9ebac86a..542502fb4 100644
--- a/app/sessreg/configure.ac
+++ b/app/sessreg/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([sessreg], [1.1.0],
+AC_INIT([sessreg], [1.1.1],
 	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [sessreg])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
diff --git a/app/sessreg/man/Makefile.am b/app/sessreg/man/Makefile.am
index 665ace5c7..2e5f146bd 100644
--- a/app/sessreg/man/Makefile.am
+++ b/app/sessreg/man/Makefile.am
@@ -9,7 +9,7 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 filenames.sed: filenames.sed.c
-	$(AM_V_GEN)$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_V_GEN)$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	    $(AM_CPPFLAGS) $(CPPFLAGS) $(srcdir)/filenames.sed.c | \
 	    $(SED) -n -e '/s|__/ p' -e '/^\/__/ p' > $@
 
diff --git a/app/sessreg/man/Makefile.in b/app/sessreg/man/Makefile.in
index 7de9cf061..ab9227c7a 100644
--- a/app/sessreg/man/Makefile.in
+++ b/app/sessreg/man/Makefile.in
@@ -453,7 +453,7 @@ uninstall-am: uninstall-appmanDATA
 	pdf-am ps ps-am uninstall uninstall-am uninstall-appmanDATA
 
 filenames.sed: filenames.sed.c
-	$(AM_V_GEN)$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_V_GEN)$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	    $(AM_CPPFLAGS) $(CPPFLAGS) $(srcdir)/filenames.sed.c | \
 	    $(SED) -n -e '/s|__/ p' -e '/^\/__/ p' > $@
 
diff --git a/app/sessreg/sessreg.c b/app/sessreg/sessreg.c
index a86724b32..0a8fdb2db 100644
--- a/app/sessreg/sessreg.c
+++ b/app/sessreg/sessreg.c
@@ -366,7 +366,7 @@ main (int argc, char **argv)
 # else
 		utmp = open (utmp_file, O_RDWR);
 		if (utmp != -1) {
-			syserr ((int) lseek (utmp, (long) slot_number * sizeof (struct utmp), 0), "lseek");
+			syserr ((int) lseek (utmp, (off_t) slot_number * sizeof (struct utmp), 0), "lseek");
 			sysnerr (write (utmp, (char *) &utmp_entry, sizeof (utmp_entry))
 					== sizeof (utmp_entry), "write utmp entry");
 			close (utmp);
@@ -401,7 +401,7 @@ main (int argc, char **argv)
 		if (llog != -1) {
 			struct lastlog ll;
 
-			sysnerr (lseek(llog, (long) (pwd->pw_uid*sizeof(ll)), 0)
+			sysnerr (lseek(llog, (off_t) (pwd->pw_uid*sizeof(ll)), 0)
 					!= -1, "seeking lastlog entry");
 			memset(&ll, 0, sizeof(ll));
 			ll.ll_time = current_time;
@@ -668,7 +668,7 @@ findslot (char *line_name, char *host_name, int addp, int slot)
 	 * first, try to locate a previous entry for this display
 	 * also record location of a free slots in case we need a new one
 	 */
-	syserr ((int) lseek (utmp, (long) slot * sizeof (struct utmp), 0), "lseek");
+	syserr ((int) lseek (utmp, (off_t) slot * sizeof (struct utmp), 0), "lseek");
 
 	if (!host_name)
 		host_name = "";