diff options
Diffstat (limited to 'source')
18 files changed, 48 insertions, 843 deletions
diff --git a/source/ap/man-db/man-db.SlackBuild b/source/ap/man-db/man-db.SlackBuild index 60f749c5..d68b5fa3 100755 --- a/source/ap/man-db/man-db.SlackBuild +++ b/source/ap/man-db/man-db.SlackBuild @@ -8,7 +8,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=man-db VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} MAN2HTML=${MAN2HTML:-20180101} diff --git a/source/ap/man-db/man-db.cron b/source/ap/man-db/man-db.cron index d8cd84d2..caf44774 100644 --- a/source/ap/man-db/man-db.cron +++ b/source/ap/man-db/man-db.cron @@ -10,5 +10,4 @@ mkdir -p /var/cache/man # Regenerate the index databases caches used by man-db. # These increase perfomance and provide features such as whatis and apropos. -ionice -c3 nice -n 19 /usr/bin/mandb --no-purge --quiet - +ionice -c3 nice -n 19 /usr/bin/mandb --quiet diff --git a/source/l/gst-plugins-bad-free/1267.patch b/source/l/gst-plugins-bad-free/1267.patch new file mode 100644 index 00000000..e467053c --- /dev/null +++ b/source/l/gst-plugins-bad-free/1267.patch @@ -0,0 +1,25 @@ +From b83e85ab677c79b46f520abebd1ee031e3a139c0 Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Sun, 26 Sep 2021 21:34:30 +0200 +Subject: [PATCH] neon: Allow building against neon 0.32.x + +No API/ABI changes: https://github.com/notroj/neon/blob/0.32.0/NEWS#L3 + +Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1267> +--- + subprojects/gst-plugins-bad/ext/neon/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/subprojects/gst-plugins-bad/ext/neon/meson.build b/subprojects/gst-plugins-bad/ext/neon/meson.build +index bf49be9111..abd9763649 100644 +--- a/subprojects/gst-plugins-bad/ext/neon/meson.build ++++ b/subprojects/gst-plugins-bad/ext/neon/meson.build +@@ -1,4 +1,4 @@ +-neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.31.99'], ++neon_dep = dependency('neon', version: ['>= 0.27', '<= 0.32.99'], + required : get_option('neon')) + + if neon_dep.found() +-- +GitLab + diff --git a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild index bf886150..f3a5038f 100755 --- a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild +++ b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gst-plugins-bad-free VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -88,6 +88,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +zcat $CWD/1267.patch.gz | patch -p3 --verbose || exit 1 + # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url index fc054aaf..8a75cddb 100644 --- a/source/n/samba/samba.url +++ b/source/n/samba/samba.url @@ -1,2 +1,2 @@ -https://download.samba.org/pub/samba/stable/samba-4.15.3.tar.gz -https://download.samba.org/pub/samba/stable/samba-4.15.3.tar.asc +https://download.samba.org/pub/samba/stable/samba-4.15.4.tar.gz +https://download.samba.org/pub/samba/stable/samba-4.15.4.tar.asc diff --git a/source/n/wpa_supplicant/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch b/source/n/wpa_supplicant/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch deleted file mode 100644 index d764a9db..00000000 --- a/source/n/wpa_supplicant/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Thu, 29 Aug 2019 11:52:04 +0300 -Subject: [PATCH] AP: Silently ignore management frame from unexpected source - address - -Do not process any received Management frames with unexpected/invalid SA -so that we do not add any state for unexpected STA addresses or end up -sending out frames to unexpected destination. This prevents unexpected -sequences where an unprotected frame might end up causing the AP to send -out a response to another device and that other device processing the -unexpected response. - -In particular, this prevents some potential denial of service cases -where the unexpected response frame from the AP might result in a -connected station dropping its association. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/ap/drv_callbacks.c | 13 +++++++++++++ - src/ap/ieee802_11.c | 12 ++++++++++++ - 2 files changed, 25 insertions(+) - -diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c -index 31587685fe3b..34ca379edc3d 100644 ---- a/src/ap/drv_callbacks.c -+++ b/src/ap/drv_callbacks.c -@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr, - "hostapd_notif_assoc: Skip event with no address"); - return -1; - } -+ -+ if (is_multicast_ether_addr(addr) || -+ is_zero_ether_addr(addr) || -+ os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR -+ " in received indication - ignore this indication silently", -+ __func__, MAC2STR(addr)); -+ return 0; -+ } -+ - random_add_randomness(addr, ETH_ALEN); - - hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211, -diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c -index c85a28db44b7..e7065372e158 100644 ---- a/src/ap/ieee802_11.c -+++ b/src/ap/ieee802_11.c -@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len, - fc = le_to_host16(mgmt->frame_control); - stype = WLAN_FC_GET_STYPE(fc); - -+ if (is_multicast_ether_addr(mgmt->sa) || -+ is_zero_ether_addr(mgmt->sa) || -+ os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) { -+ /* Do not process any frames with unexpected/invalid SA so that -+ * we do not add any state for unexpected STA addresses or end -+ * up sending out frames to unexpected destination. */ -+ wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR -+ " in received frame - ignore this frame silently", -+ MAC2STR(mgmt->sa)); -+ return 0; -+ } -+ - if (stype == WLAN_FC_STYPE_BEACON) { - handle_beacon(hapd, mgmt, len, fi); - return 1; --- -2.20.1 - diff --git a/source/n/wpa_supplicant/patches/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch b/source/n/wpa_supplicant/patches/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch deleted file mode 100644 index 1942bb3d..00000000 --- a/source/n/wpa_supplicant/patches/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 8460e3230988ef2ec13ce6b69b687e941f6cdb32 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <jouni@codeaurora.org> -Date: Tue, 8 Dec 2020 23:52:50 +0200 -Subject: [PATCH] P2P: Fix a corner case in peer addition based on PD Request - -p2p_add_device() may remove the oldest entry if there is no room in the -peer table for a new peer. This would result in any pointer to that -removed entry becoming stale. A corner case with an invalid PD Request -frame could result in such a case ending up using (read+write) freed -memory. This could only by triggered when the peer table has reached its -maximum size and the PD Request frame is received from the P2P Device -Address of the oldest remaining entry and the frame has incorrect P2P -Device Address in the payload. - -Fix this by fetching the dev pointer again after having called -p2p_add_device() so that the stale pointer cannot be used. - -Fixes: 17bef1e97a50 ("P2P: Add peer entry based on Provision Discovery Request") -Signed-off-by: Jouni Malinen <jouni@codeaurora.org> ---- - src/p2p/p2p_pd.c | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - -diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c -index 3994ec03f86b..05fd593494ef 100644 ---- a/src/p2p/p2p_pd.c -+++ b/src/p2p/p2p_pd.c -@@ -595,14 +595,12 @@ void p2p_process_prov_disc_req(struct p2p_data *p2p, const u8 *sa, - goto out; - } - -+ dev = p2p_get_device(p2p, sa); - if (!dev) { -- dev = p2p_get_device(p2p, sa); -- if (!dev) { -- p2p_dbg(p2p, -- "Provision Discovery device not found " -- MACSTR, MAC2STR(sa)); -- goto out; -- } -+ p2p_dbg(p2p, -+ "Provision Discovery device not found " -+ MACSTR, MAC2STR(sa)); -+ goto out; - } - } else if (msg.wfd_subelems) { - wpabuf_free(dev->info.wfd_subelems); --- -2.25.1 - diff --git a/source/n/wpa_supplicant/patches/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch b/source/n/wpa_supplicant/patches/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch deleted file mode 100644 index 4657b55d..00000000 --- a/source/n/wpa_supplicant/patches/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 947272febe24a8f0ea828b5b2f35f13c3821901e Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <jouni@codeaurora.org> -Date: Mon, 9 Nov 2020 11:43:12 +0200 -Subject: [PATCH] P2P: Fix copying of secondary device types for P2P group - client - -Parsing and copying of WPS secondary device types list was verifying -that the contents is not too long for the internal maximum in the case -of WPS messages, but similar validation was missing from the case of P2P -group information which encodes this information in a different -attribute. This could result in writing beyond the memory area assigned -for these entries and corrupting memory within an instance of struct -p2p_device. This could result in invalid operations and unexpected -behavior when trying to free pointers from that corrupted memory. - -Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=27269 -Fixes: e57ae6e19edf ("P2P: Keep track of secondary device types for peers") -Signed-off-by: Jouni Malinen <jouni@codeaurora.org> ---- - src/p2p/p2p.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c -index 74b7b52ae05c..5cbfc217fc1f 100644 ---- a/src/p2p/p2p.c -+++ b/src/p2p/p2p.c -@@ -453,6 +453,8 @@ static void p2p_copy_client_info(struct p2p_device *dev, - dev->info.config_methods = cli->config_methods; - os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8); - dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types; -+ if (dev->info.wps_sec_dev_type_list_len > WPS_SEC_DEV_TYPE_MAX_LEN) -+ dev->info.wps_sec_dev_type_list_len = WPS_SEC_DEV_TYPE_MAX_LEN; - os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types, - dev->info.wps_sec_dev_type_list_len); - } --- -2.25.1 - diff --git a/source/n/wpa_supplicant/patches/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch b/source/n/wpa_supplicant/patches/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch deleted file mode 100644 index 0aa8a5ea..00000000 --- a/source/n/wpa_supplicant/patches/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 5b78c8f961f25f4dc22d6f2b77ddd06d712cec63 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <jouni@codeaurora.org> -Date: Wed, 3 Jun 2020 23:17:35 +0300 -Subject: [PATCH 1/3] WPS UPnP: Do not allow event subscriptions with URLs to - other networks - -The UPnP Device Architecture 2.0 specification errata ("UDA errata -16-04-2020.docx") addresses a problem with notifications being allowed -to go out to other domains by disallowing such cases. Do such filtering -for the notification callback URLs to avoid undesired connections to -external networks based on subscriptions that any device in the local -network could request when WPS support for external registrars is -enabled (the upnp_iface parameter in hostapd configuration). - -Signed-off-by: Jouni Malinen <jouni@codeaurora.org> ---- - src/wps/wps_er.c | 2 +- - src/wps/wps_upnp.c | 38 ++++++++++++++++++++++++++++++++++++-- - src/wps/wps_upnp_i.h | 3 ++- - 3 files changed, 39 insertions(+), 4 deletions(-) - -diff --git a/src/wps/wps_er.c b/src/wps/wps_er.c -index 6bded14327f8..31d2e50e4cff 100644 ---- a/src/wps/wps_er.c -+++ b/src/wps/wps_er.c -@@ -1298,7 +1298,7 @@ wps_er_init(struct wps_context *wps, const char *ifname, const char *filter) - "with %s", filter); - } - if (get_netif_info(er->ifname, &er->ip_addr, &er->ip_addr_text, -- er->mac_addr)) { -+ NULL, er->mac_addr)) { - wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address " - "for %s. Does it have IP address?", er->ifname); - wps_er_deinit(er, NULL, NULL); -diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c -index 6e10e4bc0c3f..7d4b7439940e 100644 ---- a/src/wps/wps_upnp.c -+++ b/src/wps/wps_upnp.c -@@ -303,6 +303,14 @@ static void subscr_addr_free_all(struct subscription *s) - } - - -+static int local_network_addr(struct upnp_wps_device_sm *sm, -+ struct sockaddr_in *addr) -+{ -+ return (addr->sin_addr.s_addr & sm->netmask.s_addr) == -+ (sm->ip_addr & sm->netmask.s_addr); -+} -+ -+ - /* subscr_addr_add_url -- add address(es) for one url to subscription */ - static void subscr_addr_add_url(struct subscription *s, const char *url, - size_t url_len) -@@ -381,6 +389,7 @@ static void subscr_addr_add_url(struct subscription *s, const char *url, - - for (rp = result; rp; rp = rp->ai_next) { - struct subscr_addr *a; -+ struct sockaddr_in *addr = (struct sockaddr_in *) rp->ai_addr; - - /* Limit no. of address to avoid denial of service attack */ - if (dl_list_len(&s->addr_list) >= MAX_ADDR_PER_SUBSCRIPTION) { -@@ -389,6 +398,13 @@ static void subscr_addr_add_url(struct subscription *s, const char *url, - break; - } - -+ if (!local_network_addr(s->sm, addr)) { -+ wpa_printf(MSG_INFO, -+ "WPS UPnP: Ignore a delivery URL that points to another network %s", -+ inet_ntoa(addr->sin_addr)); -+ continue; -+ } -+ - a = os_zalloc(sizeof(*a) + alloc_len); - if (a == NULL) - break; -@@ -890,11 +906,12 @@ static int eth_get(const char *device, u8 ea[ETH_ALEN]) - * @net_if: Selected network interface name - * @ip_addr: Buffer for returning IP address in network byte order - * @ip_addr_text: Buffer for returning a pointer to allocated IP address text -+ * @netmask: Buffer for returning netmask or %NULL if not needed - * @mac: Buffer for returning MAC address - * Returns: 0 on success, -1 on failure - */ - int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text, -- u8 mac[ETH_ALEN]) -+ struct in_addr *netmask, u8 mac[ETH_ALEN]) - { - struct ifreq req; - int sock = -1; -@@ -920,6 +937,19 @@ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text, - in_addr.s_addr = *ip_addr; - os_snprintf(*ip_addr_text, 16, "%s", inet_ntoa(in_addr)); - -+ if (netmask) { -+ os_memset(&req, 0, sizeof(req)); -+ os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name)); -+ if (ioctl(sock, SIOCGIFNETMASK, &req) < 0) { -+ wpa_printf(MSG_ERROR, -+ "WPS UPnP: SIOCGIFNETMASK failed: %d (%s)", -+ errno, strerror(errno)); -+ goto fail; -+ } -+ addr = (struct sockaddr_in *) &req.ifr_netmask; -+ netmask->s_addr = addr->sin_addr.s_addr; -+ } -+ - #ifdef __linux__ - os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name)); - if (ioctl(sock, SIOCGIFHWADDR, &req) < 0) { -@@ -1026,11 +1056,15 @@ static int upnp_wps_device_start(struct upnp_wps_device_sm *sm, char *net_if) - - /* Determine which IP and mac address we're using */ - if (get_netif_info(net_if, &sm->ip_addr, &sm->ip_addr_text, -- sm->mac_addr)) { -+ &sm->netmask, sm->mac_addr)) { - wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address " - "for %s. Does it have IP address?", net_if); - goto fail; - } -+ wpa_printf(MSG_DEBUG, "WPS UPnP: Local IP address %s netmask %s hwaddr " -+ MACSTR, -+ sm->ip_addr_text, inet_ntoa(sm->netmask), -+ MAC2STR(sm->mac_addr)); - - /* Listen for incoming TCP connections so that others - * can fetch our "xml files" from us. -diff --git a/src/wps/wps_upnp_i.h b/src/wps/wps_upnp_i.h -index e87a93232df1..6ead7b4e9a30 100644 ---- a/src/wps/wps_upnp_i.h -+++ b/src/wps/wps_upnp_i.h -@@ -128,6 +128,7 @@ struct upnp_wps_device_sm { - u8 mac_addr[ETH_ALEN]; /* mac addr of network i.f. we use */ - char *ip_addr_text; /* IP address of network i.f. we use */ - unsigned ip_addr; /* IP address of network i.f. we use (host order) */ -+ struct in_addr netmask; - int multicast_sd; /* send multicast messages over this socket */ - int ssdp_sd; /* receive discovery UPD packets on socket */ - int ssdp_sd_registered; /* nonzero if we must unregister */ -@@ -158,7 +159,7 @@ struct subscription * subscription_find(struct upnp_wps_device_sm *sm, - const u8 uuid[UUID_LEN]); - void subscr_addr_delete(struct subscr_addr *a); - int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text, -- u8 mac[ETH_ALEN]); -+ struct in_addr *netmask, u8 mac[ETH_ALEN]); - - /* wps_upnp_ssdp.c */ - void msearchreply_state_machine_stop(struct advertisement_state_machine *a); --- -2.20.1 - diff --git a/source/n/wpa_supplicant/patches/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch b/source/n/wpa_supplicant/patches/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch deleted file mode 100644 index c7a449e0..00000000 --- a/source/n/wpa_supplicant/patches/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch +++ /dev/null @@ -1,59 +0,0 @@ -From f7d268864a2660b7239b9a8ff5ad37faeeb751ba Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <jouni@codeaurora.org> -Date: Wed, 3 Jun 2020 22:41:02 +0300 -Subject: [PATCH 2/3] WPS UPnP: Fix event message generation using a long URL - path - -More than about 700 character URL ended up overflowing the wpabuf used -for building the event notification and this resulted in the wpabuf -buffer overflow checks terminating the hostapd process. Fix this by -allocating the buffer to be large enough to contain the full URL path. -However, since that around 700 character limit has been the practical -limit for more than ten years, start explicitly enforcing that as the -limit or the callback URLs since any longer ones had not worked before -and there is no need to enable them now either. - -Signed-off-by: Jouni Malinen <jouni@codeaurora.org> ---- - src/wps/wps_upnp.c | 9 +++++++-- - src/wps/wps_upnp_event.c | 3 ++- - 2 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c -index 7d4b7439940e..ab685d52ecab 100644 ---- a/src/wps/wps_upnp.c -+++ b/src/wps/wps_upnp.c -@@ -328,9 +328,14 @@ static void subscr_addr_add_url(struct subscription *s, const char *url, - int rerr; - size_t host_len, path_len; - -- /* url MUST begin with http: */ -- if (url_len < 7 || os_strncasecmp(url, "http://", 7)) -+ /* URL MUST begin with HTTP scheme. In addition, limit the length of -+ * the URL to 700 characters which is around the limit that was -+ * implicitly enforced for more than 10 years due to a bug in -+ * generating the event messages. */ -+ if (url_len < 7 || os_strncasecmp(url, "http://", 7) || url_len > 700) { -+ wpa_printf(MSG_DEBUG, "WPS UPnP: Reject an unacceptable URL"); - goto fail; -+ } - url += 7; - url_len -= 7; - -diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c -index d7e6edcc6503..08a23612f338 100644 ---- a/src/wps/wps_upnp_event.c -+++ b/src/wps/wps_upnp_event.c -@@ -147,7 +147,8 @@ static struct wpabuf * event_build_message(struct wps_event_ *e) - struct wpabuf *buf; - char *b; - -- buf = wpabuf_alloc(1000 + wpabuf_len(e->data)); -+ buf = wpabuf_alloc(1000 + os_strlen(e->addr->path) + -+ wpabuf_len(e->data)); - if (buf == NULL) - return NULL; - wpabuf_printf(buf, "NOTIFY %s HTTP/1.1\r\n", e->addr->path); --- -2.20.1 - diff --git a/source/n/wpa_supplicant/patches/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch b/source/n/wpa_supplicant/patches/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch deleted file mode 100644 index 9d037604..00000000 --- a/source/n/wpa_supplicant/patches/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 85aac526af8612c21b3117dadc8ef5944985b476 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <jouni@codeaurora.org> -Date: Thu, 4 Jun 2020 21:24:04 +0300 -Subject: [PATCH 3/3] WPS UPnP: Handle HTTP initiation failures for events more - properly - -While it is appropriate to try to retransmit the event to another -callback URL on a failure to initiate the HTTP client connection, there -is no point in trying the exact same operation multiple times in a row. -Replve the event_retry() calls with event_addr_failure() for these cases -to avoid busy loops trying to repeat the same failing operation. - -These potential busy loops would go through eloop callbacks, so the -process is not completely stuck on handling them, but unnecessary CPU -would be used to process the continues retries that will keep failing -for the same reason. - -Signed-off-by: Jouni Malinen <jouni@codeaurora.org> ---- - src/wps/wps_upnp_event.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c -index 08a23612f338..c0d9e41d9a38 100644 ---- a/src/wps/wps_upnp_event.c -+++ b/src/wps/wps_upnp_event.c -@@ -294,7 +294,7 @@ static int event_send_start(struct subscription *s) - - buf = event_build_message(e); - if (buf == NULL) { -- event_retry(e, 0); -+ event_addr_failure(e); - return -1; - } - -@@ -302,7 +302,7 @@ static int event_send_start(struct subscription *s) - event_http_cb, e); - if (e->http_event == NULL) { - wpabuf_free(buf); -- event_retry(e, 0); -+ event_addr_failure(e); - return -1; - } - --- -2.20.1 - diff --git a/source/n/wpa_supplicant/patches/8ca330bd709bf7c000dfda5b1edbc0cbeabb8b55.patch b/source/n/wpa_supplicant/patches/8ca330bd709bf7c000dfda5b1edbc0cbeabb8b55.patch deleted file mode 100644 index a81ae81a..00000000 --- a/source/n/wpa_supplicant/patches/8ca330bd709bf7c000dfda5b1edbc0cbeabb8b55.patch +++ /dev/null @@ -1,230 +0,0 @@ -From 8ca330bd709bf7c000dfda5b1edbc0cbeabb8b55 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <jouni@codeaurora.org> -Date: Fri, 5 Feb 2021 00:28:17 +0200 -Subject: Flush pending control interface message for an interface to be - removed - -wpa_supplicant_ctrl_iface_deinit() was executed only if the -per-interface control interface initialization had been completed. This -is not the case if driver initialization fails and that could result in -leaving behind references to the freed wpa_s instance in a corner case -where control interface messages ended up getting queued. - -Fix this by calling wpa_supplicant_ctrl_iface_deinit() in all cases to -cancel the potential eloop timeout for wpas_ctrl_msg_queue_timeout with -the reference to the wpa_s pointer. In addition, flush any pending -message from the global queue for this interface since such a message -cannot be of use after this and there is no need to leave them in the -queue until the global control interface gets deinitialized. - -Signed-off-by: Jouni Malinen <jouni@codeaurora.org> ---- - wpa_supplicant/ctrl_iface.h | 10 +++++--- - wpa_supplicant/ctrl_iface_named_pipe.c | 5 +++- - wpa_supplicant/ctrl_iface_udp.c | 6 ++++- - wpa_supplicant/ctrl_iface_unix.c | 43 +++++++++++++++++++++++++++++++++- - wpa_supplicant/eapol_test.c | 6 ++--- - wpa_supplicant/preauth_test.c | 6 ++--- - wpa_supplicant/wpa_supplicant.c | 10 ++++---- - 7 files changed, 66 insertions(+), 20 deletions(-) - -diff --git a/wpa_supplicant/ctrl_iface.h b/wpa_supplicant/ctrl_iface.h -index 510668d..dfbd25a 100644 ---- a/wpa_supplicant/ctrl_iface.h -+++ b/wpa_supplicant/ctrl_iface.h -@@ -70,14 +70,17 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s); - - /** - * wpa_supplicant_ctrl_iface_deinit - Deinitialize control interface -+ * @wpa_s: Pointer to wpa_supplicant data - * @priv: Pointer to private data from wpa_supplicant_ctrl_iface_init() - * - * Deinitialize the control interface that was initialized with -- * wpa_supplicant_ctrl_iface_init(). -+ * wpa_supplicant_ctrl_iface_init() and any data related to the wpa_s instance. -+ * @priv may be %NULL if the control interface has not yet been initialized. - * - * Required to be implemented in each control interface backend. - */ --void wpa_supplicant_ctrl_iface_deinit(struct ctrl_iface_priv *priv); -+void wpa_supplicant_ctrl_iface_deinit(struct wpa_supplicant *wpa_s, -+ struct ctrl_iface_priv *priv); - - /** - * wpa_supplicant_ctrl_iface_wait - Wait for ctrl_iface monitor -@@ -128,7 +131,8 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s) - } - - static inline void --wpa_supplicant_ctrl_iface_deinit(struct ctrl_iface_priv *priv) -+wpa_supplicant_ctrl_iface_deinit(struct wpa_supplicant *wpa_s, -+ struct ctrl_iface_priv *priv) - { - } - -diff --git a/wpa_supplicant/ctrl_iface_named_pipe.c b/wpa_supplicant/ctrl_iface_named_pipe.c -index 79ff787..bddc041 100644 ---- a/wpa_supplicant/ctrl_iface_named_pipe.c -+++ b/wpa_supplicant/ctrl_iface_named_pipe.c -@@ -462,8 +462,11 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s) - } - - --void wpa_supplicant_ctrl_iface_deinit(struct ctrl_iface_priv *priv) -+void wpa_supplicant_ctrl_iface_deinit(struct wpa_supplicant *wpa_s, -+ struct ctrl_iface_priv *priv) - { -+ if (!priv) -+ return; - while (priv->ctrl_dst) - ctrl_close_pipe(priv->ctrl_dst); - if (priv->sec_attr_set) -diff --git a/wpa_supplicant/ctrl_iface_udp.c b/wpa_supplicant/ctrl_iface_udp.c -index 1512080..1cbf7fa 100644 ---- a/wpa_supplicant/ctrl_iface_udp.c -+++ b/wpa_supplicant/ctrl_iface_udp.c -@@ -490,8 +490,12 @@ fail: - } - - --void wpa_supplicant_ctrl_iface_deinit(struct ctrl_iface_priv *priv) -+void wpa_supplicant_ctrl_iface_deinit(struct wpa_supplicant *wpa_s, -+ struct ctrl_iface_priv *priv) - { -+ if (!priv) -+ return; -+ - if (priv->sock > -1) { - eloop_unregister_read_sock(priv->sock); - if (priv->ctrl_dst) { -diff --git a/wpa_supplicant/ctrl_iface_unix.c b/wpa_supplicant/ctrl_iface_unix.c -index 953fd2c..639573d 100644 ---- a/wpa_supplicant/ctrl_iface_unix.c -+++ b/wpa_supplicant/ctrl_iface_unix.c -@@ -800,12 +800,52 @@ static int wpas_ctrl_iface_reinit(struct wpa_supplicant *wpa_s, - } - - --void wpa_supplicant_ctrl_iface_deinit(struct ctrl_iface_priv *priv) -+static void -+wpas_global_ctrl_iface_flush_queued_msg(struct wpa_global *global, -+ struct wpa_supplicant *wpa_s) -+{ -+ struct ctrl_iface_global_priv *gpriv; -+ struct ctrl_iface_msg *msg, *prev_msg; -+ unsigned int count = 0; -+ -+ if (!global || !global->ctrl_iface) -+ return; -+ -+ gpriv = global->ctrl_iface; -+ dl_list_for_each_safe(msg, prev_msg, &gpriv->msg_queue, -+ struct ctrl_iface_msg, list) { -+ if (msg->wpa_s == wpa_s) { -+ count++; -+ dl_list_del(&msg->list); -+ os_free(msg); -+ } -+ } -+ -+ if (count) { -+ wpa_printf(MSG_DEBUG, -+ "CTRL: Dropped %u pending message(s) for interface that is being removed", -+ count); -+ } -+} -+ -+ -+void wpa_supplicant_ctrl_iface_deinit(struct wpa_supplicant *wpa_s, -+ struct ctrl_iface_priv *priv) - { - struct wpa_ctrl_dst *dst, *prev; - struct ctrl_iface_msg *msg, *prev_msg; - struct ctrl_iface_global_priv *gpriv; - -+ if (!priv) { -+ /* Control interface has not yet been initialized, so there is -+ * nothing to deinitialize here. However, there might be a -+ * pending message for this interface, so get rid of any such -+ * entry before completing interface removal. */ -+ wpas_global_ctrl_iface_flush_queued_msg(wpa_s->global, wpa_s); -+ eloop_cancel_timeout(wpas_ctrl_msg_queue_timeout, wpa_s, NULL); -+ return; -+ } -+ - if (priv->sock > -1) { - char *fname; - char *buf, *dir = NULL; -@@ -877,6 +917,7 @@ free_dst: - } - } - } -+ wpas_global_ctrl_iface_flush_queued_msg(wpa_s->global, wpa_s); - eloop_cancel_timeout(wpas_ctrl_msg_queue_timeout, priv->wpa_s, NULL); - os_free(priv); - } -diff --git a/wpa_supplicant/eapol_test.c b/wpa_supplicant/eapol_test.c -index d137ad6..e256ac5 100644 ---- a/wpa_supplicant/eapol_test.c -+++ b/wpa_supplicant/eapol_test.c -@@ -674,10 +674,8 @@ static void test_eapol_clean(struct eapol_test_data *e, - os_free(e->radius_conf); - e->radius_conf = NULL; - scard_deinit(wpa_s->scard); -- if (wpa_s->ctrl_iface) { -- wpa_supplicant_ctrl_iface_deinit(wpa_s->ctrl_iface); -- wpa_s->ctrl_iface = NULL; -- } -+ wpa_supplicant_ctrl_iface_deinit(wpa_s, wpa_s->ctrl_iface); -+ wpa_s->ctrl_iface = NULL; - - ext_password_deinit(wpa_s->ext_pw); - wpa_s->ext_pw = NULL; -diff --git a/wpa_supplicant/preauth_test.c b/wpa_supplicant/preauth_test.c -index de49948..97c16fb 100644 ---- a/wpa_supplicant/preauth_test.c -+++ b/wpa_supplicant/preauth_test.c -@@ -193,10 +193,8 @@ static void test_eapol_clean(struct wpa_supplicant *wpa_s) - pmksa_candidate_free(wpa_s->wpa); - wpa_sm_deinit(wpa_s->wpa); - scard_deinit(wpa_s->scard); -- if (wpa_s->ctrl_iface) { -- wpa_supplicant_ctrl_iface_deinit(wpa_s->ctrl_iface); -- wpa_s->ctrl_iface = NULL; -- } -+ wpa_supplicant_ctrl_iface_deinit(wpa_s, wpa_s->ctrl_iface); -+ wpa_s->ctrl_iface = NULL; - wpa_config_free(wpa_s->conf); - } - -diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c -index 90e8a46..835b335 100644 ---- a/wpa_supplicant/wpa_supplicant.c -+++ b/wpa_supplicant/wpa_supplicant.c -@@ -1158,8 +1158,8 @@ int wpa_supplicant_reload_configuration(struct wpa_supplicant *wpa_s) - os_strcmp(conf->ctrl_interface, - wpa_s->conf->ctrl_interface) != 0); - -- if (reconf_ctrl && wpa_s->ctrl_iface) { -- wpa_supplicant_ctrl_iface_deinit(wpa_s->ctrl_iface); -+ if (reconf_ctrl) { -+ wpa_supplicant_ctrl_iface_deinit(wpa_s, wpa_s->ctrl_iface); - wpa_s->ctrl_iface = NULL; - } - -@@ -6748,10 +6748,8 @@ static void wpa_supplicant_deinit_iface(struct wpa_supplicant *wpa_s, - if (terminate) - wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TERMINATING); - -- if (wpa_s->ctrl_iface) { -- wpa_supplicant_ctrl_iface_deinit(wpa_s->ctrl_iface); -- wpa_s->ctrl_iface = NULL; -- } -+ wpa_supplicant_ctrl_iface_deinit(wpa_s, wpa_s->ctrl_iface); -+ wpa_s->ctrl_iface = NULL; - - #ifdef CONFIG_MESH - if (wpa_s->ifmsh) { --- -cgit v0.12 - diff --git a/source/n/wpa_supplicant/patches/a0541334a6394f8237a4393b7372693cd7e96f15.patch b/source/n/wpa_supplicant/patches/a0541334a6394f8237a4393b7372693cd7e96f15.patch deleted file mode 100644 index 8c8ba933..00000000 --- a/source/n/wpa_supplicant/patches/a0541334a6394f8237a4393b7372693cd7e96f15.patch +++ /dev/null @@ -1,115 +0,0 @@ -From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Sat, 13 Mar 2021 18:19:31 +0200 -Subject: ASN.1: Validate DigestAlgorithmIdentifier parameters - -The supported hash algorithms do not use AlgorithmIdentifier parameters. -However, there are implementations that include NULL parameters in -addition to ones that omit the parameters. Previous implementation did -not check the parameters value at all which supported both these cases, -but did not reject any other unexpected information. - -Use strict validation of digest algorithm parameters and reject any -unexpected value when validating a signature. This is needed to prevent -potential forging attacks. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/tls/pkcs1.c | 21 +++++++++++++++++++++ - src/tls/x509v3.c | 20 ++++++++++++++++++++ - 2 files changed, 41 insertions(+) - -diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c -index bbdb0d7..5761dfe 100644 ---- a/src/tls/pkcs1.c -+++ b/src/tls/pkcs1.c -@@ -244,6 +244,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo", -+ hdr.payload, hdr.length); - - pos = hdr.payload; - end = pos + hdr.length; -@@ -265,6 +267,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier", -+ hdr.payload, hdr.length); - da_end = hdr.payload + hdr.length; - - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { -@@ -273,6 +277,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, - os_free(decrypted); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters", -+ next, da_end - next); -+ -+ /* -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to -+ * omit the parameters, but there are implementation that encode these -+ * as a NULL element. Allow these two cases and reject anything else. -+ */ -+ if (da_end > next && -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || -+ !asn1_is_null(&hdr) || -+ hdr.payload + hdr.length != da_end)) { -+ wpa_printf(MSG_DEBUG, -+ "PKCS #1: Unexpected digest algorithm parameters"); -+ os_free(decrypted); -+ return -1; -+ } - - if (!asn1_oid_equal(&oid, hash_alg)) { - char txt[100], txt2[100]; -diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c -index a8944dd..df337ec 100644 ---- a/src/tls/x509v3.c -+++ b/src/tls/x509v3.c -@@ -1964,6 +1964,7 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length); - - pos = hdr.payload; - end = pos + hdr.length; -@@ -1985,6 +1986,8 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier", -+ hdr.payload, hdr.length); - da_end = hdr.payload + hdr.length; - - if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { -@@ -1992,6 +1995,23 @@ int x509_check_signature(struct x509_certificate *issuer, - os_free(data); - return -1; - } -+ wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters", -+ next, da_end - next); -+ -+ /* -+ * RFC 5754: The correct encoding for the SHA2 algorithms would be to -+ * omit the parameters, but there are implementation that encode these -+ * as a NULL element. Allow these two cases and reject anything else. -+ */ -+ if (da_end > next && -+ (asn1_get_next(next, da_end - next, &hdr) < 0 || -+ !asn1_is_null(&hdr) || -+ hdr.payload + hdr.length != da_end)) { -+ wpa_printf(MSG_DEBUG, -+ "X509: Unexpected digest algorithm parameters"); -+ os_free(data); -+ return -1; -+ } - - if (x509_sha1_oid(&oid)) { - if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) { --- -cgit v0.12 - diff --git a/source/n/wpa_supplicant/patches/wpa_supplicant-flush-debug-output.patch b/source/n/wpa_supplicant/patches/wpa_supplicant-flush-debug-output.patch deleted file mode 100644 index a6868518..00000000 --- a/source/n/wpa_supplicant/patches/wpa_supplicant-flush-debug-output.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- wpa_supplicant-0.6.3/src/utils/wpa_debug.c.flush-debug 2007-07-30 23:15:34.000000000 -0400 -+++ wpa_supplicant-0.6.3/src/utils/wpa_debug.c 2007-07-30 23:17:06.000000000 -0400 -@@ -157,6 +157,7 @@ void wpa_debug_print_timestamp(void) - if (out_file) { - fprintf(out_file, "%ld.%06u: ", (long) tv.sec, - (unsigned int) tv.usec); -+ fflush(out_file); - } else - #endif /* CONFIG_DEBUG_FILE */ - printf("%ld.%06u: ", (long) tv.sec, (unsigned int) tv.usec); -@@ -185,6 +186,7 @@ void wpa_printf(int level, char *fmt, .. - if (out_file) { - vfprintf(out_file, fmt, ap); - fprintf(out_file, "\n"); -+ fflush(out_file); - } else { - #endif /* CONFIG_DEBUG_FILE */ - vprintf(fmt, ap); -@@ -217,6 +219,7 @@ static void _wpa_hexdump(int level, cons - fprintf(out_file, " [REMOVED]"); - } - fprintf(out_file, "\n"); -+ fflush(out_file); - } else { - #endif /* CONFIG_DEBUG_FILE */ - printf("%s - hexdump(len=%lu):", title, (unsigned long) len); -@@ -262,12 +265,14 @@ static void _wpa_hexdump_ascii(int level - fprintf(out_file, - "%s - hexdump_ascii(len=%lu): [REMOVED]\n", - title, (unsigned long) len); -+ fflush(out_file); - return; - } - if (buf == NULL) { - fprintf(out_file, - "%s - hexdump_ascii(len=%lu): [NULL]\n", - title, (unsigned long) len); -+ fflush(out_file); - return; - } - fprintf(out_file, "%s - hexdump_ascii(len=%lu):\n", -@@ -292,6 +297,7 @@ static void _wpa_hexdump_ascii(int level - pos += llen; - len -= llen; - } -+ fflush(out_file); - } else { - #endif /* CONFIG_DEBUG_FILE */ - if (!show) { diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild index 8539c099..0b467ffd 100755 --- a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild +++ b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=wpa_supplicant VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-8} +BUILD=${BUILD:-1} SRCVERSION=$(printf $VERSION | tr _ -) @@ -85,20 +85,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -zcat $CWD/patches/wpa_supplicant-flush-debug-output.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/wpa_supplicant-gui-qt4.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/wpa_supplicant-quiet-scan-results-message.patch.gz | patch -p1 --verbose || exit 1 -# Security fixes for CVE-2021-0326 CVE-2021-0535 CVE-2020-12695 CVE-2019-16275 CVE-2021-27803 CVE-2021-30004: -zcat $CWD/patches/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/a0541334a6394f8237a4393b7372693cd7e96f15.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/8ca330bd709bf7c000dfda5b1edbc0cbeabb8b55.patch.gz | patch -p1 --verbose || exit 1 - # Allow legacy tls to avoid breaking WPA2-Enterprise: zcat $CWD/patches/allow-tlsv1.patch.gz | patch -p1 --verbose || exit 1 diff --git a/source/n/wpa_supplicant/wpa_supplicant.url b/source/n/wpa_supplicant/wpa_supplicant.url new file mode 100644 index 00000000..3f1b1aef --- /dev/null +++ b/source/n/wpa_supplicant/wpa_supplicant.url @@ -0,0 +1 @@ +https://w1.fi/wpa_supplicant/ diff --git a/source/x/xterm/XTerm-console b/source/x/xterm/XTerm-console index 3dfe7715..3e28bf7a 100644 --- a/source/x/xterm/XTerm-console +++ b/source/x/xterm/XTerm-console @@ -22,23 +22,23 @@ ! can look a little odd when being resized. *VT100.font: -*-terminus-bold-r-normal-*-20-*-*-*-*-*-iso10646-1 -*VT100.font1: -*-terminus-bold-r-normal-*-12-*-*-*-*-*-iso10646-1 -*VT100.font2: -*-terminus-bold-r-normal-*-16-*-*-*-*-*-iso10646-1 -*VT100.font3: -*-terminus-bold-r-normal-*-20-*-*-*-*-*-iso10646-1 -*VT100.font4: -*-terminus-bold-r-normal-*-24-*-*-*-*-*-iso10646-1 -*VT100.font5: -*-terminus-bold-r-normal-*-28-*-*-*-*-*-iso10646-1 -*VT100.font6: -*-terminus-bold-r-normal-*-32-*-*-*-*-*-iso10646-1 +*VT100.font2: -*-terminus-bold-r-normal-*-12-*-*-*-*-*-iso10646-1 +*VT100.font3: -*-terminus-bold-r-normal-*-16-*-*-*-*-*-iso10646-1 +*VT100.font4: -*-terminus-bold-r-normal-*-20-*-*-*-*-*-iso10646-1 +*VT100.font5: -*-terminus-bold-r-normal-*-24-*-*-*-*-*-iso10646-1 +*VT100.font6: -*-terminus-bold-r-normal-*-28-*-*-*-*-*-iso10646-1 +*VT100.font7: -*-terminus-bold-r-normal-*-32-*-*-*-*-*-iso10646-1 ! Scalable/TrueType fonts: *VT100.faceName: monospace -*VT100.faceSize: 12.0 -*VT100.faceSize1: 6.0 -*VT100.faceSize2: 10.0 -*VT100.faceSize3: 12.0 -*VT100.faceSize4: 16.0 -*VT100.faceSize5: 18.0 -*VT100.faceSize6: 22.0 +*VT100.faceSize: 12.6 +*VT100.faceSize2: 7.5 +*VT100.faceSize3: 10.0 +*VT100.faceSize4: 12.6 +*VT100.faceSize5: 15.0 +*VT100.faceSize6: 17.6 +*VT100.faceSize7: 20.0 ! VT100 colours and appearance !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild index 52828987..0fb93661 100755 --- a/source/x/xterm/xterm.SlackBuild +++ b/source/x/xterm/xterm.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xterm VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} |