October 2017 - crux-commits

ports/opt (3.3): [notify] wpa_supplicant: security fix for the KRACK (Key Reinstallation Attacks) vulnerability
by crux＠crux.nu 18 Oct '17

18 Oct '17

commit 1de458abe0a7518dba2e8b17f3fb9f50c38e440c Author: Juergen Daubert <jue(a)jue.li> Date: Wed Oct 18 10:39:39 2017 +0200 [notify] wpa_supplicant: security fix for the KRACK (Key Reinstallation Attacks) vulnerability See - https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-message… - https://www.krackattacks.com/ diff --git a/wpa_supplicant/.md5sum b/wpa_supplicant/.md5sum index ea8a0db81..660019c37 100644 --- a/wpa_supplicant/.md5sum +++ b/wpa_supplicant/.md5sum @@ -1,2 +1,10 @@ +a209fe1510a138c0da3855854c38bf6f rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch +a19510a630e870a100ccb56627df38b9 rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch +1f9054638b4b142049aec620307e5bd2 rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch +95e59981ffadbb832670a06db22c717f rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch +2f13f68055c40a1034b0028d0c301988 rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch +0065da3dce2284fa0c59a1359ad752bd rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch +f993c4887d62de35b6492b0feffe2e49 rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch +2dda6fa8a71fcd25d1f658eb44d7c3f0 rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch d716495fa71fbf6f8aca3075c8706af5 wlan 091569eb4440b7d7f2b4276dbfc03c3c wpa_supplicant-2.6.tar.gz diff --git a/wpa_supplicant/.signature b/wpa_supplicant/.signature index 93a4d7c7d..b44a5da65 100644 --- a/wpa_supplicant/.signature +++ b/wpa_supplicant/.signature @@ -1,6 +1,14 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/a8Qj5cjm4Lla1kZI8ErGziUebo0tSxwaucJSBU3mj/X0ZU5Ntp5Chv1qGGbd5Ii1mp5zwdiWTpPptAQ3lCBjgQ= -SHA256 (Pkgfile) = c3597b4d648d5b0313c81f94efb37965440881e041e4d34a98838f9beb58eb34 +RWSE3ohX2g5d/RQg80Uz1Uy8/Bmifa5WGQsdDvlhpP0B/f7QXNBbntGkSjOBRzIvuuCD5bHTgtmDSqyR5n964zy4w19JVo4Seg0= +SHA256 (Pkgfile) = 4b52b01a677225157876b502c8de725da63c7a5b1ff55469905f502783b73da3 SHA256 (.footprint) = d3b2e0c4068fe789ca0c18c2c81faf906efdbd970fa00641c3e5381dcbc474a5 SHA256 (wpa_supplicant-2.6.tar.gz) = b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450 +SHA256 (rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch) = 529113cc81256c6178f3c1cf25dd8d3f33e6d770e4a180bd31c6ab7e4917f40b +SHA256 (rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch) = d86d47ab74170f3648b45b91bce780949ca92b09ab43df065178850ec0c335d7 +SHA256 (rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch) = d4535e36739a0cc7f3585e6bcba3c0bb8fc67cb3e729844e448c5dc751f47e81 +SHA256 (rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch) = 793a54748161b5af430dd9de4a1988d19cb8e85ab29bc2340f886b0297cee20b +SHA256 (rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch) = 147c8abe07606905d16404fb2d2c8849796ca7c85ed8673c09bb50038bcdeb9e +SHA256 (rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch) = 596d4d3b63ea859ed7ea9791b3a21cb11b6173b04c0a14a2afa47edf1666afa6 +SHA256 (rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch) = c5a17af84aec2d88c56ce0da2d6945be398fe7cab5c0c340deb30973900c2736 +SHA256 (rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch) = c8840d857b9432f3b488113c85c1ff5d4a4b8d81078b7033388dae1e990843b1 SHA256 (wlan) = 62f4c0bf8d5fedcf5b6ad79278f4be16f29841099f385acc4fc91e2d52ca1927 diff --git a/wpa_supplicant/Pkgfile b/wpa_supplicant/Pkgfile index f143588af..ede524d6e 100644 --- a/wpa_supplicant/Pkgfile +++ b/wpa_supplicant/Pkgfile @@ -5,13 +5,30 @@ name=wpa_supplicant version=2.6 -release=2 +release=3 source=(http://hostap.epitest.fi/releases/$name-$version.tar.gz + rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch + rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch + rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch + rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch + rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch + rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch + rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch + rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch wlan) build () { cd $name-$version/$name + patch -d.. -p1 -i $SRC/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch + patch -d.. -p1 -i $SRC/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch + patch -d.. -p1 -i $SRC/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch + patch -d.. -p1 -i $SRC/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch + patch -d.. -p1 -i $SRC/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch + patch -d.. -p1 -i $SRC/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch + patch -d.. -p1 -i $SRC/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch + patch -d.. -p1 -i $SRC/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch + cp defconfig .config echo "CONFIG_READLINE=y CONFIG_LIBNL32=y diff --git a/wpa_supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch b/wpa_supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch new file mode 100644 index 000000000..727684865 --- /dev/null +++ b/wpa_supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch @@ -0,0 +1,174 @@ +From cf4cab804c7afd5c45505528a8d16e46163243a2 Mon Sep 17 00:00:00 2001 +From: Mathy Vanhoef <Mathy.Vanhoef(a)cs.kuleuven.be> +Date: Fri, 14 Jul 2017 15:15:35 +0200 +Subject: [PATCH 1/8] hostapd: Avoid key reinstallation in FT handshake + +Do not reinstall TK to the driver during Reassociation Response frame +processing if the first attempt of setting the TK succeeded. This avoids +issues related to clearing the TX/RX PN that could result in reusing +same PN values for transmitted frames (e.g., due to CCM nonce reuse and +also hitting replay protection on the receiver) and accepting replayed +frames on RX side. + +This issue was introduced by the commit +0e84c25434e6a1f283c7b4e62e483729085b78d2 ('FT: Fix PTK configuration in +authenticator') which allowed wpa_ft_install_ptk() to be called multiple +times with the same PTK. While the second configuration attempt is +needed with some drivers, it must be done only if the first attempt +failed. + +Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef(a)cs.kuleuven.be> +--- + src/ap/ieee802_11.c | 16 +++++++++++++--- + src/ap/wpa_auth.c | 11 +++++++++++ + src/ap/wpa_auth.h | 3 ++- + src/ap/wpa_auth_ft.c | 10 ++++++++++ + src/ap/wpa_auth_i.h | 1 + + 5 files changed, 37 insertions(+), 4 deletions(-) + +diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c +index 4e04169..333035f 100644 +--- a/src/ap/ieee802_11.c ++++ b/src/ap/ieee802_11.c +@@ -1841,6 +1841,7 @@ static int add_associated_sta(struct hostapd_data *hapd, + { + struct ieee80211_ht_capabilities ht_cap; + struct ieee80211_vht_capabilities vht_cap; ++ int set = 1; + + /* + * Remove the STA entry to ensure the STA PS state gets cleared and +@@ -1848,9 +1849,18 @@ static int add_associated_sta(struct hostapd_data *hapd, + * FT-over-the-DS, where a station re-associates back to the same AP but + * skips the authentication flow, or if working with a driver that + * does not support full AP client state. ++ * ++ * Skip this if the STA has already completed FT reassociation and the ++ * TK has been configured since the TX/RX PN must not be reset to 0 for ++ * the same key. + */ +- if (!sta->added_unassoc) ++ if (!sta->added_unassoc && ++ (!(sta->flags & WLAN_STA_AUTHORIZED) || ++ !wpa_auth_sta_ft_tk_already_set(sta->wpa_sm))) { + hostapd_drv_sta_remove(hapd, sta->addr); ++ wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED); ++ set = 0; ++ } + + #ifdef CONFIG_IEEE80211N + if (sta->flags & WLAN_STA_HT) +@@ -1873,11 +1883,11 @@ static int add_associated_sta(struct hostapd_data *hapd, + sta->flags & WLAN_STA_VHT ? &vht_cap : NULL, + sta->flags | WLAN_STA_ASSOC, sta->qosinfo, + sta->vht_opmode, sta->p2p_ie ? 1 : 0, +- sta->added_unassoc)) { ++ set)) { + hostapd_logger(hapd, sta->addr, + HOSTAPD_MODULE_IEEE80211, HOSTAPD_LEVEL_NOTICE, + "Could not %s STA to kernel driver", +- sta->added_unassoc ? "set" : "add"); ++ set ? "set" : "add"); + + if (sta->added_unassoc) { + hostapd_drv_sta_remove(hapd, sta->addr); +diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c +index 3587086..707971d 100644 +--- a/src/ap/wpa_auth.c ++++ b/src/ap/wpa_auth.c +@@ -1745,6 +1745,9 @@ int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event) + #else /* CONFIG_IEEE80211R */ + break; + #endif /* CONFIG_IEEE80211R */ ++ case WPA_DRV_STA_REMOVED: ++ sm->tk_already_set = FALSE; ++ return 0; + } + + #ifdef CONFIG_IEEE80211R +@@ -3250,6 +3253,14 @@ int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm) + } + + ++int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm) ++{ ++ if (!sm || !wpa_key_mgmt_ft(sm->wpa_key_mgmt)) ++ return 0; ++ return sm->tk_already_set; ++} ++ ++ + int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm, + struct rsn_pmksa_cache_entry *entry) + { +diff --git a/src/ap/wpa_auth.h b/src/ap/wpa_auth.h +index 0de8d97..97461b0 100644 +--- a/src/ap/wpa_auth.h ++++ b/src/ap/wpa_auth.h +@@ -267,7 +267,7 @@ void wpa_receive(struct wpa_authenticator *wpa_auth, + u8 *data, size_t data_len); + enum wpa_event { + WPA_AUTH, WPA_ASSOC, WPA_DISASSOC, WPA_DEAUTH, WPA_REAUTH, +- WPA_REAUTH_EAPOL, WPA_ASSOC_FT ++ WPA_REAUTH_EAPOL, WPA_ASSOC_FT, WPA_DRV_STA_REMOVED + }; + void wpa_remove_ptk(struct wpa_state_machine *sm); + int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event); +@@ -280,6 +280,7 @@ int wpa_auth_pairwise_set(struct wpa_state_machine *sm); + int wpa_auth_get_pairwise(struct wpa_state_machine *sm); + int wpa_auth_sta_key_mgmt(struct wpa_state_machine *sm); + int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm); ++int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm); + int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm, + struct rsn_pmksa_cache_entry *entry); + struct rsn_pmksa_cache_entry * +diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c +index 42242a5..e63b99a 100644 +--- a/src/ap/wpa_auth_ft.c ++++ b/src/ap/wpa_auth_ft.c +@@ -780,6 +780,14 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm) + return; + } + ++ if (sm->tk_already_set) { ++ /* Must avoid TK reconfiguration to prevent clearing of TX/RX ++ * PN in the driver */ ++ wpa_printf(MSG_DEBUG, ++ "FT: Do not re-install same PTK to the driver"); ++ return; ++ } ++ + /* FIX: add STA entry to kernel/driver here? The set_key will fail + * most likely without this.. At the moment, STA entry is added only + * after association has been completed. This function will be called +@@ -792,6 +800,7 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm) + + /* FIX: MLME-SetProtection.Request(TA, Tx_Rx) */ + sm->pairwise_set = TRUE; ++ sm->tk_already_set = TRUE; + } + + +@@ -898,6 +907,7 @@ static int wpa_ft_process_auth_req(struct wpa_state_machine *sm, + + sm->pairwise = pairwise; + sm->PTK_valid = TRUE; ++ sm->tk_already_set = FALSE; + wpa_ft_install_ptk(sm); + + buflen = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) + +diff --git a/src/ap/wpa_auth_i.h b/src/ap/wpa_auth_i.h +index 72b7eb3..7fd8f05 100644 +--- a/src/ap/wpa_auth_i.h ++++ b/src/ap/wpa_auth_i.h +@@ -65,6 +65,7 @@ struct wpa_state_machine { + struct wpa_ptk PTK; + Boolean PTK_valid; + Boolean pairwise_set; ++ Boolean tk_already_set; + int keycount; + Boolean Pair; + struct wpa_key_replay_counter { +-- +2.7.4 + diff --git a/wpa_supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch b/wpa_supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch new file mode 100644 index 000000000..1802d664a --- /dev/null +++ b/wpa_supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch @@ -0,0 +1,250 @@ +From 927f891007c402fefd1ff384645b3f07597c3ede Mon Sep 17 00:00:00 2001 +From: Mathy Vanhoef <Mathy.Vanhoef(a)cs.kuleuven.be> +Date: Wed, 12 Jul 2017 16:03:24 +0200 +Subject: [PATCH 2/8] Prevent reinstallation of an already in-use group key + +Track the current GTK and IGTK that is in use and when receiving a +(possibly retransmitted) Group Message 1 or WNM-Sleep Mode Response, do +not install the given key if it is already in use. This prevents an +attacker from trying to trick the client into resetting or lowering the +sequence counter associated to the group key. + +Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef(a)cs.kuleuven.be> +--- + src/common/wpa_common.h | 11 +++++ + src/rsn_supp/wpa.c | 116 ++++++++++++++++++++++++++++++------------------ + src/rsn_supp/wpa_i.h | 4 ++ + 3 files changed, 87 insertions(+), 44 deletions(-) + +diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h +index af1d0f0..d200285 100644 +--- a/src/common/wpa_common.h ++++ b/src/common/wpa_common.h +@@ -217,6 +217,17 @@ struct wpa_ptk { + size_t tk_len; + }; + ++struct wpa_gtk { ++ u8 gtk[WPA_GTK_MAX_LEN]; ++ size_t gtk_len; ++}; ++ ++#ifdef CONFIG_IEEE80211W ++struct wpa_igtk { ++ u8 igtk[WPA_IGTK_MAX_LEN]; ++ size_t igtk_len; ++}; ++#endif /* CONFIG_IEEE80211W */ + + /* WPA IE version 1 + * 00-50-f2:1 (OUI:OUI type) +diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c +index 3c47879..95bd7be 100644 +--- a/src/rsn_supp/wpa.c ++++ b/src/rsn_supp/wpa.c +@@ -714,6 +714,15 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, + const u8 *_gtk = gd->gtk; + u8 gtk_buf[32]; + ++ /* Detect possible key reinstallation */ ++ if (sm->gtk.gtk_len == (size_t) gd->gtk_len && ++ os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) { ++ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, ++ "WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)", ++ gd->keyidx, gd->tx, gd->gtk_len); ++ return 0; ++ } ++ + wpa_hexdump_key(MSG_DEBUG, "WPA: Group Key", gd->gtk, gd->gtk_len); + wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, + "WPA: Installing GTK to the driver (keyidx=%d tx=%d len=%d)", +@@ -748,6 +757,9 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, + } + os_memset(gtk_buf, 0, sizeof(gtk_buf)); + ++ sm->gtk.gtk_len = gd->gtk_len; ++ os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); ++ + return 0; + } + +@@ -854,6 +866,48 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, + } + + ++#ifdef CONFIG_IEEE80211W ++static int wpa_supplicant_install_igtk(struct wpa_sm *sm, ++ const struct wpa_igtk_kde *igtk) ++{ ++ size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher); ++ u16 keyidx = WPA_GET_LE16(igtk->keyid); ++ ++ /* Detect possible key reinstallation */ ++ if (sm->igtk.igtk_len == len && ++ os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) { ++ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, ++ "WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)", ++ keyidx); ++ return 0; ++ } ++ ++ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, ++ "WPA: IGTK keyid %d pn %02x%02x%02x%02x%02x%02x", ++ keyidx, MAC2STR(igtk->pn)); ++ wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", igtk->igtk, len); ++ if (keyidx > 4095) { ++ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, ++ "WPA: Invalid IGTK KeyID %d", keyidx); ++ return -1; ++ } ++ if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), ++ broadcast_ether_addr, ++ keyidx, 0, igtk->pn, sizeof(igtk->pn), ++ igtk->igtk, len) < 0) { ++ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, ++ "WPA: Failed to configure IGTK to the driver"); ++ return -1; ++ } ++ ++ sm->igtk.igtk_len = len; ++ os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); ++ ++ return 0; ++} ++#endif /* CONFIG_IEEE80211W */ ++ ++ + static int ieee80211w_set_keys(struct wpa_sm *sm, + struct wpa_eapol_ie_parse *ie) + { +@@ -864,30 +918,14 @@ static int ieee80211w_set_keys(struct wpa_sm *sm, + if (ie->igtk) { + size_t len; + const struct wpa_igtk_kde *igtk; +- u16 keyidx; ++ + len = wpa_cipher_key_len(sm->mgmt_group_cipher); + if (ie->igtk_len != WPA_IGTK_KDE_PREFIX_LEN + len) + return -1; ++ + igtk = (const struct wpa_igtk_kde *) ie->igtk; +- keyidx = WPA_GET_LE16(igtk->keyid); +- wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, "WPA: IGTK keyid %d " +- "pn %02x%02x%02x%02x%02x%02x", +- keyidx, MAC2STR(igtk->pn)); +- wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", +- igtk->igtk, len); +- if (keyidx > 4095) { +- wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, +- "WPA: Invalid IGTK KeyID %d", keyidx); +- return -1; +- } +- if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), +- broadcast_ether_addr, +- keyidx, 0, igtk->pn, sizeof(igtk->pn), +- igtk->igtk, len) < 0) { +- wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, +- "WPA: Failed to configure IGTK to the driver"); ++ if (wpa_supplicant_install_igtk(sm, igtk) < 0) + return -1; +- } + } + + return 0; +@@ -2307,7 +2345,7 @@ void wpa_sm_deinit(struct wpa_sm *sm) + */ + void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) + { +- int clear_ptk = 1; ++ int clear_keys = 1; + + if (sm == NULL) + return; +@@ -2333,11 +2371,11 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) + /* Prepare for the next transition */ + wpa_ft_prepare_auth_request(sm, NULL); + +- clear_ptk = 0; ++ clear_keys = 0; + } + #endif /* CONFIG_IEEE80211R */ + +- if (clear_ptk) { ++ if (clear_keys) { + /* + * IEEE 802.11, 8.4.10: Delete PTK SA on (re)association if + * this is not part of a Fast BSS Transition. +@@ -2347,6 +2385,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) + os_memset(&sm->ptk, 0, sizeof(sm->ptk)); + sm->tptk_set = 0; + os_memset(&sm->tptk, 0, sizeof(sm->tptk)); ++ os_memset(&sm->gtk, 0, sizeof(sm->gtk)); ++#ifdef CONFIG_IEEE80211W ++ os_memset(&sm->igtk, 0, sizeof(sm->igtk)); ++#endif /* CONFIG_IEEE80211W */ + } + + #ifdef CONFIG_TDLS +@@ -2877,6 +2919,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm) + os_memset(sm->pmk, 0, sizeof(sm->pmk)); + os_memset(&sm->ptk, 0, sizeof(sm->ptk)); + os_memset(&sm->tptk, 0, sizeof(sm->tptk)); ++ os_memset(&sm->gtk, 0, sizeof(sm->gtk)); ++#ifdef CONFIG_IEEE80211W ++ os_memset(&sm->igtk, 0, sizeof(sm->igtk)); ++#endif /* CONFIG_IEEE80211W */ + #ifdef CONFIG_IEEE80211R + os_memset(sm->xxkey, 0, sizeof(sm->xxkey)); + os_memset(sm->pmk_r0, 0, sizeof(sm->pmk_r0)); +@@ -2949,29 +2995,11 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) + os_memset(&gd, 0, sizeof(gd)); + #ifdef CONFIG_IEEE80211W + } else if (subelem_id == WNM_SLEEP_SUBELEM_IGTK) { +- struct wpa_igtk_kde igd; +- u16 keyidx; +- +- os_memset(&igd, 0, sizeof(igd)); +- keylen = wpa_cipher_key_len(sm->mgmt_group_cipher); +- os_memcpy(igd.keyid, buf + 2, 2); +- os_memcpy(igd.pn, buf + 4, 6); +- +- keyidx = WPA_GET_LE16(igd.keyid); +- os_memcpy(igd.igtk, buf + 10, keylen); +- +- wpa_hexdump_key(MSG_DEBUG, "Install IGTK (WNM SLEEP)", +- igd.igtk, keylen); +- if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), +- broadcast_ether_addr, +- keyidx, 0, igd.pn, sizeof(igd.pn), +- igd.igtk, keylen) < 0) { +- wpa_printf(MSG_DEBUG, "Failed to install the IGTK in " +- "WNM mode"); +- os_memset(&igd, 0, sizeof(igd)); ++ const struct wpa_igtk_kde *igtk; ++ ++ igtk = (const struct wpa_igtk_kde *) (buf + 2); ++ if (wpa_supplicant_install_igtk(sm, igtk) < 0) + return -1; +- } +- os_memset(&igd, 0, sizeof(igd)); + #endif /* CONFIG_IEEE80211W */ + } else { + wpa_printf(MSG_DEBUG, "Unknown element id"); +diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h +index f653ba6..afc9e37 100644 +--- a/src/rsn_supp/wpa_i.h ++++ b/src/rsn_supp/wpa_i.h +@@ -31,6 +31,10 @@ struct wpa_sm { + u8 rx_replay_counter[WPA_REPLAY_COUNTER_LEN]; + int rx_replay_counter_set; + u8 request_counter[WPA_REPLAY_COUNTER_LEN]; ++ struct wpa_gtk gtk; ++#ifdef CONFIG_IEEE80211W ++ struct wpa_igtk igtk; ++#endif /* CONFIG_IEEE80211W */ + + struct eapol_sm *eapol; /* EAPOL state machine from upper level code */ + +-- +2.7.4 + diff --git a/wpa_supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch b/wpa_supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch new file mode 100644 index 000000000..e2937b851 --- /dev/null +++ b/wpa_supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch @@ -0,0 +1,184 @@ +From 8280294e74846ea342389a0cd17215050fa5afe8 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <j(a)w1.fi> +Date: Sun, 1 Oct 2017 12:12:24 +0300 +Subject: [PATCH 3/8] Extend protection of GTK/IGTK reinstallation of WNM-Sleep + Mode cases + +This extends the protection to track last configured GTK/IGTK value +separately from EAPOL-Key frames and WNM-Sleep Mode frames to cover a +corner case where these two different mechanisms may get used when the +GTK/IGTK has changed and tracking a single value is not sufficient to +detect a possible key reconfiguration. + +Signed-off-by: Jouni Malinen <j(a)w1.fi> +--- + src/rsn_supp/wpa.c | 53 +++++++++++++++++++++++++++++++++++++--------------- + src/rsn_supp/wpa_i.h | 2 ++ + 2 files changed, 40 insertions(+), 15 deletions(-) + +diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c +index 95bd7be..7a2c68d 100644 +--- a/src/rsn_supp/wpa.c ++++ b/src/rsn_supp/wpa.c +@@ -709,14 +709,17 @@ struct wpa_gtk_data { + + static int wpa_supplicant_install_gtk(struct wpa_sm *sm, + const struct wpa_gtk_data *gd, +- const u8 *key_rsc) ++ const u8 *key_rsc, int wnm_sleep) + { + const u8 *_gtk = gd->gtk; + u8 gtk_buf[32]; + + /* Detect possible key reinstallation */ +- if (sm->gtk.gtk_len == (size_t) gd->gtk_len && +- os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) { ++ if ((sm->gtk.gtk_len == (size_t) gd->gtk_len && ++ os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) || ++ (sm->gtk_wnm_sleep.gtk_len == (size_t) gd->gtk_len && ++ os_memcmp(sm->gtk_wnm_sleep.gtk, gd->gtk, ++ sm->gtk_wnm_sleep.gtk_len) == 0)) { + wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, + "WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)", + gd->keyidx, gd->tx, gd->gtk_len); +@@ -757,8 +760,14 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, + } + os_memset(gtk_buf, 0, sizeof(gtk_buf)); + +- sm->gtk.gtk_len = gd->gtk_len; +- os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); ++ if (wnm_sleep) { ++ sm->gtk_wnm_sleep.gtk_len = gd->gtk_len; ++ os_memcpy(sm->gtk_wnm_sleep.gtk, gd->gtk, ++ sm->gtk_wnm_sleep.gtk_len); ++ } else { ++ sm->gtk.gtk_len = gd->gtk_len; ++ os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); ++ } + + return 0; + } +@@ -852,7 +861,7 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, + (wpa_supplicant_check_group_cipher(sm, sm->group_cipher, + gtk_len, gtk_len, + &gd.key_rsc_len, &gd.alg) || +- wpa_supplicant_install_gtk(sm, &gd, key_rsc))) { ++ wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0))) { + wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, + "RSN: Failed to install GTK"); + os_memset(&gd, 0, sizeof(gd)); +@@ -868,14 +877,18 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, + + #ifdef CONFIG_IEEE80211W + static int wpa_supplicant_install_igtk(struct wpa_sm *sm, +- const struct wpa_igtk_kde *igtk) ++ const struct wpa_igtk_kde *igtk, ++ int wnm_sleep) + { + size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher); + u16 keyidx = WPA_GET_LE16(igtk->keyid); + + /* Detect possible key reinstallation */ +- if (sm->igtk.igtk_len == len && +- os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) { ++ if ((sm->igtk.igtk_len == len && ++ os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) || ++ (sm->igtk_wnm_sleep.igtk_len == len && ++ os_memcmp(sm->igtk_wnm_sleep.igtk, igtk->igtk, ++ sm->igtk_wnm_sleep.igtk_len) == 0)) { + wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, + "WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)", + keyidx); +@@ -900,8 +913,14 @@ static int wpa_supplicant_install_igtk(struct wpa_sm *sm, + return -1; + } + +- sm->igtk.igtk_len = len; +- os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); ++ if (wnm_sleep) { ++ sm->igtk_wnm_sleep.igtk_len = len; ++ os_memcpy(sm->igtk_wnm_sleep.igtk, igtk->igtk, ++ sm->igtk_wnm_sleep.igtk_len); ++ } else { ++ sm->igtk.igtk_len = len; ++ os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); ++ } + + return 0; + } +@@ -924,7 +943,7 @@ static int ieee80211w_set_keys(struct wpa_sm *sm, + return -1; + + igtk = (const struct wpa_igtk_kde *) ie->igtk; +- if (wpa_supplicant_install_igtk(sm, igtk) < 0) ++ if (wpa_supplicant_install_igtk(sm, igtk, 0) < 0) + return -1; + } + +@@ -1574,7 +1593,7 @@ static void wpa_supplicant_process_1_of_2(struct wpa_sm *sm, + if (wpa_supplicant_rsc_relaxation(sm, key->key_rsc)) + key_rsc = null_rsc; + +- if (wpa_supplicant_install_gtk(sm, &gd, key_rsc) || ++ if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0) || + wpa_supplicant_send_2_of_2(sm, key, ver, key_info) < 0) + goto failed; + os_memset(&gd, 0, sizeof(gd)); +@@ -2386,8 +2405,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) + sm->tptk_set = 0; + os_memset(&sm->tptk, 0, sizeof(sm->tptk)); + os_memset(&sm->gtk, 0, sizeof(sm->gtk)); ++ os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep)); + #ifdef CONFIG_IEEE80211W + os_memset(&sm->igtk, 0, sizeof(sm->igtk)); ++ os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep)); + #endif /* CONFIG_IEEE80211W */ + } + +@@ -2920,8 +2941,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm) + os_memset(&sm->ptk, 0, sizeof(sm->ptk)); + os_memset(&sm->tptk, 0, sizeof(sm->tptk)); + os_memset(&sm->gtk, 0, sizeof(sm->gtk)); ++ os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep)); + #ifdef CONFIG_IEEE80211W + os_memset(&sm->igtk, 0, sizeof(sm->igtk)); ++ os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep)); + #endif /* CONFIG_IEEE80211W */ + #ifdef CONFIG_IEEE80211R + os_memset(sm->xxkey, 0, sizeof(sm->xxkey)); +@@ -2986,7 +3009,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) + + wpa_hexdump_key(MSG_DEBUG, "Install GTK (WNM SLEEP)", + gd.gtk, gd.gtk_len); +- if (wpa_supplicant_install_gtk(sm, &gd, key_rsc)) { ++ if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 1)) { + os_memset(&gd, 0, sizeof(gd)); + wpa_printf(MSG_DEBUG, "Failed to install the GTK in " + "WNM mode"); +@@ -2998,7 +3021,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) + const struct wpa_igtk_kde *igtk; + + igtk = (const struct wpa_igtk_kde *) (buf + 2); +- if (wpa_supplicant_install_igtk(sm, igtk) < 0) ++ if (wpa_supplicant_install_igtk(sm, igtk, 1) < 0) + return -1; + #endif /* CONFIG_IEEE80211W */ + } else { +diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h +index afc9e37..9a54631 100644 +--- a/src/rsn_supp/wpa_i.h ++++ b/src/rsn_supp/wpa_i.h +@@ -32,8 +32,10 @@ struct wpa_sm { + int rx_replay_counter_set; + u8 request_counter[WPA_REPLAY_COUNTER_LEN]; + struct wpa_gtk gtk; ++ struct wpa_gtk gtk_wnm_sleep; + #ifdef CONFIG_IEEE80211W + struct wpa_igtk igtk; ++ struct wpa_igtk igtk_wnm_sleep; + #endif /* CONFIG_IEEE80211W */ + + struct eapol_sm *eapol; /* EAPOL state machine from upper level code */ +-- +2.7.4 + diff --git a/wpa_supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch b/wpa_supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch new file mode 100644 index 000000000..22ee21794 --- /dev/null +++ b/wpa_supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch @@ -0,0 +1,79 @@ +From 8f82bc94e8697a9d47fa8774dfdaaede1084912c Mon Sep 17 00:00:00 2001 +From: Mathy Vanhoef <Mathy.Vanhoef(a)cs.kuleuven.be> +Date: Fri, 29 Sep 2017 04:22:51 +0200 +Subject: [PATCH 4/8] Prevent installation of an all-zero TK + +Properly track whether a PTK has already been installed to the driver +and the TK part cleared from memory. This prevents an attacker from +trying to trick the client into installing an all-zero TK. + +This fixes the earlier fix in commit +ad00d64e7d8827b3cebd665a0ceb08adabf15e1e ('Fix TK configuration to the +driver in EAPOL-Key 3/4 retry case') which did not take into account +possibility of an extra message 1/4 showing up between retries of +message 3/4. + +Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef(a)cs.kuleuven.be> +--- + src/common/wpa_common.h | 1 + + src/rsn_supp/wpa.c | 5 ++--- + src/rsn_supp/wpa_i.h | 1 - + 3 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h +index d200285..1021ccb 100644 +--- a/src/common/wpa_common.h ++++ b/src/common/wpa_common.h +@@ -215,6 +215,7 @@ struct wpa_ptk { + size_t kck_len; + size_t kek_len; + size_t tk_len; ++ int installed; /* 1 if key has already been installed to driver */ + }; + + struct wpa_gtk { +diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c +index 7a2c68d..0550a41 100644 +--- a/src/rsn_supp/wpa.c ++++ b/src/rsn_supp/wpa.c +@@ -510,7 +510,6 @@ static void wpa_supplicant_process_1_of_4(struct wpa_sm *sm, + os_memset(buf, 0, sizeof(buf)); + } + sm->tptk_set = 1; +- sm->tk_to_set = 1; + + kde = sm->assoc_wpa_ie; + kde_len = sm->assoc_wpa_ie_len; +@@ -615,7 +614,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm, + enum wpa_alg alg; + const u8 *key_rsc; + +- if (!sm->tk_to_set) { ++ if (sm->ptk.installed) { + wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, + "WPA: Do not re-install same PTK to the driver"); + return 0; +@@ -659,7 +658,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm, + + /* TK is not needed anymore in supplicant */ + os_memset(sm->ptk.tk, 0, WPA_TK_MAX_LEN); +- sm->tk_to_set = 0; ++ sm->ptk.installed = 1; + + if (sm->wpa_ptk_rekey) { + eloop_cancel_timeout(wpa_sm_rekey_ptk, sm, NULL); +diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h +index 9a54631..41f371f 100644 +--- a/src/rsn_supp/wpa_i.h ++++ b/src/rsn_supp/wpa_i.h +@@ -24,7 +24,6 @@ struct wpa_sm { + struct wpa_ptk ptk, tptk; + int ptk_set, tptk_set; + unsigned int msg_3_of_4_ok:1; +- unsigned int tk_to_set:1; + u8 snonce[WPA_NONCE_LEN]; + u8 anonce[WPA_NONCE_LEN]; /* ANonce from the last 1/4 msg */ + int renew_snonce; +-- +2.7.4 + diff --git a/wpa_supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch b/wpa_supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch new file mode 100644 index 000000000..c19c4c710 --- /dev/null +++ b/wpa_supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch @@ -0,0 +1,64 @@ +From 12fac09b437a1dc8a0f253e265934a8aaf4d2f8b Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <j(a)w1.fi> +Date: Sun, 1 Oct 2017 12:32:57 +0300 +Subject: [PATCH 5/8] Fix PTK rekeying to generate a new ANonce + +The Authenticator state machine path for PTK rekeying ended up bypassing +the AUTHENTICATION2 state where a new ANonce is generated when going +directly to the PTKSTART state since there is no need to try to +determine the PMK again in such a case. This is far from ideal since the +new PTK would depend on a new nonce only from the supplicant. + +Fix this by generating a new ANonce when moving to the PTKSTART state +for the purpose of starting new 4-way handshake to rekey PTK. + +Signed-off-by: Jouni Malinen <j(a)w1.fi> +--- + src/ap/wpa_auth.c | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c +index 707971d..bf10cc1 100644 +--- a/src/ap/wpa_auth.c ++++ b/src/ap/wpa_auth.c +@@ -1901,6 +1901,21 @@ SM_STATE(WPA_PTK, AUTHENTICATION2) + } + + ++static int wpa_auth_sm_ptk_update(struct wpa_state_machine *sm) ++{ ++ if (random_get_bytes(sm->ANonce, WPA_NONCE_LEN)) { ++ wpa_printf(MSG_ERROR, ++ "WPA: Failed to get random data for ANonce"); ++ sm->Disconnect = TRUE; ++ return -1; ++ } ++ wpa_hexdump(MSG_DEBUG, "WPA: Assign new ANonce", sm->ANonce, ++ WPA_NONCE_LEN); ++ sm->TimeoutCtr = 0; ++ return 0; ++} ++ ++ + SM_STATE(WPA_PTK, INITPMK) + { + u8 msk[2 * PMK_LEN]; +@@ -2458,9 +2473,12 @@ SM_STEP(WPA_PTK) + SM_ENTER(WPA_PTK, AUTHENTICATION); + else if (sm->ReAuthenticationRequest) + SM_ENTER(WPA_PTK, AUTHENTICATION2); +- else if (sm->PTKRequest) +- SM_ENTER(WPA_PTK, PTKSTART); +- else switch (sm->wpa_ptk_state) { ++ else if (sm->PTKRequest) { ++ if (wpa_auth_sm_ptk_update(sm) < 0) ++ SM_ENTER(WPA_PTK, DISCONNECTED); ++ else ++ SM_ENTER(WPA_PTK, PTKSTART); ++ } else switch (sm->wpa_ptk_state) { + case WPA_PTK_INITIALIZE: + break; + case WPA_PTK_DISCONNECT: +-- +2.7.4 + diff --git a/wpa_supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch b/wpa_supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch new file mode 100644 index 000000000..e1bd5a572 --- /dev/null +++ b/wpa_supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch @@ -0,0 +1,132 @@ +From 6c4bed4f47d1960ec04981a9d50e5076aea5223d Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <j(a)w1.fi> +Date: Fri, 22 Sep 2017 11:03:15 +0300 +Subject: [PATCH 6/8] TDLS: Reject TPK-TK reconfiguration + +Do not try to reconfigure the same TPK-TK to the driver after it has +been successfully configured. This is an explicit check to avoid issues +related to resetting the TX/RX packet number. There was already a check +for this for TPK M2 (retries of that message are ignored completely), so +that behavior does not get modified. + +For TPK M3, the TPK-TK could have been reconfigured, but that was +followed by immediate teardown of the link due to an issue in updating +the STA entry. Furthermore, for TDLS with any real security (i.e., +ignoring open/WEP), the TPK message exchange is protected on the AP path +and simple replay attacks are not feasible. + +As an additional corner case, make sure the local nonce gets updated if +the peer uses a very unlikely "random nonce" of all zeros. + +Signed-off-by: Jouni Malinen <j(a)w1.fi> +--- + src/rsn_supp/tdls.c | 38 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 36 insertions(+), 2 deletions(-) + +diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c +index e424168..9eb9738 100644 +--- a/src/rsn_supp/tdls.c ++++ b/src/rsn_supp/tdls.c +@@ -112,6 +112,7 @@ struct wpa_tdls_peer { + u8 tk[16]; /* TPK-TK; assuming only CCMP will be used */ + } tpk; + int tpk_set; ++ int tk_set; /* TPK-TK configured to the driver */ + int tpk_success; + int tpk_in_progress; + +@@ -192,6 +193,20 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer) + u8 rsc[6]; + enum wpa_alg alg; + ++ if (peer->tk_set) { ++ /* ++ * This same TPK-TK has already been configured to the driver ++ * and this new configuration attempt (likely due to an ++ * unexpected retransmitted frame) would result in clearing ++ * the TX/RX sequence number which can break security, so must ++ * not allow that to happen. ++ */ ++ wpa_printf(MSG_INFO, "TDLS: TPK-TK for the peer " MACSTR ++ " has already been configured to the driver - do not reconfigure", ++ MAC2STR(peer->addr)); ++ return -1; ++ } ++ + os_memset(rsc, 0, 6); + + switch (peer->cipher) { +@@ -209,12 +224,15 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer) + return -1; + } + ++ wpa_printf(MSG_DEBUG, "TDLS: Configure pairwise key for peer " MACSTR, ++ MAC2STR(peer->addr)); + if (wpa_sm_set_key(sm, alg, peer->addr, -1, 1, + rsc, sizeof(rsc), peer->tpk.tk, key_len) < 0) { + wpa_printf(MSG_WARNING, "TDLS: Failed to set TPK to the " + "driver"); + return -1; + } ++ peer->tk_set = 1; + return 0; + } + +@@ -696,7 +714,7 @@ static void wpa_tdls_peer_clear(struct wpa_sm *sm, struct wpa_tdls_peer *peer) + peer->cipher = 0; + peer->qos_info = 0; + peer->wmm_capable = 0; +- peer->tpk_set = peer->tpk_success = 0; ++ peer->tk_set = peer->tpk_set = peer->tpk_success = 0; + peer->chan_switch_enabled = 0; + os_memset(&peer->tpk, 0, sizeof(peer->tpk)); + os_memset(peer->inonce, 0, WPA_NONCE_LEN); +@@ -1159,6 +1177,7 @@ skip_rsnie: + wpa_tdls_peer_free(sm, peer); + return -1; + } ++ peer->tk_set = 0; /* A new nonce results in a new TK */ + wpa_hexdump(MSG_DEBUG, "TDLS: Initiator Nonce for TPK handshake", + peer->inonce, WPA_NONCE_LEN); + os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN); +@@ -1751,6 +1770,19 @@ static int wpa_tdls_addset_peer(struct wpa_sm *sm, struct wpa_tdls_peer *peer, + } + + ++static int tdls_nonce_set(const u8 *nonce) ++{ ++ int i; ++ ++ for (i = 0; i < WPA_NONCE_LEN; i++) { ++ if (nonce[i]) ++ return 1; ++ } ++ ++ return 0; ++} ++ ++ + static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr, + const u8 *buf, size_t len) + { +@@ -2004,7 +2036,8 @@ skip_rsn: + peer->rsnie_i_len = kde.rsn_ie_len; + peer->cipher = cipher; + +- if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0) { ++ if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0 || ++ !tdls_nonce_set(peer->inonce)) { + /* + * There is no point in updating the RNonce for every obtained + * TPK M1 frame (e.g., retransmission due to timeout) with the +@@ -2020,6 +2053,7 @@ skip_rsn: + "TDLS: Failed to get random data for responder nonce"); + goto error; + } ++ peer->tk_set = 0; /* A new nonce results in a new TK */ + } + + #if 0 +-- +2.7.4 + diff --git a/wpa_supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch b/wpa_supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch new file mode 100644 index 000000000..85ea1d62b --- /dev/null +++ b/wpa_supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch @@ -0,0 +1,43 @@ +From 53c5eb58e95004f86e65ee9fbfccbc291b139057 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <j(a)w1.fi> +Date: Fri, 22 Sep 2017 11:25:02 +0300 +Subject: [PATCH 7/8] WNM: Ignore WNM-Sleep Mode Response without pending + request + +Commit 03ed0a52393710be6bdae657d1b36efa146520e5 ('WNM: Ignore WNM-Sleep +Mode Response if WNM-Sleep Mode has not been used') started ignoring the +response when no WNM-Sleep Mode Request had been used during the +association. This can be made tighter by clearing the used flag when +successfully processing a response. This adds an additional layer of +protection against unexpected retransmissions of the response frame. + +Signed-off-by: Jouni Malinen <j(a)w1.fi> +--- + wpa_supplicant/wnm_sta.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c +index 1b3409c..67a07ff 100644 +--- a/wpa_supplicant/wnm_sta.c ++++ b/wpa_supplicant/wnm_sta.c +@@ -260,7 +260,7 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s, + + if (!wpa_s->wnmsleep_used) { + wpa_printf(MSG_DEBUG, +- "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode has not been used in this association"); ++ "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode operation has not been requested"); + return; + } + +@@ -299,6 +299,8 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s, + return; + } + ++ wpa_s->wnmsleep_used = 0; ++ + if (wnmsleep_ie->status == WNM_STATUS_SLEEP_ACCEPT || + wnmsleep_ie->status == WNM_STATUS_SLEEP_EXIT_ACCEPT_GTK_UPDATE) { + wpa_printf(MSG_DEBUG, "Successfully recv WNM-Sleep Response " +-- +2.7.4 + diff --git a/wpa_supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch b/wpa_supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch new file mode 100644 index 000000000..b9678f681 --- /dev/null +++ b/wpa_supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch @@ -0,0 +1,82 @@ +From b372ab0b7daea719749194dc554b26e6367603f2 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <j(a)w1.fi> +Date: Fri, 22 Sep 2017 12:06:37 +0300 +Subject: [PATCH 8/8] FT: Do not allow multiple Reassociation Response frames + +The driver is expected to not report a second association event without +the station having explicitly request a new association. As such, this +case should not be reachable. However, since reconfiguring the same +pairwise or group keys to the driver could result in nonce reuse issues, +be extra careful here and do an additional state check to avoid this +even if the local driver ends up somehow accepting an unexpected +Reassociation Response frame. + +Signed-off-by: Jouni Malinen <j(a)w1.fi> +--- + src/rsn_supp/wpa.c | 3 +++ + src/rsn_supp/wpa_ft.c | 8 ++++++++ + src/rsn_supp/wpa_i.h | 1 + + 3 files changed, 12 insertions(+) + +diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c +index 0550a41..2a53c6f 100644 +--- a/src/rsn_supp/wpa.c ++++ b/src/rsn_supp/wpa.c +@@ -2440,6 +2440,9 @@ void wpa_sm_notify_disassoc(struct wpa_sm *sm) + #ifdef CONFIG_TDLS + wpa_tdls_disassoc(sm); + #endif /* CONFIG_TDLS */ ++#ifdef CONFIG_IEEE80211R ++ sm->ft_reassoc_completed = 0; ++#endif /* CONFIG_IEEE80211R */ + + /* Keys are not needed in the WPA state machine anymore */ + wpa_sm_drop_sa(sm); +diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c +index 205793e..d45bb45 100644 +--- a/src/rsn_supp/wpa_ft.c ++++ b/src/rsn_supp/wpa_ft.c +@@ -153,6 +153,7 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len, + u16 capab; + + sm->ft_completed = 0; ++ sm->ft_reassoc_completed = 0; + + buf_len = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) + + 2 + sm->r0kh_id_len + ric_ies_len + 100; +@@ -681,6 +682,11 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies, + return -1; + } + ++ if (sm->ft_reassoc_completed) { ++ wpa_printf(MSG_DEBUG, "FT: Reassociation has already been completed for this FT protocol instance - ignore unexpected retransmission"); ++ return 0; ++ } ++ + if (wpa_ft_parse_ies(ies, ies_len, &parse) < 0) { + wpa_printf(MSG_DEBUG, "FT: Failed to parse IEs"); + return -1; +@@ -781,6 +787,8 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies, + return -1; + } + ++ sm->ft_reassoc_completed = 1; ++ + if (wpa_ft_process_gtk_subelem(sm, parse.gtk, parse.gtk_len) < 0) + return -1; + +diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h +index 41f371f..56f88dc 100644 +--- a/src/rsn_supp/wpa_i.h ++++ b/src/rsn_supp/wpa_i.h +@@ -128,6 +128,7 @@ struct wpa_sm { + size_t r0kh_id_len; + u8 r1kh_id[FT_R1KH_ID_LEN]; + int ft_completed; ++ int ft_reassoc_completed; + int over_the_ds_in_progress; + u8 target_ap[ETH_ALEN]; /* over-the-DS target AP */ + int set_ptk_after_assoc; +-- +2.7.4 +

