diff options
| author | Alexander Leidinger <netchild@FreeBSD.org> | 2003-06-04 18:43:16 +0000 |
|---|---|---|
| committer | Alexander Leidinger <netchild@FreeBSD.org> | 2003-06-04 18:43:16 +0000 |
| commit | 3a726cb4d93524261eb6813129578e9209c46b30 (patch) | |
| tree | a7faaa6fa7bcd6eb4338928c755736550e8f3ae0 /sysutils/cdrdao | |
| parent | update to 1.10 (diff) | |
- Fix yet another bug that might be used for a root exploit. As with the last
bug you are only vulnerable if you locally set the cdrdao binary suid root.
- Respect CC already at the configure-stage of scsilib else we end up running
configure with GCC and compiling with whatever CC was set to.
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=82289
Diffstat (limited to 'sysutils/cdrdao')
4 files changed, 30 insertions, 7 deletions
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile index 46bc91feac69..e2460c37260d 100644 --- a/sysutils/cdrdao/Makefile +++ b/sysutils/cdrdao/Makefile @@ -7,7 +7,7 @@ PORTNAME= cdrdao PORTVERSION= 1.1.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -23,7 +23,7 @@ WANT_GNOME= yes MAN1= cdrdao.1 -MAKE_ENV= COPTX="-DBSD_SCSI_SENSE_BUG" +MAKE_ENV= CCOM=${CC} COPTX="-DBSD_SCSI_SENSE_BUG" .include <bsd.port.pre.mk> @@ -83,9 +83,9 @@ pre-everything:: @${ECHO_MSG} "" post-extract: -.if ${MACHINE_ARCH} != "i386" +.if ${MACHINE_ARCH} != "i386" || ${CC} != "cc" @(cd ${WRKSRC}/scsilib/RULES; \ - ${LN} -sf i386-freebsd-cc.rul ${MACHINE_ARCH}-freebsd-cc.rul) + ${LN} -sf i386-freebsd-cc.rul ${MACHINE_ARCH}-freebsd-${CC}.rul) .endif post-patch: diff --git a/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul b/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul index 22d48301343d..5df88f6d6c13 100644 --- a/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul +++ b/sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul @@ -18,8 +18,8 @@ -LDCC= @echo " ==> LINKING \"$@\""; gcc -DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc -RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib -+LDCC= $(CC) -+DYNLD= $(CC) ++LDCC= $(CCOM) ++DYNLD= $(CCOM) +RANLIB= ranlib ARFLAGS= cr LORDER= lorder @@ -27,5 +27,5 @@ RMDEP= : -MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M -+MKDEP= $(CC) -M ++MKDEP= $(CCOM) -M MKDEP_OUT= diff --git a/sysutils/cdrdao/files/patch-scsilib::RULES::rules.cnf b/sysutils/cdrdao/files/patch-scsilib::RULES::rules.cnf new file mode 100644 index 000000000000..270cb234a215 --- /dev/null +++ b/sysutils/cdrdao/files/patch-scsilib::RULES::rules.cnf @@ -0,0 +1,12 @@ +--- scsilib/RULES/rules.cnf.orig Sun Jan 27 16:11:31 2002 ++++ scsilib/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)) diff --git a/sysutils/cdrdao/files/patch-scsilib::libscg::scsitransp.c b/sysutils/cdrdao/files/patch-scsilib::libscg::scsitransp.c new file mode 100644 index 000000000000..b72e4cb6036b --- /dev/null +++ b/sysutils/cdrdao/files/patch-scsilib::libscg::scsitransp.c @@ -0,0 +1,11 @@ +--- scsilib/libscg/scsitransp.c.orig Sun Sep 15 17:02:18 2002 ++++ scsilib/libscg/scsitransp.c Wed May 28 19:29:54 2003 +@@ -1016,7 +1016,7 @@ + register Uchar *cp; + register int n; + { +- js_fprintf(f, s); ++ js_fprintf(f, "%s", s); + while (--n >= 0) + js_fprintf(f, " %02X", *cp++); + js_fprintf(f, "\n"); |