OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   24-Nov-2006 08:06:40
  Branch: HEAD                             Handle: 2006112407063900

  Modified files:
    openpkg-src/tftp        tftp.patch tftp.spec

  Log:
    resurrect pidfile handling patch hunk which got lost on last patch
    file recreation

  Summary:
    Revision    Changes     Path
    1.10        +36 -0      openpkg-src/tftp/tftp.patch
    1.60        +1  -1      openpkg-src/tftp/tftp.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/tftp/tftp.patch
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 tftp.patch
  --- openpkg-src/tftp/tftp.patch       6 Oct 2006 05:50:31 -0000       1.9
  +++ openpkg-src/tftp/tftp.patch       24 Nov 2006 07:06:39 -0000      1.10
  @@ -27,3 +27,39 @@
    int
    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 @@
  +  * SUCH DAMAGE.
  +  */
  + 
  ++#if defined(__NetBSD__)
  ++#define _NETBSD_SOURCE
  ++#endif
  + #include "config.h"         /* Must be included first */
  + #include "tftpd.h"
  + 
  +@@ -502,6 +505,22 @@
  + #ifdef HAVE_SETSID
  +       setsid();
  + #endif
  ++#ifdef PID_FILE
  ++  /* Write PID file */
  ++  {
  ++    mode_t old_umask;
  ++    pid_t  pid;
  ++    FILE   *fp;
  ++
  ++    old_umask = umask((mode_t) 0022);
  ++    pid = getpid();
  ++    if ((fp = fopen(PID_FILE, "w")) == NULL)
  ++      syslog(LOG_ERR, "cannot write PID file '%s'", PID_FILE);
  ++    fprintf(fp, "%ld\n", (long)pid);
  ++    fclose(fp);
  ++    umask(old_umask);
  ++  }
  ++#endif
  +     }
  +   } else {
  +     /* 0 is our socket descriptor */
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/tftp/tftp.spec
  ============================================================================
  $ cvs diff -u -r1.59 -r1.60 tftp.spec
  --- openpkg-src/tftp/tftp.spec        14 Oct 2006 10:18:18 -0000      1.59
  +++ openpkg-src/tftp/tftp.spec        24 Nov 2006 07:06:39 -0000      1.60
  @@ -33,7 +33,7 @@
   Group:        FTP
   License:      GPL
   Version:      0.43
  -Release:      20061014
  +Release:      20061124
   
   #   package options
   %option       with_fsl  yes
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to