rpms/dvd+rw-tools/devel dvd+rw-tools-5.17.4.8.6.manpatch, 1.1, 1.2 dvd+rw-tools-5.21.4.10.8-excl.patch, 1.1, 1.2 dvd+rw-tools.spec, 1.16, 1.17 sources, 1.6, 1.7

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Apr 18 14:38:18 UTC 2006


Author: harald

Update of /cvs/dist/rpms/dvd+rw-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22488

Modified Files:
	dvd+rw-tools-5.17.4.8.6.manpatch 
	dvd+rw-tools-5.21.4.10.8-excl.patch dvd+rw-tools.spec sources 
Log Message:
- version 6.1


Index: dvd+rw-tools-5.17.4.8.6.manpatch
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/devel/dvd+rw-tools-5.17.4.8.6.manpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dvd+rw-tools-5.17.4.8.6.manpatch	9 Sep 2004 04:23:06 -0000	1.1
+++ dvd+rw-tools-5.17.4.8.6.manpatch	18 Apr 2006 14:38:14 -0000	1.2
@@ -1,7 +1,7 @@
---- dvd+rw-tools-5.17.4.8.6/Makefile.m4.manpatch	2004-01-29 12:07:37.187269384 +0100
-+++ dvd+rw-tools-5.17.4.8.6/Makefile.m4	2004-01-29 12:08:19.313865168 +0100
-@@ -115,7 +115,7 @@
- LINK.o=$(LINK.cc)
+--- dvd+rw-tools-6.1/Makefile.m4.manpatch	2006-01-20 09:08:22.000000000 +0100
++++ dvd+rw-tools-6.1/Makefile.m4	2006-03-22 14:08:08.000000000 +0100
+@@ -173,7 +173,7 @@
+ LINK.o	=$(LINK.cc)
  
  prefix?=/usr/local
 -manprefix?=$(shell case $(prefix) in (*/usr/?*) echo $(prefix)/man ;; (*) echo $(prefix)/share/man ;; esac)
@@ -9,7 +9,7 @@
  
  bin_mode?=0755	# yes, default is *no* set-uid
  minus_o:=$(shell [[ `id -u` == 0 ]] && echo "-o root")
-@@ -123,8 +123,8 @@
+@@ -181,12 +181,12 @@
  install:	dvd+rw-tools
  	[[ -d $(prefix)/bin ]] || mkdir -p $(prefix)/bin
  	install $(minus_o) -m $(bin_mode) $(CHAIN) $(prefix)/bin
@@ -17,6 +17,12 @@
 -	install $(minus_o) -m 0644 growisofs.1 $(manprefix)/man1
 +	[[ -d $(mandir)/man1 ]] || mkdir -p $(mandir)/man1
 +	install $(minus_o) -m 0644 growisofs.1 $(mandir)/man1
+ 	[[ -f rpl8 ]] && \
+-	  install $(minus_o) -m $(bin_mode) rpl8 $(prefix)/bin
++	  install $(minus_o) -m $(bin_mode) rpl8 $(prefix)/bin || :
+ 	[[ -f btcflash ]] && \
+-	  install $(minus_o) -m $(bin_mode) btcflash $(prefix)/bin
++	  install $(minus_o) -m $(bin_mode) btcflash $(prefix)/bin || :
  ])
+ 
  # common section
