Fix ipp2p missing symbol (error_exit).
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 24 Apr 2010 21:41:54 +0000 (23:41 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 24 Apr 2010 21:41:54 +0000 (23:41 +0200)
doc/packages-list.txt
src/patches/iptables-1.4.6-ipp2p-0.8.2-pomng.patch

index ea1498d..4f68ba9 100644 (file)
 * kqemu-1.4.0pre1-kmod-2.6.32.11-ipfire
 * kqemu-1.4.0pre1-kmod-2.6.32.11-ipfire-xen
 * kudzu-1.2.64
-* kvm-kmod-2.6.33-kmod-2.6.32.11-ipfire
+* kvm-kmod-2.6.33.1-kmod-2.6.32.11-ipfire
 * l7-protocols-2009-05-10
 * lame-3.97
 * lcd4linux-0.10.1-RC2
index 5f9c307..68e44b1 100644 (file)
@@ -113,42 +113,42 @@ diff -Naur iptables-1.4.6.org/extensions/libipt_ipp2p.c iptables-1.4.6/extension
 +    switch (c) {
 +      case '1':               /*cmd: ipp2p*/
 +          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
-+                  exit_error(PARAMETER_PROBLEM,
++                  xtables_error(PARAMETER_PROBLEM,
 +                              "ipp2p: `--ipp2p' may only be "
 +                              "specified once!");
 +
 +/*        if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
-+                  exit_error(PARAMETER_PROBLEM,
++                  xtables_error(PARAMETER_PROBLEM,
 +                              "ipp2p: `--ipp2p-data' may only be "
 +                              "specified alone!");
 +*/
 +
 +          if ((*flags) != 0)
-+                  exit_error(PARAMETER_PROBLEM,
++                  xtables_error(PARAMETER_PROBLEM,
 +                              "ipp2p: `--ipp2p' may only be "
 +                              "specified alone!");
-+          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++          if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +          *flags += SHORT_HAND_IPP2P;
 +          info->cmd = *flags;
 +          break;
 +          
 +      case '2':               /*cmd: edk*/
 +          if ((*flags & IPP2P_EDK) == IPP2P_EDK)
-+                  exit_error(PARAMETER_PROBLEM,
++                  xtables_error(PARAMETER_PROBLEM,
 +                              "ipp2p: `--edk' may only be "
 +                              "specified once");
 +          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
-+                  exit_error(PARAMETER_PROBLEM,
++                  xtables_error(PARAMETER_PROBLEM,
 +                              "ipp2p: `--ipp2p' may only be "
 +                              "specified alone!");
 +/*        if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
-+                  exit_error(PARAMETER_PROBLEM,
++                  xtables_error(PARAMETER_PROBLEM,
 +                              "ipp2p: `--ipp2p-data' may only be "
 +                              "specified alone!");*/
 +            if ((*flags & IPP2P_DATA_EDK) == IPP2P_DATA_EDK)
-+            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
 +                                "ipp2p: use `--edk' OR `--edk-data' but not both of them!");
-+          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++          if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +          *flags += IPP2P_EDK;
 +          info->cmd = *flags;     
 +          break;
@@ -156,21 +156,21 @@ diff -Naur iptables-1.4.6.org/extensions/libipt_ipp2p.c iptables-1.4.6/extension
 +
 +      case '7':               /*cmd: dc*/
 +            if ((*flags & IPP2P_DC) == IPP2P_DC)
-+            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--dc' may only be "
 +                                "specified once!");
 +          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
-+                  exit_error(PARAMETER_PROBLEM,
++                  xtables_error(PARAMETER_PROBLEM,
 +                              "ipp2p: `--ipp2p' may only be "
 +                              "specified alone!");
 +/*        if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
-+                  exit_error(PARAMETER_PROBLEM,
++                  xtables_error(PARAMETER_PROBLEM,
 +                              "ipp2p: `--ipp2p-data' may only be "
 +                              "specified alone!");*/
 +            if ((*flags & IPP2P_DATA_DC) == IPP2P_DATA_DC)
-+            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
 +                                "ipp2p: use `--dc' OR `--dc-data' but not both of them!");
-+          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++          if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_DC;
 +          info->cmd = *flags;
 +          break;
@@ -178,70 +178,70 @@ diff -Naur iptables-1.4.6.org/extensions/libipt_ipp2p.c iptables-1.4.6/extension
 +
 +      case '9':               /*cmd: gnu*/
 +            if ((*flags & IPP2P_GNU) == IPP2P_GNU)
-+            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--gnu' may only be "
 +                                "specified once!");
 +/*        if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
-+                  exit_error(PARAMETER_PROBLEM,
++                  xtables_error(PARAMETER_PROBLEM,
 +                              "ipp2p: `--ipp2p-data' may only be "
 +                              "specified alone!");*/
 +          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
-+                  exit_error(PARAMETER_PROBLEM,
++                  xtables_error(PARAMETER_PROBLEM,
 +                              "ipp2p: `--ipp2p' may only be "
 +                              "specified alone!");
 +            if ((*flags & IPP2P_DATA_GNU) == IPP2P_DATA_GNU)
-+            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
 +                                "ipp2p: use `--gnu' OR `--gnu-data' but not both of them!");
-+          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++          if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_GNU;
 +          info->cmd = *flags;
 +          break;
 +
 +      case 'a':               /*cmd: kazaa*/
 +            if ((*flags & IPP2P_KAZAA) == IPP2P_KAZAA)
-+            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--kazaa' may only be "
 +                                "specified once!");
 +/*        if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA)
-+                  exit_error(PARAMETER_PROBLEM,
++                  xtables_error(PARAMETER_PROBLEM,
 +                              "ipp2p: `--ipp2p-data' may only be "
 +                              "specified alone!");*/
 +          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
-+                  exit_error(PARAMETER_PROBLEM,
++                  xtables_error(PARAMETER_PROBLEM,
 +                              "ipp2p: `--ipp2p' may only be "
 +                              "specified alone!");
 +            if ((*flags & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA)
-+            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
 +                                "ipp2p: use `--kazaa' OR `--kazaa-data' but not both of them!");
-+          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++          if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_KAZAA;
 +          info->cmd = *flags;
 +          break;                                                                                                                                                                                                                      
 +
 +      case 'b':               /*cmd: bit*/
 +            if ((*flags & IPP2P_BIT) == IPP2P_BIT)
-+            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--bit' may only be "
 +                                "specified once!");
 +          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
-+                  exit_error(PARAMETER_PROBLEM,
++                  xtables_error(PARAMETER_PROBLEM,
 +                              "ipp2p: `--ipp2p' may only be "
 +                              "specified alone!");
-+          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++          if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_BIT;
 +          info->cmd = *flags;
 +          break;                                                                                                                                                                                                                      
 +
 +      case 'c':               /*cmd: apple*/
 +            if ((*flags & IPP2P_APPLE) == IPP2P_APPLE)
-+            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--apple' may only be "
 +                                "specified once!");
 +          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
-+                  exit_error(PARAMETER_PROBLEM,
++                  xtables_error(PARAMETER_PROBLEM,
 +                              "ipp2p: `--ipp2p' may only be "
 +                              "specified alone!");
-+          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++          if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_APPLE;
 +          info->cmd = *flags;
 +          break;                                                                                                                                                                                                                      
@@ -249,14 +249,14 @@ diff -Naur iptables-1.4.6.org/extensions/libipt_ipp2p.c iptables-1.4.6/extension
 +
 +      case 'd':               /*cmd: soul*/
 +            if ((*flags & IPP2P_SOUL) == IPP2P_SOUL)
-+            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--soul' may only be "
 +                                "specified once!");
 +          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
-+                  exit_error(PARAMETER_PROBLEM,
++                  xtables_error(PARAMETER_PROBLEM,
 +                              "ipp2p: `--ipp2p' may only be "
 +                              "specified alone!");
-+          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++          if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_SOUL;
 +          info->cmd = *flags;
 +          break;                                                                                                                                                                                                                      
@@ -264,67 +264,67 @@ diff -Naur iptables-1.4.6.org/extensions/libipt_ipp2p.c iptables-1.4.6/extension
 +
 +      case 'e':               /*cmd: winmx*/
 +            if ((*flags & IPP2P_WINMX) == IPP2P_WINMX)
-+            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--winmx' may only be "
 +                                "specified once!");
 +          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
-+                  exit_error(PARAMETER_PROBLEM,
++                  xtables_error(PARAMETER_PROBLEM,
 +                              "ipp2p: `--ipp2p' may only be "
 +                              "specified alone!");
-+          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++          if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_WINMX;
 +          info->cmd = *flags;
 +          break;                                                                                                                                                                                                                      
 +
 +      case 'f':               /*cmd: ares*/
 +            if ((*flags & IPP2P_ARES) == IPP2P_ARES)
-+            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--ares' may only be "
 +                                "specified once!");
 +          if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P)
-+                  exit_error(PARAMETER_PROBLEM,
++                  xtables_error(PARAMETER_PROBLEM,
 +                              "ipp2p: `--ipp2p' may only be "
 +                              "specified alone!");
-+          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++          if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_ARES;
 +          info->cmd = *flags;
 +          break;                                                                                                                                                                                                                      
 +      
 +      case 'g':               /*cmd: mute*/
 +            if ((*flags & IPP2P_MUTE) == IPP2P_MUTE)
-+            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--mute' may only be "
 +                                "specified once!");
-+          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++          if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_MUTE;
 +          info->cmd = *flags;
 +          break;                                                                                                                                                                                                                      
 +      case 'h':               /*cmd: waste*/
 +            if ((*flags & IPP2P_WASTE) == IPP2P_WASTE)
-+            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--waste' may only be "
 +                                "specified once!");
-+          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++          if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_WASTE;
 +          info->cmd = *flags;
 +          break;                                                                                                                                                                                                                      
 +      case 'i':               /*cmd: xdcc*/
 +            if ((*flags & IPP2P_XDCC) == IPP2P_XDCC)
-+            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
 +                                "ipp2p: `--ares' may only be "
 +                                "specified once!");
-+          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++          if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +            *flags += IPP2P_XDCC;
 +          info->cmd = *flags;
 +          break;                                                                                                                                                                                                                      
 +
 +      case 'j':               /*cmd: debug*/
-+          if (invert) exit_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
++          if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!");
 +          info->debug = 1;
 +          break;                                                                                                                                                                                                                      
 +
 +      default:
-+//            exit_error(PARAMETER_PROBLEM,
++//            xtables_error(PARAMETER_PROBLEM,
 +//        "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
 +          return 0;
 +    }
@@ -336,7 +336,7 @@ diff -Naur iptables-1.4.6.org/extensions/libipt_ipp2p.c iptables-1.4.6/extension
 +final_check(unsigned int flags)
 +{
 +    if (!flags)
-+            exit_error(PARAMETER_PROBLEM,
++            xtables_error(PARAMETER_PROBLEM,
 +          "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n");
 +}
 +