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: 05-Jul-2007 07:48:55
Branch: HEAD Handle: 2007070506485500
Modified files:
openpkg-src/ucarp ucarp.patch ucarp.spec
Log:
upgrading package: ucarp 1.2 -> 1.3
Summary:
Revision Changes Path
1.4 +10 -35 openpkg-src/ucarp/ucarp.patch
1.18 +3 -3 openpkg-src/ucarp/ucarp.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ucarp/ucarp.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 ucarp.patch
--- openpkg-src/ucarp/ucarp.patch 19 Feb 2006 08:01:46 -0000 1.3
+++ openpkg-src/ucarp/ucarp.patch 5 Jul 2007 05:48:55 -0000 1.4
@@ -1,6 +1,6 @@
Index: src/carp.c
---- src/carp.c.orig 2006-02-19 00:06:17 +0100
-+++ src/carp.c 2006-02-19 08:25:51 +0100
+--- src/carp.c.orig 2007-07-04 17:17:12 +0200
++++ src/carp.c 2007-07-05 07:44:10 +0200
@@ -133,7 +133,7 @@
return (unsigned short) ~sum;
}
@@ -11,8 +11,8 @@
{
SHA1_CTX ctx;
Index: src/fillmac.c
---- src/fillmac.c.orig 2004-08-28 17:15:36 +0200
-+++ src/fillmac.c 2006-02-19 08:25:50 +0100
+--- src/fillmac.c.orig 2007-07-04 15:34:59 +0200
++++ src/fillmac.c 2007-07-05 07:44:10 +0200
@@ -102,7 +102,7 @@
}
return -1;
@@ -22,25 +22,9 @@
{
struct lifconf lifc;
struct lifnum lifn;
-@@ -130,13 +130,13 @@
- return -1;
- }
- lifr = lifc.lifc_req;
-- while (--lifn.lifn_count > 0) {
-+ while (lifn.lifn_count-- > 0) {
- if (strcmp(lifr->lifr_name, interface) == 0) {
- break;
- }
- lifr++;
- }
-- if (lifn.lifn_count <= 0) {
-+ if (lifn.lifn_count < 0) {
- logfile(LOG_ERR, _("Interface [%s] not found"), interface);
- ALLOCA_FREE(lifrspace);
- return -1;
Index: src/ip_carp.h
---- src/ip_carp.h.orig 2006-02-19 00:03:58 +0100
-+++ src/ip_carp.h 2006-02-19 08:25:51 +0100
+--- src/ip_carp.h.orig 2007-07-04 15:35:07 +0200
++++ src/ip_carp.h 2007-07-05 07:44:10 +0200
@@ -56,19 +56,19 @@
struct carp_header {
@@ -113,8 +97,8 @@
/*
Index: src/ucarp.h
---- src/ucarp.h.orig 2004-08-28 18:10:28 +0200
-+++ src/ucarp.h 2006-02-19 08:25:51 +0100
+--- src/ucarp.h.orig 2007-07-04 16:24:07 +0200
++++ src/ucarp.h 2007-07-05 07:46:30 +0200
@@ -63,10 +63,10 @@
#include <pcap.h>
@@ -130,21 +114,12 @@
# define ether_shost ether_shost.ether_addr_octet
# define ether_dhost ether_dhost.ether_addr_octet
#endif
-@@ -122,7 +122,7 @@
- # define IPPROTO_CARP 112
- #endif
- #ifndef INADDR_CARP_GROUP
--# define __OBSD_IPADDR(x) ((u_int32_t) htonl((u_int32_t)(x)))
-+# define __OBSD_IPADDR(x) ((uint32_t) htonl((uint32_t)(x)))
- # define INADDR_CARP_GROUP __OBSD_IPADDR(0xe0000012) /* 224.0.0.18 */
- #endif
- #ifndef timercmp
-@@ -194,7 +194,7 @@
+@@ -192,7 +192,7 @@
int sc_naddrs6;
int sc_advbase; /* seconds */
int sc_init_counter;
- u_int64_t sc_counter;
+ uint64_t sc_counter;
+ int sc_delayed_arp;
/* authentication */
- #define CARP_HMAC_PAD 64
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ucarp/ucarp.spec
============================================================================
$ cvs diff -u -r1.17 -r1.18 ucarp.spec
--- openpkg-src/ucarp/ucarp.spec 1 Jan 2007 17:42:31 -0000 1.17
+++ openpkg-src/ucarp/ucarp.spec 5 Jul 2007 05:48:55 -0000 1.18
@@ -24,7 +24,7 @@
# package information
Name: ucarp
-Summary: Common Address Redundancy Protocol for Unix
+Summary: Common Address Redundancy Protocol (CARP)
URL: http://www.ucarp.org/
Vendor: Frank Denis
Packager: OpenPKG Foundation e.V.
@@ -32,8 +32,8 @@
Class: EVAL
Group: Routing
License: Specific
-Version: 1.2
-Release: 20061013
+Version: 1.3
+Release: 20070705
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
