added privoxy

svn path=/nixpkgs/trunk/; revision=17645
This commit is contained in:
Rob Vermaas 2009-10-05 14:15:28 +00:00
parent 06e0f87d6e
commit b7321eddce
3 changed files with 89 additions and 0 deletions

View file

@ -0,0 +1,19 @@
{stdenv, fetchurl, autoconf, automake, coreutils}:
stdenv.mkDerivation {
name = "privoxy-3.0.12";
src = fetchurl {
url = mirror://sourceforge/ijbswa/Sources/3.0.12%20%28stable%29/privoxy-3.0.12-stable-src.tar.gz;
sha256 = "16ngim1p4pb4zk8h7js4zjw280fxqxamasfngixikp2ivmzxl469";
};
buildInputs = [automake autoconf coreutils];
patches = [./disable-user-error.patch];
preConfigure = ''
autoheader
autoconf
'';
}

View file

@ -0,0 +1,66 @@
diff -rc privoxy-3.0.12-stable/configure.in privoxy-3.0.12-stable-new/configure.in
*** privoxy-3.0.12-stable/configure.in 2009-03-21 11:45:06.000000000 +0100
--- privoxy-3.0.12-stable-new/configure.in 2009-10-05 15:39:53.683884809 +0200
***************
*** 652,659 ****
AC_PROG_AWK
AC_CHECK_PROG(GDB,gdb,yes,no)
! AC_PATH_PROG(BGROUPS,groups,no,/bin:/usr/bin:/usr/local/bin)
! AC_PATH_PROG(ID,id,no,/bin:/usr/bin:/usr/local/bin)
AC_SUBST(ID)
AC_SUBST(BGROUPS)
--- 652,659 ----
AC_PROG_AWK
AC_CHECK_PROG(GDB,gdb,yes,no)
! AC_PATH_PROG(BGROUPS,groups,no,$PATH)
! AC_PATH_PROG(ID,id,no,$PATH)
AC_SUBST(ID)
AC_SUBST(BGROUPS)
***************
*** 715,721 ****
if test $? -eq 0 ; then
USER=$with_user;
else
! AC_MSG_ERROR(There is no user '$with_user' on this system)
fi
fi
else
--- 715,721 ----
if test $? -eq 0 ; then
USER=$with_user;
else
! AC_MSG_WARN(There is no user '$with_user' on this system)
fi
fi
else
***************
*** 747,758 ****
# FIXME: this fails if valid group, but not first group
# listed.
if test "$with_group" != "`$BGROUPS $USER | sed 's/.*: //' 2>/dev/null |$AWK '{print $1}'`" ; then
! AC_MSG_ERROR(The given value '$withval' does not match group entry)
else
GROUP=$with_group;
fi
else
! AC_MSG_ERROR(There is no group entry for user '$USER')
fi
fi
else
--- 747,758 ----
# FIXME: this fails if valid group, but not first group
# listed.
if test "$with_group" != "`$BGROUPS $USER | sed 's/.*: //' 2>/dev/null |$AWK '{print $1}'`" ; then
! AC_MSG_WARN(The given value '$withval' does not match group entry)
else
GROUP=$with_group;
fi
else
! AC_MSG_WARN(There is no group entry for user '$USER')
fi
fi
else

View file

@ -1468,6 +1468,10 @@ let
inherit fetchurl stdenv neon openssl;
};
privoxy = import ../tools/networking/privoxy {
inherit fetchurl stdenv autoconf automake coreutils ;
};
tcpdump = import ../tools/networking/tcpdump {
inherit fetchurl stdenv libpcap;
};