Muehlenhoff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/396020 )
Change subject: Refresh valgrind.patch ...................................................................... Refresh valgrind.patch Change-Id: I7f2125bedd42323d4c1279d9b83ae5f1b930c34e --- M debian/changelog M debian/patches/valgrind.patch 2 files changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/openssl refs/changes/20/396020/1 diff --git a/debian/changelog b/debian/changelog index 97b174e..b2a7b79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ openssl (1.0.2n-1~wmf1) jessie-wikimedia; urgency=medium * Update to 1.0.2n + * Refresh valgrind.patch -- Moritz Muehlenhoff <[email protected]> Thu, 07 Dec 2017 15:52:39 +0100 diff --git a/debian/patches/valgrind.patch b/debian/patches/valgrind.patch index 83f1e7d..308506c 100644 --- a/debian/patches/valgrind.patch +++ b/debian/patches/valgrind.patch @@ -1,18 +1,18 @@ -Index: openssl-1.0.2/crypto/rand/md_rand.c +Index: openssl1.0-1.0.2l/crypto/rand/md_rand.c =================================================================== ---- openssl-1.0.2.orig/crypto/rand/md_rand.c -+++ openssl-1.0.2/crypto/rand/md_rand.c -@@ -480,6 +480,7 @@ int ssleay_rand_bytes(unsigned char *buf - MD_Update(&m, (unsigned char *)&(md_c[0]), sizeof(md_c)); +--- openssl1.0-1.0.2l.orig/crypto/rand/md_rand.c ++++ openssl1.0-1.0.2l/crypto/rand/md_rand.c +@@ -490,6 +490,7 @@ int ssleay_rand_bytes(unsigned char *buf + goto err; #ifndef PURIFY /* purify complains */ +#if 0 /* * The following line uses the supplied buffer as a small source of * entropy: since this buffer is often uninitialised it may cause -@@ -489,6 +490,7 @@ int ssleay_rand_bytes(unsigned char *buf - */ - MD_Update(&m, buf, j); +@@ -500,6 +501,7 @@ int ssleay_rand_bytes(unsigned char *buf + if (!MD_Update(&m, buf, j)) + goto err; #endif +#endif -- To view, visit https://gerrit.wikimedia.org/r/396020 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f2125bedd42323d4c1279d9b83ae5f1b930c34e Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/openssl Gerrit-Branch: master Gerrit-Owner: Muehlenhoff <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
