new file mode 100644

@@ -0,0 +1,71 @@

+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

+%{!?python_version: %define python_version %(%{__python} -c "import sys ; print sys.version[:3]")}

+

+%define commit0 a152954dcf0583a6efd1af31c42f9e27e6a15bea

+

+Summary:	Message of the Day

+Name:		motd

+Version:	0.1.3

+Release:	1%{?dist}

+License:	GPLv3

+URL:		http://github.com/rtnpro/fedora-motd

+Source0:	https://github.com/rtnpro/motdgen/archive/motdgen-a152954.tar.gz

+%define sha1 motdgen-a152954.tar.gz=fd0b535df54515ce5f56933e53b0ed73c77d1137

+Patch0:		strip-dnf.patch

+

+BuildArchitectures: noarch

+

+BuildRequires:	python2-devel

+BuildRequires:	python-setuptools

+

+Requires:	Linux-PAM

+Requires:	systemd

+Requires:	python2

+

+%description

+Generates Dynamic MOTD.

+

+%prep

+%setup -q -n motdgen-%{commit0}

+%patch0 -p1

+

+%build

+%{__python} setup.py build

+

+%install

+%{__python} setup.py install -O1 --skip-build \

+	--install-data=%{_datadir} --root %{buildroot}

+

+#shadow is providing /etc/pam.d/sshd with (noreplace)

+

+%triggerin -- shadow

+[ $1 -eq 1 ] && [ $2 -eq 1 ] || exit 0

+echo "detected install of motd/shadow, patching /etc/pam.d/sshd"

+grep -q '^\s*session\s*include\s*motdgen.*$' %{_sysconfdir}/pam.d/sshd \

+	|| echo "session include motdgen" >> %{_sysconfdir}/pam.d/sshd

+

+%triggerun -- shadow

+[ $1 -eq 0 ] && [ $2 -eq 1 ] || exit 0

+# $1 $2

+# 0  1  motd is being uninstalled, shadow is installed

+echo "detected uninstall of motd/shadow, reverting /etc/pam.d/sshd"

+sed -i '/^\s*session\s*include\s*motdgen.*$/d' \

+	%{_sysconfdir}/pam.d/sshd || exit 0

+

+%postun

+[ $1 -eq 0 ] || exit 0

+rm -rf %{_localstatedir}/run/motdgen

+

+%files

+%doc README.md

+%defattr(-,root,root)

+%{python_sitelib}/motdgen-%{version}-py%{python_version}.egg-info/

+%{_sysconfdir}/pam.d/motdgen

+%{_sysconfdir}/motdgen.d

+%{_sysconfdir}/profile.d/motdgen.sh

+%{_bindir}/motdgen

+%{_sysconfdir}/systemd/system/motdgen.service

+

+%changelog

+*   Mon Apr 17 2017 Bo Gan <ganb@vmware.com> 0.1.3-1

+-   Initial packaging for motd

new file mode 100644

@@ -0,0 +1,25 @@

+diff --git a/setup.py b/setup.py

+index bb8375a..a141d5d 100644

+--- a/setup.py

+@@ -11,18 +11,14 @@ setup(

+     author_email='rtnpro@gmail.com',

+     url='https://github.com/rtnpro/motdgen',

+     license="GPLv2",

+-    scripts=["motdgen", "motdgen-cache-updateinfo"],

++    scripts=["motdgen"],

+     packages=find_packages(),

+     include_package_data=True,

+     data_files=[

+         ('/etc/profile.d', ['motdgen.sh']),

+         ('/etc/pam.d', ['pam.d/motdgen']),

+-        ('/usr/lib/python2.7/site-packages/dnf-plugins',

+-         ['dnf/plugins/cache_updateinfo.py']),

+         ('/etc/motdgen.d', [

+-            'motdgen.d/01-uptime.sh',

+-            'motdgen.d/02-updateinfo.sh']),

+-        ('/etc/cron.daily', ['motdgen-cache-updateinfo']),

++            'motdgen.d/01-uptime.sh']),

+         ('/etc/systemd/system', ['motdgen.service'])

+     ]

+ )

new file mode 100644

@@ -0,0 +1,5 @@

+#!/bin/sh

+

+exec > /var/cache/tdnf/cached-updateinfo.txt

+

+tdnf -qC updateinfo

new file mode 100644

@@ -0,0 +1,9 @@

+[Unit]

+Description=Cache tdnf updateinfo

+

+[Service]

+ExecStart=/usr/bin/tdnf-cache-updateinfo

+Type=oneshot

+Nice=19

+IOSchedulingClass=2

+IOSchedulingPriority=7

new file mode 100644

@@ -0,0 +1,9 @@

+[Unit]

+Description=Run tdnf-cache-updateinfo.service daily

+

+[Timer]

+OnCalendar=*-*-* 0,6,12,18:00

+RandomizedDelaySec=6h

+

+[Install]

+WantedBy=multi-user.target

@@ -4,7 +4,7 @@

 Summary:        dnf/yum equivalent using C libs

 Name:           tdnf

 Version:        1.1.0

-Release:        3%{?dist}

+Release:        4%{?dist}

 Vendor:         VMware, Inc.

 Distribution:   Photon

 License:        VMware

