Attachment #73349 for bug #106336

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




# "Legal" (8.5" x 14").

PORTNAME=	mpage
PORTVERSION=	2.5.5
CATEGORIES=	print
MASTER_SITES=	ftp://ftp.mesa.nl/pub/mpage/
EXTRACT_SUFX=	.tgz

		%%DATADIR%%/ISO-Latin.1 %%DATADIR%%/ISO-Latin.2
PLIST_DIRS=	%%DATADIR%%

PORTDOCS=	CHANGES COPYING COPYING.LESSER Characters Copyright Encoding.format \
		FAQ NEWS README README.OS2 README.amiga SCOPTIONS TODO

post-install:
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
.for FILE in ${PORTDOCS}
	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
.endfor
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (mpage-2.5.4.tgz) = c14d58e24e7fdebe0c9eeb57ef1895f4	1	MD5 (mpage-2.5.5.tgz) = 0caccc549b3f9e8d8af465023b264a49
2	SHA256 (mpage-2.5.4.tgz) = c5487b9e5e72da60808272ed4c3de50f9237f3c9f30dfd9000520af6fbfc9a8e	2	SHA256 (mpage-2.5.5.tgz) = 3800a4dfe441401f033dae9ebad8fb32eb2ab8c944f77ae77c083e0dbb441ece
3	SIZE (mpage-2.5.4.tgz) = 93992	3	SIZE (mpage-2.5.5.tgz) = 86409




--- file.c.orig	Mon May 31 04:34:15 2004
+++ file.c	Mon Nov  1 20:58:16 2004
@@ -18,6 +18,7 @@
  */
 
 
+#include <string.h>
 #include "mpage.h"
 
 
@@ -119,11 +120,11 @@
      */
 #define DASHES "-- "
     if (opt_header != NULL)
