Merge pull request #398 from neilcook/releases

Rocky 9 Packaging

.github/workflows/builder.yml

@@ -17,6 +17,7 @@ jobs:
         os:
           - centos-7
           - ol-8
+          - rocky-9
           - amazon-2
           - debian-buster
           - debian-bullseye

.github/workflows/docker.yml

@@ -15,7 +15,7 @@ jobs:
           fetch-depth: 0
           submodules: recursive
       - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get -qq -y install gcc g++ cmake libboost-all-dev libcurl4-openssl-dev libgeoip-dev libgetdns-dev libhiredis-dev libmaxminddb-dev libluajit-5.1-dev libprotobuf-dev libreadline-dev libssl-dev libsodium-dev libsystemd-dev libyaml-cpp-dev libjsoncpp-dev uuid-dev libz-dev libtool pkg-config protobuf-compiler pandoc wget autoconf automake
+        run: sudo apt-get update && sudo apt-get -qq -y install gcc g++ cmake libboost-all-dev libcurl4-openssl-dev libgetdns-dev libhiredis-dev libmaxminddb-dev libluajit-5.1-dev libprotobuf-dev libreadline-dev libssl-dev libsodium-dev libsystemd-dev libyaml-cpp-dev libjsoncpp-dev uuid-dev libz-dev libtool pkg-config protobuf-compiler pandoc wget autoconf automake
       - name: Download prometheus-cpp
         run: git clone https://github.com/jupp0r/prometheus-cpp.git && cd prometheus-cpp && git checkout tags/v1.0.1 -b v1.0.1
       - name: Build and Install prometheus-cpp

.github/workflows/regression.yml

@@ -17,7 +17,7 @@ jobs:
           fetch-depth: 5
           submodules: recursive
       - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get -qq -y install gcc g++ cmake libboost-all-dev libcurl4-openssl-dev libgeoip-dev libgetdns-dev libhiredis-dev libmaxminddb-dev libluajit-5.1-dev libprotobuf-dev libreadline-dev libssl-dev libsodium-dev libsystemd-dev libyaml-cpp-dev libjsoncpp-dev uuid-dev libz-dev libtool pkg-config protobuf-compiler pandoc wget autoconf automake
+        run: sudo apt-get update && sudo apt-get -qq -y install gcc g++ cmake libboost-all-dev libcurl4-openssl-dev libgetdns-dev libhiredis-dev libmaxminddb-dev libluajit-5.1-dev libprotobuf-dev libreadline-dev libssl-dev libsodium-dev libsystemd-dev libyaml-cpp-dev libjsoncpp-dev uuid-dev libz-dev libtool pkg-config protobuf-compiler pandoc wget autoconf automake
       - name: Download prometheus-cpp
         run: git clone https://github.com/jupp0r/prometheus-cpp.git && cd prometheus-cpp && git checkout tags/v1.0.1 -b v1.0.1 && echo 'include(CPack)' >> CMakeLists.txt
       - name: Build and Install prometheus-cpp

builder-support/debian/control

@@ -8,7 +8,6 @@ Build-Depends: cdbs,
                automake,
                debhelper (>= 9.20160709),
                dh-autoreconf,
-               libgeoip-dev,
                libboost-all-dev (>= 1.4.0),
                libcurl4-openssl-dev,
                libgetdns-dev,

builder-support/dockerfiles/Dockerfile.target.rocky-9

@@ -0,0 +1,16 @@
+# First do the source builds
+@INCLUDE Dockerfile.target.sdist
+
+# This defines the distribution base layer
+# Put only the bare minimum of common commands here, without dev tools
+FROM rockylinux:9 as dist-base
+
+RUN touch /var/lib/rpm/* && dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
+    dnf install -y 'dnf-command(config-manager)' yum && dnf config-manager --set-enabled devel && \
+    dnf install -y curl procps-ng --allowerasing # This is to ensure we don't have curlminimal and we do have pkill
+
+RUN dnf -y install dnf-plugins-core clang
+
+# Do the actual rpm build
+@INCLUDE Dockerfile.rpmbuild
+

builder-support/dockerfiles/Dockerfile.wforce

@@ -7,7 +7,6 @@ RUN apt-get update && \
                automake \
                libboost-all-dev \
                libcurl4-openssl-dev \
-               libgeoip-dev \
                libgetdns-dev \
                libhiredis-dev \
                libmaxminddb-dev \

builder-support/specs/wforce.spec

@@ -35,7 +35,6 @@ BuildRequires: readline-devel
 BuildRequires: gcc-c++
 BuildRequires: lua-devel
 BuildRequires: libidn-devel
-BuildRequires: GeoIP-devel
 BuildRequires: boost-devel
 BuildRequires: bzip2
 BuildRequires: pkgconfig

docker/regression/Dockerfile

@@ -10,7 +10,6 @@ RUN apt-get update && \
                build-essential \
                libboost-all-dev \
                libcurl4-openssl-dev \
-               libgeoip-dev \
                libgetdns-dev \
                libhiredis-dev \
                libmaxminddb-dev \

docker/wforce_image/Dockerfile

@@ -7,7 +7,6 @@ RUN apt-get update && \
                automake \
                libboost-all-dev \
                libcurl4-openssl-dev \
-               libgeoip-dev \
                libgetdns-dev \
                libhiredis-dev \
                libmaxminddb-dev \
@@ -82,7 +81,6 @@ RUN apt-get update && \
                libboost-system1.74.0 \
                libboost-filesystem1.74.0 \
                libcurl4 \
-               libgeoip1 \
                libgetdns10 \
                libhiredis0.14 \
                libluajit-5.1-2 \

regression-tests/wforce-tw.conf

@@ -107,12 +107,6 @@ function twallow(lt)
 		return -1, "Japan is blocked", "Japan is blocked", {}
 	end
 
-	gip_record = lookupCity(lt.remote)
-	if (gip_record.city == "Wokingham")
-	then
-	   return -1, "Wokingham is blocked", "Wokingham is blocked", {}
-	end
-
 	if (sdb:twGet(lt.login, "diffPasswords") > 20)
 	then
 		return -1, "diffPasswords for login", "diffPasswords for login", {}