1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/uClibc/0.9.30.2/130-gnu89-inline.patch Fri Jan 15 22:21:12 2010 +0100
1.3 @@ -0,0 +1,16 @@
1.4 +Original patch from Gentoo.
1.5 +
1.6 +-= BEGIN original header =-
1.7 +-= END original header =-
1.8 +
1.9 +diff -durN uClibc-0.9.30.orig/Rules.mak uClibc-0.9.30/Rules.mak
1.10 +--- uClibc-0.9.30.orig/Rules.mak 2008-11-12 13:24:16.000000000 +0100
1.11 ++++ uClibc-0.9.30/Rules.mak 2009-02-07 09:57:59.000000000 +0100
1.12 +@@ -519,6 +519,7 @@
1.13 + endif
1.14 +
1.15 + CFLAGS += $(call check_gcc,-std=gnu99,)
1.16 ++CFLAGS += $(call check_gcc,-fgnu89-inline,)
1.17 +
1.18 + LDFLAGS_NOSTRIP:=$(CPU_LDFLAGS-y) -shared \
1.19 + -Wl,--warn-common -Wl,--warn-once -Wl,-z,combreloc
2.1 --- a/patches/uClibc/0.9.30.2/140-gnu89-inline.patch Thu Jan 14 23:06:48 2010 +0100
2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2.3 @@ -1,16 +0,0 @@
2.4 -Original patch from Gentoo.
2.5 -
2.6 --= BEGIN original header =-
2.7 --= END original header =-
2.8 -
2.9 -diff -durN uClibc-0.9.30.orig/Rules.mak uClibc-0.9.30/Rules.mak
2.10 ---- uClibc-0.9.30.orig/Rules.mak 2008-11-12 13:24:16.000000000 +0100
2.11 -+++ uClibc-0.9.30/Rules.mak 2009-02-07 09:57:59.000000000 +0100
2.12 -@@ -519,6 +519,7 @@
2.13 - endif
2.14 -
2.15 - CFLAGS += $(call check_gcc,-std=gnu99,)
2.16 -+CFLAGS += $(call check_gcc,-fgnu89-inline,)
2.17 -
2.18 - LDFLAGS_NOSTRIP:=$(CPU_LDFLAGS-y) -shared \
2.19 - -Wl,--warn-common -Wl,--warn-once -Wl,-z,combreloc
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/patches/uClibc/0.9.30.2/140-pack-netinet-structs.patch Fri Jan 15 22:21:12 2010 +0100
3.3 @@ -0,0 +1,224 @@
3.4 +diff -urN uClibc-0.9.30.1.orig/include/netinet/igmp.h uClibc-0.9.30.1/include/netinet/igmp.h
3.5 +--- uClibc-0.9.30.1.orig/include/netinet/igmp.h 2009-04-08 09:00:10.926545132 +0200
3.6 ++++ uClibc-0.9.30.1/include/netinet/igmp.h 2009-04-08 09:00:26.242514273 +0200
3.7 +@@ -69,7 +69,7 @@
3.8 + u_int8_t igmp_code; /* routing code */
3.9 + u_int16_t igmp_cksum; /* checksum */
3.10 + struct in_addr igmp_group; /* group address */
3.11 +-};
3.12 ++} __attribute__ ((__packed__));
3.13 +
3.14 + #define IGMP_MINLEN 8
3.15 +
3.16 +diff -urN uClibc-0.9.30.1.orig/include/netinet/in.h uClibc-0.9.30.1/include/netinet/in.h
3.17 +--- uClibc-0.9.30.1.orig/include/netinet/in.h 2009-04-08 09:00:10.926545132 +0200
3.18 ++++ uClibc-0.9.30.1/include/netinet/in.h 2009-04-08 09:00:26.242514273 +0200
3.19 +@@ -202,7 +202,7 @@
3.20 + #define s6_addr in6_u.u6_addr8
3.21 + #define s6_addr16 in6_u.u6_addr16
3.22 + #define s6_addr32 in6_u.u6_addr32
3.23 +- };
3.24 ++ } __attribute__ ((__packed__));
3.25 +
3.26 + extern const struct in6_addr in6addr_any; /* :: */
3.27 + extern const struct in6_addr in6addr_loopback; /* ::1 */
3.28 +@@ -229,7 +229,7 @@
3.29 + __SOCKADDR_COMMON_SIZE -
3.30 + sizeof (in_port_t) -
3.31 + sizeof (struct in_addr)];
3.32 +- };
3.33 ++ } __attribute__ ((__packed__));
3.34 + #endif
3.35 +
3.36 + /* Ditto, for IPv6. */
3.37 +@@ -240,7 +240,7 @@
3.38 + uint32_t sin6_flowinfo; /* IPv6 flow information */
3.39 + struct in6_addr sin6_addr; /* IPv6 address */
3.40 + uint32_t sin6_scope_id; /* IPv6 scope-id */
3.41 +- };
3.42 ++ } __attribute__ ((__packed__));
3.43 +
3.44 +
3.45 + /* IPv4 multicast request. */
3.46 +@@ -251,7 +251,7 @@
3.47 +
3.48 + /* Local IP address of interface. */
3.49 + struct in_addr imr_interface;
3.50 +- };
3.51 ++ } __attribute__ ((__packed__));
3.52 +
3.53 + struct ip_mreq_source
3.54 + {
3.55 +@@ -263,7 +263,7 @@
3.56 +
3.57 + /* IP address of interface. */
3.58 + struct in_addr imr_sourceaddr;
3.59 +- };
3.60 ++ } __attribute__ ((__packed__));
3.61 +
3.62 + /* Likewise, for IPv6. */
3.63 + struct ipv6_mreq
3.64 +@@ -273,7 +273,7 @@
3.65 +
3.66 + /* local interface */
3.67 + unsigned int ipv6mr_interface;
3.68 +- };
3.69 ++ } __attribute__ ((__packed__));
3.70 +
3.71 +
3.72 + /* Multicast group request. */
3.73 +@@ -284,7 +284,7 @@
3.74 +
3.75 + /* Group address. */
3.76 + struct sockaddr_storage gr_group;
3.77 +- };
3.78 ++ } __attribute__ ((__packed__));
3.79 +
3.80 + struct group_source_req
3.81 + {
3.82 +@@ -296,7 +296,7 @@
3.83 +
3.84 + /* Source address. */
3.85 + struct sockaddr_storage gsr_source;
3.86 +- };
3.87 ++ } __attribute__ ((__packed__));
3.88 +
3.89 +
3.90 + /* Full-state filter operations. */
3.91 +@@ -315,7 +315,7 @@
3.92 + uint32_t imsf_numsrc;
3.93 + /* Source addresses. */
3.94 + struct in_addr imsf_slist[1];
3.95 +- };
3.96 ++ } __attribute__ ((__packed__));
3.97 +
3.98 + #define IP_MSFILTER_SIZE(numsrc) (sizeof (struct ip_msfilter) \
3.99 + - sizeof (struct in_addr) \
3.100 +@@ -336,7 +336,7 @@
3.101 + uint32_t gf_numsrc;
3.102 + /* Source addresses. */
3.103 + struct sockaddr_storage gf_slist[1];
3.104 +-};
3.105 ++} __attribute__ ((__packed__));
3.106 +
3.107 + #define GROUP_FILTER_SIZE(numsrc) (sizeof (struct group_filter) \
3.108 + - sizeof (struct sockaddr_storage) \
3.109 +@@ -460,14 +460,14 @@
3.110 + {
3.111 + struct in6_addr ipi6_addr; /* src/dst IPv6 address */
3.112 + unsigned int ipi6_ifindex; /* send/recv interface index */
3.113 +- };
3.114 ++ } __attribute__ ((__packed__));
3.115 +
3.116 + /* IPv6 MTU information. */
3.117 + struct ip6_mtuinfo
3.118 + {
3.119 + struct sockaddr_in6 ip6m_addr; /* dst address including zone ID */
3.120 + uint32_t ip6m_mtu; /* path MTU in host byte order */
3.121 +- };
3.122 ++ } __attribute__ ((__packed__));
3.123 +
3.124 +
3.125 + #if 0 /*def __USE_GNU*/
3.126 +diff -urN uClibc-0.9.30.1.orig/include/netinet/ip.h uClibc-0.9.30.1/include/netinet/ip.h
3.127 +--- uClibc-0.9.30.1.orig/include/netinet/ip.h 2009-04-08 09:00:10.926545132 +0200
3.128 ++++ uClibc-0.9.30.1/include/netinet/ip.h 2009-04-08 09:00:26.242514273 +0200
3.129 +@@ -63,7 +63,7 @@
3.130 + u_int32_t saddr;
3.131 + u_int32_t daddr;
3.132 + /*The options start here. */
3.133 +- };
3.134 ++ } __attribute__ ((__packed__));
3.135 +
3.136 + #ifdef __USE_BSD
3.137 + /*
3.138 +@@ -127,7 +127,7 @@
3.139 + u_int8_t ip_p; /* protocol */
3.140 + u_short ip_sum; /* checksum */
3.141 + struct in_addr ip_src, ip_dst; /* source and dest address */
3.142 +- };
3.143 ++ } __attribute__ ((__packed__));
3.144 +
3.145 + /*
3.146 + * Time stamp option structure.
3.147 +diff -urN uClibc-0.9.30.1.orig/include/netinet/ip_icmp.h uClibc-0.9.30.1/include/netinet/ip_icmp.h
3.148 +--- uClibc-0.9.30.1.orig/include/netinet/ip_icmp.h 2009-04-08 09:00:10.926545132 +0200
3.149 ++++ uClibc-0.9.30.1/include/netinet/ip_icmp.h 2009-04-08 09:00:26.242514273 +0200
3.150 +@@ -43,7 +43,7 @@
3.151 + u_int16_t mtu;
3.152 + } frag; /* path mtu discovery */
3.153 + } un;
3.154 +-};
3.155 ++} __attribute__ ((__packed__));
3.156 +
3.157 + #define ICMP_ECHOREPLY 0 /* Echo Reply */
3.158 + #define ICMP_DEST_UNREACH 3 /* Destination Unreachable */
3.159 +@@ -199,7 +199,7 @@
3.160 + #define icmp_radv icmp_dun.id_radv
3.161 + #define icmp_mask icmp_dun.id_mask
3.162 + #define icmp_data icmp_dun.id_data
3.163 +-};
3.164 ++} __attribute__ ((__packed__));
3.165 +
3.166 + /*
3.167 + * Lower bounds on packet lengths for various types.
3.168 +diff -urN uClibc-0.9.30.1.orig/include/netinet/tcp.h uClibc-0.9.30.1/include/netinet/tcp.h
3.169 +--- uClibc-0.9.30.1.orig/include/netinet/tcp.h 2009-04-08 09:00:10.926545132 +0200
3.170 ++++ uClibc-0.9.30.1/include/netinet/tcp.h 2009-04-08 09:00:26.242514273 +0200
3.171 +@@ -86,7 +86,7 @@
3.172 + u_int16_t th_win; /* window */
3.173 + u_int16_t th_sum; /* checksum */
3.174 + u_int16_t th_urp; /* urgent pointer */
3.175 +-};
3.176 ++} __attribute__ ((__packed__));
3.177 +
3.178 + # else /* !__FAVOR_BSD */
3.179 + struct tcphdr
3.180 +@@ -121,7 +121,7 @@
3.181 + u_int16_t window;
3.182 + u_int16_t check;
3.183 + u_int16_t urg_ptr;
3.184 +-};
3.185 ++} __attribute__ ((__packed__));
3.186 + # endif /* __FAVOR_BSD */
3.187 +
3.188 + enum
3.189 +@@ -226,7 +226,7 @@
3.190 + u_int32_t tcpi_rcv_space;
3.191 +
3.192 + u_int32_t tcpi_total_retrans;
3.193 +-};
3.194 ++} __attribute__ ((__packed__));
3.195 +
3.196 +
3.197 + /* For TCP_MD5SIG socket option. */
3.198 +@@ -239,7 +239,7 @@
3.199 + u_int16_t tcpm_keylen; /* Key length. */
3.200 + u_int32_t __tcpm_pad2; /* Zero. */
3.201 + u_int8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */
3.202 +-};
3.203 ++} __attribute__ ((__packed__));
3.204 +
3.205 + #endif /* Misc. */
3.206 +
3.207 +diff -urN uClibc-0.9.30.1.orig/include/netinet/udp.h uClibc-0.9.30.1/include/netinet/udp.h
3.208 +--- uClibc-0.9.30.1.orig/include/netinet/udp.h 2009-04-08 09:00:10.926545132 +0200
3.209 ++++ uClibc-0.9.30.1/include/netinet/udp.h 2009-04-08 09:00:26.242514273 +0200
3.210 +@@ -61,7 +61,7 @@
3.211 + u_int16_t uh_dport; /* destination port */
3.212 + u_int16_t uh_ulen; /* udp length */
3.213 + u_int16_t uh_sum; /* udp checksum */
3.214 +-};
3.215 ++} __attribute__ ((__packed__));
3.216 +
3.217 + #else
3.218 +
3.219 +@@ -71,7 +71,7 @@
3.220 + u_int16_t dest;
3.221 + u_int16_t len;
3.222 + u_int16_t check;
3.223 +-};
3.224 ++} __attribute__ ((__packed__));
3.225 + #endif
3.226 +
3.227 + #define SOL_UDP 17 /* sockopt level for UDP */
4.1 --- a/patches/uClibc/0.9.30.2/200-pack-netinet-structs.patch Thu Jan 14 23:06:48 2010 +0100
4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
4.3 @@ -1,224 +0,0 @@
4.4 -diff -urN uClibc-0.9.30.1.orig/include/netinet/igmp.h uClibc-0.9.30.1/include/netinet/igmp.h
4.5 ---- uClibc-0.9.30.1.orig/include/netinet/igmp.h 2009-04-08 09:00:10.926545132 +0200
4.6 -+++ uClibc-0.9.30.1/include/netinet/igmp.h 2009-04-08 09:00:26.242514273 +0200
4.7 -@@ -69,7 +69,7 @@
4.8 - u_int8_t igmp_code; /* routing code */
4.9 - u_int16_t igmp_cksum; /* checksum */
4.10 - struct in_addr igmp_group; /* group address */
4.11 --};
4.12 -+} __attribute__ ((__packed__));
4.13 -
4.14 - #define IGMP_MINLEN 8
4.15 -
4.16 -diff -urN uClibc-0.9.30.1.orig/include/netinet/in.h uClibc-0.9.30.1/include/netinet/in.h
4.17 ---- uClibc-0.9.30.1.orig/include/netinet/in.h 2009-04-08 09:00:10.926545132 +0200
4.18 -+++ uClibc-0.9.30.1/include/netinet/in.h 2009-04-08 09:00:26.242514273 +0200
4.19 -@@ -202,7 +202,7 @@
4.20 - #define s6_addr in6_u.u6_addr8
4.21 - #define s6_addr16 in6_u.u6_addr16
4.22 - #define s6_addr32 in6_u.u6_addr32
4.23 -- };
4.24 -+ } __attribute__ ((__packed__));
4.25 -
4.26 - extern const struct in6_addr in6addr_any; /* :: */
4.27 - extern const struct in6_addr in6addr_loopback; /* ::1 */
4.28 -@@ -229,7 +229,7 @@
4.29 - __SOCKADDR_COMMON_SIZE -
4.30 - sizeof (in_port_t) -
4.31 - sizeof (struct in_addr)];
4.32 -- };
4.33 -+ } __attribute__ ((__packed__));
4.34 - #endif
4.35 -
4.36 - /* Ditto, for IPv6. */
4.37 -@@ -240,7 +240,7 @@
4.38 - uint32_t sin6_flowinfo; /* IPv6 flow information */
4.39 - struct in6_addr sin6_addr; /* IPv6 address */
4.40 - uint32_t sin6_scope_id; /* IPv6 scope-id */
4.41 -- };
4.42 -+ } __attribute__ ((__packed__));
4.43 -
4.44 -
4.45 - /* IPv4 multicast request. */
4.46 -@@ -251,7 +251,7 @@
4.47 -
4.48 - /* Local IP address of interface. */
4.49 - struct in_addr imr_interface;
4.50 -- };
4.51 -+ } __attribute__ ((__packed__));
4.52 -
4.53 - struct ip_mreq_source
4.54 - {
4.55 -@@ -263,7 +263,7 @@
4.56 -
4.57 - /* IP address of interface. */
4.58 - struct in_addr imr_sourceaddr;
4.59 -- };
4.60 -+ } __attribute__ ((__packed__));
4.61 -
4.62 - /* Likewise, for IPv6. */
4.63 - struct ipv6_mreq
4.64 -@@ -273,7 +273,7 @@
4.65 -
4.66 - /* local interface */
4.67 - unsigned int ipv6mr_interface;
4.68 -- };
4.69 -+ } __attribute__ ((__packed__));
4.70 -
4.71 -
4.72 - /* Multicast group request. */
4.73 -@@ -284,7 +284,7 @@
4.74 -
4.75 - /* Group address. */
4.76 - struct sockaddr_storage gr_group;
4.77 -- };
4.78 -+ } __attribute__ ((__packed__));
4.79 -
4.80 - struct group_source_req
4.81 - {
4.82 -@@ -296,7 +296,7 @@
4.83 -
4.84 - /* Source address. */
4.85 - struct sockaddr_storage gsr_source;
4.86 -- };
4.87 -+ } __attribute__ ((__packed__));
4.88 -
4.89 -
4.90 - /* Full-state filter operations. */
4.91 -@@ -315,7 +315,7 @@
4.92 - uint32_t imsf_numsrc;
4.93 - /* Source addresses. */
4.94 - struct in_addr imsf_slist[1];
4.95 -- };
4.96 -+ } __attribute__ ((__packed__));
4.97 -
4.98 - #define IP_MSFILTER_SIZE(numsrc) (sizeof (struct ip_msfilter) \
4.99 - - sizeof (struct in_addr) \
4.100 -@@ -336,7 +336,7 @@
4.101 - uint32_t gf_numsrc;
4.102 - /* Source addresses. */
4.103 - struct sockaddr_storage gf_slist[1];
4.104 --};
4.105 -+} __attribute__ ((__packed__));
4.106 -
4.107 - #define GROUP_FILTER_SIZE(numsrc) (sizeof (struct group_filter) \
4.108 - - sizeof (struct sockaddr_storage) \
4.109 -@@ -460,14 +460,14 @@
4.110 - {
4.111 - struct in6_addr ipi6_addr; /* src/dst IPv6 address */
4.112 - unsigned int ipi6_ifindex; /* send/recv interface index */
4.113 -- };
4.114 -+ } __attribute__ ((__packed__));
4.115 -
4.116 - /* IPv6 MTU information. */
4.117 - struct ip6_mtuinfo
4.118 - {
4.119 - struct sockaddr_in6 ip6m_addr; /* dst address including zone ID */
4.120 - uint32_t ip6m_mtu; /* path MTU in host byte order */
4.121 -- };
4.122 -+ } __attribute__ ((__packed__));
4.123 -
4.124 -
4.125 - #if 0 /*def __USE_GNU*/
4.126 -diff -urN uClibc-0.9.30.1.orig/include/netinet/ip.h uClibc-0.9.30.1/include/netinet/ip.h
4.127 ---- uClibc-0.9.30.1.orig/include/netinet/ip.h 2009-04-08 09:00:10.926545132 +0200
4.128 -+++ uClibc-0.9.30.1/include/netinet/ip.h 2009-04-08 09:00:26.242514273 +0200
4.129 -@@ -63,7 +63,7 @@
4.130 - u_int32_t saddr;
4.131 - u_int32_t daddr;
4.132 - /*The options start here. */
4.133 -- };
4.134 -+ } __attribute__ ((__packed__));
4.135 -
4.136 - #ifdef __USE_BSD
4.137 - /*
4.138 -@@ -127,7 +127,7 @@
4.139 - u_int8_t ip_p; /* protocol */
4.140 - u_short ip_sum; /* checksum */
4.141 - struct in_addr ip_src, ip_dst; /* source and dest address */
4.142 -- };
4.143 -+ } __attribute__ ((__packed__));
4.144 -
4.145 - /*
4.146 - * Time stamp option structure.
4.147 -diff -urN uClibc-0.9.30.1.orig/include/netinet/ip_icmp.h uClibc-0.9.30.1/include/netinet/ip_icmp.h
4.148 ---- uClibc-0.9.30.1.orig/include/netinet/ip_icmp.h 2009-04-08 09:00:10.926545132 +0200
4.149 -+++ uClibc-0.9.30.1/include/netinet/ip_icmp.h 2009-04-08 09:00:26.242514273 +0200
4.150 -@@ -43,7 +43,7 @@
4.151 - u_int16_t mtu;
4.152 - } frag; /* path mtu discovery */
4.153 - } un;
4.154 --};
4.155 -+} __attribute__ ((__packed__));
4.156 -
4.157 - #define ICMP_ECHOREPLY 0 /* Echo Reply */
4.158 - #define ICMP_DEST_UNREACH 3 /* Destination Unreachable */
4.159 -@@ -199,7 +199,7 @@
4.160 - #define icmp_radv icmp_dun.id_radv
4.161 - #define icmp_mask icmp_dun.id_mask
4.162 - #define icmp_data icmp_dun.id_data
4.163 --};
4.164 -+} __attribute__ ((__packed__));
4.165 -
4.166 - /*
4.167 - * Lower bounds on packet lengths for various types.
4.168 -diff -urN uClibc-0.9.30.1.orig/include/netinet/tcp.h uClibc-0.9.30.1/include/netinet/tcp.h
4.169 ---- uClibc-0.9.30.1.orig/include/netinet/tcp.h 2009-04-08 09:00:10.926545132 +0200
4.170 -+++ uClibc-0.9.30.1/include/netinet/tcp.h 2009-04-08 09:00:26.242514273 +0200
4.171 -@@ -86,7 +86,7 @@
4.172 - u_int16_t th_win; /* window */
4.173 - u_int16_t th_sum; /* checksum */
4.174 - u_int16_t th_urp; /* urgent pointer */
4.175 --};
4.176 -+} __attribute__ ((__packed__));
4.177 -
4.178 - # else /* !__FAVOR_BSD */
4.179 - struct tcphdr
4.180 -@@ -121,7 +121,7 @@
4.181 - u_int16_t window;
4.182 - u_int16_t check;
4.183 - u_int16_t urg_ptr;
4.184 --};
4.185 -+} __attribute__ ((__packed__));
4.186 - # endif /* __FAVOR_BSD */
4.187 -
4.188 - enum
4.189 -@@ -226,7 +226,7 @@
4.190 - u_int32_t tcpi_rcv_space;
4.191 -
4.192 - u_int32_t tcpi_total_retrans;
4.193 --};
4.194 -+} __attribute__ ((__packed__));
4.195 -
4.196 -
4.197 - /* For TCP_MD5SIG socket option. */
4.198 -@@ -239,7 +239,7 @@
4.199 - u_int16_t tcpm_keylen; /* Key length. */
4.200 - u_int32_t __tcpm_pad2; /* Zero. */
4.201 - u_int8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */
4.202 --};
4.203 -+} __attribute__ ((__packed__));
4.204 -
4.205 - #endif /* Misc. */
4.206 -
4.207 -diff -urN uClibc-0.9.30.1.orig/include/netinet/udp.h uClibc-0.9.30.1/include/netinet/udp.h
4.208 ---- uClibc-0.9.30.1.orig/include/netinet/udp.h 2009-04-08 09:00:10.926545132 +0200
4.209 -+++ uClibc-0.9.30.1/include/netinet/udp.h 2009-04-08 09:00:26.242514273 +0200
4.210 -@@ -61,7 +61,7 @@
4.211 - u_int16_t uh_dport; /* destination port */
4.212 - u_int16_t uh_ulen; /* udp length */
4.213 - u_int16_t uh_sum; /* udp checksum */
4.214 --};
4.215 -+} __attribute__ ((__packed__));
4.216 -
4.217 - #else
4.218 -
4.219 -@@ -71,7 +71,7 @@
4.220 - u_int16_t dest;
4.221 - u_int16_t len;
4.222 - u_int16_t check;
4.223 --};
4.224 -+} __attribute__ ((__packed__));
4.225 - #endif
4.226 -
4.227 - #define SOL_UDP 17 /* sockopt level for UDP */