@@ -2,7 +2,7 @@

 Summary:	Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. 

 Name:		net-snmp   

 Version:	5.7.3

-Release:	6%{?dist}

+Release:	7%{?dist}

 License:	BSD (like)  

 URL:		http://net-snmp.sourceforge.net/

 Group:		Productivity/Networking/Other

@@ -10,6 +10,8 @@ Vendor:		VMware, Inc.

 Distribution:	Photon

 Source0:	http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.gz

 %define sha1 net-snmp=97dc25077257680815de44e34128d365c76bd839

+Source1:	snmpd.service

+Source2:	snmptrapd.service

 Patch1: 	net-snmp-5.7.2-systemd.patch

 Patch2:         net-snmp-remove-u64-typedef.patch

 Patch3:         net-snmp-fix-perl-module-compilation.patch

@@ -52,33 +54,8 @@ make

 %install

 make install DESTDIR=%{buildroot}

 mkdir -p %{buildroot}/lib/systemd/system

-cat << EOF >> %{buildroot}/lib/systemd/system/snmpd.service

-[Unit]

-Description=Simple Network Management Protocol (SNMP) Daemon.

-After=syslog.target network.target

-

-[Service]

-Type=notify

-ExecStart=/usr/sbin/snmpd -LS0-6d -f

-ExecReload=/bin/kill -HUP $MAINPID

-

-[Install]

-WantedBy=multi-user.target

-EOF

-

-cat << EOF >> %{buildroot}/lib/systemd/system/snmptrapd.service

-[Unit]

-Description=Simple Network Management Protocol (SNMP) Trap Daemon.

-After=syslog.target network.target

-

-[Service]

-Type=notify

-ExecStart=/usr/sbin/snmptrapd -Lsd -f

-ExecReload=/bin/kill -HUP $MAINPID

-

-[Install]

-WantedBy=multi-user.target

-EOF

+install -m 0644 %{SOURCE1} %{buildroot}/lib/systemd/system/snmpd.service

+install -m 0644 %{SOURCE2} %{buildroot}/lib/systemd/system/snmptrapd.service

 %check

 make %{?_smp_mflags} test

