From bee8b2fb7522ba5c784c17eddc2950fb722ae969 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Fri, 14 Oct 2016 22:04:01 +0400 Subject: [PATCH 1/6] MassBuild#1169: Increase release tag --- openswan.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openswan.spec b/openswan.spec index 67a9b32..c65a81a 100644 --- a/openswan.spec +++ b/openswan.spec @@ -3,7 +3,7 @@ Summary: An implementation of IPSEC & IKE for Linux Name: openswan Version: 2.6.49 -Release: 1 +Release: 2 License: GPLv2+ Group: System/Servers Url: http://www.openswan.org/ From c0ece4ba1c25e386f43bbad5e2f9886c382ce0cd Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Sat, 4 Feb 2017 19:07:09 +0300 Subject: [PATCH 2/6] MassBuild#1230: Increase release tag --- openswan.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openswan.spec b/openswan.spec index c65a81a..3802feb 100644 --- a/openswan.spec +++ b/openswan.spec @@ -3,7 +3,7 @@ Summary: An implementation of IPSEC & IKE for Linux Name: openswan Version: 2.6.49 -Release: 2 +Release: 3 License: GPLv2+ Group: System/Servers Url: http://www.openswan.org/ From 6052d4d71ef276f368ba592f5efb818c4ae8a91a Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Tue, 14 Feb 2017 02:11:08 +1000 Subject: [PATCH 3/6] Try to workaround messed up man generation on install --- .abf.yml | 9 --------- openswan.spec | 5 ++++- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.abf.yml b/.abf.yml index 7f0eeb9..4142398 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,12 +1,3 @@ -removed_sources: - openswan-2.6.39.tar.gz: 0100c226ef82222243aba74deeb47bead594fbc2 - openswan-2.6.41.tar.gz: 98089d87b361184b1667e8c0e1975d7707b0ee1b - openswan-2.6.44.tar.gz: e074d5dfec525330a5db724912443636f7679f15 - openswan-2.6.48.tar.gz: 39ae42a907824d039fd55805e2c3ae5dec9fc9bc sources: - openswan-2.6.39.tar.gz.asc: 74917d65f6bcdc66d84ca76a14a7ed323b9344eb - openswan-2.6.41.tar.gz.asc: 4cbcec60fa1ac7b8813d4bda975c18a722bad0c1 - openswan-2.6.44.tar.gz.asc: 149bcb348ab548c8b1aa564a4d9b0e6c92e3c68e - openswan-2.6.48.tar.gz.asc: 6ff1212ee2523af4ee960fe31be31f3e70c43e21 openswan-2.6.49.tar.gz: 2175fbe82ea1c88caec2d877c069fa237b7aa122 openswan-2.6.49.tar.gz.asc: 6fae97dd2f1a71caa645bbcc646d241e8375c422 diff --git a/openswan.spec b/openswan.spec index 3802feb..8121f21 100644 --- a/openswan.spec +++ b/openswan.spec @@ -3,7 +3,7 @@ Summary: An implementation of IPSEC & IKE for Linux Name: openswan Version: 2.6.49 -Release: 3 +Release: 4 License: GPLv2+ Group: System/Servers Url: http://www.openswan.org/ @@ -95,6 +95,9 @@ This is the documentation for Openswan. find . -type f -name "*.html" -exec dos2unix {} \; +# Try to workaround messed up man generation on install +cat _confread/d.ipsec.conf/order.txt >_confread/ipsec.conf.5.xml + %build %serverbuild From 69b9d736c2d00dad43e415cf68cd7587d6d6a435 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Tue, 14 Feb 2017 02:19:47 +1000 Subject: [PATCH 4/6] Fix path --- openswan.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openswan.spec b/openswan.spec index 8121f21..c65f5d9 100644 --- a/openswan.spec +++ b/openswan.spec @@ -96,7 +96,7 @@ This is the documentation for Openswan. find . -type f -name "*.html" -exec dos2unix {} \; # Try to workaround messed up man generation on install -cat _confread/d.ipsec.conf/order.txt >_confread/ipsec.conf.5.xml +cat programs/_confread/d.ipsec.conf/order.txt >programs/_confread/ipsec.conf.5.xml %build %serverbuild From 6ce94ca28120492bdefa46730568a841f00bf92d Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Tue, 14 Feb 2017 02:48:00 +1000 Subject: [PATCH 5/6] Properly create ipsec.conf.5.xml --- openswan.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openswan.spec b/openswan.spec index c65f5d9..2c29b34 100644 --- a/openswan.spec +++ b/openswan.spec @@ -96,7 +96,9 @@ This is the documentation for Openswan. find . -type f -name "*.html" -exec dos2unix {} \; # Try to workaround messed up man generation on install -cat programs/_confread/d.ipsec.conf/order.txt >programs/_confread/ipsec.conf.5.xml +pushd programs/_confread +cat `cat d.ipsec.conf/order.txt` >ipsec.conf.5.xml +popd %build %serverbuild From 88e92613aa514b10eb75750443e19af5e18d36e5 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Tue, 14 Feb 2017 03:15:00 +1000 Subject: [PATCH 6/6] Try to build with all docbook-dtds --- openswan.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/openswan.spec b/openswan.spec index 2c29b34..11e30ad 100644 --- a/openswan.spec +++ b/openswan.spec @@ -13,6 +13,7 @@ Source2: openswan.service Patch0: openswan-2.6.28-manfix.patch BuildRequires: bison BuildRequires: docbook-dtd412-xml +BuildRequires: docbook-dtds BuildRequires: docbook-style-xsl BuildRequires: dos2unix BuildRequires: flex