[med-svn] r15143 - in trunk/packages/ctn/trunk/debian: . patches
Andreas Tille
tille at alioth.debian.org
Thu Nov 7 21:10:04 UTC 2013
Author: tille
Date: 2013-11-07 21:10:04 +0000 (Thu, 07 Nov 2013)
New Revision: 15143
Added:
trunk/packages/ctn/trunk/debian/patches/20_prevent_installing_examples.patch
trunk/packages/ctn/trunk/debian/patches/30_hardening.patch
Modified:
trunk/packages/ctn/trunk/debian/patches/series
trunk/packages/ctn/trunk/debian/test-endian.c
Log:
Patches needed for hardening (not finished); no warnings when building debian/test-endian.c
Added: trunk/packages/ctn/trunk/debian/patches/20_prevent_installing_examples.patch
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/20_prevent_installing_examples.patch (rev 0)
+++ trunk/packages/ctn/trunk/debian/patches/20_prevent_installing_examples.patch 2013-11-07 21:10:04 UTC (rev 15143)
@@ -0,0 +1,58 @@
+Author: Andreas Tille <tille at debian.org>
+LastChanged: Thu, 07 Nov 2013 14:44:28 +0100
+Description: Do not install scripts which are only needed as examples
+
+--- a/apps/scripts/Makefile
++++ b/apps/scripts/Makefile
+@@ -12,28 +12,29 @@ include $(DICOM_MAKE)
+ application: $(SCRIPTS)
+
+ install:
+- chmod 775 $(SCRIPTS)
+- cp add-accession-numbers $(DICOM_BIN)
+- cp create_common $(DICOM_BIN)
+- cp create_icons $(DICOM_BIN)
+- cp create_icons.94 $(DICOM_BIN)
+- cp createdirectory $(DICOM_BIN)
+- cp fillImageDBScript $(DICOM_BIN)
+- cp his_layout $(DICOM_BIN)
+- cp icon_script $(DICOM_BIN)
+- cp img_layout $(DICOM_BIN)
+- cp pacs_layout $(DICOM_BIN)
+- cp print_layout $(DICOM_BIN)
+- cp start_clients $(DICOM_BIN)
+- cp start_his_client $(DICOM_BIN)
+- cp start_his_server $(DICOM_BIN)
+- cp start_img_client $(DICOM_BIN)
+- cp start_img_displays $(DICOM_BIN)
+- cp start_img_server $(DICOM_BIN)
+- cp start_pacs_client $(DICOM_BIN)
+- cp start_pacs_server $(DICOM_BIN)
+- cp start_print_client $(DICOM_BIN)
+- cp stop_img_displays $(DICOM_BIN)
++ #chmod 775 $(SCRIPTS)
++ #cp add-accession-numbers $(DICOM_BIN)
++ #cp create_common $(DICOM_BIN)
++ #cp create_icons $(DICOM_BIN)
++ #cp create_icons.94 $(DICOM_BIN)
++ #cp createdirectory $(DICOM_BIN)
++ #cp fillImageDBScript $(DICOM_BIN)
++ #cp his_layout $(DICOM_BIN)
++ #cp icon_script $(DICOM_BIN)
++ #cp img_layout $(DICOM_BIN)
++ #cp pacs_layout $(DICOM_BIN)
++ #cp print_layout $(DICOM_BIN)
++ #cp start_clients $(DICOM_BIN)
++ #cp start_his_client $(DICOM_BIN)
++ #cp start_his_server $(DICOM_BIN)
++ #cp start_img_client $(DICOM_BIN)
++ #cp start_img_displays $(DICOM_BIN)
++ #cp start_img_server $(DICOM_BIN)
++ #cp start_pacs_client $(DICOM_BIN)
++ #cp start_pacs_server $(DICOM_BIN)
++ #cp start_print_client $(DICOM_BIN)
++ #cp stop_img_displays $(DICOM_BIN)
++ echo 'scripts will be installed as examples'
+
+ install-clean: install
+ make clean
Added: trunk/packages/ctn/trunk/debian/patches/30_hardening.patch
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/30_hardening.patch (rev 0)
+++ trunk/packages/ctn/trunk/debian/patches/30_hardening.patch 2013-11-07 21:10:04 UTC (rev 15143)
@@ -0,0 +1,67 @@
+--- a/facilities/database/database.c
++++ b/facilities/database/database.c
+@@ -865,7 +865,7 @@ DB_DumpDB(short dbid)
+ if (HF_SharedLock() != HF_NORMAL)
+ return;
+
+- printf("DB Key: %s Number of Patients: %d Number of Additions/Deletions: %d\n\n",
++ printf("DB Key: %s Number of Patients: %d Number of Additions/Deletions: %ld\n\n",
+ GS_root.dbkey, GS_root.num_patients, HF_ReadUpdateFlag());
+
+ for (i = 0; i < DB_MAXPATIENTS; i++) {
+@@ -947,7 +947,7 @@ DB_PrintSeries(SeriesNode *snode)
+ printf("\t\t Modality: %s\n", snode->series.Modality);
+ printf("\t\tSeries Number: %s\n", snode->series.SeriesNumber);
+ printf("\t\t Series UID: %s\n", snode->series.SeriesUID);
+- printf("\t\t Series Time: %d\n", snode->time_stamp);
++ printf("\t\t Series Time: %ld\n", snode->time_stamp);
+ }
+ /* DB_PrintStudy
+ **
+@@ -981,7 +981,7 @@ DB_PrintStudy(StudyNode *snode)
+ printf("\t\t InterpretingPhysName: %s\n", snode->study.InterpretingPhysName);
+ printf("\t\t ProcedureDescription: %s\n", snode->study.ProcedureDescription);
+ printf("\t\t AdmittingDiagnosedDescription: %s\n", snode->study.AdmittingDiagnosedDescription);
+- printf("\t\tStudy Time: %d\n", snode->time_stamp);
++ printf("\t\tStudy Time: %ld\n", snode->time_stamp);
+ }
+ /* DB_PrintPatient
+ **
+@@ -1007,7 +1007,7 @@ DB_PrintPatient(PatientNode pnode)
+ printf("\tBirthdate: %s\n", pnode.pat.BirthDate);
+ printf("\t Name: %s\n", pnode.pat.Name);
+ printf("\t PatID: %s\n", pnode.pat.PatID);
+- printf("\t Pat Time: %d\n\n", pnode.time_stamp);
++ printf("\t Pat Time: %ld\n\n", pnode.time_stamp);
+ }
+
+ /* DB_PrintImage
+@@ -1035,7 +1035,7 @@ DB_PrintImage(ImageNode inode)
+ printf("\t ImageUID: %s\n", inode.image.ImageUID);
+ printf("\t Class UID: %s\n", inode.image.ClassUID);
+ printf("\t FileName: %s\n", inode.image.FileName);
+- printf("\tImage Time: %d\n\n", inode.time_stamp);
++ printf("\tImage Time: %ld\n\n", inode.time_stamp);
+ }
+
+ /* DB_AddSeries
+--- a/facilities/objects/dcm.c
++++ b/facilities/objects/dcm.c
+@@ -1649,7 +1649,7 @@ DCM_DumpElements(DCM_OBJECT ** callerObj
+ (void) LST_Position(&(*object)->groupList, groupItem);
+
+ while (groupItem != NULL) {
+-#ifdef MACOS
++#if defined(MACOS) || defined(LINUX) || defined(FREEBSD)
+ printf("Group: %04x, Length: %8ld\n", groupItem->group,
+ groupItem->baseLength);
+ #else
+@@ -1660,7 +1660,7 @@ DCM_DumpElements(DCM_OBJECT ** callerObj
+ if (elementItem != NULL)
+ (void) LST_Position(&groupItem->elementList, elementItem);
+ while (elementItem != NULL) {
+-#ifdef MACOS
++#if defined(MACOS) || defined(LINUX) || defined(FREEBSD)
+ (void) printf("%04x %04x %8ld ",
+ DCM_TAG_GROUP(elementItem->element.tag),
+ DCM_TAG_ELEMENT(elementItem->element.tag),
Modified: trunk/packages/ctn/trunk/debian/patches/series
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/series 2013-11-07 17:02:34 UTC (rev 15142)
+++ trunk/packages/ctn/trunk/debian/patches/series 2013-11-07 21:10:04 UTC (rev 15143)
@@ -1,3 +1,5 @@
10_all_patches.patch
11_csh-to-bash.patch
20_mysql_4.2.patch
+20_prevent_installing_examples.patch
+30_hardening.patch
Modified: trunk/packages/ctn/trunk/debian/test-endian.c
===================================================================
--- trunk/packages/ctn/trunk/debian/test-endian.c 2013-11-07 17:02:34 UTC (rev 15142)
+++ trunk/packages/ctn/trunk/debian/test-endian.c 2013-11-07 21:10:04 UTC (rev 15143)
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include <stdlib.h>
main()
{
More information about the debian-med-commit
mailing list