Commit Graph

1806 Commits

Author SHA1 Message Date
Mingli Yu
57929333d9 kea: replace -Og with -O
With below logic in local.conf:
MACHINE ??= "qemumips64"
MULTILIB_GLOBAL_VARIANTS_append = " libn32"
MULTILIBS ?= "multilib:lib32 multilib:libn32"
DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips"
DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32"
require conf/multilib.conf
DEBUG_BUILD = "1"
 $ bitbake lib32-kea
[snip]
{standard input}: Assembler messages:
{standard input}:305030: Error: branch out of range
{standard input}:305041: Error: branch out of range
{standard input}:305432: Error: branch out of range
{standard input}:305443: Error: branch out of range
Makefile:707: recipe for target 'dhcp4_parser.lo' failed
make[6]: *** [dhcp4_parser.lo] Error 1
[snip]

When DEBUG_BUILD enabled, -Og pass to compiler,
replace -Og with -O to fix the above compile error.

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-06-15 16:45:33 -07:00
Adrian Bunk
b4e9a646ce wireless-regdb: Upgrade 2019.03.01 -> 2019.06.03
This includes deletion of a frequency where transmission
is no longer legal in Japan.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-06-15 16:45:33 -07:00
Adrian Bunk
d7ea637358 recipes-devtools: Move back from meta-networking to meta-perl
It needs both freeradius and perl-module-data-dumper,
so neither place would fulfill all dependencies.

In general meta-perl looks like the more appropriate place.

The location in meta-networking also had the problem that
it was one directory too deep and therefore not included
in BBFILES.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-06-15 16:45:33 -07:00
Martin Jansa
229a047d9d spice: append to CFLAGS instead of +=
* so that -Wno-address-of-packed-member is used for all the builds not
  only for target builds
* with native it was overwritten with BUILD_CFLAGS and for nativesdk with
  BUILDSDK_CFLAGS
* this issue isn't specific for gcc-9 as the original commit said, I see
  nativesdk-spice failing on older hosts with gcc-7 with the same issue
* also use -Wno-error=address-of-packed-member instead of
  -Wno-address-of-packed-member so that there is still a warning, just
  not fatal for the build in combination with -Werror.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-06-15 16:45:33 -07:00
Hongxu Jia
7a07c5480c net-snmp: split net-snmp-config to package net-snmp-dev
Move net-snmp-config in which contains build path from
package net-snmp to net-snmp-dev.

It refers ubuntu, here are we got from Ubuntu 18.04
$ dpkg -c /var/cache/apt/archives/libsnmp-dev_5.7.3+dfsg-1.8ubuntu3.1_amd64.deb
drwxr-xr-x root/root         0 2018-10-15 22:16 ./usr/bin/
-rwxr-xr-x root/root     43797 2018-10-15 22:16 ./usr/bin/mib2c
-rwxr-xr-x root/root      8780 2018-10-15 22:16 ./usr/bin/mib2c-update
-rwxr-xr-x root/root     29427 2018-10-15 22:16 ./usr/bin/net-snmp-config
-rwxr-xr-x root/root      3688 2018-10-15 22:16 ./usr/bin/net-snmp-create-v3-user

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-06-15 16:45:33 -07:00
Yi Zhao
5d1e72d9f7 python-ldap: add python-pyasn1 and python-pyasn1-modules as runtime dependencies
According to Doc/requirements.txt, this package needs python-pyasn1 and
python-pyasn1-modules as runtime dependencies.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-06-15 16:45:33 -07:00
Adrian Bunk
6050d95be2 samba: Upgrade 4.8.11 -> 4.8.12
The only change is the fix for CVE-2018-16860.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-06-15 16:45:32 -07:00
Hongzhi.Song
b47aae2d61 spice: fix compile errors on 32bit system
There are folowing compile errors on Linux 32bit system:

red-channel.c:207:73: error: format '%x' expects argument of type
'unsigned int', but argument 7 has type 'long unsigned int' [-Werror=format=]
|207| red_channel_debug(self, "thread_id 0x%" G_GSIZE_MODIFIER "x",
                                ~~~~~~~~~~~~~~~~~~~~~^
                        self->priv->thread_id);
                ~~~~~~~~~~~~~~~~~~~~~^

