Merge oe-devel@oe-devel.bkbits.net:packages

into null.(none):/data/mtx/oe/packages

2004/12/03 16:33:56+01:00 (none)!br1
changed license of openssl to "openssl" and added it to SRC_DISTRIBUTE_LICENSES

BKrev: 41b087b62RUqLw4wE_QHhF8F_4c_nw

diff --git a/conf/licenses.conf b/conf/licenses.conf
index db3f78e..1ba1e2e 100644 (file)
--- a/conf/licenses.conf
+++ b/conf/licenses.conf
@@ -1,4 +1,4 @@
 SRC_DISTRIBUTE_LICENSES = "GPL GPLv2 BSD LGPL Apache-2.0 QPL AFL"
 SRC_DISTRIBUTE_LICENSES += "MIT Sleepycat Classpath Perl PSF PD Artistic"
-SRC_DISTRIBUTE_LICENSES += "bzip2 zlib ntp cron libpng netperf"
+SRC_DISTRIBUTE_LICENSES += "bzip2 zlib ntp cron libpng netperf openssl"
 

diff --git a/openssl/openssl_0.9.7d.oe b/openssl/openssl_0.9.7d.oe
index cfaa9e3..60ed679 100644 (file)
--- a/openssl/openssl_0.9.7d.oe
+++ b/openssl/openssl_0.9.7d.oe
@@ -1,7 +1,7 @@
 SECTION = "libs"
 DESCRIPTION = "Secure Socket Layer (SSL) binary and related cryptographic tools."
 HOMEPAGE = "http://www.openssl.org/"
-LICENSE = "Apache"
+LICENSE = "openssl"
 PR = "r2"
 
 SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \