Update to 1.22:

2011-11-11  Dave Beckett <dave@dajobe.org>

	* Snapshotted flickcurl_1_22 for 1.22 release (GIT
	6698387f4240cec82b0e115adf8a863657dd7066)

	* utils/oauth-test.c:
	Update flickcurl_oauth_prepare_common call

	* NEWS.html, src/common.c, src/flickcurl_internal.h: Disable
	mtwist unless building experimental OAuth

	* src/Makefile.am: Do not use libmtwist without oauth

	* configure.ac, src/Makefile.am, src/common.c,
	src/flickcurl_internal.h, utils/Makefile.am: Add --enable-oauth
	default disabled

	* src/common.c:
	(flickcurl_free): Free OAuth urls

	* src/oauth.c:
	(test_signature_calc): Test free

	* src/oauth.c: Make oauth test work again

	* src/flickcurl_internal.h, src/oauth.c: Remove is_request arg -
	just use od->callback

	* src/common.c, src/flickcurl_internal.h, src/oauth.c,
	utils/oauth-test.c: Move flickcurl_oauth_data into flickcurl
	struct

	* docs/flickcurl-docs.xml, docs/tmpl/section-config.sgml: Add
	config section to docs

	* autogen.sh, docs/tmpl/section-auth.sgml,
	docs/tmpl/section-core.sgml, docs/tmpl/section-misc.sgml,
	docs/tmpl/section-unused.sgml, docs/tmpl/section-upload.sgml,
	libmtwist: Fix submodule checkouts

	* autogen.sh: Init and update any git submodules

2011-11-09  Dave Beckett <dave@dajobe.org>

	* src/flickcurl_internal.h, src/oauth.c:
	Reduce visibility of oauth
	internal functions These are internal to the library now because the
	flickcurl_oauth_data is an internal structure.

2011-11-01  Dave Beckett <dave@dajobe.org>

	* src/common.c: Return method details with curl errors

	* src/Makefile.am: Clean tests

2011-10-30  Dave Beckett <dave@dajobe.org>

	* utils/oauth-test.c: code style

	* utils/oauth-test.c: casts

	* src/oauth.c: docs

	* src/oauth.c: consts

	* docs/flickcurl-sections.txt: add oauth urls

	* src/flickcurl_internal.h, src/oauth.c: fix const char keys

	* src/oauth.c: docs

	* src/oauth.c:
	(flickcurl_oauth_access_token): Delete request token after success.

	* src/oauth.c:
	(flickcurl_oauth_build_key): Build sign key from request OR access
	token

	* utils/oauth-test.c: docs

	* src/Makefile.am, src/oauth.c, utils/oauth-test.c: Add oauth
	checksum test

	* src/.gitignore: ignore *_test

2011-10-29  Dave Beckett <dave@dajobe.org>

	* utils/oauth-test.c: Report request token

	* src/oauth.c:
	(flickcurl_oauth_prepare_common): docs and send all oauth params
	except callback to requests

	* src/flickcurl_internal.h, src/oauth.c, utils/oauth-test.c:
	(flickcurl_oauth_access_token): Pass in verifier

	* src/flickcurl_internal.h, src/oauth.c: request_token* fields
	renamed from tmp_token*

	* docs/flickcurl-sections.txt, src/auth-api.c, src/flickcurl.h:
	Added flickr.auth.oauth.getAccessToken partial support

	(flickcurl_auth_oauth_getAccessToken): Added for
	flickr.auth.oauth.getAccessToken - right now it exchanges the old
	tokens for OAuth ones and drops them both.

	* src/flickcurl_internal.h, utils/oauth-test.c: oauth field
	client_key_len renamed from client_len

	* utils/oauth-test.c: FLICKCURL_MAX_OAUTH_PARAM_COUNT

	* src/oauth.c: is_oauth_method fix

	* src/flickcurl_internal.h, src/oauth.c:
	FLICKCURL_MAX_OAUTH_PARAM_COUNT

	* src/flickcurl.h, src/flickcurl_internal.h, src/oauth.c,
	utils/oauth-test.c: Compute authorize URI after getting back oauth
	request token (flickcurl_oauth_get_authorize_uri): Added.

	* src/common.c, src/flickcurl_internal.h, src/oauth.c: Add utility
	functions for oauth responses as HTTP forms

	(flickcurl_invoke_get_form_content): Added to get content as k/v
	array of strings.

	(flickcurl_free_form): Added to free the above.

	(flickcurl_oauth_request_token), flickcurl_oauth_access_token):
	Use above.

	* src/common.c, src/flickcurl_internal.h, src/oauth.c,
	utils/Makefile.am, utils/oauth-test.c: Move OAuth test code into
	oauth.c and refactor a little

	* src/oauth.c:
	(flickcurl_oauth_prepare_common): Do not use oath method name in
	params

	* libmtwist: Update to libmtwist head

	* utils/oauth-test.c: Pass in (fake) flickr method for
	flickcurl_oauth_prepare_common()

	* src/oauth.c:
	(flickcurl_oauth_prepare_common): Use http method not flickr method

	* utils/oauth-test.c: remove unused srand()

	* src/common.c, src/flickcurl_internal.h, src/oauth.c,
	utils/oauth-test.c: Use libmtwist for PRNG for nonce

	* libmtwist: Update to libmtwist head

	* docs/flickcurl-sections.txt: Add symbols

	* src/Makefile.am:
	Add mtwist_config.h

	* NEWS.html, docs/flickcurl-sections.txt:
	flickcurl_get_hidden_from_string

	* README.html: libmtwist submodule

