From a6e010689dcf5876a156ee3bdb0c62deb1b9604a Mon Sep 17 00:00:00 2001
From: abs <abs@pkgsrc.org>
Date: Wed, 26 Jun 2002 21:02:59 +0000
Subject: Updated libirman to 0.4.1bnb4:     Fix incorrect free() usage and
 writing past the end of a malloc()ed string

---
 sysutils/libirman/Makefile         |  4 ++--
 sysutils/libirman/distinfo         |  7 ++++---
 sysutils/libirman/patches/patch-aa |  2 +-
 sysutils/libirman/patches/patch-ab | 27 +++++++++++++++------------
 sysutils/libirman/patches/patch-ac | 12 ++++++------
 sysutils/libirman/patches/patch-ad | 18 +++++++++---------
 sysutils/libirman/patches/patch-ae | 13 +++++++++++++
 7 files changed, 50 insertions(+), 33 deletions(-)
 create mode 100644 sysutils/libirman/patches/patch-ae

(limited to 'sysutils/libirman')

diff --git a/sysutils/libirman/Makefile b/sysutils/libirman/Makefile
index 9bef6d320ed..262a6693f26 100644
--- a/sysutils/libirman/Makefile
+++ b/sysutils/libirman/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/06/20 09:06:48 abs Exp $
+# $NetBSD: Makefile,v 1.5 2002/06/26 21:02:59 abs Exp $
 #
 
 DISTNAME=	libirman-0.4.1b
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.evation.com/libirman/
 
diff --git a/sysutils/libirman/distinfo b/sysutils/libirman/distinfo
index b6a884e7d83..677ff7b67c9 100644
--- a/sysutils/libirman/distinfo
+++ b/sysutils/libirman/distinfo
@@ -2,6 +2,7 @@
 SHA1 (libirman-0.4.1b.tar.gz) = 739e7cbb4c7e0af59fd244e3d2ed73b97905849a
 Size (libirman-0.4.1b.tar.gz) = 52874 bytes
 SHA1 (patch-aa) = e060a7e54fc817634cd7e92d7e5e17f147003363
-SHA1 (patch-ab) = 94bf4bbbadc36ff47ded256c37eb86b36a2ad1d9
-SHA1 (patch-ac) = 4a4cef60aa053a2781bc48d9c268cc10ae9654cf
-SHA1 (patch-ad) = a5ec71dd27d0d9033ab6464a28146c7fe6ca8d0e
+SHA1 (patch-ab) = c0ff90a35ab9be2f9890d3587f93a24ee1faa30b
+SHA1 (patch-ac) = 94bf4bbbadc36ff47ded256c37eb86b36a2ad1d9
+SHA1 (patch-ad) = 4a4cef60aa053a2781bc48d9c268cc10ae9654cf
+SHA1 (patch-ae) = a5ec71dd27d0d9033ab6464a28146c7fe6ca8d0e
diff --git a/sysutils/libirman/patches/patch-aa b/sysutils/libirman/patches/patch-aa
index 002d3f95f95..2b24628bca4 100644
--- a/sysutils/libirman/patches/patch-aa
+++ b/sysutils/libirman/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/06/14 20:38:41 abs Exp $
+$NetBSD: patch-aa,v 1.3 2002/06/26 21:03:00 abs Exp $
 
 --- Makefile.in.orig	Thu Feb 18 11:14:57 1999
 +++ Makefile.in
diff --git a/sysutils/libirman/patches/patch-ab b/sysutils/libirman/patches/patch-ab
index 6e5fd19524f..490a24a3929 100644
--- a/sysutils/libirman/patches/patch-ab
+++ b/sysutils/libirman/patches/patch-ab
@@ -1,13 +1,16 @@
-$NetBSD: patch-ab,v 1.1 2002/06/14 20:38:41 abs Exp $
+$NetBSD: patch-ab,v 1.2 2002/06/26 21:03:00 abs Exp $
 
