@@ -7,10 +7,8 @@ URL:		http://www.kernel.org

 Group:		Applications/Internet

 Vendor:		VMware, Inc.

 Distribution: Photon

-Source0:	http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{version}.tar.gz

+Source0:	https://www.kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-%{version}.tar.gz

 %define sha1 tftp=2fe37983ffeaf4063ffaba514c4848635c622d8b

-Source1:        tftpd-hpa.service

-Source2:        tftpd-hpa.socket

 %description

 The Trivial File Transfer Protocol (TFTP) is normally used only for

@@ -50,11 +48,7 @@ make INSTALLROOT=%{buildroot} \

     SBINDIR=%{_sbindir} MANDIR=%{_mandir} \

 	install

 install -m755 -d %{buildroot}%{_sysconfdir}/xinetd.d/ %{buildroot}/var/lib/tftpboot

-#pushd %{buildroot}

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

-cp %{SOURCE1} %{buildroot}/lib/systemd/system/tftpd-hpa.service

-cp %{SOURCE2} %{buildroot}/lib/systemd/system/tftpd-hpa.socket

-#popd

+

 cat << EOF >> %{buildroot}%{_sysconfdir}/xinetd.d/tftp

 # default: off

 # description: The tftp server serves files using the trivial file transfer \

@@ -79,16 +73,6 @@ EOF

 %clean

 rm -rf %{buildroot}

-%post server

-/sbin/ldconfig 

-%systemd_post tftpd-hpa.service tftpd-hpa.socket

-

-%preun server

-%systemd_preun tftpd-hpa.service tftpd-hpa.socket

-

-%postun server

-/sbin/ldconfig

-%systemd_postun_with_restart tftpd-hpa.service

 %files

 %defattr(-,root,root)

