Hello community, here is the log from the commit of package latex2html for openSUSE:Factory checked in at 2015-12-20 10:52:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/latex2html (Old) and /work/SRC/openSUSE:Factory/.latex2html.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "latex2html" Changes: -------- --- /work/SRC/openSUSE:Factory/latex2html/latex2html.changes 2014-10-07 18:24:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.latex2html.new/latex2html.changes 2015-12-20 10:52:29.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Dec 16 15:01:36 UTC 2015 - [email protected] + +- updated to 2015: apply patches from Debian +D latex2html-2012-backref-workaround.diff +D latex2html-2012-binmode.diff +D latex2html-2012-dest-dir.diff +D latex2html-2012-gsout.diff (upstreamed) +D latex2html-2012-match-multiline.diff (upstreamed) +D latex2html-2012-perl-bindir.diff +D latex2html-2012-share-dir.diff +A latex2html-backref-workaround.diff +A latex2html-binmode.diff +A latex2html-dest-dir.diff +A latex2html-perl-bindir.diff +A latex2html-share-dir.diff + +------------------------------------------------------------------- Old: ---- latex2html-2012-backref-workaround.diff latex2html-2012-binmode.diff latex2html-2012-dest-dir.diff latex2html-2012-gsout.diff latex2html-2012-match-multiline.diff latex2html-2012-perl-bindir.diff latex2html-2012-share-dir.diff latex2html-2012.tgz New: ---- latex2html-2015.tar.gz latex2html-backref-workaround.diff latex2html-binmode.diff latex2html-dest-dir.diff latex2html-perl-bindir.diff latex2html-share-dir.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ latex2html.spec ++++++ --- /var/tmp/diff_new_pack.iOIPam/_old 2015-12-20 10:52:31.000000000 +0100 +++ /var/tmp/diff_new_pack.iOIPam/_new 2015-12-20 10:52:31.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package latex2html # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,25 +33,23 @@ Requires: perl Requires: texlive-dvips Requires: texlive-latex -Version: 2012 +Version: 2015 Release: 0 Summary: LaTeX to HTML Converter License: GPL-2.0+ Group: Productivity/Publishing/TeX/Utilities BuildArch: noarch -Source0: http://mirrors.ctan.org/support/latex2html/latex2html-%{version}.tgz +Source0: http://mirrors.ctan.org/support/latex2html/latex2html-%{version}.tar.gz Source1: latex2html-manual.tar.bz2 Source2: latex2html-README.SUSE Source3: testfile.tex Source4: local.pm Source5: latex2html.1 -Patch0: latex2html-%{version}-share-dir.diff -Patch1: latex2html-%{version}-perl-bindir.diff -Patch2: latex2html-%{version}-dest-dir.diff -Patch3: latex2html-%{version}-binmode.diff -Patch4: latex2html-%{version}-gsout.diff -Patch5: latex2html-%{version}-match-multiline.diff -Patch6: latex2html-%{version}-backref-workaround.diff +Patch0: latex2html-share-dir.diff +Patch1: latex2html-perl-bindir.diff +Patch2: latex2html-dest-dir.diff +Patch3: latex2html-binmode.diff +Patch4: latex2html-backref-workaround.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -84,8 +82,6 @@ %patch2 %patch3 %patch4 -%patch5 -%patch6 cp %{S:2} README.SUSE cp %{S:4} . ++++++ latex2html-backref-workaround.diff ++++++ --- ./latex2html.pin.orig 2013-06-25 14:57:10.000000000 +0000 +++ ./latex2html.pin 2013-06-25 14:57:27.000000000 +0000 @@ -16557,7 +16557,7 @@ sub make_isolatin1_rx { $caption_suffixes = "lof|lot"; # $caption_rx = "\\\\caption\\s*([[]\\s*((($any_next_pair_rx5)|([[][^]]*[]])|[^]])*)[]])?$O(\\d+)$C([\\s\\S]*)$O\\8$C$EOL"; - $caption_rx = "\\\\(top|bottom|table)?caption\\s*\\\*?\\s*([[]\\s*((($any_next_pair_rx6)|([[][^]]*[]])|[^]])*)[]])?$O(\\d+)$C([\\s\\S]*)$O\\9$C$EOL"; + $caption_rx = "\\\\(top|bottom|table)?caption\\s*\\\*?\\s*([[]\\s*((($any_next_pair_rx6)|([[][^]]*[]])|[^]])*)[]])?$O(\\d+)$C([\\s\\S]*)$O\\g9$C$EOL"; $caption_width_rx = "\\\\setlength\\s*(($O|$OP)\\d+($C|$CP))\\\\captionwidth\\1\\s*(($O|$OP)\\d+($C|$CP))([^>]*)\\4"; # Matches the \htmlimage command @@ -16622,7 +16622,7 @@ sub make_isolatin1_rx { # Matches a label command and its argument $labels_rx = "\\\\label\\s*$O(\\d+)$C([\\s\\S]*)$O\\1$C$EOL"; - $labels_rx8 = "\\\\label\\s*$O(\\d+)$C([\\s\\S]*)$O\\8$C$EOL"; + $labels_rx8 = "\\\\label\\s*$O(\\d+)$C([\\s\\S]*)$O\\g8$C$EOL"; # Matches environments that should not be touched during the translation # $verbatim_env_rx = "\\s*{(verbatim|rawhtml|LVerbatim)[*]?}"; ++++++ latex2html-binmode.diff ++++++ Index: IndicTeX-HTML/devnagri.perl =================================================================== --- IndicTeX-HTML/devnagri.perl.orig 2002-11-29 12:48:57.000000000 +0100 +++ IndicTeX-HTML/devnagri.perl 2015-12-16 15:54:34.214410597 +0100 @@ -331,6 +331,7 @@ sub do_env_pre_tr_devnagri { local($_) = @_; open(DNTR,">dntr.tmp") || print "\n *** cannot open dntr.tmp ***" ; + binmode DNTR; print DNTR "\$\$", &revert_to_raw_tex($_), "\$\$"; close DNTR; &syswait("patc -p $PRE_FILTERS${dd}dng.pat dntr.tmp dntr.tmp1"); Index: IndicTeX-HTML/itrans.perl =================================================================== --- IndicTeX-HTML/itrans.perl.orig 2015-08-04 16:58:10.000000000 +0200 +++ IndicTeX-HTML/itrans.perl 2015-12-16 15:54:34.214410597 +0100 @@ -336,10 +336,11 @@ , "\#${indic}ifm=".$itrans_info{$indic.'ifm'} , "\#$indic", $itext , "\#end$indic\n" ); open(ITRANS, ">itrans.itx"); + binmode ITRANS;; print ITRANS "$_"; close(ITRANS); &syswait("$ITRANS <itrans.itx >itrans.htm"); - open(ITRANS, "<itrans.htm"); $itext = ''; + open(ITRANS, "<itrans.htm"); binmode ITRANS; $itext = ''; while (<ITRANS>) { next if (/^(\%|$)/); $itext .= $_ Index: IndicTeX-HTML/malyalam.perl =================================================================== --- IndicTeX-HTML/malyalam.perl.orig 2002-11-29 12:48:59.000000000 +0100 +++ IndicTeX-HTML/malyalam.perl 2015-12-16 15:54:34.214410597 +0100 @@ -221,6 +221,7 @@ sub do_env_pre_mmtr { local($_) = @_; open(MMTR,">mmtr.tmp") || print "\n *** cannot open mmtr.tmp ***" ; + binmode MMTR; print MMTR "\$\$", &revert_to_raw_tex($_), "\$\$"; close MMTR; &syswait("$PATC -p $MMDIR${dd}mm.pat mmtr.tmp mmtr.tmp1"); Index: cweb2html/cweb2html =================================================================== --- cweb2html/cweb2html.orig 2015-12-16 15:54:34.198410597 +0100 +++ cweb2html/cweb2html 2015-12-16 15:54:34.214410597 +0100 @@ -258,7 +258,7 @@ open(INPUT,"<$filename") || die "$PRGFILE: error: Could not open $filename\n"; - + binmode INPUT; while (<INPUT>) { $string{'STRING'} .= $_; } Index: cweb2html/htcweb.perl =================================================================== --- cweb2html/htcweb.perl.orig 2002-11-29 12:49:01.000000000 +0100 +++ cweb2html/htcweb.perl 2015-12-16 15:54:34.214410597 +0100 @@ -941,6 +941,7 @@ print "\nReading <$_[0]>..." if $DEBUG; open(INPUT,"<$_[0]"); + binmode INPUT; while (<INPUT>) { $string{'STRING'} .= $_; } @@ -948,6 +949,7 @@ print "\nReading <$_[1]>..." if $DEBUG; open(INPUT,"<$_[1]"); + binmode INPUT; while (<INPUT>) { $string{'STRING'} .= $_; } @@ -1028,6 +1030,7 @@ } } open(INPUT,"<$file") || die "Could not open $file\n"; + binmode INPUT; while (<INPUT>) { $string{'STRING'} .= $_}; $_ = delete $string{'STRING'}; # Blow it away and return the result Index: cweb2html/makemake.pl =================================================================== --- cweb2html/makemake.pl.orig 2015-12-16 15:54:34.198410597 +0100 +++ cweb2html/makemake.pl 2015-12-16 15:54:34.214410597 +0100 @@ -27,8 +27,10 @@ die "Cannot rename to $source.bak, $!\n"; open(OUT,">$source") || die "Cannot open $source, $!\n"; + binmode OUT; open(IN,"<$source.bak"); + binmode IN; while (<IN>) { $string{'STRING'} .= $_; } Index: latex2html.pin =================================================================== --- latex2html.pin.orig 2015-08-04 16:58:10.000000000 +0200 +++ latex2html.pin 2015-12-16 15:54:34.218410597 +0100 @@ -1088,6 +1088,7 @@ unless($ignore); return undef; } + binmode CATFILE; local($/) = undef; # slurp in whole file my $contents = <CATFILE>; close(CATFILE); @@ -1344,6 +1345,7 @@ $auto_styles =~ s/\|$//; if(open(STYLES, "<$TMP_${dd}styles")) { + binmode STYLES; while(<STYLES>) { if(s/^\s*(\S+)\s*(.*)$/$style = $1; $options = $2;/eo) { &do_require_package($style); @@ -1759,6 +1761,7 @@ unless(open(SINPUT,"<$file")) { die "\nError: Cannot read '$file': $!\n"; } + binmode SINPUT; local(@file_string); print STDOUT "$file" if ($VERBOSITY >1); while (<SINPUT>) { @@ -1843,6 +1846,7 @@ &wrap_shorthand_environments; print STDOUT "\n *** End-of-partition ***" if ($VERBOSITY > 1); if(open(OUT, ">$TMP_$dd$PARTITION_PREFIX$count")) { + binmode OUT; print OUT $_; close(OUT); } else { @@ -1863,6 +1867,7 @@ local($file) = @_; local(%string); if(open(INPUT,"<$file")) { + binmode INPUT; local(@file_string); while (<INPUT>) { push(@file_string, $_ ); @@ -2316,6 +2321,7 @@ open(OUTPUT, ">$CURRENT_FILE") || die "Cannot write '$CURRENT_FILE': $!\n"; + binmode OUTPUT; if ($XBIT_HACK) { # use Apache's XBit hack chmod 0744, $CURRENT_FILE; &check_htaccess; @@ -3766,6 +3772,7 @@ print "\nWriting image.pre file ...\n"; open(ENV,">.$dd${PREFIX}images.pre") || die "\nCannot write '${PREFIX}images.pre': $!\n"; + binmode ENV; print ENV &make_latex($latex_body); print ENV "\n"; close ENV; @@ -3785,6 +3792,7 @@ # save pre-processor commands in a file: preproc open(CMDS,">.$dd${PREFIX}preproc") || die "\nCannot write '${PREFIX}preproc': $!\n"; + binmode CMDS; print CMDS $preprocessor_cmds ; close CMDS; @@ -3795,6 +3803,7 @@ print "\nWriting image file ...\n"; open(ENV,">.$dd${PREFIX}images.tex") || die "\nCannot write '${PREFIX}images.tex': $!\n"; + binmode ENV; print ENV &make_latex($latex_body); print ENV "\n"; close ENV; @@ -7155,8 +7164,10 @@ print "\nError: Cannot write '$FILE.css': $!\n"; return; } + binmode STYLESHEET; if ( -f $EXTERNAL_STYLESHEET ) { if(open(EXT_STYLES, "<$EXTERNAL_STYLESHEET")) { + binmode EXT_STYLES; while (<EXT_STYLES>) { print STYLESHEET $_; } close(EXT_STYLES); } else { @@ -7451,7 +7462,7 @@ &slurp_input($this_file); open(OUTFILE, ">$this_file") || die "\nError: Cannot write file '$this_file': $!\n"; - + binmode OUTFILE; if (($INDEX) && ($SHORT_INDEX) && ($SEGMENT eq 1)) { &make_index_segment($title,$file); } @@ -7815,6 +7826,7 @@ return(); } if(open(INIT, "<$init_file")) { + binmode INIT; foreach $info_line (<INIT>) { $info_line =~ s/[<>"&]/'&'.$html_special_entities{$&}.';'/eg; $init_contents .= $info_line; @@ -8579,6 +8591,7 @@ sub post_process_footnotes { &slurp_input($footfile); open(OUT, ">$footfile") || die "Cannot write file '$footfile': $!\n"; + binmode OUT; &replace_markers; &post_post_process if (defined &post_post_process); &adjust_encoding; @@ -8600,6 +8613,7 @@ print "\nError: Cannot write '$filename': $!\n"; return; } + binmode FILE; print FILE $_; close(FILE); } @@ -9039,6 +9053,7 @@ my $script = $SCRIPT || $0; open(PIPE, "$perldoc -t $script |") || die "Fatal: can't open pipe: $!"; + binmode PIPE; while (<PIPE>) { if (/^\s*$/) { next; @@ -10134,6 +10149,7 @@ print "\nError: Cannot write '$urlimg': $!\n"; return; } + binmode IMAGE_MAP; ### HWS Pass server map unchanged from user print IMAGE_MAP "<HTML>\n<BODY>\n<A HREF=\"$map\">\n"; print IMAGE_MAP "<IMG\n SRC=\"$url\" ISMAP $ausemp $altst> </A>"; @@ -10151,6 +10167,8 @@ ($to_prefix, $suffix) = split(/\./, $to); if ($EXTN =~ /$suffix$/) { if (open(FROM, "<$from") && open(HTMP, ">HTML_tmp")) { + binmode FROM; + binmode HTMP; while (<FROM>) { s/$from_prefix\.$IMAGE_TYPE/$to_prefix.$IMAGE_TYPE/g; print HTMP; @@ -10175,6 +10193,7 @@ &replace_markers; &add_dir_to_href if ($DESTDIR); if(open(CAPTIONS, ">${PREFIX}$type.pl")) { + binmode CAPTIONS; print CAPTIONS $_; close (CAPTIONS); } else { @@ -16379,6 +16398,7 @@ if (-f $access_file) { print STDOUT " ... found"; open(HTACCESS, "<$access_file"); + binmode HTACCESS; while (<HTACCESS>) { if (/^\s*XBitHack\s*on\s*$/) { print STDOUT " with XBitHack on"; Index: styles/color.perl =================================================================== --- styles/color.perl.orig 2015-12-16 15:54:34.218410597 +0100 +++ styles/color.perl 2015-12-16 15:55:58.302409628 +0100 @@ -153,6 +153,7 @@ if (-f $file) { if (open(COLORFILE,"<$file")) { print STDOUT "\n(reading colors from $file" if $DEBUG; + binmode COLORFILE; while (<COLORFILE>) { s/^\s*(\d+)\s+(\d+)\s+(\d+)\s+(\w+(\s\w+)*)\s*/ ($r,$g,$b,$name)=($1,$2,$3,$4); @@ -183,6 +184,7 @@ if (-f $file) { if (open(COLORFILE,"<$file")) { print STDOUT "\n(reading colors from $file"; + binmode COLORFILE; @colors = (<COLORFILE>); foreach (@colors) { next if (/^\s*$/); Index: styles/frames.perl =================================================================== --- styles/frames.perl.orig 2002-11-29 12:49:18.000000000 +0100 +++ styles/frames.perl 2015-12-16 15:54:34.218410597 +0100 @@ -1126,6 +1126,7 @@ ); &text_cleanup; open(FILE,">$filename") || print "Cannot open $filename $!\n"; + binmode FILE; print FILE $_; close(FILE); } Index: styles/getimagesize.perl =================================================================== --- styles/getimagesize.perl.orig 2002-11-29 12:49:18.000000000 +0100 +++ styles/getimagesize.perl 2015-12-16 15:54:34.218410597 +0100 @@ -12,6 +12,7 @@ my $type = lc($1); $type = $IMAGE_TYPE unless $type =~ /(gif|png|jpe?g)/; if (open(IMAGE, "<$imagefile")) { + binmode IMAGE; my ($buffer,$magic,$dummy,$width,$height) = ('','','',0,0); binmode(IMAGE); # not harmful un UNIX # if ($IMAGE_TYPE =~ /gif/) { Index: styles/graphics-support.perl =================================================================== --- styles/graphics-support.perl.orig 2004-10-25 07:15:01.000000000 +0200 +++ styles/graphics-support.perl 2015-12-16 15:54:34.218410597 +0100 @@ -426,6 +426,7 @@ my($file)=@_; my(@bb,$f); if(($f=find_file($file,$GRAPHICS_PATH,['.eps','.ps','.bb'])) && open(PS,$f)){ + binmode PS; while(<PS>){ if(/^%%BoundingBox:\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s*$/){ @bb=($1,$2,$3,$4); last; }} Index: styles/html.perl =================================================================== --- styles/html.perl.orig 2015-08-04 16:58:10.000000000 +0200 +++ styles/html.perl 2015-12-16 15:54:34.218410597 +0100 @@ -293,6 +293,7 @@ if ($pretag) { # code due to Alan Williams <[email protected]> open(LABELS, "<$labelfile"); + binmode LABELS; print "\nLoading external labels from $labelfile, with prefix $pretag" if ($VERBOSITY > 1); local($translated_stream, $instream); @@ -400,6 +401,7 @@ if ($pretag) { # code due to Alan Williams <[email protected]> open(LABELS, "<$labelfile"); + binmode LABELS; print "\nLoading external labels from $labelfile, with prefix $pretag" if ($VERBOSITY > 1); local($translated_stream, $instream); Index: styles/webtex.perl =================================================================== --- styles/webtex.perl.orig 2015-08-04 16:58:10.000000000 +0200 +++ styles/webtex.perl 2015-12-16 15:54:34.218410597 +0100 @@ -227,6 +227,7 @@ &webeq_failed($out_tag); $out_tag = ''; } else { open(TAG, "<$out_tag"); + binmode TAG; $app_tag = join('',<TAG>); close(TAG); # replace webeq fall-back image by LaTeX2HTML's own, or none at all Index: texexpand.pin =================================================================== --- texexpand.pin.orig 2004-01-03 07:14:59.000000000 +0100 +++ texexpand.pin 2015-12-16 15:54:34.218410597 +0100 @@ -552,6 +552,7 @@ if($opt{save_styles}) { open(STYLES,">$opt{save_styles}") || die "$prompt Error: Cannot open style file '$opt{save_styles}': $!\n"; + binmode STYLES; } my $out_file = $opt{output}||$opt{out}; if($out_file) { @@ -561,6 +562,7 @@ else { open(OUT,">&STDOUT"); } + binmode OUT; &process_file($infile); # the workhorse... @@ -678,6 +680,7 @@ $includelevel++; open(IN,"<$infile") || die "$prompt Cannot open $infile\n"; + binmode IN; print STDERR "$prompt %--- Processing $infile" if ($debug > 1); # if we don't include this file marker LaTeX2HTML won't split Index: versions/frame.pl =================================================================== --- versions/frame.pl.orig 2002-11-29 12:49:18.000000000 +0100 +++ versions/frame.pl 2015-12-16 15:54:34.222410596 +0100 @@ -1202,6 +1202,7 @@ ); &text_cleanup; open(FILE,">$filename") || print "Cannot open $filename $!\n"; + binmode FILE; print FILE $_; close(FILE); } Index: versions/techexpl.pl =================================================================== --- versions/techexpl.pl.orig 2002-11-29 12:49:19.000000000 +0100 +++ versions/techexpl.pl 2015-12-16 15:54:34.222410596 +0100 @@ -212,6 +212,7 @@ sub TE_check_file_contents { local ($ifile) = @_; open(TEINC, "<$ifile"); + binmode TEINC; my($macrosOK,$macrosNUM,$numlines,$invalid) = (0,0,0,0); my $TE_special_macros_rx = join('|',@TE_special_macros); my $TE_defined_accents_rx = join('|',@TE_defined_accents); ++++++ latex2html-dest-dir.diff ++++++ Index: config/install.pl =================================================================== --- config/install.pl.orig 2002-11-29 12:49:01.000000000 +0100 +++ config/install.pl 2013-11-25 15:17:23.522211642 +0100 @@ -293,8 +293,10 @@ split(/\s+/,$cfg{'IMAGE_TYPES'}) : qw(gif); my $iconrx = join('|', @icon_types); +my $destdir=$ENV{"DESTDIR"}; my $dest1 = "$cfg{'SHLIBDIR'}${dd}icons"; -if((-d $dest1 && !-w _) || (-d $cfg{'SHLIBDIR'} && !-w _)) { +print STDERR "((( $destdir, $dest1 )))\n"; +if((-d "$destdir$dest1" && !-w _) || (-d "$destdir$cfg{'SHLIBDIR'}" && !-w _)) { print STDERR "Error: Cannot install icons in '$dest1': No write permission.\n"; $dest1 = ''; } @@ -372,7 +374,10 @@ if($cfg{TEXPATH}) { print "\nNote: trying to install LaTeX2HTML style files in TeX directory tree\n ($cfg{TEXPATH})\n"; - unless(mkpath($cfg{TEXPATH})) { + my $dest = $cfg{TEXPATH}; + my $destdir=$ENV{"DESTDIR"}; + $dest= "$destdir$dest"; + unless(mkpath($dest)) { #my $testpath = $cfg{TEXPATH}; # to strip (latex2)html #$testpath =~ s/[$dd$dd][^$dd$dd]*$//; #if((-d $cfg{TEXPATH} && !-w _) || (-d $testpath && !-w _)) { ++++++ latex2html-perl-bindir.diff ++++++ --- cweb2html/cweb2html +++ cweb2html/cweb2html @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl ################################################################################ # Copyright 1998-1999 by Jens Lippmann ([email protected]) --- cweb2html/makemake.pl +++ cweb2html/makemake.pl @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl ################################################################################ # Copyright 1998-1999 by Jens Lippmann ([email protected]) --- makeseg/makeseg +++ makeseg/makeseg @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # Check options and load configuration files &init; ++++++ latex2html-share-dir.diff ++++++ Index: config/config.pl =================================================================== --- config/config.pl.orig +++ config/config.pl @@ -1918,7 +1918,7 @@ else { $newcfg{'SHLIBDIR'} = $newcfg{'PREFIX'}; } else { - $newcfg{'SHLIBDIR'} = "$newcfg{'PREFIX'}${dd}share${dd}lib${dd}latex2html"; + $newcfg{'SHLIBDIR'} = "$newcfg{'PREFIX'}${dd}share${dd}latex2html"; } } add_drive_letter($newcfg{'SHLIBDIR'});
