summaryrefslogtreecommitdiffstats
path: root/openembedded
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-01-19 21:55:53 +0000
committerRichard Purdie <richard@openedhand.com>2006-01-19 21:55:53 +0000
commit00f73b93ad637c0a46ad22e0e1451b9d250a2651 (patch)
tree5529e260e220c0013839329a7c431dcd321c951b /openembedded
parent7c37c29a5a141a02ca4acf6d54f6a762f1ff4a79 (diff)
downloadpoky-00f73b93ad637c0a46ad22e0e1451b9d250a2651.tar.gz
Add avahi 0.6.3 abd renive 0.5.2 and 0.6
git-svn-id: https://svn.o-hand.com/repos/poky@225 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded')
-rw-r--r--openembedded/packages/avahi/avahi-0.5.2/alignment-fix.patch96
-rw-r--r--openembedded/packages/avahi/avahi_0.5.2.bb53
-rw-r--r--openembedded/packages/avahi/avahi_0.6.3.bb (renamed from openembedded/packages/avahi/avahi_0.6.bb)9
3 files changed, 5 insertions, 153 deletions
diff --git a/openembedded/packages/avahi/avahi-0.5.2/alignment-fix.patch b/openembedded/packages/avahi/avahi-0.5.2/alignment-fix.patch
deleted file mode 100644
index fc23f23756..0000000000
--- a/openembedded/packages/avahi/avahi-0.5.2/alignment-fix.patch
+++ /dev/null
@@ -1,96 +0,0 @@
1--- avahi-0.5/avahi-core/dns.c.orig 2005-09-23 16:35:02 +0200
2+++ avahi-0.5/avahi-core/dns.c 2005-09-23 16:35:07 +0200
3@@ -177,11 +177,13 @@
4 assert(idx < p->size);
5
6 if (idx < 0x4000) {
7- uint16_t *t;
8- if (!(t = (uint16_t*) avahi_dns_packet_extend(p, sizeof(uint16_t))))
9+ uint8_t *t;
10+
11+ if (!(t = (uint8_t*) avahi_dns_packet_extend(p, sizeof(uint16_t))))
12 return NULL;
13
14- *t = htons((0xC000 | idx));
15+ t[0] = (uint8_t) ((0xC000 | idx) >> 8);
16+ t[1] = (uint8_t) idx;
17 return saved_ptr;
18 }
19 }
20@@ -223,7 +225,8 @@
21 if (!(d = avahi_dns_packet_extend(p, sizeof(uint16_t))))
22 return NULL;
23
24- *((uint16_t*) d) = htons(v);
25+ d[0] = (uint8_t) (v >> 8);
26+ d[1] = (uint8_t) v;
27 return d;
28 }
29
30@@ -234,7 +237,10 @@
31 if (!(d = avahi_dns_packet_extend(p, sizeof(uint32_t))))
32 return NULL;
33
34- *((uint32_t*) d) = htonl(v);
35+ d[0] = (uint8_t) (v >> 24);
36+ d[1] = (uint8_t) (v >> 16);
37+ d[2] = (uint8_t) (v >> 8);
38+ d[3] = (uint8_t) v;
39
40 return d;
41 }
42@@ -385,26 +391,42 @@
43 }
44
45 int avahi_dns_packet_consume_uint16(AvahiDnsPacket *p, uint16_t *ret_v) {
46+ uint8_t *d;
47+ uint16_t tmp_v;
48+
49 assert(p);
50 assert(ret_v);
51
52 if (p->rindex + sizeof(uint16_t) > p->size)
53 return -1;
54
55- *ret_v = ntohs(*((uint16_t*) (AVAHI_DNS_PACKET_DATA(p) + p->rindex)));
56+ d = (uint8_t*) (AVAHI_DNS_PACKET_DATA(p) + p->rindex);
57+ tmp_v = (d[0] << 8) | d[1];
58+ d = (uint8_t*) ret_v;
59+ d[0] = ((uint8_t*)(&tmp_v))[0];
60+ d[1] = ((uint8_t*)(&tmp_v))[1];
61 p->rindex += sizeof(uint16_t);
62
63 return 0;
64 }
65
66 int avahi_dns_packet_consume_uint32(AvahiDnsPacket *p, uint32_t *ret_v) {
67+ uint8_t* d;
68+ uint32_t tmp_v;
69+
70 assert(p);
71 assert(ret_v);
72
73 if (p->rindex + sizeof(uint32_t) > p->size)
74 return -1;
75
76- *ret_v = ntohl(*((uint32_t*) (AVAHI_DNS_PACKET_DATA(p) + p->rindex)));
77+ d = (uint8_t*) (AVAHI_DNS_PACKET_DATA(p) + p->rindex);
78+ tmp_v = (d[0] << 24) | (d[1] << 16) | (d[2] << 8) | d[3];
79+ d = (uint8_t*) ret_v;
80+ d[0] = ((uint8_t*)(&tmp_v))[0];
81+ d[1] = ((uint8_t*)(&tmp_v))[1];
82+ d[2] = ((uint8_t*)(&tmp_v))[2];
83+ d[3] = ((uint8_t*)(&tmp_v))[3];
84 p->rindex += sizeof(uint32_t);
85
86 return 0;
87@@ -733,7 +755,8 @@
88
89 /* avahi_log_debug("appended %u", size); */
90
91- * (uint16_t*) l = htons((uint16_t) size);
92+ l[0] = (uint8_t) ((uint16_t) size >> 8);
93+ l[1] = (uint8_t) ((uint16_t) size);
94
95 return t;
96
diff --git a/openembedded/packages/avahi/avahi_0.5.2.bb b/openembedded/packages/avahi/avahi_0.5.2.bb
deleted file mode 100644
index e4291db2c2..0000000000
--- a/openembedded/packages/avahi/avahi_0.5.2.bb
+++ /dev/null
@@ -1,53 +0,0 @@
1DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
2HOMEPAGE = "http://www.freedesktop.org/Software/Avahi"
3LICENSE= "GPL"
4DEPENDS = "expat libdaemon dbus-0.50"
5RRECOMMENDS = "libnss-mdns"
6SECTION = "net"
7PRIORITY = "optional"
8PR = "r0"
9
10SRC_URI = "http://www.freedesktop.org/~lennart/avahi-${PV}.tar.gz \
11 file://alignment-fix.patch;patch=1"
12
13PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc"
14
15FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
16FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
17FILES_avahi-daemon = "${sbindir}/avahi-daemon \
18 ${sysconfdir}/avahi/avahi-daemon.conf \
19 ${sysconfdir}/avahi/services \
20 ${sysconfdir}/dbus-1 \
21 ${sysconfdir}/init.d/avahi-daemon \
22 ${datadir}/avahi/introspection/*.introspect \
23 ${datadir}/avahi/avahi-service.dtd \
24 ${datadir}/avahi/service-types"
25FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
26FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
27 ${sysconfdir}/avahi/avahi-dnsconfd.action \
28 ${sysconfdir}/init.d/avahi-dnsconfd"
29FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
30
31CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
32
33EXTRA_OECONF = "--with-distro=debian --disable-mono --disable-mono-docs --disable-gtk --disable-qt3 --disable-qt4 --disable-python"
34inherit autotools
35inherit update-rc.d
36
37INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
38INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
39INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
40INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
41INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
42
43pkg_postinst_avahi-daemon () {
44 grep avahi /etc/group || addgroup avahi
45 grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
46 /etc/init.d/dbus-1 force-reload
47}
48
49pkg_postrm_avahi-daemon () {
50 deluser avahi || true
51 delgroup avahi || true
52}
53
diff --git a/openembedded/packages/avahi/avahi_0.6.bb b/openembedded/packages/avahi/avahi_0.6.3.bb
index 4ea3841f1d..fbd7208d1d 100644
--- a/openembedded/packages/avahi/avahi_0.6.bb
+++ b/openembedded/packages/avahi/avahi_0.6.3.bb
@@ -1,15 +1,15 @@
1DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" 1DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
2HOMEPAGE = "http://www.freedesktop.org/Software/Avahi" 2HOMEPAGE = "http://avahi.org"
3LICENSE= "GPL" 3LICENSE= "GPL"
4DEPENDS = "expat libdaemon dbus-0.50" 4DEPENDS = "expat libdaemon dbus-0.60"
5RRECOMMENDS = "libnss-mdns" 5RRECOMMENDS = "libnss-mdns"
6SECTION = "net" 6SECTION = "net"
7PRIORITY = "optional" 7PRIORITY = "optional"
8PR = "r0" 8PR = "r0"
9 9
10SRC_URI = "http://www.freedesktop.org/~lennart/avahi-${PV}.tar.gz" 10SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
11 11
12PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc" 12PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils"
13 13
14FILES_libavahi-common = "${libdir}/libavahi-common.so.*" 14FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
15FILES_libavahi-core= "${libdir}/libavahi-core.so.*" 15FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
@@ -26,6 +26,7 @@ FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
26 ${sysconfdir}/avahi/avahi-dnsconfd.action \ 26 ${sysconfdir}/avahi/avahi-dnsconfd.action \
27 ${sysconfdir}/init.d/avahi-dnsconfd" 27 ${sysconfdir}/init.d/avahi-dnsconfd"
28FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" 28FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
29FILES_avahi-utils = "${bindir}/avahi-*"
29 30
30CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" 31CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
31 32
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-04-21 16:01:01 +0000