OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 18-Feb-2009 10:32:04
Branch: HEAD Handle: 2009021809320300
Modified files:
openpkg-src/tftp tftp.patch tftp.spec
Log:
upgrading package: tftp 0.48 -> 5.0
Summary:
Revision Changes Path
1.11 +25 -14 openpkg-src/tftp/tftp.patch
1.70 +8 -6 openpkg-src/tftp/tftp.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tftp/tftp.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 tftp.patch
--- openpkg-src/tftp/tftp.patch 24 Nov 2006 07:06:39 -0000 1.10
+++ openpkg-src/tftp/tftp.patch 18 Feb 2009 09:32:03 -0000 1.11
@@ -1,6 +1,17 @@
+Index: MCONFIG.in
+--- MCONFIG.in.orig 2009-02-16 23:51:22 +0100
++++ MCONFIG.in 2009-02-18 10:19:59 +0100
+@@ -21,6 +21,7 @@
+ # Prefixes
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
++datarootdir = @datarootdir@
+
+ # Directory for user binaries
+ BINDIR = @bindir@
Index: Makefile
---- Makefile.orig 2006-10-05 23:23:01 +0200
-+++ Makefile 2006-10-06 07:41:41 +0200
+--- Makefile.orig 2009-02-16 23:51:22 +0100
++++ Makefile 2009-02-18 10:19:59 +0100
@@ -59,9 +59,9 @@
# Adding "configure" to the dependencies serializes this with running
# autoconf, because there are apparently race conditions between
@@ -15,9 +26,9 @@
configure: configure.in aclocal.m4
rm -rf MCONFIG configure config.log aconfig.h *.cache
Index: configure
---- configure.orig 2006-10-05 23:23:14 +0200
-+++ configure 2006-10-06 07:49:18 +0200
-@@ -9877,6 +9877,9 @@
+--- configure.orig 2009-02-16 23:51:35 +0100
++++ configure 2009-02-18 10:19:59 +0100
+@@ -9852,6 +9852,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -28,21 +39,21 @@
main ()
{
Index: tftpd/tftpd.c
---- tftpd/tftpd.c.orig 2004-09-15 00:38:46 +0200
-+++ tftpd/tftpd.c 2005-06-11 13:43:54 +0200
-@@ -35,6 +35,9 @@
+--- tftpd/tftpd.c.orig 2009-02-16 23:51:22 +0100
++++ tftpd/tftpd.c 2009-02-18 10:20:18 +0100
+@@ -31,6 +31,9 @@
* SUCH DAMAGE.
*/
+#if defined(__NetBSD__)
+#define _NETBSD_SOURCE
+#endif
- #include "config.h" /* Must be included first */
+ #include "config.h" /* Must be included first */
#include "tftpd.h"
-@@ -502,6 +505,22 @@
- #ifdef HAVE_SETSID
- setsid();
+@@ -716,6 +719,22 @@
+ #ifndef __CYGWIN__
+ set_socket_nonblock(fd, 1);
#endif
+#ifdef PID_FILE
+ /* Write PID file */
@@ -61,5 +72,5 @@
+ }
+#endif
}
- } else {
- /* 0 is our socket descriptor */
+
+ /* Disable path MTU discovery */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tftp/tftp.spec
============================================================================
$ cvs diff -u -r1.69 -r1.70 tftp.spec
--- openpkg-src/tftp/tftp.spec 1 Jan 2008 15:05:59 -0000 1.69
+++ openpkg-src/tftp/tftp.spec 18 Feb 2009 09:32:03 -0000 1.70
@@ -31,8 +31,8 @@
Class: BASE
Group: FTP
License: GPL
-Version: 0.48
-Release: 20080101
+Version: 5.0
+Release: 20090218
# package options
%option with_fsl yes
@@ -88,6 +88,7 @@
esac
./configure \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--with-remap \
--without-tcpwrappers \
--without-readline
@@ -105,9 +106,10 @@
INSTALLROOT=$RPM_BUILD_ROOT
%{l_shtool} install -c -m 644 %{l_value -s -a} \
%{SOURCE tftpd.remap} $RPM_BUILD_ROOT%{l_prefix}/etc/tftp/
- mv $RPM_BUILD_ROOT%{l_prefix}/man/man8/in.tftpd.8 \
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/tftpd.8
+ mv $RPM_BUILD_ROOT%{l_prefix}/man/man8/in.tftpd.8 \
$RPM_BUILD_ROOT%{l_prefix}/man/man8/tftpd.8
- mv $RPM_BUILD_ROOT%{l_prefix}/sbin/in.tftpd \
+ mv $RPM_BUILD_ROOT%{l_prefix}/sbin/in.tftpd \
$RPM_BUILD_ROOT%{l_prefix}/sbin/tftpd
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
@@ -128,7 +130,7 @@
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%config %{l_prefix}/etc/fsl/fsl.tftp' \
- '%config %{l_prefix}/etc/tftp/*'
+ '%config %{l_prefix}/etc/tftp/*'
%files -f files
@@ -139,7 +141,7 @@
# before upgrade, save status and stop service
[ $1 -eq 2 ] || exit 0
eval `%{l_rc} tftp status 2>/dev/null | tee %{l_tmpfile}`
- %{l_rc} tfp stop 2>/dev/null
+ %{l_rc} tftp stop 2>/dev/null
exit 0
%post
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
