fix some too-short mktemp format strings

2013-03-11 20:59:04 +00:00 · 2013-03-11 20:59:04 +00:00 · de37654fca
commit de37654fca
parent 68760f58ab
12 changed files with 90 additions and 18 deletions
--- a/chinese/ttfm/Makefile
+++ b/chinese/ttfm/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2013/03/11 01:30:26 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2013/03/11 20:59:04 sthen Exp $

 COMMENT=	big5/gb enhanced truetype font manager

 DISTNAME=	ttfm-0.9.5
 PKGNAME=	zh-${DISTNAME}
-REVISION=	0
+REVISION=	1
 CATEGORIES=	chinese

 MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
--- a/chinese/ttfm/patches/patch-modules_xttfm_ttfm
+++ b/chinese/ttfm/patches/patch-modules_xttfm_ttfm
@ -1,12 +1,14 @@
-$OpenBSD: patch-modules_xttfm_ttfm,v 1.2 2011/07/08 09:41:46 jasper Exp $
--- modules/xttfm.ttfm.orig	Tue Nov  4 00:08:32 2003
-+++ modules/xttfm.ttfm	Fri Jul  8 11:36:15 2011
-@@ -29,8 +29,8 @@ export PREFIX; PREFIX=/usr/local
+$OpenBSD: patch-modules_xttfm_ttfm,v 1.3 2013/03/11 20:59:05 sthen Exp $
+--- modules/xttfm.ttfm.orig	Mon Nov  3 23:08:32 2003
+++ modules/xttfm.ttfm	Mon Mar 11 20:42:44 2013
+@@ -28,9 +28,9 @@ export VERSION; VERSION=0.9.3
+ export PREFIX; PREFIX=/usr/local
 export X11BASE; X11BASE=/usr/X11R6
 export PATH; PATH=/bin:/sbin:/usr/bin:/usr/sbin:$PREFIX/bin:$PREFIX/sbin:$X11BASE/bin
- export TEMPFILE; TEMPFILE="`mktemp /tmp/ttfm.tmpXXX`"
+-export TEMPFILE; TEMPFILE="`mktemp /tmp/ttfm.tmpXXX`"
 -export DefaultFontPath; DefaultFontPath=$PREFIX/share/fonts/TrueType
 -export XTTFFONTPATH; XTTFFONTPATH="${X11BASE}/lib/X11/fonts/TrueType"
+export TEMPFILE; TEMPFILE="`mktemp /tmp/ttfm.tmpXXXXXXXXXX`"
 +export DefaultFontPath; DefaultFontPath=$PREFIX/lib/X11/fonts/TrueType
 +export XTTFFONTPATH; XTTFFONTPATH="${PREFIX}/lib/X11/fonts/TrueType"
 export TTFINFOPATH; TTFINFOPATH="${PREFIX}/bin/ttfinfo"
--- a/databases/mysql-zrm/Makefile
+++ b/databases/mysql-zrm/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2013/03/11 02:52:05 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2013/03/11 20:59:05 sthen Exp $

 COMMENT =	MySQL backup scripts

 V =		2.2
 DISTNAME =	MySQL-zrm-$V.0
 PKGNAME =	${DISTNAME:L}
-REVISION =	4
+REVISION =	5
 CATEGORIES =	databases perl5

 HOMEPAGE =	http://www.zmanda.com/
--- a/databases/mysql-zrm/patches/patch-usr_bin_mysql-zrm-scheduler
+++ b/databases/mysql-zrm/patches/patch-usr_bin_mysql-zrm-scheduler
@ -0,0 +1,12 @@
+$OpenBSD: patch-usr_bin_mysql-zrm-scheduler,v 1.1 2013/03/11 20:59:05 sthen Exp $
+--- usr/bin/mysql-zrm-scheduler.orig	Mon Mar 11 20:48:00 2013
+++ usr/bin/mysql-zrm-scheduler	Mon Mar 11 20:48:10 2013
+@@ -351,7 +351,7 @@ if ( $interval eq "monthly" ) {
+ }
+ 
+ 
+-($mycrontab_fh, $mycrontab) = mkstemp( "/tmp/zrmcrontabXXXXX" );
+($mycrontab_fh, $mycrontab) = mkstemp( "/tmp/zrmcrontabXXXXXXXXXX" );
+ 
+ system ("crontab -l > $mycrontab 2> /dev/null");
+ $exit_value  = $? >> 8;
--- a/databases/mysql-zrm/patches/patch-usr_bin_zrm-pre-scheduler
+++ b/databases/mysql-zrm/patches/patch-usr_bin_zrm-pre-scheduler
@ -0,0 +1,12 @@
+$OpenBSD: patch-usr_bin_zrm-pre-scheduler,v 1.1 2013/03/11 20:59:05 sthen Exp $
+--- usr/bin/zrm-pre-scheduler.orig	Mon Mar 11 20:48:00 2013
+++ usr/bin/zrm-pre-scheduler	Mon Mar 11 20:48:07 2013
+@@ -95,7 +95,7 @@ sub reschedule()
+     my $lev     = $_[4];
+     my $found=0;
+ 
+-    ($mycrontab_fh, $mycrontab) = mkstemp( "/tmp/zrm-preschedulerXXXXX" );
+    ($mycrontab_fh, $mycrontab) = mkstemp( "/tmp/zrm-preschedulerXXXXXXXXXX" );
+     $mycrontab_fh=$mycrontab_fh; # quiet warnings
+     system ("crontab -l > $mycrontab 2> /dev/null");
+     $exit_value  = $? >> 8;
--- a/databases/mysql-zrm/patches/patch-usr_lib_mysql-zrm_ZRM_Common_pm
+++ b/databases/mysql-zrm/patches/patch-usr_lib_mysql-zrm_ZRM_Common_pm
@ -1,6 +1,6 @@
-$OpenBSD: patch-usr_lib_mysql-zrm_ZRM_Common_pm,v 1.3 2010/05/05 17:03:19 giovanni Exp $
--- usr/lib/mysql-zrm/ZRM/Common.pm.orig	Thu Feb  4 01:19:25 2010
-+++ usr/lib/mysql-zrm/ZRM/Common.pm	Wed May  5 12:10:00 2010
+$OpenBSD: patch-usr_lib_mysql-zrm_ZRM_Common_pm,v 1.4 2013/03/11 20:59:05 sthen Exp $
+--- usr/lib/mysql-zrm/ZRM/Common.pm.orig	Thu Feb  4 00:19:25 2010
+++ usr/lib/mysql-zrm/ZRM/Common.pm	Mon Mar 11 20:48:14 2013
@@ -90,9 +90,9 @@ our $LOGGER;
 our $INDEX_FILENAME="index";
 our $MYSQL_ZRM_CONFIG_FILE=catfile( $MYSQL_ZRM_BASEDIR, "mysql-zrm.conf");
@ -14,3 +14,12 @@ $OpenBSD: patch-usr_lib_mysql-zrm_ZRM_Common_pm,v 1.3 2010/05/05 17:03:19 giovan
 our $TAR_EXCLUDE_OPTION=" --exclude";
 our $COMPRESS_FILENAME="backup-data";
 our $COMPRESS_LOGICAL_FILENAME="backup-sql";
