--- a/components/augeas/Makefile	Tue Apr 19 17:18:03 2016 -0700
+++ b/components/augeas/Makefile	Tue Apr 19 20:37:48 2016 -0700
@@ -27,13 +27,13 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		augeas
-COMPONENT_VERSION=	1.3.0
+COMPONENT_VERSION=	1.4.0
 COMPONENT_PROJECT_URL=	http://www.augeas.net/
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:80763031af76515a8ea66013ddc3c466742a15d2e907c7c8e2e3b7410262e2af
+    sha256:659fae7ac229029e60a869a3b88c616cfd51cf2fba286cdfe3af3a052cb35b30
 COMPONENT_ARCHIVE_URL=	http://download.augeas.net/$(COMPONENT_ARCHIVE)
 
-TPNO=	21660
+TPNO=	27876
 
 include $(WS_MAKE_RULES)/common.mk
 

--- a/components/augeas/augeas.p5m	Tue Apr 19 17:18:03 2016 -0700
+++ b/components/augeas/augeas.p5m	Tue Apr 19 20:37:48 2016 -0700
@@ -40,75 +40,145 @@
 file path=usr/bin/fadot
 file path=usr/include/augeas.h
 file path=usr/include/fa.h
-file path=usr/lib/$(MACH64)/libaugeas.la
-link path=usr/lib/$(MACH64)/libaugeas.so target=libaugeas.so.0.19.0
-link path=usr/lib/$(MACH64)/libaugeas.so.0 target=libaugeas.so.0.19.0
-file path=usr/lib/$(MACH64)/libaugeas.so.0.19.0
-file path=usr/lib/$(MACH64)/libfa.la
-link path=usr/lib/$(MACH64)/libfa.so target=libfa.so.1.4.0
-link path=usr/lib/$(MACH64)/libfa.so.1 target=libfa.so.1.4.0
-file path=usr/lib/$(MACH64)/libfa.so.1.4.0
-file usr/lib/$(MACH64)/pkgconfig/augeas.pc path=usr/lib/pkgconfig/augeas.pc
+link path=usr/lib/$(MACH64)/libaugeas.so target=libaugeas.so.0.20.0
+link path=usr/lib/$(MACH64)/libaugeas.so.0 target=libaugeas.so.0.20.0
+file path=usr/lib/$(MACH64)/libaugeas.so.0.20.0
+link path=usr/lib/$(MACH64)/libfa.so target=libfa.so.1.4.1
+link path=usr/lib/$(MACH64)/libfa.so.1 target=libfa.so.1.4.1
+file path=usr/lib/$(MACH64)/libfa.so.1.4.1
+file path=usr/lib/$(MACH64)/pkgconfig/augeas.pc
+file path=usr/share/augeas/lenses/dist/access.aug
 file path=usr/share/augeas/lenses/dist/activemq_conf.aug
 file path=usr/share/augeas/lenses/dist/activemq_xml.aug
+file path=usr/share/augeas/lenses/dist/afs_cellalias.aug
 file path=usr/share/augeas/lenses/dist/aliases.aug
+file path=usr/share/augeas/lenses/dist/anacron.aug
+file path=usr/share/augeas/lenses/dist/approx.aug
+file path=usr/share/augeas/lenses/dist/apt_update_manager.aug
+file path=usr/share/augeas/lenses/dist/aptcacherngsecurity.aug
+file path=usr/share/augeas/lenses/dist/aptconf.aug
+file path=usr/share/augeas/lenses/dist/aptpreferences.aug
+file path=usr/share/augeas/lenses/dist/aptsources.aug
 file path=usr/share/augeas/lenses/dist/authorized_keys.aug
 file path=usr/share/augeas/lenses/dist/automaster.aug
+file path=usr/share/augeas/lenses/dist/automounter.aug
+file path=usr/share/augeas/lenses/dist/avahi.aug
+file path=usr/share/augeas/lenses/dist/backuppchosts.aug
 file path=usr/share/augeas/lenses/dist/bbhosts.aug
+file path=usr/share/augeas/lenses/dist/bootconf.aug
 file path=usr/share/augeas/lenses/dist/build.aug
+file path=usr/share/augeas/lenses/dist/cachefilesd.aug
 file path=usr/share/augeas/lenses/dist/carbon.aug
+file path=usr/share/augeas/lenses/dist/cgconfig.aug
+file path=usr/share/augeas/lenses/dist/cgrules.aug
+file path=usr/share/augeas/lenses/dist/channels.aug
+file path=usr/share/augeas/lenses/dist/chrony.aug
+file path=usr/share/augeas/lenses/dist/clamav.aug
+file path=usr/share/augeas/lenses/dist/cobblermodules.aug
+file path=usr/share/augeas/lenses/dist/cobblersettings.aug
 file path=usr/share/augeas/lenses/dist/collectd.aug
+file path=usr/share/augeas/lenses/dist/cpanel.aug
+file path=usr/share/augeas/lenses/dist/cron.aug
+file path=usr/share/augeas/lenses/dist/crypttab.aug
 file path=usr/share/augeas/lenses/dist/cups.aug
 file path=usr/share/augeas/lenses/dist/cyrus_imapd.aug
 file path=usr/share/augeas/lenses/dist/darkice.aug
+file path=usr/share/augeas/lenses/dist/debctrl.aug
+file path=usr/share/augeas/lenses/dist/desktop.aug
+file path=usr/share/augeas/lenses/dist/device_map.aug
+file path=usr/share/augeas/lenses/dist/dhclient.aug
 file path=usr/share/augeas/lenses/dist/dhcpd.aug
+file path=usr/share/augeas/lenses/dist/dns_zone.aug
 file path=usr/share/augeas/lenses/dist/dnsmasq.aug
 file path=usr/share/augeas/lenses/dist/dovecot.aug
+file path=usr/share/augeas/lenses/dist/dpkg.aug
+file path=usr/share/augeas/lenses/dist/dput.aug
 file path=usr/share/augeas/lenses/dist/erlang.aug
+file path=usr/share/augeas/lenses/dist/ethers.aug
+file path=usr/share/augeas/lenses/dist/exports.aug
+file path=usr/share/augeas/lenses/dist/fai_diskconfig.aug
 file path=usr/share/augeas/lenses/dist/fonts.aug
+file path=usr/share/augeas/lenses/dist/fstab.aug
 file path=usr/share/augeas/lenses/dist/fuse.aug
+file path=usr/share/augeas/lenses/dist/gdm.aug
 file path=usr/share/augeas/lenses/dist/group.aug
+file path=usr/share/augeas/lenses/dist/grub.aug
+file path=usr/share/augeas/lenses/dist/gshadow.aug
+file path=usr/share/augeas/lenses/dist/gtkbookmarks.aug
+file path=usr/share/augeas/lenses/dist/host_conf.aug
+file path=usr/share/augeas/lenses/dist/hostname.aug
 file path=usr/share/augeas/lenses/dist/hosts.aug
+file path=usr/share/augeas/lenses/dist/hosts_access.aug
 file path=usr/share/augeas/lenses/dist/htpasswd.aug
 file path=usr/share/augeas/lenses/dist/httpd.aug
 file path=usr/share/augeas/lenses/dist/inetd.aug
 file path=usr/share/augeas/lenses/dist/inifile.aug
 file path=usr/share/augeas/lenses/dist/inittab.aug
 file path=usr/share/augeas/lenses/dist/inputrc.aug
+file path=usr/share/augeas/lenses/dist/interfaces.aug
+file path=usr/share/augeas/lenses/dist/iproute2.aug
+file path=usr/share/augeas/lenses/dist/iptables.aug
+file path=usr/share/augeas/lenses/dist/iscsid.aug
 file path=usr/share/augeas/lenses/dist/jaas.aug
+file path=usr/share/augeas/lenses/dist/jettyrealm.aug
 file path=usr/share/augeas/lenses/dist/jmxaccess.aug
 file path=usr/share/augeas/lenses/dist/jmxpassword.aug
 file path=usr/share/augeas/lenses/dist/json.aug
+file path=usr/share/augeas/lenses/dist/kdump.aug
+file path=usr/share/augeas/lenses/dist/keepalived.aug
 file path=usr/share/augeas/lenses/dist/known_hosts.aug
+file path=usr/share/augeas/lenses/dist/koji.aug
 file path=usr/share/augeas/lenses/dist/krb5.aug
 file path=usr/share/augeas/lenses/dist/ldif.aug
+file path=usr/share/augeas/lenses/dist/ldso.aug
+file path=usr/share/augeas/lenses/dist/lightdm.aug
+file path=usr/share/augeas/lenses/dist/limits.aug
+file path=usr/share/augeas/lenses/dist/login_defs.aug
 file path=usr/share/augeas/lenses/dist/logrotate.aug
 file path=usr/share/augeas/lenses/dist/logwatch.aug
+file path=usr/share/augeas/lenses/dist/lokkit.aug
 file path=usr/share/augeas/lenses/dist/lvm.aug
+file path=usr/share/augeas/lenses/dist/mailscanner.aug
+file path=usr/share/augeas/lenses/dist/mailscanner_rules.aug
 file path=usr/share/augeas/lenses/dist/mcollective.aug
+file path=usr/share/augeas/lenses/dist/mdadm_conf.aug
 file path=usr/share/augeas/lenses/dist/memcached.aug
+file path=usr/share/augeas/lenses/dist/mke2fs.aug
+file path=usr/share/augeas/lenses/dist/modprobe.aug
+file path=usr/share/augeas/lenses/dist/modules.aug
+file path=usr/share/augeas/lenses/dist/modules_conf.aug
 file path=usr/share/augeas/lenses/dist/mongodbserver.aug
 file path=usr/share/augeas/lenses/dist/monit.aug
+file path=usr/share/augeas/lenses/dist/multipath.aug
 file path=usr/share/augeas/lenses/dist/mysql.aug
 file path=usr/share/augeas/lenses/dist/nagioscfg.aug
 file path=usr/share/augeas/lenses/dist/nagiosobjects.aug
 file path=usr/share/augeas/lenses/dist/netmasks.aug
+file path=usr/share/augeas/lenses/dist/networkmanager.aug
 file path=usr/share/augeas/lenses/dist/networks.aug
 file path=usr/share/augeas/lenses/dist/nginx.aug
 file path=usr/share/augeas/lenses/dist/nrpe.aug
+file path=usr/share/augeas/lenses/dist/nsswitch.aug
 file path=usr/share/augeas/lenses/dist/ntp.aug
+file path=usr/share/augeas/lenses/dist/ntpd.aug
 file path=usr/share/augeas/lenses/dist/odbc.aug
 file path=usr/share/augeas/lenses/dist/openshift_config.aug
 file path=usr/share/augeas/lenses/dist/openshift_http.aug
 file path=usr/share/augeas/lenses/dist/openshift_quickstarts.aug
+file path=usr/share/augeas/lenses/dist/openvpn.aug
+file path=usr/share/augeas/lenses/dist/pagekite.aug
 file path=usr/share/augeas/lenses/dist/pam.aug
 file path=usr/share/augeas/lenses/dist/pamconf.aug
 file path=usr/share/augeas/lenses/dist/passwd.aug
+file path=usr/share/augeas/lenses/dist/pbuilder.aug
 file path=usr/share/augeas/lenses/dist/pg_hba.aug
+file path=usr/share/augeas/lenses/dist/pgbouncer.aug
 file path=usr/share/augeas/lenses/dist/php.aug
+file path=usr/share/augeas/lenses/dist/phpvars.aug
 file path=usr/share/augeas/lenses/dist/postfix_access.aug
 file path=usr/share/augeas/lenses/dist/postfix_main.aug
 file path=usr/share/augeas/lenses/dist/postfix_master.aug
+file path=usr/share/augeas/lenses/dist/postfix_sasl_smtpd.aug
 file path=usr/share/augeas/lenses/dist/postfix_transport.aug
 file path=usr/share/augeas/lenses/dist/postfix_virtual.aug
 file path=usr/share/augeas/lenses/dist/postgresql.aug
@@ -116,38 +186,54 @@
 file path=usr/share/augeas/lenses/dist/protocols.aug
 file path=usr/share/augeas/lenses/dist/puppet.aug
 file path=usr/share/augeas/lenses/dist/puppet_auth.aug
+file path=usr/share/augeas/lenses/dist/puppetfile.aug
 file path=usr/share/augeas/lenses/dist/puppetfileserver.aug
