src/patches/miniupnpd-1.4_use_XT_ALIGN.patch

   1 diff -Naur miniupnpd-1.4.org/netfilter/iptcrdr.c miniupnpd-1.4/netfilter/iptcrdr.c
   2 --- miniupnpd-1.4.org/netfilter/iptcrdr.c       2009-10-10 21:19:41.000000000 +0200
   3 +++ miniupnpd-1.4/netfilter/iptcrdr.c   2012-07-29 16:09:42.640363971 +0200
   4 @@ -443,8 +443,8 @@
   5         struct ipt_entry_match *match;
   6         struct ipt_tcp * tcpinfo;
   7         size_t size;
   8 -       size =   IPT_ALIGN(sizeof(struct ipt_entry_match))
   9 -              + IPT_ALIGN(sizeof(struct ipt_tcp));
  10 +       size =   XT_ALIGN(sizeof(struct ipt_entry_match))
  11 +              + XT_ALIGN(sizeof(struct ipt_tcp));
  12         match = calloc(1, size);
  13         match->u.match_size = size;
  14         strncpy(match->u.user.name, "tcp", IPT_FUNCTION_MAXNAMELEN);
  15 @@ -462,8 +462,8 @@
  16         struct ipt_entry_match *match;
  17         struct ipt_udp * udpinfo;
  18         size_t size;
  19 -       size =   IPT_ALIGN(sizeof(struct ipt_entry_match))
  20 -              + IPT_ALIGN(sizeof(struct ipt_udp));
  21 +       size =   XT_ALIGN(sizeof(struct ipt_entry_match))
  22 +              + XT_ALIGN(sizeof(struct ipt_udp));
  23         match = calloc(1, size);
  24         match->u.match_size = size;
  25         strncpy(match->u.user.name, "udp", IPT_FUNCTION_MAXNAMELEN);
  26 @@ -483,8 +483,8 @@
  27         struct ip_nat_range * range;
  28         size_t size;
  29
  30 -       size =   IPT_ALIGN(sizeof(struct ipt_entry_target))
  31 -              + IPT_ALIGN(sizeof(struct ip_nat_multi_range));
  32 +       size =   XT_ALIGN(sizeof(struct ipt_entry_target))
  33 +              + XT_ALIGN(sizeof(struct ip_nat_multi_range));
  34         target = calloc(1, size);
  35         target->u.target_size = size;
  36         strncpy(target->u.user.name, "DNAT", IPT_FUNCTION_MAXNAMELEN);
  37 @@ -614,8 +614,8 @@
  38  {
  39         struct ipt_entry_target * target = NULL;
  40         size_t size;
  41 -       size =   IPT_ALIGN(sizeof(struct ipt_entry_target))
  42 -              + IPT_ALIGN(sizeof(int));
  43 +       size =   XT_ALIGN(sizeof(struct ipt_entry_target))
  44 +              + XT_ALIGN(sizeof(int));
  45         target = calloc(1, size);
  46         target->u.user.target_size = size;
  47         strncpy(target->u.user.name, "ACCEPT", IPT_FUNCTION_MAXNAMELEN);