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 openpkg-web          Date:   13-Dec-2003 14:42:14
  Branch: HEAD                             Handle: 2003121313421202

  Added files:
    openpkg-src/cdpr        cdpr.patch
  Modified files:
    openpkg-web             news.txt

  Log:
    modifying package: cdpr-2.1.0 20031213 again

  Summary:
    Revision    Changes     Path
    1.1         +48 -0      openpkg-src/cdpr/cdpr.patch
    1.7751      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/cdpr/cdpr.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1 cdpr.patch
  --- /dev/null 2003-12-13 14:42:14.000000000 +0100
  +++ cdpr.patch        2003-12-13 14:42:14.000000000 +0100
  @@ -0,0 +1,48 @@
  +--- cdpr.c.orig      Wed Nov 19 17:53:13 2003
  ++++ cdpr.c   Wed Nov 19 17:54:06 2003
  +@@ -639,7 +639,7 @@
  +     pcap_lookupnet(dev, &net, &mask, errbuf);
  + 
  +     /* Open the pcap device */
  +-    if((handle = pcap_open_live(dev, BUFSIZ, 1, 0, errbuf)) == NULL)
  ++    if((handle = pcap_open_live(dev, BUFSIZ, 1, 1000, errbuf)) == NULL)
  +     {
  +             printf("Error opening device (%s)\n", errbuf);
  +             exit(1);
  +@@ -656,11 +656,6 @@
  +     pcap_setfilter(handle, &filter);
  +     pcap_freecode(&filter);
  + 
  +-    /* Set non-blocking mode */
  +-    if(pcap_setnonblock(handle, 1, errbuf))
  +-    {
  +-            pcap_perror(handle, NULL);
  +-    }
  + 
  +     /* Get the next packet that comes in, we only need one */
  +     printf("Waiting for CDP advertisement:\n");
  +@@ -671,11 +666,7 @@
  +     do
  +     {
  +             packet = pcap_next(handle, &header);
  +-#ifdef WIN32
  +-            Sleep(10000);
  +-#else
  +-            usleep(10000);
  +-#endif
  ++
  +     } while ((!packet) && ( timeout=((start_time+seconds) > (unsigned 
int)time(NULL))) );
  + 
  +     /*
  +Index: Makefile
  +--- Makefile.orig    2003-10-23 01:18:47.000000000 +0200
  ++++ Makefile 2003-12-13 14:34:47.000000000 +0100
  +@@ -17,7 +17,7 @@
  + #LDFLAGS = -lsocket -lnsl -lpcap
  + 
  + cdpr: cdpr.c cdprs.c conffile.c cdp.h cdpr.h
  +-    gcc $(CFLAGS) cdpr.c cdprs.c conffile.c $(LDFLAGS) -o cdpr
  ++    $(CC) $(CFLAGS) cdpr.c cdprs.c conffile.c $(LDFLAGS) -o cdpr $(LIBS)
  + 
  + clean:
  +     rm -f cdpr
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7750 -r1.7751 news.txt
  --- openpkg-web/news.txt      13 Dec 2003 13:41:53 -0000      1.7750
  +++ openpkg-web/news.txt      13 Dec 2003 13:42:12 -0000      1.7751
  @@ -1,3 +1,4 @@
  +13-Dec-2003: Upgraded package: P<cdpr-2.1.0-20031213>
   13-Dec-2003: New package: P<cdpr-2.1.0-20031213>
   13-Dec-2003: Upgraded package: P<ethereal-0.10.0-20031213>
   13-Dec-2003: Upgraded package: P<wine-20031212-20031213>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to