Skip to contentSkip to conversation

cppcms: fix license

PATCH New Fabrice Fontaine 3 participants 5 messages Sep 18, 2018 – Oct 5, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 cppcms: fix license

cppcms contains embedded third party software so add THIRD_PARTY_SOFTWARE.TXT to CPPCMS_LICENSE_FILES as well as the additional licenses to CPPCMS_LICENSE.
Also add hash for COPYING.TXT and THIRD_PARTY_SOFTWARE.TXT

---
 package/cppcms/cppcms.hash | 2 ++
 package/cppcms/cppcms.mk   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
package/cppcms/cppcms.hash +2 -0
index 28e998c6c1..6bfc680ac0 100644
@@ -3,3 +3,5 @@ sha1	15f21897c14acfd4b0c74622e49d95857f2fe939	cppcms-1.0.5.tar.bz2
 md5	d668c201dd31fff8090380ebdc0bcc2b	cppcms-1.0.5.tar.bz2
 # Locally computed:
 sha256	84b685977bca97c3e997497f227bd5906adb80555066d811a7046b01c2f51865	cppcms-1.0.5.tar.bz2
+sha256	2ff22bab712c46dbadf9bae0f759bbc95d5d87614cacb7ebc3d5a50910603d6a	COPYING.TXT
+sha256	70fbf0194bee0f444c57ecd47e7d976a3e5a890e4421a21aab49f2d214267e69	THIRD_PARTY_SOFTWARE.TXT
package/cppcms/cppcms.mk +2 -2
index f3ea2628ea..5fb6375d80 100644
@@ -6,8 +6,8 @@
 
 CPPCMS_VERSION = 1.0.5
 CPPCMS_SOURCE = cppcms-$(CPPCMS_VERSION).tar.bz2
-CPPCMS_LICENSE = LGPL-3.0
-CPPCMS_LICENSE_FILES = COPYING.TXT
+CPPCMS_LICENSE = LGPL-3.0, BSL-1.0 (boost), MIT (base64.cpp), Public Domain (json2.js), Zlib (md5)
+CPPCMS_LICENSE_FILES = COPYING.TXT THIRD_PARTY_SOFTWARE.TXT
 CPPCMS_SITE = http://downloads.sourceforge.net/project/cppcms/cppcms/$(CPPCMS_VERSION)
 CPPCMS_INSTALL_STAGING = YES
 CPPCMS_CXXFLAGS = $(TARGET_CXXFLAGS)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 cppcms: bump to version 1.2.1

cppcms is now licensed under MIT so update license and add hash for MIT.TXT

---
 package/cppcms/cppcms.hash | 13 +++++++------
 package/cppcms/cppcms.mk   |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)
package/cppcms/cppcms.hash +7 -6
index 6bfc680ac0..1d3c9179e7 100644
@@ -1,7 +1,8 @@
-# From http://sourceforge.net/projects/cppcms/files/cppcms/1.0.5/
-sha1	15f21897c14acfd4b0c74622e49d95857f2fe939	cppcms-1.0.5.tar.bz2
-md5	d668c201dd31fff8090380ebdc0bcc2b	cppcms-1.0.5.tar.bz2
+# From http://sourceforge.net/projects/cppcms/files/cppcms/1.2.1/
+sha1	9cb25cc5d507d2f4235326ba3815eba252b4ac77	cppcms-1.2.1.tar.bz2
+md5	2bb259fefb86532e404207c71c094a0c	cppcms-1.2.1.tar.bz2
 # Locally computed:
-sha256	84b685977bca97c3e997497f227bd5906adb80555066d811a7046b01c2f51865	cppcms-1.0.5.tar.bz2
-sha256	2ff22bab712c46dbadf9bae0f759bbc95d5d87614cacb7ebc3d5a50910603d6a	COPYING.TXT
-sha256	70fbf0194bee0f444c57ecd47e7d976a3e5a890e4421a21aab49f2d214267e69	THIRD_PARTY_SOFTWARE.TXT
+sha256  10fec7710409c949a229b9019ea065e25ff5687103037551b6f05716bf6cac52        cppcms-1.2.1.tar.bz2
+sha256  fb7c15ddf590037d4cd18ebd61148a2304b9243369d238a64f599182377e32db        COPYING.TXT
+sha256	3e4012cc5950e05bedfdd2f00ceffe1ef71c46ac8c79f07e237ecb23c773f65f	MIT.TXT
+sha256	d6ce062e5cf4f7e3c536d7d2fee84c882c45245f1848ed3162401f2b29fa2b4b	THIRD_PARTY_SOFTWARE.TXT
package/cppcms/cppcms.mk +3 -3
index 5fb6375d80..b289617bbc 100644
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-CPPCMS_VERSION = 1.0.5
+CPPCMS_VERSION = 1.2.1
 CPPCMS_SOURCE = cppcms-$(CPPCMS_VERSION).tar.bz2
