The current print/bibview port crashes at startup.  A patch that fixes
this problem is provided below.  In particular, the patch explicitly
includes headers for some of the C standard libraries.  This patch
creates or modifies the following patch files
 
 print/bibview/patches/patch-bib_file_c
 print/bibview/patches/patch-bib_flex_c
 print/bibview/patches/patch-bibview_c
 print/bibview/patches/patch-ctl_open_c
 print/bibview/patches/patch-ctl_serv_c
 print/bibview/patches/patch-globdata_c
 print/bibview/patches/patch-rc_file_c

In addition, the patch file

 print/bibview/patches/patch-ctl_save_c

is created to fix a use-after-free bug that could cause bibview to crash
in some circumstances.  Also, the patch file

 print/bibview/patches/patch-BibView_eng_ad

is created to remove a trailing tab character that was causing a minor
user-interface glitch.



--- print/bibview/Makefile.orig Sun Dec  3 12:37:22 2017
+++ print/bibview/Makefile      Thu Nov  8 18:32:03 2018
@@ -3,7 +3,7 @@
 COMMENT=       GUI for manipulating BibTeX bibliography databases
 
 DISTNAME=      bibview-2.2
-REVISION=      4
+REVISION=      5
 CATEGORIES=    databases print
 FIX_EXTRACT_PERMISSIONS=Yes
 
--- print/bibview/patches/patch-BibView_eng_ad.orig     Wed Nov  7 00:10:59 2018
+++ print/bibview/patches/patch-BibView_eng_ad  Thu Nov  8 18:14:54 2018
@@ -0,0 +1,11 @@
+--- BibView.eng.ad.orig        Thu May  4 17:09:45 1995
++++ BibView.eng.ad     Tue Nov  6 23:49:19 2018
+@@ -49,7 +49,7 @@
+ BibView*mainwin*services.label:       Services
+ BibView*mainwin*services.menuName:    servicesMenu
+ BibView*servicesMenu.label:           Services Menu
+-BibView*servicesMenu*item1*label:     Consistency Check       
++BibView*servicesMenu*item1*label:     Consistency Check
+ BibView*servicesMenu*item2*label:     Unify
+ BibView*servicesMenu*item3*label:     Print
+ BibView*servicesMenu*item4*label:     Edit Macros
--- print/bibview/patches/patch-bib_file_c.orig Tue Apr 17 13:13:30 2001
+++ print/bibview/patches/patch-bib_file_c      Thu Nov  8 18:14:59 2018
@@ -1,7 +1,11 @@
-$OpenBSD: patch-bib_file_c,v 1.1 2001/04/17 13:13:30 naddy Exp $
---- bib_file.c.orig    Thu May  4 18:19:36 1995
-+++ bib_file.c Tue Apr 17 14:30:51 2001
-@@ -466,10 +466,10 @@ Errcode bifFileRead(BibPtr bp)
+--- bib_file.c.orig    Thu May  4 16:19:36 1995
++++ bib_file.c Tue Nov  6 23:58:09 2018
+@@ -1,3 +1,4 @@
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <X11/Intrinsic.h>
+@@ -466,10 +467,10 @@
    bp->macrofile = (char *)XtMalloc(strlen(tempName)+1);
    strcpy(bp->macrofile,tempName);
  #else
