From 47e1fd44da9a760b176c4ea88d90b78deb23ab9d Mon Sep 17 00:00:00 2001
From: Gunter Zeilinger <gunterze@protonmail.com>
Date: Fri, 8 May 2020 09:07:14 +0200
Subject: [PATCH] ldapadd -f dcm4chee-archive.ldif fails with sysmalloc:
 Assertion fix #2568

---
 .../src/main/assembly/dist.xml                | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/dcm4chee-arc-assembly/src/main/assembly/dist.xml b/dcm4chee-arc-assembly/src/main/assembly/dist.xml
index aaf1b014d..6e384ede9 100644
--- a/dcm4chee-arc-assembly/src/main/assembly/dist.xml
+++ b/dcm4chee-arc-assembly/src/main/assembly/dist.xml
@@ -56,11 +56,17 @@
         <include>cli/add-data-source-${db}.cli</include>
         <include>cli/add-jms-queues.cli</include>
         <include>configuration/dcm4chee-arc/ldap.properties</include>
-        <include>ldap/**</include>
         <include>rs/**</include>
       </includes>
       <lineEnding>dos</lineEnding>
-      <filtered>true</filtered>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/resources</directory>
+      <outputDirectory>.</outputDirectory>
+      <includes>
+        <include>ldap/**</include>
+      </includes>
+      <lineEnding>unix</lineEnding>
     </fileSet>
     <fileSet>
       <directory>${basedir}/src/main/resources</directory>
@@ -102,7 +108,6 @@
     <dependencySet>
       <outputDirectory>.</outputDirectory>
       <includes>
-        <include>org.dcm4che:dcm4che-conf-ldap-schema</include>
         <include>org.dcm4che.dcm4chee-arc:dcm4chee-arc-entity</include>
       </includes>
       <unpack>true</unpack>
@@ -114,5 +119,19 @@
       </unpackOptions>
       <useProjectArtifact>false</useProjectArtifact>
     </dependencySet>
+    <dependencySet>
+      <outputDirectory>.</outputDirectory>
+      <includes>
+        <include>org.dcm4che:dcm4che-conf-ldap-schema</include>
+      </includes>
+      <unpack>true</unpack>
+      <unpackOptions>
+        <excludes>
+          <exclude>META-INF/**</exclude>
+        </excludes>
+        <lineEnding>unix</lineEnding>
+      </unpackOptions>
+      <useProjectArtifact>false</useProjectArtifact>
+    </dependencySet>
   </dependencySets>
 </assembly>