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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   19-Oct-2003 11:39:15
  Branch: HEAD                             Handle: 2003101910391500

  Added files:
    openpkg-src/ntp         ntp.patch
  Modified files:
    openpkg-src/ntp         ntp.spec

  Log:
    add optional SNTP and Crypto/OpenSSL support; port again to anchient
    Debian 2.2

  Summary:
    Revision    Changes     Path
    1.3         +35 -0      openpkg-src/ntp/ntp.patch
    1.56        +19 -2      openpkg-src/ntp/ntp.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/ntp/ntp.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.3 ntp.patch
  --- /dev/null 2003-10-19 11:39:15.000000000 +0200
  +++ ntp.patch 2003-10-19 11:39:15.000000000 +0200
  @@ -0,0 +1,35 @@
  +Index: ntpd/ntp_io.c
  +--- ntpd/ntp_io.c.orig       2003-10-07 23:10:39.000000000 +0200
  ++++ ntpd/ntp_io.c    2003-10-19 11:37:19.000000000 +0200
  +@@ -809,6 +809,7 @@
  +             /*
  +              * enable reception of multicast packets
  +              */
  ++#if defined(IPV6_JOIN_GROUP)
  +             mreq6.ipv6mr_multiaddr = iaddr6;
  +             mreq6.ipv6mr_interface = 0;
  +             if(setsockopt(inter_list[i].fd, IPPROTO_IPV6, IPV6_JOIN_GROUP,
  +@@ -818,6 +819,7 @@
  +                      mreq6.ipv6mr_interface, stoa(&addr));
  +             inter_list[i].flags |= INT_MULTICAST;
  +             inter_list[i].num_mcast++;
  ++#endif
  +             if(i >= ninterfaces)
  +                     ninterfaces = i+1;
  + 
  +@@ -963,6 +965,7 @@
  +                     }
  +                     else
  +                     {
  ++#if defined(IPV6_LEAVE_GROUP)
  +                             /* We are sharing "any address" port :-(  Don't close 
it! */
  +                             if (setsockopt(inter_list[i].fd, IPPROTO_IPV6, 
IPV6_LEAVE_GROUP,
  +                                     (char *)&mreq6, sizeof(mreq6)) == -1)
  +@@ -971,6 +974,7 @@
  +                             /* If there are none left negate the Multicast flag */
  +                             if(inter_list[i].num_mcast == 0)
  +                                     inter_list[i].flags &= ~INT_MULTICAST;
  ++#endif
  +                     }
  +             }
  +             break;
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ntp/ntp.spec
  ============================================================================
  $ cvs diff -u -r1.55 -r1.56 ntp.spec
  --- openpkg-src/ntp/ntp.spec  19 Oct 2003 09:21:57 -0000      1.55
  +++ openpkg-src/ntp/ntp.spec  19 Oct 2003 09:39:15 -0000      1.56
  @@ -36,7 +36,9 @@
   Release:      20031019
   
   #   package options
  -%option       with_fsl  yes
  +%option       with_fsl     yes
  +%option       with_crypto  yes
  +%option       with_sntp    yes
   
   #   list of sources
   Source0:      ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-%{version}.tar.gz
  @@ -44,6 +46,7 @@
   Source2:      ntp.conf
   Source3:      rc.ntp
   Source4:      fsl.ntp
  +Patch0:       ntp.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -54,6 +57,10 @@
   BuildPreReq:  fsl >= 1.2.0
   PreReq:       fsl >= 1.2.0
   %endif
  +%if "%{with_crypto}" == "yes"
  +BuildPreReq:  openssl
  +PreReq:       openssl
  +%endif
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -73,6 +80,7 @@
   %prep
       %setup -q
       %setup -q -T -D -a 1
  +    %patch -p0 -P 0
   
   %build
       #   configure program
  @@ -81,7 +89,16 @@
       LDFLAGS="%{l_fsl_ldflags}" \
       LIBS="%{l_fsl_libs}" \
       ./configure \
  -        --prefix=%{l_prefix}
  +        --prefix=%{l_prefix} \
  +%if "%{with_sntp}" == "yes"
  +        --with-sntp \
  +%endif
  +%if "%{with_crypto}" == "yes"
  +        --with-crypto \
  +        --with-openssl-libdir=%{l_prefix}/lib \
  +        --with-openssl-incdir=%{l_prefix}/include \
  +%endif
  +        --enable-ntpdate-step
       %{l_shtool} subst \
           -e 's;\(CONFIG_FILE[^"]*"\)/etc/ntp.conf;\1%{l_prefix}/etc/ntp/ntp.conf;' \
           include/ntp_config.h ntpdate/ntptime_config.c
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to