diff --git a/README.md b/README.md index 3cfc047..6a19f3a 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Browsing, reading and downloading eBooks using a Calibre database -**Shipped version:** 0.96.20~ynh3 +**Shipped version:** 0.96.21~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 1ad0e3b..d016b08 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Explorer, lire et télécharger des eBooks à partir d'une base de données Calibre -**Version incluse :** 0.96.20~ynh3 +**Version incluse :** 0.96.21~ynh1 ## Captures d’écran diff --git a/manifest.toml b/manifest.toml index 72b4f9d..fb36ef6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Calibre-web" description.en = "Browsing, reading and downloading eBooks using a Calibre database" description.fr = "Explorer, lire et télécharger des eBooks à partir d'une base de données Calibre" -version = "0.96.20~ynh3" +version = "0.96.21~ynh1" maintainers = ["Krakinou"] @@ -15,7 +15,7 @@ admindoc = "https://github.com/janeczku/calibre-web/wiki" code = "https://github.com/janeczku/calibre-web" [integration] -yunohost = ">= 4.3.0" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = true @@ -70,11 +70,12 @@ ram.runtime = "200M" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/janeczku/calibre-web/releases/download/0.6.20/calibre-web-0.6.20.zip" - sha256 = "2f1f8a5ae06f182986193a90796fa96a7b0b5c61fdd29971969b49245b1aaf24" + url = "https://github.com/janeczku/calibre-web/archive/refs/tags/0.6.21.zip" + sha256 = "570afeb74ec6506380e923244088c656921ffc94a616c9da46d68f5f39237fa4" autoupdate.strategy = "latest_github_release" - autoupdate.asset = "calibre-web-.*.zip" + autoupdate.asset = ".*.zip" + [resources.sources.kepubify] arm64.url = "https://github.com/pgaskin/kepubify/releases/download/v4.0.4/kepubify-linux-arm64" @@ -105,5 +106,15 @@ ram.runtime = "200M" main.default = 8083 [resources.apt] - packages = [ "sqlite3", "imagemagick", "libldap2-dev", "libsasl2-dev", "python3-venv", "python3-dev", "python3-lxml", "libjpeg-dev", "zlib1g-dev", "libffi-dev" ] - \ No newline at end of file + #sqlite3 is required to tweak the database in the scripts + #imagemagick is required for cover extraction from EPUBs + #python3-venv is required for installing a venv environnement in the scripts + #python3-dev is required for compiling the ldap dependency during pip install + #libldap2-dev is required for compiling the ldap dependency during pip install + #libsasl2-dev is required for compiling the ldap dependency during pip install + #libjpeg-dev is required for comics and image reading in browser + packages = [ "sqlite3", "imagemagick", "python3-venv", "python3-dev", "libldap2-dev", "libsasl2-dev", "libjpeg-dev" ] + #for reference, dependencies that have been removed in 0.96.21~ynh1: + #python3-lxml : not required in packages as already part of yunohost dependencies + #zlib1g-dev : is part of python3-dev dependencies : not required anymore + #libffi-dev : usage unknown \ No newline at end of file diff --git a/sources/patches/main-config_sql.py.patch.src b/sources/patches/main-config_sql.py.patch.src index 6ea77a6..fb610ea 100644 --- a/sources/patches/main-config_sql.py.patch.src +++ b/sources/patches/main-config_sql.py.patch.src @@ -1,6 +1,6 @@ ---- a/cps/config_sql.py 2022-11-10 20:01:25.834187046 +0100 -+++ b/cps/config_sql.py 2022-11-09 23:48:08.351335088 +0100 -@@ -62,7 +62,7 @@ +--- a/cps/config_sql.py 2023-10-21 12:40:32.000000000 +0200 ++++ b/cps/config_sql.py 2023-11-09 23:14:23.774051473 +0100 +@@ -67,7 +67,7 @@ mail_server_type = Column(SmallInteger, default=0) mail_gmail_token = Column(JSON, default={}) @@ -9,13 +9,13 @@ config_calibre_uuid = Column(String) config_port = Column(Integer, default=constants.DEFAULT_PORT) config_external_port = Column(Integer, default=constants.DEFAULT_PORT) -@@ -79,11 +79,11 @@ +@@ -83,11 +83,11 @@ config_theme = Column(Integer, default=0) config_log_level = Column(SmallInteger, default=logger.DEFAULT_LOG_LEVEL) -- config_logfile = Column(String) +- config_logfile = Column(String, default=logger.DEFAULT_LOG_FILE) - config_access_log = Column(SmallInteger, default=0) -- config_access_logfile = Column(String) +- config_access_logfile = Column(String, default=logger.DEFAULT_ACCESS_LOG) + config_logfile = Column(String, default='__LOG_FILE__') + config_access_log = Column(SmallInteger, default=1) + config_access_logfile = Column(String, default='__ACCESS_LOG_FILE__') @@ -25,8 +25,8 @@ config_anonbrowse = Column(SmallInteger, default=0) config_public_reg = Column(SmallInteger, default=0) config_remote_login = Column(Boolean, default=False) -@@ -109,11 +109,11 @@ - config_goodreads_api_key = Column(String) +@@ -114,11 +114,11 @@ + config_goodreads_api_secret_e = Column(String) config_goodreads_api_secret = Column(String) config_register_email = Column(Boolean, default=False) - config_login_type = Column(Integer, default=0) @@ -39,7 +39,7 @@ config_ldap_port = Column(SmallInteger, default=389) config_ldap_authentication = Column(SmallInteger, default=constants.LDAP_AUTH_SIMPLE) config_ldap_serv_username = Column(String, default='cn=admin,dc=example,dc=org') -@@ -122,15 +122,15 @@ +@@ -128,15 +128,15 @@ config_ldap_cacert_path = Column(String, default="") config_ldap_cert_path = Column(String, default="") config_ldap_key_path = Column(String, default="") diff --git a/sources/patches/main-optional-requirements.txt.patch b/sources/patches/main-optional-requirements.txt.patch index 861e31f..9c84db2 100644 --- a/sources/patches/main-optional-requirements.txt.patch +++ b/sources/patches/main-optional-requirements.txt.patch @@ -1,22 +1,22 @@ ---- a/optional-requirements.txt 2023-03-27 19:49:57.000000000 +0200 -+++ b/optional-requirements.txt 2023-04-08 15:37:08.576678746 +0200 +--- a/optional-requirements.txt 2023-10-21 12:40:32.000000000 +0200 ++++ b/optional-requirements.txt 2023-11-09 23:07:35.075891057 +0100 @@ -1,19 +1,5 @@ # GDrive Integration --google-api-python-client>=1.7.11,<2.90.0 - gevent>20.6.0,<23.0.0 +-google-api-python-client>=1.7.11,<2.98.0 + gevent>20.6.0,<24.0.0 -greenlet>=0.4.17,<2.1.0 -httplib2>=0.9.2,<0.23.0 -oauth2client>=4.0.0,<4.1.4 -uritemplate>=3.0.0,<4.2.0 --pyasn1-modules>=0.0.8,<0.3.0 --pyasn1>=0.1.9,<0.5.0 --PyDrive2>=1.3.1,<1.16.0 --PyYAML>=3.12 +-pyasn1-modules>=0.0.8,<0.4.0 +-pyasn1>=0.1.9,<0.6.0 +-PyDrive2>=1.3.1,<1.18.0 +-PyYAML>=3.12,<6.1 -rsa>=3.4.2,<4.10.0 - -# Gmail --google-auth-oauthlib>=0.4.3,<0.9.0 --google-api-python-client>=1.7.11,<2.90.0 +-google-auth-oauthlib>=0.4.3,<1.1.0 +-google-api-python-client>=1.7.11,<2.98.0 # goodreads goodreads>=0.3.2,<0.4.0 @@ -25,8 +25,8 @@ Flask-SimpleLDAP>=1.4.0,<1.5.0 -# oauth --Flask-Dance>=2.0.0,<6.3.0 --SQLAlchemy-Utils>=0.33.5,<0.40.0 +-Flask-Dance>=2.0.0,<7.1.0 +-SQLAlchemy-Utils>=0.33.5,<0.42.0 - # metadata extraction rarfile>=3.2