tags 698294 + pending thanks Dear maintainer,
I've prepared an NMU for puppet (versioned as 2.7.18-2.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Cheers, Anton
diff -Nru puppet-2.7.18/debian/changelog puppet-2.7.18/debian/changelog --- puppet-2.7.18/debian/changelog 2012-09-19 11:45:14.000000000 +0200 +++ puppet-2.7.18/debian/changelog 2013-02-28 21:15:05.000000000 +0100 @@ -1,3 +1,10 @@ +puppet (2.7.18-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix checksum mismatch when copying followed symlinks. (Closes: #698294) + + -- Anton Gladky <gl...@debian.org> Thu, 28 Feb 2013 21:14:32 +0100 + puppet (2.7.18-2) unstable; urgency=low [ Faidon Liambotis ] diff -Nru puppet-2.7.18/debian/patches/fix_checksum_missmatch_symlinks puppet-2.7.18/debian/patches/fix_checksum_missmatch_symlinks --- puppet-2.7.18/debian/patches/fix_checksum_missmatch_symlinks 1970-01-01 01:00:00.000000000 +0100 +++ puppet-2.7.18/debian/patches/fix_checksum_missmatch_symlinks 2013-02-28 21:13:39.000000000 +0100 @@ -0,0 +1,18 @@ +Description: Fixes checksum mismatch when copying followed symlinks +Origin: http://projects.puppetlabs.com/issues/7680#note-6 +Acked-by: Anton Gladky <gl...@debian.org> +Applied-Upstream: https://github.com/sodabrew/puppet/commit/9acce27806afb75570c156ff883d7b5edb8d7cb3 +Bug-Debian: http://bugs.debian.org/698294 +Last-Update: 2013-02-28 + +--- a/lib/puppet/type/file/source.rb ++++ b/lib/puppet/type/file/source.rb +@@ -117,7 +117,7 @@ + param_name = (metadata_method == :checksum) ? :content : metadata_method + next if metadata_method == :owner and !Puppet.features.root? + next if metadata_method == :checksum and metadata.ftype == "directory" +- next if metadata_method == :checksum and metadata.ftype == "link" and metadata.links == :manage ++ next if metadata_method == :checksum and metadata.ftype == "link" and resource[:links] == :manage + + if Puppet.features.microsoft_windows? + next if [:owner, :group].include?(metadata_method) and !local? diff -Nru puppet-2.7.18/debian/patches/series puppet-2.7.18/debian/patches/series --- puppet-2.7.18/debian/patches/series 2012-09-19 11:45:14.000000000 +0200 +++ puppet-2.7.18/debian/patches/series 2013-02-28 21:01:24.000000000 +0100 @@ -1,2 +1,3 @@ apache2-passenger-template fix_logcheck +fix_checksum_missmatch_symlinks
signature.asc
Description: OpenPGP digital signature
