head 1.8; access; symbols pkgsrc-2026Q1:1.8.0.126 pkgsrc-2026Q1-base:1.8 pkgsrc-2025Q4:1.8.0.124 pkgsrc-2025Q4-base:1.8 pkgsrc-2025Q3:1.8.0.122 pkgsrc-2025Q3-base:1.8 pkgsrc-2025Q2:1.8.0.120 pkgsrc-2025Q2-base:1.8 pkgsrc-2025Q1:1.8.0.118 pkgsrc-2025Q1-base:1.8 pkgsrc-2024Q4:1.8.0.116 pkgsrc-2024Q4-base:1.8 pkgsrc-2024Q3:1.8.0.114 pkgsrc-2024Q3-base:1.8 pkgsrc-2024Q2:1.8.0.112 pkgsrc-2024Q2-base:1.8 pkgsrc-2024Q1:1.8.0.110 pkgsrc-2024Q1-base:1.8 pkgsrc-2023Q4:1.8.0.108 pkgsrc-2023Q4-base:1.8 pkgsrc-2023Q3:1.8.0.106 pkgsrc-2023Q3-base:1.8 pkgsrc-2023Q2:1.8.0.104 pkgsrc-2023Q2-base:1.8 pkgsrc-2023Q1:1.8.0.102 pkgsrc-2023Q1-base:1.8 pkgsrc-2022Q4:1.8.0.100 pkgsrc-2022Q4-base:1.8 pkgsrc-2022Q3:1.8.0.98 pkgsrc-2022Q3-base:1.8 pkgsrc-2022Q2:1.8.0.96 pkgsrc-2022Q2-base:1.8 pkgsrc-2022Q1:1.8.0.94 pkgsrc-2022Q1-base:1.8 pkgsrc-2021Q4:1.8.0.92 pkgsrc-2021Q4-base:1.8 pkgsrc-2021Q3:1.8.0.90 pkgsrc-2021Q3-base:1.8 pkgsrc-2021Q2:1.8.0.88 pkgsrc-2021Q2-base:1.8 pkgsrc-2021Q1:1.8.0.86 pkgsrc-2021Q1-base:1.8 pkgsrc-2020Q4:1.8.0.84 pkgsrc-2020Q4-base:1.8 pkgsrc-2020Q3:1.8.0.82 pkgsrc-2020Q3-base:1.8 pkgsrc-2020Q2:1.8.0.78 pkgsrc-2020Q2-base:1.8 pkgsrc-2020Q1:1.8.0.58 pkgsrc-2020Q1-base:1.8 pkgsrc-2019Q4:1.8.0.80 pkgsrc-2019Q4-base:1.8 pkgsrc-2019Q3:1.8.0.76 pkgsrc-2019Q3-base:1.8 pkgsrc-2019Q2:1.8.0.74 pkgsrc-2019Q2-base:1.8 pkgsrc-2019Q1:1.8.0.72 pkgsrc-2019Q1-base:1.8 pkgsrc-2018Q4:1.8.0.70 pkgsrc-2018Q4-base:1.8 pkgsrc-2018Q3:1.8.0.68 pkgsrc-2018Q3-base:1.8 pkgsrc-2018Q2:1.8.0.66 pkgsrc-2018Q2-base:1.8 pkgsrc-2018Q1:1.8.0.64 pkgsrc-2018Q1-base:1.8 pkgsrc-2017Q4:1.8.0.62 pkgsrc-2017Q4-base:1.8 pkgsrc-2017Q3:1.8.0.60 pkgsrc-2017Q3-base:1.8 pkgsrc-2017Q2:1.8.0.56 pkgsrc-2017Q2-base:1.8 pkgsrc-2017Q1:1.8.0.54 pkgsrc-2017Q1-base:1.8 pkgsrc-2016Q4:1.8.0.52 pkgsrc-2016Q4-base:1.8 pkgsrc-2016Q3:1.8.0.50 pkgsrc-2016Q3-base:1.8 pkgsrc-2016Q2:1.8.0.48 pkgsrc-2016Q2-base:1.8 pkgsrc-2016Q1:1.8.0.46 pkgsrc-2016Q1-base:1.8 pkgsrc-2015Q4:1.8.0.44 pkgsrc-2015Q4-base:1.8 pkgsrc-2015Q3:1.8.0.42 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.40 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.38 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.36 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.34 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.32 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.30 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.28 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.26 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.24 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.22 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.20 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.18 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.16 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.14 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.12 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.10 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.8 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.6 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.4 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.2 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.7.0.10 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.8 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.6 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.4 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.2 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.6.0.10 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.8 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.6 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.4 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.2 pkgsrc-2008Q2-base:1.6 cwrapper:1.5.0.18 pkgsrc-2008Q1:1.5.0.16 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.14 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.12 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.10 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.8 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.6 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.4 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.2 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.4.0.2 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.3.0.4 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.2 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.2.0.10 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc_base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.8 date 2010.09.16.12.02.16; author wiz; state Exp; branches; next 1.7; 1.7 date 2009.04.28.13.01.39; author hasso; state Exp; branches; next 1.6; 1.6 date 2008.07.13.16.14.00; author tonnerre; state Exp; branches; next 1.5; 1.5 date 2006.05.19.08.32.04; author joerg; state Exp; branches; next 1.4; 1.4 date 2005.12.27.10.19.16; author martti; state dead; branches; next 1.3; 1.3 date 2005.09.06.08.11.00; author abs; state Exp; branches; next 1.2; 1.2 date 2004.04.22.15.28.47; author drochner; state Exp; branches; next 1.1; 1.1 date 2004.04.08.14.17.57; author drochner; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.04.08.14.17.57; author drochner; state Exp; branches; next ; desc @@ 1.8 log @Update to 1.2.0: 1.2.0: Some new features! -Progress bar and speed enhancements/system load reduction coming with it - many thanks to Eric Kilfoil! -Vobcopy can now "rip" from an iso image on hdd or a directory containing a VIDEO_TS directory. People seem to need this for streaming dvd content to a ps3 via fuppes. That part seem to be buggy though, works 50/50. Will look further into that. -Option -M to rip the title with the longest playing time. -Other small corrections I think. @ text @$NetBSD: patch-aa,v 1.7 2009/04/28 13:01:39 hasso Exp $ --- vobcopy.c.orig 2009-06-08 20:15:34.000000000 +0000 +++ vobcopy.c @@@@ -52,7 +52,6 @@@@ #include "vobcopy.h" -extern int errno; char name[300]; bool overwrite_flag = FALSE; bool overwrite_all_flag = FALSE; @@@@ -2308,7 +2307,7 @@@@ char *safestrncpy(char *dest, const char return strncpy(dest, src, n-1); } -#if defined(__APPLE__) && defined(__GNUC__) || defined(OpenBSD) +#if defined(__APPLE__) && defined(__GNUC__) || defined(OpenBSD) || defined(__DragonFly__) int fdatasync( int value ) { return 0; @ 1.7 log @Make it build on DragonFly. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 2008/07/13 16:14:00 tonnerre Exp $ d3 3 a5 3 --- vobcopy.c.orig 2008-02-19 07:27:04 +0200 +++ vobcopy.c 2008-09-22 03:12:50 +0300 @@@@ -53,7 +53,6 @@@@ d12 2 a13 2 @@@@ -2177,7 +2176,7 @@@@ char *safestrncpy(char *dest, const char d17 2 a18 2 -#if defined(__APPLE__) && defined(__GNUC__) +#if (defined(__APPLE__) && defined(__GNUC__)) || defined(__DragonFly__) @ 1.6 log @Update vobcopy to a version which is less than 3 years old. This fixes CVE-2007-5718, some crashes, and introduces and fixes largefile issues. Changes since vobcopy-0.5.14: - Fixed operation on GNU libcized BSD variants. - Fixed compilation under MacOS 10. - Fixed CVE-2007-5718 (insecure temporary file creation). - Fixed segfault in the logging routine. - Fixed Makefile for gcc versions not equal to 3.4. - Choose the right dvd device from fstab. - Read only as many blocks as there are actually left. - Partial fix for detection of full nfs files. - Fixed double space detection on MacOSX, hopefully... - sprintf fixes. - -D_FORTIFY_SOURCE=2 is strange, 3 bytes won't fit into a char[4] then. Well, they fit into char[8]... - The configure.sh script now also detects if the system is an ia64/AMD64 and uses the lib64 directory accordingly. - Added checks for return values from library calls. - Added some code to make -n and -m mutually exclusive. - The size-checking code with -m was broken. Fixed hopefully. - Typo in the manpage. - With -m, if files exist you now have the option to [s]kip the files already present. - Some dvd's show files ending in ";?", they should now work. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- vobcopy.c.orig 2008-02-19 06:27:04.000000000 +0100 +++ vobcopy.c d13 9 @ 1.5 log @Fix errno usage. @ text @d3 1 a3 1 --- vobcopy.c.orig 2006-05-19 08:27:58.000000000 +0000 d5 3 a7 3 @@@@ -121,7 +121,6 @@@@ #include #include d10 2 a11 1 char name[300]; a12 1 /* --------------------------------------------------------------------------*/ @ 1.4 log @Updated vobcopy to 0.5.14 0.5.14-rc1: lots of bug fixes for *bds, solaris and -tada- OSX! Quite some stuff should now work better on freebsd, openbsd and solaris since Takeshi Nakamura provided some patches. Also incorporated the fix the netbsd folks did when they incorporated 0.5.13 into their ports collection. AND it seems that OSX now works (besides fink, which provided vobcopy for quite some time already). What is needed is dlcompat IIRC. Thanks to all for their help! 0.5.14-test1: changed dvd name getting function to what Jim Hatfield found works for freebsd Davide has a dvd which has names like this: VTS_01_2.VOB;? A new routine tries to remove the ;?. On OSX, getopt.h doesn't get found. /usr/include/getopt.h should do it @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2005/09/06 08:11:00 abs Exp $ d3 5 a7 72 --- dvd.c.orig 2004-03-26 19:53:10.000000000 +0100 +++ dvd.c 2004-04-22 16:27:45.000000000 +0200 @@@@ -23,9 +23,18 @@@@ #include #include #include -#if (defined(__unix__) || defined(unix)) && !defined(USG) || (defined(__APPLE__) && defined(__GNUC__)) +#if (defined(__unix__) || defined(unix)) && !defined(USG) || (defined(__APPLE__) && defined(__GNUC__)) || defined(__NetBSD__) #include +#define USE_GETMNTINFO +#if !defined(__NetBSD__) || (__NetBSD_Version__ < 299000900) #include +#define USE_STATFS_FOR_DEV +#define GETMNTINFO_USES_STATFS +#else +#include +#define USE_STATVFS_FOR_DEV +#define GETMNTINFO_USES_STATVFS +#endif #endif #include "vobcopy.h" #if (defined(__sun__)) @@@@ -61,9 +70,10 @@@@ int filehandle = 0; int i = 0, last = 0; int bytes_read; + char help[2048]; /* open the device */ - if ( !(filehandle = open(device, O_RDONLY)) ) + if ( !(filehandle = open(device, O_RDONLY, 0)) ) { /* open failed */ fprintf( stderr, "[Error] something wrong in dvd_name getting - please specify path as /cdrom or /dvd (mount point) or use -t\n"); @@@@ -72,7 +82,7 @@@@ } /* seek to title of first track, which is at (track_no * 32768) + 40 */ - if ( 32808 != lseek( filehandle, 32808, SEEK_SET ) ) + if ( 32768 != lseek( filehandle, 32768, SEEK_SET ) ) { /* seek failed */ close( filehandle ); @@@@ -82,13 +92,15 @@@@ } /* read title */ - if ( (bytes_read = read(filehandle, title, 32)) != 32) + if ( (bytes_read = read(filehandle, help, 2048)) != 2048) { close(filehandle); fprintf( stderr, "[Error] something wrong in dvd_name getting - please specify path as /cdrom or /dvd (mount point) or use -t\n" ); - fprintf(stderr, "[Error] only read %d bytes instead of 32\n", bytes_read); + fprintf(stderr, "[Error] only read %d bytes instead of 2048\n", bytes_read); return -1; } + + memcpy(title, help + 40, 32); /* make sure string is terminated */ title[32] = '\0'; @@@@ -138,9 +150,12 @@@@ char *k; bool mounted = FALSE; int mntcheck; -#if ( defined( BSD ) && ( BSD >= 199306 ) ) || ( defined( __APPLE__ ) && defined( __GNUC__ ) ) +#ifdef USE_STATFS_FOR_DEV struct statfs buf; #endif +#ifdef USE_STATVFS_FOR_DEV + struct statvfs buf; +#endif d9 2 d12 1 a12 47 /* the string should have no trailing / */ @@@@ -166,12 +181,19 @@@@ /* *look through /etc/mtab to see if it's actually mounted */ -#if ( defined( BSD ) && ( BSD >= 199306 ) ) || ( defined( __APPLE__ ) && defined( __GNUC__ ) ) +#if defined(USE_STATFS_FOR_DEV) || defined(USE_STATVFS_FOR_DEV) +#ifdef USE_STATFS_FOR_DEV if( !statfs( path, &buf ) ) +#else + if( !statvfs( path, &buf ) ) +#endif { if( !strcmp( path, buf.f_mntonname ) ) { mounted = TRUE; + strcpy(device, "/dev/r"); + strcat(device, buf.f_mntfromname + 5); + return mounted; } } else @@@@ -366,9 +388,13 @@@@ /* returns <0 if error */ int get_device_oyo( char *path, char *device ) { /*oyo*/ -#if (defined(BSD) && (BSD >= 199306)) || (defined(__APPLE__) && defined(__GNUC__)) +#ifdef USE_GETMNTINFO int i, n, dvd_count = 0; +#ifdef GETMNTINFO_USES_STATFS struct statfs *mntbuf; +#else + struct statvfs *mntbuf; +#endif if( ( n = getmntinfo( &mntbuf, MNT_WAIT ) ) > 0 ) { @@@@ -378,7 +404,8 @@@@ { dvd_count++; strcpy( path, mntbuf[i].f_mntonname ); - strcpy( device, mntbuf[i].f_mntfromname ); + strcpy(device, "/dev/r"); + strcat(device, mntbuf[i].f_mntfromname + 5); } } if(dvd_count == 0) @ 1.3 log @Fix NetBSD statvfs check to be >= 299000900 not >= 200040000 No pkgrevision bumps needed. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2004/04/22 15:28:47 drochner Exp $ @ 1.2 log @make this build after the statfs->statvfs conversion @ text @d1 1 a1 1 $NetBSD$ d13 1 a13 1 +#if !defined(__NetBSD__) || (__NetBSD_Version__ < 200040000) @ 1.1 log @Initial revision @ text @d3 3 a5 3 --- dvd.c.orig 2004-02-26 02:14:15.000000000 +0100 +++ dvd.c 2004-02-26 12:36:40.000000000 +0100 @@@@ -23,7 +23,7 @@@@ d12 2 d15 7 d23 3 a25 1 @@@@ -56,9 +56,10 @@@@ d37 1 a37 1 @@@@ -67,7 +68,7 @@@@ d46 1 a46 1 @@@@ -77,13 +78,15 @@@@ d64 26 a89 1 @@@@ -162,6 +165,9 @@@@ d99 16 a114 1 @@@@ -350,7 +356,8 @@@@ @ 1.1.1.1 log @import vobcopy-0.5.13, a tool to copy DVD .vob files to harddisk @ text @@