summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-06-26 18:12:31 -0300
committerSilvio Rhatto <rhatto@riseup.net>2012-06-26 18:12:31 -0300
commitd461a9971185e4ddf9b0ef0e13c2992c9c96a362 (patch)
treefcd98ac9d026dfded1fd3e8614b3312d918b26e4
parent367b9b1653d3f3a63f627990a1d70348e7ce70b8 (diff)
downloadkeyringer-d461a9971185e4ddf9b0ef0e13c2992c9c96a362.tar.gz
keyringer-d461a9971185e4ddf9b0ef0e13c2992c9c96a362.tar.bz2
Adding debian/patches/
-rw-r--r--.gitignore1
-rw-r--r--debian/patches/debian-changes-0.1-1101
-rw-r--r--debian/patches/series1
3 files changed, 103 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 1377554..19e7574 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
*.swp
+.pc
diff --git a/debian/patches/debian-changes-0.1-1 b/debian/patches/debian-changes-0.1-1
new file mode 100644
index 0000000..a6ad49a
--- /dev/null
+++ b/debian/patches/debian-changes-0.1-1
@@ -0,0 +1,101 @@
+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) <nnnn is the bug number of your ITP>
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Silvio Rhatto <rhatto@riseup.net>
+
+---
+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: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- 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 <<EOF >> 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 <<EOF >> 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 <keyring> $BASENAME <gpg|ssh|ssl|ssl-cacert|ssl-self> <file> <hostname> [outfile]"
++ echo -e "Usage: keyringer <keyring> $BASENAME <gpg|ssh|ssl|ssl-self> <file> <hostname> [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
new file mode 100644
index 0000000..0540e18
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian-changes-0.1-1