diff options
| author | Rob Vermaas | 2009-10-05 14:15:28 +0000 |
|---|---|---|
| committer | Rob Vermaas | 2009-10-05 14:15:28 +0000 |
| commit | b7321eddceb614c748e0f70be053ef74f16af14f (patch) | |
| tree | 1c948bc6d51bcb2fa241a7a49bed02edc5328dc1 /pkgs/tools | |
| parent | 06e0f87d6e5e323eeeffd4e3ade7f2e89326c792 (diff) | |
added privoxy
svn path=/nixpkgs/trunk/; revision=17645
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/privoxy/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/tools/networking/privoxy/disable-user-error.patch | 66 |
2 files changed, 85 insertions, 0 deletions
diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix new file mode 100644 index 000000000000..49dc057b33d8 --- /dev/null +++ b/pkgs/tools/networking/privoxy/default.nix @@ -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 + ''; +} diff --git a/pkgs/tools/networking/privoxy/disable-user-error.patch b/pkgs/tools/networking/privoxy/disable-user-error.patch new file mode 100644 index 000000000000..c2576409c6d0 --- /dev/null +++ b/pkgs/tools/networking/privoxy/disable-user-error.patch @@ -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 |