diff --git a/udftools-1.0.0b3-fixcompile.patch b/udftools-1.0.0b3-fixcompile.patch new file mode 100644 index 0000000..83883bc --- /dev/null +++ b/udftools-1.0.0b3-fixcompile.patch @@ -0,0 +1,546 @@ +Nur in udftools-1.0.0b3-new/cdrwtool: cdrwtool. +diff -ur udftools-1.0.0b3/cdrwtool/cdrwtool.c udftools-1.0.0b3-new/cdrwtool/cdrwtool.c +--- udftools-1.0.0b3/cdrwtool/cdrwtool.c 2002-12-28 05:48:51.000000000 +0100 ++++ udftools-1.0.0b3-new/cdrwtool/cdrwtool.c 2007-08-23 13:28:23.000000000 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #include + #include +Nur in udftools-1.0.0b3-new/cdrwtool: cdrwtool.o. +Nur in udftools-1.0.0b3-new/cdrwtool: defaults.o. +Nur in udftools-1.0.0b3-new/cdrwtool: .deps. +Nur in udftools-1.0.0b3-new/cdrwtool: .libs. +Nur in udftools-1.0.0b3-new/cdrwtool: main.o. +Nur in udftools-1.0.0b3-new/cdrwtool: Makefile. +Nur in udftools-1.0.0b3-new/cdrwtool: mkudffs.o. +Nur in udftools-1.0.0b3-new/cdrwtool: options.o. +diff -ur udftools-1.0.0b3/config/config.guess udftools-1.0.0b3-new/config/config.guess +--- udftools-1.0.0b3/config/config.guess 2004-02-23 10:33:44.000000000 +0100 ++++ udftools-1.0.0b3-new/config/config.guess 2007-08-23 13:27:41.000000000 +0200 +@@ -3,7 +3,7 @@ + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + +-timestamp='2003-01-10' ++timestamp='2003-06-17' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -106,6 +106,7 @@ + : ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || ++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; + dummy=$tmp/dummy ; + tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +@@ -135,6 +136,13 @@ + UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown + UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + ++## for Red Hat Linux ++if test -f /etc/redhat-release ; then ++ VENDOR=redhat ; ++else ++ VENDOR= ; ++fi ++ + # Note: order is significant - the case branches are not exclusive. + + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +@@ -235,74 +243,56 @@ + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; +- *:MicroBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE} +- exit 0 ;; + alpha:OSF1:*:*) + if test $UNAME_RELEASE = "V4.0"; then + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + fi ++ # According to Compaq, /usr/sbin/psrinfo has been available on ++ # OSF/1 and Tru64 systems produced since 1995. I hope that ++ # covers most systems running today. This code pipes the CPU ++ # types through head -n 1, so we only detect the type of CPU 0. ++ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` ++ case "$ALPHA_CPU_TYPE" in ++ "EV4 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "EV4.5 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "LCA4 (21066/21068)") ++ UNAME_MACHINE="alpha" ;; ++ "EV5 (21164)") ++ UNAME_MACHINE="alphaev5" ;; ++ "EV5.6 (21164A)") ++ UNAME_MACHINE="alphaev56" ;; ++ "EV5.6 (21164PC)") ++ UNAME_MACHINE="alphapca56" ;; ++ "EV5.7 (21164PC)") ++ UNAME_MACHINE="alphapca57" ;; ++ "EV6 (21264)") ++ UNAME_MACHINE="alphaev6" ;; ++ "EV6.7 (21264A)") ++ UNAME_MACHINE="alphaev67" ;; ++ "EV6.8CB (21264C)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8AL (21264B)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8CX (21264D)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.9A (21264/EV69A)") ++ UNAME_MACHINE="alphaev69" ;; ++ "EV7 (21364)") ++ UNAME_MACHINE="alphaev7" ;; ++ "EV7.9 (21364A)") ++ UNAME_MACHINE="alphaev79" ;; ++ esac + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. +- eval $set_cc_for_build +- cat <$dummy.s +- .data +-\$Lformat: +- .byte 37,100,45,37,120,10,0 # "%d-%x\n" +- +- .text +- .globl main +- .align 4 +- .ent main +-main: +- .frame \$30,16,\$26,0 +- ldgp \$29,0(\$27) +- .prologue 1 +- .long 0x47e03d80 # implver \$0 +- lda \$2,-1 +- .long 0x47e20c21 # amask \$2,\$1 +- lda \$16,\$Lformat +- mov \$0,\$17 +- not \$1,\$18 +- jsr \$26,printf +- ldgp \$29,0(\$26) +- mov 0,\$16 +- jsr \$26,exit +- .end main +-EOF +- $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null +- if test "$?" = 0 ; then +- case `$dummy` in +- 0-0) +- UNAME_MACHINE="alpha" +- ;; +- 1-0) +- UNAME_MACHINE="alphaev5" +- ;; +- 1-1) +- UNAME_MACHINE="alphaev56" +- ;; +- 1-101) +- UNAME_MACHINE="alphapca56" +- ;; +- 2-303) +- UNAME_MACHINE="alphaev6" +- ;; +- 2-307) +- UNAME_MACHINE="alphaev67" +- ;; +- 2-1307) +- UNAME_MACHINE="alphaev68" +- ;; +- 3-1307) +- UNAME_MACHINE="alphaev7" +- ;; +- esac +- fi + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit 0 ;; ++ Alpha*:OpenVMS:*:*) ++ echo alpha-hp-vms ++ exit 0 ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead +@@ -341,6 +331,9 @@ + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit 0 ;; ++ DRS?6000:unix:4.0:6*) ++ echo sparc-icl-nx6 ++ exit 0 ;; + DRS?6000:UNIX_SV:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7 && exit 0 ;; +@@ -765,7 +758,7 @@ + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; +- *:FreeBSD:*:*) ++ *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) + # Determine whether the default compiler uses glibc. + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -788,8 +781,8 @@ + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit 0 ;; +- x86:Interix*:3*) +- echo i586-pc-interix3 ++ x86:Interix*:[34]*) ++ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + exit 0 ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks +@@ -816,10 +809,20 @@ + echo ${UNAME_MACHINE}-pc-minix + exit 0 ;; + arm*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep __ARM_EABI__ >/dev/null ++ then ++ echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu ++ else ++ echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnueabi ++ fi ++ exit 0 ;; ++ cris:Linux:*:*) ++ echo cris-axis-linux-gnu + exit 0 ;; + ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu + exit 0 ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -863,10 +866,10 @@ + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + ;; + ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu ++ echo powerpc-${VENDOR:-unknown}-linux-gnu + exit 0 ;; + ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu ++ echo powerpc64-${VENDOR:-unknown}-linux-gnu + exit 0 ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +@@ -894,7 +897,10 @@ + echo hppa64-unknown-linux-gnu + exit 0 ;; + s390:Linux:*:* | s390x:Linux:*:*) +- echo ${UNAME_MACHINE}-ibm-linux ++ echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu ++ exit 0 ;; ++ sh64*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -903,7 +909,7 @@ + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo x86_64-${VENDOR:-unknown}-linux-gnu + exit 0 ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so +@@ -955,7 +961,7 @@ + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 ++ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0 + test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + ;; + i*86:DYNIX/ptx:4*:*) +@@ -1054,7 +1060,7 @@ + exit 0 ;; + M68*:*:R3V[567]*:*) + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; +- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0) ++ 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` +@@ -1210,6 +1216,9 @@ + *:ITS:*:*) + echo pdp10-unknown-its + exit 0 ;; ++ SEI:*:*:SEIUX) ++ echo mips-sei-seiux${UNAME_RELEASE} ++ exit 0 ;; + esac + + #echo '(No uname command or uname output not recognized.)' 1>&2 +diff -ur udftools-1.0.0b3/config/config.sub udftools-1.0.0b3-new/config/config.sub +--- udftools-1.0.0b3/config/config.sub 2004-02-23 10:33:44.000000000 +0100 ++++ udftools-1.0.0b3-new/config/config.sub 2007-08-23 13:27:41.000000000 +0200 +@@ -3,7 +3,7 @@ + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + +-timestamp='2003-01-03' ++timestamp='2003-06-18' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -229,7 +229,7 @@ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ +- | clipper \ ++ | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ +@@ -258,11 +258,11 @@ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | s390 | s390x \ +- | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ +- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ ++ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ + | strongarm \ +- | tahoe | thumb | tic80 | tron \ ++ | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xscale | xstormy16 | xtensa \ +@@ -297,7 +297,7 @@ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* \ + | bs2000-* \ +- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ +@@ -331,11 +331,13 @@ + | pyramid-* \ + | romp-* | rs6000-* \ + | s390-* | s390x-* \ +- | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ ++ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ +- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ +- | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ ++ | tahoe-* | thumb-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ +@@ -373,6 +375,9 @@ + basic_machine=a29k-none + os=-bsd + ;; ++ amd64) ++ basic_machine=x86_64-pc ++ ;; + amdahl) + basic_machine=580-amdahl + os=-sysv +@@ -768,18 +773,24 @@ + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; +- pentiumii | pentium2) ++ pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; ++ pentium4) ++ basic_machine=i786-pc ++ ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; +- pentiumii-* | pentium2-*) ++ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ++ pentium4-*) ++ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + pn) + basic_machine=pn-gould + ;; +@@ -832,6 +843,10 @@ + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; ++ sei) ++ basic_machine=mips-sei ++ os=-seiux ++ ;; + sequent) + basic_machine=i386-sequent + ;; +@@ -839,6 +854,9 @@ + basic_machine=sh-hitachi + os=-hms + ;; ++ sh64) ++ basic_machine=sh64-unknown ++ ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks +@@ -913,14 +931,18 @@ + basic_machine=t90-cray + os=-unicos + ;; +- tic4x | c4x*) +- basic_machine=tic4x-unknown +- os=-coff +- ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; ++ tic55x | c55x*) ++ basic_machine=tic55x-unknown ++ os=-coff ++ ;; ++ tic6x | c6x*) ++ basic_machine=tic6x-unknown ++ os=-coff ++ ;; + tx39) + basic_machine=mipstx39-unknown + ;; +@@ -1023,13 +1045,13 @@ + we32k) + basic_machine=we32k-att + ;; +- sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) ++ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; +- sparc | sparcv9 | sparcv9b) ++ sparc | sparcv8 | sparcv9 | sparcv9b) + basic_machine=sparc-sun + ;; + cydra) +@@ -1114,7 +1136,7 @@ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ +- | -powermax* | -dnix* | -microbsd*) ++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1223,6 +1245,12 @@ + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; ++ -aros*) ++ os=-aros ++ ;; ++ -kaos*) ++ os=-kaos ++ ;; + -none) + ;; + *) +@@ -1254,6 +1282,9 @@ + arm*-semi) + os=-aout + ;; ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 +Nur in udftools-1.0.0b3-new: config.log. +Nur in udftools-1.0.0b3-new: config.status. +Nur in udftools-1.0.0b3-new/doc: Makefile. +Nur in udftools-1.0.0b3-new/include: config.h. +Nur in udftools-1.0.0b3-new/include: stamp-h1. +Nur in udftools-1.0.0b3-new: libtool. +Nur in udftools-1.0.0b3-new/libudffs: crc.lo. +Nur in udftools-1.0.0b3-new/libudffs: crc.o. +Nur in udftools-1.0.0b3-new/libudffs: .deps. +Nur in udftools-1.0.0b3-new/libudffs: desc.lo. +Nur in udftools-1.0.0b3-new/libudffs: desc.o. +Nur in udftools-1.0.0b3-new/libudffs: extent.lo. +Nur in udftools-1.0.0b3-new/libudffs: extent.o. +Nur in udftools-1.0.0b3-new/libudffs: file.lo. +Nur in udftools-1.0.0b3-new/libudffs: file.o. +Nur in udftools-1.0.0b3-new/libudffs: .libs. +Nur in udftools-1.0.0b3-new/libudffs: libudffs.la. +Nur in udftools-1.0.0b3-new/libudffs: Makefile. +Nur in udftools-1.0.0b3-new/libudffs: unicode.lo. +Nur in udftools-1.0.0b3-new/libudffs: unicode.o. +Nur in udftools-1.0.0b3-new: Makefile. +Nur in udftools-1.0.0b3-new/mkudffs: defaults.o. +Nur in udftools-1.0.0b3-new/mkudffs: .deps. +Nur in udftools-1.0.0b3-new/mkudffs: .libs. +Nur in udftools-1.0.0b3-new/mkudffs: main.o. +Nur in udftools-1.0.0b3-new/mkudffs: Makefile. +Nur in udftools-1.0.0b3-new/mkudffs: mkudffs. +Nur in udftools-1.0.0b3-new/mkudffs: mkudffs.o. +Nur in udftools-1.0.0b3-new/mkudffs: options.o. +Nur in udftools-1.0.0b3-new/pktsetup: .deps. +Nur in udftools-1.0.0b3-new/pktsetup: .libs. +Nur in udftools-1.0.0b3-new/pktsetup: Makefile. +Nur in udftools-1.0.0b3-new/pktsetup: pktsetup. +diff -ur udftools-1.0.0b3/pktsetup/pktsetup.c udftools-1.0.0b3-new/pktsetup/pktsetup.c +--- udftools-1.0.0b3/pktsetup/pktsetup.c 2007-08-23 13:30:18.000000000 +0200 ++++ udftools-1.0.0b3-new/pktsetup/pktsetup.c 2007-08-23 13:29:58.000000000 +0200 +@@ -26,6 +26,8 @@ + #include + #include + #include ++#include ++#include + + #include + +@@ -86,7 +88,7 @@ + { + int pkt_fd, dev_fd, cmd; + +- if ((pkt_fd = open(pkt_device, O_RDONLY | O_CREAT)) == -1) { ++ if ((pkt_fd = open(pkt_device, O_RDONLY | O_CREAT, 0600)) == -1) { + perror("open packet device"); + return; + } +Nur in udftools-1.0.0b3-new/pktsetup: pktsetup.o. +Nur in udftools-1.0.0b3-new/udfct: Makefile. +Nur in udftools-1.0.0b3-new/udffsck: .deps. +Nur in udftools-1.0.0b3-new/udffsck: .libs. +Nur in udftools-1.0.0b3-new/udffsck: main.o. +Nur in udftools-1.0.0b3-new/udffsck: Makefile. +Nur in udftools-1.0.0b3-new/udffsck: udffsck. +Nur in udftools-1.0.0b3-new/wrudf: .deps. +Nur in udftools-1.0.0b3-new/wrudf: ide-pc.o. +Nur in udftools-1.0.0b3-new/wrudf: .libs. +Nur in udftools-1.0.0b3-new/wrudf: Makefile. +Nur in udftools-1.0.0b3-new/wrudf: wrudf. +Nur in udftools-1.0.0b3-new/wrudf: wrudf-cdr.o. +Nur in udftools-1.0.0b3-new/wrudf: wrudf-cdrw.o. +Nur in udftools-1.0.0b3-new/wrudf: wrudf-cmnd.o. +Nur in udftools-1.0.0b3-new/wrudf: wrudf-desc.o. +Nur in udftools-1.0.0b3-new/wrudf: wrudf.o. diff --git a/udftools-1.0.0b3-mkudffs-bigendian.patch b/udftools-1.0.0b3-mkudffs-bigendian.patch index 3209262..79544ee 100644 --- a/udftools-1.0.0b3-mkudffs-bigendian.patch +++ b/udftools-1.0.0b3-mkudffs-bigendian.patch @@ -1,21 +1,117 @@ -Date: Sun, 12 Dec 2004 14:25:09 +0100 -From: Christoph Hellwig -To: submit@bugs.debian.org - -Package: udftools -Version: 1.0.0b3-6 - -mkduffs crashes with a segmentation fault when trying to create a -filesystem on big-endian systems. e.g. mkudffs /dev/sda4 on my -PowerMac. - -udffstools from CVS on sf.net is fine, and I've extracted the actual -fix: - - -diff -uNr -Xdontdiff -p udftools-1.0.0b3/mkudffs/mkudffs.c udftools/mkudffs/mkudffs.c ---- udftools-1.0.0b3/mkudffs/mkudffs.c 2004-02-23 04:35:33.000000000 +0100 -+++ udftools/mkudffs/mkudffs.c 2004-03-02 03:09:39.000000000 +0100 +diff -up udftools-1.0.0b3/mkudffs/defaults.c.mkudffs-bigendian udftools-1.0.0b3/mkudffs/defaults.c +--- udftools-1.0.0b3/mkudffs/defaults.c.mkudffs-bigendian 2007-08-23 13:41:29.000000000 +0200 ++++ udftools-1.0.0b3/mkudffs/defaults.c 2007-08-23 13:42:16.000000000 +0200 +@@ -69,7 +69,7 @@ struct primaryVolDesc default_pvd = + { + tagIdent : constant_cpu_to_le16(TAG_IDENT_PVD), + descVersion : constant_cpu_to_le16(3), +- tagSerialNum : 1, ++ tagSerialNum : constant_cpu_to_le16(1), + descCRC : constant_cpu_to_le16(sizeof(struct primaryVolDesc) - sizeof(tag)), + }, + volDescSeqNum : constant_cpu_to_le32(1), +@@ -119,7 +119,7 @@ struct logicalVolDesc default_lvd = + { + tagIdent : constant_cpu_to_le16(TAG_IDENT_LVD), + descVersion : constant_cpu_to_le16(3), +- tagSerialNum : 1, ++ tagSerialNum : constant_cpu_to_le16(1), + descCRC : constant_cpu_to_le16(sizeof(struct logicalVolDesc) - sizeof(tag)), + }, + volDescSeqNum : constant_cpu_to_le32(2), +@@ -157,7 +157,7 @@ struct volDescPtr default_vdp = + { + tagIdent : constant_cpu_to_le16(TAG_IDENT_VDP), + descVersion : constant_cpu_to_le16(3), +- tagSerialNum : 1, ++ tagSerialNum : constant_cpu_to_le16(1), + descCRC : constant_cpu_to_le16(sizeof(struct volDescPtr) - sizeof(tag)), + }, + volDescSeqNum : constant_cpu_to_le32(3), +@@ -192,7 +192,7 @@ struct impUseVolDesc default_iuvd = + { + tagIdent : constant_cpu_to_le16(TAG_IDENT_IUVD), + descVersion : constant_cpu_to_le16(3), +- tagSerialNum : 1, ++ tagSerialNum : constant_cpu_to_le16(1), + descCRC : constant_cpu_to_le16(sizeof(struct impUseVolDesc) - sizeof(tag)), + }, + volDescSeqNum : constant_cpu_to_le32(4), +@@ -215,7 +215,7 @@ struct partitionDesc default_pd = + { + tagIdent : constant_cpu_to_le16(TAG_IDENT_PD), + descVersion : constant_cpu_to_le16(3), +- tagSerialNum : 1, ++ tagSerialNum : constant_cpu_to_le16(1), + descCRC : constant_cpu_to_le16(sizeof(struct partitionDesc) - sizeof(tag)), + }, + volDescSeqNum : constant_cpu_to_le32(5), +@@ -242,7 +242,7 @@ struct unallocSpaceDesc default_usd = + { + tagIdent : constant_cpu_to_le16(TAG_IDENT_USD), + descVersion : constant_cpu_to_le16(3), +- tagSerialNum : 1, ++ tagSerialNum : constant_cpu_to_le16(1), + descCRC : constant_cpu_to_le16(sizeof(struct unallocSpaceDesc) - sizeof(tag)), + }, + volDescSeqNum : constant_cpu_to_le32(6), +@@ -254,7 +254,7 @@ struct terminatingDesc default_td = + { + tagIdent : constant_cpu_to_le16(TAG_IDENT_TD), + descVersion : constant_cpu_to_le16(3), +- tagSerialNum : 1, ++ tagSerialNum : constant_cpu_to_le16(1), + descCRC : constant_cpu_to_le16(sizeof(struct terminatingDesc) - sizeof(tag)), + }, + }; +@@ -265,7 +265,7 @@ struct logicalVolIntegrityDesc default_l + { + tagIdent : constant_cpu_to_le16(TAG_IDENT_LVID), + descVersion : constant_cpu_to_le16(3), +- tagSerialNum : 1, ++ tagSerialNum : constant_cpu_to_le16(1), + descCRC : constant_cpu_to_le16(sizeof(struct logicalVolIntegrityDesc) - sizeof(tag)), + }, + integrityType : constant_cpu_to_le32(LVID_INTEGRITY_TYPE_CLOSE), +@@ -295,7 +295,7 @@ struct sparingTable default_stable = + { + tagIdent : constant_cpu_to_le16(0), + descVersion : constant_cpu_to_le16(3), +- tagSerialNum : 1, ++ tagSerialNum : constant_cpu_to_le16(1), + descCRC : constant_cpu_to_le16(sizeof(struct sparingTable) - sizeof(tag)), + }, + sparingIdent : +@@ -387,7 +387,7 @@ struct fileSetDesc default_fsd = + { + tagIdent : constant_cpu_to_le16(TAG_IDENT_FSD), + descVersion : constant_cpu_to_le16(3), +- tagSerialNum : 1, ++ tagSerialNum : constant_cpu_to_le16(1), + descCRC : constant_cpu_to_le16(sizeof(struct fileSetDesc) - sizeof(tag)), + }, + interchangeLvl : constant_cpu_to_le16(2), +@@ -426,7 +426,7 @@ struct fileEntry default_fe = + { + tagIdent : constant_cpu_to_le16(TAG_IDENT_LVID), + descVersion : constant_cpu_to_le16(3), +- tagSerialNum : 1, ++ tagSerialNum : constant_cpu_to_le16(1), + descCRC : constant_cpu_to_le16(sizeof(struct primaryVolDesc) - sizeof(tag)), + }, + icbTag : +@@ -458,7 +458,7 @@ struct extendedFileEntry default_efe = + { + tagIdent : constant_cpu_to_le16(TAG_IDENT_LVID), + descVersion : constant_cpu_to_le16(3), +- tagSerialNum : 1, ++ tagSerialNum : constant_cpu_to_le16(1), + descCRC : constant_cpu_to_le16(sizeof(struct primaryVolDesc) - sizeof(tag)), + }, + icbTag : +diff -up udftools-1.0.0b3/mkudffs/mkudffs.c.mkudffs-bigendian udftools-1.0.0b3/mkudffs/mkudffs.c +--- udftools-1.0.0b3/mkudffs/mkudffs.c.mkudffs-bigendian 2004-02-23 04:35:33.000000000 +0100 ++++ udftools-1.0.0b3/mkudffs/mkudffs.c 2007-08-23 13:31:54.000000000 +0200 @@ -250,14 +250,14 @@ void split_space(struct udf_disc *disc) if (size % offsets[PSPACE_SIZE]) size -= (size % offsets[PSPACE_SIZE]); @@ -33,4 +129,3 @@ diff -uNr -Xdontdiff -p udftools-1.0.0b3/mkudffs/mkudffs.c udftools/mkudffs/mkud { if (j == 1) disc->udf_lvid->sizeTable[i+j] = cpu_to_le32(0xFFFFFFFF); - diff --git a/udftools-1.0.0b3-warningfixes2.patch b/udftools-1.0.0b3-warningfixes2.patch new file mode 100644 index 0000000..2a2e68f --- /dev/null +++ b/udftools-1.0.0b3-warningfixes2.patch @@ -0,0 +1,218 @@ +Nur in udftools-1.0.0b3-new/cdrwtool: cdrwtool. +Nur in udftools-1.0.0b3-new/cdrwtool: cdrwtool.o. +Nur in udftools-1.0.0b3-new/cdrwtool: defaults.o. +Nur in udftools-1.0.0b3-new/cdrwtool: .deps. +Nur in udftools-1.0.0b3-new/cdrwtool: .libs. +Nur in udftools-1.0.0b3-new/cdrwtool: main.o. +Nur in udftools-1.0.0b3-new/cdrwtool: Makefile. +Nur in udftools-1.0.0b3-new/cdrwtool: mkudffs.o. +Nur in udftools-1.0.0b3-new/cdrwtool: options.o. +Nur in udftools-1.0.0b3-new: config.log. +Nur in udftools-1.0.0b3-new: config.status. +Nur in udftools-1.0.0b3-new: debugfiles.list. +Nur in udftools-1.0.0b3-new: debuglinks.list. +Nur in udftools-1.0.0b3-new: debugsources.list. +Nur in udftools-1.0.0b3-new/doc: Makefile. +Nur in udftools-1.0.0b3-new/include: config.h. +Nur in udftools-1.0.0b3-new/include: stamp-h1. +Nur in udftools-1.0.0b3-new: libtool. +Nur in udftools-1.0.0b3-new/libudffs: crc.lo. +Nur in udftools-1.0.0b3-new/libudffs: crc.o. +Nur in udftools-1.0.0b3-new/libudffs: .deps. +Nur in udftools-1.0.0b3-new/libudffs: desc.lo. +Nur in udftools-1.0.0b3-new/libudffs: desc.o. +Nur in udftools-1.0.0b3-new/libudffs: extent.lo. +Nur in udftools-1.0.0b3-new/libudffs: extent.o. +diff -ur udftools-1.0.0b3/libudffs/file.c udftools-1.0.0b3-new/libudffs/file.c +--- udftools-1.0.0b3/libudffs/file.c 2002-11-26 08:18:51.000000000 +0100 ++++ udftools-1.0.0b3-new/libudffs/file.c 2007-08-23 14:02:07.000000000 +0200 +@@ -576,7 +576,7 @@ + tmp = leBPL_to_cpup(p); + found_first: + tmp |= (~0UL << size); +- if (tmp == ~0UL) /* Are any bits zero? */ ++ if (tmp == (uintBPL)~0UL) /* Are any bits zero? */ + return result + size; /* Nope. */ + found_middle: + return result + ffz(tmp); +Nur in udftools-1.0.0b3-new/libudffs: file.lo. +Nur in udftools-1.0.0b3-new/libudffs: file.o. +Nur in udftools-1.0.0b3-new/libudffs: .libs. +Nur in udftools-1.0.0b3-new/libudffs: libudffs.la. +Nur in udftools-1.0.0b3-new/libudffs: Makefile. +Nur in udftools-1.0.0b3-new/libudffs: unicode.lo. +Nur in udftools-1.0.0b3-new/libudffs: unicode.o. +Nur in udftools-1.0.0b3-new: Makefile. +Nur in udftools-1.0.0b3-new/mkudffs: defaults.o. +Nur in udftools-1.0.0b3-new/mkudffs: .deps. +Nur in udftools-1.0.0b3-new/mkudffs: .libs. +Nur in udftools-1.0.0b3-new/mkudffs: main.o. +Nur in udftools-1.0.0b3-new/mkudffs: Makefile. +Nur in udftools-1.0.0b3-new/mkudffs: mkudffs. +diff -ur udftools-1.0.0b3/mkudffs/mkudffs.c udftools-1.0.0b3-new/mkudffs/mkudffs.c +--- udftools-1.0.0b3/mkudffs/mkudffs.c 2007-08-23 14:32:38.000000000 +0200 ++++ udftools-1.0.0b3-new/mkudffs/mkudffs.c 2007-08-23 14:14:42.000000000 +0200 +@@ -72,7 +72,7 @@ + disc->udf_pvd[0] = malloc(sizeof(struct primaryVolDesc)); + memcpy(disc->udf_pvd[0], &default_pvd, sizeof(struct primaryVolDesc)); + memcpy(&disc->udf_pvd[0]->recordingDateAndTime, &ts, sizeof(timestamp)); +- sprintf(&disc->udf_pvd[0]->volSetIdent[1], "%08lx%s", ++ sprintf((char *)&disc->udf_pvd[0]->volSetIdent[1], "%08lx%s", + mktime(tm), &disc->udf_pvd[0]->volSetIdent[9]); + disc->udf_pvd[0]->volIdent[31] = strlen(disc->udf_pvd[0]->volIdent); + disc->udf_pvd[0]->volSetIdent[127] = strlen(disc->udf_pvd[0]->volSetIdent); +@@ -289,7 +289,7 @@ + int write_disc(struct udf_disc *disc) + { + struct udf_extent *start_ext; +- int ret; ++ int ret=0; + + start_ext = disc->head; + +@@ -299,6 +299,7 @@ + return ret; + start_ext = start_ext->next; + } ++ return ret; + } + + void setup_vrs(struct udf_disc *disc) +@@ -450,7 +451,7 @@ + struct unallocSpaceEntry *use; + short_ad *sad; + int max = (0x3FFFFFFF / disc->blocksize) * disc->blocksize; +- int pos; ++ int pos=0; + long long rem; + + if (disc->flags & FLAG_STRATEGY4096) +Nur in udftools-1.0.0b3-new/mkudffs: mkudffs.o. +Nur in udftools-1.0.0b3-new/mkudffs: options.o. +Nur in udftools-1.0.0b3-new/pktsetup: .deps. +Nur in udftools-1.0.0b3-new/pktsetup: .libs. +Nur in udftools-1.0.0b3-new/pktsetup: Makefile. +Nur in udftools-1.0.0b3-new/pktsetup: pktsetup. +Nur in udftools-1.0.0b3-new/pktsetup: pktsetup.o. +Nur in udftools-1.0.0b3-new/udfct: Makefile. +Nur in udftools-1.0.0b3-new/udffsck: .deps. +Nur in udftools-1.0.0b3-new/udffsck: .libs. +Nur in udftools-1.0.0b3-new/udffsck: main.o. +Nur in udftools-1.0.0b3-new/udffsck: Makefile. +Nur in udftools-1.0.0b3-new/udffsck: udffsck. +Nur in udftools-1.0.0b3-new/wrudf: .deps. +diff -ur udftools-1.0.0b3/wrudf/ide-pc.c udftools-1.0.0b3-new/wrudf/ide-pc.c +--- udftools-1.0.0b3/wrudf/ide-pc.c 2002-11-26 08:18:51.000000000 +0100 ++++ udftools-1.0.0b3-new/wrudf/ide-pc.c 2007-08-23 14:32:09.000000000 +0200 +@@ -31,6 +31,7 @@ + #include /* for u_char etc. */ + #include + #include /* sleep() */ ++#include + + #include "bswap.h" + #include "ide-pc.h" +Nur in udftools-1.0.0b3-new/wrudf: ide-pc.o. +Nur in udftools-1.0.0b3-new/wrudf: .libs. +Nur in udftools-1.0.0b3-new/wrudf: Makefile. +Nur in udftools-1.0.0b3-new/wrudf: wrudf. +diff -ur udftools-1.0.0b3/wrudf/wrudf.c udftools-1.0.0b3-new/wrudf/wrudf.c +--- udftools-1.0.0b3/wrudf/wrudf.c 2007-08-23 14:32:38.000000000 +0200 ++++ udftools-1.0.0b3-new/wrudf/wrudf.c 2007-08-23 14:26:41.000000000 +0200 +@@ -245,7 +245,7 @@ + } else if( strncmp( spm->partIdent.ident, UDF_ID_VIRTUAL, strlen(UDF_ID_VIRTUAL)) == 0 ) + virtualPartitionNum = i; + } +- spm = (char*)spm + spm->partitionMapLength; ++ spm = (struct sparablePartitionMap*)((char*)spm + spm->partitionMapLength); + } + + if( medium == CDR ) { +@@ -300,7 +300,7 @@ + fail("SpaceBitmap not found\n"); + } + +- if (fsdLen = decode_utf8(fsd->fileSetIdent, fsdOut, fsd->fileSetIdent[31])) ++ if ((fsdLen = decode_utf8(fsd->fileSetIdent, fsdOut, fsd->fileSetIdent[31]))>=0) + fsdOut[fsdLen] = '\0'; + + printf("You are going to update fileset '%s'\nProceed (y/N) : ", &fsdOut[1]); +@@ -605,7 +605,7 @@ + int + main(int argc, char** argv) + { +- int rv; ++ int rv=0; + int cmnd; + char prompt[256]; + Directory *d; +Nur in udftools-1.0.0b3-new/wrudf: wrudf-cdr.o. +diff -ur udftools-1.0.0b3/wrudf/wrudf-cdrw.c udftools-1.0.0b3-new/wrudf/wrudf-cdrw.c +--- udftools-1.0.0b3/wrudf/wrudf-cdrw.c 2002-11-26 08:18:51.000000000 +0100 ++++ udftools-1.0.0b3-new/wrudf/wrudf-cdrw.c 2007-08-23 14:30:14.000000000 +0200 +@@ -614,7 +614,6 @@ + readTaggedBlock(uint32_t lbn, uint16_t partition) + { + int i; +- uint32_t blkno; + uint8_t sum, *p; + struct generic_desc *block; + +@@ -634,7 +633,7 @@ + if( strncmp(((struct sparingTable*)block)->sparingIdent.ident, UDF_ID_SPARING, strlen(UDF_ID_SPARING)) != 0 ) { + for( i = 0; i < 2048; i++ ) { + if( ((uint8_t*)block)[i] != 0 ) { +- printf("readTaggedBlock: Empty block %d not all zeroes\n", blkno); ++ printf("readTaggedBlock: Empty block %d not all zeroes\n", lbn); + break; + } + } +@@ -647,10 +646,10 @@ + sum += *(p + i); + + if( block->descTag.tagChecksum != sum ) +- fail("readTagged: Checksum error in block %d\n", blkno); ++ fail("readTagged: Checksum error in block %d\n", lbn); + + if( block->descTag.descCRC != udf_crc((uint8_t*)block + sizeof(tag), ((tag*)block)->descCRCLength, 0) ) +- fail("readTagged: CRC error in block %d\n", blkno); ++ fail("readTagged: CRC error in block %d\n", lbn); + + return block; + } +@@ -709,8 +708,8 @@ + writeExtents(char* src, int usesShort, void* extents) + { + uint len, blkno, partitionNumber; +- long_ad *lo; +- short_ad *sh; ++ long_ad *lo=NULL; ++ short_ad *sh=NULL; + + if( usesShort ) { + sh = (short_ad*) extents; +Nur in udftools-1.0.0b3-new/wrudf: wrudf-cdrw.o. +diff -ur udftools-1.0.0b3/wrudf/wrudf-cmnd.c udftools-1.0.0b3-new/wrudf/wrudf-cmnd.c +--- udftools-1.0.0b3/wrudf/wrudf-cmnd.c 2002-11-26 08:18:51.000000000 +0100 ++++ udftools-1.0.0b3-new/wrudf/wrudf-cmnd.c 2007-08-23 14:22:41.000000000 +0200 +@@ -45,7 +45,7 @@ + int + copyFile(Directory *dir, char* inName, char*newName, struct stat *fileStat) + { +- int fd, i, blkno; ++ int fd, i=0, blkno; + uint32_t nBytes, blkInPkt; + uint32_t maxVarPktSize; // in bytes + struct fileIdentDesc *fid; +@@ -54,7 +54,7 @@ + + fd = open(inName, O_RDONLY); + if( fd == 0 ) { +- printf("'%s' does not exist\n", cmndv[i]); ++ printf("'%s' does not exist\n", inName); + return CMND_FAILED; + } + +Nur in udftools-1.0.0b3-new/wrudf: wrudf-cmnd.o. +Nur in udftools-1.0.0b3-new/wrudf: wrudf-desc.o. +Nur in udftools-1.0.0b3-new/wrudf: wrudf.o. diff --git a/udftools.spec b/udftools.spec index 815c7be..440305f 100644 --- a/udftools.spec +++ b/udftools.spec @@ -1,8 +1,8 @@ Summary: Linux UDF Filesystem userspace utilities Name: udftools Version: 1.0.0b3 -Release: 7%{?dist} -License: GPL +Release: 8%{?dist} +License: GPLv2+ Group: Applications/Archiving URL: http://sourceforge.net/projects/linux-udf/ Source: http://dl.sf.net/linux-udf/udftools-%{version}.tar.gz @@ -10,6 +10,8 @@ Patch0: udftools-1.0.0b3-pktsetup-chardev.patch Patch1: udftools-1.0.0b3-mkudffs-bigendian.patch Patch2: udftools-1.0.0b3-wrudf-gcc4.patch Patch3: udftools-1.0.0b3-warningfixes.patch +Patch4: udftools-1.0.0b3-fixcompile.patch +Patch5: udftools-1.0.0b3-warningfixes2.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: readline-devel, ncurses-devel @@ -23,6 +25,8 @@ Linux UDF Filesystem userspace utilities. %patch1 -p1 -b .mkudffs-bigendian %patch2 -p1 -b .wrudf-gcc4 %patch3 -p1 -b .warningfixes +%patch4 -p1 -b .fixcompile +%patch5 -p1 -b .warningfixes2 %build @@ -33,7 +37,7 @@ Linux UDF Filesystem userspace utilities. %install %{__rm} -rf %{buildroot} %makeinstall - +libtool --finish %{buildroot}%{_libdir} %clean %{__rm} -rf %{buildroot} @@ -49,6 +53,11 @@ Linux UDF Filesystem userspace utilities. %changelog +* Tue Aug 23 2007 Harald Hoyer - 1.0.0b3-8 +- fixed compile issues +- added more bigendian patches +- changed license tag + * Mon Aug 28 2006 Matthias Saou 1.0.0b3-7 - FC6 rebuild.