rediff to fix the patch -- and fixed grammar in the patch to clarify the message

Package-Manager: portage-2.1.2_rc4-r6

diff --git a/dev-util/cscope/ChangeLog b/dev-util/cscope/ChangeLog
index 8e5004f088e0063ead1b2b7034c7c9e4beb1dc9e..f6f7e40ae9c31680df3b9799c449a2868c7ad65c 100644 (file)
--- a/dev-util/cscope/ChangeLog
+++ b/dev-util/cscope/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cscope
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/ChangeLog,v 1.83 2007/01/06 21:16:08 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/ChangeLog,v 1.84 2007/01/06 23:00:15 seemant Exp $
+
+  06 Jan 2007; Seemant Kulleen <seemant@gentoo.org>
+  files/cscope-158831-warning_webscope.patch:
+  rediff to fix the patch -- and fixed grammar in the patch to clarify the
+  message
 
   06 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
   -files/cscope-15.5-can-2004-0996.patch, -files/cscope-15.5-memset.patch,

diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
index 6be926cbb2abe1863fa705030425a27f385dd85d..ab8b1fe9fc97fd05ea1b54081e51840a225f03f0 100644 (file)
--- a/dev-util/cscope/Manifest
+++ b/dev-util/cscope/Manifest
@@ -1,14 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50xcscope-gentoo.el 95 RMD160 427fc486b902b6fb57e6524c747a51403993f02f SHA1 c051e28d49967d6f590c9098f3aa99b1fa8508cd SHA256 65f0256a47f6df2d724ab665906965348295ddb14b8f8f153335933c60de5c7e
 MD5 28ddc553966bf7045758be324600f5c8 files/50xcscope-gentoo.el 95
 RMD160 427fc486b902b6fb57e6524c747a51403993f02f files/50xcscope-gentoo.el 95
 SHA256 65f0256a47f6df2d724ab665906965348295ddb14b8f8f153335933c60de5c7e files/50xcscope-gentoo.el 95
-AUX cscope-158831-warning_webscope.patch 688 RMD160 7108af388d55f9ac48117b854d946b4df98bd263 SHA1 8a7f2de595263dea06c470e90dc0508079fa09dd SHA256 1b603d7ba88b6cf31b3ba27e78bc48cc51bd5d0e04fce6c2832390d862ccc177
-MD5 3a7fec9109069a5175722a21caf8da09 files/cscope-158831-warning_webscope.patch 688
-RMD160 7108af388d55f9ac48117b854d946b4df98bd263 files/cscope-158831-warning_webscope.patch 688
-SHA256 1b603d7ba88b6cf31b3ba27e78bc48cc51bd5d0e04fce6c2832390d862ccc177 files/cscope-158831-warning_webscope.patch 688
+AUX cscope-158831-warning_webscope.patch 758 RMD160 ce8667064acb333e441859fd5f896a67d5e43210 SHA1 bec47811b5ba25ca7a2119e3755f965070223a3b SHA256 e6847887ca5a160d126704f8672b8267a62f00ed44c9fe6e14c200a5cc8cdb13
+MD5 2ffbb534d68f90c8cc54611b29dc2c3f files/cscope-158831-warning_webscope.patch 758
+RMD160 ce8667064acb333e441859fd5f896a67d5e43210 files/cscope-158831-warning_webscope.patch 758
+SHA256 e6847887ca5a160d126704f8672b8267a62f00ed44c9fe6e14c200a5cc8cdb13 files/cscope-158831-warning_webscope.patch 758
 DIST cscope-15.5.20060927.tar.gz 274045 RMD160 13125578fe9e532220335de1b3d00d775f40447a SHA1 369c25c6112705dc522b2bab370ac8bd606cd01c SHA256 f8799f0a1f943837a5b0cbe07e6c7e2b2a017109508ae1b492e8eb470459f45a
 DIST cscope-15.6.tar.gz 391223 RMD160 b93238d3c91782d032e028abcfde3c2a7491a9c9 SHA1 f5f73dca1f223cf6905c09a7f0e8eb993fa5fd93 SHA256 6d6461ef402a1d6e42e1cd40e7524c4ed19e79eacef1d83ba4ed680f7bcac5ca
 EBUILD cscope-15.5.20060927-r1.ebuild 1469 RMD160 bebccc64bc601164d44b7ed6b80cc6411dcdec4b SHA1 6eb83a0887b78570a58cc79b653eb60e42c153a4 SHA256 ff8fe9810734dd2b0af9707864345b2e666ba05c5f25f2ec3071decf52014d78
