diff --git a/.gitignore b/.gitignore index c5a76f9..7cc6999 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /radcli-1.2.2.tar.gz.sig /radcli-1.2.3.tar.gz.sig /radcli-1.2.3.tar.gz +/radcli-1.2.5.tar.gz.sig +/radcli-1.2.5.tar.gz diff --git a/radcli-overflow-fix.patch b/radcli-overflow-fix.patch deleted file mode 100644 index 0ef6f7c..0000000 --- a/radcli-overflow-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e093225299cb2aba9ad88b475d01e4fc989d5448 Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos -Date: Thu, 26 Nov 2015 17:07:46 +0100 -Subject: [PATCH 1/2] use sockaddr_storage in rc_ipaddr_local - -This corrects a buffer overflow in that function ---- - lib/config.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/config.c b/lib/config.c -index 2933298..6e9af4d 100644 ---- a/lib/config.c -+++ b/lib/config.c -@@ -836,7 +836,7 @@ static int find_match (const struct addrinfo* addr, const struct addrinfo *hostn - static int rc_ipaddr_local(const struct sockaddr *addr) - { - int temp_sock, res, serrno; -- struct sockaddr tmpaddr; -+ struct sockaddr_storage tmpaddr; - - memcpy(&tmpaddr, addr, SA_LEN(addr)); - -@@ -849,7 +849,7 @@ static int rc_ipaddr_local(const struct sockaddr *addr) - } else { - ((struct sockaddr_in6*)&tmpaddr)->sin6_port = 0; - } -- res = bind(temp_sock, &tmpaddr, SA_LEN(&tmpaddr)); -+ res = bind(temp_sock, (struct sockaddr*)(&tmpaddr), SS_LEN(&tmpaddr)); - serrno = errno; - close(temp_sock); - if (res == 0) --- -2.5.0 - diff --git a/radcli.spec b/radcli.spec index 899cd75..32ff734 100644 --- a/radcli.spec +++ b/radcli.spec @@ -1,7 +1,7 @@ Summary: RADIUS protocol client library Name: radcli -Version: 1.2.3 -Release: 2%{?dist} +Version: 1.2.5 +Release: 1%{?dist} #Breakdown of licenses. Under MIT license: # lib/avpair.c, lib/buildreq.c, lib/clientid.c, lib/config.c, lib/dict.c, @@ -19,7 +19,6 @@ URL: http://radcli.github.io/radcli/ sed 's/\./_/g')} Source0: https://github.com/radcli/radcli/releases/download/%{name}_%{myversion}/%{name}-%{version}.tar.gz -Patch1: radcli-overflow-fix.patch #BuildRequires: libtool, automake, autoconf, gettext-devel BuildRequires: nettle-devel >= 2.7.1 @@ -54,7 +53,6 @@ and radiusclient-ng. %prep %setup -q rm -f lib/md5.c -%patch1 -p1 -b .overflow sed -i -e 's|sys_lib_dlsearch_path_spec="[^"]\+|& %{_libdir}|g' configure %build @@ -95,6 +93,10 @@ cp -p %{buildroot}%{_datadir}/%{name}/dictionary %{buildroot}%{_sysconfdir}/%{na %{_datadir}/%{name}/dictionary %{_datadir}/%{name}/dictionary.roaringpenguin %{_datadir}/%{name}/dictionary.microsoft +%{_datadir}/%{name}/dictionary.ascend +%{_datadir}/%{name}/dictionary.compat +%{_datadir}/%{name}/dictionary.merit +%{_datadir}/%{name}/dictionary.sip %files devel @@ -114,6 +116,9 @@ cp -p %{buildroot}%{_datadir}/%{name}/dictionary %{buildroot}%{_sysconfdir}/%{na %{_libdir}/libradiusclient-ng.so %changelog +* Mon Nov 30 2015 Nikos Mavrogiannopoulos - 1.2.5-1 +- Added TCP support + * Thu Nov 26 2015 Nikos Mavrogiannopoulos - 1.2.3-2 - Fixed overflow in rc_ipaddr_local() diff --git a/sources b/sources index 962390d..394d065 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -6924b6f7750501b315d9c6c9daabe025 radcli-1.2.3.tar.gz.sig -e283db7db2248cd6499aff69813cb1ed radcli-1.2.3.tar.gz +79201124393fb1aa38786cbf5fc0c71f radcli-1.2.5.tar.gz.sig +b94e46e37668cc562ea5420d095a836b radcli-1.2.5.tar.gz