From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 19 19:00:48 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C393516A4D9 for ; Mon, 19 Jul 2004 19:00:48 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B120E43D58 for ; Mon, 19 Jul 2004 19:00:48 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i6JJ0mSI003005 for ; Mon, 19 Jul 2004 19:00:48 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6JJ0mh5003004; Mon, 19 Jul 2004 19:00:48 GMT (envelope-from gnats) Resent-Date: Mon, 19 Jul 2004 19:00:48 GMT Resent-Message-Id: <200407191900.i6JJ0mh5003004@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Heiner Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C393D16A4CE for ; Mon, 19 Jul 2004 18:53:51 +0000 (GMT) Received: from mail.gmx.net (mail.gmx.de [213.165.64.20]) by mx1.FreeBSD.org (Postfix) with SMTP id 92D2943D2F for ; Mon, 19 Jul 2004 18:53:50 +0000 (GMT) (envelope-from h.eichmann@gmx.de) Received: (qmail 24162 invoked by uid 65534); 19 Jul 2004 18:53:46 -0000 Received: from pD9EC354E.dip.t-dialin.net (EHLO [192.168.254.42]) (217.236.53.78) by mail.gmx.net (mp009) with SMTP; 19 Jul 2004 20:53:46 +0200 Message-Id: <200407192057.22101.h.eichmann@gmx.de> Date: Mon, 19 Jul 2004 19:57:22 +0100 From: Heiner To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/69310: Port upgrade: sysutils/k3b to 0.11.12 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jul 2004 19:00:49 -0000 >Number: 69310 >Category: ports >Synopsis: Port upgrade: sysutils/k3b to 0.11.12 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jul 19 19:00:48 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Heiner Eichmann >Release: FreeBSD 4.10-STABLE i386 >Organization: Sirius Cybernetics Corp. >Environment: FreeBSD 7of9.unimatrix-zero.borg 4.10-STABLE FreeBSD 4.10-STABLE #1: Sun Jun 20 14:49:25 CEST 2004 root@7of9.unimatrix-zero.borg:/usr/obj/usr/src/sys/MYKERNEL i386 >Description: Upgrade to 0.11.12 >How-To-Repeat: >Fix: See attached files. --Boundary-00=_SmB/AkMIizN6P7a Content-Type: text/x-diff; charset="iso-8859-1"; name="diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="diff" diff -urN ../../sysutils/k3b/Makefile ./Makefile --- ../../sysutils/k3b/Makefile Sun Jul 11 18:34:01 2004 +++ ./Makefile Tue Jun 29 21:54:23 2004 @@ -6,8 +6,7 @@ # PORTNAME= k3b -PORTVERSION= 0.11.9 -PORTREVISION= 1 +PORTVERSION= 0.11.12 CATEGORIES= sysutils multimedia kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff -urN ../../sysutils/k3b/distinfo ./distinfo --- ../../sysutils/k3b/distinfo Fri May 28 07:51:59 2004 +++ ./distinfo Tue Jun 29 20:02:56 2004 @@ -1,2 +1,2 @@ -MD5 (k3b-0.11.9.tar.bz2) = 88f46a5cfbda5fa89b4bfee504567df1 -SIZE (k3b-0.11.9.tar.bz2) = 3217141 +MD5 (k3b-0.11.12.tar.bz2) = 32537417ea39adbc5c4d7bd30c07f8b5 +SIZE (k3b-0.11.12.tar.bz2) = 3187611 \ No newline at end of file diff -urN ../../sysutils/k3b/files/patch-src-Makefile.in ./files/patch-src-Makefile.in --- ../../sysutils/k3b/files/patch-src-Makefile.in Fri May 28 07:52:00 2004 +++ ./files/patch-src-Makefile.in Sun Jul 11 15:14:12 2004 @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig Mon Mar 29 20:04:54 2004 -+++ src/Makefile.in Tue May 11 22:57:03 2004 -@@ -272,7 +272,7 @@ +--- src/Makefile.in.orig Thu Jun 24 19:34:03 2004 ++++ src/Makefile.in Sun Jul 11 12:24:22 2004 +@@ -287,7 +287,7 @@ #>+ 1 k3b_SOURCES=k3bwelcomewidget.cpp k3bapplication.cpp k3bdiroperator.cpp kdndfileview.cpp k3bfiletreeview.cpp k3bcddbmultientriesdialog.cpp k3baudioplayer.cpp k3bprojecttabbar.cpp k3bprojecttabwidget.cpp k3bsplash.cpp k3bblankingdialog.cpp k3bfileview.cpp k3bdirview.cpp k3btoolbox.cpp k3b.cpp main.cpp k3bstatusbarmanager.cpp k3bfiletreecombobox.cpp k3breadcdreader.cpp k3binterface.cpp k3bprojectinterface.cpp k3bsystemproblemdialog.cpp k3bcdcontentsview.cpp k3bwriterspeedverificationdialog.cpp k3bdatatrackreader.cpp k3binterface_skel.cpp k3bprojectinterface_skel.cpp diff -urN ../../sysutils/k3b/files/patch-src-core-k3bdefaultexternalprograms.cpp ./files/patch-src-core-k3bdefaultexternalprograms.cpp --- ../../sysutils/k3b/files/patch-src-core-k3bdefaultexternalprograms.cpp Fri May 28 07:52:00 2004 +++ ./files/patch-src-core-k3bdefaultexternalprograms.cpp Sun Jul 11 15:14:12 2004 @@ -1,5 +1,5 @@ ---- src/core/k3bdefaultexternalprograms.cpp.orig Mon Mar 22 18:13:21 2004 -+++ src/core/k3bdefaultexternalprograms.cpp Tue May 11 22:57:03 2004 +--- src/core/k3bdefaultexternalprograms.cpp.orig Fri May 21 19:03:21 2004 ++++ src/core/k3bdefaultexternalprograms.cpp Sun Jul 11 12:24:22 2004 @@ -30,6 +30,7 @@ #include #include @@ -143,7 +143,7 @@ K3bProcess::OutputCollector out( &vp ); vp << path; -@@ -911,7 +912,7 @@ +@@ -913,7 +914,7 @@ K3bExternalBin* bin = 0; // probe version diff -urN ../../sysutils/k3b/files/patch-src-core-k3bprocess.cpp ./files/patch-src-core-k3bprocess.cpp --- ../../sysutils/k3b/files/patch-src-core-k3bprocess.cpp Fri May 28 07:52:00 2004 +++ ./files/patch-src-core-k3bprocess.cpp Sun Jul 11 15:14:12 2004 @@ -1,5 +1,5 @@ --- src/core/k3bprocess.cpp.orig Sun Feb 1 09:18:58 2004 -+++ src/core/k3bprocess.cpp Tue May 11 22:57:03 2004 ++++ src/core/k3bprocess.cpp Sun Jul 11 12:24:22 2004 @@ -28,6 +28,60 @@ #include #include diff -urN ../../sysutils/k3b/files/patch-src-core-k3bprocess.h ./files/patch-src-core-k3bprocess.h --- ../../sysutils/k3b/files/patch-src-core-k3bprocess.h Fri May 28 07:52:01 2004 +++ ./files/patch-src-core-k3bprocess.h Sun Jul 11 15:14:12 2004 @@ -1,5 +1,5 @@ --- src/core/k3bprocess.h.orig Tue Jan 27 09:19:13 2004 -+++ src/core/k3bprocess.h Tue May 11 22:57:03 2004 ++++ src/core/k3bprocess.h Sun Jul 11 12:24:22 2004 @@ -194,4 +194,21 @@ KProcess* m_process; }; diff -urN ../../sysutils/k3b/files/patch-src-device-k3bdevice.cpp ./files/patch-src-device-k3bdevice.cpp --- ../../sysutils/k3b/files/patch-src-device-k3bdevice.cpp Fri May 28 07:52:01 2004 +++ ./files/patch-src-device-k3bdevice.cpp Sun Jul 11 15:14:12 2004 @@ -1,6 +1,6 @@ ---- src/device/k3bdevice.cpp.orig Sun Mar 14 17:35:20 2004 -+++ src/device/k3bdevice.cpp Mon May 24 23:31:19 2004 -@@ -56,6 +56,12 @@ +--- src/device/k3bdevice.cpp.orig Wed Jun 23 12:06:46 2004 ++++ src/device/k3bdevice.cpp Sun Jul 11 12:24:22 2004 +@@ -57,6 +57,13 @@ #endif // Q_OS_LINUX @@ -8,12 +8,13 @@ +#define __BYTE_ORDER BYTE_ORDER +#define __BIG_ENDIAN BIG_ENDIAN +#define CD_FRAMESIZE_RAW 2352 ++#define nearbyint(x) rint(x) +#endif + #ifdef HAVE_RESMGR extern "C" { -@@ -152,8 +158,10 @@ +@@ -153,8 +160,10 @@ d->supportedProfiles = 0; @@ -24,7 +25,7 @@ // -@@ -192,6 +200,7 @@ +@@ -193,6 +202,7 @@ unsigned char header[2048]; ::memset( header, 0, 2048 ); @@ -32,7 +33,7 @@ cmd[0] = MMC::GET_CONFIGURATION; cmd[8] = 8; if( cmd.transport( TR_DIR_READ, header, 8 ) ) { -@@ -733,6 +742,14 @@ +@@ -769,6 +779,14 @@ m_bufferSize = 1024; d->burnfree = false; } @@ -45,9 +46,9 @@ + d->burnfree = false; + } } - else if( vendor().startsWith("MATSHITA") ) { - if( description().startsWith("CD-R CW-7501") ) { -@@ -2317,10 +2334,12 @@ + else if( vendor().startsWith("HP") ) { + if( description().startsWith("CD-Writer 6020") ) { +@@ -2559,10 +2577,12 @@ { // if the device is already opened we do not close it // to allow fast multible method calls in a row @@ -60,7 +61,7 @@ // header size is 8 unsigned char* buffer = 0; -@@ -2406,13 +2425,16 @@ +@@ -2648,13 +2668,16 @@ delete [] buffer; } diff -urN ../../sysutils/k3b/files/patch-src-device-k3bdevice.h ./files/patch-src-device-k3bdevice.h --- ../../sysutils/k3b/files/patch-src-device-k3bdevice.h Fri May 28 07:52:01 2004 +++ ./files/patch-src-device-k3bdevice.h Sun Jul 11 15:14:12 2004 @@ -1,6 +1,6 @@ ---- src/device/k3bdevice.h.orig Sun Mar 14 17:35:20 2004 -+++ src/device/k3bdevice.h Tue May 11 22:57:03 2004 -@@ -661,6 +661,10 @@ +--- src/device/k3bdevice.h.orig Wed Jun 9 18:36:58 2004 ++++ src/device/k3bdevice.h Sun Jul 11 12:24:22 2004 +@@ -677,6 +677,10 @@ class Private; Private* d; diff -urN ../../sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp ./files/patch-src-device-k3bdevicemanager.cpp --- ../../sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp Fri May 28 07:52:01 2004 +++ ./files/patch-src-device-k3bdevicemanager.cpp Sun Jul 11 15:14:12 2004 @@ -1,5 +1,5 @@ ---- src/device/k3bdevicemanager.cpp.orig Sun Feb 29 13:52:41 2004 -+++ src/device/k3bdevicemanager.cpp Tue May 11 22:57:03 2004 +--- src/device/k3bdevicemanager.cpp.orig Tue Jun 22 21:50:55 2004 ++++ src/device/k3bdevicemanager.cpp Sun Jul 11 12:24:22 2004 @@ -49,6 +49,12 @@ #include #include @@ -35,7 +35,7 @@ scanFstab(); return m_foundDevices; -@@ -427,6 +441,7 @@ +@@ -421,6 +435,7 @@ bool K3bCdDevice::DeviceManager::testForCdrom(const QString& devicename) { bool ret = false; @@ -43,7 +43,7 @@ int cdromfd = K3bCdDevice::openDevice( devicename.ascii() ); if (cdromfd < 0) { kdDebug() << "could not open device " << devicename << " (" << strerror(errno) << ")" << endl; -@@ -467,11 +482,36 @@ +@@ -461,11 +476,36 @@ } ::close( cdromfd ); @@ -80,7 +80,7 @@ K3bDevice* device = 0; // resolve all symlinks -@@ -503,6 +543,7 @@ +@@ -497,6 +537,7 @@ device->m_target = target; device->m_lun = lun; } @@ -88,7 +88,7 @@ if( !device->init() ) { kdDebug() << "Could not initialize device " << devicename << endl; -@@ -578,9 +619,20 @@ +@@ -572,9 +613,20 @@ if( K3bDevice* dev = findDevice( resolveSymLink(md) ) ) { @@ -109,7 +109,7 @@ dev->setMountDevice( md ); dev->m_supermount = supermount; } -@@ -589,6 +641,8 @@ +@@ -583,6 +635,8 @@ { // compare bus, id, lun since the same device can for example be // determined as /dev/srX or /dev/scdX @@ -118,7 +118,7 @@ int bus = -1, id = -1, lun = -1; if( determineBusIdLun( mountInfo->fs_spec, bus, id, lun ) ) { if( K3bDevice* dev = findDevice( bus, id, lun ) ) { -@@ -599,6 +653,17 @@ +@@ -593,6 +647,17 @@ } } } @@ -136,7 +136,7 @@ } -@@ -674,5 +739,131 @@ +@@ -668,5 +733,131 @@ return QString::fromLatin1( resolved ); } diff -urN ../../sysutils/k3b/files/patch-src-device-k3bdevicemanager.h ./files/patch-src-device-k3bdevicemanager.h --- ../../sysutils/k3b/files/patch-src-device-k3bdevicemanager.h Fri May 28 07:52:01 2004 +++ ./files/patch-src-device-k3bdevicemanager.h Sun Jul 11 15:14:12 2004 @@ -1,5 +1,5 @@ --- src/device/k3bdevicemanager.h.orig Wed Jan 21 11:20:11 2004 -+++ src/device/k3bdevicemanager.h Tue May 11 22:57:03 2004 ++++ src/device/k3bdevicemanager.h Sun Jul 11 12:24:22 2004 @@ -112,6 +112,10 @@ class Private; diff -urN ../../sysutils/k3b/files/patch-src-device-k3bscsicommand.cpp ./files/patch-src-device-k3bscsicommand.cpp --- ../../sysutils/k3b/files/patch-src-device-k3bscsicommand.cpp Fri May 28 07:52:01 2004 +++ ./files/patch-src-device-k3bscsicommand.cpp Sun Jul 11 15:14:12 2004 @@ -1,5 +1,5 @@ --- src/device/k3bscsicommand.cpp.orig Wed Jan 21 11:20:11 2004 -+++ src/device/k3bscsicommand.cpp Mon May 24 23:32:04 2004 ++++ src/device/k3bscsicommand.cpp Sun Jul 11 12:24:22 2004 @@ -58,13 +58,14 @@ diff -urN ../../sysutils/k3b/files/patch-src-device-k3bscsicommand.h ./files/patch-src-device-k3bscsicommand.h --- ../../sysutils/k3b/files/patch-src-device-k3bscsicommand.h Fri May 28 07:52:01 2004 +++ ./files/patch-src-device-k3bscsicommand.h Sun Jul 11 15:14:12 2004 @@ -1,5 +1,5 @@ --- src/device/k3bscsicommand.h.orig Wed Jan 21 11:20:11 2004 -+++ src/device/k3bscsicommand.h Tue May 11 22:57:03 2004 ++++ src/device/k3bscsicommand.h Sun Jul 11 12:24:22 2004 @@ -17,9 +17,27 @@ #define _K3B_SCSI_COMMAND_H_ diff -urN ../../sysutils/k3b/files/patch-src-rip-k3bdvdrippingprocess.cpp ./files/patch-src-rip-k3bdvdrippingprocess.cpp --- ../../sysutils/k3b/files/patch-src-rip-k3bdvdrippingprocess.cpp Fri May 28 07:52:01 2004 +++ ./files/patch-src-rip-k3bdvdrippingprocess.cpp Sun Jul 11 15:14:12 2004 @@ -1,6 +1,6 @@ ---- src/rip/k3bdvdrippingprocess.cpp.orig Wed Jan 21 11:20:20 2004 -+++ src/rip/k3bdvdrippingprocess.cpp Tue May 11 22:57:03 2004 -@@ -278,10 +278,13 @@ +--- src/rip/k3bdvdrippingprocess.cpp.orig Wed Jun 2 11:31:41 2004 ++++ src/rip/k3bdvdrippingprocess.cpp Sun Jul 11 12:24:22 2004 +@@ -285,10 +285,13 @@ void K3bDvdRippingProcess::slotPreProcessingDvd() { QString video; QDir video_ts( m_mountPoint + "/VIDEO_TS"); diff -urN ../../sysutils/k3b/files/patch-src-rip-k3bmovieview.cpp ./files/patch-src-rip-k3bmovieview.cpp --- ../../sysutils/k3b/files/patch-src-rip-k3bmovieview.cpp Fri May 28 07:52:01 2004 +++ ./files/patch-src-rip-k3bmovieview.cpp Sun Jul 11 15:14:12 2004 @@ -1,5 +1,5 @@ --- src/rip/k3bmovieview.cpp.orig Fri Feb 6 12:08:51 2004 -+++ src/rip/k3bmovieview.cpp Tue May 11 22:57:03 2004 ++++ src/rip/k3bmovieview.cpp Sun Jul 11 12:24:22 2004 @@ -223,8 +223,11 @@ } diff -urN ../../sysutils/k3b/files/patch-src-rip-k3btcwrapper.cpp ./files/patch-src-rip-k3btcwrapper.cpp --- ../../sysutils/k3b/files/patch-src-rip-k3btcwrapper.cpp Fri May 28 07:52:01 2004 +++ ./files/patch-src-rip-k3btcwrapper.cpp Sun Jul 11 15:14:12 2004 @@ -1,5 +1,5 @@ --- src/rip/k3btcwrapper.cpp.orig Wed Jan 21 11:20:20 2004 -+++ src/rip/k3btcwrapper.cpp Tue May 11 22:57:03 2004 ++++ src/rip/k3btcwrapper.cpp Sun Jul 11 12:24:22 2004 @@ -65,7 +65,12 @@ //K3bProcess *p = new K3bProcess(); emit tcprobeTitleParsed( m_currentTitle ); diff -urN ../../sysutils/k3b/files/patch-src-rip-k3bvideocdrip.cpp ./files/patch-src-rip-k3bvideocdrip.cpp --- ../../sysutils/k3b/files/patch-src-rip-k3bvideocdrip.cpp Thu Jan 1 01:00:00 1970 +++ ./files/patch-src-rip-k3bvideocdrip.cpp Sun Jul 11 15:14:12 2004 @@ -0,0 +1,12 @@ +--- src/rip/k3bvideocdrip.cpp.orig Sun Jul 11 15:13:42 2004 ++++ src/rip/k3bvideocdrip.cpp Sun Jul 11 15:14:07 2004 +@@ -41,7 +41,8 @@ + m_ripsourceType( 0 ), + m_videooptions( options ), + m_canceled( false ), +- m_process( 0 ) ++ m_process( 0 ), ++ m_subPosition( 0 ) + {} + + diff -urN ../../sysutils/k3b/pkg-message ./pkg-message --- ../../sysutils/k3b/pkg-message Fri May 28 07:51:59 2004 +++ ./pkg-message Sun Jul 18 09:25:48 2004 @@ -3,10 +3,10 @@ drives, use them through the cam system. See Chapter 12.5.9 of the handbook (http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/creating-cds.html#ATAPICAM) 2. Your CD and DVD drives must have a mount point in /etc/fstab. They have - to be accessed through their atapicam device. I.e. the drives - have to be adressed by e.g. /dev/cd0c instead of /dev/acd0c. + to be accessed through their atapicam device if possible. I.e. the drives + have to be adressed by e.g. /dev/cd0c instead of /dev/acd0c (/dev/cd0 on FreeBSD 5.x). 3. k3b has to be started from a root console, which is not recommended. - Alternatively do all of the following: + Alternatively do ALL of the following: 3a. set the suid flag on cdrecord and cdrdao. The 'Notes' the chapter of 'man cdrecord' discusses this. 3b. - For every user who should be able to use k3b and for every CD or DVD @@ -16,6 +16,8 @@ /dev/cd0c /usr/home/XXX/cdrom cd9660 ro,noauto,nodev,nosuid 0 0 Furthermore allow user mounts as described in topic 9.22 of the FAQ: http://www.freebsd.org/doc/en_US.ISO8859-1/books/faq/disks.html#USER-FLOPPYMOUNT + Note: If you are using FreeBSD 5.x you might want to edit your /etc/devfs.conf. + See http://sig9.com/archive/articles/HOWTO-mount-fs.html for details. - or just give mount and umount the suid flag, which is a security leak. 3c. - Every user who should be able to use k3b must have read and write access to all pass through devices connected with CD and DVD drives and to the /dev/xpt0 --Boundary-00=_SmB/AkMIizN6P7a-- >Release-Note: >Audit-Trail: >Unformatted: --Boundary-00=_SmB/AkMIizN6P7a Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline X-send-pr-version: send-pr 3.113 X-GNATS-Notify: