1
0
mirror of synced 2025-01-31 04:21:43 +03:00

Use Libevent2 from CentOS 6 repo

- Libevent2 is newly available in CentOS 6 as of May 12
- No longer need to install from download.libreswan.org
- Remove libevent-devel before install to avoid conflicts
- Thanks to Thomas C for reporting this issue
This commit is contained in:
hwdsl2 2016-05-26 17:24:31 -05:00
parent 1feadb51f3
commit 1cc1e89963
2 changed files with 4 additions and 16 deletions

View File

@ -110,14 +110,8 @@ yum -y install nss-devel nspr-devel pkgconfig pam-devel \
# Installed Libevent2
if grep -qs "release 6" /etc/redhat-release; then
le2_url=https://download.libreswan.org/binaries/rhel/6/x86_64
rpm1=libevent2-2.0.22-1.el6.x86_64.rpm
rpm2=libevent2-devel-2.0.22-1.el6.x86_64.rpm
wget -t 3 -T 30 -nv -O "$rpm1" "$le2_url/$rpm1"
[ "$?" != "0" ] && { echo "Cannot download Libevent2. Aborting."; exit 1; }
wget -t 3 -T 30 -nv -O "$rpm2" "$le2_url/$rpm2"
[ "$?" != "0" ] && { echo "Cannot download Libevent2. Aborting."; exit 1; }
rpm -ivh --force "$rpm1" "$rpm2" && /bin/rm -f "$rpm1" "$rpm2"
yum -y remove libevent-devel
yum -y install libevent2-devel
elif grep -qs "release 7" /etc/redhat-release; then
yum -y install libevent-devel
fi

View File

@ -153,14 +153,8 @@ fi
# Installed Libevent2
if grep -qs "release 6" /etc/redhat-release; then
le2_url=https://download.libreswan.org/binaries/rhel/6/x86_64
rpm1=libevent2-2.0.22-1.el6.x86_64.rpm
rpm2=libevent2-devel-2.0.22-1.el6.x86_64.rpm
wget -t 3 -T 30 -nv -O "$rpm1" "$le2_url/$rpm1"
[ "$?" != "0" ] && { echo "Cannot download Libevent2. Aborting."; exit 1; }
wget -t 3 -T 30 -nv -O "$rpm2" "$le2_url/$rpm2"
[ "$?" != "0" ] && { echo "Cannot download Libevent2. Aborting."; exit 1; }
rpm -ivh --force "$rpm1" "$rpm2" && /bin/rm -f "$rpm1" "$rpm2"
yum -y remove libevent-devel
yum -y install libevent2-devel
elif grep -qs "release 7" /etc/redhat-release; then
yum -y install libevent-devel
fi