Commit Graph

4978 Commits

Author SHA1 Message Date
George McCollister
9e0586e889 networkmanager: use bash-completion.bbclass
Use bash-completion.bbclass to package bash completions.

Signed-off-by: George McCollister <george.mccollister@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:16:53 +01:00
George McCollister
44e7994dd1 bash-completion: move to oe-core
Move bash-completion to OE core since recipes are creating packages that
should RDEPEND on bash-completion.

Signed-off-by: George McCollister <george.mccollister@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:16:53 +01:00
Mike Crowe
2cbf2ac87c nbench-byte: Explicitly set EXTRA_OEMAKE as required
This recipe currently relies on EXTRA_OEMAKE having been to set to "-e
MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this
explicit so that the default in bitbake.conf can be changed.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:16:38 +01:00
Mike Crowe
f941c1b364 ckermit: Explicitly set EXTRA_OEMAKE as required
This recipe currently relies on EXTRA_OEMAKE having been to set to "-e
MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this
explicit so that the default in bitbake.conf can be changed.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:16:38 +01:00
Mike Crowe
8033474218 rarpd: Explicitly set EXTRA_OEMAKE as required
This recipe currently relies on EXTRA_OEMAKE having been to set to "-e
MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this
explicit so that the default in bitbake.conf can be changed.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:16:38 +01:00
Mike Crowe
f2a337432e yavta: Explicitly set EXTRA_OEMAKE as required
This recipe currently relies on EXTRA_OEMAKE having been to set to "-e
MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this
explicit so that the default in bitbake.conf can be changed.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:16:38 +01:00
Mike Crowe
028ada697c serialcheck: Explicitly set EXTRA_OEMAKE as required
This recipe currently relies on EXTRA_OEMAKE having been to set to "-e
MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this
explicit so that the default in bitbake.conf can be changed.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:16:37 +01:00
Mike Crowe
5a5d24f8b0 iptraf: Explicitly set EXTRA_OEMAKE as required
This recipe currently relies on EXTRA_OEMAKE having been to set to "-e
MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this
explicit so that the default in bitbake.conf can be changed.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:16:37 +01:00
Mike Crowe
17509aec29 mg: Explicitly set EXTRA_OEMAKE as required
This recipe currently relies on EXTRA_OEMAKE having been to set to "-e
MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this
explicit so that the default in bitbake.conf can be changed.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:16:37 +01:00
Mike Crowe
2dfb2b2dab pngcheck: Explicitly set EXTRA_OEMAKE as required
This recipe currently relies on EXTRA_OEMAKE having been to set to "-e
MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this
explicit so that the default in bitbake.conf can be changed.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:16:37 +01:00
Martin Jansa
fcee650591 vboxguestdrivers: upgrade to 4.3.36
* 4.3.30 isn't compatible with newer kernels and fails with:
  4.3.30-r0/vbox_module/vboxsf/lnkops.c: In function 'sf_follow_link':
  4.3.30-r0/vbox_module/vboxsf/lnkops.c:43:5: error: implicit declaration of function 'nd_set_link' [-Werror=implicit-function-declaration]
     nd_set_link(nd, error ? ERR_PTR(error) : path);
     ^
  4.3.30-r0/vbox_module/vboxsf/lnkops.c: In function 'sf_put_link':
  4.3.30-r0/vbox_module/vboxsf/lnkops.c:49:18: error: implicit declaration of function 'nd_get_link' [-Werror=implicit-function-declaration]
     char *page = nd_get_link(nd);
                  ^
* see:
  https://www.virtualbox.org/ticket/14227

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:16:37 +01:00
Andreas Müller
ac236fbf94 hunspell: initial add 1.3.3
There are at least three different places where hunspell recipe is found [1-3]. Let's
move it to a more common place to avoid further redundancy.

Native extension is required for libreoffice-native in meta-office [4].

