Source: krb5 Version: 1.12.1+dfsg-3 Severity: wishlist Tags: patch Hi,
As promised, here's the second patch that adds build profile annotations to the krb5 debian/control file. It also removes the -N... options in the rules file, thus making the changes a lot smaller. However, it may not be uploaded right now, since the Debian archive does not yet support build profile annotations; it will probably have to wait until Jessie is released. If anything should go wrong with the patch, it is also available at https://gitorious.org/roam-debian-bootstrap/krb5-debian/commits/roam-stage1-control-2 G'luck, Peter -- System Information: Debian Release: jessie/sid APT prefers testing APT policy: (990, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.14-1-amd64 (SMP w/4 CPU cores) Locale: LANG=bg_BG.UTF-8, LC_CTYPE=bg_BG.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
From 290a02d4cbb5c53b98022daafd0108fb2120dcd2 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <r...@ringlet.net>
Date: Mon, 23 Jun 2014 13:08:34 +0300
Subject: [PATCH] Add build profile annotations to debian/control.
Use <!profile.stage1> to drop the LDAP build dependency in the stage1
profile.
Use Build-Profiles: !stage1 instead of -N... to skip building the LDAP
interface package and minimize the changes to the rules file.
---
debian/control | 4 ++--
debian/rules | 57 +++++++++++++++++++++++++++------------------------------
2 files changed, 29 insertions(+), 32 deletions(-)
diff --git a/debian/control b/debian/control
index e94b26b..1ca454f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,9 @@
Source: krb5
Section: net
Priority: standard
-# For stage1 builds, remove the libldap2-dev dependency.
Build-Depends: debhelper (>= 8.1.3), byacc | bison,
comerr-dev, docbook-to-man, doxygen,
- libkeyutils-dev [linux-any], libldap2-dev,
+ libkeyutils-dev [linux-any], libldap2-dev <!profile.stage1>,
libncurses5-dev, libssl-dev, ss-dev,
libverto-dev (>= 0.2.4), pkg-config
build-depends-indep: python-cheetah, python-lxml, python-sphinx, doxygen-latex
@@ -57,6 +56,7 @@ Description: MIT Kerberos key server (KDC)
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 --git a/debian/rules b/debian/rules
index 49ebb20..e359db9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,11 +51,8 @@ EXCLUDE = -Xtmac.doc -Xexamples/krb5 -Xgnats/mit
-Xkrb5-send-pr \
LIB_PACKAGES = libkrb5-3 libgssapi-krb5-2 libkadm5clnt-mit9 libkadm5srv-mit9
libkdb5-7 libgssrpc4 \
libkrb5support0 libk5crypto3 libkrad0
-ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
-DH_EXCLUDE=
-else
+ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
KRB5_SKIP_LDAP= 1
-DH_EXCLUDE= -Nkrb5-kdc-ldap
endif
ifeq (,$(KRB5_SKIP_LDAP))
@@ -144,7 +141,7 @@ endif
install -m644 src/util/ac_check_krb5.m4 \
debian/libkrb5-dev/usr/share/aclocal
- dh_install --sourcedir=debian/tmp --fail-missing $(EXCLUDE)
$(DH_EXCLUDE)
+ dh_install --sourcedir=debian/tmp --fail-missing $(EXCLUDE)
set -e ; find
debian/krb5-multidev/usr/lib/$(DEB_HOST_MULTIARCH)/mit-krb5 -type l -name \*.so
-print |\
while read linkname; do \
ln -s -f ../`readlink $$linkname` \
@@ -178,17 +175,17 @@ binary-indep: DH_OPTIONS=-i
binary-indep: build-indep install
dh_testdir
dh_testroot
- dh_installchangelogs -Xdoc/CHANGES $(DH_EXCLUDE)
- dh_installchangelogs -pkrb5-doc -k $(DH_EXCLUDE) doc/CHANGES
- dh_installdocs $(DH_EXCLUDE)
- dh_installinfo $(DH_EXCLUDE)
- dh_link $(DH_EXCLUDE)
- dh_compress $(DH_EXCLUDE)
- dh_fixperms $(DH_EXCLUDE)
- dh_installdeb $(DH_EXCLUDE)
- dh_gencontrol $(DH_EXCLUDE)
- dh_md5sums $(DH_EXCLUDE)
- dh_builddeb $(DH_EXCLUDE)
+ dh_installchangelogs -Xdoc/CHANGES
+ dh_installchangelogs -pkrb5-doc -k doc/CHANGES
+ dh_installdocs
+ dh_installinfo
+ dh_link
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
# Build architecture-dependent files here.
# Pass -a to all debhelper commands in this target to reduce clutter. Strip
@@ -200,27 +197,27 @@ binary-arch: DH_OPTIONS=-a
binary-arch: build-arch install
dh_testdir
dh_testroot
- dh_installchangelogs -Xdoc/CHANGES $(DH_EXCLUDE)
- dh_installdocs $(DH_EXCLUDE)
- dh_installdebconf $(DH_EXCLUDE)
- dh_installinit $(DH_EXCLUDE) -- defaults 18 18
- dh_lintian $(DH_EXCLUDE)
+ dh_installchangelogs -Xdoc/CHANGES
+ dh_installdocs
+ dh_installdebconf
+ dh_installinit -- defaults 18 18
+ dh_lintian
set -e ; for pkg in $(LIB_PACKAGES) ; do \
DH_OPTIONS="" dh_strip -p$$pkg --dbg-package=libkrb5-dbg; \
DH_OPTIONS="" dh_makeshlibs -p$$pkg
-Xusr/lib/$(DEB_HOST_MULTIARCH)/krb5/plugins -- -c4 ; \
done
- dh_strip $(DH_EXCLUDE)
- dh_link $(DH_EXCLUDE)
- dh_compress $(DH_EXCLUDE)
- dh_fixperms $(DH_EXCLUDE)
+ dh_strip
+ dh_link
+ dh_compress
+ dh_fixperms
chmod u+s debian/krb5-user/usr/bin/ksu
chmod 700 debian/krb5-kdc/var/lib/krb5kdc
chmod 700 debian/krb5-kdc/etc/krb5kdc
- dh_installdeb $(DH_EXCLUDE)
- dh_shlibdeps $(DH_EXCLUDE)
- dh_gencontrol $(DH_EXCLUDE)
- dh_md5sums $(DH_EXCLUDE)
- dh_builddeb $(DH_EXCLUDE)
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean configure binary-indep binary-arch binary install
--
2.0.0
signature.asc
Description: Digital signature
