Attachment 221608 Details for Bug 252715 – proposed patch for seahub

[patch] proposed patch for seahub

seahub.patch (text/plain), 12.79 KB, created by Martin Waschbüsch on 2021-01-15 22:47:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Waschbüsch

Created: 2021-01-15 22:47:39 UTC

Size: 12.79 KB

patch

obsolete

>diff -ruN seahub.orig/Makefile seahub/Makefile
>--- seahub.orig/Makefile	2020-06-29 12:18:28.452658000 +0000
>+++ seahub/Makefile	2021-01-15 16:57:30.909341000 +0000
>@@ -3,7 +3,7 @@
> PORTNAME=	seahub
> DISTVERSIONPREFIX=	v
> DISTVERSION=	${SEAHUB_VER}
>-DISTVERSIONSUFFIX=	-pro
>+DISTVERSIONSUFFIX=	-server
> CATEGORIES=	www
> 
> MAINTAINER=	ultima@FreeBSD.org
>diff -ruN seahub.orig/distinfo seahub/distinfo
>--- seahub.orig/distinfo	2020-12-05 00:17:34.920051000 +0000
>+++ seahub/distinfo	2021-01-15 16:58:53.236856000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1607117621
>-SHA256 (haiwen-seahub-v7.1.9-pro_GH0.tar.gz) = 7b0b28a0b9b5922ae13ce26e8985c1910e09f38ae9ddda960affd1d2966faba2
>-SIZE (haiwen-seahub-v7.1.9-pro_GH0.tar.gz) = 21298878
>+TIMESTAMP = 1610729933
>+SHA256 (haiwen-seahub-v7.1.5-server_GH0.tar.gz) = cc7f5a1642d203b2390ae3c30c8a5546d1e829d9d1a5ddf686e558292746ce5c
>+SIZE (haiwen-seahub-v7.1.5-server_GH0.tar.gz) = 21398476
>diff -ruN seahub.orig/pkg-plist seahub/pkg-plist
>--- seahub.orig/pkg-plist	2020-12-05 00:17:34.920051000 +0000
>+++ seahub/pkg-plist	2021-01-15 22:26:25.067970000 +0000
>@@ -70,7 +70,6 @@
> %%SEAHUBDIR%%/frontend/src/components/dialog/confirm-disconnect-dingtalk.js
> %%SEAHUBDIR%%/frontend/src/components/dialog/confirm-disconnect-wechat.js
> %%SEAHUBDIR%%/frontend/src/components/dialog/confirm-restore-repo.js
>-%%SEAHUBDIR%%/frontend/src/components/dialog/confirm-unlink-device.js
> %%SEAHUBDIR%%/frontend/src/components/dialog/copy-dirent-dialog.js
> %%SEAHUBDIR%%/frontend/src/components/dialog/copy-move-dirent-progress-dialog.js
> %%SEAHUBDIR%%/frontend/src/components/dialog/create-department-repo-dialog.js
>@@ -312,7 +311,6 @@
> %%SEAHUBDIR%%/frontend/src/components/user-settings/two-factor-auth.js
> %%SEAHUBDIR%%/frontend/src/components/user-settings/user-avatar-form.js
> %%SEAHUBDIR%%/frontend/src/components/user-settings/user-basic-info-form.js
>-%%SEAHUBDIR%%/frontend/src/components/user-settings/web-api-auth-token.js
> %%SEAHUBDIR%%/frontend/src/components/user-settings/webdav-password.js
> %%SEAHUBDIR%%/frontend/src/components/video-player.js
> %%SEAHUBDIR%%/frontend/src/components/wiki-dir-list-view/wiki-dir-list-item.js
>@@ -561,12 +559,12 @@
> %%SEAHUBDIR%%/frontend/src/pages/sys-admin/statistic/statistic-nav.js
> %%SEAHUBDIR%%/frontend/src/pages/sys-admin/statistic/statistic-reports.js
> %%SEAHUBDIR%%/frontend/src/pages/sys-admin/statistic/statistic-storage.js
>-%%SEAHUBDIR%%/frontend/src/pages/sys-admin/statistic/statistic-traffic-orgs.js
>-%%SEAHUBDIR%%/frontend/src/pages/sys-admin/statistic/statistic-traffic-users.js
> %%SEAHUBDIR%%/frontend/src/pages/sys-admin/statistic/statistic-traffic.js
> %%SEAHUBDIR%%/frontend/src/pages/sys-admin/statistic/statistic-users.js
>+%%SEAHUBDIR%%/frontend/src/pages/sys-admin/statistic/traffic-organizations-table.js
> %%SEAHUBDIR%%/frontend/src/pages/sys-admin/statistic/traffic-table-body.js
> %%SEAHUBDIR%%/frontend/src/pages/sys-admin/statistic/traffic-table.js
>+%%SEAHUBDIR%%/frontend/src/pages/sys-admin/statistic/traffic-user-table.js
> %%SEAHUBDIR%%/frontend/src/pages/sys-admin/terms-and-conditions/content.js
> %%SEAHUBDIR%%/frontend/src/pages/sys-admin/terms-and-conditions/item.js
> %%SEAHUBDIR%%/frontend/src/pages/sys-admin/terms-and-conditions/terms-and-conditions.js
>@@ -815,8 +813,8 @@
> %%SEAHUBDIR%%/manage.py
> %%SEAHUBDIR%%/media/assets/css/bootstrap.min.b00faad199b5.css
> %%SEAHUBDIR%%/media/assets/css/bootstrap.min.css
>-%%SEAHUBDIR%%/media/assets/frontend/commons/bundle.common.c93da01bb0e4.js
> %%SEAHUBDIR%%/media/assets/frontend/commons/bundle.common.js
>+%%SEAHUBDIR%%/media/assets/frontend/commons/bundle.common.c16c9c55c50a.js
> %%SEAHUBDIR%%/media/assets/frontend/css/TCAccept.6d3a92ee4731.css
> %%SEAHUBDIR%%/media/assets/frontend/css/TCAccept.css
> %%SEAHUBDIR%%/media/assets/frontend/css/TCView.6d3a92ee4731.css
>@@ -891,71 +889,71 @@
> %%SEAHUBDIR%%/media/assets/frontend/css/wiki.0b08d1727482.css
> %%SEAHUBDIR%%/media/assets/frontend/css/wiki.css
> %%SEAHUBDIR%%/media/assets/frontend/css/wiki.ffbe5ec63186.css
>-%%SEAHUBDIR%%/media/assets/frontend/js/TCAccept.805657dee973.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/TCAccept.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/TCView.51545dd1a7b9.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/TCView.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/app.2ca802bc39af.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/app.9c6233fbbf0d.js
> %%SEAHUBDIR%%/media/assets/frontend/js/app.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/draft.14c3ddc6110a.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/draft.0ba43f3978db.js
> %%SEAHUBDIR%%/media/assets/frontend/js/draft.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/fileHistory.437d35a72ec4.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/fileHistory.66ba81e52c65.js
> %%SEAHUBDIR%%/media/assets/frontend/js/fileHistory.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/fileHistoryOld.5276dec443c1.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/fileHistoryOld.7dc0ea33914a.js
> %%SEAHUBDIR%%/media/assets/frontend/js/fileHistoryOld.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/fileView.4b2cf19f0fc1.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/fileView.57f93d491e63.js
> %%SEAHUBDIR%%/media/assets/frontend/js/fileView.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/historyTrashFileView.9f885833ae37.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/historyTrashFileView.4f833f505164.js
> %%SEAHUBDIR%%/media/assets/frontend/js/historyTrashFileView.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/markdownEditor.fe70bfe8d8cc.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/markdownEditor.7da94a4112b7.js
> %%SEAHUBDIR%%/media/assets/frontend/js/markdownEditor.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/orgAdmin.180f37f4e9f9.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/orgAdmin.aa48556b4636.js
> %%SEAHUBDIR%%/media/assets/frontend/js/orgAdmin.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/repoFolderTrash.eb18436448c0.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/repoFolderTrash.b78bd6e3c2b1.js
> %%SEAHUBDIR%%/media/assets/frontend/js/repoFolderTrash.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/repoHistory.536c22fe398f.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/repoHistory.b80ba34921ab.js
> %%SEAHUBDIR%%/media/assets/frontend/js/repoHistory.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/repoSnapshot.72fc1bbea7ab.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/repoSnapshot.94dec1f6a559.js
> %%SEAHUBDIR%%/media/assets/frontend/js/repoSnapshot.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/search.73470c0ec004.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/search.dd9e0967db03.js
> %%SEAHUBDIR%%/media/assets/frontend/js/search.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/settings.6d8e44187184.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/settings.33675a2a0c3f.js
> %%SEAHUBDIR%%/media/assets/frontend/js/settings.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/sharedDirView.60be93cea42b.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/sharedDirView.d2ce2685835f.js
> %%SEAHUBDIR%%/media/assets/frontend/js/sharedDirView.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewAudio.68f5d739c839.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewAudio.e42a84aec183.js
> %%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewAudio.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewDocument.b84bf3af195e.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewDocument.cc29f930f528.js
> %%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewDocument.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewImage.23fb27699ea7.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewImage.9c360af79d55.js
> %%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewImage.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewMarkdown.c14a5a2ae9e9.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewMarkdown.209ba5901b68.js
> %%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewMarkdown.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewPDF.6028be3f0858.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewPDF.4c3225ce328a.js
> %%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewPDF.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewSVG.4ba6f976a4f5.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewSVG.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewSpreadsheet.7a118b5965c8.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewSpreadsheet.5d951409fa6a.js
> %%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewSpreadsheet.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewText.343553238d34.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewSVG.ab8ebba55272.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewSVG.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewText.560b4235bf38.js
> %%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewText.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewUnknown.c187424e919a.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewUnknown.985b5eb374fa.js
> %%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewUnknown.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewVideo.60c1ce041294.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewVideo.5182cb106f8f.js
> %%SEAHUBDIR%%/media/assets/frontend/js/sharedFileViewVideo.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/sysAdmin.b20f7088bbe5.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/sysAdmin.e8f71a4dad3d.js
> %%SEAHUBDIR%%/media/assets/frontend/js/sysAdmin.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/userNotifications.9ae280bd9acf.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/TCAccept.e8e8276c4166.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/TCAccept.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/TCView.b62476f38eca.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/TCView.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/userNotifications.d4a7ccb722fe.js
> %%SEAHUBDIR%%/media/assets/frontend/js/userNotifications.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/viewCdoc.f388f37c9990.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/viewCdoc.3268666422f9.js
> %%SEAHUBDIR%%/media/assets/frontend/js/viewCdoc.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/viewFileDocument.3e0c2d10c8ab.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/viewFileDocument.bf3ece0698d4.js
> %%SEAHUBDIR%%/media/assets/frontend/js/viewFileDocument.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/viewFileSpreadsheet.f4b5402e5245.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/viewFileSpreadsheet.921cf3587b54.js
> %%SEAHUBDIR%%/media/assets/frontend/js/viewFileSpreadsheet.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/viewFileText.8a335b33ccd6.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/viewFileText.5a3016b1524d.js
> %%SEAHUBDIR%%/media/assets/frontend/js/viewFileText.js
>-%%SEAHUBDIR%%/media/assets/frontend/js/wiki.160ab6c801c5.js
>+%%SEAHUBDIR%%/media/assets/frontend/js/wiki.7b2d353acdd2.js
> %%SEAHUBDIR%%/media/assets/frontend/js/wiki.js
> %%SEAHUBDIR%%/media/assets/frontend/media/fa-regular-400.33f727ccde4b.woff2
> %%SEAHUBDIR%%/media/assets/frontend/media/fa-regular-400.3929b3ef871f.svg
>@@ -1472,6 +1470,17 @@
> %%SEAHUBDIR%%/media/office-template/empty.docx
> %%SEAHUBDIR%%/media/office-template/empty.pptx
> %%SEAHUBDIR%%/media/office-template/empty.xlsx
>+%%SEAHUBDIR%%/media/rest_framework/css/bootstrap-tweaks.css
>+%%SEAHUBDIR%%/media/rest_framework/css/bootstrap.min.css
>+%%SEAHUBDIR%%/media/rest_framework/css/default.css
>+%%SEAHUBDIR%%/media/rest_framework/css/prettify.css
>+%%SEAHUBDIR%%/media/rest_framework/img/glyphicons-halflings-white.png
>+%%SEAHUBDIR%%/media/rest_framework/img/glyphicons-halflings.png
>+%%SEAHUBDIR%%/media/rest_framework/img/grid.png
>+%%SEAHUBDIR%%/media/rest_framework/js/bootstrap.min.js
>+%%SEAHUBDIR%%/media/rest_framework/js/default.js
>+%%SEAHUBDIR%%/media/rest_framework/js/jquery-1.8.1-min.js
>+%%SEAHUBDIR%%/media/rest_framework/js/prettify-min.js
> %%SEAHUBDIR%%/pylintrc
> %%SEAHUBDIR%%/pylintrc.template
> %%SEAHUBDIR%%/pytest.ini
>@@ -1555,7 +1564,6 @@
> %%SEAHUBDIR%%/seahub/api2/endpoints/admin/web_settings.py
> %%SEAHUBDIR%%/seahub/api2/endpoints/admin/work_weixin.py
> %%SEAHUBDIR%%/seahub/api2/endpoints/all_groups.py
>-%%SEAHUBDIR%%/seahub/api2/endpoints/auth_token_by_session.py
> %%SEAHUBDIR%%/seahub/api2/endpoints/be_shared_repo.py
> %%SEAHUBDIR%%/seahub/api2/endpoints/cancel_zip_task.py
> %%SEAHUBDIR%%/seahub/api2/endpoints/copy_move_task.py
>@@ -1724,6 +1732,7 @@
> %%SEAHUBDIR%%/seahub/base/registration_urls.py
> %%SEAHUBDIR%%/seahub/base/sudo_mode.py
> %%SEAHUBDIR%%/seahub/base/templatetags/__init__.py
>+%%SEAHUBDIR%%/seahub/base/templatetags/rest_framework.py
> %%SEAHUBDIR%%/seahub/base/templatetags/seahub_tags.py
> %%SEAHUBDIR%%/seahub/base/templatetags/upload_tags.py
> %%SEAHUBDIR%%/seahub/base/tests.py
>@@ -2016,6 +2025,9 @@
> %%SEAHUBDIR%%/seahub/templates/remote_user/create_unknown_user_false.html
> %%SEAHUBDIR%%/seahub/templates/remote_user/error.html
> %%SEAHUBDIR%%/seahub/templates/remote_user/not_active.html
>+%%SEAHUBDIR%%/seahub/templates/rest_framework/api.html
>+%%SEAHUBDIR%%/seahub/templates/rest_framework/base.html
>+%%SEAHUBDIR%%/seahub/templates/rest_framework/login.html
> %%SEAHUBDIR%%/seahub/templates/repo_dir_recycle_view.html
> %%SEAHUBDIR%%/seahub/templates/repo_folder_trash_react.html
> %%SEAHUBDIR%%/seahub/templates/repo_history_react.html

Flags:

martin: maintainer-approval?

Actions: View | Diff

Attachments on bug 252715: 221608 | 221609 | 221610 | 221611