November 2012 - tor-commits - lists.torproject.org

[flashproxy/master] Modified makefile to package man pages.
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit 1cdeeb36061f710931732e4156497073d470b298 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Mon Nov 12 20:10:43 2012 -0500 Modified makefile to package man pages. dist target now depends on generated generated man pages, added target to generate them using a2x. Also added highlighting of an option name in flashproxy-client man page. --- Makefile | 14 ++++++++++++-- doc/flashproxy-client.1.txt | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e86c8f5..1f12d46 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,10 @@ BINDIR = $(PREFIX)/bin VERSION = 0.8 -CLIENT_DIST_FILES = flashproxy-client flashproxy-reg-email flashproxy-reg-http README LICENSE torrc +CLIENT_EXECUTABLES = flashproxy-client flashproxy-reg-email flashproxy-reg-http +CLIENT_ASCIIDOCS = $(CLIENT_EXECUTABLES:%=doc/%.1.txt) +CLIENT_MANPAGES = $(CLIENT_EXECUTABLES:%=doc/%.1) +CLIENT_DIST_FILES = $(CLIENT_EXECUTABLES) README LICENSE torrc all: : @@ -23,10 +26,12 @@ test: DISTNAME = flashproxy-client-$(VERSION) DISTDIR = dist/$(DISTNAME) -dist: +dist: $(CLIENT_MANPAGES) rm -rf dist mkdir -p $(DISTDIR) + mkdir $(DISTDIR)/doc cp -f $(CLIENT_DIST_FILES) $(DISTDIR) + cp -f $(CLIENT_MANPAGES) $(DISTDIR)/doc cd dist && zip -q -r -9 $(DISTNAME).zip $(DISTNAME) dist/$(DISTNAME).zip: $(CLIENT_DIST_FILES) @@ -37,4 +42,9 @@ sign: dist/$(DISTNAME).zip cd dist && gpg --sign --detach-sign --armor $(DISTNAME).zip cd dist && gpg --verify $(DISTNAME).zip.asc $(DISTNAME).zip +%.1: $(CLIENT_ASCIIDOCS) + rm -rf $@ + a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 23" \ + -d manpage -f manpage $@.txt; + .PHONY: all install clean test dist sign diff --git a/doc/flashproxy-client.1.txt b/doc/flashproxy-client.1.txt index abd4415..752f6e2 100644 --- a/doc/flashproxy-client.1.txt +++ b/doc/flashproxy-client.1.txt @@ -31,7 +31,7 @@ the "websocket" pluggable transport. In managed mode, the __LOCAL__ port is chos arbitrarily instead of defaulting to 9001; however this can be overridden by including a __LOCAL__ port in the command. This is the way the program should be invoked in a torrc ClientTransportPlugin "exec" line. -Use the --external option to run as an external proxy that does not +Use the **--external** option to run as an external proxy that does not interact with Tor. If any of the **--register**, **--register-addr**, or **--register-methods** options are

1 0

[flashproxy/master] Changed make recipe to use minimal prereqs.
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit 7dad65e0bce8693fa35061f27caac95f21f93430 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Mon Nov 12 20:51:22 2012 -0500 Changed make recipe to use minimal prereqs. Changed the %.1 target to have as prerequisite %.1.txt, rather than all of the asciidoc files. Otherwise man pages would be generated unnecessarily. Also changed recipe to use automatic variable $<, to match the style found in the make manual. --- Makefile | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b29ab48..4f3a07a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ BINDIR = $(PREFIX)/bin VERSION = 0.8 CLIENT_EXECUTABLES = flashproxy-client flashproxy-reg-email flashproxy-reg-http -CLIENT_ASCIIDOCS = $(CLIENT_EXECUTABLES:%=doc/%.1.txt) CLIENT_MANPAGES = $(CLIENT_EXECUTABLES:%=doc/%.1) CLIENT_DIST_FILES = $(CLIENT_EXECUTABLES) README LICENSE torrc @@ -42,9 +41,9 @@ sign: dist/$(DISTNAME).zip cd dist && gpg --sign --detach-sign --armor $(DISTNAME).zip cd dist && gpg --verify $(DISTNAME).zip.asc $(DISTNAME).zip -%.1: $(CLIENT_ASCIIDOCS) +%.1: %.1.txt rm -rf $@ a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 23" \ - -d manpage -f manpage $@.txt + -d manpage -f manpage $< .PHONY: all install clean test dist sign

1 0

