[Pkg-ocaml-maint-commits] [bibtex2html] 04/04: drop patch paranoid-bibtex

[Ralf Treinen]

This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch master
in repository bibtex2html.

commit 941fc4ace59711238b5d5cc5d2f48d56b71ca1ef
Author: Ralf Treinen <treinen at free.fr>
Date:   Sun Jul 6 20:06:41 2014 +0200

    drop patch paranoid-bibtex
---
 debian/changelog               |  4 ++--
 debian/patches/paranoid-bibtex | 43 ------------------------------------------
 debian/patches/series          |  1 -
 3 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a42a53d..a14d4c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,9 @@ bibtex2html (1.98-1) unstable; urgency=medium
   * New upstream version.
   * Refreshed patches: charset, path-expand-styles
   * Update patch charset: we also have to link with unix.cma
-  * Deactivate patch paranoid-bibtex which has been fixed upstream.
+  * Drop patch paranoid-bibtex, this has been fixed upstream.
 
- -- Ralf Treinen <treinen at debian.org>  Sun, 06 Jul 2014 19:51:21 +0200
+ -- Ralf Treinen <treinen at debian.org>  Sun, 06 Jul 2014 19:58:44 +0200
 
 bibtex2html (1.97-5) unstable; urgency=low
 
diff --git a/debian/patches/paranoid-bibtex b/debian/patches/paranoid-bibtex
deleted file mode 100644
index 4b57e14..0000000
--- a/debian/patches/paranoid-bibtex
+++ /dev/null
@@ -1,43 +0,0 @@
-Author: Ralf Treinen <treinen at debian.org>
-Description: run bibtex in the directory where the .aux file resides, in 
- order work around security-enhanced bibtex that cannot write outside
- its working directory
-Debian-Bug: #666572
-
-Index: bibtex2html/main.ml
-===================================================================
---- bibtex2html.orig/main.ml	2012-04-01 16:59:13.000000000 +0200
-+++ bibtex2html/main.ml	2012-04-01 16:59:49.000000000 +0200
-@@ -105,7 +105,12 @@
-    \end{enumerate} *)
- 
- let create_aux_file fbib tmp =
--  let ch = open_out (tmp ^ ".aux") in
-+  let ch = open_out (tmp ^ ".aux")
-+  and absolute_fbib =
-+    if Filename.is_relative fbib
-+    then Filename.concat (Sys.getcwd ()) fbib
-+    else fbib
-+  in
-   output_string ch "\\relax\n\\bibstyle{";
-   output_string ch !style;
-   output_string ch "}\n";
-@@ -116,7 +121,7 @@
-   else
-     output_string ch "\\citation{*}\n";
-   output_string ch "\\bibdata{";
--  output_string ch (Filename.chop_suffix fbib ".bib");
-+  output_string ch (Filename.chop_suffix absolute_fbib ".bib");
-   output_string ch "}\n";
-   close_out ch
- 
-@@ -143,7 +148,8 @@
-       else 
- 	"" 
-     in
--    let cmd = sprintf "%s %s %s" !command tmp redir in
-+    let cmd = sprintf "cd %s && %s %s %s"
-+      (Filename.dirname tmp) !command (Filename.basename tmp) redir in
-     if !Options.debug then begin 
-       eprintf "\nbibtex command: %s\n" cmd; flush stderr
-     end;
diff --git a/debian/patches/series b/debian/patches/series
index 5d3852a..6d7d652 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 charset
 doc-noexamples
 test-byte
-paranoid-bibtex
 path-expand-styles

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/bibtex2html.git