From 85e87ab6c7612d014ed90aa91fc0f08fa9e89890 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 31 Dec 2011 03:18:07 +0100 Subject: Add patch headers to all patch files, report most patches upstream. Waiting for feedback and quotable URLs from NoMachine. --- debian/changelog | 2 ++ debian/patches/001_add-main-makefile.patch | 5 +++++ .../002_nxcompshad_build-against-nx-x11-only.patch | 9 ++++++++- debian/patches/003_nxcompshad_gcc43.patch | 7 +++++++ debian/patches/004_nx-x11_fix-nxcompshad-build.patch | 7 +++++++ debian/patches/007_nxcompshad_clean-gch-files.patch | 6 ++++++ debian/patches/009_nxproxy_add-man-page.patch | 5 +++++ .../010_nxauth_fix-binary-name-in-man-page.patch | 6 ++++++ debian/patches/012_nxcomp_makefile-uninstall.patch | 7 +++++-- debian/patches/013_nxcompext_makefile-uninstall.patch | 7 +++++-- debian/patches/014_nxcompshad_makefile-uninstall.patch | 5 +++++ debian/patches/015_nxproxy_makefile-uninstall.patch | 5 +++++ debian/patches/016_nx-x11_install-location.patch | 6 ++++++ .../017_nx-x11_update-autotools-helper-files.patch | 10 ++++++++++ .../018_nx-x11_update-libtool-ltmain-script.patch | 6 ++++++ ...9_nx-x11_expat-build-against-system-libxmltok.patch | 8 ++++++++ debian/patches/101_nxagent_set-rgb-path.patch | 13 ++++++++----- .../102_xserver-xext_set-securitypolicy-path.patch | 13 ++++++++----- debian/patches/103_nxagent_set-X0-config-path.patch | 8 ++++++++ .../105_nxagent_export-remote-keyboard-config.patch | 14 ++++++++------ debian/patches/106_nxagent_utf8-copy-clipboard.patch | 7 +++++++ ...gent_clipboard-compound-text+small-bed-sheets.patch | 7 +++++++ debian/patches/108_nxagent_wine-close-delay.patch | 7 +++++++ .../109_nxagent_locale-utf8-compound-text.patch | 7 +++++++ .../110_nxagent_createpixmap-bounds-check.patch | 18 ++++++++++++++++++ debian/patches/200_nxagent_unbrand-agent.patch | 6 ++++++ 26 files changed, 180 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8ff91d74..16a618076 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,6 +71,8 @@ nx-libs (2:3.5.0-2) UNRELEASED; urgency=low - 008_add-nxproxy-wrapper.patch. - 011_add-nxauth-wrapper.patch. * Remove patch: 104_nxagent_enable_debug.patch, as it breaks package build. + * Add patch headers to all patch files, report most patches upstream. Waiting for + feedback and quotable URLs from NoMachine. -- Mike Gabriel Wed, 28 Dec 2011 19:06:26 +0100 diff --git a/debian/patches/001_add-main-makefile.patch b/debian/patches/001_add-main-makefile.patch index f487ef711..df3f4e71f 100644 --- a/debian/patches/001_add-main-makefile.patch +++ b/debian/patches/001_add-main-makefile.patch @@ -1,3 +1,8 @@ +Description: Provide main Makefile for whole source tree + By design this patch is not needed to be sent upstream. +Forwarded: not-needed +Author: Mike Gabriel +Last-Update: 2011-12-31 --- /dev/null +++ b/Makefile @@ -0,0 +1,43 @@ diff --git a/debian/patches/002_nxcompshad_build-against-nx-x11-only.patch b/debian/patches/002_nxcompshad_build-against-nx-x11-only.patch index 975e63010..4e92c3b04 100644 --- a/debian/patches/002_nxcompshad_build-against-nx-x11-only.patch +++ b/debian/patches/002_nxcompshad_build-against-nx-x11-only.patch @@ -1,4 +1,11 @@ -Build nxcompshad against own nx-X11 sources instead of the system's X11. +Description: Build nxcompshad against nx-X11. + Make sure nxcompshad get built against nx-X11. + . + Furthermore /usr/X11R6/lib is an outdated path on + current Debian systems. +Forwarded: pending... +Author: Mike Gabriel +Last-Update: 2011-12-31 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -48,7 +48,7 @@ diff --git a/debian/patches/003_nxcompshad_gcc43.patch b/debian/patches/003_nxcompshad_gcc43.patch index c16a5c154..165c30035 100644 --- a/debian/patches/003_nxcompshad_gcc43.patch +++ b/debian/patches/003_nxcompshad_gcc43.patch @@ -1,3 +1,10 @@ +Description: gcc43 fix + Use builtin includes to build with gcc43. + . + Originally contributed by Marcelo Boveto Shima . +Forwarded: pending... +Author: Mike Gabriel +Last-Update: 2011-12-31 --- a/nxcompshad/Logger.h +++ b/nxcompshad/Logger.h @@ -18,8 +18,8 @@ diff --git a/debian/patches/004_nx-x11_fix-nxcompshad-build.patch b/debian/patches/004_nx-x11_fix-nxcompshad-build.patch index 386dfef2e..f65fb7877 100644 --- a/debian/patches/004_nx-x11_fix-nxcompshad-build.patch +++ b/debian/patches/004_nx-x11_fix-nxcompshad-build.patch @@ -1,3 +1,10 @@ +Description: Fix build on Debian + By an unknown reason this patch currently is needed to + build nx-X11, nxcomp, nxcompshad and nxcompext with + dpkg-buildpackage and debuild. +Forwarded: not-needed +Author: Mike Gabriel +Last-Update: 2011-12-31 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -1047,7 +1047,7 @@ diff --git a/debian/patches/007_nxcompshad_clean-gch-files.patch b/debian/patches/007_nxcompshad_clean-gch-files.patch index 97f543e2f..897e27890 100644 --- a/debian/patches/007_nxcompshad_clean-gch-files.patch +++ b/debian/patches/007_nxcompshad_clean-gch-files.patch @@ -1,3 +1,9 @@ +Description: Remove .gch files during cleanup. + When building nxcompshad .gch files get created. On + cleanup these should be removed. +Forwarded: pending... +Author: Mike Gabriel +Last-Update: 2012-12-31 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -185,7 +185,7 @@ diff --git a/debian/patches/009_nxproxy_add-man-page.patch b/debian/patches/009_nxproxy_add-man-page.patch index f872f846e..83d1b884e 100644 --- a/debian/patches/009_nxproxy_add-man-page.patch +++ b/debian/patches/009_nxproxy_add-man-page.patch @@ -1,3 +1,8 @@ +Description: Add man page for nxproxy. + Providing a man page for nxproxy on Debian. +Forwarded: not-needed +Author: Mike Gabriel +Last-Update: 2012-12-31 --- /dev/null +++ b/nxproxy/man/nxproxy.1 @@ -0,0 +1,27 @@ diff --git a/debian/patches/010_nxauth_fix-binary-name-in-man-page.patch b/debian/patches/010_nxauth_fix-binary-name-in-man-page.patch index cc4f46e75..a3de56597 100644 --- a/debian/patches/010_nxauth_fix-binary-name-in-man-page.patch +++ b/debian/patches/010_nxauth_fix-binary-name-in-man-page.patch @@ -1,3 +1,9 @@ +Description: Fix binary name in man page for nxauth. + The NX auth man page in upstream still uses xauth as + binary name. +Forwarded: pending... +Author: Mike Gabriel +Last-Update: 2012-12-31 --- a/nx-X11/programs/nxauth/nxauth.man +++ b/nx-X11/programs/nxauth/nxauth.man @@ -27,51 +27,51 @@ diff --git a/debian/patches/012_nxcomp_makefile-uninstall.patch b/debian/patches/012_nxcomp_makefile-uninstall.patch index 9545a5766..36f1555f6 100644 --- a/debian/patches/012_nxcomp_makefile-uninstall.patch +++ b/debian/patches/012_nxcomp_makefile-uninstall.patch @@ -1,5 +1,8 @@ -Index: nx-libs/nxcomp/Makefile.in -=================================================================== +Description: Add install and uninstall stanzas to nxcomp/Makefile + Provide install and uninstall functionality in nxcomp/Makefile. +Forwarded: pending... +Author: Mike Gabriel +Last-Update: 2011-12-31 --- nx-libs.orig/nxcomp/Makefile.in 2011-12-05 09:16:34.000000000 +0100 +++ nx-libs/nxcomp/Makefile.in 2011-12-05 09:19:28.000000000 +0100 @@ -68,6 +68,9 @@ diff --git a/debian/patches/013_nxcompext_makefile-uninstall.patch b/debian/patches/013_nxcompext_makefile-uninstall.patch index f4002a565..97e4f03f6 100644 --- a/debian/patches/013_nxcompext_makefile-uninstall.patch +++ b/debian/patches/013_nxcompext_makefile-uninstall.patch @@ -1,5 +1,8 @@ -Index: nx-libs/nxcompext/Makefile.in -=================================================================== +Description: Add install and uninstall stanzas to nxcompext/Makefile + Provide install and uninstall functionality in nxcompext/Makefile. +Forwarded: pending... +Author: Mike Gabriel +Last-Update: 2011-12-31 --- nx-libs.orig/nxcompext/Makefile.in 2011-12-05 09:20:15.000000000 +0100 +++ nx-libs/nxcompext/Makefile.in 2011-12-05 09:24:37.000000000 +0100 @@ -60,7 +60,9 @@ diff --git a/debian/patches/014_nxcompshad_makefile-uninstall.patch b/debian/patches/014_nxcompshad_makefile-uninstall.patch index 43dd17345..1a7888546 100644 --- a/debian/patches/014_nxcompshad_makefile-uninstall.patch +++ b/debian/patches/014_nxcompshad_makefile-uninstall.patch @@ -1,3 +1,8 @@ +Description: Add install and uninstall stanzas to nxcompshad/Makefile + Provide install and uninstall functionality in nxcompshad/Makefile. +Forwarded: pending... +Author: Mike Gabriel +Last-Update: 2011-12-31 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -76,8 +76,13 @@ diff --git a/debian/patches/015_nxproxy_makefile-uninstall.patch b/debian/patches/015_nxproxy_makefile-uninstall.patch index 4c349fb7e..554c86aa4 100644 --- a/debian/patches/015_nxproxy_makefile-uninstall.patch +++ b/debian/patches/015_nxproxy_makefile-uninstall.patch @@ -1,3 +1,8 @@ +Description: Add install and uninstall stanzas to nxcomp/Makefile + Provide install and uninstall functionality in nxcomp/Makefile. +Forwarded: pending... +Author: Mike Gabriel +Last-Update: 2011-12-31 --- a/nxproxy/Makefile.in +++ b/nxproxy/Makefile.in @@ -41,6 +41,8 @@ diff --git a/debian/patches/016_nx-x11_install-location.patch b/debian/patches/016_nx-x11_install-location.patch index fecde7648..1bda0b08b 100644 --- a/debian/patches/016_nx-x11_install-location.patch +++ b/debian/patches/016_nx-x11_install-location.patch @@ -1,3 +1,9 @@ +Description: FHS adaptation for Debian packaging + On Debian, NX libraries and binaries are installed to + /usr/lib/nx. +Forwarded: not-needed +Author: Mike Gabriel +Last-Update: 2012-12-31 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -820,12 +820,12 @@ diff --git a/debian/patches/017_nx-x11_update-autotools-helper-files.patch b/debian/patches/017_nx-x11_update-autotools-helper-files.patch index d457ea5c3..4d7d95abf 100644 --- a/debian/patches/017_nx-x11_update-autotools-helper-files.patch +++ b/debian/patches/017_nx-x11_update-autotools-helper-files.patch @@ -1,3 +1,13 @@ +Description: Update outdated/ancient autotools files + Replace autotools files for at these locations: + - nx-X11/extras/expat/conftools + - nx-X11/extras/fontconfig + - nx-X11/extras/freetype2/builds/unix + - nx-X11/programs/xterm + - nx-X11/lib/Xft +Forwarded: pending... +Author: Mike Gabriel +Last-Update: 2011-12-31 --- a/nx-X11/extras/expat/conftools/config.guess +++ b/nx-X11/extras/expat/conftools/config.guess @@ -1,9 +1,10 @@ diff --git a/debian/patches/018_nx-x11_update-libtool-ltmain-script.patch b/debian/patches/018_nx-x11_update-libtool-ltmain-script.patch index be4a44e71..156712266 100644 --- a/debian/patches/018_nx-x11_update-libtool-ltmain-script.patch +++ b/debian/patches/018_nx-x11_update-libtool-ltmain-script.patch @@ -1,3 +1,9 @@ +Description: Update outdated libtool file + Replace libtool file at this location: + - nx-X11/extras/expat/conftools/ltmain.sh +Forwarded: pending... +Author: Mike Gabriel +Last-Update: 2011-12-31 --- a/nx-X11/extras/expat/conftools/ltmain.sh +++ b/nx-X11/extras/expat/conftools/ltmain.sh @@ -1,4631 +1,9435 @@ diff --git a/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch b/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch index 227dd4695..bd0c72a7e 100644 --- a/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch +++ b/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch @@ -1,3 +1,11 @@ +Description: Building expat against system's libxmltok library + Provide support for building expat against the system's libxmltok library. + . + Not reported to upstream as this patch is mainly imported for being compliant + with Debian policy (lintian error: embedded-library). +Forwarded: not-needed +Author: Mike Gabriel +Last-Update: 2011-12-31 --- a/nx-X11/lib/expat/Imakefile +++ b/nx-X11/lib/expat/Imakefile @@ -19,7 +19,7 @@ diff --git a/debian/patches/101_nxagent_set-rgb-path.patch b/debian/patches/101_nxagent_set-rgb-path.patch index bcbfa0c85..b77348cc0 100644 --- a/debian/patches/101_nxagent_set-rgb-path.patch +++ b/debian/patches/101_nxagent_set-rgb-path.patch @@ -1,8 +1,11 @@ -## dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Change the path to the keyboard configuration file - +Description: FHS path fix for rgb file + This patch is needed on Debian only, not reporting this path + addition to upstream. + . + Originally contributed by Marcelo Boveto Shima . +Forwarded: not-needed +Author: Mike Gabriel +Last-Update: 2011-12-31 --- a/nx-X11/programs/Xserver/os/oscolor.c +++ b/nx-X11/programs/Xserver/os/oscolor.c @@ -53,7 +53,7 @@ diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.patch b/debian/patches/102_xserver-xext_set-securitypolicy-path.patch index 4e04dfd32..4f43eeb37 100644 --- a/debian/patches/102_xserver-xext_set-securitypolicy-path.patch +++ b/debian/patches/102_xserver-xext_set-securitypolicy-path.patch @@ -1,8 +1,11 @@ -## dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Change the path to the keyboard configuration file - +Description: FHS path fix for SecurityPolicy file + This patch is needed on Debian only, not reporting this path + change to upstream. + . + Originally contributed by Marcelo Boveto Shima . +Forwarded: not-needed +Author: Mike Gabriel +Last-Update: 2011-12-31 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c @@ -86,7 +86,7 @@ diff --git a/debian/patches/103_nxagent_set-X0-config-path.patch b/debian/patches/103_nxagent_set-X0-config-path.patch index d99eae8a2..485f5fdc3 100644 --- a/debian/patches/103_nxagent_set-X0-config-path.patch +++ b/debian/patches/103_nxagent_set-X0-config-path.patch @@ -1,3 +1,11 @@ +Description: FHS path fix for keyboard config file + This patch is needed on Debian only, not reporting this path + addition to upstream. + . + Originally contributed by FreeNX Team. +Forwarded: not-needed +Author: Mike Gabriel +Last-Update: 2011-12-31 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -136,7 +136,7 @@ diff --git a/debian/patches/105_nxagent_export-remote-keyboard-config.patch b/debian/patches/105_nxagent_export-remote-keyboard-config.patch index ec8575efb..2ea3a2c1f 100644 --- a/debian/patches/105_nxagent_export-remote-keyboard-config.patch +++ b/debian/patches/105_nxagent_export-remote-keyboard-config.patch @@ -1,9 +1,11 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 93_export_remote_keyboar_config.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Export the client keyboard configurations to a file - +Description: Export remote keyboard configuration to session directory + Let nxagent write the keyboard configuration to /keyboard + and make it available within the NX session. + . + Originally contributed by Marcelo Boveto Shima . +Forwarded: pending... +Author: Mike Gabriel +Last-Update: 2011-12-31 --- a/nx-X11/programs/Xserver/hw/nxagent/Error.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c @@ -497,7 +497,7 @@ diff --git a/debian/patches/106_nxagent_utf8-copy-clipboard.patch b/debian/patches/106_nxagent_utf8-copy-clipboard.patch index 21a8ec094..9c0a047d6 100644 --- a/debian/patches/106_nxagent_utf8-copy-clipboard.patch +++ b/debian/patches/106_nxagent_utf8-copy-clipboard.patch @@ -1,3 +1,10 @@ +Description: UTF-8 Clipboard copying + Enable UTF-8 clipboard copies. + . + Originally contributed by FreeNX Team (dimbor). +Forwarded: not-yet +Author: Mike Gabriel +Last-Update: 2011-12-31 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -166,7 +166,9 @@ diff --git a/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.patch b/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.patch index bde9356bf..129cb707e 100644 --- a/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.patch +++ b/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.patch @@ -1,3 +1,10 @@ +Description: Prevent sending COMPOUND_TEXT + Do not send COMPOUND_TEXT to client. + . + Originally contributed by FreeNX Team (dimbor). +Forwarded: not-yet +Author: Mike Gabriel +Last-Update: 2011-12-31 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -1226,10 +1226,11 @@ diff --git a/debian/patches/108_nxagent_wine-close-delay.patch b/debian/patches/108_nxagent_wine-close-delay.patch index ede84730f..875571c48 100644 --- a/debian/patches/108_nxagent_wine-close-delay.patch +++ b/debian/patches/108_nxagent_wine-close-delay.patch @@ -1,3 +1,10 @@ +Description: Wine Close Delay + Wine close delay. + . + Originally contributed by FreeNX Team (dimbor). +Forwarded: not-yet +Author: Mike Gabriel +Last-Update: 2011-12-31 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -176,6 +176,14 @@ diff --git a/debian/patches/109_nxagent_locale-utf8-compound-text.patch b/debian/patches/109_nxagent_locale-utf8-compound-text.patch index 248e6577c..74bd53bd0 100644 --- a/debian/patches/109_nxagent_locale-utf8-compound-text.patch +++ b/debian/patches/109_nxagent_locale-utf8-compound-text.patch @@ -1,3 +1,10 @@ +Description: Enable locale support + Enable locale support in nxagent. + . + Originally contributed by FreeNX Team (dimbor). +Forwarded: not-yet +Author: Mike Gabriel +Last-Update: 2011-12-31 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -64,6 +64,9 @@ diff --git a/debian/patches/110_nxagent_createpixmap-bounds-check.patch b/debian/patches/110_nxagent_createpixmap-bounds-check.patch index a5d4c3afa..d65862bdc 100644 --- a/debian/patches/110_nxagent_createpixmap-bounds-check.patch +++ b/debian/patches/110_nxagent_createpixmap-bounds-check.patch @@ -1,3 +1,21 @@ +Description: Avoid large pixmaps + It is allowed to try and allocate a pixmap which is larger than + 32767 in either dimension. However, all of the framebuffer code + is buggy and does not reliably draw to such big pixmaps, basically + because the Region data structure operates with signed shorts + for the rectangles in it. + . + Furthermore, several places in the X server computes the + size in bytes of the pixmap and tries to store it in an + integer. This integer can overflow and cause the allocated size + to be much smaller. + . + So, such big pixmaps are rejected here with a BadAlloc + . + Originally contributed by FreeNX Team +Forwarded: pending... +Author: Mike Gabriel +Last-Update: 2011-12-31 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -1973,6 +1973,23 @@ diff --git a/debian/patches/200_nxagent_unbrand-agent.patch b/debian/patches/200_nxagent_unbrand-agent.patch index 8e441ca7b..c9aea0496 100644 --- a/debian/patches/200_nxagent_unbrand-agent.patch +++ b/debian/patches/200_nxagent_unbrand-agent.patch @@ -1,3 +1,9 @@ +Description: Unbrand NX Agent Startup Screen + By design this patch is probably not interesting to + NX upstream. +Forwarded: not-needed +Author: Mike Gabriel +Last-Update: 2012-12-31 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -1754,7 +1754,20 @@ -- cgit v1.2.3