Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ownCloud: Update to v10.13.2 #5912

Merged
merged 29 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
31e5464
Update ownCloud to 10.13.2
mreid-tt Oct 15, 2023
c097fef
Migrate wizards to use mustache
mreid-tt Oct 15, 2023
fda749d
Use new shared folder handling
mreid-tt Oct 15, 2023
d3ffea2
Fix mustache line formatting
mreid-tt Oct 15, 2023
b3e7feb
Attempt fix for wizard templates
mreid-tt Oct 15, 2023
55d5f83
Fix multi-volume service setup
mreid-tt Oct 15, 2023
8f28437
Remove synthetic daemon
mreid-tt Oct 15, 2023
b1e4efc
Update change log
mreid-tt Oct 15, 2023
e0f87bb
Fix DSM6 dependencies
mreid-tt Oct 15, 2023
d254a91
Framework: Fix wizard template logic
mreid-tt Oct 17, 2023
d05d631
Amendments following review
mreid-tt Oct 18, 2023
13d8fda
Redesign backup and restore
mreid-tt Oct 22, 2023
8434e09
Fix wizard checks
mreid-tt Oct 22, 2023
153d532
Fix backup file naming
mreid-tt Oct 22, 2023
2b61920
Fix rsync parameters
mreid-tt Oct 22, 2023
f162e9f
Fix database restore and wizards
mreid-tt Oct 22, 2023
df6329e
Fix wizard logic
mreid-tt Oct 22, 2023
a526d0e
Minor script fixes
mreid-tt Oct 22, 2023
5063d54
Move SQL command to function
mreid-tt Oct 22, 2023
7d14ce7
Fix user data restore path
mreid-tt Oct 22, 2023
c121f11
Refine condition check for restore
mreid-tt Oct 22, 2023
8023b1b
Fix for boolean match
mreid-tt Oct 22, 2023
7e98ed6
Revert "Fix for boolean match"
mreid-tt Oct 23, 2023
d35d543
Remove verbose output from tar
mreid-tt Oct 23, 2023
f1c9813
Refine wizard messages
mreid-tt Oct 23, 2023
6eebe9b
Update change log
mreid-tt Oct 23, 2023
2b92da2
Remove unneeded install path
mreid-tt Oct 25, 2023
aefb6ee
Trim excess wizard code
mreid-tt Oct 27, 2023
677ef18
Move app call to variable
mreid-tt Oct 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cross/owncloud/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PKG_NAME = owncloud
PKG_VERS = 10.13.1
PKG_DATE = 20230906
PKG_VERS = 10.13.2
PKG_DATE = 20231009
PKG_EXT = tar.bz2
PKG_DIST_NAME = $(PKG_NAME)-complete-$(PKG_DATE).$(PKG_EXT)
PKG_DIST_SITE = https://download.owncloud.com/server/stable
Expand Down
6 changes: 3 additions & 3 deletions cross/owncloud/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
owncloud-complete-20230906.tar.bz2 SHA1 c8175bc117cf1e0bf4ac0c31fa2d683324c842fc
owncloud-complete-20230906.tar.bz2 SHA256 7419b2bdd72457e388976d152be566b9aa008c8deb960a39e00ef6866c1916bb
owncloud-complete-20230906.tar.bz2 MD5 dfc1c8db52fd91ebe5fc6e998416bd85
owncloud-complete-20231009.tar.bz2 SHA1 240643ff4eaef8cf5432e5a4ab673b6e06bef59a
owncloud-complete-20231009.tar.bz2 SHA256 0eee3bf9dacd86ef6b5efba4d71d99188e98d3ff83a49078e87d4ea4e3937cec
owncloud-complete-20231009.tar.bz2 MD5 2f8e340a760c18b184859680a8c29e1c
3 changes: 3 additions & 0 deletions mk/spksrc.spk.mk
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,9 @@ ifneq ($(strip $(WIZARDS_DIR)),)
$(eval SPK_CONTENT += WIZARD_UIFILES)
@mkdir -p $(DSM_WIZARDS_DIR)
@find $${SPKSRC_WIZARDS_DIR} -maxdepth 1 -type f -and \( $(WIZARD_FILE_NAMES) \) -print -exec cp -f {} $(DSM_WIZARDS_DIR) \;
@if [ -f "$(DSM_WIZARDS_DIR)/uninstall_uifile.sh" ] && [ -f "$(DSM_WIZARDS_DIR)/uninstall_uifile" ]; then \
rm "$(DSM_WIZARDS_DIR)/uninstall_uifile"; \
fi
@if [ -d "$(WIZARDS_DIR)$(TCVERSION)" ]; then \
$(MSG) "Create DSM Version specific Wizards: $(WIZARDS_DIR)$(TCVERSION)"; \
find $${SPKSRC_WIZARDS_DIR}$(TCVERSION) -maxdepth 1 -type f -and \( $(WIZARD_FILE_NAMES) \) -print -exec cp -f {} $(DSM_WIZARDS_DIR) \; ;\
Expand Down
32 changes: 15 additions & 17 deletions spk/owncloud/Makefile
Original file line number Diff line number Diff line change
@@ -1,51 +1,49 @@
SPK_NAME = owncloud
SPK_VERS = 10.13.1
SPK_REV = 11
SPK_VERS = 10.13.2
SPK_REV = 12
SPK_ICON = src/owncloud.png
DSM_UI_DIR = app

