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
isaak yansane-sisk
slapos
Commits
286af66f
Commit
286af66f
authored
Jul 03, 2013
by
Vivien Alger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Copying some patches from cygwin branch
parent
9a7dcc00
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
40 additions
and
10 deletions
+40
-10
component/glib/buildout.cfg
component/glib/buildout.cfg
+4
-0
component/glib/cygwin-glib-2.28.8-src.patch
component/glib/cygwin-glib-2.28.8-src.patch
+11
-0
component/popt/buildout.cfg
component/popt/buildout.cfg
+3
-0
component/popt/cygwin-popt-1.16-src.patch
component/popt/cygwin-popt-1.16-src.patch
+13
-0
software/davstorage/common.cfg
software/davstorage/common.cfg
+1
-1
software/davstorage/instance-davstorage.cfg
software/davstorage/instance-davstorage.cfg
+8
-9
No files found.
component/glib/buildout.cfg
View file @
286af66f
...
@@ -17,3 +17,7 @@ environment =
...
@@ -17,3 +17,7 @@ environment =
CPPFLAGS=-I${zlib:location}/include -I${gettext:location}/include
CPPFLAGS=-I${zlib:location}/include -I${gettext:location}/include
LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
PATH=${gettext:location}/bin:%(PATH)s
PATH=${gettext:location}/bin:%(PATH)s
[x86-cygwin-glib]
patches =
${:_profile_base_location_}/cygwin-glib-2.28.8-src.patch
component/glib/cygwin-glib-2.28.8-src.patch
0 → 100644
View file @
286af66f
--- glib/gstrfuncs.c~ 2012-12-30 14:51:30.000000000 +0800
+++ glib/gstrfuncs.c 2012-12-30 14:51:50.203125000 +0800
@@ -1423,7 +1423,7 @@
#ifdef HAVE_STRSIGNAL
const char *msg_locale;
-#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN)
+#if defined(G_OS_BEOS)
extern const char *strsignal(int);
#else
/* this is declared differently (const) in string.h on BeOS */
component/popt/buildout.cfg
View file @
286af66f
...
@@ -8,3 +8,6 @@ url = ftp://anduin.linuxfromscratch.org/BLFS/svn/p/popt-1.16.tar.gz
...
@@ -8,3 +8,6 @@ url = ftp://anduin.linuxfromscratch.org/BLFS/svn/p/popt-1.16.tar.gz
md5sum = 3743beefa3dd6247a73f8f7a32c14c33
md5sum = 3743beefa3dd6247a73f8f7a32c14c33
configure-options =
configure-options =
--disable-static
--disable-static
[x86-cygwin-popt]
patches = ${:_profile_base_location_}/cygwin-popt-1.16-src.patch
\ No newline at end of file
component/popt/cygwin-popt-1.16-src.patch
0 → 100644
View file @
286af66f
--- poptconfig.c~ 2011-09-10 22:49:30.802250000 +0800
+++ poptconfig.c 2011-09-10 23:46:30.572048000 +0800
@@ -45,8 +45,9 @@
extern int glob_pattern_p (const char *_
#if !defined(__GLIBC__)
/* Return nonzero if PATTERN contains any metacharacters.
Metacharacters can be quoted with backslashes if QUOTE is nonzero. */
+#define glob_pattern_p glob_pattern_p_s
static int
-glob_pattern_p (const char * pattern, int quote)
+glob_pattern_p_s(const char * pattern, int quote)
/*@*/
{
const char * p;
software/davstorage/common.cfg
View file @
286af66f
...
@@ -76,7 +76,7 @@ mode = 0644
...
@@ -76,7 +76,7 @@ mode = 0644
[instance-davstorage]
[instance-davstorage]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-davstorage.cfg
url = ${:_profile_base_location_}/instance-davstorage.cfg
md5sum =
dcc147b49d3c64bc35dd0e914116d5cf
md5sum =
b60ef53023921a2e6d072e31b52f555e
output = ${buildout:directory}/template-davstorage.cfg
output = ${buildout:directory}/template-davstorage.cfg
mode = 0644
mode = 0644
...
...
software/davstorage/instance-davstorage.cfg
View file @
286af66f
...
@@ -9,7 +9,6 @@ parts =
...
@@ -9,7 +9,6 @@ parts =
logrotate
logrotate
logrotate-entry-davstorage
logrotate-entry-davstorage
request-frontend
request-frontend
frontend-ajaxupload-promise
eggs-directory = ${buildout:eggs-directory}
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
...
@@ -167,8 +166,7 @@ name = Frontend Ajax
...
@@ -167,8 +166,7 @@ name = Frontend Ajax
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
slave = true
config = url https-only
config = url
config-https-only = true
config-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/
config-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/
return = site_url
return = site_url
...
@@ -184,9 +182,10 @@ config-https-only = true
...
@@ -184,9 +182,10 @@ config-https-only = true
config-url = https://$${davstorage:user}:$${davstorage:password}@[$${davstorage:ip}]:$${davstorage:port_webdav}/
config-url = https://$${davstorage:user}:$${davstorage:password}@[$${davstorage:ip}]:$${davstorage:port_webdav}/
return = site_url
return = site_url
[frontend-ajaxupload-promise]
# XXX Vivien: promise not working for now
recipe = slapos.cookbook:check_url_available
#[frontend-ajaxupload-promise]
path = $${basedirectory:promises}/frontend-ajaxupload
#recipe = slapos.cookbook:check_url_available
url = $${request-frontend-ajaxupload:connection-site_url}
#path = $${basedirectory:promises}/frontend-ajaxupload
dash_path = ${dash:location}/bin/dash
#url = $${request-frontend-ajaxupload:connection-site_url}
curl_path = ${curl:location}/bin/curl
#dash_path = ${dash:location}/bin/dash
\ No newline at end of file
#curl_path = ${curl:location}/bin/curl
\ No newline at end of file
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