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
Vincent Bechu
slapos
Commits
2c695d00
Commit
2c695d00
authored
Apr 13, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply slapos.recipe.cmmi in the commponent logrotate.
parent
a29c16dc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
11 deletions
+32
-11
component/logrotate/buildout.cfg
component/logrotate/buildout.cfg
+10
-11
component/logrotate/logrotate-3.7.9-cygwin.patch
component/logrotate/logrotate-3.7.9-cygwin.patch
+22
-0
No files found.
component/logrotate/buildout.cfg
View file @
2c695d00
...
@@ -3,21 +3,20 @@ extends =
...
@@ -3,21 +3,20 @@ extends =
../popt/buildout.cfg
../popt/buildout.cfg
parts = logrotate
parts = logrotate
[logrotate-3.7.9-O_CLOEXEC.optional.patch]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/${:filename}
download-only = true
md5sum = 6beac248c978b767d4bccc1b7eebe6bd
filename = ${:_buildout_section_name_}
[logrotate]
[logrotate]
recipe =
hexagonit
.recipe.cmmi
recipe =
slapos
.recipe.cmmi
url = https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.9.tar.gz
url = https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.9.tar.gz
md5sum = eeba9dbca62a9210236f4b83195e4ea5
md5sum = eeba9dbca62a9210236f4b83195e4ea5
patch-options = -p1
patch-options = -p1
patches
=
patches=
${
logrotate-3.7.9-O_CLOEXEC.optional.patch:location}/${logrotate-3.7.9-O_CLOEXEC.optional.patch:filename}
${
:_profile_base_location_}/logrotate-3.7.9-O_CLOEXEC.optional.patch
configure-command = true
configure-command = true
make-options = PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
[x86-linux-logrotate]
environment =
environment =
POPT_DIR=${popt:location}/include -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib
POPT_DIR=${popt:location}/include -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib
[x86-cygwin-logrotate]
patches =
${logrotate:patches}
${:_profile_base_location_}/logrotate-3.7.9-cygwin.patch
component/logrotate/logrotate-3.7.9-cygwin.patch
0 → 100644
View file @
2c695d00
diff --git a/config.c b/config.c
index e6d5d1d..a526d64 100644
--- a/config.c
+++ b/config.c
@@ -547,7 +547,7 @@
static int readConfigFile(const char *configFile, struct logInfo *defConfig)
length = sb.st_size;
buf = mmap(NULL, (size_t)(length + 2), PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_POPULATE, fd, (off_t) 0);
+ MAP_PRIVATE, fd, (off_t) 0);
if (buf == MAP_FAILED) {
message(MESS_ERROR, "Error mapping config file %s: %s\n",
configFile, strerror(errno));
@@ -559,7 +559,7 @@
static int readConfigFile(const char *configFile, struct logInfo *defConfig)
buf[length + 1] = '\0';
buf[length] = '\n';
madvise(buf, (size_t)(length + 2),
- MADV_SEQUENTIAL | MADV_WILLNEED | MADV_DONTFORK);
+ MADV_SEQUENTIAL | MADV_WILLNEED);
message(MESS_DEBUG, "reading config file %s\n", configFile);
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