Copying some patches from cygwin branch

component/glib/buildout.cfg

@@ -17,3 +17,7 @@ environment =
   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
   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

+--- 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

@@ -8,3 +8,6 @@ url = ftp://anduin.linuxfromscratch.org/BLFS/svn/p/popt-1.16.tar.gz
 md5sum = 3743beefa3dd6247a73f8f7a32c14c33
 configure-options =
   --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

+--- 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

@@ -76,7 +76,7 @@ mode = 0644
 [instance-davstorage]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-davstorage.cfg
-md5sum = dcc147b49d3c64bc35dd0e914116d5cf
+md5sum = b60ef53023921a2e6d072e31b52f555e
 output = ${buildout:directory}/template-davstorage.cfg
 mode = 0644
 

software/davstorage/instance-davstorage.cfg

@@ -9,7 +9,6 @@ parts =
   logrotate
   logrotate-entry-davstorage
   request-frontend
-  frontend-ajaxupload-promise
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -167,8 +166,7 @@ name = Frontend Ajax
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
 slave = true
-config = url https-only
-config-https-only = true
+config = url
 config-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/
 return = site_url
 
@@ -184,9 +182,10 @@ config-https-only = true
 config-url = https://$${davstorage:user}:$${davstorage:password}@[$${davstorage:ip}]:$${davstorage:port_webdav}/
 return = site_url
 
-[frontend-ajaxupload-promise]
-recipe = slapos.cookbook:check_url_available
-path = $${basedirectory:promises}/frontend-ajaxupload
-url = $${request-frontend-ajaxupload:connection-site_url}
-dash_path = ${dash:location}/bin/dash
-curl_path = ${curl:location}/bin/curl
\ No newline at end of file
+# XXX Vivien: promise not working for now
+#[frontend-ajaxupload-promise]
+#recipe = slapos.cookbook:check_url_available
+#path = $${basedirectory:promises}/frontend-ajaxupload
+#url = $${request-frontend-ajaxupload:connection-site_url}
+#dash_path = ${dash:location}/bin/dash
+#curl_path = ${curl:location}/bin/curl
\ No newline at end of file