From 8940a50e1a7d33e6aee49c390bf093fe8294a979 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 05:15:35 +0000
Subject: import cdrkit-1.1.11-25.el7


---

diff --git a/SOURCES/cdrkit-1.1.11-device-name.patch b/SOURCES/cdrkit-1.1.11-device-name.patch
new file mode 100644
index 0000000..c6c3e33
--- /dev/null
+++ b/SOURCES/cdrkit-1.1.11-device-name.patch
@@ -0,0 +1,29 @@
+diff -up wrk/libusal/scsi-linux-sg.c.wrk wrk/libusal/scsi-linux-sg.c
+--- wrk/libusal/scsi-linux-sg.c.wrk	2015-05-31 22:21:03.376694659 +0200
++++ wrk/libusal/scsi-linux-sg.c	2015-05-31 22:22:47.183667927 +0200
+@@ -509,7 +509,8 @@ usalo_open(SCSI *usalp, char *device)
+ 		/* scan and maybe keep one open, sg_setup decides */
+ #define HDX 0
+ #define SCD 1
+-#define SG 2
++#define SCD2 2
++#define SG 3
+ 		int h;
+ /*
+ retry_scan_open:
+@@ -533,6 +534,15 @@ retry_scan_open:
+ 						first=0;
+ 						last=255;
+ 						break;
++					}
++				case(SCD2):
++					{
++						if(!check_linux_26())
++							continue;
++						pattern="/dev/sr%d";
++						first=0;
++						last=255;
++						break;
+ 					}
+ 				case(SG):
+ 					{
diff --git a/SOURCES/cdrkit-1.1.11-kernel-release.patch b/SOURCES/cdrkit-1.1.11-kernel-release.patch
new file mode 100644
index 0000000..860a9f6
--- /dev/null
+++ b/SOURCES/cdrkit-1.1.11-kernel-release.patch
@@ -0,0 +1,12 @@
+diff -up cdrkit-1.1.11/libusal/scsi-linux-sg.c.sfdc01983864 cdrkit-1.1.11/libusal/scsi-linux-sg.c
+--- cdrkit-1.1.11/libusal/scsi-linux-sg.c.sfdc01983864	2017-12-12 08:55:08.000000000 +0100
++++ cdrkit-1.1.11/libusal/scsi-linux-sg.c	2017-12-12 09:00:57.000000000 +0100
+@@ -251,7 +251,7 @@ static BOOL get_max_secs(char *dirpath,
+ BOOL check_linux_26() {
+ 	int gen, tmp;
+ 	struct utsname buf;
+-	return ( 0==uname( &buf ) && sscanf(buf.release, "%d.%d", &gen, &tmp)>1 && tmp>=6);
++	return ( 0==uname( &buf ) && sscanf(buf.release, "%d.%d", &gen, &tmp)>1 && tmp>=6 && gen == 2);
+ }
+ 
+ int sg_open_excl(char *device, int mode, BOOL beQuiet)
diff --git a/SPECS/cdrkit.spec b/SPECS/cdrkit.spec
index cd35d8e..b3b4ac1 100644
--- a/SPECS/cdrkit.spec
+++ b/SPECS/cdrkit.spec
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities
 Name: cdrkit
 Version: 1.1.11
-Release: 23%{?dist}
+Release: 25%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: http://cdrkit.org/
@@ -25,6 +25,8 @@ Patch16: cdrkit-1.1.11-cmakewarn.patch
 Patch17: cdrkit-1.1.11-memset.patch
 Patch18: cdrkit-1.1.11-paranoiacdio.patch
 Patch19: cdrkit-1.1.11-ppc64le_elfheader.patch
+Patch20: cdrkit-1.1.11-kernel-release.patch
+Patch21: cdrkit-1.1.11-device-name.patch
 
 BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel
 
@@ -136,6 +138,8 @@ SCSI devices.
 %patch17 -p1 -b .edcspeed
 %patch18 -p1 -b .paranoiacdio
 %patch19 -p1 -b .elfheader
+%patch20 -p1 -b .kernel
+%patch21 -p1 -b .device_name
 
 # we do not want bundled paranoia library
 rm -rf libparanoia
@@ -300,6 +304,16 @@ fi
 %{_includedir}/usal
 
 %changelog
+* Tue May 15 2018 Jakub Martisko <jamartis@redhat.com> - 1.1.11-25
+- add support for device names of the form /dev/srN
+- fix provided by Frantisek Kluknavsky
+- resolves:rhbz#1058446
+
+* Thu May 10 2018 Jakub Martisko <jamartis@redhat.com> - 1.1.11-24
+- fix libusal kernel version check
+- fix provided by Renaud Métrich
+- resolves:rhbz#1524845
+
 * Mon Sep 22 2014 Frantisek Kluknavsky <fkluknav@redhat.com> - 1.1.11-23
 - removed conflicting #define to fix FTBFS on ppc64le
 - resolves:rhbz#1144072