---- test_func.c.orig	Thu Feb 18 11:15:03 1999
-+++ test_func.c
-@@ -17,6 +17,8 @@
-   unsigned char *code;
-   char *text;
- 
-+  setlinebuf(stdout);
-+
-   if (argc < 2) {
-     fprintf(stderr, "usage: test_func device\n");
-     fprintf(stderr, "       where device is the serial port at which the infra red receiver resides\n");
+--- ircmd.c.orig	Wed Jun 26 21:55:30 2002
++++ ircmd.c
+@@ -140,10 +140,10 @@
+       strcpy(rcname, home);
+       rcname[hl] = '/';
+       strcpy(rcname + hl+1, IR_USER_IRMANRC);
+-      rcname[hl+rl+2] = '\0';
+     
+       rc = fopen(rcname, "r");
+       if (!rc) {			/* system, eg /etc/irmanrc.conf */
++        freefile = 1;
+         rcname = IR_SYSTEM_IRMANRC;
+         rc = fopen(rcname, "r");
+       }
diff --git a/sysutils/libirman/patches/patch-ac b/sysutils/libirman/patches/patch-ac
index edd95fc7860..07bebdd1db8 100644
--- a/sysutils/libirman/patches/patch-ac
+++ b/sysutils/libirman/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2002/06/14 20:38:41 abs Exp $
+$NetBSD: patch-ac,v 1.2 2002/06/26 21:03:01 abs Exp $
 
---- test_io.c.orig	Thu Feb 18 11:15:03 1999
-+++ test_io.c
+--- test_func.c.orig	Thu Feb 18 11:15:03 1999
++++ test_func.c
 @@ -17,6 +17,8 @@
-   int datum;
-   int i;
+   unsigned char *code;
+   char *text;
  
 +  setlinebuf(stdout);
 +
    if (argc < 2) {
-     fprintf(stderr, "usage: test_io device\n");
+     fprintf(stderr, "usage: test_func device\n");
      fprintf(stderr, "       where device is the serial port at which the infra red receiver resides\n");
diff --git a/sysutils/libirman/patches/patch-ad b/sysutils/libirman/patches/patch-ad
index 47c88ba1a52..96b32d48d63 100644
--- a/sysutils/libirman/patches/patch-ad
+++ b/sysutils/libirman/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2002/06/14 20:38:41 abs Exp $
+$NetBSD: patch-ad,v 1.2 2002/06/26 21:03:01 abs Exp $
 
---- test_name.c.orig	Thu Feb 18 11:15:03 1999
-+++ test_name.c
-@@ -18,6 +18,8 @@
-   char *name;
-   char *filename;
+--- test_io.c.orig	Thu Feb 18 11:15:03 1999
++++ test_io.c
+@@ -17,6 +17,8 @@
+   int datum;
+   int i;
  
 +  setlinebuf(stdout);
 +
-   if (ir_init_commands(NULL, 1) < 0) {
-     fprintf(stderr, "error initialising commands: %s\n", strerror(errno));
-     exit(1);
+   if (argc < 2) {
+     fprintf(stderr, "usage: test_io device\n");
+     fprintf(stderr, "       where device is the serial port at which the infra red receiver resides\n");
diff --git a/sysutils/libirman/patches/patch-ae b/sysutils/libirman/patches/patch-ae
new file mode 100644
index 00000000000..4d33524681b
--- /dev/null
+++ b/sysutils/libirman/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2002/06/26 21:03:01 abs Exp $
+
+--- test_name.c.orig	Thu Feb 18 11:15:03 1999
++++ test_name.c
+@@ -18,6 +18,8 @@
+   char *name;
+   char *filename;
+ 
++  setlinebuf(stdout);
++
+   if (ir_init_commands(NULL, 1) < 0) {
+     fprintf(stderr, "error initialising commands: %s\n", strerror(errno));
+     exit(1);
-- 
cgit v1.2.3