[1] https://github.com/openwebos/meta-webos/blob/master/recipes-upstreamable/hunspell/hunspell_1.3.2.bb
[2] https://github.com/webOS-ports/meta-webos-ports/blob/master/meta-luneos/recipes-upstreamable/hunspell/hunspell_1.3.2.bb
[3] https://github.com/schnitzeltony/meta-office/blob/master/recipes-support/hunspell/hunspell_1.3.3.bb
[4] https://github.com/schnitzeltony/meta-office

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:15:28 +01:00
Ioan-Adrian Ratiu
4c2f0370fb openldap: enable native build
This is required by the apr-util & apache2 recipes to enable
ldap support without breaking the build (nothing provides -native)

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:15:27 +01:00
Sven Ebenfeld
0c024ec106 mongodb: 2.6.0 -> 3.3.0 and remove from pnblacklist
Since building mongodb was impossible currently, I updated the recipe
and got it working on arm >= v6, x86 and x86_64. Unfortunately, it fails
building with system-boost for the current version 1.60. The corresponding
ticket SERVER-17294 of mongodb jira is still in progress. So we use the
built-in version of boost.

Signed-off-by: Sven Ebenfeld <sven.ebenfeld@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:15:27 +01:00
Paul Vaduva
142d6fb402 lua: Added ptest for lua
Signed-off-by: Andreas Sundstr
Signed-off-by: Maxin B. John <maxin.john@enea.com>
Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:15:27 +01:00
Ioan-Adrian Ratiu
32ed5e4e15 start-stop-daemon: Upgrade 1.16.0.2 -> 1.17.25
Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Brad Mouring <brad.mouring@ni.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:15:26 +01:00
Trevor Woerner
33965e42d2 nodejs: upgrade from 4.2.4 to 4.2.6
...plus a switch to xz.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-15 10:15:26 +01:00
Andreas Müller
bb3bc1ad97 geis: initial add 2.2.17
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:58:07 +01:00
Andreas Müller
574d277373 grail: initial add 3.1.0
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:58:07 +01:00
Andreas Müller
779aa9dfd9 frame: initial add 2.5.0
Note: configure.ac asks for xorg-server explicitly.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:58:07 +01:00
Kai Kang
05960f3299 atop: add recipe
Add recipe for atop.

* remove bashisms for scripts
* fix permissions for executable files
* create volatile directory /var/volatile/log/atop
* implement status command in sysvinit script
* drop atopacctd which is excluded from most distribution such as Ubuntu
  and Fedora

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:58:06 +01:00
Denys Dmytriyenko
668468d59c memtester: upgrade 4.1.3 -> 4.3.0
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:58:06 +01:00
Derek Straka
3a43f6897c php: update to 5.6.17 and 5.5.31
Fixes CVE-2016-1903 and other bugs
https://secure.php.net/ChangeLog-5.php
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-1903

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:58:06 +01:00
Derek Straka
7744e5992c php: check for existance of directory before 'rmdir' in do_install_append_class-target
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:58:06 +01:00
Koen Kooi
230f333a05 various: delete leftovers from qt4 recipes
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:58:05 +01:00
Li xin
0a7502242e networkmanager: add PACKAGECONFIG for qt4-x11-free
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
2016-02-01 15:58:05 +01:00
Bruno Vernay
f3b3c1fdd8 openldap: improve packaging of OpenLDAP modules
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:58:05 +01:00
Roy Li
4497ee4349 libx86-1: port a patch to make it work
port a patch from libx86-1.1-21.fc23.src.rpm, and make libx86-1 be able to work
and assume zero which return by LRMI_common_init is valid address

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:58:04 +01:00
Khem Raj
8404784b35 polkit: Fix build with musl
Make features like netgroup optional, these are not supported by posix
secondly they are poked at during configure so nothing changes for glibc
based systems but it helps compiling with musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:58:04 +01:00
Khem Raj
484fbf6979 fbset: Fix out of tree builds ( S != B )
Remove assumption about glibc == linux

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:58:03 +01:00
Khem Raj
9cf9d864d5 lvm2: Portable fixes for fixing compile with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:51:19 +01:00
Armin Kuster
a6b22d2d57 numactl: update to 2.0.11
LIC_FILES_CKSUM changed do to adding version history.

Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:51:19 +01:00
Bob Ham
9d140fd109 wmiconfig: mark as having broken "make clean"
Set CLEANBROKEN as the Makefile has no "clean" target.

Signed-off-by: Bob Ham <bob.ham@collabora.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:51:19 +01:00
Bob Ham
e5fa3a5ca5 s3c64xx-gpio: mark as having broken "make clean"
Set CLEANBROKEN as the Makefile has no "clean" target.

