On Tuesday 15 of February 2011 17:20:55 Jan Malanik wrote:
hi,
I'm trying backport this patch to nm version 0.8.1-10.git20100831.fc14
and NetworkManager-vpnc version 0.8.1-1.fc14.
I added line
#define NM_LOCAL_PORT 500
to file nm-vpnc-service.h, repack source tarball and then start command
rpmbuild -ba NetworkManager-vpnc.spec
During compilation I get an error:
m-vpnc.c: In function 'vpnc_plugin_ui_interface_init':
nm-vpnc.c:1444:13: error: 'NMVpnPluginUiInterface' has no member named
'import'
nm-vpnc.c:1445:13: error: 'NMVpnPluginUiInterface' has no member named
'export'
make[3]: *** [libnm_vpnc_properties_la-nm-vpnc.lo] Error 1
make[3]: Leaving directory
`/root/rpmbuild/BUILD/NetworkManager-vpnc-0.8.1/properties'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory
`/root/rpmbuild/BUILD/NetworkManager-vpnc-0.8.1/properties'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/root/rpmbuild/BUILD/NetworkManager-vpnc-0.8.1'
make: *** [all] Error 2
error: Bad exit status from /var/tmp/rpm-tmp.kC10CJ (%build)
I think this is due the different versions of NetworkManager and vpnc
plugin.
Is there any other solution than downgrade NetworkManager package?
thanks
There was a change in between of import/export function names - commit
6ddce13ade01c3f7eec5da34675d05c7e913f7a2
So, you have to include this patch as well.
Steps:
1. yumdownloader --source NetworkManager-vpnc
2. rpm -ihv NetworkManager-vpnc-0.8.1-1.fc14.src.rpm
3. cd ~/rpmbuild/SPECS/
4. Edit NetworkManager-vpnc.spec to include local-port-0.patch
and fix-import-export.patch
(updated spec in the attachment)
5. copy local-port-0.patch to ~/rpmbuild/SOURCES
6. copy fix-import-export.patch to ~/rpmbuild/SOURCES
7. rpmbuild -ba NetworkManager-vpnc.spec
8. find your rpm in ~/rpmbuild/SOURCES
Jirka
%define nm_version 1:0.8.1
%define dbus_version1.1
%define gtk2_version2.10.0
%define vpnc_version0.5
%define shared_mime_version 0.16-3
%define snapshot %{nil}
%define realversion 0.8.1
Summary: NetworkManager VPN plugin for vpnc
Name: NetworkManager-vpnc
Epoch: 1
Version: 0.8.1
Release: 1%{snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://www.gnome.org/projects/NetworkManager/
Source:%{name}-%{realversion}%{snapshot}.tar.bz2
Patch0:local-port-0.patch
Patch1:fix-import-export.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: gtk2-devel = %{gtk2_version}
BuildRequires: dbus-devel = %{dbus_version}
BuildRequires: NetworkManager-devel = %{nm_version}
BuildRequires: NetworkManager-glib-devel = %{nm_version}
BuildRequires: GConf2-devel
BuildRequires: gnome-keyring-devel
BuildRequires: libglade2-devel
BuildRequires: intltool gettext
Requires: gtk2 = %{gtk2_version}
Requires: dbus = %{dbus_version}
Requires: NetworkManager = %{nm_version}
Requires: vpnc = %{vpnc_version}
Requires: shared-mime-info = %{shared_mime_version}
Requires: GConf2
Requires: gnome-keyring
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
%description
This package contains software for integrating the vpnc VPN software
with NetworkManager and the GNOME desktop
%prep
%setup -q -n NetworkManager-vpnc-%{realversion}
%patch0 -p1 -b .local-port
%patch1 -p1 -b .import-export
%build
%configure --enable-more-warnings=yes
make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.a
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
/usr/bin/update-desktop-database /dev/null || :
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/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 %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%files -f %{name}.lang
%defattr(-, root, root)
%doc AUTHORS ChangeLog
%{_libdir}/NetworkManager/lib*.so*
%{_libexecdir}/nm-vpnc-auth-dialog
%{_sysconfdir}/dbus-1/system.d/nm-vpnc-service.conf
%{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name
%{_libexecdir}/nm-vpnc-service
%{_libexecdir}/nm-vpnc-service-vpnc-helper
%{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.glade
#%{_datadir}/applications/nm-vpnc.desktop
%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
%dir %{_datadir}/gnome-vpn-properties/vpnc
%changelog
* Tue Jul 27 2010 Dan Williams d...@redhat.com - 1:0.8.1-1
- Update to 0.8.1 release
- Updated translations
* Sun Apr 11 2010 Dan Williams d...@redhat.com - 1:0.8.0-1
- Handle NAT Traversal importing better
- Default to newer NAT-T instead of