On 32bit system, #define G_GSIZE_MODIFIER "". But the type of
'self->priv->thread_id' is 'unsigned long int' which should match '%lx'
not '%x'.

So we should recovery the <0x%" G_GSIZE_MODIFIER "x"> to <0x%lx">.
And others files modification are similar to G_GSIZE_MODIFIER.

Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-06-15 16:45:32 -07:00
Changqing Li
8e641e28f6 samba/libldb: add rconflicts
samba have bundled libldb, so when both samba and libldb, or both pyldb \
and samba-python is installed, below error will appear:

file /usr/bin/ldbadd conflicts between attempted installs of samba-4.8.11-r0.i586 and libldb-1.4.1-r0.i586
file /usr/bin/ldbdel conflicts between attempted installs of samba-4.8.11-r0.i586 and libldb-1.4.1-r0.i586
...
file /usr/lib/python2.7/site-packages/ldb.so conflicts between attempted installs of libpyldb-util1-1.4.1-r0.i586 and samba-python-4.8.11-r0.i586

so add rconflicts for both packages

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-29 02:21:42 -07:00
Changqing Li
1ac44de135 netkit-telnet: add rconflicts
fix below error:

file /etc/xinetd.d/telnet conflicts between attempted installs of netkit-telnet-0.17-r0.i586 and inetutils-telnetd-1.9.4-r0.i586
file /usr/sbin/in.telnetd conflicts between attempted installs of netkit-telnet-0.17-r0.i586 and inetutils-telnetd-1.9.4-r0.i586

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-29 02:21:42 -07:00
Andrei Gherzan
061953143d networkmanager: Update to 1.18.0
One patch was dropped (0003-dlopen-failure.patch) as a similar one was
merged upstream. See:
bd4957fcd7

Refreshed musl patches as well.

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-29 02:21:42 -07:00
Mingli Yu
5c20a95fc5 kea: Upgrade to 1.5.0
* License-Update: below text added
  The ext/coroutine code is externally maintained and distributed under
  the Boost Software License, Version 1.0.  (See its accompanying file
  LICENSE_1_0.txt.)

* There is a new added logic in 1.5.0 to use AC_TRY_RUN
  to detect usable C++11 regex in below commit:
  39ab2f5d15 [5680] Added sanitizeString() function to libutil

  Use AC_COMPILE_IFELSE instead to fix below
  do_configure error:
  | checking for usuable C++11 regex... configure: error: in '/builddir/upgrade1/tmp/work/core2-64-poky-linux/kea/1.5.0-r0/build':
  | configure: error: cannot run test program while cross compiling

* Remove 0001-Fix-error-call-of-overloaded-distance-is-ambiguous.patch
  as the logic is already included in 1.5.0.

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-24 10:12:12 -07:00
Oleksandr Kravchuk
a78c3ba083 lldpd: update to 1.0.3
Removed patch is not appropriate anymore.

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-24 10:11:28 -07:00
Khem Raj
4ee7becad0 spice,spice-protocol: Uprev to 0.14.0
Drop the patch for fixing printf formatting, its fixed differently
upstream

Forward port pthread_t printf patch

Add -Wno-address-of-packed-member needed with gcc9

replace _append += with just _append syntax

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-23 10:46:34 -07:00
Adrian Bunk
bb4aa80bfb Remove ipsec-tools and umip
ipsec-tools is dead upstream and upstream recommends
against using it:
http://ipsec-tools.sourceforge.net/

More detailed explanation from the Debian maintainer:
https://bugs.debian.org/917847

umip was the only package depending on ipsec-tools.
umip is dormant upstream since 2013.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-23 08:26:14 -07:00
Oleksandr Kravchuk
4a7b942dc1 mdns: update to 878.200.35
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-23 08:26:14 -07:00
Oleksandr Kravchuk
f71d09b3db nbd: update to 3.19
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-23 08:26:14 -07:00
Oleksandr Kravchuk
fd09cf70d6 mtr: update to 0.92
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-23 08:26:14 -07:00
Oleksandr Kravchuk
33d578bda5 ipcalc: update to 2.2.3
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-21 17:52:23 -07:00
Oleksandr Kravchuk
b296db5657 atftp: update to 0.7.2
Removed patches were upstreamed.

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-21 17:52:23 -07:00
Oleksandr Kravchuk
05138d26fe rp-pppoe: update to 3.13
Removed patch was upstreamed.

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-21 10:45:39 -07:00
Oleksandr Kravchuk
1c632066c5 python-ldap: update to 3.2.0
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-21 08:48:56 -07:00
Oleksandr Kravchuk
7ada285f29 opensaf: update to 5.19.03
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-20 22:23:04 -07:00
Martin Jansa
74aeba20e5 igmpproxy: remove 0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch and _GNU_SOURCE
* it was upgraded to 0.2.1 in:
  commit 50979151e6
  Author: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
  Date:   Sat Mar 16 18:22:59 2019 +0100

    igmpproxy: update to 0.2.1

