Skip to content

Commit a6fabd9

Browse files
jolivainyann-morin-1998
authored andcommitted
package/asterisk: update patches to be applied with fuzz 0
Commit 8f88a64 "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, asterisk fails to build with output: Applying 0004-install-samples-need-the-data-files.patch using patch: patching file Makefile Hunk #1 FAILED at 779. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej This commit rebase the package patches on the current package version. Note: the patch 0005 is unchanged, as it is correct in its current state. Fixes: - http://autobuild.buildroot.org/results/92d/92d58ecb67f11a6eb74695bc1efcc672f69a57a9 Signed-off-by: Julien Olivain <ju.o@free.fr> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
1 parent de278d6 commit a6fabd9

4 files changed

+26
-19
lines changed

package/asterisk/0001-sounds-do-not-download-and-check-sha1s.patch

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 3e8a9e9a1c7eae515eb628778c3c8a04338b3bb3 Mon Sep 17 00:00:00 2001
1+
From 63f685e468bef94d8938b7a9c1a18c6c00840219 Mon Sep 17 00:00:00 2001
22
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
33
Date: Tue, 27 Dec 2016 11:21:09 +0100
44
Subject: [PATCH] sounds: do not download and check sha1s
@@ -20,16 +20,18 @@ However, that poses at least two problems:
2020

2121
So we just do without the sha1 download and checks.
2222

23+
Signed-off-by: Julien Olivain <ju.o@free.fr>
24+
[Julien: rebase patch on tag 20.7.0]
2325
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
2426
---
2527
sounds/Makefile | 10 ----------
2628
1 file changed, 10 deletions(-)
2729

2830
diff --git a/sounds/Makefile b/sounds/Makefile
29-
index 84d0f45..7a80d56 100644
31+
index 288b8139a9..260434e504 100644
3032
--- a/sounds/Makefile
3133
+++ b/sounds/Makefile
32-
@@ -100,17 +100,7 @@ ifneq ($(SOUNDS_CACHE_DIR),)
34+
@@ -101,17 +101,7 @@ ifneq ($(SOUNDS_CACHE_DIR),)
3335
if test ! -f "$$(SOUNDS_CACHE_DIR)/$$@"; then \
3436
(cd "$$(SOUNDS_CACHE_DIR)"; $$(DOWNLOAD) $$(SOUNDS_URL)/$$@); \
3537
fi; \
@@ -48,5 +50,5 @@ index 84d0f45..7a80d56 100644
4850
else
4951
$(CMD_PREFIX) \
5052
--
51-
2.7.4
53+
2.45.2
5254

package/asterisk/0002-configure-fix-detection-of-libcrypt.patch

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8996503f6c55e55f326ab11c18278954ad7abaf3 Mon Sep 17 00:00:00 2001
1+
From e959097b00357a2fd5f140daf3114c2245cd6b95 Mon Sep 17 00:00:00 2001
22
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
33
Date: Tue, 27 Dec 2016 11:21:57 +0100
44
Subject: [PATCH] configure: fix detection of libcrypt
@@ -15,17 +15,18 @@ and thus concludes that crypt is missing when it was successfully found.
1515
Fix that by also storing the result of either check in the 'CRYPT'
1616
scheme.
1717

18+
Signed-off-by: Julien Olivain <ju.o@free.fr>
19+
[Julien: rebase patch on tag 20.7.0]
1820
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
1921
---
20-
configure | 2 ++
2122
configure.ac | 2 ++
22-
2 files changed, 4 insertions(+)
23+
1 file changed, 2 insertions(+)
2324

