From 411d66ecd4f86cddd97a132400236ba374085b8c Mon Sep 17 00:00:00 2001
From: Ville Skyttä <ville.skytta@iki.fi>
Date: Mar 12 2014 21:10:51 +0000
Subject: Update to 20130922.


- Fix for CVE-2014-2277 from Debian (#1074721) + related man page fix.
- Fix bogus date in %changelog.

---

diff --git a/perltidy-20130922-tmpnamdoc.patch b/perltidy-20130922-tmpnamdoc.patch
new file mode 100644
index 0000000..5ecea44
--- /dev/null
+++ b/perltidy-20130922-tmpnamdoc.patch
@@ -0,0 +1,15 @@
+diff -up Perl-Tidy-20130922/bin/perltidy~ Perl-Tidy-20130922/bin/perltidy
+--- Perl-Tidy-20130922/bin/perltidy~	2013-09-22 17:43:35.000000000 +0300
++++ Perl-Tidy-20130922/bin/perltidy	2014-03-12 23:01:08.164606065 +0200
+@@ -3060,9 +3060,8 @@ in any way.  And, of course, it does not
+ =item Temporary files
+ 
+ Under the -html option with the default --pod2html flag, a temporary file is
+-required to pass text to Pod::Html.  Unix systems will try to use the POSIX
+-tmpnam() function.  Otherwise the file F<perltidy.TMP> will be temporarily
+-created in the current working directory.
++required to pass text to Pod::Html.  The temporary file is created using
++File::Temp::tempfile().
+ 
+ =item Special files when standard input is used
+ 
diff --git a/perltidy.spec b/perltidy.spec
index 9b20f27..260e993 100644
--- a/perltidy.spec
+++ b/perltidy.spec
@@ -1,11 +1,13 @@
 Name:           perltidy
-Version:        20121207
-Release:        4%{?dist}
+Version:        20130922
+Release:        1%{?dist}
 Summary:        Tool for indenting and reformatting Perl scripts
 
 License:        GPLv2+
 URL:            http://perltidy.sourceforge.net/
-Source:         http://downloads.sourceforge.net/perltidy/Perl-Tidy-%{version}.tar.gz
+Source0:        http://www.cpan.org/modules/by-module/Perl/Perl-Tidy-%{version}.tar.gz
+Source1:        http://cdn.debian.net/debian/pool/main/p/perltidy/perltidy_20130922-1.debian.tar.xz
+Patch0:         %{name}-20130922-tmpnamdoc.patch
 
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -30,7 +32,9 @@ because it is very good at localizing errors.
 
 
 %prep
-%setup -q -n Perl-Tidy-%{version}
+%setup -q -n Perl-Tidy-%{version} -a 1
+%{__patch} -p1 -i debian/patches/fix_insecure_tmpnam_usage_740670
+%patch0 -p1
 rm -f docs/perltidy.1 examples/pt.bat
 f=CHANGES ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
@@ -60,6 +64,11 @@ make test
 
 
 %changelog
+* Wed Mar 12 2014 Ville Skyttä <ville.skytta@iki.fi> - 20130922-1
+- Update to 20130922.
+- Fix for CVE-2014-2277 from Debian (#1074721) + related man page fix.
+- Fix bogus date in %%changelog.
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20121207-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -159,7 +168,7 @@ make test
 * Thu Jun 15 2006 Ville Skyttä <ville.skytta@iki.fi> - 20060614-1
 - 20060614, specfile cleanups, include examples in docs.
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Wed Apr  6 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
 * Thu Dec 16 2004 Ville Skyttä <ville.skytta@iki.fi> - 0:20031021-1
diff --git a/sources b/sources
index 7d5f4d9..534b7cd 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-2fd84e72296337c78f2c024af3005aa8  Perl-Tidy-20121207.tar.gz
+efc831bc9f238ae037dae22c41b6ba31  Perl-Tidy-20130922.tar.gz
+0fa0cdb8817f6faf4cb97efa3d3ebb25  perltidy_20130922-1.debian.tar.xz