Christian Wiese
12 years ago
4 changed files with 2 additions and 155 deletions
Split View
Diff Options
-
+0 -46base/shadow/shadow-4.1.5-nscd-ignore-exit-1.patch
-
+0 -54base/shadow/shadow-4.1.5-nscd-newline-msg.patch
-
+0 -53base/shadow/shadow-4.1.5-stdarg.patch
-
+2 -2base/shadow/shadow.desc
@ -1,46 +0,0 @@ |
|||
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# |
|||
# Filename: package/.../shadow/shadow-4.1.5-nscd-ignore-exit-1.patch |
|||
# Copyright (C) 2012 The OpenSDE Project |
|||
# |
|||
# More information can be found in the files COPYING and README. |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# --- SDE-COPYRIGHT-NOTE-END --- |
|||
|
|||
From 357ff92218a68f2ea74b9d08867c662571012bbe Mon Sep 17 00:00:00 2001 |
|||
From: Mike Frysinger <vapier@gentoo.org> |
|||
Date: Sun, 12 Feb 2012 23:37:04 -0500 |
|||
Subject: [PATCH 3/3] nscd: ignore exit 1 code |
|||
|
|||
If nscd is installed but not in use, then running `nscd -i` will exit(1). |
|||
We shouldn't warn in this case since this is not abnormal behavior. |
|||
|
|||
Signed-off-by: Mike Frysinger <vapier@gentoo.org> |
|||
---
|
|||
lib/nscd.c | 3 +++ |
|||
1 files changed, 3 insertions(+), 0 deletions(-) |
|||
|
|||
diff --git a/lib/nscd.c b/lib/nscd.c
|
|||
index ea1dc55..7adb58f 100644
|
|||
--- a/lib/nscd.c
|
|||
+++ b/lib/nscd.c
|
|||
@@ -39,6 +39,9 @@ int nscd_flush_cache (const char *service)
|
|||
/* nscd is not installed, or it is installed but uses an |
|||
interpreter that is missing. Probably the former. */ |
|||
return 0; |
|||
+ } else if (code == 1) {
|
|||
+ /* nscd is installed, but it isn't active. */
|
|||
+ return 0;
|
|||
} else if (code != 0) { |
|||
(void) fprintf (stderr, _("%s: nscd exited with status %d\n"), |
|||
Prog, code); |
|||
--
|
|||
1.7.8.4 |
|||
|
|||
@ -1,54 +0,0 @@ |
|||
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# |
|||
# Filename: package/.../shadow/shadow-4.1.5-nscd-newline-msg.patch |
|||
# Copyright (C) 2012 The OpenSDE Project |
|||
# |
|||
# More information can be found in the files COPYING and README. |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# --- SDE-COPYRIGHT-NOTE-END --- |
|||
|
|||
From 360351b9b99bba0a278923c4237d158cbd726df5 Mon Sep 17 00:00:00 2001 |
|||
From: Mike Frysinger <vapier@gentoo.org> |
|||
Date: Sun, 12 Feb 2012 23:08:42 -0500 |
|||
Subject: [PATCH 1/3] nscd: add missing newline to warning msg |
|||
|
|||
Trying to run `passwd` without nscd running shows the messages: |
|||
... |
|||
Re-enter new password: |
|||
passwd: nscd exited with status 1passwd: Failed to flush the nscd cache. |
|||
passwd: nscd exited with status 1passwd: Failed to flush the nscd cache. |
|||
passwd: nscd exited with status 1passwd: Failed to flush the nscd cache. |
|||
passwd: nscd exited with status 1passwd: Failed to flush the nscd cache. |
|||
passwd: password changed. |
|||
... |
|||
|
|||
You can see the status message missing a newline, so add it. |
|||
|
|||
Signed-off-by: Mike Frysinger <vapier@gentoo.org> |
|||
---
|
|||
lib/nscd.c | 2 +- |
|||
1 files changed, 1 insertions(+), 1 deletions(-) |
|||
|
|||
diff --git a/lib/nscd.c b/lib/nscd.c
|
|||
index 227c205..ea1dc55 100644
|
|||
--- a/lib/nscd.c
|
|||
+++ b/lib/nscd.c
|
|||
@@ -40,7 +40,7 @@ int nscd_flush_cache (const char *service)
|
|||
interpreter that is missing. Probably the former. */ |
|||
return 0; |
|||
} else if (code != 0) { |
|||
- (void) fprintf (stderr, _("%s: nscd exited with status %d"),
|
|||
+ (void) fprintf (stderr, _("%s: nscd exited with status %d\n"),
|
|||
Prog, code); |
|||
(void) fprintf (stderr, _(MSG_NSCD_FLUSH_CACHE_FAILED), Prog); |
|||
return -1; |
|||
--
|
|||
1.7.8.4 |
|||
|
|||
@ -1,53 +0,0 @@ |
|||
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# |
|||
# Filename: package/.../shadow/shadow-4.1.5-stdarg.patch |
|||
# Copyright (C) 2012 The OpenSDE Project |
|||
# |
|||
# More information can be found in the files COPYING and README. |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# --- SDE-COPYRIGHT-NOTE-END --- |
|||
|
|||
From 04d19a920ea0cf74f977006e3f8241bf77cbc16b Mon Sep 17 00:00:00 2001 |
|||
From: Mike Frysinger <vapier@gentoo.org> |
|||
Date: Sun, 12 Feb 2012 22:41:05 -0500 |
|||
Subject: [PATCH] copydir: include stdarg.h for va_* funcs |
|||
|
|||
Building on newer systems fails due to using stdargs but not including |
|||
the header file: |
|||
|
|||
copydir.c: In function 'error_acl': |
|||
copydir.c:126:2: warning: implicit declaration of function 'va_start' [-Wimplicit-function-declaration] |
|||
copydir.c:132:2: warning: implicit declaration of function 'va_end' [-Wimplicit-function-declaration] |
|||
... |
|||
libmisc/copydir.c:126: undefined reference to 'va_start' |
|||
libmisc/copydir.c:132: undefined reference to 'va_end' |
|||
... |
|||
make[2]: *** [useradd] Error 1 |
|||
|
|||
Signed-off-by: Mike Frysinger <vapier@gentoo.org> |
|||
---
|
|||
libmisc/copydir.c | 1 + |
|||
1 files changed, 1 insertions(+), 0 deletions(-) |
|||
|
|||
diff --git a/libmisc/copydir.c b/libmisc/copydir.c
|
|||
index 7cb5f56..c6cbe6b 100644
|
|||
--- a/libmisc/copydir.c
|
|||
+++ b/libmisc/copydir.c
|
|||
@@ -40,6 +40,7 @@
|
|||
#include <sys/time.h> |
|||
#include <fcntl.h> |
|||
#include <stdio.h> |
|||
+#include <stdarg.h>
|
|||
#include "prototypes.h" |
|||
#include "defines.h" |
|||
#ifdef WITH_SELINUX |
|||
--
|
|||
1.7.8.4 |
|||
|
|||