[git] Scute - branch, master, updated. scute-1.3.0-28-ged1ef5c
by Justus Winter
cvs at cvs.gnupg.org
Tue Dec 15 18:36:03 CET 2015
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 "PKCS#11 token on top of gpg-agent".
The branch, master has been updated
via ed1ef5c21b4cd74c53c040be4281d8d0c3a1eb3a (commit)
via e08ba44b9eeea2f9ab1d71cd385ec8ed72b36b4a (commit)
via fdc7f1ff043b1303ad961943742a2a4ad0fa8529 (commit)
via b196766e47653473b7d1ffc429e4f3366de3e7a4 (commit)
via 3ad9605ce3dcc6142c076dd3249a294d75b3d4bc (commit)
from da2c278b3287b309f9f307eeecded932a32b99ce (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 ed1ef5c21b4cd74c53c040be4281d8d0c3a1eb3a
Author: Justus Winter <justus at g10code.com>
Date: Tue Dec 15 18:32:49 2015 +0100
doc/website: Fix broken links.
--
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/website/contact.xhtml b/doc/website/contact.xhtml
index 7cd8313..2e070d7 100644
--- a/doc/website/contact.xhtml
+++ b/doc/website/contact.xhtml
@@ -51,16 +51,12 @@
<div id="main">
<h1>Contact</h1>
<p>
- Scute is developed and maintained by <a
- href="http://www.g10code.com/">g10 Code GmbH</a>. You can
- support its development by <a
- href="http://www.g10code.com/products.html">buying
- maintenance points</a>, <a
- href="http://www.g10code.com/support.html">getting support
- contracts</a> or <a
- href="http://www.g10code.com/consult.html">contracting
- us</a> for custom development, security consulting and
- training.
+ Scute is developed and maintained
+ by <a href="http://www.g10code.com/">g10 Code GmbH</a>. You
+ can support its development
+ by <a href="http://www.g10code.com/support.html">getting
+ support contracts</a> for custom development, security
+ consulting and training.
</p>
<h2>Bug Reports</h2>
<p>
diff --git a/doc/website/index.xhtml b/doc/website/index.xhtml
index 9e96e7d..78f8d82 100644
--- a/doc/website/index.xhtml
+++ b/doc/website/index.xhtml
@@ -52,7 +52,7 @@
<h1>Introduction</h1>
<p>
Scute is a <a
- href="http://www.rsasecurity.com/rsalabs/node.asp?id=2133">PKCS
+ href="https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=pkcs11">PKCS
#11</a> module that adds support for the <a
href="http://www.g10code.com/p-card.html">OpenPGP smartcard</a>
card to the <a
commit e08ba44b9eeea2f9ab1d71cd385ec8ed72b36b4a
Author: Justus Winter <justus at g10code.com>
Date: Tue Dec 15 18:15:41 2015 +0100
doc/website: Update VCS instructions.
--
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/website/download.xhtml b/doc/website/download.xhtml
index a6285ed..311d41c 100644
--- a/doc/website/download.xhtml
+++ b/doc/website/download.xhtml
@@ -172,12 +172,11 @@
</p>
<h2>Development</h2>
<p>
- The source of Scute is managed with the version control
- system <a
- href="http://subversion.tigris.org/">Subversion</a>. The
- repository can be retrieved with the following command:
+ The source of Scute is managed using the GIT distributed
+ revision control system. The repository can be retrieved
+ with the following command:
<pre>
- $ svn co svn://cvs.gnupg.org/scute/trunk scute
+ $ git clone git://git.gnupg.org/scute.git
</pre>
Please send an e-mail to the <a
href="http://lists.gnupg.org/mailman/listinfo/gnupg-devel">GnuPG
@@ -186,7 +185,7 @@
</p>
<p>
A web interface to the <a
- href="http://cvs.gnupg.org/cgi-bin/viewcvs.cgi/?root=Scute">Scute
+ href="http://git.gnupg.org/cgi-bin/gitweb.cgi?p=scute.git">Scute
source repository</a> is available on-line, and contains
up-to-date as well as archived versions of all files
included in the Scute source package, including the most
commit fdc7f1ff043b1303ad961943742a2a4ad0fa8529
Author: Justus Winter <justus at g10code.com>
Date: Tue Dec 15 17:56:04 2015 +0100
doc/website: Update list of releases.
--
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/website/download.xhtml b/doc/website/download.xhtml
index 2e395ff..a6285ed 100644
--- a/doc/website/download.xhtml
+++ b/doc/website/download.xhtml
@@ -55,39 +55,90 @@
should compile on any recent GNU/Linux system. It can also
be cross-built for Windows 32-bit using MingW32.
</p>
- <p>
- The most recent release of Scute is version 1.2.0. The
- following files belong to this release.
- <table>
- <caption>The files released with Scute 1.2.0.</caption>
- <tr><th>File</th><th>Description</th><th>Signature</th></tr>
- <tr><td><a href="ftp://ftp.gnupg.org/gcrypt/scute/scute-1.2.0.tar.bz2">Scute 1.2.0 source package</a>
- </td><td>The source code of Scute 1.2.0</td>
- <td><a href="ftp://ftp.gnupg.org/gcrypt/scute/scute-1.2.0.tar.bz2.sig">Digital Signature</a></td></tr>
- </table>
- </p>
- <p>
- The previous release of Scute was version 1.1.0. The
- following files belong to this release.
- <table>
- <caption>The files released with Scute 1.1.0.</caption>
- <tr><th>File</th><th>Description</th><th>Signature</th></tr>
- <tr><td><a href="ftp://ftp.gnupg.org/gcrypt/scute/scute-1.1.0.tar.bz2">Scute 1.1.0 source package</a>
- </td><td>The source code of Scute 1.1.0</td>
- <td><a href="ftp://ftp.gnupg.org/gcrypt/scute/scute-1.1.0.tar.bz2.sig">Digital Signature</a></td></tr>
- </table>
- </p>
<p>
- The first release of Scute was version 1.0.0. The
- following files belong to this release.
- <table>
- <caption>The files released with Scute 1.0.0.</caption>
- <tr><th>File</th><th>Description</th><th>Signature</th></tr>
- <tr><td><a href="ftp://ftp.gnupg.org/gcrypt/scute/scute-1.0.0.tar.bz2">Scute 1.0.0 source package</a>
- </td><td>The source code of Scute 1.0.0</td>
- <td><a href="ftp://ftp.gnupg.org/gcrypt/scute/scute-1.0.0.tar.bz2.sig">Digital Signature</a></td></tr>
- </table>
+ The most recent release of Scute is version 1.4.0.
</p>
+ <table>
+ <caption>Scute source distributions.</caption>
+ <tr>
+ <th>Description</th>
+ <th>Version</th>
+ <th>Date</th>
+ <th>Size</th>
+ <th>Tarball</th>
+ <th>Signature</th>
+ </tr>
+ <tr>
+ <td>Scute source distribution</td>
+ <td>1.4.0</td>
+ <td>2010-04-21</td>
+ <td>755 kB</td>
+ <td>
+ <a href="ftp://ftp.gnupg.org/gcrypt/scute/scute-1.4.0.tar.bz2">
+ download</a>
+ </td>
+ <td>
+ <a href="ftp://ftp.gnupg.org/gcrypt/scute/scute-1.4.0.tar.bz2.sig">
+ download</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Scute source distribution</td>
+ <td>1.3.0</td>
+ <td>2009-06-20</td>
+ <td>754 kB</td>
+ <td>
+ <a href="ftp://ftp.gnupg.org/gcrypt/scute/scute-1.3.0.tar.bz2">
+ download</a>
+ </td>
+ <td>
+ <a href="ftp://ftp.gnupg.org/gcrypt/scute/scute-1.3.0.tar.bz2.sig">
+ download</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Scute source distribution</td>
+ <td>1.2.0</td>
+ <td>2008-09-02</td>
+ <td>731 kB</td>
+ <td>
+ <a href="ftp://ftp.gnupg.org/gcrypt/scute/scute-1.2.0.tar.bz2">
+ download</a>
+ </td>
+ <td>
+ <a href="ftp://ftp.gnupg.org/gcrypt/scute/scute-1.2.0.tar.bz2.sig">
+ download</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Scute source distribution</td>
+ <td>1.1.0</td>
+ <td>2007-05-02</td>
+ <td>675 kB</td>
+ <td>
+ <a href="ftp://ftp.gnupg.org/gcrypt/scute/scute-1.1.0.tar.bz2">
+ download</a>
+ </td>
+ <td>
+ <a href="ftp://ftp.gnupg.org/gcrypt/scute/scute-1.1.0.tar.bz2.sig">
+ download</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Scute source distribution</td>
+ <td>1.0.0</td>
+ <td>2006-11-11</td>
+ <td>325 kB</td>
+ <td>
+ <a href="ftp://ftp.gnupg.org/gcrypt/scute/scute-1.0.0.tar.bz2">
+ download</a>
+ </td>
+ <td>
+ <a href="ftp://ftp.gnupg.org/gcrypt/scute/scute-1.0.0.tar.bz2.sig">
+ download</a>
+ </td>
+ </tr>
+ </table>
<h2>Prerequisites</h2>
<p>Scute requires the following packages to compile:
<table>
commit b196766e47653473b7d1ffc429e4f3366de3e7a4
Author: Justus Winter <justus at g10code.com>
Date: Tue Dec 15 17:26:11 2015 +0100
Update the version magic to work with git.
--
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/configure.ac b/configure.ac
index 3e3c261..86babcc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
# configure.ac: Configure script for Scute.
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 g10 Code GmbH
-#
+# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2015 g10 Code GmbH
+#
# This file is part of Scute.
#
# Scute is free software; you can redistribute it and/or modify it
@@ -31,29 +31,33 @@
AC_PREREQ(2.59)
min_automake_version="1.9.3"
-# Version number: Remember to change it immediately *after* a release.
-# Make sure to run "svn up" before a "make dist".
-# See below for the LT versions.
-#
-# The SVN version is usually the next intended release version with
-# the string "-svnNNNN" appended. The reason for this is that tests
-# for a specific feature can already be done under the assumption that
-# the SVN version is the most recent one in a branch.
-#
-# To disable the SVN version for the real release, set the my_issvn
-# macro to "no". To make this most useful for snapshot releases
-# please do an "svn up" right before recreating the configure script,
-# so that a proper revision number for all files is available when
-# running a "make distcheck".
-
-m4_define([my_version], [1.5.0])
-m4_define([my_issvn], [yes])
-
-m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
- || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
-AC_INIT([scute],
- [my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision])],
- [bug-scute at gnupg.org])
+# To build a release you need to create a tag with the version number
+# (git tag -s scute-1.n.m) and run "./autogen.sh --force". Please
+# bump the version number immediately *after* the release and do
+# another commit and push so that the git magic is able to work.
+m4_define([mym4_package],[scute])
+m4_define([mym4_major], [1])
+m4_define([mym4_minor], [5])
+m4_define([mym4_micro], [0])
+
+# To start a new development series, i.e a new major or minor number
+# you need to mark an arbitrary commit before the first beta release
+# with an annotated tag. For example the 1.5 branch starts off with
+# the tag "scute-1.5-base". This is used as the base for counting
+# beta numbers before the first release of a series.
+
+# Below is m4 magic to extract and compute the git revision number,
+# the decimalized short revision number, a beta version string and a
+# flag indicating a development version (mym4_isbeta). Note that the
+# m4 processing is done by autoconf and not during the configure run.
+m4_define([mym4_verslist], m4_split(m4_esyscmd([./autogen.sh --find-version] \
+ mym4_package mym4_major mym4_minor mym4_micro),[:]))
+m4_define([mym4_isbeta], m4_argn(2, mym4_verslist))
+m4_define([mym4_version], m4_argn(4, mym4_verslist))
+m4_define([mym4_revision], m4_argn(7, mym4_verslist))
+m4_define([mym4_revision_dec], m4_argn(8, mym4_verslist))
+m4_esyscmd([echo ]mym4_version[>VERSION])
+AC_INIT([mym4_package],[mym4_version], [http://bugs.gnupg.org])
# LT Version numbers, remember to change them just *before* a release.
# (Code changed: REVISION++)
commit 3ad9605ce3dcc6142c076dd3249a294d75b3d4bc
Author: Justus Winter <justus at g10code.com>
Date: Tue Dec 15 16:54:44 2015 +0100
Rename 'README.SVN' to 'README.GIT', and update it.
--
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/Makefile.am b/Makefile.am
index ee24d06..68db8e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
-EXTRA_DIST = autogen.sh README.SVN
+EXTRA_DIST = autogen.sh README.GIT
if RUN_TESTS
tests = tests
diff --git a/README.SVN b/README.GIT
similarity index 79%
rename from README.SVN
rename to README.GIT
index c642282..57dab7a 100644
--- a/README.SVN
+++ b/README.GIT
@@ -1,11 +1,11 @@
-If you are building from Subversion, run the script
+If you are building from GIT, run the script
./autogen.sh
first, to make sure that you have all the necessary maintainer tools
are installed and to build the actual configuration files. If you
-have just updated from SVN, you should add the option "--force" to
-autogen.sh so that meta data from SVN is noticed. Then run
+have just checked out from GIT, you should add the option "--force" to
+autogen.sh so that meta data is noticed by autom4te.cache. Then run
./configure --enable-maintainer-mode
@@ -16,9 +16,9 @@ tools, or the tools are not installed, you may use environment
variables to override the default tool names:
AUTOMAKE_SUFFIX is used as a suffix for all tools from the automake
- package. For example
- AUTOMAKE_SUFFIX="-1.7" ./autogen.sh
- uses "automake-1.7" and "aclocal-1.7.
+ package. For example
+ AUTOMAKE_SUFFIX="-1.14" ./autogen.sh
+ uses "automake-1.14" and "aclocal-1.14.
AUTOMAKE_PREFIX is used as a prefix for all tools from the automake
page and may be combined with AUTOMAKE_SUFFIX. e.g.:
AUTOMAKE_PREFIX=/usr/foo/bin ./autogen.sh
@@ -37,15 +37,13 @@ It is also possible to use the variable name AUTOMAKE, AUTOCONF,
ACLOCAL, AUTOHEADER, GETTEXT and MSGMERGE to directly specify the name
of the programs to run. It is however better to use the suffix and
prefix forms as described above because that does not require
-knowledge about the actual tools used by autgen.sh.
+knowledge about the actual tools used by autogen.sh.
Please don't use autopoint, libtoolize or autoreconf unless you are
the current maintainer and want to update the standard configuration
-files. All those files should be in the SVN and only updated manually
+files. All those files should be in GIT and only updated manually
if the maintainer decides that newer versions are required. The
maintainer should also make sure that the required version of automake
et al. are properly indicated at the top of configure.ac and take care
to copy the files and not merely use symlinks.
-
-
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 +-
README.SVN => README.GIT | 18 +++----
configure.ac | 54 +++++++++++---------
doc/website/contact.xhtml | 16 +++---
doc/website/download.xhtml | 124 +++++++++++++++++++++++++++++++--------------
doc/website/index.xhtml | 2 +-
6 files changed, 132 insertions(+), 84 deletions(-)
rename README.SVN => README.GIT (79%)
hooks/post-receive
--
PKCS#11 token on top of gpg-agent
http://git.gnupg.org
More information about the Gnupg-commits
mailing list