[polipo: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/polipo

[Bernard Johnson]

commit 4eef7d89b031cf5b80a8e714b1ac9699aa54fb85
Merge: 3ee24a0 ef73c17
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Sun Jan 22 19:32:50 2012 -0700

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/polipo
    
    Conflicts:
    	polipo.spec

 polipo.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc polipo.spec
index 7211a1c,8fc42ce..2ede1fe
--- a/polipo.spec
+++ b/polipo.spec
@@@ -10,7 -10,7 +10,7 @@@
  
  Name:           polipo
  Version:        1.0.4.1
--Release:        5%{?dist}
++Release:        6%{?dist}
  Summary:        Lightweight caching web proxy
  License:        MIT
  Source0:        http://freehaven.net/~chrisd/%{name}/%{name}-%{version}.tar.gz
@@@ -187,16 -181,14 +187,19 @@@ f
  
  %if 0%{?_with_tmpfilesd}
  %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
 -%else
 -%attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
  %endif
 +%attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
  
  %changelog
- * Sun Jan 22 2012 Bernard Johnson <bjohnson at symetrix.com> - 1.0.4.1-5
++* Sun Jan 22 2012 Bernard Johnson <bjohnson at symetrix.com> - 1.0.4.1-6
 +- add daily cache cleanup
 +- fix missing creation of /var/run directory (bz #755198)
 +- make sure log directory context is set correctly (bz #741779)
 +- fix denial of service vulnerability CVE-2011-3596 (bz #742897)
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4.1-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Mon Sep 26 2011 Bernard Johnson <bjohnson at symetrix.com> - 1.0.4.1-4
  - take file / dir creation & testing out of initscript (bz #708814)
  - remove log file / dir creation in spec too