aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/0056_nx-X11_Werror-format-security.full.patch
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-08-03 09:41:21 +0200
committerMihai Moldovan <ionic@ionic.de>2017-08-03 09:41:21 +0200
commit6ae091cc27f90bd431e4d9564c760fa209f8efb8 (patch)
tree253588fb5860a00d39e957085a08a0dfcd736927 /debian/patches/0056_nx-X11_Werror-format-security.full.patch
parenta4fb30f8d0dc188821ac61d64d113a6ae6156b95 (diff)
downloadnx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.tar.gz
nx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.tar.bz2
nx-libs-6ae091cc27f90bd431e4d9564c760fa209f8efb8.zip
debian/patches: refresh all patches.
Removes some fuzziness and adds the -p diff option to show the C function name in hunk headers.
Diffstat (limited to 'debian/patches/0056_nx-X11_Werror-format-security.full.patch')
-rw-r--r--debian/patches/0056_nx-X11_Werror-format-security.full.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/0056_nx-X11_Werror-format-security.full.patch b/debian/patches/0056_nx-X11_Werror-format-security.full.patch
index a047de774..e29a5eb0f 100644
--- a/debian/patches/0056_nx-X11_Werror-format-security.full.patch
+++ b/debian/patches/0056_nx-X11_Werror-format-security.full.patch
@@ -6,7 +6,7 @@ Abstract:
idea why.
--- a/nx-X11/lib/xtrans/Xtransint.h
+++ b/nx-X11/lib/xtrans/Xtransint.h
-@@ -444,7 +444,7 @@
+@@ -444,7 +444,7 @@ static int trans_mkdir (
int hack= 0, saveerrno=errno; \
struct timeval tp;\
gettimeofday(&tp,0); \
@@ -15,7 +15,7 @@ Abstract:
ErrorF(x+hack,a,b,c); \
ErrorF("timestamp (ms): %d\n",tp.tv_sec*1000+tp.tv_usec/1000); \
errno=saveerrno; \
-@@ -454,7 +454,7 @@
+@@ -454,7 +454,7 @@ static int trans_mkdir (
int hack= 0, saveerrno=errno; \
struct timeval tp;\
gettimeofday(&tp,0); \
@@ -24,7 +24,7 @@ Abstract:
fprintf(stderr, x+hack,a,b,c); fflush(stderr); \
fprintf(stderr, "timestamp (ms): %d\n",tp.tv_sec*1000+tp.tv_usec/1000); \
fflush(stderr); \
-@@ -466,14 +466,14 @@
+@@ -466,14 +466,14 @@ static int trans_mkdir (
/* Use ErrorF() for the X server */
#define PRMSG(lvl,x,a,b,c) if (lvl <= XTRANSDEBUG){ \
int hack= 0, saveerrno=errno; \
@@ -43,7 +43,7 @@ Abstract:
} else ((void)0)
--- a/nx-X11/programs/nxauth/process.c
+++ b/nx-X11/programs/nxauth/process.c
-@@ -974,7 +974,7 @@
+@@ -974,7 +974,7 @@ fprintfhex(register FILE *fp, int len, c
char *hex;
hex = bintohex(len, cp);
@@ -54,7 +54,7 @@ Abstract:
--- a/nx-X11/programs/Xserver/GL/glx/glximports.c
+++ b/nx-X11/programs/Xserver/GL/glx/glximports.c
-@@ -110,12 +110,12 @@
+@@ -110,12 +110,12 @@ void *__glXImpRealloc(__GLcontext *gc, v
void __glXImpWarning(__GLcontext *gc, char *msg)
{
@@ -71,7 +71,7 @@ Abstract:
--- a/nx-X11/programs/Xserver/hw/nxagent/Error.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c
-@@ -232,7 +232,7 @@
+@@ -232,7 +232,7 @@ static int nxagentPrintError(dpy, event,
int nxagentExitHandler(const char *message)
{
@@ -82,7 +82,7 @@ Abstract:
}
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
-@@ -481,7 +481,7 @@
+@@ -481,7 +481,7 @@ void OsVendorVErrorFFunction(const char
nxagentStartRedirectToClientsLog();
@@ -93,7 +93,7 @@ Abstract:
}
--- a/nx-X11/programs/Xserver/os/log.c
+++ b/nx-X11/programs/Xserver/os/log.c
-@@ -692,9 +692,9 @@
+@@ -692,9 +692,9 @@ Error(char *str)
return;
sprintf(err, "%s: ", str);
strcat(err, strerror(saveErrno));