-        (void)sprintf(command, "%s -l%d -w%d -h \"%s\" %s%s", prprog,
+        (void)snprintf(command, sizeof(command), "%s -l%d -w%d -h \"%s\" %s%s", prprog,
                   asheet->sh_plength, asheet->sh_cwidth, opt_header,
                   fname[0] == '-' ? DASHES : "", fname);
     else
-        (void)sprintf(command, "%s -l%d -w%d %s%s", prprog,
+        (void)snprintf(command, sizeof(command), "%s -l%d -w%d %s%s", prprog,
                   asheet->sh_plength, asheet->sh_cwidth,
                   fname[0] == '-' ? DASHES : "", fname);
     /*
@@ -168,7 +169,7 @@
      * but the tmpfilename
      */
      
-    (void) strcpy(tmpfile, "/usr/tmp/mpage-stdin-XXXXXX");
+    (void) strlcpy(tmpfile, "/tmp/mpage-stdin-XXXXXX", sizeof(tmpfile));
     if ( (tmpfd = mkstemp(tmpfile)) == -1) {
         fprintf(stderr, "%s: cannot create temporary file", MPAGE);
         perror(MPAGE);
@@ -217,11 +218,11 @@
 	}
         close(tmpfd);
         if (opt_header != NULL)
-            (void)sprintf(command, "%s -l%d -w%d -h \"%s\" > %s", prprog,
+            (void)snprintf(command, sizeof(command), "%s -l%d -w%d -h \"%s\" > %s", prprog,
                       asheet->sh_plength, asheet->sh_cwidth,
                       opt_header, tmpfile);
         else
-            (void)sprintf(command, "%s -l%d -w%d > %s", prprog,
+            (void)snprintf(command, sizeof(command), "%s -l%d -w%d > %s", prprog,
                       asheet->sh_plength, asheet->sh_cwidth, tmpfile);
         /*
          * open a pipe to the pr(1) command which will create a

Return to bug 106336

Lines 10-16 Link Here

(-)Makefile (-1 / +12 lines)
10	# "Legal" (8.5" x 14").	10	# "Legal" (8.5" x 14").
11		11
12	PORTNAME= mpage	12	PORTNAME= mpage
13	PORTVERSION= 2.5.4	13	PORTVERSION= 2.5.5
14	CATEGORIES= print	14	CATEGORIES= print
15	MASTER_SITES= ftp://ftp.mesa.nl/pub/mpage/	15	MASTER_SITES= ftp://ftp.mesa.nl/pub/mpage/
16	EXTRACT_SUFX= .tgz	16	EXTRACT_SUFX= .tgz
Lines 26-29 Link Here
26	%%DATADIR%%/ISO-Latin.1 %%DATADIR%%/ISO-Latin.2	26	%%DATADIR%%/ISO-Latin.1 %%DATADIR%%/ISO-Latin.2
27	PLIST_DIRS= %%DATADIR%%	27	PLIST_DIRS= %%DATADIR%%
28		28
		29	PORTDOCS= CHANGES COPYING COPYING.LESSER Characters Copyright Encoding.format \
		30	FAQ NEWS README README.OS2 README.amiga SCOPTIONS TODO
		31
		32	post-install:
		33	.if !defined(NOPORTDOCS)
		34	@${MKDIR} ${DOCSDIR}
		35	.for FILE in ${PORTDOCS}
		36	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
		37	.endfor
		38	.endif
		39
29	.include <bsd.port.mk>	40	.include <bsd.port.mk>

Removed Link Here

(-)files/patch-file_c (-47 lines)
1	--- file.c.orig Mon May 31 04:34:15 2004
2	+++ file.c Mon Nov 1 20:58:16 2004
3	@@ -18,6 +18,7 @@
4	*/
5
6
7	+#include <string.h>
8	#include "mpage.h"
9
10
11	@@ -119,11 +120,11 @@
12	*/
13	#define DASHES "-- "
14	if (opt_header != NULL)
15	- (void)sprintf(command, "%s -l%d -w%d -h \"%s\" %s%s", prprog,
16	+ (void)snprintf(command, sizeof(command), "%s -l%d -w%d -h \"%s\" %s%s", prprog,
17	asheet->sh_plength, asheet->sh_cwidth, opt_header,
18	fname[0] == '-' ? DASHES : "", fname);
19	else
20	- (void)sprintf(command, "%s -l%d -w%d %s%s", prprog,
21	+ (void)snprintf(command, sizeof(command), "%s -l%d -w%d %s%s", prprog,
22	asheet->sh_plength, asheet->sh_cwidth,
23	fname[0] == '-' ? DASHES : "", fname);
24	/*
25	@@ -168,7 +169,7 @@
26	* but the tmpfilename
27	*/
28
29	- (void) strcpy(tmpfile, "/usr/tmp/mpage-stdin-XXXXXX");
30	+ (void) strlcpy(tmpfile, "/tmp/mpage-stdin-XXXXXX", sizeof(tmpfile));
31	if ( (tmpfd = mkstemp(tmpfile)) == -1) {
32	fprintf(stderr, "%s: cannot create temporary file", MPAGE);
33	perror(MPAGE);
34	@@ -217,11 +218,11 @@
35	}
36	close(tmpfd);
37	if (opt_header != NULL)
38	- (void)sprintf(command, "%s -l%d -w%d -h \"%s\" > %s", prprog,
39	+ (void)snprintf(command, sizeof(command), "%s -l%d -w%d -h \"%s\" > %s", prprog,
40	asheet->sh_plength, asheet->sh_cwidth,
41	opt_header, tmpfile);
42	else
43	- (void)sprintf(command, "%s -l%d -w%d > %s", prprog,
44	+ (void)snprintf(command, sizeof(command), "%s -l%d -w%d > %s", prprog,
45	asheet->sh_plength, asheet->sh_cwidth, tmpfile);
46	/*
47	* open a pipe to the pr(1) command which will create a