summaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 12:16:11 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 12:16:11 +0000
commit1bf09aec527f0c817c541a73e0c3ced472a43c85 (patch)
treecbe727460a34fb85da825c61217faac97166e090 /debian/patches
parentAdding debian version 2.4.1-2. (diff)
downloadisc-kea-1bf09aec527f0c817c541a73e0c3ced472a43c85.tar.xz
isc-kea-1bf09aec527f0c817c541a73e0c3ced472a43c85.zip
Adding debian version 2.4.1-3.debian/2.4.1-3debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/0001-support_kfreebsd.patch28
-rw-r--r--debian/patches/0011-kea-ctrl-agent-authentication.patch7
-rw-r--r--debian/patches/series1
3 files changed, 7 insertions, 29 deletions
diff --git a/debian/patches/0001-support_kfreebsd.patch b/debian/patches/0001-support_kfreebsd.patch
deleted file mode 100644
index 123113b..0000000
--- a/debian/patches/0001-support_kfreebsd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Adam Majer <adamm@zombino.com>
-Date: Fri, 13 Jul 2018 17:06:51 +0000
-Subject: support_kfreebsd
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -457,7 +457,7 @@
- [AC_MSG_RESULT([OS X >= 10.9])
- kea_undefined_pthread_behavior=yes])
- ;;
--*-freebsd*)
-+*-freebsd*|*-kfreebsd*)
- # 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
-@@ -555,7 +555,7 @@
- BSD_TYPE="OSX"
- CPPFLAGS="$CPPFLAGS -DOS_BSD"
- ;;
-- *-freebsd*)
-+ *-freebsd*|*-kfreebsd*)
- AC_DEFINE([OS_BSD], [1], [Running on BSD?])
- AC_DEFINE([OS_FREEBSD], [1], [Running on FreeBSD?])
- OS_TYPE="BSD"
diff --git a/debian/patches/0011-kea-ctrl-agent-authentication.patch b/debian/patches/0011-kea-ctrl-agent-authentication.patch
index 1262bbc..d965fbc 100644
--- a/debian/patches/0011-kea-ctrl-agent-authentication.patch
+++ b/debian/patches/0011-kea-ctrl-agent-authentication.patch
@@ -1,3 +1,10 @@
+Description: Set kea-ctrl-agent up to require a password.
+Author: Andreas Hasenack <andreas.hasenack@canonical.com>
+Forwarded: not-needed
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1033367
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/isc-kea/+bug/2007312
+Last-Update: 2023-03-17
+
diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre
index e6ae8b8a..f7e3fed2 100644
--- a/src/bin/keactrl/kea-ctrl-agent.conf.pre
diff --git a/debian/patches/series b/debian/patches/series
index 7bafbb0..d18b4f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-support_kfreebsd.patch
0002-kea_admin_fix.patch
0009-disable-database-tests.patch
0010-set-control-sockets-location.patch