[Pkg-fedora-ds-maintainers] 389-ds-base: Changes to 'master'
Timo Aaltonen
tjaalton at moszumanska.debian.org
Mon Oct 3 14:54:55 UTC 2016
debian/389-ds-base.postinst | 12 +++++++++---
debian/changelog | 9 +++++++++
debian/control | 31 -------------------------------
debian/rules | 4 ----
debian/tests/control | 5 +++++
debian/tests/setup | 17 +++++++++++++++++
6 files changed, 40 insertions(+), 38 deletions(-)
New commits:
commit a2f2cff253d2f2e4db8dc1c00c0193ad3d280621
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Mon Oct 3 17:53:40 2016 +0300
releasing package 389-ds-base version 1.3.4.14-2
diff --git a/debian/changelog b/debian/changelog
index 975a36f..e6df681 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-389-ds-base (1.3.4.14-2) UNRELEASED; urgency=medium
+389-ds-base (1.3.4.14-2) unstable; urgency=medium
* tests: Add simple autopkgtests.
* postinst: Start instances after offline update.
* control, rules: Drop -dbg packages.
* control: Drop conflicts on slapd. (Closes: #822532)
- -- Timo Aaltonen <tjaalton at debian.org> Mon, 26 Sep 2016 15:12:31 +0300
+ -- Timo Aaltonen <tjaalton at debian.org> Mon, 03 Oct 2016 17:53:26 +0300
389-ds-base (1.3.4.14-1) unstable; urgency=medium
commit 9155d529a2b7f282295108c864ec428928d2ca34
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Mon Oct 3 17:53:22 2016 +0300
control: Drop conflicts on slapd. (Closes: #822532)
diff --git a/debian/changelog b/debian/changelog
index 7ecbbcf..975a36f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@
* tests: Add simple autopkgtests.
* postinst: Start instances after offline update.
* control, rules: Drop -dbg packages.
+ * control: Drop conflicts on slapd. (Closes: #822532)
-- Timo Aaltonen <tjaalton at debian.org> Mon, 26 Sep 2016 15:12:31 +0300
diff --git a/debian/control b/debian/control
index 7dd0dde..82dea7a 100644
--- a/debian/control
+++ b/debian/control
@@ -100,7 +100,6 @@ Depends:
systemd,
${misc:Depends},
${shlibs:Depends},
-Conflicts: slapd
Breaks: dirsrv, libdirsrv-dev, libdirsrv0
Replaces: dirsrv, libdirsrv-dev, libdirsrv0
Description: 389 Directory Server suite - server
commit f9bfacd90d728dcccaf45520682762386b395cd7
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Mon Oct 3 17:52:46 2016 +0300
control, rules: Drop -dbg packages.
diff --git a/debian/changelog b/debian/changelog
index 9a0510b..7ecbbcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@
* tests: Add simple autopkgtests.
* postinst: Start instances after offline update.
+ * control, rules: Drop -dbg packages.
-- Timo Aaltonen <tjaalton at debian.org> Mon, 26 Sep 2016 15:12:31 +0300
diff --git a/debian/control b/debian/control
index 3a43af1..7dd0dde 100644
--- a/debian/control
+++ b/debian/control
@@ -64,22 +64,6 @@ Description: 389 Directory Server suite - libraries
.
This package contains core libraries for the 389 Directory Server.
-Package: 389-ds-base-libs-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
-Depends: 389-ds-base-libs (= ${binary:Version}), ${misc:Depends}
-Description: 389 Directory Server suite - library debugging symbols
- Based on the Lightweight Directory Access Protocol (LDAP), the 389
- Directory Server is designed to manage large directories of users and
- resources robustly and scalably.
- .
- This package provides detached debugging information for the 389
- Directory Server libraries. It is useful primarily to permit better
- backtraces and crash dump analysis after problems with the libraries.
- GDB will find this debug information automatically.
-
Package: 389-ds-base-dev
Section: libdevel
Architecture: any
@@ -135,17 +119,3 @@ Description: 389 Directory Server suite - server
* on-line, zero downtime update of schema, configuration, and
in-tree Access Control Information.
-Package: 389-ds-base-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: 389-ds-base (= ${binary:Version}), ${misc:Depends}
-Description: 389 Directory Server suite - server debugging symbols
- Based on the Lightweight Directory Access Protocol (LDAP), the 389
- Directory Server is designed to manage large directories of users and
- resources robustly and scalably.
- .
- This package provides detached debugging information for the 389
- Directory Server. It is useful primarily to permit better backtraces
- and crash dump analysis after problems with the libraries.
- GDB will find this debug information automatically.
diff --git a/debian/rules b/debian/rules
index c6e32d7..5cfdfba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,9 +88,5 @@ override_dh_install:
override_dh_systemd_enable:
dh_systemd_enable -p389-ds-base --no-enable dirsrv-snmp.service
-override_dh_strip:
- dh_strip -p389-ds-base-libs --dbg-package=389-ds-base-libs-dbg
- dh_strip -p389-ds-base --dbg-package=389-ds-base-dbg
-
override_dh_shlibdeps:
dh_shlibdeps -l"debian/389-ds-base/usr/lib/$(DEB_HOST_MULTIARCH)/dirsrv" -a
commit 2d32222b43e0cc2d1c754b7b0c096c1f8873351b
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Mon Oct 3 17:42:00 2016 +0300
postinst: Start instances after offline update.
diff --git a/debian/389-ds-base.postinst b/debian/389-ds-base.postinst
index 3955570..5aaf903 100644
--- a/debian/389-ds-base.postinst
+++ b/debian/389-ds-base.postinst
@@ -5,7 +5,7 @@ set -e
CONFIG_DIR=/etc/dirsrv
OUT=/dev/null
-INSTANCES=`ls -d /etc/dirsrv/slapd-* 2>/dev/null | grep -v removed | sed 's/.*-//'`
+INSTANCES=`ls -d /etc/dirsrv/slapd-* 2>/dev/null | grep -v removed | sed 's/.*slapd-//'`
if [ "$1" = configure ]; then
# lets give them a user/group in all cases.
@@ -22,10 +22,16 @@ if [ "$1" = configure ]; then
if [ -n "$2" ]; then
for inst in $INSTANCES; do
- service dirsrv at inst stop > $OUT 2>&1
+ service dirsrv@$inst stop > $OUT 2>&1
done
+
setup-ds -l $OUT -u -s General.UpdateMode=offline > $OUT 2>&1
- # instances are started below
+
+ if [ $? = 0 ]; then
+ for inst in $INSTANCES; do
+ service dirsrv@$inst start > $OUT 2>&1
+ done
+ fi
fi
fi
diff --git a/debian/changelog b/debian/changelog
index c68e938..9a0510b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
389-ds-base (1.3.4.14-2) UNRELEASED; urgency=medium
* tests: Add simple autopkgtests.
+ * postinst: Start instances after offline update.
-- Timo Aaltonen <tjaalton at debian.org> Mon, 26 Sep 2016 15:12:31 +0300
commit 5398f80b8710961901fca9f4d9917655c2087da2
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Mon Oct 3 11:19:18 2016 +0300
tests: Add simple autopkgtests.
diff --git a/debian/changelog b/debian/changelog
index be6c2f7..c68e938 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+389-ds-base (1.3.4.14-2) UNRELEASED; urgency=medium
+
+ * tests: Add simple autopkgtests.
+
+ -- Timo Aaltonen <tjaalton at debian.org> Mon, 26 Sep 2016 15:12:31 +0300
+
389-ds-base (1.3.4.14-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..603e559
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,5 @@
+Tests: setup
+Depends:
+ 389-ds-base,
+ python-lib389,
+Restrictions: needs-root
diff --git a/debian/tests/setup b/debian/tests/setup
new file mode 100644
index 0000000..e23d910
--- /dev/null
+++ b/debian/tests/setup
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# hack for lxc
+IP=`ip route get 1.1.1.1 | awk '{print $NF; exit}'`
+HOSTNAME=`cat /etc/hosts| grep '127.0.1.1' | awk '{print $NF; exit}'`
+echo "$IP $HOSTNAME.debci $HOSTNAME" >> /etc/hosts
+
+/usr/sbin/setup-ds --silent -- \
+ General.FullMachineName=$HOSTNAME.debci\
+ General.SuiteSpotUserID=dirsrv\
+ General.SuiteSpotGroup=dirsrv\
+ slapd.ServerPort=1389\
+ slapd.ServerIdentifier=debci\
+ slapd.Suffix=dc=example,dc=com\
+ slapd.RootDN="cn=Directory Manager"\
+ slapd.RootDNPwd=Secret123
+
More information about the Pkg-fedora-ds-maintainers
mailing list