diff --git a/Dockerfile b/Dockerfile index 6fc3a47048c5d755253ee4de6b4a49447d6b3b7a..0a519877969d2414521745edec732cfb5c0a8139 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM debian:jessie +FROM debian:stretch RUN apt-get update && apt-get -y upgrade -RUN apt-get install -y curl build-essential debhelper dh-autoreconf dh-systemd autotools-dev libssl-dev nettle-dev docbook2x +RUN apt-get install -y git curl build-essential debhelper dh-autoreconf dh-systemd autotools-dev libssl1.0-dev nettle-dev docbook2x WORKDIR /root/ COPY patches patches COPY build.sh build.sh diff --git a/build.sh b/build.sh index f4d3980f424184f2c70c6c473d444b17d9196b71..e27e8c991f2aa4c38bec4317e75e4e32dfd02cb3 100755 --- a/build.sh +++ b/build.sh @@ -4,7 +4,7 @@ set -e package="radsecproxy" version="1.6.9" -revision="1~uninett" +revision="3~uninett" export TZ="Europe/Oslo" now=$(date +"%a, %d %b %Y %T %z") @@ -14,15 +14,18 @@ here=$(pwd) export DEBIAN_FRONTEND=noninteractive cat >> /etc/apt/sources.list << EOF -deb-src http://cdn-fastly.deb.debian.org/debian jessie main -deb-src http://cdn-fastly.deb.debian.org/debian jessie-updates main -deb-src http://security.debian.org jessie/updates main +deb-src http://cdn-fastly.deb.debian.org/debian stretch main +deb-src http://cdn-fastly.deb.debian.org/debian stretch-updates main +deb-src http://security.debian.org stretch/updates main EOF apt-get update curl --silent -o "${package}"_"${version}".orig.tar.gz "https://software.nordu.net/${package}/${package}-${version}.tar.gz" tar xzf "${package}"_"${version}".orig.tar.gz +#git clone https://git.nordu.net/radsecproxy.git "${package}"-"${version}" +#tar czf "${package}"_"${version}".orig.tar.gz "${package}"-"${version}" +#( cd "${package}"-"${version}" ; aclocal ; automake --add-missing ) apt-get source ${package} tar xf "${package}"_*.debian.tar.xz -C "${package}"-"${version}/" diff --git a/patches/patch-ad b/patches/patch-ad deleted file mode 100644 index b0f88594dcf11990a748dddf252fd80c05f1d767..0000000000000000000000000000000000000000 --- a/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD$ - -Don't overwrite LDFLAGS, only add to it. We might get flags -via the build environment, but not during the configure stage. - ---- a/Makefile.in 2016-03-14 15:15:08.000000000 +0100 -+++ b/Makefile.in 2016-08-03 15:29:37.344000000 +0200 -@@ -310,7 +310,7 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS += @LDFLAGS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LTLIBOBJS = @LTLIBOBJS@