Updated to 16.4.0, fixed some PKGBUILD errors

7 files changed, 621 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a907b04b625..b3e4a8e4dcdb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = asterisk-cisco
 	pkgdesc = A complete PBX solution. Includes the Cisco Presence patch for use with Cisco IP Phones
-	pkgver = 13.21.1
+	pkgver = 16.4.0
 	pkgrel = 1
 	url = http://www.asterisk.org
 	install = asterisk.install
@@ -17,6 +17,7 @@ pkgbase = asterisk-cisco
 	depends = libxml2
 	depends = jansson
 	depends = libxslt
+	depends = libedit
 	optdepends = lua51
 	optdepends = libsrtp
 	optdepends = postgresql
@@ -134,18 +135,18 @@ pkgbase = asterisk-cisco
 	backup = etc/asterisk/voicemail.conf
 	backup = etc/asterisk/vpb.conf
 	backup = etc/asterisk/xmpp.conf
-	source = http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.21.1.tar.gz
-	source = https://issues.asterisk.org/jira/secure/attachment/57644/cisco-usecallmanager-13.21.1.patch
-	source = https://issues.asterisk.org/jira/secure/attachment/55770/DialTemplate.xml
-	source = https://issues.asterisk.org/jira/secure/attachment/55771/FeaturePolicy.xml
-	source = https://issues.asterisk.org/jira/secure/attachment/57258/SEPMAC.cnf.xml
-	source = https://issues.asterisk.org/jira/secure/attachment/55769/SoftKeys.xml
-	source = https://issues.asterisk.org/jira/secure/attachment/55772/AppDialRules.xml
+	source = http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.4.0.tar.gz
+	source = http://usecallmanager.nz/includes/cisco-usecallmanager-16.4.0.patch
+	source = DialTemplate.xml
+	source = FeaturePolicy.xml
+	source = SEPMAC.cnf.xml
+	source = SoftKeys.xml
+	source = AppDialRules.xml
 	source = asterisk.service
 	source = asterisk.logrotated
 	source = asterisk.tmpfile
-	sha256sums = 013f61155bb53c14c8244d8d4779df931fa4a139895d7a420db99c5f339024df
-	sha256sums = 3355f7abc9af1e63ae4fbf405407ba417955078caf5cbcb292c71ebd421d4720
+	sha256sums = d870711299089d0b1f01708534b0e139c4e83d828cbb79dfc90ec59774be83fa
+	sha256sums = cb28bb435c1f49f9e5d7174c0244a5dc66044eec2dff09922dd6976cc7a8313c
 	sha256sums = 10795bc3b2fb28b79b3ab74bbd8f33b667e3bf4b1c87ccfb2aae168f9b07a17c
 	sha256sums = da5a87717517b37d0554369235e0bdb86700bd696c1a70db5a47d9f4711b44db
 	sha256sums = ecff1e7807003beb3198f95859fa3c1b57d618940872d1c8638e65f5a49afce4