2011-10-28  Dave Beckett <dave@dajobe.org>

	* .gitmodules, configure.ac, libmtwist, src/Makefile.am,
	src/mtwist_config.h: Add libmtwist as a git submodule

2011-10-16  Dave Beckett <dave@dajobe.org>

	* src/oauth.c:
	(flickcurl_oauth_compute_signature): Simplify greatly.

	* src/config.c, src/flickcurl.h, utils/flickcurl.c:
	(flickcurl_config_write_ini): Now writes to a filename

	* utils/codegen.c, utils/flickcurl.c, utils/flickrdf.c,
	utils/list-methods.c, utils/oauth-test.c: Update the utilities to
	use flickcurl_config_ functions

	* docs/flickcurl-sections.txt, src/common.c, src/config.c,
	src/flickcurl.h: Update flickcurl config file reading and writing
	support Move ini reading and writing into the library.

	(flickcurl_config_read_ini): Added, deprecating read_ini_config()
	and adding a flickcurl* param.  Reads in library configuration.

	(flickcurl_config_var_handler): Added as standard handler for
	above.

	(flickcurl_config_write_ini): Added to write an ini file for
	library configuration.

	* src/oauth.c:
	(flickcurl_oauth_compute_signature): Docs and error path.

	* configure.ac: Fix libcurl version check to actually check curl
	not libxml twice

	* configure.ac: Remove unused libcurl_min_vernum

	* NEWS.html: Tim Harder is 'radhermit' on GitHub.

2011-10-15  Dave Beckett <dave@dajobe.org>

	* NEWS.html: 1.22

	* utils/flickcurl.c: Tidy help output; describe all upload params
	defaults

	* docs/flickcurl-sections.txt: Add flickcurl_get_hidden_label,
	flickcurl_get_hidden_level_from_string

	* src/common.c, src/flickcurl.h, src/upload-api.c,
	utils/flickcurl.c: Add support for upload field 'hidden'

	flickcurl_upload_params gains int param hidden with values 1 for
	global and 2 for hidden.

	(flickcurl_get_hidden_label, flickcurl_get_hidden_from_string):
	Added utility functions to turn the int to a label and vice versa

	* utils/flickcurl.c: Document upload params safety_level and
	content_type

	* docs/Makefile.am, docs/tmpl/section-favorite.sgml: Update tmpls

	* docs/flickcurl-sections.txt:
	Add flickcurl_favorites_getContext

	* src/favorites-api.c, src/flickcurl.h, utils/flickcurl.c:
	Implement API favorites.getContext

	(flickcurl_favorites_getContext): Added returning an array of two
	photo lists for previous and next photos.  flickcurl utility adds
	new command favorites.getContext to call above.

	* src/flickcurl_internal.h, src/photo.c:
	(flickcurl_new_photos_list): Added to construct a photos list

	* configure.ac, src/common.c, utils/flickrdf.c: Support Raptor V2
	only.  Raptor V1 was last supported in January 2010

	* src/panda-api.c: extras docs

