[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#912068: stretch-pu: package apache-directory-server/2.0.0~M15-4



Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org@packages.debian.org
Usertags: pu

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

I would like to upload fixes for two RC bugs that affect stretch and make
the package uninstallable and, after manually fixing that, unusable:

 #909063 - apacheds: package installation fails due to incorrect apacheds.service unit
 #911557 - apacheds: broken symlinks: /usr/share/apacheds/lib/{log4j-1.2,commons-io,antlr}.jar

Find attached the diff between the version now in stretch and the proposed
version.

-----BEGIN PGP SIGNATURE-----

iQKJBAEBCABzFiEEPJ1UpHV1wCb7F/0mt5o8FqDE8pYFAlvUzCUxGmh0dHBzOi8v
d3d3LmRvbWluaWstZ2VvcmdlLmRlL2dwZy1wb2xpY3kudHh0LmFzYyMcZG9taW5p
ay5nZW9yZ2VAaXQucGlyYXRlbnBhcnRlaS5kZQAKCRC3mjwWoMTylrCFD/0QUhlM
ijX+9V3iHy8/j5T/jsLB5jyOcYuuFofC1vucHN9IQAx809U002X1ODYwicydkXcq
wpo9RAvPqJr1zYO47p9O8M/qj0wf1r4g/avZRH0rJbf1n0I8O8yJAUvTHtKjQXub
sARZm3HmZ/axSES281IzBthvjmPnMMJR6347irFrTIemgvBO84yxTw6n4qHMD+uc
hJPfjJ0bYuk+db0zv99QG8cSfGJoZG5IxpasIQKFvkBzj147EW+uzEahy/UxnqUw
kUobzzsviLR9qh2R2Rf8RlIIuKsfP9Fvdtf4aUwd00XpsW6nk3O37Rrlz/ZeWosP
RPEizy0cwaFYWxlTwVRd/2Gj6wKnGVHbNBU6x++XRGEae5nyFB5AnQcbWw8Zoj+M
Q4Cgfh07RtN5nu9o07MNrorr1ks/2muDFp+0Mu8T2inQ4p0V9Wf2RFEEJy/BPZMX
p7/h+4iP5CO2vtT130zhZhbj0laxdQ1HRVIjAmknSrYHF5QAY3BNINHiYp4YjfTH
piIGjddlW+DDwNvN/UXIAOtmxJlfpB/pcblSzzMLnTnxgNoxXxfPVN2qYQDJznvf
vk9yx1t2P829QE09eeOpR9TQnujU6uwN5rOosTw8mv4oH2Z7YOcJQ3V7otMUCXp4
Z3IfnTn+Cyj1HBMixuPc4KduGAufG6mdvX2Osw==
=oswM
-----END PGP SIGNATURE-----
diff --git a/debian/apacheds.service b/debian/apacheds.service
index e6de514..23efa17 100644
--- a/debian/apacheds.service
+++ b/debian/apacheds.service
@@ -8,14 +8,15 @@ Type=simple
 User=apacheds
 Group=apacheds
 EnvironmentFile=/etc/default/apacheds
-ExecStart=${JAVA_HOME}/bin/java ${JAVA_OPTS} \
-            -Dapacheds.controls=${ADS_CONTROLS} \
-            -Dapacheds.extendedOperations=${ADS_EXTENDED_OPERATIONS} \
-            -Dlog4j.configuration=file:${ADS_INSTANCES}/${ADS_INSTANCE}/conf/log4j.properties \
-            -Dapacheds.log.dir=${ADS_INSTANCES}/${ADS_INSTANCE}/log \
-            -cp '${ADS_HOME}/lib/*' \
-            org.apache.directory.server.UberjarMain \
-            ${ADS_INSTANCES}/${ADS_INSTANCE}/
+ExecStart=/bin/sh -c "exec \
+            ${JAVA_HOME}/bin/java ${JAVA_OPTS} \
+              -Dapacheds.controls=${ADS_CONTROLS} \
+              -Dapacheds.extendedOperations=${ADS_EXTENDED_OPERATIONS} \
+              -Dlog4j.configuration=file:${ADS_INSTANCES}/${ADS_INSTANCE}/conf/log4j.properties \
+              -Dapacheds.log.dir=${ADS_INSTANCES}/${ADS_INSTANCE}/log \
+              -cp '${ADS_HOME}/lib/*' \
+              org.apache.directory.server.UberjarMain \
+              ${ADS_INSTANCES}/${ADS_INSTANCE}/"
 PrivateTmp=true
 
 [Install]
diff --git a/debian/changelog b/debian/changelog
index 62c6358..bdfa64f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apache-directory-server (2.0.0~M15-4+deb9u1) stretch; urgency=medium
+
+  * Team upload.
+  * Fix command in systemd service file. (Closes: #909063)
+  * Add missing dependencies to libraries. (Closes: #911557)
+
+ -- Dominik George <natureshadow@debian.org>  Sat, 27 Oct 2018 15:32:48 +0200
+
 apache-directory-server (2.0.0~M15-4) unstable; urgency=medium
 
   * Transition to Jetty 9
diff --git a/debian/control b/debian/control
index 0b02379..31df170 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,14 @@ Homepage: http://directory.apache.org
 
 Package: libapacheds-java
 Architecture: all
-Depends: ${maven:Depends}, ${misc:Depends}, libapacheds-i18n-java (= ${source:Version}), libapacheds-kerberos-codec-java (= ${source:Version})
+Depends:
+ libantlr-java,
+ libapacheds-i18n-java (= ${source:Version}),
+ libapacheds-kerberos-codec-java (= ${source:Version}),
+ libcommons-io-java,
+ liblog4j1.2-java,
+ ${maven:Depends},
+ ${misc:Depends},
 Suggests: ${maven:OptionalDepends}
 Description: Apache Directory Server (Libraries)
  ApacheDS is an embbedable directory server entirely written in Java, which

Reply to: