keepalived: update to 1.3.1.
This commit is contained in:
Juan RP
parent
6540ee0bdd
commit
33190c1fef
|
|
@ -1,166 +0,0 @@
|
|||
--- keepalived/libipvs-2.6/ip_vs.h.orig 2016-06-07 22:59:13.646839611 +0200
|
||||
+++ keepalived/libipvs-2.6/ip_vs.h 2016-06-07 22:59:23.861840138 +0200
|
||||
@@ -118,10 +118,10 @@
|
||||
*/
|
||||
struct ip_vs_service_kern {
|
||||
/* virtual service addresses */
|
||||
- u_int16_t protocol;
|
||||
+ uint16_t protocol;
|
||||
__be32 addr; /* virtual ip address */
|
||||
__be16 port;
|
||||
- u_int32_t fwmark; /* firwall mark of service */
|
||||
+ uint32_t fwmark; /* firwall mark of service */
|
||||
|
||||
/* virtual service options */
|
||||
char sched_name[IP_VS_SCHEDNAME_MAXLEN];
|
||||
@@ -132,17 +132,17 @@
|
||||
|
||||
struct ip_vs_service_user {
|
||||
/* virtual service addresses */
|
||||
- u_int16_t protocol;
|
||||
+ uint16_t protocol;
|
||||
__be32 __addr_v4; /* virtual ip address - internal use only */
|
||||
__be16 port;
|
||||
- u_int32_t fwmark; /* firwall mark of service */
|
||||
+ uint32_t fwmark; /* firwall mark of service */
|
||||
|
||||
/* virtual service options */
|
||||
char sched_name[IP_VS_SCHEDNAME_MAXLEN];
|
||||
unsigned flags; /* virtual service flags */
|
||||
unsigned timeout; /* persistent timeout in sec */
|
||||
__be32 netmask; /* persistent netmask */
|
||||
- u_int16_t af;
|
||||
+ uint16_t af;
|
||||
union nf_inet_addr addr;
|
||||
char pe_name[IP_VS_PENAME_MAXLEN];
|
||||
};
|
||||
@@ -157,8 +157,8 @@
|
||||
int weight; /* destination weight */
|
||||
|
||||
/* thresholds for active connections */
|
||||
- u_int32_t u_threshold; /* upper threshold */
|
||||
- u_int32_t l_threshold; /* lower threshold */
|
||||
+ uint32_t u_threshold; /* upper threshold */
|
||||
+ uint32_t l_threshold; /* lower threshold */
|
||||
};
|
||||
|
||||
struct ip_vs_dest_user {
|
||||
@@ -171,9 +171,9 @@
|
||||
int weight; /* destination weight */
|
||||
|
||||
/* thresholds for active connections */
|
||||
- u_int32_t u_threshold; /* upper threshold */
|
||||
- u_int32_t l_threshold; /* lower threshold */
|
||||
- u_int16_t af;
|
||||
+ uint32_t u_threshold; /* upper threshold */
|
||||
+ uint32_t l_threshold; /* lower threshold */
|
||||
+ uint16_t af;
|
||||
union nf_inet_addr addr;
|
||||
};
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
/* The argument to IP_VS_SO_GET_SERVICE */
|
||||
struct ip_vs_service_entry_kern {
|
||||
/* which service: user fills in these */
|
||||
- u_int16_t protocol;
|
||||
+ uint16_t protocol;
|
||||
__be32 addr; /* virtual address */
|
||||
__be16 port;
|
||||
- u_int32_t fwmark; /* firwall mark of service */
|
||||
+ uint32_t fwmark; /* firwall mark of service */
|
||||
|
||||
/* service options */
|
||||
char sched_name[IP_VS_SCHEDNAME_MAXLEN];
|
||||
@@ -232,10 +232,10 @@
|
||||
|
||||
struct ip_vs_service_entry {
|
||||
/* which service: user fills in these */
|
||||
- u_int16_t protocol;
|
||||
+ uint16_t protocol;
|
||||
__be32 __addr_v4; /* virtual address - internal use only*/
|
||||
__be16 port;
|
||||
- u_int32_t fwmark; /* firwall mark of service */
|
||||
+ uint32_t fwmark; /* firwall mark of service */
|
||||
|
||||
/* service options */
|
||||
char sched_name[IP_VS_SCHEDNAME_MAXLEN];
|
||||
@@ -249,7 +249,7 @@
|
||||
/* statistics */
|
||||
struct ip_vs_stats_user stats;
|
||||
|
||||
- u_int16_t af;
|
||||
+ uint16_t af;
|
||||
union nf_inet_addr addr;
|
||||
char pe_name[IP_VS_PENAME_MAXLEN];
|
||||
|
||||
@@ -261,12 +261,12 @@
|
||||
unsigned conn_flags; /* connection flags */
|
||||
int weight; /* destination weight */
|
||||
|
||||
- u_int32_t u_threshold; /* upper threshold */
|
||||
- u_int32_t l_threshold; /* lower threshold */
|
||||
+ uint32_t u_threshold; /* upper threshold */
|
||||
+ uint32_t l_threshold; /* lower threshold */
|
||||
|
||||
- u_int32_t activeconns; /* active connections */
|
||||
- u_int32_t inactconns; /* inactive connections */
|
||||
- u_int32_t persistconns; /* persistent connections */
|
||||
+ uint32_t activeconns; /* active connections */
|
||||
+ uint32_t inactconns; /* inactive connections */
|
||||
+ uint32_t persistconns; /* persistent connections */
|
||||
|
||||
/* statistics */
|
||||
struct ip_vs_stats_user stats;
|
||||
@@ -278,26 +278,26 @@
|
||||
unsigned conn_flags; /* connection flags */
|
||||
int weight; /* destination weight */
|
||||
|
||||
- u_int32_t u_threshold; /* upper threshold */
|
||||
- u_int32_t l_threshold; /* lower threshold */
|
||||
+ uint32_t u_threshold; /* upper threshold */
|
||||
+ uint32_t l_threshold; /* lower threshold */
|
||||
|
||||
- u_int32_t activeconns; /* active connections */
|
||||
- u_int32_t inactconns; /* inactive connections */
|
||||
- u_int32_t persistconns; /* persistent connections */
|
||||
+ uint32_t activeconns; /* active connections */
|
||||
+ uint32_t inactconns; /* inactive connections */
|
||||
+ uint32_t persistconns; /* persistent connections */
|
||||
|
||||
/* statistics */
|
||||
struct ip_vs_stats_user stats;
|
||||
- u_int16_t af;
|
||||
+ uint16_t af;
|
||||
union nf_inet_addr addr;
|
||||
};
|
||||
|
||||
/* The argument to IP_VS_SO_GET_DESTS */
|
||||
struct ip_vs_get_dests_kern {
|
||||
/* which service: user fills in these */
|
||||
- u_int16_t protocol;
|
||||
+ uint16_t protocol;
|
||||
__be32 addr; /* virtual address - internal use only */
|
||||
__be16 port;
|
||||
- u_int32_t fwmark; /* firwall mark of service */
|
||||
+ uint32_t fwmark; /* firwall mark of service */
|
||||
|
||||
/* number of real servers */
|
||||
unsigned int num_dests;
|
||||
@@ -308,14 +308,14 @@
|
||||
|
||||
struct ip_vs_get_dests {
|
||||
/* which service: user fills in these */
|
||||
- u_int16_t protocol;
|
||||
+ uint16_t protocol;
|
||||
__be32 __addr_v4; /* virtual address - internal use only */
|
||||
__be16 port;
|
||||
- u_int32_t fwmark; /* firwall mark of service */
|
||||
+ uint32_t fwmark; /* firwall mark of service */
|
||||
|
||||
/* number of real servers */
|
||||
unsigned int num_dests;
|
||||
- u_int16_t af;
|
||||
+ uint16_t af;
|
||||
union nf_inet_addr addr;
|
||||
|
||||
/* the real servers */
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'keepalived'
|
||||
pkgname=keepalived
|
||||
version=1.2.23
|
||||
revision=2
|
||||
version=1.3.1
|
||||
revision=1
|
||||
conf_files="/etc/${pkgname}/${pkgname}.conf"
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-sha1"
|
||||
|
|
@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
license="GPL-2"
|
||||
homepage="http://www.keepalived.org/"
|
||||
distfiles="http://www.keepalived.org/software/$pkgname-$version.tar.gz"
|
||||
checksum=19e432bcf10ff3e801aa87acf84113a0b57d31524c3ca8866f13ffeb0475d910
|
||||
checksum=3daba23b3fbea7f60269ac9e817faaa6de547205711e289ae3088da31ba92d8c
|
||||
|
||||
post_install() {
|
||||
vsv $pkgname
|
||||
|
|
|
|||
Loading…
Reference in New Issue