Signed-off-by: Bob Ham <bob.ham@collabora.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:51:18 +01:00
Bob Ham
ad234b4c67 s3c24xx-gpio: mark as having broken "make clean"
Set CLEANBROKEN as the Makefile has no "clean" target.

Signed-off-by: Bob Ham <bob.ham@collabora.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:51:18 +01:00
Robert Yang
5e99b0dc87 scsirastools: remove inherit autotools_stage
The autotools can instead of it.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-02-01 15:31:26 +01:00
Martin Jansa
73854a0556 telepathy-glib: update python-native-runtime dependency
* it was renamed in oe-core with:
  commit 8a474057d86b3ebf6271656d6b9adf384ea9ad6d
  Author: Ed Bartosh <ed.bartosh@linux.intel.com>
  Date:   Wed Jan 13 10:03:04 2016 +0200

    bitbake.conf: rename python-native-runtime

    The code in native.bbclass adds -native suffix to the package
    names that don't have it.

    Renamed python-native-runtime -> hostpython-runtime-native to avoid
    mangling it and to conform with the naming convetion for native
    packages.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-01-27 12:43:57 +01:00
Martin Jansa
b82601c25e phoronix-test-suite: exclude bash, php, python dependency with SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS
* otherwise the recipe cannot inherit allarch. as detected with
  openembedded-core/scripts/sstate-diff-machines.sh:

 === Comparing signatures for task do_package_write_ipk.sigdata between qemux86copy and qemuarm ===
ERROR: phoronix-test-suite different signature for task do_package_write_ipk.sigdata between qemux86copy and qemuarm
runtaskdeps changed from ['bashbash_4.3.30.bb.do_packagedata', 'opkg-utilsopkg-utils_git.bb.do_populate_sysroot:virtual:native', 'phoronix-test-suitephoronix-test-suite_6.0.1.bb.do_package', 'phoronix-test-suitephoronix-test-suite_6.0.1.bb.do_packagedata', 'phpphp_5.6.16.bb.do_packagedata', 'pseudopseudo_1.7.4.bb.do_populate_sysroot:virtual:native', 'pythonpython_2.7.9.bb.do_packagedata'] to ['bashbash_4.3.30.bb.do_packagedata', 'opkg-utilsopkg-utils_git.bb.do_populate_sysroot:virtual:native', 'phoronix-test-suitephoronix-test-suite_6.0.1.bb.do_package', 'phoronix-test-suitephoronix-test-suite_6.0.1.bb.do_packagedata', 'phpphp_5.6.16.bb.do_packagedata', 'pseudopseudo_1.7.4.bb.do_populate_sysroot:virtual:native', 'pythonpython_2.7.9.bb.do_packagedata']
/home/jenkins/oe/world/shr-core/openembedded-core/meta/recipes-extended/bash/bash_4.3.30.bb.do_packagedata with hash 6750d401e680e6e5dac8e8585c43b386
 changed to
/home/jenkins/oe/world/shr-core/openembedded-core/meta/recipes-extended/bash/bash_4.3.30.bb.do_packagedata with hash bc992ff361286bc2f048935132a20348
/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-devtools/php/php_5.6.16.bb.do_packagedata with hash 17a21823eea3e0d1cce1d516f77b23ad
 changed to
/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-devtools/php/php_5.6.16.bb.do_packagedata with hash 6058efb32e6f622aa866f982c3688f08
/home/jenkins/oe/world/shr-core/openembedded-core/meta/recipes-devtools/python/python_2.7.9.bb.do_packagedata with hash 4e3278467af71cb9d0219f674415a2fa
 changed to
/home/jenkins/oe/world/shr-core/openembedded-core/meta/recipes-devtools/python/python_2.7.9.bb.do_packagedata with hash 4186010efd8bd3464948437ae114ec2a
Hash for dependent task phpphp_5.6.16.bb.do_packagedata changed from 17a21823eea3e0d1cce1d516f77b23ad to 6058efb32e6f622aa866f982c3688f08
Hash for dependent task bashbash_4.3.30.bb.do_packagedata changed from 6750d401e680e6e5dac8e8585c43b386 to bc992ff361286bc2f048935132a20348
Hash for dependent task pythonpython_2.7.9.bb.do_packagedata changed from 4e3278467af71cb9d0219f674415a2fa to 4186010efd8bd3464948437ae114ec2a

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-01-27 12:43:57 +01:00
Dai Caiyun
2a7be1d4f5 cryptsetup: 1.6.7 -> 1.7.0
Upgrade cryptsetup from 1.6.7 to 1.7.0.

