From 982e968ef61a94e0de75d733e9036e5c60afca34 Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Wed, 25 Aug 2021 15:29:51 +0200 Subject: print/hplip(-plugin): update to 3.22.2 - Convert post-patch to real patches because they are easier to maintain. - Fix a NULL dereference in the scanner backend when D-Bus isn't running. - Depend on sysutils/py-distro to make hp-toolbox (Device Manager) work again. - Upstream switched to Avahi for mDNS support. Rename the SNMP option to NETWORK because it's not just SNMP now. - Don't install some programs related to uninstalling and upgrading of HPLIP and the installation of firmware plugins because they circumvent the package system. - Install icons in share/icons so desktops can choose an appropriate resolution. Portions taken from a patch by Oleg Sidorkin . PR: 255586, 257034, 257512 --- print/hplip/files/patch-protocol_discovery_mdns.c | 86 ----------------------- 1 file changed, 86 deletions(-) delete mode 100644 print/hplip/files/patch-protocol_discovery_mdns.c (limited to 'print/hplip/files/patch-protocol_discovery_mdns.c') diff --git a/print/hplip/files/patch-protocol_discovery_mdns.c b/print/hplip/files/patch-protocol_discovery_mdns.c deleted file mode 100644 index f22417a63aa3..000000000000 --- a/print/hplip/files/patch-protocol_discovery_mdns.c +++ /dev/null @@ -1,86 +0,0 @@ -Use a dynamically allocated port instead of binding port 5353. The bind(2) -call fails when Avahi has already claimed port 5353. On top of that, HPLIP -only performs one-shot queries and those shouldn't be using port 5353 according -to RFC 6762. - -Don't disable loop-back. It's harmless. - -Use default TTL of 1. RFC 6762 requires 255 for responses, not for queries. - -There's no need to join the multicast group for one-shot queries. Responses -are sent to the unicast address. - ---- protocol/discovery/mdns.c.orig 2020-07-01 14:48:56 UTC -+++ protocol/discovery/mdns.c -@@ -24,7 +24,11 @@ - Author: Sanjay Kumar - \*****************************************************************************/ - --//#include -+#include -+#include -+#include -+#include -+#include - #include - #include - #include -@@ -70,57 +74,13 @@ static int mdns_convert_name_to_dns(const char *name, - static int mdns_open_socket(int *psocket) - { - int stat = MDNS_STATUS_ERROR; -- int udp_socket = -1, yes = 1; -- char loop = 0, ttl = 255; -- struct sockaddr_in recv_addr , addr; -- struct ip_mreq mreq; -+ int udp_socket; - - DBG("mdns_open_socket entry.\n"); - - if ((udp_socket = socket(AF_INET, SOCK_DGRAM, 0)) == -1) - { - BUG("unable to create udp socket: %m\n"); -- goto bugout; -- } -- -- /* Get rid of "address already in use" error message. */ -- if (setsockopt(udp_socket, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) == -1) -- { -- BUG("unable to setsockopt: %m\n"); -- goto bugout; -- } -- -- /* Bind the socket to port and IP equal to INADDR_ANY. */ -- bzero(&recv_addr, sizeof(recv_addr)); -- recv_addr.sin_family = AF_INET; -- recv_addr.sin_addr.s_addr = htonl(INADDR_ANY); -- recv_addr.sin_port = htons(5353); -- if (bind(udp_socket, (struct sockaddr *) &recv_addr, sizeof(recv_addr)) == -1) -- { -- BUG("unable to bind udp socket: %m\n"); -- goto bugout; -- } -- -- /* Set multicast loopback off. */ -- if (setsockopt(udp_socket, IPPROTO_IP, IP_MULTICAST_LOOP, &loop, sizeof(loop)) == -1) -- { -- BUG("unable to setsockopt: %m\n"); -- goto bugout; -- } -- -- /* Set ttl to 255. Required by mdns. */ -- if (setsockopt(udp_socket, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl))== -1) -- { -- BUG("unable to setsockopt: %m\n"); -- goto bugout; -- } -- -- /* Join the .local multicast group */ -- mreq.imr_multiaddr.s_addr = inet_addr("224.0.0.251"); -- mreq.imr_interface.s_addr = htonl(INADDR_ANY); -- if (setsockopt(udp_socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(struct ip_mreq)) == -1) { -- BUG("unable to add to multicast group: %m\n"); -- close(udp_socket); - goto bugout; - } - -- cgit v1.2.3