@@ -22,6 +22,10 @@ BuildRequires:  librepo-devel

 Source0:    %{name}-%{version}.tar.gz

 Patch0:     hy_sack_create.patch

 %define sha1 tdnf=15544a87ea01d6215fed35bd2d1299776f7daca1

+Source1:    cache-updateinfo

+Source2:    cache-updateinfo.service

+Source3:    cache-updateinfo.timer

+Source4:    updateinfo.sh

 %description

 tdnf is a yum/dnf equivalent

@@ -48,6 +52,10 @@ make %{?_smp_mflags}

 make DESTDIR=%{buildroot} install

 mkdir -p %{buildroot}/var/cache/tdnf

 ln -sf %{_bindir}/tdnf %{buildroot}%{_bindir}/tyum

+install -v -D -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/tdnf-cache-updateinfo

+install -v -D -m 0644 %{SOURCE2} %{buildroot}%{_libdir}/systemd/system/tdnf-cache-updateinfo.service

+install -v -D -m 0644 %{SOURCE3} %{buildroot}%{_libdir}/systemd/system/tdnf-cache-updateinfo.timer

+install -v -D -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/motdgen.d/02-tdnf-updateinfo.sh

 # Pre-install

 %pre

@@ -63,12 +71,31 @@ ln -sf %{_bindir}/tdnf %{buildroot}%{_bindir}/tyum

     /sbin/ldconfig

+%triggerin -- motd

+[ $2 -eq 1 ] || exit 0

+if [ $1 -eq 1 ]; then

+    echo "detected install of tdnf/motd, enabling tdnf-cache-updateinfo.timer"

+    systemctl enable tdnf-cache-updateinfo.timer >/dev/null 2>&1 || :

+    systemctl start tdnf-cache-updateinfo.timer >/dev/null 2>&1 || :

+elif [ $1 -eq 2 ]; then

+    echo "detected upgrade of tdnf, daemon-reload"

+    systemctl daemon-reload >/dev/null 2>&1 || :

+fi

+

+

 # Pre-uninstall

 %preun

     # First argument is 0 => Uninstall

     # First argument is 1 => Upgrade

+%triggerun -- motd

+[ $1 -eq 1 ] && [ $2 -eq 1 ] && exit 0

+echo "detected uninstall of tdnf/motd, disabling tdnf-cache-updateinfo.timer"

+systemctl --no-reload disable tdnf-cache-updateinfo.timer >/dev/null 2>&1 || :

+systemctl stop tdnf-cache-updateinfo.timer >/dev/null 2>&1 || :

+rm -rf /var/cache/tdnf/cached-updateinfo.txt

+

 # Post-uninstall

 %postun

@@ -77,12 +104,21 @@ ln -sf %{_bindir}/tdnf %{buildroot}%{_bindir}/tyum

     # First argument is 0 => Uninstall

     # First argument is 1 => Upgrade

+%triggerpostun -- motd

+[ $1 -eq 1 ] && [ $2 -eq 1 ] || exit 0

+echo "detected upgrade of tdnf/motd, restarting tdnf-cache-updateinfo.timer"

+systemctl try-restart tdnf-cache-updateinfo.timer >/dev/null 2>&1 || :

+

 %files

     %defattr(-,root,root,0755)

     %{_bindir}/tdnf

     %{_bindir}/tyum

+    %{_bindir}/tdnf-cache-updateinfo

     %{_libdir}/*.so.*

     %config(noreplace) %{_sysconfdir}/tdnf/tdnf.conf

+    %config %{_libdir}/systemd/system/tdnf-cache-updateinfo.service

+    %config(noreplace) %{_libdir}/systemd/system/tdnf-cache-updateinfo.timer

+    %config %{_sysconfdir}/motdgen.d/02-tdnf-updateinfo.sh

     %dir /var/cache/tdnf

 %files devel

@@ -95,6 +131,8 @@ ln -sf %{_bindir}/tdnf %{buildroot}%{_bindir}/tyum

     %{_libdir}/pkgconfig/tdnf.pc

 %changelog

+*   Thu Apr 20 2017 Bo Gan <ganb@vmware.com> 1.1.0-4

+-   motd hooks/triggers for updateinfo notification

 *   Fri Apr 14 2017 Dheerajs Shetty <dheerajs@vmware.com> 1.1.0-3

 -   Adding a patch to compile with latest hawkey version

 *   Mon Dec 19 2016 Xiaolin Li <xiaolinl@vmware.com> 1.1.0-2

new file mode 100644

@@ -0,0 +1,7 @@

+path=/var/cache/tdnf/cached-updateinfo.txt

+

+if [ -f "$path" ]; then

+    cat $path

+else

+    echo "tdnf update info not available yet!"

+fi

@@ -190,6 +190,7 @@

         "c-ares",

         "dnsmasq",

         "ddclient",

-        "netmgmt"

+        "netmgmt",

+        "motd"

     ]

 }

@@ -9,7 +9,7 @@

                 "open-vm-tools",

                 "docker","bridge-utils",

                 "cloud-init", "tzdata",

-                "krb5", "which", "initramfs"]

+                "krb5", "which", "initramfs", "motd"]

 }

@@ -9,7 +9,7 @@

                 "open-vm-tools",

                 "docker","bridge-utils",

                 "cloud-init",

-                "krb5", "which", "tzdata"]

+                "krb5", "which", "tzdata", "motd"]

 }