2011-09-02  Dave Beckett <dajobe@digg.com>

	* utils/oauth-test.c: access token testing

	* src/flickcurl_internal.h: Add verifier field

2011-08-15  Dave Beckett <dave@dajobe.org>

	* Merge pull request #13 from kumanna/help-without-auth (below)
	Help without authentication

2011-08-14  Kumar Appaiah <a.kumar@alumni.iitm.ac.in>

	* utils/flickcurl.c: Use stdout for non-error user output

	Since users usually expect any non-error output to come to stdout,
	this commit changes all output except error reports to be directed
	to stdout.

	* utils/flickcurl.c: Fix indentation

	* utils/flickcurl.c: Provision for help message even when not
	authenticated.

	Even when not authenticated, the user might desire to see the list
	of API calls available. This commit facilitates the display of
	that message.

	* utils/flickcurl.c: Move printing help details to a function.

	This commit moves printing the help message to a function, viz.
	print_help_string, so that it can be called from multiple places
	without having to duplicate code. In addition, displays an extra
	newline at the end for neater output.

2011-08-14  Dave Beckett <dave@dajobe.org>

	* Merge pull request #12 from kumanna/kumar (below)
	Fix man page and documentation quirks reported at Debian.

	Debian bug http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=635892

2011-08-14  Kumar Appaiah <a.kumar@alumni.iitm.ac.in>

	* utils/flickcurl.c: Fix grammatical error in description of
	galleries.create

	* docs/flickrdf.1: Fix incorrect spacing in flickrdf man page
	Fixes an incorrect space in the reference to the flickcurl man
	page.

	* docs/flickrdf.1: Remove reference to missing README for flickrdf
	This removes the reference to a missing README file for flickrdf.
	This fixes Debian bug 637196 in flickcurl.

2011-07-28  Dave Beckett <dave@dajobe.org>

	* Merge pull request #10 from radhermit/curl-headers (below)
	Remove old curl header include

2011-06-25  Dave Beckett <dave@dajobe.org>

	* src/flickcurl_internal.h, src/oauth.c, utils/oauth-test.c: Test
	code calls Flickr OAuth endpoint with correctly signed call

2011-06-23  Dave Beckett <dave@dajobe.org>

	* src/flickcurl_internal.h: ws

	* src/flickcurl_internal.h, src/oauth.c, utils/oauth-test.c:
	(flickcurl_oauth_build_key_data): Added internal call with API
	that will change

	* utils/oauth-test.c:
	(oauth_build_key_data): Added

	* utils/oauth-test.c:
	Add a structure oauth_data

	* utils/oauth-test.c:
	Do URI encoding and concatenating

	* src/Makefile.am, src/flickcurl_internal.h, src/oauth.c,
	src/sha1.c, utils/.gitignore, utils/Makefile.am, utils/oauth-test.c:
	OAuth test code

2011-05-08  Dave Beckett <dave@dajobe.org>

	* src/galleries-api.c, src/method.c, src/photosets-api.c,
	src/prefs-api.c, src/test-api.c, src/upload-api.c: code style

	* src/person.c:
	(flickcurl_build_persons): Do not zap any existing data if a field
	is not found.

2011-03-31  Dave Beckett <dave@dajobe.org>

	* NEWS.html: 1.22

2011-03-31  Dave Beckett <dave@dajobe.org>

	* utils/Makefile.am: Add raptor_fake.h to sources and
	distribution.

2011-03-30  Dave Beckett <dave@dajobe.org>

	* NEWS.html, configure.ac:
	Bumped version to 1.22

	* docs/tmpl/section-tag.sgml:
	Added flickcurl_free_tags to doc tmpls

	* docs/flickcurl-sections.txt:
	(flickcurl_free_tags): Added

2011-03-30  Naruto TAKAHASHI <tnaruto@gmail.com>

	* src/flickcurl.h, src/photo.c, src/tags.c: add
	flickcurl_free_tags

	* docs/tmpl/section-photoset.sgml, src/flickcurl.h,
	src/photoset.c: move owner filed to the end of the structure.

