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
Matevz Golob
slapos
Commits
84066ec0
Commit
84066ec0
authored
Jul 19, 2013
by
Vivien Alger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
davstorage: Finishing software release v1.1 with postfix service
parent
72e10a30
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
232 additions
and
83 deletions
+232
-83
component/postfix/buildout.cfg
component/postfix/buildout.cfg
+36
-2
component/postfix/initgroups.patch
component/postfix/initgroups.patch
+13
-0
component/postfix/libdb.patch
component/postfix/libdb.patch
+20
-0
component/postfix/noroot.patch
component/postfix/noroot.patch
+93
-0
component/postfix/session.patch
component/postfix/session.patch
+13
-0
software/davstorage/common.cfg
software/davstorage/common.cfg
+3
-11
software/davstorage/development.cfg
software/davstorage/development.cfg
+0
-61
software/davstorage/instance-davstorage.cfg
software/davstorage/instance-davstorage.cfg
+8
-8
software/davstorage/software.cfg
software/davstorage/software.cfg
+46
-1
No files found.
component/postfix/buildout.cfg
View file @
84066ec0
...
@@ -11,9 +11,43 @@ parts = postfix
...
@@ -11,9 +11,43 @@ parts = postfix
[postfix]
[postfix]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url =
ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.8.3
.tar.gz
url =
http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/postfix-2.10.0
.tar.gz
md5sum = b3922ededd3fd6051f759e58a4ada3ae
#
md5sum = b3922ededd3fd6051f759e58a4ada3ae
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
configure-command = make
configure-command = make
configure-options = makefiles CCARGS='-DUSE_TLS -DHAS_PCRE -DHAS_DB -I${libdb:location}/include -I${pcre:location}/include -I${openssl:location}/include' AUXLIBS='-L${openssl:location}/lib -L${pcre:location}/lib -L${libdb:location}/lib -lssl -lpcre -ldb -lcrypto -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${libdb:location}/lib'
configure-options = makefiles CCARGS='-DUSE_TLS -DHAS_PCRE -DHAS_DB -I${libdb:location}/include -I${pcre:location}/include -I${openssl:location}/include' AUXLIBS='-L${openssl:location}/lib -L${pcre:location}/lib -L${libdb:location}/lib -lssl -lpcre -ldb -lcrypto -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${libdb:location}/lib'
make-targets = non-interactive-package install_root=${:location}
make-targets = non-interactive-package install_root=${:location}
patch-options = -p1
patches =
${initgroups.patch:location}/${initgroups.patch:filename}
${session.patch:location}/${session.patch:filename}
${noroot.patch:location}/${noroot.patch:filename}
${libdb.patch:location}/${libdb.patch:filename}
[initgroups.patch]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/${:filename}
filename = initgroups.patch
download-only = true
md5sum = b1e509d978c566d1b4b5c8415dfe2f91
[session.patch]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/${:filename}
filename = session.patch
download-only = true
md5sum = 41af4ac75d9bafc85385f0688727bf45
[noroot.patch]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/${:filename}
filename = noroot.patch
download-only = true
md5sum = 2e73b29c4e07bc7c933b62ab5fae20de
[libdb.patch]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/${:filename}
filename = libdb.patch
download-only = true
#md5sum = 9ecec894597f35a38bdaded881af561b
component/postfix/initgroups.patch
0 → 100644
View file @
84066ec0
--- a/src/util/chroot_uid.c
+++ b/src/util/chroot_uid.c
@@ -57,8 +57,8 @@
void chroot_uid(const char *root_dir, const char *user_name)
gid = pwd->pw_gid;
if (setgid(gid) < 0)
msg_fatal("setgid(%ld): %m", (long) gid);
- if (initgroups(user_name, gid) < 0)
- msg_fatal("initgroups: %m");
+ /*if (initgroups(user_name, gid) < 0)
+ msg_fatal("initgroups: %m");*/
}
/*
component/postfix/libdb.patch
0 → 100644
View file @
84066ec0
diff --git a/makedefs b/makedefs
index 93b5949..9209a61 100644
--- a/makedefs
+++ b/makedefs
@@ -290,7 +290,6 @@
case "$SYSTEM.$RELEASE" in
# by including <db.h> and by linking with -ldb
echo "No <db.h> include file found." 1>&2
echo "Install the appropriate db*-devel package first." 1>&2
- exit 1
fi
SYSLIBS="-ldb"
;;
@@ -361,7 +360,6 @@
EOF
# by including <db.h> and by linking with -ldb
echo "No <db.h> include file found." 1>&2
echo "Install the appropriate db*-devel package first." 1>&2
- exit 1
fi
SYSLIBS="-ldb"
;;
component/postfix/noroot.patch
0 → 100644
View file @
84066ec0
--- a/src/util/set_ugid.c
+++ b/src/util/set_ugid.c
@@ -44,7 +44,7 @@
void set_ugid(uid_t uid, gid_t gid)
{
- int saved_errno = errno;
+/* int saved_errno = errno;
if (geteuid() != 0)
if (seteuid(0) < 0)
@@ -58,4 +58,4 @@
void set_ugid(uid_t uid, gid_t gid)
if (msg_verbose > 1)
msg_info("setugid: uid %ld gid %ld", (long) uid, (long) gid);
errno = saved_errno;
-}
+*/}
--- a/src/util/set_eugid.c
+++ b/src/util/set_eugid.c
@@ -53,7 +53,7 @@
void set_eugid(uid_t euid, gid_t egid)
{
- int saved_errno = errno;
+/* int saved_errno = errno;
if (geteuid() != 0)
if (seteuid(0))
@@ -67,4 +67,4 @@
void set_eugid(uid_t euid, gid_t egid)
if (msg_verbose)
msg_info("set_eugid: euid %ld egid %ld", (long) euid, (long) egid);
errno = saved_errno;
-}
+*/}
--- a/src/postfix/postfix.c
+++ b/src/postfix/postfix.c
@@ -448,12 +448,12 @@
int main(int argc, char **argv)
* privileges for selected operations. That's right - it takes privileges
* to toss privileges.
*/
- if (getuid() != 0) {
+ /*if (getuid() != 0) {
msg_error("to submit mail, use the Postfix sendmail command");
msg_fatal("the postfix command is reserved for the superuser");
}
if (unsafe() != 0)
- msg_fatal("the postfix command must not run as a set-uid process");
+ msg_fatal("the postfix command must not run as a set-uid process");*/
/*
* Parse switches.
--- a/src/global/mail_params.c
+++ b/src/global/mail_params.c
@@ -709,7 +709,9 @@
void mail_params_init()
check_default_privs();
check_mail_owner();
check_sgid_group();
+ /*
check_overlap();
+ */
#ifdef HAS_DB
dict_db_cache_size = var_db_read_buf;
#endif
--- a/src/master/master.c
+++ b/src/master/master.c
@@ -315,10 +315,10 @@
int main(int argc, char **argv)
* privileges for selected operations. That's right - it takes privileges
* to toss privileges.
*/
- if (getuid() != 0)
+ /*if (getuid() != 0)
msg_fatal("the master command is reserved for the superuser");
if (unsafe() != 0)
- msg_fatal("the master command must not run as a set-uid process");
+ msg_fatal("the master command must not run as a set-uid process");*/
/*
* Process JCL.
--- a/src/postsuper/postsuper.c
+++ b/src/postsuper/postsuper.c
@@ -1150,10 +1150,10 @@
int main(int argc, char **argv)
* the secondary groups, the process environment, and so on. Otherwise,
* accidents can happen. If not with Postfix, then with other software.
*/
- if (unsafe() != 0)
+ /*if (unsafe() != 0)
msg_fatal("this postfix command must not run as a set-uid process");
if (getuid())
- msg_fatal("use of this command is reserved for the superuser");
+ msg_fatal("use of this command is reserved for the superuser");*/
/*
* Parse JCL.
component/postfix/session.patch
0 → 100644
View file @
84066ec0
--- a/src/master/master.c
+++ b/src/master/master.c
@@ -392,8 +392,10 @@
int main(int argc, char **argv)
* all MTA processes cleanly. Give up if we can't separate from our
* parent process. We're not supposed to blow away the parent.
*/
+ /*
if (debug_me == 0 && master_detach != 0 && setsid() == -1 && getsid(0) != getpid())
msg_fatal("unable to set session and process group ID: %m");
+ */
/*
* Make some room for plumbing with file descriptors. XXX This breaks
software/davstorage/common.cfg
View file @
84066ec0
...
@@ -42,6 +42,7 @@ parts =
...
@@ -42,6 +42,7 @@ parts =
apache-php
apache-php
application
application
template
template
bootstrap-conf
lxml-python
lxml-python
eggs
eggs
instance-recipe-egg
instance-recipe-egg
...
@@ -78,19 +79,10 @@ mode = 0644
...
@@ -78,19 +79,10 @@ 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 =
699ecf4678386667f58a3391bab7af0f
md5sum =
0dc988d8f9ade52e83e3092fa7943dbb
output = ${buildout:directory}/template-davstorage.cfg
output = ${buildout:directory}/template-davstorage.cfg
mode = 0644
mode = 0644
[mailer-plugin]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/templates/${:filename}
filename = class.phpmailer-lite.php
sendmail-location = ${postfix:location}/usr/sbin/sendmail
output = ${application:location}/plugins/mailer.phpmailer-lite/lib/${:filename}
mode = 0644
#md5sum =
[bootstrap-conf]
[bootstrap-conf]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/templates/${:filename}
url = ${:_profile_base_location_}/templates/${:filename}
...
@@ -98,7 +90,7 @@ filename = bootstrap_conf.php
...
@@ -98,7 +90,7 @@ filename = bootstrap_conf.php
translation = fr_FR.UTF-8
translation = fr_FR.UTF-8
output = ${application:location}/conf/${:filename}
output = ${application:location}/conf/${:filename}
mode = 0644
mode = 0644
#md5sum =
md5sum = f8bbf14507f9c22d7b69696345e57c2e
[lxml-python]
[lxml-python]
python = python2.7
python = python2.7
software/davstorage/development.cfg
View file @
84066ec0
...
@@ -31,64 +31,3 @@ update-command = ${:command}
...
@@ -31,64 +31,3 @@ update-command = ${:command}
command =
command =
grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
[versions]
zc.buildout = 1.6.0-dev-SlapOS-002
Jinja2 = 2.6
Werkzeug = 0.8.3
buildout-versions = 1.7
hexagonit.recipe.cmmi = 1.6
hexagonit.recipe.download = 1.6nxd002
meld3 = 0.6.10
openssl = 1.0.1c
# Required by:
# slapos.core
Flask = 0.9
# Required by:
# slapos.cookbook
PyXML = 0.8.4
slapos.recipe.template = 2.4.2
# Required by:
# slapos.cookbook==0.24
# slapos.core==0.14
# xml-marshaller==0.9.7
lxml = 3.1.0
# Required by:
# slapos.cookbook==0.24
netaddr = 0.7.10
# Required by:
# slapos.core==0.14
netifaces = 0.8
# Required by:
# slapos.cookbook==0.24
# slapos.core==0.14
# zc.buildout==1.5.3-dev-SlapOS-009
# zc.recipe.egg==1.3.2
setuptools = 0.6c12dev-r88846
# Required by:
# slapos.cookbook==0.73.1
slapos.core = 0.35.1
# Required by:
# slapos.core==0.35.1
supervisor = 3.0b1
# Required by:
# slapos.cookbook==0.73.1
xml-marshaller = 0.9.7
# Required by:
# slapos.cookbook==0.24
zc.recipe.egg = 1.3.2
# Required by:
# slapos.core==0.35.1
zope.interface = 4.0.5
software/davstorage/instance-davstorage.cfg
View file @
84066ec0
...
@@ -218,7 +218,7 @@ filename = class.phpmailer-lite.php
...
@@ -218,7 +218,7 @@ filename = class.phpmailer-lite.php
sendmail-script = $${sendmail-script:output}
sendmail-script = $${sendmail-script:output}
output = $${directory:htdocs}/plugins/mailer.phpmailer-lite/lib/$${:filename}
output = $${directory:htdocs}/plugins/mailer.phpmailer-lite/lib/$${:filename}
mode = 0644
mode = 0644
#md5sum =
md5sum = 4649b152e1f639873a03149eccc70aaf
[share-url-generation]
[share-url-generation]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
...
@@ -226,7 +226,7 @@ url = ${:_profile_base_location_}/templates/$${:filename}
...
@@ -226,7 +226,7 @@ url = ${:_profile_base_location_}/templates/$${:filename}
filename = class.AJXP_Utils.php
filename = class.AJXP_Utils.php
output = $${directory:htdocs}/core/classes/$${:filename}
output = $${directory:htdocs}/core/classes/$${:filename}
mode = 0644
mode = 0644
#md5sum =
md5sum = f681c0a0a17f4b2a0896b952e53239ed
[postfix-service]
[postfix-service]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
...
@@ -236,7 +236,7 @@ postfix-location = ${postfix:location}/usr/sbin/postfix
...
@@ -236,7 +236,7 @@ postfix-location = ${postfix:location}/usr/sbin/postfix
postfix-config-dir = $${directory:postfix-conf}
postfix-config-dir = $${directory:postfix-conf}
output = $${basedirectory:services}/postfix
output = $${basedirectory:services}/postfix
mode = 0755
mode = 0755
#md5sum =
md5sum = 94799688bf95fb16b86972a23df13af2
[sendmail-script]
[sendmail-script]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
...
@@ -246,7 +246,7 @@ sendmail-location = ${postfix:location}/usr/sbin/sendmail
...
@@ -246,7 +246,7 @@ sendmail-location = ${postfix:location}/usr/sbin/sendmail
postfix-config-dir = $${directory:postfix-conf}
postfix-config-dir = $${directory:postfix-conf}
output = $${rootdirectory:bin}/sendmail
output = $${rootdirectory:bin}/sendmail
mode = 0755
mode = 0755
#md5sum =
md5sum = d2ea9ecfd653dcb0bd06c06bcaabc5df
[postfix-conf]
[postfix-conf]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
...
@@ -257,12 +257,12 @@ command-directory = ${postfix:location}/usr/sbin
...
@@ -257,12 +257,12 @@ command-directory = ${postfix:location}/usr/sbin
bin-directory = ${postfix:location}/usr/bin
bin-directory = ${postfix:location}/usr/bin
daemon-directory = ${postfix:location}/usr/libexec/postfix
daemon-directory = ${postfix:location}/usr/libexec/postfix
data-directory = $${directory:data}
data-directory = $${directory:data}
mail-owner = $${slap-connection:partition
_
id}
mail-owner = $${slap-connection:partition
-
id}
mail-group = $${slap-connection:partition
_
id}
mail-group = $${slap-connection:partition
-
id}
ipv4 = $${slap-network-information:global-ipv6}
ipv4 = $${slap-network-information:global-ipv6}
output = $${directory:postfix-conf}/main.cf
output = $${directory:postfix-conf}/main.cf
mode = 0644
mode = 0644
#md5sum =
md5sum = a72b679c523f587422f95d295de27876
[postfix-users]
[postfix-users]
recipe = plone.recipe.command
recipe = plone.recipe.command
...
@@ -276,7 +276,7 @@ filename = master.cf.in
...
@@ -276,7 +276,7 @@ filename = master.cf.in
port = 2525
port = 2525
output = $${directory:postfix-conf}/master.cf
output = $${directory:postfix-conf}/master.cf
mode = 0644
mode = 0644
#md5sum =
md5sum = de33aa9ef530ef3c7661b914d2d1fbef
# XXX Vivien: promise not working for now
# XXX Vivien: promise not working for now
#[frontend-ajaxupload-promise]
#[frontend-ajaxupload-promise]
...
...
software/davstorage/software.cfg
View file @
84066ec0
...
@@ -32,6 +32,52 @@ command =
...
@@ -32,6 +32,52 @@ command =
grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
[networkcache]
# signature certificates of the following uploaders.
# Romain Courteaud
# Cedric de Saint Martin
# Test Agent
signature-certificate-list =
-----BEGIN CERTIFICATE-----
MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
QUUGLQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-----END CERTIFICATE-----
[versions]
[versions]
zc.buildout = 1.6.0-dev-SlapOS-002
zc.buildout = 1.6.0-dev-SlapOS-002
Jinja2 = 2.6
Jinja2 = 2.6
...
@@ -91,4 +137,3 @@ zc.recipe.egg = 1.3.2
...
@@ -91,4 +137,3 @@ zc.recipe.egg = 1.3.2
# Required by:
# Required by:
# slapos.core==0.35.1
# slapos.core==0.35.1
zope.interface = 4.0.5
zope.interface = 4.0.5
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