Signed-off-by: Dai Caiyun <daicy.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-01-27 12:43:57 +01:00
Maxin B. John
1e2d9ae318 libjpeg-turbo: remove recipe
Remove libjpeg-turbo package from meta-oe as it will be moved to oe-core
to replace libjpeg package.

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-01-27 12:43:57 +01:00
Dai Caiyun
72210ea476 syslog-ng: 3.5.4.1 -> 3.6.4
Upgrade syslog-ng from 3.5.4.1 to 3.6.4.

1) Modify the syslog-ng.service-the-syslog-ng-service.patch,since the datas has been changed.
2) Delete these patches,since they are not needed any more.
    afsql-afsql_dd_insert_db-refactor.patch
    deinit-the-new-config-when-reverting-to-the.patch
    free-global-LogTemplateOptions.patch
    still-free-the-unconsumed-item.patch
    syslog-ng-verify-the-list-before-del.patch
    rewrite-expr-grammar.ym-Free-up-token.patch
    logwriter-dont-allocate-a-new-buffer.patch
3) Fix WARNING:
    QA Issue: syslog-ng-libs rdepends on libpcre, but it isn't a build dependency? [build-deps]
    QA Issue: syslog-ng rdepends on libpcre, but it isn't a build dependency? [build-deps]
4) Fix ERROR: QA Issue: non -staticdev package contains static .a library:
    work/i586-poky-linux/syslog-ng/3.6.4-r0/packages-split/syslog-ng/usr/lib/syslog-ng/libtest/libsyslog-ng-test.a' [staticdev]

Signed-off-by: Dai Caiyun <daicy.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-01-27 12:43:56 +01:00
Derek Straka
19a3f18e1e jq: upgrade to 1.5
update source url and checksums
license checksum update since trailing whitespace removed upstream
disable-maintainer-mode to avoid bison > 3.0 dependency

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-01-27 12:43:56 +01:00
Adrian
99e89431ff networkmanager-openvpn: Update to 1.0.8
Signed-off-by: Adrian Freihofer <adrian.freihofer@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-01-27 12:43:56 +01:00
Dai Caiyun
4817da9207 networkmanager: 1.0.6 -> 1.0.10
* Upgrade networkmanager from 1.0.6 to 1.0.10.
* add patches:
  - Apply three bug fix patches from NM git.
  - Apply a patch to fix a bug in the header files breaking gnome-panel build.
  - fix ppp rdepend: pppd is not on the target if NM does not rdepend on it.

Signed-off-by: Adrian Freihofer <adrian.freihofer@gmail.com>
Signed-off-by: Dai Caiyun <daicy.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-01-27 12:43:56 +01:00
Belal, Awais
8e49262b12 mplayer2: fix building with gcc 5.x
This patch works around a potential problem in the theora
glue code where it assumes that the compiler will
somehow find a function which is not exported explicitly
through the libtheora library. Due to this problem the
build fails with gcc-5.x compiler.
The included patch essentially backports a commit which
updates the glue code to use the Theora 1.0 API to
eliminate this problem and PNBLACKLIST is cleared
for mplayer2.

