diff options
author | Werner Koch <wk@gnupg.org> | 2013-02-25 10:16:11 +0100 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2013-02-25 10:24:33 +0100 |
commit | 3367ff0aa51b6685e37b749b3179643b82d23064 (patch) | |
tree | f81f2cc4d62b707bf1becd9d6af0f5d4b8985179 | |
parent | b0ce47b730452bb28d5f46db3857c9efa5f9f51e (diff) | |
download | libgpg-error-1.11.tar.gz |
Release 1.11.libgpg-error-1.11
* configure.ac: Set LT version to C9/A9/R0.
* Makefile.am (GITLOG_TO_CHANGELOG): New.
(gen-ChangeLog): Use --tear-off.
* build-aux/gitlog-to-changelog: Remove.
-rw-r--r-- | AUTHORS | 50 | ||||
-rw-r--r-- | Makefile.am | 16 | ||||
-rw-r--r-- | NEWS | 6 | ||||
-rw-r--r-- | README | 8 | ||||
-rwxr-xr-x | build-aux/gitlog-to-changelog | 345 | ||||
-rw-r--r-- | configure.ac | 6 |
6 files changed, 60 insertions, 371 deletions
@@ -1,5 +1,5 @@ Package: libgpg-error -Maintainer: Marcus Brinkmann <marcus@g10code.com> +Maintainer: Werner Koch <wk@gnupg.org> Bug reports: bug-gnupg@gnupg.org Mailing list: gnupg-devel@gnupg.org Security related bug reports: security@gnupg.org @@ -7,36 +7,62 @@ License (library): LGPLv2.1+ License (tools): GPLv2+ with exception -Aron Xu <happyaron.xu@gmail.com> +Aron Xu <happyaron.xu at gmail.com> - TRANSLATION [zh_CN] -Clytie Siddall <clytie@riverland.net.au> +Clytie Siddall <clytie at riverland.net.au> - TRANSLATION [vi] -Daniel Nylander <po@danielnylander.se> +Daniel Nylander <po at danielnylander.se> - TRANSLATION [sv] -Francesco Groccia <fgr@anche.no> +David Prévot <david at tilapin.org> + - TRANSLATION [fr] + +Felipe Castro <fefcas at gmail.com> + - TRANSLATION [eo] + +Francesco Groccia <fgr at anche.no> - TRANSLATION [it] -g10 Code GmbH <code@g10code.com> +Freek de Kruijf <f.de.kruijf at gmail.com> + - TRANSLATION [nl] + +g10 Code GmbH <code at g10code.com> - Design and implementation. -Jakub Bogusz <qboosh@pld-linux.org> +Jakub Bogusz <qboosh at pld-linux.org> - TRANSLATION [pl] -Laurentiu Buzdugan <lbuz@rolix.org> +Joe Hansen <joedalton2 at yahoo.dk> + - TRANSLATION [da] + +Laurentiu Buzdugan <lbuz at rolix.org> - TRANSLATION [ro] -Petr Pisar <petr.pisar@atlas.cz> +Petr Pisar <petr.pisar at atlas.cz> - TRANSLATION [cs] +Robert Schiele <rschiele at uni-mannheim.de> + - libgpg-error.spec + +Stephane Roy <sroy at j2n.net> + - TRANSLATION [fr] + +Takeshi Hamasaki <hmatrjp at users.sourceforge.jp> + - TRANSLATION [fp] + +Werner Koch <wk at gnupg.org> + - TRANSLATION [de] + +Yasuaki Taniguchi <yasuakit at gmail.com> + - TRANSLATION [fp] -The RPM specs file libgpg-error.spec has been contributed by -Robert Schiele <rschiele@uni-mannheim.de> +Yuri Chornoivan <yurchor at ukr.net> + - TRANSLATION [uk] - Copyright 2003, 2004, 2005, 2006, 2007 g10 Code GmbH + Copyright 2003, 2004, 2005, 2006, 2007, 2013 g10 Code GmbH This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without diff --git a/Makefile.am b/Makefile.am index 7c92ff6..acb192e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # Makefile.am for libgpg-error. -# Copyright (C) 2003, 2006, 2007 g10 Code GmbH +# Copyright (C) 2003, 2006, 2007, 2013 g10 Code GmbH # # This file is part of libgpg-error. # @@ -14,17 +14,18 @@ # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +# License along with this program; if not, see <http://www.gnu.org/licenses/>. ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = dist-bzip2 +# (A suitable gitlog-to-changelog script can be found in GnuPG master.) +GITLOG_TO_CHANGELOG=gitlog-to-changelog + EXTRA_DIST = autogen.sh config.rpath libgpg-error.spec.in \ COPYING COPYING.LIB potomo doc/HACKING ChangeLog-2011 \ po/ChangeLog-2011 m4/ChangeLog-2011 contrib/ChangeLog-2011 \ - build-aux/gitlog-to-changelog build-aux/git-log-footer \ - build-aux/git-log-fix + build-aux/git-log-footer build-aux/git-log-fix if LANGUAGES_SOME lang_subdirs = lang @@ -44,10 +45,11 @@ dist-hook: gen-ChangeLog gen_start_date = 2011-12-01T00:00:00 .PHONY: gen-ChangeLog gen-ChangeLog: + set -e; \ if test -d $(top_srcdir)/.git; then \ (cd $(top_srcdir) && \ - ./build-aux/gitlog-to-changelog \ - --amend=build-aux/git-log-fix \ + $(GITLOG_TO_CHANGELOG) --append-dot --tear-off \ + --amend=build-aux/git-log-fix --tear-off \ --since=$(gen_start_date) ) > $(distdir)/cl-t; \ cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t;\ rm -f $(distdir)/ChangeLog; \ @@ -1,5 +1,5 @@ -Noteworthy changes in version 1.11 (unreleased) ----------------------------------------------- +Noteworthy changes in version 1.11 (2013-02-25) +----------------------------------------------- * New error source GPG_ERR_SOURCE_ASSUAN for Libassuan related errors. @@ -21,7 +21,7 @@ Noteworthy changes in version 1.11 (unreleased) Noteworthy changes in version 1.10 (2010-10-26) ----------------------------------------------- +----------------------------------------------- * Using a static library on W32 does now work. @@ -9,7 +9,8 @@ libgpg-error is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. See the file -COPYING.LIB for copyright and warranty information. +COPYING.LIB for copyright and warranty information. See the file +AUTHORS for a list of authors and important mail addresses. However, some files (for example src/mkerrnos.awk) used in the build process of the library are covered by a different license. Please see @@ -88,6 +89,11 @@ is: ./autogen.sh --build-w32ce +There is also _experimental_ support for building a 64 bit Windows +version: + + ./autogen.sh --build-w64 + Known Problems -------------- diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog deleted file mode 100755 index 40a8035..0000000 --- a/build-aux/gitlog-to-changelog +++ /dev/null @@ -1,345 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}' - & eval 'exec perl -wS "$0" $argv:q' - if 0; -# Convert git log output to ChangeLog format. - -my $VERSION = '2011-11-02 07:53'; # UTC -# The definition above must lie within the first 8 lines in order -# for the Emacs time-stamp write hook (at end) to update it. -# If you change this file with Emacs, please let the write hook -# do its job. Otherwise, update this string manually. - -# Copyright (C) 2008-2011 Free Software Foundation, Inc. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Written by Jim Meyering - -use strict; -use warnings; -use Getopt::Long; -use POSIX qw(strftime); - -(my $ME = $0) =~ s|.*/||; - -# use File::Coda; # http://meyering.net/code/Coda/ -END { - defined fileno STDOUT or return; - close STDOUT and return; - warn "$ME: failed to close standard output: $!\n"; - $? ||= 1; -} - -sub usage ($) -{ - my ($exit_code) = @_; - my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR); - if ($exit_code != 0) - { - print $STREAM "Try `$ME --help' for more information.\n"; - } - else - { - print $STREAM <<EOF; -Usage: $ME [OPTIONS] [ARGS] - -Convert git log output to ChangeLog format. If present, any ARGS -are passed to "git log". To avoid ARGS being parsed as options to -$ME, they may be preceded by '--'. - -OPTIONS: - - --amend=FILE FILE maps from an SHA1 to perl code (i.e., s/old/new/) that - makes a change to SHA1's commit log text or metadata. - --append-dot append a dot to the first line of each commit message if - there is no other punctuation or blank at the end. - --since=DATE convert only the logs since DATE; - the default is to convert all log entries. - --format=FMT set format string for commit subject and body; - see 'man git-log' for the list of format metacharacters; - the default is '%s%n%b%n' - - --help display this help and exit - --version output version information and exit - -EXAMPLE: - - $ME --since=2008-01-01 > ChangeLog - $ME -- -n 5 foo > last-5-commits-to-branch-foo - -In a FILE specified via --amend, comment lines (starting with "#") are ignored. -FILE must consist of <SHA,CODE+> pairs where SHA is a 40-byte SHA1 (alone on -a line) referring to a commit in the current project, and CODE refers to one -or more consecutive lines of Perl code. Pairs must be separated by one or -more blank line. - -Here is sample input for use with --amend=FILE, from coreutils: - -3a169f4c5d9159283548178668d2fae6fced3030 -# fix typo in title: -s/all tile types/all file types/ - -1379ed974f1fa39b12e2ffab18b3f7a607082202 -# Due to a bug in vc-dwim, I mis-attributed a patch by Paul to myself. -# Change the author to be Paul. Note the escaped "@": -s,Jim .*>,Paul Eggert <eggert\@cs.ucla.edu>, - -EOF - } - exit $exit_code; -} - -# If the string $S is a well-behaved file name, simply return it. -# If it contains white space, quotes, etc., quote it, and return the new string. -sub shell_quote($) -{ - my ($s) = @_; - if ($s =~ m![^\w+/.,-]!) - { - # Convert each single quote to '\'' - $s =~ s/\'/\'\\\'\'/g; - # Then single quote the string. - $s = "'$s'"; - } - return $s; -} - -sub quoted_cmd(@) -{ - return join (' ', map {shell_quote $_} @_); -} - -# Parse file F. -# Comment lines (starting with "#") are ignored. -# F must consist of <SHA,CODE+> pairs where SHA is a 40-byte SHA1 -# (alone on a line) referring to a commit in the current project, and -# CODE refers to one or more consecutive lines of Perl code. -# Pairs must be separated by one or more blank line. -sub parse_amend_file($) -{ - my ($f) = @_; - - open F, '<', $f - or die "$ME: $f: failed to open for reading: $!\n"; - - my $fail; - my $h = {}; - my $in_code = 0; - my $sha; - while (defined (my $line = <F>)) - { - $line =~ /^\#/ - and next; - chomp $line; - $line eq '' - and $in_code = 0, next; - - if (!$in_code) - { - $line =~ /^([0-9a-fA-F]{40})$/ - or (warn "$ME: $f:$.: invalid line; expected an SHA1\n"), - $fail = 1, next; - $sha = lc $1; - $in_code = 1; - exists $h->{$sha} - and (warn "$ME: $f:$.: duplicate SHA1\n"), - $fail = 1, next; - } - else - { - $h->{$sha} ||= ''; - $h->{$sha} .= "$line\n"; - } - } - close F; - - $fail - and exit 1; - - return $h; -} - -{ - my $since_date; - my $format_string = '%s%n%b%n'; - my $amend_file; - my $append_dot = 0; - GetOptions - ( - help => sub { usage 0 }, - version => sub { print "$ME version $VERSION\n"; exit }, - 'since=s' => \$since_date, - 'format=s' => \$format_string, - 'amend=s' => \$amend_file, - 'append-dot' => \$append_dot, - ) or usage 1; - - - defined $since_date - and unshift @ARGV, "--since=$since_date"; - - # This is a hash that maps an SHA1 to perl code (i.e., s/old/new/) - # that makes a correction in the log or attribution of that commit. - my $amend_code = defined $amend_file ? parse_amend_file $amend_file : {}; - - my @cmd = (qw (git log --log-size), - '--pretty=format:%H:%ct %an <%ae>%n%n'.$format_string, @ARGV); - open PIPE, '-|', @cmd - or die ("$ME: failed to run `". quoted_cmd (@cmd) ."': $!\n" - . "(Is your Git too old? Version 1.5.1 or later is required.)\n"); - - my $prev_date_line = ''; - my @prev_coauthors = (); - while (1) - { - defined (my $in = <PIPE>) - or last; - $in =~ /^log size (\d+)$/ - or die "$ME:$.: Invalid line (expected log size):\n$in"; - my $log_nbytes = $1; - - my $log; - my $n_read = read PIPE, $log, $log_nbytes; - $n_read == $log_nbytes - or die "$ME:$.: unexpected EOF\n"; - - # Extract leading hash. - my ($sha, $rest) = split ':', $log, 2; - defined $sha - or die "$ME:$.: malformed log entry\n"; - $sha =~ /^[0-9a-fA-F]{40}$/ - or die "$ME:$.: invalid SHA1: $sha\n"; - - # If this commit's log requires any transformation, do it now. - my $code = $amend_code->{$sha}; - if (defined $code) - { - eval 'use Safe'; - my $s = new Safe; - # Put the unpreprocessed entry into "$_". - $_ = $rest; - - # Let $code operate on it, safely. - my $r = $s->reval("$code") - or die "$ME:$.:$sha: failed to eval \"$code\":\n$@\n"; - - # Note that we've used this entry. - delete $amend_code->{$sha}; - - # Update $rest upon success. - $rest = $_; - } - - my @line = split "\n", $rest; - my $author_line = shift @line; - defined $author_line - or die "$ME:$.: unexpected EOF\n"; - $author_line =~ /^(\d+) (.*>)$/ - or die "$ME:$.: Invalid line " - . "(expected date/author/email):\n$author_line\n"; - - my $date_line = sprintf "%s $2\n", strftime ("%F", localtime ($1)); - - # Format 'Co-authored-by: A U Thor <email@example.com>' lines in - # standard multi-author ChangeLog format. - my @coauthors = grep /^Co-authored-by:.*$/, @line; - for (@coauthors) - { - s/^Co-authored-by:\s*/\t /; - s/\s*</ </; - - /<.*?@.*\..*>/ - or warn "$ME: warning: missing email address for " - . substr ($_, 5) . "\n"; - } - - # If this header would be the same as the previous date/name/email/ - # coauthors header, then arrange not to print it. - if ($date_line ne $prev_date_line or "@coauthors" ne "@prev_coauthors") - { - $prev_date_line eq '' - or print "\n"; - print $date_line; - @coauthors - and print join ("\n", @coauthors), "\n"; - } - $prev_date_line = $date_line; - @prev_coauthors = @coauthors; - - # Omit "Co-authored-by..." and "Signed-off-by..." lines. - @line = grep !/^Signed-off-by: .*>$/, @line; - @line = grep !/^Co-authored-by: /, @line; - - # Remove leading and trailing blank lines. - if (@line) - { - while ($line[0] =~ /^\s*$/) { shift @line; } - while ($line[$#line] =~ /^\s*$/) { pop @line; } - } - - # If there were any lines - if (@line == 0) - { - warn "$ME: warning: empty commit message:\n $date_line\n"; - } - else - { - if ($append_dot) - { - # If the first line of the message has enough room, then - if (length $line[0] < 72) - { - # append a dot if there is no other punctuation or blank - # at the end. - $line[0] =~ /[[:punct:]\s]$/ - or $line[0] .= '.'; - } - } - - # Prefix each non-empty line with a TAB. - @line = map { length $_ ? "\t$_" : '' } @line; - - print "\n", join ("\n", @line), "\n"; - } - - defined ($in = <PIPE>) - or last; - $in ne "\n" - and die "$ME:$.: unexpected line:\n$in"; - } - - close PIPE - or die "$ME: error closing pipe from " . quoted_cmd (@cmd) . "\n"; - # FIXME-someday: include $PROCESS_STATUS in the diagnostic - - # Complain about any unused entry in the --amend=F specified file. - my $fail = 0; - foreach my $sha (keys %$amend_code) - { - warn "$ME:$amend_file: unused entry: $sha\n"; - $fail = 1; - } - - exit $fail; -} - -# Local Variables: -# mode: perl -# indent-tabs-mode: nil -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "my $VERSION = '" -# time-stamp-format: "%:y-%02m-%02d %02H:%02M" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "'; # UTC" -# End: diff --git a/configure.ac b/configure.ac index dc897a2..5a453bf 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # configure.ac for libgpg-error -# Copyright (C) 2003, 2004, 2006, 2010 g10 Code GmbH +# Copyright (C) 2003, 2004, 2006, 2010, 2013 g10 Code GmbH # # This file is part of libgpg-error. # @@ -51,8 +51,8 @@ AC_INIT([libgpg-error],[mym4_full_version],[http://bugs.gnupg.org]) # (Interfaces added: AGE++) # (Interfaces removed: AGE=0) # Note that added error codes don't constitute an interface change. -LIBGPG_ERROR_LT_CURRENT=8 -LIBGPG_ERROR_LT_AGE=8 +LIBGPG_ERROR_LT_CURRENT=9 +LIBGPG_ERROR_LT_AGE=9 LIBGPG_ERROR_LT_REVISION=0 ################################################ |