diff --git a/.gitignore b/.gitignore index a8b6984..e5e3aa5 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ /radcli-1.2.5.tar.gz /radcli-1.2.7.tar.gz /radcli-1.2.7.tar.gz.sig +/radcli-1.2.8.tar.gz +/radcli-1.2.8.tar.gz.sig diff --git a/radcli-1.2.7-random.patch b/radcli-1.2.7-random.patch deleted file mode 100644 index 201dac1..0000000 --- a/radcli-1.2.7-random.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/lib/sendserver.c b/lib/sendserver.c -index ac5a35f..dce17f4 100644 ---- a/lib/sendserver.c -+++ b/lib/sendserver.c -@@ -20,6 +20,11 @@ - #include "rc-md5.h" - #include "rc-hmac.h" - -+#if defined(HAVE_GNUTLS) -+# include -+# include -+#endif -+ - #define SCLOSE(fd) if (sfuncs->close_fd) sfuncs->close_fd(fd) - - static void rc_random_vector(unsigned char *); -@@ -338,7 +343,11 @@ static void rc_random_vector(unsigned char *vector) - { - int randno; - int i; --#if defined(HAVE_GETENTROPY) -+#if defined(HAVE_GNUTLS) -+ if (gnutls_rnd(GNUTLS_RND_NONCE, vector, AUTH_VECTOR_LEN) >= 0) { -+ return; -+ } -+#elif defined(HAVE_GETENTROPY) - if (getentropy(vector, AUTH_VECTOR_LEN) >= 0) { - return; - } /* else fall through */ diff --git a/radcli.spec b/radcli.spec index fba8b85..bade8f9 100644 --- a/radcli.spec +++ b/radcli.spec @@ -1,7 +1,7 @@ Summary: RADIUS protocol client library Name: radcli -Version: 1.2.7 -Release: 3%{?dist} +Version: 1.2.8 +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-1.2.7-random.patch #BuildRequires: libtool, automake, autoconf, gettext-devel BuildRequires: nettle-devel >= 2.7.1 @@ -53,7 +52,6 @@ and radiusclient-ng. %prep %setup -q -%patch1 -p1 -b .random rm -f lib/md5.c sed -i -e 's|sys_lib_dlsearch_path_spec="[^"]\+|& %{_libdir}|g' configure @@ -118,6 +116,9 @@ cp -p %{buildroot}%{_datadir}/%{name}/dictionary %{buildroot}%{_sysconfdir}/%{na %{_libdir}/libradiusclient-ng.so %changelog +* Fri Jun 30 2017 Nikos Mavrogiannopoulos - 1.2.8-1 +- New upstream release + * Sat Feb 11 2017 Fedora Release Engineering - 1.2.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index e6261a0..95ef6d9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (radcli-1.2.7.tar.gz) = 622ad71583e0d8431caaed9c99b3f593736e124429c5b7034f50cb6025bac832ba3477d79168a19557ee0afc5bcc5a4d62fbd694081555ad5ff3035e6803c236 -SHA512 (radcli-1.2.7.tar.gz.sig) = cc7b03ec93b97228e44533efdeea6e2667e3c56bbbea121b582361291ac3e571452731cfef4d4a7b4c6bedf6fa56d4bae496ac98b09cb3af86183b74a0df7417 +SHA512 (radcli-1.2.8.tar.gz) = cf4b7c8f62651c01a7408cc57e97edcd71a3ee0353368e571469ae2a13b7b2066f400a4fe0d49fe75b32e03473c02924d4cc61c432e3bd9d5eb4b11df67bf7a1 +SHA512 (radcli-1.2.8.tar.gz.sig) = dacdb8684c4d83247d47953d0c0681890f6ae06a8f7d8a20970e1468a0de22cd703884d0fcbd40286472ea6047185885115f34308d61f8f4c2cede9427805f7b