diff --git a/AppDialRules.xml b/AppDialRules.xml
new file mode 100644
index 000000000000..ac33638963f5
--- /dev/null
+++ b/AppDialRules.xml
@@ -0,0 +1,5 @@
+<DialRules>
+  <DialRule BeginsWith="+" NumDigits="11" DigitsToRemove="1" PrefixWith="00" />
+  <DialRule BeginsWith="+" NumDigits="12" DigitsToRemove="1" PrefixWith="00" />
+  <DialRule BeginsWith="+" NumDigits="13" DigitsToRemove="1" PrefixWith="00" />
+</DialRules>
diff --git a/DialTemplate.xml b/DialTemplate.xml
new file mode 100644
index 000000000000..2dd3469b4124
--- /dev/null
+++ b/DialTemplate.xml
@@ -0,0 +1,5 @@
+<dialTemplate>
+  <versionStamp>83f69fbc-0525-46be-b492-73d806a0299a</versionStamp>
+  <TEMPLATE match="..." timeout="1" />
+  <TEMPLATE match="*" timeout="3" />
+</dialTemplate>
diff --git a/FeaturePolicy.xml b/FeaturePolicy.xml
new file mode 100644
index 000000000000..4059b1bdc83a
--- /dev/null
+++ b/FeaturePolicy.xml
@@ -0,0 +1,67 @@
+<featurePolicy name="Feature Policy">
+  <versionStamp>a64c9b2e-b1fe-4781-ba89-7f8574012eb8</versionStamp>
+  <featureDef name="Forward All">
+    <id>1</id>
+    <enable>true</enable>
+  </featureDef>
+  <featureDef name="Park">
+    <id>2</id>
+    <enable>true</enable>
+  </featureDef>
+  <featureDef name="Divert (Alerting)">
+    <id>3</id>
+    <enable>true</enable>
+  </featureDef>
+  <featureDef name="Conference Details">
+    <id>4</id>
+    <enable>true</enable>
+  </featureDef>
+  <featureDef name="Speed Dial">
+    <id>5</id>
+    <enable>true</enable>
+  </featureDef>
+  <featureDef name="Call Back">
+    <id>6</id>
+    <enable>true</enable>
+  </featureDef>
+  <featureDef name="Redial">
+    <id>7</id>
+    <enable>true</enable>
+  </featureDef>
+  <featureDef name="Barge">
+    <id>8</id>
+    <enable>false</enable>
+  </featureDef>
+  <featureDef name="Divert (Connected)">
+    <id>9</id>
+    <enable>true</enable>
+  </featureDef>
+  <featureDef name="Call PickUp">
+    <id>10</id>
+    <enable>true</enable>
+  </featureDef>
+  <featureDef name="Other Call PickUp">
+    <id>11</id>
+    <enable>true</enable>
+  </featureDef>
+  <featureDef name="Group Call PickUp">
+    <id>12</id>
+    <enable>true</enable>
+  </featureDef>
+  <featureDef name="Mobility">
+    <id>13</id>
+    <enable>false</enable>
+  </featureDef>
+  <featureDef name="Meet Me">
+    <id>14</id>
+    <enable>true</enable>
+  </featureDef>
+  <featureDef name="Quality Reporting Tool">
+    <id>15</id>
+    <enable>true</enable>
+  </featureDef>
+  <featureDef name="Malicious Caller ID">
+    <id>16</id>
+    <enable>true</enable>
+  </featureDef>
+</featurePolicy>
diff --git a/PKGBUILD b/PKGBUILD
index a270ab65341a..0275d2197326 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Maik Broemme <mbroemme@libmpq.org>
 
 pkgname=asterisk-cisco
-pkgver=13.21.1
+pkgver=16.4.0
 pkgrel=1
 pkgdesc="A complete PBX solution. Includes the Cisco Presence patch for use with Cisco IP Phones"
 provides=('asterisk')
@@ -121,22 +121,22 @@ backup=('etc/asterisk/acl.conf'
 	'etc/asterisk/xmpp.conf')
 url="http://www.asterisk.org"
 license=('GPL')
-depends=('alsa-lib' 'speex' 'popt' 'libvorbis' 'curl' 'libxml2' 'jansson' 'libxslt')
+depends=('alsa-lib' 'speex' 'popt' 'libvorbis' 'curl' 'libxml2' 'jansson' 'libxslt' 'libedit')
 makedepends=('sqlite3' 'gsm')
 optdepends=('lua51' 'libsrtp' 'postgresql' 'unixodbc' 'iksemel' 'dahdi')
 source=(http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-${pkgver}.tar.gz \
-	https://issues.asterisk.org/jira/secure/attachment/57644/cisco-usecallmanager-13.21.1.patch \
-	https://issues.asterisk.org/jira/secure/attachment/55770/DialTemplate.xml \
-	https://issues.asterisk.org/jira/secure/attachment/55771/FeaturePolicy.xml \
-	https://issues.asterisk.org/jira/secure/attachment/57258/SEPMAC.cnf.xml \
-	https://issues.asterisk.org/jira/secure/attachment/55769/SoftKeys.xml \
-	https://issues.asterisk.org/jira/secure/attachment/55772/AppDialRules.xml \
+	http://usecallmanager.nz/includes/cisco-usecallmanager-${pkgver}.patch \
+	DialTemplate.xml \
+	FeaturePolicy.xml \
+	SEPMAC.cnf.xml \
+	SoftKeys.xml \
+	AppDialRules.xml \
 	asterisk.service \
 	asterisk.logrotated \
 	asterisk.tmpfile)
 install=asterisk.install
