summaryrefslogtreecommitdiff
path: root/net/avahi/files
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--net/avahi/files/patch-Makefile.in20
-rw-r--r--net/avahi/files/patch-avahi-core_socket.c34
-rw-r--r--net/avahi/files/patch-avahi-sharp_Makefile.in16
3 files changed, 30 insertions, 40 deletions
diff --git a/net/avahi/files/patch-Makefile.in b/net/avahi/files/patch-Makefile.in
index 8467b3b3eca8..a117a3b11b5f 100644
--- a/net/avahi/files/patch-Makefile.in
+++ b/net/avahi/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig Sun Jan 29 13:36:41 2006
-+++ Makefile.in Sun Jan 29 13:37:37 2006
+--- Makefile.in.orig Mon Jan 30 13:05:47 2006
++++ Makefile.in Mon Jan 30 13:07:36 2006
@@ -1037,6 +1037,8 @@
avahi-core.pc: avahi-core.pc.in
sed -e 's,@prefix\@,$(prefix),g' \
@@ -9,3 +9,19 @@
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
@HAVE_DBUS_TRUE@avahi-client.pc: avahi-client.pc.in
+@@ -1047,11 +1049,15 @@
+ @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@avahi-compat-howl.pc: avahi-compat-howl.pc.in
+ @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@ sed -e 's,@prefix\@,$(prefix),g' \
+ @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@ -e 's,@libdir\@,$(libdir),g' \
++@ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@ -e 's,@PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
++@ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@ -e 's,@PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
+ @ENABLE_COMPAT_HOWL_TRUE@@HAVE_DBUS_TRUE@ -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' $< > $@
+
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@avahi-compat-libdns_sd.pc: avahi-compat-libdns_sd.pc.in
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ sed -e 's,@prefix\@,$(prefix),g' \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ -e 's,@libdir\@,$(libdir),g' \
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ -e 's,@PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
++@ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ -e 's,@PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
+ @ENABLE_COMPAT_LIBDNS_SD_TRUE@@HAVE_DBUS_TRUE@ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+
+ @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@avahi-sharp.pc: avahi-sharp.pc.in
diff --git a/net/avahi/files/patch-avahi-core_socket.c b/net/avahi/files/patch-avahi-core_socket.c
index 783d41c02f35..dc19ed3795be 100644
--- a/net/avahi/files/patch-avahi-core_socket.c
+++ b/net/avahi/files/patch-avahi-core_socket.c
@@ -1,38 +1,28 @@
---- avahi-core/socket.c.orig Sun Apr 23 19:20:31 2006
-+++ avahi-core/socket.c Sun Apr 23 20:16:46 2006
+--- avahi-core/socket.c.orig Thu Feb 9 20:45:09 2006
++++ avahi-core/socket.c Mon Apr 24 17:14:18 2006
@@ -468,7 +468,7 @@ int avahi_send_dns_packet_ipv4(int fd, A
size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_pktinfo)) / sizeof(size_t)) + 1];
#elif defined(IP_SENDSRCADDR)
struct cmsghdr *cmsg;
- size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_addr)) / sizeof(size_t)) + 1];
-+ char cmsg_data[CMSG_SPACE(sizeof(struct in_addr))];
++ uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_addr))];
#endif
assert(fd >= 0);
-@@ -491,8 +491,8 @@ int avahi_send_dns_packet_ipv4(int fd, A
- msg.msg_iov = &io;
- msg.msg_iovlen = 1;
- msg.msg_flags = 0;
-- msg.msg_control = NULL;
-- msg.msg_controllen = 0;
-+ msg.msg_control = cmsg_data;
-+ msg.msg_controllen = sizeof(cmsg_data);
-
- #ifdef IP_PKTINFO
- if (interface > 0 || src_address) {
-@@ -518,18 +518,15 @@ int avahi_send_dns_packet_ipv4(int fd, A
+@@ -518,18 +518,17 @@ int avahi_send_dns_packet_ipv4(int fd, A
#elif defined(IP_SENDSRCADDR)
if (src_address) {
struct in_addr *addr;
+
++ msg.msg_control = cmsg_data;
++ msg.msg_controllen = sizeof(cmsg_data);
+ cmsg = CMSG_FIRSTHDR(&msg);
- memset(cmsg_data, 0, sizeof(cmsg_data));
- cmsg = (struct cmsghdr*) cmsg_data;
-- cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
+ cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
cmsg->cmsg_level = IPPROTO_IP;
cmsg->cmsg_type = IP_SENDSRCADDR;
-+ cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
addr = (struct in_addr *)CMSG_DATA(cmsg);
addr->s_addr = src_address->address;
@@ -42,30 +32,30 @@
}
#elif defined(IP_MULTICAST_IF)
{
-@@ -551,7 +548,7 @@ int avahi_send_dns_packet_ipv6(int fd, A
+@@ -551,7 +550,7 @@ int avahi_send_dns_packet_ipv6(int fd, A
struct msghdr msg;
struct iovec io;
struct cmsghdr *cmsg;
- size_t cmsg_data[(CMSG_SPACE(sizeof(struct in6_pktinfo))/sizeof(size_t)) + 1];
-+ char cmsg_data[CMSG_SPACE(sizeof(struct in6_pktinfo))];
++ uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in6_pktinfo))];
assert(fd >= 0);
assert(p);
-@@ -576,9 +573,11 @@ int avahi_send_dns_packet_ipv6(int fd, A
+@@ -576,9 +575,11 @@ int avahi_send_dns_packet_ipv6(int fd, A
if (interface > 0 || src_address) {
struct in6_pktinfo *pkti;
+
+ msg.msg_control = cmsg_data;
+ msg.msg_controllen = sizeof(cmsg_data);
-+ cmsg = CMSG_FIRSTHDR(&msg);
++ cmsg = CMSG_FIRSTHDR(&msg);
- memset(cmsg_data, 0, sizeof(cmsg_data));
- cmsg = (struct cmsghdr*) cmsg_data;
cmsg->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo));
cmsg->cmsg_level = IPPROTO_IPV6;
cmsg->cmsg_type = IPV6_PKTINFO;
-@@ -591,8 +590,6 @@ int avahi_send_dns_packet_ipv6(int fd, A
+@@ -591,8 +592,6 @@ int avahi_send_dns_packet_ipv6(int fd, A
if (src_address)
memcpy(&pkti->ipi6_addr, src_address->address, sizeof(src_address->address));
diff --git a/net/avahi/files/patch-avahi-sharp_Makefile.in b/net/avahi/files/patch-avahi-sharp_Makefile.in
deleted file mode 100644
index 45c44adbea75..000000000000
--- a/net/avahi/files/patch-avahi-sharp_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- avahi-sharp/Makefile.in.orig Tue Feb 7 23:04:12 2006
-+++ avahi-sharp/Makefile.in Tue Feb 7 23:25:30 2006
-@@ -573,10 +573,10 @@
- $(ASSEMBLY): $(AVAHISOURCES)
- mcs -keyfile:$(srcdir)/avahi.snk -target:library -out:$@ -debug $(AVAHISOURCES) -r:Mono.Posix
-
- $(ASSEMBLY).config: $(ASSEMBLY).config.in
-- $(srcdir)/gencfg.sh $(top_builddir)/avahi-client/libavahi-client.la \
-- $(top_builddir)/avahi-common/libavahi-common.la \
-- $(top_builddir)/avahi-glib/libavahi-glib.la < $< > $@
-+# $(srcdir)/gencfg.sh $(top_builddir)/avahi-client/libavahi-client.la \
-+# $(top_builddir)/avahi-common/libavahi-common.la \
-+# $(top_builddir)/avahi-glib/libavahi-glib.la < $< > $@
-
- @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@all: $(ASSEMBLY) $(ASSEMBLY).config
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-09 02:40:05 +0000