Attachment #160108 for bug #202488

View | Details | Raw Unified | Return to bug 202488
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libirman	4	PORTNAME= libirman
5	PORTVERSION= 0.4.5	5	PORTVERSION= 0.4.6
6	PORTREVISION= 2	6	PORTREVISION= 2
7	CATEGORIES= comms	7	CATEGORIES= comms
8	MASTER_SITES= SF/lirc/${PORTNAME}/${PORTVERSION}	8	MASTER_SITES= SF/lirc/${PORTNAME}/${PORTVERSION}

Lines 1-11 Link Here

(-)files/patch-Makefile.in (-7 / +7 lines)
1	--- Makefile.in.orig 2009-04-10 23:07:01 +0800	1	--- Makefile.in.orig 2015-08-18 19:51:04 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -534,7 +534,7 @@ install-dist_sysconfDATA: $(dist_sysconf	3	@@ -778,7 +778,7 @@ install-dist_sysconfDATA: $(dist_sysconf
4	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \	4	done \| $(am__base_list) \| \
5	f=$(am__strip_dir) \	5	while read files; do \
6	echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \	6	echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
7	- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \	7	- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" \|\| exit $$?; \
8	+ $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f.sample"; \	8	+ $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)/$$files.sample" \|\| exit $$?; \
9	done	9	done
10		10
11	uninstall-dist_sysconfDATA:	11	uninstall-dist_sysconfDATA:




--- irio.c.orig	2009-01-26 21:00:17 UTC
+++ irio.c
@@ -93,14 +93,6 @@ int ir_open_port(char *filename)
     return -1;
   }
 
-  /* lock the file for ourselves */
-  if (flock(portfd, LOCK_EX | LOCK_NB) < 0) {
-    /* unable to get lock */
-    close(portfd);
-    portfd = 0;
-    return -1;
-  }
-
   /* get port attributes, store in oldterm */
   if (tcgetattr(portfd, &oldterm) < 0) {
     close(portfd);




--- irio.c-orig	Sat Mar 29 20:26:57 2003
+++ irio.c	Sat Mar 29 20:27:12 2003
@@ -91,14 +91,6 @@
     return -1;
   }
 
-  /* lock the file for ourselves */
-  if (flock(portfd, LOCK_EX | LOCK_NB) < 0) {
-    /* unable to get lock */
-    close(portfd);
-    portfd = 0;
-    return -1;
-  }
-
   /* get port attributes, store in oldterm */
   if (tcgetattr(portfd, &oldterm) < 0) {
     close(portfd);

Return to bug 202488

Line 0 Link Here

(-)files/patch-irio.c (+17 lines)
	1	--- irio.c.orig 2009-01-26 21:00:17 UTC
	2	+++ irio.c
	3	@@ -93,14 +93,6 @@ int ir_open_port(char *filename)
	4	return -1;
	5	}
	6
	7	- /* lock the file for ourselves */
	8	- if (flock(portfd, LOCK_EX \| LOCK_NB) < 0) {
	9	- /* unable to get lock */
	10	- close(portfd);
	11	- portfd = 0;
	12	- return -1;
	13	- }
	14	-
	15	/* get port attributes, store in oldterm */
	16	if (tcgetattr(portfd, &oldterm) < 0) {
	17	close(portfd);

Lines 1-17 Link Here

(-)files/patch-no-flock-of-serial-ports (-17 lines)
1	--- irio.c-orig Sat Mar 29 20:26:57 2003
2	+++ irio.c Sat Mar 29 20:27:12 2003
3	@@ -91,14 +91,6 @@
4	return -1;
5	}
6
7	- /* lock the file for ourselves */
8	- if (flock(portfd, LOCK_EX \| LOCK_NB) < 0) {
9	- /* unable to get lock */
10	- close(portfd);
11	- portfd = 0;
12	- return -1;
13	- }
14	-
15	/* get port attributes, store in oldterm */
16	if (tcgetattr(portfd, &oldterm) < 0) {
17	close(portfd);