-sha256sums=('013f61155bb53c14c8244d8d4779df931fa4a139895d7a420db99c5f339024df'
-            '3355f7abc9af1e63ae4fbf405407ba417955078caf5cbcb292c71ebd421d4720'
+sha256sums=('d870711299089d0b1f01708534b0e139c4e83d828cbb79dfc90ec59774be83fa'
+            'cb28bb435c1f49f9e5d7174c0244a5dc66044eec2dff09922dd6976cc7a8313c'
             '10795bc3b2fb28b79b3ab74bbd8f33b667e3bf4b1c87ccfb2aae168f9b07a17c'
             'da5a87717517b37d0554369235e0bdb86700bd696c1a70db5a47d9f4711b44db'
             'ecff1e7807003beb3198f95859fa3c1b57d618940872d1c8638e65f5a49afce4'
diff --git a/SEPMAC.cnf.xml b/SEPMAC.cnf.xml
new file mode 100644
index 000000000000..0879c29c86d1
--- /dev/null
+++ b/SEPMAC.cnf.xml
@@ -0,0 +1,322 @@
+<device>
+  <fullConfig>true</fullConfig>
+  <deviceProtocol>SIP</deviceProtocol>
+  <devicePool>
+    <dateTimeSetting>
+      <dateTemplate>D/M/Y</dateTemplate>
+      <timeZone></timeZone>
+      <ntps>
+        <ntp>
+          <name></name>
+          <ntpMode>unicast</ntpMode>
+        </ntp>
+      </ntps>
+    </dateTimeSetting>
+    <callManagerGroup>
+      <members>
+        <member priority="0">
+          <callManager>
+            <ports>
+              <sipPort>5060</sipPort>
+	      <securedSipPort>5061</securedSipPort>
+            </ports>
+            <processNodeName></processNodeName>
+          </callManager>
+        </member>
+      </members>
+    </callManagerGroup>
+  </devicePool>
+  <!-- <vpnGroup>
+    <mtu>1290</mtu>
+    <failConnectTime>30</failConnectTime>
+    <authMethod>0</authMethod>
+    <pswdPersistent>1</pswdPersistent>
+    <autoNetDetect>1</autoNetDetect>
+    <enableHostIDCheck>0</enableHostIDCheck>
+    <addresses>
+      <url1></url1>
+    </addresses>
+    <credentials>
+      <hashAlg>0</hashAlg>
+      <certHash1></certHash1>
+    </credentials>
+  </vpnGroup> -->
+  <sipProfile>
+    <sipProxies>
+      <registerWithProxy>true</registerWithProxy>
+    </sipProxies>
+    <sipCallFeatures>
+      <cnfJoinEnabled>true</cnfJoinEnabled>
+      <callForwardURI>x-cisco-serviceuri-cfwdall</callForwardURI>
+      <callPickupURI>x-cisco-serviceuri-pickup</callPickupURI>
+      <callPickupListURI>x-cisco-serviceuri-opickup</callPickupListURI>
+      <callPickupGroupURI>x-cisco-serviceuri-gpickup</callPickupGroupURI>
+      <meetMeServiceURI>x-cisco-serviceuri-meetme</meetMeServiceURI>
+      <abbreviatedDialURI>x-cisco-serviceuri-abbrdial</abbreviatedDialURI>
+      <rfc2543Hold>false</rfc2543Hold>
+      <callHoldRingback>1</callHoldRingback>
+      <localCfwdEnable>true</localCfwdEnable>
+      <semiAttendedTransfer>true</semiAttendedTransfer>
+      <anonymousCallBlock>3</anonymousCallBlock>
+      <callerIdBlocking>3</callerIdBlocking>
+      <dndControl>0</dndControl>
+      <remoteCcEnable>true</remoteCcEnable>
+      <retainForwardInformation>false</retainForwardInformation>
+      <uriDialingDisplayPreference>1</uriDialingDisplayPreference>
+    </sipCallFeatures>
+    <sipStack>
+      <sipInviteRetx>6</sipInviteRetx>
+      <sipRetx>10</sipRetx>
+      <timerInviteExpires>180</timerInviteExpires>
+      <timerRegisterExpires>3600</timerRegisterExpires>
+      <timerRegisterDelta>5</timerRegisterDelta>
+      <timerKeepAliveExpires>120</timerKeepAliveExpires>
+      <timerSubscribeExpires>120</timerSubscribeExpires>
+      <timerSubscribeDelta>5</timerSubscribeDelta>
+      <timerT1>500</timerT1>
+      <timerT2>4000</timerT2>
+      <maxRedirects>70</maxRedirects>
+      <remotePartyID>true</remotePartyID>
+      <userInfo>Phone</userInfo>
+    </sipStack>
+    <autoAnswerTimer>1</autoAnswerTimer>
+    <autoAnswerAltBehavior>false</autoAnswerAltBehavior>
+    <autoAnswerOverride>true</autoAnswerOverride>
+    <transferOnhookEnabled>true</transferOnhookEnabled>
+    <enableVad>false</enableVad>
+    <preferredCodec>none</preferredCodec>
+    <dtmfAvtPayload>101</dtmfAvtPayload>
+    <dtmfDbLevel>3</dtmfDbLevel>
+    <dtmfOutofBand>avt</dtmfOutofBand>
+    <alwaysUsePrimeLine>false</alwaysUsePrimeLine>
+    <alwaysUsePrimeLineVoiceMail>false</alwaysUsePrimeLineVoiceMail>
+    <kpml>0</kpml>
+    <phoneLabel></phoneLabel>
+    <stutterMsgWaiting>0</stutterMsgWaiting>
+    <callStats>true</callStats>
+    <offhookToFirstDigitTimer>15000</offhookToFirstDigitTimer>
+    <silentPeriodBetweenCallWaitingBursts>10</silentPeriodBetweenCallWaitingBursts>
+    <disableLocalSpeedDialConfig>false</disableLocalSpeedDialConfig>
+    <startMediaPort>16384</startMediaPort>
+    <stopMediaPort>32766</stopMediaPort>
+    <natEnabled>false</natEnabled>
+    <natReceivedProcessing>false</natReceivedProcessing>
+    <natAddress></natAddress>
+    <sipLines>
+      <line button="1" lineIndex="1">
+        <featureID>9</featureID>
+        <featureLabel></featureLabel>
+        <proxy>USECALLMANAGER</proxy>
+        <port>5060</port>
+        <name></name>
+        <displayName></displayName>
+        <autoAnswer>
+          <autoAnswerEnabled>0</autoAnswerEnabled>
+        </autoAnswer>
+        <callWaiting>3</callWaiting>
+        <authName></authName>
+        <authPassword></authPassword>
+        <contact></contact>
+        <sharedLine>false</sharedLine>
+        <messageWaitingLampPolicy>3</messageWaitingLampPolicy>
+        <messageWaitingAMWI>0</messageWaitingAMWI>
+        <messagesNumber></messagesNumber>
+        <ringSettingIdle>4</ringSettingIdle>
+        <ringSettingActive>5</ringSettingActive>
+        <forwardCallInfoDisplay>
+          <callerName>true</callerName>
+          <callerNumber>true</callerNumber>
+          <redirectedNumber>false</redirectedNumber>
+          <dialedNumber>true</dialedNumber>
+        </forwardCallInfoDisplay>
+        <maxNumCalls>5</maxNumCalls>
+        <busyTrigger>4</busyTrigger>
+      </line>
+    </sipLines>
+    <externalNumberMask></externalNumberMask>
+    <voipControlPort>5060</voipControlPort>
+    <dscpForAudio>184</dscpForAudio>
+    <ringSettingBusyStationPolicy>0</ringSettingBusyStationPolicy>
+    <dialTemplate></dialTemplate>
+    <softKeyFile></softKeyFile>
+  </sipProfile>
+  <MissedCallLoggingOption>1</MissedCallLoggingOption>
+  <featurePolicyFile></featurePolicyFile>
+  <commonProfile>
+    <phonePassword></phonePassword>
+    <backgroundImageAccess>true</backgroundImageAccess>
+    <callLogBlfEnabled>2</callLogBlfEnabled>
+  </commonProfile>
+  <vendorConfig>
+    <defaultWallpaperFile></defaultWallpaperFile>
+    <disableSpeaker>false</disableSpeaker>
+    <disableSpeakerAndHeadset>false</disableSpeakerAndHeadset>
+    <enableMuteFeature>false</enableMuteFeature>
+    <enableGroupListen>true</enableGroupListen>
+    <holdResumeKey>1</holdResumeKey>
+    <recentsSoftKey>1</recentsSoftKey>
+    <dfBit>1</dfBit>
+    <pcPort>0</pcPort>
+    <spanToPCPort>1</spanToPCPort>
+    <garp>0</garp>
+    <rtcp>1</rtcp>
+    <videoRtcp>1</videoRtcp>
+    <voiceVlanAccess>0</voiceVlanAccess>
+    <videoCapability>1</videoCapability>
+    <hideVideoByDefault>0</hideVideoByDefault>
+    <separateMute>0</separateMute>
+    <ciscoCamera>1</ciscoCamera>
+    <usb1>1</usb1>
+    <usb2>1</usb2>
+    <usbClasses>0,1,2</usbClasses>
+    <sdio>1</sdio>
+    <wifi>1</wifi>
+    <bluetooth>1</bluetooth>
+    <bluetoothProfile>0,1</bluetoothProfile>
+    <btpbap>0</btpbap>
+    <bthfu>0</bthfu>
+    <ehookEnable>0</ehookEnable>
+    <autoSelectLineEnable>1</autoSelectLineEnable>
+    <autoCallSelect>1</autoCallSelect>
+    <incomingCallToastTimer>10</incomingCallToastTimer>
+    <dialToneFromReleaseKey>0</dialToneFromReleaseKey>
+    <joinAndDirectTransferPolicy>0</joinAndDirectTransferPolicy>
+    <minimumRingVolume></minimumRingVolume>
+    <simplifiedNewCall>0</simplifiedNewCall>
+    <actionableAlert>0</actionableAlert>
+    <showCallHistoryForSelectedLine>0</showCallHistoryForSelectedLine>
+    <kemOneColumn>0</kemOneColumn>
+    <lineMode>0</lineMode>
+    <allCallsOnPrimary>0</allCallsOnPrimary>
+    <softKeyControl>0</softKeyControl>
+    <settingsAccess>1</settingsAccess>
+    <webProtocol>0</webProtocol>
+    <webAccess>0</webAccess>
+    <webAdmin>1</webAdmin>
+    <adminPassword></adminPassword>
+    <sshAccess>0</sshAccess>
+    <detectCMConnectionFailure>0</detectCMConnectionFailure>
+    <g722CodecSupport>1</g722CodecSupport>
+    <handsetWidebandEnable>2</handsetWidebandEnable>
+    <headsetWidebandEnable>2</headsetWidebandEnable>
+    <headsetWidebandUIControl>1</headsetWidebandUIControl>
+    <handsetWidebandUIControl>1</handsetWidebandUIControl>
+    <daysDisplayNotActive>1,7</daysDisplayNotActive>
+    <displayOnTime>08:00</displayOnTime>
+    <displayOnDuration>10:00</displayOnDuration>
+    <displayIdleTimeout>00:10</displayIdleTimeout>
+    <displayOnWhenIncomingCall>1</displayOnWhenIncomingCall>
+    <displayRefreshRate>0</displayRefreshRate>
+    <daysBacklightNotActive>1,7</daysBacklightNotActive>
+    <backlightOnTime>08:00</backlightOnTime>
+    <backlightOnDuration>10:00</backlightOnDuration>
+    <backlightIdleTimeout>00:10</backlightIdleTimeout>
+    <backlightOnWhenIncomingCall>1</backlightOnWhenIncomingCall>
+    <recordingTone>0</recordingTone>
+    <recordingToneLocalVolume>100</recordingToneLocalVolume>
+    <recordingToneRemoteVolume>50</recordingToneRemoteVolume>
+    <recordingToneDuration></recordingToneDuration>
+    <moreKeyReversionTimer>5</moreKeyReversionTimer>
+    <peerFirmwareSharing>0</peerFirmwareSharing>
+    <loadServer></loadServer>
+    <problemReportUploadURL></problemReportUploadURL>
+    <enableCdpSwPort>1</enableCdpSwPort>
+    <enableCdpPcPort>0</enableCdpPcPort>
+    <enableLldpSwPort>1</enableLldpSwPort>
+    <enableLldpPcPort>0</enableLldpPcPort>
+    <cdpEnable>true</cdpEnable>
+    <outOfRangeAlert>0</outOfRangeAlert>
+    <scanningMode>2</scanningMode>
+    <applicationURL></applicationURL>
+    <appButtonTimer>0</appButtonTimer>
+    <appButtonPriority>0</appButtonPriority>
+    <specialNumbers></specialNumbers>
+    <sendKeyAction>0</sendKeyAction>
+    <powerOffWhenCharging>0</powerOffWhenCharging>
+    <homeScreen>0</homeScreen>
+    <accessContacts>1</accessContacts>
+    <accessFavorites>1</accessFavorites>
+    <accessVoicemail>1</accessVoicemail>
+    <accessApps>1</accessApps>
+  </vendorConfig>
+  <versionStamp>d902ed5a-c1e5-4233-b1d6-a960d53d1c3a</versionStamp>
+  <loadInformation></loadInformation>
+  <!-- <addOnModules>
+    <addOnModule idx="1">
+      <deviceType></deviceType>
+      <deviceLine></deviceLine>
+      <loadInformation></loadInformation>
+    </addOnModule>
+  </addOnModules> -->
+  <phoneServices useHTTPS="false">
+    <provisioning>2</provisioning>
+    <phoneService type="1" category="0">
+      <name>Missed Calls</name>
+      <url>Application:Cisco/MissedCalls</url>
+      <vendor></vendor>
+      <version></version>
+    </phoneService>
+    <phoneService type="1" category="0">
+      <name>Received Calls</name>
+      <url>Application:Cisco/ReceivedCalls</url>
+      <vendor></vendor>
+      <version></version>
+    </phoneService>
+    <phoneService type="1" category="0">
+      <name>Placed Calls</name>
+      <url>Application:Cisco/PlacedCalls</url>
+      <vendor></vendor>
+      <version></version>
+    </phoneService>
+    <phoneService type="2" category="0">
+      <name>Voicemail</name>
+      <url>Application:Cisco/Voicemail</url>
+      <vendor></vendor>
+      <version></version>
+    </phoneService>
+  </phoneServices>
+  <userLocale>
+    <name></name>
+    <uid>1</uid>
+    <langCode></langCode>
+    <version></version>
+    <winCharSet>utf-8</winCharSet>
+  </userLocale>
+  <networkLocale></networkLocale>
+  <networkLocaleInfo>
+    <name></name>
+    <version></version>
+  </networkLocaleInfo>
+  <deviceSecurityMode>1</deviceSecurityMode>
+  <idleTimeout>0</idleTimeout>
+  <authenticationURL></authenticationURL>
+  <messagesURL></messagesURL>
+  <servicesURL></servicesURL>
+  <directoryURL></directoryURL>
+  <idleURL></idleURL>
+  <informationURL></informationURL>
+  <proxyServerURL></proxyServerURL>
+  <secureAuthenticationURL></secureAuthenticationURL>
+  <secureMessagesURL></secureMessagesURL>
+  <secureServicesURL></secureServicesURL>
+  <secureDirectoryURL></secureDirectoryURL>
+  <secureInformationURL></secureInformationURL>
+  <secureIdleURL></secureIdleURL>
+  <transportLayerProtocol>1</transportLayerProtocol>
+  <TLSResumptionTimer>3600</TLSResumptionTimer>
+  <phonePersonalization>1</phonePersonalization>
+  <autoCallPickupEnable>true</autoCallPickupEnable>
+  <blfAudibleAlertSettingOfIdleStation>0</blfAudibleAlertSettingOfIdleStation>
+  <blfAudibleAlertSettingOfBusyStation>0</blfAudibleAlertSettingOfBusyStation>
+  <dndCallAlert>1</dndCallAlert>
+  <dndReminderTimer>5</dndReminderTimer>
+  <advertiseG722Codec>1</advertiseG722Codec>
+  <rollover>0</rollover>
+  <joinAcrossLines>0</joinAcrossLines>
+  <capfAuthMode>0</capfAuthMode>
+  <capfList></capfList>
+  <certHash></certHash>
+  <encrConfig>false</encrConfig>
+  <sshUserId></sshUserId>
+  <sshPassword></sshPassword>
+</device>
diff --git a/SoftKeys.xml b/SoftKeys.xml
new file mode 100644
index 000000000000..22c35de00fa7
--- /dev/null
+++ b/SoftKeys.xml
@@ -0,0 +1,201 @@
+<softKeyCfg>
+  <versionStamp>0200d4f8-e302-4315-b91e-9490e0b37fc5</versionStamp>
+  <typeSoftKey>
+    <softKeyDef keyID="Undefined">
+      <tag>0</tag>
+      <eventID>0</eventID>
+      <helpID>0</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="Redial">
+      <tag>1</tag>
+      <eventID>1</eventID>
+      <helpID>301</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="NewCall">
+      <tag>2</tag>
+      <eventID>2</eventID>
+      <helpID>302</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="Hold">
+      <tag>3</tag>
+      <eventID>3</eventID>
+      <helpID>303</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="Transfer">
+      <tag>4</tag>
+      <eventID>4</eventID>
+      <helpID>304</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="CFwdAll">
+      <tag>5</tag>
+      <eventID>5</eventID>
+      <helpID>305</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="&lt;&lt;">
+      <tag>8</tag>
+      <eventID>8</eventID>
+      <helpID>308</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="EndCall">
+      <tag>9</tag>
+      <eventID>9</eventID>
+      <helpID>309</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="Resume">
+      <tag>10</tag>
+      <eventID>10</eventID>
+      <helpID>310</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="Answer">
+      <tag>11</tag>
+      <eventID>11</eventID>
+      <helpID>311</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="Confrn">
+      <tag>13</tag>
+      <eventID>13</eventID>
+      <helpID>313</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="Park">
+      <tag>14</tag>
+      <eventID>14</eventID>
+      <helpID>314</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="Join">
+      <tag>15</tag>
+      <eventID>15</eventID>
+      <helpID>315</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="MeetMe">
+      <tag>16</tag>
+      <eventID>16</eventID>
+      <helpID>316</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="PickUp">
+      <tag>17</tag>
+      <eventID>17</eventID>
+      <helpID>317</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="GPickUp">
+      <tag>18</tag>
+      <eventID>18</eventID>
+      <helpID>318</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="RmLstC">
+      <tag>57</tag>
+      <eventID>19</eventID>
+      <helpID>319</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="DND">
+      <tag>63</tag>
+      <eventID>69</eventID>
+      <helpID>369</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="CallBack">
+      <tag>65</tag>
+      <eventID>20</eventID>
+      <helpID>320</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="QRT">
+      <tag>75</tag>
+      <eventID>22</eventID>
+      <helpID>322</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="MCID">
+      <tag>76</tag>
+      <eventID>27</eventID>
+      <helpID>327</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="Select">
+      <tag>78</tag>
+      <eventID>29</eventID>
+      <helpID>329</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="ConfList">
+      <tag>79</tag>
+      <eventID>30</eventID>
+      <helpID>330</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="iDivert">
+      <tag>80</tag>
+      <eventID>31</eventID>
+      <helpID>331</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="OPickUp">
+      <tag>91</tag>
+      <eventID>34</eventID>
+      <helpID>334</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="HLog">
+      <tag>92</tag>
+      <eventID>35</eventID>
+      <helpID>335</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="AbbrDial">
+      <tag>7740</tag>
+      <eventID>71</eventID>
+      <helpID>371</helpID>
+    </softKeyDef>
+    <softKeyDef keyID="Record">
+      <tag>7747</tag>
+      <eventID>74</eventID>
+      <helpID>374</helpID>
+    </softKeyDef>
+  </typeSoftKey>
+  <softKeySets>
+    <softKeySet id="On Hook">
+      <softKey keyID="Redial" />
+      <softKey keyID="NewCall" />
+      <softKey keyID="DND" />
+      <softKey keyID="CFwdAll" />
+    </softKeySet>
+    <softKeySet id="Off Hook">
+      <softKey keyID="Redial" />
+      <softKey keyID="EndCall" />
+      <softKey keyID="PickUp" />
+    </softKeySet>
+    <softKeySet id="Off Hook With Feature">
+      <softKey keyID="Redial" />
+      <softKey keyID="EndCall" />
+    </softKeySet>
+    <softKeySet id="Digits After First">
+      <softKey keyID="&lt;&lt;" />
+      <softKey keyID="EndCall" />
+    </softKeySet>
+    <softKeySet id="Ring Out">
+      <softKey keyID="Undefined" />
+      <softKey keyID="EndCall" />
+    </softKeySet>
+    <softKeySet id="Connected">
+      <softKey keyID="Hold" />
+      <softKey keyID="EndCall" />
+      <softKey keyID="Transfer" />
+      <softKey keyID="Confrn" />
+      <softKey keyID="ConfList" />
+      <softKey keyID="Park" />
+    </softKeySet>
+    <softKeySet id="Connected No Feature">
+      <softKey keyID="Undefined" />
+      <softKey keyID="EndCall" />
+    </softKeySet>
+    <softKeySet id="Connected Transfer">
+      <softKey keyID="Undefined" />
+      <softKey keyID="EndCall" />
+      <softKey keyID="Transfer" />
+    </softKeySet>
+    <softKeySet id="Connected Conference">
+      <softKey keyID="Undefined" />
+      <softKey keyID="EndCall" />
+      <softKey keyID="Confrn" />
+      <softKey keyID="ConfList" />
+    </softKeySet>
+    <softKeySet id="On Hold">
+      <softKey keyID="Resume" />
+      <softKey keyID="NewCall" />
+    </softKeySet>
+    <softKeySet id="Ring In">
+      <softKey keyID="Answer" />
+      <softKey keyID="iDivert" />
+    </softKeySet>
+  </softKeySets>
+</softKeyCfg>