[gentoo-user] korganizer patch

[gentoo-user] korganizer patch

[Michael W. Holdeman]

I applied a patch to korganizer to fix kde bug 
http://bugs.kde.org/show_bug.cgi?id=113376   

I then rearchive kdepim-3.4.92.tar.bz2 and run 
ebuild /usr/portage/kde-base/kdepim/kdepim-3.5.0_beta2.ebuild digest, which 
completes successfully but when attempting to emerge korganizer again I get 
!!! Digest verification Failed:
!!!    /usr/portage/distfiles/kdepim-3.4.92.tar.bz2
!!! Reason: Failed on MD5 verification


what did I miss?

Mike
-- 
 
Michael W. Holdeman


________________________________________
Powered by Gentoo Linux www.gentoo.org  |
Kernel 2.6.11-ck8                       |
Win4Lin 5-1-20 netraverse.com           |
Win4LinPro 6.1.1-03 win4lin.com         |
________________________________________|

-- 
gentoo-user@gentoo.org mailing list

Re: [gentoo-user] korganizer patch

[Jason Ayres]

Michael W. Holdeman wrote:

>I applied a patch to korganizer to fix kde bug 
>http://bugs.kde.org/show_bug.cgi?id=113376   
>
>I then rearchive kdepim-3.4.92.tar.bz2 and run 
>ebuild /usr/portage/kde-base/kdepim/kdepim-3.5.0_beta2.ebuild digest, which 
>completes successfully but when attempting to emerge korganizer again I get 
>!!! Digest verification Failed:
>!!!    /usr/portage/distfiles/kdepim-3.4.92.tar.bz2
>!!! Reason: Failed on MD5 verification
>
>
>what did I miss?
>
>Mike
>  
>
Taking a stab here, but if you changed the contents of the archive from 
what portage is expecting, that would probably cause the md5 failure.

Jason

 Outgoing mail is Virus Scanned byNorman Data Defense.        Inbound Spam reduced 98.2% byVircom Sieve.        
-- 
gentoo-user@gentoo.org mailing list

Re: [gentoo-user] korganizer patch

[Neil Bothwick]

