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 3.x development tree".
The branch, master has been updated via 210155684c82a1717227ca92cdb2718362d0e787 (commit) via ba0b224ac0975ab1497ec8aa62d17e44b92f29af (commit) from 170769d4b46748a196c114c697a2f4a066f088ff (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 210155684c82a1717227ca92cdb2718362d0e787 Merge: ba0b224 170769d Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 25 00:48:11 2012 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit ba0b224ac0975ab1497ec8aa62d17e44b92f29af Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 25 00:46:41 2012 +0200
strongswan: Enable systemd support and make services start.
The binaries that are created in this package do not find their shared libs (there is no RPATH), so we create symlinks to %{libdir}.
-----------------------------------------------------------------------
Summary of changes: strongswan/strongswan.nm | 43 +++++++++++++++++++++++++++++++------------ 1 files changed, 31 insertions(+), 12 deletions(-)
Difference in files: diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm index fd88d43..a47f2aa 100644 --- a/strongswan/strongswan.nm +++ b/strongswan/strongswan.nm @@ -5,7 +5,7 @@
name = strongswan version = 5.0.0 -release = 0.1.rc1 +release = 0.2.rc1 thisapp = %{name}-%{version}rc1
groups = Networking/VPN @@ -32,21 +32,21 @@ build libcap-devel libcurl-devel libgcrypt-devel + libtool openldap-devel + openssl-devel perl sqlite-devel + systemd-devel + systemd-units end
configure_options += \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --with-user=nobody \ - --with-group=nobody \ --enable-curl \ --enable-ldap \ + --enable-openssl \ --enable-sqlite \ --enable-gcrypt \ - --enable-cisco-quirks \ --with-capabilities=libcap
if "%{DISTRO_ARCH}" == "i686" @@ -56,18 +56,37 @@ build test make check end -end
-# Plugins and many other files are installed in /usr/lib/ipsec -# and loaded by using a RPATH. -quality-agent - whitelist_rpath - /usr/lib/ipsec + install_cmds + # Make the shared libraries available to the runtime linker. + # (RPATH issues, whatever...) + cd %{BUILDROOT}%{libdir} + for lib in libcharon.so.0 libhydra.so.0 libstrongswan.so.0; do + ln -svf ipsec/${lib} . + done end end
packages package %{name} + script postin + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + systemctl reload-or-try-restart strongswan.service >/dev/null 2>&1 || : + end + + script preun + systemctl disable --no-reload strongswan.service >/dev/null 2>&1 || : + systemctl stop strongswan.service >/dev/null 2>&1 || : + end + + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end + end
package %{name}-debuginfo template DEBUGINFO
hooks/post-receive -- IPFire 3.x development tree