@@ -119,6 +96,8 @@ rm -rf %{buildroot}/*

 %exclude /usr/lib/perl5/5.22.1/x86_64-linux-thread-multi/perllocal.pod

 %changelog

+*	Mon Jul 24 2017 Dheeraj Shetty <dheerajs@vmware.com> 5.7.3-7

+-	Make service file a different source

 *	Tue Apr 04 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.7.3-6

 -	Patch to remove U64 typedef

 *       Mon Oct 04 2016 ChangLee <changLee@vmware.com> 5.7.3-5

new file mode 100644

@@ -0,0 +1,11 @@

+[Unit]

+Description=Simple Network Management Protocol (SNMP) Daemon.

+After=syslog.target network.target

+

+[Service]

+Type=notify

+ExecStart=/usr/sbin/snmpd -LS0-6d -f

+ExecReload=/bin/kill -HUP $MAINPID

+

+[Install]

+WantedBy=multi-user.target

new file mode 100644

@@ -0,0 +1,11 @@

+[Unit]

+Description=Simple Network Management Protocol (SNMP) Trap Daemon.

+After=syslog.target network.target

+

+[Service]

+Type=notify

+ExecStart=/usr/sbin/snmptrapd -Lsd -f

+ExecReload=/bin/kill -HUP $MAINPID

+

+[Install]

+WantedBy=multi-user.target

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

 Summary:        Free version of the SSH connectivity tools

 Name:           openssh

 Version:        7.5p1

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        BSD

 URL:            https://www.openssh.com/

 Group:          System Environment/Security

@@ -11,6 +11,8 @@ Source0:        https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{v

 %define sha1    openssh=5e8f185d00afb4f4f89801e9b0f8b9cee9d87ebd

 Source1:        http://www.linuxfromscratch.org/blfs/downloads/systemd/blfs-systemd-units-20140907.tar.bz2

 %define sha1    blfs-systemd-units=713afb3bbe681314650146e5ec412ef77aa1fe33

+Source2:        sshd.service

+Source3:        sshd-keygen.service

 Patch0:         blfs_systemd_fixes.patch

 Patch1:         openssh-7.5p1-fips.patch

 Patch2:         openssh-7.5p1-configure-fips.patch

@@ -76,37 +78,8 @@ pushd blfs-systemd-units-20140907

 make DESTDIR=%{buildroot} install-sshd

 popd

-cat << EOF > %{buildroot}/lib/systemd/system/sshd.service

-[Unit]

-Description=OpenSSH Daemon

-After=network.target sshd-keygen.service

-

-[Service]

-ExecStart=%{_sbindir}/sshd -D

-ExecReload=/bin/kill -HUP $MAINPID

-KillMode=process

-Restart=always

-

-[Install]

-WantedBy=multi-user.target

-EOF

-

-cat << EOF >> %{buildroot}/lib/systemd/system/sshd-keygen.service

-[Unit]

-Description=Generate sshd host keys

-ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key

-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key

-ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key

-Before=sshd.service

-

-[Service]

-Type=oneshot

-RemainAfterExit=yes

-ExecStart=%{_bindir}/ssh-keygen -A

-[Install]

-WantedBy=multi-user.target

-EOF

-

+install -m644 %{SOURCE2} %{buildroot}/lib/systemd/system/sshd.service

+install -m644 %{SOURCE3} %{buildroot}/lib/systemd/system/sshd-keygen.service

 install -m755 contrib/ssh-copy-id %{buildroot}/%{_bindir}/

 install -m644 contrib/ssh-copy-id.1 %{buildroot}/%{_mandir}/man1/

@@ -195,6 +168,8 @@ rm -rf %{buildroot}/*

 %{_mandir}/man8/ssh-pkcs11-helper.8.gz

 %changelog

+*   Mon Jul 24 2017 Dheeraj Shetty <dheerajs@vmware.com> 7.5p1-3

+-   Seperate the service file from the spec file

 *   Wed May 3  2017 Bo Gan <ganb@vmware.com> 7.5p1-2

 -   Fixed openssh-server dependency on coreutils

 *   Tue Mar 28 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 7.5p1-1

new file mode 100644

@@ -0,0 +1,13 @@

+[Unit]

+Description=Generate sshd host keys

+ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key

+ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key

+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key

+Before=sshd.service

+

+[Service]

+Type=oneshot

+RemainAfterExit=yes

+ExecStart=/usr/bin/ssh-keygen -A

+[Install]

+WantedBy=multi-user.target

new file mode 100644

@@ -0,0 +1,12 @@

+[Unit]

+Description=OpenSSH Daemon

+After=network.target sshd-keygen.service

+

+[Service]

+ExecStart=/usr/sbin/sshd -D

+ExecReload=/bin/kill -HUP $MAINPID

+KillMode=process

+Restart=always

+

+[Install]

+WantedBy=multi-user.target

new file mode 100644

@@ -0,0 +1,16 @@

+[Unit]

+Description=Connection poller for PostgreSQL.

+After=syslog.target network.target

+

+[Service]

+Type=forking

+ExecStart=/usr/bin/pgbouncer --quiet --user pgbouncer /etc/pgbouncer.ini

+ExecReload=/bin/kill -USR2 $MAINPID

+User=pgbouncer

+Group=pgbouncer

+RuntimeDirectory=pgbouncer

+RuntimeDirectoryMode=0755

+Restart=always

+

+[Install]

+WantedBy=multi-user.target

@@ -1,11 +1,12 @@

 Summary:	Connection pooler for PostgreSQL.

 Name:		pgbouncer

 Version:	1.7.2

-Release:	5%{?dist}

+Release:	6%{?dist}

 License:	BSD

 URL:		https://wiki.postgresql.org/wiki/PgBouncer

 Source0:        https://pgbouncer.github.io/downloads/files/1.7.2/%{name}-%{version}.tar.gz

 %define sha1 pgbouncer=d9bb29da15d90713e2399af3ebf5019da5cbe2d6

+Source1:        pgbouncer.service

 Group:		Application/Databases.

 Vendor:		VMware, Inc.

 Distribution:	Photon

@@ -35,24 +36,7 @@ install -p -d %{buildroot}%{_sysconfdir}/

 install -p -d %{buildroot}%{_sysconfdir}/sysconfig

 install -p -m 644 etc/pgbouncer.ini %{buildroot}%{_sysconfdir}/

 mkdir -p %{buildroot}/etc/systemd/system/

-cat << EOF >> %{buildroot}/etc/systemd/system/%{name}.service

-[Unit]

-Description=Connection poller for PostgreSQL.

-After=syslog.target network.target

-

-[Service]

-Type=forking

-ExecStart=/usr/bin/pgbouncer --quiet --user pgbouncer /etc/pgbouncer.ini

-ExecReload=/bin/kill -USR2 $MAINPID

-User=pgbouncer

-Group=pgbouncer

-RuntimeDirectory=pgbouncer

-RuntimeDirectoryMode=0755

-Restart=always

-

-[Install]

-WantedBy=multi-user.target

-EOF

+install -m 0644 %{SOURCE1} %{buildroot}/etc/systemd/system/%{name}.service

 %check

 pushd test

@@ -95,6 +79,8 @@ fi

 /usr/share/doc/pgbouncer/*

 %changelog

+*   Mon Jul 24 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.7.2-6

+-   Seperate the service file from the spec file

 *   Wed May 31 2017 Rongrong Qiu <rqiu@vmware.com> 1.7.2-5

 -   Add RuntimeDirectory and Type=forking

 *   Thu Apr 13 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.7.2-4