[flashproxy/master] Removed spurious semi-colon from make recipe.
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit 5a0be39953b05b0e51dc95d513ea0727be499228 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Mon Nov 12 20:25:58 2012 -0500 Removed spurious semi-colon from make recipe. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 1f12d46..b29ab48 100644 --- a/Makefile +++ b/Makefile @@ -45,6 +45,6 @@ sign: dist/$(DISTNAME).zip %.1: $(CLIENT_ASCIIDOCS) rm -rf $@ a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 23" \ - -d manpage -f manpage $@.txt; + -d manpage -f manpage $@.txt .PHONY: all install clean test dist sign

1 0

[flashproxy/master] List each man page individually in CLIENT_MANPAGES.
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit 727adfce7b0aa4d7d96dfe89ffb5613901e8392c Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 12 20:06:53 2012 -0800 List each man page individually in CLIENT_MANPAGES. So we can add a program without having to add a man page for it immediately. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 4f3a07a..cdbf30c 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ BINDIR = $(PREFIX)/bin VERSION = 0.8 CLIENT_EXECUTABLES = flashproxy-client flashproxy-reg-email flashproxy-reg-http -CLIENT_MANPAGES = $(CLIENT_EXECUTABLES:%=doc/%.1) +CLIENT_MANPAGES = doc/flashproxy-client.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1 CLIENT_DIST_FILES = $(CLIENT_EXECUTABLES) README LICENSE torrc all:

1 0

[flashproxy/master] Slight style changes to man pages.
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit f5f51507d965d4906d387348b02a39e7ced4525c Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 12 19:56:27 2012 -0800 Slight style changes to man pages. "Flashproxy" → "flash proxy". I don't know how the formatting of the :man source: and :man manual: parts is supposed to look, so I'm leaving them out. --- doc/flashproxy-client.1.txt | 4 +--- doc/flashproxy-reg-email.1.txt | 3 --- doc/flashproxy-reg-http.1.txt | 5 +---- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/doc/flashproxy-client.1.txt b/doc/flashproxy-client.1.txt index 752f6e2..420d3d4 100644 --- a/doc/flashproxy-client.1.txt +++ b/doc/flashproxy-client.1.txt @@ -2,14 +2,12 @@ // To generate manpages, use the a2x command i.e. // a2x --no-xmllint -d manpage -f manpage flashproxy-client.1.txt // see http://www.methods.co.nz/asciidoc/userguide.html#X1 -:man source: Flashproxy Client -:man manual: Flashproxy Manual FLASHPROXY-CLIENT(1) ==================== NAME ---- -flashproxy-client - The Flashproxy pluggable transport client program +flashproxy-client - The flash proxy client transport plugin SYNOPSIS -------- diff --git a/doc/flashproxy-reg-email.1.txt b/doc/flashproxy-reg-email.1.txt index f98472e..ab12bab 100644 --- a/doc/flashproxy-reg-email.1.txt +++ b/doc/flashproxy-reg-email.1.txt @@ -3,9 +3,6 @@ // This one has a long name, if you don't change the // default length parameter it will be truncated, use: // a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 23" -d manpage -f manpage flashproxy-reg-email.1.txt -:man source: Flashproxy Register Email -:man manual: Flashproxy Manual - FLASHPROXY-REG-EMAIL(1) ======================= diff --git a/doc/flashproxy-reg-http.1.txt b/doc/flashproxy-reg-http.1.txt index a81e143..42566d8 100644 --- a/doc/flashproxy-reg-http.1.txt +++ b/doc/flashproxy-reg-http.1.txt @@ -3,15 +3,12 @@ // This one has a long name, if you don't change the // default length parameter it will be truncated, use: // a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 22" -d manpage -f manpage flashproxy-reg-http.1.txt -:man source: Flashproxy Register HTTP -:man manual: Flashproxy Manual - FLASHPROXY-REG-HTTP(1) ====================== NAME ---- -flashproxy-reg-http - Register with a facilitator using the http method +flashproxy-reg-http - Register with a facilitator using the HTTP method SYNOPSIS --------

1 0

[flashproxy/master] Add generated .1 man pages.
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit 1e91752ed7466c09f305c55be84ed84d3e1c26d7 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 12 20:00:01 2012 -0800 Add generated .1 man pages. On second thought, I want to include these generated files so that they can be included with "make install". --- doc/flashproxy-client.1 | 109 ++++++++++++++++++++++++++++++++++++++++++++ doc/flashproxy-reg-email.1 | 85 ++++++++++++++++++++++++++++++++++ doc/flashproxy-reg-http.1 | 59 ++++++++++++++++++++++++ 3 files changed, 253 insertions(+), 0 deletions(-) diff --git a/doc/flashproxy-client.1 b/doc/flashproxy-client.1 new file mode 100644 index 0000000..8409a58 --- /dev/null +++ b/doc/flashproxy-client.1 @@ -0,0 +1,109 @@ +'\" t +.\" Title: flashproxy-client +.\" Author: [see the "AUTHORS" section] +.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> +.\" Date: 11/12/2012 +.\" Manual: \ \& +.\" Source: \ \& +.\" Language: English +.\" +.TH "FLASHPROXY\-CLIENT" "1" "11/12/2012" "\ \&" "\ \&" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +flashproxy-client \- The flash proxy client transport plugin +.SH "SYNOPSIS" +.sp +\fBflashproxy\-client\fR \fB\-\-register\fR [\fIOPTIONS\fR] [\fILOCAL\fR][:\fIPORT\fR] [\fIREMOTE\fR][:\fIPORT\fR] +.SH "DESCRIPTION" +.sp +Wait for connections on a local and a remote port\&. When any pair of connections exists, data is ferried between them until one side is closed\&. By default \fILOCAL\fR is localhost addresses on port 9001 and \fIREMOTE\fR is all addresses on port 9000\&. +.sp +The local connection acts as a SOCKS4a proxy, but the host and port in the SOCKS request are ignored and the local connection is always linked to a remote connection\&. +.sp +By default, runs as a managed proxy: informs a parent Tor project of support for the "websocket" pluggable transport\&. In managed mode, the \fILOCAL\fR port is chosen arbitrarily instead of defaulting to 9001; however this can be overridden by including a \fILOCAL\fR port in the command\&. This is the way the program should be invoked in a torrc ClientTransportPlugin "exec" line\&. Use the \fB\-\-external\fR option to run as an external proxy that does not interact with Tor\&. +.sp +If any of the \fB\-\-register\fR, \fB\-\-register\-addr\fR, or \fB\-\-register\-methods\fR options are used, then your IP address will be sent to the facilitator so that proxies can connect to you\&. You need to register in some way in order to get any service\&. The \fB\-\-facilitator\fR option allows controlling which facilitator is used; if omitted, it uses a public default\&. +.SH "OPTIONS" +.PP +\fB\-\-daemon\fR +.RS 4 +Daemonize (Unix only)\&. +.RE +.PP +\fB\-\-external\fR +.RS 4 +Be an external proxy (don\(cqt interact with Tor using environment variables and stdout)\&. +.RE +.PP +\fB\-f\fR, \fB\-\-facilitator\fR=\fIURL\fR +.RS 4 +Advertise willingness to receive connections to URL\&. +.RE +.PP +\fB\-h\fR, \fB\-\-help\fR +.RS 4 +Display a help message and exit\&. +.RE +.PP +\fB\-l\fR, \fB\-\-log\fR \fIFILENAME\fR +.RS 4 +Write log to +\fIFILENAME\fR +(default is stdout)\&. +.RE +.PP +\fB\-\-pidfile\fR \fIFILENAME\fR +.RS 4 +Write PID to +\fIFILENAME\fR +after daemonizing\&. +.RE +.PP +\fB\-r\fR, \fB\-\-register\fR +.RS 4 +Register with the facilitator\&. +.RE +.PP +\fB\-\-register\-addr\fR=\fIADDR\fR +.RS 4 +Register the given address (in case it differs from REMOTE)\&. Implies \-\-register\&. +.RE +.PP +\fB\-\-register\-methods\fR=\fIMETHOD\fR[,\fIMETHOD\fR] +.RS 4 +Register using the given comma\-separated list of methods\&. Implies \-\-register\&. Possible methods are: email, http\&. Default is "email,http"\&. +.RE +.PP +\fB\-\-unsafe\-logging\fR +.RS 4 +Don\(cqt scrub IP addresses from logs\&. +.RE +.SH "SEE ALSO" +.sp +\fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR +.sp +\fBhttps://www\&.torproject\&.org/docs/pluggable\-transports\&.html\&.en\fR +.SH "BUGS" +.sp +Please report using \fBhttps://trac\&.torproject\&.org/projects/tor\fR\&. +.SH "AUTHORS" +.sp +David Fifield [dcf at torproject\&.org]\&. diff --git a/doc/flashproxy-reg-email.1 b/doc/flashproxy-reg-email.1 new file mode 100644 index 0000000..3ff9c32 --- /dev/null +++ b/doc/flashproxy-reg-email.1 @@ -0,0 +1,85 @@ +'\" t +.\" Title: flashproxy-reg-email +.\" Author: [see the "AUTHORS" section] +.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> +.\" Date: 11/12/2012 +.\" Manual: \ \& +.\" Source: \ \& +.\" Language: English +.\" +.TH "FLASHPROXY\-REG\-EMAIL" "1" "11/12/2012" "\ \&" "\ \&" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +flashproxy-reg-email \- Register with a facilitator using the email method +.SH "SYNOPSIS" +.sp +\fBflashproxy\-reg\-email\fR [\fIOPTIONS\fR] [\fIREMOTE\fR][:\fIPORT\fR] +.SH "DESCRIPTION" +.sp +Register with a flash proxy facilitator through email\&. Makes a STARTTLS connection to an SMTP server and sends mail with a client IP address to a designated address\&. By default the remote address registered is ":9000" (the external IP address is guessed)\&. +.sp +Using an SMTP server or email address other than the defaults will not work unless you have made special arrangements to connect them to a facilitator\&. +.sp +This program requires the M2Crypto library for Python\&. +.SH "OPTIONS" +.PP +\fB\-4\fR +.RS 4 +Name lookups use only IPv4\&. +.RE +.PP +\fB\-6\fR +.RS 4 +Name lookups use only IPv6\&. +.RE +.PP +\fB\-d\fR, \fB\-\-debug\fR +.RS 4 +Enable debugging output (Python smtplib messages)\&. +.RE +.PP +\fB\-e\fR, \fB\-\-email\fR=\fIADDRESS\fR +.RS 4 +Send mail to +\fIADDRESS\fR +(default is "flashproxyreg\&.a(a)gmail\&.com")\&. +.RE +.PP +\fB\-h\fR, \fB\-\-help\fR +.RS 4 +Display help message and exit\&. +.RE +.PP +\fB\-s\fR, \fB\-\-smtp\fR=\fIHOST\fR[:\fIPORT\fR] +.RS 4 +Use the given SMTP server (default is "gmail\-smtp\-in\&.l\&.google\&.com:25")\&. +.RE +.SH "SEE ALSO" +.sp +\fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR +.sp +\fBhttps://www\&.torproject\&.org/docs/pluggable\-transports\&.html\&.en\fR +.SH "BUGS" +.sp +Please report using \fBhttps://trac\&.torproject\&.org/projects/tor\fR\&. +.SH "AUTHORS" +.sp +David Fifield [dcf at torproject\&.org]\&. diff --git a/doc/flashproxy-reg-http.1 b/doc/flashproxy-reg-http.1 new file mode 100644 index 0000000..7b55e50 --- /dev/null +++ b/doc/flashproxy-reg-http.1 @@ -0,0 +1,59 @@ +'\" t +.\" Title: flashproxy-reg-http +.\" Author: [see the "AUTHORS" section] +.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> +.\" Date: 11/12/2012 +.\" Manual: \ \& +.\" Source: \ \& +.\" Language: English +.\" +.TH "FLASHPROXY\-REG\-HTTP" "1" "11/12/2012" "\ \&" "\ \&" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +flashproxy-reg-http \- Register with a facilitator using the HTTP method +.SH "SYNOPSIS" +.sp +\fBflashproxy\-reg\-http\fR [\fIOPTIONS\fR] [\fIREMOTE\fR][:\fIPORT\fR] +.SH "DESCRIPTION" +.sp +Register with a flash proxy facilitator using an HTTP POST\&. By default the remote address registered is ":9000"\&. +.SH "OPTIONS" +.PP +\fB\-f\fR, \fB\-\-facilitator\fR +.RS 4 +Register with the given facilitator (by default "https://tor\-facilitator\&.bamsoftware\&.com/")\&. +.RE +.PP +\fB\-h\fR, \fB\-\-help\fR +.RS 4 +Display help message and exit\&. +.RE +.SH "SEE ALSO" +.sp +\fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR +.sp +\fBhttps://www\&.torproject\&.org/docs/pluggable\-transports\&.html\&.en\fR +.SH "BUGS" +.sp +Please report using \fBhttps://trac\&.torproject\&.org/projects/tor\fR\&. +.SH "AUTHORS" +.sp +David Fifield [dcf at torproject\&.org]\&.

1 0

[flashproxy/master] Shorter variable names.
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit 6565a134265f52ef6be6034994085e67410e9829 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 12 20:12:45 2012 -0800 Shorter variable names. CLIENT_EXECUTABLES → CLIENT_BIN CLIENT_MANPAGES → CLIENT_MAN --- Makefile | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index b52f962..5539c44 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,9 @@ MANDIR = $(PREFIX)/share/man VERSION = 0.8 -CLIENT_EXECUTABLES = flashproxy-client flashproxy-reg-email flashproxy-reg-http -CLIENT_MANPAGES = doc/flashproxy-client.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1 -CLIENT_DIST_FILES = $(CLIENT_EXECUTABLES) README LICENSE torrc +CLIENT_BIN = flashproxy-client flashproxy-reg-email flashproxy-reg-http +CLIENT_MAN = doc/flashproxy-client.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1 +CLIENT_DIST_FILES = $(CLIENT_BIN) README LICENSE torrc all: : @@ -14,8 +14,8 @@ all: install: mkdir -p $(BINDIR) mkdir -p $(MANDIR)/man1 - cp -f $(CLIENT_EXECUTABLES) $(BINDIR) - cp -f $(CLIENT_MANPAGES) $(MANDIR)/man1 + cp -f $(CLIENT_BIN) $(BINDIR) + cp -f $(CLIENT_MAN) $(MANDIR)/man1 clean: rm -f *.pyc @@ -28,12 +28,12 @@ test: DISTNAME = flashproxy-client-$(VERSION) DISTDIR = dist/$(DISTNAME) -dist: $(CLIENT_MANPAGES) +dist: $(CLIENT_MAN) rm -rf dist mkdir -p $(DISTDIR) mkdir $(DISTDIR)/doc cp -f $(CLIENT_DIST_FILES) $(DISTDIR) - cp -f $(CLIENT_MANPAGES) $(DISTDIR)/doc + cp -f $(CLIENT_MAN) $(DISTDIR)/doc cd dist && zip -q -r -9 $(DISTNAME).zip $(DISTNAME) dist/$(DISTNAME).zip: $(CLIENT_DIST_FILES)

1 0

[flashproxy/master] Install man pages on "make install".
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit 9f1878b28dd11de342a1b3d0b7b71a24e9a6b3b4 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 12 20:10:53 2012 -0800 Install man pages on "make install". --- Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index cdbf30c..b52f962 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ PREFIX = /usr/local BINDIR = $(PREFIX)/bin +MANDIR = $(PREFIX)/share/man VERSION = 0.8 @@ -12,7 +13,9 @@ all: install: mkdir -p $(BINDIR) - cp -f flashproxy-client flashproxy-reg-email flashproxy-reg-http $(BINDIR) + mkdir -p $(MANDIR)/man1 + cp -f $(CLIENT_EXECUTABLES) $(BINDIR) + cp -f $(CLIENT_MANPAGES) $(MANDIR)/man1 clean: rm -f *.pyc

1 0

[flashproxy/master] No need for a recursive delete of a single file.
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit 735ecbe1ac12d37d869c540740aa9301b2296ffc Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 12 20:13:54 2012 -0800 No need for a recursive delete of a single file. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 5539c44..361fdf3 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ sign: dist/$(DISTNAME).zip cd dist && gpg --verify $(DISTNAME).zip.asc $(DISTNAME).zip %.1: %.1.txt - rm -rf $@ + rm -f $@ a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 23" \ -d manpage -f manpage $<

1 0

[flashproxy/master] Rearrange Makefile.
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit dc85b06b491fc17a838436b38556e3768dcebffb Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 12 20:14:41 2012 -0800 Rearrange Makefile. Put the man page target above the phony targets. --- Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 361fdf3..ce34812 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,11 @@ CLIENT_DIST_FILES = $(CLIENT_BIN) README LICENSE torrc all: : +%.1: %.1.txt + rm -f $@ + a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 23" \ + -d manpage -f manpage $< + install: mkdir -p $(BINDIR) mkdir -p $(MANDIR)/man1 @@ -44,9 +49,4 @@ sign: dist/$(DISTNAME).zip cd dist && gpg --sign --detach-sign --armor $(DISTNAME).zip cd dist && gpg --verify $(DISTNAME).zip.asc $(DISTNAME).zip -%.1: %.1.txt - rm -f $@ - a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 23" \ - -d manpage -f manpage $< - .PHONY: all install clean test dist sign

1 0