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

  Server: cvs.openpkg.org                  Name:   Michael van Elst
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   21-Jul-2003 10:51:41
  Branch: HEAD                             Handle: 2003072109513902

  Modified files:
    openpkg-src/libnet      libnet.patch libnet.spec
    openpkg-web             news.txt

  Log:
    fix build for systems without INET6

  Summary:
    Revision    Changes     Path
    1.2         +53 -3      openpkg-src/libnet/libnet.patch
    1.19        +1  -1      openpkg-src/libnet/libnet.spec
    1.5677      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/libnet/libnet.patch
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 libnet.patch
  --- openpkg-src/libnet/libnet.patch   20 Aug 2002 14:59:14 -0000      1.1
  +++ openpkg-src/libnet/libnet.patch   21 Jul 2003 08:51:41 -0000      1.2
  @@ -1,14 +1,64 @@
  ---- src/libnet_resolve.c.orig        Tue Aug 20 16:56:01 2002
  -+++ src/libnet_resolve.c     Tue Aug 20 16:56:01 2002
  -@@ -218,7 +218,11 @@
  +--- src/libnet_resolve.c.dist        2003-07-21 10:38:32.000000000 +0200
  ++++ src/libnet_resolve.c     2003-07-21 10:41:21.000000000 +0200
  +@@ -185,8 +185,10 @@
  + 
  +     if (use_name == LIBNET_RESOLVE)
  +     {    
  ++#ifdef AF_INET6
  +         host_ent = gethostbyaddr((char *)&addr, sizeof(struct in_addr),
  +                 AF_INET6);
  ++#endif
  +     }
  +     if (!host_ent)
  +     {
  +@@ -218,7 +220,15 @@
       
        if (use_name == LIBNET_RESOLVE)
        {
  ++#if defined AF_INET6
   +#if defined(__FreeBSD__) || defined(__linux__)
            if (!(host_ent = gethostbyname2(host_name, AF_INET6)))
   +#else
   +        if (!(host_ent = gethostbyname(host_name)) || host_ent->h_addrtype != 
AF_INET6)
   +#endif
  ++#else
  ++        if (0)
  ++#endif
            {
                snprintf(l->err_buf, LIBNET_ERRBUF_SIZE,
                        "libnet_name2addr6(): %s", strerror(errno));
  +--- src/libnet_raw.c.dist    2003-07-21 10:38:37.000000000 +0200
  ++++ src/libnet_raw.c 2003-07-21 10:41:55.000000000 +0200
  +@@ -122,8 +122,12 @@
  +         return (-1);
  +     } 
  + 
  ++#ifdef PF_INET6
  +     l->fd = socket(PF_INET6, SOCK_RAW, l->protocol);
  +     if (l->fd == -1)
  ++#else
  ++    if (0)
  ++#endif
  +     {
  +         snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, 
  +                 "libnet_open_raw6(): SOCK_RAW allocation failed: %s\n",
  +--- src/libnet_write.c.dist  2003-07-21 10:38:44.000000000 +0200
  ++++ src/libnet_write.c       2003-07-21 10:47:09.000000000 +0200
  +@@ -194,6 +194,7 @@
  + int
  + libnet_write_raw_ipv6(libnet_t *l, u_char *packet, u_long size)
  + {
  ++#ifdef AF_INET6
  +     int c;
  +     struct sockaddr_in6 sin;
  +     struct libnet_ipv6_hdr *ip_hdr;
  +@@ -224,6 +225,9 @@
  + #endif
  +     }
  +     return (c);
  ++#else
  ++    return (-1);
  ++#endif
  + }
  + 
  + /* EOF */
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/libnet/libnet.spec
  ============================================================================
  $ cvs diff -u -r1.18 -r1.19 libnet.spec
  --- openpkg-src/libnet/libnet.spec    8 Jul 2003 14:40:33 -0000       1.18
  +++ openpkg-src/libnet/libnet.spec    21 Jul 2003 08:51:41 -0000      1.19
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      BSD-style
   Version:      1.1.0
  -Release:      20020821
  +Release:      20030721
   
   #   list of sources
   Source0:      http://www.packetfactory.net/libnet/dist/libnet-%{version}.tar.gz
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5676 -r1.5677 news.txt
  --- openpkg-web/news.txt      21 Jul 2003 08:12:22 -0000      1.5676
  +++ openpkg-web/news.txt      21 Jul 2003 08:51:39 -0000      1.5677
  @@ -1,3 +1,4 @@
  +21-Jul-2003: Upgraded package: P<libnet-1.1.0-20030721>
   21-Jul-2003: Upgraded package: P<whoson-2.02a-20030721>
   21-Jul-2003: Upgraded package: P<vrrpd-0.8.7-20030721>
   21-Jul-2003: Upgraded package: P<tripwire-2.3.1.2-20030721>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to