bugFreeciv - Bugs: bug #20698, Version check incorrectly...

 
 
Show feedback again

bug #20698: Version check incorrectly considers "2.4.0" older than "2.4.0-beta1"

Submitted by:  Jacob Nevins <jtn>
Submitted on:  Mon 01 Apr 2013 11:58:16 AM UTC  
 
Category: generalSeverity: 3 - Normal
Priority: 5 - NormalStatus: Fixed
Assigned to: Jacob Nevins <jtn>Open/Closed: Closed
Release: 2.4.0-beta1Operating System: Any
Planned Release: 2.4.0-beta2,2.5.0

Add a New Comment (Rich MarkupRich Markup):
   

You are not logged in

Please log in, so followups can be emailed to you.

 

(Jump to the original submission Jump to the original submission)

Tue 09 Apr 2013 06:54:30 PM UTC, SVN revision 22702:

Fix version checking to consider "2.4.0" later than "2.4.0-beta1"
by importing cvercmp upstream revisions r22 and r24 (always subtokenize).

See gna bug #20698.

(Browse SVN revision 22702)

Jacob Nevins <jtn>
Project AdministratorIn charge of this item.
Tue 09 Apr 2013 06:49:57 PM UTC, SVN revision 22701:

Fix version checking to consider "2.4.0" later than "2.4.0-beta1"
by importing cvercmp upstream revisions r22 and r24 (always subtokenize).

See gna bug #20698.

(Browse SVN revision 22701)

Jacob Nevins <jtn>
Project AdministratorIn charge of this item.
Sun 07 Apr 2013 11:46:26 PM UTC, comment #5:

Attached the Freeciv version.
This is the combination of r22 and r24 from upstream, with the addition of an extra initialisation which quells a 'may be used uninitialised' warning which shows up in my Freeciv build but didn't in my cvercmp build (probably because I had built -O0 for debugging). Also attached the equivalent patch for cvercmp upstream.

(file #17708)

Jacob Nevins <jtn>
Project AdministratorIn charge of this item.
Sun 07 Apr 2013 09:17:49 PM UTC, comment #4:

> Assigned to cazfi to decide whether he likes them for upstream. > If so, I can turn the net cvercmp.c change (previous + this)
> into a Freeciv patch.


I've committed file #17638 to upstream as is. I may rework test suite a bit before committing it, but it's not affecting cvercmp.[ch] which is all that freeciv is interested about.

Marko Lindqvist <cazfi>
Project Administrator
Sat 06 Apr 2013 05:32:32 PM UTC, comment #3:

> One solution would be jtn granting copyright over his
> contributions to me (the fsf way of handling contributions)

I'm fine with assigning copyright to you for the cvercmp changes I've submitted to date under this ticket and bug #20680.

Jacob Nevins <jtn>
Project AdministratorIn charge of this item.
Sat 06 Apr 2013 05:26:19 PM UTC, comment #2:

One thing I have to decide about accepting contributions to upstream cvercmp is licensing. Currently I have copyright of everything in there, so I have freedom to relicense / dual (and more) license how ever I wish. I'd like to keep that right to myself - not so much for cvercmp itself as for some other projects where I have copy of it included.
Obviously by submitting copy to freeciv I've given that version out as GPLv2+ at least (but I can still dual-license it).

One solution would be jtn granting copyright over his contributions to me (the fsf way of handling contributions)

Marko Lindqvist <cazfi>
Project Administrator
Sat 06 Apr 2013 12:43:36 PM UTC, comment #1:

Attached a proposed rework of cvercmp which uses subtokenization always, so that in addition to upstream 1.0.2 "2.4.0-beta1 < 2.4.0", we have "2.4.0-betamax > 2.4.0".

Also attached an overengineered regression test suite for upstream, which passes with this patch and fails without (and could have triggered the segfaults of bug #20680). (Perhaps this should be plumbed into the build system somehow? I haven't investigated.)

Assigned to cazfi to decide whether he likes them for upstream. If so, I can turn the net cvercmp.c change (previous + this) into a Freeciv patch.

(file #17683, file #17684)

Jacob Nevins <jtn>
Project AdministratorIn charge of this item.
Mon 01 Apr 2013 11:58:16 AM UTC, original submission:

Split out from bug #20680.

Bug exists in our copy of cvercmp. There's a fix upstream (1.0.2, r22), but I want to think if we can do a bit better.

Jacob Nevins <jtn>
Project AdministratorIn charge of this item.

 

(Note: upload size limit is set to 1024 kB, after insertion of the required escape characters.)

Attach File(s):
   
   
Comment:
   

Attached Files
file #17709:  cvercmp-used-uninit-warning.patch added by jtn (615B - text/x-diff - cvercmp r24: quell a 'may be used uninitialised' warning (included in file #17708))
file #17708:  trunk-S2_4-cvercmp-subtokenize.patch added by jtn (8kB - text/x-diff - trunk/S2_4 r22685)
file #17683:  cvercmp-subtokenize-more.patch added by jtn (7kB - text/x-diff - cvercmp 1.0.2 / r22)
file #17684:  cvercmp-test-suite.patch added by jtn (9kB - text/x-diff - cvercmp 1.0.2 / r22)

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -unavailable- added by cazfi (Posted a comment)
  • -unavailable- added by jtn
  • -unavailable- added by jtn (Submitted the item)
  •  

    Do you think this task is very important?
    If so, you can click here to add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

    Please enter the title of George Orwell's famous dystopian book (it's a date):

     

     

    Follow 10 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Tue 09 Apr 2013 06:54:50 PM UTCjtnStatusReady For Test=>Fixed
      Open/ClosedOpen=>Closed
    Sun 07 Apr 2013 11:47:08 PM UTCjtnAttached File-=>Added cvercmp-used-uninit-warning.patch, #17709
    Sun 07 Apr 2013 11:46:26 PM UTCjtnAttached File-=>Added trunk-S2_4-cvercmp-subtokenize.patch, #17708
    Sun 07 Apr 2013 09:17:49 PM UTCcazfiAssigned tocazfi=>jtn
    Sat 06 Apr 2013 12:43:36 PM UTCjtnAttached File-=>Added cvercmp-subtokenize-more.patch, #17683
      Attached File-=>Added cvercmp-test-suite.patch, #17684
      StatusNone=>Ready For Test
      Assigned tojtn=>cazfi
    Mon 01 Apr 2013 12:10:14 PM UTCjtnCarbon-Copy-=>Added cazfi
    Show feedback again

    Back to the top


    Powered by Savane 3.1-cleanup