From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 20 Nov 2017 15:48:15 +0000 (+0000)
Subject: Pull libkqueue from the official freeradius fork
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47c387ca24f61632bdaec01b2df495a5a7cd787f;p=thirdparty%2Ffreeradius-server.git

Pull libkqueue from the official freeradius fork
---

diff --git a/scripts/docker/build-centos6/Dockerfile.source b/scripts/docker/build-centos6/Dockerfile.source
index ea3f5a7797b..d4b4512e579 100644
--- a/scripts/docker/build-centos6/Dockerfile.source
+++ b/scripts/docker/build-centos6/Dockerfile.source
@@ -39,7 +39,7 @@ RUN sh cmake.sh --skip-license --prefix=/usr/local
 #
 WORKDIR /usr/local/src/repositories
 # Fixme: Change to the main repo when they merge this branch
-RUN git clone --branch patch-3 --depth=1 https://github.com/arr2036/libkqueue.git
+RUN git clone --branch master --depth=1 https://github.com/FreeRADIUS/libkqueue.git
 WORKDIR libkqueue
 RUN cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib ./ && \
     make && \
@@ -71,7 +71,7 @@ RUN yum-builddep -y hiredis/redhat/hiredis.spec
 RUN v=$(rpm -q --qf '%{VERSION}\n' --specfile hiredis/redhat/hiredis.spec | head -1) ;\
     mv hiredis hiredis-$v ;\
     tar -c -z -f $HOME/rpmbuild/SOURCES/hiredis-$v.tar.gz --exclude=.git hiredis-$v ;\
-    rpmbuild -bb hiredis-$v/redhat/hiredis.spec 
+    rpmbuild -bb hiredis-$v/redhat/hiredis.spec
 RUN yum localinstall -y $HOME/rpmbuild/RPMS/*/hiredis-*.rpm
 
 #
diff --git a/scripts/docker/build-centos7/Dockerfile.source b/scripts/docker/build-centos7/Dockerfile.source
index 5ebd4287b9d..e02cab9eb70 100644
--- a/scripts/docker/build-centos7/Dockerfile.source
+++ b/scripts/docker/build-centos7/Dockerfile.source
@@ -38,7 +38,7 @@ RUN sh cmake.sh --skip-license --prefix=/usr/local
 #
 WORKDIR /usr/local/src/repositories
 # Fixme: Change to the main repo when they merge this branch
-RUN git clone --branch patch-3 --depth=1 https://github.com/arr2036/libkqueue.git
+RUN git clone --branch master --depth=1 https://github.com/FreeRADIUS/libkqueue.git
 WORKDIR libkqueue
 RUN cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib ./ && \
     make && \
diff --git a/scripts/docker/build-debian9/Dockerfile.source b/scripts/docker/build-debian9/Dockerfile.source
index 3c4bb0ee8a8..b2cd1e872bc 100644
--- a/scripts/docker/build-debian9/Dockerfile.source
+++ b/scripts/docker/build-debian9/Dockerfile.source
@@ -29,7 +29,7 @@ RUN sh cmake.sh --skip-license --prefix=/usr/local
 #
 WORKDIR /usr/local/src/repositories
 # Fixme: Change to the main repo when they merge this branch
-RUN git clone --branch patch-3 --depth=1 https://github.com/arr2036/libkqueue.git
+RUN git clone --branch master --depth=1 https://github.com/FreeRADIUS/libkqueue.git
 WORKDIR libkqueue
 RUN cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib ./ && \
     make && \
diff --git a/scripts/docker/build-ubuntu14/Dockerfile.source b/scripts/docker/build-ubuntu14/Dockerfile.source
index 864b460f18d..8f1307f01d7 100644
--- a/scripts/docker/build-ubuntu14/Dockerfile.source
+++ b/scripts/docker/build-ubuntu14/Dockerfile.source
@@ -37,7 +37,7 @@ RUN sh cmake.sh --skip-license --prefix=/usr/local
 #
 WORKDIR /usr/local/src/repositories
 # Fixme: Change to the main repo when they merge this branch
-RUN git clone --branch patch-3 --depth=1 https://github.com/arr2036/libkqueue.git
+RUN git clone --branch master --depth=1 https://github.com/FreeRADIUS/libkqueue.git
 WORKDIR libkqueue
 RUN cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib ./ && \
     make && \
diff --git a/scripts/docker/build-ubuntu16/Dockerfile.source b/scripts/docker/build-ubuntu16/Dockerfile.source
index 86568893c3a..e860c6c1cea 100644
--- a/scripts/docker/build-ubuntu16/Dockerfile.source
+++ b/scripts/docker/build-ubuntu16/Dockerfile.source
@@ -37,7 +37,7 @@ RUN sh cmake.sh --skip-license --prefix=/usr/local
 #
 WORKDIR /usr/local/src/repositories
 # Fixme: Change to the main repo when they merge this branch
-RUN git clone --branch patch-3 --depth=1 https://github.com/arr2036/libkqueue.git
+RUN git clone --branch master --depth=1 https://github.com/FreeRADIUS/libkqueue.git
 WORKDIR libkqueue
 RUN cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib ./ && \
     make && \