mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

- Fix yet another bug that might be used for a root exploit. As with the last

Browse Source 
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
This commit is contained in:
Alexander Leidinger 2003-06-04 18:43:16 +00:00
parent 5f3932d5ab
commit 3a726cb4d9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=82289
4 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sysutils/cdrdao/Makefile
View File

@ -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:

6
sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul
View File

@ -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=

12
sysutils/cdrdao/files/patch-scsilib::RULES::rules.cnf Normal file
View File

@ -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))

11
sysutils/cdrdao/files/patch-scsilib::libscg::scsitransp.c Normal file
View File

@ -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");