@@ -27,10 +24,10 @@ EBUILD cscope-15.6.ebuild 1320 RMD160 3d1d04ba4c7e2aaff15811a67178e1583a3b38af S
 MD5 9453b05bae0570b785a88aef123328df cscope-15.6.ebuild 1320
 RMD160 3d1d04ba4c7e2aaff15811a67178e1583a3b38af cscope-15.6.ebuild 1320
 SHA256 8c42f1f732fe9961189d94cd8bfa184f904e9c836e8d5115e51d574ca5910461 cscope-15.6.ebuild 1320
-MISC ChangeLog 11202 RMD160 0fa902018ed7d813167305aa7a60100f05009fee SHA1 46f9f02f11d1d587b4400c3b086a02ad887c106a SHA256 9fb1878445dd514f7e54a3d06c632e9645f6d0952a9839dd49d55edb0f88e43f
-MD5 5819efbc1fa9221d296c32633a4878d9 ChangeLog 11202
-RMD160 0fa902018ed7d813167305aa7a60100f05009fee ChangeLog 11202
-SHA256 9fb1878445dd514f7e54a3d06c632e9645f6d0952a9839dd49d55edb0f88e43f ChangeLog 11202
+MISC ChangeLog 11388 RMD160 93bedf31d7d73276b6b56b14a333f880d5101f50 SHA1 77b948357194baf83d689ee4f695f633abbeb17f SHA256 22eb0afabe3ead33ed012b977a7becffd36b3abfa5ebe10f5653f8895347d8db
+MD5 2ea4a5c79e5cfdf65e2298d34b036744 ChangeLog 11388
+RMD160 93bedf31d7d73276b6b56b14a333f880d5101f50 ChangeLog 11388
+SHA256 22eb0afabe3ead33ed012b977a7becffd36b3abfa5ebe10f5653f8895347d8db ChangeLog 11388
 MISC metadata.xml 790 RMD160 7889067edaf88f6188a74c114c39160fcf827f71 SHA1 379cdedd442db840c7d9ea38c13cdb917ece90eb SHA256 c357e749a49ff673990a6cfdda92bd8589d6b5d2d8a4f45e8976d7bd7eb384d8
 MD5 79094d1585cb050b3855fbfe440f22b9 metadata.xml 790
 RMD160 7889067edaf88f6188a74c114c39160fcf827f71 metadata.xml 790
@@ -47,10 +44,3 @@ SHA256 5dd44a7fae431e139f023aedb5fd9742666c433ddf5a9b006cb1b461ff1c1ecd files/di
 MD5 4bd8ebc34f7028967f258d210e5b5e77 files/digest-cscope-15.6-r1 235
 RMD160 d6ef0554329cdf3c560ab5cbfadae810a3e529b6 files/digest-cscope-15.6-r1 235
 SHA256 5dd44a7fae431e139f023aedb5fd9742666c433ddf5a9b006cb1b461ff1c1ecd files/digest-cscope-15.6-r1 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFoBGfNQqtfCuFneMRAt5oAJ0bf/9xw1lBJRRALFr34ZPDX81uHACeL0Wr
-qxjDqz5jvtRMM8Rnpy1OsBs=
-=wyhl
------END PGP SIGNATURE-----

diff --git a/dev-util/cscope/files/cscope-158831-warning_webscope.patch b/dev-util/cscope/files/cscope-158831-warning_webscope.patch
index 5b23052833496723483f5e924bab6059213fe157..fba70e4456dd54c19d37abcfb3b716d2adc26143 100644 (file)
--- a/dev-util/cscope/files/cscope-158831-warning_webscope.patch
+++ b/dev-util/cscope/files/cscope-158831-warning_webscope.patch
@@ -1,16 +1,16 @@
---- /tmp/cscope        2007-01-06 19:11:10.000000000 +0100
-+++ cscope     2007-01-06 19:15:16.000000000 +0100
+--- cscope-15.6/contrib/webcscope/cscope.orig  2007-01-06 17:56:32.000000000 -0500
++++ cscope-15.6/contrib/webcscope/cscope       2007-01-06 17:57:41.000000000 -0500
 @@ -1,4 +1,4 @@
 -#!/bin/perl
 +#!/usr/bin/perl
  
