diff --git a/debian/changelog b/debian/changelog index 36a0c0f..8614226 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ x11-xserver-utils (7.7+1) UNRELEASED; urgency=low - Clarify .Xresources vs. .Xdefaults in man page (closes: #649187) - Ensure we don't read out of ClassName array bounds for unknown visual type (closes: #488535) + * Update/refresh patches. -- Robert Hooker <sarvatt@ubuntu.com> Wed, 15 May 2013 12:08:34 -0400 diff --git a/debian/patches/01_sessreg_implement_hostname_hashing.diff b/debian/patches/01_sessreg_implement_hostname_hashing.diff index c2cd84f..d1ed5f7 100644 --- a/debian/patches/01_sessreg_implement_hostname_hashing.diff +++ b/debian/patches/01_sessreg_implement_hostname_hashing.diff @@ -39,12 +39,12 @@ Index: x11-xserver-utils/sessreg/sessreg.c + static int wflag, uflag, lflag; static const char *wtmp_file, *utmp_file; - static char *line; -@@ -397,21 +409,23 @@ set_utmp (struct utmp *u, char *line, ch + #ifdef USE_UTMPX +@@ -399,21 +411,23 @@ set_utmp (struct utmp *u, char *line, ch memset (u->ut_name, 0, sizeof (u->ut_name)); #ifdef HAVE_STRUCT_UTMP_UT_ID if (line) { -- int i; +- size_t i; /* - * this is a bit crufty, but - * follows the apparent conventions in @@ -76,7 +76,7 @@ Index: x11-xserver-utils/sessreg/sessreg.c memset (u->ut_id, 0, sizeof (u->ut_id)); #endif #ifdef HAVE_STRUCT_UTMP_UT_PID -@@ -660,3 +674,129 @@ findslot (char *line_name, char *host_na +@@ -662,3 +676,129 @@ findslot (char *line_name, char *host_na return freeslot; } #endif diff --git a/debian/patches/02_xmodmap-include-config.h-before-system-headers.diff b/debian/patches/02_xmodmap-include-config.h-before-system-headers.diff index 583c99c..f793b48 100644 --- a/debian/patches/02_xmodmap-include-config.h-before-system-headers.diff +++ b/debian/patches/02_xmodmap-include-config.h-before-system-headers.diff @@ -13,13 +13,13 @@ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> xmodmap.c | 4 ++++ 3 files changed, 12 insertions(+) -diff --git a/xmodmap/exec.c b/xmodmap/exec.c -index dbcb669..419b10e 100644 ---- a/xmodmap/exec.c -+++ b/xmodmap/exec.c -@@ -54,6 +54,10 @@ from The Open Group. - * original xmodmap, written by David Rosenthal, of Sun Microsystems. - */ +Index: x11-xserver-utils/xmodmap/exec.c +=================================================================== +--- x11-xserver-utils.orig/xmodmap/exec.c ++++ x11-xserver-utils/xmodmap/exec.c +@@ -62,6 +62,10 @@ from The Open Group. + #include <X11/Xwindows.h> + #endif +#ifdef HAVE_CONFIG_H +# include "config.h" @@ -28,13 +28,13 @@ index dbcb669..419b10e 100644 #include <X11/Xos.h> #include <X11/Xlib.h> #include <stdio.h> -diff --git a/xmodmap/pf.c b/xmodmap/pf.c -index 0eb0f55..3f0c3f4 100644 ---- a/xmodmap/pf.c -+++ b/xmodmap/pf.c -@@ -26,6 +26,10 @@ from The Open Group. - - */ +Index: x11-xserver-utils/xmodmap/pf.c +=================================================================== +--- x11-xserver-utils.orig/xmodmap/pf.c ++++ x11-xserver-utils/xmodmap/pf.c +@@ -30,6 +30,10 @@ from The Open Group. + # include "config.h" + #endif +#ifdef HAVE_CONFIG_H +# include "config.h" @@ -43,13 +43,13 @@ index 0eb0f55..3f0c3f4 100644 #include <X11/Xos.h> #include <X11/Xlib.h> #include <stdio.h> -diff --git a/xmodmap/xmodmap.c b/xmodmap/xmodmap.c -index 58a8e70..0f89629 100644 ---- a/xmodmap/xmodmap.c -+++ b/xmodmap/xmodmap.c -@@ -26,6 +26,10 @@ from The Open Group. - - */ +Index: x11-xserver-utils/xmodmap/xmodmap.c +=================================================================== +--- x11-xserver-utils.orig/xmodmap/xmodmap.c ++++ x11-xserver-utils/xmodmap/xmodmap.c +@@ -30,6 +30,10 @@ from The Open Group. + # include "config.h" + #endif +#ifdef HAVE_CONFIG_H +# include "config.h" @@ -58,6 +58,3 @@ index 58a8e70..0f89629 100644 #include <X11/Xos.h> #include <X11/Xlib.h> #include <stdio.h> --- -1.7.10 -