- [

dvd+rw-tools-5.21.4.10.8-excl.patch:
 growisofs.c   |   28 +++++++++++++++++++++++++++-
 transport.hxx |   32 ++++++++++++++++++++++++++++++--
 2 files changed, 57 insertions(+), 3 deletions(-)

Index: dvd+rw-tools-5.21.4.10.8-excl.patch
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/devel/dvd+rw-tools-5.21.4.10.8-excl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dvd+rw-tools-5.21.4.10.8-excl.patch	9 Sep 2004 04:24:14 -0000	1.1
+++ dvd+rw-tools-5.21.4.10.8-excl.patch	18 Apr 2006 14:38:14 -0000	1.2
@@ -1,6 +1,50 @@
---- dvd+rw-tools-5.21.4.10.8/transport.hxx.excl	2004-08-25 01:36:29.000000000 +0200
-+++ dvd+rw-tools-5.21.4.10.8/transport.hxx	2004-09-01 13:01:48.669600384 +0200
-@@ -191,6 +191,33 @@
+--- dvd+rw-tools-6.1/growisofs.c.excl	2006-01-26 22:16:54.000000000 +0100
++++ dvd+rw-tools-6.1/growisofs.c	2006-03-22 14:01:42.000000000 +0100
+@@ -593,6 +593,32 @@
+   return ret;
+ }
+ 
++int open64excl(const char *device, int mode)
++{
++  int f, i;
++    
++  f = open64(device, mode | O_EXCL);
++    
++  if (f < 0) {
++    if (errno != EBUSY)	
++      return f;
++      
++    for (i = 0; (i < 10) && (f == -1); i++) {
++      fprintf(stderr, "Error trying to open %s exclusively ... retrying in 1 second.\n", device);
++      usleep(1000000 + (long)(100000.0 * rand()/(RAND_MAX+1.0)));
++      f = open64(device, mode | O_EXCL);
++    }
++      
++    if (f < 0) {
++      fprintf(stderr, "Trying to open without locking.\n");
++      f = open64(device, mode);      
++    }
++  }
++    
++  return f;
++}
++
++
+ char *setup_fds (char *device)
+ { char *odevice;
+   uid_t uid=getuid();
+@@ -667,7 +693,7 @@
+      * with set-root-uid should fill in for the kernel
+      * deficiency...
+      */
+-    if ((fd = open64 (device,O_RDWR|O_NONBLOCK)) >= 0)
++    if ((fd = open64excl (device,O_RDWR|O_NONBLOCK)) >= 0)
+     {	if (fstat64 (fd,&sc) < 0)
+ 	    fprintf (stderr,":-( unable to stat64(\"%s\"): ",device),
+ 	    perror (NULL), exit (FATAL_START(errno));
+--- dvd+rw-tools-6.1/transport.hxx.excl	2006-01-26 09:02:32.000000000 +0100
++++ dvd+rw-tools-6.1/transport.hxx	2006-03-22 13:58:38.000000000 +0100
+@@ -217,6 +217,33 @@
      ~Scsi_Command()	{ if (fd>=0 && autoclose) close(fd),fd=-1;
  			  if (filename) free(filename),filename=NULL;
  			}
@@ -34,7 +78,7 @@
      int associate (const char *file,const struct stat *ref=NULL)
      { struct stat sb;
  
-@@ -199,8 +226,9 @@
+@@ -225,8 +252,9 @@
  	 * execution under Linux kernel 2.6[.8]. Under 2.4 it
  	 * falls down to O_RDONLY...
  	 */
@@ -46,47 +90,3 @@
  	if (fstat(fd,&sb) < 0)				return 0;
  	if (!S_ISBLK(sb.st_mode))	{ errno=ENOTBLK;return 0; }
  
---- dvd+rw-tools-5.21.4.10.8/growisofs.c.excl	2004-08-25 01:02:29.000000000 +0200
-+++ dvd+rw-tools-5.21.4.10.8/growisofs.c	2004-09-01 13:01:09.706523672 +0200
-@@ -487,6 +487,32 @@
-   return ret;
- }
- 
-+int open64excl(const char *device, int mode)
-+{
-+  int f, i;
-+    
-+  f = open64(device, mode | O_EXCL);
-+    
-+  if (f < 0) {
-+    if (errno != EBUSY)	
-+      return f;
-+      
-+    for (i = 0; (i < 10) && (f == -1); i++) {
-+      fprintf(stderr, "Error trying to open %s exclusively ... retrying in 1 second.\n", device);
-+      usleep(1000000 + (long)(100000.0 * rand()/(RAND_MAX+1.0)));
-+      f = open64(device, mode | O_EXCL);
-+    }
-+      
-+    if (f < 0) {
-+      fprintf(stderr, "Trying to open without locking.\n");
-+      f = open64(device, mode);      
-+    }
-+  }
-+    
-+  return f;
-+}
-+
-+
- char *setup_fds (char *device)
- { char *odevice;
-   uid_t uid=getuid();
-@@ -561,7 +587,7 @@
-      * with set-root-uid should fill in for the kernel
-      * deficiency...
-      */
--    if ((fd = open64 (device,O_RDWR|O_NONBLOCK)) >= 0)
-+    if ((fd = open64excl(device,O_RDWR|O_NONBLOCK)) >= 0)
- 	ioctl_handle=(void *)(long)fd;
-     else
- 	ioctl_handle=(void *)(long)dup(in_fd);


Index: dvd+rw-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/devel/dvd+rw-tools.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dvd+rw-tools.spec	11 Feb 2006 02:28:10 -0000	1.16
+++ dvd+rw-tools.spec	18 Apr 2006 14:38:14 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:	Toolchain to master DVD+RW/+R media
 Name:		dvd+rw-tools
-Version:	5.21.4.10.8
-Release: 6.2.1
+Version:	6.1
+Release: 	1
 License:	GPL
 Group:		Applications/Multimedia
 Source:		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz
@@ -20,13 +20,13 @@
 %prep
 %setup -q  -n %{name}-%{version}
 %patch -p1 -b .manpatch
-%patch10 -p1 -b .excl
+#%patch10 -p1 -b .excl
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
 
-make
+make WARN="-DDEFAULT_BUF_SIZE_MB=16"
 cp %SOURCE1 index.html
 
 %install
@@ -54,6 +54,9 @@
 %{_mandir}/man1/growisofs.1*
 
 %changelog
+* Fri Mar 24 2006 Harald Hoyer <harald at redhat.com> - 6.1-0.FC5.1
+- version 6.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.21.4.10.8-6.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Sep 2004 04:24:11 -0000	1.6
+++ sources	18 Apr 2006 14:38:14 -0000	1.7
@@ -1 +1 @@
-b931c02e2b23342f664276ef26d1502c  dvd+rw-tools-5.21.4.10.8.tar.gz
+d6bad594e55a2e0d7cf76ce452fce399  dvd+rw-tools-6.1.tar.gz




More information about the fedora-cvs-commits mailing list