2425
diff --git a/configure.ac b/configure.ac
25-
index 121dd93..d459ff5 100644
26+
index 639bcd9df3..16f4297634 100644
2627
--- a/configure.ac
2728
+++ b/configure.ac
28-
@@ -2406,10 +2406,12 @@ AC_CHECK_FUNC([crypt], [SYSCRYPT=true], [SYSCRYPT=""])
29+
@@ -2694,10 +2694,12 @@ AC_CHECK_FUNC([crypt], [SYSCRYPT=true], [SYSCRYPT=""])
2930
if test "x$LIBCRYPT_LIB" != "x" ; then
3031
CRYPT_LIB="$LIBCRYPT_LIB"
3132
CRYPT_INCLUDE="$LIBCRYPT_INCLUDE"
@@ -39,5 +40,5 @@ index 121dd93..d459ff5 100644
3940
fi
4041

4142
--
42-
2.7.4
43+
2.45.2
4344

package/asterisk/0003-build-ensure-target-directory-for-modules-exists.patch

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 933b2554a40f932571bdbdbb5217cda3e35fd61f Mon Sep 17 00:00:00 2001
1+
From 93edc41d3ae60e6ee9b9bbb7cdcc592133521fa3 Mon Sep 17 00:00:00 2001
22
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
33
Date: Mon, 27 Nov 2017 12:52:52 +0100
44
Subject: [PATCH] build: ensure target directory for modules exists
@@ -9,16 +9,18 @@ modules fails because the target directory does not exist yet.
99
We fix that by instructing $(INSTALL) to create the destination directory
1010
first.
1111

12+
Signed-off-by: Julien Olivain <ju.o@free.fr>
13+
[Julien: rebase patch on tag 20.7.0]
1214
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
1315
---
1416
Makefile.moddir_rules | 2 +-
1517
1 file changed, 1 insertion(+), 1 deletion(-)
1618

1719
diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules
18-
index 59190bece9..b73153a9a5 100644
20+
index 795b32c716..7d5e5d241a 100644
1921
--- a/Makefile.moddir_rules
2022
+++ b/Makefile.moddir_rules
21-
@@ -110,7 +110,7 @@ clean::
23+
@@ -106,7 +106,7 @@ clean::
2224

2325
install:: all
2426
@echo "Installing modules from `basename $(CURDIR)`..."
@@ -28,5 +30,5 @@ index 59190bece9..b73153a9a5 100644
2830
@if [ -f .moduleinfo ] ; then \
2931
declare -A DISABLED_MODS ;\
3032
--
31-
2.11.0
33+
2.45.2
3234

package/asterisk/0004-install-samples-need-the-data-files.patch

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 05680ea9899c2246c23d11860c2c8e10aa8f80c7 Mon Sep 17 00:00:00 2001
1+
From d347deb0376a3254d7cd8bbfe46dd645d1bf1061 Mon Sep 17 00:00:00 2001
22
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
33
Date: Fri, 1 Dec 2017 11:08:16 +0100
44
Subject: [PATCH] install: samples need the data files
@@ -12,24 +12,26 @@ installed at the time we try to generate the voicemail data.
1212

1313
Ensure the needed dependency.
1414

15+
Signed-off-by: Julien Olivain <ju.o@free.fr>
16+
[Julien: rebase patch on tag 20.7.0]
1517
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
1618
---
1719
Makefile | 2 +-
1820
1 file changed, 1 insertion(+), 1 deletion(-)
1921

2022
diff --git a/Makefile b/Makefile
21-
index f29c07f680..b58f707b61 100644
23+
index 7ef73342cc..bb60f5e380 100644
2224
--- a/Makefile
2325
+++ b/Makefile
24-
@@ -779,7 +779,7 @@ adsi:
26+
@@ -819,7 +819,7 @@ adsi:
2527
$(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
2628
done
2729

2830
-samples: adsi
2931
+samples: adsi datafiles
3032
@echo Installing other config files...
31-
$(call INSTALL_CONFIGS,samples,.sample)
33+
$(call INSTALL_CONFIGS,configs/samples,.sample)
3234
$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
3335
--
34-
2.11.0
36+
2.45.2
3537

0 commit comments

Comments
 (0)