tcp_wrappers: Remove separate builder.sh and use standard stdenv phases

For instance, this means that the binaries get stripped properly
(previously this package retained a reference to glibc headers).
This commit is contained in:
Tuomas Tynkkynen 2016-05-14 21:05:58 +03:00
parent 34f4515051
commit b7437eb012
2 changed files with 35 additions and 41 deletions

View File

@ -1,39 +0,0 @@
source "$stdenv/setup" || exit 1
# Unpack
unpackPhase
cd "$sourceRoot/upstream/tarballs"
tar xzvf *
cd tcp_wrappers_7.6
# Patch
patchPhase
for patch in debian/patches/*
do
echo "applying Debian patch \`$(basename $patch)'..."
patch --batch -p1 < $patch
done
substituteInPlace "Makefile" --replace \
"REAL_DAEMON_DIR=/usr/sbin" "REAL_DAEMON_DIR=$out/sbin" \
--replace "/tmp" '$$TMPDIR'
echo "building..."
make REAL_DAEMON_DIR="$out/sbin" linux
# Install
mkdir -p "$out/sbin"
cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/sbin"
mkdir -p "$out/lib"
cp -v shared/lib*.so* "$out/lib"
mkdir -p "$out/include"
cp -v *.h "$out/include"
mkdir -p "$out/man"
for i in 3 5 8;
do
mkdir -p "$out/man/man$i"
cp *.$i "$out/man/man$i" ;
done

View File

@ -15,7 +15,40 @@ stdenv.mkDerivation {
})
];
builder = ./builder.sh;
prePatch = ''
cd upstream/tarballs
tar xzvf *
cd tcp_wrappers_7.6
'';
postPatch = ''
for patch in debian/patches/*; do
echo "applying Debian patch \`$(basename $patch)'..."
patch --batch -p1 < $patch
done
'';
buildPhase = ''
make REAL_DAEMON_DIR="$out/sbin" linux
'';
installPhase = ''
mkdir -p "$out/sbin"
cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/sbin"
mkdir -p "$out/lib"
cp -v shared/lib*.so* "$out/lib"
mkdir -p "$out/include"
cp -v *.h "$out/include"
mkdir -p "$out/man"
for i in 3 5 8;
do
mkdir -p "$out/man/man$i"
cp *.$i "$out/man/man$i" ;
done
'';
meta = {
description = "TCP Wrappers, a network logger, also known as TCPD or LOG_TCP";
@ -32,7 +65,7 @@ stdenv.mkDerivation {
'';
homepage = ftp://ftp.porcupine.org/pub/security/index.html;
license = "BSD-style";
platforms = stdenv.lib.platforms.unix;
};
}