DEPENDS = cross/owncloud
SPK_DEPENDS = "WebStation:PHP7.4:Apache2.4"
# Pure PHP package, make sure ARCH is not defined
override ARCH=

REQUIRED_MIN_DSM = 6.0
SPK_DEPENDS = WebStation:PHP7.4:Apache2.4

MAINTAINER = ymartin59
DESCRIPTION = ownCloud is a personal cloud which runs on your own server and gives you freedom and control over your own data.
CHANGELOG = "Update ownCloud to 10.13.1."
DISPLAY_NAME = ownCloud
CHANGELOG = "1. Update ownCloud to 10.13.2.<br/>2. New backup and restore functions.<br/>3. Use new shared folder handling.<br/>4. Package maintenance optimisation."
HOMEPAGE = https://owncloud.org/

LICENSE = AGPL

STARTABLE = yes
SERVICE_USER = auto
SERVICE_WIZARD_SHARE = wizard_data_share
WIZARDS_TEMPLATES_DIR = src/wizard_templates/
SERVICE_WIZARD_SHARENAME = wizard_data_share
USE_DATA_SHARE_WORKER = yes
SERVICE_SETUP = src/service-setup.sh

SYSTEM_GROUP = http

# Admin link for in DSM UI
ADMIN_URL = /owncloud/
ADMIN_PROTOCOL = https

CONF_DIR = src/conf/
WIZARDS_DIR = src/wizard/

DSM_UI_DIR = app
DSM_UI_CONFIG = src/app/config
CONF_DIR = src/conf/

POST_STRIP_TARGET = owncloud_extra_install
SERVICE_SETUP = src/service-setup.sh
STARTABLE = no

# TMPDIR is used for owncloud built in backup and update
USE_ALTERNATE_TMPDIR = 1

# Pure PHP package, make sure ARCH is not defined
override ARCH=
POST_STRIP_TARGET = owncloud_extra_install

include ../../mk/spksrc.spk.mk

.PHONY: owncloud_extra_install
owncloud_extra_install:
install -m 755 -d $(STAGING_DIR)/bin -d $(STAGING_DIR)/web
install -m 755 src/bin/owncloud-daemon $(STAGING_DIR)/bin/owncloud-daemon
install -m 755 -d $(STAGING_DIR)/web
install -m 644 src/web/owncloud.conf $(STAGING_DIR)/web/owncloud.conf
install -m 644 src/web/owncloud.json $(STAGING_DIR)/web/owncloud.json
32 changes: 0 additions & 32 deletions spk/owncloud/src/bin/owncloud-daemon

This file was deleted.

Loading