head 1.2; access; symbols pkgsrc-2021Q3:1.1.0.2 pkgsrc-2021Q3-base:1.1; locks; strict; comment @// @; 1.2 date 2021.11.08.14.44.26; author gdt; state dead; branches; next 1.1; commitid lTzqIiX50lsN70gD; 1.1 date 2021.09.08.22.48.13; author gdt; state Exp; branches; next ; commitid HUVeGIYyG5EWKc8D; desc @@ 1.2 log @geography/gdal: Update to 3.3.3 Upstream changes: bug fixes @ text @$NetBSD: patch-gcore_gdalopeninfo.cpp,v 1.1 2021/09/08 22:48:13 gdt Exp $ Upstream code assumes that fopen(dir, 'r') will fail, when POSIX requires it to succeed. Extend the "only on FreeBSD" conditional to all systems. Fixed differently upstream post 3.3.2 after discussion. --- gcore/gdalopeninfo.cpp.orig 2021-09-01 09:48:45.000000000 +0000 +++ gcore/gdalopeninfo.cpp @@@@ -213,12 +213,8 @@@@ retry: // TODO(schwehr): Stop using got #endif // HAVE_READLINK -#ifdef __FreeBSD__ - /* FreeBSD 8 oddity: fopen(a_directory, "rb") returns non NULL */ + /* fopen(dir, "r") is required to succeed, per POSIX */ bool bPotentialDirectory = (eAccess == GA_ReadOnly); -#else - bool bPotentialDirectory = false; -#endif // __FreeBDS__ /* Check if the filename might be a directory of a special virtual file system */ if( STARTS_WITH(pszFilename, "/vsizip/") || @ 1.1 log @geography/gdal*: Update to 3.3.2 Upstream changes are bugfixes. One bugfix is applied locally and has been fixed differently upstream. This version mostly passes gdal's tests on NetBSD 9 amd64, if one rebuilds base sqlite3 with rtree. @ text @d1 1 a1 1 $NetBSD$ @