head 1.7; access; symbols pkgsrc-2026Q1:1.7.0.120 pkgsrc-2026Q1-base:1.7 pkgsrc-2025Q4:1.7.0.118 pkgsrc-2025Q4-base:1.7 pkgsrc-2025Q3:1.7.0.116 pkgsrc-2025Q3-base:1.7 pkgsrc-2025Q2:1.7.0.114 pkgsrc-2025Q2-base:1.7 pkgsrc-2025Q1:1.7.0.112 pkgsrc-2025Q1-base:1.7 pkgsrc-2024Q4:1.7.0.110 pkgsrc-2024Q4-base:1.7 pkgsrc-2024Q3:1.7.0.108 pkgsrc-2024Q3-base:1.7 pkgsrc-2024Q2:1.7.0.106 pkgsrc-2024Q2-base:1.7 pkgsrc-2024Q1:1.7.0.104 pkgsrc-2024Q1-base:1.7 pkgsrc-2023Q4:1.7.0.102 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.100 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.7.0.98 pkgsrc-2023Q2-base:1.7 pkgsrc-2023Q1:1.7.0.96 pkgsrc-2023Q1-base:1.7 pkgsrc-2022Q4:1.7.0.94 pkgsrc-2022Q4-base:1.7 pkgsrc-2022Q3:1.7.0.92 pkgsrc-2022Q3-base:1.7 pkgsrc-2022Q2:1.7.0.90 pkgsrc-2022Q2-base:1.7 pkgsrc-2022Q1:1.7.0.88 pkgsrc-2022Q1-base:1.7 pkgsrc-2021Q4:1.7.0.86 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.84 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.82 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.80 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.7.0.78 pkgsrc-2020Q4-base:1.7 pkgsrc-2020Q3:1.7.0.76 pkgsrc-2020Q3-base:1.7 pkgsrc-2020Q2:1.7.0.72 pkgsrc-2020Q2-base:1.7 pkgsrc-2020Q1:1.7.0.52 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.74 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.70 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.68 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.66 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.64 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.62 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.60 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.58 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.56 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.54 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.50 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.48 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.46 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.44 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.42 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.40 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.38 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.36 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.34 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.32 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.7.0.30 pkgsrc-2014Q4-base:1.7 pkgsrc-2014Q3:1.7.0.28 pkgsrc-2014Q3-base:1.7 pkgsrc-2014Q2:1.7.0.26 pkgsrc-2014Q2-base:1.7 pkgsrc-2014Q1:1.7.0.24 pkgsrc-2014Q1-base:1.7 pkgsrc-2013Q4:1.7.0.22 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.7.0.20 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.18 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.16 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.14 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.12 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.10 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.8 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.6 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.4 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.2 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.6.0.26 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.24 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.22 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.20 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.18 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.16 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.14 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.12 pkgsrc-2009Q2-base:1.6 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.7 date 2011.05.15.09.59.18; author hans; 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.7 log @Fix build on SunOS. @ text @$NetBSD: patch-ab,v 1.6 2008/07/13 16:14:00 tonnerre Exp $ --- dvd.c.orig 2009-06-08 22:15:34.000000000 +0200 +++ dvd.c 2011-05-15 12:46:00.612223980 +0200 @@@@ -23,7 +23,7 @@@@ */ int get_dvd_name(const char *device, char *title) { - + int i = 0; #if defined( __sun ) /* title is actually in the device name */ char *new_title; @@@@ -31,7 +31,7 @@@@ int get_dvd_name(const char *device, cha strncpy( title, new_title, sizeof(title)-1 ); #else int filehandle = 0; - int i = 0, last = 0; + int last = 0; int bytes_read; char tmp_buf[2048]; @@@@ -173,7 +173,7 @@@@ int get_device( char *path, char *device if( !strcmp( path, buf.f_mntonname ) ) { mounted = TRUE; -#if defined(__FreeBSD__) && (__FreeBSD_Version > 500000) +#if defined(__DragonFly__) || (defined(__FreeBSD__) && (__FreeBSD_Version > 500000)) strcpy(device, buf.f_mntfromname); #else strcpy(device, "/dev/r"); @ 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 21 a23 3 --- dvd.c.orig 2008-02-19 06:27:04.000000000 +0100 +++ dvd.c @@@@ -166,7 +166,7 @@@@ int get_device( char *path, char *device @ 1.5 log @Fix errno usage. @ text @d3 1 a3 1 --- dvd.c.orig 2006-05-19 08:29:37.000000000 +0000 d5 1 a5 9 @@@@ -48,7 +48,6 @@@@ #include -extern int errno; /*for solaris, if we need to include some cdrom related stuff #include @@@@ -199,7 +198,7 @@@@ int get_device( char *path, char *device @ 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-ab,v 1.3 2005/09/06 08:11:00 abs Exp $ d3 3 a5 30 --- vobcopy.c.orig 2004-03-26 19:53:10.000000000 +0100 +++ vobcopy.c 2004-04-22 15:54:46.000000000 +0200 @@@@ -63,20 +63,22 @@@@ #include #include #include /*for readdir*/ -#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 #else #include #endif #include /* for solaris, but is also present in linux */ -#if (defined(BSD) && (BSD >= 199306)) ||(defined(__APPLE__) && defined(__GNUC__)) +#if (defined(BSD) && (BSD >= 199306) && !defined(__NetBSD__)) ||(defined(__APPLE__) && defined(__GNUC__)) || (defined(__NetBSD__) && (__NetBSD_Version__ < 299000900)) /* I don't know if *BSD have getopt-long... please tell me! */ //#define HAVE_GETOPT_LONG #include +#define USE_STATFS #else #if (defined(__linux__)) #include +#define USE_STATFS #define HAVE_GETOPT_LONG #else #include @@@@ -143,14 +145,6 @@@@ bool quiet_flag = FALSE; struct stat buf; a6 12 - /** - * This case here has to be examined for every system vobcopy shall run under - */ -#if defined( __linux__ ) || ( defined( BSD ) && ( BSD >= 199306 )) || (defined (__APPLE__) && defined(__GNUC__)) - struct statfs buf1; -#elif !defined(__sun__) - struct statvfs buf1; -#endif dvd_reader_t *dvd = NULL; dvd_file_t *dvd_file; extern char *optarg; @@@@ -354,7 +348,7 @@@@ d8 2 a9 10 #if defined( __USE_FILE_OFFSET64 ) || ( defined( BSD ) && ( BSD >= 199306 ) ) || (defined (__APPLE__) && defined(__GNUC__)) case'l': /*large file output*/ - max_filesize_in_blocks = 4500000000000000; + max_filesize_in_blocks = 4500000000000000LL; /* 2^63 / 2048 (not exactly) */ large_file_flag = TRUE; break; @@@@ -1702,7 +1696,7 @@@@ off_t freespace_getter( char *path, int verbosity_level ) { d11 11 a21 32 -#if defined( __linux__ ) || ( defined( BSD ) && ( BSD >= 199306 ) ) || (defined (__APPLE__) && defined(__GNUC__)) +#ifdef USE_STATFS struct statfs buf1; #else struct statvfs buf1; @@@@ -1710,7 +1704,7 @@@@ /* ssize_t temp1, temp2; */ long temp1, temp2; off_t sum; -#if defined( __linux__ ) || ( defined( BSD ) && ( BSD >= 199306 ) ) || (defined (__APPLE__) && defined(__GNUC__)) +#ifdef USE_STATFS statfs( path, &buf1 ); if( verbosity_level >= 1 ) fprintf( stderr, "Used the linux statfs\n" ); @@@@ -1739,7 +1733,7 @@@@ off_t usedspace_getter( char *path, int verbosity_level ) { -#if defined( __linux__ ) || ( defined( BSD ) && ( BSD >= 199306 ) ) || (defined (__APPLE__) && defined(__GNUC__)) +#ifdef USE_STATFS struct statfs buf2; #else struct statvfs buf2; @@@@ -1747,7 +1741,7 @@@@ /* ssize_t temp1, temp2; */ long temp1, temp2; off_t sum; -#if defined( __linux__ ) || ( defined( BSD ) && ( BSD >= 199306 ) ) || (defined (__APPLE__) && defined(__GNUC__)) +#ifdef USE_STATFS statfs( path, &buf2 ); if( verbosity_level >= 1 ) fprintf( stderr, "Used the linux statfs\n" ); @ 1.3 log @Fix NetBSD statvfs check to be >= 299000900 not >= 200040000 No pkgrevision bumps needed. @ text @d1 1 a1 1 $NetBSD: patch-ab,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$ d18 1 a18 1 +#if (defined(BSD) && (BSD >= 199306) && !defined(__NetBSD__)) ||(defined(__APPLE__) && defined(__GNUC__)) || (defined(__NetBSD__) && (__NetBSD_Version__ < 200040000)) @ 1.1 log @Initial revision @ text @d3 3 a5 3 --- vobcopy.c.orig 2003-09-02 12:53:29.000000000 +0200 +++ vobcopy.c 2003-09-02 12:54:40.000000000 +0200 @@@@ -62,7 +62,7 @@@@ d14 76 @ 1.1.1.1 log @import vobcopy-0.5.13, a tool to copy DVD .vob files to harddisk @ text @@