Commit e2b5cae8 authored by Kolbjørn Barmen's avatar Kolbjørn Barmen

Oppdatert til Debian-9 aka stretch

parent e17fa521
FROM debian:jessie FROM debian:stretch
RUN apt-get update && apt-get -y upgrade 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/ WORKDIR /root/
COPY patches patches COPY patches patches
COPY build.sh build.sh COPY build.sh build.sh
......
...@@ -4,7 +4,7 @@ set -e ...@@ -4,7 +4,7 @@ set -e
package="radsecproxy" package="radsecproxy"
version="1.6.9" version="1.6.9"
revision="1~uninett" revision="3~uninett"
export TZ="Europe/Oslo" export TZ="Europe/Oslo"
now=$(date +"%a, %d %b %Y %T %z") now=$(date +"%a, %d %b %Y %T %z")
...@@ -14,15 +14,18 @@ here=$(pwd) ...@@ -14,15 +14,18 @@ here=$(pwd)
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
cat >> /etc/apt/sources.list << EOF 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 stretch main
deb-src http://cdn-fastly.deb.debian.org/debian jessie-updates main deb-src http://cdn-fastly.deb.debian.org/debian stretch-updates main
deb-src http://security.debian.org jessie/updates main deb-src http://security.debian.org stretch/updates main
EOF EOF
apt-get update apt-get update
curl --silent -o "${package}"_"${version}".orig.tar.gz "https://software.nordu.net/${package}/${package}-${version}.tar.gz" curl --silent -o "${package}"_"${version}".orig.tar.gz "https://software.nordu.net/${package}/${package}-${version}.tar.gz"
tar xzf "${package}"_"${version}".orig.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} apt-get source ${package}
tar xf "${package}"_*.debian.tar.xz -C "${package}"-"${version}/" tar xf "${package}"_*.debian.tar.xz -C "${package}"-"${version}/"
......
$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@
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment