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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Klaus Wölfel
slapos
Commits
724b5ae0
Commit
724b5ae0
authored
Oct 21, 2011
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'erp5' into erp5-generic
parents
26e75418
efb0a98d
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
78 additions
and
95 deletions
+78
-95
component/apache/buildout.cfg
component/apache/buildout.cfg
+2
-0
component/gdbm/buildout.cfg
component/gdbm/buildout.cfg
+4
-11
component/imagemagick/buildout.cfg
component/imagemagick/buildout.cfg
+2
-2
component/mariadb/buildout.cfg
component/mariadb/buildout.cfg
+2
-2
component/memcached/buildout.cfg
component/memcached/buildout.cfg
+21
-3
component/memcached/memcached-fix-strict-aliasing.patch
component/memcached/memcached-fix-strict-aliasing.patch
+0
-40
component/memcached/memcached-gcc-4.4.patch
component/memcached/memcached-gcc-4.4.patch
+12
-0
component/memcached/memcached-gcc4.6.patch
component/memcached/memcached-gcc4.6.patch
+0
-36
component/perl/buildout.cfg
component/perl/buildout.cfg
+2
-0
component/python-2.6/buildout.cfg
component/python-2.6/buildout.cfg
+2
-0
component/python-2.7/buildout.cfg
component/python-2.7/buildout.cfg
+2
-0
software/erp5/software.cfg
software/erp5/software.cfg
+29
-1
No files found.
component/apache/buildout.cfg
View file @
724b5ae0
...
...
@@ -23,6 +23,8 @@ download-only = true
[apache]
# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
recipe = hexagonit.recipe.cmmi
depends =
${gdbm:version}
url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.21.tar.bz2
md5sum = 1696ae62cd879ab1d4dd9ff021a470f2
patches =
...
...
component/gdbm/buildout.cfg
View file @
724b5ae0
...
...
@@ -2,25 +2,18 @@
parts =
gdbm
[gdbm-nochange-patch-download]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/${:filename}
md5sum = fafa6cae0afbf2b5afb9ef3b8e3035a4
download-only = true
filename = gdbm-Makefile.in-nochange.patch
[gdbm]
recipe = hexagonit.recipe.cmmi
url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-1.8.3.tar.gz
md5sum = 1d1b1d5c0245b1c00aff92da751e9aa1
patches = ${gdbm-nochange-patch-download:location}/${gdbm-nochange-patch-download:filename}
version = 1.9.1
url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
md5sum = 59f6e4c4193cb875964ffbe8aa384b58
configure-options =
--disable-static
# install as parts/gdbm/include/gdbm/*.h etc. because some softwares
# (eg. python's dbmmodule.c extension) assume the location like this.
includedir = ${buildout:parts-directory}/${:_buildout_section_name_}/include
make-targets =
install in
stall-compat in
cludedir=${:includedir}/gdbm && rm -f ${:includedir}/*.h && ln -sf gdbm/gdbm.h ${:includedir}/gdbm.h
install includedir=${:includedir}/gdbm && rm -f ${:includedir}/*.h && ln -sf gdbm/gdbm.h ${:includedir}/gdbm.h
# it seems that parallel build sometimes fails for gdbm.
make-options =
-j1
component/imagemagick/buildout.cfg
View file @
724b5ae0
...
...
@@ -35,8 +35,8 @@ filename = imagemagick-6.6.7-4-without-lzma.patch
[imagemagick]
recipe = hexagonit.recipe.cmmi
url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.
2-10
.tar.bz2
md5sum =
073ec5d7f2a22db96a0e87e4322b75f9
url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.
3-1
.tar.bz2
md5sum =
89d378733d89bc61c04bc0fdc140a3a7
configure-options =
--disable-static
--without-x
...
...
component/mariadb/buildout.cfg
View file @
724b5ae0
...
...
@@ -21,9 +21,9 @@ download-only = true
[mariadb]
recipe = hexagonit.recipe.cmmi
version = 5.3.
1
-beta
version = 5.3.
2
-beta
url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://mirror.layerjet.com/mariadb
md5sum =
5b3a94de1c1fcaa193edbbc8d7f8ffe4
md5sum =
d8199454059ab2c98313aaad0c1bc318
# compile directory is required to build mysql plugins.
keep-compile-dir = true
# configure: how to avoid searching for my.cnf?
...
...
component/memcached/buildout.cfg
View file @
724b5ae0
[buildout]
parts = memcached
extends = ../libevent/buildout.cfg
extends =
../autoconf/buildout.cfg
../automake/buildout.cfg
../libevent/buildout.cfg
[memcached-fix-array-subscript-is-above-array-bounds]
recipe = hexagonit.recipe.download
...
...
@@ -9,15 +12,30 @@ filename = memcached-1.4-fix-array-subscript-is-above-array-bounds.patch
download-only = true
md5sum = 472508b9a4b6c0b9f5d6f2abce3444e3
[memcached-gcc-4.4.patch]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/${:filename}
filename = memcached-gcc-4.4.patch
download-only = true
md5sum = fd98d0cbfc4d3a25ac9808472fbe62f8
[memcached]
recipe = hexagonit.recipe.cmmi
url = http://memcached.googlecode.com/files/memcached-1.4.8.tar.gz
md5sum = b7104e269511621c2777367d6d6315fe
patches =
${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename}
${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename}
${memcached-gcc-4.4.patch:location}/${memcached-gcc-4.4.patch:filename}
patch-options = -p1
configure-command =
aclocal-1.11
autoheader
automake-1.11 --foreign
autoconf
./configure
configure-options =
--prefix=${buildout:parts-directory}/${:_buildout_section_name_}
--with-libevent=${libevent:location}
--disable-docs
environment =
PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:%(PATH)s
LDFLAGS =-Wl,-rpath=${libevent:location}/lib
component/memcached/memcached-fix-strict-aliasing.patch
deleted
100644 → 0
View file @
26e75418
diff -rdBu memcached-1.4.0-rc1/memcached.h memcached-1.4.0-my/memcached.h
--- memcached-1.4.0-rc1/memcached.h 2009-05-29 00:51:56.000000000 +0400
+++ memcached-1.4.0-my/memcached.h 2009-06-07 22:32:52.000000000 +0400
@@ -75,21 +75,21 @@
/* warning: don't use these macros with a function, as it evals its arg twice */
#define ITEM_get_cas(i) ((uint64_t)(((i)->it_flags & ITEM_CAS) ? \
- *(uint64_t*)&((i)->end[0]) : 0x0))
+ *(uint64_t*)((char*)(i) + sizeof(*i)) : 0x0))
#define ITEM_set_cas(i,v) { if ((i)->it_flags & ITEM_CAS) { \
- *(uint64_t*)&((i)->end[0]) = v; } }
+ *(uint64_t*)((char*)(i) + sizeof(*i)) = v; } }
-#define ITEM_key(item) (((char*)&((item)->end[0])) \
+#define ITEM_key(item) ((char*)(item) + sizeof(*item) \
+ (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
-#define ITEM_suffix(item) ((char*) &((item)->end[0]) + (item)->nkey + 1 \
+#define ITEM_suffix(item) ((char*)(item) + sizeof(*item) + (item)->nkey + 1 \
+ (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
-#define ITEM_data(item) ((char*) &((item)->end[0]) + (item)->nkey + 1 \
+#define ITEM_data(item) ((char*)(item) + sizeof(*item) + (item)->nkey + 1 \
+ (item)->nsuffix \
+ (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
-#define ITEM_ntotal(item) (sizeof(struct _stritem) + (item)->nkey + 1 \
+#define ITEM_ntotal(item) (sizeof(*item) + (item)->nkey + 1 \
+ (item)->nsuffix + (item)->nbytes \
+ (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
@@ -285,7 +285,6 @@
uint8_t it_flags; /* ITEM_* above */
uint8_t slabs_clsid;/* which slab class we're in */
uint8_t nkey; /* key length, w/terminating null and padding */
- void * end[];
/* if it_flags & ITEM_CAS we have 8 bytes CAS */
/* then null-terminated key */
/* then " flags length\r\n" (no terminating null) */
component/memcached/memcached-gcc-4.4.patch
0 → 100644
View file @
724b5ae0
#
In OpenSuse 11.2, 'gcc -dumpversion' returns '4.4', not '4.4.*'.
--- memcached-1.4.8/configure.ac.orig
+++ memcached-1.4.8/configure.ac
@@ -502,7 +502,7 @@
GCC_VERSION=`$CC -dumpversion`
CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
case $GCC_VERSION in
- 4.4.*)
+ 4.4 | 4.4.*)
CFLAGS="$CFLAGS -fno-strict-aliasing"
;;
esac
component/memcached/memcached-gcc4.6.patch
deleted
100644 → 0
View file @
26e75418
diff --git a/items.c b/items.c
index e7f01ea..9fc6704 100644
--- a/items.c
+++ b/items.c
@@ -450,9 +450,7 @@
void do_item_stats_sizes(ADD_STAT add_stats, void *c) {
for (i = 0; i < num_buckets; i++) {
if (histogram[i] != 0) {
char key[8];
- int klen = 0;
- klen = snprintf(key, sizeof(key), "%d", i * 32);
- assert(klen < sizeof(key));
+ assert(snprintf(key, sizeof(key), "%d", i * 32) < sizeof(key));
APPEND_STAT(key, "%u", histogram[i]);
}
}
diff --git a/memcached.c b/memcached.c
index 750c8b3..0913b77 100644
--- a/memcached.c
+++ b/memcached.c
@@ -4627,8 +4627,6 @@
int main (int argc, char **argv) {
/* create the listening socket, bind it, and init */
if (settings.socketpath == NULL) {
- int udp_port;
-
const char *portnumber_filename = getenv("MEMCACHED_PORT_FILENAME");
char temp_portnumber_filename[PATH_MAX];
FILE *portnumber_file = NULL;
@@ -4658,7 +4656,6 @@
int main (int argc, char **argv) {
* then daemonise if needed, then init libevent (in some cases
* descriptors created by libevent wouldn't survive forking).
*/
- udp_port = settings.udpport ? settings.udpport : settings.port;
/* create the UDP listening socket and bind it */
errno = 0;
component/perl/buildout.cfg
View file @
724b5ae0
...
...
@@ -14,6 +14,8 @@ filename = ${:_buildout_section_name_}
[perl]
recipe = hexagonit.recipe.cmmi
depends =
${gdbm:version}
version = 5.14.2
url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
md5sum = 04a4c5d3c1f9f19d77daff8e8cd19a26
...
...
component/python-2.6/buildout.cfg
View file @
724b5ae0
...
...
@@ -24,6 +24,8 @@ filename = python-2.6.6-no_system_inc_dirs.patch
[python2.6]
recipe = hexagonit.recipe.cmmi
depends =
${gdbm:version}
# This is actually the default setting for prefix, but we can't use it in
# other settings in this part if we don't set it explicitly here.
prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
...
...
component/python-2.7/buildout.cfg
View file @
724b5ae0
...
...
@@ -38,6 +38,8 @@ python = python2.7
[python2.7common]
recipe = hexagonit.recipe.cmmi
depends =
${gdbm:version}
# This is actually the default setting for prefix, but we can't use it in
# other settings in this part if we don't set it explicitly here.
prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
...
...
software/erp5/software.cfg
View file @
724b5ae0
...
...
@@ -135,7 +135,7 @@ output = ${buildout:directory}/schema.json
mode = 0644
[networkcache]
# Romain Courteaud signature certificate
# Romain Courteaud
+ Sebastien Robin
signature certificate
signature-certificate-list =
-----BEGIN CERTIFICATE-----
MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
...
...
@@ -150,3 +150,31 @@ signature-certificate-list =
q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
QUUGLQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDwyupMnruo3+Z2
1BBkQj+nCECu+TMI9s/0NVd73Hfst9GSr/eaZW8MJ6XNwyR/2DOkZs+1v97FBD9w
dT1Njg6WBF+Qavi5NU9D+XWOXNLQEJYIH1tEFbjcHKog4DplKOuOM59pBpVUak6Y
eZCoWXa3e7dNdv3jOUkqaTgG8Sv3tHetBTF2nSuj3M4ti66wV60Spo9L0BkeQl8j
h5qhr06aX0AYfrfHElWw4rvYz6ExIz4uP86/YlyktkI0DBNnI8uaOPKtgb8AzipF
b4wgWkwpmqCr/5+3DYFNIow2wkeq2XQKuC8um7EQXr3pDgCSEux5zb0sq7voyIhS
MIUIDQqXAgMBAAECggEBAKDIzdSltWcZQrmb9uoLdpdhIlfz3IkizU8jAyyY1ZdC
UvVg/LOjAZibLNKNeGTJiApCAHY7DVR+9qFwF6QetEyl1O4JD9YT677W5xFNmBMI
0DXSQk3fN1X66fsT3spHnaqRe+NUWwhIB/02R0qymlwAhzB5wSQlz147bgbsqVA3
bH6EuKLaGd0QSfAfp0ELqk0iz/K/TSIdH2W3UThB9setbLbYcmALDZ6ugUSqxHcn
8P9W8FUOONS68+wERL4cBAQ97SJLgOkV5HWWDd2GmP8Odh8KPJ8yuMeUrwuuFJb4
pUsICfBSJrTrdDli97ocuutwgSKmDuocTk3Ble7qCHECgYEA/dyzt1TzXN+V3J6n
L/yOznsd6gYOwriKiugYnjM6RMsPBAdb2OdD6idtQQEBkL5LH5jNy+0yQco1oqoV
HxZeqpGvQKPjHPLWUDNgHa880p3aAIr+y0lb5HfXPUZJscGanodJg8zEo4/6o3lh
34mXRTXhqWt11DulIspTpJw4gckCgYEA8tIJchWeqkkQff7l8wlLQFcMjMmBqtDO
UDMWWo3OV/MmKNGpyXFnRoyZf5MY03CZ7vskMmGYrG4UoRDhkX1uFjccFqTTtt8B
gEbY6DwNpckKLoyO99vwqeH2ZH6K2PsHJxBPHW5MyHE+mqyQP1peONisI73ke2MD
HTaSiwVGWV8CgYEA4bp3StMMuk5NESk5fB/UU6GBze+o/FffSPhru2/NphHwviJU
9x9ccj6wlRZx7+RlJClZBLVa9Mj6vDMEKOpZLs3vyUhwz/LVweaM1phVOuoFSGpP
eS83uIUfLGrtaFPASqn9ImbXiqChuu5ZqszLZ00r5NuaoCaRBchma35FeJECgYEA
kEAQlnKbiIPRRVhpGMFbsARGk1ieLHDRL7m5vN/jRkJPWA599ArnlHSwN6aWJ/4L
pHoTnc522XCn1qtlpX3DKXVhvV372/aNOLxd3VDXtrZA0zhzMnG5feKb8kVujMpM
DHvW1CATgzwrOc3r/4ba1KB7WtxTYK2ISxGBaw8eJLcCgYEAr12H7C22rKbySQdr
unCbkFS1U3D5rQrpneWzN3DkFySSMOwref/l1VJMJh+F5p2s8VQxlC14+rmNh3o3
pLK+jHoGZ00q15vsH4xKTUTHgyUOQ8e/FsrY9pwadT6iw529B6C+ZNzqRnRGfbZr
teOUBdScIHhUmQDkNALjEmOyYNI=
-----END CERTIFICATE-----
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