- Un-bungle newly introduced segfault in prior build

lirc-0.8.6-ioctl-portability.patch

@@ -2,6 +2,14 @@ Index: lirc-0.8.6/drivers/lirc.h
 ===================================================================
 --- lirc-0.8.6.orig/drivers/lirc.h
 +++ lirc-0.8.6/drivers/lirc.h
+@@ -11,6 +11,7 @@
+ #define __USE_LINUX_IOCTL_DEFS
+ #include <sys/ioctl.h>
+ #endif
++#include <stdint.h>
+
+ #define PULSE_BIT  0x01000000
+ #define PULSE_MASK 0x00FFFFFF
 @@ -68,27 +68,27 @@ typedef int lirc_t;
  
  /*** IOCTL commands for lirc driver ***/

lirc-0.8.6-remove-obsolete-modes.patch

@@ -2,15 +2,7 @@ Index: lirc-0.8.6/drivers/lirc.h
 ===================================================================
 --- lirc-0.8.6.orig/drivers/lirc.h
 +++ lirc-0.8.6/drivers/lirc.h
-@@ -11,6 +11,7 @@
- #define __USE_LINUX_IOCTL_DEFS
- #include <sys/ioctl.h>
- #endif
-+#include <stdint.h>
- 
- #define PULSE_BIT  0x01000000
- #define PULSE_MASK 0x00FFFFFF
-@@ -27,17 +28,13 @@ typedef int lirc_t;
+@@ -28,17 +28,13 @@ typedef int lirc_t;
  #define LIRC_MODE_RAW                  0x00000001
  #define LIRC_MODE_PULSE                0x00000002
  #define LIRC_MODE_MODE2                0x00000004
@@ -28,7 +20,7 @@ Index: lirc-0.8.6/drivers/lirc.h
  
  #define LIRC_CAN_SEND_MASK             0x0000003f
  
-@@ -48,9 +45,7 @@ typedef int lirc_t;
+@@ -49,9 +45,7 @@ typedef int lirc_t;
  #define LIRC_CAN_REC_RAW               LIRC_MODE2REC(LIRC_MODE_RAW)
  #define LIRC_CAN_REC_PULSE             LIRC_MODE2REC(LIRC_MODE_PULSE)
  #define LIRC_CAN_REC_MODE2             LIRC_MODE2REC(LIRC_MODE_MODE2)
@@ -403,18 +395,22 @@ Index: lirc-0.8.6/daemons/hw_bte.c
 ===================================================================
 --- lirc-0.8.6.orig/daemons/hw_bte.c
 +++ lirc-0.8.6/daemons/hw_bte.c
-@@ -66,14 +66,10 @@ struct hardware hw_bte=
+@@ -66,14 +66,14 @@ struct hardware hw_bte=
  	LIRC_DRIVER_DEVICE,       /* default device */
  	-1,                       /* fd */
  #if BTE_CAN_SEND
 -	LIRC_CAN_REC_STRING|LIRC_CAN_SEND_STRING,    /* features */
 -	LIRC_MODE_STRING,         /* send_mode */
++	LIRC_CAN_REC_LIRCCODE|LIRC_CAN_SEND_LIRCCODE,    /* features */
++	LIRC_MODE_LIRCCODE,       /* send_mode */
  #else
 -	LIRC_CAN_REC_STRING,      /* features */
++	LIRC_CAN_REC_LIRCCODE,    /* features */
  	0,                        /* send_mode */
  #endif
  
 -	LIRC_MODE_STRING,         /* rec_mode */
++	LIRC_MODE_LIRCCODE,       /* rec_mode */
  	16,                       /* code_length */
  	bte_init,	          /* init_func */
  	NULL,                     /* config_func */

lirc.spec

@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.6
-Release:        3%{?pre:.%{pre}}%{?dist}
+Release:        4%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -289,6 +289,9 @@ fi
 
 
 %changelog
+* Mon Feb 15 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-4
+- Un-bungle newly introduced segfault in prior build
+
 * Mon Feb 15 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-3
 - Fix up ioctl portability between 32-bit and 64-bit