jamielinux pushed to torsocks (f22). "Update to upstream release 2.1.0"

[notifications at fedoraproject.org]

From bece80a8da95a944529fafc6a7acbb7fce032c1e Mon Sep 17 00:00:00 2001
From: Jamie Nguyen <j at jamielinux.com>
Date: Thu, 28 May 2015 08:05:13 +0100
Subject: Update to upstream release 2.1.0


diff --git a/.gitignore b/.gitignore
index 216e07e..63a68c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /torsocks-1.3.tar.gz.asc
 /torsocks-ea105bb76ea1e9f9660dd2307639b75ca6d76569.tar.gz
 /torsocks-bb972f433006efc660a334cc3a1248e7f6211964.tar.gz
+/torsocks-2.1.0.tar.bz2
+/torsocks-2.1.0.tar.bz2.asc
diff --git a/sources b/sources
index f678a84..f53e632 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-48021f05b32b2d4d0e965bc071c597da  torsocks-bb972f433006efc660a334cc3a1248e7f6211964.tar.gz
+cced40ded9a0c7335050b778677fbd60  torsocks-2.1.0.tar.bz2
+6a23ca93e000578e1cdb43cc8bc417c7  torsocks-2.1.0.tar.bz2.asc
diff --git a/torsocks-2.1.0-Do-not-run-tests-that-require-network-access.patch b/torsocks-2.1.0-Do-not-run-tests-that-require-network-access.patch
new file mode 100644
index 0000000..767af9b
--- /dev/null
+++ b/torsocks-2.1.0-Do-not-run-tests-that-require-network-access.patch
@@ -0,0 +1,25 @@
+From b4a4af2c15a909b01115fbe3807f943fc4172701 Mon Sep 17 00:00:00 2001
+From: Jamie Nguyen <j at jamielinux.com>
+Date: Thu, 28 May 2015 07:59:11 +0100
+Subject: [PATCH] Do not run tests that require network access
+
+---
+ tests/test_list | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/tests/test_list b/tests/test_list
+index e66a239..51b1167 100644
+--- a/tests/test_list
++++ b/tests/test_list
+@@ -1,8 +1,5 @@
+ ./test_connect
+-./test_dns
+-./test_fd_passing
+ ./test_socket
+-./test_getpeername
+ ./unit/test_onion
+ ./unit/test_connection
+ ./unit/test_utils
+-- 
+2.1.0
+
diff --git a/torsocks.bash_completion b/torsocks.bash_completion
deleted file mode 100644
index 365c906..0000000
--- a/torsocks.bash_completion
+++ /dev/null
@@ -1 +0,0 @@
-complete -F _command torsocks
diff --git a/torsocks.spec b/torsocks.spec
index 35679bf..6a59197 100644
--- a/torsocks.spec
+++ b/torsocks.spec
@@ -1,18 +1,19 @@
-%global commit bb972f433006efc660a334cc3a1248e7f6211964
-
 Name:              torsocks
-Version:           2.0.0
-Release:           3%{?dist}
+Version:           2.1.0
+Release:           1%{?dist}
 
 Summary:           Use SOCKS-friendly applications with Tor
 Group:             Applications/Internet
 License:           GPLv2+
 URL:               https://gitweb.torproject.org/torsocks.git
 
-Source0:           https://github.com/dgoulet/torsocks/archive/%{commit}/torsocks-%{commit}.tar.gz
-Source1:           torsocks.bash_completion
+Source0:           https://people.torproject.org/~dgoulet/torsocks/torsocks-%{version}.tar.bz2
+Source1:           https://people.torproject.org/~dgoulet/torsocks/torsocks-%{version}.tar.bz2.asc
+
+Patch0:            %{name}-2.1.0-Do-not-run-tests-that-require-network-access.patch
 
-BuildRequires:     autoconf automake libtool
+# Unit tests require /usr/bin/prove
+BuildRequires:     perl(Test::Harness)
 
 
 %description
@@ -22,11 +23,11 @@ rejects UDP traffic from the application you're using.
 
 
 %prep
-%setup -q -n torsocks-%{commit}
+%setup -q -n %{name}-%{version}
+%patch0 -p1
 
 
 %build
-./autogen.sh
 %configure --libdir=%{_libdir}
 make %{?_smp_mflags}
 
@@ -39,12 +40,18 @@ rm -f %{buildroot}%{_libdir}/torsocks/libtorsocks.{a,la}*
 rm -fr %{buildroot}%{_datadir}/doc/torsocks
 
 # For bash completion.
-install -p -D -m 0644 %{SOURCE1} \
+install -p -D -m0644 extras/torsocks-bash_completion \
     %{buildroot}%{_sysconfdir}/bash_completion.d/torsocks
 
 
+%check
+pushd tests/
+make check-am
+popd
+
+
 %files
-%doc ChangeLog gpl-2.0.txt LICENSE README.md
+%doc ChangeLog gpl-2.0.txt doc/notes/DEBUG doc/socks/socks-extensions.txt
 %{_bindir}/torsocks
 %{_mandir}/man1/torsocks.1.*
 %{_mandir}/man5/torsocks.conf.5.*
@@ -58,6 +65,10 @@ install -p -D -m 0644 %{SOURCE1} \
 
 
 %changelog
+* Thu May 28 2015 Jamie Nguyen <jamielinux at fedoraproject.org> - 2.1.0-1
+- update to upstream release 2.1.0
+- run test suite
+
 * Wed Apr 29 2015 Jon Ciesla <limburgher at gmail.com> - 2.0.0-3
 - Updated to latest to fix syscall errors.
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/torsocks.git/commit/?h=f22&id=bece80a8da95a944529fafc6a7acbb7fce032c1e