Attachment 216822 Details for Bug 245805 – 2.4.3 patch with pkg-message reworked

[patch] 2.4.3 patch with pkg-message reworked

onedrive-2.4.3-3.diff (text/plain), 3.97 KB, created by Hiroo Ono on 2020-07-28 00:52:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hiroo Ono

Created: 2020-07-28 00:52:30 UTC

Size: 3.97 KB

patch

obsolete

>diff --git a/net/onedrive/files/patch-Makefile.in b/net/onedrive/files/patch-Makefile.in
>new file mode 100644
>index 0000000000..00dc2279b4
>--- /dev/null
>+++ b/net/onedrive/files/patch-Makefile.in
>@@ -0,0 +1,61 @@
>+--- Makefile.in.orig	2020-07-13 17:07:56.191226000 +0200
>++++ Makefile.in	2020-07-13 17:09:28.425645000 +0200
>+@@ -25,6 +25,7 @@ systemdsystemunitdir = @systemdsystemunitdir@
>+ curl_LIBS = @curl_LIBS@
>+ sqlite_LIBS = @sqlite_LIBS@
>+ notify_LIBS = @notify_LIBS@
>++inotify_LIBS = @inotify_LIBS@
>+ COMPLETIONS = @COMPLETIONS@
>+ BASH_COMPLETION_DIR = @BASH_COMPLETION_DIR@
>+ ZSH_COMPLETION_DIR = @ZSH_COMPLETION_DIR@
>+@@ -54,7 +55,7 @@ endif
>+ system_unit_files = contrib/systemd/onedrive@.service
>+ user_unit_files = contrib/systemd/onedrive.service
>+ 
>+-DOCFILES = README.md config LICENSE CHANGELOG.md docs/Docker.md docs/INSTALL.md docs/Office365.md docs/USAGE.md docs/BusinessSharedFolders.md
>++DOCFILES = README.md config CHANGELOG.md docs/Office365.md docs/USAGE.md docs/BusinessSharedFolders.md
>+ 
>+ ifneq ("$(wildcard /etc/redhat-release)","")
>+ RHEL = $(shell cat /etc/redhat-release | grep -E "(Red Hat Enterprise Linux Server|CentOS)" | wc -l)
>+@@ -66,6 +67,7 @@ endif
>+ 
>+ SOURCES = \
>+ 	src/config.d \
>++	src/freebsd_inotify.d \
>+ 	src/itemdb.d \
>+ 	src/log.d \
>+ 	src/main.d \
>+@@ -101,14 +103,15 @@ onedrive: $(SOURCES)
>+ 	else \
>+ 		echo $(version) > version ; \
>+ 	fi
>+-	$(DC) $(DCFLAGS) $(addprefix -L,$(curl_LIBS)) $(addprefix -L,$(sqlite_LIBS)) $(addprefix -L,$(notify_LIBS)) -L-ldl $(SOURCES) -of$@
>++	$(DC) $(DCFLAGS) $(addprefix -L,$(curl_LIBS)) $(addprefix -L,$(sqlite_LIBS)) $(addprefix -L,$(notify_LIBS)) $(addprefix -L,$(inotify_LIBS)) -L-ldl $(SOURCES) -of$@
>+ 
>+ install: all
>+-	$(INSTALL) -D onedrive $(DESTDIR)$(bindir)/onedrive
>+-	$(INSTALL) -D onedrive.1 $(DESTDIR)$(mandir)/man1/onedrive.1
>+-	$(INSTALL) -D -m 644 contrib/logrotate/onedrive.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/onedrive
>++	$(INSTALL) -s onedrive $(DESTDIR)$(bindir)/onedrive
>++	$(INSTALL) onedrive.1 $(DESTDIR)$(mandir)/man1/onedrive.1
>++	mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d
>++	$(INSTALL) -m 644 contrib/logrotate/onedrive.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/onedrive
>+ 	mkdir -p $(DESTDIR)$(docdir)
>+-	$(INSTALL) -D -m 644 $(DOCFILES) $(DESTDIR)$(docdir)
>++	$(INSTALL) -m 644 $(DOCFILES) $(DESTDIR)$(docdir)
>+ ifeq ($(HAVE_SYSTEMD),yes)
>+ 	$(INSTALL) -d -m 0755 $(DESTDIR)$(systemduserunitdir) $(DESTDIR)$(systemdsystemunitdir)
>+ ifeq ($(RHEL),1)
>+@@ -125,8 +128,10 @@ ifeq ($(RHEL_VERSION),6)
>+ endif	
>+ endif
>+ ifeq ($(COMPLETIONS),yes)
>+-	$(INSTALL) -D -m 644 contrib/completions/complete.zsh $(DESTDIR)$(ZSH_COMPLETION_DIR)/_onedrive
>+-	$(INSTALL) -D -m 644 contrib/completions/complete.bash $(DESTDIR)$(BASH_COMPLETION_DIR)/onedrive
>++	mkdir -p $(DESTDIR)$(ZSH_COMPLETION_DIR)
>++	$(INSTALL) -m 644 contrib/completions/complete.zsh $(DESTDIR)$(ZSH_COMPLETION_DIR)/_onedrive
>++	mkdir -p $(DESTDIR)$(BASH_COMPLETION_DIR)
>++	$(INSTALL) -m 644 contrib/completions/complete.bash $(DESTDIR)$(BASH_COMPLETION_DIR)/onedrive
>+ endif
>+ 
>+ 
>diff --git a/net/onedrive/files/patch-configure.ac b/net/onedrive/files/patch-configure.ac
>new file mode 100644
>index 0000000000..43fb6f55ba
>--- /dev/null
>+++ b/net/onedrive/files/patch-configure.ac
>@@ -0,0 +1,10 @@
>+--- configure.ac.orig	2020-04-21 17:07:18.318838000 +0900
>++++ configure.ac	2020-04-21 17:09:11.896888000 +0900
>+@@ -144,6 +144,7 @@
>+ dnl Check for required modules: curl and sqlite at the moment
>+ PKG_CHECK_MODULES([curl],[libcurl])
>+ PKG_CHECK_MODULES([sqlite],[sqlite3])
>++PKG_CHECK_MODULES([inotify],[libinotify])
>+ 
>+ dnl
>+ dnl systemd and unit file directories
>diff --git a/net/onedrive/pkg-message b/net/onedrive/pkg-message
>new file mode 100644
>index 0000000000..f721250f0d
>--- /dev/null
>+++ b/net/onedrive/pkg-message
>@@ -0,0 +1,9 @@
>+[
>+{ type: install
>+  message: <<EOM
>+When upgrading from version 2.3.3, the onedrive client may fail to
>+synchronize. In this case, execute onedrive --logout to logout and
>+re-authenticate. For more detail, see USAGE.md.
>+EOM
>+}
>+]

Actions: View | Diff

Attachments on bug 245805: 213654 | 216422 | 216756 | 216822