summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-support
Commit message (Collapse)AuthorAgeFilesLines
...
* libtalloc: fixes for deterministic buildsJackie Huang2016-10-202-4/+190
| | | | | | | | | | | | | | | | | | | | * Add configure option and PACKAGECONFIG for the following packages: - acl - attr - libaio - libbsd - libcap - valgrind * They are all optional, so disable by default or control them based on DISTRO_FEATURES. * Remove the direct dependency on libaio and libbsd Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* libldb: fix for LIC_FILES_CHKSUMJackie Huang2016-10-201-3/+3
| | | | | | | | Use the source files instead of common-licenses Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* libtdb: fix for LIC_FILES_CHKSUMJackie Huang2016-10-201-2/+2
| | | | | | | | Use the source files instead of common-licenses Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* libtevent: fix for LIC_FILES_CHKSUMJackie Huang2016-10-201-1/+1
| | | | | | | | Use the source file instead of common-licenses Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* libtalloc: fix for LIC_FILES_CHKSUMJackie Huang2016-10-201-2/+2
| | | | | | | | Use the source files instead of common-licenses Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* chrony: add PACKAGECONFIG for nss, libcapMartin Jansa2016-09-261-1/+3
| | | | | | | | | | | * fixes autodetected dependencies http://logs.nslu2-linux.org/buildlogs/oe/world/log.report.20160905_011801.log chrony-2.4: chronyc rdepends on nss, but it isn't a build dependency, missing nss in DEPENDS or PACKAGECONFIG? [build-deps] chrony-2.4: chrony rdepends on libcap, but it isn't a build dependency, missing libcap in DEPENDS or PACKAGECONFIG? [build-deps] chrony-2.4: chrony rdepends on nss, but it isn't a build dependency, missing nss in DEPENDS or PACKAGECONFIG? [build-deps] * also use PACKAGECONFIG_CONFARGS instead of EXTRA_OECONF in do_configure Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* tcpreplay: upgrade to 4.1.1Mingli Yu2016-09-146-180/+19
| | | | | | | | | | | | | | | * Upgrade tcpreplay from 3.4.4 to 4.1.1 * Update the LICENSE file checksum as the LICENSE updated to implement GPLv3 license * Remove the backport and unapplicable patches - tcpreplay-3.4.4-cross-compile.patch - tcpreplay-3.4.4-no-bfp-support.patch - tcpreplay-3.4.4-fix-unable-to-link-libpcap-issue.patch - tcpreplay-3.4.4-improve-search-for-libpcap.patch are Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* wireshark: update to 2.2Armin Kuster2016-09-121-18/+6
| | | | | | | | | | | remove unused config params. Drop PE Drop do_configure_prepend update PACKAGECONFIG's for graphics Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* traceroute: update to 2.1.0Wenzong Fan2016-09-121-2/+2
| | | | | | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* stunnel: 5.28 -> 5.35Wang Xin2016-09-121-2/+2
| | | | | | | | Upgrade stunnel from 5.28 to 5.35. Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* strongswan: 5.3.2 -> 5.5.0Wang Xin2016-09-121-4/+2
| | | | | | | | Upgrade strongswan from 5.3.2 to 5.5.0. Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* openvpn: 2.3.8 -> 2.3.9Wang Xin2016-09-051-3/+3
| | | | | | | | | | | | | | 1) Upgrade openvpn from 2.3.8 to 2.3.9. 2) Modify EXTRA_OECONF, Since the Changelog in the new version shows: Remove --enable-password-save option Reflect enable-password-save change in documentation Also remove second instance of enable-password-save in the man page 3) Fix the Warning: WARNING: openvpn-2.3.9-r0 do_configure: QA Issue: openvpn: configure was passed unrecognised options: --enable-password-save [unknown-configure-option] Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* tnftp: control ipv6 support based on DISTRO_FEATURESJackie Huang2016-09-051-1/+4
| | | | | | | | | Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* stunnel: control ipv6 support based on DISTRO_FEATURESJackie Huang2016-09-051-1/+4
| | | | | | | | | Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* ntp: control ipv6 support based on DISTRO_FEATURESJackie Huang2016-09-051-1/+4
| | | | | | | | | Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* mtr: control ipv6 support based on DISTRO_FEATURESJackie Huang2016-09-051-0/+2
| | | | | | | | | Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* chrony: control ipv6 support based on DISTRO_FEATURESJackie Huang2016-09-051-1/+4
| | | | | | | | | Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* ipvsadm: fix QA warning for GNU_HASHYi Zhao2016-09-052-0/+20
| | | | | | | | | Add LDFLAGS variable to Makefile so that extra linker flags can be sent via this variable. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* yp-tools: fix compile errorsJoe Slater2016-09-052-2/+53
| | | | | | | | | | | Fix two fatal warnings. The cast error only occurs for some architectures. Not applicable to yp-tools-4.x. Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* ifenslave: upgrade to 2.7Kai Kang2016-09-052-18/+20
| | | | | | | | | | | | | The current version of ifenslave is 2.6_1.1.0 actually, then update to 2.7 and change the version to 2.7 too. * update to SRC_URI to the debian git repo * the license is changed from GPLv2 to GPLv3 * the program is rewrote with shell script Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* wireshark: update to 2.0.5Yi Zhao2016-09-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The following vulnerabilities have been fixed: * [1]wnpa-sec-2016-39 CORBA IDL dissector crash on 64-bit Windows. ([2]Bug 12495) * [3]wnpa-sec-2016-41 PacketBB crash. ([4]Bug 12577) * [5]wnpa-sec-2016-42 WSP infinite loop. ([6]Bug 12594) * [7]wnpa-sec-2016-44 RLC long loop. ([8]Bug 12660) * [9]wnpa-sec-2016-45 LDSS dissector crash. ([10]Bug 12662) * [11]wnpa-sec-2016-46 RLC dissector crash. ([12]Bug 12664) * [13]wnpa-sec-2016-47 OpenFlow long loop. ([14]Bug 12659) * [15]wnpa-sec-2016-48 MMSE, WAP, WBXML, and WSP infinite loop. ([16]Bug 12661) * [17]wnpa-sec-2016-49 WBXML crash. ([18]Bug 12663) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* meta-oe: remove trailing spacesMartin Jansa2016-08-223-4/+4
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* meta-oe: fix indentationMartin Jansa2016-08-2214-92/+90
| | | | | | | | * remove tabs which sneaked in since last cleanup * meta-oe layers are using consistent indentation with 4 spaces, see http://www.openembedded.org/wiki/Styleguide Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* tnftp: tnftp20130505 -> tnftp20151004Mingli Yu2016-08-161-2/+2
| | | | | | | | Upgrade tnftp from tnftp20130505 to tnftp20151004 Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* geoipupdate: 2.2.1 -> 2.2.2Wang Xin2016-08-163-4/+4
| | | | | | | | Upgrade geoipupdate from 2.2.1 to 2.2.2. Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* geoip: 1.6.6 -> 1.6.9Wang Xin2016-08-161-1/+1
| | | | | | | | Upgrade geoip from 1.6.6 to 1.6.9. Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* dovecot: 2.2.21 -> 2.2.25Wang Xin2016-08-161-2/+2
| | | | | | | | Upgrade dovecot from 2.2.21 to 2.2.25. Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* dnsmasq: update to version 2.76Terry Boese2016-08-163-11/+10
| | | | | | | | | Correct do_compile_append() and do_install(), as the location of the DHCP lease tools has changed. Signed-off-by: Terry Boese <terry.boese@vecima.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* libldb: upgrade to 1.1.27Jackie Huang2016-08-161-2/+2
| | | | | | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* ctdb: upgrade to 2.5.6Jackie Huang2016-08-161-2/+2
| | | | | | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* libtdb: upgrade to 1.3.10Jackie Huang2016-08-161-2/+2
| | | | | | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* libtevent: upgrade to 0.9.29Jackie Huang2016-08-161-2/+2
| | | | | | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* libtalloc: upgrade to 2.1.8Jackie Huang2016-08-161-2/+2
| | | | | | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* ntp: make ntp and alternative for ntpdPascal Bach2016-08-051-1/+7
| | | | | | | | This way ntp can be used as an alternative to ntpd from busybox Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* bridge-utils: various build fixes (musl & CFLAGS)André Draszik2016-08-056-3/+287
| | | | | | | | | | | | | | bridge-utils suffers from a few problems: - doesn't build on musl - doesn't respect CFLAGS - build errors are silently ignored - doesn't support parallel make All of these are addressed with the included patches. Signed-off-by: André Draszik <git@andred.net> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* wireshark: inherit perlnativeJackie Huang2016-08-051-2/+2
| | | | | | | | | | | wireshark needs pod2man and pod2html (provided by perl-native) to create doc files, inherit perlnative instead of the dependency only, so it sets the correct path to find these native commands. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* curlpp: fix QA issue for cav-octeon3Qi.Chen@windriver.com2016-08-051-0/+4
| | | | | | | | | | | | | | | | Modify the curlpp.pc file in do_install_append to avoid the following QA error. ERROR: QA Issue: curlpp.pc failed sanity test (tmpdir) The problem occurs only for tunes which set baselib to 'lib32', and in OE, we only have two tunes which set such value. BASE_LIB_tune-octeon2 = "lib32" BASE_LIB_tune-octeon3 = "lib32" Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* c-ares: use our compilation flagsAndré Draszik2016-08-052-1/+29
| | | | | | | | | | | | | | | | | If not requested otherwise as ./configure option, c-ares will strip any -g from CFLAGS / CPPFLAGS and add -g0 instead, disabling all debug info. Similarly, it will try to enable optimisation (but bail out since in that case it honors an existing -O in CFLAGS / CPPFLAGS) Since we want to control code generation, patch out the code mangling -g (and -O for consistency). Alternatively, if we were to pass --enable-debug to ./configure, c-ares would at the same time assume that we don't want optimisation anymore. Signed-off-by: André Draszik <adraszik@tycoint.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* chrony: Versatile implementation of NTPHenry Hallam2016-06-163-0/+229
| | | | | | | | | | | chrony is an alternative to ntpd. In particular it may be useful for quasi-realtime embedded systems that have a pulse-per-second time reference available and need to rapidly synchronize to it after boot, which appears to be unachievable with ntpd. Signed-off-by: Henry Hallam <henry@pericynthion.org> Reviewed-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* curlpp: fix build with gcc-6 and remove blacklistDerek Straka2016-06-151-3/+4
| | | | | | Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* wireshark: update to 2.0.4Armin Kuster2016-06-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following vulnerabilities have been fixed: * [1]wnpa-sec-2016-29 The SPOOLS dissector could go into an infinite loop. Discovered by the CESG. * [2]wnpa-sec-2016-30 The IEEE 802.11 dissector could crash. ([3]Bug 11585) * [4]wnpa-sec-2016-31 The IEEE 802.11 dissector could crash. Discovered by Mateusz Jurczyk. ([5]Bug 12175) * [6]wnpa-sec-2016-32 The UMTS FP dissector could crash. ([7]Bug 12191) * [8]wnpa-sec-2016-33 Some USB dissectors could crash. Discovered by Mateusz Jurczyk. ([9]Bug 12356) * [10]wnpa-sec-2016-34 The Toshiba file parser could crash. Discovered by iDefense Labs. ([11]Bug 12394) * [12]wnpa-sec-2016-35 The CoSine file parser could crash. Discovered by iDefense Labs. ([13]Bug 12395) * [14]wnpa-sec-2016-36 The NetScreen file parser could crash. Discovered by iDefense Labs. ([15]Bug 12396) * [16]wnpa-sec-2016-37 The Ethernet dissector could crash. ([17]Bug 12440) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* ntp: Security fixes via Upgrade to 4.2.8p8fan.xin2016-06-151-2/+2
| | | | | | | | | | | | | | | CVE-2016-4957 CVE-2016-4953 CVE-2016-4954 CVE-2016-4955 CVE-2016-4956 For more info to see: http://support.ntp.org/bin/view/Main/SecurityNotice#June_2016_ntp_4_2_8p8_NTP_Securi Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* crda, lftp, curlpp: blacklist, fails to build with gcc-6Martin Jansa2016-06-151-0/+3
| | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* libldb: add missing libaio dependencyJonathan Liu2016-06-011-1/+1
| | | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* libtalloc: add missing libaio dependencyJonathan Liu2016-06-011-1/+1
| | | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* libtdb: add missing libaio dependencyJonathan Liu2016-06-011-0/+2
| | | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* libtevent: add missing libaio dependencyJonathan Liu2016-06-011-1/+1
| | | | | | | | | | | | Fixes the following compile error: | [ 6/27] Compiling lib/replace/test/testsuite.c | In file included from ../lib/replace/test/testsuite.c:49:0: | ../lib/replace/system/aio.h:29:20: fatal error: libaio.h: No such file or directory | compilation terminated. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* cifs-utils: make samba conditional dependencyS. Lockwood-Childs2016-06-011-2/+2
| | | | | | | | | | Add PACKAGECONFIG for cifsacl and update PACKAGECONFIG for cifsidmap to make samba a conditional dependency. It is nice to be able to get mount.cifs without needing to build samba. Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* netcat-openbsd: fix qa warningShrikant Bobade2016-06-011-0/+2
| | | | | | | | | | | | | fix for QA Warning: No GNU_HASH in elf binary, it won't obey the default LDFLAGS which results in QA Warning while building with external toolchain, so adding the default LDFLAGS. WARNING: netcat-openbsd-1.105-r0 do_package_qa:QA Issue: No GNU_HASH in the elf binary:..nc.netcat-openbsd' [ldflags] Signed-off-by: Shrikant Bobade <shrikant_bobade@mentor.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
* esmtp: Fix rootfs creation errorsDai Caiyun2016-06-011-0/+5
| | | | | | | | | | | | | 1) error: file /usr/share/man/man1/mailq.1 from install of postfix-doc conflicts with file from package esmtp-doc 2) error: file /usr/share/man/man1/newaliases.1 from install of postfix-doc conflicts with file from package esmtp-doc 3) error: file /usr/share/man/man1/sendmail.1 from install of postfix-doc conflicts with file from package esmtp-doc Signed-off-by: Dai Caiyun <daicy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>