[Buildroot] [PATCH v3 0/3] Use a date for cvs and bump expect

[Buildroot] [PATCH v3 0/3] Use a date for cvs and bump expect

[Fabio Porcedda]

This patch set bump expect and in order to do that add to the cvs
script support for using a date instead of a tag.

v3:
 - remove already merged patch
 - use UTC instead of UCT (Arnout)
 - add documentation about using a branch
 - in the example remove the minutes from the timezone because it does not work
 - fix supporto for Fedora "-r :<tag>" -> "-r <tag>"
 - add ack-by and tested-by on the latest patch (Arnout)
v2:
 - add acked-by to the first patch
 - improve documentation about the date
 - use TZ=UCT to set a default time zone
 - add a patch to remove the comment at the end of the version string

Fabio Porcedda (3):
  support/download/cvs: add support to use a date instead of a tag
  manual: cvs: document that a branch or a date can be used
  expect: bump to version 5.45.3

 docs/manual/adding-packages-generic.txt |  4 +++-
 package/expect/expect.hash              |  2 --
 package/expect/expect.mk                |  6 +++---
 support/download/cvs                    | 11 ++++++++++-
 4 files changed, 16 insertions(+), 7 deletions(-)
 delete mode 100644 package/expect/expect.hash

-- 
2.3.5

[Buildroot] [PATCH v3 1/3] support/download/cvs: add support to use a date instead of a tag

[Fabio Porcedda]

This is useful when a tag is not avaiable.

Also fix support for Fedora where the command "cvs -r :<version>" doesn't work.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 support/download/cvs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/support/download/cvs b/support/download/cvs
index 2c3a666..bfac73b 100755
--- a/support/download/cvs
+++ b/support/download/cvs
@@ -26,7 +26,16 @@ rev="${3}"
 rawname="${4}"
 basename="${5}"
 
+if [[ ${rev} =~ ^[0-9] ]]; then
+    # Date, because a tag or a branch cannot begin with a number
+    select="-D"
+else
+    # Tag or branch
+    select="-r"
+fi
+
+export TZ=UTC
 ${CVS} ${verbose} -z3 -d":pserver:anonymous@${repo}" \
-       co -d "${basename}" -r ":${rev}" -P "${rawname}"
+       co -d "${basename}" ${select} "${rev}" -P "${rawname}"
 
 tar czf "${output}" "${basename}"
-- 
2.3.5

[Buildroot] [PATCH v3 2/3] manual: cvs: document that a branch or a date can be used

[Fabio Porcedda]

Also instead of using the generic word "timestamp" use the word "tag".

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
---
 docs/manual/adding-packages-generic.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 8cf6bb6..bc07667 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -280,7 +280,9 @@ information is (assuming the package name is +libfoo+) :
      Only anonymous pserver mode is supported.
      +LIBFOO_SITE+ 'must' contain the source URL as well as the remote
      repository directory. The module is the package name.
-     +LIBFOO_VERSION+ is 'mandatory' and 'must' be a timestamp.
+     +LIBFOO_VERSION+ is 'mandatory' and 'must' be a tag, a branch, or
+     a date (e.g. "2014-10-20", "2014-10-20 13:45", "2014-10-20
+     13:45+01" see "man cvs" for further details).
   ** +git+ for retrieving source code from a Git repository. Used by
      default when +LIBFOO_SITE+ begins with +git://+. The downloaded
      source code is cached as with the +svn+
-- 
2.3.5

[Buildroot] [PATCH v3 3/3] expect: bump to version 5.45.3

[Fabio Porcedda]

Download it from the cvs repository because it is not avaialbe as a
downloadable file.
Also because a tag isn't avaiable use the date.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/expect/expect.hash | 2 --
 package/expect/expect.mk   | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 package/expect/expect.hash

diff --git a/package/expect/expect.hash b/package/expect/expect.hash
deleted file mode 100644
index 09e68e7..0000000
--- a/package/expect/expect.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally computed:
-sha256  b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040  expect5.45.tar.gz
diff --git a/package/expect/expect.mk b/package/expect/expect.mk
index 8ef7e90..d78ff6c 100644
--- a/package/expect/expect.mk
+++ b/package/expect/expect.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-EXPECT_VERSION = 5.45
-EXPECT_SOURCE = expect$(EXPECT_VERSION).tar.gz
-EXPECT_SITE = http://downloads.sourceforge.net/project/expect/Expect/$(EXPECT_VERSION)
+# Version 5.45.3
+EXPECT_VERSION = 2014-05-02
+EXPECT_SITE = cvs://expect.cvs.sourceforge.net:/cvsroot/expect
 EXPECT_LICENSE = Public domain
 EXPECT_LICENSE_FILES = README
 
-- 
2.3.5

[Buildroot] [PATCH v3 0/3] Use a date for cvs and bump expect

[Thomas Petazzoni]

Dear Fabio Porcedda,

On Wed,  6 May 2015 14:17:47 +0200, Fabio Porcedda wrote:

> Fabio Porcedda (3):
>   support/download/cvs: add support to use a date instead of a tag
>   manual: cvs: document that a branch or a date can be used
>   expect: bump to version 5.45.3

Patches applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com