SOURCES: initng-savefile.patch, initng-utmpx.patch, initng-nokilli...

[mwinkler]

Author: mwinkler                     Date: Thu Oct 19 21:46:40 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 0.6.8

---- Files affected:
SOURCES:
   initng-savefile.patch (1.6 -> 1.7) , initng-utmpx.patch (1.6 -> 1.7) , initng-nokillia.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/initng-savefile.patch
diff -u SOURCES/initng-savefile.patch:1.6 SOURCES/initng-savefile.patch:1.7
--- SOURCES/initng-savefile.patch:1.6	Sun Feb 26 13:07:41 2006
+++ SOURCES/initng-savefile.patch	Thu Oct 19 23:46:35 2006
@@ -1,13 +1,18 @@
---- initng-0.5.4/plugins/reload/initng_reload.c~	2006-02-26 13:44:46.000000000 +0200
-+++ initng-0.5.4/plugins/reload/initng_reload.c	2006-02-26 13:46:05.000000000 +0200
-@@ -42,8 +42,8 @@
+--- initng-0.6.8-orig/plugins/reload/initng_reload.c	2006-06-11 22:37:18.000000000 +0000
++++ initng-0.6.8/plugins/reload/initng_reload.c	2006-10-19 15:46:05.218211750 +0000
+@@ -44,11 +44,11 @@
  
- #include "initng_reload.h"
+ INITNG_PLUGIN_MACRO;
  
--#define SAVE_FILE      VARDIR "/initng_db_backup.v13"
--#define SAVE_FILE_FAKE VARDIR "/initng_db_backup_fake.v13"
-+#define SAVE_FILE      "/var/run/initng_db_backup.v13"
-+#define SAVE_FILE_FAKE "/var/run/initng_db_backup_fake.v13"
+-#define SAVE_FILE      VARDIR "/initng_db_backup.v15"
+-#define SAVE_FILE_FAKE VARDIR "/initng_db_backup_fake.v15"
++#define SAVE_FILE      VARDIR "/run/initng_db_backup.v15"
++#define SAVE_FILE_FAKE VARDIR "/run/initng_db_backup_fake.v15"
+ 
+-#define SAVE_FILE_V13      VARDIR "/initng_db_backup.v13"
+-#define SAVE_FILE_FAKE_v13 VARDIR "/initng_db_backup_fake.v13"
++#define SAVE_FILE_V13      VARDIR "/run/initng_db_backup.v13"
++#define SAVE_FILE_FAKE_v13 VARDIR "/run/initng_db_backup_fake.v13"
  
  static int write_file(const char *filename);
  static int read_file(const char *filename);

================================================================
Index: SOURCES/initng-utmpx.patch
diff -u SOURCES/initng-utmpx.patch:1.6 SOURCES/initng-utmpx.patch:1.7
--- SOURCES/initng-utmpx.patch:1.6	Thu Apr 20 11:28:03 2006
+++ SOURCES/initng-utmpx.patch	Thu Oct 19 23:46:35 2006
@@ -1,9 +1,6 @@
-it is not known to the initng what utmp file library uses,
-so skip the check and call utmpname()
-
---- initng-0.6.0RC1/plugins/initctl/initng_initctl.c~	2006-03-22 14:29:42.000000000 +0200
-+++ initng-0.6.0RC1/plugins/initctl/initng_initctl.c	2006-03-22 22:14:24.000000000 +0200
-@@ -236,19 +236,7 @@
+--- initng-0.6.8-orig/plugins/initctl/initng_initctl.c	2006-06-08 16:32:44.000000000 +0000
++++ initng-0.6.8/plugins/initctl/initng_initctl.c	2006-10-19 15:47:55.449100750 +0000
+@@ -238,18 +238,7 @@
  	struct utmp utmp;
  	time_t t;
  
@@ -19,8 +16,7 @@
 -	   TODO, is this a good idea or a bad idea?
 -	   utmpname("/var/run/utmp");
 -	 */
--
-+    utmpname(UTMP_FILE);
++	utmpname(UTMP_FILE);
+ 
  	setutent();
  	memset(&utmp, 0, sizeof(utmp));
- 	utmp.ut_type = RUN_LVL;

================================================================
Index: SOURCES/initng-nokillia.patch
diff -u SOURCES/initng-nokillia.patch:1.2 SOURCES/initng-nokillia.patch:1.3
--- SOURCES/initng-nokillia.patch:1.2	Thu May 18 20:36:41 2006
+++ SOURCES/initng-nokillia.patch	Thu Oct 19 23:46:35 2006
@@ -1,17 +1,18 @@
---- initng-0.6.7/tools/CMakeLists.txt~	2006-05-18 21:31:27.727047292 +0300
-+++ initng-0.6.7/tools/CMakeLists.txt	2006-05-18 21:31:54.887656088 +0300
-@@ -1,14 +1,11 @@
- INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR}  )
+--- initng-0.6.8-orig/tools/CMakeLists.txt	2006-08-08 09:25:14.000000000 +0000
++++ initng-0.6.8/tools/CMakeLists.txt	2006-10-19 15:51:25.970257500 +0000
+@@ -1,7 +1,5 @@
+ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR} )
  
 -ADD_EXECUTABLE(killalli5 killalli5.c)
 -
  ADD_EXECUTABLE(itype itype.c)
  
- ADD_EXECUTABLE(itool itool.c)
- TARGET_LINK_LIBRARIES(itool initng)
+ IF(SERVICE_CACHE)
+@@ -10,7 +8,6 @@
+ ENDIF(SERVICE_CACHE)
  
  INSTALL_PROGRAMS(${SBIN_INSTALL_DIR} initng-segfault)
 -INSTALL_TARGETS(${SBIN_INSTALL_DIR} killalli5)
  INSTALL_FILES(${SYSCONF_INSTALL_DIR}/initng FILES killall5-ignore)
  
- IF (INSTALL_AS_INIT)
+ IF(INSTALL_AS_INIT)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/initng-savefile.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SOURCES/initng-utmpx.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SOURCES/initng-nokillia.patch?r1=1.2&r2=1.3&f=u