diff --git a/NetworkManager-vpnc.spec b/NetworkManager-vpnc.spec index b31da4f..e69bacc 100644 --- a/NetworkManager-vpnc.spec +++ b/NetworkManager-vpnc.spec @@ -7,7 +7,7 @@ Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc Version: 0.6.0 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: %{name}-%{version}.tar.gz @@ -32,12 +32,15 @@ Requires: libgnomeui Requires: gnome-keyring Requires: libglade2 +Patch1: nm-vpnc-0.6.0-rekeying.patch + %description This package contains software for integrating the vpnc VPN software with NetworkManager and the GNOME desktop %prep %setup -q +%patch1 -p1 -b .rekeying %build %configure @@ -50,7 +53,7 @@ make rm -f %{buildroot}%{_libdir}/lib*.la rm -f %{buildroot}%{_libdir}/lib*.a -%find_lang %{name} +#%find_lang %{name} %clean rm -rf %{buildroot} @@ -69,7 +72,8 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor fi -%files -f %{name}.lang +#%files -f %{name}.lang +%files %defattr(-, root, root) %doc AUTHORS ChangeLog NEWS README @@ -84,6 +88,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Wed Apr 12 2006 Christopher Aillon 0.6.0-2 +- Rekey every 2 hours + * Tue Mar 14 2006 Dan Williams - 0.6.0-1 - Update to CVS snapshot of 0.6 for NM compatibility diff --git a/nm-vpnc-0.6.0-rekeying.patch b/nm-vpnc-0.6.0-rekeying.patch new file mode 100644 index 0000000..e30edd2 --- /dev/null +++ b/nm-vpnc-0.6.0-rekeying.patch @@ -0,0 +1,49 @@ +--- NetworkManager-vpnc-0.6.0/src/nm-vpnc-service.c.rekeying 2006-03-19 07:15:48.000000000 -0500 ++++ NetworkManager-vpnc-0.6.0/src/nm-vpnc-service.c 2006-03-19 07:15:51.000000000 -0500 +@@ -57,6 +57,7 @@ + + #define NM_VPNC_HELPER_PATH BINDIR"/nm-vpnc-service-vpnc-helper" + #define NM_VPNC_UDP_ENCAPSULATION_PORT 0 /* random port */ ++#define NM_VPNC_REKEYING_INTERVAL 7200 + + typedef struct NmVpncData + { +@@ -444,6 +445,7 @@ + write_config_option (vpnc_fd, "Script " NM_VPNC_HELPER_PATH "\n"); + write_config_option (vpnc_fd, "UDP Encapsulate\n"); + write_config_option (vpnc_fd, "UDP Encapsulation Port %d\n", NM_VPNC_UDP_ENCAPSULATION_PORT); ++ write_config_option (vpnc_fd, "Rekeying interval %d\n", NM_VPNC_REKEYING_INTERVAL); + write_config_option (vpnc_fd, "IPSec secret %s\n", password_items[0]); + write_config_option (vpnc_fd, "Xauth password %s\n", password_items[1]); + +@@ -485,17 +487,19 @@ + static gboolean nm_vpnc_config_options_validate (char **data_items, int num_items) + { + Option allowed_opts[] = { +- { "IPSec gateway", OPT_TYPE_ADDRESS }, +- { "IPSec ID", OPT_TYPE_ASCII }, +- { "IPSec secret", OPT_TYPE_ASCII }, +- { "Xauth username", OPT_TYPE_ASCII }, +- { "UDP Encapsulate", OPT_TYPE_NONE }, +- { "UDP Encapsulation Port", OPT_TYPE_ASCII }, +- { "Domain", OPT_TYPE_ASCII }, +- { "IKE DH Group", OPT_TYPE_ASCII }, +- { "Perfect Forward Secrecy", OPT_TYPE_ASCII }, +- { "Application Version", OPT_TYPE_ASCII }, +- { NULL, OPT_TYPE_UNKNOWN } }; ++ { "IPSec gateway", OPT_TYPE_ADDRESS }, ++ { "IPSec ID", OPT_TYPE_ASCII }, ++ { "IPSec secret", OPT_TYPE_ASCII }, ++ { "Xauth username", OPT_TYPE_ASCII }, ++ { "UDP Encapsulate", OPT_TYPE_NONE }, ++ { "UDP Encapsulation Port", OPT_TYPE_ASCII }, ++ { "Domain", OPT_TYPE_ASCII }, ++ { "IKE DH Group", OPT_TYPE_ASCII }, ++ { "Perfect Forward Secrecy", OPT_TYPE_ASCII }, ++ { "Application Version", OPT_TYPE_ASCII }, ++ { "Rekeying interval", OPT_TYPE_ASCII }, ++ { NULL, OPT_TYPE_UNKNOWN } ++ }; + + unsigned int i; +