Commit 7490cd9a authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 3.1.2-1

r-base (3.1.2-1) unstable; urgency=low

  * New upstream version released this morning

r-base (3.1.1.20141024-1) unstable; urgency=low

  * Initial rc build (r66864) of R 3.1.2 expected for October 31
parents 2fdef4ba c917ea8b
......@@ -43,7 +43,9 @@ INSTALL_DIR = ${INSTALL} -d
LDFLAGS = @LDFLAGS@
LIBINTL= @LIBINTL@
LIBM = @LIBM@
LIBR = @LIBR@
LIBR0 = @LIBR0@
LIBR1 = @LIBR1@
LIBR = @LIBR0@ @LIBR1@
LIBS = @LIBS@
LIBnn = @LIBnn@
LIBTOOL = @LIBTOOL@
......@@ -53,7 +55,7 @@ MAIN_CFLAGS = @MAIN_CFLAGS@
MAIN_FFLAGS = @MAIN_FFLAGS@
MAIN_LD = @MAIN_LD@@BUILD_LTO_TRUE@ $(CFLAGS)
MAIN_LDFLAGS = @MAIN_LDFLAGS@ @WANT_R_SHLIB_FALSE@ @USE_EXPORTFILES_TRUE@ -Wl,-bE:$(top_builddir)/etc/R.exp
MAIN_LINK = $(MAIN_LD) $(MAIN_LDFLAGS) $(LDFLAGS)
MAIN_LINK = $(MAIN_LD) $(MAIN_LDFLAGS) $(LIBR0) $(LDFLAGS)
## need this for bootstrapping
MKINSTALLDIRS = @R_SHELL@ $(top_srcdir)/src/scripts/mkinstalldirs.in
NOTANGLE = @NOTANGLE@
......@@ -80,7 +82,7 @@ SHLIB_CFLAGS = @SHLIB_CFLAGS@
SHLIB_FFLAGS = @SHLIB_FFLAGS@
SHLIB_LD = @SHLIB_LD@
SHLIB_LDFLAGS = @SHLIB_LDFLAGS@@BUILD_LTO_TRUE@ $(SHLIB_LTO)
SHLIB_LINK = $(SHLIB_LD) $(SHLIB_LDFLAGS) $(LDFLAGS)
SHLIB_LINK = $(SHLIB_LD) $(SHLIB_LDFLAGS) $(LIBR0) $(LDFLAGS)
SHLIB_LTO = $(CFLAGS) $(CPICFLAGS)
STRIP_LIBS = @striplib@
STRIP_STATIC_LIBS = @stripstaticlib@
......
Revision: 66115
Last Changed Date: 2014-07-10
Revision: 66913
Last Changed Date: 2014-10-31
Sock it to Me
Pumpkin Helmet
This diff is collapsed.
......@@ -284,10 +284,13 @@ AC_ARG_ENABLE([BLAS-shlib],
[use_blas_shlib="${enableval}"],
[use_blas_shlib="unset"])
## As from R 3.2.0 split up -L... and -lR
if test "${want_R_shlib}" = yes; then
LIBR="-L\$(R_HOME)/lib\$(R_ARCH) -lR"
LIBR0="-L\$(R_HOME)/lib\$(R_ARCH)"
LIBR1=-lR
else
LIBR=
LIBR0=
LIBR1=
fi
## Enable maintainer-specific portions of Makefiles.
......@@ -2061,7 +2064,8 @@ fi
## check for vecLib framework (potentially to be used for BLAS)
## in theory vecLib is platform-independent, in practice only
## Apple's OS X is known to provide it
R_CHECK_FRAMEWORK(cblas_cdotu_sub, vecLib)
## However, as from 10.10 it only provides Accelerate.
R_CHECK_FRAMEWORK(cblas_cdotu_sub, Accelerate)
## BLAS.
## <NOTE>
......@@ -2100,7 +2104,9 @@ case "${host_os}" in
fi
;;
esac
AC_SUBST(LIBR)
## LIBR0 is for the -L part, LIBR1 for -lR (if needed)
AC_SUBST(LIBR0)
AC_SUBST(LIBR1)
## This version is used to build a shared BLAS lib
BLAS_LIBS0=${BLAS_LIBS}
......@@ -2798,10 +2804,14 @@ if test "${acx_blas_ok}" = "yes"; then
## Try to figure out which BLAS was used.
case "${BLAS_LIBS0}" in
*-latlas*) r_blas=ATLAS ;;
*-lgoto*) r_blas=Goto ;;
*-lopenblas*) r_blas=OpenBLAS ;;
*-lacml*) r_blas=ACML ;;
*-lmkl*) r_blas=MKL ;;
*-lsgemm*) r_blas=PhiPack ;;
*sunperf*) r_blas=SunPerf ;;
*-lessl*) r_blas=ESSL ;;
*vecLib*) r_blas=vecLib ;;
*Accelerate*) r_blas=Accelerate ;;
"") r_blas=none ;;
*) r_blas=generic ;;
esac
......@@ -2816,29 +2826,45 @@ if test "${acx_lapack_ok}" = "yes"; then
esac
R_SH_VAR_ADD(r_external_libs, [LAPACK(${r_lapack})], [, ])
fi
if test "${use_ICU}" = yes; then
R_SH_VAR_ADD(r_external_libs, [ICU], [, ])
fi
if test "${have_lzma}" = yes; then
R_SH_VAR_ADD(r_external_libs, [lzma], [, ])
fi
r_capabilities=
r_no_capabilities=
if test "${have_png}" = yes; then
R_SH_VAR_ADD(r_capabilities, [PNG], [, ])
else
R_SH_VAR_ADD(r_no_capabilities, [PNG], [, ])
fi
if test "${have_jpeg}" = yes; then
R_SH_VAR_ADD(r_capabilities, [JPEG], [, ])
else
R_SH_VAR_ADD(r_no_capabilities, [JPEG], [, ])
fi
if test "${have_tiff}" = yes; then
R_SH_VAR_ADD(r_capabilities, [TIFF], [, ])
else
R_SH_VAR_ADD(r_no_capabilities, [TIFF], [, ])
fi
if test "${USE_NLS}" = yes; then
R_SH_VAR_ADD(r_capabilities, [NLS], [, ])
else
R_SH_VAR_ADD(r_no_capabilities, [NLS], [, ])
fi
if test "${r_cv_cairo_works}" = yes; then
R_SH_VAR_ADD(r_capabilities, [cairo], [, ])
else
R_SH_VAR_ADD(r_no_capabilities, [cairo], [, ])
fi
if test "${use_ICU}" = yes; then
R_SH_VAR_ADD(r_capabilities, [ICU], [, ])
else
R_SH_VAR_ADD(r_no_capabilities, [ICU], [, ])
fi
r_options=
r_no_options=
if test "${want_R_framework}" = yes; then
R_SH_VAR_ADD(r_options, [framework], [, ])
elif test "${want_R_shlib}" = yes; then
......@@ -2848,12 +2874,18 @@ elif test "${want_R_static}" = yes; then
fi
if test "${use_blas_shlib}" = yes; then
R_SH_VAR_ADD(r_options, [shared BLAS], [, ])
else
R_SH_VAR_ADD(r_no_options, [shared BLAS], [, ])
fi
if test "${want_R_profiling}" = yes; then
R_SH_VAR_ADD(r_options, [R profiling], [, ])
else
R_SH_VAR_ADD(r_no_options, [R profiling], [, ])
fi
if test "${want_memory_profiling}" = yes; then
R_SH_VAR_ADD(r_options, [memory profiling], [, ])
else
R_SH_VAR_ADD(r_no_options, [memory profiling], [, ])
fi
if test "${use_maintainer_mode}" = yes; then
R_SH_VAR_ADD(r_options, [maintainer mode], [, ])
......@@ -2861,9 +2893,6 @@ fi
if test "${use_strict_barrier}" = yes; then
R_SH_VAR_ADD(r_options, [strict barrier], [, ])
fi
if test "${want_linux_lfs}" = yes; then
R_SH_VAR_ADD(r_options, [Linux LFS], [, ])
fi
if test "${want_prebuilt_html}" = yes; then
R_SH_VAR_ADD(r_options, [static HTML], [, ])
fi
......@@ -2888,6 +2917,9 @@ R is now configured for ${host}
Additional capabilities: ${r_capabilities}
Options enabled: ${r_options}
Capabilities skipped: ${r_no_capabilities}
Options not enabled: ${r_no_options}
Recommended packages: ${use_recommended_packages}
])
if test -n "${warn_f77_cc_double_complex}"; then
......
r-base (3.1.1-1+deb8u1) jessie-security; urgency=high
r-base (3.1.2-1) unstable; urgency=low
* src/library/grDevices/src/devPS.c: Apply upstream commits r71664 and
r71667 related to CVE-2016-8714 reported as TALOS-2016-0227
-- Dirk Eddelbuettel <edd@debian.org> Tue, 14 Mar 2017 20:09:08 -0500
* New upstream version released this morning
-- Dirk Eddelbuettel <edd@debian.org> Fri, 31 Oct 2014 05:04:22 -0500
r-base (3.1.1.20141024-1) unstable; urgency=low
* Initial rc build (r66864) of R 3.1.2 expected for October 31
-- Dirk Eddelbuettel <edd@debian.org> Sat, 25 Oct 2014 14:16:00 -0500
r-base (3.1.1-1) unstable; urgency=low
......
Index: devPS.c
===================================================================
--- devPS.c (revision 71663)
+++ devPS.c (revision 71664)
@@ -513,13 +513,15 @@
if (!(fp = R_fopen(R_ExpandFileName(buf), "r"))) return 0;
}
if (GetNextItem(fp, buf, -1, &state)) return 0; /* encoding name */
- strcpy(encname, buf+1);
+ strncpy(encname, buf+1, 99);
+ encname[99] = '\0';
if (!isPDF) snprintf(enccode, 5000, "/%s [\n", encname);
else enccode[0] = '\0';
if (GetNextItem(fp, buf, 0, &state)) { fclose(fp); return 0;} /* [ */
for(i = 0; i < 256; i++) {
if (GetNextItem(fp, buf, i, &state)) { fclose(fp); return 0; }
- strcpy(encnames[i].cname, buf+1);
+ strncpy(encnames[i].cname, buf+1, 39);
+ encnames[i].cname[39] = '\0';
strcat(enccode, " /"); strcat(enccode, encnames[i].cname);
if(i%8 == 7) strcat(enccode, "\n");
}
Index: devPS.c
===================================================================
--- devPS.c (revision 71666)
+++ devPS.c (revision 71667)
@@ -521,7 +521,7 @@
for(i = 0; i < 256; i++) {
if (GetNextItem(fp, buf, i, &state)) { fclose(fp); return 0; }
strncpy(encnames[i].cname, buf+1, 39);
- encnames[i].cname[39] = '\0';
+ encnames[i].cname[39] = '\0';
strcat(enccode, " /"); strcat(enccode, encnames[i].cname);
if(i%8 == 7) strcat(enccode, "\n");
}
......@@ -12,12 +12,13 @@ Peter Dalgaard
Seth Falcon
Robert Gentleman
Kurt Hornik
Stefano Iacus
Ross Ihaka
Michael Lawrence
Friedrich Leisch
Uwe Ligges
Thomas Lumley
Martin Maechler
Martin Morgan
Duncan Murdoch
Paul Murrell
Martyn Plummer
......@@ -27,7 +28,8 @@ Duncan Temple Lang
Luke Tierney
Simon Urbanek
plus Heiner Schwarte up to October 1999 and Guido Masarotto up to June 2003.
plus Heiner Schwarte up to October 1999, Guido Masarotto up to June 2003 and
Stefano Iacus up to July 2014.
Current R-core members can be contacted via email to R-project.org
with name made up by replacing spaces by dots in the name listed above.
......@@ -259,6 +259,29 @@ src/main/xspline.c
* notice remain intact.
src/modules/nano{ftp,http}.c
Copyright (C) 1998-2001 Daniel Veillard. All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is fur-
nished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
src/modules/lapack/dlapack.f, cmplx.f, dlamc.f
Extracted from
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
No preview for this file type
......@@ -4,14 +4,15 @@
1 FAQ
*****
A collection of Frequently Asked Questions and their answers is maintained
by Kurt Hornik <Kurt.Hornik@R-project.org> and can be found at the URL
A collection of Frequently Asked Questions and their answers is
maintained by Kurt Hornik <Kurt.Hornik@R-project.org> and can be found
at the URL
`http://CRAN.R-project.org/doc/FAQ/R-FAQ.html'
<http://CRAN.R-project.org/doc/FAQ/R-FAQ.html>
A text version is in file `FAQ' in this directory, and an HTML version is
available as file `doc/html/faq.html' and via the on-line help (on the
index page given by `help.start()').
A text version is in file 'FAQ' in this directory, and an HTML version
is available as file 'doc/html/faq.html' and via the on-line help (on
the index page given by 'help.start()').
2 Mailing lists
***************
......@@ -19,20 +20,20 @@ index page given by `help.start()').
Thanks to Martin Maechler <Martin.Maechler@R-project.org> there are a
number of mailing lists which are used by R users and developers. See
`http://www.R-project.org/mail.html'
<http://www.R-project.org/mail.html>
for details.
3 Archives
**********
The Comprehensive R Archive Network (CRAN) is a collection of sites which
carry identical material, consisting of the R distribution(s), the
contributed extensions, documentation for R, and binaries, with the master
site at `http://CRAN.R-project.org/' and information on daily mirrors
available from
The Comprehensive R Archive Network (CRAN) is a collection of sites
which carry identical material, consisting of the R distribution(s), the
contributed extensions, documentation for R, and binaries, with the
master site at <http://CRAN.R-project.org/> and information on daily
mirrors available from
`http://CRAN.R-project.org/mirrors.html'
<http://CRAN.R-project.org/mirrors.html>
4 Bug-tracking system
*********************
......@@ -40,5 +41,5 @@ available from
R has a bug-tracking system (or perhaps a bug-filing system is a more
precise description) available on the net at
`http://bugs.R-project.org/'
<http://bugs.R-project.org/>
......@@ -60,7 +60,8 @@ email addresses to contributors to the R Project (even without making them
members of the R Foundation) when in the view of the R Foundation this
would help advance the R project.
The R Core Group, Roger Bivand, John Fox and Bill Venables are the
ordinary members of the R Foundation. In addition, Dirk Eddelbuettel,
Torsten Hothorn, David Meyer, Simon Wood, and Achim Zeileis are also
e-addressable by <Firstname>.<Lastname>@R-project.org.
The R Core Group, Roger Bivand, Dirk Eddelbuettel, John Fox, Torsten
Hothorn, Stefano Iacus, Marc Schwartz, Bill Venables, Hadley Wickham
and Achim Zeileis are the ordinary members of the R Foundation. In
addition, David Meyer and Simon Wood are also e-addressable by
<Firstname>.<Lastname>@R-project.org.
This diff is collapsed.
This diff is collapsed.
<html lang="en">
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<!-- Created by GNU Texinfo 5.2, http://www.gnu.org/software/texinfo/ -->
<head>
<title>R Resources</title>
<meta http-equiv="Content-Type" content="text/html">
<meta name="description" content="R Resources">
<meta name="generator" content="makeinfo 4.13">
<link title="Top" rel="top" href="#Top">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
pre.format { font-family:inherit }
pre.smalldisplay { font-family:inherit; font-size:smaller }
pre.smallformat { font-family:inherit; font-size:smaller }
pre.smallexample { font-size:smaller }
pre.smalllisp { font-size:smaller }
span.sc { font-variant:small-caps }
span.roman { font-family:serif; font-weight:normal; }
span.sansserif { font-family:sans-serif; font-weight:normal; }
<meta name="keywords" content="R Resources">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="makeinfo">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link href="#Top" rel="start" title="Top">
<link href="dir.html#Top" rel="up" title="(dir)">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
blockquote.smallquotation {font-size: smaller}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
div.smalldisplay {margin-left: 3.2em}
div.smallexample {margin-left: 3.2em}
div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
div.smalllisp {margin-left: 3.2em}
kbd {font-style:oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
pre.smalldisplay {font-family: inherit; font-size: smaller}
pre.smallexample {font-size: smaller}
pre.smallformat {font-family: inherit; font-size: smaller}
pre.smalllisp {font-size: smaller}
span.nocodebreak {white-space:nowrap}
span.nolinebreak {white-space:nowrap}
span.roman {font-family:serif; font-weight:normal}
span.sansserif {font-family:sans-serif; font-weight:normal}
ul.no-bullet {list-style: none}
body {margin-left: 5%; margin-right: 5%;}
H1 {
......@@ -66,74 +87,93 @@ p {
margin-top: 0.6ex;
margin-bottom: 1.2ex;
}
--></style>
-->
</style>
</head>
<body>
<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
<h1 class="settitle" align="center">R Resources</h1>
<HTML>
<HEAD>
<TITLE>R: Resources</TITLE>
<LINK REL=STYLESHEET TYPE="text/css" HREF="R.css">
</HEAD>
<p><BODY>
<BODY>
<h1>Other Resources
<img class="toplogo" src="logo.jpg" alt="[R logo]">
</h1>
<hr width="100%">
<a name="Top"></a>
<h1 class="node-heading">Top</h1>
<p><a name="Top"></a>
<p><a name="FAQ"></a>
<h3 class="section">0.1 FAQ</h3>
<hr>
<a name="FAQ"></a>
<a name="FAQ-1"></a>
<h3 class="section">1 FAQ</h3>
<p>A collection of <a href="faq.html">Frequently Asked Questions</a> and their
answers is maintained by <a href="mailto:Kurt.Hornik@R-project.org">Kurt Hornik</a>
and can be found at the <acronym>URL</acronym>
</p>
<blockquote>
<a href="http://CRAN.R-project.org/doc/FAQ/R-FAQ.html">http://CRAN.R-project.org/doc/FAQ/R-FAQ.html</a>
</blockquote>
<p><a href="http://CRAN.R-project.org/doc/FAQ/R-FAQ.html">http://CRAN.R-project.org/doc/FAQ/R-FAQ.html</a>
</p></blockquote>
<p><a name="Mailing-lists"></a>
<h3 class="section">0.2 Mailing lists</h3>
<hr>
<a name="Mailing-lists"></a>
<a name="Mailing-lists-1"></a>
<h3 class="section">2 Mailing lists</h3>
<p>Thanks to <a href="mailto:Martin.Maechler@R-project.org">Martin Maechler</a> there
are a number of mailing lists which are used by R users and developers.
are a number of mailing lists which are used by R users and developers.
See
</p>
<blockquote>
<a href="http://www.R-project.org/mail.html">http://www.R-project.org/mail.html</a>
</blockquote>
<p><a href="http://www.R-project.org/mail.html">http://www.R-project.org/mail.html</a>
</p></blockquote>
<p>for details.
<p><a name="Archives"></a>
<h3 class="section">0.3 Archives</h3>
</p>
<hr>
<a name="Archives"></a>
<a name="Archives-1"></a>
<h3 class="section">3 Archives</h3>
<p>The Comprehensive R Archive Network (<acronym>CRAN</acronym>) is a collection of
sites which carry identical material, consisting of the R
distribution(s), the contributed extensions, documentation for R, and
binaries, with the master site at <a href="http://CRAN.R-project.org/">http://CRAN.R-project.org/</a> and
information on daily mirrors available from
</p>
<blockquote>
<a href="http://CRAN.R-project.org/mirrors.html">http://CRAN.R-project.org/mirrors.html</a>
</blockquote>
<p><a href="http://CRAN.R-project.org/mirrors.html">http://CRAN.R-project.org/mirrors.html</a>
</p></blockquote>
<p><a name="Bug-tracking-system"></a>
<hr>
<a name="Bug_002dtracking-system"></a>
<h3 class="section">0.4 Bug-tracking system</h3>
<a name="Bug_002dtracking-system-1"></a>
<h3 class="section">4 Bug-tracking system</h3>
<p>R has a bug-tracking system (or perhaps a bug-filing system is a more
precise description) available on the net at
</p>
<blockquote>
<a href="http://bugs.R-project.org/">http://bugs.R-project.org/</a>
</blockquote>
<p><a href="http://bugs.R-project.org/">http://bugs.R-project.org/</a>
</p></blockquote>
<hr>
</body></html>
</body>
</html>
This diff is collapsed.
This diff is collapsed.
......@@ -44,7 +44,7 @@ $\t\$%
@c -- edit these here alone -- in order keep consistency
@macro Rcopyright{year}