2011-03-29  Naruto TAKAHASHI <tnaruto@gmail.com>

	* docs/tmpl/section-photoset.sgml, src/flickcurl.h,
	src/photoset.c: add owner to flickcurl_photoset

4 files changed, 8 insertions, 23 deletions

diff --git a/net/flickcurl/Makefile b/net/flickcurl/Makefile
index 3fb50923264..2be2ffbb22a 100644
--- a/net/flickcurl/Makefile
+++ b/net/flickcurl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2011/08/29 14:45:59 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2012/01/20 12:36:26 wiz Exp $
 #
 
-DISTNAME=	flickcurl-1.21
+DISTNAME=	flickcurl-1.22
 CATEGORIES=	net
 MASTER_SITES=	http://download.dajobe.org/flickcurl/
 
diff --git a/net/flickcurl/PLIST b/net/flickcurl/PLIST
index fb6b2efd5b8..08b9de66494 100644
--- a/net/flickcurl/PLIST
+++ b/net/flickcurl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/08/25 13:30:23 jakllsch Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/01/20 12:36:26 wiz Exp $
 bin/flickcurl
 bin/flickcurl-config
 bin/flickrdf
@@ -35,6 +35,7 @@ share/gtk-doc/html/flickcurl/flickcurl-section-category.html
 share/gtk-doc/html/flickcurl/flickcurl-section-collections.html
 share/gtk-doc/html/flickcurl/flickcurl-section-comment.html
 share/gtk-doc/html/flickcurl/flickcurl-section-commons.html
+share/gtk-doc/html/flickcurl/flickcurl-section-config.html
 share/gtk-doc/html/flickcurl/flickcurl-section-contact.html
 share/gtk-doc/html/flickcurl/flickcurl-section-context.html
 share/gtk-doc/html/flickcurl/flickcurl-section-core.html
@@ -63,7 +64,6 @@ share/gtk-doc/html/flickcurl/flickcurl-section-test.html
 share/gtk-doc/html/flickcurl/flickcurl-section-upload.html
 share/gtk-doc/html/flickcurl/flickcurl-section-urls.html
 share/gtk-doc/html/flickcurl/flickcurl-section-video.html
-share/gtk-doc/html/flickcurl/flickcurl.devhelp
 share/gtk-doc/html/flickcurl/flickcurl.devhelp2
 share/gtk-doc/html/flickcurl/home.png
 share/gtk-doc/html/flickcurl/index.html
diff --git a/net/flickcurl/distinfo b/net/flickcurl/distinfo
index 975a93c6517..6aa7873024f 100644
--- a/net/flickcurl/distinfo
+++ b/net/flickcurl/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2011/08/29 14:45:46 wiz Exp $
+$NetBSD: distinfo,v 1.3 2012/01/20 12:36:26 wiz Exp $
 
-SHA1 (flickcurl-1.21.tar.gz) = 42f73733e750a54758bd07db81fdd12b91c430dd
-RMD160 (flickcurl-1.21.tar.gz) = 5943d029d98d540802a162eab8ca13b9b2e9480a
-Size (flickcurl-1.21.tar.gz) = 1775999 bytes
-SHA1 (patch-src_flickcurl__internal.h) = 6fb6f9f9cd56aacb2fc93ea0a080cbae25ff46a4
+SHA1 (flickcurl-1.22.tar.gz) = 38f427262bc76c23ac4ab31ed4df6c6022c5d3ec
+RMD160 (flickcurl-1.22.tar.gz) = 820e09983327738c6af34e7c5b7913b5d9acab42
+Size (flickcurl-1.22.tar.gz) = 1821304 bytes
diff --git a/net/flickcurl/patches/patch-src_flickcurl__internal.h b/net/flickcurl/patches/patch-src_flickcurl__internal.h
deleted file mode 100644
index 3b638a8c91c..00000000000
--- a/net/flickcurl/patches/patch-src_flickcurl__internal.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_flickcurl__internal.h,v 1.2 2011/08/29 14:45:46 wiz Exp $
-
-Compatibility with latest curl.
-
---- src/flickcurl_internal.h.orig	2010-07-24 19:33:34.000000000 +0000
-+++ src/flickcurl_internal.h
-@@ -24,7 +24,6 @@
- #include <libxml/xpath.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
-