Bug 252715 - www/seahub using different source branch from net-mgmt/seafile-server
Summary: www/seahub using different source branch from net-mgmt/seafile-server
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Richard Gallamore
URL:
Keywords: patch
Depends on:
Blocks:
 
Reported: 2021-01-15 17:15 UTC by Martin Waschbüsch
Modified: 2021-02-01 02:28 UTC (History)
0 users

See Also:
ultima: maintainer-feedback+


Attachments
proposed patch for seahub (12.79 KB, patch)
2021-01-15 22:47 UTC, Martin Waschbüsch
martin: maintainer-approval?
Details | Diff
proposed patch for seafile-server (448 bytes, patch)
2021-01-15 22:47 UTC, Martin Waschbüsch
martin: maintainer-approval?
Details | Diff
proposed patch for py-seafobj (974 bytes, patch)
2021-01-15 22:48 UTC, Martin Waschbüsch
martin: maintainer-approval?
Details | Diff
proposed patch for py-seafdav (987 bytes, patch)
2021-01-15 22:49 UTC, Martin Waschbüsch
martin: maintainer-approval?
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Martin Waschbüsch 2021-01-15 17:15:02 UTC
The following packages comprise the seafile server and frontend:

net-mgmt/ccnet-server
net-mgmt/seafile-server

www/py-seafdav
www/py-seafobj
www/seahub

The first two use the -server source tags on github.
The last three use the -pro source tags (even though a -server tag is available on GH).

The -pro tag is meant for the commercial 'pro' edition of seafile, while the -server tag is for the community edition.

In the latest versions on ports, py-seafdav, py-seafobj and seahub use the 7.1.9 (pro) version which references functionality in the seafile api that is only available in the pro version (group quotas for instance).

From what I can see, the correct SEAHUB_VER in
net-mgmt/seafile-server/Makefile.include
should (as of today) be 7.1.5

and the DISTVERSIONSUFFIX in the Makefile of www/py-seafdav, www/py-seafobj and www/seahub should be changed to '-server'
Comment 1 Martin Waschbüsch 2021-01-15 22:47:39 UTC
Created attachment 221608 [details]
proposed patch for seahub
Comment 2 Martin Waschbüsch 2021-01-15 22:47:58 UTC
Created attachment 221609 [details]
proposed patch for seafile-server
Comment 3 Martin Waschbüsch 2021-01-15 22:48:20 UTC
Created attachment 221610 [details]
proposed patch for py-seafobj
Comment 4 Martin Waschbüsch 2021-01-15 22:49:07 UTC
Created attachment 221611 [details]
proposed patch for py-seafdav
Comment 5 Martin Waschbüsch 2021-01-15 22:50:17 UTC
Richard, just to keep you updated: the proposed changes fix the issues I mentioned in my earlier mail. If I can further help with this, please let me know. :-)
Comment 6 Richard Gallamore freebsd_committer 2021-01-23 07:08:04 UTC
Hey Martin,

Thanks for the patches, I don't want to change this at this time because this would require bumping the PORTEPOCH. I plan to upgrade to 7.2 soon and I will take this issue into account.
Comment 7 Martin Waschbüsch 2021-01-23 07:50:50 UTC
(In reply to Richard Gallamore from comment #6)
Thanks for the heads-up. That is fine with me.

I have a working version using the patches and I'll be thrilled when 7.2 is out! :-)
Comment 8 commit-hook freebsd_committer 2021-02-01 02:26:46 UTC
A commit references this bug:

Author: ultima
Date: Mon Feb  1 02:26:32 UTC 2021
New revision: 563541
URL: https://svnweb.freebsd.org/changeset/ports/563541

Log:
  Updated Seafile/Seahub to 8.0.3

  Changed to -server branch, some errors were creeping over
  from the pro version not being compatible with the community
  edition. Previously this was never an issue as you must manually
  upgrade to the pro version for the new features.

  Disabled seafile-controller config checking prior to startup.
  The check only ran on ccnet previously and this was changed to
  seafile which never implemented the function.
  https://forum.seafile.com/t/seafile-controller-t-functionality-broken-on-8-x/13738

  This version adds compatible with Django 2.2, this will require
  coordination with multiple port devs to migrate this over
  properly.

  Changes: https://manual.seafile.com/changelog/server-changelog/

  PR:		252715

Changes:
  head/net-mgmt/seafile-server/Makefile
  head/net-mgmt/seafile-server/Makefile.include
  head/net-mgmt/seafile-server/distinfo
  head/net-mgmt/seafile-server/files/patch-server_Makefile.am
  head/net-mgmt/seafile-server/files/patch-server_seaf-server.c
  head/net-mgmt/seafile-server/files/seafile.in
  head/net-mgmt/seafile-server/pkg-plist
  head/www/py-seafdav/Makefile
  head/www/py-seafdav/distinfo
  head/www/py-seafobj/Makefile
  head/www/py-seafobj/distinfo
  head/www/seahub/Makefile
  head/www/seahub/distinfo
  head/www/seahub/pkg-plist