Skip to content

S
slapos
Commit da56db86 authored by Alain Takoudjou's avatar Alain Takoudjou
Browse files
Options

Merge branch 'lamp' into master

parents 2238a2e5 94c7bbdd
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 71 deletions
component/cclient/buildout.cfg
View file @ da56db86
......@@ -12,16 +12,15 @@ parts =
[cclient-patch]
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/imap-2007f.patch
#md5sum = Student may put here md5sum of this file, this is good idea
download-only = True
md5sum = 42c77fdd5d7a976fc302b93aadb3da98
location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = imap-2007f.patch
[cclient]
recipe = hexagonit.recipe.cmmi
url = ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz
md5sum = 2126fd125ea26b73b20f01fcd5940369
configure-command = true
keep-compile-dir = true
# cclient does not support parallel compilation
make-options =
slx
......
component/cclient/imap-2007f.patch
View file @ da56db86
--- old/Makefile 2011-09-22 13:19:53.000000000 +0100
+++ new/Makefile 2011-09-23 11:29:12.405271442 +0100
@@ -580,7 +580,6 @@
+++ new/Makefile 2011-11-09 15:02:54.038306922 +0100
@@ -280,7 +280,11 @@
SYSTEM=unix
TOOLS=tools
TOUCH=touch
-
+IMAPDIR=$(CCLIENT)/cclient
+COMPILEDIR = $(CCLIENT)/cclient__compile__/imap-2007f
+CP=cp -r
+INSTALL=install
+FOR=for
# Primary build command
@@ -580,7 +584,6 @@
@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@echo
@echo Do you want to continue this build anyway? Type y or n please:
......@@ -8,7 +21,7 @@
nounenc:
@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -639,7 +638,7 @@
@@ -639,7 +642,7 @@
@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@echo
@echo Do you want to build with IPv6 anyway? Type y or n please:
......@@ -17,15 +30,27 @@
@echo OK, I will remember that you really want to build with IPv6.
@echo You will not see this message again.
@$(TOUCH) ip6
@@ -731,6 +730,12 @@
@@ -731,6 +734,24 @@
$(SH) -c '$(RM) an ua OSTYPE SPECIALS c-client mtest imapd ipopd mailutil mlock dmail tmail || true'
$(CD) tools;$(MAKE) clean
+install:
+ install -v -d $(CCLIENT)/cclient/include
+ ln -svf $(CCLIENT)/cclient__compile__/imap-2007f/c-client $(CCLIENT)/cclient/include
+ install -v -d $(CCLIENT)/cclient/lib
+ ln -svf $(CCLIENT)/cclient__compile__/imap-2007f/c-client/c-client.a $(CCLIENT)/cclient/lib/libc-client.a
+install:
+ $(INSTALL) -v -d $(IMAPDIR)/include
+ $(INSTALL) -v -d $(IMAPDIR)/lib
+ $(INSTALL) -v -m 644 $(COMPILEDIR)/c-client/*.h $(IMAPDIR)/include
+ $(INSTALL) -v -m 644 $(COMPILEDIR)/c-client/c-client.a $(IMAPDIR)/lib
+ $(CP) $(COMPILEDIR)/ipopd $(COMPILEDIR)/mailutil $(COMPILEDIR)/imapd \
+ $(COMPILEDIR)/dmail $(COMPILEDIR)/mlock $(COMPILEDIR)/mtest $(COMPILEDIR)/tmail $(IMAPDIR)
+ $(RM) $(IMAPDIR)/ipopd/*.h $(IMAPDIR)/ipopd/*.c $(IMAPDIR)/ipopd/Makefile;
+ $(RM) $(IMAPDIR)/mailutil/*.h $(IMAPDIR)/mailutil/*.c $(IMAPDIR)/mailutil/Makefile;
+ $(RM) $(IMAPDIR)/imapd/*.h $(IMAPDIR)/imapd/*.c $(IMAPDIR)/imapd/Makefile;
+ $(RM) $(IMAPDIR)/tmail/*.h $(IMAPDIR)/tmail/*.c $(IMAPDIR)/tmail/Makefile;
+ $(RM) $(IMAPDIR)/mlock/*.h $(IMAPDIR)/mlock/*.c $(IMAPDIR)/mlock/Makefile;
+ $(RM) $(IMAPDIR)/mtest/*.h $(IMAPDIR)/mtest/*.c $(IMAPDIR)/mtest/Makefile;
+ $(RM) $(IMAPDIR)/dmail/*.h $(IMAPDIR)/dmail/*.c $(IMAPDIR)/dmail/Makefile;
+ $(INSTALL) -v -m 644 $(COMPILEDIR)/ip6 $(IMAPDIR)
+ $(INSTALL) -v -m 644 $(COMPILEDIR)/OSTYPE $(IMAPDIR)
+ $(INSTALL) -v -m 644 $(COMPILEDIR)/SPECIALS $(IMAPDIR)
+
# A monument to a hack of long ago and far away...
......
software/b2evolution/software.cfg
View file @ da56db86
......@@ -80,7 +80,7 @@ netaddr = 0.7.6
# Required by:
# slapos.core==0.18
netifaces = 0.5
netifaces = 0.6
# Required by:
# slapos.toolbox==0.10
......
software/eSKUeL/software.cfg
View file @ da56db86
......@@ -79,7 +79,7 @@ netaddr = 0.7.6
# Required by:
# slapos.core==0.18
netifaces = 0.5
netifaces = 0.6
# Required by:
# slapos.toolbox==0.10
......
software/ezpublish/software.cfg
View file @ da56db86
......@@ -79,7 +79,7 @@ netaddr = 0.7.6
# Required by:
# slapos.core==0.18
netifaces = 0.5
netifaces = 0.6
# Required by:
# slapos.toolbox==0.10
......
software/joomla/software.cfg
View file @ da56db86
......@@ -80,7 +80,7 @@ netaddr = 0.7.6
# Required by:
# slapos.core==0.18
netifaces = 0.5
netifaces = 0.6
# Required by:
# slapos.toolbox==0.10
......
software/lamp-template/software.cfg
View file @ da56db86
......@@ -14,7 +14,7 @@ extends =
http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.50:/stack/shacache-client.cfg
[application]
recipe = recipe = slapos.recipe.build:download-unpacked
recipe = slapos.recipe.build:download-unpacked
url = Student shall put here url of zipped or tarballed web page or application
md5sum = Student may put here md5sum of this file, this is good idea
#If provided tarball does not contain top directory, option shall be changed to false
......@@ -25,7 +25,6 @@ md5sum = Student may put here md5sum of this file, this is good idea
recipe = slapos.recipe.download
url = Student shall put here url to template file for application
#md5sum = Student may put here md5sum of this file, this is good idea
download-only = True
filename = template.in
mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
......
software/magento/software.cfg
View file @ da56db86
......@@ -78,7 +78,7 @@ netaddr = 0.7.6
# Required by:
# slapos.core==0.18
netifaces = 0.5
netifaces = 0.6
# Required by:
# slapos.toolbox==0.10
......
software/net2ftp/software.cfg
View file @ da56db86
......@@ -103,7 +103,7 @@ netaddr = 0.7.6
# Required by:
# slapos.core==0.18
netifaces = 0.5
netifaces = 0.6
# Required by:
# slapos.toolbox==0.10
......
software/openX/software.cfg
View file @ da56db86
......@@ -79,7 +79,7 @@ netaddr = 0.7.6
# Required by:
# slapos.core==0.18
netifaces = 0.5
netifaces = 0.6
# Required by:
# slapos.toolbox==0.10
......
software/os-commerce/software.cfg
View file @ da56db86
......@@ -80,7 +80,7 @@ netaddr = 0.7.6
# Required by:
# slapos.core==0.18
netifaces = 0.5
netifaces = 0.6
# Required by:
# slapos.toolbox==0.10
......
software/zencart/software.cfg
View file @ da56db86
......@@ -22,7 +22,7 @@ md5sum = e0a5fb39078321ced7f5a9c193f30927
strip-top-level-dir = true
[configure-script]
recipe = hexagonit.recipe.download
recipe = slapos.recipe.download
location = ${buildout:parts-directory}/${:_buildout_section_name_}
url = ${:_profile_base_location_}/configure.py
filename = configure.py
......@@ -92,7 +92,7 @@ netaddr = 0.7.6
# Required by:
# slapos.core==0.18
netifaces = 0.5
netifaces = 0.6
# Required by:
# slapos.toolbox==0.10
......
stack/lamp.cfg
View file @ da56db86
......@@ -71,53 +71,28 @@ signature-certificate-list =
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=
MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
/4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIID3TCCAsWgAwIBAgIBDTANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMCWFgx
DjAMBgNVBAgMBVN0YXRlMQ0wCwYDVQQHDARDaXR5MRAwDgYDVQQKDAdDb21wYW55
MSgwJgYDVQQDDB9BdXRvbWF0aWMgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR0wGwYJ
KoZIhvcNAQkBFg54eEBleGFtcGxlLmNvbTAeFw0xMTExMDgxMzU1NTJaFw0yMTEx
MDUxMzU1NTJaMF8xCzAJBgNVBAYTAlhYMQ4wDAYDVQQIDAVTdGF0ZTEQMA4GA1UE
CgwHQ29tcGFueTEPMA0GA1UEAwwGdGFsaW5vMR0wGwYJKoZIhvcNAQkBFg54eEBl
eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkMeeZt
z/4p6hamN0yApJsIR5G9Mkdcr7VMKwVse1JpOOVj0XnHZ6+FYxgX16/vEjMfriO4
T/ffjnHmR+OwCMLC3rDe65CWZAktnOqKnDCCTLOgKx+pTc0eA1xEwitK8JR0L7lE
MdyK+rzQVaA1pWbMwyVqq8Q1fpRzZAiZJyPKTzDUgGXwaue50Pb7S77WTwO8WXAK
P3CK2gwYTfAb/jhwSSWk4zWmVGQA5nPq3IpHNxOhAYBiTpIiCwJB8p6tDZnZpQLe
AzClfWqKVJimVvCKRyMiuJlx7xiKbjLLiIo/u5WMlV0futcaf1R1VMbxYBcZB21S
M1txHbX6aq7IjkECAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYd
T3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFGFXXztJn/eV
knd/IhlzhcXpyA4wMB8GA1UdIwQYMBaAFKm28UrrR+5HOLTksfGwB+b8zFOQMA0G
CSqGSIb3DQEBBQUAA4IBAQCP3uox7yQPUatGFT65YUmCwnOZQa2caGeON7DA7UUo
5UTBx8tU5wKR6Rw1VBkqLSR/K+OYPw6JyWpMJQrIqtURm0vJvqZIhuF+V3sHKGef
NC0n1ViD+aP72XvIjCnKKZYFJ9KTT+rmkT2SVwOWBkwMd9mPuIPmqZS0P0VLRTN0
WqktHtEF0slqMDGyoaOIKde1mQ7GnqIvfY5+AldrMXh+q+7gVGPYFOm0GZ+Hm7s4
v3/x9sKz9ceiEEyuKXKHS+mZ+6NOVjzwiX4lIOIXA/sgc0KMDXymdGcprIlhVi+f
dvUkPb5e0gENsh40+Iq/+Lf3th/mcLBOd2VjN3+RXMdw
MIIB9DCCAV2gAwIBAgIJAL392bEdqpFQMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
BAMMCENPTVAtMjM0MB4XDTExMTEwOTE1MzA0M1oXDTEyMTEwODE1MzA0M1owEzER
MA8GA1UEAwwIQ09NUC0yMzQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMRR
T0cacZKztie/DaRRjq3mgcqfPKoGXu6zXmeRQI+6Y4bnzjf8h/jAuPzR552P0xK5
psxhavXA8hOGRLFDtvDMQLepVHWfwqtFtcp5vNf2+KWqOYy0OxHfVIlnatvCqTZN
NG1vRsSOAQ+v7QNFHh6NBbiSrjBBfg4vkfzqnsUvAgMBAAGjUDBOMB0GA1UdDgQW
BBTGGw+ASoDi9kqPElDkC0Q5RtAfRjAfBgNVHSMEGDAWgBTGGw+ASoDi9kqPElDk
C0Q5RtAfRjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAIOuR1OqXLke
LLzH0kRnlIOe60dYJvRya53wDx5x2g4/qkXZPLx2RcbaUrX/SCbL70vfr+apUPss
dOSJ86sf/PQHW3/1fhTTE+Vck1MiiAq0aIx6WnKnz4+ZcQctB7b0DCsTcQnmbpi2
n9MuhWaT21VOYhIGzJFPw5XW47/RrwhR
-----END CERTIFICATE-----
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7