+file path=usr/share/augeas/lenses/dist/pylonspaste.aug
 file path=usr/share/augeas/lenses/dist/pythonpaste.aug
 file path=usr/share/augeas/lenses/dist/qpid.aug
 file path=usr/share/augeas/lenses/dist/quote.aug
 file path=usr/share/augeas/lenses/dist/rabbitmq.aug
 file path=usr/share/augeas/lenses/dist/redis.aug
+file path=usr/share/augeas/lenses/dist/reprepro_uploaders.aug
+file path=usr/share/augeas/lenses/dist/resolv.aug
 file path=usr/share/augeas/lenses/dist/rmt.aug
+file path=usr/share/augeas/lenses/dist/rsyncd.aug
 file path=usr/share/augeas/lenses/dist/rsyslog.aug
 file path=usr/share/augeas/lenses/dist/rx.aug
 file path=usr/share/augeas/lenses/dist/samba.aug
+file path=usr/share/augeas/lenses/dist/schroot.aug
+file path=usr/share/augeas/lenses/dist/securetty.aug
 file path=usr/share/augeas/lenses/dist/sep.aug
 file path=usr/share/augeas/lenses/dist/services.aug
 file path=usr/share/augeas/lenses/dist/shadow.aug
 file path=usr/share/augeas/lenses/dist/shells.aug
+file path=usr/share/augeas/lenses/dist/shellvars.aug
+file path=usr/share/augeas/lenses/dist/shellvars_list.aug
 file path=usr/share/augeas/lenses/dist/simplelines.aug
 file path=usr/share/augeas/lenses/dist/simplevars.aug
+file path=usr/share/augeas/lenses/dist/sip_conf.aug
 file path=usr/share/augeas/lenses/dist/slapd.aug
+file path=usr/share/augeas/lenses/dist/smbusers.aug
 file path=usr/share/augeas/lenses/dist/solaris_system.aug
+file path=usr/share/augeas/lenses/dist/soma.aug
 file path=usr/share/augeas/lenses/dist/spacevars.aug
 file path=usr/share/augeas/lenses/dist/splunk.aug
 file path=usr/share/augeas/lenses/dist/squid.aug
 file path=usr/share/augeas/lenses/dist/ssh.aug
 file path=usr/share/augeas/lenses/dist/sshd.aug
+file path=usr/share/augeas/lenses/dist/sssd.aug
 file path=usr/share/augeas/lenses/dist/stunnel.aug
 file path=usr/share/augeas/lenses/dist/subversion.aug
 file path=usr/share/augeas/lenses/dist/sudoers.aug
+file path=usr/share/augeas/lenses/dist/sysconfig.aug
 file path=usr/share/augeas/lenses/dist/sysconfig_route.aug
 file path=usr/share/augeas/lenses/dist/sysctl.aug
 file path=usr/share/augeas/lenses/dist/syslog.aug
+file path=usr/share/augeas/lenses/dist/systemd.aug
 file path=usr/share/augeas/lenses/dist/tests/test_access.aug
 file path=usr/share/augeas/lenses/dist/tests/test_activemq_conf.aug
 file path=usr/share/augeas/lenses/dist/tests/test_activemq_xml.aug
+file path=usr/share/augeas/lenses/dist/tests/test_afs_cellalias.aug
 file path=usr/share/augeas/lenses/dist/tests/test_aliases.aug
 file path=usr/share/augeas/lenses/dist/tests/test_anacron.aug
 file path=usr/share/augeas/lenses/dist/tests/test_approx.aug
@@ -170,6 +256,7 @@
 file path=usr/share/augeas/lenses/dist/tests/test_cgrules.aug
 file path=usr/share/augeas/lenses/dist/tests/test_channels.aug
 file path=usr/share/augeas/lenses/dist/tests/test_chrony.aug
+file path=usr/share/augeas/lenses/dist/tests/test_clamav.aug
 file path=usr/share/augeas/lenses/dist/tests/test_cobblermodules.aug
 file path=usr/share/augeas/lenses/dist/tests/test_cobblersettings.aug
 file path=usr/share/augeas/lenses/dist/tests/test_collectd.aug
