[SM-Commit] GIT changes to master grimoire by Flavien Bridault (a150518a28a853c53f7e28db317bcb2bf2e9b813)

Flavien Bridault scm at mail.sourcemage.org
Fri Sep 8 12:29:25 EDT 2006


GIT changes to master grimoire by Flavien Bridault <vlaaad at sourcemage.org>:

 dev/null                                       |binary
 disk/cdrtools/DETAILS                          |    2 +-
 disk/cdrtools/HISTORY                          |    6 ------
 disk/cdrtools/PRE_BUILD                        |    5 +++--
 disk/cdrtools/cdrtools-2.01.01a03-rezero.patch |   12 ++++++++++++
 disk/cdrtools/cdrtools-2.01.01a11.tar.bz2.sig  |binary
 disk/cdrtools/cdrtools-2.01.01a12.tar.bz2.sig  |    0 
 7 files changed, 16 insertions(+), 9 deletions(-)

New commits:
commit a150518a28a853c53f7e28db317bcb2bf2e9b813
Author: Flavien Bridault <vlaaad at sourcemage.org>
Commit: Flavien Bridault <vlaaad at sourcemage.org>

    cdrtools: added back sig

commit 3cd2ce3ac354b96ac562c09f55d9937956148229
Author: Flavien Bridault <vlaaad at sourcemage.org>
Commit: Flavien Bridault <vlaaad at sourcemage.org>

    cdrtools: Revert 9bb980b0c801 because it prevents non-root user to burn.

diff --git a/disk/cdrtools/DETAILS b/disk/cdrtools/DETAILS
index c0cfef4..3f026b7 100755
--- a/disk/cdrtools/DETAILS
+++ b/disk/cdrtools/DETAILS
@@ -1,5 +1,5 @@
            SPELL=cdrtools
-         VERSION=2.01.01a12
+         VERSION=2.01.01a11
            ALPHA=$([ "${VERSION//a/}" != "$VERSION" ] && echo 1)
           SOURCE=${SPELL}-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION%a*}
diff --git a/disk/cdrtools/HISTORY b/disk/cdrtools/HISTORY
index 8c34667..834bc81 100644
--- a/disk/cdrtools/HISTORY
+++ b/disk/cdrtools/HISTORY
@@ -1,9 +1,3 @@
-2006-09-05 Pol Vinogradov <vin.public at gmail.com>
-	* DETAILS: updated to 2.01.01a12
-	* PRE_BUILD: using INSTALL_ROOT in sedit,
-	  removed cdrtools-2.01.01a03-rezero.patch applying
-	* cdrtools-2.01.01a03-rezero.patch: removed, seems fixed in upstream
-
 2006-07-11 Pol Vinogradov <vin.public at gmail.com>
 	* DETAILS: updated to 2.01.01a11
 
diff --git a/disk/cdrtools/PRE_BUILD b/disk/cdrtools/PRE_BUILD
index 6b33637..4df229f 100755
--- a/disk/cdrtools/PRE_BUILD
+++ b/disk/cdrtools/PRE_BUILD
@@ -1,10 +1,11 @@
 default_pre_build						&&
 cd ${SOURCE_DIRECTORY}						&&
 sed -i "s:/usr/src/linux/include::"  DEFAULTS/Defaults.linux    &&
-sed -i "s:/opt/schily:${INSTALL_ROOT}/usr:g" DEFAULTS/Defaults.linux		&&
+sed -i "s:/opt/schily:/usr:g" DEFAULTS/Defaults.linux		&&
 sed -i "s:/usr/src/linux/include::g" DEFAULTS/Defaults.linux	&&
 sed -i "1iMANDIR= share/man"         RULES/rules.man            &&
 case ${PERM} in
-  burning_group_users)  patch -p1 < $SPELL_DIRECTORY/cdrtools-2.01.01a01-scanbus.patch ;;
+  burning_group_users)  patch -p1 < $SPELL_DIRECTORY/cdrtools-2.01.01a01-scanbus.patch   &&
+			patch -p1 < $SPELL_DIRECTORY/cdrtools-2.01.01a03-rezero.patch ;;	
   burning_group_users_with_suid_bit)	patch -p1 < $SPELL_DIRECTORY/patch_cdrecord_for_suid ;;
 esac
diff --git a/disk/cdrtools/cdrtools-2.01.01a03-rezero.patch b/disk/cdrtools/cdrtools-2.01.01a03-rezero.patch
new file mode 100644
index 0000000..7e8d71f
--- /dev/null
+++ b/disk/cdrtools/cdrtools-2.01.01a03-rezero.patch
@@ -0,0 +1,12 @@
+--- cdrtools-2.01.01/cdrecord/cdrecord.c.rezero	2005-08-03 12:50:28.000000000 +0200
++++ cdrtools-2.01.01/cdrecord/cdrecord.c	2005-08-03 12:50:53.000000000 +0200
+@@ -3880,7 +3880,8 @@
+ 	scsi_start_stop_unit(scgp, 1, 0, immed);
+ 	wait_unit_ready(scgp, 120);
+ 	scgp->silent++;
+-	rezero_unit(scgp);	/* Is this needed? Not supported by some drvives */
++	/* kernel >= 2.6.12 does not like that as user
++	rezero_unit(scgp); */	/* Is this needed? Not supported by some drvives */
+ 	scgp->silent--;
+ 	test_unit_ready(scgp);
+ 	scsi_start_stop_unit(scgp, 1, 0, immed);
diff --git a/disk/cdrtools/cdrtools-2.01.01a11.tar.bz2.sig b/disk/cdrtools/cdrtools-2.01.01a11.tar.bz2.sig
new file mode 100644
index 0000000..aa90c05
Binary files /dev/null and b/disk/cdrtools/cdrtools-2.01.01a11.tar.bz2.sig differ
diff --git a/disk/cdrtools/cdrtools-2.01.01a12.tar.bz2.sig b/disk/cdrtools/cdrtools-2.01.01a12.tar.bz2.sig
deleted file mode 100644
index c8f06a6..0000000
Binary files a/disk/cdrtools/cdrtools-2.01.01a12.tar.bz2.sig and /dev/null differ



More information about the SM-Commit mailing list