cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplfy the slp patch the same way as mdns.

Browse Source
This commit is contained in:
ajacoutot 2013-01-26 14:50:17 +00:00
parent 20e289fba1
commit 9bed088b75
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
print/hplip/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.65 2013/01/26 12:25:54 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.66 2013/01/26 14:50:17 ajacoutot Exp $
SHARED_ONLY= Yes
@ -17,9 +17,9 @@ PKGNAME-hpcups= hpcups-${V}
PKGNAME-libs= hplip-libs-${V}
PKGNAME-gui= hplip-gui-${V}
REVISION-main= 4
REVISION-main= 5
REVISION-libs= 0
REVISION-gui= 1
REVISION-gui= 2
REVISION-hpcups=1
REVISION-hpijs= 0

13
print/hplip/patches/patch-base_slp_py
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-base_slp_py,v 1.2 2012/06/26 11:17:54 sthen Exp $
$OpenBSD: patch-base_slp_py,v 1.3 2013/01/26 14:50:17 ajacoutot Exp $
XXX Unable to setup multicast socket... [Errno 22] Invalid argument
--- base/slp.py.orig Sun Sep 26 19:07:36 2010
+++ base/slp.py Fri Nov 5 11:06:42 2010
@@ -69,12 +69,13 @@ def detectNetworkDevices(ttl=4, timeout=10): #, xid=No
--- base/slp.py.orig Tue Nov 20 10:55:15 2012
+++ base/slp.py Sat Jan 26 15:04:25 2013
@@ -69,12 +69,12 @@ def detectNetworkDevices(ttl=4, timeout=10): #, xid=No
pass
try:
@ -12,9 +12,8 @@ XXX Unable to setup multicast socket... [Errno 22] Invalid argument
- s.setsockopt(socket.SOL_IP, socket.IP_MULTICAST_IF, socket.inet_aton(intf) + socket.inet_aton('0.0.0.0'))
- s.setsockopt(socket.SOL_IP, socket.IP_MULTICAST_LOOP ,1)
+ s.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_TTL, ttl)
+ s.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_IF, socket.inet_aton(intf))
+ s.setsockopt(socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP, socket.inet_aton(mcast_addr) + socket.inet_aton(intf))
+ s.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_LOOP, 1)
+ s.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_IF, socket.inet_aton(intf) + socket.inet_aton('0.0.0.0'))
+ s.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_LOOP ,1)
except Exception, e:
log.error("Unable to setup multicast socket for SLP: %s" % e)
- return {}