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 + +