dnsdist: drop EL6 pkg support

diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild
index 52a2d8bf6c186230ef924af3d7a4dfa9cd9e206c..2dfa18ef9bb7f5749f0e3f925d0a8935c64a4207 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.rpmbuild
+++ b/builder-support/dockerfiles/Dockerfile.rpmbuild
@@ -37,22 +37,13 @@ RUN touch /var/lib/rpm/* &&  if $(grep -q 'release 6' /etc/redhat-release); then
 @ENDIF
 
 @IF [ -n "$M_dnsdist$M_all" ]
-RUN if $(grep -q 'release 6' /etc/redhat-release); then \
-      true ; \
-    else \
-      mkdir /libh2o && cd /libh2o && \
-      touch /var/lib/rpm/* && yum install -y curl openssl-devel cmake && \
+RUN mkdir /libh2o && cd /libh2o && \
+      yum install -y curl openssl-devel cmake && \
       curl -L https://github.com/h2o/h2o/archive/v2.2.6.tar.gz | tar xz && \
       CFLAGS='-fPIC' cmake -DWITH_PICOTLS=off -DWITH_BUNDLED_SSL=off -DWITH_MRUBY=off -DCMAKE_INSTALL_PREFIX=/opt ./h2o-2.2.6 && \
       make install && \
-      cd /pdns; \
-    fi
-
-RUN touch /var/lib/rpm/* && if $(grep -q 'release 6' /etc/redhat-release); then \
-      scl enable devtoolset-7 -- builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \
-    else \
-      builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \
-    fi
+      cd /pdns;
+RUN builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec
 @ENDIF
 
 # mv across layers with overlay2 is buggy in some kernel versions (results in empty dirs)

diff --git a/builder-support/specs/dnsdist.spec b/builder-support/specs/dnsdist.spec
index 1a4f0a7ed786887d265c778ca5276549df46017d..24eaa3e5606e77329087db3bac78ee477ad69c48 100644 (file)
--- a/builder-support/specs/dnsdist.spec
+++ b/builder-support/specs/dnsdist.spec
@@ -10,11 +10,6 @@ BuildRequires: readline-devel
 BuildRequires: libedit-devel
 BuildRequires: openssl-devel
 
-%if 0%{?el6}
-BuildRequires: boost148-devel
-BuildRequires: lua-devel
-BuildRequires: re2-devel
-%endif
 %if 0%{?suse_version}
 BuildRequires: boost-devel
 BuildRequires: lua-devel
@@ -43,9 +38,6 @@ BuildRequires: systemd-units
 BuildRequires: tinycdb-devel
 %endif
 
-%if 0%{?el6}
-Requires(pre): shadow-utils
-%endif
 %if 0%{?suse_version}
 Requires(pre): shadow
 %systemd_requires
@@ -60,11 +52,7 @@ BuildRequires: fstrm-devel
 dnsdist is a high-performance DNS loadbalancer that is scriptable in Lua.
 
 %prep
-%if 0%{?rhel} == 6
-%setup -n %{name}-%{getenv:BUILDER_VERSION}
-%else
 %autosetup -p1 -n %{name}-%{getenv:BUILDER_VERSION}
-%endif
 
 # run as dnsdist user
 sed -i '/^ExecStart/ s/dnsdist/dnsdist -u dnsdist -g dnsdist/' dnsdist.service.in
@@ -78,13 +66,6 @@ sed -i '/^ExecStart/ s/dnsdist/dnsdist -u dnsdist -g dnsdist/' dnsdist.service.i
   --disable-silent-rules \
   --enable-unit-tests \
   --enable-dns-over-tls \
-%if 0%{?el6}
-  --disable-dnscrypt \
-  --without-libsodium \
-  --with-re2 \
-  --with-net-snmp \
-  --with-boost=/usr/include/boost148 LIBRARY_PATH=/usr/lib64/boost148
-%endif
 %if 0%{?suse_version}
   --disable-dnscrypt \
   --without-libsodium \
@@ -106,11 +87,7 @@ sed -i '/^ExecStart/ s/dnsdist/dnsdist -u dnsdist -g dnsdist/' dnsdist.service.i
   PKG_CONFIG_PATH=/opt/lib64/pkgconfig
 %endif
 
-%if 0%{?el6}
-make %{?_smp_mflags} LIBRARY_PATH=/usr/lib64/boost148
-%else
 make %{?_smp_mflags}
-%endif
 mv dnsdistconf.lua dnsdist.conf.sample
 
 %check
@@ -119,14 +96,8 @@ make %{?_smp_mflags} check || (cat test-suite.log && false)
 %install
 %make_install
 install -d %{buildroot}/%{_sysconfdir}/dnsdist
-%if 0%{?el6}
-install -d -m 755 %{buildroot}/%{_sysconfdir}/init && install -m 644 contrib/dnsdist.upstart.conf %{buildroot}/%{_sysconfdir}/init/%{name}.conf
-install -d -m 755 %{buildroot}/%{_sysconfdir}/default && install -m 644 contrib/dnsdist.default %{buildroot}/%{_sysconfdir}/default/%{name}
-%else
-# EL7 and SUSE
 sed -i "s,/^\(ExecStart.*\)dnsdist\(.*\)\$,\1dnsdist -u dnsdist -g dnsdist\2," %{buildroot}/lib/systemd/system/dnsdist.service
 sed -i "s,/^\(ExecStart.*\)dnsdist\(.*\)\$,\1dnsdist -u dnsdist -g dnsdist\2," %{buildroot}/lib/systemd/system/dnsdist@.service
-%endif
 
 %pre
 getent group dnsdist >/dev/null || groupadd -r dnsdist
@@ -136,11 +107,6 @@ getent passwd dnsdist >/dev/null || \
 exit 0
 
 %post
-%if 0%{?el6}
-if [ -x /sbin/initctl ]; then
-  /sbin/initctl reload-configuration
-fi
-%endif
 %if 0%{?suse_version}
 %service_add_post %{name}.service
 %endif
@@ -150,12 +116,6 @@ systemctl daemon-reload ||:
 %endif
 
 %preun
-%if 0%{?el6}
-if [ $1 -eq 0 ] ; then
-    # This is package removal, not upgrade
-    /sbin/stop %{name} >/dev/null 2>&1 || :
-fi
-%endif
 %if 0%{?suse_version}
 %service_del_preun %{name}.service
 %endif
@@ -164,14 +124,6 @@ fi
 %endif
 
 %postun
-%if 0%{?el6}
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    if [ -x /sbin/initctl ] && /sbin/initctl status %{name} 2>/dev/null | grep -q 'running' ; then
-      /sbin/initctl restart %{name} > /dev/null 2>&1 || :
-    fi
-fi
-%endif
 %if 0%{?suse_version}
 %service_del_postun %{name}.service
 %endif
@@ -186,9 +138,4 @@ fi
 %{_bindir}/*
 %{_mandir}/man1/*
 %dir %{_sysconfdir}/dnsdist
-%if 0%{?el6}
-%{_sysconfdir}/init/%{name}.conf
-%{_sysconfdir}/default/%{name}
-%else
 /lib/systemd/system/dnsdist*
-%endif

diff --git a/pdns/dnsdistdist/contrib/dnsdist.default b/pdns/dnsdistdist/contrib/dnsdist.default
deleted file mode 100644 (file)
index 8e6dc5b..0000000
--- a/pdns/dnsdistdist/contrib/dnsdist.default
+++ /dev/null
@@ -1 +0,0 @@
-DNSDIST_OPTIONS=''

diff --git a/pdns/dnsdistdist/contrib/dnsdist.upstart.conf b/pdns/dnsdistdist/contrib/dnsdist.upstart.conf
deleted file mode 100644 (file)
index 1253df5..0000000
--- a/pdns/dnsdistdist/contrib/dnsdist.upstart.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-description "dnsdist - A DNS loadbalancer"
-start on runlevel [2345]
-stop on runlevel [016]
-
-kill timeout 10
-respawn
-
-script
-  DNSDIST_OPTIONS=''
-  DNSDIST_USER=dnsdist
-  DNSDIST_GROUP=dnsdist
-  test -r /etc/default/dnsdist && source /etc/default/dnsdist
-  exec /usr/bin/dnsdist --supervised --uid $DNSDIST_USER --gid $DNSDIST_GROUP $DNSDIST_OPTIONS
-end script