Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Dmitry Butskoy
1c126dbd22 . 2025-06-19 15:10:34 +03:00
Dmitry Butskoy
b41727f229 port to epel8 2025-06-19 14:53:56 +03:00
16 changed files with 1206 additions and 6 deletions

View file

View file

@ -1,6 +0,0 @@
# Makefile for source rpm: irda-utils
# $Id$
NAME := irda-utils
SPECFILE = $(firstword $(wildcard *.spec))
include ../common/Makefile.common

View file

@ -0,0 +1,11 @@
--- irda-utils-0.9.15/irattach/irattach.c.rh1 2003-11-24 17:30:21.000000000 +0100
+++ irda-utils-0.9.15/irattach/irattach.c 2003-11-24 17:34:51.000000000 +0100
@@ -614,7 +614,7 @@
/* First arg is device name. Save it now, because in some cases
* getopt() will remove it... */
strncpy(device, argv[1], 20);
- device[20] = '\0';
+ device[19] = '\0';
/* Look for options */
/* Do this before processing device, to handle "-h" and -v"

View file

@ -0,0 +1,35 @@
diff -upr irda-utils-0.9.16/findchip/nsc.c irda-utils-0.9.16.new/findchip/nsc.c
--- irda-utils-0.9.16/findchip/nsc.c 2003-07-07 21:33:37.000000000 -0400
+++ irda-utils-0.9.16.new/findchip/nsc.c 2006-03-24 07:16:14.000000000 -0500
@@ -33,7 +33,7 @@
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
-#include <asm/io.h>
+#include <sys/io.h>
#include "findchip.h"
diff -upr irda-utils-0.9.16/findchip/smc.c irda-utils-0.9.16.new/findchip/smc.c
--- irda-utils-0.9.16/findchip/smc.c 2003-07-07 21:33:37.000000000 -0400
+++ irda-utils-0.9.16.new/findchip/smc.c 2006-03-24 07:14:19.000000000 -0500
@@ -32,7 +32,7 @@
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
-#include <asm/io.h>
+#include <sys/io.h>
#include "findchip.h"
diff -upr irda-utils-0.9.16/findchip/winbond.c irda-utils-0.9.16.new/findchip/winbond.c
--- irda-utils-0.9.16/findchip/winbond.c 2000-11-06 16:11:39.000000000 -0500
+++ irda-utils-0.9.16.new/findchip/winbond.c 2006-03-24 07:16:29.000000000 -0500
@@ -32,7 +32,7 @@
#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
-#include <asm/io.h>
+#include <sys/io.h>
#include "findchip.h"

View file

@ -0,0 +1,79 @@
--- irda-utils-0.9.17/irdadump/Makefile.rh3 2006-03-09 07:25:23.000000000 +0100
+++ irda-utils-0.9.17/irdadump/Makefile 2006-06-01 14:47:25.000000000 +0200
@@ -8,8 +8,8 @@
RM_CMD = $(ECMD)$(RM) *.BAK *.bak *.o ,* *~ *.a
-INCLUDES = $(SYS_INCLUDES) -I../include/
-LIBRARIES = $(SYS_LIBRARIES)
+INCLUDES = $(SYS_INCLUDES) -I../include/ -I. `pkg-config --cflags glib-2.0`
+LIBRARIES = $(SYS_LIBRARIES) `pkg-config --cflags --libs glib-2.0`
LIBPATH = $(SYS_LIBPATH)
#
@@ -27,7 +27,7 @@
LIBIRDADUMP_TARGET = lib_irdadump.a
IRDADUMP_TARGET = irdadump
-all: lib_irdadump.a irdadump
+all: irdadump lib_irdadump.a
lib_irdadump.a: $(LIBIRDADUMP_OBJS)
@@ -40,7 +40,8 @@
irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
+ $(ECMD)$(CC) $(CFLAGS) $(LIBRARIES) -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
+ #$(ECMD)$(CC) $(CFLAGS) `pkg-config --cflags --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
.c.o:
--- irda-utils-0.9.17/irnetd/Makefile.rh3 2006-03-09 07:25:19.000000000 +0100
+++ irda-utils-0.9.17/irnetd/Makefile 2006-06-01 14:47:25.000000000 +0200
@@ -55,7 +55,7 @@
install: irnetd
$(prn_install)
- $(ECMD) install irnetd /usr/sbin/
+ $(ECMD) install irnetd $(ROOT)/usr/sbin/
clean:
--- irda-utils-0.9.17/Makefile.rh3 2006-03-09 07:25:27.000000000 +0100
+++ irda-utils-0.9.17/Makefile 2006-06-01 14:48:21.000000000 +0200
@@ -28,10 +28,11 @@
TARGET = test
DIRS = irattach irdaping etc man irnetd psion tekram findchip irdadump smcinit
-CFLAGS= -O2 -W -Wall
+CFLAGS = -O2 -W -Wall
+INCLUDES = -I/usr/include/glib-2.0 -I./include -I.
all:
- @-(set -e ; for d in $(DIRS) ; do $(MAKE) $(MAKE_OUTPUT) -C $$d $@ ; done)
+ @-(set -e ; for d in $(DIRS) ; do $(MAKE) $(INCLUDES) $(MAKE_OUTPUT) -C $$d $@ ; done)
install:
--- irda-utils-0.9.17/psion/Makefile.rh3 2006-03-09 07:25:19.000000000 +0100
+++ irda-utils-0.9.17/psion/Makefile 2006-06-01 14:47:25.000000000 +0200
@@ -5,6 +5,7 @@
PSION_SRC= irpsion5.c
PSION_OBJS= irpsion5.o
PSION_TARGETS= irpsion5
+CFLAGS= -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
all: $(PSION_TARGETS)
@@ -22,7 +23,6 @@
$(ECMD)install $(PSION_TARGETS) $(ROOT)/usr/bin
-CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
irpsion5:
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@
\ Kein Zeilenumbruch am Dateiende.
+ $(ECMD)$(CC) $(CFLAGS) -g -I/usr/include/glib-2.0 -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) $(PSION_SRC) -o $@

View file

@ -0,0 +1,14 @@
--- irda-utils-0.9.17/irdadump/main.c.root 2006-06-01 12:53:34.000000000 +0200
+++ irda-utils-0.9.17/irdadump/main.c 2006-06-01 12:54:03.000000000 +0200
@@ -72,6 +72,11 @@
char *readfilename = NULL;
int fd, c;
+ if(geteuid()) {
+ puts("You need to be root to run this utility.\n");
+ return 1;
+ }
+
while ((c = getopt(argc, argv, "bc:di:lpr:s:tvw:x?")) != -1) {
switch (c) {
case 'b': /* Dumb bytes */

