update to 3.01a27 [release 3.01a27-1mamba;Tue Feb 17 2015]

This commit is contained in:
Silvan Calarco 2024-01-05 21:09:43 +01:00
parent 2c5e934480
commit 4fd7ce50af
6 changed files with 8 additions and 1145 deletions

View File

@ -1,15 +0,0 @@
--- cdrecord-2.01/librscg/scsi-remote.c.org 2004-08-30 16:09:33.000000000 -0600
+++ cdrecord-2.01/librscg/scsi-remote.c 2004-08-30 16:11:06.000000000 -0600
@@ -1071,9 +1071,9 @@
/*
* Become 'locuser' to tell the rsh program the local user id.
*/
- if (getuid() != pw->pw_uid &&
- setuid(pw->pw_uid) == -1) {
- errmsg("setuid(%lld) failed.\n",
+ if ((pw->pw_uid) != geteuid() &&
+ seteuid(pw->pw_uid) == -1) {
+ errmsg("seteuid(%lld) failed.\n",
(Llong)pw->pw_uid);
_exit(EX_BAD);
/* NOTREACHED */

View File

@ -1,61 +0,0 @@
--- cdrtools-2.01/mkisofs/write.c.jj 2005-08-27 10:16:33.000000000 +0200
+++ cdrtools-2.01/mkisofs/write.c 2005-08-27 10:29:41.000000000 +0200
@@ -1907,7 +1907,7 @@ pvd_write(outfile)
/* Next we write out the primary descriptor for the disc */
memset(&vol_desc, 0, sizeof (vol_desc));
vol_desc.type[0] = ISO_VD_PRIMARY;
- memcpy(vol_desc.id, ISO_STANDARD_ID, sizeof (ISO_STANDARD_ID));
+ memcpy(vol_desc.id, ISO_STANDARD_ID, sizeof (ISO_STANDARD_ID) - 1);
vol_desc.version[0] = 1;
memset(vol_desc.system_id, ' ', sizeof (vol_desc.system_id));
@@ -2030,7 +2030,7 @@ evd_write(outfile)
*/
memset(&evol_desc, 0, sizeof (evol_desc));
evol_desc.type[0] = (unsigned char) ISO_VD_END;
- memcpy(evol_desc.id, ISO_STANDARD_ID, sizeof (ISO_STANDARD_ID));
+ memcpy(evol_desc.id, ISO_STANDARD_ID, sizeof (ISO_STANDARD_ID) - 1);
evol_desc.version[0] = 1;
xfwrite(&evol_desc, SECTOR_SIZE, 1, outfile, 0, TRUE);
last_extent_written += 1;
--- cdrtools-2.01/mkisofs/eltorito.c.jj 2004-05-23 22:46:05.000000000 +0200
+++ cdrtools-2.01/mkisofs/eltorito.c 2005-08-27 10:30:50.000000000 +0200
@@ -270,7 +270,7 @@ get_torito_desc(boot_desc)
memset(boot_desc, 0, sizeof (*boot_desc));
boot_desc->type[0] = 0;
- memcpy(boot_desc->id, ISO_STANDARD_ID, sizeof (ISO_STANDARD_ID));
+ memcpy(boot_desc->id, ISO_STANDARD_ID, sizeof (ISO_STANDARD_ID) - 1);
boot_desc->version[0] = 1;
memcpy(boot_desc->system_id, EL_TORITO_ID, sizeof (EL_TORITO_ID));
--- cdrtools-2.01/cdda2wav/toc.c.jj 2004-05-21 22:56:44.000000000 +0200
+++ cdrtools-2.01/cdda2wav/toc.c 2005-08-27 10:25:04.000000000 +0200
@@ -959,7 +959,12 @@ process_cddb_titles(sock_fd, inbuff, rea
if (*target != NULL)
**target = '\0';
} else {
- realloc(*target, strlen(*target) + clen - 1);
+ char *newp = realloc(*target, strlen(*target) + clen - 1);
+ if (newp == NULL) {
+ free (*target);
+ *target = NULL;
+ } else
+ *target = newp;
}
if (*target != NULL) {
strcat((char *)*target, inbuff+ind+7);
@@ -994,7 +999,12 @@ process_cddb_titles(sock_fd, inbuff, rea
if (global.tracktitle[tno] != NULL)
*(global.tracktitle[tno]) = '\0';
} else {
- realloc(global.tracktitle[tno], strlen((char *)global.tracktitle[tno]) + p - q + 1 );
+ char *newp = realloc(global.tracktitle[tno], strlen((char *)global.tracktitle[tno]) + p - q + 1 );
+ if (newp == NULL) {
+ free (global.tracktitle[tno]);
+ global.tracktitle[tno] = NULL;
+ } else
+ global.tracktitle[tno] = newp;
}
if (global.tracktitle[tno] != NULL) {
strcat((char *)global.tracktitle[tno], q+1);

View File

@ -1,12 +0,0 @@
diff -pur cdrtools-2.01/cdrecord/drv_mmc.c cdrtools-2.01-fix/cdrecord/drv_mmc.c
--- cdrtools-2.01/cdrecord/drv_mmc.c 2006-03-16 14:33:59.000000000 +0100
+++ cdrtools-2.01-fix/cdrecord/drv_mmc.c 2006-03-16 14:35:55.000000000 +0100
@@ -1087,7 +1087,7 @@ check_writemodes_mmc(scgp, dp)
return (0);
}
-LOCAL int
+EXPORT int
check_writemodes_mdvd(scgp, dp)
SCSI *scgp;
cdr_t *dp;

View File

@ -1,11 +0,0 @@
--- cdrtools-2.01/RULES/mk-gmake.id 2004-09-08 18:10:02.000000000 +0200
+++ cdrtools-2.01/RULES/mk-gmake.id.nowarn 2006-03-16 12:55:18.000000000 +0100
@@ -37,7 +37,7 @@
ifndef ARCH_DONE
-__gmake_warn:= $(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 5)
+#__gmake_warn:= $(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 5)
_MACHCMD= (mach || uname -p || true) 2> /dev/null
_ARCHCMD= (arch || /usr/ucb/arch || true) 2> /dev/null

File diff suppressed because it is too large Load Diff

View File

@ -1,26 +1,21 @@
%define cdrecording_group 12 %define cdrecording_group 12
%define sourcever %(echo %version | cut -da -f1) %define sourcever %(echo %version | cut -da -f1)
Name: cdrtools Name: cdrtools
Version: 3.01a25 Version: 3.01a27
Release: 1mamba Release: 1mamba
Summary: Tools for CD/DVD recorders Summary: Tools for CD/DVD recorders
Group: System/Tools Group: System/Tools
Vendor: openmamba Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://sourceforge.net/projects/cdrtools/ URL: http://cdrtools.sourceforge.net/
Source: http://downloads.sourceforge.net/project/cdrtools/alpha/cdrtools-%{version}.tar.gz Source: http://downloads.sourceforge.net/project/cdrtools/alpha/cdrtools-%{version}.tar.bz2
Patch0: %{name}-2.01-CAN-2004-0806.patch
Patch1: %{name}-2.01-warnings.patch
Patch2: http://crashrecovery.org/oss-dvd/cdrtools-2.01a32-ossdvd.patch.bz2
Patch3: %{name}-2.01-gcc4.patch
Patch4: %{name}-2.01-gcc_static.patch
License: GPL, Common Development and Distribution License License: GPL, Common Development and Distribution License
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: bash
BuildRequires: glibc-devel BuildRequires: glibc-devel
## AUTOBUILDREQ-END BuildRequires: libacl-devel
BuildRequires: libcap-devel BuildRequires: libcap-devel
## AUTOBUILDREQ-END
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description %description
@ -43,11 +38,6 @@ This is the development package.
%prep %prep
%setup -q -n %{name}-%{sourcever} %setup -q -n %{name}-%{sourcever}
#%patch0 -p1 -b .CAN-2004-0806
#%patch1 -p1 -b .warning
#%patch2 -p1
#%patch3 -p1 -b .gcc4
#%patch4 -p1 -b .gcc_static
%build %build
mandir=%{_mandir} mandir=%{_mandir}
@ -117,6 +107,9 @@ mandir=%{_mandir}
%doc README.linux-shm README.mkisofs %doc README.linux-shm README.mkisofs
%changelog %changelog
* Tue Feb 17 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 3.01a27-1mamba
- update to 3.01a27
* Sun Nov 16 2014 Automatic Build System <autodist@mambasoft.it> 3.01a25-1mamba * Sun Nov 16 2014 Automatic Build System <autodist@mambasoft.it> 3.01a25-1mamba
- automatic version update by autodist - automatic version update by autodist