Re: [PATCH 2/3] gnu: Remove unused patch.

[Ludovic Courtès]

Leo Famulari  skribis:

> * gnu/packages/patches/expat-CVE-2015-1283-refix.patch: Delete file.
> * gnu/local.mk (dist_patch_DATA): Remove it.

OK!

[PATCH 2/3] gnu: Remove unused patch.

[Leo Famulari]

* gnu/packages/patches/expat-CVE-2015-1283-refix.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk   |  1 -
 .../patches/expat-CVE-2015-1283-refix.patch| 42 --
 2 files changed, 43 deletions(-)
 delete mode 100644 gnu/packages/patches/expat-CVE-2015-1283-refix.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index ef7b4df..fe91bc3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -480,7 +480,6 @@ dist_patch_DATA =   
\
   %D%/packages/patches/emacs-source-date-epoch.patch   \
   %D%/packages/patches/eudev-rules-directory.patch \
   %D%/packages/patches/evilwm-lost-focus-bug.patch \
-  %D%/packages/patches/expat-CVE-2015-1283-refix.patch \
   %D%/packages/patches/expat-CVE-2016-0718.patch   \
   %D%/packages/patches/fastcap-mulGlobal.patch \
   %D%/packages/patches/fastcap-mulSetup.patch  \
diff --git a/gnu/packages/patches/expat-CVE-2015-1283-refix.patch 
b/gnu/packages/patches/expat-CVE-2015-1283-refix.patch
deleted file mode 100644
index af5e3bc..000
--- a/gnu/packages/patches/expat-CVE-2015-1283-refix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Update previous fix for CVE-2015-1283 to not rely on undefined behavior.
-
-Copied from Debian, as found in Debian package version 2.1.0-6+deb8u2.
-
-https://sources.debian.net/src/expat/2.1.0-6%2Bdeb8u2/debian/patches/CVE-2015-1283-refix.patch/
-
-From 29a11774d8ebbafe8418b4a5ffb4cc1160b194a1 Mon Sep 17 00:00:00 2001
-From: Pascal Cuoq 
-Date: Sun, 15 May 2016 09:05:46 +0200
-Subject: [PATCH] Avoid relying on undefined behavior in CVE-2015-1283 fix.
-

- expat/lib/xmlparse.c | 6 --
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/lib/xmlparse.c b/lib/xmlparse.c
-index 13e080d..cdb12ef 100644
 a/lib/xmlparse.c
-+++ b/lib/xmlparse.c
-@@ -1695,7 +1695,8 @@ XML_GetBuffer(XML_Parser parser, int len
-   }
- 
-   if (len > bufferLim - bufferEnd) {
--int neededSize = len + (int)(bufferEnd - bufferPtr);
-+/* Do not invoke signed arithmetic overflow: */
-+int neededSize = (int) ((unsigned)len + (unsigned)(bufferEnd - 
bufferPtr));
- /* BEGIN MOZILLA CHANGE (sanity check neededSize) */
- if (neededSize < 0) {
-   errorCode = XML_ERROR_NO_MEMORY;
-@@ -1729,7 +1730,8 @@ XML_GetBuffer(XML_Parser parser, int len
-   if (bufferSize == 0)
- bufferSize = INIT_BUFFER_SIZE;
-   do {
--bufferSize *= 2;
-+/* Do not invoke signed arithmetic overflow: */
-+bufferSize = (int) (2U * (unsigned) bufferSize);
- /* BEGIN MOZILLA CHANGE (prevent infinite loop on overflow) */
-   } while (bufferSize < neededSize && bufferSize > 0);
- /* END MOZILLA CHANGE */
--- 
-2.8.2
-
-- 
2.8.3