From 040f35d9b78c3fc75e2f4345d8543f18826929c879065e93048944397e7229e6 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Tue, 16 Nov 2021 08:44:06 +0000 Subject: [PATCH] - harden_gnuhealth.service.patch removed - we are not using the service from GH reporting.diff added to catch change from .odt to .fodt OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/gnuhealth?expand=0&rev=90 --- gnuhealth.changes | 6 ++++ gnuhealth.spec | 6 ++-- harden_gnuhealth.service.patch | 24 -------------- reporting.diff | 20 ++++++++++++ webdav.diff | 60 ++++++++++++++++++++++++++++++++++ 5 files changed, 89 insertions(+), 27 deletions(-) delete mode 100644 harden_gnuhealth.service.patch create mode 100644 reporting.diff create mode 100644 webdav.diff diff --git a/gnuhealth.changes b/gnuhealth.changes index d08fbcb..835d421 100644 --- a/gnuhealth.changes +++ b/gnuhealth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 16 08:37:25 UTC 2021 - Axel Braun + +- harden_gnuhealth.service.patch removed - we are not using the service from GH + reporting.diff added to catch change from .odt to .fodt + ------------------------------------------------------------------- Mon Sep 20 14:02:25 UTC 2021 - Johannes Segitz diff --git a/gnuhealth.spec b/gnuhealth.spec index 48fa3f6..837d020 100644 --- a/gnuhealth.spec +++ b/gnuhealth.spec @@ -40,7 +40,7 @@ Source7: gnuhealth-rpmlintrc Source8: https://ftp.gnu.org/gnu/health/%{name}-%{version}.tar.gz.sig Source9: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=health&download=1#/%{name}.keyring Patch0: shebang.diff -Patch1: harden_gnuhealth.service.patch +Patch1: reporting.diff BuildRequires: fdupes BuildRequires: python-rpm-generators @@ -110,10 +110,10 @@ This package provides the interface to Orthanc %prep %setup -q -n %{name}-%{version} -%patch0 -p1 +%autopatch -p1 + cp %{S:1} . cp %{S:2} . -%patch1 -p1 %build for i in h*; do diff --git a/harden_gnuhealth.service.patch b/harden_gnuhealth.service.patch deleted file mode 100644 index f8c7de6..0000000 --- a/harden_gnuhealth.service.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: gnuhealth-3.8.0/scripts/startup/gnuhealth.service -=================================================================== ---- gnuhealth-3.8.0.orig/scripts/startup/gnuhealth.service -+++ gnuhealth-3.8.0/scripts/startup/gnuhealth.service -@@ -3,6 +3,19 @@ Description=GNU Health Server - After=network.target - - [Service] -+# added automatically, for details please see -+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort -+ProtectSystem=full -+ProtectHome=true -+PrivateDevices=true -+ProtectHostname=true -+ProtectClock=true -+ProtectKernelTunables=true -+ProtectKernelModules=true -+ProtectKernelLogs=true -+ProtectControlGroups=true -+RestrictRealtime=true -+# end of automatic additions - Type=simple - User=gnuhealth - WorkingDirectory=/home/gnuhealth diff --git a/reporting.diff b/reporting.diff new file mode 100644 index 0000000..4ec9e89 --- /dev/null +++ b/reporting.diff @@ -0,0 +1,20 @@ +diff -U 3 -dHrN a/health_reporting/health_reporting_report.xml b/health_reporting/health_reporting_report.xml +--- a/health_reporting/health_reporting_report.xml 2021-01-29 00:16:22.747730075 +0100 ++++ b/health_reporting/health_reporting_report.xml 2021-11-15 18:31:40.803718094 +0100 +@@ -5,14 +5,14 @@ + + Summary Report + gnuhealth.summary.report +- health_reporting/report/summary_report.odt ++ health_reporting/report/summary_report.fodt + pdf + + + + Epidemiological Surveillance + gnuhealth.epidemics.report +- health_reporting/report/epidemics_report.odt ++ health_reporting/report/epidemics_report.fodt + pdf + + diff --git a/webdav.diff b/webdav.diff new file mode 100644 index 0000000..faa8bc1 --- /dev/null +++ b/webdav.diff @@ -0,0 +1,60 @@ +diff -U 3 -dHrN -- a/health_caldav/setup.py b/health_caldav/setup.py +--- a/health_caldav/setup.py 2021-01-29 00:16:22.579731378 +0100 ++++ b/health_caldav/setup.py 2021-04-28 19:09:21.063707816 +0200 +@@ -47,13 +47,13 @@ + url='https://www.gnuhealth.org', + download_url='http://ftp.gnu.org/gnu/health/', + keywords='GNUHealth calendar caldav', +- package_dir={'trytond.modules.calendar': '.'}, ++ package_dir={'trytond.modules.health_caldav': '.'}, + packages=[ +- 'trytond.modules.calendar', +- 'trytond.modules.calendar.tests', ++ 'trytond.modules.health_caldav', ++ 'trytond.modules.health_caldav.tests', + ], + package_data={ +- 'trytond.modules.calendar': (info.get('xml', []) ++ 'trytond.modules.health_caldav': (info.get('xml', []) + + ['tryton.cfg', 'view/*.xml', 'locale/*.po']), + }, + classifiers=[ +@@ -79,7 +79,7 @@ + zip_safe=False, + entry_points=""" + [trytond.modules] +- calendar = trytond.modules.calendar ++ calendar = trytond.modules.health_caldav + """, + test_suite='tests', + test_loader='trytond.test_loader:Loader', +diff -U 3 -dHrN -- a/health_webdav3_server/setup.py b/health_webdav3_server/setup.py +--- a/health_webdav3_server/setup.py 2021-02-14 01:56:43.480016164 +0100 ++++ b/health_webdav3_server/setup.py 2021-04-28 15:15:55.966534040 +0200 +@@ -63,13 +63,13 @@ + url='https://www.gnuhealth.org', + download_url='http://ftp.gnu.org/gnu/health/', + keywords='webdav GNUHealth', +- package_dir={'trytond.modules.webdav': '.'}, ++ package_dir={'trytond.modules.gnuhealth_webdav3_server': '.'}, + packages=[ +- 'trytond.modules.webdav', +- 'trytond.modules.webdav.tests', ++ 'trytond.modules.gnuhealth_webdav3_server', ++ 'trytond.modules.gnuhealth_webdav3_server.tests', + ], + package_data={ +- 'trytond.modules.webdav': (info.get('xml', []) ++ 'trytond.modules.gnuhealth_webdav3_server': (info.get('xml', []) + + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.fodt', + 'icons/*.svg', 'tests/*.rst']), + }, +@@ -93,7 +93,7 @@ + zip_safe=False, + entry_points=""" + [trytond.modules] +- webdav = trytond.modules.webdav ++ webdav = trytond.modules.gnuhealth_webdav3_server + """, + test_suite='tests', + test_loader='trytond.test_loader:Loader',