Control: block -1 by 763766
Hi,
On Tue, 8 Jul 2014 00:11:09 +0300 Peter Pentchev <r...@ringlet.net> wrote:
> I've also attached a new version of the patch that adds build-time
> support for the "stage1" build profile (no <!profile.stage1> yet) that
> has been rebased onto the new version of the master branch; it is also
> available from
> https://gitorious.org/roam-debian-bootstrap/krb5-debian/commits/roam-stage1-build-3
> I'll send the full control profile syntax one to the other bug right
> away.
the syntax for the Build-Profiles field was changed during the bootstrap
sprint in paris [1,2]. Attached patch is updated to reflect those changes.
As the patch requires debhelper to understand the new syntax, this bug is
blocked by that bug in debhelper.
In contrast to the patch for #752409 (which is marked as block by this bug)
this patch does use the new build profile syntax in the Build-Depends field and
thus can be applied before Jessie is released.
cheers, josch
[1] https://wiki.debian.org/Sprints/2014/BootstrapSprint
[2] https://wiki.debian.org/BuildProfileSpec
diff -Nru krb5-1.13~alpha1+dfsg/debian/changelog krb5-1.13~alpha1+dfsg/debian/changelog
--- krb5-1.13~alpha1+dfsg/debian/changelog 2014-09-12 00:02:46.000000000 +0200
+++ krb5-1.13~alpha1+dfsg/debian/changelog 2014-10-07 11:50:36.000000000 +0200
@@ -1,3 +1,14 @@
+krb5 (1.13~alpha1+dfsg-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * While building, check the DEB_BUILD_PROFILES variable for "stage1" and, if
+ found, disable the LDAP functionality and skip the LDAP-related parts of
+ the build and installation. Add build profile annotations to debian/control.
+ Based on patch by Peter Pentchev
+ Closes: #752407
+
+ -- Johannes Schauer <j.scha...@email.de> Tue, 07 Oct 2014 11:41:41 +0200
+
krb5 (1.13~alpha1+dfsg-1) experimental; urgency=low
[ Jelmer Vernooij ]
diff -Nru krb5-1.13~alpha1+dfsg/debian/control krb5-1.13~alpha1+dfsg/debian/control
--- krb5-1.13~alpha1+dfsg/debian/control 2014-09-12 00:02:46.000000000 +0200
+++ krb5-1.13~alpha1+dfsg/debian/control 2014-10-07 11:49:59.000000000 +0200
@@ -1,7 +1,8 @@
Source: krb5
Section: net
Priority: standard
-Build-Depends: debhelper (>= 8.1.3), byacc | bison,
+# For stage1 builds, remove the libldap2-dev dependency.
+Build-Depends: debhelper (>= 9.FIXME), byacc | bison,
comerr-dev, docbook-to-man, doxygen,
libkeyutils-dev [linux-any], libldap2-dev,
libncurses5-dev, libssl-dev, ss-dev,
@@ -56,6 +57,7 @@
Package: krb5-kdc-ldap
Architecture: any
Priority: extra
+Build-Profiles: <!stage1>
Depends: ${misc:Depends}, ${shlibs:Depends}, krb5-kdc (= ${binary:Version})
Description: MIT Kerberos key server (KDC) LDAP plugin
Kerberos is a system for authenticating users and services on a network.
diff -Nru krb5-1.13~alpha1+dfsg/debian/rules krb5-1.13~alpha1+dfsg/debian/rules
--- krb5-1.13~alpha1+dfsg/debian/rules 2014-09-12 00:02:46.000000000 +0200
+++ krb5-1.13~alpha1+dfsg/debian/rules 2014-10-07 11:41:32.000000000 +0200
@@ -51,6 +51,16 @@
LIB_PACKAGES = libkrb5-3 libgssapi-krb5-2 libkadm5clnt-mit9 libkadm5srv-mit9 libkdb5-8 libgssrpc4 \
libkrb5support0 libk5crypto3 libkrad0
+ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
+KRB5_SKIP_LDAP= 1
+endif
+
+ifeq (,$(KRB5_SKIP_LDAP))
+CONFIGURE_LDAP= --with-ldap
+else
+CONFIGURE_LDAP= --without-ldap
+endif
+
# We touch each configure and Autoconf-related file so that we do not attempt
# to use Autoconf. The cache is used by the Embdebian project for cross
# compiles.
@@ -66,7 +76,7 @@
cd build && $(FLAGS) ../src/configure \
--prefix=/usr --localstatedir=/etc --mandir=/usr/share/man \
--with-system-et --with-system-ss --disable-rpath \
- --enable-shared --with-ldap --without-tcl \
+ --enable-shared $(CONFIGURE_LDAP) --without-tcl \
--with-system-verto \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--sysconfdir=/etc \
@@ -114,11 +124,15 @@
cd build && $(MAKE) install DESTDIR=`pwd`/../debian/tmp
install -d $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/krb5 $(CURDIR)/debian/tmp/etc/insserv/overrides
+ifeq (,$(KRB5_SKIP_LDAP))
install -m644 debian/krb5-kdc-ldap.insserv-override debian/tmp/etc/insserv/overrides/krb5-kdc
- install -m644 $(CURDIR)/debian/README.mech.d $(CURDIR)/debian/libgssapi-krb5-2/etc/gss/mech.d/README
mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libkdb_ldap* \
$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/krb5/
rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/krb5/libkdb_ldap*.so
+else
+ rm -f $(CURDIR)/debian/tmp/usr/share/man/man8/kdb5_ldap_util.8
+endif
+ install -m644 $(CURDIR)/debian/README.mech.d $(CURDIR)/debian/libgssapi-krb5-2/etc/gss/mech.d/README
mv $(CURDIR)/debian/tmp/usr/bin/krb5-config \
$(CURDIR)/debian/tmp/usr/bin/krb5-config.mit
mv $(CURDIR)/debian/tmp/usr/share/man/man1/krb5-config.1 \
