From 7450cfc08e30d8680733434f096f84ceb0e784d2 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 22 Oct 2016 13:19:05 -0700 Subject: better manpage-fixing patch --- debian/patches/fix-manpage-syntax-error.patch | 22 ---- .../patches/fix-use-of-.IP-macro-in-manpage.patch | 115 +++++++++++++++++++++ debian/patches/series | 2 +- 3 files changed, 116 insertions(+), 23 deletions(-) delete mode 100644 debian/patches/fix-manpage-syntax-error.patch create mode 100644 debian/patches/fix-use-of-.IP-macro-in-manpage.patch (limited to 'debian/patches') diff --git a/debian/patches/fix-manpage-syntax-error.patch b/debian/patches/fix-manpage-syntax-error.patch deleted file mode 100644 index 27d6836..0000000 --- a/debian/patches/fix-manpage-syntax-error.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Sean Whitton -Date: Sat, 22 Oct 2016 12:18:08 -0700 -Subject: fix manpage syntax error - -"67: warning: numeric expression expected (got `B')" ---- - keysafe.1 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/keysafe.1 b/keysafe.1 -index c22d337..39465b6 100644 ---- a/keysafe.1 -+++ b/keysafe.1 -@@ -64,7 +64,7 @@ and --port and --address to configure how the server listens to - connections. It's recommended to only expose keysafe servers over a tor - hidden service. - .PP --.IP --backup-server BACKUPDIR -+.IP \--backup-server BACKUPDIR - Run on a server, populates the BACKUPDIR with a gpg encrypted backup - of all the objects stored in the --store-directory. This is designed - to be rsynced offsite (with --delete) to back up a keysafe server with diff --git a/debian/patches/fix-use-of-.IP-macro-in-manpage.patch b/debian/patches/fix-use-of-.IP-macro-in-manpage.patch new file mode 100644 index 0000000..ca957c6 --- /dev/null +++ b/debian/patches/fix-use-of-.IP-macro-in-manpage.patch @@ -0,0 +1,115 @@ +From: Sean Whitton +Date: Sat, 22 Oct 2016 12:18:08 -0700 +Subject: fix use of .IP macro in manpage + +"67: warning: numeric expression expected (got `B')" +--- + keysafe.1 | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +diff --git a/keysafe.1 b/keysafe.1 +index c22d337..73d0b4d 100644 +--- a/keysafe.1 ++++ b/keysafe.1 +@@ -64,21 +64,21 @@ and --port and --address to configure how the server listens to + connections. It's recommended to only expose keysafe servers over a tor + hidden service. + .PP +-.IP --backup-server BACKUPDIR ++.IP "--backup-server BACKUPDIR" + Run on a server, populates the BACKUPDIR with a gpg encrypted backup + of all the objects stored in the --store-directory. This is designed + to be rsynced offsite (with --delete) to back up a keysafe server with + minimal information leakage. + .PP +-.IP --restore-server BACKUPDIR ++.IP "--restore-server BACKUPDIR" + Restore all objects present in the gpg-encrypted + backups in the specified directory. + .PP +-.IP --chaff HOSTNAME ++.IP "--chaff HOSTNAME" + Upload random data to a keysafe server. --port can be used to specify + the server's port. Continues uploading data until interrupted with ctrl-c. + .PP +-.IP --chaff-max-delay SECONDS ++.IP "--chaff-max-delay SECONDS" + Specify a delay between chaff uploads. Will delay a + random amount between 0 and this many seconds. + .PP +@@ -94,17 +94,17 @@ Benchmark speed of keysafe's cryptographic primitives. + .IP --test + Run test suite. + .PP +-.IP --gpgkeyid KEYID ++.IP "--gpgkeyid KEYID" + Specify keyid of gpg key to back up or restore. This is useful if you + have multiple gpg keys. But, when this option is used to back up a key, + you have to also provide it to restore that key. + .PP +-.IP --keyfile FILE ++.IP "--keyfile FILE" + To back up anything other than a gpg secret key, use this option. + To restore from the backup, you must use this same option, and pass the + exact same filename. + .PP +-.IP --store-directory dir ++.IP "--store-directory dir" + Where to store data locally. For the client, data is + stored here before it is uploaded to the server. For + the server, this is where it stores its data. +@@ -115,7 +115,7 @@ Use GUI interface for interaction. Default is to use + readline interface when run in a terminal, and GUI otherwise. + The GUI currently is implemented using zenity(1). + .PP +-.IP --totalshares M --neededshares N ++.IP "--totalshares M --neededshares N" + These options have to be specified together. + The default values are --totalshares 3 --neededshares 2. + Keysafe uses Shamir secret sharing to create M shares of the encrypted +@@ -124,37 +124,37 @@ To restore the data, only N of the shares are needed. If you specify + these options when backing up a secret key, you also must specify them + with the same values to restore that secret key. + .PP +-.IP --name N ++.IP "--name N" + Specify name used for key backup/restore, avoiding the usual prompt. + .PP +-.IP --othername N ++.IP "--othername N" + Specify other name used for key backup/restore, avoiding the usual prompt. + .PP +-.IP --add-storage-directory DIR ++.IP "--add-storage-directory DIR" + Add the directory to the list of locations keysafe + will use for backup/restore of keys. Keysafe will use + the directory first, before any of its built-in servers. + .PP +-.IP --add-server HOST[:PORT] ++.IP "--add-server HOST[:PORT]" + Add the server to the server list which keysafe will + use for backup/restore of keys. Keysafe will use the + server first before any of its built-in servers. + .PP +-.IP --port P ++.IP "--port P" + Port for server to listen on. (default: 80) + .PP +-.IP --address A ++.IP "--address A" + Address for server to bind to. (Use "*" to bind to + all addresses.) (default: "127.0.0.1") + .PP +-.IP --months-to-fill-half-disk N ++.IP "--months-to-fill-half-disk N" + Server rate-limits requests and requires proof of + work, to avoid too many objects being stored. This is + an lower bound on how long it could possibly take for + half of the current disk space to be + filled. (default: 12) + .PP +-.IP --motd MESSAGE ++.IP "--motd MESSAGE" + The server's Message Of The Day. + .PP + .IP --testmode diff --git a/debian/patches/series b/debian/patches/series index 05b7591..519c3e1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ fix-spelling-errors-caught-by-lintian.patch add-keywords-to-desktop-file.patch -fix-manpage-syntax-error.patch +fix-use-of-.IP-macro-in-manpage.patch -- cgit v1.2.3