113
irda-utils-0.9.18-PIE.patch Normal file
View file

@ -0,0 +1,113 @@
diff --git a/findchip/Makefile b/findchip/Makefile
index 7428617..0937827 100644
--- a/findchip/Makefile
+++ b/findchip/Makefile
@@ -47,7 +47,7 @@ all: findchip
findchip: $(OBJS)
$(prn_cc_o)
- $(ECMD)$(CC) $(OBJS) $(CFLAGS) -o $@
+ $(ECMD)$(CC) $(OBJS) $(CFLAGS) $(LDFLAGS) -o $@
clean:
diff --git a/irattach/Makefile b/irattach/Makefile
index e70de61..76383c2 100644
--- a/irattach/Makefile
+++ b/irattach/Makefile
@@ -28,7 +28,7 @@ include ../output.mak
CC = gcc
LD = ld
RM = rm -f
-CFLAGS = -O2 -W -Wall -Wstrict-prototypes -Wshadow $(SYS_INCLUDES)
+CFLAGS = -O2 -W -Wall -Wstrict-prototypes -Wshadow $(SYS_INCLUDES) $(RPM_OPT_FLAGS)
SYS_INCLUDES = -I/usr/include
SYS_LIBPATH = -L/usr/lib -L/usr/local/lib
@@ -49,13 +49,13 @@ all: $(TARGETS)
irattach: irattach.o util.o
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@
dongle_attach: dongle_attach.o
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@
install: $(TARGETS)
diff --git a/irdadump/Makefile b/irdadump/Makefile
index bd21abb..e7d8929 100644
--- a/irdadump/Makefile
+++ b/irdadump/Makefile
@@ -19,7 +19,7 @@ SYS_INCLUDES = -I/usr/include
SYS_LIBRARIES =
SYS_LIBPATH = -L/usr/lib -L/usr/local/lib
-CFLAGS= -O2 -W -Wall -I. `pkg-config --cflags glib-2.0`
+CFLAGS= -O2 -W -Wall -I. `pkg-config --cflags glib-2.0` $(RPM_OPT_FLAGS)
LIBIRDADUMP_OBJS = irdadump.o irlap.o irlmp.o obex.o ircomm.o netbuf.o capture.o
IRDADUMP_OBJS = main.o
@@ -40,7 +40,7 @@ lib_irdadump.a: $(LIBIRDADUMP_OBJS)
irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) $(LIBRARIES) -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBRARIES) -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
#$(ECMD)$(CC) $(CFLAGS) `pkg-config --cflags --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
diff --git a/irdaping/Makefile b/irdaping/Makefile
index ef84acd..cd64c90 100644
--- a/irdaping/Makefile
+++ b/irdaping/Makefile
@@ -56,7 +56,7 @@ all: $(TARGETS)
irdaping: $(OBJS)
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
.c.o:
diff --git a/irnetd/Makefile b/irnetd/Makefile
index 1fb1571..5efbc4a 100644
--- a/irnetd/Makefile
+++ b/irnetd/Makefile
@@ -50,7 +50,7 @@ all: $(TARGETS)
irnetd: $(OBJS)
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
install: irnetd
diff --git a/psion/Makefile b/psion/Makefile
index 001926c..5d7cd7f 100644
--- a/psion/Makefile
+++ b/psion/Makefile
@@ -25,4 +25,4 @@ install: $(PSION_TARGETS)
irpsion5:
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) -g -I/usr/include/glib-2.0 -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) $(PSION_SRC) -o $@
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) -g -I/usr/include/glib-2.0 -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) $(PSION_SRC) -o $@
diff --git a/tekram/Makefile b/tekram/Makefile
index e10d116..65996e6 100644
--- a/tekram/Makefile
+++ b/tekram/Makefile
@@ -55,7 +55,7 @@ all: irkbd
irkbd: $(OBJS)
$(prn_cc_o)
- $(ECMD)$(CC) $(OBJS) -o $@
+ $(ECMD)$(CC) $(LDFLAGS) $(OBJS) -o $@
.c.o:

View file

@ -0,0 +1,94 @@
diff -Nrbu irda-utils-0.9.18/man/irda.7 irda-utils-0.9.18-OK/man/irda.7
--- irda-utils-0.9.18/man/irda.7 2006-07-11 10:16:06.000000000 +0400
+++ irda-utils-0.9.18-OK/man/irda.7 2011-07-15 20:31:58.000000000 +0400
@@ -61,7 +61,7 @@
connection between two sockets on top of
.IR IrTTP ,
similar to TCP sockets. IrTTP guarantees that the data arrives in
-order and manages flow contol, IrLAP retransmits lost packets.
+order and manages flow control, IrLAP retransmits lost packets.
.br
Stream sockets does not preserve record boundaries.
.TP
@@ -70,7 +70,7 @@
connection between two sockets on top of
.IR IrTTP .
IrTTP guarantees that the data arrives in order and manages flow
-contol, IrLAP retransmits lost packets.
+control, IrLAP retransmits lost packets.
.br
SeqPacket sockets preserve record boundaries. Large datagrams will be
fragmented as needed.
@@ -79,8 +79,8 @@
SeqPacket sockets provides a reliable, datagram oriented, full duplex
connection between two sockets on top of
.IR IrLMP .
-There is no guarantees that the data arrives in order and there is no
-flow contol, however IrLAP retransmits lost packets.
+There is no guarantee that the data arrives in order and there is no
+flow control, however IrLAP retransmits lost packets.
.br
Datagram sockets preserve record boundaries. No fragmentation is
provided, datagrams larger than the IrDA link MTU are truncated or
@@ -90,9 +90,9 @@
Ultra sockets provides a connectionless, unreliable datagram packet
service on top of
.IR IrLAP-Ultra .
-Ultra datagrams are sent and receive only when no IrLAP connection is
+Ultra datagrams are sent and received only when no IrLAP connection is
established and otherwise discarded. They are always transmitted at
-9600 bauds. Datagrams may be lost, reordered, and there is no flow
+9600 bauds. Datagrams may be lost or reordered, and there is no flow
control.
.br
Ultra sockets preserve record boundaries. No fragmentation is
@@ -124,8 +124,8 @@
.I sir_lsap_sel
is usually not used.
.I sir_addr
-is the address of the peer and optional (and that case the first peer
-discoverd will be used).
+is the optional address of the peer (if no given the first peer
+discovered will be used).
.I sir_name
is the service name of the socket.
.\"
diff -Nrbu irda-utils-0.9.18/man/irnet.4 irda-utils-0.9.18-OK/man/irnet.4
--- irda-utils-0.9.18/man/irnet.4 2006-07-11 10:16:06.000000000 +0400
+++ irda-utils-0.9.18-OK/man/irnet.4 2011-07-15 20:33:14.000000000 +0400
@@ -31,7 +31,7 @@
.I PPP over IrCOMM
is that it avoids the framing and serial emulation which are a
performance bottleneck. It also allows multipoint communications in a
-sensible fashion. And finally, it can automatically handle incomming
+sensible fashion. And finally, it can automatically handle incoming
connections through
.B irnetd.
.PP
@@ -84,7 +84,7 @@
.IR "control channel" ,
other use are unsupported.
.B IrNET
-support multiple concurent connections (limited by the IrDA stack),
+support multiple concurrent connections (limited by the IrDA stack),
all those connections are multiplexed on a single
.B /dev/irnet
device (as opposed to IrCOMM which as one device per connection).
@@ -164,7 +164,7 @@
.\" EXAMPLE part
.\"
.SH EXAMPLE
-Start a IrNET server accepting any incomming connection:
+Start a IrNET server accepting any incoming connection:
.br
.B " pppd /dev/irnet 9600 local noauth nolock passive"
.PP
@@ -177,7 +177,7 @@
.br
.B " pppd /dev/irnet 9600 local noauth nolock connect ""echo name MyIrDANode""
.PP
-Start a IrNET server accepting incomming connection from peer with IrDA address 0x12345678 only on IrDA port 0x87654321:
+Start a IrNET server accepting incoming connection from peer with IrDA address 0x12345678 only on IrDA port 0x87654321:
.br
.B " pppd /dev/irnet 9600 local noauth nolock passive connect ""echo daddr 0x12345678 , saddr 0x87654321"""
.\"

View file

