[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU shishi branch, master, updated. shishi-0-0-40-32-gfee5e3c
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU shishi branch, master, updated. shishi-0-0-40-32-gfee5e3c |
|
Date: |
Mon, 18 Jan 2010 22:50:16 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU shishi".
http://git.savannah.gnu.org/cgit/shishi.git/commit/?id=fee5e3cb81b31f217bf5a4625f1b15a5a6b29d3e
The branch, master has been updated
via fee5e3cb81b31f217bf5a4625f1b15a5a6b29d3e (commit)
via e36d37a77d69d7545951d502a061b2135ae0ab7a (commit)
via 561fcc5a4223e1fa5593f740795e0290a065f917 (commit)
via 023902110c9c772163d03b5650d65ea6065672fc (commit)
via c88826e61735be59b701a51f6c060a231c13c36d (commit)
via b04e1771aab49dcc75b3027a2733794c4c56d653 (commit)
from 2066773b613f9c73a58a6ed8afe934c1b2b4c298 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fee5e3cb81b31f217bf5a4625f1b15a5a6b29d3e
Author: Simon Josefsson <address@hidden>
Date: Mon Jan 18 23:48:34 2010 +0100
Fix copyright years.
commit e36d37a77d69d7545951d502a061b2135ae0ab7a
Author: Simon Josefsson <address@hidden>
Date: Mon Jan 18 23:48:31 2010 +0100
Fix license.
commit 561fcc5a4223e1fa5593f740795e0290a065f917
Author: Simon Josefsson <address@hidden>
Date: Mon Jan 18 23:40:35 2010 +0100
Fix syntax-check rule.
commit 023902110c9c772163d03b5650d65ea6065672fc
Author: Simon Josefsson <address@hidden>
Date: Mon Jan 18 23:39:39 2010 +0100
Use libtasn1 2.4.
commit c88826e61735be59b701a51f6c060a231c13c36d
Author: Simon Josefsson <address@hidden>
Date: Mon Jan 18 23:38:25 2010 +0100
Update gnulib files.
commit b04e1771aab49dcc75b3027a2733794c4c56d653
Author: Simon Josefsson <address@hidden>
Date: Tue Jan 12 20:58:10 2010 +0100
Make it build.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 2 ++
README | 2 +-
asn1/Makefile.am | 4 ++--
asn1/coding.c | 4 ++--
asn1/decoding.c | 12 ++++++------
asn1/element.c | 4 ++--
asn1/errors.c | 4 ++--
asn1/gstr.c | 4 ++--
asn1/int.h | 4 ++--
asn1/libtasn1.h | 6 +++---
asn1/parser_aux.c | 4 ++--
asn1/structure.c | 6 +++---
cfg.mk | 2 +-
doc/Makefile.am | 4 ++--
doc/reference/shishi-docs.sgml | 2 +-
gl/Makefile.am | 18 +++++++++---------
gl/getdate.y | 2 ++
lib/Makefile.am | 2 +-
maint.mk | 9 ++++++---
src/Makefile.am | 2 +-
tests/Makefile.am | 2 +-
21 files changed, 53 insertions(+), 46 deletions(-)
diff --git a/NEWS b/NEWS
index ac8a6a1..1f0e9a7 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@ See the end for copying conditions.
** Update many gnulib files.
+** minitasn1: Internal copy upgraded to GNU Libtasn1 v2.4.
+
** API and ABI modifications:
No changes since last version.
diff --git a/README b/README
index d301bc8..d48c768 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
Shishi README -- Important introductory notes.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Simon Josefsson
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Simon
Josefsson
See the end for copying conditions.
This directory holds Shishi, an implementation of the RFC 1510/4120
diff --git a/asn1/Makefile.am b/asn1/Makefile.am
index e7f1838..f976570 100644
--- a/asn1/Makefile.am
+++ b/asn1/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Simon Josefsson.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 Simon Josefsson.
#
# This file is part of Shishi.
#
@@ -18,7 +18,7 @@
# to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
# Floor, Boston, MA 02110-1301, USA.
-AM_CPPFLAGS = -I../gl
+AM_CPPFLAGS = -DASN1_BUILDING -I$(srcdir)/../gl -I$(builddir)/../gl
EXTRA_DIST = README
diff --git a/asn1/coding.c b/asn1/coding.c
index ea0c7d9..11df3fc 100644
--- a/asn1/coding.c
+++ b/asn1/coding.c
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2004, 2006, 2008, 2009 Free Software Foundation
- * Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2004, 2006, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
*
* This file is part of LIBTASN1.
*
diff --git a/asn1/decoding.c b/asn1/decoding.c
index b79002c..da64510 100644
--- a/asn1/decoding.c
+++ b/asn1/decoding.c
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2004, 2006, 2008, 2009 Free Software Foundation
- * Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2004, 2006, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
*
* This file is part of LIBTASN1.
*
@@ -806,8 +806,8 @@ _asn1_get_indefinite_length_string (const unsigned char
*der, int *len)
* error occurred.
*
* Fill the structure *ELEMENT with values of a DER encoding
- * string. The sructure must just be created with function
- * 'create_stucture'. If an error occurs during the decoding
+ * string. The structure must just be created with function
+ * 'asn1_create_element'. If an error occurs during the decoding
* procedure, the *ELEMENT is deleted and set equal to
* %ASN1_TYPE_EMPTY.
*
@@ -1364,8 +1364,8 @@ asn1_der_decoding (ASN1_TYPE * element, const void *ider,
int len,
* error occurred.
*
* Fill the element named ELEMENTNAME with values of a DER encoding
- * string. The sructure must just be created with function
- * 'create_stucture'. The DER vector must contain the encoding
+ * string. The structure must just be created with function
+ * 'asn1_create_element'. The DER vector must contain the encoding
* string of the whole STRUCTURE. If an error occurs during the
* decoding procedure, the *STRUCTURE is deleted and set equal to
* %ASN1_TYPE_EMPTY.
diff --git a/asn1/element.c b/asn1/element.c
index 4b4c838..09a6a9f 100644
--- a/asn1/element.c
+++ b/asn1/element.c
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2004, 2006, 2008, 2009 Free Software Foundation
- * Copyright (C) 2000, 2001, 2002, 2003 Fabio Fiorina
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2008, 2009, 2010
+ * Free Software Foundation, Inc.
*
* This file is part of LIBTASN1.
*
diff --git a/asn1/errors.c b/asn1/errors.c
index 86dec68..56d5f08 100644
--- a/asn1/errors.c
+++ b/asn1/errors.c
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2006, 2008, 2009 Free Software Foundation, Inc.
- * Copyright (C) 2002, 2005 Fabio Fiorina
+ * Copyright (C) 2002, 2005, 2006, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
*
* This file is part of LIBTASN1.
*
diff --git a/asn1/gstr.c b/asn1/gstr.c
index 9c08351..b3f6af2 100644
--- a/asn1/gstr.c
+++ b/asn1/gstr.c
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation
- * Copyright (C) 2002 Nikos Mavroyanopoulos
+ * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
*
* This file is part of LIBTASN1.
*
diff --git a/asn1/int.h b/asn1/int.h
index 5b42af5..def4927 100644
--- a/asn1/int.h
+++ b/asn1/int.h
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
Inc.
- * Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+ * Software Foundation, Inc.
*
* This file is part of LIBTASN1.
*
diff --git a/asn1/libtasn1.h b/asn1/libtasn1.h
index cc330c4..ba80671 100644
--- a/asn1/libtasn1.h
+++ b/asn1/libtasn1.h
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
- * Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+ * Software Foundation, Inc.
*
* This file is part of LIBTASN1.
*
@@ -45,7 +45,7 @@ extern "C"
{
#endif
-#define ASN1_VERSION "2.3"
+#define ASN1_VERSION "2.4"
typedef int asn1_retCode; /* type returned by libtasn1 functions */
diff --git a/asn1/parser_aux.c b/asn1/parser_aux.c
index 98af5d6..5ee2dee 100644
--- a/asn1/parser_aux.c
+++ b/asn1/parser_aux.c
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2004, 2006, 2007, 2008, 2009 Free Software Foundation
- * Copyright (C) 2000,2001 Fabio Fiorina
+ * Copyright (C) 2000, 2001, 2004, 2006, 2007, 2008, 2009, 2010 Free
+ * Software Foundation, Inc.
*
* This file is part of LIBTASN1.
*
diff --git a/asn1/structure.c b/asn1/structure.c
index 3931651..edaafe6 100644
--- a/asn1/structure.c
+++ b/asn1/structure.c
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2004, 2006, 2007, 2008, 2009 Free Software Foundation
- * Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009, 2010 Free
+ * Software Foundation, Inc.
*
* This file is part of LIBTASN1.
*
@@ -670,7 +670,7 @@ _asn1_expand_identifier (ASN1_TYPE * node, ASN1_TYPE root)
* Creates a structure of type @source_name. Example using
* "pkix.asn":
*
- * rc = asn1_create_structure(cert_def, "PKIX1.Certificate",
+ * rc = asn1_create_element(cert_def, "PKIX1.Certificate",
* certptr);
*
* Returns:
diff --git a/cfg.mk b/cfg.mk
index 265fcfc..a354e18 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -29,7 +29,7 @@ local-checks-to-skip = sc_copyright_check
sc_error_message_uppercase \
sc_immutable_NEWS sc_makefile_at_at_check sc_po_check \
sc_prohibit_atoi_atof sc_prohibit_have_config_h \
sc_prohibit_strcmp sc_require_config_h sc_require_config_h_first
-VC_LIST_NEVER = ^((db/|src/)?(gl|build-aux))/.*
+VC_LIST_ALWAYS_EXCLUDE_REGEX = ^((db/|src/)?(gl|build-aux))/.*
autoreconf:
for f in po/*.po.in; do \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1d8d3c4..8abee98 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Simon Josefsson.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 Simon Josefsson
#
# This file is part of Shishi.
#
@@ -832,7 +832,7 @@ doit:
-bugsto $(PACKAGE_BUGREPORT) \
-includefuncprefix \
-seeinfo $(PACKAGE) -verbatimcopying \
- -copyright "2002-2008 Simon Josefsson" \
+ -copyright "2002-2010 Simon Josefsson" \
-function $$i \
$(GDOC_SRC) >> man/$$i.3 && \
echo -n "."; \
diff --git a/doc/reference/shishi-docs.sgml b/doc/reference/shishi-docs.sgml
index dc7f5c3..1b002df 100644
--- a/doc/reference/shishi-docs.sgml
+++ b/doc/reference/shishi-docs.sgml
@@ -52,7 +52,7 @@ kind of devices including iPAQ handhelds and S/390 mainframes.
<para>
Shishi is free software licensed under the GNU General Public License
-version 3.0.
+version 3.0 (or later).
</para>
<figure id="components">
diff --git a/gl/Makefile.am b/gl/Makefile.am
index 33cec8d..1d92311 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -954,7 +954,8 @@ stdio.h: stdio.in.h $(LINK_WARNING_H) $(WARN_ON_USE_H)
$(ARG_NONNULL_H)
-e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \
-e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \
-e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \
- -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
+ < $(srcdir)/stdio.in.h | \
+ sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
-e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
-e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
-e
's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
@@ -994,8 +995,7 @@ stdio.h: stdio.in.h $(LINK_WARNING_H) $(WARN_ON_USE_H)
$(ARG_NONNULL_H)
-e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
- < $(srcdir)/stdio.in.h; \
+ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
} > address@hidden && \
mv address@hidden $@
MOSTLYCLEANFILES += stdio.h stdio.h-t
@@ -1160,7 +1160,8 @@ string.h: string.in.h $(LINK_WARNING_H) $(ARG_NONNULL_H)
-e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
-e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \
-e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \
- -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
+ < $(srcdir)/string.in.h | \
+ sed -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
-e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
-e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
-e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \
@@ -1189,8 +1190,7 @@ string.h: string.in.h $(LINK_WARNING_H) $(ARG_NONNULL_H)
-e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \
-e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
- -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
- < $(srcdir)/string.in.h; \
+ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)'; \
} > address@hidden && \
mv address@hidden $@
MOSTLYCLEANFILES += string.h string.h-t
@@ -1523,7 +1523,8 @@ unistd.h: unistd.in.h $(LINK_WARNING_H) $(WARN_ON_USE_H)
$(ARG_NONNULL_H)
-e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \
-e 's|@''GNULIB_USLEEP''@|$(GNULIB_USLEEP)|g' \
-e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \
- -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
+ < $(srcdir)/unistd.in.h | \
+ sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
-e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
-e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \
-e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \
@@ -1580,8 +1581,7 @@ unistd.h: unistd.in.h $(LINK_WARNING_H) $(WARN_ON_USE_H)
$(ARG_NONNULL_H)
-e
's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g'
\
-e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
- < $(srcdir)/unistd.in.h; \
+ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
} > address@hidden && \
mv address@hidden $@
MOSTLYCLEANFILES += unistd.h unistd.h-t
diff --git a/gl/getdate.y b/gl/getdate.y
index e8c5233..445865b 100644
--- a/gl/getdate.y
+++ b/gl/getdate.y
@@ -1252,6 +1252,8 @@ get_date (struct timespec *result, char const *p, struct
timespec const *now)
char tz1buf[TZBUFSIZE];
bool large_tz = TZBUFSIZE < tzsize;
bool setenv_ok;
+ /* Free tz0, in case this is the 2nd or subsequent time through. */
+ free (tz0);
tz0 = get_tz (tz0buf);
z = tz1 = large_tz ? xmalloc (tzsize) : tz1buf;
for (s = tzbase; *s != '"'; s++)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9e80151..cf537e5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Simon
Josefsson
#
# This file is part of Shishi.
#
diff --git a/maint.mk b/maint.mk
index c91b730..366d12a 100644
--- a/maint.mk
+++ b/maint.mk
@@ -36,11 +36,14 @@ VC-tag = git tag -s -m '$(VERSION)' -u '$(gpg_key_ID)'
VC_LIST = $(build_aux)/vc-list-files -C $(srcdir)
+# You can override this variable in cfg.mk to set your own regexp
+# matching files to ignore.
+VC_LIST_ALWAYS_EXCLUDE_REGEX ?= ^$$
+
VC_LIST_EXCEPT = \
$(VC_LIST) | if test -f $(srcdir)/.x-$@; then grep -vEf $(srcdir)/.x-$@; \
- else grep -Ev "$${VC_LIST_EXCEPT_DEFAULT-ChangeLog}"; fi \
- | if test -n "$(VC_LIST_NEVER)"; then grep -Ev "$(VC_LIST_NEVER)"; \
- else cat; fi
+ else grep -Ev -e "$${VC_LIST_EXCEPT_DEFAULT-ChangeLog}"; fi \
+ | grep -Ev -e '$(VC_LIST_ALWAYS_EXCLUDE_REGEX)'
ifeq ($(origin prev_version_file), undefined)
prev_version_file = $(srcdir)/.prev-version
diff --git a/src/Makefile.am b/src/Makefile.am
index f7c8d5e..b67edb0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Simon
Josefsson
#
# This file is part of Shishi.
#
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8b842de..c9ab2c2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Simon
Josefsson
#
# This file is part of Shishi.
#
hooks/post-receive
--
GNU shishi
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU shishi branch, master, updated. shishi-0-0-40-32-gfee5e3c,
Simon Josefsson <=