--- print/bibview/patches/patch-bib_flex_c.orig Wed Nov  7 00:12:04 2018
+++ print/bibview/patches/patch-bib_flex_c      Thu Nov  8 18:14:59 2018
@@ -0,0 +1,10 @@
+--- bib_flex.c.orig    Wed Mar 22 18:19:10 1995
++++ bib_flex.c Tue Nov  6 23:57:00 2018
+@@ -1454,6 +1454,7 @@
+ char *yytext;
+ # line 1 "b.l"
+ # line 2 "b.l"
++#include <unistd.h>
+ #include "b.tab.h"
+ #include <X11/Intrinsic.h>
+ #include "bibview.h"
--- print/bibview/patches/patch-bibview_c.orig  Tue Apr 17 13:13:31 2001
+++ print/bibview/patches/patch-bibview_c       Thu Nov  8 18:15:00 2018
@@ -1,7 +1,14 @@
-$OpenBSD: patch-bibview_c,v 1.1 2001/04/17 13:13:31 naddy Exp $
---- bibview.c.orig     Fri Apr 21 18:49:15 1995
-+++ bibview.c  Tue Apr 17 14:30:50 2001
-@@ -170,9 +170,9 @@ int max_bibtex_types;
+--- bibview.c.orig     Fri Apr 21 16:49:15 1995
++++ bibview.c  Tue Nov  6 23:59:37 2018
+@@ -20,6 +20,7 @@
+ /*********************************************************************/
+ 
+ 
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <sys/param.h>
+@@ -170,9 +171,9 @@
  /* fallback resources */
  static char *fallback_resources[] = {
  #ifdef GERMAN
--- print/bibview/patches/patch-ctl_open_c.orig Tue Apr 17 13:13:31 2001
+++ print/bibview/patches/patch-ctl_open_c      Thu Nov  8 18:15:02 2018
@@ -1,7 +1,14 @@
-$OpenBSD: patch-ctl_open_c,v 1.1 2001/04/17 13:13:31 naddy Exp $
---- ctl_open.c.orig    Thu Nov 25 14:11:12 1993
-+++ ctl_open.c Tue Apr 17 14:30:50 2001
-@@ -112,9 +112,9 @@ char *tempName;
+--- ctl_open.c.orig    Thu Nov 25 13:11:12 1993
++++ ctl_open.c Tue Nov  6 23:58:55 2018
+@@ -20,6 +20,7 @@
+ /*                                                                   */
+ /*********************************************************************/
+ 
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
+@@ -112,9 +113,9 @@
     bp->tempfile = (char *)XtMalloc(strlen(tempName)+1);
     strcpy(bp->tempfile,tempName);
  #else
--- print/bibview/patches/patch-ctl_save_c.orig Wed Nov  7 00:11:27 2018
+++ print/bibview/patches/patch-ctl_save_c      Thu Nov  8 18:15:02 2018
@@ -0,0 +1,15 @@
+--- ctl_save.c.orig    Thu Nov 25 13:11:13 1993
++++ ctl_save.c Thu Nov  8 18:10:05 2018
+@@ -337,12 +337,6 @@
+    if ((status = gubCloseBibWin(gbp)) != OK) {
+       guwError(status);
+    }
+-   if (gbp->macrofile != NULL)
+-      sprintf(sysStr, "rm -f %s %s", gbp->tempfile, 
+-              gbp->macrofile);
+-   else
+-      sprintf(sysStr, "rm -f %s", gbp->tempfile);
+-   system(sysStr);
+ 
+    gbp = NULL;
+ }
--- print/bibview/patches/patch-ctl_serv_c.orig Tue Apr 17 13:13:31 2001
+++ print/bibview/patches/patch-ctl_serv_c      Thu Nov  8 18:15:03 2018
@@ -1,7 +1,15 @@
-$OpenBSD: patch-ctl_serv_c,v 1.1 2001/04/17 13:13:31 naddy Exp $
---- ctl_serv.c.orig    Thu Nov 25 14:11:13 1993
-+++ ctl_serv.c Tue Apr 17 14:30:50 2001
-@@ -307,11 +307,11 @@ char *tempName;
+--- ctl_serv.c.orig    Thu Nov 25 13:11:13 1993
++++ ctl_serv.c Tue Nov  6 23:58:31 2018
+@@ -20,6 +20,8 @@
+ /*                                                                   */
+ /*********************************************************************/
+ 
++#include <stdlib.h>
++#include <unistd.h>
+ #include <stdio.h>
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
+@@ -307,11 +309,11 @@
        bp->macrofile = (char *)XtMalloc(strlen(tempName)+1);
        strcpy(bp->macrofile,tempName);
  #else
--- print/bibview/patches/patch-globdata_c.orig Wed Nov  7 00:11:49 2018
+++ print/bibview/patches/patch-globdata_c      Thu Nov  8 18:15:03 2018
@@ -0,0 +1,10 @@
+--- globdata.c.orig    Mon May  8 16:24:40 1995
++++ globdata.c Tue Nov  6 23:57:48 2018
+@@ -20,6 +20,7 @@
+ /*                                                                   */
+ /*********************************************************************/
+ 
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <unistd.h>
--- print/bibview/patches/patch-rc_file_c.orig  Wed Nov  7 00:12:23 2018
+++ print/bibview/patches/patch-rc_file_c       Thu Nov  8 18:15:03 2018
@@ -0,0 +1,10 @@
+--- rc_file.c.orig     Fri Jul 21 14:29:37 1995
++++ rc_file.c  Tue Nov  6 23:57:29 2018
+@@ -19,6 +19,7 @@
+ /*                                                                   */
+ /*********************************************************************/
+ 
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>

Reply via email to