summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-04-13 10:23:43 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-04-13 10:23:43 +0000
commit3c69608c05f949918d3e28dcd373da1a79cc8f53 (patch)
treea4c42e174bc00e171c4c397aacfbc3c92030b1fe /net-proxy
parentDisable KMS on non linux systems, bug #314827, suggested by Naohiro Aota <nao... (diff)
downloadhistorical-3c69608c05f949918d3e28dcd373da1a79cc8f53.tar.gz
historical-3c69608c05f949918d3e28dcd373da1a79cc8f53.tar.bz2
historical-3c69608c05f949918d3e28dcd373da1a79cc8f53.zip
Fix broken patch (bug #312947).
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/ziproxy/ChangeLog6
-rw-r--r--net-proxy/ziproxy/Manifest14
-rw-r--r--net-proxy/ziproxy/files/ziproxy-2.7.2-libpng14.patch4
3 files changed, 19 insertions, 5 deletions
diff --git a/net-proxy/ziproxy/ChangeLog b/net-proxy/ziproxy/ChangeLog
index 554cc300b5c1..2b83d5a70af5 100644
--- a/net-proxy/ziproxy/ChangeLog
+++ b/net-proxy/ziproxy/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-proxy/ziproxy
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.24 2010/03/08 20:06:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ziproxy/ChangeLog,v 1.25 2010/04/13 10:23:43 flameeyes Exp $
+
+ 13 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ files/ziproxy-2.7.2-libpng14.patch:
+ Fix broken patch (bug #312947).
08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> ziproxy-2.7.2.ebuild,
+files/ziproxy-2.7.2-libpng14.patch:
diff --git a/net-proxy/ziproxy/Manifest b/net-proxy/ziproxy/Manifest
index de9c583ccae4..a57182dc968a 100644
--- a/net-proxy/ziproxy/Manifest
+++ b/net-proxy/ziproxy/Manifest
@@ -1,4 +1,7 @@
-AUX ziproxy-2.7.2-libpng14.patch 880 RMD160 0799b0d30748cde9477d3e8ba1da5275148114be SHA1 c2f552ae1720694912307441d2ca0ed55e23f203 SHA256 90a543a715f55651b096e7eb8ab0cc224737092c34d28f78f78981e20b72f781
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ziproxy-2.7.2-libpng14.patch 913 RMD160 9a6669a06ee285be933a045bc49ecb49b447477a SHA1 a944826da99677e6e96701ab27953e36c34642bd SHA256 052c58d39daac4043d5e8d762770613c7d51f626d1163295c2ea255091b59793
AUX ziproxy.confd 650 RMD160 1cbd1e13f3276399b89c94c0323fb8fa05c9c6af SHA1 12e7b4bf054e89de93c548be5c7fe000632c63b9 SHA256 dad7db324941944a35c87d4e061a004f5d9638ea24f139bc9bad80a51e0e8d78
AUX ziproxy.initd 706 RMD160 b52b5b8f80bc402ff801723c4d9fb79f37935033 SHA1 66b467840480c94a7b551f4a92d1b2ab4752b199 SHA256 f143de97458b3373ba7b177fc19109ba8730354240e9ab5b3f5fe6192103d099
DIST ziproxy-2.7.0.tar.bz2 239929 RMD160 02aa4b1e750cf299728e1a4ced54180b3c5b5d46 SHA1 5692c4e3356c898eec788a78ceb66b5d35dbdef0 SHA256 cd3e7cf6d4ca1faaf82867024486c72091968b9b9bd9ca41dac76fd76ad00d7a
@@ -7,5 +10,12 @@ DIST ziproxy-2.7.2.tar.bz2 258257 RMD160 60f04f5e482e034b5613f44ec1ba129f8c16e79
EBUILD ziproxy-2.7.0.ebuild 1848 RMD160 5e85f64a4b94963c9f43b5c7e7787c1b686a141b SHA1 3d8d417d1629170c7d9b79b016d101ab8b1607f2 SHA256 25d3fce71ca79def4c4a40790ba158b7ff82cb33c34d794c594f7225a1f3878f
EBUILD ziproxy-2.7.1.ebuild 1853 RMD160 4106b6c10d2a18b16d92c9b228d7a6dc2df8468a SHA1 6a8148adb7a8f919e0fea0b498c843b2c5500fc6 SHA256 4d6d8f901215d61152cdde954992913d094a94dab67280aebfe5857428431ea4
EBUILD ziproxy-2.7.2.ebuild 2057 RMD160 7f7ec10da7e91072ab7957c6725346027ebbae80 SHA1 386fb548d90b9f23067999ac4d9b72a86fab37a6 SHA256 033865079938e7e76f099607095113fef2b738fb3b38059e274eadb2defda555
-MISC ChangeLog 4391 RMD160 351e820cfddaec5debea803dfdf7a830d11d347a SHA1 e3e9a8d2ece049df02271581910d65cce63e8d5c SHA256 0839b5765b46db32fbee0b7832cfe8dec9e7e20fedc8aee2fa5780743dfc7b18
+MISC ChangeLog 4520 RMD160 0faa60210cea084122d312d33239f447873bfffc SHA1 b19f18e561f21c193a8c2f3527e3ddd4f860a999 SHA256 aab6aa4e36d7a6b4bd8ba0274710a89d87e948d8e8b997db40ae029cc0bb8893
MISC metadata.xml 534 RMD160 00f3e51718dbf971a2a828f9e465e3bedb0ee93e SHA1 7f1144f73a3502d77737e553424a421d986d57a9 SHA256 a07a0f1fef6f615ca4dd7d66321ef8e733faea0068218fcab034085d42236b68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvERj4ACgkQAiZjviIA2XgfuQCcCs8ERCv0eO5z0yZA6SqjNbKB
+WQMAoKA5hBHCdnmqkYEmv3/7gmIoGTtP
+=bgyU
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/ziproxy/files/ziproxy-2.7.2-libpng14.patch b/net-proxy/ziproxy/files/ziproxy-2.7.2-libpng14.patch
index b5bc7ff42d7b..a3256a21f35b 100644
--- a/net-proxy/ziproxy/files/ziproxy-2.7.2-libpng14.patch
+++ b/net-proxy/ziproxy/files/ziproxy-2.7.2-libpng14.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- ziproxy-2.7.2.orig/configure.in
++++ ziproxy-2.7.2/configure.in
@@ -24,7 +24,7 @@
AC_CHECK_LIB(jpeg, jpeg_start_decompress,, AC_MSG_ERROR([libjpeg not found.]))