@@ -184,6 +271,7 @@
 file path=usr/share/augeas/lenses/dist/tests/test_device_map.aug
 file path=usr/share/augeas/lenses/dist/tests/test_dhclient.aug
 file path=usr/share/augeas/lenses/dist/tests/test_dhcpd.aug
+file path=usr/share/augeas/lenses/dist/tests/test_dns_zone.aug
 file path=usr/share/augeas/lenses/dist/tests/test_dnsmasq.aug
 file path=usr/share/augeas/lenses/dist/tests/test_dovecot.aug
 file path=usr/share/augeas/lenses/dist/tests/test_dpkg.aug
@@ -213,6 +301,7 @@
 file path=usr/share/augeas/lenses/dist/tests/test_interfaces.aug
 file path=usr/share/augeas/lenses/dist/tests/test_iproute2.aug
 file path=usr/share/augeas/lenses/dist/tests/test_iptables.aug
+file path=usr/share/augeas/lenses/dist/tests/test_iscsid.aug
 file path=usr/share/augeas/lenses/dist/tests/test_jaas.aug
 file path=usr/share/augeas/lenses/dist/tests/test_jettyrealm.aug
 file path=usr/share/augeas/lenses/dist/tests/test_jmxaccess.aug
@@ -233,6 +322,8 @@
 file path=usr/share/augeas/lenses/dist/tests/test_logwatch.aug
 file path=usr/share/augeas/lenses/dist/tests/test_lokkit.aug
 file path=usr/share/augeas/lenses/dist/tests/test_lvm.aug
+file path=usr/share/augeas/lenses/dist/tests/test_mailscanner.aug
+file path=usr/share/augeas/lenses/dist/tests/test_mailscanner_rules.aug
 file path=usr/share/augeas/lenses/dist/tests/test_mcollective.aug
 file path=usr/share/augeas/lenses/dist/tests/test_mdadm_conf.aug
 file path=usr/share/augeas/lenses/dist/tests/test_memcached.aug
@@ -265,11 +356,13 @@
 file path=usr/share/augeas/lenses/dist/tests/test_passwd.aug
 file path=usr/share/augeas/lenses/dist/tests/test_pbuilder.aug
 file path=usr/share/augeas/lenses/dist/tests/test_pg_hba.aug
+file path=usr/share/augeas/lenses/dist/tests/test_pgbouncer.aug
 file path=usr/share/augeas/lenses/dist/tests/test_php.aug
 file path=usr/share/augeas/lenses/dist/tests/test_phpvars.aug
 file path=usr/share/augeas/lenses/dist/tests/test_postfix_access.aug
 file path=usr/share/augeas/lenses/dist/tests/test_postfix_main.aug
 file path=usr/share/augeas/lenses/dist/tests/test_postfix_master.aug
+file path=usr/share/augeas/lenses/dist/tests/test_postfix_sasl_smtpd.aug
 file path=usr/share/augeas/lenses/dist/tests/test_postfix_transport.aug
 file path=usr/share/augeas/lenses/dist/tests/test_postfix_virtual.aug
 file path=usr/share/augeas/lenses/dist/tests/test_postgresql.aug
@@ -277,7 +370,9 @@
 file path=usr/share/augeas/lenses/dist/tests/test_protocols.aug
 file path=usr/share/augeas/lenses/dist/tests/test_puppet.aug
 file path=usr/share/augeas/lenses/dist/tests/test_puppet_auth.aug
+file path=usr/share/augeas/lenses/dist/tests/test_puppetfile.aug
 file path=usr/share/augeas/lenses/dist/tests/test_puppetfileserver.aug
+file path=usr/share/augeas/lenses/dist/tests/test_pylonspaste.aug
 file path=usr/share/augeas/lenses/dist/tests/test_pythonpaste.aug
 file path=usr/share/augeas/lenses/dist/tests/test_qpid.aug
 file path=usr/share/augeas/lenses/dist/tests/test_quote.aug

