summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Randolf <br1@subnet.at>2004-12-03 15:35:18 +0000
committerBruno Randolf <br1@subnet.at>2004-12-03 15:35:18 +0000
commit9dc659a02bffedbc2a2dedc1d606af2fbae6fdd7 (patch)
tree50168a79dd7bff676cfd619d303eab51a42c3d97
parent5d878927488eb9f251df0d53feaec22228f29991 (diff)
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
-rw-r--r--conf/licenses.conf2
-rw-r--r--openssl/openssl_0.9.7d.oe2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/licenses.conf b/conf/licenses.conf
index db3f78e10f..1ba1e2eace 100644
--- 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 cfaa9e396f..60ed6799c6 100644
--- 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 \