diff options
| author | Nixpkgs Monitor <none@none> | 2013-12-04 04:25:26 +0200 |
|---|---|---|
| committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-12-04 04:28:34 +0200 |
| commit | 3837210feddf342c33f99de59dc4a95b36308af2 (patch) | |
| tree | dc4092019e07891e9d931876e4d1eb445f816a9a /pkgs/tools/networking/privoxy | |
| parent | 42a5c9d6373867cd89d390f2e044075f6c1e2abf (diff) | |
| download | nixpkgs-3837210feddf342c33f99de59dc4a95b36308af2.tar nixpkgs-3837210feddf342c33f99de59dc4a95b36308af2.tar.gz nixpkgs-3837210feddf342c33f99de59dc4a95b36308af2.tar.bz2 nixpkgs-3837210feddf342c33f99de59dc4a95b36308af2.tar.lz nixpkgs-3837210feddf342c33f99de59dc4a95b36308af2.tar.xz nixpkgs-3837210feddf342c33f99de59dc4a95b36308af2.tar.zst nixpkgs-3837210feddf342c33f99de59dc4a95b36308af2.zip | |
privoxy: update from 3.0.12 to 3.0.21, potentially fixes CVE-2013-2503
Diffstat (limited to 'pkgs/tools/networking/privoxy')
| -rw-r--r-- | pkgs/tools/networking/privoxy/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/networking/privoxy/disable-user-error.patch | 66 |
2 files changed, 3 insertions, 71 deletions
diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 8af67aed1d4..6fff52c63bd 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -1,17 +1,15 @@ {stdenv, fetchurl, autoconf, automake, zlib, pcre, w3m}: stdenv.mkDerivation { - name = "privoxy-3.0.12"; + name = "privoxy-3.0.21"; src = fetchurl { - url = mirror://sourceforge/ijbswa/Sources/3.0.12%20%28stable%29/privoxy-3.0.12-stable-src.tar.gz; - sha256 = "16ngim1p4pb4zk8h7js4zjw280fxqxamasfngixikp2ivmzxl469"; + url = mirror://sourceforge/ijbswa/Sources/3.0.21%20%28stable%29/privoxy-3.0.21-stable-src.tar.gz; + sha256 = "1f6xb7aa47p90c26vqaw74y6drs9gpnhxsgby3mx0awdjh0ydisy"; }; buildInputs = [automake autoconf zlib pcre w3m]; - 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 deleted file mode 100644 index c2576409c6d..00000000000 --- a/pkgs/tools/networking/privoxy/disable-user-error.patch +++ /dev/null @@ -1,66 +0,0 @@ -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 |