Author: tille
Date: 2008-09-23 11:36:21 +0000 (Tue, 23 Sep 2008)
New Revision: 2518
Added:
trunk/packages/arb/trunk/debian/arb-doc.lintian-overrides
trunk/packages/arb/trunk/debian/patches/20_tmpfile_issue.patch
Modified:
trunk/packages/arb/trunk/debian/changelog
trunk/packages/arb/trunk/debian/conf/arb_tcp.dat
trunk/packages/arb/trunk/debian/patches/series
Log:
Fix tempfile issue and location of arb name server issue.
Added: trunk/packages/arb/trunk/debian/arb-doc.lintian-overrides
===================================================================
--- trunk/packages/arb/trunk/debian/arb-doc.lintian-overrides
(rev 0)
+++ trunk/packages/arb/trunk/debian/arb-doc.lintian-overrides 2008-09-23
11:36:21 UTC (rev 2518)
@@ -0,0 +1,6 @@
+# While the arb-doc package in fact contains documentation
+# that can be read by itself it is a basic component of the
+# help system binary programm arb and needs to be installed
+# in any case if arb should be running. So the decision
+# to move arb-doc not into the doc section was done intentionally
+arb-doc: doc-package-should-be-section-doc arb-doc
Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog 2008-09-22 13:18:04 UTC (rev
2517)
+++ trunk/packages/arb/trunk/debian/changelog 2008-09-23 11:36:21 UTC (rev
2518)
@@ -1,3 +1,13 @@
+arb (0.0.20071207.1-5) unstable; urgency=low
+
+ * Fix tempfile issues in upstream scripts
+ Closes: #496396
+ * Fix arb name server location in config file (Thanks to
+ Felipe Figueiredo <[EMAIL PROTECTED]>)
+ Closes: #495650
+
+ -- Andreas Tille <[EMAIL PROTECTED]> Tue, 23 Sep 2008 13:32:05 +0200
+
arb (0.0.20071207.1-4) unstable; urgency=low
* debian/arb-common.postrm: Remove stuff arb leaves behind in
Modified: trunk/packages/arb/trunk/debian/conf/arb_tcp.dat
===================================================================
--- trunk/packages/arb/trunk/debian/conf/arb_tcp.dat 2008-09-22 13:18:04 UTC
(rev 2517)
+++ trunk/packages/arb/trunk/debian/conf/arb_tcp.dat 2008-09-23 11:36:21 UTC
(rev 2518)
@@ -51,8 +51,8 @@
# You may define additional nameservers, using one additional field for
identification.
# The defined nameserver 'ARB_NAME_SERVER_START' uses the fields 'acc' and
'start'.
-ARB_NAME_SERVER localhost:3020 arb_name_server
-d/var/lib/arb/lib/nas/names.dat
-ARB_NAME_SERVER_START localhost:3021 arb_name_server
-d/var/lib/arb/lib/nas/names_start.dat -fstart
+ARB_NAME_SERVER localhost:3020 arb_name_server
-d/var/lib/arb/nas/names.dat
+ARB_NAME_SERVER_START localhost:3021 arb_name_server
-d/var/lib/arb/nas/names_start.dat -fstart
#*********** PT_SERVERS The server should run on the nfs server
******************
#******* You may add new pt_servers here: (numbers must be continued)
*********
Added: trunk/packages/arb/trunk/debian/patches/20_tmpfile_issue.patch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_tmpfile_issue.patch
(rev 0)
+++ trunk/packages/arb/trunk/debian/patches/20_tmpfile_issue.patch
2008-09-23 11:36:21 UTC (rev 2518)
@@ -0,0 +1,66 @@
+--- arb-0.0.20071207.1.orig/SH/arb_fastdnaml
++++ arb-0.0.20071207.1/SH/arb_fastdnaml
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+-tmp=/tmp/arb_fdnaml_${USER}_$$
++tmp=`mktemp -t arb_fdnaml_XXXXXXXXXX`
+ mv infile $tmp
+ nice -19 $1 < $tmp &
+ sig=$!
+--- arb-0.0.20071207.1.orig/SH/dszmconnect.pl
++++ arb-0.0.20071207.1/SH/dszmconnect.pl
+@@ -20,7 +20,7 @@
+ use HTTP::Request::Common qw(POST);
+ use LWP::UserAgent;
+
+-
++use File::Temp qw/ tempfile tempdir /;
+
+
+
+@@ -51,9 +51,12 @@
+ </body>
+ </html>";
+
++my $TMPOUT;
++my $template = 'arbdsmz_XXXXXX';
++(undef, $TMPOUT) = tempfile($template, OPEN => 0);
++$TMPOUT = $TMPOUT . ".html";
+
+-
+-open (OUTPUT , "> /tmp/arbdsmz.html") or die "cannot open input file
/tmp/arbdsmz.html";
++open (OUTPUT , "> $TMPOUT") or die "cannot open temporary input file $TMPOUT";
+
+ if (scalar(@ARGV) == 0)
+ {print OUTPUT $errordocument;
+@@ -86,7 +89,10 @@
+ $req_selection->content($selection_content);
+
+ # Pass request to the user agent and get a response back
+- my $res_selection = $ua_selection -> request($req_selection,
'/tmp/arbdsmz.htm');
++ my $TMPUSEROUT;
++ (undef, $TMPUSEROUT) = tempfile($template, OPEN => 0);
++ $TMPUSEROUT = $TMPUSEROUT . ".htm";
++ my $res_selection = $ua_selection -> request($req_selection, $TMPUSEROUT);
+
+
+
+@@ -95,7 +101,7 @@
+ else {die "Bad luck this time, request failed\n";};
+
+
+-open (INPUT , "< /tmp/arbdsmz.htm") or die "cannot open input file
/tmp/arbdsmz.htm";
++open (INPUT , "< $TMPUSEROUT") or die "cannot open input file $TMPUSEROUT";
+
+
+ my $htmlcontent;
+@@ -111,7 +117,7 @@
+
+ print OUTPUT $htmlcontent ;
+
+-#exec ('netscape', '/tmp/arbdsmz.html');
+-print "file:///tmp/arbdsmz.html";
++#exec ('netscape', $TMPOUT);
++print "file://" . $TMPOUT;
+
+ ##print "$htmlcontent\n";
Modified: trunk/packages/arb/trunk/debian/patches/series
===================================================================
--- trunk/packages/arb/trunk/debian/patches/series 2008-09-22 13:18:04 UTC
(rev 2517)
+++ trunk/packages/arb/trunk/debian/patches/series 2008-09-23 11:36:21 UTC
(rev 2518)
@@ -4,3 +4,4 @@
30_Makefile_main
20_Makefiles
ARB_release200712_gcc4.3.1.patch
+20_tmpfile_issue.patch
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