- # $Id: cscope-158831-warning_webscope.patch,v 1.1 2007/01/06 18:30:51 opfer Exp $
+ # $Id: cscope-158831-warning_webscope.patch,v 1.2 2007/01/06 23:00:15 seemant Exp $
  #
 @@ -375,6 +375,7 @@
        print &HtmlTop ("Web-CScope");
  
        print <<ENDOFTEXTA;
-+<p style="color:red">Be aware that this webfrontend is insecure and allows viewing ALL apache readable files, including your configuration!</p>   
++<p style="color:red">Be aware that this web front-end is insecure and allows ALL apache readable files to be viewable -- including your configuration!</p>
  Select an operation below and enter a symbol, function or text to search in
  the database.  The active version is $version.  Input is case-sensitive,
  so if your search returns no results, check the case and the symbol name.<hr>

diff --git a/dev-util/elfsh/Manifest b/dev-util/elfsh/Manifest
index 0ef6547d54c9d62bcfdf931570ec00a0130dccb3..54985673b893d8f24d46653e53469f4dd43ba7c3 100644 (file)
--- a/dev-util/elfsh/Manifest
+++ b/dev-util/elfsh/Manifest
@@ -1,31 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 78d6f076c6cd165a92ea270c93ddc83e ChangeLog 1288
-RMD160 dacc6f42e73ae88327b858284e361cb2f8a4af5c ChangeLog 1288
-SHA256 89e2d9844cc8394df6626037660e8cef1da38ed4dd15a67eba9ce077ba8dbcbb ChangeLog 1288
-MD5 307dbef0cc687ed8f6f5f7f67393ea0e elfsh-0.51_beta3.ebuild 921
-RMD160 2bc185c714bde3d600495cb61de54dfd94dcd705 elfsh-0.51_beta3.ebuild 921
-SHA256 30b1be72ee4fc31f741cc22fc1d060629a362ea44ccbff18d9cabefeec03408f elfsh-0.51_beta3.ebuild 921
-MD5 189098eea7a95e9bb96b1840176af431 elfsh-0.65_rc1.ebuild 1388
-RMD160 c52b4ac9021082c75e9bcd6113d036e4073b13fb elfsh-0.65_rc1.ebuild 1388
-SHA256 47832c80b22ddbd97640cd5eadb0ef77fee213c35658b14bb63f1fc7820a536e elfsh-0.65_rc1.ebuild 1388
+AUX 0.51_beta3-gentoo.patch 2027 RMD160 25addaf101cd9442496c33d8349519793870c79b SHA1 c39b5a44776ad56a6774e4d45b3cf37f6c4c5b93 SHA256 7e2ca434936f97c2726ebf5c1bae92f67b4d0f4de7bbfba9719447eb566da32d
 MD5 f130345b5343f3e9253dfde8eb549427 files/0.51_beta3-gentoo.patch 2027
 RMD160 25addaf101cd9442496c33d8349519793870c79b files/0.51_beta3-gentoo.patch 2027
 SHA256 7e2ca434936f97c2726ebf5c1bae92f67b4d0f4de7bbfba9719447eb566da32d files/0.51_beta3-gentoo.patch 2027
