[Pkg-privacy-commits] [obfs4proxy] 111/151: Drop obsolete upstream patches

Sat Aug 22 12:59:45 UTC 2015

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository obfs4proxy.

commit 68ade79ad771ac7117056401afe6c65ddcbd3f33
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Fri Oct 3 12:00:55 2014 +0200

    Drop obsolete upstream patches
---
 .../0001-Add-a-man-page-for-obfs4proxy.patch       | 94 ----------------------
 ...umentation-cleanups-no-functional-changes.patch | 66 ---------------
 debian/patches/series                              |  2 -
 3 files changed, 162 deletions(-)

diff --git a/debian/patches/0001-Add-a-man-page-for-obfs4proxy.patch b/debian/patches/0001-Add-a-man-page-for-obfs4proxy.patch
deleted file mode 100644
index 5bfed9a..0000000
--- a/debian/patches/0001-Add-a-man-page-for-obfs4proxy.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Author: Yawning Angel <yawning at torproject.org>
-Description:  Add a man page for obfs4proxy.
-
---- /dev/null
-+++ b/doc/obfs4proxy.1
-@@ -0,0 +1,88 @@
-+.TH OBFS4PROXY 1 "2014-09-06"
-+.SH NAME
-+obfs4proxy \- pluggable transport proxy for Tor, implementing obfs4
-+.SH SYNOPSIS
-+.B obfs4proxy
-+[\fIoptions\fR]
-+.SH DESCRIPTION
-+obfs4proxy is a tool that attempts to circumvent censorship by
-+transforming the Tor traffic between the client and the bridge. This way
-+censors, who usually monitor traffic between the client and the bridge,
-+will see innocent-looking transformed traffic instead of the actual Tor
-+traffic.
-+.PP
-+obfs4proxy implements the obfuscation protocols obfs2, obfs3 and obfs4.
-+.PP
-+obfs4proxy is currently only supported as a managed pluggable transport
-+spawned as a helper process via the \fBtor\fR daemon.
-+.SH OPTIONS
-+.TP
-+\fB\-h\fR, \fB\-\-help\fR
-+Display usage information and exit.
-+.TP
-+\fB\-\-version\fR
-+Display version information and exit.
-+.TP
-+\fB\-\-enableLogging\fR
-+Enable logging.
-+.TP
-+\fB\-\-logLevel\fR=\fIlevel\fR
-+Specify the maximum log severity to log out of "\fBERROR\fR", "\fBWARN\fR", and
-+"\fBINFO\fR".
-+.TP
-+\fB\-\-unsafeLogging\fR
-+Disable the IP address scrubber when logging, storing personally identifiable
-+information in the logs.
-+.TP
-+\fB\-\-obfs4\-distBias\fR
-+When generating probability distributions for the obfs4 lenght and timing
-+obfuscation, generate biased distributions similar to ScrambleSuit.
-+.SH ENVIORNMENT
-+obfs4proxy honors all of the enviornment variables as specified in the Tor
-+Pluggable Transport Specification.
-+.SH FILES
-+.PP
-+\fIDataDirectory\fR\fB/pt_state/obfs4proxy.log\fR
-+.RS 4
-+The log file, assuming logging is enabled.
-+.RE
-+.PP
-+\fIDataDirectory\fR\fB/pt_state/obfs4_state.json\fR
-+.RS 4
-+The Bridge (server) auto-generated obfs4 bridge parameters file.  This file
-+will not be created if the administrator specifies them in the \fBtorrc\fR
-+via a \fBServerTransportOptions\fR directive.
-+.RE
-+.SH "CONFORMING TO"
-+Tor Pluggable Transport Specification
-+.SH NOTES
-+Using the obfs4 protocol requires tor-0.2.5.x or later.
-+.PP
-+The obfs2 protocol is included for backwards compatibility purposes only, and
-+should not be used in new deployments.
-+.SH EXAMPLE
-+To configure tor to be able to use obfs4 bridges (as a client), add obfs4proxy
-+to the \fBtorrc\fR like thus:
-+.PP
-+.nf
-+.RS
-+# Use obfs4proxy to provide the obfs4 protocol.
-+ClientTransportPlugin obfs4 exec /usr/bin/obfs4proxy
-+.RE
-+.fi
-+.PP
-+To configure tor to act as an obfs4 bridge (as the server), add obfs4proxy
-+to the \fBtorrc\fR like thus:
-+.PP
-+.nf
-+.RS
-+#
-+# In addition to the standard tor bridge configuration, add:
-+#
-+
-+# Use obfs4proxy to provide the obfs4 protocol.
-+ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy
-+.RE
-+.fi
-+.SH "SEE ALSO"
-+\fBtor (1), \fBtorrc (5), \fBobfsproxy (1)
diff --git a/debian/patches/0002-Minor-documentation-cleanups-no-functional-changes.patch b/debian/patches/0002-Minor-documentation-cleanups-no-functional-changes.patch
deleted file mode 100644
index 234cfd2..0000000
--- a/debian/patches/0002-Minor-documentation-cleanups-no-functional-changes.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 1436720b12383b353982022ae3d0ea0f5d847cc6 Mon Sep 17 00:00:00 2001
-From: Yawning Angel <yawning at torproject.org>
-Date: Sat, 6 Sep 2014 16:47:57 +0000
-Subject: [PATCH 2/3] Minor documentation cleanups, no functional changes.
-
----
- README.md |   17 ++++++++++-------
- 1 file changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/README.md b/README.md
-index 4ad8b5c..fdcb34b 100644
---- a/README.md
-+++ b/README.md
-@@ -32,8 +32,8 @@ handshake variants without being obscenely slow is non-trivial.
- Build time library dependencies are handled by go get automatically but are
- listed for clarity.
- 
-- * Go 1.2.0 or later.   Prior versions of Go 1.0.2 are missing certain important
--   parts of the runtime library like a SHA256 implementation.
-+ * Go 1.2.0 or later.   Prior versions of Go (Eg: 1.0.2) are missing certain
-+   important parts of the runtime library like a SHA256 implementation.
-  * go.crypto (https://code.google.com/p/go.crypto)
-  * go.net (https://code.google.com/p/go.net)
-  * ed25519/extra25519 (https://github.com/agl/ed25519/extra25519)
-@@ -46,11 +46,11 @@ To build:
- `go get git.torproject.org/pluggable-transports/obfs4.git/obfs4proxy`
- 
- To install:
--Copy `$GOPATH/bin/obfs4proxy` to a permanent location (Eg: `/usr/local/sbin`)
-+Copy `$GOPATH/bin/obfs4proxy` to a permanent location (Eg: `/usr/local/bin`)
- 
- Client side torrc configuration:
- ```
--ClientTransportPlugin obfs4 exec /usr/local/sbin/obfs4proxy
-+ClientTransportPlugin obfs4 exec /usr/local/bin/obfs4proxy
- ```
- 
- Bridge side torrc configuration:
-@@ -58,8 +58,11 @@ Bridge side torrc configuration:
- # Act as a bridge relay.
- BridgeRelay 1
- 
-+# Enable the Extended ORPort
-+ExtORPort auto
-+
- # Use obfs4proxy to provide the obfs4 protocol.
--ServerTransportPlugin obfs4 exec /usr/local/sbin/obfs4proxy
-+ServerTransportPlugin obfs4 exec /usr/local/bin/obfs4proxy
- 
- # (Optional) Listen on the specified address/port for obfs4 connections as
- # opposed to picking a port automatically.
-@@ -72,9 +75,9 @@ ServerTransportPlugin obfs4 exec /usr/local/sbin/obfs4proxy
-    ports (<=1024) even when not running as root by granting the
-    `CAP_NET_BIND_SERVICE` capability with setcap:
- 
--   `# setcap 'cap_net_bind_service=+ep' /usr/local/sbin/obfs4proxy`
-+   `# setcap 'cap_net_bind_service=+ep' /usr/local/bin/obfs4proxy`
- 
-- * obfs4proxy can also act as a obfs2 and obfs3 client or server.  Adjust the
-+ * obfs4proxy can also act as an obfs2 and obfs3 client or server.  Adjust the
-    `ClientTransportPlugin` and `ServerTransportPlugin` lines in the torrc as
-    appropriate.
- 
--- 
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 875fac3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Add-a-man-page-for-obfs4proxy.patch
-0002-Minor-documentation-cleanups-no-functional-changes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfs4proxy.git

