[debian-edu-commits] debian-edu/ 07/32: debian/patches: Add 007_use-openssl-sha.patch. Build against openssl/sha.h, don't use dropped, non-DFSG licensed files sha1.c and sha1.h.

[Mike Gabriel]

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

sunweaver pushed a commit to annotated tag debian/1_2.0.2+dfsg1-1
in repository italc.

commit f4dc11c39cb65f0edc77695b8ef7f38aa6f36724
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Aug 14 13:28:22 2014 +0200

    debian/patches: Add 007_use-openssl-sha.patch. Build against openssl/sha.h, don't use dropped, non-DFSG licensed files sha1.c and sha1.h.
---
 debian/patches/007_use-openssl-sha.patch | 16 ++++++++++++++++
 debian/patches/series                    |  1 +
 2 files changed, 17 insertions(+)

diff --git a/debian/patches/007_use-openssl-sha.patch b/debian/patches/007_use-openssl-sha.patch
new file mode 100644
index 0000000..0d7ea29
--- /dev/null
+++ b/debian/patches/007_use-openssl-sha.patch
@@ -0,0 +1,16 @@
+Description: Use OpenSSL's sha algorithm instead of upstream's
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Abstract:
+ See debian/README.Debian for details.
+
+--- a/ica/x11/libvncserver/rfbcrypto_included.c
++++ b/ica/x11/libvncserver/rfbcrypto_included.c
+@@ -23,7 +23,7 @@
+ 
+ #include <string.h>
+ #include "md5.h"
+-#include "sha1.h"
++#include "openssl/sha.h"
+ #include "rfbcrypto.h"
+ 
+ void digestmd5(const struct iovec *iov, int iovcnt, void *dest)
diff --git a/debian/patches/series b/debian/patches/series
index 0c54176..e483ca5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 005_gcc47-ftbfs.patch
 006_inject-buildtype-from-outside.patch
 031_fix-spelling-errors.patch
+007_use-openssl-sha.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/italc.git