@@ -101,9 +85,161 @@ rm -rf %{buildroot}

 %dir %attr(0750,nobody,nobody) /var/lib/tftpboot

 %{_sbindir}/in.tftpd

 %{_mandir}/man8/*

-/lib/systemd/system/tftpd-hpa.service

-/lib/systemd/system/tftpd-hpa.socket

 %changelog

 *	Mon Jul 27 2015 Xiaolin Li <xiaolinl@vmware.com> 5.2-1

--	Initial build.	First version

+-	Add tftp library to photon.

+* Tue Sep 14 2004 H. Peter Anvin <hpa@zytor.com>

+- removed completely broken "Malta" patch.

+- integrated into build machinery so rpm -ta works.

+

+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>

+- rebuilt

+

+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>

+- rebuilt

+

+* Fri Apr 11 2003 Elliot Lee <sopwith@redhat.com>

+- 0.33

+- Add /tftpboot directory (#88204)

+

+* Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com>

+- rebuilt

+

+* Sun Feb 23 2003 Tim Powers <timp@redhat.com>

+- add BuildPreReq on tcp_wrappers

+

+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>

+- rebuilt

+

+* Mon Nov 11 2002 Elliot Lee <sopwith@redhat.com> 0.32-1

+- Update to 0.32

+

+* Wed Oct 23 2002 Elliot Lee <sopwith@redhat.com> 0.30-1

+- Fix #55789

+- Update to 0.30

+

+* Thu Jun 27 2002 Elliot Lee <sopwith@redhat.com>

+- Try applying HJ's patch from #65476

+

+* Fri Jun 21 2002 Tim Powers <timp@redhat.com>

+- automated rebuild

+

+* Mon Jun 17 2002 Elliot Lee <sopwith@redhat.com>

+- Update to 0.29

+

+* Thu May 23 2002 Tim Powers <timp@redhat.com>

+- automated rebuild

+

+* Wed Jan 09 2002 Tim Powers <timp@redhat.com>

+- automated rebuild

+

+* Tue Dec 18 2001 Elliot Lee <sopwith@redhat.com> 0.17-15

+- Add patch4: netkit-tftp-0.17-defaultport.patch for bug #57562

+- Update to tftp-hpa-0.28 (bug #56131)

+- Remove include/arpa/tftp.h to fix #57259

+- Add resource limits in tftp-xinetd (#56722)

+

+* Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>

+- Bump release + rebuild.

+

+* Tue Jun 12 2001 Helge Deller <hdeller@redhat.de> (0.17-13)

+- updated tftp-hpa source to tftp-hpa-0.17

+- tweaked specfile with different defines for tftp-netkit and tftp-hpa version

+- use hpa's tftpd.8 man page instead of the netkits one

+

+* Mon May 07 2001 Helge Deller <hdeller@redhat.de>

+- rebuilt in 7.1.x

+

+* Wed Apr 18 2001 Helge Deller <hdeller@redhat.de>

+- fix tftp client's put problems (#29529)

+- update to tftp-hpa-0.16

+

+* Wed Apr  4 2001 Jakub Jelinek <jakub@redhat.com>

+- don't let configure to guess compiler, it can pick up egcs

+

+* Thu Feb 08 2001 Helge Deller <hdeller@redhat.de>

+- changed "wait" in xinetd file to "yes" (hpa-tftpd forks and exits) (#26467)

+- fixed hpa-tftpd to handle files greater than 32MB (#23725)

+- added "-l" flag to hpa-tftpd for file-logging (#26467)

+- added description for "-l" to the man-page 

+

+* Thu Feb 08 2001 Helge Deller <hdeller@redhat.de>

+- updated tftp client to 0.17 stable (#19640),

+- drop dependency on xinetd for tftp client (#25051),

+

+* Wed Jan 17 2001 Jeff Johnson <jbj@redhat.com>

+- xinetd shouldn't wait on tftp (which forks) (#23923).

+

+* Sat Jan  6 2001 Jeff Johnson <jbj@redhat.com>

+- fix to permit tftp put's (#18128).

+- startup as root with chroot to /tftpboot with early reversion to nobody

+  is preferable to starting as nobody w/o ability to chroot.

+- %%post is needed by server, not client. Add %%postun for erasure as well.

+

+* Wed Aug 23 2000 Nalin Dahyabhai <nalin@redhat.com>

+- default to being disabled

+

+* Thu Aug 17 2000 Jeff Johnson <jbj@redhat.com>

+- correct group.

+

+* Tue Jul 25 2000 Nalin Dahyabhai <nalin@redhat.com>

+- change user from root to nobody

+

+* Sat Jul 22 2000 Jeff Johnson <jbj@redhat.com>

+- update to tftp-hpa-0.14 (#14003).

+- add server_args (#14003).

+- remove -D_BSD_SOURCE (#14003).

+

+* Fri Jul 21 2000 Nalin Dahyabhai <nalin@redhat.com>

+- cook up an xinetd config file for tftpd

+

+* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>

+- automatic rebuild

+

+* Sun Jun 18 2000 Jeff Johnson <jbj@redhat.com>

+- FHS packaging.

+- update to 0.17.

+

+* Fri May  5 2000 Matt Wilson <msw@redhat.com>

+- use _BSD_SOURCE for hpa's tftpd so we get BSD signal semantics.

+

+* Fri Feb 11 2000 Bill Nottingham <notting@redhat.com>

+- fix description

+

+* Wed Feb  9 2000 Jeff Johnson <jbj@redhat.com>

+- compress man pages (again).

+

+* Wed Feb 02 2000 Cristian Gafton <gafton@redhat.com>

+- man pages are compressed

+- fix description and summary

+

+* Tue Jan  4 2000 Bill Nottingham <notting@redhat.com>

+- split client and server

+

+* Tue Dec 21 1999 Jeff Johnson <jbj@redhat.com>

+- update to 0.16.

+

+* Sat Aug 28 1999 Jeff Johnson <jbj@redhat.com>

+- update to 0.15.

+

+* Wed Apr  7 1999 Jeff Johnson <jbj@redhat.com>

+- tftpd should truncate file when overwriting (#412)

+

+* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> 

+- auto rebuild in the new build environment (release 22)

+

+* Mon Mar 15 1999 Jeff Johnson <jbj@redhat.com>

+- compile for 6.0.

+

+* Fri Aug  7 1998 Jeff Johnson <jbj@redhat.com>

+- build root

+

+* Mon Apr 27 1998 Prospector System <bugs@redhat.com>

+- translations modified for de, fr, tr

+

+* Mon Sep 22 1997 Erik Troan <ewt@redhat.com>

+- added check for getpwnam() failure

+

+* Tue Jul 15 1997 Erik Troan <ewt@redhat.com>

+- initial build

deleted file mode 100644

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

-[Unit]

-Description = HPA's tftp server

-Requires = tftpd-hpa.socket

-

-[Service]

-ExecStart = /usr/sbin/in.tftpd -v --secure /var/lib/tftpboot

-StandardInput = socket

-User = tftp

-Group = tftp

deleted file mode 100644

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

-[Unit]

-Description = Listen for tftp connections

-

-[Socket]

-ListenDatagram = 69

-BindToDevice = eth0

-

-[Install]

-WantedBy = sockets.target

@@ -1,3 +1,4 @@

+#copied from xinetd-2.3.15-15.fc22.x86_64.rpm

 [Unit]

 Description=Xinetd A Powerful Replacement For Inetd

 After=syslog.target network.target

@@ -3,7 +3,6 @@ Name:		xinetd

 Version:	2.3.15

 Release:	1%{?dist}

 License:	BSD

-URL:		http://www.xinetd.org/

 Group:		System Environment/Daemons

 Vendor:     	VMware, Inc.

 Distribution: 	Photon

@@ -27,7 +26,6 @@ mechanism to protect against port scanners, among other things.

 	--sbindir=%{buildroot}/%{_sbindir} 	\

 	--mandir=%{buildroot}/%{_datadir}/man 

   make

-  strip xinetd/xinetd

 %install

 rm -rf %{buildroot}

@@ -36,29 +34,25 @@ mkdir -p %{buildroot}/etc/rc.d/init.d

 mkdir -p %{buildroot}/etc/xinetd.d

 %makeinstall  

-#install -m 0755 xinetd6 %{buildroot}/%{_sbindir}

 install -m 0755 contrib/xinetd %{buildroot}/etc/rc.d/init.d/xinetd

 install -m 0600 contrib/xinetd.conf %{buildroot}/etc/

 cp contrib/xinetd.d/* %{buildroot}/etc/xinetd.d

-#pushd %{buildroot}

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

 cp %{SOURCE1} %{buildroot}/lib/systemd/system/xinetd.service

-#popd

-install -vdm755 %{buildroot}/etc/systemd/system/multi-user.target.wants

-ln -sfv ../../../../lib/systemd/system/xinetd.service  %{buildroot}/etc/systemd/system/multi-user.target.wants/xinetd.service

+

 %clean

 rm -rf %{buildroot}

 %post

-/sbin/ldconfig 

-%systemd_post xinetd.service

+%{_sbindir}/ldconfig 

+if [ $1 -eq 1 ] ; then

+    # Initial installation

+    # Enabled by default per "runs once then goes away" exception

+    /bin/systemctl enable xinetd.service     >/dev/null 2>&1 || :

+fi

 %preun

-%systemd_preun xinetd.service

-

-%postun

-/sbin/ldconfig

-%systemd_postun_with_restart xinetd.service

+/bin/systemctl disable xinetd.service

 %files

 %defattr(-, root, root)

@@ -69,9 +63,10 @@ rm -rf %{buildroot}

 %attr(0750, root, root) %config(noreplace) /etc/xinetd.conf

 %attr(0750, root, root) %config(noreplace) /etc/xinetd.d/*

 /lib/systemd/system/xinetd.service

-/etc/systemd/system/multi-user.target.wants/xinetd.service

 %changelog

 *   Fri Aug 07 2015 Xiaolin Li  <xiaolinl@vmware.com> 2.3.15-1

--   Initial build. First version

+-   Add xinetd library to photon

+*   Sun Sep 07 2003 Steve Grubb <linux_4ever@yahoo.com>

+-   Refined installation and added services.