[sslsplit/f19] Rebase to upstream 0.4.8

Paul Wouters pwouters at fedoraproject.org
Wed Jan 29 04:32:24 UTC 2014


commit b69e78e2f5acaa2faf9f181391f84de5ed04b30e
Author: Patrick Uiterwijk <puiterwijk at redhat.com>
Date:   Wed Jan 29 01:13:41 2014 +0100

    Rebase to upstream 0.4.8
    
    Conflicts:
    	sslsplit.spec

 .gitignore    |    1 +
 sources       |    2 +-
 sslsplit.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 27aeffc..182aa21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /sslsplit-0.4.4.tar.bz2
 /sslsplit-0.4.5.tar.bz2
 /0.4.5.tar.gz
+/0.4.8.tar.gz
diff --git a/sources b/sources
index 89ba02e..419ee24 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f06b5729a6152515434c0f9b5f0deb98  0.4.5.tar.gz
+8849a1635e612e6eb69b33d77a8414a9  0.4.8.tar.gz
diff --git a/sslsplit.spec b/sslsplit.spec
index ed81bd0..67eccc9 100644
--- a/sslsplit.spec
+++ b/sslsplit.spec
@@ -1,6 +1,6 @@
 Summary: Transparent and scalable SSL/TLS interception
 Name: sslsplit
-Version: 0.4.5
+Version: 0.4.8
 Release: 1%{?dist}
 License: BSD
 Url: http://www.roe.ch/SSLsplit
@@ -45,6 +45,9 @@ cp -a %{name}.1  %{buildroot}%{_mandir}/man1/
 %{_mandir}/*/*
 
 %changelog
+* Wed Jan 29 2014 Patrick Uiterwijk <puiterwijk at redhat.com> - 0.4.8-1
+- Rebase to upstream 0.4.8
+
 * Wed Feb 13 2013 Patrick Uiterwijk <puiterwijk at gmail.com> - 0.4.5-1
 - Rebase to upstream 0.4.5
 - Switched to usage of Github download links


More information about the scm-commits mailing list