rpms/NetworkManager-openvpn/EL-5 NetworkManager-openvpn-0.7.0-keyring.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 NetworkManager-openvpn.spec, 1.5, 1.6 sources, 1.2, 1.3 NetworkManager-openvpn-0.3.2-scriptsec.patch, 1.1, NONE
Lubomir Rintel
lkundrak at fedoraproject.org
Sat Feb 7 11:41:11 UTC 2009
- Previous message (by thread): rpms/system-config-printer/devel system-config-printer.spec, 1.244, 1.245
- Next message (by thread): rpms/NetworkManager-pptp/EL-5 NetworkManager-pptp-0.7.0-dbus.patch, NONE, 1.1 NetworkManager-pptp-0.7.0-keyring.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 NetworkManager-pptp.spec, 1.1, 1.2 sources, 1.2, 1.3 NetworkManager-pptp-0.6.4-noversion.patch, 1.1, NONE NetworkManager-pptp-0.6.4-pppdplugin.patch, 1.1, NONE NetworkManager-pptp-0.6.6-desktop.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lkundrak
Update of /cvs/pkgs/rpms/NetworkManager-openvpn/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24081
Modified Files:
.cvsignore NetworkManager-openvpn.spec sources
Added Files:
NetworkManager-openvpn-0.7.0-keyring.patch
Removed Files:
NetworkManager-openvpn-0.3.2-scriptsec.patch
Log Message:
* Sat Feb 7 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0-18.svn11.1
- Adjust for RHEL 5.3, older and less capable keyring manager
NetworkManager-openvpn-0.7.0-keyring.patch:
--- NEW FILE NetworkManager-openvpn-0.7.0-keyring.patch ---
Older keyring manager does not provide memory protected string manipulation.
This is slightly less secure, but definitely not a security flaw.
Lubomir Rintel <lkundrak at v3.sk>
diff -up NetworkManager-openvpn-0.7.0/common-gnome/keyring-helpers.c.keyring NetworkManager-openvpn-0.7.0/common-gnome/keyring-helpers.c
--- NetworkManager-openvpn-0.7.0/common-gnome/keyring-helpers.c.keyring 2008-12-11 20:52:57.000000000 +0100
+++ NetworkManager-openvpn-0.7.0/common-gnome/keyring-helpers.c 2009-02-07 12:03:14.000000000 +0100
@@ -21,7 +21,7 @@
*/
#include <string.h>
-#include <gnome-keyring-memory.h>
+#include <gnome-keyring.h>
#include <nm-setting-vpn.h>
@@ -137,7 +137,7 @@ keyring_helpers_delete_secret (const cha
GNOME_KEYRING_ATTRIBUTE_TYPE_STRING,
secret_name,
NULL);
- if (ret != GNOME_KEYRING_RESULT_OK && ret != GNOME_KEYRING_RESULT_NO_MATCH)
+ if (ret != GNOME_KEYRING_RESULT_OK)
return FALSE;
if (g_list_length (found) == 0)
return TRUE;
diff -up NetworkManager-openvpn-0.7.0/properties/auth-helpers.c.keyring NetworkManager-openvpn-0.7.0/properties/auth-helpers.c
--- NetworkManager-openvpn-0.7.0/properties/auth-helpers.c.keyring 2008-12-11 20:52:57.000000000 +0100
+++ NetworkManager-openvpn-0.7.0/properties/auth-helpers.c 2009-02-07 12:03:14.000000000 +0100
@@ -33,7 +33,7 @@
#include <errno.h>
#include <glib/gi18n-lib.h>
-#include <gnome-keyring-memory.h>
+#include <gnome-keyring.h>
#include <nm-setting-connection.h>
#include "auth-helpers.h"
@@ -77,7 +77,7 @@ fill_password (GladeXML *xml,
tmp = nm_setting_vpn_get_secret (s_vpn, priv_key_password ? NM_OPENVPN_KEY_CERTPASS : NM_OPENVPN_KEY_PASSWORD);
if (tmp)
- password = gnome_keyring_memory_strdup (tmp);
+ password = strdup (tmp);
}
} else {
NMSettingConnection *s_con;
@@ -91,7 +91,7 @@ fill_password (GladeXML *xml,
if (password) {
gtk_entry_set_text (GTK_ENTRY (widget), password);
- gnome_keyring_memory_free (password);
+ free (password);
}
return widget;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 19 Aug 2006 10:46:12 -0000 1.2
+++ .cvsignore 7 Feb 2009 11:40:39 -0000 1.3
@@ -1 +1 @@
-NetworkManager-openvpn-0.3.2.tar.gz
+NetworkManager-openvpn-0.7.0.svn11.tar.gz
Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/EL-5/NetworkManager-openvpn.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NetworkManager-openvpn.spec 16 Oct 2008 18:28:58 -0000 1.5
+++ NetworkManager-openvpn.spec 7 Feb 2009 11:40:39 -0000 1.6
@@ -1,39 +1,41 @@
-%define nm_version 0.6.4
-%define dbus_version 0.61
-%define gtk2_version 2.6.0
+%define nm_version 1:0.7.0-1
+%define dbus_version 1.1
+%define gtk2_version 2.10.0
%define openvpn_version 2.1
-%define shared_mime_version 0.17-1
+%define shared_mime_version 0.16-3
-Summary: NetworkManager VPN integration for OpenVPN
+%define svn_snapshot svn11
+
+Summary: NetworkManager VPN plugin for OpenVPN
Name: NetworkManager-openvpn
-Version: 0.3.2
-Release: 7%{?dist}.2
-License: GPL
+Epoch: 1
+Version: 0.7.0
+Release: 18.%{svn_snapshot}%{?dist}.1
+License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
Group: System Environment/Base
# How to build the source package:
-# - Check out NetworkManager from Gnome CVS, use the right tag,
-# e.g. NETWORKMANAGER_0_6_4_RELEASE
+# - Check out NetworkManager from Gnome SVN, currently trunk is used
# - cd NetworkManager/vpn-daemons/openvpn
-# - ./augogen.sh --prefix=/usr --sysconfdir=/etc
-# - make distclean
-# - cd ..
-# - mv openvpn NetworkManager-openvpn-%{version}
-# - tar cvfz NetworkManager-openvpn-%{version}.tar.gz NetworkManager-openvpn-%{version}
-Source: %{name}-%{version}.tar.gz
-Patch0: NetworkManager-openvpn-0.3.2-scriptsec.patch
+# - ./autogen.sh --prefix=/usr --sysconfdir=/etc
+# - make distcheck
+# - use generated NetworkManager-openvpn-0.7.0.tar.gz
+Source: %{name}-%{version}.%{svn_snapshot}.tar.gz
+Patch0: NetworkManager-openvpn-0.7.0-keyring.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: NetworkManager-devel >= %{nm_version}
+BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: NetworkManager-devel >= %{nm_version}
+BuildRequires: NetworkManager-glib-devel >= %{nm_version}
+BuildRequires: glib2-devel
BuildRequires: GConf2-devel
-BuildRequires: libgnomeui-devel
BuildRequires: gnome-keyring-devel
BuildRequires: libglade2-devel
-BuildRequires: libpng-devel
BuildRequires: perl-XML-Parser
-BuildRequires: intltool
+BuildRequires: libtool intltool gettext
BuildRequires: perl
+BuildRequires: gnome-common
Requires(post): %{_bindir}/update-desktop-database
Requires(postun): %{_bindir}/update-desktop-database
Requires(post): /sbin/ldconfig
@@ -51,21 +53,24 @@
with NetworkManager and the GNOME desktop.
%prep
-%setup -q
-%patch0 -p1 -b .scriptsec
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .keyring
+
%build
if [ ! -f configure ]; then
- ./autogen.sh
+ ./autogen.sh
fi
-%configure --disable-static --disable-dependency-tracking
+%configure --disable-static --disable-dependency-tracking --enable-more-warnings=yes
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
+
+rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
-rm -f %{buildroot}%{_libdir}/lib*.la
+%find_lang %{name}
%clean
rm -rf %{buildroot}
@@ -73,34 +78,124 @@
%post
/sbin/ldconfig
/usr/bin/update-desktop-database > /dev/null
+touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor
+ /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
/sbin/ldconfig
/usr/bin/update-desktop-database > /dev/null
+touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor
+ /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
-%files
+%files -f %{name}.lang
%defattr(-, root, root)
-%doc COPYING AUTHORS ChangeLog README
-%{_libdir}/lib*.so*
+%doc AUTHORS ChangeLog README
+%{_libdir}/NetworkManager/lib*.so*
%{_libexecdir}/nm-openvpn-auth-dialog
-%config %{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf
-%config %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name
-%{_bindir}/nm-openvpn-service
-%{_bindir}/nm-openvpn-service-openvpn-helper
+%{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf
+%{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name
+%{_libexecdir}/nm-openvpn-service
+%{_libexecdir}/nm-openvpn-service-openvpn-helper
%{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.glade
%{_datadir}/applications/nm-openvpn.desktop
%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png
+%dir %{_datadir}/gnome-vpn-properties/openvpn
%changelog
-* Thu Oct 16 2008 Lubomir Rintel <lkundrak at v3.sk> 0.3.2-7.2
-- Add the script security patch
+* Sat Feb 7 2009 Lubomir Rintel <lkundrak at v3.sk> 1:0.7.0-18.svn11.1
+- Adjust for RHEL 5.3, older and less capable keyring manager
+
+* Sat Jan 3 2009 Dan Williams <dcbw at redhat.com> 1:0.7.0-18.svn11
+- Rebuild for updated NetworkManager
+- Fix some specfile issues (rh #477149)
+
+* Sat Dec 20 2008 Christoph Höger <choeger at cs.tu-berlin.de> 0.7.0-17.svn4326
+- removed libpng-devel from BuildRequires, added %{_datadir}/gnome-vpn-properties/openvpn/ (rh #477149)
+
+* Fri Nov 21 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-16.svn4326
+- Rebuild for updated NetworkManager
+
+* Mon Oct 27 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-16.svn4229
+- Rebuild for updated NetworkManager
+
+* Sun Oct 12 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-16.svn4175
+- Rebuild for updated NetworkManager
+- Allow changing passwords from the connection editor
+- Honor OpenVPN's 'route-vpn-gateway' option
+
+* Tue Sep 30 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-16.svn4027
+- Fix order of Password TLS certificate choosers (rh #464765)
+- Use %find_lang for locale-specific files (rh #448551)
+- Fix --script-security issues with OpenVPN 2.1-rc9 and later (rh #460754)
+
+* Fri Aug 29 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-15.svn4027
+- Rebuild for updated NetworkManager
+
+* Mon Aug 11 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-15.svn3930
+- Rebuild for updated NetworkManager
+
+* Thu Jul 24 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-15.svn3846
+- Rebuild to sync with F9 release number
+
+* Thu Jul 24 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-11.svn3846
+- Fix TLS Authentication direction combo
+- Only update settings if the advanced dialog's OK button is pressed
+
+* Fri Jul 18 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-11.svn3832
+- Update for NM netmask -> prefix changes
+
+* Wed Jul 02 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-11.svn3801
+- Update for moving VPN editing into connection manager
+- Import OpenVPN configuration files rather than old custom format
+
+* Mon May 05 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-10.svn3632
+- Fix issue with location of the VPN plugin
+
+* Thu May 01 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-10.svn3627
+- Update for compat with new NM bits
+
+* Wed Apr 23 2008 Christoph Höger <choeger at cs.tu-berlin.de> 1:0.7.0-10.svn3549
+- (Hopefully) Fix generation of nm-openvpn-service.name (#443389)
+
+* Wed Apr 09 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-9.svn3549
+- Update for compat with new NM bits
+
+* Mon Mar 03 2008 Tim Niemueller <tim at niemueller.de> 1:0.7.0-9.svn3302
+- Mute %post and %postun scripts
+
+* Fri Feb 08 2008 Tim Niemueller <tim at niemueller.de> 1:0.7.0-8.svn3302
+- Update to latest SVN snapshot
+- Fixes rhbz#429816 (port was not saved correctly)
+- Respects DNS search string from OpenVPN server
+
+* Fri Jan 18 2008 Tim Niemueller <tim at niemueller.de> 1:0.7.0-7.svn3169
+- Use install -p during "make install" to fix #342701
+
+* Thu Dec 13 2007 Tim Niemueller <tim at niemueller.de> 1:0.7.0-6.svn3169
+- Update to latest SVN snapshot
+
+* Thu Dec 6 2007 Dan Williams <dcbw at redhat.com> 1:0.7.0-5.svn3140
+- Update to latest SVN snapshot to get stuff working
+
+* Fri Nov 23 2007 Tim Niemueller <tim at niemueller.de> 1:0.7.0-4.svn3047
+- BuildRequire libtool and glib2-devel since we call autogen.sh now
+
+* Fri Nov 23 2007 Tim Niemueller <tim at niemueller.de> 1:0.7.0-3.svn3047
+- Fixed #320941
+- Call autogen, therefore BuildRequire gnome-common
+- Use plain 3047 from repo and use a patch, we cannot use trunk at the
+ moment since it is in flux and incompatible with NM available for F8
+
+* Wed Oct 31 2007 Tim Niemueller <tim at niemueller.de> 1:0.7.0-2.svn3047.fc8
+- BuildRequire gettext
+
+* Tue Oct 30 2007 Tim Niemueller <tim at niemueller.de> 1:0.7.0-1.svn3047.fc8
+- Upgrade to trunk, needed to be compatible with NM 0.7.0, rebuild for F-8
* Fri Sep 15 2006 Tim Niemueller <tim at niemueller.de> 0.3.2-7
- Rebuild for FC6
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 Aug 2006 10:46:12 -0000 1.2
+++ sources 7 Feb 2009 11:40:39 -0000 1.3
@@ -1 +1 @@
-9a35d23c554dd215deee39a2e58e8e08 NetworkManager-openvpn-0.3.2.tar.gz
+de7716aef7fe8665030e82aa244ec3c0 NetworkManager-openvpn-0.7.0.svn11.tar.gz
--- NetworkManager-openvpn-0.3.2-scriptsec.patch DELETED ---
- Previous message (by thread): rpms/system-config-printer/devel system-config-printer.spec, 1.244, 1.245
- Next message (by thread): rpms/NetworkManager-pptp/EL-5 NetworkManager-pptp-0.7.0-dbus.patch, NONE, 1.1 NetworkManager-pptp-0.7.0-keyring.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 NetworkManager-pptp.spec, 1.1, 1.2 sources, 1.2, 1.3 NetworkManager-pptp-0.6.4-noversion.patch, 1.1, NONE NetworkManager-pptp-0.6.4-pppdplugin.patch, 1.1, NONE NetworkManager-pptp-0.6.6-desktop.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list