[-- Attachment #1: Type: text/plain, Size: 859 bytes --]

On Tue, 25 Oct 2005 20:51:14 -0400, Michael W. Holdeman wrote:

> I then rearchive kdepim-3.4.92.tar.bz2 and run 
> ebuild /usr/portage/kde-base/kdepim/kdepim-3.5.0_beta2.ebuild digest,
> which completes successfully but when attempting to emerge korganizer
> again I get !!! Digest verification Failed:
> !!!    /usr/portage/distfiles/kdepim-3.4.92.tar.bz2
> !!! Reason: Failed on MD5 verification
 
> what did I miss?

Recreating the digest for the package. Portage uses MD5 checksums to
check that files have not been altered, as a security measure. You need
to regenerate the digest as you made the changes and want to accept them.

Either "ebuild /path/to/ebuild digest" or 
"emerge --digest --other-options package"


-- 
Neil Bothwick

Q. What is the difference between Queensland and yoghurt?
A. Yoghurt has an active culture.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [gentoo-user] korganizer patch

[Nick Rout]

On Wed, 26 Oct 2005 11:27:49 +0100
Neil Bothwick <neil@digimed.co.uk> wrote:

> On Tue, 25 Oct 2005 20:51:14 -0400, Michael W. Holdeman wrote:
> 
> > I then rearchive kdepim-3.4.92.tar.bz2 and run 
> > ebuild /usr/portage/kde-base/kdepim/kdepim-3.5.0_beta2.ebuild digest,
> > which completes successfully but when attempting to emerge korganizer
> > again I get !!! Digest verification Failed:
> > !!!    /usr/portage/distfiles/kdepim-3.4.92.tar.bz2
> > !!! Reason: Failed on MD5 verification
>  
> > what did I miss?
> 
> Recreating the digest for the package. Portage uses MD5 checksums to
> check that files have not been altered, as a security measure. You need
> to regenerate the digest as you made the changes and want to accept them.
> 
> Either "ebuild /path/to/ebuild digest" or 
> "emerge --digest --other-options package"

ummmm read the original post again. It's hard to see at a glance as the line of code is not separated, but he clearly says:

"run ebuild /usr/portage/kde-base/kdepim/kdepim-3.5.0_beta2.ebuild digest,
which completes successfully"

> 
> 
> -- 
> Neil Bothwick
> 
> Q. What is the difference between Queensland and yoghurt?
> A. Yoghurt has an active culture.
> 
-- 
gentoo-user@gentoo.org mailing list

Re: [gentoo-user] korganizer patch

[Neil Bothwick]

[-- Attachment #1: Type: text/plain, Size: 415 bytes --]

On Wed, 26 Oct 2005 23:37:05 +1300, Nick Rout wrote:

> ummmm read the original post again. It's hard to see at a glance as the
> line of code is not separated, but he clearly says:
> 
> "run ebuild /usr/portage/kde-base/kdepim/kdepim-3.5.0_beta2.ebuild
> digest, which completes successfully"

Err, yes. Sorry about that, reading too fast :(


-- 
Neil Bothwick

Yeah, but what's the speed of dark?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [gentoo-user] korganizer patch

[Uwe Thiem]

On 26 October 2005 12:27, Neil Bothwick wrote:
> On Tue, 25 Oct 2005 20:51:14 -0400, Michael W. Holdeman wrote:
> > I then rearchive kdepim-3.4.92.tar.bz2 and run
> > ebuild /usr/portage/kde-base/kdepim/kdepim-3.5.0_beta2.ebuild digest,
> > which completes successfully but when attempting to emerge korganizer
> > again I get !!! Digest verification Failed:
> > !!!    /usr/portage/distfiles/kdepim-3.4.92.tar.bz2
> > !!! Reason: Failed on MD5 verification
> >
> > what did I miss?
>
> Recreating the digest for the package. Portage uses MD5 checksums to
> check that files have not been altered, as a security measure. You need
> to regenerate the digest as you made the changes and want to accept them.
>
> Either "ebuild /path/to/ebuild digest" or

Didn't he write above that he did just that?

Uwe

-- 
95% of all programmers rate themselves among the top 5% of all software 
developers. - Linus Torvalds

http://www.uwix.iway.na (last updated: 20.06.2004)
-- 
gentoo-user@gentoo.org mailing list

Re: [gentoo-user] korganizer patch

[Holly Bostick]

Neil Bothwick schreef:
> On Tue, 25 Oct 2005 20:51:14 -0400, Michael W. Holdeman wrote:
> 
> 
>> I then rearchive kdepim-3.4.92.tar.bz2 and run ebuild
>> /usr/portage/kde-base/kdepim/kdepim-3.5.0_beta2.ebuild digest, 
>> which completes successfully but when attempting to emerge
>> korganizer again I get !!! Digest verification Failed: !!!
>> /usr/portage/distfiles/kdepim-3.4.92.tar.bz2 !!! Reason: Failed on
>> MD5 verification
> 
> 
> 
>> what did I miss?
> 
> 
> Recreating the digest for the package. Portage uses MD5 checksums to 
> check that files have not been altered, as a security measure. You
> need to regenerate the digest as you made the changes and want to
> accept them.
> 
> Either "ebuild /path/to/ebuild digest" or "emerge --digest
> --other-options package"
> 
> 

Should this be handled in /usr/portage in any case? Portage is going to
overwrite the changed files (the digest) every time a sync is done,
isn't it? I wonder if this digest being created in the real Portage tree
rather than the overlay tree might not be the problem in the first
place-- since changed files in the Portage tree itself 'should'
automatically fail, since that's what the check function is designed to
keep an eye on. It really doesn't do much good for a file to be changed
in the official Portage tree and for Portage to just say "OK, that's
fine." Suppose you'd been hacked?

The overlay tree, on the other hand, is designed to accept modified
files; that's what it's for.

I'd copy *both* ebuilds to my overlay tree and digest the copies, and
see if that helped. Does the digest for the parent application digest
the hard dependencies? Silly question, of course it must. So that's
what's failing, the korganizer digest of kdepim, not the kdepim digest
itself; we never get that far. So korganizer has to be redigested as well.

Holly
-- 
gentoo-user@gentoo.org mailing list

Re: [gentoo-user] korganizer patch

[Nick Rout]

On Tue, 25 Oct 2005 20:51:14 -0400
"Michael W. Holdeman" <lists@ptfd.org> wrote:

> I applied a patch to korganizer to fix kde bug 
> http://bugs.kde.org/show_bug.cgi?id=113376   
> 
> I then rearchive kdepim-3.4.92.tar.bz2 and run 
> ebuild /usr/portage/kde-base/kdepim/kdepim-3.5.0_beta2.ebuild digest, which 
> completes successfully but when attempting to emerge korganizer again I get 
> !!! Digest verification Failed:
> !!!    /usr/portage/distfiles/kdepim-3.4.92.tar.bz2
> !!! Reason: Failed on MD5 verification
> 
> 
> what did I miss?

not sure, but surely the better way is to change the ebuild  so that it applies the patch?

> 
> Mike
> -- 
>

-- 
gentoo-user@gentoo.org mailing list

Re: [gentoo-user] korganizer patch

[Benno Schulenberg]

Michael W. Holdeman wrote:
> I applied a patch to korganizer to fix kde bug
> http://bugs.kde.org/show_bug.cgi?id=113376  
>
> I then rearchive kdepim-3.4.92.tar.bz2

Do not change tarballs.

Instead, put the kdepim-3.5.0_beta2.ebuild in your overlay, add the 
patch to it with PATCHES="${FILESDIR}/korganizer-monthview.patch" 
or something similar, then make the digest on this ebuild, and 
emerge.

Benno
-- 
gentoo-user@gentoo.org mailing list

Re: [gentoo-user] korganizer patch

[Michael W. Holdeman]

On Wednesday 26 October 2005 06:39, Benno Schulenberg wrote:
> Michael W. Holdeman wrote:
> > I applied a patch to korganizer to fix kde bug
> > http://bugs.kde.org/show_bug.cgi?id=113376  
> >
> > I then rearchive kdepim-3.4.92.tar.bz2
>
> Do not change tarballs.
>
> Instead, put the kdepim-3.5.0_beta2.ebuild in your overlay, add the
> patch to it with PATCHES="${FILESDIR}/korganizer-monthview.patch"
> or something similar, then make the digest on this ebuild, and
> emerge.
I know, I know... I just always seem to have trouble with that, nd I just 
wqntewd to test the patch quickly...

I will try the "correct" way today and see if I get anywhere...

Mike
-- 
 
Michael W. Holdeman


________________________________________
Powered by Gentoo Linux www.gentoo.org  |
Kernel 2.6.11-ck8                       |
Win4Lin 5-1-20 netraverse.com           |
Win4LinPro 6.1.1-03 win4lin.com         |
________________________________________|

-- 
gentoo-user@gentoo.org mailing list

Re: [gentoo-user] korganizer patch

[Michael W. Holdeman]

OK, 
So what is wrong with this patch:
_________________________________________________________________
--- /kde-base/korganizer/komonthview.cpp #474283:474284
 @ -960,7 +960,7  @
      }
   } else if ( event ) {
       for ( QDateTime _date = date;
-            _date < event->dtEnd(); _date = _date.addDays( 1 ) ) {
+            _date <= event->dtEnd(); _date = _date.addDays( 1 ) ) {
         mvc = lookupCellByDate( _date.date() );
         if ( mvc ) mvc->addIncidence( event );
       }

_____________________________________________________________
Mike

On Wednesday 26 October 2005 06:39, Benno Schulenberg wrote:
> Michael W. Holdeman wrote:
> > I applied a patch to korganizer to fix kde bug
> > http://bugs.kde.org/show_bug.cgi?id=113376  
> >
> > I then rearchive kdepim-3.4.92.tar.bz2
>
> Do not change tarballs.
>
> Instead, put the kdepim-3.5.0_beta2.ebuild in your overlay, add the
> patch to it with PATCHES="${FILESDIR}/korganizer-monthview.patch"
> or something similar, then make the digest on this ebuild, and
> emerge.
>
> Benno

-- 
 
Michael W. Holdeman
Fire Chief
Porter Emergency Services

________________________________________
Powered by Gentoo Linux www.gentoo.org  |
Kernel 2.6.11-ck8                       |
Win4Lin 5-1-20 netraverse.com           |
Win4LinPro 6.1.1-03 win4lin.com         |
________________________________________|

-- 
 
Michael W. Holdeman


________________________________________
Powered by Gentoo Linux www.gentoo.org  |
Kernel 2.6.11-ck8                       |
Win4Lin 5-1-20 netraverse.com           |
Win4LinPro 6.1.1-03 win4lin.com         |
________________________________________|

-- 
gentoo-user@gentoo.org mailing list

Re: [gentoo-user] korganizer patch

[Benno Schulenberg]

Michael W. Holdeman wrote:
> OK,
> So what is wrong with this patch:

What is the error message?  :)

What I normally do is: unpack the affected tarball, copy the 
affected files to .orig versions, make the necessary changes, 
create a patch from above the topdir with 'diff -u' between the 
orig files and the changed files, stick that patch in the 
${FILESDIR} in the overlay, and add its name to PATCHES.

The patch you show isn't one created with 'diff -u', 'patch' may 
simply not recognize it.

Benno
-- 
gentoo-user@gentoo.org mailing list

Re: [gentoo-user] korganizer patch

[Michael W. Holdeman]

On Wednesday 26 October 2005 17:27, Benno Schulenberg wrote:
> Michael W. Holdeman wrote:
> > OK,
> > So what is wrong with this patch:
>
> What is the error message?  :)
>
> What I normally do is: unpack the affected tarball, copy the
> affected files to .orig versions, make the necessary changes,
> create a patch from above the topdir with 'diff -u' between the
> orig files and the changed files, stick that patch in the
> ${FILESDIR} in the overlay, and add its name to PATCHES.
>
> The patch you show isn't one created with 'diff -u', 'patch' may
> simply not recognize it.
>
I shall try it.

Mike

ps.
* Applying korganizer-monthview.patch ...

 * Failed Patch: korganizer-monthview.patch !
 *  
( /usr/local/overlays/kde-base/korganizer/files/korganizer-monthview.patch )
 *
 * Include in your bugreport the contents of:
 *
 
*   /var/tmp/portage/korganizer-3.5.0_beta2/temp/korganizer-monthview.patch-25061.out


 
Michael W. Holdeman


________________________________________
Powered by Gentoo Linux www.gentoo.org  |
Kernel 2.6.11-ck8                       |
Win4Lin 5-1-20 netraverse.com           |
Win4LinPro 6.1.1-03 win4lin.com         |
________________________________________|
-- 
gentoo-user@gentoo.org mailing list