diff options
author | Mike Frysinger <vapier@gentoo.org> | 2004-09-21 22:37:53 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2004-09-21 22:37:53 +0000 |
commit | dd2c2f8d0a1ad46ebc6097a2f667a0d7515efaf5 (patch) | |
tree | 43e425fb8a5c7db610b113ca1eac18b0e1755a30 /app-admin/metalog | |
parent | KEYWORD updates (diff) | |
download | historical-dd2c2f8d0a1ad46ebc6097a2f667a0d7515efaf5.tar.gz historical-dd2c2f8d0a1ad46ebc6097a2f667a0d7515efaf5.tar.bz2 historical-dd2c2f8d0a1ad46ebc6097a2f667a0d7515efaf5.zip |
not used
Diffstat (limited to 'app-admin/metalog')
-rw-r--r-- | app-admin/metalog/Manifest | 11 | ||||
-rw-r--r-- | app-admin/metalog/files/metalog-0.6-gentoo.patch | 107 |
2 files changed, 5 insertions, 113 deletions
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest index 6b8fa6b5e337..3934cbaf1656 100644 --- a/app-admin/metalog/Manifest +++ b/app-admin/metalog/Manifest @@ -2,19 +2,18 @@ Hash: SHA1 MD5 4cda4a5de968d03bcf197984fb2742aa ChangeLog 4343 -MD5 68a983d7dddc5d9d76ed2bb230bc4679 metalog-0.7-r1.ebuild 1269 -MD5 1d7c1bc1121882eed2c72d1a81911af8 metalog-0.8_pre20031130.ebuild 1444 +MD5 2a74fd225cfa2605cc1caf6553ac3e3d metalog-0.7-r1.ebuild 1267 +MD5 cf197bd0e9d0d41c174067c97f9558cc metalog-0.8_pre20031130.ebuild 1449 MD5 2a4834a861e0ed954124316c2a0ad8e9 files/consolelog.sh 191 MD5 ab769042aa4721d0ac745943e00c70e4 files/digest-metalog-0.7-r1 63 MD5 d16762a967c2f400ba4876a942d16d08 files/digest-metalog-0.8_pre20031130 74 -MD5 3e19c05da6bed4a092412095406b0bda files/metalog-0.6-gentoo.patch 3252 MD5 11665b7995cc4ca104d7d8c1c94db226 files/metalog.conf 1715 MD5 d34f8927d9b4943572de23e6300a189a files/metalog.confd 503 MD5 1340f1bb658ce93a963a7a833a05919a files/metalog.rc6 661 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFBUKrgHTu7gpaalycRAhGTAJsEmO4Mg9JeEQLulZQUF7866VgMfACg4okg -Hf7Mh5bH2pQ3LOSi/Ie9xFQ= -=dxKu +iD8DBQFBUK1eHTu7gpaalycRAhqUAKDlAi3DkN/saMYFjxA/rE7vZLopLQCgoTKL +CqPfDc0HLH0JBk+ELuQLahI= +=lqAM -----END PGP SIGNATURE----- diff --git a/app-admin/metalog/files/metalog-0.6-gentoo.patch b/app-admin/metalog/files/metalog-0.6-gentoo.patch deleted file mode 100644 index f3f5c9cf1c1c..000000000000 --- a/app-admin/metalog/files/metalog-0.6-gentoo.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff -ru metalog-0.6/AUTHORS metalog-0.6.1/AUTHORS ---- metalog-0.6/AUTHORS 2001-06-25 17:08:40.000000000 -0400 -+++ metalog-0.6.1/AUTHORS 2002-01-26 07:16:44.000000000 -0500 -@@ -1 +1,2 @@ - Frank DENIS "Jedi/Sector One" <ange@angelic.com> -+Leo Lipelis <aeoo@gentoo.org> - tiny patch to allow /var/run/metalog.pid -diff -ru metalog-0.6/ChangeLog metalog-0.6.1/ChangeLog ---- metalog-0.6/ChangeLog 2001-07-09 10:27:55.000000000 -0400 -+++ metalog-0.6.1/ChangeLog 2002-01-26 07:16:44.000000000 -0500 -@@ -1,3 +1,5 @@ -+* Gentoo Patch : -+ Add --pidfile <opt> option to allow <opt> pid file creation. - * Version 0.6 : - Use strtoq if strtoull isn't available. - Read /dev/klog when klogctl() isn't implemented. -diff -ru metalog-0.6/src/metalog.c metalog-0.6.1/src/metalog.c ---- metalog-0.6/src/metalog.c 2001-07-09 10:23:16.000000000 -0400 -+++ metalog-0.6.1/src/metalog.c 2002-01-26 09:36:54.000000000 -0500 -@@ -868,6 +868,8 @@ - - static RETSIGTYPE sigkchld(int sig) - { -+ fprintf(stderr, "Unlinking pid file: %s\n", pid_file); -+ unlink(pid_file); - fprintf(stderr, "Process [%u] died with signal [%d]\n", - (unsigned int) getpid(), sig); - exit(EXIT_FAILURE); -@@ -974,6 +976,7 @@ - int fodder; - int option_index = 0; - -+ pid_file = NULL; - while ((fodder = getopt_long(argc, argv, GETOPT_OPTIONS, - long_options, &option_index)) != -1) { - switch (fodder) { -@@ -995,6 +998,13 @@ - case 's' : - synchronous = (sig_atomic_t) 1; - break; -+ case 'p' : -+ /* this is needed because argv will get nuked */ -+ pid_file = (char *) malloc(strlen(optarg) + 1); -+ if (pid_file != NULL) { -+ strcpy(pid_file, optarg); -+ } -+ break; - default : - fprintf(stderr, "Unknown option\n"); - exit(EXIT_FAILURE); -@@ -1010,6 +1020,16 @@ - } - } - -+static void writePidFile(const char *const pid_file) -+{ -+ FILE *f; -+ f = fopen(pid_file, "wb"); -+ if (f) { -+ fprintf(f, "%u\n", (u_int) getpid()); -+ fclose(f); -+ } -+} -+ - int main(int argc, char *argv[]) - { - int sockets[2]; -@@ -1025,6 +1045,10 @@ - } - dodaemonize(); - setsignals(); -+ /* write MASTER pid to /var/run/metalog.pid */ -+ if (pid_file) { -+ writePidFile(pid_file); -+ } - clearargs(argv); - setprogname(PROGNAME_MASTER); - if (getDataSources(sockets) < 0) { -diff -ru metalog-0.6/src/metalog_p.h metalog-0.6.1/src/metalog_p.h ---- metalog-0.6/src/metalog_p.h 2001-07-09 10:17:06.000000000 -0400 -+++ metalog-0.6.1/src/metalog_p.h 2002-01-26 07:16:44.000000000 -0500 -@@ -2,9 +2,9 @@ - #define __METALOG_P_H__ 1 - - #ifdef HAVE_KLOGCTL --# define GETOPT_OPTIONS "Bc:hs" -+# define GETOPT_OPTIONS "Bc:hsp:" - #else --# define GETOPT_OPTIONS "Bhs" -+# define GETOPT_OPTIONS "Bhsp:" - #endif - - static struct option long_options[] = { -@@ -14,6 +14,7 @@ - #endif - { "help", 0, NULL, 'h' }, - { "synchronous", 0, NULL, 's' }, -+ { "pidfile", 1, NULL, 'p' }, - { NULL, 0, NULL, 0 } - }; - -@@ -27,5 +28,6 @@ - static pid_t command_child; - static sig_atomic_t synchronous; - static signed char daemonize; -+static char *pid_file; - - #endif |