mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-04 11:23:46 +00:00
Code Issues Releases Activity

- Update to 2.01. For changes since 2.00.3 please see:

Browse Source 
ftp://ftp.berlios.de/pub/cdrecord/AN-2.01
- Once again remove the patch for the configure script to disable the use
  of mlockall(2) as it no longer causes negative side effects on FreeBSD
  => 502113. Mark the port IGNORE on FreeBSD 5.x with broken mlockall(2)
  as such changes are not allowed according to a comment in xconfig.h.in.
  A patch for aclocal.m4 was submitted upstream but didn't get integrated.

Mkisofs 2.01 was verified to produce working FreeBSD install images for
alpha, i386, ia64 and sparc64.

Thanks to:	marcel for verifying mkisofs on ia64
Approved by:	netchild
This commit is contained in:
Marius Strobl 2004-12-29 22:17:04 +00:00
parent 2905c4e912
commit 864c1eaec4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=125474
9 changed files with 18 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sysutils/cdrtools/Makefile
View File

@ -6,13 +6,12 @@
#
PORTNAME= cdrtools
PORTVERSION?= 2.0.3
PORTREVISION?= 4
PORTVERSION?= 2.01
PORTREVISION?= 0
CATEGORIES?= sysutils audio
MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/ \
ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/ \
ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/
DISTNAME= cdrtools-2.00.3
ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/
DISTNAME= cdrtools-2.01
MAINTAINER= marius@FreeBSD.org
COMMENT= CD/CD-R[W] and ISO-9660 image creation and extraction tools
@ -25,14 +24,15 @@ MLINKS= isoinfo.8 devdump.8 isoinfo.8 isodump.8 isoinfo.8 isovfy.8 \
mkisofs.8 mkhybrid.8
DOCS= README README.ATAPI README.DiskT@2 README.FreeBSD README.WORM \
README.audio README.cdplus README.cdrw README.cdtext \
README.copy README.mkisofs README.multi README.raw \
README.rscsi README.sony README.verify
README.clone README.copy README.mkisofs README.multi \
README.raw README.rscsi README.sony README.verify
CDDA2WAVDOCS= FAQ Frontends HOWTOUSE OtherProgs README THANKS TODO
MKISOFSDOCS= README README.compression README.eltorito README.graft_dirs \
README.hfs_boot README.hfs_magic README.hide README.joliet \
README.macosx README.mkhybrid README.prep_boot README.rootinfo \
README.session README.sort README.sparcboot
README.session README.sort README.sparcboot README.sunx86boot
USE_BZIP2= yes
USE_GMAKE= yes
USE_REINPLACE= yes
MAKE_ENV= CCOM=${CC} LANG=C
@ -50,6 +50,10 @@ PLIST_SUB= RSCSI="@comment "
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 501104 && ${OSVERSION} < 502113
IGNORE= The mlockall(2) of your FreeBSD 5.x version causes problems when used by cdrecord. Please update FreeBSD to >= 5.3 in order to use this port
.endif
pre-everything::
.if !defined(WITH_RSCSI)
@${ECHO_MSG} ""
@ -74,6 +78,7 @@ post-extract:
.endif
post-patch:
@${RM} ${WRKSRC}/TARGETS/55scgskeleton ${WRKSRC}/TARGETS/85man
.if !defined(WITH_RSCSI)
@${RM} ${WRKSRC}/TARGETS/55rscsi
.endif

4
sysutils/cdrtools/distinfo
View File

@ -1,2 +1,2 @@
MD5 (cdrtools-2.00.3.tar.gz) = c0cdfa2dbe9f4c977b0a71fb08ddff0e
SIZE (cdrtools-2.00.3.tar.gz) = 1638876
MD5 (cdrtools-2.01.tar.bz2) = d44a81460e97ae02931c31188fe8d3fd
SIZE (cdrtools-2.01.tar.bz2) = 1400389

16
sysutils/cdrtools/files/patch-README.rscsi
View File

@ -1,11 +1,6 @@
--- README.rscsi.orig Sun Aug 17 11:31:39 2003
+++ README.rscsi Sun Aug 17 14:38:57 2003
@@ -14,28 +14,25 @@
- Create one or more special user(s) that have /opt/schily/sbin/rscsi
as login shell with their own home directory.
- You then may create special .rhost files for each user.
+ You then may create special .rhosts files for each user.
@@ -18,24 +18,21 @@
NOTE: In this case, rscsi must be installed suid root.
**** This is the preferred method ****
@ -39,12 +34,3 @@
RSCSI Security:
@@ -96,7 +93,7 @@
information about the remote libscg version used for the connection.
- To be able to use the remote SCSI client code from win32 you need to create
- a file /etc/passwd with a corect entry for the user you are on win32.
+ a file /etc/passwd with a correct entry for the user you are on win32.
Call 'id' to get the right user id.
Note that remote SCSI has not yet been tested on Win32.

12
sysutils/cdrtools/files/patch-RULES::rules.cnf
View File

@ -1,12 +0,0 @@
--- RULES/rules.cnf.orig Sun Jan 27 16:11:31 2002
+++ RULES/rules.cnf Sun Jun 1 18:58:37 2003
@@ -33,8 +33,7 @@
#
# Hack until the <mach>-<os>-*cc.rul files are updated
#
-_HCCCOM= $(OARCH:%-gcc=gcc)
-HCCCOM= $(_HCCCOM:%-cc=cc)
+HCCCOM= $(C_ARCH)
_CCCOM= $(_UNIQ)$(CCCOM)
__CCCOM= $(_CCCOM:$(_UNIQ)=$(HCCCOM))

