Source: isc-kea
Severity: wishlist
Tags: patch
Hi,
Would it be possible to package the new upstream version? I'd be happy to help
if needed, I've already updated the package for work using the attached patch.
Thanks,
Vincent
diff -uNr archive/isc-kea-1.0.0/debian/changelog isc-kea/debian/changelog
--- archive/isc-kea-1.0.0/debian/changelog 2016-07-25 23:03:11.000000000 +0200
+++ isc-kea/debian/changelog 2016-11-15 22:04:56.305994768 +0100
@@ -1,3 +1,26 @@
+isc-kea (1.1.0-1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream release
+ - Refresh patches
+ - Remove debian/patches/fix_gcc6
+ * debian/rules: Use --with autoreconf
+ - Add Build-Depends on dh-autoreconf
+ - Refresh patches to patch Makefile.am, not Makefile.in
+ * debian/control:
+ - Update Vcs fields to use https
+ - Standard-Version 3.9.8
+ - Build-Depends on default-libmysqlclient-dev instead of
+ libmysqlclient-dev
+ - Extend and make consistent all the extended descriptions, fix
+ extended-description-is-probably-too-short
+ - Add Depends on lsb-base for kea-dhcp4-server, kea-dhcp6-server, and
+ kea-dhcp-ddns-server
+ - Build-Depends on libssl1.0-dev
+ * debian/copyright: move debian/* section below *
+
+ -- Vincent Legout <vleg...@debian.org> Tue, 08 Nov 2016 10:41:53 +0100
+
isc-kea (1.0.0-4) unstable; urgency=medium
* debian/rules:
diff -uNr archive/isc-kea-1.0.0/debian/control isc-kea/debian/control
--- archive/isc-kea-1.0.0/debian/control 2016-07-25 22:17:51.000000000 +0200
+++ isc-kea/debian/control 2016-11-15 22:03:37.631460421 +0100
@@ -4,17 +4,17 @@
Maintainer: Adam Majer <ad...@zombino.com>
Build-Depends: debhelper (>= 9), autotools-dev, liblog4cplus-dev,
libboost-dev, libboost-system-dev, bison, flex,
- libmysqlclient-dev, libpq-dev, python3-dev, elinks,
+ default-libmysqlclient-dev, libpq-dev, python3-dev, elinks,
postgresql-server-dev-all,
- xsltproc, docbook, docbook-xsl
-Standards-Version: 3.9.7
+ xsltproc, docbook, docbook-xsl, dh-autoreconf, libssl1.0-dev
+Standards-Version: 3.9.8
Homepage: http://kea.isc.org/
-Vcs-Git: git://anonscm.debian.org/collab-maint/isc-kea.git
-Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/isc-kea.git;a=summary
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/isc-kea.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/isc-kea.git/
Package: kea-dhcp4-server
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kea-common (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, kea-common (= ${binary:Version}), lsb-base (>= 3.0-6)
Suggests: kea-doc
Description: ISC KEA IPv4 DHCP server
KEA is an IPv4 and IPv6 DHCP server developed by Internet Systems Consortium
@@ -24,7 +24,7 @@
Package: kea-dhcp6-server
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kea-common (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, kea-common (= ${binary:Version}), lsb-base (>= 3.0-6)
Suggests: kea-doc
Description: ISC KEA IPv6 DHCP server
KEA is an IPv4 and IPv6 DHCP server developed by Internet Systems Consortium
@@ -34,12 +34,13 @@
Package: kea-dhcp-ddns-server
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kea-common (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, kea-common (= ${binary:Version}), lsb-base (>= 3.0-6)
Suggests: kea-doc
Description: ISC KEA DHCP Dynamic DNS service
- KEA is an IPv4 and IPv6 DHCP server developed by Internet Systems Consortium.
+ KEA is an IPv4 and IPv6 DHCP server developed by Internet Systems Consortium
+ providing a very high-performance with PostgreSQL, MySQL and memfile backends.
.
- This package provides Dynamic DNS service to update DNS mapping based on
+ This package provides Dynamic DNS service to update DNS mapping based on
DHCP lease events.
Package: kea-doc
@@ -47,7 +48,8 @@
Section: doc
Depends: ${misc:Depends}
Description: Documentation for ISC KEA DHCP server
- KEA is an IPv4 and IPv6 DHCP server developed by Internet Systems Consortium.
+ KEA is an IPv4 and IPv6 DHCP server developed by Internet Systems Consortium
+ providing a very high-performance with PostgreSQL, MySQL and memfile backends.
.
This package provides documentation for the DHCP servers.
@@ -56,7 +58,8 @@
Section: admin
Depends: ${shlibs:Depends}, ${misc:Depends}, kea-common (= ${binary:Version})
Description: Administration utilities for ISC KEA DHCP server
- KEA is an IPv4 and IPv6 DHCP server developed by Internet Systems Consortium.
+ KEA is an IPv4 and IPv6 DHCP server developed by Internet Systems Consortium
+ providing a very high-performance with PostgreSQL, MySQL and memfile backends.
.
This package provides backend database initialization and migration
scripts and a DHCP benchmark tool.
@@ -66,7 +69,8 @@
Section: devel
Depends: ${shlibs:Depends}, ${misc:Depends}, kea-common (= ${binary:Version})
Description: Development headers for ISC KEA DHCP server
- KEA is an IPv4 and IPv6 DHCP server developed by Internet Systems Consortium.
+ KEA is an IPv4 and IPv6 DHCP server developed by Internet Systems Consortium
+ providing a very high-performance with PostgreSQL, MySQL and memfile backends.
.
This package provides headers and static libraries of the common ISC KEA
libraries, including libdhcp++
@@ -76,6 +80,7 @@
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Common libraries for the ISC KEA DHCP server
- KEA is an IPv4 and IPv6 DHCP server developed by Internet Systems Consortium.
+ KEA is an IPv4 and IPv6 DHCP server developed by Internet Systems Consortium
+ providing a very high-performance with PostgreSQL, MySQL and memfile backends.
.
This package provides common libraries used by ISC KEA servers and utilities.
diff -uNr archive/isc-kea-1.0.0/debian/copyright isc-kea/debian/copyright
--- archive/isc-kea-1.0.0/debian/copyright 2016-07-25 22:17:51.000000000 +0200
+++ isc-kea/debian/copyright 2016-11-08 11:17:29.938106269 +0100
@@ -2,14 +2,14 @@
Upstream-Name: isc-kea-dhcp-server
Source: http://kea.isc.org
-Files: debian/*
-Copyright: 2016 Adam Majer <ad...@zombino.com>
-License: MPL-2.0
-
Files: *
Copyright: 2014-2015 Internet Systems Consortium, Inc.
License: MPL-2.0
+Files: debian/*
+Copyright: 2016 Adam Majer <ad...@zombino.com>
+License: MPL-2.0
+
Files: src/lib/util/encode/base16_from_binary.h
src/lib/util/encode/base32hex_from_binary.h
src/lib/util/encode/binary_from_base32hex.h
diff -uNr archive/isc-kea-1.0.0/debian/patches/fix_gcc6 isc-kea/debian/patches/fix_gcc6
--- archive/isc-kea-1.0.0/debian/patches/fix_gcc6 2016-07-25 22:53:26.000000000 +0200
+++ isc-kea/debian/patches/fix_gcc6 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-Index: isc-kea/src/lib/dhcpsrv/pgsql_lease_mgr.cc
-===================================================================
---- isc-kea.orig/src/lib/dhcpsrv/pgsql_lease_mgr.cc
-+++ isc-kea/src/lib/dhcpsrv/pgsql_lease_mgr.cc
-@@ -1690,7 +1690,7 @@ PgSqlLeaseMgr::getVersion() const {
-
- PQclear(r);
-
-- return make_pair<uint32_t, uint32_t>(version, minor);
-+ return std::pair<uint32_t, uint32_t>(version, minor);
- }
-
- void
diff -uNr archive/isc-kea-1.0.0/debian/patches/path_fixes isc-kea/debian/patches/path_fixes
--- archive/isc-kea-1.0.0/debian/patches/path_fixes 2016-07-25 22:17:51.000000000 +0200
+++ isc-kea/debian/patches/path_fixes 2016-11-08 10:57:10.662258517 +0100
@@ -1,34 +1,8 @@
-Index: isc-kea/src/lib/dhcpsrv/Makefile.in
-===================================================================
---- isc-kea.orig/src/lib/dhcpsrv/Makefile.in 2016-01-28 00:42:00.765652681 -0600
-+++ isc-kea/src/lib/dhcpsrv/Makefile.in 2016-01-28 00:42:00.761652719 -0600
-@@ -544,7 +544,7 @@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = subdir-objects
- SUBDIRS = . testutils tests
--dhcp_data_dir = @localstatedir@/@PACKAGE@
-+dhcp_data_dir = @localstatedir@/lib/@PACKAGE@
- kea_lfc_location = @prefix@/sbin/kea-lfc
- # Set location of the kea-lfc binary.
- AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib \
-Index: isc-kea/src/lib/log/interprocess/Makefile.in
-===================================================================
---- isc-kea.orig/src/lib/log/interprocess/Makefile.in 2016-01-28 00:42:00.765652681 -0600
-+++ isc-kea/src/lib/log/interprocess/Makefile.in 2016-01-28 00:42:00.761652719 -0600
-@@ -401,7 +401,7 @@
- top_srcdir = @top_srcdir@
- SUBDIRS = . tests
- AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib \
-- -DLOCKFILE_DIR=\"$(localstatedir)/run/$(PACKAGE_NAME)\" \
-+ -DLOCKFILE_DIR=\"$(localstatedir)/run\" \
- $(BOOST_INCLUDES)
- AM_CXXFLAGS = $(KEA_CXXFLAGS)
- CLEANFILES = *.gcno *.gcda
Index: isc-kea/src/lib/log/interprocess/interprocess_sync_file.cc
===================================================================
---- isc-kea.orig/src/lib/log/interprocess/interprocess_sync_file.cc 2016-01-28 00:42:00.765652681 -0600
-+++ isc-kea/src/lib/log/interprocess/interprocess_sync_file.cc 2016-01-28 00:42:00.761652719 -0600
-@@ -48,7 +48,7 @@
+--- isc-kea.orig/src/lib/log/interprocess/interprocess_sync_file.cc
++++ isc-kea/src/lib/log/interprocess/interprocess_sync_file.cc
+@@ -48,7 +48,7 @@ InterprocessSyncFile::do_lock(int cmd, s
lockfile_path = env;
}
@@ -39,9 +13,9 @@
// checks every time a message is logged.
Index: isc-kea/src/lib/dhcpsrv/daemon.cc
===================================================================
---- isc-kea.orig/src/lib/dhcpsrv/daemon.cc 2016-01-28 00:42:00.765652681 -0600
-+++ isc-kea/src/lib/dhcpsrv/daemon.cc 2016-01-28 00:42:00.761652719 -0600
-@@ -28,7 +28,7 @@
+--- isc-kea.orig/src/lib/dhcpsrv/daemon.cc
++++ isc-kea/src/lib/dhcpsrv/daemon.cc
+@@ -28,7 +28,7 @@ namespace dhcp {
Daemon::Daemon()
: signal_set_(), signal_handler_(), config_file_(""), proc_name_(""),
@@ -52,8 +26,8 @@
// This is primarily intended to simplify testing
Index: isc-kea/src/bin/d2/spec_config.h.pre.in
===================================================================
---- isc-kea.orig/src/bin/d2/spec_config.h.pre.in 2016-01-28 00:42:00.765652681 -0600
-+++ isc-kea/src/bin/d2/spec_config.h.pre.in 2016-01-28 00:42:00.761652719 -0600
+--- isc-kea.orig/src/bin/d2/spec_config.h.pre.in
++++ isc-kea/src/bin/d2/spec_config.h.pre.in
@@ -4,4 +4,4 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -62,8 +36,8 @@
+#define D2_SPECFILE_LOCATION "@prefix@/share/kea-dhcp-ddns-server/dhcp-ddns.spec"
Index: isc-kea/src/bin/dhcp4/spec_config.h.pre.in
===================================================================
---- isc-kea.orig/src/bin/dhcp4/spec_config.h.pre.in 2016-01-28 00:42:00.765652681 -0600
-+++ isc-kea/src/bin/dhcp4/spec_config.h.pre.in 2016-01-28 00:42:00.761652719 -0600
+--- isc-kea.orig/src/bin/dhcp4/spec_config.h.pre.in
++++ isc-kea/src/bin/dhcp4/spec_config.h.pre.in
@@ -4,4 +4,4 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -72,20 +46,46 @@
+#define DHCP4_SPECFILE_LOCATION "@prefix@/share/kea-dhcp4-server/dhcp4.spec"
Index: isc-kea/src/bin/dhcp6/spec_config.h.pre.in
===================================================================
---- isc-kea.orig/src/bin/dhcp6/spec_config.h.pre.in 2016-01-28 00:42:00.765652681 -0600
-+++ isc-kea/src/bin/dhcp6/spec_config.h.pre.in 2016-01-28 00:42:00.761652719 -0600
+--- isc-kea.orig/src/bin/dhcp6/spec_config.h.pre.in
++++ isc-kea/src/bin/dhcp6/spec_config.h.pre.in
@@ -4,4 +4,4 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#define DHCP6_SPECFILE_LOCATION "@prefix@/share/@PACKAGE@/dhcp6.spec"
+#define DHCP6_SPECFILE_LOCATION "@prefix@/share/kea-dhcp6/dhcp6.spec"
-Index: isc-kea/doc/guide/Makefile.in
+Index: isc-kea/src/lib/dhcpsrv/Makefile.am
===================================================================
---- isc-kea.orig/doc/guide/Makefile.in 2015-12-28 14:25:52.000000000 -0600
-+++ isc-kea/doc/guide/Makefile.in 2016-01-28 00:43:22.584887938 -0600
-@@ -576,7 +576,7 @@
+--- isc-kea.orig/src/lib/dhcpsrv/Makefile.am
++++ isc-kea/src/lib/dhcpsrv/Makefile.am
+@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
+ SUBDIRS = . testutils tests
+
+-dhcp_data_dir = @localstatedir@/@PACKAGE@
++dhcp_data_dir = @localstatedir@/lib/@PACKAGE@
+ kea_lfc_location = @prefix@/sbin/kea-lfc
+
+ AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib -DDHCP_DATA_DIR="\"$(dhcp_data_dir)\""
+Index: isc-kea/src/lib/log/interprocess/Makefile.am
+===================================================================
+--- isc-kea.orig/src/lib/log/interprocess/Makefile.am
++++ isc-kea/src/lib/log/interprocess/Makefile.am
+@@ -1,7 +1,7 @@
+ SUBDIRS = . tests
+
+ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
+-AM_CPPFLAGS += -DLOCKFILE_DIR=\"$(localstatedir)/run/$(PACKAGE_NAME)\"
++AM_CPPFLAGS += -DLOCKFILE_DIR=\"$(localstatedir)/run\"
+ AM_CPPFLAGS += $(BOOST_INCLUDES)
+
+ AM_CXXFLAGS = $(KEA_CXXFLAGS)
+Index: isc-kea/doc/guide/Makefile.am
+===================================================================
+--- isc-kea.orig/doc/guide/Makefile.am
++++ isc-kea/doc/guide/Makefile.am
+@@ -15,7 +15,7 @@ EXTRA_DIST = $(DOCBOOK)
+ DISTCLEANFILES = $(HTMLDOCS) $(DOCS) kea-messages.xml
kea-messages.xml:
- $(top_srcdir)/tools/system_messages -o $@ \
diff -uNr archive/isc-kea-1.0.0/debian/patches/series isc-kea/debian/patches/series
--- archive/isc-kea-1.0.0/debian/patches/series 2016-07-25 22:40:12.000000000 +0200
+++ isc-kea/debian/patches/series 2016-11-15 22:03:17.271882200 +0100
@@ -2,4 +2,3 @@
fix_typo
fix_pc_paths
support_kfreebsd
-fix_gcc6
diff -uNr archive/isc-kea-1.0.0/debian/patches/support_kfreebsd isc-kea/debian/patches/support_kfreebsd
--- archive/isc-kea-1.0.0/debian/patches/support_kfreebsd 2016-07-25 22:17:51.000000000 +0200
+++ isc-kea/debian/patches/support_kfreebsd 2016-11-08 10:42:43.714147318 +0100
@@ -1,8 +1,8 @@
Index: isc-kea/configure
===================================================================
---- isc-kea.orig/configure 2016-03-01 00:18:59.277551067 -0600
-+++ isc-kea/configure 2016-03-01 00:18:59.273551106 -0600
-@@ -16008,7 +16008,7 @@
+--- isc-kea.orig/configure
++++ isc-kea/configure
+@@ -16075,7 +16075,7 @@ $as_echo "OS X >= 10.9" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
;;
@@ -11,7 +11,7 @@
# On FreeBSD10.1 pthread_cond_destroy doesn't work as documented, which
# causes the CondVarTest.destroyWhileWait test to fail. According to the
# pthread_cond_destroy documentation for FreeBSD, this function should
-@@ -16707,7 +16707,7 @@
+@@ -16774,7 +16774,7 @@ $as_echo "#define OS_OSX 1" >>confdefs.h
BSD_TYPE="OSX"
CPPFLAGS="$CPPFLAGS -DOS_BSD"
;;
diff -uNr archive/isc-kea-1.0.0/debian/rules isc-kea/debian/rules
--- archive/isc-kea-1.0.0/debian/rules 2016-07-25 22:22:34.000000000 +0200
+++ isc-kea/debian/rules 2016-11-08 10:47:12.350047373 +0100
@@ -17,7 +17,7 @@
export DEB_CXXFLAGS_MAINT_STRIP = -O2
%:
- dh $@ --with autotools-dev --parallel -B
+ dh $@ --with autotools-dev --with autoreconf --parallel -B
override_dh_auto_configure:
cat debian/conffiles.md5 | md5sum -c --status