Signed-off-by: Awais Belal <awais_belal@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-01-27 12:43:55 +01:00
Yi Zhao
e27a8ed92b logwatch: fix host-user-contaminated
Fix QA warning:
WARNING: QA Issue: logwatch: /logwatch/usr/share/logwatch/scripts/services/resolver is owned by uid 1000,
which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-01-27 12:36:32 +01:00
Yi Zhao
e1e5e884ad orrery: fix host-user-contaminated
Fix QA warning:
WARNING: QA Issue: orrery: /orrery/usr/share/orrery/deepSky/messier is owned by uid 1000,
which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-01-27 12:36:32 +01:00
Yi Zhao
e644f3c8e8 espeak: fix host-user-contaminated
Fix QA warning:
WARNING: QA Issue: espeak: /espeak/usr/share/espeak-data/mbrola_ph/de6_phtrans is owned by uid 1000,
which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-01-27 12:36:31 +01:00
Yi Zhao
79d2df777b debootstrap: fix host-user-contaminated
Fix QA warning:
WARNING: QA Issue: debootstrap: /debootstrap/usr/share/debootstrap/scripts/gutsy is owned by uid 1000,
which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-01-27 12:36:31 +01:00
Trevor Woerner
ab21935a7e nodejs: update from 4.2.3 to 4.2.4
Additionally, the LICENSE file changed as follows:

   - npm is a package manager program located at deps/npm.
     npm's license follows:
     """
  -    Copyright (c) Isaac Z. Schlueter
  -    All rights reserved.
  -
  -    npm is released under the Artistic 2.0 License.
  -    The text of the License follows:
  +    The npm application
  +    Copyright (c) npm, Inc. and Contributors
  +    Licensed on the terms of The Artistic License 2.0
  +
  +    Node package dependencies of the npm application
  +    Copyright (c) their respective copyright owners
  +    Licensed on their respective license terms
  +
  +    The npm public registry at https://registry.npmjs.com
  +    and the npm website at https://www.npmjs.com
  +    Operated by npm, Inc.
  +    Use governed by terms published on https://www.npmjs.com
  +
  +    "Node.js"
  +    Trademark Joyent, Inc., https://joyent.com
  +    Neither npm nor npm, Inc. are affiliated with Joyent, Inc.
  +
  +    The Node.js application
  +    Project of Node Foundation, https://nodejs.org
  +
  +    The npm Logo
  +    Copyright (c) Mathias Pettersson and Brian Hammond
  +
  +    "Gubblebum Blocky" typeface
  +    Copyright (c) Tjarda Koster, https://jelloween.deviantart.com
  +    Used with permission

  ...

  -    "Node.js" and "node" trademark Joyent, Inc. npm is not officially
  -    part of the Node.js project, and is neither owned by nor
  -    officially affiliated with Joyent, Inc.
  -
  -    Packages published in the npm registry (other than the Software and
  -    its included dependencies) are not part of npm itself, are the sole
  -    property of their respective maintainers, and are not covered by
  -    this license.
  +    The following additional terms shall apply to use of the npm software, the npm
  +    website, the npm repository and any other services or products offered by npm,
  +    Inc.:
  +
  +    "Node.js" trademark Joyent, Inc.  npm is not officially part of the Node.js
  +    project, and is neither owned by nor affiliated with Joyent, Inc.
  +
  +    "npm" and "The npm Registry" are owned by npm, Inc. All rights reserved.
  +
  +    Modules published on the npm registry are not officially endorsed by npm, Inc.
  +    or the Node.js project.
  +
  +    Data published to the npm registry is not part of npm itself, and is the sole
  +    property of the publisher. While every effort is made to ensure accountability,
  +    there is absolutely no guarantee, warrantee, or assertion expressed or implied
  +    as to the quality, fitness for a specific purpose, or lack of malice in any
  +    given npm package.  Packages downloaded through the npm registry are
  +    independently licensed and are not covered by this license.
  +
  +    Additional policies relating to, and restrictions on use of, npm products and
  +    services are available on the npm website.  All such policies and restrictions,
  +    as updated from time to time, are hereby incorporated into this license
  +    agreement.  By using npm, you acknowledge your agreement to all such policies
  +    and restrictions.
  +
  +    If you have a complaint about a package in the public npm registry, and cannot
  +    resolve it with the package owner, please email support@npmjs.com and explain
  +    the situation.  See the [npm Dispute Resolution
  +    policy](https://github.com/npm/policies/blob/master/disputes.md) for more
  +    details.

  -    "npm Logo" created by Mathias Pettersson and Brian Hammond,
  -    used with permission.
  +    Any data published to The npm Registry (including user account information) may
  +    be removed or modified at the sole discretion of the npm server administrators.
  +
  +    "npm Logo" contributed by Mathias Pettersson and Brian Hammond,
  +    use is subject to https://www.npmjs.com/policies/trademark

       "Gubblebum Blocky" font
  -    Copyright (c) by Tjarda Koster, http://jelloween.deviantart.com
  +    Copyright (c) by Tjarda Koster, https://jelloween.deviantart.com
       included for use in the npm website and documentation,
       used with permission.

  -    This program uses several Node.js modules contained in the node_modules/
  +    This program uses several Node modules contained in the node_modules/
       subdirectory, according to the terms of their respective licenses.
     """

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-01-27 12:36:31 +01:00