[Koha-devel] Cherry-picking and SIPServer unification

[Galen Charlton]

Hi,

Via the magic of git cherry-pick -X ignore-space-change, it turns out
that at least some patches made on Koha's fork of SipServer (a.k.a.
OpenNCIP) can be brought over mostly as is.

For example, consider Koha bug 3723 [1], SIPServer bug 1180479 [2],
and the patch of Colin's I was able to cherry-pick as a proposed fix
for SIPServer [3].

SIPServer is a GPL2+ project (though note that although the license
change from GPL2 to GPL2+ has been agreed to by all significantly
copyright holders, there's a patch pending to update the source files
accordingly).  Koha, of course, is GPL3+ and once was GPL2+.

Per my reading of the GPL compatibility matrix [4], I don't see any
licensing bar to cherry-picking patches over from Koha to SIPServer,
because future releases of SIPServer can be "conveyed" as GPL3.

Consequently, I intend to do some cherry-picking to help move us to
the point where Koha can fold its fork into.

If anybody sees a technical or licensing problem with this, please let me know.

[1] http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3723
[2] https://bugs.launchpad.net/sipserver/+bug/1180479
[3] http://git.evergreen-ils.org/?p=working/SIPServer.git;a=commit;h=bbee352fc8c275ff65f816120b7ac9f4cf969c39
[4] http://www.gnu.org/licenses/gpl-faq.html#AllCompatibility

Regards,

Galen
--
Galen Charlton
Manager of Implementation
Equinox Software, Inc. / The Open Source Experts
email:  gmc at esilibrary.com
direct: +1 770-709-5581
cell:   +1 404-984-4366
skype:  gmcharlt
web:    http://www.esilibrary.com/
Supporting Koha and Evergreen: http://koha-community.org &
http://evergreen-ils.org