logo

live-bootstrap

Mirror of <https://github.com/fosslinux/live-bootstrap>

remove-ctassert.patch (3325B)

    

  1. # SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
  2. #
  3. # SPDX-License-Identifier: BSD-2-Clause
  5. __CTASSERT macro does not work properly on our older GCC.
  7. diff -ru src/arp.c src/arp.c
  8. --- dhcpcd-10.0.1/src/arp.c
  9. +++ dhcpcd-10.0.1/src/arp.c
  10. @@ -63,9 +63,6 @@
  11.  /* ARP debugging can be quite noisy. Enable this for more noise! */
  12.  //#define	ARP_DEBUG
  13.  
  14. -/* Assert the correct structure size for on wire */
  15. -__CTASSERT(sizeof(struct arphdr) == 8);
  16. -
  17.  static ssize_t
  18.  arp_request(const struct arp_state *astate,
  19.      const struct in_addr *sip)
  20. diff -ru src/auth.c src/auth.c
  21. --- dhcpcd-10.0.1/src/auth.c
  22. +++ dhcpcd-10.0.1/src/auth.c
  23. @@ -343,9 +343,6 @@
  24.  
  25.  	/* RFC3318, section 5.2 - zero giaddr and hops */
  26.  	if (mp == 4) {
  27. -		/* Assert the bootp structure is correct size. */
  28. -		__CTASSERT(sizeof(struct bootp) == 300);
  29. -
  30.  		*(mm + offsetof(struct bootp, hops)) = '\0';
  31.  		memset(mm + offsetof(struct bootp, giaddr), 0, 4);
  32.  	}
  33. diff -ru src/dhcp6.c src/dhcp6.c
  34. --- dhcpcd-10.0.1/src/dhcp6.c
  35. +++ dhcpcd-10.0.1/src/dhcp6.c
  36. @@ -84,33 +84,28 @@
  37.  	uint8_t xid[3];
  38.  	/* followed by options */
  39.  };
  40. -__CTASSERT(sizeof(struct dhcp6_message) == 4);
  41.  
  42.  struct dhcp6_option {
  43.  	uint16_t code;
  44.  	uint16_t len;
  45.  	/* followed by data */
  46.  };
  47. -__CTASSERT(sizeof(struct dhcp6_option) == 4);
  48.  
  49.  struct dhcp6_ia_na {
  50.  	uint8_t iaid[4];
  51.  	uint32_t t1;
  52.  	uint32_t t2;
  53.  };
  54. -__CTASSERT(sizeof(struct dhcp6_ia_na) == 12);
  55.  
  56.  struct dhcp6_ia_ta {
  57.  	uint8_t iaid[4];
  58.  };
  59. -__CTASSERT(sizeof(struct dhcp6_ia_ta) == 4);
  60.  
  61.  struct dhcp6_ia_addr {
  62.  	struct in6_addr addr;
  63.  	uint32_t pltime;
  64.  	uint32_t vltime;
  65.  };
  66. -__CTASSERT(sizeof(struct dhcp6_ia_addr) == 16 + 8);
  67.  
  68.  /* XXX FIXME: This is the only packed structure and it does not align.
  69.   * Maybe manually decode it? */
  70. @@ -120,7 +115,6 @@
  71.  	uint8_t prefix_len;
  72.  	struct in6_addr prefix;
  73.  } __packed;
  74. -__CTASSERT(sizeof(struct dhcp6_pd_addr) == 8 + 1 + 16);
  75.  
  76.  struct dhcp6_op {
  77.  	uint16_t type;
  78. diff -ru src/dhcp.c src/dhcp.c
  79. --- dhcpcd-10.0.1/src/dhcp.c
  80. +++ dhcpcd-10.0.1/src/dhcp.c
  81. @@ -98,11 +98,6 @@
  82.  #define IP_RECVPKTINFO IP_PKTINFO
  83.  #endif
  84.  
  85. -/* Assert the correct structure size for on wire */
  86. -__CTASSERT(sizeof(struct ip)		== 20);
  87. -__CTASSERT(sizeof(struct udphdr)	== 8);
  88. -__CTASSERT(sizeof(struct bootp)		== 300);
  89. -
  90.  struct dhcp_op {
  91.  	uint8_t value;
  92.  	const char *name;
  93. diff -ru src/if-bsd.c src/if-bsd.c
  94. --- dhcpcd-10.0.1/src/if-bsd.c
  95. +++ dhcpcd-10.0.1/src/if-bsd.c
  96. @@ -1600,7 +1600,6 @@
  97.  #endif
  98.  }
  99.  
  100. -__CTASSERT(offsetof(struct rt_msghdr, rtm_msglen) == 0);
  101.  int
  102.  if_handlelink(struct dhcpcd_ctx *ctx)
  103.  {
  104. diff -ru src/ipv6nd.c src/ipv6nd.c
  105. --- dhcpcd-10.0.1/src/ipv6nd.c
  106. +++ dhcpcd-10.0.1/src/ipv6nd.c
  107. @@ -80,7 +80,6 @@
  108.  	uint32_t	nd_opt_rdnss_lifetime;
  109.          /* followed by list of IP prefixes */
  110.  };
  111. -__CTASSERT(sizeof(struct nd_opt_rdnss) == 8);
  112.  #endif
  113.  
  114.  #ifndef ND_OPT_DNSSL
  115. @@ -92,7 +91,6 @@
  116.  	uint32_t	nd_opt_dnssl_lifetime;
  117.  	/* followed by list of DNS servers */
  118.  };
  119. -__CTASSERT(sizeof(struct nd_opt_dnssl) == 8);
  120.  #endif
  121.  
  122.  /* Impossible options, so we can easily add extras */
  123. diff -ru src/privsep-root.c src/privsep-root.c
  124. --- dhcpcd-10.0.1/src/privsep-root.c
  125. +++ dhcpcd-10.0.1/src/privsep-root.c
  126. @@ -56,8 +56,6 @@
  127.  #include "sa.h"
  128.  #include "script.h"
  129.  
  130. -__CTASSERT(sizeof(ioctl_request_t) <= sizeof(unsigned long));
  131. -
  132.  struct psr_error
  133.  {
  134.  	ssize_t psr_result;