Merge pull request #31634 from yegortimoshenko/bchunk/1.2.2

bchunk: 1.2.0 -> 1.2.2

pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch

@@ -1,25 +0,0 @@
---- a/bchunk.c	2017-10-30 18:03:58.658741629 +0000
-+++ b/bchunk.c	2017-10-30 19:40:25.558131619 +0000
-@@ -18,6 +18,7 @@
-   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-   */
-
-+#define _GNU_SOURCE
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -271,11 +272,10 @@
- 	int16_t i;
- 	float fl;
- 	
--	if (!(fname = malloc(strlen(bname) + 8))) {
--		fprintf(stderr, "main(): malloc() failed, out of memory\n");
-+	if (asprintf(&fname, "%s%2.2d.%s", bname, track->num, track->extension) == -1) {
-+		fprintf(stderr, "writetrack(): asprintf() failed, out of memory\n");
- 		exit(4);
- 	}
--	sprintf(fname, "%s%2.2d.%s", bname, track->num, track->extension);
- 	
- 	printf("%2d: %s ", track->num, fname);
- 	
-

pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch

@@ -1,33 +0,0 @@
-diff -urNZ bchunk-1.2.0.orig/bchunk.c bchunk-1.2.0/bchunk.c
---- a/bchunk.c	2017-10-30 18:03:58.658741629 +0000
-+++ b/bchunk.c	2017-10-30 19:17:36.732855884 +0000
-@@ -426,11 +426,11 @@
- 			printf("\nTrack ");
- 			if (!(p = strchr(p, ' '))) {
- 				fprintf(stderr, "... ouch, no space after TRACK.\n");
--				continue;
-+				exit(3);
- 			}
- 			p++;
- 			if (!(t = strchr(p, ' '))) {
- 				fprintf(stderr, "... ouch, no space after track number.\n");
--				continue;
-+				exit(3);
- 			}
- 			*t = '\0';
-
-@@ -460,12 +460,12 @@
- 		} else if ((p = strstr(s, "INDEX"))) {
- 			if (!(p = strchr(p, ' '))) {
- 				printf("... ouch, no space after INDEX.\n");
--				continue;
-+				exit(3);
- 			}
- 			p++;
- 			if (!(t = strchr(p, ' '))) {
- 				printf("... ouch, no space after index number.\n");
--				continue;
-+				exit(3);
- 			}
- 			*t = '\0';
- 			t++;

pkgs/tools/cd-dvd/bchunk/default.nix

@@ -1,15 +1,14 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "bchunk-1.2.0";
+  name = "bchunk-${version}";
+  version = "1.2.2";
 
   src = fetchurl {
     url = "http://he.fi/bchunk/${name}.tar.gz";
-    sha256 = "0pcbyx3689cbl23dcij497hb3q5f1wmki7cxic5nzldx71g9vp5g";
+    sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7";
   };
 
-  patches = [ ./CVE-2017-15953.patch ./CVE-2017-15955.patch ];
-
   installPhase = ''
     install -Dt $out/bin bchunk
     install -Dt $out/share/man/man1 bchunk.1