diff options
author | 2003-11-12 18:43:50 +0000 | |
---|---|---|
committer | 2003-11-12 18:43:50 +0000 | |
commit | b4ee6d78f8ac6c394604bfc2be1878a40bf38da4 (patch) | |
tree | 3517cf3c44ac855439cf6f987bf97641bbbd373e /sys-apps/vcron | |
parent | Version bump and 0.2.5 marked stable on x86 (diff) | |
download | gentoo-2-b4ee6d78f8ac6c394604bfc2be1878a40bf38da4.tar.gz gentoo-2-b4ee6d78f8ac6c394604bfc2be1878a40bf38da4.tar.bz2 gentoo-2-b4ee6d78f8ac6c394604bfc2be1878a40bf38da4.zip |
Fixed close stdin patch, to close 32911.
Diffstat (limited to 'sys-apps/vcron')
-rw-r--r-- | sys-apps/vcron/ChangeLog | 6 | ||||
-rw-r--r-- | sys-apps/vcron/Manifest | 8 | ||||
-rw-r--r-- | sys-apps/vcron/files/vcron-3.0.1-close_stdin.diff | 34 |
3 files changed, 39 insertions, 9 deletions
diff --git a/sys-apps/vcron/ChangeLog b/sys-apps/vcron/ChangeLog index f120ba0ae777..bce7c8884ab8 100644 --- a/sys-apps/vcron/ChangeLog +++ b/sys-apps/vcron/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/vcron # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/vcron/ChangeLog,v 1.19 2003/10/30 17:54:03 pebenito Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/vcron/ChangeLog,v 1.20 2003/11/12 18:43:48 pebenito Exp $ + + 12 Nov 2003; Chris PeBenito <pebenito@gentoo.org> + files/vcron-3.0.1-close_stdin.diff: + Fixed close stdin patch, to close 32911. 30 Oct 2003; Chris PeBenito <pebenito@gentoo.org> vcron-3.0.1-r2.ebuild: Mark stable on x86 and ppc. diff --git a/sys-apps/vcron/Manifest b/sys-apps/vcron/Manifest index 53692daccdb0..6142bd578682 100644 --- a/sys-apps/vcron/Manifest +++ b/sys-apps/vcron/Manifest @@ -1,10 +1,10 @@ +MD5 5422bd54a86002f19d4a05aa0bf95311 ChangeLog 2869 MD5 0c1ced878df37a66b0cbc4ceff57b375 vcron-3.0.1-r1.ebuild 1371 -MD5 c3c8ed3519aa893e486585cc2aa57537 ChangeLog 2735 MD5 2e14224a3057ed241a1e11bed1e0f34c vcron-3.0.1-r2.ebuild 1594 -MD5 c8e987ea566611c641316ff140c8d91c files/vixie-cron-3.0.1-gentoo.patch 27121 -MD5 42a9b1ba7246f2fb453203eaccbb0e08 files/digest-vcron-3.0.1-r2 68 MD5 7f79290c2f51c9dcee459c8a5636f652 files/vcron.rc6 520 MD5 6a065c2a4012e573ebb852275516a1d4 files/crontab 563 MD5 42a9b1ba7246f2fb453203eaccbb0e08 files/digest-vcron-3.0.1-r1 68 +MD5 42a9b1ba7246f2fb453203eaccbb0e08 files/digest-vcron-3.0.1-r2 68 +MD5 9d66b761d15afae9471d33509b712fe9 files/vcron-3.0.1-close_stdin.diff 810 MD5 9495caecef1f8b925d19a1d34c4ff405 files/vcron-3.0.1-selinux.diff.bz2 1931 -MD5 73b3a3fde51e9070b50a5a4482a1b5b4 files/vcron-3.0.1-close_stdin.diff 323 +MD5 c8e987ea566611c641316ff140c8d91c files/vixie-cron-3.0.1-gentoo.patch 27121 diff --git a/sys-apps/vcron/files/vcron-3.0.1-close_stdin.diff b/sys-apps/vcron/files/vcron-3.0.1-close_stdin.diff index 6cfa8df25891..a365f0c3ce3c 100644 --- a/sys-apps/vcron/files/vcron-3.0.1-close_stdin.diff +++ b/sys-apps/vcron/files/vcron-3.0.1-close_stdin.diff @@ -1,11 +1,37 @@ diff -urN vixie-cron-3.0.1.orig/cron.c vixie-cron-3.0.1/cron.c ---- vixie-cron-3.0.1.orig/cron.c 1995-05-31 16:37:20.000000000 -0500 -+++ vixie-cron-3.0.1/cron.c 2003-10-16 17:31:41.000000000 -0500 -@@ -107,6 +107,7 @@ +--- vixie-cron-3.0.1.orig/cron.c 2003-11-07 11:33:38.000000000 -0600 ++++ vixie-cron-3.0.1/cron.c 2003-11-12 12:37:42.000000000 -0600 +@@ -25,6 +25,8 @@ + + #include "cron.h" + #include <sys/signal.h> ++#include <sys/stat.h> ++#include <fcntl.h> + #if SYS_TIME_H + # include <sys/time.h> + # include <time.h> +@@ -58,6 +60,7 @@ + char *argv[]; + { + cron_db database; ++ int i; + + ProgramName = argv[0]; + +@@ -108,6 +111,16 @@ } } -+ close(STDIN_FILENO); ++ /* close stdin, stdout, and stderr */ ++ if ( (i = open("/dev/null", O_RDWR)) < 0) { ++ log_it("CRON",getpid(),"DEATH","can't open /dev/null"); ++ exit(0); ++ } ++ close(0); dup2(i, 0); ++ close(1); dup2(i, 1); ++ close(2); dup2(i, 2); ++ close(i); ++ acquire_daemonlock(0); database.head = NULL; database.tail = NULL; |