[debian-edu-commits] debian-edu/ 04/21: debian/patches: Drop 007_use-openssl-sha.patch. Solved upstream.

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository italc.

commit 4c2dfe03b5f11cd21ab21b46660a47a4263f823e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Nov 28 11:54:34 2016 +0100

    debian/patches: Drop 007_use-openssl-sha.patch. Solved upstream.
---
 debian/patches/007_use-openssl-sha.patch | 16 ----------------
 debian/patches/series                    |  1 -
 2 files changed, 17 deletions(-)

diff --git a/debian/patches/007_use-openssl-sha.patch b/debian/patches/007_use-openssl-sha.patch
deleted file mode 100644
index 0d7ea29..0000000
--- a/debian/patches/007_use-openssl-sha.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 d4c7a31..f3afb05 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,5 @@
 003_rename-plugin-dir.patch
 005_gcc47-ftbfs.patch
 006_inject-buildtype-from-outside.patch
-007_use-openssl-sha.patch
 030_fix-man-pages.patch
 031_fix-spelling-errors.patch

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