Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eric Zheng
slapos
Commits
c165673e
Commit
c165673e
authored
Apr 14, 2015
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into re6st-master
parents
a4f1aa88
6ea27764
Changes
23
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
1955 additions
and
283 deletions
+1955
-283
CHANGES.txt
CHANGES.txt
+8
-0
component/gcc/buildout.cfg
component/gcc/buildout.cfg
+2
-2
component/groonga/buildout.cfg
component/groonga/buildout.cfg
+4
-4
component/libtasn1/buildout.cfg
component/libtasn1/buildout.cfg
+2
-2
component/libtiff/CVE-2012-4564.patch
component/libtiff/CVE-2012-4564.patch
+0
-31
component/libtiff/CVE-2013-1960.patch
component/libtiff/CVE-2013-1960.patch
+0
-146
component/libtiff/CVE-2013-4231.patch
component/libtiff/CVE-2013-4231.patch
+0
-17
component/libtiff/CVE-2013-4232.patch
component/libtiff/CVE-2013-4232.patch
+0
-18
component/libtiff/CVE-2013-4244.patch
component/libtiff/CVE-2013-4244.patch
+0
-18
component/libtiff/buildout.cfg
component/libtiff/buildout.cfg
+1
-6
component/libtiff/tiff_4.0.3-12.3.debian.patch
component/libtiff/tiff_4.0.3-12.3.debian.patch
+1900
-0
component/mariadb/buildout.cfg
component/mariadb/buildout.cfg
+2
-2
component/openldap/buildout.cfg
component/openldap/buildout.cfg
+2
-2
component/sqlite3/buildout.cfg
component/sqlite3/buildout.cfg
+2
-2
component/stunnel/buildout.cfg
component/stunnel/buildout.cfg
+2
-2
component/wget/buildout.cfg
component/wget/buildout.cfg
+3
-3
component/wget/wget-doc.makefile.patch
component/wget/wget-doc.makefile.patch
+6
-6
setup.py
setup.py
+1
-1
slapos/recipe/shellinabox.py
slapos/recipe/shellinabox.py
+0
-1
software/re6stnet/software.cfg
software/re6stnet/software.cfg
+2
-2
software/slaprunner/software.cfg
software/slaprunner/software.cfg
+1
-1
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+11
-11
stack/slapos.cfg
stack/slapos.cfg
+6
-6
No files found.
CHANGES.txt
View file @
c165673e
Changes
Changes
=======
=======
0.99 (2015-04-10)
-----------------
* re6stnet: new recipe to deploy re6st registry (re6st master) with slapos.
0.98 (2015-04-09)
-----------------
* shellinabox: do not run in debug mode, it is much slower !
0.97 (2015-03-26)
0.97 (2015-03-26)
-----------------
-----------------
* switch softwaretype recipe: the recipe is backward compatible with old slapos node packages.
* switch softwaretype recipe: the recipe is backward compatible with old slapos node packages.
...
...
component/gcc/buildout.cfg
View file @
c165673e
...
@@ -21,8 +21,8 @@ environment =
...
@@ -21,8 +21,8 @@ environment =
[mpc]
[mpc]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/mpc/mpc-1.0.
2
.tar.gz
url = http://ftp.gnu.org/gnu/mpc/mpc-1.0.
3
.tar.gz
md5sum =
68fadff3358fb3e7976c7a398a0af4c3
md5sum =
d6a1d5f8ddea3abd2cc3e98f58352d26
configure-options =
configure-options =
--with-gmp=${gmp:location}
--with-gmp=${gmp:location}
--with-mpfr=${mpfr:location}
--with-mpfr=${mpfr:location}
...
...
component/groonga/buildout.cfg
View file @
c165673e
...
@@ -13,8 +13,8 @@ extends =
...
@@ -13,8 +13,8 @@ extends =
[groonga]
[groonga]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = http://packages.groonga.org/source/groonga/groonga-5.0.
0
.tar.gz
url = http://packages.groonga.org/source/groonga/groonga-5.0.
2
.tar.gz
md5sum =
a403fd685405fbdb424a3679082790d2
md5sum =
6b62afa667cce73b5fda7a5b9e491b7b
# temporary patch to respect more tokens in natural language mode.
# temporary patch to respect more tokens in natural language mode.
patches =
patches =
${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b
${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b
...
@@ -37,9 +37,9 @@ environment =
...
@@ -37,9 +37,9 @@ environment =
[groonga-normalizer-mysql]
[groonga-normalizer-mysql]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
version = 1.0.
8
version = 1.0.
9
url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-${:version}.tar.gz
url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-${:version}.tar.gz
md5sum =
bcc01e8b715f0f9252effcf9d40338c1
md5sum =
8666686bfce38d14f305e2c90c242cff
location = ${groonga:location}
location = ${groonga:location}
configure-options =
configure-options =
--disable-static
--disable-static
...
...
component/libtasn1/buildout.cfg
View file @
c165673e
...
@@ -4,8 +4,8 @@ parts =
...
@@ -4,8 +4,8 @@ parts =
[libtasn1]
[libtasn1]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.
2
.tar.gz
url = http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.
4
.tar.gz
md5sum =
414df906df421dee0a5cf7548788d153
md5sum =
c26d76d1309dd339365c563076599912
configure-options =
configure-options =
--disable-static
--disable-static
--disable-gtk-doc-html
--disable-gtk-doc-html
component/libtiff/CVE-2012-4564.patch
deleted
100644 → 0
View file @
a4f1aa88
Index: tiff-4.0.3/tools/ppm2tiff.c
===================================================================
--- tiff-4.0.3.orig/tools/ppm2tiff.c 2013-06-23 10:36:50.779629492 -0400
+++ tiff-4.0.3/tools/ppm2tiff.c 2013-06-23 10:36:50.775629494 -0400
@@ -89,6 +89,7 @@
int c;
extern int optind;
extern char* optarg;
+ tmsize_t scanline_size;
if (argc < 2) {
fprintf(stderr, "%s: Too few arguments\n", argv[0]);
@@ -237,8 +238,16 @@
}
if (TIFFScanlineSize(out) > linebytes)
buf = (unsigned char *)_TIFFmalloc(linebytes);
- else
- buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out));
+ else {
+ scanline_size = TIFFScanlineSize(out);
+ if (scanline_size != 0)
+ buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out));
+ else {
+ fprintf(stderr, "%s: scanline size overflow\n",infile);
+ (void) TIFFClose(out);
+ exit(-2);
+ }
+ }
if (resolution > 0) {
TIFFSetField(out, TIFFTAG_XRESOLUTION, resolution);
TIFFSetField(out, TIFFTAG_YRESOLUTION, resolution);
component/libtiff/CVE-2013-1960.patch
deleted
100644 → 0
View file @
a4f1aa88
Index: tiff-4.0.3/tools/tiff2pdf.c
===================================================================
--- tiff-4.0.3.orig/tools/tiff2pdf.c 2013-06-23 10:36:50.979629486 -0400
+++ tiff-4.0.3/tools/tiff2pdf.c 2013-06-23 10:36:50.975629486 -0400
@@ -3341,33 +3341,56 @@
uint32 height){
tsize_t i=0;
- uint16 ri =0;
- uint16 v_samp=1;
- uint16 h_samp=1;
- int j=0;
-
- i++;
-
- while(i<(*striplength)){
+
+ while (i < *striplength) {
+ tsize_t datalen;
+ uint16 ri;
+ uint16 v_samp;
+ uint16 h_samp;
+ int j;
+ int ncomp;
+
+ /* marker header: one or more FFs */
+ if (strip[i] != 0xff)
+ return(0);
+ i++;
+ while (i < *striplength && strip[i] == 0xff)
+ i++;
+ if (i >= *striplength)
+ return(0);
+ /* SOI is the only pre-SOS marker without a length word */
+ if (strip[i] == 0xd8)
+ datalen = 0;
+ else {
+ if ((*striplength - i) <= 2)
+ return(0);
+ datalen = (strip[i+1] << 8) | strip[i+2];
+ if (datalen < 2 || datalen >= (*striplength - i))
+ return(0);
+ }
switch( strip[i] ){
- case 0xd8:
- /* SOI - start of image */
+ case 0xd8: /* SOI - start of image */
_TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), 2);
*bufferoffset+=2;
- i+=2;
break;
- case 0xc0:
- case 0xc1:
- case 0xc3:
- case 0xc9:
- case 0xca:
+ case 0xc0: /* SOF0 */
+ case 0xc1: /* SOF1 */
+ case 0xc3: /* SOF3 */
+ case 0xc9: /* SOF9 */
+ case 0xca: /* SOF10 */
if(no==0){
- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2);
- for(j=0;j<buffer[*bufferoffset+9];j++){
- if( (buffer[*bufferoffset+11+(2*j)]>>4) > h_samp)
- h_samp = (buffer[*bufferoffset+11+(2*j)]>>4);
- if( (buffer[*bufferoffset+11+(2*j)] & 0x0f) > v_samp)
- v_samp = (buffer[*bufferoffset+11+(2*j)] & 0x0f);
+ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2);
+ ncomp = buffer[*bufferoffset+9];
+ if (ncomp < 1 || ncomp > 4)
+ return(0);
+ v_samp=1;
+ h_samp=1;
+ for(j=0;j<ncomp;j++){
+ uint16 samp = buffer[*bufferoffset+11+(3*j)];
+ if( (samp>>4) > h_samp)
+ h_samp = (samp>>4);
+ if( (samp & 0x0f) > v_samp)
+ v_samp = (samp & 0x0f);
}
v_samp*=8;
h_samp*=8;
@@ -3381,45 +3404,43 @@
(unsigned char) ((height>>8) & 0xff);
buffer[*bufferoffset+6]=
(unsigned char) (height & 0xff);
- *bufferoffset+=strip[i+2]+2;
- i+=strip[i+2]+2;
-
+ *bufferoffset+=datalen+2;
+ /* insert a DRI marker */
buffer[(*bufferoffset)++]=0xff;
buffer[(*bufferoffset)++]=0xdd;
buffer[(*bufferoffset)++]=0x00;
buffer[(*bufferoffset)++]=0x04;
buffer[(*bufferoffset)++]=(ri >> 8) & 0xff;
buffer[(*bufferoffset)++]= ri & 0xff;
- } else {
- i+=strip[i+2]+2;
}
break;
- case 0xc4:
- case 0xdb:
- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2);
- *bufferoffset+=strip[i+2]+2;
- i+=strip[i+2]+2;
+ case 0xc4: /* DHT */
+ case 0xdb: /* DQT */
+ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2);
+ *bufferoffset+=datalen+2;
break;
- case 0xda:
+ case 0xda: /* SOS */
if(no==0){
- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2);
- *bufferoffset+=strip[i+2]+2;
- i+=strip[i+2]+2;
+ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2);
+ *bufferoffset+=datalen+2;
} else {
buffer[(*bufferoffset)++]=0xff;
buffer[(*bufferoffset)++]=
(unsigned char)(0xd0 | ((no-1)%8));
- i+=strip[i+2]+2;
}
- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), (*striplength)-i-1);
- *bufferoffset+=(*striplength)-i-1;
+ i += datalen + 1;
+ /* copy remainder of strip */
+ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i]), *striplength - i);
+ *bufferoffset+= *striplength - i;
return(1);
default:
- i+=strip[i+2]+2;
+ /* ignore any other marker */
+ break;
}
+ i += datalen + 1;
}
-
+ /* failed to find SOS marker */
return(0);
}
#endif
component/libtiff/CVE-2013-4231.patch
deleted
100644 → 0
View file @
a4f1aa88
Description: Buffer overflow in gif2tiff
Bug: http://bugzilla.maptools.org/show_bug.cgi?id=2450
Bug-Debian: http://bugs.debian.org/719303
Index: tiff-4.0.3/tools/gif2tiff.c
===================================================================
--- tiff-4.0.3.orig/tools/gif2tiff.c 2013-08-22 11:46:11.960846910 -0400
+++ tiff-4.0.3/tools/gif2tiff.c 2013-08-22 11:46:11.956846910 -0400
@@ -333,6 +333,8 @@
int status = 1;
datasize = getc(infile);
+ if (datasize > 12)
+ return 0;
clear = 1 << datasize;
eoi = clear + 1;
avail = clear + 2;
component/libtiff/CVE-2013-4232.patch
deleted
100644 → 0
View file @
a4f1aa88
Description: use after free in tiff2pdf
Bug: http://bugzilla.maptools.org/show_bug.cgi?id=2449
Bug-Debian: http://bugs.debian.org/719303
Index: tiff-4.0.3/tools/tiff2pdf.c
===================================================================
--- tiff-4.0.3.orig/tools/tiff2pdf.c 2013-08-22 11:46:37.292847242 -0400
+++ tiff-4.0.3/tools/tiff2pdf.c 2013-08-22 11:46:37.292847242 -0400
@@ -2461,7 +2461,8 @@
(unsigned long) t2p->tiff_datasize,
TIFFFileName(input));
t2p->t2p_error = T2P_ERR_ERROR;
- _TIFFfree(buffer);
+ _TIFFfree(buffer);
+ return(0);
} else {
buffer=samplebuffer;
t2p->tiff_datasize *= t2p->tiff_samplesperpixel;
component/libtiff/CVE-2013-4244.patch
deleted
100644 → 0
View file @
a4f1aa88
Description: OOB write in gif2tiff
Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=996468
Index: tiff-4.0.3/tools/gif2tiff.c
===================================================================
--- tiff-4.0.3.orig/tools/gif2tiff.c 2013-08-24 11:17:13.546447901 -0400
+++ tiff-4.0.3/tools/gif2tiff.c 2013-08-24 11:17:13.546447901 -0400
@@ -400,6 +400,10 @@
}
if (oldcode == -1) {
+ if (code >= clear) {
+ fprintf(stderr, "bad input: code=%d is larger than clear=%d\n",code, clear);
+ return 0;
+ }
*(*fill)++ = suffix[code];
firstchar = oldcode = code;
return 1;
component/libtiff/buildout.cfg
View file @
c165673e
...
@@ -14,12 +14,7 @@ url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz
...
@@ -14,12 +14,7 @@ url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz
md5sum = 051c1068e6a0627f461948c365290410
md5sum = 051c1068e6a0627f461948c365290410
patch-options = -p1
patch-options = -p1
patches =
patches =
${:_profile_base_location_}/CVE-2012-4564.patch#45667ee618dbe78acce1129706556124
${:_profile_base_location_}/tiff_4.0.3-12.3.debian.patch#c246dc095f57f869b35cf40a32aa8366
${:_profile_base_location_}/CVE-2013-1960.patch#21a3d119cd3eeadd35ccc355fbd748cf
${:_profile_base_location_}/CVE-2013-1961.patch#bb219740a815b9b47698b83d0ae9f82a
${:_profile_base_location_}/CVE-2013-4231.patch#f6ff024c8df861a6dbb5a0ecd8a0f853
${:_profile_base_location_}/CVE-2013-4232.patch#b439184b3a5f434a3e3235f611b54a89
${:_profile_base_location_}/CVE-2013-4244.patch#2acff059c6156953aadb436b475e5acb
configure-options =
configure-options =
--disable-static
--disable-static
--without-x
--without-x
...
...
component/libtiff/
CVE-2013-1961
.patch
→
component/libtiff/
tiff_4.0.3-12.3.debian
.patch
View file @
c165673e
This diff is collapsed.
Click to expand it.
component/mariadb/buildout.cfg
View file @
c165673e
...
@@ -58,8 +58,8 @@ environment =
...
@@ -58,8 +58,8 @@ environment =
# mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
# mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
# http://mroonga.github.com/
# http://mroonga.github.com/
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = http://packages.groonga.org/source/mroonga/mroonga-5.0
0
.tar.gz
url = http://packages.groonga.org/source/mroonga/mroonga-5.0
1
.tar.gz
md5sum =
c0d49ef2ca60b82cd40eb9a842460f55
md5sum =
b9fd8d5ebf6088b6a23f05485cc8733f
configure-command = mkdir fake_mariadb_source && ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql && ./configure
configure-command = mkdir fake_mariadb_source && ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql && ./configure
configure-options =
configure-options =
--prefix=${buildout:parts-directory}/${:_buildout_section_name_}
--prefix=${buildout:parts-directory}/${:_buildout_section_name_}
...
...
component/openldap/buildout.cfg
View file @
c165673e
...
@@ -8,8 +8,8 @@ extends =
...
@@ -8,8 +8,8 @@ extends =
[openldap]
[openldap]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.
33
.tgz
url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.
40
.tgz
md5sum =
5adae44897647c15ce5abbff313bc85a
md5sum =
423c1f23d2a0cb96b3e9baf7e9d7dda7
configure-options =
configure-options =
--disable-static
--disable-static
--disable-slapd
--disable-slapd
...
...
component/sqlite3/buildout.cfg
View file @
c165673e
...
@@ -5,8 +5,8 @@ parts =
...
@@ -5,8 +5,8 @@ parts =
[sqlite3]
[sqlite3]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = http://sqlite.org/2015/sqlite-autoconf-3080
801
.tar.gz
url = http://sqlite.org/2015/sqlite-autoconf-3080
900
.tar.gz
md5sum =
a6381941ffe8817ba19669ec0c0ede6
f
md5sum =
6a18d4609852f4b63f812a1059df468
f
configure-options =
configure-options =
--disable-static
--disable-static
--enable-readline
--enable-readline
...
...
component/stunnel/buildout.cfg
View file @
c165673e
...
@@ -6,8 +6,8 @@ parts =
...
@@ -6,8 +6,8 @@ parts =
[stunnel]
[stunnel]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = https://www.stunnel.org/downloads/archive/5.x/stunnel-5.1
2
.tar.gz
url = https://www.stunnel.org/downloads/archive/5.x/stunnel-5.1
4
.tar.gz
md5sum =
43685457503bb24144d03dc307b3211b
md5sum =
e716501960dc6856d80f92547298f724
configure-options =
configure-options =
--enable-ipv6
--enable-ipv6
--disable-libwrap
--disable-libwrap
...
...
component/wget/buildout.cfg
View file @
c165673e
...
@@ -10,8 +10,8 @@ parts =
...
@@ -10,8 +10,8 @@ parts =
[wget]
[wget]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = http://ftp.gnu.org/gnu/wget/wget-1.16.
1
.tar.xz
url = http://ftp.gnu.org/gnu/wget/wget-1.16.
3
.tar.xz
md5sum =
78942cc0cce0a23e18114d982789e360
md5sum =
d2e4455781a70140ae83b54ca594ce21
configure-options =
configure-options =
--enable-ipv6
--enable-ipv6
--enable-opie
--enable-opie
...
@@ -24,7 +24,7 @@ patch-options =
...
@@ -24,7 +24,7 @@ patch-options =
-p1
-p1
patches =
patches =
${:_profile_base_location_}/wget-doc.makefile.patch#
aabcc1695c7fb65ac44f295e04a2db78
${:_profile_base_location_}/wget-doc.makefile.patch#
0d23cf1ee81268a94699aebbb26058e6
environment =
environment =
PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
...
...
component/wget/wget-doc.makefile.patch
View file @
c165673e
...
@@ -7,16 +7,16 @@
...
@@ -7,16 +7,16 @@
-SUBDIRS = lib src doc po tests util testenv
-SUBDIRS = lib src doc po tests util testenv
+SUBDIRS = lib src po tests util testenv
+SUBDIRS = lib src po tests util testenv
EXTRA_DIST =
ChangeLog.README
MAILING-LIST \
EXTRA_DIST = MAILING-LIST \
msdos/
ChangeLog msdos/
config.h msdos/Makefile.DJ \
msdos/config.h msdos/Makefile.DJ \
--- a/Makefile.in 2012-08-05 22:17:17.000000000 +0200
--- a/Makefile.in 2012-08-05 22:17:17.000000000 +0200
+++ b/Makefile.in 2013-06-21 15:05:04.351269286 +0200
+++ b/Makefile.in 2013-06-21 15:05:04.351269286 +0200
@@ -1
195,7 +1195
,7 @@
@@ -1
322,7 +1322
,7 @@
ACLOCAL_AMFLAGS = -I m4
ACLOCAL_AMFLAGS = -I m4
# subdirectories in the distribution
# subdirectories in the distribution
-SUBDIRS = lib src doc po tests util testenv
-SUBDIRS = lib src doc po tests util testenv
+SUBDIRS = lib src po tests util testenv
+SUBDIRS = lib src po tests util testenv
EXTRA_DIST =
ChangeLog.README
MAILING-LIST \
EXTRA_DIST = MAILING-LIST \
msdos/
ChangeLog msdos/
config.h msdos/Makefile.DJ \
msdos/config.h msdos/Makefile.DJ \
msdos/Makefile.WC ABOUT-NLS \
msdos/Makefile.WC ABOUT-NLS \
setup.py
View file @
c165673e
...
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
...
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import
glob
import
glob
import
os
import
os
version
=
'0.
97.dev
'
version
=
'0.
100.dev0
'
name
=
'slapos.cookbook'
name
=
'slapos.cookbook'
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
...
...
slapos/recipe/shellinabox.py
View file @
c165673e
...
@@ -69,7 +69,6 @@ def shellinabox(args):
...
@@ -69,7 +69,6 @@ def shellinabox(args):
command_line
=
[
command_line
=
[
args
[
'shellinabox'
],
args
[
'shellinabox'
],
'-d'
,
'-c'
,
certificate_dir
,
'-c'
,
certificate_dir
,
'-s'
,
service
,
'-s'
,
service
,
'--ipv6'
,
args
[
'ipv6'
],
'--ipv6'
,
args
[
'ipv6'
],
...
...
software/re6stnet/software.cfg
View file @
c165673e
...
@@ -13,7 +13,6 @@ extends =
...
@@ -13,7 +13,6 @@ extends =
develop =
develop =
${:parts-directory}/re6stnet-repository
${:parts-directory}/re6stnet-repository
${:parts-directory}/slapos.cookbook-repository
parts =
parts =
slapos-cookbook
slapos-cookbook
...
@@ -48,6 +47,8 @@ eggs =
...
@@ -48,6 +47,8 @@ eggs =
[re6stnet-repository]
[re6stnet-repository]
repository = http://git.erp5.org/repos/re6stnet.git
repository = http://git.erp5.org/repos/re6stnet.git
branch = re6st-slapos
branch = re6st-slapos
revision = e70bead521b3e8747865b089124a71d54988da16
[slapos.cookbook-repository]
[slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
...
@@ -120,7 +121,6 @@ stop-on-error = true
...
@@ -120,7 +121,6 @@ stop-on-error = true
update-command = ${:command}
update-command = ${:command}
command =
command =
grep parts ${buildout:develop-eggs-directory}/re6stnet.egg-link
grep parts ${buildout:develop-eggs-directory}/re6stnet.egg-link
grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
[versions]
[versions]
apache-libcloud = 0.17.0
apache-libcloud = 0.17.0
...
...
software/slaprunner/software.cfg
View file @
c165673e
...
@@ -21,7 +21,7 @@ plone.recipe.command = 1.1
...
@@ -21,7 +21,7 @@ plone.recipe.command = 1.1
pycrypto = 2.6.1
pycrypto = 2.6.1
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.template = 2.6
slapos.recipe.template = 2.6
slapos.toolbox = 0.4
7.3
slapos.toolbox = 0.4
8
smmap = 0.9.0
smmap = 0.9.0
z3c.recipe.scripts = 1.0.1
z3c.recipe.scripts = 1.0.1
...
...
stack/erp5/buildout.cfg
View file @
c165673e
...
@@ -585,7 +585,7 @@ zope.app.testing = 3.8.1
...
@@ -585,7 +585,7 @@ zope.app.testing = 3.8.1
# Pinned versions
# Pinned versions
MySQL-python = 1.2.5
MySQL-python = 1.2.5
Pillow = 2.
7.0
Pillow = 2.
8.1
Products.CMFActionIcons = 2.1.3
Products.CMFActionIcons = 2.1.3
Products.DCWorkflowGraph = 0.4.1
Products.DCWorkflowGraph = 0.4.1
Products.ExternalEditor = 1.1.0
Products.ExternalEditor = 1.1.0
...
@@ -607,7 +607,7 @@ csp-eventlet = 0.7.0
...
@@ -607,7 +607,7 @@ csp-eventlet = 0.7.0
ecdsa = 0.13
ecdsa = 0.13
elementtree = 1.2.6.post20050316
elementtree = 1.2.6.post20050316
erp5diff = 0.8.1.5
erp5diff = 0.8.1.5
eventlet = 0.17.
1
eventlet = 0.17.
3
five.formlib = 1.0.4
five.formlib = 1.0.4
five.localsitemanager = 2.0.5
five.localsitemanager = 2.0.5
gitdb = 0.6.4
gitdb = 0.6.4
...
@@ -617,7 +617,7 @@ httplib2 = 0.9
...
@@ -617,7 +617,7 @@ httplib2 = 0.9
huBarcode = 1.0.0
huBarcode = 1.0.0
interval = 1.0.0
interval = 1.0.0
ipdb = 0.8
ipdb = 0.8
ipython = 3.
0
.0
ipython = 3.
1
.0
logilab-common = 0.63.2
logilab-common = 0.63.2
numpy = 1.9.2
numpy = 1.9.2
plone.recipe.command = 1.1
plone.recipe.command = 1.1
...
@@ -635,7 +635,7 @@ qrcode = 5.1
...
@@ -635,7 +635,7 @@ qrcode = 5.1
restkit = 4.2.2
restkit = 4.2.2
rtjp-eventlet = 0.3.2
rtjp-eventlet = 0.3.2
slapos.recipe.template = 2.6
slapos.recipe.template = 2.6
slapos.toolbox = 0.4
7.3
slapos.toolbox = 0.4
8
smmap = 0.9.0
smmap = 0.9.0
socketpool = 0.5.3
socketpool = 0.5.3
spyne = 2.11.0
spyne = 2.11.0
...
@@ -648,15 +648,15 @@ validictory = 1.0.0
...
@@ -648,15 +648,15 @@ validictory = 1.0.0
xupdate-processor = 0.4
xupdate-processor = 0.4
# Required by:
# Required by:
# slapos.toolbox==0.4
7.3
# slapos.toolbox==0.4
8
GitPython =
0.3.6
GitPython =
1.0.0
# Required by:
# Required by:
# Products.CMFCore==2.2.8
# Products.CMFCore==2.2.8
Products.ZSQLMethods = 2.13.4
Products.ZSQLMethods = 2.13.4
# Required by:
# Required by:
# slapos.toolbox==0.4
7.3
# slapos.toolbox==0.4
8
atomize = 0.2.0
atomize = 0.2.0
# Required by:
# Required by:
...
@@ -664,7 +664,7 @@ atomize = 0.2.0
...
@@ -664,7 +664,7 @@ atomize = 0.2.0
backports.ssl-match-hostname = 3.4.0.2
backports.ssl-match-hostname = 3.4.0.2
# Required by:
# Required by:
# slapos.toolbox==0.4
7.3
# slapos.toolbox==0.4
8
feedparser = 5.1.3
feedparser = 5.1.3
# Required by:
# Required by:
...
@@ -672,15 +672,15 @@ feedparser = 5.1.3
...
@@ -672,15 +672,15 @@ feedparser = 5.1.3
fpconst = 0.7.2
fpconst = 0.7.2
# Required by:
# Required by:
# slapos.toolbox==0.4
7.3
# slapos.toolbox==0.4
8
lockfile = 0.10.2
lockfile = 0.10.2
# Required by:
# Required by:
# slapos.toolbox==0.4
7.3
# slapos.toolbox==0.4
8
paramiko = 1.15.2
paramiko = 1.15.2
# Required by:
# Required by:
# slapos.toolbox==0.4
7.3
# slapos.toolbox==0.4
8
rpdb = 0.1.5
rpdb = 0.1.5
# Required by:
# Required by:
...
...
stack/slapos.cfg
View file @
c165673e
...
@@ -111,7 +111,7 @@ hexagonit.recipe.download = 1.7.post4
...
@@ -111,7 +111,7 @@ hexagonit.recipe.download = 1.7.post4
Jinja2 = 2.7.3
Jinja2 = 2.7.3
MarkupSafe = 0.23
MarkupSafe = 0.23
Werkzeug = 0.10.
1
Werkzeug = 0.10.
4
buildout-versions = 1.7
buildout-versions = 1.7
cffi = 0.9.2
cffi = 0.9.2
collective.recipe.template = 1.11
collective.recipe.template = 1.11
...
@@ -120,9 +120,9 @@ cryptography = 0.8.1
...
@@ -120,9 +120,9 @@ cryptography = 0.8.1
inotifyx = 0.2.2
inotifyx = 0.2.2
itsdangerous = 0.24
itsdangerous = 0.24
lxml = 3.4.2
lxml = 3.4.2
meld3 = 1.0.
0
meld3 = 1.0.
2
mr.developer = 1.31
mr.developer = 1.31
netaddr = 0.7.1
3
netaddr = 0.7.1
4
pbr = 0.10.8
pbr = 0.10.8
prettytable = 0.7.2
prettytable = 0.7.2
psutil = 2.2.1
psutil = 2.2.1
...
@@ -133,10 +133,10 @@ requests = 2.6.0
...
@@ -133,10 +133,10 @@ requests = 2.6.0
setuptools = 12.0.4
setuptools = 12.0.4
simplejson = 3.6.5
simplejson = 3.6.5
six = 1.9.0
six = 1.9.0
slapos.cookbook = 0.9
7
slapos.cookbook = 0.9
9
slapos.core = 1.3.9
slapos.core = 1.3.9
slapos.libnetworkcache = 0.14.2
slapos.libnetworkcache = 0.14.2
slapos.recipe.build = 0.2
0
slapos.recipe.build = 0.2
1
slapos.recipe.cmmi = 0.2
slapos.recipe.cmmi = 0.2
stevedore = 1.3.0
stevedore = 1.3.0
xml-marshaller = 0.9.7
xml-marshaller = 0.9.7
...
@@ -172,7 +172,7 @@ netifaces = 0.10.4
...
@@ -172,7 +172,7 @@ netifaces = 0.10.4
# Required by:
# Required by:
# pbr==0.10.8
# pbr==0.10.8
pip = 6.
0.8
pip = 6.
1.1
# Required by:
# Required by:
# cryptography==0.8
# cryptography==0.8
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment