From: Vincent Bernat <bernat@luffy.cx>
Date: Tue, 1 May 2012 09:29:22 +0000 (+0200)
Subject: Update changelog, travis and packaging for libevent
X-Git-Tag: 0.6.0~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68b375c3eacce8d3ea88141af0ced0018f993517;p=thirdparty%2Flldpd.git

Update changelog, travis and packaging for libevent
---

diff --git a/.travis.yml b/.travis.yml
index c3b8fadd..a1701d67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: "python"
 install:
   - "sudo apt-get -y install automake autoconf libtool pkg-config"
-  - "sudo apt-get -y install libsnmp-dev libxml2-dev check"
+  - "sudo apt-get -y install libsnmp-dev libxml2-dev libevent-dev check"
 script: "./autogen.sh && ./configure $LLDPD_CONFIG_ARGS && make && make check"
 env:
   - LLDPD_CONFIG_ARGS=""
diff --git a/CHANGELOG b/CHANGELOG
index 363f7166..e26b5a17 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ lldpd (0.6)
     + Support for multiple management addresses and IPv6 management
       addresses. Contributed by João Valverde.
   * Global changes:
+    + Switch to libevent. See README.md for details.
     + Partial rewrite of the SNMP part. Less code.
     + Unit tests for SNMP.
     + Major rewrite of the protocol between lldpd and lldpctl. Less
diff --git a/debian/control b/debian/control
index 7a67bc28..d39e75dd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: lldpd
 Section: net
 Priority: optional
 Maintainer: Vincent Bernat <bernat@debian.org>
-Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libsnmp15-dev | libsnmp9-dev | libsnmp-dev, libxml2-dev
+Build-Depends: debhelper (>= 5), cdbs, autotools-dev,
+               libsnmp15-dev | libsnmp9-dev | libsnmp-dev,
+	       libxml2-dev, libevent-dev, pkg-config, libtool
 Standards-Version: 3.8.4
 Homepage: https://trac.luffy.cx/lldpd/
 
diff --git a/m4/libevent.m4 b/m4/libevent.m4
index acfe1eb8..d802afb4 100644
--- a/m4/libevent.m4
+++ b/m4/libevent.m4
@@ -9,7 +9,7 @@ AC_DEFUN([lldp_CHECK_LIBEVENT], [
   _save_CC="$CC"
 
   # First, try with pkg-config
-  PKG_CHECK_MODULES([LIBEVENT], [libevent >= 2.0.5], [], [:])
+  PKG_CHECK_MODULES([LIBEVENT], [libevent >= 1.4.3], [], [:])
 
   AC_MSG_CHECKING([how to compile with libevent])
   if test x"$1" = x -o x"$1" = x"yes"; then
diff --git a/redhat/lldpd.spec b/redhat/lldpd.spec
index 3fe1fde2..214780df 100644
--- a/redhat/lldpd.spec
+++ b/redhat/lldpd.spec
@@ -37,6 +37,9 @@ Source0: http://www.luffy.cx/lldpd/%{name}-%{version}.tar.gz
 Source1: lldpd.init%{?suse_version:.suse}
 Source2: lldpd.sysconfig
 
+BuildRequires: pkgconfig
+BuildRequires: libtool
+BuildRequires: libevent-devel
 %if %{with snmp}
 BuildRequires: net-snmp-devel
 BuildRequires: openssl-devel