* which includes _GNU_SOURCE:
  7d790aa2f1
* and includes sys/types.h in os-linux.h:
  6f92242b23
* and the patch doesn't apply cleanly:
  ERROR: Fuzz detected:

  checking file src/igmpproxy.h
  Hunk #1 succeeded at 51 with fuzz 2 (offset 5 lines).

  patching file src/igmpproxy.h
  Hunk #1 succeeded at 51 with fuzz 2 (offset 5 lines).

  The context lines in the patches can be updated with devtool:

      devtool modify lib32-igmpproxy
      devtool finish --force-patch-refresh lib32-igmpproxy <layer_path>

  Don't forget to review changes done by devtool!

  ERROR: QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-20 09:49:01 -07:00
Scott Ellis
fc1b5310b2 wireguard: Upgrade 20190123 -> 20190406
Fixes issues with kernels 5.1 and greater.

Signed-off-by: Scott Ellis <scott@jumpnowtek.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-20 09:49:00 -07:00
Martin Jansa
590663da5d umip: make MACHINE_ARCH
* Depends on ipsec-tools which is already MACHINE_ARCH (and also RRECOMMENDS kernel modules)
* Fixes:
  ERROR: umip different signature for task do_configure.sigdata between hammerhead and mako
  Hash for dependent task umip/umip_1.0.bb.do_prepare_recipe_sysroot changed from 7c74a208880f6c8a5aa46b1c8577e39b6b71429d9a379ea75f17a155ca270035 to 87c6cd438dd9645c98530e3ac1094005bace785bfd89bfe4073bc8815926abba
  Unable to find matching sigdata for /OE/build/luneos-master/webos-ports/meta-openembedded/meta-networking/recipes-connectivity/umip/umip_1.0.bb.do_prepare_recipe_sysroot with hashes 7c74a208880f6c8a5aa46b1c8577e39b6b71429d9a379ea75f17a155ca270035 or 87c6cd438dd9645c98530e3ac1094005bace785bfd89bfe4073bc8815926abba

  bitbake-diffsigs /OE/build/luneos-master/webos-ports/tmp-glibc/sstate-diff/1557963509/[hm]*/*/umip/*do_prepare*.sigdata*
  Hash for dependent task ipsec-tools/ipsec-tools_0.8.2.bb.do_populate_sysroot changed from 1100c4984d88050bb7ca154445205bac3c3ab80c3ff0aa7c9124825c9d4f6e14 to feeddbd35a8106b264c98076e21d0b3cb227ab1d209e150926112b2906273ef4
  Unable to find matching sigdata for /OE/build/luneos-master/webos-ports/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb.do_populate_sysroot with hashes 1100c4984d88050bb7ca154445205bac3c3ab80c3ff0aa7c9124825c9d4f6e14 or feeddbd35a8106b264c98076e21d0b3cb227ab1d209e150926112b2906273ef4

  as detected with:
  openembedded-core/scripts/sstate-diff-machines.sh --targets=world --tmpdir=tmp-glibc/ --analyze --machines="hammerhead mako qemux86"

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-18 12:42:47 -07:00
Oleksandr Kravchuk
ab19763267 xl2tpd: update to 1.3.14
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-18 12:42:47 -07:00
Oleksandr Kravchuk
fcd06d5821 pure-ftpd: update to 1.0.47
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-18 12:42:47 -07:00
Oleksandr Kravchuk
ec1a8aa098 znc: update to 1.7.3
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-18 12:42:47 -07:00
Nicolas Dechesne
1ecd8b4364 cannelloni: move from meta-oe to meta-networking
It has a dependency on lksctp-tools which is available in
meta-networking. Move the recipe to avoid dependency from meta-oe onto
meta-networking.

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Acked-by: Sean Nyekjaer <sean@geanix.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-13 20:25:49 -07:00
Oleksandr Kravchuk
c1c8895609 openvpn: update to 2.4.7
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-11 23:35:30 -07:00
Oleksandr Kravchuk
9860cda823 conntrack-tools: update to 1.4.5
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-10 14:10:13 -07:00
Oleksandr Kravchuk
d703b5984e libnetfilter-conntrack: update to 1.0.7
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-10 09:17:08 -07:00
Adrian Bunk
d312b56fa2 dovecot: Upgrade 2.2.36 -> 2.2.36.3
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-09 20:34:33 -07:00
Adrian Bunk
285a93a5a9 pptp-linux: Upgrade 1.9.0 -> 1.10.0
Remove patch for issue fixed upstream.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-09 20:34:33 -07:00
Adrian Bunk
10f2232c70 postfix: Upgrade 3.4.1 -> 3.4.5
Remove patch for issue fixed upstream.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-09 20:34:33 -07:00
Adrian Bunk
9665016569 dnrd: Remove stale files of recipe removed 2 years ago
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-09 20:34:33 -07:00
Johannes Pointner
11e7ffc442 samba: update to 4.8.11
* This includes security fixes that adresses the following defects:
CVE-2018-14629 (Unprivileged adding of CNAME record causing loop in AD
Internal DNS server)
CVE-2018-16841 (Double-free in Samba AD DC KDC with PKINIT)
CVE-2018-16851 (NULL pointer de-reference in Samba AD DC LDAP server)
CVE-2018-16853 (Samba AD DC S4U2Self crash in experimental MIT Kerberos
configuration (unsupported))
CVE-2019-3880 (Save registry file outside share as unprivileged user)

* Upstreamed patch removed:
0001-ldb-Refuse-to-build-Samba-against-a-newer-minor-vers.patch

* Extended PACKAGECONFIG ad-dc to be able to build MIT Kerberos
see https://bugzilla.samba.org/show_bug.cgi?id=13678

Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-09 20:34:33 -07:00
Oleksandr Kravchuk
42c02c0885 opensaf: update to 5.19.01
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-09 20:34:32 -07:00
Oleksandr Kravchuk
b2ab7703f6 networkd-dispatcher: update to 2.0.1
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-09 20:34:32 -07:00
Oleksandr Kravchuk
7f887ee74b libnetfilter-queue: fix update to 1.0.3
SRC_URI was mistakenly not updated in @57967659f4724a8b614f.

Removed patch was upstreamed. Another one was refreshed with devtool.

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-08 00:28:05 -07:00
Qi.Chen@windriver.com
75c110e47a ipsec-tools: fix CVE tag in patch
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-07 09:33:49 -07:00
Qi.Chen@windriver.com
772f7d8703 netkit-rsh: add tag to CVE patch
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-07 09:33:49 -07:00
Oleksandr Kravchuk
7832621d1c ebtables: add UPSTREAM_CHECK_URI
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-06 08:32:04 -07:00
Oleksandr Kravchuk
de407d4786 ypbind-mt: update to 2.6
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-06 08:32:04 -07:00
Andreas Müller
183b99913b packagegroup-meta-networking: replace DISTRO_FEATURE by DISTRO_FEATURES
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-06 08:32:04 -07:00
Oleksandr Kravchuk
b99b30f034 arno-iptables-firewall: update to 2.0.3
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-05 23:22:39 -07:00
Martin Jansa
2fc270597a miniupnpd: fix SRC_URI for multilib
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-02 14:13:57 -07:00
Yi Zhao
fd793c0adb openhpi: update openhpi-fix-testfail-errors.patch
The openhpi-fix-testfail-errors.patch tries to fix 2 saftest failures.
But the second fix is not correct. It should not return false when there
is no surrogate pairs since for the code points in UTF-16 Basic
Multilingual Plane (BMP), there is no need surrogate pairs. We should
update saftest case to fix this failure.

Also add more description for the first fix.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-05-02 14:13:57 -07:00
Wenlin Kang
8f97bb5394 samba: add PACKAGECONFIG for libunwind
Add libunwind switch, this makes it have a chance to compile
codes which are conditioned by "HAVE_LIBUNWIND_H"

Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-04-30 12:18:30 -07:00