pool/NetworkManager-strongswan
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 427962 from GNOME:Next

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/427962
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/NetworkManager-strongswan?expand=0&rev=18
This commit is contained in:
Bjørn Lie 2016-09-16 21:54:52 +00:00 committed by Git OBS Bridge
parent 072d88de32
commit e2aa3aa68d
7 changed files with 35 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NetworkManager-strongswan-1.3.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:371ef2fcffd0bc40b1cb86355f20662324735d0dd1af3f1f72c2d3aab3c32fef
size 270324

3
NetworkManager-strongswan-1.4.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:02680f5226213ec69994b4e0c22229c1d777a3f8eff96a03f79326921ef5d661
size 288422

19
NetworkManager-strongswan.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Sep 9 17:27:03 UTC 2016 - zaitor@opensuse.org
- Update to version 1.4.0:
+ Updated to NetworkManager 1.2.
- Changes from version 1.3.2:
+ GUI fix.
+ Update to libsecret.
+ D-Bus policy moved to charon-nm.
- Modify BuildRequires following upstreams changes:
+ Drop: pkgconfig(gnome-keyring-1), pkgconfig(gtk+-2.0),
pkgconfig(dbus-glib-1) and pkgconfig(libgnomeui-2.0).
+ Add pkgconfig, pkgconfig(libnm-gtk), pkgconfig(libnma),
pkgconfig(gtk+-3.0) and pkgconfig(libsecret-1).
- Drop nm-strongswan-service-conf.patch,
nm-strongswan-fix-config.patch and nm-strongswan-UI-fixup.patch.
- Drop libtool BuildRequires and autoreconf call, we no longer
carry any patches.
-------------------------------------------------------------------
Tue Sep 8 06:14:23 UTC 2015 - dimstar@opensuse.org

34
NetworkManager-strongswan.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package NetworkManager-strongswan
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: NetworkManager-strongswan
Version: 1.3.1
Version: 1.4.0
Release: 0
Summary: NetworkManager VPN support for strongSwan
License: GPL-2.0+
@ -25,23 +25,16 @@ Group: Productivity/Networking/System
Url: http://www.strongswan.org/
Source0: http://download.strongswan.org/NetworkManager/%{name}-%{version}.tar.bz2
Source1: README
# PATCH-FIX-UPSTREAM nm-strongswan-service-conf.patch binli@opensuse.org -- Dismiss the rpmlint warning for 'send_interface'
Patch0: nm-strongswan-service-conf.patch
# PATCH-FIX-UPSTREAM nm-strongswan-UI-fixup.patch boo#944769 dimstar@opensuse.org -- Fix broken UI
Patch1: nm-strongswan-UI-fixup.patch
# PATCH-FIX-UPSTREAM nm-strongswan-fix-config.patch boo#944769 dimstar@opensuse.org -- Fix path to NM plugins in config file
Patch2: nm-strongswan-fix-config.patch
BuildRequires: intltool
# Needed by patch2
BuildRequires: libtool
BuildRequires: pkgconfig(NetworkManager) >= 0.9.0
BuildRequires: pkgconfig(dbus-glib-1) >= 0.30
BuildRequires: pkgconfig(gnome-keyring-1)
BuildRequires: pkgconfig(gtk+-2.0) >= 2.6
BuildRequires: pkgconfig(libgnomeui-2.0)
BuildRequires: pkgconfig
BuildRequires: pkgconfig(NetworkManager) >= 1.1.0
BuildRequires: pkgconfig(gtk+-3.0) >= 3.0
BuildRequires: pkgconfig(libnm-glib)
BuildRequires: pkgconfig(libnm-glib-vpn)
BuildRequires: pkgconfig(libnm-gtk) >= 1.1.0
BuildRequires: pkgconfig(libnm-util)
BuildRequires: pkgconfig(libnma) >= 1.1.0
BuildRequires: pkgconfig(libsecret-1)
Requires: %{name}-frontend
Requires: NetworkManager >= 0.9.0
Requires: strongswan-nm >= 5.0.1
@ -67,14 +60,9 @@ strongSwan.
%lang_package
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
cp %{SOURCE1} README.SUSE
%build
# Needed by patch2
autoreconf -fiv
%configure\
--disable-static \
--disable-more-warnings
@ -93,13 +81,17 @@ rm -rf %{buildroot}
%doc README.SUSE
%dir %{_sysconfdir}/NetworkManager/VPN
%config %{_sysconfdir}/NetworkManager/VPN/nm-strongswan-service.name
%config %{_sysconfdir}/dbus-1/system.d/nm-strongswan-service.conf
%dir %{_libexecdir}/NetworkManager
%dir %{_libexecdir}/NetworkManager/VPN
%{_libexecdir}/NetworkManager/VPN/nm-strongswan-service.name
%{_libdir}/NetworkManager/libnm-vpn-plugin-strongswan.so
%files gnome
%defattr(-,root,root,-)
%{_libdir}/NetworkManager/libnm-strongswan-properties.so
%{_libexecdir}/nm-strongswan-auth-dialog
%{_datadir}/gnome-vpn-properties/
%{_datadir}/appdata/NetworkManager-strongswan.appdata.xml
%files lang -f %{name}.lang

