From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c007921b21f23e8249b87a3fd19c15dd8ec3d199
Date: Tue, 08 Jul 2014 19:28:29 +0200 [thread overview]
Message-ID: <20140708172829.DB9B121189@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3463 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via c007921b21f23e8249b87a3fd19c15dd8ec3d199 (commit)
from 3d4b48ceb2a8f4a83666c673073939256b181cdd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c007921b21f23e8249b87a3fd19c15dd8ec3d199
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Jul 8 19:27:44 2014 +0200
strongswan: Don't ship unity plugin any more.
Fixes #10569
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/strongswan | 3 ---
config/rootfiles/core/80/update.sh | 6 ++++++
lfs/strongswan | 1 -
3 files changed, 6 insertions(+), 4 deletions(-)
Difference in files:
diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index 550fa69..077ac41 100644
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -54,7 +54,6 @@ etc/strongswan.d/charon/sha2.conf
etc/strongswan.d/charon/socket-default.conf
etc/strongswan.d/charon/sshkey.conf
etc/strongswan.d/charon/stroke.conf
-etc/strongswan.d/charon/unity.conf
etc/strongswan.d/charon/updown.conf
etc/strongswan.d/charon/x509.conf
etc/strongswan.d/charon/xauth-eap.conf
@@ -133,7 +132,6 @@ usr/lib/ipsec/plugins/libstrongswan-sha2.so
usr/lib/ipsec/plugins/libstrongswan-socket-default.so
usr/lib/ipsec/plugins/libstrongswan-sshkey.so
usr/lib/ipsec/plugins/libstrongswan-stroke.so
-usr/lib/ipsec/plugins/libstrongswan-unity.so
usr/lib/ipsec/plugins/libstrongswan-updown.so
usr/lib/ipsec/plugins/libstrongswan-x509.so
usr/lib/ipsec/plugins/libstrongswan-xauth-eap.so
@@ -213,7 +211,6 @@ usr/sbin/ipsec
#usr/share/strongswan/templates/config/plugins/socket-default.conf
#usr/share/strongswan/templates/config/plugins/sshkey.conf
#usr/share/strongswan/templates/config/plugins/stroke.conf
-#usr/share/strongswan/templates/config/plugins/unity.conf
#usr/share/strongswan/templates/config/plugins/updown.conf
#usr/share/strongswan/templates/config/plugins/x509.conf
#usr/share/strongswan/templates/config/plugins/xauth-eap.conf
diff --git a/config/rootfiles/core/80/update.sh b/config/rootfiles/core/80/update.sh
index 26e0044..8bd9a89 100644
--- a/config/rootfiles/core/80/update.sh
+++ b/config/rootfiles/core/80/update.sh
@@ -31,6 +31,12 @@ do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
done
+# Remove old strongswan files
+rm -f \
+ /etc/strongswan.d/charon/unity.conf \
+ /usr/lib/ipsec/plugins/libstrongswan-unity.so \
+ /usr/share/strongswan/templates/config/plugins/unity.conf
+
# Stop services
# Extract files
diff --git a/lfs/strongswan b/lfs/strongswan
index a5bda74..3f05c98 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -97,7 +97,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--enable-eap-peap \
--enable-eap-mschapv2 \
--enable-eap-identity \
- --enable-unity \
$(CONFIGURE_OPTIONS)
cd $(DIR_APP) && make $(MAKETUNING)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2014-07-08 17:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140708172829.DB9B121189@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox