From: Jonathan McDowell Date: Sun, 6 Oct 2013 11:41:18 +0000 (+0100) Subject: Merge branch 'switch-to-debhelper' of git://git.sommitrealweird.co.uk/onak X-Git-Tag: onak-0.4.3~60 X-Git-Url: http://the.earth.li/gitweb/?a=commitdiff_plain;h=4c00c60025f3da30824b2df0fb5f25c0207245e3;hp=b7a8b5277d37b289361ff0cc881632f527e4d5db;p=onak.git Merge branch 'switch-to-debhelper' of git://git.sommitrealweird.co.uk/onak --- diff --git a/.gitignore b/.gitignore index 6a7382c..b313628 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ testparse wotsap tags .depend +aclocal.m4 autom4te.cache version.h *.o diff --git a/Doxyfile b/Doxyfile index 92ae055..353a002 100644 --- a/Doxyfile +++ b/Doxyfile @@ -32,7 +32,7 @@ PROJECT_NAME = onak # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.4.1 +PROJECT_NUMBER = 0.4.2 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/HISTORY b/HISTORY index 4f578c5..3bc56fa 100644 --- a/HISTORY +++ b/HISTORY @@ -286,3 +286,15 @@ * Always put a leading 0x on keyids in HTML output links * Allow retrieval of key by full fingerprint * Add keyid to DB4 backend deletion error messages + +0.4.2 - 1st October 2013 + +* Add support for RIPEMD160, SHA224, SHA384 & SHA512 when available +* Fix stripkeys to output all the keys at the end rather as it goes along +* Add support for checking signature hashes +* Use Doxygen for some initial code documentation generation +* Cleanup code in preparation for a separate libonak for general PGP bits +* Prevent read_openpgp_stream from returning empty packages + causing crashes +* Allow maxpath + splitkeys to take a -c option to specify the config file +* Add wotsap tool to generate data files for wotsap +* Add HKP backend to allow onak to be used as a proxying keyserver diff --git a/README b/README index 63b2a21..e1cc1ca 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -onak 0.4.1 -Copyright 2003-2012 Jonathan McDowell +onak 0.4.2 +Copyright 2003-2013 Jonathan McDowell http://www.earth.li/projectpurple/progs/onak.html @@ -62,7 +62,7 @@ should live; by default it'll be PREFIX/etc/onak.conf. Backends: -Currently there is support for 5 different database backends: +Currently there is support for 6 different database backends: * file The original backend. Very simple and ideal for testing. Stores each @@ -93,6 +93,10 @@ Currently there is support for 5 different database backends: subkey searching). Needs a good filesystem to get good performance though as it creates many, many files and links. +* hkp + A proxying backend. No keys are stored locally; all fetch and store + requests are forwarded to the provided keyserver. + Other keyservers: @@ -138,12 +142,14 @@ onak lives at: http://www.earth.li/projectpurple/progs/onak.html -Development is carried out using arch; you can access the repository +Development is carried out using git; you can access the repository with something like: -tla register-archive noodles@earth.li--2004-laptop \ - http://www.earth.li/~noodles/arch/ -tla get -A noodles@earth.li--2004-laptop onak--mainline--0.3 +git clone git://the.earth.li/onak.git + +or it can be browsed via gitweb at: + +http://the.earth.li/gitweb/?p=onak.git;a=summary License: diff --git a/configure.ac b/configure.ac index 55def5c..f949a77 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.50) -AC_INIT([onak],[0.4.1],[noodles-onak@earth.li]) +AC_INIT([onak],[0.4.2],[noodles-onak@earth.li]) AC_CONFIG_SRCDIR(onak.c) AC_CONFIG_HEADER(config.h) diff --git a/debian/changelog b/debian/changelog index 5ae0246..6e608b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,14 @@ -onak (0.4.1-1+bzr) unstable; urgency=low +onak (0.4.2-1) unstable; urgency=low - * Development build + * New upstream release + * Prevent splitkeys crash with malformed key input. (Closes: #716350) * Switch to source format 3.0 (quilt). * Only seed initial database if key file is available. (Closes: #710665) * Bump Debian Standards-Version to 3.9.4.0 * Update year in copyright file * Updated Vcs fields to point to git repository - -- Jonathan McDowell Tue, 24 Apr 2012 21:54:17 -0700 + -- Jonathan McDowell Tue, 01 Oct 2013 11:56:55 +0100 onak (0.4.1-1) unstable; urgency=low diff --git a/keydb_hkp.c b/keydb_hkp.c index f1dfe44..3802e49 100644 --- a/keydb_hkp.c +++ b/keydb_hkp.c @@ -31,6 +31,7 @@ #include "mem.h" #include "onak-conf.h" #include "parsekey.h" +#include "version.h" static CURL *curl = NULL; @@ -43,6 +44,11 @@ static void hkp_initdb(bool readonly) { curl_global_init(CURL_GLOBAL_DEFAULT); curl = curl_easy_init(); + if (curl == NULL) { + logthing(LOGTHING_CRITICAL, "Could not initialize CURL."); + exit(EXIT_FAILURE); + } + curl_easy_setopt(curl, CURLOPT_USERAGENT, "onak/" ONAK_VERSION); } /** diff --git a/keydctl.c b/keydctl.c index e46a355..11e5e8f 100644 --- a/keydctl.c +++ b/keydctl.c @@ -190,7 +190,7 @@ static void usage(void) { puts("keydctl " ONAK_VERSION " - control an onak keyd instance.\n"); puts("Usage:\n"); - puts("\tonak [options] \n"); + puts("\tkeydctl [options] \n"); puts("\tCommands:\n"); puts("\tcheck - check if keyd is running"); puts("\tquit - request that keyd cleanly shuts down");