From 56f10eabc43b670badb61058e5613a5f15a51ec2 Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Nov 17 2015 17:57:15 +0000
Subject: Built with the libsodium instead of the NaCl (upstream hint,


  https://github.com/netsniff-ng/netsniff-ng/issues/152)

---

diff --git a/netsniff-ng-0.6.0-curvetun-compile-fix.patch b/netsniff-ng-0.6.0-curvetun-compile-fix.patch
deleted file mode 100644
index ac4d18f..0000000
--- a/netsniff-ng-0.6.0-curvetun-compile-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/curvetun/Makefile b/curvetun/Makefile
-index 134e2c7..d436307 100644
---- a/curvetun/Makefile
-+++ b/curvetun/Makefile
-@@ -1,5 +1,6 @@
- curvetun-libs =	-l${CONFIG_NACL_LIB} \
--		-lpthread
-+		-lpthread \
-+		-lstdc++
- 
- curvetun-objs =	xmalloc.o \
- 		epoll2.o \
diff --git a/netsniff-ng.spec b/netsniff-ng.spec
index 4b4f13b..2dbe445 100644
--- a/netsniff-ng.spec
+++ b/netsniff-ng.spec
@@ -1,21 +1,15 @@
-# By default built with NaCl static lib
-%bcond_without nacl
-
 Name:		netsniff-ng
 Version:	0.6.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Packet sniffing beast
 Group:		Applications/Internet
 License:	GPLv2
 URL:		http://netsniff-ng.org/
 Source0:	http://www.netsniff-ng.org/pub/netsniff-ng/netsniff-ng-%{version}.tar.xz
-Patch0:	netsniff-ng-0.6.0-curvetun-compile-fix.patch
 BuildRequires:	ncurses-devel GeoIP-devel libnetfilter_conntrack-devel
 BuildRequires:	userspace-rcu-devel libnl3-devel libcli-devel flex bison
 BuildRequires:	perl-podlators zlib-devel libpcap-devel libnet-devel
-%if %{with nacl}
-BuildRequires:	nacl-static
-%endif
+BuildRequires:	libsodium-devel
 # rhbz#1111779, this should be probably dropped in f23 or later
 Provides:	mausezahn = 0.40-9
 Obsoletes:	mausezahn < 0.40-9
@@ -38,9 +32,10 @@ netsniff-ng toolkit currently consists of the following utilities:
 
 %prep
 %setup -q
-%patch0 -p1 -b .curvetun-compile-fix
 
 %build
+export NACL_INC_DIR=$(pkg-config --variable=includedir libsodium )/sodium
+export NACL_LIB=sodium
 %configure
 make %{?_smp_mflags} ETCDIR=%{_sysconfdir} Q= STRIP=: \
   CFLAGS="%{optflags} -fPIC" LDFLAGS="%{?__global_ldflags}"
@@ -57,6 +52,10 @@ make install PREFIX=%{_prefix} ETCDIR=%{_sysconfdir} DESTDIR="%{buildroot}"
 %{_mandir}/man8/*
 
 %changelog
+* Tue Nov 17 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 0.6.0-2
+- Built with the libsodium instead of the NaCl (upstream hint,
+  https://github.com/netsniff-ng/netsniff-ng/issues/152)
+
 * Tue Nov 10 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 0.6.0-1
 - New version
   Resolves: rhbz#1279885