44
sysutils/cdrtools/files/patch-cdda2wav::interface.c
View File

@ -17,47 +17,3 @@
if (!S_ISCHR(statstruct->st_mode)) {
fprintf(stderr, "%s is not a char device\n",pdev_name);
exit(SYNTAX_ERROR);
@@ -555,8 +563,25 @@
}
dontneedgroup();
dontneedroot();
+#if defined (__FreeBSD__)
+ /*
+ * i_read_c_block(), used by paranoia_read_limited() for reading the
+ * data from the CD, doesn't use a page aligned buffer as required by
+ * FreeBSD for SCSI transfers (well, most OS do). Probably this should
+ * be dealt with in cdda_read() (called by i_read_c_block() with the
+ * unaligned buffer and in turn calls ReadCdRom() to do the actual read)
+ * but it seems like overkill to add yet another buffer (would make it
+ * 3 or so from do_read() to ReadCdRom() alone). Instead, limit the
+ * transfer size via the maximum for the sectors to read at once to a
+ * value that lets the data fit into a page (for FreeBSD the code below
+ * would set the maximum sectors to 27).
+ */
+ if (global.nsectors > 26)
+ global.nsectors = 26;
+#else
if (global.nsectors > (unsigned) scg_bufsize(scgp, 3*1024*1024)/CD_FRAMESIZE_RAW)
global.nsectors = scg_bufsize(scgp, 3*1024*1024)/CD_FRAMESIZE_RAW;
+#endif
if (global.overlap >= global.nsectors)
global.overlap = global.nsectors-1;
@@ -593,9 +618,6 @@
exit(RACE_ERROR);
}
#endif
- if (scgp != NULL && global.scsi_verbose) {
- scgp->verbose = global.scsi_verbose;
- }
}
return retval;
}
@@ -888,6 +910,7 @@
FatalError("No memory for SCSI structure.\n");
}
scgp->silent = 0;
+ scgp->verbose = global.scsi_verbose;
SetupCookedIoctl( global.dev_name );
#else
FatalError("Sorry, there is no known method to access the device.\n");

10
sysutils/cdrtools/files/patch-conf::configure
View File

@ -1,10 +0,0 @@
--- conf/configure.orig Fri Sep 19 16:47:37 2003
+++ conf/configure Fri Sep 19 16:49:26 2003
@@ -5567,6 +5567,7 @@
int
main()
{
+ exit(1);
if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0) {
if (errno == EINVAL || errno == ENOMEM ||
errno == EPERM || errno == EACCES)

16
sysutils/cdrtools/files/patch-librscg::scsi-remote.c
View File

@ -1,16 +0,0 @@
--- librscg/scsi-remote.c.orig Thu Jan 15 01:25:09 2004
+++ librscg/scsi-remote.c Tue Aug 24 00:11:42 2004
@@ -1074,6 +1074,13 @@
if (getuid() != pw->pw_uid &&
setuid(pw->pw_uid) == -1) {
errmsg("setuid(%lld) failed.\n",
+ (Llong)pw->pw_uid);
+ _exit(EX_BAD);
+ /* NOTREACHED */
+ }
+ if (getuid() != geteuid() &&
+ seteuid(pw->pw_uid) == -1) {
+ errmsg("seteuid(%lld) failed.\n",
(Llong)pw->pw_uid);
_exit(EX_BAD);
/* NOTREACHED */

18
sysutils/cdrtools/files/patch-rscsi::rscsi.c
View File

@ -1,18 +0,0 @@
--- rscsi/rscsi.c Thu Mar 6 16:26:19 2003
+++ rscsi/rscsi.c Thu Jul 31 07:51:15 2003
@@ -143,8 +143,14 @@
if (debug_name == NULL && argc <= 0)
debug_name = "/tmp/RSCSI";
#endif
- if (argc > 0)
+#ifdef NONONO
+ /*
+ * Should we allow root to shoot himself into the foot?
+ * Allowing to write arbitrary files may be a security risk.
+ */
+ if (argc > 0 && getuid() == 0)
debug_name = *argv;
+#endif
if (debug_name != NULL)
debug_file = fopen(debug_name, "w");

2
sysutils/cdrtools/pkg-plist
View File

@ -29,6 +29,7 @@ etc/cdrecord.sample
%%PORTDOCS%%%%DOCSDIR%%/README.cdplus
%%PORTDOCS%%%%DOCSDIR%%/README.cdrw
%%PORTDOCS%%%%DOCSDIR%%/README.cdtext
%%PORTDOCS%%%%DOCSDIR%%/README.clone
%%PORTDOCS%%%%DOCSDIR%%/README.copy
%%PORTDOCS%%%%DOCSDIR%%/README.mkisofs
%%PORTDOCS%%%%DOCSDIR%%/README.multi
@ -59,5 +60,6 @@ etc/cdrecord.sample
%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.session
%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.sort
%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.sparcboot
%%PORTDOCS%%%%DOCSDIR%%/mkisofs/README.sunx86boot
%%PORTDOCS%%@dirrm %%DOCSDIR%%/mkisofs
%%PORTDOCS%%@dirrm %%DOCSDIR%%