22
nm-strongswan-UI-fixup.patch
View File

@ -1,22 +0,0 @@
Index: NetworkManager-strongswan-1.3.1/properties/nm-strongswan-dialog.ui
===================================================================
--- NetworkManager-strongswan-1.3.1.orig/properties/nm-strongswan-dialog.ui
+++ NetworkManager-strongswan-1.3.1/properties/nm-strongswan-dialog.ui
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 2.12 -->
- <object class="GtkWindow" id="strongswan-widget">
- <property name="can_focus">False</property>
- <property name="title" translatable="yes">window1</property>
- <child>
<object class="GtkVBox" id="strongswan-vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -374,6 +370,4 @@
</packing>
</child>
</object>
- </child>
- </object>
</interface>

22
nm-strongswan-fix-config.patch
View File

@ -1,22 +0,0 @@
Index: NetworkManager-strongswan-1.3.1/nm-strongswan-service.name.in
===================================================================
--- NetworkManager-strongswan-1.3.1.orig/nm-strongswan-service.name.in
+++ NetworkManager-strongswan-1.3.1/nm-strongswan-service.name.in
@@ -5,4 +5,4 @@ program=@CHARON@
[GNOME]
auth-dialog=@LIBEXECDIR@/nm-strongswan-auth-dialog
-properties=libnm-strongswan-properties
+properties=@LIBDIR@/NetworkManager/libnm-strongswan-properties
Index: NetworkManager-strongswan-1.3.1/Makefile.am
===================================================================
--- NetworkManager-strongswan-1.3.1.orig/Makefile.am
+++ NetworkManager-strongswan-1.3.1/Makefile.am
@@ -13,6 +13,7 @@ nmvpnservice_DATA = nm-strongswan-servic
nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in
$(AM_V_GEN) \
sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|' \
+ -e 's![@]LIBDIR[@]!$(libdir)!' \
-e 's|[@]CHARON[@]|$(charon)|' $< >$@
EXTRA_DIST = nm-strongswan-service.name.in \

17
nm-strongswan-service-conf.patch
View File

@ -1,17 +0,0 @@
Index: NetworkManager-strongswan-1.1.2/nm-strongswan-service.conf
===================================================================
--- NetworkManager-strongswan-1.1.2.orig/nm-strongswan-service.conf
+++ NetworkManager-strongswan-1.1.2/nm-strongswan-service.conf
@@ -5,12 +5,10 @@
<policy user="root">
<allow own="org.freedesktop.NetworkManager.strongswan"/>
<allow send_destination="org.freedesktop.NetworkManager.strongswan"/>
- <allow send_interface="org.freedesktop.NetworkManager.strongswan"/>
</policy>
<policy context="default">
<deny own="org.freedesktop.NetworkManager.strongswan"/>
<deny send_destination="org.freedesktop.NetworkManager.strongswan"/>
- <deny send_interface="org.freedesktop.NetworkManager.strongswan"/>
</policy>
</busconfig>