--- a/components/augeas/patches/test-put-symlink-augsave.patch	Tue Apr 19 17:18:03 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-Patch to account for differing output of /usr/bin/sum on Solaris. This fix has been
-integrated into Augeas in version 1.4.0. This patch should be removed when Augeas
-is upgraded.
-
---- augeas-1.3.0/tests/test-put-symlink-augsave.sh.orig	2015-05-28 14:25:00.307497157 -0700
-+++ augeas-1.3.0/tests/test-put-symlink-augsave.sh	2015-05-28 14:25:38.148551120 -0700
-@@ -17,7 +17,7 @@
- cat <<EOF > $HOSTS
- 127.0.0.1 localhost
- EOF
--HOSTS_SUM=$(sum $HOSTS)
-+HOSTS_SUM=$(sum $HOSTS | cut -d ' ' -f 1)
- 
- touch $ATTACK_FILE
- (cd $(dirname $HOSTS) && ln -s ../other/attack $(basename $HOSTS).augsave)
-@@ -37,7 +37,7 @@
-     exit 1
- fi
- 
--if [ ! "x${HOSTS_SUM}" = "x$(sum $HOSTS_AUGSAVE)" ]; then
-+if [ ! "x${HOSTS_SUM}" = "x$(sum $HOSTS_AUGSAVE | cut -d ' ' -f 1)" ]; then
-     echo "/etc/hosts.augsave has changed from the original /etc/hosts"
-     exit 1
- fi

--- a/components/augeas/test/results-64.master	Tue Apr 19 17:18:03 2016 -0700
+++ b/components/augeas/test/results-64.master	Tue Apr 19 20:37:48 2016 -0700
@@ -103,6 +103,7 @@
 PASS: lens-access.sh
 PASS: lens-activemq_conf.sh
 PASS: lens-activemq_xml.sh
+PASS: lens-afs_cellalias.sh
 PASS: lens-aliases.sh
 PASS: lens-anacron.sh
 PASS: lens-approx.sh
@@ -125,6 +126,7 @@
 PASS: lens-cgrules.sh
 PASS: lens-channels.sh
 PASS: lens-chrony.sh
+PASS: lens-clamav.sh
 PASS: lens-cobblersettings.sh
 PASS: lens-cobblermodules.sh
 PASS: lens-collectd.sh
@@ -139,6 +141,7 @@
 PASS: lens-device_map.sh
 PASS: lens-dhclient.sh
 PASS: lens-dhcpd.sh
+PASS: lens-dns_zone.sh
 PASS: lens-dnsmasq.sh
 PASS: lens-dovecot.sh
 PASS: lens-dpkg.sh
@@ -168,6 +171,7 @@
 PASS: lens-interfaces.sh
 PASS: lens-iptables.sh
 PASS: lens-iproute2.sh
+PASS: lens-iscsid.sh
 PASS: lens-jettyrealm.sh
 PASS: lens-jmxaccess.sh
 PASS: lens-jmxpassword.sh
@@ -187,6 +191,8 @@
 PASS: lens-logwatch.sh
 PASS: lens-lokkit.sh
 PASS: lens-lvm.sh
+PASS: lens-mailscanner.sh
+PASS: lens-mailscanner_rules.sh
 PASS: lens-mcollective.sh
 PASS: lens-mdadm_conf.sh
 PASS: lens-memcached.sh
@@ -219,11 +225,13 @@
 PASS: lens-passwd.sh
 PASS: lens-pbuilder.sh
 PASS: lens-pg_hba.sh
+PASS: lens-pgbouncer.sh
 PASS: lens-php.sh
 PASS: lens-phpvars.sh
 PASS: lens-postfix_access.sh
 PASS: lens-postfix_main.sh
 PASS: lens-postfix_master.sh
+PASS: lens-postfix_sasl_smtpd.sh
 PASS: lens-postfix_transport.sh
 PASS: lens-postfix_virtual.sh
 PASS: lens-postgresql.sh
@@ -231,7 +239,9 @@
 PASS: lens-protocols.sh
 PASS: lens-puppet.sh
 PASS: lens-puppet_auth.sh
+PASS: lens-puppetfile.sh
 PASS: lens-puppetfileserver.sh
+PASS: lens-pylonspaste.sh
 PASS: lens-pythonpaste.sh
 PASS: lens-qpid.sh
 PASS: lens-quote.sh
@@ -313,7 +323,7 @@
 PASS: test-save
 PASS: test-api
 PASS: test-run
-# PASS:  212
+# PASS:  222
 # SKIP:  3
 # XFAIL: 0
 # FAIL:  0