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 --- .../development/libraries/tcp-wrappers/default.nix | 74 ---------------------- .../libraries/tcp-wrappers/have-strerror.patch | 20 ------ .../libraries/tcp-wrappers/trivial-fixes.patch | 27 -------- 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 +++++++++++ pkgs/servers/portmap/default.nix | 4 +- pkgs/top-level/all-packages.nix | 4 +- 10 files changed, 82 insertions(+), 205 deletions(-) delete mode 100644 pkgs/development/libraries/tcp-wrappers/default.nix delete mode 100644 pkgs/development/libraries/tcp-wrappers/have-strerror.patch delete mode 100644 pkgs/development/libraries/tcp-wrappers/trivial-fixes.patch 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') diff --git a/pkgs/development/libraries/tcp-wrappers/default.nix b/pkgs/development/libraries/tcp-wrappers/default.nix deleted file mode 100644 index 14335e6a3ad..00000000000 --- a/pkgs/development/libraries/tcp-wrappers/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -x@{builderDefsPackage - , flex, bison - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="tcp-wrappers"; - version="7.6"; - name="${baseName}-${version}"; - url="http://ftp.porcupine.org/pub/security/tcp_wrappers_${version}.tar.gz"; - hash="0p9ilj4v96q32klavx0phw9va21fjp8vpk11nbh6v2ppxnnxfhwm"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "doUnpack" "fixMakefile" "doPatch" - "doMake" "doDeploy"]; - - patches = [./have-strerror.patch ./trivial-fixes.patch]; - - makeFlags = [ - "REAL_DAEMON_DIR=$out/bin" - "STYLE='\"-DHAVE_STRERROR -DSYS_ERRLIST_DEFINED\"'" - "generic" - ]; - - setVars = a.noDepEntry '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lnsl" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC" - ''; - - fixMakefile = a.fullDepEntry '' - chmod u+w Makefile - echo 'libwrap.so: $(LIB_OBJ)' >> Makefile - echo ' ld $(LIB_OBJ) --shared -o libwrap.so' >> Makefile - '' ["minInit"]; - - doDeploy = a.fullDepEntry '' - mkdir -p "$out"/{sbin,lib} - make libwrap.so - cp libwrap.{a,so} "$out/lib" - find . -perm +111 -a ! -name '*.*' -exec cp '{}' "$out/sbin" ';' - '' ["defEnsureDir" "minInit"]; - - meta = { - description = "Network logging TCP wrappers"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = "free-noncopyleft"; - }; - passthru = { - updateInfo = { - downloadPage = "http://ftp.porcupine.org/pub/security/index.html"; - }; - }; -}) x diff --git a/pkgs/development/libraries/tcp-wrappers/have-strerror.patch b/pkgs/development/libraries/tcp-wrappers/have-strerror.patch deleted file mode 100644 index 626fce1a88a..00000000000 --- a/pkgs/development/libraries/tcp-wrappers/have-strerror.patch +++ /dev/null @@ -1,20 +0,0 @@ -Debian patch -diff -ruN tcp_wrappers_7.6.orig/percent_m.c tcp_wrappers_7.6/percent_m.c ---- tcp_wrappers_7.6.orig/percent_m.c 1994-12-28 17:42:37.000000000 +0100 -+++ tcp_wrappers_7.6/percent_m.c 2003-08-21 02:45:31.000000000 +0200 -@@ -29,11 +29,15 @@ - - while (*bp = *cp) - if (*cp == '%' && cp[1] == 'm') { -+#ifdef HAVE_STRERROR -+ strcpy(bp, strerror(errno)); -+#else - if (errno < sys_nerr && errno > 0) { - strcpy(bp, sys_errlist[errno]); - } else { - sprintf(bp, "Unknown error %d", errno); - } -+#endif - bp += strlen(bp); - cp += 2; - } else { diff --git a/pkgs/development/libraries/tcp-wrappers/trivial-fixes.patch b/pkgs/development/libraries/tcp-wrappers/trivial-fixes.patch deleted file mode 100644 index 1e55819f8de..00000000000 --- a/pkgs/development/libraries/tcp-wrappers/trivial-fixes.patch +++ /dev/null @@ -1,27 +0,0 @@ -Debian patch -diff -ruNp tcp_wrappers_7.6.orig/options.c tcp_wrappers_7.6/options.c ---- tcp_wrappers_7.6.orig/options.c 2006-03-01 23:45:28.000000000 +0100 -+++ tcp_wrappers_7.6/options.c 2006-03-01 22:55:44.000000000 +0100 -@@ -41,6 +41,7 @@ static char sccsid[] = "@(#) options.c 1 - #include - #include - #include -+#include - #include - #include - #include -diff -ruNp tcp_wrappers_7.6.orig/scaffold.c tcp_wrappers_7.6/scaffold.c ---- tcp_wrappers_7.6.orig/scaffold.c 2006-03-01 23:45:28.000000000 +0100 -+++ tcp_wrappers_7.6/scaffold.c 2006-03-01 22:56:13.000000000 +0100 -@@ -17,6 +17,7 @@ static char sccs_id[] = "@(#) scaffold.c - #include - #include - #include -+#include - #include - #include - #include -@@ -28,3 +28,2 @@ - --extern char *malloc(); - 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"; + }; +} diff --git a/pkgs/servers/portmap/default.nix b/pkgs/servers/portmap/default.nix index d7a05261ff2..f2152b65df3 100644 --- a/pkgs/servers/portmap/default.nix +++ b/pkgs/servers/portmap/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, lib, tcpWrapper +{ fetchurl, stdenv, lib, tcp_wrappers , daemonUser ? false, daemonUID ? false, daemonGID ? false }: assert daemonUser -> (!daemonUID && !daemonGID); @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ++ lib.optional (daemonUID != false) "DAEMON_UID=${toString daemonUID}" ++ lib.optional (daemonGID != false) "DAEMON_GID=${toString daemonGID}"; - buildInputs = [ tcpWrapper ]; + buildInputs = [ tcp_wrappers ]; installPhase = '' mkdir -p "$out/sbin" "$out/man/man8" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b678bed1d32..468e0875926 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4916,8 +4916,6 @@ let tcltls = callPackage ../development/libraries/tcltls { }; - tcp_wrappers = callPackage ../development/libraries/tcp-wrappers {}; - tdb = callPackage ../development/libraries/tdb { }; tecla = callPackage ../development/libraries/tecla { }; @@ -6193,7 +6191,7 @@ let }; # FIXME: `tcp-wrapper' is actually not OS-specific. - tcpWrapper = callPackage ../os-specific/linux/tcp-wrapper { }; + tcp_wrappers = callPackage ../os-specific/linux/tcp-wrappers { }; trackballs = callPackage ../games/trackballs { debug = false; -- cgit 1.4.1