@ -0,0 +1,299 @@
diff -Nrbu irda-utils-0.9.18/irdadump/irdadump.c irda-utils-0.9.18-OK/irdadump/irdadump.c
--- irda-utils-0.9.18/irdadump/irdadump.c 2006-07-11 10:16:06.000000000 +0400
+++ irda-utils-0.9.18-OK/irdadump/irdadump.c 2017-02-13 03:42:20.216303403 +0300
@@ -71,7 +71,7 @@
* Print current time
*
*/
-inline void print_time(const struct timeval *timev, GString *str)
+void print_time(const struct timeval *timev, GString *str)
{
int s;
@@ -90,7 +90,7 @@
* Print the difference in time between this frame and the previous one
*
*/
-inline void print_diff_time(struct timeval *timev, struct timeval *prev_timev,
+void print_diff_time(struct timeval *timev, struct timeval *prev_timev,
GString *str)
{
float diff;
diff -Nrbu irda-utils-0.9.18/irdadump/irdadump.h irda-utils-0.9.18-OK/irdadump/irdadump.h
--- irda-utils-0.9.18/irdadump/irdadump.h 2006-07-11 10:16:06.000000000 +0400
+++ irda-utils-0.9.18-OK/irdadump/irdadump.h 2017-02-13 03:41:55.785303429 +0300
@@ -219,10 +219,10 @@
guint8 caddr; /* LAP connection address (for garbage collect) */
};
-inline void parse_obex(GNetBuf *buf, GString *str, int cmd);
-inline void parse_irlmp(GNetBuf *buf, GString *str,
+void parse_obex(GNetBuf *buf, GString *str, int cmd);
+void parse_irlmp(GNetBuf *buf, GString *str,
guint8 caddr, int type, int cmd);
-inline void parse_ui_irlmp(GNetBuf *buf, GString *str, int type);
+void parse_ui_irlmp(GNetBuf *buf, GString *str, int type);
void parse_ircomm_params(guint8 clen, GNetBuf *buf, GString *str);
void parse_ircomm_connect(GNetBuf *buf, GString *str);
void parse_ircomm_lmp(GNetBuf *buf, GString *str);
diff -Nrbu irda-utils-0.9.18/irdadump/irlap.c irda-utils-0.9.18-OK/irdadump/irlap.c
--- irda-utils-0.9.18/irdadump/irlap.c 2006-07-11 10:16:06.000000000 +0400
+++ irda-utils-0.9.18-OK/irdadump/irlap.c 2017-02-13 03:43:06.858303354 +0300
@@ -91,7 +91,7 @@
* Garbage collect destroyes LAP connections
*
*/
-inline void garbage_connection(guint8 caddr)
+void garbage_connection(guint8 caddr)
{
gint i;
@@ -226,7 +226,7 @@
* Parse and print the names of the various hint bits if they are set
*
*/
-inline void parse_hints(guint8 *hint, GString *str)
+void parse_hints(guint8 *hint, GString *str)
{
g_string_append(str, "[ ");
if (hint[0] & HINT_PNP)
@@ -261,7 +261,7 @@
* Exchange station identification frame
*
*/
-inline void parse_xid_frame(guint8 command, guint8 pf, int type,
+void parse_xid_frame(guint8 command, guint8 pf, int type,
GNetBuf *buf, GString *str)
{
struct xid_frame *frame = (struct xid_frame *) buf->data;
@@ -339,7 +339,7 @@
* Information frames
*
*/
-inline void parse_i_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
+void parse_i_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
GNetBuf *buf, GString *str)
{
int nr, ns;
@@ -396,7 +396,7 @@
* Information frames
*
*/
-inline void parse_ui_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
+void parse_ui_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
GNetBuf *buf, GString *str)
{
/* Remove IrLAP header */
@@ -417,7 +417,7 @@
* Frame reject frame
*
*/
-inline void parse_frmr_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
+void parse_frmr_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
GNetBuf *buf, GString *str)
{
int nr, ns;
@@ -439,7 +439,7 @@
* Receive ready frame
*
*/
-inline void parse_rr_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
+void parse_rr_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
GNetBuf *buf, GString *str)
{
int nr;
@@ -479,7 +479,7 @@
* Receive not ready frame
*
*/
-inline void parse_rnr_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
+void parse_rnr_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
GNetBuf *buf, GString *str)
{
int nr;
@@ -497,7 +497,7 @@
* Reject frame
*
*/
-inline void parse_rej_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
+void parse_rej_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
GNetBuf *buf, GString *str)
{
int nr;
@@ -515,7 +515,7 @@
* Selective reject frame
*
*/
-inline void parse_srej_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
+void parse_srej_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
GNetBuf *buf, GString *str)
{
int nr;
@@ -533,7 +533,7 @@
* Unnumbered acknowledgement frame
*
*/
-inline void parse_ua_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
+void parse_ua_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
GNetBuf *buf, GString *str)
{
struct ua_frame *frame = (struct ua_frame *) buf->data;
@@ -564,7 +564,7 @@
* Disconnect frame
*
*/
-inline void parse_disc_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
+void parse_disc_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
GNetBuf *buf, GString *str)
{
/* Kill "unused" warning */
@@ -582,7 +582,7 @@
* Disconnected mode frame
*
*/
-inline void parse_dm_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
+void parse_dm_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
GNetBuf *buf, GString *str)
{
/* Kill "unused" warning */
@@ -598,7 +598,7 @@
* Request disconnect frame
*
*/
-inline void parse_rd_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
+void parse_rd_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
GNetBuf *buf, GString *str)
{
/* Kill "unused" warning */
@@ -614,7 +614,7 @@
* Test frame
*
*/
-inline void parse_test_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
+void parse_test_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
GNetBuf *buf, GString *str)
{
struct test_frame *frame = (struct test_frame *) buf->data;
@@ -634,7 +634,7 @@
* Set normal response mode frame
*
*/
-inline void parse_snrm_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
+void parse_snrm_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
GNetBuf *buf, GString *str)
{
struct snrm_frame *frame = (struct snrm_frame *) buf->data;
@@ -671,7 +671,7 @@
* Request normal response mode
*
*/
-inline void parse_rnrm_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
+void parse_rnrm_frame(guint8 caddr, guint8 cmd, guint8 pf, int type,
GNetBuf *buf, GString *str)
{
gint32 saddr, daddr;
diff -Nrbu irda-utils-0.9.18/irdadump/irlmp.c irda-utils-0.9.18-OK/irdadump/irlmp.c
--- irda-utils-0.9.18/irdadump/irlmp.c 2006-07-11 10:16:06.000000000 +0400
+++ irda-utils-0.9.18-OK/irdadump/irlmp.c 2017-02-13 03:41:45.654303441 +0300
@@ -47,7 +47,7 @@
* Try to parse and print the LM-IAS query
*
*/
-inline void parse_iriap_command(GNetBuf *buf, GString *str, guint8 slsap_sel)
+void parse_iriap_command(GNetBuf *buf, GString *str, guint8 slsap_sel)
{
guint8 opcode;
char name[255];
@@ -193,7 +193,7 @@
*
*
*/
-inline void parse_iriap_response(GNetBuf *buf, GString *str, guint8 dlsap_sel)
+void parse_iriap_response(GNetBuf *buf, GString *str, guint8 dlsap_sel)
{
guint8 opcode, rsp;
@@ -239,7 +239,7 @@
* Parse IrTTP data frame
*
*/
-inline void parse_irnet(GNetBuf *buf, GString *str)
+void parse_irnet(GNetBuf *buf, GString *str)
{
/* Kill "unused" warning */
buf = buf;
@@ -256,7 +256,7 @@
* Parse IrTTP data frame
*
*/
-inline void parse_irttp(GNetBuf *buf, GString *str)
+void parse_irttp(GNetBuf *buf, GString *str)
{
g_string_sprintfa(str, "TTP credits=%d ", buf->data[0] & 0x7f);
@@ -273,7 +273,7 @@
* Parse IrTTP connect frame
*
*/
-inline void parse_irttp_connect(GNetBuf *buf, GString *str)
+void parse_irttp_connect(GNetBuf *buf, GString *str)
{
guint8 plen, pi, pl;
guint16 tmp_cpu;
@@ -303,7 +303,7 @@
* Parse IrLMP frame
*
*/
-inline void parse_irlmp(GNetBuf *buf, GString *str,
+void parse_irlmp(GNetBuf *buf, GString *str,
guint8 caddr, int type, int cmd)
{
guint8 slsap_sel, dlsap_sel;
@@ -437,7 +437,7 @@
* Parse IrLMP frame in UI frame
*
*/
-inline void parse_ui_irlmp(GNetBuf *buf, GString *str, int type)
+void parse_ui_irlmp(GNetBuf *buf, GString *str, int type)
{
guint8 slsap_sel, dlsap_sel;
int ctrl;
diff -Nrbu irda-utils-0.9.18/irdadump/obex.c irda-utils-0.9.18-OK/irdadump/obex.c
--- irda-utils-0.9.18/irdadump/obex.c 2006-07-11 10:16:06.000000000 +0400
+++ irda-utils-0.9.18-OK/irdadump/obex.c 2017-02-13 03:42:10.356303414 +0300
@@ -112,7 +112,7 @@
* Parse an OBEX put command
*
*/
-inline void parse_obex_headers(GNetBuf *buf, GString *str)
+void parse_obex_headers(GNetBuf *buf, GString *str)
{
struct obex_minimal_frame *frame;
int final;
@@ -179,7 +179,7 @@
}
}
-inline void parse_obex_connect(GNetBuf *buf, GString *str)
+void parse_obex_connect(GNetBuf *buf, GString *str)
{
struct obex_connect_frame *frame;
guint16 length;
@@ -210,7 +210,7 @@
* We also need to parse the anser to GET request properly
* Jean II
*/
-inline void parse_obex_success(GNetBuf *buf, GString *str)
+void parse_obex_success(GNetBuf *buf, GString *str)
{
struct obex_connect_frame *frame;
guint16 length;
@@ -252,7 +252,7 @@
* Parse OBEX commands and responses
*
*/
-inline void parse_obex(GNetBuf *buf, GString *str, int cmd)
+void parse_obex(GNetBuf *buf, GString *str, int cmd)
{
guint8 opcode;
int len;

View file

@ -0,0 +1,15 @@
--- irda-utils-0.9.18/etc/install-etc.root 2006-07-11 00:16:06.000000000 -0600
+++ irda-utils-0.9.18/etc/install-etc 2009-10-20 10:11:39.691877856 -0600
@@ -1,10 +1,10 @@
#!/bin/sh
# Only install on SYSV for now
-if [ -d /etc/sysconfig/ ]; then
+if [ -d $ROOT/etc/sysconfig/ ]; then
install -D irda.sysconfig $ROOT/etc/sysconfig/irda
install -D ifcfg-irlan0 $ROOT/etc/sysconfig/network-scripts/ifcfg-irlan0
fi
-if [ -d /etc/rc.d/init.d ]; then
+if [ -d $ROOT/etc/rc.d/init.d ]; then
install -D irda.rc $ROOT/etc/rc.d/init.d/irda
fi

View file

@ -0,0 +1,11 @@
--- irda-utils-0.9.18/irattach/irattach.c.orig 2021-05-17 01:58:48.781587723 +0300
+++ irda-utils-0.9.18/irattach/irattach.c 2021-05-17 02:01:21.738344238 +0300
@@ -68,7 +68,7 @@
static int termvalid = -1; /* If termsave is valid */
/* Default path for pid file */
-char *pidfile = "/var/run/irattach.pid";
+char *pidfile = "/run/irattach.pid";
/* Used by ioctl to the tty to obtain the network device name */
struct irtty_info {

430
irda-utils.spec Normal file
View file

@ -0,0 +1,430 @@
Summary: Utilities for infrared communication between devices
Name: irda-utils
Version: 0.9.18
Release: 41%{?dist}
Url: http://irda.sourceforge.net
# Automatically converted from old format: GPLv2+ - review is highly recommended.
License: GPL-2.0-or-later
ExcludeArch: s390 s390x
Source0: http://downloads.sourceforge.net/irda/%{name}/%{version}/%{name}-%{version}.tar.gz
Source1: irda.init
Source2: irda.service
Source3: irda.sysconfig
Patch1: irda-utils-0.9.17-rootonly.patch
Patch2: irda-utils-0.9.15-rh1.patch
Patch3: irda-utils-0.9.16-io.patch
Patch4: irda-utils-0.9.17-makefile.patch
Patch6: irda-utils-0.9.18-root.patch
Patch7: irda-utils-0.9.18-man.patch
Patch8: irda-utils-0.9.18-PIE.patch
Patch9: irda-utils-0.9.18-no-inline.patch
Patch10: irda-utils-0.9.18-run.patch
BuildRequires: gcc
BuildRequires: glib2-devel, pciutils-devel
BuildRequires: systemd-units
BuildRequires: make
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
%description
IrDA(TM) (Infrared Data Association) is an industry standard for
wireless, infrared communication between devices. IrDA speeds range
from 9600 bps to 4 Mbps, and IrDA can be used by many modern devices
including laptops, LAN adapters, PDAs, printers, and mobile phones.
The Linux-IrDA project is a GPL'd implementation, written from
scratch, of the IrDA protocols. Supported IrDA protocols include
IrLAP, IrLMP, IrIAP, IrTTP, IrLPT, IrLAN, IrCOMM and IrOBEX.
The irda-utils package contains a collection of programs that enable
the use of IrDA protocols. Most IrDA features are implemented in the
kernel, so IrDA support must be enabled in the kernel before any IrDA
tools or programs can be used. Some configuration outside the kernel
is required, however, and some IrDA features, like IrOBEX, are
actually implemented outside the kernel.
%prep
%setup -q
%patch -P1 -p1
%patch -P2 -p1
%patch -P3 -p1
%patch -P4 -p1
%patch -P6 -p1
gunzip man/irnet.4.gz man/irda.7.gz
%patch -P7 -p1
gzip -9 man/irnet.4 man/irda.7
%patch -P8 -p1
%patch -P9 -p1
%patch -P10 -p1
%build
export LDFLAGS="%{?__global_ldflags}"
make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS -std=gnu89" ROOT="$RPM_BUILD_ROOT" \
LDFLAGS="%{?__global_ldflags}" \
CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
for dir in %{_sbindir} %{_bindir} %{_initrddir} %{_sysconfdir}/sysconfig
do
install -d $RPM_BUILD_ROOT$dir
done
make install ROOT="$RPM_BUILD_ROOT" MANDIR="$RPM_BUILD_ROOT/%{_mandir}"
#install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/irda
#chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda
rm -f $RPM_BUILD_ROOT/%{_initrddir}/irda
install -d $RPM_BUILD_ROOT%{_unitdir}
install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/irda.service
install -p -m644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifcfg-irlan0
for i in irattach irdadump irdaping tekram
do
[ -f $i/README ] && ln $i/README README.$i
done
iconv -f ISO8859-1 -t UTF-8 <README.irdadump >README.irdadump.new && \
mv -f README.irdadump.new README.irdadump
mv etc/modules.conf.irda etc/modprobe.conf.irda
chmod -x etc/ifcfg-irlan0
%post
%systemd_post irda.service
%preun
%systemd_preun irda.service
%postun
%systemd_postun_with_restart irda.service
%files
%{_sbindir}/*
%{_bindir}/*
%{_mandir}/*/*
%{_unitdir}/*
%config(noreplace) %{_sysconfdir}/sysconfig/irda
%doc README* etc/ifcfg-irlan0 etc/modprobe.conf.irda
%changelog
* Thu Jun 19 2025 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.9.18-41
- port to EPEL8
* Mon May 17 2021 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.9.18-40
- move /var/run to /run and fix systemd service file (#1960900)
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.9.18-39
- Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-37
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Mon Feb 13 2017 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.9.18-29
- add no-inline patch for new compilers
- require pciutils-devel for smcinit
* Sun Feb 12 2017 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.9.18-25
- enable smcinit (#1421387)
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.18-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.18-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.18-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.18-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Thu Jun 13 2013 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.9.18-18
- build with PIE flags (#955165)
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.18-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Mon Sep 24 2012 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.9.18-16
- new systemd-rpm macros (#850171)
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.18-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.18-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Mon Jul 18 2011 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.9.18-13
- migrate from SysV to Systemd init system (#694940)
* Fri Jul 15 2011 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.9.18-12
- spec file cleanup
- add own init script instead of huge patched original one
(and fix #242468)
- disable smcinit manuals in smcdisable patch as well
- fix typos in man pages (#668122, #675677)
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.18-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Tue Oct 20 2009 Orion Poplawski <orion@cora.nwra.com> - 0.9.18-10
- Add patch to fix installing of initscript into buildroot
* Mon Aug 10 2009 Ville Skyttä <ville.skytta@iki.fi> - 0.9.18-9
- Convert specfile to UTF-8.
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.18-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.18-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Mon Dec 01 2008 Karsten Hopp <karsten@redhat.com> 0.9.18-6
- use macros, fix Source0
* Thu Jul 31 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.9.18-5
- fix license tag
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.9.18-4
- Autorebuild for GCC 4.3
* Wed Aug 29 2007 Karsten Hopp <karsten@redhat.com> 0.9.18-3
- rebuild for buildid
* Wed Feb 21 2007 Karsten Hopp <karsten@redhat.com> 0.9.18-2
- review cleanups
* Tue Jan 23 2007 Karsten Hopp <karsten@redhat.com> 0.9.18-1
- update to 0.9.18
* Tue Aug 01 2006 Karsten Hopp <karsten@redhat.de> 0.9.17-2
- initscript fix from Paul Bolle (#168325)
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0.9.17-1.1
- rebuild
* Mon Jun 19 2006 Karsten Hopp <karsten@redhat.de> 0.9.17-1
- update to 0.9.17
- makefile fixes
- disable smcinit
- use manpages from 0.9.17-pre3 as those from 0.9.17 are corrupted
* Mon Apr 03 2006 Karsten Hopp <karsten@redhat.de> 0.9.16-8
- don't use asm/io.h directly (Bastien Nocera #186875)
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0.9.16-7.2.1
- bump again for double-long bug on ppc(64)
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 0.9.16-7.2
- rebuilt for new gcc4.1 snapshot and glibc changes
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
- rebuilt
* Wed Mar 02 2005 Karsten Hopp <karsten@redhat.de> 0.9.16-7
- build with gcc-4
* Tue Feb 15 2005 Karsten Hopp <karsten@redhat.de> 0.9.16-6
- use RPM_OPT_FLAGS as CFLAGS
* Tue Feb 15 2005 Karsten Hopp <karsten@redhat.de> 0.9.16-5
- load irtty-sir module (#148750)
* Wed Feb 02 2005 Karsten Hopp <karsten@redhat.de> 0.9.16-4
- use glib2 instead of glib (#136223)
* Mon Oct 04 2004 Karsten Hopp <karsten@redhat.de> 0.9.16-3
- load irda modules to make it work with udev (#134322)
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Wed Jun 02 2004 Karsten Hopp <karsten@redhat.de> 0.9.16-1
- update
* Wed Feb 18 2004 Karsten Hopp <karsten@redhat.de> 0.9.15-5
- add manpages (#115972)
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Sat Jan 24 2004 Florian La Roche <Florian.LaRoche@redhat.de>
- do not use *.spec as filename for a patch
* Mon Nov 24 2003 Karsten Hopp <karsten@redhat.de> 0.9.15-2
- fix array usage (#110791)
* Sun Oct 19 2003 Florian La Roche <Florian.LaRoche@redhat.de>
- add a %%clean specfile target
* Thu Jul 03 2003 Karsten Hopp <karsten@redhat.de> 0.9.15-1.1
- rebuilt
* Wed Jul 02 2003 Karsten Hopp <karsten@redhat.de> 0.9.15-1
- update
- removed libtool patch, it's obsolete now
- new root patch
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
- rebuilt
* Mon Dec 16 2002 Dan Walsh <dwalsh@redhat.com> 0.9.14-8
- Fixed service script description
* Mon Dec 09 2002 Phil Knirsch <pknirsch@redhat.com> 0.9.14-7
- Fixed problem with %%doc entries.
* Tue Jul 09 2002 Phil Knirsch <pknirsch@redhat.com> 0.9.14-6
- Removed the ifcfg-irlan0 file. It shouldn't be installed by default. Moved it
to the docs dir.
* Fri Jun 21 2002 Tim Powers <timp@redhat.com> 0.9.14-5
- automated rebuild
* Thu May 23 2002 Tim Powers <timp@redhat.com> 0.9.14-4
- automated rebuild
* Thu Apr 4 2002 Bernhard Rosenkraenzer <bero@redhat.com> 0.9.14-3
- Stop irda service earlier (#61777)
* Mon Jul 16 2001 Bernhard Rosenkraenzer <bero@redhat.com> 0.9.14-2
- Fix libtool detection (#49093)
* Tue Apr 24 2001 Bernhard Rosenkraenzer <bero@redhat.com> 0.9.14-1
- 0.9.14-1
* Thu Feb 8 2001 Bernhard Rosenkraenzer <bero@redhat.com>
- Make init scripts more i18n friendly (use $0, $prog)
Bugs #26527 and #26550
- Exclude S/390 (they don't have the needed hardware)
* Mon Feb 5 2001 Bernhard Rosenkraenzer <bero@redhat.com>
- i18nize init scripts (#26077)
* Wed Jan 10 2001 Bernhard Rosenkraenzer <bero@redhat.com>
- chmod -x /etc/sysconfig/irda (#22837)
* Sat Jan 6 2001 Bernhard Rosenkraenzer <bero@redhat.com>
- Fix up the init script
* Mon Dec 25 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- Get rid of the /etc/modules.conf hack; the entries are in the
latest modutils by default. (Bug #22799)
- Require modutils >= 2.3.21-4 to make sure the modules.conf hack
isn't needed
* Wed Dec 6 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- Require modutils >= 2.3.11-5 rather than /etc/modules.conf
* Tue Dec 5 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- 0.9.13
* Tue Oct 31 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- Add necessary entries to /etc/modules.conf in %%post (Bug #19960)
- Update source URL
- Fix build with current kernel 2.4 header files
* Mon Oct 2 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- make irdadump exit with an error message rather than a segfault when
run as non-root
- Update URL
* Wed Aug 2 2000 Bill Nottingham <notting@redhat.com>
- fix start priority (345 isn't right...)
- fix condrestart
* Sun Jul 23 2000 Trond Eivind Glomsrød <teg@redhat.com>
- source files from /etc/rc.d/init.d
* Sun Jul 23 2000 Trond Eivind Glomsrød <teg@redhat.com>
- don't prereq /etc/init.d anymore
- rename "rh-status"
- use %%{_tmppath}
* Sat Jul 15 2000 Bill Nottingham <notting@redhat.com>
- move initscript back
* Thu Jul 13 2000 Prospector <bugzilla@redhat.com>
- automatic rebuild
* Tue Jun 27 2000 Preston Brown <pbrown@redhat.com>
- don't prereq, only require initscripts
* Mon Jun 26 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- Fix up initscripts
- chkconfigize
* Sun Jun 18 2000 Matt Wilson <msw@redhat.com>
- rebuilt for next release
* Fri Feb 4 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- 0.9.10
- add docs
* Fri Feb 4 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- strip libraries
* Mon Jan 31 2000 Bill Nottingham <notting@redhat.com>
- fix typo in initscript
* Mon Oct 11 1999 Cristian Gafton <gafton@redhat.com>
- remove some of the network config files (and hope that the package will
still work :-)
* Sun Oct 10 1999 Bernhard Rosenkraenzer <bero@redhat.de>
- Add the /etc/irda directory. It's needed.
- Add the /etc/rc.d/init.d/irda script to start the irda daemon
- chkconfig'ize /etc/rc.d/init.d/irda
* Fri Sep 17 1999 Cristian Gafton <gafton@redhat.com>
- build for RH 6.1
- add patch to make the damn package compile without any IrDA installed.

80
irda.init Normal file
View file

@ -0,0 +1,80 @@
#!/bin/sh
#
# irda This shell script takes care of starting and stopping
# IrDA support
#
# chkconfig: - 45 24
# description: IrDA(TM) (Infrared Data Association) is an industry standard \
# for wireless, infrared communication between devices. IrDA speeds range \
# from 9600 bps to 4 Mbps, and IrDA can be used by many modern devices \
# including laptops, LAN adapters, PDAs, printers, and mobile phones.
#
# Source function library.
. /etc/rc.d/init.d/functions
# Source IrDA networking configuration.
. /etc/sysconfig/irda
# Check that irda is up.
[ ${IRDA} = "no" ] && exit 6
[ -f /usr/sbin/irattach ] || exit 5
args=
[ -n "$DONGLE" ] && args="$args -d $DONGLE"
[ "$DISCOVERY" = "yes" ] && args="$args -s"
RETVAL=0
start() {
echo -n $"Starting IrDA: "
/sbin/modprobe ircomm-tty 2>/dev/null
/sbin/modprobe irtty-sir 2>/dev/null
/sbin/modprobe irnet 2>/dev/null
daemon /usr/sbin/irattach ${DEVICE} ${args}
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/irda
echo
}
stop() {
echo -n $"Shutting down IrDA: "
killproc irattach
RETVAL=$?
rm -f /var/lock/subsys/irda
echo
}
restart() {
stop
start
}
# See how we were called.
case "$1" in
start)
start
;;
stop)
stop
;;
status)
status irattach
RETVAL=$?
;;
restart|reload|force-reload)
restart
;;
condrestart|try-restart)
[ -f /var/lock/subsys/irda ] && restart
;;
*)
echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
exit 3
esac
exit $RETVAL

16
irda.service Normal file
View file

@ -0,0 +1,16 @@
[Unit]
Description=Irda Support
After=syslog.target
[Service]
Type=forking
PIDFile=/run/irattach.pid
EnvironmentFile=-/etc/sysconfig/irda
ExecStartPre=-/sbin/modprobe -qab ircomm-tty irtty-sir irnet
ExecStart=/usr/sbin/irattach ${DEVICE} ${OPTIONS}
StandardOutput=journal
StandardError=journal
[Install]
WantedBy=multi-user.target

8
irda.sysconfig Normal file
View file

@ -0,0 +1,8 @@
# Either a tty name, or IrDA interface name, or FIR module name.
# See irattach(8) for more info
DEVICE=/dev/ttyS2
# `-s' starts discovery of remote devices
# `-d dongle' attaches an additional dongle driver `dobgle' to the IrDA port
#OPTIONS="-s -d actisys+"
OPTIONS="-s"

View file

@ -0,0 +1 @@
84dc12aa4c3f61fccb8d8919bf4079bb irda-utils-0.9.18.tar.gz