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
Xiaowu Zhang
slapos
Commits
b362488c
Commit
b362488c
authored
Dec 03, 2020
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
component/logrotate: Version up to 3.17.0 .
Fixes FTBFS on gcc 10.
parent
0f727e18
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
18 deletions
+2
-18
component/logrotate/buildout.cfg
component/logrotate/buildout.cfg
+2
-2
component/logrotate/logrotate-3.7.9-O_CLOEXEC.optional.patch
component/logrotate/logrotate-3.7.9-O_CLOEXEC.optional.patch
+0
-16
No files found.
component/logrotate/buildout.cfg
View file @
b362488c
...
@@ -8,8 +8,8 @@ parts = logrotate
...
@@ -8,8 +8,8 @@ parts = logrotate
[logrotate]
[logrotate]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
shared = true
shared = true
url = https://github.com/logrotate/logrotate/releases/download/3.1
5.0/logrotate-3.15
.0.tar.xz
url = https://github.com/logrotate/logrotate/releases/download/3.1
7.0/logrotate-3.17
.0.tar.xz
md5sum =
320046f0b9fc38337e8827d4c5a866a0
md5sum =
ac2a7151fc8a187201872358a20a2813
# BBB this is only for backward-compatibility.
# BBB this is only for backward-compatibility.
post-install =
post-install =
ln -nsf . @@LOCATION@@/usr
ln -nsf . @@LOCATION@@/usr
...
...
component/logrotate/logrotate-3.7.9-O_CLOEXEC.optional.patch
deleted
100644 → 0
View file @
0f727e18
diff --git a/config.c b/config.c
index e6d5d1d..dd004a9 100644
--- a/config.c
+++ b/config.c
@@ -519,7 +519,11 @@
static int readConfigFile(const char *configFile, struct logInfo *defConfig)
length arrays -- of course, if we aren't run setuid it doesn't
matter much */
+#ifdef O_CLOEXEC
fd = open(configFile, O_RDONLY | O_CLOEXEC);
+#else
+ fd = open(configFile, O_RDONLY);
+#endif
if (fd < 0) {
message(MESS_ERROR, "failed to open config file %s: %s\n",
configFile, strerror(errno));
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