01/01: gnu: r-nloptr: Update package hash.
efraim pushed a commit to branch master
in repository guix.
commit 8ba3f751b685663f5b164a3468f9fb74d4dac984
Author: Efraim Flashner
Date: Thu Oct 26 10:45:49 2017 +0300
gnu: r-nloptr: Update package hash.
The source was repacked and reuploaded without incrementing the version
number. The difference was windows line endings on the windows files.
* gnu/packages/statistics.scm (r-nloptr)[source]: Update package hash.
---
gnu/packages/statistics.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 96b3901..1a5056b 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5071,7 +5071,7 @@ expected shortfall risk are also included.")
(uri (cran-uri "nloptr" version))
(sha256
(base32
- "1cypz91z28vhvwq2rzqjrbdc6a2lvfr2g16vid2sax618q6ai089"
+ "1sz1xj3785x4vsm4nd6in298bk32hs2jk5nsxma7ivxi7jcmn8l4"
(build-system r-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
branch master updated (e5af1f4 -> 8ba3f75)
efraim pushed a change to branch master in repository guix. from e5af1f4 gnu: sorcer: Fix building on non-Intel hardware. new 8ba3f75 gnu: r-nloptr: Update package hash. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/statistics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
01/01: Merge remote-tracking branch 'origin/python-updates' into core-updates
efraim pushed a commit to branch core-updates in repository guix. commit eda8a841ac7457ffe05c4a4248d6dff074b72326 Merge: b7883b1 49c620e Author: Efraim Flashner Date: Thu Oct 26 12:45:11 2017 +0300 Merge remote-tracking branch 'origin/python-updates' into core-updates gnu/local.mk | 8 +- gnu/packages/backup.scm| 4 +- gnu/packages/calendar.scm | 3 +- gnu/packages/databases.scm | 2 +- gnu/packages/patches/python-2.7-adjust-tests.patch | 22 + .../python-2.7-getentropy-on-old-kernels.patch | 54 -- gnu/packages/patches/python-3-fix-tests.patch | 149 + gnu/packages/patches/python-3.5-fix-tests.patch| 69 -- .../python-3.5-getentropy-on-old-kernels.patch | 720 - .../patches/python-unittest2-python3-compat.patch | 34 + ...atch => python-unittest2-remove-argparse.patch} | 0 gnu/packages/python.scm| 339 +- gnu/packages/tls.scm | 4 +- gnu/packages/web.scm | 2 +- 14 files changed, 394 insertions(+), 1016 deletions(-)
branch core-updates updated (b7883b1 -> eda8a84)
efraim pushed a change to branch core-updates
in repository guix.
from b7883b1 Merge branch 'master' into core-updates
adds 603a649 gnu: python@2: Update to 2.7.14.
adds b18226c gnu: python@3: Update to 3.6.3.
adds 220b0ac gnu: python-py: Update to 1.4.34.
adds 8dd339e gnu: python-six: Really enable tests.
adds 8ed675a gnu: python-six: Update to 1.11.0.
adds 928da60 gnu: Remove python-pytest@2.
adds 92b2101 gnu: python-pytest: Add a minimal variant for
bootstrapping.
adds cf65951 gnu: python-setuptools-scm: Update to 1.15.6.
adds f2ef961 gnu: python-pytest: Update to 3.2.3.
adds 0098b95 gnu: python-pyflakes: Update to 1.5.0.
adds 31612e1 gnu: python-mccabe: Update to 0.6.1.
adds 8f65361 gnu: python-mock@2: Add dependency on python-six.
adds 3e6218b gnu: Fix pytest dependency cycle.
adds a6c6a59 gnu: Add python2-enum.
adds a0fd9a3 gnu: python-flake8: Update to 3.4.1.
adds 6bb9645 gnu: Add python2-funcsigs.
adds 4ae6555 gnu: Remove python-mock@1.
adds 5db49f7 gnu: python-jinja2: Remove workaround for < Python 3.6.
adds 7439173 gnu: python-unittest2: Update to 1.1.0.
adds 71d9f56 gnu: python-coverage: Update to 4.4.1.
adds 49c620e gnu: python@3.6: Fix building on aarch64.
new eda8a84 Merge remote-tracking branch 'origin/python-updates' into
core-updates
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
gnu/local.mk | 8 +-
gnu/packages/backup.scm| 4 +-
gnu/packages/calendar.scm | 3 +-
gnu/packages/databases.scm | 2 +-
gnu/packages/patches/python-2.7-adjust-tests.patch | 22 +
.../python-2.7-getentropy-on-old-kernels.patch | 54 --
gnu/packages/patches/python-3-fix-tests.patch | 149 +
gnu/packages/patches/python-3.5-fix-tests.patch| 69 --
.../python-3.5-getentropy-on-old-kernels.patch | 720 -
.../patches/python-unittest2-python3-compat.patch | 34 +
...atch => python-unittest2-remove-argparse.patch} | 0
gnu/packages/python.scm| 339 +-
gnu/packages/tls.scm | 4 +-
gnu/packages/web.scm | 2 +-
14 files changed, 394 insertions(+), 1016 deletions(-)
create mode 100644 gnu/packages/patches/python-2.7-adjust-tests.patch
delete mode 100644
gnu/packages/patches/python-2.7-getentropy-on-old-kernels.patch
create mode 100644 gnu/packages/patches/python-3-fix-tests.patch
delete mode 100644 gnu/packages/patches/python-3.5-fix-tests.patch
delete mode 100644
gnu/packages/patches/python-3.5-getentropy-on-old-kernels.patch
create mode 100644 gnu/packages/patches/python-unittest2-python3-compat.patch
rename gnu/packages/patches/{python2-unittest2-remove-argparse.patch =>
python-unittest2-remove-argparse.patch} (100%)
01/01: gnu: vsearch: Update to 2.5.1.
benwoodcroft pushed a commit to branch master in repository guix. commit ed5e9a33f844f617bbd40b29b0abdc654bc81c82 Author: Ben Woodcroft Date: Thu Oct 26 19:55:29 2017 +1000 gnu: vsearch: Update to 2.5.1. * gnu/packages/bioinformatics.scm (vsearch): Update to 2.5.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 43a00f1..acf689d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6199,7 +6199,7 @@ SELECT or UPDATE queries to an end-point.") (define-public vsearch (package (name "vsearch") -(version "2.5.0") +(version "2.5.1") (source (origin (method url-fetch) @@ -6209,7 +6209,7 @@ SELECT or UPDATE queries to an end-point.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1k8wf3qns4mqrsizywbkqcasqjw000m4drxsag3qd7390pwvf9kz")) + "1s63l2yrws8ksnnlvh0yvdklb3d7d8f2cp8l3i5r5kqvyjz1j27n")) (patches (search-patches "vsearch-unbundle-cityhash.patch")) (snippet '(begin
branch master updated (8ba3f75 -> ed5e9a3)
benwoodcroft pushed a change to branch master in repository guix. from 8ba3f75 gnu: r-nloptr: Update package hash. new ed5e9a3 gnu: vsearch: Update to 2.5.1. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
branch master updated (ed5e9a3 -> bc709e0)
jlicht pushed a change to branch master in repository guix. from ed5e9a3 gnu: vsearch: Update to 2.5.1. new bc709e0 gnu: node: Update to 8.7.0. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/node.scm | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-)
01/01: gnu: node: Update to 8.7.0.
jlicht pushed a commit to branch master
in repository guix.
commit bc709e03770dbe97b5e88bd975dd160dc94a5d56
Author: Jelle Licht
Date: Mon Oct 23 22:04:15 2017 +0200
gnu: node: Update to 8.7.0.
* gnu/packages/node.scm (node): Update to 8.7.0.
(node)[arguments]: Removed dgram mutlicast test. Removed dns test. Removed
broken linter test workaround.
---
gnu/packages/node.scm | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 805b81b..e354130 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -40,14 +40,14 @@
(define-public node
(package
(name "node")
-(version "8.4.0")
+(version "8.7.0")
(source (origin
(method url-fetch)
(uri (string-append "http://nodejs.org/dist/v"; version
"/node-v" version ".tar.gz"))
(sha256
(base32
-"1vrpc4lspm33hmb8c2q4w1fzg3iaip2gx4wpr4nyy417hbx1a6k4"
+"1a0ginagx3pav6v7adyp76jisia4qgbsq6pz3als4kshwlk4a667"
(build-system gnu-build-system)
(arguments
;; TODO: Purge the bundled copies from the source.
@@ -76,10 +76,6 @@
(("'/usr/bin/env'")
(string-append "'" (which "env") "'")))
- ;; Linting is no longer supported in the release tarball
- (substitute* '("Makefile")
- ((" \\$\\(MAKE\\) lint") ""))
-
;; FIXME: This test seems to depends on files that are not
;; available in the bundled v8. See
;; https://github.com/nodejs/node/issues/13344
@@ -92,6 +88,8 @@
"test/parallel/test-util-inspect.js"
"test/parallel/test-v8-serdes.js"
"test/parallel/test-dgram-membership.js"
+
"test/parallel/test-dgram-multicast-set-interface-lo.js"
+ "test/parallel/test-dns-cancel-reverse-lookup.js"
"test/parallel/test-dns-resolveany.js"
"test/parallel/test-cluster-master-error.js"
"test/parallel/test-cluster-master-kill.js"
branch master updated (bc709e0 -> 9c43f43)
lfam pushed a change to branch master in repository guix. from bc709e0 gnu: node: Update to 8.7.0. new 436594c gnu: ffmpeg: Update to 3.4. new 0cbcab7 gnu: go: Update to 1.9.2. new 552ee77 build-system/go: Fix installation path of executable files. new 9c43f43 doc: Document the installation of Go source code. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: doc/guix.texi | 5 + gnu/packages/golang.scm| 4 ++-- gnu/packages/video.scm | 4 ++-- guix/build/go-build-system.scm | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-)
02/04: gnu: go: Update to 1.9.2.
lfam pushed a commit to branch master in repository guix. commit 0cbcab7254dd50bbf2f36712fa7450f1e105a0d1 Author: Leo Famulari Date: Wed Oct 25 21:55:30 2017 -0400 gnu: go: Update to 1.9.2. * gnu/packages/golang.scm (go-1.9): Update to 1.9.2. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f97f6f1..b8f86ac 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -205,7 +205,7 @@ sequential processes (CSP) concurrent programming features added.") (package (inherit go-1.4) (name "go") -(version "1.9.1") +(version "1.9.2") (source (origin (method url-fetch) @@ -213,7 +213,7 @@ sequential processes (CSP) concurrent programming features added.") name version ".src.tar.gz")) (sha256 (base32 - "03jmrgqq852wqyphvd8p46i32f72xki3bmylhkxf0kynqyfzqjm8" + "1p23n4xzbknl3bbhlckbvxbhpxknd5rn0i2szmn9i2dcz15ihpv6" (arguments (substitute-keyword-arguments (package-arguments go-1.4) ((#:phases phases)
04/04: doc: Document the installation of Go source code.
lfam pushed a commit to branch master
in repository guix.
commit 9c43f432eb166bc9a3d1e4e74d68771cea33c6e4
Author: Leo Famulari
Date: Wed Oct 25 22:58:18 2017 -0400
doc: Document the installation of Go source code.
* doc/guix.texi (Build Systems): Document '#:install-source?' for the Go
build system.
---
doc/guix.texi | 5 +
1 file changed, 5 insertions(+)
diff --git a/doc/guix.texi b/doc/guix.texi
index 94cba0e..e4ba15c 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3592,6 +3592,11 @@ package source code's remote URI and filesystem
hierarchy structure. In
some cases, you will need to unpack the package's source code to a
different directory structure than the one indicated by the import path,
and @code{#:unpack-path} should be used in such cases.
+
+Packages that provide Go libraries should be installed along with their
+source code. The key @code{#:install-source?}, which defaults to
+@code{#t}, controls whether or not the source code is installed. It can
+be set to @code{#f} for packages that only provide executable files.
@end defvr
@defvr {Scheme Variable} glib-or-gtk-build-system
03/04: build-system/go: Fix installation path of executable files.
lfam pushed a commit to branch master
in repository guix.
commit 552ee77250409de0bde2b75f60eb5ddd0f881045
Author: Leo Famulari
Date: Wed Oct 25 22:43:36 2017 -0400
build-system/go: Fix installation path of executable files.
* guix/build/go-build-system.scm (setup-environment): Set GOBIN correctly.
---
guix/build/go-build-system.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guix/build/go-build-system.scm b/guix/build/go-build-system.scm
index 72af6ce..d175f3b 100644
--- a/guix/build/go-build-system.scm
+++ b/guix/build/go-build-system.scm
@@ -171,7 +171,7 @@ respectively."
(setenv "GOPATH" (string-append (getcwd) ":" (getenv "GOPATH")))
(setenv "GOPATH" (getcwd)))
;; Where to install compiled executable files ('commands' in Go parlance').
-(setenv "GOBIN" out)
+(setenv "GOBIN" (string-append out "/bin"))
#t))
(define* (build #:key import-path #:allow-other-keys)
01/04: gnu: ffmpeg: Update to 3.4.
lfam pushed a commit to branch master
in repository guix.
commit 436594ca47c2858bccec3699b7d3dcfef101c65c
Author: Rutger Helling
Date: Thu Oct 26 15:20:35 2017 +0200
gnu: ffmpeg: Update to 3.4.
* gnu/packages/video.scm (ffmpeg): Update to 3.4.
Signed-off-by: Leo Famulari
---
gnu/packages/video.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 63824f6..d73e21a 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -585,14 +585,14 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264,
and VC-1/VMW3).")
(define-public ffmpeg
(package
(name "ffmpeg")
-(version "3.3.4")
+(version "3.4")
(source (origin
(method url-fetch)
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-";
version ".tar.xz"))
(sha256
(base32
- "0mx9dvad3lkyhvsrblf280x2bz6dxajya1ylnspbdzldj0dpxfcq"
+ "1vzvpx8ixy8m44f8qwp833hv253hpghybgzbc4n8b3div3j0dvmf"
(build-system gnu-build-system)
(inputs
`(("fontconfig" ,fontconfig)
branch master updated (9c43f43 -> 2e205c6)
jlicht pushed a change to branch master in repository guix. from 9c43f43 doc: Document the installation of Go source code. new 2e205c6 gnu: openrct2: Fix a few paths. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/games.scm | 6 ++ 1 file changed, 6 insertions(+)
01/01: gnu: openrct2: Fix a few paths.
jlicht pushed a commit to branch master
in repository guix.
commit 2e205c61933433324ec47ce5be630e0aef0cb385
Author: Rutger Helling
Date: Sat Oct 21 10:33:30 2017 +0200
gnu: openrct2: Fix a few paths.
* gnu/packages/games.scm (openrct2): Fix a few paths.
---
gnu/packages/games.scm | 6 ++
1 file changed, 6 insertions(+)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 61eed39..896d534 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2648,6 +2648,12 @@ Transport Tycoon Deluxe.")
`(#:tests? #f ;; no tests available
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-usr-share-paths
+(lambda* (#:key make-flags outputs #:allow-other-keys)
+ ;; Fix some references to /usr/share.
+ (substitute* "src/openrct2/platform/linux.c"
+(("/usr/share")
+(string-append (assoc-ref %outputs "out") "/share")
(add-after 'build 'fix-cmake-install-file
(lambda _
;; The build system tries to download a file and compare hashes.
01/01: gnu: wget: Update to 1.19.2 [fixes CVE-2017-13089 and CVE-2017-13090].
mbakke pushed a commit to branch master
in repository guix.
commit 6b88912eb6c414467234678c347990181dbf848b
Author: Marius Bakke
Date: Thu Oct 26 23:23:44 2017 +0200
gnu: wget: Update to 1.19.2 [fixes CVE-2017-13089 and CVE-2017-13090].
* gnu/packages/wget.scm (wget): Update to 1.19.2.
[source](uri): Change to '.lz' tarball.
[source](patches): Remove.
[native-inputs]: Add LZIP.
* gnu/packages/patches/wget-CVE-2017-6508.patch,
gnu/packages/patches/wget-fix-504-test-timeout.patch,
gnu/packages/patches/wget-perl-5.26.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
---
gnu/local.mk | 3 -
gnu/packages/patches/wget-CVE-2017-6508.patch | 45 --
.../patches/wget-fix-504-test-timeout.patch| 160 -
gnu/packages/patches/wget-perl-5.26.patch | 96 -
gnu/packages/wget.scm | 13 +-
5 files changed, 6 insertions(+), 311 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index f318bcd..2aa2f7b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1100,9 +1100,6 @@ dist_patch_DATA =
\
%D%/packages/patches/vte-CVE-2012-2738-pt1.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt2.patch \
%D%/packages/patches/weechat-python.patch\
- %D%/packages/patches/wget-CVE-2017-6508.patch\
- %D%/packages/patches/wget-fix-504-test-timeout.patch \
- %D%/packages/patches/wget-perl-5.26.patch\
%D%/packages/patches/wicd-bitrate-none-fix.patch \
%D%/packages/patches/wicd-get-selected-profile-fix.patch \
%D%/packages/patches/wicd-urwid-1.3.patch\
diff --git a/gnu/packages/patches/wget-CVE-2017-6508.patch
b/gnu/packages/patches/wget-CVE-2017-6508.patch
deleted file mode 100644
index 0218fce..000
--- a/gnu/packages/patches/wget-CVE-2017-6508.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix CVE-2017-6508:
-
-https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-6508
-
-Patch copied from upstream source repository:
-
-https://git.savannah.gnu.org/cgit/wget.git/commit/?id=4d729e322fae359a1aefaafec1144764a54e8ad4
-
-From 4d729e322fae359a1aefaafec1144764a54e8ad4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20R=C3=BChsen?=
-Date: Mon, 6 Mar 2017 10:04:22 +0100
-Subject: [PATCH] Fix CRLF injection in Wget host part
-
-* src/url.c (url_parse): Reject control characters in host part of URL
-
-Reported-by: Orange Tsai
- src/url.c | 11 +++
- 1 file changed, 11 insertions(+)
-
-diff --git a/src/url.c b/src/url.c
-index 8f8ff0b8..7d36b27d 100644
a/src/url.c
-+++ b/src/url.c
-@@ -925,6 +925,17 @@ url_parse (const char *url, int *error, struct iri *iri,
bool percent_encode)
- url_unescape (u->host);
- host_modified = true;
-
-+ /* check for invalid control characters in host name */
-+ for (p = u->host; *p; p++)
-+{
-+ if (c_iscntrl(*p))
-+{
-+ url_free(u);
-+ error_code = PE_INVALID_HOST_NAME;
-+ goto error;
-+}
-+}
-+
- /* Apply IDNA regardless of iri->utf8_encode status */
- if (opt.enable_iri && iri)
- {
---
-2.12.0
-
diff --git a/gnu/packages/patches/wget-fix-504-test-timeout.patch
b/gnu/packages/patches/wget-fix-504-test-timeout.patch
deleted file mode 100644
index d9bf154..000
--- a/gnu/packages/patches/wget-fix-504-test-timeout.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-This patch is from upstream. If a machine is too slow it can cause
-test-504.py to fail.
-http://git.savannah.gnu.org/cgit/wget.git/patch/?id=ac4fed32204e9ec1874e7cb5ecc55f1b35c1c8de
-
-From ac4fed32204e9ec1874e7cb5ecc55f1b35c1c8de Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20R=C3=BChsen?=
-Date: Tue, 14 Feb 2017 16:20:26 +0100
-Subject: Fix 504 status handling
-
-* src/http.c (gethttp): Move 504 handling to correct place.
- (http_loop): Fix memeory leak.
-* testenv/server/http/http_server.py: Add Content-Length header on non-2xx
- status codes with a body
-
-Reported-by: Adam Sampson
- src/http.c | 30 +++---
- testenv/server/http/http_server.py | 9 +
- 2 files changed, 16 insertions(+), 23 deletions(-)
-
-diff --git a/src/http.c b/src/http.c
-index 898e184..d2c5c77 100644
a/src/http.c
-+++ b/src/http.c
-@@ -3476,7 +3476,7 @@ gethttp (const struct url *u, struct url *original_url,
struct http_stat *hs,
-
- #ifdef HAVE_METALINK
- /* We need to check for the Metalink data in the very first response
-- we get from the server (before redirectionrs, authorization, etc.). */
-+ we get from the server (before redirections, authorization, etc.). */
- if (metalink)
- {
- hs->metalink = metalink_from_http (resp, hs, u);
-@@ -3496,7 +3496,7 @@
branch master updated (2e205c6 -> 6b88912)
mbakke pushed a change to branch master in repository guix. from 2e205c6 gnu: openrct2: Fix a few paths. new 6b88912 gnu: wget: Update to 1.19.2 [fixes CVE-2017-13089 and CVE-2017-13090]. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk | 3 - gnu/packages/patches/wget-CVE-2017-6508.patch | 45 -- .../patches/wget-fix-504-test-timeout.patch| 160 - gnu/packages/patches/wget-perl-5.26.patch | 96 - gnu/packages/wget.scm | 13 +- 5 files changed, 6 insertions(+), 311 deletions(-) delete mode 100644 gnu/packages/patches/wget-CVE-2017-6508.patch delete mode 100644 gnu/packages/patches/wget-fix-504-test-timeout.patch delete mode 100644 gnu/packages/patches/wget-perl-5.26.patch
branch master updated (6b88912 -> 1c2adcd)
mbakke pushed a change to branch master in repository guix. from 6b88912 gnu: wget: Update to 1.19.2 [fixes CVE-2017-13089 and CVE-2017-13090]. new b1c0150 gnu: Add ffmpeg@3.3 and use it on packages that fail with 3.4. new 1c2adcd gnu: ffmpeg@3.3: Update to 3.3.5. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/gstreamer.scm | 2 +- gnu/packages/messaging.scm | 2 +- gnu/packages/video.scm | 13 + 3 files changed, 15 insertions(+), 2 deletions(-)
02/02: gnu: ffmpeg@3.3: Update to 3.3.5.
mbakke pushed a commit to branch master in repository guix. commit 1c2adcd6b9d3d15fba1d2e9705ffccb7f3cbcd7f Author: Marius Bakke Date: Thu Oct 26 23:55:55 2017 +0200 gnu: ffmpeg@3.3: Update to 3.3.5. * gnu/packages/video.scm (ffmpeg-3.3): Update to 3.3.5. --- gnu/packages/video.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5596c48..e1ea349 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -751,17 +751,18 @@ convert and stream audio and video. It includes the libavcodec audio/video codec library.") (license license:gpl2+))) +;; XXX: Remove this when gst-libav and qtox supports 3.4. (define-public ffmpeg-3.3 (package (inherit ffmpeg) -(version "3.3.4") +(version "3.3.5") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"; version ".tar.xz")) (sha256 (base32 - "0mx9dvad3lkyhvsrblf280x2bz6dxajya1ylnspbdzldj0dpxfcq")) + "00nq8ng2p16yb48acargaz1hlp9kq24vfwvkqjlslz4a7864k4x8")) (define-public ffmpeg-2.8 (package
01/02: gnu: Add ffmpeg@3.3 and use it on packages that fail with 3.4.
mbakke pushed a commit to branch master
in repository guix.
commit b1c01503dfcb915c39af4a45716ebafafb806549
Author: Rutger Helling
Date: Thu Oct 26 19:50:17 2017 +0200
gnu: Add ffmpeg@3.3 and use it on packages that fail with 3.4.
* gnu/packages/gstreamer.scm (gst-libav)[inputs]: Change ffmpeg to
ffmpeg-3.3.
* gnu/packages/messaging.scm (qtox)[inputs]: Change ffmpeg to ffmpeg-3.3.
* gnu/packages/video.scm (ffmpeg-3.3): New variable.
Signed-off-by: Marius Bakke
---
gnu/packages/gstreamer.scm | 2 +-
gnu/packages/messaging.scm | 2 +-
gnu/packages/video.scm | 12
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index c308dc9..c87465d 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -409,7 +409,7 @@ distribution problems in some jurisdictions, e.g. due to
patent threats.")
("python" ,python)))
(inputs
`(("gst-plugins-base" ,gst-plugins-base)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-3.3)
("orc" ,orc)
("zlib" ,zlib)))
(home-page "http://gstreamer.freedesktop.org/";)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index cd9c41f..72dbbcd 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -822,7 +822,7 @@ instant messenger with audio and video chat capabilities.")
(("TIMESTAMP") "\"\""))
#t)
(inputs
- `(("ffmpeg" ,ffmpeg)
+ `(("ffmpeg" ,ffmpeg-3.3)
("glib" ,glib)
("gtk+" ,gtk+-2)
("libsodium" ,libsodium)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index d73e21a..5596c48 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -751,6 +751,18 @@ convert and stream audio and video. It includes the
libavcodec
audio/video codec library.")
(license license:gpl2+)))
+(define-public ffmpeg-3.3
+ (package
+(inherit ffmpeg)
+(version "3.3.4")
+(source (origin
+ (method url-fetch)
+ (uri (string-append "https://ffmpeg.org/releases/ffmpeg-";
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0mx9dvad3lkyhvsrblf280x2bz6dxajya1ylnspbdzldj0dpxfcq"))
+
(define-public ffmpeg-2.8
(package
(inherit ffmpeg)
branch master updated (1c2adcd -> 256ecba)
jlicht pushed a change to branch master in repository guix. from 1c2adcd gnu: ffmpeg@3.3: Update to 3.3.5. new 256ecba gnu: ansible: Update to 2.4.1.0. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
01/01: gnu: ansible: Update to 2.4.1.0.
jlicht pushed a commit to branch master in repository guix. commit 256ecba1a1966ed161e333f8962316a38a5d5d83 Author: Jelle Licht Date: Thu Oct 26 14:19:18 2017 +0200 gnu: ansible: Update to 2.4.1.0. * gnu/packages/admin.scm (ansible): Update to 2.4.1.0. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index cb5e86d..8f3f3cd 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1382,14 +1382,14 @@ of supported upstream metrics systems simultaneously.") (define-public ansible (package (name "ansible") -(version "2.3.1.0") +(version "2.4.1.0") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 (base32 - "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd")) + "0spv0kjaicwss4q52s727b6grdizcxpa0bbsfg26pgf5kjrayqfs")) (patches (search-patches "ansible-wrap-program-hack.patch" (build-system python-build-system) (native-inputs
branch master updated (256ecba -> 3414ce9)
mbakke pushed a change to branch master in repository guix. from 256ecba gnu: ansible: Update to 2.4.1.0. new 750e9f1 gnu: xpra: Update to 2.1.3. new b89e3c7 gnu: python-configargparse: Update to 0.12.0. new 9d0866c gnu: Add python-ratelimiter. new 3414ce9 gnu: snakemake: Update to 4.2.0. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/python.scm | 58 - gnu/packages/xorg.scm | 4 ++-- 2 files changed, 50 insertions(+), 12 deletions(-)
01/04: gnu: xpra: Update to 2.1.3.
mbakke pushed a commit to branch master
in repository guix.
commit 750e9f15a3d9e4678653f6bc92b48da1b85e014c
Author: Rutger Helling
Date: Thu Oct 26 14:47:12 2017 +0200
gnu: xpra: Update to 2.1.3.
* gnu/packages/xorg.scm (xpra): Update to 2.1.3.
Signed-off-by: Marius Bakke
---
gnu/packages/xorg.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 4caa3d9..28d0d75 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5917,7 +5917,7 @@ basic eye-candy effects.")
(define-public xpra
(package
(name "xpra")
-(version "2.1.2")
+(version "2.1.3")
(source
(origin
(method url-fetch)
@@ -5925,7 +5925,7 @@ basic eye-candy effects.")
version ".tar.xz"))
(sha256
(base32
- "0a5ffs6gm7j7vzqdbhfmjn9z8qxm9m9as7a1vjmjx63yxv9jqihn"
+ "0r0l3p59q05fmvkp3jv8vmny2v8m1vyhqkg6b9r2qgxn1kcxx7rm"
(build-system python-build-system)
(inputs `(("ffmpeg", ffmpeg)
("flac", flac)
02/04: gnu: python-configargparse: Update to 0.12.0.
mbakke pushed a commit to branch master
in repository guix.
commit b89e3c77c683626b3c747245926483692abde9f6
Author: Kyle Meyer
Date: Thu Oct 26 17:02:28 2017 -0400
gnu: python-configargparse: Update to 0.12.0.
* gnu/packages/python.scm (python-configargparse, python2-configargparse):
Update to 0.12.0.
[arguments]: Enable tests.
[native-inputs]: Add python-pyyaml, which is an optional dependency but
required to run the tests.
Signed-off-by: Marius Bakke
---
gnu/packages/python.scm | 24 +---
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f003cb2..3f92da4 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -15,7 +15,7 @@
;;; Copyright © 2015, 2017 Ben Woodcroft
;;; Copyright © 2015, 2016 Erik Edrosa
;;; Copyright © 2015, 2016, 2017 Efraim Flashner
-;;; Copyright © 2015 Kyle Meyer
+;;; Copyright © 2015, 2017 Kyle Meyer
;;; Copyright © 2015, 2016 Chris Marusich
;;; Copyright © 2016 Danny Milosavljevic
;;; Copyright © 2016 Lukas Gradl
@@ -9279,20 +9279,30 @@ config files.")
(define-public python-configargparse
(package
(name "python-configargparse")
-(version "0.10.0")
+(version "0.12.0")
(source (origin
(method url-fetch)
(uri (string-append
-"https://pypi.python.org/packages/source/C/ConfigArgParse/";
+"https://pypi.io/packages/source/C/ConfigArgParse/";
"ConfigArgParse-" version ".tar.gz"))
(sha256
(base32
-"19wh919gbdbzxzpagg52q3lm62yicm95ddlcx77dyjc1slyshl1v"
+"0fgkiqh6r3rbkdq3k8c48m85g52k96686rw3a6jg4lcncrkpvk98"
(build-system python-build-system)
+(native-inputs
+ `(("python-pyyaml" ,python-pyyaml)))
(arguments
- ;; FIXME: Bug in test suite filed upstream:
- ;; https://github.com/bw2/ConfigArgParse/issues/32
- '(#:tests? #f))
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda _
+ ;; Bypass setuptools-shim because one test relies on "setup.py"
+ ;; being the first argument passed to the python call.
+ ;;
+ ;; NOTE: Many tests do not run because they rely on Python's
+ ;; built-in test.test_argparse, but we remove the unit tests from
+ ;; our Python installation.
+ (zero? (system* "python" "setup.py" "test")))
(synopsis "Replacement for argparse")
(description "A drop-in replacement for argparse that allows options to
also
be set via config files and/or environment variables.")
04/04: gnu: snakemake: Update to 4.2.0.
mbakke pushed a commit to branch master
in repository guix.
commit 3414ce98765bb0f58507418bfb9fa68bded06591
Author: Kyle Meyer
Date: Thu Oct 26 17:02:30 2017 -0400
gnu: snakemake: Update to 4.2.0.
* gnu/packages/python.scm (snakemake): Update to 4.2.0.
[propagated-inputs]: Add python-appdirs, python-configargparse,
python-pyyaml,
and python-ratelimiter, which are dependencies as of Snakemake 4.1.0.
Signed-off-by: Marius Bakke
---
gnu/packages/python.scm | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index fed7394..e8a7339 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6626,13 +6626,13 @@ of the structure, dynamics, and functions of complex
networks.")
(define-public snakemake
(package
(name "snakemake")
-(version "3.13.3")
+(version "4.2.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "snakemake" version))
(sha256
-(base32 "1nixb944r4hlskwkzc4wjs34b40xpxpw9gmhhm5p09gvmm22ap5d"
+(base32 "0mgl44q152ws40zj2vicqark5szyd73vqy9pf26g6hk6dk0y0c79"
(build-system python-build-system)
(arguments
;; TODO: Package missing test dependencies.
@@ -6651,7 +6651,11 @@ of the structure, dynamics, and functions of complex
networks.")
#t)
(propagated-inputs
`(("python-wrapt" ,python-wrapt)
- ("python-requests" ,python-requests)))
+ ("python-requests" ,python-requests)
+ ("python-appdirs" ,python-appdirs)
+ ("python-configargparse" ,python-configargparse)
+ ("python-pyyaml" ,python-pyyaml)
+ ("python-ratelimiter" ,python-ratelimiter)))
(home-page "https://bitbucket.org/snakemake/snakemake/wiki/Home";)
(synopsis "Python-based execution environment for make-like workflows")
(description
03/04: gnu: Add python-ratelimiter.
mbakke pushed a commit to branch master
in repository guix.
commit 9d0866ce1b85c3433552627909dd67aba64814f7
Author: Kyle Meyer
Date: Thu Oct 26 17:02:29 2017 -0400
gnu: Add python-ratelimiter.
* gnu/packages/python.scm (python-ratelimiter, python2-ratelimiter): New
variables.
Signed-off-by: Marius Bakke
---
gnu/packages/python.scm | 24
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3f92da4..fed7394 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -16843,3 +16843,27 @@ interpreter when it prints a stack trace.")
(define-public python2-traceback2
(package-with-python2 python-traceback2))
+
+(define-public python-ratelimiter
+ (package
+(name "python-ratelimiter")
+(version "1.2.0")
+(source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "ratelimiter" version))
+ (sha256
+(base32
+ "1dhz85mj5bqd2mij84ncs6pz32hgidr79hay4aqfmzaa4rbb497p"
+(build-system python-build-system)
+(arguments
+ '(#:tests? #f)) ; There are no tests in the pypi archive.
+(home-page "https://github.com/RazerM/ratelimiter";)
+(synopsis "Simple rate limiting object")
+(description
+ "The @code{ratelimiter} module ensures that an operation will not be
+executed more than a given number of times during a given period.")
+(license license:asl2.0)))
+
+(define-public python2-ratelimiter
+ (package-with-python2 python-ratelimiter))
branch master updated (3414ce9 -> ba2cd6c)
civodul pushed a change to branch master in repository guix. from 3414ce9 gnu: snakemake: Update to 4.2.0. new ba2cd6c gnu: synergy: Update repository URI and hash. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/synergy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
01/01: gnu: synergy: Update repository URI and hash.
civodul pushed a commit to branch master in repository guix. commit ba2cd6c2d8f40bc4d3fb91dd4c6ea05b8a586dec Author: Maxim Cournoyer Date: Thu Oct 26 08:11:38 2017 -0400 gnu: synergy: Update repository URI and hash. * gnu/packages/synergy.scm (synergy)[uri]: Replace synergy by synergy-core. [sha256]: Update to reflect the name change of the archive root directory. Signed-off-by: Ludovic Courtès --- gnu/packages/synergy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm index 79f7ca0..310a0f6 100644 --- a/gnu/packages/synergy.scm +++ b/gnu/packages/synergy.scm @@ -38,12 +38,12 @@ (source (origin (method url-fetch) - (uri (string-append "https://github.com/symless/synergy/archive/"; + (uri (string-append "https://github.com/symless/synergy-core/archive/"; "v" version "-stable.tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 -"16vxbly4a33c63da3kmj7j47cam583l7bip33jc43mw173wqihw5")) +"052z1yiwck9hlshf8in2dgz6p7jxmq9yfj32mfzjaygpz6mmmr4y")) (modules '((guix build utils))) (snippet ;; Remove ~14MB of unnecessary bundled source and binaries
branch master updated (ba2cd6c -> 4119376)
mbakke pushed a change to branch master in repository guix. from ba2cd6c gnu: synergy: Update repository URI and hash. new 4119376 gnu: exiv2: Add upstream security fixes. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk | 2 + gnu/packages/image.scm | 2 + .../patches/exiv2-CVE-2017-14859-14862-14864.patch | 66 ++ gnu/packages/patches/exiv2-CVE-2017-14860.patch| 48 4 files changed, 118 insertions(+) create mode 100644 gnu/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch create mode 100644 gnu/packages/patches/exiv2-CVE-2017-14860.patch
01/01: gnu: exiv2: Add upstream security fixes.
mbakke pushed a commit to branch master
in repository guix.
commit 4119376d66f2016dd60e5da6b36d90894b6a74f4
Author: Marius Bakke
Date: Thu Oct 26 22:58:28 2017 +0200
gnu: exiv2: Add upstream security fixes.
Fixes CVE-2017-14859, CVE-2017-14860, CVE-2017-14862 and CVE-2017-14864.
* gnu/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch,
gnu/packages/patches/exiv2-CVE-2017-14860.patch: New files.
* gnu/local.mk (dist_patch_DATA): Register them.
* gnu/packages/image.scm (exiv2)[source]: Use them.
---
gnu/local.mk | 2 +
gnu/packages/image.scm | 2 +
.../patches/exiv2-CVE-2017-14859-14862-14864.patch | 66 ++
gnu/packages/patches/exiv2-CVE-2017-14860.patch| 48
4 files changed, 118 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 2aa2f7b..90dc7ae 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -605,6 +605,8 @@ dist_patch_DATA =
\
%D%/packages/patches/eudev-rules-directory.patch \
%D%/packages/patches/evilwm-lost-focus-bug.patch \
%D%/packages/patches/exim-CVE-2017-1000369.patch \
+ %D%/packages/patches/exiv2-CVE-2017-14860.patch \
+ %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch \
%D%/packages/patches/fastcap-mulGlobal.patch \
%D%/packages/patches/fastcap-mulSetup.patch \
%D%/packages/patches/fasthenry-spAllocate.patch \
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index b53247d..df8ac67 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -866,6 +866,8 @@ channels.")
version ".tar.gz")
(string-append "https://fossies.org/linux/misc/exiv2-";
version ".tar.gz")))
+ (patches (search-patches "exiv2-CVE-2017-14860.patch"
+
"exiv2-CVE-2017-14859-14862-14864.patch"))
(sha256
(base32
"1yza317qxd8yshvqnay164imm0ks7cvij8y8j86p1gqi1153qpn7"
diff --git a/gnu/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch
b/gnu/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch
new file mode 100644
index 000..69e65ae
--- /dev/null
+++ b/gnu/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch
@@ -0,0 +1,66 @@
+Fix CVE-2017-14859, CVE-2017-14862 and CVE-2017-14864.
+
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14859
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14862
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14864
+
+Copied from upstream:
+
+https://github.com/Exiv2/exiv2/commit/8a586c74bbe3fbca64e86e42a42282c73f427607
+
+From 8a586c74bbe3fbca64e86e42a42282c73f427607 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?=
+Date: Sat, 7 Oct 2017 23:08:36 +0200
+Subject: [PATCH] Fix for CVE-2017-14864, CVE-2017-14862 and CVE-2017-14859
+
+The invalid memory dereference in
+Exiv2::getULong()/Exiv2::StringValueBase::read()/Exiv2::DataValue::read()
+is caused further up the call-stack, by
+v->read(pData, size, byteOrder) in TiffReader::readTiffEntry()
+passing an invalid pData pointer (pData points outside of the Tiff
+file). pData can be set out of bounds in the (size > 4) branch where
+baseOffset() and offset are added to pData_ without checking whether
+the result is still in the file. As offset comes from an untrusted
+source, an attacker can craft an arbitrarily large offset into the
+file.
+
+This commit adds a check into the problematic branch, whether the
+result of the addition would be out of bounds of the Tiff
+file. Furthermore the whole operation is checked for possible
+overflows.
+---
+ src/tiffvisitor.cpp | 13 +
+ 1 file changed, 13 insertions(+)
+
+diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
+index 4ab733d4..ef13542e 100644
+--- a/src/tiffvisitor.cpp
b/src/tiffvisitor.cpp
+@@ -47,6 +47,7 @@ EXIV2_RCSID("@(#) $Id$")
+ #include
+ #include
+ #include
++#include
+
+ //
*
+ namespace {
+@@ -1517,7 +1518,19 @@ namespace Exiv2 {
+ size = 0;
+ }
+ if (size > 4) {
++// setting pData to pData_ + baseOffset() + offset can result in
pData pointing to invalid memory,
++// as offset can be arbitrarily large
++if ((static_cast(baseOffset()) >
std::numeric_limits::max() - static_cast(offset))
++ || (static_cast(baseOffset() + offset) >
std::numeric_limits::max() - reinterpret_cast(pData_)))
++{
++throw Error(59);
++}
++if (pData_ + static_cast(baseOffset()) +
static_cast(offset) > pLast_) {
++throw Error(58);
++}
+ pData = const