-CPPCMS_LICENSE = LGPL-3.0, BSL-1.0 (boost), MIT (base64.cpp), Public Domain (json2.js), Zlib (md5)
-CPPCMS_LICENSE_FILES = COPYING.TXT THIRD_PARTY_SOFTWARE.TXT
+CPPCMS_LICENSE = MIT, BSL-1.0 (boost), Public Domain (json2.js), Zlib (md5)
+CPPCMS_LICENSE_FILES = COPYING.TXT MIT.TXT THIRD_PARTY_SOFTWARE.TXT
 CPPCMS_SITE = http://downloads.sourceforge.net/project/cppcms/cppcms/$(CPPCMS_VERSION)
 CPPCMS_INSTALL_STAGING = YES
 CPPCMS_CXXFLAGS = $(TARGET_CXXFLAGS)
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/2 cppcms: bump to version 1.2.1

Hello,

Quoted 18 lines · Fabrice Fontaine

cppcms is now licensed under MIT so update license and add hash for MIT.TXT

---
 package/cppcms/cppcms.hash | 13 +++++++------
 package/cppcms/cppcms.mk   |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)
package/cppcms/cppcms.hash +1 -3
index 6bfc680ac0..1d3c9179e7 100644
@@ -1,7 +1,8 @@
-# From http://sourceforge.net/projects/cppcms/files/cppcms/1.0.5/
-sha1	15f21897c14acfd4b0c74622e49d95857f2fe939	cppcms-1.0.5.tar.bz2
-md5	d668c201dd31fff8090380ebdc0bcc2b	cppcms-1.0.5.tar.bz2
+# From http://sourceforge.net/projects/cppcms/files/cppcms/1.2.1/

package/cppcms/cppcms.hash line 8

Quoted 10 lines
package/cppcms/cppcms.hash +6 -3
+sha1	9cb25cc5d507d2f4235326ba3815eba252b4ac77	cppcms-1.2.1.tar.bz2
+md5	2bb259fefb86532e404207c71c094a0c	cppcms-1.2.1.tar.bz2
 # Locally computed:
-sha256	84b685977bca97c3e997497f227bd5906adb80555066d811a7046b01c2f51865	cppcms-1.0.5.tar.bz2
-sha256	2ff22bab712c46dbadf9bae0f759bbc95d5d87614cacb7ebc3d5a50910603d6a	COPYING.TXT
-sha256	70fbf0194bee0f444c57ecd47e7d976a3e5a890e4421a21aab49f2d214267e69	THIRD_PARTY_SOFTWARE.TXT
+sha256  10fec7710409c949a229b9019ea065e25ff5687103037551b6f05716bf6cac52        cppcms-1.2.1.tar.bz2
+sha256  fb7c15ddf590037d4cd18ebd61148a2304b9243369d238a64f599182377e32db        COPYING.TXT
+sha256	3e4012cc5950e05bedfdd2f00ceffe1ef71c46ac8c79f07e237ecb23c773f65f	MIT.TXT
+sha256	d6ce062e5cf4f7e3c536d7d2fee84c882c45245f1848ed3162401f2b29fa2b4b	THIRD_PARTY_SOFTWARE.TXT

There was a mixup of tabs and spaces here, so I fixed that up and applied to master. Thanks!

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/2 cppcms: fix license

In reply to Fabrice Fontaine

Hello,

Quoted 10 lines · Fabrice Fontaine

cppcms contains embedded third party software so add THIRD_PARTY_SOFTWARE.TXT to CPPCMS_LICENSE_FILES as well as the additional licenses to CPPCMS_LICENSE.
Also add hash for COPYING.TXT and THIRD_PARTY_SOFTWARE.TXT

---
 package/cppcms/cppcms.hash | 2 ++
 package/cppcms/cppcms.mk   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 1/2 cppcms: fix license

In reply to Fabrice Fontaine
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

cppcms contains embedded third party software so add THIRD_PARTY_SOFTWARE.TXT to CPPCMS_LICENSE_FILES as well as the additional licenses to CPPCMS_LICENSE.
Also add hash for COPYING.TXT and THIRD_PARTY_SOFTWARE.TXT

Committed to 2018.02.x, 2018.05.x and 2018.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard