From 4f8e4fa1e7654fb65a86b91d8895af724474c673 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 26 Jun 2012 19:09:02 -0300 Subject: Keyringer dependencies --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 87ac26d..108adc9 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,8 @@ Homepage: https://git.sarava.org/?p=keyringer.git;a=summary Package: keyringer Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, bash, git-core, gnupg, grep, gawk, coreutils, sed +Recommends: openssl Description: Distributed secret management using GPG and git Keyringer lets you manage and share secrets using GPG and git in a distributed fashion. It has custom commands to encrypt, decrypt, recrypt, create key pairs, -- cgit v1.2.3 From d73dd4304325b54968deb7c6d9c73402cd9927e2 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 26 Jun 2012 19:10:07 -0300 Subject: Changing debian/compat --- debian/compat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 -- cgit v1.2.3 From 28defbcc299dba94fb1c46251ee60f62f12eef6a Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 26 Jun 2012 19:10:15 -0300 Subject: Misc debian changes --- debian/patches/debian-changes-0.1-1 | 101 ------------------------------------ debian/patches/series | 1 - 2 files changed, 102 deletions(-) delete mode 100644 debian/patches/debian-changes-0.1-1 delete mode 100644 debian/patches/series (limited to 'debian') diff --git a/debian/patches/debian-changes-0.1-1 b/debian/patches/debian-changes-0.1-1 deleted file mode 100644 index a6ad49a..0000000 --- a/debian/patches/debian-changes-0.1-1 +++ /dev/null @@ -1,101 +0,0 @@ -Description: Upstream changes introduced in version 0.1-1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - keyringer (0.1-1) unstable; urgency=low - . - * Initial release (Closes: #nnnn) - . - The person named in the Author field signed this changelog entry. -Author: Silvio Rhatto - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- keyringer-0.1.orig/Makefile -+++ keyringer-0.1/Makefile -@@ -23,7 +23,6 @@ clean: - find . -name *~ | xargs rm -f # clean local backups - - install_lib: -- $(INSTALL) -D --mode=0644 lib/keyringer/csr.sh $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/csr.sh - $(INSTALL) -D --mode=0644 lib/keyringer/functions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/functions - - install_share: ---- keyringer-0.1.orig/share/keyringer/genpair -+++ keyringer-0.1/share/keyringer/genpair -@@ -101,10 +101,6 @@ function genpair_ssl { - cd "$TMPWORK" - - # Generate certificate -- if [ "$KEYTYPE" == "ssl-cacert" ]; then -- # We use a custom script for CaCert -- "$LIB/csr.sh" "$NODE" -- else - cat <> openssl.conf - [ req ] - default_keyfile = ${NODE}_privatekey.pem -@@ -127,22 +123,21 @@ commonName = Common - extendedKeyUsage=serverAuth,clientAuth - EOF - -- # Add SubjectAltNames so wildcard certs can work correctly. -- if [ "$WILDCARD" == "yes" ]; then -+ # Add SubjectAltNames so wildcard certs can work correctly. -+ if [ "$WILDCARD" == "yes" ]; then - cat <> openssl.conf - subjectAltName=DNS:${NODE}, DNS:${CNAME} - EOF -- fi -+ fi - -- echo "Please review your OpenSSL configuration:" -- cat openssl.conf -- read -p "Hit ENTER to continue." prompt -+ echo "Please review your OpenSSL configuration:" -+ cat openssl.conf -+ read -p "Hit ENTER to continue." prompt - -- openssl req -batch -nodes -config openssl.conf -newkey rsa:2048 -sha256 \ -- -keyout ${NODE}_privatekey.pem -out ${NODE}_csr.pem -+ openssl req -batch -nodes -config openssl.conf -newkey rsa:2048 -sha256 \ -+ -keyout ${NODE}_privatekey.pem -out ${NODE}_csr.pem - -- openssl req -noout -text -in ${NODE}_csr.pem -- fi -+ openssl req -noout -text -in ${NODE}_csr.pem - - # Self-sign - if [ "$KEYTYPE" == "ssl-self" ]; then -@@ -199,9 +194,9 @@ CWD="`pwd`" - - # Verify - if [ -z "$NODE" ]; then -- echo -e "Usage: keyringer $BASENAME [outfile]" -+ echo -e "Usage: keyringer $BASENAME [outfile]" - echo -e "Options:" -- echo -e "\t gpg|ssh|ssl[-cacert,-self]: key type." -+ echo -e "\t gpg|ssh|ssl[-self]: key type." - echo -e "\t file : base file name for encrypted output (relative to keys folder)" - echo -e "\t hostname : host for the key pair" - echo -e "\t outfile : optional unencrypted output file, useful for deployment" -@@ -216,7 +211,7 @@ keyringer_set_tmpfile genpair -d - - # Dispatch - echo "Generating $KEYTYPE key for $NODE..." --if [ "$KEYTYPE" == "ssl-self" ] || [ "$KEYTYPE" == "ssl-cacert" ]; then -+if [ "$KEYTYPE" == "ssl-self" ]; then - genpair_ssl - else - genpair_"$KEYTYPE" diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 0540e18..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -debian-changes-0.1-1 -- cgit v1.2.3 From 8bc5be5387171f7fc06492be7580787a3722a52b Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 21 Aug 2012 14:17:08 -0300 Subject: Updating .gitignore --- .gitignore | 3 +++ debian/keyringer.substvars | 1 + 2 files changed, 4 insertions(+) create mode 100644 debian/keyringer.substvars (limited to 'debian') diff --git a/.gitignore b/.gitignore index dd07a0f..f9b9271 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +debian/keyringer.debhelper.log +debian/keyringer +debian/files *.swp .pc debian/files diff --git a/debian/keyringer.substvars b/debian/keyringer.substvars new file mode 100644 index 0000000..abd3ebe --- /dev/null +++ b/debian/keyringer.substvars @@ -0,0 +1 @@ +misc:Depends= -- cgit v1.2.3 From efbf6809ec3ab4f1d34bd7bcacfaebd46e32d170 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 17 Aug 2013 12:36:44 -0300 Subject: Updating project homepage at debian/control --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 108adc9..b386532 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Silvio Rhatto Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.8.4 -Homepage: https://git.sarava.org/?p=keyringer.git;a=summary +Homepage: https://keyringer.pw #Vcs-Git: git://git.debian.org/collab-maint/keyringer.git #Vcs-Browser: http://git.debian.org/?p=collab-maint/keyringer.git;a=summary -- cgit v1.2.3 From d46f13b4683dcd456387e81b53017d2b672e778e Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 17 Aug 2013 12:49:53 -0300 Subject: Adding 'open' action --- debian/control | 2 +- share/keyringer/edit | 15 +++++++++++++-- share/keyringer/open | 1 + share/man/keyringer.1.mdwn | 3 +++ 4 files changed, 18 insertions(+), 3 deletions(-) create mode 120000 share/keyringer/open (limited to 'debian') diff --git a/debian/control b/debian/control index b386532..689c7d9 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Homepage: https://keyringer.pw Package: keyringer Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, bash, git-core, gnupg, grep, gawk, coreutils, sed -Recommends: openssl +Recommends: openssl, xdg-utils Description: Distributed secret management using GPG and git Keyringer lets you manage and share secrets using GPG and git in a distributed fashion. It has custom commands to encrypt, decrypt, recrypt, create key pairs, diff --git a/share/keyringer/edit b/share/keyringer/edit index 0604d7e..fe05ecc 100755 --- a/share/keyringer/edit +++ b/share/keyringer/edit @@ -22,10 +22,21 @@ keyringer_set_tmpfile edit # Decrypt the information to the file $GPG --yes -o "$TMPWORK" --use-agent -d "$KEYDIR/$FILE" +if [ "$BASENAME" == "edit" ]; then + APP="$EDITOR" +elif [ "$BASENAME" == "open" ]; then + if which xdg-open &> /dev/null; then + APP="xdg-open" + else + echo "You should have xdg-open application to perform this action, aborting." + exit 1 + fi +fi + # Prompt -echo "Press any key to open the decrypted data in $EDITOR, Ctrl-C to abort" +echo "Press any key to open the decrypted data with $APP, Ctrl-C to abort" read key -$EDITOR "$TMPWORK" +$APP "$TMPWORK" # Encrypt again $GPG --yes -o "$KEYDIR/$FILE" --use-agent --armor -e -s $(keyringer_recipients "$RECIPIENTS_FILE") "$TMPWORK" diff --git a/share/keyringer/open b/share/keyringer/open new file mode 120000 index 0000000..8491ab9 --- /dev/null +++ b/share/keyringer/open @@ -0,0 +1 @@ +edit \ No newline at end of file diff --git a/share/man/keyringer.1.mdwn b/share/man/keyringer.1.mdwn index 99abd60..23b8d85 100644 --- a/share/man/keyringer.1.mdwn +++ b/share/man/keyringer.1.mdwn @@ -75,6 +75,9 @@ encrypt-batch <*SECRET*> genpair <*ssh*|*gpg*|*ssl*|*ssl-self*> [*options*] : Wrapper to generete encryption keypairs, useful for automated key deployment. +open <*SECRET*> +: Open a secret using xdg-open. + recrypt <*SECRET*> : Recrypts a secret by decrypting it and recrypting again. Useful when users are added into recipient configuration. If no *SECRET* is given, all secrets in the repository -- cgit v1.2.3 From 43483167db3c675098f2ba2e7e3658461e3eaa0d Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 5 Sep 2013 18:24:27 -0300 Subject: Adding install_man target --- Makefile | 5 ++++- debian/keyringer.substvars | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 debian/keyringer.substvars (limited to 'debian') diff --git a/Makefile b/Makefile index c353df7..030918a 100644 --- a/Makefile +++ b/Makefile @@ -36,8 +36,11 @@ install_doc: $(INSTALL) -D --mode=0644 README $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/README $(INSTALL) -D --mode=0644 LICENSE $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/LICENSE +install_man: + $(INSTALL) -D --mode=0644 share/man/keyringer.1 $(DESTDIR)/$(PREFIX)/share/man/man1 + install: clean - @make install_lib install_share install_bin install_doc + @make install_lib install_share install_bin install_doc install_man build_man: pandoc -s -w man share/man/keyringer.1.mdwn -o share/man/keyringer.1 diff --git a/debian/keyringer.substvars b/debian/keyringer.substvars deleted file mode 100644 index abd3ebe..0000000 --- a/debian/keyringer.substvars +++ /dev/null @@ -1 +0,0 @@ -misc:Depends= -- cgit v1.2.3 From f91709c2abaa2b3011ef0b9799ce2fa010f9d534 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 5 Sep 2013 18:35:43 -0300 Subject: Updating version to be ready for 0.2.3 --- Makefile | 2 +- debian/changelog | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/Makefile b/Makefile index 030918a..d7ff5fb 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # PACKAGE = keyringer -VERSION = 0.2.2 +VERSION = 0.2.3 PREFIX ?= /usr/local INSTALL = /usr/bin/install diff --git a/debian/changelog b/debian/changelog index 6d55a57..daf5e3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,11 @@ +keyringer (0.2.3-1) unstable; urgency=low + + * Packaging upstream 0.2.3 + + -- Silvio Rhatto Thu, 05 Sep 2013 18:32:37 -0300 + keyringer (0.1-1) unstable; urgency=low - * Initial release (Closes: #nnnn) + * Initial release -- Silvio Rhatto Tue, 26 Jun 2012 16:33:57 -0300 -- cgit v1.2.3