[pkg-remote-commits] [xrdp] 01/01: Remove debian/patches/nxstack.diff; applied upstream.

[Thorsten Glaser]

This is an automated email from the git hooks/post-receive script.

tg pushed a commit to branch master
in repository xrdp.

commit d7c64b4cdee3afb36c564f2408c0345a0ee83be5
Author: mirabilos <t.glaser at tarent.de>
Date:   Wed Jan 25 13:31:33 2017 +0100

    Remove debian/patches/nxstack.diff; applied upstream.
---
 debian/changelog            |   4 +-
 debian/patches/nxstack.diff | 114 --------------------------------------------
 debian/patches/series       |   1 -
 3 files changed, 3 insertions(+), 116 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d167665..86d1619 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ xrdp (0.9.1-4) unstable; urgency=high
   * Fix up PAM conffile handling for upgrades from jessie{,-backports}.
   * Don’t use FUSE on the Hurd, it does not support enough of it yet.
   * Add GNU/kFreeBSD support to NASM format detection autoconfigury.
+  * Remove patch to make stack not executable in *.asm files; upstrem
+    fixed this already.
 
- -- Thorsten Glaser <tg at mirbsd.de>  Wed, 25 Jan 2017 11:39:33 +0100
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 25 Jan 2017 13:30:59 +0100
 
 xrdp (0.9.1-3) unstable; urgency=medium
 
