Codebase list isc-kea / 70edd20
Rebase patches for Kea 1.5.0 Gbp-Dch: ignore Ondřej Surý 5 years ago
9 changed file(s) with 72 addition(s) and 144 deletion(s). Raw diff Collapse all Expand all
+17
-0
debian/patches/0001-fix_typo less more
0 From: Adam Majer <adamm@zombino.com>
1 Date: Fri, 13 Jul 2018 17:06:51 +0000
2 Subject: fix_typo
3
4 ---
5 src/bin/keactrl/keactrl.in | 1 -
6 1 file changed, 1 deletion(-)
7
8 diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in
9 index 9869bc3..a229c68 100644
10 --- a/src/bin/keactrl/keactrl.in
11 +++ b/src/bin/keactrl/keactrl.in
12 @@ -549,4 +549,3 @@ ${args}" 1
13 log_error "Invalid command: ${command}."
14 exit 1 ;;
15 esac
16 -fi
+30
-0
debian/patches/0002-support_kfreebsd less more
0 From: Adam Majer <adamm@zombino.com>
1 Date: Fri, 13 Jul 2018 17:06:51 +0000
2 Subject: support_kfreebsd
3
4 ---
5 configure.ac | 4 ++--
6 1 file changed, 2 insertions(+), 2 deletions(-)
7
8 diff --git a/configure.ac b/configure.ac
9 index c880b77..188c512 100644
10 --- a/configure.ac
11 +++ b/configure.ac
12 @@ -404,7 +404,7 @@ case "$host" in
13 [AC_MSG_RESULT([OS X >= 10.9])
14 kea_undefined_pthread_behavior=yes])
15 ;;
16 -*-freebsd*)
17 +*-freebsd*|*-kfreebsd*)
18 # On FreeBSD10.1 pthread_cond_destroy doesn't work as documented, which
19 # causes the CondVarTest.destroyWhileWait test to fail. According to the
20 # pthread_cond_destroy documentation for FreeBSD, this function should
21 @@ -527,7 +527,7 @@ case $host in
22 BSD_TYPE="OSX"
23 CPPFLAGS="$CPPFLAGS -DOS_BSD"
24 ;;
25 - *-freebsd*)
26 + *-freebsd*|*-kfreebsd*)
27 AC_DEFINE([OS_BSD], [1], [Running on BSD?])
28 AC_DEFINE([OS_FREEBSD], [1], [Running on FreeBSD?])
29 OS_TYPE="BSD"
+22
-0
debian/patches/0003-kea_admin_fix less more
0 From: Kea <isc-kea@packages.debian.org>
1 Date: Tue, 19 Feb 2019 12:39:35 +0000
2 Subject: kea_admin_fix
3
4 Removed the fallback to the build version of kea-admin since it will not exist on users hosts.
5 ---
6 src/bin/admin/kea-admin.in | 2 --
7 1 file changed, 2 deletions(-)
8
9 diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
10 index 3d391df..dcb8bff 100644
11 --- a/src/bin/admin/kea-admin.in
12 +++ b/src/bin/admin/kea-admin.in
13 @@ -37,8 +37,6 @@ dump_qry=""
14 # use build version if it isn't.
15 if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
16 . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
17 -else
18 - . @abs_top_srcdir@/src/bin/admin/admin-utils.sh
19 fi
20
21 # Prints out usage version.
+0
-16
debian/patches/fix_pc_paths less more
0 From: Adam Majer <adamm@zombino.com>
1 Date: Fri, 13 Jul 2018 17:06:51 +0000
2 Subject: fix_pc_paths
3
4 ---
5 dns++.pc.in | 2 +-
6 1 file changed, 1 insertion(+), 1 deletion(-)
7
8 --- a/dns++.pc.in
9 +++ b/dns++.pc.in
10 @@ -8,4 +8,4 @@
11 Version: @PACKAGE_VERSION@
12 Requires: @CRYPTO_PACKAGE@
13 Cflags: -I${includedir}/@PACKAGE_NAME@
14 -Libs: -L${libdir} -lb10-dns++ -lb10-cryptolink -lb10-util -lb10-exceptions -lm
15 +Libs: -L${libdir} -lkea-dns++ -lkea-cryptolink -lkea-util -lkea-exceptions -lm
+0
-15
debian/patches/fix_typo less more
0 From: Adam Majer <adamm@zombino.com>
1 Date: Fri, 13 Jul 2018 17:06:51 +0000
2 Subject: fix_typo
3
4 ---
5 src/bin/keactrl/keactrl.in | 1 -
6 1 file changed, 1 deletion(-)
7
8 --- a/src/bin/keactrl/keactrl.in
9 +++ b/src/bin/keactrl/keactrl.in
10 @@ -461,4 +461,3 @@
11 log_error "Invalid command: ${command}."
12 exit 1 ;;
13 esac
14 -fi
+0
-14
debian/patches/kea_admin_fix less more
0 Removed the fallback to the build version of kea-admin since it will not exist on users hosts.
1 Index: isc-kea/src/bin/admin/kea-admin.in
2 ===================================================================
3 --- isc-kea.orig/src/bin/admin/kea-admin.in
4 +++ isc-kea/src/bin/admin/kea-admin.in
5 @@ -35,8 +35,6 @@ dump_qry=""
6 # use build version if it isn't.
7 if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
8 . @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh
9 -else
10 - . @abs_top_srcdir@/src/bin/admin/admin-utils.sh
11 fi
12
13 # Prints out usage version.
+0
-55
debian/patches/path_fixes less more
0 From: Adam Majer <adamm@zombino.com>
1 Date: Fri, 13 Jul 2018 17:06:51 +0000
2 Subject: path_fixes
3
4 ---
5 src/lib/dhcpsrv/Makefile.in | 2 +-
6 src/lib/dhcpsrv/daemon.cc | 2 +-
7 src/lib/log/interprocess/Makefile.in | 2 +-
8 src/lib/log/interprocess/interprocess_sync_file.cc | 2 +-
9 4 files changed, 4 insertions(+), 4 deletions(-)
10
11 --- a/src/lib/dhcpsrv/Makefile.in
12 +++ b/src/lib/dhcpsrv/Makefile.in
13 @@ -657,7 +657,7 @@
14 top_srcdir = @top_srcdir@
15 AUTOMAKE_OPTIONS = subdir-objects
16 SUBDIRS = . testutils tests benchmarks
17 -dhcp_data_dir = @localstatedir@/@PACKAGE@
18 +dhcp_data_dir = @localstatedir@/lib/@PACKAGE@
19 kea_lfc_location = @prefix@/sbin/kea-lfc
20 # Set location of the kea-lfc binary.
21 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib \
22 --- a/src/lib/dhcpsrv/daemon.cc
23 +++ b/src/lib/dhcpsrv/daemon.cc
24 @@ -29,7 +29,7 @@
25
26 Daemon::Daemon()
27 : signal_set_(), signal_handler_(), config_file_(""), proc_name_(""),
28 - pid_file_dir_(DHCP_DATA_DIR), pid_file_(), am_file_author_(false) {
29 + pid_file_dir_("/var/run"), pid_file_(), am_file_author_(false) {
30
31 // The pid_file_dir can be overridden via environment variable
32 // This is primarily intended to simplify testing
33 --- a/src/lib/log/interprocess/Makefile.in
34 +++ b/src/lib/log/interprocess/Makefile.in
35 @@ -418,7 +418,7 @@
36 top_srcdir = @top_srcdir@
37 SUBDIRS = . tests
38 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib \
39 - -DLOCKFILE_DIR=\"$(localstatedir)/run/$(PACKAGE_NAME)\" \
40 + -DLOCKFILE_DIR=\"$(localstatedir)/run\" \
41 $(BOOST_INCLUDES)
42 AM_CXXFLAGS = $(KEA_CXXFLAGS)
43 CLEANFILES = *.gcno *.gcda
44 --- a/src/lib/log/interprocess/interprocess_sync_file.cc
45 +++ b/src/lib/log/interprocess/interprocess_sync_file.cc
46 @@ -50,7 +50,7 @@
47 lockfile_path = env;
48 }
49
50 - lockfile_path += "/" + task_name_ + "_lockfile";
51 + lockfile_path += "/isc_kea_" + task_name_ + "_lockfile";
52
53 // Open the lockfile in the constructor so it doesn't do the access
54 // checks every time a message is logged.
+3
-3
debian/patches/series less more
0 fix_typo
1 support_kfreebsd
2 kea_admin_fix
0 0001-fix_typo
1 0002-support_kfreebsd
2 0003-kea_admin_fix
+0
-41
debian/patches/support_kfreebsd less more
0 From: Adam Majer <adamm@zombino.com>
1 Date: Fri, 13 Jul 2018 17:06:51 +0000
2 Subject: support_kfreebsd
3
4 ---
5 configure | 4 ++--
6 configure.ac | 2 +-
7 2 files changed, 3 insertions(+), 3 deletions(-)
8
9 --- a/configure.ac
10 +++ b/configure.ac
11 @@ -7,7 +7,10 @@
12 # For GIT versions, this is x.y.z-git, where x.y.z denotes the software
13 # version that was used as a base + changes that were made later, but
14 # are not released yet.
15 -AC_INIT(kea,1.4.0, kea-dev@lists.isc.org)
16 +# For patch releases, this is x.y.x-Pn, where x.y.z denotes the release
17 +# that was used as the base and n is the patch number. Patchlevel
18 +# counts from 1.
19 +AC_INIT(kea,1.4.0-P1, kea-dev@lists.isc.org)
20 AC_CONFIG_SRCDIR(README)
21
22 # serial-tests is not available in automake version before 1.13, so
23 @@ -396,7 +399,7 @@
24 [AC_MSG_RESULT([OS X >= 10.9])
25 kea_undefined_pthread_behavior=yes])
26 ;;
27 -*-freebsd*)
28 +*-freebsd*|*-kfreebsd*)
29 # On FreeBSD10.1 pthread_cond_destroy doesn't work as documented, which
30 # causes the CondVarTest.destroyWhileWait test to fail. According to the
31 # pthread_cond_destroy documentation for FreeBSD, this function should
32 @@ -519,7 +522,7 @@
33 BSD_TYPE="OSX"
34 CPPFLAGS="$CPPFLAGS -DOS_BSD"
35 ;;
36 - *-freebsd*)
37 + *-freebsd*|*-kfreebsd*)
38 AC_DEFINE([OS_BSD], [1], [Running on BSD?])
39 AC_DEFINE([OS_FREEBSD], [1], [Running on FreeBSD?])
40 OS_TYPE="BSD"