Source: openldap
Version: 2.4.48+dfsg-1
Severity: minor
Tags: patch
openldap has implemented a "stage1" build profile to help bootstrapping
architectures. Unfortunately, "stage1" is only meaningful when you look
at many packages. You cannot easily tell what it means for openldap just
by looking at openldap. We have since implemented a number of standard
profile names. The most common ones disable language bindings (e.g.
"nopython"). However, none of the established ones seem a good fit for
openldap. I'm therefore proposing a custom profile name
"pkg.openldap.nodaemon" here. Just reading the name should make it
obvious, what this profile does. I've attached a patch implementing this
rename. Please consider applying it if you agree with my proposal.
Otherwise, let's talk about a better name. In any case, we want to stop
using "stage1" as much as possible to enable building whole package sets
with the same set of profiles, but "stage1" doesn't have uniform meaning
across packages.
Helmut
diff --minimal -Nru openldap-2.4.48+dfsg/debian/changelog
openldap-2.4.48+dfsg/debian/changelog
--- openldap-2.4.48+dfsg/debian/changelog 2019-07-25 17:32:00.000000000
+0200
+++ openldap-2.4.48+dfsg/debian/changelog 2020-01-24 06:24:45.000000000
+0100
@@ -1,3 +1,10 @@
+openldap (2.4.48+dfsg-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename stage1 build profileto pkg.openldap.nodaemon. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 24 Jan 2020 06:24:45 +0100
+
openldap (2.4.48+dfsg-1) unstable; urgency=medium
* New upstream release.
diff --minimal -Nru openldap-2.4.48+dfsg/debian/control
openldap-2.4.48+dfsg/debian/control
--- openldap-2.4.48+dfsg/debian/control 2019-07-25 02:14:43.000000000 +0200
+++ openldap-2.4.48+dfsg/debian/control 2020-01-24 06:22:47.000000000 +0100
@@ -8,17 +8,17 @@
Build-Depends: debhelper (>= 10),
dpkg-dev (>= 1.17.14),
groff-base,
- heimdal-multidev (>= 7.4.0.dfsg.1-1~) <!stage1>,
- libdb5.3-dev <!stage1>,
+ heimdal-multidev (>= 7.4.0.dfsg.1-1~) <!pkg.openldap.nodaemon>,
+ libdb5.3-dev <!pkg.openldap.nodaemon>,
libgnutls28-dev,
- libltdl-dev <!stage1>,
- libperl-dev (>= 5.8.0) <!stage1>,
+ libltdl-dev <!pkg.openldap.nodaemon>,
+ libperl-dev (>= 5.8.0) <!pkg.openldap.nodaemon>,
libsasl2-dev,
- libwrap0-dev <!stage1>,
- nettle-dev <!stage1>,
+ libwrap0-dev <!pkg.openldap.nodaemon>,
+ nettle-dev <!pkg.openldap.nodaemon>,
perl:any,
po-debconf,
- unixodbc-dev <!stage1>
+ unixodbc-dev <!pkg.openldap.nodaemon>
Build-Conflicts: libbind-dev, bind-dev, libicu-dev, autoconf2.13
Standards-Version: 4.4.0
Homepage: http://www.openldap.org/
@@ -28,7 +28,7 @@
Package: slapd
Architecture: any
-Build-Profiles: <!stage1>
+Build-Profiles: <!pkg.openldap.nodaemon>
Pre-Depends: debconf (>= 0.5) | debconf-2.0, ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, libldap-2.4-2 (= ${binary:Version}),
coreutils (>= 4.5.1-1), psmisc, perl (>> 5.8.0) | libmime-base64-perl,
@@ -46,7 +46,7 @@
Package: slapd-contrib
Architecture: any
-Build-Profiles: <!stage1>
+Build-Profiles: <!pkg.openldap.nodaemon>
Depends: slapd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Provides: slapd-smbk5pwd
Breaks: slapd-smbk5pwd (<< 2.4.47+dfsg-2~)
@@ -59,7 +59,7 @@
Package: slapd-smbk5pwd
Architecture: all
Section: oldlibs
-Build-Profiles: <!stage1>
+Build-Profiles: <!pkg.openldap.nodaemon>
Depends: slapd-contrib, ${misc:Depends}
Breaks: slapd (<< 2.4.47+dfsg-2~)
Description: transitional package for slapd-contrib
@@ -118,7 +118,7 @@
Package: slapi-dev
Section: libdevel
Architecture: any
-Build-Profiles: <!stage1>
+Build-Profiles: <!pkg.openldap.nodaemon>
Depends: slapd (= ${binary:Version}), ${misc:Depends}
Description: development libraries for OpenLDAP SLAPI plugin interface
This package allows development of plugins for the OpenLDAP slapd server
diff --minimal -Nru openldap-2.4.48+dfsg/debian/rules
openldap-2.4.48+dfsg/debian/rules
--- openldap-2.4.48+dfsg/debian/rules 2019-07-25 02:14:43.000000000 +0200
+++ openldap-2.4.48+dfsg/debian/rules 2020-01-24 06:24:41.000000000 +0100
@@ -17,7 +17,7 @@
ifeq ($(DEB_HOST_ARCH_OS),hurd)
CONFIG += --disable-bdb --disable-hdb --disable-mdb
endif
-ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
+ifneq ($(filter pkg.openldap.nodaemon,$(DEB_BUILD_PROFILES)),)
CONFIG += --disable-slapd
endif
@@ -110,7 +110,7 @@
override_dh_auto_build:
dh_auto_build -- $(MAKEVARS)
-ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
+ifeq ($(filter pkg.openldap.nodaemon,$(DEB_BUILD_PROFILES)),)
for mod in $(CONTRIB_MODULES); do \
dh_auto_build -Dcontrib/slapd-modules/$$mod
-Bcontrib/slapd-modules/$$mod -- $(CONTRIB_MAKEVARS) || exit $$?; \
done
@@ -125,7 +125,7 @@
override_dh_auto_install:
dh_auto_install -- $(MAKEVARS)
-ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
+ifeq ($(filter pkg.openldap.nodaemon,$(DEB_BUILD_PROFILES)),)
for mod in $(CONTRIB_MODULES); do \
dh_auto_install -Dcontrib/slapd-modules/$$mod
-Bcontrib/slapd-modules/$$mod -- $(CONTRIB_MAKEVARS) || exit $$?; \
done
@@ -158,7 +158,7 @@
override_dh_installinit:
dh_installinit -- "defaults 19 80"
-ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
+ifeq ($(filter pkg.openldap.nodaemon,$(DEB_BUILD_PROFILES)),)
override_dh_installman:
dh_installman
rm -f $(CURDIR)/debian/slapd/usr/share/man/man5/slapo-smbk5pwd.*
@@ -170,11 +170,9 @@
override_dh_strip:
dh_strip -plibldap-2.4-2 --dbgsym-migration='libldap-2.4-2-dbg (<<
2.4.45+dfsg-1~)'
-ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
dh_strip -pslapd --dbgsym-migration='slapd-dbg (<< 2.4.45+dfsg-1~)'
-endif
dh_strip --remaining-packages
-ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
+ifeq ($(filter pkg.openldap.nodaemon,$(DEB_BUILD_PROFILES)),)
# hardlink these so not confined by apparmor; do this here and not
# in dh_link so that dh_strip doesn't get confused and put the wrong
# binary in the debug package.
@@ -189,17 +187,17 @@
done
dh_link
+ifeq ($(filter pkg.openldap.nodaemon,$(DEB_BUILD_PROFILES)),)
override_dh_makeshlibs:
-ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
echo "slapd:Provides=$$(objdump -p
debian/slapd/usr/lib/$(DEB_HOST_MULTIARCH)/libslapi-*.so.* \
| sed -ne '/SONAME/ { s/[[:space:]]*SONAME[[:space:]]*//; \
s/\.so\./-/; p; q }' \
)" >> debian/slapd.substvars
dh_makeshlibs -pslapd -X/usr/lib/ldap/ -V "$$(sed
-ne's/slapd:Provides=//p' debian/slapd.substvars)"
-endif
dh_makeshlibs --remaining-packages
+endif
-ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
+ifeq ($(filter pkg.openldap.nodaemon,$(DEB_BUILD_PROFILES)),)
override_dh_installdeb:
dh_installdeb
perl -w debian/dh_installscripts-common -p slapd
@@ -209,7 +207,7 @@
dh_auto_clean
# Update translation templates for debconf
debconf-updatepo
-ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
+ifeq ($(filter pkg.openldap.nodaemon,$(DEB_BUILD_PROFILES)),)
# Remove our stripped schema from the upstream source area.
if [ -z "$(DFSG_NONFREE)" ]; then \
set -e; for s in debian/schema/*.schema debian/schema/*.ldif; do \