diff --git a/debian/patches/nxstack.diff b/debian/patches/nxstack.diff
deleted file mode 100644
index 75673d3..0000000
--- a/debian/patches/nxstack.diff
+++ /dev/null
@@ -1,114 +0,0 @@
-From: Thorsten Glaser <tg at mirbsd.org>
-Subject: re-enable non-executable stack
---- a/librfxcodec/src/amd64/cpuid_amd64.asm
-+++ b/librfxcodec/src/amd64/cpuid_amd64.asm
-@@ -46,3 +46,4 @@ PROC _cpuid_amd64
-     ret
-     align 16
- 
-+section .note.GNU-stack noalloc noexec nowrite progbits
---- a/librfxcodec/src/x86/cpuid_x86.asm
-+++ b/librfxcodec/src/x86/cpuid_x86.asm
-@@ -44,3 +44,4 @@ PROC _cpuid_x86
-     ret;
-     align 16
- 
-+section .note.GNU-stack noalloc noexec nowrite progbits
---- a/xorgxrdp/module/amd64/a8r8g8b8_to_a8b8g8r8_box_amd64_sse2.asm
-+++ b/xorgxrdp/module/amd64/a8r8g8b8_to_a8b8g8r8_box_amd64_sse2.asm
-@@ -195,3 +195,4 @@ done_loop_x:
-     ret
-     align 16
- 
-+section .note.GNU-stack noalloc noexec nowrite progbits
---- a/xorgxrdp/module/amd64/a8r8g8b8_to_nv12_box_amd64_sse2.asm
-+++ b/xorgxrdp/module/amd64/a8r8g8b8_to_nv12_box_amd64_sse2.asm
-@@ -330,3 +330,4 @@ loop1:
-     ret
-     align 16
- 
-+section .note.GNU-stack noalloc noexec nowrite progbits
---- a/xorgxrdp/module/amd64/cpuid_amd64.asm
-+++ b/xorgxrdp/module/amd64/cpuid_amd64.asm
-@@ -69,3 +69,4 @@ PROC _cpuid_amd64
-     ret
-     align 16
- 
-+section .note.GNU-stack noalloc noexec nowrite progbits
---- a/xorgxrdp/module/amd64/i420_to_rgb32_amd64_sse2.asm
-+++ b/xorgxrdp/module/amd64/i420_to_rgb32_amd64_sse2.asm
-@@ -250,3 +250,4 @@ loop_x:
-     align 16
- 
- 
-+section .note.GNU-stack noalloc noexec nowrite progbits
---- a/xorgxrdp/module/amd64/uyvy_to_rgb32_amd64_sse2.asm
-+++ b/xorgxrdp/module/amd64/uyvy_to_rgb32_amd64_sse2.asm
-@@ -160,3 +160,4 @@ loop1:
-     ret
-     align 16
- 
-+section .note.GNU-stack noalloc noexec nowrite progbits
---- a/xorgxrdp/module/amd64/yuy2_to_rgb32_amd64_sse2.asm
-+++ b/xorgxrdp/module/amd64/yuy2_to_rgb32_amd64_sse2.asm
-@@ -160,3 +160,4 @@ loop1:
-     ret
-     align 16
- 
-+section .note.GNU-stack noalloc noexec nowrite progbits
---- a/xorgxrdp/module/amd64/yv12_to_rgb32_amd64_sse2.asm
-+++ b/xorgxrdp/module/amd64/yv12_to_rgb32_amd64_sse2.asm
-@@ -254,3 +254,4 @@ loop_x:
-     align 16
- 
- 
-+section .note.GNU-stack noalloc noexec nowrite progbits
---- a/xorgxrdp/module/x86/a8r8g8b8_to_a8b8g8r8_box_x86_sse2.asm
-+++ b/xorgxrdp/module/x86/a8r8g8b8_to_a8b8g8r8_box_x86_sse2.asm
-@@ -180,3 +180,4 @@ done_loop_x:
-     ret
-     align 16
- 
-+section .note.GNU-stack noalloc noexec nowrite progbits
---- a/xorgxrdp/module/x86/a8r8g8b8_to_nv12_box_x86_sse2.asm
-+++ b/xorgxrdp/module/x86/a8r8g8b8_to_nv12_box_x86_sse2.asm
-@@ -324,3 +324,4 @@ loop1:
-     ret
-     align 16
- 
-+section .note.GNU-stack noalloc noexec nowrite progbits
---- a/xorgxrdp/module/x86/cpuid_x86.asm
-+++ b/xorgxrdp/module/x86/cpuid_x86.asm
-@@ -67,3 +67,4 @@ PROC _cpuid_x86
-     ret
-     align 16
- 
-+section .note.GNU-stack noalloc noexec nowrite progbits
---- a/xorgxrdp/module/x86/i420_to_rgb32_x86_sse2.asm
-+++ b/xorgxrdp/module/x86/i420_to_rgb32_x86_sse2.asm
-@@ -249,3 +249,4 @@ loop_x:
-     align 16
- 
- 
-+section .note.GNU-stack noalloc noexec nowrite progbits
---- a/xorgxrdp/module/x86/uyvy_to_rgb32_x86_sse2.asm
-+++ b/xorgxrdp/module/x86/uyvy_to_rgb32_x86_sse2.asm
-@@ -164,3 +164,4 @@ loop1:
-     ret
-     align 16
- 
-+section .note.GNU-stack noalloc noexec nowrite progbits
---- a/xorgxrdp/module/x86/yuy2_to_rgb32_x86_sse2.asm
-+++ b/xorgxrdp/module/x86/yuy2_to_rgb32_x86_sse2.asm
-@@ -164,3 +164,4 @@ loop1:
-     ret
-     align 16
- 
-+section .note.GNU-stack noalloc noexec nowrite progbits
---- a/xorgxrdp/module/x86/yv12_to_rgb32_x86_sse2.asm
-+++ b/xorgxrdp/module/x86/yv12_to_rgb32_x86_sse2.asm
-@@ -249,3 +249,4 @@ loop_x:
-     align 16
- 
- 
-+section .note.GNU-stack noalloc noexec nowrite progbits
diff --git a/debian/patches/series b/debian/patches/series
index a1fb5c0..56090f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ make-fixes.diff
 config.diff
 misc-fixes.diff
 systemd.diff
-nxstack.diff
 fix_perms.diff
 shutup-daemon.diff
 sockpath.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/xrdp.git