upgrading package: tftp 0.37 -> 0.38

tftp/tftp.patch

@@ -1,7 +1,22 @@
+Index: Makefile
+--- Makefile.orig	2004-01-08 21:48:51 +0100
++++ Makefile	2004-09-03 20:19:54 +0200
+@@ -58,9 +58,9 @@
+ # Adding "configure" to the dependencies serializes this with running
+ # autoconf, because there are apparently race conditions between
+ # autoconf and autoheader.
+-aconfig.h.in: configure.in configure aclocal.m4
+-	rm -f aconfig.h.in aconfig.h
+-	autoheader
++#aconfig.h.in: configure.in configure aclocal.m4
++#	rm -f aconfig.h.in aconfig.h
++#	autoheader
+ 
+ configure: configure.in aclocal.m4
+ 	rm -rf MCONFIG configure config.log aconfig.h *.cache
 Index: tftpd/tftpd.c
-diff -Nau tftpd/tftpd.c.orig tftpd/tftpd.c
---- tftpd/tftpd.c.orig	2004-06-15 14:28:32 +0200
-+++ tftpd/tftpd.c	2004-06-15 14:29:08 +0200
+--- tftpd/tftpd.c.orig	2004-06-13 23:11:24 +0200
++++ tftpd/tftpd.c	2004-09-03 20:19:54 +0200
 @@ -502,6 +502,22 @@
  #ifdef HAVE_SETSID
        setsid();
@@ -25,87 +40,3 @@ diff -Nau tftpd/tftpd.c.orig tftpd/tftpd.c
      }
    } else {
      /* 0 is our socket descriptor */
-Index: Makefile
-diff -Nau Makefile.orig Makefile
---- Makefile.orig	2004-06-15 14:31:05 +0200
-+++ Makefile	2004-06-15 14:31:11 +0200
-@@ -58,9 +58,9 @@
- # Adding "configure" to the dependencies serializes this with running
- # autoconf, because there are apparently race conditions between
- # autoconf and autoheader.
--aconfig.h.in: configure.in configure aclocal.m4
--	rm -f aconfig.h.in aconfig.h
--	autoheader
-+#aconfig.h.in: configure.in configure aclocal.m4
-+#	rm -f aconfig.h.in aconfig.h
-+#	autoheader
- 
- configure: configure.in aclocal.m4
- 	rm -rf MCONFIG configure config.log aconfig.h *.cache
-Index: configure
-diff -Nau configure.orig configure
---- configure.orig	2004-06-13 23:13:46 +0200
-+++ configure	2004-06-15 14:56:31 +0200
-@@ -11946,16 +11946,16 @@
-   test "$ac_cv_search_xmalloc" = "none required" || LIBS="$ac_cv_search_xmalloc $LIBS"
- 
- else
--  LIBXTRA=true case $LIBOBJS in
-+  LIBXTRA=true
-+  case $LIBOBJS in
-     "xmalloc.$ac_objext"   | \
-   *" xmalloc.$ac_objext"   | \
-     "xmalloc.$ac_objext "* | \
--  *" xmalloc.$ac_objext "*
--fi
-+  *" xmalloc.$ac_objext "*)
-  ;;
-   *) LIBOBJS="$LIBOBJS xmalloc.$ac_objext" ;;
- esac
--)
-+fi
- echo "$as_me:$LINENO: checking for library containing xstrdup" >&5
- echo $ECHO_N "checking for library containing xstrdup... $ECHO_C" >&6
- if test "${ac_cv_search_xstrdup+set}" = set; then
-@@ -12081,16 +12081,16 @@
-   test "$ac_cv_search_xstrdup" = "none required" || LIBS="$ac_cv_search_xstrdup $LIBS"
- 
- else
--  LIBXTRA=true case $LIBOBJS in
-+  LIBXTRA=true
-+  case $LIBOBJS in
-     "xstrdup.$ac_objext"   | \
-   *" xstrdup.$ac_objext"   | \
-     "xstrdup.$ac_objext "* | \
--  *" xstrdup.$ac_objext "*
--fi
-+  *" xstrdup.$ac_objext "*)
-  ;;
-   *) LIBOBJS="$LIBOBJS xstrdup.$ac_objext" ;;
- esac
--)
-+fi
- echo "$as_me:$LINENO: checking for library containing bsd_signal" >&5
- echo $ECHO_N "checking for library containing bsd_signal... $ECHO_C" >&6
- if test "${ac_cv_search_bsd_signal+set}" = set; then
-@@ -12216,16 +12216,16 @@
-   test "$ac_cv_search_bsd_signal" = "none required" || LIBS="$ac_cv_search_bsd_signal $LIBS"
- 
- else
--  LIBXTRA=true case $LIBOBJS in
-+  LIBXTRA=true
-+  case $LIBOBJS in
-     "bsdsignal.$ac_objext"   | \
-   *" bsdsignal.$ac_objext"   | \
-     "bsdsignal.$ac_objext "* | \
--  *" bsdsignal.$ac_objext "*
--fi
-+  *" bsdsignal.$ac_objext "*)
-  ;;
-   *) LIBOBJS="$LIBOBJS bsdsignal.$ac_objext" ;;
- esac
--)
-+fi
- if $LIBXTRA; then
- 	XTRALIBS="$OBJROOT/lib/libxtra.a $XTRALIBS"
- fi

tftp/tftp.spec

@@ -33,8 +33,8 @@ Distribution: OpenPKG
 Class:        BASE
 Group:        Network
 License:      GPL
-Version:      0.37
-Release:      20040706
+Version:      0.38
+Release:      20040903
 
 #   package options
 %option       with_fsl  yes
@@ -51,6 +51,8 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20040130, make, gcc
 PreReq:       OpenPKG, openpkg >= 20040130
+BuildPreReq:  getopt
+PreReq:       getopt
 %if "%{with_fsl}" == "yes"
 BuildPreReq:  fsl >= 1.2.0
 PreReq:       fsl >= 1.2.0
@@ -75,10 +77,10 @@ AutoReqProv:  no
 
 %build
     CC="%{l_cc}" \
-    CFLAGS="%{l_cflags -O} -DPID_FILE='\"%{l_prefix}/var/tftp/tftpd.pid\"'" \
+    CFLAGS="%{l_cflags -O} %{l_cppflags} -DPID_FILE='\"%{l_prefix}/var/tftp/tftpd.pid\"'" \
     CPPFLAGS="%{l_cppflags}" \
     LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
-    LIBS="%{l_fsl_libs}" \
+    LIBS="%{l_fsl_libs} -lgetopt" \
     ./configure \
         --prefix=%{l_prefix} \
         --with-remap \