From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4cdcf12702ac05a3ba368f0667fe7daf2e5dbd78
Date: Fri, 16 Oct 2015 23:34:30 +0200 [thread overview]
Message-ID: <20151016213432.35D0A21577@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 9590 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 3.x development tree".
The branch, master has been updated
via 4cdcf12702ac05a3ba368f0667fe7daf2e5dbd78 (commit)
via 549db1aec915296cb7b528d087399135847b5f36 (commit)
via 542adc2e14ef98079d1806b8d3e0ae0285f9f790 (commit)
via 15ded0e1a142c21ee3c7a55717a85677db64fe62 (commit)
from e78194361bad619058031f571105c3f71f07600f (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 4cdcf12702ac05a3ba368f0667fe7daf2e5dbd78
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Oct 16 17:35:34 2015 +0200
systemd: Enable build of compat libs.
Some software out there is still linking against the old
systemd libraries which now are shipped in an own package.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 549db1aec915296cb7b528d087399135847b5f36
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Oct 16 23:20:04 2015 +0200
strongswan: Update to 5.3.3
This is a minor update to the latest stable version of strongswan.
The support and usage of systemd explicitly has been enabled and
the dependency to systemd has been updated because the configure script
of strongswan is looking for the systemd compat libraries which are provided
by systemd 221-2 and later versions.
There was the requirement to move some libraries to %{libdir} because
of a hard-coded RPATH, which is against our release policy.
Fixes #10896.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 542adc2e14ef98079d1806b8d3e0ae0285f9f790
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Oct 16 20:12:53 2015 +0200
ddns: Update to 009
This is a major update to the latest available version of ddns,
which mainly includes a better SSL error handling and support for
desec.io.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 15ded0e1a142c21ee3c7a55717a85677db64fe62
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 16 21:46:33 2015 +0100
openvpn: Drop package
The IPFire Developer Summit decided to drop OpenVPN support
from IPFire 3 since it has many issues that don't seem to get
solved in the near future and nobody volunteered to maintain
this package.
Development is focussing on IPsec for now and OpenVPN may
come back later when resources have been freed or there
is enough demand (including volunteers to work on it).
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
ddns/ddns.nm | 4 +-
openvpn/openvpn.nm | 53 ----------------------
.../patches/strongswan-swanctl-1193106.patch | 10 ++++
strongswan/strongswan.nm | 19 ++++++--
systemd/systemd.nm | 24 +++++++++-
5 files changed, 51 insertions(+), 59 deletions(-)
delete mode 100644 openvpn/openvpn.nm
create mode 100644 strongswan/patches/strongswan-swanctl-1193106.patch
Difference in files:
diff --git a/ddns/ddns.nm b/ddns/ddns.nm
index 5c17119..c19411b 100644
--- a/ddns/ddns.nm
+++ b/ddns/ddns.nm
@@ -4,8 +4,8 @@
###############################################################################
name = ddns
-version = 008
-release = 2
+version = 009
+release = 1
arch = noarch
groups = System/Tools
diff --git a/openvpn/openvpn.nm b/openvpn/openvpn.nm
deleted file mode 100644
index ca6e961..0000000
--- a/openvpn/openvpn.nm
+++ /dev/null
@@ -1,53 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = openvpn
-version = 2.3.6
-release = 1
-
-groups = Networking/VPN
-url = http://openvpn.net/
-license = GPLv2
-summary = A full-featured SSL VPN solution.
-
-description
- OpenVPN is a robust and highly flexible tunneling application that uses all
- of the encryption, authentication, and certification features of the
- OpenSSL library to securely tunnel IP networks over a single UDP or TCP
- port. It can use the Marcus Franz Xaver Johannes Oberhumer's LZO library
- for compression.
-end
-
-source_dl = http://swupdate.openvpn.org/community/releases/
-
-PLUGINS = auth-pam down-root
-
-build
- requires
- iproute2
- libselinux-devel
- lzo-devel
- openssl-devel
- pam-devel
- systemd-devel
- end
-
- configure_options += \
- --enable-password-save \
- --enable-iproute2 \
- --enable-systemd
-end
-
-packages
- package %{name}
- requires
- iproute2
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/strongswan/patches/strongswan-swanctl-1193106.patch b/strongswan/patches/strongswan-swanctl-1193106.patch
new file mode 100644
index 0000000..cecef1f
--- /dev/null
+++ b/strongswan/patches/strongswan-swanctl-1193106.patch
@@ -0,0 +1,10 @@
+diff -urNp strongswan-5.2.2/init/systemd-swanctl/strongswan-swanctl.service.in strongswan-5.2.2-patched/init/systemd-swanctl/strongswan-swanctl.service.in
+--- strongswan-5.2.2/init/systemd-swanctl/strongswan-swanctl.service.in 2014-09-26 09:04:24.000000000 -0400
++++ strongswan-5.2.2-patched/init/systemd-swanctl/strongswan-swanctl.service.in 2015-02-20 09:42:17.822480297 -0500
+@@ -7,3 +7,6 @@ Type=notify
+ ExecStart=@SBINDIR@/charon-systemd
+ ExecStartPost=@SBINDIR@/swanctl --load-all --noprompt
+ ExecReload=@SBINDIR@/swanctl --reload
++
++[Install]
++WantedBy=multi-user.target
diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm
index b386083..3eb1462 100644
--- a/strongswan/strongswan.nm
+++ b/strongswan/strongswan.nm
@@ -4,7 +4,7 @@
###############################################################################
name = strongswan
-version = 5.3.2
+version = 5.3.3
release = 1
groups = Networking/VPN
@@ -38,11 +38,12 @@ build
openssl-devel
perl
sqlite-devel
- systemd-devel
- systemd-units
+ systemd-devel >= 221-2
end
configure_options += \
+ --disable-static \
+ --with-ipseclibdir=%{libdir}/ipsec \
--enable-curl \
--enable-ldap \
--enable-openssl \
@@ -61,6 +62,7 @@ build
--enable-eap-identity \
--with-capabilities=libcap \
--enable-swanctl \
+ --enable-systemd \
--enable-kernel-libipsec
if "%{DISTRO_ARCH}" == "i686"
@@ -72,6 +74,14 @@ build
#test
# make check
#end
+
+ install_cmds
+ # Drop unneeded files.
+ rm -rvf %{BUILDROOT}%{libdir}/ipsec/lib*.so
+
+ # Move libraries to libdir.
+ mv %{BUILDROOT}%{libdir}/ipsec/lib*.so.* %{BUILDROOT}%{libdir}
+ end
end
packages
@@ -83,11 +93,14 @@ packages
script postup
systemctl daemon-reload >/dev/null 2>&1 || :
systemctl reload-or-try-restart strongswan.service >/dev/null 2>&1 || :
+ systemctl reload-or-try-restart strongswan-swanctl.service >/dev/null 2>&1 || :
end
script preun
systemctl disable --no-reload strongswan.service >/dev/null 2>&1 || :
+ systemctl disable --no-reload strongswan-swanctl.service >/dev/null 2>&1 || :
systemctl stop strongswan.service >/dev/null 2>&1 || :
+ systemctl stop strongswan-swanctl.service >/dev/null 2>&1 || :
end
script postun
diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 7112a3c..7346c09 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -5,7 +5,7 @@
name = systemd
version = 221
-release = 1
+release = 2
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
groups = System/Base
@@ -60,6 +60,7 @@ build
--with-sysvrcnd-path= \
--enable-introspection \
--enable-zlib \
+ --enable-compat-libs \
--disable-smack \
--disable-backlight \
--disable-firstboot \
@@ -358,9 +359,30 @@ packages
end
end
+ package %{name}-compat-libs
+ summary = systemd compatibility libraries.
+ description
+ Compatibility libraries for systemd. If your package requires this
+ package, you need to update your link options and build.
+ end
+
+ requires
+ %{name}-libs = %{thisver}
+ end
+
+ files
+ %{libdir}/libsystemd-daemon.so.*
+ %{libdir}/libsystemd-login.so.*
+ %{libdir}/libsystemd-journal.so.*
+ %{libdir}/libsystemd-id128.so.*
+ end
+ end
+
package %{name}-devel
template DEVEL
+ requires += %{name}-compat-libs = %{thisver}
+
files += %{prefix}/lib/pakfire/macros/
end
hooks/post-receive
--
IPFire 3.x development tree
reply other threads:[~2015-10-16 21:34 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=20151016213432.35D0A21577@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