+DIST elfsh-0.51b3-portable.tgz 136679 RMD160 278b2c846335d14953b27fa8946763622acb6303 SHA1 d8afc99cb2966710aa4b6a781ad9008bf0baaeb9 SHA256 ecffe100d0da12235cfe464726313491409739493030f3fbdb3a28696b23447f
+DIST elfsh-0.65rc1.tgz 326670 RMD160 b70f3a71d14413c35bd26c8a6cf25493c7751cbd SHA256 4b1eba142127d875090b100914d1b20198a1e3116eb98208da92a6004bfb7e97
+EBUILD elfsh-0.51_beta3.ebuild 1006 RMD160 ed3caca83bc6c90f70551dcdcaf0b06f94793ce8 SHA1 aad6307e577ec30ac7d4e99bcd8b10fc92d043f2 SHA256 41f46e00f6717838143ec9403281c55870be01d692a33d50f760bc55551eb29b
+MD5 f1c7b3c371c328842408504e5cbdcce5 elfsh-0.51_beta3.ebuild 1006
+RMD160 ed3caca83bc6c90f70551dcdcaf0b06f94793ce8 elfsh-0.51_beta3.ebuild 1006
+SHA256 41f46e00f6717838143ec9403281c55870be01d692a33d50f760bc55551eb29b elfsh-0.51_beta3.ebuild 1006
+EBUILD elfsh-0.65_rc1.ebuild 1388 RMD160 c52b4ac9021082c75e9bcd6113d036e4073b13fb SHA1 977f01fbdf00e6b4bd7deb876116f0707fb7ecfa SHA256 47832c80b22ddbd97640cd5eadb0ef77fee213c35658b14bb63f1fc7820a536e
+MD5 189098eea7a95e9bb96b1840176af431 elfsh-0.65_rc1.ebuild 1388
+RMD160 c52b4ac9021082c75e9bcd6113d036e4073b13fb elfsh-0.65_rc1.ebuild 1388
+SHA256 47832c80b22ddbd97640cd5eadb0ef77fee213c35658b14bb63f1fc7820a536e elfsh-0.65_rc1.ebuild 1388
+MISC ChangeLog 1381 RMD160 bb25e3816dfda6fe58d0cf3c7dc55bd22de7407d SHA1 772b03683b7bd2f6a18066438f3a47f1560752b9 SHA256 09b99629d5fad80fb5573109fd6be2a1c68493e61e1c86b5b07ce50328f9daaa
+MD5 9ac3a6905664fa54b05411cb4b4c39bf ChangeLog 1381
+RMD160 bb25e3816dfda6fe58d0cf3c7dc55bd22de7407d ChangeLog 1381
+SHA256 09b99629d5fad80fb5573109fd6be2a1c68493e61e1c86b5b07ce50328f9daaa ChangeLog 1381
+MISC metadata.xml 596 RMD160 99b4ab6b5f56a9d36c0cc579a47a89c577ff920f SHA1 29355d1b10f728f18a494a2ad9f57e551e395a70 SHA256 99373629ef64621114fee7b984193462811dee2e2c755207379361b0ea9f4d8c
+MD5 1b15d9b8549cda1aa82a9be3fb149245 metadata.xml 596
+RMD160 99b4ab6b5f56a9d36c0cc579a47a89c577ff920f metadata.xml 596
+SHA256 99373629ef64621114fee7b984193462811dee2e2c755207379361b0ea9f4d8c metadata.xml 596
 MD5 958b1ec6ce8d6069b0accc19cacdbdff files/digest-elfsh-0.51_beta3 256
 RMD160 c15d6f1d249c87ebae5aa8fa1eb581d91089dae5 files/digest-elfsh-0.51_beta3 256
 SHA256 538be0f0e8541f7a0bbb6521bfe9c936c72fff6b9d0cc270cc5d5841731b98d8 files/digest-elfsh-0.51_beta3 256
 MD5 1cba64ed741b54ee403512f39e34308a files/digest-elfsh-0.65_rc1 232
 RMD160 f318aac2795d548b660c79f4ff5962255cd2a9ae files/digest-elfsh-0.65_rc1 232
 SHA256 930252a18020d9219bbb64814280920c778534f36f2eff0398c06f1f49a67b8f files/digest-elfsh-0.65_rc1 232
-MD5 1b15d9b8549cda1aa82a9be3fb149245 metadata.xml 596
-RMD160 99b4ab6b5f56a9d36c0cc579a47a89c577ff920f metadata.xml 596
-SHA256 99373629ef64621114fee7b984193462811dee2e2c755207379361b0ea9f4d8c metadata.xml 596
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFECTA92+ySkm8kpY0RAjy3AJ4zUUuRvI9Xp/wbIrUQKMGvm7ep4ACghnID
-wGlUbBqPvdphKSA4aTaOH2Q=
-=Lx2f
------END PGP SIGNATURE-----