+@@ -1349,7 +1349,7 @@ sub createConfigFile()
+ #	if( $action eq "check" ){
+ 		#return;
+ 	#}
+-	$confFileHandle = new File::Temp(TEMPLATE=>"tmpXXXXX",DIR=>$backupset_dir,SUFFIX=>".conf", UNLINK=>1);
+	$confFileHandle = new File::Temp(TEMPLATE=>"tmpXXXXXXXXXX",DIR=>$backupset_dir,SUFFIX=>".conf", UNLINK=>1);
+ 	$ENV{'ZRM_CONF'} = "$confFileHandle";
+ 	if( $verbose ){
+ 		&printLog( "ZRM Temporary configuration file = $confFileHandle\n" );
--- a/databases/p5-SQL-Translator/Makefile
+++ b/databases/p5-SQL-Translator/Makefile
@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2013/03/11 02:52:07 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2013/03/11 20:59:05 sthen Exp $

-COMMENT= 	database schema manipulation
+COMMENT=	database schema manipulation

 DISTNAME=	SQL-Translator-0.11007
-REVISION=	0
+REVISION=	1
 CATEGORIES=	databases devel
 MODULES=	cpan
-USE_GROFF =	Yes

 HOMEPAGE=	http://sqlfairy.sourceforge.net/

--- a/databases/p5-SQL-Translator/patches/patch-t_09sqlt-diagram_t
+++ b/databases/p5-SQL-Translator/patches/patch-t_09sqlt-diagram_t
@ -0,0 +1,12 @@
+$OpenBSD: patch-t_09sqlt-diagram_t,v 1.1 2013/03/11 20:59:05 sthen Exp $
+--- t/09sqlt-diagram.t.orig	Mon Mar 11 20:49:30 2013
+++ t/09sqlt-diagram.t	Mon Mar 11 20:49:35 2013
+@@ -22,7 +22,7 @@ my @data = qw(data mysql Apache-Session-MySQL.sql);
+ my $sqlt_diagram = catfile($Bin, updir, @script);
+ my $test_data = catfile($Bin, @data);
+ 
+-my $tmp = mktemp('sqlXXXXX');
+my $tmp = mktemp('sqlXXXXXXXXXX');
+ 
+ ok(-e $sqlt_diagram); 
+ my @cmd = ($^X, $sqlt_diagram, "-d", "MySQL", "-o", $tmp, $test_data);
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2013/03/11 02:52:07 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2013/03/11 20:59:05 sthen Exp $

 COMMENT=	administration and development platform for PostgreSQL

 V=		1.14.0
+REVISION=	0
 DISTNAME=	pgadmin3-$V
 CATEGORIES=	databases devel

--- a/databases/pgadmin3/patches/patch-stringextract
+++ b/databases/pgadmin3/patches/patch-stringextract
@ -0,0 +1,12 @@
+$OpenBSD: patch-stringextract,v 1.1 2013/03/11 20:59:05 sthen Exp $
+--- stringextract.orig	Mon Mar 11 20:51:36 2013
+++ stringextract	Mon Mar 11 20:51:44 2013
+@@ -56,7 +56,7 @@ xgettext -k_ -k__ -kwxPLURAL:1,2 -j -s -o pgadmin3.pot
+ xgettext -k_ -k__ -kwxPLURAL:1,2 -j -s -o pgadmin3.pot pgadmin/include/*.h
+ xgettext -k_ -k__ -kwxPLURAL:1,2 -j -s -o pgadmin3.pot pgadmin/include/*.h
+ 
+-TMPDIR=`mktemp -d tmpwork.XXXX` || exit 1
+TMPDIR=`mktemp -d tmpwork.XXXXXXXXXX` || exit 1
+ echo "$TMPDIR"
+ 
+ mkdir $TMPDIR/pgadmin
--- a/sysutils/entr/Makefile
+++ b/sysutils/entr/Makefile
@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2013/03/11 11:41:30 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2013/03/11 20:59:05 sthen Exp $

 COMMENT = run arbitrary commands when files change

 DISTNAME = entr-1.4
+REVISION =	0
 REV = b90825a157a4

 CATEGORIES = sysutils
--- a/sysutils/entr/patches/patch-regress_sh
+++ b/sysutils/entr/patches/patch-regress_sh
@ -0,0 +1,12 @@
+$OpenBSD: patch-regress_sh,v 1.1 2013/03/11 20:59:05 sthen Exp $
+--- regress.sh.orig	Mon Mar 11 20:56:13 2013
+++ regress.sh	Mon Mar 11 20:56:20 2013
+@@ -28,7 +28,7 @@ function assert {
+ 
+ function pause { sleep 0.2; }
+ function setup { touch $tmp/file{1,2,3}; sleep 0.1; }
+-tmp=$(mktemp -d /tmp/entr_regress.XXXX)
+tmp=$(mktemp -d /tmp/entr_regress.XXXXXXXXXX)
+ 
+ 
+ try "no arguments"