Hi,
This updates grive to the latest version.
It is required in order to be able to access Google Drive, as Google
decide to invalidate all non-official keys and is refusing all 3rd party
providers to re-register.
The solution now is to request your own API keys and allow the program
to access your Drive through it, which is what this update adds
(among other things).
This also includes a couple of off64_t -> int64_t changes :(
OK?
Paul
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/grive2/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile 12 Jul 2019 20:49:43 -0000 1.11
+++ Makefile 18 May 2020 14:09:55 -0000
@@ -2,9 +2,8 @@
COMMENT = third-party client for Google Drive
-VERSION = 0.5.0
+VERSION = 0.5.1
DISTNAME = grive2-${VERSION}
-REVISION = 2
CATEGORIES = sysutils
@@ -14,7 +13,7 @@ HOMEPAGE = http://yourcmc.ru/wiki/Grive
GH_ACCOUNT = vitalif
GH_PROJECT = grive2
-GH_COMMIT = ae06eccb38b2fe250c9ddeac3e3973f80b8a0aa9
+GH_COMMIT = 548ea362f319cd1f7fcbad0344fde8449fa14255
# GPLv2 only
PERMIT_PACKAGE = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/grive2/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 6 May 2017 15:10:18 -0000 1.3
+++ distinfo 18 May 2020 14:09:55 -0000
@@ -1,2 +1,2 @@
-SHA256 (grive2-0.5.0-ae06eccb.tar.gz) =
oEWgC62rbFEVn9gwnghNQmr0AN69NXXlIgstcph7Zck=
-SIZE (grive2-0.5.0-ae06eccb.tar.gz) = 162870
+SHA256 (grive2-0.5.1-548ea362.tar.gz) =
wJIn9bDA483dfmpHEYa3sRNtOMb6DGC3hYgpiNzUd0A=
+SIZE (grive2-0.5.1-548ea362.tar.gz) = 169931
Index: patches/patch-grive_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/sysutils/grive2/patches/patch-grive_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-grive_CMakeLists_txt
--- patches/patch-grive_CMakeLists_txt 30 Nov 2015 11:56:15 -0000 1.1.1.1
+++ patches/patch-grive_CMakeLists_txt 18 May 2020 14:09:55 -0000
@@ -1,9 +1,13 @@
$OpenBSD: patch-grive_CMakeLists_txt,v 1.1.1.1 2015/11/30 11:56:15 sthen Exp $
---- grive/CMakeLists.txt.orig Sun Oct 11 17:59:25 2015
-+++ grive/CMakeLists.txt Wed Nov 4 09:30:32 2015
-@@ -26,4 +26,4 @@ set_target_properties( grive_executable
+Index: grive/CMakeLists.txt
+--- grive/CMakeLists.txt.orig
++++ grive/CMakeLists.txt
+@@ -25,7 +25,7 @@ set_target_properties( grive_executable
)
install(TARGETS grive_executable RUNTIME DESTINATION bin)
--install(FILES doc/grive.1 DESTINATION share/man/man1 )
+-
+install(FILES doc/grive.1 DESTINATION man/man1 )
+ if ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES
"OpenBSD" )
+ install(FILES doc/grive.1 DESTINATION man/man1 )
+ else ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES
"OpenBSD" )
Index: patches/patch-libgrive_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/sysutils/grive2/patches/patch-libgrive_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-libgrive_CMakeLists_txt
--- patches/patch-libgrive_CMakeLists_txt 30 Nov 2015 11:56:15 -0000
1.1.1.1
+++ patches/patch-libgrive_CMakeLists_txt 18 May 2020 14:09:55 -0000
@@ -1,11 +1,12 @@
$OpenBSD: patch-libgrive_CMakeLists_txt,v 1.1.1.1 2015/11/30 11:56:15 sthen
Exp $
---- libgrive/CMakeLists.txt.orig Sun Oct 11 17:59:25 2015
-+++ libgrive/CMakeLists.txt Wed Nov 4 09:30:32 2015
-@@ -7,7 +7,6 @@ find_package(CURL REQUIRED)
- find_package(EXPAT REQUIRED)
+Index: libgrive/CMakeLists.txt
+--- libgrive/CMakeLists.txt.orig
++++ libgrive/CMakeLists.txt
+@@ -6,7 +6,6 @@ find_package(LibGcrypt REQUIRED)
+ find_package(CURL REQUIRED)
find_package(Boost 1.40.0 COMPONENTS program_options filesystem
unit_test_framework regex system REQUIRED)
find_package(BFD)
-find_package(CppUnit)
find_package(Iberty)
- find_package(ZLIB)
+ find_package(PkgConfig)
Index: patches/patch-libgrive_src_base_Resource_cc
===================================================================
RCS file: patches/patch-libgrive_src_base_Resource_cc
diff -N patches/patch-libgrive_src_base_Resource_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libgrive_src_base_Resource_cc 18 May 2020 14:09:55 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: libgrive/src/base/Resource.cc
+--- libgrive/src/base/Resource.cc.orig
++++ libgrive/src/base/Resource.cc
+@@ -265,7 +265,7 @@ void Resource::FromLocal( Val& state )
+ FileType ft ;
+ try
+ {
+- os::Stat( path, &m_ctime, (off64_t*)&m_size, &ft ) ;
++ os::Stat( path, &m_ctime, (int64_t*)&m_size, &ft ) ;
+ }
+ catch ( os::Error &e )
+ {
Index: patches/patch-libgrive_src_util_File_cc
===================================================================
RCS file: /cvs/ports/sysutils/grive2/patches/patch-libgrive_src_util_File_cc,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-libgrive_src_util_File_cc
--- patches/patch-libgrive_src_util_File_cc 30 Nov 2015 11:56:15 -0000
1.1.1.1
+++ patches/patch-libgrive_src_util_File_cc 18 May 2020 14:09:55 -0000
@@ -1,11 +1,12 @@
$OpenBSD: patch-libgrive_src_util_File_cc,v 1.1.1.1 2015/11/30 11:56:15 sthen
Exp $
---- libgrive/src/util/File.cc.orig Sun Oct 11 17:59:25 2015
-+++ libgrive/src/util/File.cc Wed Nov 4 09:30:36 2015
+Index: libgrive/src/util/File.cc
+--- libgrive/src/util/File.cc.orig
++++ libgrive/src/util/File.cc
@@ -32,6 +32,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
+#include <unistd.h>
- #ifdef WIN32
- #include <io.h>
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <unistd.h>
Index: patches/patch-libgrive_src_util_OS_cc
===================================================================
RCS file: patches/patch-libgrive_src_util_OS_cc
diff -N patches/patch-libgrive_src_util_OS_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libgrive_src_util_OS_cc 18 May 2020 14:09:55 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: libgrive/src/util/OS.cc
+--- libgrive/src/util/OS.cc.orig
++++ libgrive/src/util/OS.cc
+@@ -44,7 +44,7 @@ void Stat( const fs::path& filename, DateTime *t, off_
+ Stat( filename.string(), t, size, ft ) ;
+ }
+
+-void Stat( const std::string& filename, DateTime *t, off64_t *size, FileType
*ft )
++void Stat( const std::string& filename, DateTime *t, int64_t *size, FileType
*ft )
+ {
+ struct stat s = {} ;
+ if ( ::stat( filename.c_str(), &s ) != 0 )
Index: patches/patch-libgrive_src_util_OS_hh
===================================================================
RCS file: patches/patch-libgrive_src_util_OS_hh
diff -N patches/patch-libgrive_src_util_OS_hh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libgrive_src_util_OS_hh 18 May 2020 14:09:55 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: libgrive/src/util/OS.hh
+--- libgrive/src/util/OS.hh.orig
++++ libgrive/src/util/OS.hh
+@@ -35,8 +35,8 @@ namespace os
+ {
+ struct Error : virtual Exception {} ;
+
+- void Stat( const std::string& filename, DateTime *t, off64_t *size,
FileType *ft ) ;
+- void Stat( const fs::path& filename, DateTime *t, off64_t *size,
FileType *ft ) ;
++ void Stat( const std::string& filename, DateTime *t, int64_t *size,
FileType *ft ) ;
++ void Stat( const fs::path& filename, DateTime *t, int64_t *size,
FileType *ft ) ;
+
+ void SetFileTime( const std::string& filename, const DateTime& t ) ;
+ void SetFileTime( const fs::path& filename, const DateTime& t ) ;
Index: patches/patch-libgrive_src_util_Types_hh
===================================================================
RCS file: patches/patch-libgrive_src_util_Types_hh
diff -N patches/patch-libgrive_src_util_Types_hh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libgrive_src_util_Types_hh 18 May 2020 14:09:55 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: libgrive/src/util/Types.hh
+--- libgrive/src/util/Types.hh.orig
++++ libgrive/src/util/Types.hh
+@@ -24,7 +24,7 @@
+ // import types into the Grive namespace
+ namespace gr
+ {
+- using ::off_t ;
++ using ::int64_t ;
+
+ // should use boost/cstdint
+ typedef unsigned long long u64_t ;
