[pkg-dhcp-commits] [isc-dhcp] 01/01: release 4.3.1-5
Michael Gilbert
mgilbert at moszumanska.debian.org
Mon Dec 15 00:03:14 UTC 2014
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository isc-dhcp.
commit 33376299f0e35416aefc45eb0eb8f1998db68800
Author: Michael Gilbert <mgilbert at debian.org>
Date: Mon Dec 15 00:02:48 2014 +0000
release 4.3.1-5
---
debian/changelog | 6 +++
debian/control | 6 +--
debian/patches/series | 2 +
debian/patches/system-bind.patch | 102 +++++++++++++++++++++++++++++++++++++++
debian/rules | 16 +++---
5 files changed, 118 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fc2ca60..4fd1f35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+isc-dhcp (4.3.1-5) unstable; urgency=medium
+
+ * Dynamically link against system bind libraries.
+
+ -- Michael Gilbert <mgilbert at debian.org> Thu, 16 Oct 2014 01:28:44 +0000
+
isc-dhcp (4.3.1-4) unstable; urgency=medium
* Bump standards to 3.9.6.
diff --git a/debian/control b/debian/control
index 199bf7b..6d383ce 100644
--- a/debian/control
+++ b/debian/control
@@ -8,11 +8,11 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-dhcp/isc-dhcp.git;a=summary
Homepage: http://www.isc.org
Build-Depends:
groff,
- quilt,
pkg-config,
po-debconf,
libssl-dev,
libldap2-dev,
+ libbind-export-dev (>= 1:9.9.5.dfsg-4.3),
dh-autoreconf,
debhelper (>= 9),
dpkg-dev (>= 1.13.2),
@@ -47,7 +47,6 @@ Priority: extra
Architecture: any
Depends:
${misc:Depends},
- ${shlibs:Depends},
isc-dhcp-dbg (= ${binary:Version}),
Description: ISC DHCP server for automatic IP address assignment (server debug)
This is the server from the Internet Software Consortium's implementation of
@@ -61,7 +60,6 @@ Priority: extra
Architecture: any
Depends:
${misc:Depends},
- ${shlibs:Depends},
debianutils (>= 2.8.2),
isc-dhcp-common (= ${binary:Version}),
lsb-base,
@@ -151,7 +149,6 @@ Priority: extra
Architecture: any
Depends:
${misc:Depends},
- ${shlibs:Depends},
isc-dhcp-dbg (= ${binary:Version}),
Description: ISC DHCP server for automatic IP address assignment (client debug)
This is the client from the Internet Software Consortium's implementation of
@@ -192,7 +189,6 @@ Priority: extra
Architecture: any
Depends:
${misc:Depends},
- ${shlibs:Depends},
isc-dhcp-dbg (= ${binary:Version}),
Description: ISC DHCP server for automatic IP address assignment (relay debug)
This is the relay from the Internet Software Consortium's implementation of
diff --git a/debian/patches/series b/debian/patches/series
index 68011c9..95856c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@ no-loopback-checksum.patch
fix-exit-hook-manpage.patch
spelling-error.patch
manpage-hyphens.patch
+
+system-bind.patch
diff --git a/debian/patches/system-bind.patch b/debian/patches/system-bind.patch
new file mode 100644
index 0000000..664a8ab
--- /dev/null
+++ b/debian/patches/system-bind.patch
@@ -0,0 +1,102 @@
+description: link against system bind libraries
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/client/Makefile.am
++++ b/client/Makefile.am
+@@ -10,8 +10,8 @@ dhclient_SOURCES = clparse.c dhclient.c
+ scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
+ scripts/netbsd scripts/nextstep scripts/openbsd \
+ scripts/solaris scripts/openwrt
+-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../bind/lib/libirs.a \
+- ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a
++dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a -lirs-export -ldns-export -lisc-export
++
+ man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
+ EXTRA_DIST = $(man_MANS)
+
+--- a/dhcpctl/Makefile.am
++++ b/dhcpctl/Makefile.am
+@@ -6,12 +6,10 @@ EXTRA_DIST = $(man_MANS)
+
+ omshell_SOURCES = omshell.c
+ omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
+- ../bind/lib/libirs.a ../bind/lib/libdns.a \
+- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
++ -lirs-export -ldns-export -lisc-export
+
+ libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
+
+ cltest_SOURCES = cltest.c
+ cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
+- ../bind/lib/libirs.a ../bind/lib/libdns.a \
+- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
++ -lirs-export -ldns-export -lisc-export
+--- a/omapip/Makefile.am
++++ b/omapip/Makefile.am
+@@ -10,6 +10,4 @@ man_MANS = omapi.3
+ EXTRA_DIST = $(man_MANS)
+
+ svtest_SOURCES = test.c
+-svtest_LDADD = libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \
+- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
+-
++svtest_LDADD = libomapi.a -lirs-export -ldns-export -lisc-export
+--- a/relay/Makefile.am
++++ b/relay/Makefile.am
+@@ -3,8 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
+ sbin_PROGRAMS = dhcrelay
+ dhcrelay_SOURCES = dhcrelay.c
+ dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+- ../bind/lib/libirs.a ../bind/lib/libdns.a \
+- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
++ -lirs-export -ldns-export -lisc-export
+ man_MANS = dhcrelay.8
+ EXTRA_DIST = $(man_MANS)
+
+--- a/server/Makefile.am
++++ b/server/Makefile.am
+@@ -14,8 +14,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
+
+ dhcpd_CFLAGS = $(LDAP_CFLAGS)
+ dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+- ../dhcpctl/libdhcpctl.a ../bind/lib/libirs.a \
+- ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a
++ ../dhcpctl/libdhcpctl.a -lirs-export -ldns-export -lisc-export
+
+ man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
+ EXTRA_DIST = $(man_MANS)
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -22,10 +22,9 @@ EXTRA_DIST = RELNOTES LICENSE \
+ doc/devel/arch.dox doc/devel/atf.dox doc/devel/contrib.dox \
+ doc/devel/debug.dox doc/devel/isc-logo.jpg doc/devel/mainpage.dox \
+ doc/devel/omapi.dox doc/devel/qa.dox util/bindvar.sh \
+- bind/Makefile bind/bind.tar.gz bind/version.tmp \
+ common/tests/Atffile server/tests/Atffile
+
+-SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server
++SUBDIRS = includes tests common dst omapip client dhcpctl relay server
+
+ nobase_include_HEADERS = dhcpctl/dhcpctl.h
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -609,9 +609,6 @@ fi
+ # AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) & etc).
+ CFLAGS="$CFLAGS $STD_CWARNINGS"
+
+-# Try to add the bind include directory
+-CFLAGS="$CFLAGS -I$libbind/include"
+-
+ case "$host" in
+ *-darwin*)
+ CFLAGS="$CFLAGS -D__APPLE_USE_RFC_3542" ;;
+@@ -637,8 +634,6 @@ AC_CONFIG_FILES([
+ ])
+ AC_OUTPUT
+
+-sh util/bindvar.sh
+-
+ cat > config.report << END
+
+ ISC DHCP source configure results:
diff --git a/debian/rules b/debian/rules
index 677704c..be0317e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,11 +7,13 @@ DEB_HOST_ARCH_OS=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DHCLIENT_SCRIPT=/sbin/dhclient-script
+
CFLAGS+=-Wall
-CFLAGS+=-D_PATH_DHCLIENT_SCRIPT='"/sbin/dhclient-script"'
+CFLAGS+=-I/usr/include/bind-export
+CFLAGS+=-D_PATH_DHCLIENT_SCRIPT='"$(DHCLIENT_SCRIPT)"'
CFLAGS+=-D_PATH_DHCPD_CONF='"/etc/dhcp/dhcpd.conf"'
CFLAGS+=-D_PATH_DHCLIENT_CONF='"/etc/dhcp/dhclient.conf"'
-CFLAGS+=-DNOMINUM
CONFFLAGS=--prefix=/usr \
--sysconfdir=/etc/dhcp \
@@ -39,10 +41,6 @@ endif
override_dh_auto_configure:
override_dh_auto_build:
- # extract and patch embedded bind
- cd bind && tar xf bind.tar.gz && \
- cd bind-* && test -e ../../debian/bind-patches/series && \
- QUILT_PATCHES=../../debian/bind-patches quilt push -a || true
# ldap-enabled build
test -f Makefile && $(MAKE) distclean || true
./configure --with-ldap --with-ldapcrypto $(CONFFLAGS)
@@ -56,9 +54,9 @@ override_dh_auto_build:
override_dh_install:
dh_install
cp debian/dhclient-script.$(DEB_HOST_ARCH_OS) \
- debian/isc-dhcp-client/sbin/dhclient-script
+ debian/isc-dhcp-client$(DHCLIENT_SCRIPT)
cp debian/dhclient-script.$(DEB_HOST_ARCH_OS).udeb \
- debian/isc-dhcp-client-udeb/sbin/dhclient-script
+ debian/isc-dhcp-client-udeb$(DHCLIENT_SCRIPT)
cp debian/rfc3442-classless-routes.$(DEB_HOST_ARCH_OS) \
debian/isc-dhcp-client/etc/dhcp/dhclient-exit-hooks.d/rfc3442-classless-routes
cp contrib/dhcp-lease-list.pl \
@@ -68,5 +66,5 @@ override_dh_strip:
dh_strip --dbg-package=isc-dhcp-dbg
override_dh_clean:
- cd bind && rm -rf bind-* include lib bindvar.tmp *.log
+ rm -rf bind
dh_clean -- dhcpd config.*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dhcp/isc-dhcp.git
More information about the pkg-dhcp-commits
mailing list