1 0

ports/core (3.3): libdevmapper: re-added pkg-config libs fix
by crux＠crux.nu 17 Oct '17

17 Oct '17

commit ed5b915a2efcd7dd25fab0e4eff5d7382f620ec3 Author: Matt Housh <jaeger(a)crux.ninja> Date: Tue Oct 17 15:24:46 2017 -0500 libdevmapper: re-added pkg-config libs fix diff --git a/libdevmapper/.signature b/libdevmapper/.signature index bbee0aca..6ae3f787 100644 --- a/libdevmapper/.signature +++ b/libdevmapper/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqnHbk1zLwBe2UnnodFGEkUG3IQJVMdWJ2sAsbYYe+1iVpOSVwlhIoZBokFRte14kSw0uV+aRz+jUB+5+yqEDNQo= -SHA256 (Pkgfile) = 877346a34cd27f55f09bf16ab043c3680e08c8dae0077d9a9c9b410a320e7bff +RWRJc1FUaeVeqgRM5PYvJvtOf5gVSaf0yyFmcG4rysts0+VVxiaz1rUe6CmLpwXixrDY/YtPM6PUbsHOrvKd1RQV9ofN9J4e+QI= +SHA256 (Pkgfile) = 5a15c22fe7a6a74d85c0681e7993471d56e54ce5389d5a363a4ca9427e6966b2 SHA256 (.footprint) = e1b2ea187ba9d1831b4ad6cdf13ec1c7179b4bfc8a77289afa0172379a962ba3 SHA256 (LVM2.2.02.175.tgz) = 4db7a3ec6d082be212f759279b54bcdfd3c3797a5ea67605746049b004632559 diff --git a/libdevmapper/Pkgfile b/libdevmapper/Pkgfile index 49403a79..54e362e3 100644 --- a/libdevmapper/Pkgfile +++ b/libdevmapper/Pkgfile @@ -5,7 +5,7 @@ name=libdevmapper version=1.02.144 -release=1 +release=2 source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/releases/LVM2.2.0… build() { @@ -29,10 +29,13 @@ build() { make device-mapper make DESTDIR=$PKG install_device-mapper install -m0644 -D udev/12-dm-permissions.rules $PKG/etc/udev/rules.d/12-dm-permissions.rules.example - + # symlink dmsetup to dmstats and not dmsetup.static ln -sf dmsetup $PKG/sbin/dmstats - + # pkgconfig insists on /lib one or the other way... sed -i '/^libdir=/s|${exec_prefix}|/usr|' $PKG/usr/lib/pkgconfig/devmapper.pc + + # fix pkg-config + sed -i 's/@RT_LIB@/-lrt/' $PKG/usr/lib/pkgconfig/devmapper.pc }

1 0

ports/contrib (3.3): thin-provisioning-tools: 0.6.3 -> 0.7.4
by crux＠crux.nu 17 Oct '17

17 Oct '17

commit bc9741ee48e852dd4090db9adcbf72c68599e9ed Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Tue Oct 17 15:56:57 2017 +1100 thin-provisioning-tools: 0.6.3 -> 0.7.4 diff --git a/thin-provisioning-tools/.footprint b/thin-provisioning-tools/.footprint index 5ac0c633..fdcb53c0 100644 --- a/thin-provisioning-tools/.footprint +++ b/thin-provisioning-tools/.footprint @@ -5,6 +5,7 @@ lrwxrwxrwx root/root usr/sbin/cache_dump -> pdata_tools lrwxrwxrwx root/root usr/sbin/cache_metadata_size -> pdata_tools lrwxrwxrwx root/root usr/sbin/cache_repair -> pdata_tools lrwxrwxrwx root/root usr/sbin/cache_restore -> pdata_tools +lrwxrwxrwx root/root usr/sbin/cache_writeback -> pdata_tools lrwxrwxrwx root/root usr/sbin/era_check -> pdata_tools lrwxrwxrwx root/root usr/sbin/era_dump -> pdata_tools lrwxrwxrwx root/root usr/sbin/era_invalidate -> pdata_tools @@ -24,11 +25,14 @@ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man8/ -rw-r--r-- root/root usr/share/man/man8/cache_check.8.gz -rw-r--r-- root/root usr/share/man/man8/cache_dump.8.gz +-rw-r--r-- root/root usr/share/man/man8/cache_metadata_size.8.gz -rw-r--r-- root/root usr/share/man/man8/cache_repair.8.gz -rw-r--r-- root/root usr/share/man/man8/cache_restore.8.gz +-rw-r--r-- root/root usr/share/man/man8/cache_writeback.8.gz -rw-r--r-- root/root usr/share/man/man8/era_check.8.gz -rw-r--r-- root/root usr/share/man/man8/era_dump.8.gz -rw-r--r-- root/root usr/share/man/man8/era_invalidate.8.gz +-rw-r--r-- root/root usr/share/man/man8/era_restore.8.gz -rw-r--r-- root/root usr/share/man/man8/thin_check.8.gz -rw-r--r-- root/root usr/share/man/man8/thin_delta.8.gz -rw-r--r-- root/root usr/share/man/man8/thin_dump.8.gz diff --git a/thin-provisioning-tools/.md5sum b/thin-provisioning-tools/.md5sum index 33cc8134..36cad67e 100644 --- a/thin-provisioning-tools/.md5sum +++ b/thin-provisioning-tools/.md5sum @@ -1 +1,2 @@ -28b352363ea7eb6698ad2efcd7d8c2ae v0.6.3.tar.gz +ba8fe139a151e403c88c75e2a78d703c 0001-fix-build-with-testing-disabled.patch +b4d6129f37fd7ea4d663a876e0fa8bc7 v0.7.4.tar.gz diff --git a/thin-provisioning-tools/.signature b/thin-provisioning-tools/.signature index ae231990..ac4d666d 100644 --- a/thin-provisioning-tools/.signature +++ b/thin-provisioning-tools/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38D2202NrKC7XHjWg9xBcffFULqksCtcQ7xX/cl0EgNkdE2t36fb+Q8HYs1ic6eIYJrzubisqWOIwv848Lh+AgI= -SHA256 (Pkgfile) = fe491710ac7f0e5eeccfd75bca3ed84844fd08e37a7d56dadf3e5ef4021bbe4b -SHA256 (.footprint) = a2bb1fee32f3762dec477186a957516a5eefd527bdee0cda0f4056d1c7eec91a -SHA256 (v0.6.3.tar.gz) = 52d808c29dcaa83c142ceb2b418d01e9423811b082eff63fa0336bb7f0590c45 +RWSagIOpLGJF39mdMfNO2v3exvEN68GW/F2QA8oSRvFdcI8Dbu5k+lDX4oyNybbJoSnhU5EkvC6TC7CgFe5uLvcd0dURZFHmeQ0= +SHA256 (Pkgfile) = 7ac33eee4a06ebf686af6b01565571332d6aa527a94403e88c6e6f85130b9fe0 +SHA256 (.footprint) = ee613c17160229defea0d615a32d162e3af47786c70d6bb18599f8ef5824ef9d +SHA256 (v0.7.4.tar.gz) = f65f84e653e182480dacad77c611e13cd6de1c354e02fb4b96db4d2f328c3904 +SHA256 (0001-fix-build-with-testing-disabled.patch) = 8f59d9076ed23d593f8671792804cbfeb8bdae5c996200e1269f27fa49a6b873 diff --git a/thin-provisioning-tools/0001-fix-build-with-testing-disabled.patch b/thin-provisioning-tools/0001-fix-build-with-testing-disabled.patch new file mode 100644 index 00000000..4c1c1db3 --- /dev/null +++ b/thin-provisioning-tools/0001-fix-build-with-testing-disabled.patch @@ -0,0 +1,35 @@ +From 8d75be81120b9cf172c95d0153c5f845ed804234 Mon Sep 17 00:00:00 2001 +From: Adam Sampson <ats-github(a)offog.org> +Date: Mon, 16 Oct 2017 13:07:36 +0100 +Subject: [functional-tests] fix build with testing disabled (#88) + +The rule for lib/libft.so is only enabled with --enable-testing, +so the default target shouldn't depend unconditionally on it. +With the default configure options, the build failed with: +make: *** No rule to make target 'lib/libft.so', needed by 'all'. Stop. +--- + Makefile.in | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index e745739..02b75dd 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -21,8 +21,13 @@ V=@ + PROGRAMS=\ + bin/pdata_tools + ++ifeq ("@TESTING@", "yes") ++TESTLIBS=\ ++ lib/libft.so ++endif ++ + .PHONY: all +-all: $(PROGRAMS) lib/libft.so ++all: $(PROGRAMS) $(TESTLIBS) + + SOURCE=\ + base/output_file_requirements.cc \ +-- +cgit v1.1-22-g1649 + diff --git a/thin-provisioning-tools/Pkgfile b/thin-provisioning-tools/Pkgfile index 66afea3a..75fb97e0 100644 --- a/thin-provisioning-tools/Pkgfile +++ b/thin-provisioning-tools/Pkgfile @@ -5,13 +5,16 @@ # Depends on: boost expat libaio name=thin-provisioning-tools -version=0.6.3 +version=0.7.4 release=1 -source=(https://github.com/jthornber/$name/archive/v$version.tar.gz) +source=(https://github.com/jthornber/$name/archive/v$version.tar.gz + 0001-fix-build-with-testing-disabled.patch) build() { cd $name-$version + patch -p1 -i $SRC/0001-fix-build-with-testing-disabled.patch + autoconf ./configure --prefix=/usr

1 0

ports/opt (3.3): flash-player-plugin: 27.0.0.130 -> 27.0.0.170
by crux＠crux.nu 17 Oct '17

17 Oct '17

commit 20c103a502445cce22169012befdd28a642c17dc Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Tue Oct 17 13:58:20 2017 +1100 flash-player-plugin: 27.0.0.130 -> 27.0.0.170 diff --git a/flash-player-plugin/.md5sum b/flash-player-plugin/.md5sum index d19c62efc..185014c4a 100644 --- a/flash-player-plugin/.md5sum +++ b/flash-player-plugin/.md5sum @@ -1 +1 @@ -b9c56ec3866d11c252e62eb89324d1e7 flash-player-npapi-27.0.0.130-release.x86_64.rpm +aa6fc858098b0e8bf624ccb6bd9905e7 flash-player-npapi-27.0.0.170-release.x86_64.rpm diff --git a/flash-player-plugin/.signature b/flash-player-plugin/.signature index 938dab71e..d8b6c76b7 100644 --- a/flash-player-plugin/.signature +++ b/flash-player-plugin/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VlFNt3pYwljWZgcQyTbCjxKnnd7oz2tc5thc7ZTF8rhSFCBZKGd1G1QbakBFt2jjxjWZ2yp9z8Qr60Tfn7gswU= -SHA256 (Pkgfile) = e4aabf4c572345b33c26ba43762e87d52c98b739f306c6f3bc24c5488a2a74ac +RWSE3ohX2g5d/dMeV3MwfVfXGAsqYTN68sYr3I9IAHiTCUrtZJPRONWgO5wBkXo1Hvy8zbAwvqRZ0ZQtxe1Cb/PKbrqZJ8CrWQo= +SHA256 (Pkgfile) = 9f383af4e219803ffcf9269cec4271226e8718ff119898250a91898a62dff580 SHA256 (.footprint) = 9bc6ecbc9ca40c49f8ac0db0024a96e10a49e188ae0402544f6b70ab32e7277f -SHA256 (flash-player-npapi-27.0.0.130-release.x86_64.rpm) = 4b8b3588737899be70a31cfbbaca5c762990ca9bb67bef3b59e7e50d887e7bea +SHA256 (flash-player-npapi-27.0.0.170-release.x86_64.rpm) = 21d2cfb71fd12e45cd73c24519131cbd8e5549278dc0879d13ad9b7e002e8f5c diff --git a/flash-player-plugin/Pkgfile b/flash-player-plugin/Pkgfile index a935944bb..cf4e158e7 100644 --- a/flash-player-plugin/Pkgfile +++ b/flash-player-plugin/Pkgfile @@ -4,7 +4,7 @@ # Packager: Matt Housh, jaeger at crux dot nu name=flash-player-plugin -version=27.0.0.130 +version=27.0.0.170 release=1 source=(https://fpdownload.adobe.com/pub/flashplayer/pdc/$version/flash-pla…

1 0

ports/contrib (3.3): partclone: fix missing source
by crux＠crux.nu 17 Oct '17

17 Oct '17

commit 3b46c3040c6887cc712309e2b67008f5eba63106 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Tue Oct 17 13:45:57 2017 +1100 partclone: fix missing source diff --git a/partclone/.md5sum b/partclone/.md5sum index 6e2b8fa0..9ba4e15f 100644 --- a/partclone/.md5sum +++ b/partclone/.md5sum @@ -1 +1 @@ -1b6602fa623afc37a8c5252335d1bb01 partclone_0.2.89.orig.tar.gz +9a4fadfea79f9051aaf7c999534ab501 partclone-0.2.89.tar.gz diff --git a/partclone/.signature b/partclone/.signature index 8e6bb7f9..71257e29 100644 --- a/partclone/.signature +++ b/partclone/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wc7EiRdHbz/y4gS664xX//FSuh9r+hiJvgrqRKG60iArdpiRsWYNNcHyjuopHN4nxRgvHPYb/ujCXe94jbkVQQ= -SHA256 (Pkgfile) = fc970d57e31e874b176f348641579cece85be49070099f9e5d7d17a14eb03282 +RWSagIOpLGJF34iCknPUrRvQiyM3rkYj8V0VxQdVAhvxBexGNConA5PKmUFCyjLpcBY4aL5uBrULY0kDaaMwdYSwXphZqffwqQQ= +SHA256 (Pkgfile) = 14554059c66005372d74e416e3fe3a05f2ce313731c5e9ae6c2930c67a8c1a14 SHA256 (.footprint) = 6005e4f93d011b32c697ea47e3f458c0324fdc1d6daba327dcbd19f0c3abcf89 -SHA256 (partclone_0.2.89.orig.tar.gz) = 25fe77774e4e5a50501a0c3796833f7b5a129dc60555eb833806be83a58f5219 +SHA256 (partclone-0.2.89.tar.gz) = 32cffdfcb1dcb56d46289ae23228ed3c38a2121654a6209850e9fbe65ea428c6 diff --git a/partclone/Pkgfile b/partclone/Pkgfile index 662e7357..b6e320a9 100644 --- a/partclone/Pkgfile +++ b/partclone/Pkgfile @@ -7,7 +7,7 @@ name=partclone version=0.2.89 release=1 -source=(https://partclone.nchc.org.tw/download/stable/$version/${name}_$version.orig.tar.gz) +source=(https://downloads.sourceforge.net/project/$name/stable/$version/$name-$version.tar.gz) build() { cd $name-$version

1 0

ports/opt (3.3): btrfs-progs: updated to 4.13.3
by crux＠crux.nu 16 Oct '17

16 Oct '17

commit 05b686fa153bab7092a57d43291176cd52142102 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Mon Oct 16 21:15:56 2017 +0200 btrfs-progs: updated to 4.13.3 diff --git a/btrfs-progs/.md5sum b/btrfs-progs/.md5sum index 0294b153e..efeb368f0 100644 --- a/btrfs-progs/.md5sum +++ b/btrfs-progs/.md5sum @@ -1 +1 @@ -69699461c8e4161d7027b6da22ace35c btrfs-progs-v4.13.2.tar.xz +6e9e6720d58a3968fd3db15eaa72ca6d btrfs-progs-v4.13.3.tar.xz diff --git a/btrfs-progs/.signature b/btrfs-progs/.signature index 20760647a..fe11e331e 100644 --- a/btrfs-progs/.signature +++ b/btrfs-progs/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Wt+lwriIBQ+XPWCOWUtoMHEZ9RMQaSHpI1BojuHalfzdQmiXJ4z9NRxp/o73hD4mVIdkSMnMZYSmZdDv0NUwgo= -SHA256 (Pkgfile) = ee7f1a96aa17dcf09c94749dbd5327374120d8cbe76709628b27e9508d1e399a +RWSE3ohX2g5d/WmMhAbnKD0Lyq5N3q37TpjhgbkUCjPDqAd6uB+qaja4bv112zzeLB+IVci9fbIaYa5lEWZrNBuDH2MWjude7gU= +SHA256 (Pkgfile) = 1c4faa25142d5f06271f8869e940823796a3125927b8847f3b29c57cce5bdbed SHA256 (.footprint) = a29435b0a075edf510a96e949e3a0d21138e6af59f76ac28307f4435b35da84d -SHA256 (btrfs-progs-v4.13.2.tar.xz) = 75c7331f1306495dfffabe542ef6c5539808f0cdaebdf14fa8b7ab09c59448bd +SHA256 (btrfs-progs-v4.13.3.tar.xz) = 805bdb0031c21a0a5d2ba295a8c9bdd8ba831a68c3fa801aab85677ec902d783 diff --git a/btrfs-progs/Pkgfile b/btrfs-progs/Pkgfile index 5c5d0650b..8c57a27c8 100644 --- a/btrfs-progs/Pkgfile +++ b/btrfs-progs/Pkgfile @@ -4,7 +4,7 @@ # Depends on: util-linux e2fsprogs lzo zlib name=btrfs-progs -version=4.13.2 +version=4.13.3 release=1 source=(https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/bt…

1 0

ports/contrib (3.3): asterisk: 13.7.2 -> 13.17.2
by crux＠crux.nu 16 Oct '17

16 Oct '17

commit 9d0535a2d71faf387f5d620183ec007bec6ca224 Author: Alan Mizrahi <alan at mizrahi dot com dot ve> Date: Mon Oct 16 11:32:23 2017 +0900 asterisk: 13.7.2 -> 13.17.2 diff --git a/asterisk/.footprint b/asterisk/.footprint index 8cfda94f..ec07923f 100644 --- a/asterisk/.footprint +++ b/asterisk/.footprint @@ -10,6 +10,7 @@ drwxr-x--- root/asterisk etc/asterisk/default/ -rw-r----- root/asterisk etc/asterisk/default/app_mysql.conf -rw-r----- root/asterisk etc/asterisk/default/app_skel.conf -rw-r----- root/asterisk etc/asterisk/default/ari.conf +-rw-r----- root/asterisk etc/asterisk/default/ast_debug_tools.conf -rw-r----- root/asterisk etc/asterisk/default/asterisk.conf -rw-r----- root/asterisk etc/asterisk/default/calendar.conf -rw-r----- root/asterisk etc/asterisk/default/ccss.conf @@ -72,6 +73,7 @@ drwxr-x--- root/asterisk etc/asterisk/default/ -rw-r----- root/asterisk etc/asterisk/default/oss.conf -rw-r----- root/asterisk etc/asterisk/default/phone.conf -rw-r----- root/asterisk etc/asterisk/default/phoneprov.conf +-rw-r----- root/asterisk etc/asterisk/default/pjproject.conf -rw-r----- root/asterisk etc/asterisk/default/pjsip.conf -rw-r----- root/asterisk etc/asterisk/default/pjsip_notify.conf -rw-r----- root/asterisk etc/asterisk/default/pjsip_wizard.conf @@ -121,6 +123,7 @@ drwxr-xr-x root/root usr/include/asterisk/ -rw-r--r-- root/root usr/include/asterisk/ael_structs.h -rw-r--r-- root/root usr/include/asterisk/agi.h -rw-r--r-- root/root usr/include/asterisk/alaw.h +-rw-r--r-- root/root usr/include/asterisk/alertpipe.h -rw-r--r-- root/root usr/include/asterisk/aoc.h -rw-r--r-- root/root usr/include/asterisk/app.h -rw-r--r-- root/root usr/include/asterisk/ari.h @@ -227,7 +230,9 @@ drwxr-xr-x root/root usr/include/asterisk/doxygen/ -rw-r--r-- root/root usr/include/asterisk/mod_format.h -rw-r--r-- root/root usr/include/asterisk/module.h -rw-r--r-- root/root usr/include/asterisk/monitor.h +-rw-r--r-- root/root usr/include/asterisk/multicast_rtp.h -rw-r--r-- root/root usr/include/asterisk/musiconhold.h +-rw-r--r-- root/root usr/include/asterisk/named_locks.h -rw-r--r-- root/root usr/include/asterisk/netsock.h -rw-r--r-- root/root usr/include/asterisk/netsock2.h -rw-r--r-- root/root usr/include/asterisk/network.h @@ -249,6 +254,8 @@ drwxr-xr-x root/root usr/include/asterisk/doxygen/ -rw-r--r-- root/root usr/include/asterisk/res_hep.h -rw-r--r-- root/root usr/include/asterisk/res_mwi_external.h -rw-r--r-- root/root usr/include/asterisk/res_odbc.h +-rw-r--r-- root/root usr/include/asterisk/res_odbc_transaction.h +-rw-r--r-- root/root usr/include/asterisk/res_pjproject.h -rw-r--r-- root/root usr/include/asterisk/res_pjsip.h -rw-r--r-- root/root usr/include/asterisk/res_pjsip_body_generator_types.h -rw-r--r-- root/root usr/include/asterisk/res_pjsip_cli.h @@ -336,7 +343,6 @@ drwxr-xr-x root/root usr/lib/asterisk/modules/ -rwxr-xr-x root/root usr/lib/asterisk/modules/app_chanspy.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_confbridge.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_controlplayback.so --rwxr-xr-x root/root usr/lib/asterisk/modules/app_dahdiras.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_db.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_dial.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_dictate.so @@ -348,7 +354,6 @@ drwxr-xr-x root/root usr/lib/asterisk/modules/ -rwxr-xr-x root/root usr/lib/asterisk/modules/app_exec.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_externalivr.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_festival.so --rwxr-xr-x root/root usr/lib/asterisk/modules/app_flash.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_followme.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_forkcdr.so -rwxr-xr-x root/root usr/lib/asterisk/modules/app_getcpeid.so @@ -408,29 +413,24 @@ drwxr-xr-x root/root usr/lib/asterisk/modules/ -rwxr-xr-x root/root usr/lib/asterisk/modules/cel_sqlite3_custom.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_alsa.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_bridge_media.so --rwxr-xr-x root/root usr/lib/asterisk/modules/chan_console.so --rwxr-xr-x root/root usr/lib/asterisk/modules/chan_dahdi.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_iax2.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_mgcp.so --rwxr-xr-x root/root usr/lib/asterisk/modules/chan_multicast_rtp.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_oss.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_phone.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_pjsip.so +-rwxr-xr-x root/root usr/lib/asterisk/modules/chan_rtp.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_sip.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_skinny.so -rwxr-xr-x root/root usr/lib/asterisk/modules/chan_unistim.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_a_mu.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_adpcm.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_alaw.so --rwxr-xr-x root/root usr/lib/asterisk/modules/codec_dahdi.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_g722.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_g726.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_gsm.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_ilbc.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_lpc10.so --rwxr-xr-x root/root usr/lib/asterisk/modules/codec_opus.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_resample.so --rwxr-xr-x root/root usr/lib/asterisk/modules/codec_speex.so -rwxr-xr-x root/root usr/lib/asterisk/modules/codec_ulaw.so -rwxr-xr-x root/root usr/lib/asterisk/modules/format_g719.so -rwxr-xr-x root/root usr/lib/asterisk/modules/format_g723.so @@ -447,7 +447,6 @@ drwxr-xr-x root/root usr/lib/asterisk/modules/ -rwxr-xr-x root/root usr/lib/asterisk/modules/format_siren7.so -rwxr-xr-x root/root usr/lib/asterisk/modules/format_sln.so -rwxr-xr-x root/root usr/lib/asterisk/modules/format_vox.so --rwxr-xr-x root/root usr/lib/asterisk/modules/format_vp8.so -rwxr-xr-x root/root usr/lib/asterisk/modules/format_wav.so -rwxr-xr-x root/root usr/lib/asterisk/modules/format_wav_gsm.so -rwxr-xr-x root/root usr/lib/asterisk/modules/func_aes.so @@ -491,7 +490,6 @@ drwxr-xr-x root/root usr/lib/asterisk/modules/ -rwxr-xr-x root/root usr/lib/asterisk/modules/func_sha1.so -rwxr-xr-x root/root usr/lib/asterisk/modules/func_shell.so -rwxr-xr-x root/root usr/lib/asterisk/modules/func_sorcery.so --rwxr-xr-x root/root usr/lib/asterisk/modules/func_speex.so -rwxr-xr-x root/root usr/lib/asterisk/modules/func_sprintf.so -rwxr-xr-x root/root usr/lib/asterisk/modules/func_srv.so -rwxr-xr-x root/root usr/lib/asterisk/modules/func_strings.so @@ -506,7 +504,6 @@ drwxr-xr-x root/root usr/lib/asterisk/modules/ -rwxr-xr-x root/root usr/lib/asterisk/modules/pbx_config.so -rwxr-xr-x root/root usr/lib/asterisk/modules/pbx_dundi.so -rwxr-xr-x root/root usr/lib/asterisk/modules/pbx_loopback.so --rwxr-xr-x root/root usr/lib/asterisk/modules/pbx_lua.so -rwxr-xr-x root/root usr/lib/asterisk/modules/pbx_realtime.so -rwxr-xr-x root/root usr/lib/asterisk/modules/pbx_spool.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_adsi.so @@ -536,15 +533,17 @@ drwxr-xr-x root/root usr/lib/asterisk/modules/ -rwxr-xr-x root/root usr/lib/asterisk/modules/res_fax.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_fax_spandsp.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_format_attr_celt.so +-rwxr-xr-x root/root usr/lib/asterisk/modules/res_format_attr_g729.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_format_attr_h263.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_format_attr_h264.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_format_attr_opus.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_format_attr_silk.so +-rwxr-xr-x root/root usr/lib/asterisk/modules/res_format_attr_siren14.so +-rwxr-xr-x root/root usr/lib/asterisk/modules/res_format_attr_siren7.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_format_attr_vp8.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_hep.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_hep_pjsip.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_hep_rtcp.so --rwxr-xr-x root/root usr/lib/asterisk/modules/res_http_post.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_http_websocket.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_limit.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_manager_devicestate.so @@ -554,6 +553,7 @@ drwxr-xr-x root/root usr/lib/asterisk/modules/ -rwxr-xr-x root/root usr/lib/asterisk/modules/res_mutestream.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_parking.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_phoneprov.so +-rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjproject.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_acl.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_authenticator_digest.so @@ -563,16 +563,15 @@ drwxr-xr-x root/root usr/lib/asterisk/modules/ -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_diversion.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_dlg_options.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_dtmf_info.so +-rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_empty_info.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_endpoint_identifier_anonymous.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_endpoint_identifier_ip.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_endpoint_identifier_user.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_exten_state.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_header_funcs.so --rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_keepalive.so --rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_log_forwarder.so +-rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_history.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_logger.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_messaging.so --rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_multihomed.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_mwi.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_mwi_body_generator.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_nat.so @@ -597,6 +596,7 @@ drwxr-xr-x root/root usr/lib/asterisk/modules/ -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_session.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_sips_contact.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_t38.so +-rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_transport_management.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_transport_websocket.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_pjsip_xpidf_body_generator.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_realtime.so @@ -619,7 +619,6 @@ drwxr-xr-x root/root usr/lib/asterisk/modules/ -rwxr-xr-x root/root usr/lib/asterisk/modules/res_stasis_snoop.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_statsd.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_stun_monitor.so --rwxr-xr-x root/root usr/lib/asterisk/modules/res_timing_dahdi.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_timing_pthread.so -rwxr-xr-x root/root usr/lib/asterisk/modules/res_timing_timerfd.so lrwxrwxrwx root/root usr/lib/libasteriskssl.so -> libasteriskssl.so.1 @@ -635,9 +634,6 @@ drwxr-xr-x root/root usr/sbin/ lrwxrwxrwx root/root usr/sbin/rasterisk -> asterisk -rwxr-xr-x root/root usr/sbin/safe_asterisk drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/dahdi/ -drwxr-xr-x root/root usr/share/dahdi/span_config.d/ --rw-r--r-- root/root usr/share/dahdi/span_config.d/40-asterisk drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man8/ -rw-r--r-- root/root usr/share/man/man8/aelparse.8.gz @@ -677,6 +673,11 @@ drwxr-xr-x asterisk/asterisk var/lib/asterisk/rest-api/ -rw-r--r-- asterisk/asterisk var/lib/asterisk/rest-api/recordings.json -rw-r--r-- asterisk/asterisk var/lib/asterisk/rest-api/resources.json -rw-r--r-- asterisk/asterisk var/lib/asterisk/rest-api/sounds.json +drwxr-xr-x asterisk/asterisk var/lib/asterisk/scripts/ +-rwxr-xr-x asterisk/asterisk var/lib/asterisk/scripts/ast_coredumper +-rwxr-xr-x asterisk/asterisk var/lib/asterisk/scripts/ast_logescalator +-rwxr-xr-x asterisk/asterisk var/lib/asterisk/scripts/ast_loggrabber +-rwxr-xr-x asterisk/asterisk var/lib/asterisk/scripts/refcounter.py drwxr-xr-x asterisk/asterisk var/lib/asterisk/sounds/ drwxr-xr-x asterisk/asterisk var/lib/asterisk/static-http/ -rw-r--r-- asterisk/asterisk var/lib/asterisk/static-http/ajamdemo.html @@ -686,6 +687,7 @@ drwxr-xr-x asterisk/asterisk var/lib/asterisk/static-http/ -rw-r--r-- asterisk/asterisk var/lib/asterisk/static-http/core-en_US.xml -rw-r--r-- asterisk/asterisk var/lib/asterisk/static-http/mantest.html -rw-r--r-- asterisk/asterisk var/lib/asterisk/static-http/prototype.js +drwxr-xr-x asterisk/asterisk var/lib/asterisk/third-party/ drwxr-xr-x root/root var/log/ drwxr-xr-x asterisk/asterisk var/log/asterisk/ drwxr-xr-x asterisk/asterisk var/log/asterisk/cdr-csv/ diff --git a/asterisk/.md5sum b/asterisk/.md5sum index f78e0e84..1b31fe9f 100644 --- a/asterisk/.md5sum +++ b/asterisk/.md5sum @@ -1,10 +1,8 @@ -6c0321fa62f78fd89a5a5c9309850ef9 asterisk-13.7.2.tar.gz +a63d9ff1a393031065c90aa3ac447cff asterisk-13.17.2.tar.gz 0a336b92908bcff6cb87fe3797aea70c asterisk.rc -be145ed0aa3a84b350a619dd8a61f675 bb2925fc4eaad5b30b93eece851297de5c12e06c.tar.gz -82dd1478c2c3fe22353ee606f57d14ac build-disable-astcanary.patch -6a094135e25cf7c29166f451497ca832 build-disable-moh-wav.patch -d87c70c27bbf4c7b87b9233299accc54 build-disable-sounds-en-gsm.patch -26eb7fd153cf476762961f8d8506dd53 build-enable-aelparse.patch -bba4c1d952a3998303f6618825b0feee build-enable-cdr-mysql.patch -431f79999f54e9b8695d65ac3af29691 build-enable-ilbc.patch -26f4bc4b21bde4161349cb0812b634a5 build-enable-opus-vp8.patch +aa218748cf378f9e16cb2a591235105c build-disable-astcanary.patch +befe4c13c82eaa0875c880cf93061664 build-disable-moh-wav.patch +b3d27ba36fff7f34bdf4ef8840ca80fe build-disable-sounds-en-gsm.patch +9ab8876475f34a9f160f5035fe471f83 build-enable-aelparse.patch +27ff84cbc05921c4bd2d207512331b23 build-enable-cdr-mysql.patch +982fea5bc4d234b487449e5ee73b95b2 build-enable-ilbc.patch diff --git a/asterisk/.signature b/asterisk/.signature index 7d937316..91ce67a5 100644 --- a/asterisk/.signature +++ b/asterisk/.signature @@ -1,14 +1,12 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33ueF6ON02NzHlplGl4Dol2xIr2xcsHFDLwVTxky24OrPtaqMdsNiBViuTE6xUk4jOEgWGmWnvRHCD0x1hRqeAw= -SHA256 (Pkgfile) = f093001d22ca6554a083c6d44f2252b5bdf26f0ecfb82fa3e963df4f84e1f0aa -SHA256 (.footprint) = 0bbb079cde2b106d95e269da4fd7d830bcffc71281aa5d252b9c8cc3849b7393 -SHA256 (asterisk-13.7.2.tar.gz) = 8a22856f0cff22b6f1d901eb0a91d459cd73f3ab1f71e9738b947428947fb232 -SHA256 (bb2925fc4eaad5b30b93eece851297de5c12e06c.tar.gz) = db450d25e62ed2ba298614b8194e6ef65a6657b7faadcf0c288f146d074176c9 +RWSagIOpLGJF3/sU4ukkqaZA5Rqe6cwUdONE5gKexqZ1rdAWLaeOlUId6XVtoa1CJCXfQekeosMXC0DOtAzIHnTr3ueThXLIeA8= +SHA256 (Pkgfile) = 90fd6edfe5fb53f8ee743638a06f07c2aab89f4ec7513e11af3760b8243eed28 +SHA256 (.footprint) = a02d9671c0befe3c00d7bf599d6b2b19a7f54922f2210e5ef60e88c6f55bde09 +SHA256 (asterisk-13.17.2.tar.gz) = 19ae0565687b85bde382b2cc274dd5a27ac33dc57a4eb3b663cb5ad9b238f1ac SHA256 (asterisk.rc) = becdd19e0646ff4bdb3ba057ca55897c74ddefcefa3df9ac27ed537ec0d36700 -SHA256 (build-enable-aelparse.patch) = 00cd33125e964b085c08fe9ba1e2195d3b3e4875bb19329b5e3a75c45f4bdea5 -SHA256 (build-disable-astcanary.patch) = b9f728e4a2316ebb9f9409856246e7ed50890516b4fac0a8f156e48d578a95cf -SHA256 (build-enable-cdr-mysql.patch) = 49581b93f5c1ad3205223e1026427da14aad4f153292525d7ffeaff531770bb1 -SHA256 (build-enable-ilbc.patch) = 59cdfdb7349e95466c8ded7fa27550d8fb4f0692e0083281e6405dd0d37805b8 -SHA256 (build-disable-moh-wav.patch) = 3189905225d0c9c80e71dfb3a503722ee1d4286c3447d9745414d3a95c5726c1 -SHA256 (build-enable-opus-vp8.patch) = e9771ad6faeace8bbbc8806bc927da1e7c89544a7342c48280299af6772a8bea -SHA256 (build-disable-sounds-en-gsm.patch) = afd3705d89651b73b791a203fc52b5ee1792402aae28de092b5a29479e1c52ff +SHA256 (build-enable-aelparse.patch) = 6906efe6a9b3a85d63e855419d4e5179d06010895a2411b20a0cad51e51c104b +SHA256 (build-disable-astcanary.patch) = 17398ea759641f67ee74fcf10648337759e34131128f54172289dec0762fd9b1 +SHA256 (build-enable-cdr-mysql.patch) = b9efd4d5c8c67cb1c40f211eaec8ddf8640704382206a701e6ff3e5f6bbb278c +SHA256 (build-enable-ilbc.patch) = 292a3e968acd9457ae8c752ab44c8877ffe86c909c389d49125939315510014d +SHA256 (build-disable-moh-wav.patch) = d1eb0a98d5847b0d42623ac33955cef596ee191aab6b07949edec689f43263ae +SHA256 (build-disable-sounds-en-gsm.patch) = 5a4f88c02768a22d0ed03fcc902f94be76bb92163f2b589a8ba95a18d0121e96 diff --git a/asterisk/Pkgfile b/asterisk/Pkgfile index 935b34c2..2bdcd1a3 100644 --- a/asterisk/Pkgfile +++ b/asterisk/Pkgfile @@ -1,36 +1,26 @@ # Description: PBX Software implementation # URL: http://www.asterisk.org # Maintainer: Alan Mizrahi, alan at mizrahi dot com dot ve -# Depends on: openssl ncurses jansson -# Optional: dahdi pjsip opus +# Depends on: openssl ncurses jansson libxml2 +# Optional: dahdi pjsip opus mysql name=asterisk -version=13.7.2 +version=13.17.2 release=5 source=( http://downloads.digium.com/pub/asterisk/releases/asterisk-$version.tar.gz -https://github.com/seanbright/asterisk-opus/archive/bb2925fc4eaad5b30b93eece851297de5c12e06c.tar.gz asterisk.rc build-enable-aelparse.patch build-disable-astcanary.patch build-enable-cdr-mysql.patch build-enable-ilbc.patch build-disable-moh-wav.patch -build-enable-opus-vp8.patch build-disable-sounds-en-gsm.patch ) build () { cd asterisk-$version - # patch to add Opus transcoding and VP8 passthrough - # https://github.com/seanbright/asterisk-opus - if [ -f /usr/include/opus/opus.h ]; then - cp $SRC/asterisk-opus-*/codecs/* codecs/ - cp $SRC/asterisk-opus-*/formats/* formats/ - ./bootstrap.sh - fi - ./configure \ --prefix=/usr \ --with-ncurses \ @@ -41,12 +31,6 @@ build () { # Generate a menuselect-tree file make menuselect-tree - # Enable Opus and VP8 - if [ -f /usr/include/opus/opus.h ]; then - patch -p1 -i $SRC/asterisk-opus-*/asterisk.patch - patch -p1 -i $SRC/build-enable-opus-vp8.patch - fi - # Add aelparse utility patch -p1 -i $SRC/build-enable-aelparse.patch diff --git a/asterisk/build-disable-astcanary.patch b/asterisk/build-disable-astcanary.patch index dbf13e7d..958991ad 100644 --- a/asterisk/build-disable-astcanary.patch +++ b/asterisk/build-disable-astcanary.patch @@ -1,6 +1,6 @@ ---- asterisk-13.2.0/menuselect-tree 2015-04-01 13:33:21.374042590 +0900 -+++ asterisk-13.2.0/menuselect-tree.astcanary-disable 2015-04-01 13:54:31.376756837 +0900 -@@ -1755,7 +1755,7 @@ +--- asterisk-13.13.1/menuselect-tree.orig 2017-01-30 11:04:27.059563497 +0900 ++++ asterisk-13.13.1/menuselect-tree 2017-01-30 11:05:31.552645320 +0900 +@@ -1924,7 +1924,7 @@ <support_level>extended</support_level> </member> <member name="astcanary"> diff --git a/asterisk/build-disable-moh-wav.patch b/asterisk/build-disable-moh-wav.patch index 2f1730ed..356d03c2 100644 --- a/asterisk/build-disable-moh-wav.patch +++ b/asterisk/build-disable-moh-wav.patch @@ -1,6 +1,6 @@ ---- asterisk-13.2.0/menuselect-tree 2015-04-01 13:33:21.374042590 +0900 -+++ asterisk-13.2.0/menuselect-tree.moh-wav-disable 2015-04-01 13:43:24.193315947 +0900 -@@ -2086,7 +2086,7 @@ +--- asterisk-13.13.1/menuselect-tree.orig 2017-01-30 11:04:27.059563497 +0900 ++++ asterisk-13.13.1/menuselect-tree 2017-01-30 11:08:43.845228750 +0900 +@@ -2282,7 +2282,7 @@ </category> <category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes"> <member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" > diff --git a/asterisk/build-disable-sounds-en-gsm.patch b/asterisk/build-disable-sounds-en-gsm.patch index f1d7674d..46fc54ef 100644 --- a/asterisk/build-disable-sounds-en-gsm.patch +++ b/asterisk/build-disable-sounds-en-gsm.patch @@ -1,6 +1,6 @@ ---- asterisk-13.2.0/menuselect-tree 2015-04-01 13:33:21.374042590 +0900 -+++ asterisk-13.2.0/menuselect-tree.sounds-en-gsm-disable 2015-04-01 13:43:09.645045100 +0900 -@@ -1877,7 +1877,7 @@ +--- asterisk-13.13.1/menuselect-tree.orig 2017-01-30 11:04:27.059563497 +0900 ++++ asterisk-13.13.1/menuselect-tree 2017-01-30 11:09:27.578391532 +0900 +@@ -2046,7 +2046,7 @@ </member> <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" > <support_level>core</support_level> diff --git a/asterisk/build-enable-aelparse.patch b/asterisk/build-enable-aelparse.patch index 2fabbe7f..a2271a1a 100644 --- a/asterisk/build-enable-aelparse.patch +++ b/asterisk/build-enable-aelparse.patch @@ -1,6 +1,6 @@ ---- asterisk-13.2.0/menuselect-tree 2015-04-01 13:33:21.374042590 +0900 -+++ asterisk-13.2.0/menuselect-tree.aelparse-enable 2015-04-01 13:49:46.451358551 +0900 -@@ -1751,7 +1751,7 @@ +--- asterisk-13.13.1/menuselect-tree.orig 2017-01-30 11:04:27.059563497 +0900 ++++ asterisk-13.13.1/menuselect-tree 2017-01-30 11:04:39.656181039 +0900 +@@ -1920,7 +1920,7 @@ </category> <category name="MENUSELECT_UTILS" displayname="Utilities" positive_output="yes"> <member name="aelparse"> diff --git a/asterisk/build-enable-cdr-mysql.patch b/asterisk/build-enable-cdr-mysql.patch index caadb20e..7bf60787 100644 --- a/asterisk/build-enable-cdr-mysql.patch +++ b/asterisk/build-enable-cdr-mysql.patch @@ -1,5 +1,5 @@ ---- asterisk-13.2.0/menuselect-tree 2015-04-01 13:33:21.374042590 +0900 -+++ asterisk-13.2.0/menuselect-tree.cdr-mysql-enable 2015-04-01 13:49:31.412842692 +0900 +--- asterisk-13.13.1/menuselect-tree.orig 2017-01-30 11:04:27.059563497 +0900 ++++ asterisk-13.13.1/menuselect-tree 2017-01-30 11:06:05.912511323 +0900 @@ -10,7 +10,7 @@ </member> <member name="cdr_mysql" displayname="MySQL CDR Backend" remove_on_change="addons/cdr_mysql.o addons/cdr_mysql.so"> diff --git a/asterisk/build-enable-ilbc.patch b/asterisk/build-enable-ilbc.patch index 77092dd8..52f94c01 100644 --- a/asterisk/build-enable-ilbc.patch +++ b/asterisk/build-enable-ilbc.patch @@ -1,6 +1,6 @@ ---- asterisk-13.2.0/menuselect-tree 2015-04-01 13:33:21.374042590 +0900 -+++ asterisk-13.2.0/menuselect-tree.ilbc-enable 2015-04-01 13:43:40.749590341 +0900 -@@ -491,6 +491,7 @@ +--- asterisk-13.13.1/menuselect-tree.orig 2017-01-30 11:04:27.059563497 +0900 ++++ asterisk-13.13.1/menuselect-tree 2017-01-30 11:08:17.595331119 +0900 +@@ -494,6 +494,7 @@ </member> <member name="codec_ilbc" displayname="iLBC Coder/Decoder" remove_on_change="codecs/codec_ilbc.o codecs/codec_ilbc.so"> <use>ilbc</use>

1 0

ports/contrib (3.3): asterisk-core-sounds-en-ulaw: 1.5 -> 1.6
by crux＠crux.nu 16 Oct '17

16 Oct '17

commit 8418b1cd0390b0e9417b35df471502642b93ddc0 Author: Alan Mizrahi <alan at mizrahi dot com dot ve> Date: Mon Oct 16 11:31:55 2017 +0900 asterisk-core-sounds-en-ulaw: 1.5 -> 1.6 diff --git a/asterisk-core-sounds-en-ulaw/.footprint b/asterisk-core-sounds-en-ulaw/.footprint index b660be80..0fd2b12e 100644 --- a/asterisk-core-sounds-en-ulaw/.footprint +++ b/asterisk-core-sounds-en-ulaw/.footprint @@ -2,6 +2,8 @@ drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ drwxr-xr-x root/root var/lib/asterisk/ drwxr-xr-x root/root var/lib/asterisk/sounds/ +-rw-r--r-- root/root var/lib/asterisk/sounds/activated.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/added.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/agent-alreadyon.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/agent-incorrect.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/agent-loggedoff.ulaw @@ -9,12 +11,24 @@ drwxr-xr-x root/root var/lib/asterisk/sounds/ -rw-r--r-- root/root var/lib/asterisk/sounds/agent-newlocation.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/agent-pass.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/agent-user.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/all-circuits-busy-now.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/ascending-2tone.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/astcc-followed-by-the-pound-key.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/at-tone-time-exactly.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/auth-incorrect.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/auth-thankyou.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/basic-pbx-ivr-main.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/beep.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/beeperr.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/call-forwarding.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/call-fwd-no-ans.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/call-fwd-on-busy.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/call-fwd-unconditional.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/call-waiting.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/calling.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/cancelled.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/cannot-complete-as-dialed.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/check-number-dial-again.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/conf-adminmenu-162.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/conf-adminmenu-18.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/conf-adminmenu-menu8.ulaw @@ -22,6 +36,7 @@ drwxr-xr-x root/root var/lib/asterisk/sounds/ -rw-r--r-- root/root var/lib/asterisk/sounds/conf-enteringno.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/conf-errormenu.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/conf-extended.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/conf-full.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/conf-getchannel.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/conf-getconfno.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/conf-getpin.ulaw @@ -56,6 +71,8 @@ drwxr-xr-x root/root var/lib/asterisk/sounds/ -rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-begin-glorious-b.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-begin-glorious-c.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-begin-leader.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-binaural-off.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-binaural-on.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-conf-begin.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-conf-end.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-dec-list-vol-in.ulaw @@ -99,6 +116,7 @@ drwxr-xr-x root/root var/lib/asterisk/sounds/ -rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-there-are.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-unlocked.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-unmuted.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/de-activated.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/demo-abouttotry.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/demo-congrats.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/demo-echodone.ulaw @@ -233,6 +251,13 @@ drwxr-xr-x root/root var/lib/asterisk/sounds/digits/ -rw-r--r-- root/root var/lib/asterisk/sounds/dir-pls-enter.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/dir-usingkeypad.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/dir-welcome.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/disabled.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/do-not-disturb.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/enabled.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/enter-num-blacklist.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/entr-num-rmv-blklist.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/extension.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/feature-not-avail-line.ulaw drwxr-xr-x root/root var/lib/asterisk/sounds/followme/ -rw-r--r-- root/root var/lib/asterisk/sounds/followme/call-from.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/followme/no-recording.ulaw @@ -240,9 +265,19 @@ drwxr-xr-x root/root var/lib/asterisk/sounds/followme/ -rw-r--r-- root/root var/lib/asterisk/sounds/followme/pls-hold-while-try.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/followme/sorry.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/followme/status.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/for.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/from-unknown-caller.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/goodbye.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/hello-world.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/hello.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/hours.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/if-correct-press.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/im-sorry.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/info-about-last-call.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/invalid.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/is-in-use.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/is-set-to.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/is.ulaw drwxr-xr-x root/root var/lib/asterisk/sounds/letters/ -rw-r--r-- root/root var/lib/asterisk/sounds/letters/a.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/letters/ascii123.ulaw @@ -305,8 +340,14 @@ drwxr-xr-x root/root var/lib/asterisk/sounds/letters/ -rw-r--r-- root/root var/lib/asterisk/sounds/letters/y.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/letters/z.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/letters/zed.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/location.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/lowercase.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/minute.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/minutes.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/num-was-successfully.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/number-not-answering.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/number.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/one-moment-please.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/pbx-invalid.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/pbx-invalidpark.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/pbx-parkingfailed.ulaw @@ -339,6 +380,10 @@ drwxr-xr-x root/root var/lib/asterisk/sounds/phonetic/ -rw-r--r-- root/root var/lib/asterisk/sounds/phonetic/x_p.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/phonetic/y_p.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/phonetic/z_p.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/please-try-again.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/please-try-call-later.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/pls-hold-while-try.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/pm-invalid-option.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/priv-callee-options.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/priv-callpending.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/priv-introsaved.ulaw @@ -346,6 +391,7 @@ drwxr-xr-x root/root var/lib/asterisk/sounds/phonetic/ -rw-r--r-- root/root var/lib/asterisk/sounds/privacy-incorrect.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/privacy-prompt.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/privacy-thankyou.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/privacy-to-blacklist-last-caller.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/privacy-unident.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/queue-callswaiting.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/queue-holdtime.ulaw @@ -360,7 +406,9 @@ drwxr-xr-x root/root var/lib/asterisk/sounds/phonetic/ -rw-r--r-- root/root var/lib/asterisk/sounds/queue-thankyou.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/queue-thereare.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/queue-youarenext.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/removed.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/screen-callee-options.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/second.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/seconds.ulaw drwxr-xr-x root/root var/lib/asterisk/sounds/silence/ -rw-r--r-- root/root var/lib/asterisk/sounds/silence/1.ulaw @@ -373,6 +421,12 @@ drwxr-xr-x root/root var/lib/asterisk/sounds/silence/ -rw-r--r-- root/root var/lib/asterisk/sounds/silence/7.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/silence/8.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/silence/9.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/simul-call-limit-reached.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/something-terribly-wrong.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/sorry-youre-having-problems.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/sorry.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/speed-dial-empty.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/speed-dial.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/spy-agent.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/spy-console.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/spy-dahdi.ulaw @@ -391,12 +445,19 @@ drwxr-xr-x root/root var/lib/asterisk/sounds/silence/ -rw-r--r-- root/root var/lib/asterisk/sounds/spy-usbradio.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/spy-zap.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/ss-noservice.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/telephone-number.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/time.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/to-call-this-number.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/to-extension.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/to-listen-to-it.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/to-rerecord-it.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/transfer.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/tt-allbusy.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/tt-monkeys.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/tt-monkeysintro.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/tt-somethingwrong.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/tt-weasels.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/unidentified-no-callback.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/uppercase.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/vm-Cust1.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/vm-Cust2.ulaw @@ -512,3 +573,6 @@ drwxr-xr-x root/root var/lib/asterisk/sounds/silence/ -rw-r--r-- root/root var/lib/asterisk/sounds/vm-unknown-caller.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/vm-whichbox.ulaw -rw-r--r-- root/root var/lib/asterisk/sounds/vm-youhave.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/with.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/you-entered.ulaw +-rw-r--r-- root/root var/lib/asterisk/sounds/your.ulaw diff --git a/asterisk-core-sounds-en-ulaw/.md5sum b/asterisk-core-sounds-en-ulaw/.md5sum index 0af0f242..97b251cc 100644 --- a/asterisk-core-sounds-en-ulaw/.md5sum +++ b/asterisk-core-sounds-en-ulaw/.md5sum @@ -1 +1 @@ -bb1e5b78b460d7f303fe967ef89d42cf asterisk-core-sounds-en-ulaw-1.5.tar.gz +203a8a013876d43bd1f85380424222ba asterisk-core-sounds-en-ulaw-1.6.tar.gz diff --git a/asterisk-core-sounds-en-ulaw/.signature b/asterisk-core-sounds-en-ulaw/.signature index 316963a3..7e30ce36 100644 --- a/asterisk-core-sounds-en-ulaw/.signature +++ b/asterisk-core-sounds-en-ulaw/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3z+y1d+pBcqqoV5825ee9Ah2UOQCgEysbfbe6rpEBhoL6F9kPZClmxBoEyISRN7ipbNVdjacd7s1+TH497sjNwk= -SHA256 (Pkgfile) = d7cbda617221b40da1a54b45dfa52b20104748f160458b679e85f3bbd2940892 -SHA256 (.footprint) = 396a56105d6e29203ad255399d73cb41f9b3b8d70b7754193cbf11262cd161b7 -SHA256 (asterisk-core-sounds-en-ulaw-1.5.tar.gz) = 31cef62aafaaf3981281a903c40b03a72807a76ec2e4ec5429918bf679cc4108 +RWSagIOpLGJF3/BddE1MHza5//iL+niaPMAf/CC0YQ2eh7jqiCA03xoBq5d1qP6wTqOSbYCBmzOjgFde0AmoszPL5HnmNqaO4Qg= +SHA256 (Pkgfile) = d75c58dbc35b3caac1fc89e5751a699a3f978a8acf77ca06c61958f925c741dd +SHA256 (.footprint) = 032d69871c856a7f0df9ec0c65004a6b28108df5b1f0ea1e41b1fa23ee5867f5 +SHA256 (asterisk-core-sounds-en-ulaw-1.6.tar.gz) = 992614fbdee5d0dc15a4ea717eef86d0a10fe4ec66fef9a54a874b5b4055a960 diff --git a/asterisk-core-sounds-en-ulaw/Pkgfile b/asterisk-core-sounds-en-ulaw/Pkgfile index 50b3253d..660b06dc 100644 --- a/asterisk-core-sounds-en-ulaw/Pkgfile +++ b/asterisk-core-sounds-en-ulaw/Pkgfile @@ -4,7 +4,7 @@ # Depends on: asterisk name=asterisk-core-sounds-en-ulaw -version=1.5 +version=1.6 release=1 source=(http://downloads.digium.com/pub/telephony/sounds/releases/$name-$ve…

1 0

ports/contrib (3.3): asterisk-core-sounds-en-alaw: 1.5 -> 1.6
by crux＠crux.nu 16 Oct '17

16 Oct '17

commit 68f898edc939be8d51847a04688b8a61992f8277 Author: Alan Mizrahi <alan at mizrahi dot com dot ve> Date: Mon Oct 16 11:31:45 2017 +0900 asterisk-core-sounds-en-alaw: 1.5 -> 1.6 diff --git a/asterisk-core-sounds-en-alaw/.footprint b/asterisk-core-sounds-en-alaw/.footprint index 7239d016..15ccd0ea 100644 --- a/asterisk-core-sounds-en-alaw/.footprint +++ b/asterisk-core-sounds-en-alaw/.footprint @@ -71,6 +71,8 @@ drwxr-xr-x root/root var/lib/asterisk/sounds/ -rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-begin-glorious-b.alaw -rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-begin-glorious-c.alaw -rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-begin-leader.alaw +-rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-binaural-off.alaw +-rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-binaural-on.alaw -rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-conf-begin.alaw -rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-conf-end.alaw -rw-r--r-- root/root var/lib/asterisk/sounds/confbridge-dec-list-vol-in.alaw @@ -340,6 +342,7 @@ drwxr-xr-x root/root var/lib/asterisk/sounds/letters/ -rw-r--r-- root/root var/lib/asterisk/sounds/letters/zed.alaw -rw-r--r-- root/root var/lib/asterisk/sounds/location.alaw -rw-r--r-- root/root var/lib/asterisk/sounds/lowercase.alaw +-rw-r--r-- root/root var/lib/asterisk/sounds/minute.alaw -rw-r--r-- root/root var/lib/asterisk/sounds/minutes.alaw -rw-r--r-- root/root var/lib/asterisk/sounds/num-was-successfully.alaw -rw-r--r-- root/root var/lib/asterisk/sounds/number-not-answering.alaw @@ -405,6 +408,7 @@ drwxr-xr-x root/root var/lib/asterisk/sounds/phonetic/ -rw-r--r-- root/root var/lib/asterisk/sounds/queue-youarenext.alaw -rw-r--r-- root/root var/lib/asterisk/sounds/removed.alaw -rw-r--r-- root/root var/lib/asterisk/sounds/screen-callee-options.alaw +-rw-r--r-- root/root var/lib/asterisk/sounds/second.alaw -rw-r--r-- root/root var/lib/asterisk/sounds/seconds.alaw drwxr-xr-x root/root var/lib/asterisk/sounds/silence/ -rw-r--r-- root/root var/lib/asterisk/sounds/silence/1.alaw diff --git a/asterisk-core-sounds-en-alaw/.md5sum b/asterisk-core-sounds-en-alaw/.md5sum index 7c367ac8..82ae6f36 100644 --- a/asterisk-core-sounds-en-alaw/.md5sum +++ b/asterisk-core-sounds-en-alaw/.md5sum @@ -1 +1 @@ -31091dd45e04a9dffe3355be995d3bce asterisk-core-sounds-en-alaw-1.5.tar.gz +f0d72af5367989d6d604e1e885116254 asterisk-core-sounds-en-alaw-1.6.tar.gz diff --git a/asterisk-core-sounds-en-alaw/.signature b/asterisk-core-sounds-en-alaw/.signature index 8ea56c08..26f03ad4 100644 --- a/asterisk-core-sounds-en-alaw/.signature +++ b/asterisk-core-sounds-en-alaw/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31GkbYv5qXulaVnw1Ti4KtXpB7xB/KHieQqOpVzNJFQeuQjH/Es4lE9r4GEVyXMBYcRkm+x4floSHy7dNGfOLAY= -SHA256 (Pkgfile) = d690dd1bfaa24bdec2ca1f151f4e3a492fcd1d2f62aa875c6a6e7ad0e1d45848 -SHA256 (.footprint) = e3af3bf5c7627a223a230bb35d75ad7a083702039026dd1a8a99daf7b30e8086 -SHA256 (asterisk-core-sounds-en-alaw-1.5.tar.gz) = b43663215abf71f8af6bdecb52f7cdbdbced399e4fefc3221227d4e881a80e51 +RWSagIOpLGJF3/sCJe5e1Cfl6XtmVNGGlDwWA/qHpIfONrvw4K2/iQZkF3LlWUcgASrtMMx5M4vp5xdv5MlKYTh7GXEzebngxwk= +SHA256 (Pkgfile) = a5b40cc0478f77d42e96574f7738f77d52cdd06b0d18abf0fe26e66ed54ecdc0 +SHA256 (.footprint) = ab2735e26e9b53683faad72d8d044e84a116b06c7f80c5e11251e53c314f8f86 +SHA256 (asterisk-core-sounds-en-alaw-1.6.tar.gz) = c51efcc80807b7e13b0993d0c3f7ae7d66d09e087d651c595f5080f2a61e9378 diff --git a/asterisk-core-sounds-en-alaw/Pkgfile b/asterisk-core-sounds-en-alaw/Pkgfile index fd5dd8f4..53bf28e0 100644 --- a/asterisk-core-sounds-en-alaw/Pkgfile +++ b/asterisk-core-sounds-en-alaw/Pkgfile @@ -4,7 +4,7 @@ # Depends on: asterisk name=asterisk-core-sounds-en-alaw -version=1.5 +version=1.6 release=1 source=(http://downloads.digium.com/pub/telephony/sounds/releases/$name-$ve…

1 0

ports/contrib (3.3): ghc: fix signature
by crux＠crux.nu 15 Oct '17

15 Oct '17

commit c2f5b09268e98966f1ed93d8fedae90aa2b8fbc6 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Mon Oct 16 09:17:37 2017 +1100 ghc: fix signature diff --git a/ghc/.signature b/ghc/.signature index 7be87ce8..53984e72 100644 --- a/ghc/.signature +++ b/ghc/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF34fgSTfbMH254wuKpytbHqAasMCO5GKTYDLW3jWt6HtwoLZCMgMRNfJFz59noqIBfTzstelJw2Mw/x1EZxrMRwk= -SHA256 (Pkgfile) = 5fb3bc0b65f6131425d7809786a344e54d888a951001d2d08ffbc1d42814864f +RWSagIOpLGJF30lyPPtrpreBfSAz4tuKoGEg6wVRFKeg3To7Itbwd6d3QfeslxLCeWmMLxiQ9WR00bBLt5W7hayrWO0cy4quVAc= +SHA256 (Pkgfile) = 7304782d8213fd78af07d6a560ff89c6060e82cf721e6c107121d102b67aa86c SHA256 (.footprint) = 4ff31b8a98f645c1ba2c21f5101c0fded15b94ac31494f1e72592651d0c1e528 SHA256 (ghc-8.2.1-src.tar.xz) = cfc2d496708dacea3ea7dde4c6a4b921b97a7f550ee2acea44cfa535840593f0

1 0