diff options
Diffstat (limited to 'deskutils/py-paperless-ngx/files')
3 files changed, 17 insertions, 38 deletions
diff --git a/deskutils/py-paperless-ngx/files/patch-paperless.conf.example b/deskutils/py-paperless-ngx/files/patch-paperless.conf.example index fe40bb7b43a4..35e184176393 100644 --- a/deskutils/py-paperless-ngx/files/patch-paperless.conf.example +++ b/deskutils/py-paperless-ngx/files/patch-paperless.conf.example @@ -1,6 +1,6 @@ ---- paperless.conf.example.orig 2024-04-08 01:44:14 UTC +--- paperless.conf.example.orig 2025-08-17 20:46:35 UTC +++ paperless.conf.example -@@ -17,17 +17,29 @@ +@@ -13,17 +13,29 @@ # Paths and folders @@ -34,7 +34,7 @@ #PAPERLESS_URL=https://example.com #PAPERLESS_CSRF_TRUSTED_ORIGINS=https://example.com # can be set using PAPERLESS_URL #PAPERLESS_ALLOWED_HOSTS=example.com,www.example.com # can be set using PAPERLESS_URL -@@ -40,6 +52,7 @@ +@@ -36,6 +48,7 @@ # OCR settings @@ -42,7 +42,7 @@ #PAPERLESS_OCR_LANGUAGE=eng #PAPERLESS_OCR_MODE=skip #PAPERLESS_OCR_SKIP_ARCHIVE_FILE=never -@@ -56,6 +69,7 @@ +@@ -52,6 +65,7 @@ # Software tweaks @@ -50,7 +50,7 @@ #PAPERLESS_TASK_WORKERS=1 #PAPERLESS_THREADS_PER_WORKER=1 #PAPERLESS_TIME_ZONE=UTC -@@ -92,3 +106,7 @@ +@@ -88,3 +102,7 @@ #PAPERLESS_CONVERT_BINARY=/usr/bin/convert #PAPERLESS_GS_BINARY=/usr/bin/gs diff --git a/deskutils/py-paperless-ngx/files/patch-src_paperless__mail_mail.py b/deskutils/py-paperless-ngx/files/patch-src_paperless__mail_mail.py deleted file mode 100644 index 948e6f5f4e98..000000000000 --- a/deskutils/py-paperless-ngx/files/patch-src_paperless__mail_mail.py +++ /dev/null @@ -1,20 +0,0 @@ ---- src/paperless_mail/mail.py.orig 2025-06-19 19:07:49 UTC -+++ src/paperless_mail/mail.py -@@ -29,7 +29,7 @@ from imap_tools import MailBoxUnencrypted - from imap_tools import MailMessage - from imap_tools import MailMessageFlags - from imap_tools import errors --from imap_tools.mailbox import MailBoxTls -+from imap_tools.mailbox import MailBoxStartTls - from imap_tools.query import LogicOperator - - from documents.data_models import ConsumableDocument -@@ -419,7 +419,7 @@ def get_mailbox(server, port, security) -> MailBox: - if security == MailAccount.ImapSecurity.NONE: - mailbox = MailBoxUnencrypted(server, port) - elif security == MailAccount.ImapSecurity.STARTTLS: -- mailbox = MailBoxTls(server, port, ssl_context=ssl_context) -+ mailbox = MailBoxStartTls(server, port, ssl_context=ssl_context) - elif security == MailAccount.ImapSecurity.SSL: - mailbox = MailBox(server, port, ssl_context=ssl_context) - else: diff --git a/deskutils/py-paperless-ngx/files/patch-src_paperless_settings.py b/deskutils/py-paperless-ngx/files/patch-src_paperless_settings.py index 0631a458caf6..c29b74ddd28c 100644 --- a/deskutils/py-paperless-ngx/files/patch-src_paperless_settings.py +++ b/deskutils/py-paperless-ngx/files/patch-src_paperless_settings.py @@ -1,15 +1,14 @@ ---- src/paperless/settings.py.orig 2025-04-19 22:34:42 UTC +--- src/paperless/settings.py.orig 2025-08-17 20:46:35 UTC +++ src/paperless/settings.py -@@ -21,8 +21,6 @@ if configuration_path and os.path.exists(configuration - load_dotenv(configuration_path) - elif os.path.exists("../paperless.conf"): - load_dotenv("../paperless.conf") --elif os.path.exists("/etc/paperless.conf"): -- load_dotenv("/etc/paperless.conf") - elif os.path.exists("/usr/local/etc/paperless.conf"): - load_dotenv("/usr/local/etc/paperless.conf") - -@@ -267,7 +265,7 @@ THUMBNAIL_DIR = MEDIA_ROOT / "documents" / "thumbnails +@@ -25,7 +25,6 @@ logger = logging.getLogger("paperless.settings") + for path in [ + os.getenv("PAPERLESS_CONFIGURATION_PATH"), + "../paperless.conf", +- "/etc/paperless.conf", + "/usr/local/etc/paperless.conf", + ]: + if path and Path(path).exists(): +@@ -273,7 +272,7 @@ THUMBNAIL_DIR = MEDIA_ROOT / "documents" / "thumbnails DATA_DIR = __get_path("PAPERLESS_DATA_DIR", BASE_DIR.parent / "data") @@ -17,8 +16,8 @@ +NLTK_DIR = __get_path("PAPERLESS_NLTK_DIR", "/usr/local/share/nltk_data") # Check deprecated setting first - EMPTY_TRASH_DIR = os.getenv( -@@ -1106,7 +1104,7 @@ FILENAME_FORMAT_REMOVE_NONE = __get_boolean( + EMPTY_TRASH_DIR = ( +@@ -1279,7 +1278,7 @@ FILENAME_FORMAT_REMOVE_NONE = __get_boolean( THUMBNAIL_FONT_NAME = os.getenv( "PAPERLESS_THUMBNAIL_FONT_NAME", |