summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gentoo.org>2015-01-09 13:38:10 +0000
committerAndrew Savchenko <bircoph@gentoo.org>2015-01-09 13:38:10 +0000
commit99c9cde95dc5a34853783fe96f2911196331f9e9 (patch)
tree019de6c24cee0e69ad719f5f2cffbb782e1cadd8 /net-proxy
parentStable for amd64, wrt bug #535554 (diff)
downloadhistorical-99c9cde95dc5a34853783fe96f2911196331f9e9.tar.gz
historical-99c9cde95dc5a34853783fe96f2911196331f9e9.tar.bz2
historical-99c9cde95dc5a34853783fe96f2911196331f9e9.zip
Fix bug 536082
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org> Package-Manager: portage-2.2.15/cvs/Linux i686 Manifest-Sign-Key: 0x565953B95372756C
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/privoxy/ChangeLog7
-rw-r--r--net-proxy/privoxy/Manifest30
-rw-r--r--net-proxy/privoxy/files/privoxy-3.0.22-force.patch9
3 files changed, 21 insertions, 25 deletions
diff --git a/net-proxy/privoxy/ChangeLog b/net-proxy/privoxy/ChangeLog
index c03e14f32f6f..ec3a0b04ce4c 100644
--- a/net-proxy/privoxy/ChangeLog
+++ b/net-proxy/privoxy/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-proxy/privoxy
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.98 2015/01/08 16:10:40 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.99 2015/01/09 13:38:06 bircoph Exp $
+
+ 09 Jan 2015; Andrew Savchenko <bircoph@gentoo.org>
+ files/privoxy-3.0.22-force.patch:
+ Fix bug 536082: remove patch chunk mangled by CVS, it is not needed
+ to fix build with --disable-force.
*privoxy-3.0.22 (08 Jan 2015)
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index b2e9f0a7f754..2b791c49016b 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -2,7 +2,7 @@
Hash: SHA256
AUX privoxy-3.0.19-gentoo.patch 3661 SHA256 71c6e6b042a820c44e7110c8a60f7987c826900fd4b22073565977ce63d4860a SHA512 e0f916f33b8f17375b60686a0e4795883f29e46c55e273e0a69fae63d4b4e5a2585bb86b04aa288fdd75cdf51eedf7d72a9f8092e13a853e934e0029ae919a24 WHIRLPOOL 701a5c7ec31b7d2d68801005d81f01ec727712aab7d5d866427a78c940ef2d63201f6ba9e1679bf8e919653b355ea8a0577d4bce5c13b24812d43f2b09797553
-AUX privoxy-3.0.22-force.patch 1034 SHA256 e0da06ad3f0d326a698d3e3a39eac3885222e9bca0a01bf2b3b80a168572c0a5 SHA512 4d53313058b16dd1bda0e6f6bae6e18d5b202327a736201d50872af3c9a85628d8dc939ddbaeb367714294120fa977f5690bfa56a2d1bcdc9dc0f9654306d6f5 WHIRLPOOL 058ebf66d71ce331414b92da4aa02786a5182bca1de05c07ce6acc44feda625c5183ec4518cb9300f59562f80f6b7b885962c942b0641911d8cda332c9e143c9
+AUX privoxy-3.0.22-force.patch 553 SHA256 85f0a44c6510bc539e32a1eab049ce77cec7dfa079ea33f5941577a17b1d1f49 SHA512 1fa257b541d60d5033ee22fb16ab61ccf36016e5eebae4bad6c0bf581b2b353707abc160bc4922553f9152bff415d1059656e7a5ead2f4f4676cc5652959b0ce WHIRLPOOL c8b6a70cb25522a24db37192106f9ff6a34cb05933043c9e917b9033bb6e1f2e4548471ce7ade8716bfe1e64a370980b4576909ef221415b7e683e72bb9df5ce
AUX privoxy.initd 745 SHA256 224496b498b4f692ae3316a95b5c7c8b6230dcd5fee0ca163956a7acde243de9 SHA512 5d3870a672cd58d2d88a14af1ebb9c953f951016ba9e0905d7b9bd4ad1b699bf8b77bbb8bc8f31a71a928d3cd4c7f47c6cc20e01962a5ee89981414573fc0972 WHIRLPOOL d55a1df238e24589602174592bfc67af3333f3228abdf9be0f39527d35e7c088421472851b3c54bdb4af9273e714782598c939947fdda6f7e5673fc4b53cb0aa
AUX privoxy.logrotate 191 SHA256 a14373c8a26aab32f6f025c11a5521d7923ce900d00b31aa61da9f3979e3bb2e SHA512 118caaeac3aba751584c5bdfc737bf5bfeddf1a62fda1f44bcd4654ae2e33183bc1ce6fc66d4a1bdd79766e42e669b1615a6d46d528a1bd49cabdf98385a3bb9 WHIRLPOOL 4f7f576eb52a02daf38ccec68c49ee5ae0d449cbefdc11ecd1a9790eeee99f800576e05467f80a915423aa077ed3769e85a7c03a92679f31d6b3fe4a3aa3a792
AUX privoxy.service 248 SHA256 35fee00be175e22dffafcd4a61de3a117268d64d506e99b9b3518702c3a20f35 SHA512 0f3484f06521a66b984fda7238f175a135b22fa5a00dc0c8caadd380d21bfecdae7a6c8d2c0d9a4a3c2858539913722be2b7d4fddd17ea2c95f4e151c3f74ca0 WHIRLPOOL 681c7fe28220ddc4194e6e83974878530b4a3aefd3b1a2de66f9b950ea1eb36252b484077c31af9fbbe335d777898e551455ee5c57892f4e43e5966b23b2d05c
@@ -10,22 +10,22 @@ DIST privoxy-3.0.21-stable-src.tar.gz 1733120 SHA256 5ec7e601948d2bd0ebf0ebe90ee
DIST privoxy-3.0.22-stable-src.tar.gz 1737251 SHA256 1a214fec1f3616ea7ff42f1ecdb67ce82690199ec403de9d34b99d0896efcc41 SHA512 40e893ac25d69575c3a2c28bcc5882d91093f8eb6194a54d5b5298ad4023563e586c9aa2a793bbafe2fe3aeef7aa9094aa01e72861a51f0e569d1e5c74f974b2 WHIRLPOOL 229123d2c8acdf258f5baeb36300cec32c730580f11bc2c0bbf7e4c17bfeee800938b2680f0bd1f7ee0346ac55500f4a34945e3a68a1f9791c96a5768aac5a69
EBUILD privoxy-3.0.21-r2.ebuild 1686 SHA256 53334648d625b6e72b5f954ef9410c45262f5799b2185b111557abeebcc14b09 SHA512 cf4ca8849dc3d877fafd252c57f57e328873ca430beb6c5884f2b34aee0537f18f5bb338348b6ab9b8ff94db3f2f5c2c538e044060a72245f0530d04005668cf WHIRLPOOL 3ad0402ea70f45ee56760e4132051436542a8f43aeccce71ca5bdd6b96a152fe99685681770e49328e213cfe86b1a55d51d6d850bf3abe167c076d70e62cb802
EBUILD privoxy-3.0.22.ebuild 2301 SHA256 af89044adab909ffea71f88ee3508458bd6f193106e945cc79f1fbf3a4a64366 SHA512 ebfba934fb576a4f08877576829b23881bfd5161827ebbc1cbc57a7940e072f4ea109f61790a285ff203cbe223f758c04c31fddae5d802a8726a8f462f02d89c WHIRLPOOL ea590616d7f7977bbcb784ef7aa17f19126ef5d8218afce4e3b1d28079008e525d2d8f16b89eae0ef16f8bff611b470ee1c0cd22798982e49781e0f98d7d7021
-MISC ChangeLog 18906 SHA256 96a5f85be9d6167455ad95f07b7600a5e62ac8ba810c46a8e4933c4808e8ac42 SHA512 3b57017728542b8aac3447a0a49e32cb5655c4b612a5c43f2c66e6a55be277ebfd66e1b57abec0065bf898723a0a93c7215b29290b0d6cd0906cb216dd4263aa WHIRLPOOL 354eb9f658c674b26041d37c5d42ce3ab2f67ca7c493dab4bb7cf0fd0a9313b1e114815a8f5afb4f474173309de800b61ba94e3f3ca9c67858b43224869df426
+MISC ChangeLog 19103 SHA256 e234a21e9b8d8ba9170e224841e219d6600d5ced184e9a0384c4057bff8b2428 SHA512 4e4f2dcb9b236843d1df8344f015998c341122b242be97b15abc863e1de4335cf8efce48584f81529533b9981f30fbcb57665a7027f3386a1401b2d50f688b61 WHIRLPOOL 36e6a5d097c74a9560bb294f9fe62eb000b2ae28d5aaf6075f9abb6e052426c1ad13aea6e5f45f74cc8f4b21971253c536e21275a55fb37212ad5a5dcecef5bd
MISC metadata.xml 1056 SHA256 22f63a2ff4c284f142c7583912701733d538d03214c69d86b2fe3d03daf4dfa3 SHA512 eaf871e571e70ed96d80b8bbd6897d9eb11c096d589a92b5eebf3b1873289817c56051f39725729c3bbc7ec962aa201125191f046bedb750662adf69c9754330 WHIRLPOOL 264ad98af64124e21a65c9b585339dd76e31c154e8a82b9154e9bf8c97f826db6e9d15235e0ec6f49074bf93ce0fdc8be33019e4a9672d92d3155c3d7639adc1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJUrqwBAAoJEFZZU7lTcnVsoG4QAKOBbGI0Ea1ZbnoQFMTVPQLp
-b2AA+I9qeweFc1o4Wyj3/QmLtskLB0H2StLROQZ44gE3M6dZjltzl4c2vJ9EhOmK
-cZD55PAZ3IEZ/4kXbHwPU0NRU4IfCJUc0wivnP0oWVstJQtw6MKgxU1OShCvhuYN
-nTmqEApFJycmfqRA3cPzk98LNrU6ehjaDycT+10K/5hBsAlUJD5GX0rkt8jyllJD
-Gc4pvkfEktYZXvJZNzMX4glftlahCkFenPnJxZIaNwvL33YE9hXK2q5oVJF8pz5e
-vLC6QMeDG0Oe54ATbNbgCtxwWIOx0XUh5OqMZNN4sp5p4+KpAUfCxrIIwWYd3SaV
-quDbBC3z8opXVHBS5bPj8/YUfBq9XPaBQYzCmURsydXp+U0dAlN61QQqmrZBwOFu
-5dMEnBlbr4IvBxEDwV3ifywgZYsMhP3AooLxsAPjLXGTCfgEDjRngMQ2CV+hDpT2
-fKp4rrzVJpOC5y8rW2DcD8SHWvKbt3CljF5xjjb4rhK8n/bJNcA8s0DR2e6mkJf/
-OeK4/NqiX5mPZkSWtT1RqFxVX72tDWySXr1gHMZVlD452HNMmVs+0o76vGgL/5g2
-9Fm84e5wdTRoJwyhLfAF793fLQvK18uz9RYT829PJ4vxgH28W/pO+0L0ALAoU+g0
-FvjLoYaqn1pekm6OUoAN
-=qZE1
+iQIcBAEBCAAGBQJUr9m/AAoJEFZZU7lTcnVs3/cP/1PTQtJI3ifpFW7GPPz5JteZ
+e4L91t2N7+0YIJsWiAqzrwgeKi3jXdz9q8yHKyeUWg/IYvxQoEqAxFgpHxdJdshK
+WDrMLJ2HThNRdScnKgFHJ0tuOCm/LoDrK/vZuxmoIKAloz5ygf7K99nTNeEZQ10S
+jeTloaEfOV0gcVTfGCB6dA3oid/v4C8c1C73lNze7aY337gw7m9czvFeP+ZtL8Ou
+4W79/o3aMNgO+UAELYQPSJXj7JpWV1lHJHPoLxdSAho7FkrYRuIV15sC8cUn4cZy
+eRA04MKwso5AOk8g99V5dHYnzAdPN8Te+ooLimtzdTLGIpmwP4282P9A0vCZHGsD
+SnjOIPfMMHqxml7VFaa/W9RaDNEGRK2blJ6qugyq6QUjOc5/u3GuRw2bCfJB3HHV
+ikFRv9NH8SI45AeWH4acnxQ72UZL2E+0k/SBsUV+55kdTIY63gOHF047O/i4LIeQ
+QgwjivPUzmADQY1Q5yQCPMHNcwsV+Qsz5NfvX8Gwdeg7lWANwT01+mJqP+vINEpA
+7zYQL+VLDV10y69jDk2izwVo5E7esu8CDKotKdNDZXqRHUEH6iUgh+QLE/EyNyBW
+M988mLk6qkThbvlMOtVn8+0uE4unIMPhQx8tcSuX2jQQHuwhwUW6SaswEQEJ/SII
+16H98dzxd+C6ApyEFmEj
+=JCUT
-----END PGP SIGNATURE-----
diff --git a/net-proxy/privoxy/files/privoxy-3.0.22-force.patch b/net-proxy/privoxy/files/privoxy-3.0.22-force.patch
index aa0fe3564a2a..8d3ac1242d05 100644
--- a/net-proxy/privoxy/files/privoxy-3.0.22-force.patch
+++ b/net-proxy/privoxy/files/privoxy-3.0.22-force.patch
@@ -1,14 +1,5 @@
--- project.h 2014/11/12 12:00:41 1.208
+++ project.h 2014/11/16 18:43:48 1.209
-@@ -1,7 +1,7 @@
- #ifndef PROJECT_H_INCLUDED
- #define PROJECT_H_INCLUDED
- /** Version string. */
--#define PROJECT_H_VERSION "$Id: privoxy-3.0.22-force.patch,v 1.1 2015/01/08 16:10:40 bircoph Exp $"
-+#define PROJECT_H_VERSION "$Id: privoxy-3.0.22-force.patch,v 1.1 2015/01/08 16:10:40 bircoph Exp $"
- /*********************************************************************
- *
- * File : $Source: /var/cvsroot/gentoo-x86/net-proxy/privoxy/files/privoxy-3.0.22-force.patch,v $
@@ -1365,10 +1365,9 @@
/** Calculates the number of elements in an array, using sizeof. */
#define SZ(X) (sizeof(X) / sizeof(*X))