Mailinglist Archive: opensuse-commit (1177 mails)
| < Previous | Next > |
commit NetworkManager-kde for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 09 Jan 2009 16:46:20 +0100
- Message-id: <20090109154621.04AD3678166@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package NetworkManager-kde for
openSUSE:Factory
checked in at Fri Jan 9 16:46:20 CET 2009.
--------
--- KDE/NetworkManager-kde/NetworkManager-kde.changes 2008-12-05
12:21:20.000000000 +0100
+++ /mounts/work_src_done/STABLE/NetworkManager-kde/NetworkManager-kde.changes
2009-01-09 14:55:24.000000000 +0100
@@ -1 +1,8 @@
--------------------------------------------------------------------
+--------------------------------------------------------------------
+Fri Jan 9 11:48:46 CET 2009 - hschaa@xxxxxxx
+
+- Fix phase2 editing WPA-EAP connections (bnc#457080)
+- Update VPNC properties to match current NM (bnc#439742)
+- Fix usage of system wide ca certificates (bnc#456050)
+
+------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
fix_phase2_combo.patch
fix_use_system_cert.patch
fix_vpnc_properties.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-kde.spec ++++++
--- /var/tmp/diff_new_pack.t27008/_old 2009-01-09 16:46:06.000000000 +0100
+++ /var/tmp/diff_new_pack.t27008/_new 2009-01-09 16:46:06.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package NetworkManager-kde (Version 0.7r848570)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,7 +28,7 @@
Group: System/GUI/KDE
AutoReqProv: on
Version: 0.7r848570
-Release: 24
+Release: 25
Summary: KNetworkManager application for use with NetworkManager
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: NetworkManager >= 0.7
@@ -44,6 +44,9 @@
Patch9: fix_static_ip.patch
Patch10: fix_empty_eap_identity.patch
Patch11: update_translations_de.patch
+Patch12: fix_phase2_combo.patch
+Patch13: fix_use_system_cert.patch
+Patch14: fix_vpnc_properties.patch
%description
KNetworkManager is a system tray applet for controlling network
@@ -124,6 +127,9 @@
%patch9 -p0
%patch10 -p0
%patch11 -p0
+%patch12 -p0
+%patch13 -p0
+%patch14 -p0
%build
. /etc/opt/kde3/common_options
@@ -190,6 +196,10 @@
/opt/kde3/share/services/%{appname}_vpnc.desktop
%changelog
+* Fri Jan 09 2009 hschaa@xxxxxxx
+- Fix phase2 editing WPA-EAP connections (bnc#457080)
+- Update VPNC properties to match current NM (bnc#439742)
+- Fix usage of system wide ca certificates (bnc#456050)
* Fri Dec 05 2008 hschaa@xxxxxxx
- Update german translations (bnc#404754)
* Thu Dec 04 2008 coolo@xxxxxxx
++++++ fix_phase2_combo.patch ++++++
Index:
knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
===================================================================
---
knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
(Revision 897527)
+++
knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
(Revision 897528)
@@ -510,6 +510,9 @@
QBiDirectionalMap<int, IEEE8021x::EAP_PHASE1>::Iterator it =
_eapIndexMap.findData(_security_setting->getEAP());
cboMethod->setCurrentItem(it.key());
+ // update phase2 combobox
+
_phase2_widget->setAllowedPhase2Methods(_security_setting->getAllowedPhase2Methods());
+
txtIdentity->setText(_security_setting->getIdentity());
txtAnonIdentity->setText(_security_setting->getAnonIdentity());
txtPassword->setText(_security_setting->getPassword());
++++++ fix_use_system_cert.patch ++++++
Index: knetworkmanager/src/knetworkmanager-connection_setting_8021x.h
===================================================================
--- knetworkmanager/src/knetworkmanager-connection_setting_8021x.h
(Revision 908142)
+++ knetworkmanager/src/knetworkmanager-connection_setting_8021x.h
(Revision 908143)
@@ -144,6 +144,9 @@
QString getCaPath(void) const;
void setCaPath(QString);
+ bool getUseSystemCaCert(void) const;
+ void setUseSystemCaCert(bool);
+
//FIXME
// client cert
@@ -166,6 +169,7 @@
QString _identity;
QString _anonIdentity;
QByteArray _caCert;
+ bool _useSystemCaCert;
QString _caPath;
QByteArray _clientCert;
QByteArray _privateKey;
Index:
knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.h
===================================================================
---
knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.h
(Revision 908142)
+++
knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.h
(Revision 908143)
@@ -158,6 +158,7 @@
void slotIdentityChanged(const QString&);
void slotAnonIdentityChanged(const QString&);
void slotPasswordChanged(const QString&);
+ void slotUseSystemCaCertChanged(bool on);
private:
IEEE8021x* _security_setting;
Index: knetworkmanager/src/knetworkmanager-connection_setting_8021x.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-connection_setting_8021x.cpp
(Revision 908142)
+++ knetworkmanager/src/knetworkmanager-connection_setting_8021x.cpp
(Revision 908143)
@@ -62,6 +62,7 @@
, _eapPhase2(EAP_PHASE2_AUTH_NONE)
, _phase2AuthEAP(QString::null)
, _phase2CaPath(QString::null)
+ , _useSystemCaCert(false)
{
// init eap map
_eapMap[EAP_NONE] = QString::null;
@@ -120,6 +121,18 @@
return _password;
}
+bool
+IEEE8021x::getUseSystemCaCert(void) const
+{
+ return _useSystemCaCert;
+}
+
+void
+IEEE8021x::setUseSystemCaCert(bool use)
+{
+ _useSystemCaCert = use;
+}
+
IEEE8021x::EAP_PHASE1
IEEE8021x::getEAP(void) const
{
@@ -178,6 +191,8 @@
if (!_caPath.isEmpty())
map.insert(NM_SETTING_802_1X_CA_PATH,
QDBusData::fromString(_caPath));
+ map.insert(NM_SETTING_802_1X_SYSTEM_CA_CERTS,
QDBusData::fromBool(_useSystemCaCert));
+
//FIXME
/*
if (!_clientCert.isNull())
@@ -286,6 +301,8 @@
_phase2AuthEAP = it.data().toString();
else if (it.key() == NM_SETTING_802_1X_PHASE2_CA_PATH)
_phase2CaPath = it.data().toString();
+ else if (it.key() == NM_SETTING_802_1X_SYSTEM_CA_CERTS)
+ _useSystemCaCert = it.data().toBool();
else
kdWarning() << k_funcinfo << " Unknown setting: " <<
it.key() << endl;
}
Index:
knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
===================================================================
---
knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
(Revision 908142)
+++
knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
(Revision 908143)
@@ -517,13 +517,23 @@
txtAnonIdentity->setText(_security_setting->getAnonIdentity());
txtPassword->setText(_security_setting->getPassword());
+ chkCAStore->setChecked(_security_setting->getUseSystemCaCert());
+ kURLCACert->setEnabled(!_security_setting->getUseSystemCaCert());
+
// get notified if the method changes
connect(cboMethod, SIGNAL(activated(int)), this,
SLOT(slotMethodChanged(int)));
connect(txtIdentity, SIGNAL(textChanged(const QString&)), this,
SLOT(slotIdentityChanged(const QString&)));
connect(txtAnonIdentity, SIGNAL(textChanged(const QString&)), this,
SLOT(slotAnonIdentityChanged(const QString&)));
connect(txtPassword, SIGNAL(textChanged(const QString&)), this,
SLOT(slotPasswordChanged(const QString&)));
+ connect(chkCAStore, SIGNAL(toggled(bool)), this,
SLOT(slotUseSystemCaCertChanged(bool)));
}
+void WirelessSecurityEAPImpl::slotUseSystemCaCertChanged(bool on)
+{
+ _security_setting->setUseSystemCaCert(on);
+ kURLCACert->setEnabled(!on);
+}
+
void WirelessSecurityEAPImpl::slotMethodChanged(int index)
{
// new method choosen
Index: knetworkmanager/src/connection_setting_wireless_security_eap.ui
===================================================================
--- knetworkmanager/src/connection_setting_wireless_security_eap.ui
(Revision 908142)
+++ knetworkmanager/src/connection_setting_wireless_security_eap.ui
(Revision 908143)
@@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>493</width>
- <height>180</height>
+ <width>583</width>
+ <height>174</height>
</rect>
</property>
<property name="caption">
@@ -80,6 +80,24 @@
<string>Password:</string>
</property>
</widget>
+ <widget class="KPasswordEdit" row="3" column="1">
+ <property name="name">
+ <cstring>txtPassword</cstring>
+ </property>
+ </widget>
+ <widget class="QLabel" row="4" column="0">
+ <property name="name">
+ <cstring>textLabel16</cstring>
+ </property>
+ <property name="text">
+ <string>Private Secret Key:</string>
+ </property>
+ </widget>
+ <widget class="KPasswordEdit" row="4" column="1">
+ <property name="name">
+ <cstring>txtPrivateSecretKey</cstring>
+ </property>
+ </widget>
<widget class="QLabel" row="0" column="2">
<property name="name">
<cstring>textLabel12</cstring>
@@ -88,15 +106,17 @@
<string>Client Certificate:</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="2">
+ <widget class="KURLRequester" row="0" column="3">
<property name="name">
- <cstring>textLabel14</cstring>
+ <cstring>kURLClientCert</cstring>
</property>
- <property name="text">
- <string>CA Certificate:</string>
+ </widget>
+ <widget class="KURLRequester" row="1" column="3">
+ <property name="name">
+ <cstring>kURLPrivateKey</cstring>
</property>
</widget>
- <widget class="QLabel" row="2" column="2">
+ <widget class="QLabel" row="1" column="2">
<property name="name">
<cstring>textLabel15</cstring>
</property>
@@ -106,35 +126,31 @@
</widget>
<widget class="QLabel" row="3" column="2">
<property name="name">
- <cstring>textLabel16</cstring>
+ <cstring>textLabel14</cstring>
</property>
<property name="text">
- <string>Private Secret Key:</string>
+ <string>CA Certificate:</string>
</property>
</widget>
- <widget class="KPasswordEdit" row="3" column="1">
+ <widget class="KURLRequester" row="3" column="3">
<property name="name">
- <cstring>txtPassword</cstring>
+ <cstring>kURLCACert</cstring>
</property>
</widget>
- <widget class="KURLRequester" row="0" column="3">
+ <widget class="QLabel" row="2" column="2">
<property name="name">
- <cstring>kURLClientCert</cstring>
+ <cstring>textLabel1</cstring>
</property>
- </widget>
- <widget class="KURLRequester" row="1" column="3">
- <property name="name">
- <cstring>kURLCACert</cstring>
+ <property name="text">
+ <string>Use System CA Certificates</string>
</property>
</widget>
- <widget class="KURLRequester" row="2" column="3">
+ <widget class="QCheckBox" row="2" column="3">
<property name="name">
- <cstring>kURLPrivateKey</cstring>
+ <cstring>chkCAStore</cstring>
</property>
- </widget>
- <widget class="KPasswordEdit" row="3" column="3">
- <property name="name">
- <cstring>txtPrivateSecretKey</cstring>
+ <property name="text">
+ <string></string>
</property>
</widget>
</grid>
@@ -143,6 +159,5 @@
</widget>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
-
</includehints>
</UI>
++++++ fix_vpnc_properties.patch ++++++
Index: knetworkmanager/vpn-plugins/vpnc/src/vpncprop.ui
===================================================================
--- knetworkmanager/vpn-plugins/vpnc/src/vpncprop.ui (Revision 897081)
+++ knetworkmanager/vpn-plugins/vpnc/src/vpncprop.ui (Revision 897092)
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>VPNCConfigWidget</class>
<widget class="QWidget">
<property name="name">
@@ -9,9 +9,12 @@
<x>0</x>
<y>0</y>
<width>667</width>
- <height>368</height>
+ <height>435</height>
</rect>
</property>
+ <property name="caption">
+ <string>VPNCConfigWidget</string>
+ </property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
@@ -96,55 +99,6 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox" row="8" column="0" rowspan="1"
colspan="2">
- <property name="name">
- <cstring>chkIPAdresses</cstring>
- </property>
- <property name="text">
- <string>Only use VPN Connection for these Adresses
(for example: 172.16.0.0/16 10.11.12.0/24)</string>
- </property>
- </widget>
- <spacer row="10" column="1">
- <property name="name">
- <cstring>spacer10</cstring>
- </property>
- <property name="orientation">
- <enum>Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>20</width>
- <height>16</height>
- </size>
- </property>
- </spacer>
- <widget class="QCheckBox" row="6" column="0" rowspan="1"
colspan="2">
- <property name="name">
- <cstring>chkDisableNatTraversal</cstring>
- </property>
- <property name="text">
- <string>Disable NAT traversal</string>
- </property>
- </widget>
- <widget class="QCheckBox" row="7" column="0" rowspan="1"
colspan="2">
- <property name="name">
- <cstring>chkSingleDES</cstring>
- </property>
- <property name="text">
- <string>Enable weak single DES encryption</string>
- </property>
- </widget>
- <widget class="KLineEdit" row="9" column="0" rowspan="1"
colspan="2">
- <property name="name">
- <cstring>routes</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- </widget>
<widget class="QCheckBox" row="4" column="0" rowspan="1"
colspan="2">
<property name="name">
<cstring>chkUseKeepAlive</cstring>
@@ -169,14 +123,6 @@
<string>Override user name</string>
</property>
</widget>
- <widget class="KLineEdit" row="1" column="1">
- <property name="name">
- <cstring>Xauth_username</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- </widget>
<widget class="QLabel" row="1" column="0">
<property name="name">
<cstring>lblUsername</cstring>
@@ -188,14 +134,6 @@
<string>Username</string>
</property>
</widget>
- <widget class="KLineEdit" row="3" column="1">
- <property name="name">
- <cstring>Domain</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- </widget>
<widget class="QLabel" row="3" column="0">
<property name="name">
<cstring>lblDomain</cstring>
@@ -234,13 +172,81 @@
</sizepolicy>
</property>
</widget>
+ <widget class="KLineEdit" row="3" column="1">
+ <property name="name">
+ <cstring>Domain</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ <widget class="KLineEdit" row="1" column="1">
+ <property name="name">
+ <cstring>Xauth_username</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ <widget class="QLabel" row="6" column="0">
+ <property name="name">
+ <cstring>textLabel1</cstring>
+ </property>
+ <property name="text">
+ <string>NAT traversal</string>
+ </property>
+ </widget>
+ <widget class="QComboBox" row="6" column="1">
+ <property name="name">
+ <cstring>cboNAT</cstring>
+ </property>
+ </widget>
+ <widget class="QCheckBox" row="7" column="0" rowspan="1"
colspan="2">
+ <property name="name">
+ <cstring>chkSingleDES</cstring>
+ </property>
+ <property name="text">
+ <string>Enable weak single DES encryption</string>
+ </property>
+ </widget>
+ <widget class="QCheckBox" row="8" column="0" rowspan="1"
colspan="2">
+ <property name="name">
+ <cstring>chkIPAdresses</cstring>
+ </property>
+ <property name="text">
+ <string>Only use VPN Connection for these Adresses
(for example: 172.16.0.0/16 10.11.12.0/24)</string>
+ </property>
+ </widget>
+ <spacer row="10" column="1">
+ <property name="name">
+ <cstring>spacer10</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="KLineEdit" row="9" column="0" rowspan="1"
colspan="2">
+ <property name="name">
+ <cstring>routes</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ </widget>
</grid>
</widget>
</widget>
</grid>
</widget>
-<customwidgets>
-</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
</includehints>
Index: knetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp
===================================================================
--- knetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp
(Revision 897081)
+++ knetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp
(Revision 897092)
@@ -40,7 +40,11 @@
typedef KGenericFactory<VPNCPlugin> VPNCPluginFactory;
K_EXPORT_COMPONENT_FACTORY( knetworkmanager_vpnc,
VPNCPluginFactory("knetworkmanager_vpnc"));
+#define NAT_MODE_CISCO 0
+#define NAT_MODE_NATT 1
+#define NAT_MODE_DISABLED 2
+
VPNCPlugin::VPNCPlugin(QObject* parent, const char* name, const QStringList&
args)
: VPNPlugin(parent, name, args)
{
@@ -82,6 +86,10 @@
connect(_vpncWidget->chkUseKeepAlive, SIGNAL(toggled(bool)),
_vpncWidget->nat_keep_alive_interval, SLOT(setEnabled(bool)));
connect(_vpncWidget->chkUseKeepAlive, SIGNAL(toggled(bool)),
_vpncWidget->lblKeepAliveInterval, SLOT(setEnabled(bool)));
+ _vpncWidget->cboNAT->insertItem(i18n("Cisco UDP (default)"),
NAT_MODE_CISCO);
+ _vpncWidget->cboNAT->insertItem(i18n("NAT-T"), NAT_MODE_NATT);
+ _vpncWidget->cboNAT->insertItem(i18n("Disabled"), NAT_MODE_DISABLED);
+
this->languageChange();
}
@@ -126,13 +134,27 @@
_vpncWidget->nat_keep_alive_interval->setText(value);
_vpncWidget->chkUseKeepAlive->setChecked(true);
}
+ // backwards compatibility
else if (entry == "Disable NAT Traversal")
{
- _vpncWidget->chkDisableNatTraversal->setChecked(value
== "true");
+ _vpncWidget->cboNAT->setCurrentItem(NAT_MODE_DISABLED);
}
+ else if (entry == "NAT Traversal Mode")
+ {
+ if (value == "natt")
+
_vpncWidget->cboNAT->setCurrentItem(NAT_MODE_NATT);
+ else if (value == "cisco-udp")
+
_vpncWidget->cboNAT->setCurrentItem(NAT_MODE_CISCO);
+ else if (value == "none")
+
_vpncWidget->cboNAT->setCurrentItem(NAT_MODE_DISABLED);
+ else
+ {
+ // FIXME: unknown NAT mode
+ }
+ }
else if (entry == "Enable Single DES")
{
- _vpncWidget->chkSingleDES->setChecked(value == "true");
+ _vpncWidget->chkSingleDES->setChecked(value == "yes" ||
value == "true");
}
}
@@ -160,9 +182,25 @@
if (_vpncWidget->chkUseKeepAlive->isChecked())
strlist.insert("NAT-Keepalive packet interval",
QString(_vpncWidget->nat_keep_alive_interval->text()));
- strlist.insert("Disable NAT Traversal",
QString::number(_vpncWidget->chkDisableNatTraversal->isChecked()));
- strlist.insert("Enable Single DES",
QString::number(_vpncWidget->chkSingleDES->isChecked()));
+ switch (_vpncWidget->cboNAT->currentItem())
+ {
+ case NAT_MODE_CISCO:
+ strlist.insert("NAT Traversal Mode", "cisco-udp");
+ break;
+ case NAT_MODE_NATT:
+ strlist.insert("NAT Traversal Mode", "natt");
+ break;
+ case NAT_MODE_DISABLED:
+ default:
+ strlist.insert("NAT Traversal Mode", "none");
+ break;
+ }
+ if (_vpncWidget->chkSingleDES->isChecked())
+ strlist.insert("Enable Single DES", "yes");
+ else
+ strlist.insert("Enable Single DES", "no");
+
return strlist;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |