From 59e979177d8e8d5ed1567bfee189901da414684d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 29 Nov 2012 15:14:16 +0100 Subject: Remove duplicate tcp-wrappers package --- pkgs/os-specific/linux/nfs-utils/default.nix | 4 +-- pkgs/os-specific/linux/tcp-wrapper/builder.sh | 39 ------------------------- pkgs/os-specific/linux/tcp-wrapper/default.nix | 38 ------------------------ pkgs/os-specific/linux/tcp-wrappers/builder.sh | 39 +++++++++++++++++++++++++ pkgs/os-specific/linux/tcp-wrappers/default.nix | 38 ++++++++++++++++++++++++ 5 files changed, 79 insertions(+), 79 deletions(-) delete mode 100644 pkgs/os-specific/linux/tcp-wrapper/builder.sh delete mode 100644 pkgs/os-specific/linux/tcp-wrapper/default.nix create mode 100644 pkgs/os-specific/linux/tcp-wrappers/builder.sh create mode 100644 pkgs/os-specific/linux/tcp-wrappers/default.nix (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 4060204d505..42bacd41be0 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, tcpWrapper, utillinux, libcap, libtirpc, libevent, libnfsidmap +{ fetchurl, stdenv, tcp_wrappers, utillinux, libcap, libtirpc, libevent, libnfsidmap , lvm2, e2fsprogs }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ tcpWrapper utillinux libcap libtirpc libevent libnfsidmap + [ tcp_wrappers utillinux libcap libtirpc libevent libnfsidmap lvm2 e2fsprogs ]; diff --git a/pkgs/os-specific/linux/tcp-wrapper/builder.sh b/pkgs/os-specific/linux/tcp-wrapper/builder.sh deleted file mode 100644 index 7ea574fcf23..00000000000 --- a/pkgs/os-specific/linux/tcp-wrapper/builder.sh +++ /dev/null @@ -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 diff --git a/pkgs/os-specific/linux/tcp-wrapper/default.nix b/pkgs/os-specific/linux/tcp-wrapper/default.nix deleted file mode 100644 index a3f79cd05a8..00000000000 --- a/pkgs/os-specific/linux/tcp-wrapper/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ fetchurl, stdenv }: - -stdenv.mkDerivation { - name = "tcp-wrappers-7.6"; - - src = fetchurl { - url = mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs.orig.tar.gz; - sha256 = "0k68ziinx6biwar5lcb9jvv0rp6b3vmj6861n75bvrz4w1piwkdp"; - }; - - patches = [ - (fetchurl { - url = mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs-13.diff.gz; - sha256 = "071ir20rh8ckhgrc0y99wgnlbqjgkprf0qwbv84lqw5i6qajbcnh"; - }) - ]; - - builder = ./builder.sh; - - meta = { - description = "TCP Wrappers, a network logger, also known as TCPD or LOG_TCP"; - - longDescription = '' - Wietse Venema's network logger, also known as TCPD or LOG_TCP. - These programs log the client host name of incoming telnet, ftp, - rsh, rlogin, finger etc. requests. Security options are: access - control per host, domain and/or service; detection of host name - spoofing or host address spoofing; booby traps to implement an - early-warning system. The current version supports the System - V.4 TLI network programming interface (Solaris, DG/UX) in - addition to the traditional BSD sockets. - ''; - - homepage = ftp://ftp.porcupine.org/pub/security/index.html; - - license = "BSD-style"; - }; -} diff --git a/pkgs/os-specific/linux/tcp-wrappers/builder.sh b/pkgs/os-specific/linux/tcp-wrappers/builder.sh new file mode 100644 index 00000000000..7ea574fcf23 --- /dev/null +++ b/pkgs/os-specific/linux/tcp-wrappers/builder.sh @@ -0,0 +1,39 @@ +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 diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix new file mode 100644 index 00000000000..a3f79cd05a8 --- /dev/null +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -0,0 +1,38 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation { + name = "tcp-wrappers-7.6"; + + src = fetchurl { + url = mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs.orig.tar.gz; + sha256 = "0k68ziinx6biwar5lcb9jvv0rp6b3vmj6861n75bvrz4w1piwkdp"; + }; + + patches = [ + (fetchurl { + url = mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs-13.diff.gz; + sha256 = "071ir20rh8ckhgrc0y99wgnlbqjgkprf0qwbv84lqw5i6qajbcnh"; + }) + ]; + + builder = ./builder.sh; + + meta = { + description = "TCP Wrappers, a network logger, also known as TCPD or LOG_TCP"; + + longDescription = '' + Wietse Venema's network logger, also known as TCPD or LOG_TCP. + These programs log the client host name of incoming telnet, ftp, + rsh, rlogin, finger etc. requests. Security options are: access + control per host, domain and/or service; detection of host name + spoofing or host address spoofing; booby traps to implement an + early-warning system. The current version supports the System + V.4 TLI network programming interface (Solaris, DG/UX) in + addition to the traditional BSD sockets. + ''; + + homepage = ftp://ftp.porcupine.org/pub/security/index.html; + + license = "BSD-style"; + }; +} -- cgit 1.4.1