--- a/components/privoxy/Makefile Tue Apr 19 14:24:04 2016 -0700
+++ b/components/privoxy/Makefile Tue Apr 19 15:03:17 2016 -0700
@@ -26,15 +26,15 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= privoxy
-COMPONENT_VERSION= 3.0.23
+COMPONENT_VERSION= 3.0.24
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)-stable
COMPONENT_ARCHIVE= $(COMPONENT_SRC)-src.tar.gz
COMPONENT_PROJECT_URL= http://www.privoxy.org/
COMPONENT_ARCHIVE_HASH= \
- sha256:b75f6b8b8409ed7ac6c3a00dcd608a45180f07bfa46658c836d5c6ffc4dc25c4
+ sha256:a381f6dc78f08de0d4a2342d47a5949a6608073ada34b933137184f3ca9fb012
COMPONENT_ARCHIVE_URL= http://downloads.sourceforge.net/ijbswa/$(COMPONENT_ARCHIVE)
-TPNO= 22977
+TPNO= 27274
TEST_TARGET= $(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk
--- a/components/privoxy/privoxy.copyright Tue Apr 19 14:24:04 2016 -0700
+++ b/components/privoxy/privoxy.copyright Tue Apr 19 15:03:17 2016 -0700
@@ -1,6 +1,3 @@
-v.09232010
-
-
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
@@ -341,11 +338,21 @@
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
-------------------------------------------------------------------------------
+--------------------------------------
+./pcre/licence
+
+PCRE LICENCE
+
+PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
- Copyright (c) 1997-2000 University of Cambridge
+Written by: Philip Hazel <[email protected]>
------------------------------------------------------------------------------
+University of Cambridge Computing Service,
+Cambridge, England. Phone: +44 1223 334714.
+
+Copyright (c) 1997-2000 University of Cambridge
+
Permission is granted to anyone to use this software for any purpose on any
computer system, and to redistribute it freely, subject to the following
restrictions:
@@ -355,7 +362,21 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
2. The origin of this software must not be misrepresented, either by
- explicit claim or by omission.
+ explicit claim or by omission. In practice, this means that if you use
+ PCRE in software which you distribute to others, commercially or
+ otherwise, you must put a sentence like this
+
+ Regular expression support is provided by the PCRE library package,
+ which is open source software, written by Philip Hazel, and copyright
+ by the University of Cambridge, England.
+
+ somewhere reasonably visible in your documentation and in any relevant
+ files or online help data or similar. A reference to the ftp site for
+ the source, that is, to
+
+ ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
+
+ should also be given in the documentation.
3. Altered versions must be plainly marked as such, and must not be
misrepresented as being the original software.
@@ -363,5 +384,5 @@
4. If PCRE is embedded in any software that is released under the GNU
General Purpose Licence (GPL), then the terms of that licence shall
supersede any condition above with which it is incompatible.
------------------------------------------------------------------------------
+End