asterisk-1.8.x: refresh patches

SVN-Revision: 28072

diff --git a/net/asterisk-1.8.x/patches/100-build_tools-iconv.patch b/net/asterisk-1.8.x/patches/100-build_tools-iconv.patch
index 1073bda9eaccb3e606917b98af239d78758a65b4..d3cad8252f40e59578f7111524f09daf6ca37ce5 100644 (file)
--- a/net/asterisk-1.8.x/patches/100-build_tools-iconv.patch
+++ b/net/asterisk-1.8.x/patches/100-build_tools-iconv.patch
@@ -1,6 +1,6 @@
 --- a/build_tools/menuselect-deps.in
 +++ b/build_tools/menuselect-deps.in
-@@ -14,7 +14,7 @@ GTK2=@PBX_GTK2@
+@@ -16,7 +16,7 @@ GTK2=@PBX_GTK2@
  H323=@PBX_H323@
  HOARD=@PBX_HOARD@
  ICAL=@PBX_ICAL@

diff --git a/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch b/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch
index 12d5551c1d9066661b8fca7d4c87d410c5aa5dfa..0f865f916c56ccfbc970d2942d6fc4ec3de5c620 100644 (file)
--- a/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch
+++ b/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch
@@ -1,6 +1,6 @@
 --- a/main/utils.c
 +++ b/main/utils.c
-@@ -1632,7 +1632,7 @@ ast_string_field __ast_string_field_allo
+@@ -1635,7 +1635,7 @@ ast_string_field __ast_string_field_allo
        }
  
        result = (*pool_head)->base + (*pool_head)->used;
@@ -9,7 +9,7 @@
        /* SPARC requires that the allocation field be aligned. */
        if ((long) result % sizeof(ast_string_field_allocation)) {
                result++;
-@@ -1713,7 +1713,7 @@ void __ast_string_field_ptr_build_va(str
+@@ -1716,7 +1716,7 @@ void __ast_string_field_ptr_build_va(str
                }
        } else {
                target = (*pool_head)->base + (*pool_head)->used + sizeof(ast_string_field_allocation);