lirc.diff fehlerhaft!

[mb405]

kann mal einer, der dazu in der lage ist die lirc.diff im cvs ändern. da ist ein fehler drin. da fehlt ein - . somit wird die acconfig.h nicht gepatcht.

Code: Alles auswählen

diff -ru lirc-0.6.6/acconfig.h lirc-0.6.6.new/acconfig.h
-- lirc-0.6.6/acconfig.h        Sat Jul 27 11:17:08 2002
+++ lirc-0.6.6.new/acconfig.h   Mon Oct 21 20:26:13 2002

danke

[Houdini]

fixed

[mb405]

danke

nur warum muss man lircd mit komplettenpfad zur lircd.conf aufrufen ??
ohne gibts nen segfault.
es gibt ja schon ne 0.8.2 bei den entwicklern. nur fehlt mir das wissen, was nagepasst werden muss, das es läuft auf der box.

[mb405]

ich hab mal das alte diff auf 0.8.2 angepasst. aber ob ich alles hab, ka ?

Code: Alles auswählen

diff -Naur lirc-0.8.2_org/acconfig.h lirc-0.8.2/acconfig.h
--- lirc-0.8.2_org/acconfig.h	2007-05-06 11:46:59.000000000 +0200
+++ lirc-0.8.2/acconfig.h	2007-07-21 11:55:40.000000000 +0200
@@ -208,7 +208,8 @@
 #define LIRCRC_USER_FILE	"." CFG_LIRCRC
 #define LIRCRC_ROOT_FILE	SYSCONFDIR "/" CFG_LIRCRC
 
-#define LOGFILE			LOCALSTATEDIR "/log/" LOG_LIRCD
+/*#define LOGFILE			LOCALSTATEDIR "/log/" LOG_LIRCD*/
+#define LOGFILE			"/dev/null"
 #define LIRMAND_LOGFILE		LOCALSTATEDIR "/log/" LOG_LIRMAND
 
 #define PIDFILE                 LOCALSTATEDIR "/run/" PID_LIRCD
diff -Naur lirc-0.8.2_org/config.h.in lirc-0.8.2/config.h.in
--- lirc-0.8.2_org/config.h.in	2007-06-09 21:36:28.000000000 +0200
+++ lirc-0.8.2/config.h.in	2007-07-21 11:56:46.000000000 +0200
@@ -369,7 +369,8 @@
 #define LIRCRC_USER_FILE	"." CFG_LIRCRC
 #define LIRCRC_ROOT_FILE	SYSCONFDIR "/" CFG_LIRCRC
 
-#define LOGFILE			LOCALSTATEDIR "/log/" LOG_LIRCD
+/* #define LOGFILE			LOCALSTATEDIR "/log/" LOG_LIRCD */
+#define LOGFILE			"/dev/null"
 #define LIRMAND_LOGFILE		LOCALSTATEDIR "/log/" LOG_LIRMAND
 
 #define PIDFILE                 LOCALSTATEDIR "/run/" PID_LIRCD
diff -Naur lirc-0.8.2_org/configure lirc-0.8.2/configure
--- lirc-0.8.2_org/configure	2007-06-09 21:36:00.000000000 +0200
+++ lirc-0.8.2/configure	2007-07-21 12:02:21.000000000 +0200
@@ -24431,8 +24431,6 @@
 
 if test "$driver" = "none"; then
   lirc_driver=none
-  hw_module=""
-  HW_DEFAULT="hw_null"
 fi
 
 if test "$driver" = "userspace" -o "$driver" = "all"; then
diff -Naur lirc-0.8.2_org/daemons/lircd.c lirc-0.8.2/daemons/lircd.c
--- lirc-0.8.2_org/daemons/lircd.c	2007-05-06 11:46:59.000000000 +0200
+++ lirc-0.8.2/daemons/lircd.c	2007-07-21 12:01:35.000000000 +0200
@@ -99,7 +99,7 @@
 #else
 static const char *syslogident = "lircd-" VERSION;
 #endif
-FILE *pidf;
+//FILE *pidf;
 char *pidfile = PIDFILE;
 char *lircdfile = LIRCD;
 
@@ -313,8 +313,8 @@
 		shutdown(sockinet,2);
 		close(sockinet);
 	}
-	fclose(pidf);
-	(void) unlink(pidfile);
+//	fclose(pidf);
+//	(void) unlink(pidfile);
 	if(clin>0 && hw.deinit_func) hw.deinit_func();
 #ifdef USE_SYSLOG
 	closelog();
@@ -860,8 +860,8 @@
  start_server_failed1:
 	close(sockfd);
  start_server_failed0:
-	fclose(pidf);
-	(void) unlink(pidfile);
+//	fclose(pidf);
+//	(void) unlink(pidfile);
 	exit(EXIT_FAILURE);
 }