-
Notifications
You must be signed in to change notification settings - Fork 267
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rtpengine: bump to 11.5.1.12 release and set PCRE2
Bump rtpengine to release 11.5.1.12. New 11.x release require libopus as a new library and also moved to PCRE2 library. Refresh patches and also introduce a new one to disable docs as they changed doc generation tool and now would require a new prereq and docs are not useful and would waste space on an embedded scenario. Signed-off-by: Christian Marangi <[email protected]>
- Loading branch information
Showing
5 changed files
with
70 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| --- a/daemon/Makefile | ||
| +++ b/daemon/Makefile | ||
| @@ -30,7 +30,7 @@ CFLAGS+= $(shell pkg-config --cflags lib | ||
| @@ -32,7 +32,7 @@ CFLAGS+= $(shell pkg-config --cflags lib | ||
| CFLAGS+= $(shell pkg-config --cflags libavutil) | ||
| CFLAGS+= $(shell pkg-config --cflags libswresample) | ||
| CFLAGS+= $(shell pkg-config --cflags libavfilter) | ||
| -CFLAGS+= $(shell pkg-config --cflags spandsp) | ||
| +CFLAGS+= $(shell pkg-config --cflags spandsp3) | ||
| CFLAGS+= $(shell pkg-config --cflags opus) | ||
| CFLAGS+= -DWITH_TRANSCODING | ||
| CFLAGS+= $(shell mysql_config --cflags) | ||
| else | ||
| @@ -65,7 +65,7 @@ LDLIBS+= $(shell pkg-config --libs libav | ||
| @@ -68,7 +68,7 @@ LDLIBS+= $(shell pkg-config --libs libav | ||
| LDLIBS+= $(shell pkg-config --libs libavutil) | ||
| LDLIBS+= $(shell pkg-config --libs libswresample) | ||
| LDLIBS+= $(shell pkg-config --libs libavfilter) | ||
| -LDLIBS+= $(shell pkg-config --libs spandsp) | ||
| +LDLIBS+= $(shell pkg-config --libs spandsp3) | ||
| LDLIBS+= $(shell pkg-config --libs opus) | ||
| LDLIBS+= $(shell mysql_config --libs) | ||
| endif | ||
|
|
30 changes: 0 additions & 30 deletions
30
net/rtpengine/patches/06-fix-compilation-with-iptables-1-8-8.patch
This file was deleted.
Oops, something went wrong.
54 changes: 32 additions & 22 deletions
54
net/rtpengine/patches/07-always-dynamically-allocate-buffer-for-kernel-mod.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,46 @@ | ||
| --- a/kernel-module/xt_RTPENGINE.c | ||
| +++ b/kernel-module/xt_RTPENGINE.c | ||
| @@ -3455,14 +3455,11 @@ static inline ssize_t proc_control_read_ | ||
| struct inode *inode; | ||
| uint32_t id; | ||
| @@ -3781,7 +3781,6 @@ static inline ssize_t proc_control_read_ | ||
| struct rtpengine_table *t; | ||
| - struct rtpengine_message msgbuf; | ||
| struct rtpengine_message *msg; | ||
| int err; | ||
| enum rtpengine_command cmd; | ||
| - char scratchbuf[512]; | ||
| size_t readlen, writelen, writeoffset; | ||
| int i; | ||
|
|
||
| if (buflen < sizeof(*msg)) | ||
| return -EIO; | ||
| - if (buflen == sizeof(*msg)) | ||
| - msg = &msgbuf; | ||
| else { /* > */ | ||
| msg = kmalloc(buflen, GFP_KERNEL); | ||
| if (!msg) | ||
| @@ -3559,16 +3556,14 @@ static inline ssize_t proc_control_read_ | ||
| goto out; | ||
| @@ -3823,13 +3822,9 @@ static inline ssize_t proc_control_read_ | ||
| return -ERANGE; | ||
|
|
||
| // do we need an extra large storage buffer? | ||
| - if (buflen > sizeof(scratchbuf)) { | ||
| - msg.storage = kmalloc(buflen, GFP_KERNEL); | ||
| - if (!msg.storage) | ||
| - return -ENOMEM; | ||
| - } | ||
| - else | ||
| - msg.storage = scratchbuf; | ||
| + msg.storage = kmalloc(buflen, GFP_KERNEL); | ||
| + if (!msg.storage) | ||
| + return -ENOMEM; | ||
|
|
||
| // get our table | ||
| inode = file->f_path.dentry->d_inode; | ||
| @@ -3942,16 +3937,14 @@ static inline ssize_t proc_control_read_ | ||
| goto err_free; | ||
| } | ||
|
|
||
| - if (msg != &msgbuf) | ||
| - kfree(msg); | ||
| + kfree(msg); | ||
| - if (msg.storage != scratchbuf) | ||
| - kfree(msg.storage); | ||
| + kfree(msg.storage); | ||
|
|
||
| return buflen; | ||
|
|
||
| err: | ||
| err_table_free: | ||
| table_put(t); | ||
| out: | ||
| - if (msg != &msgbuf) | ||
| - kfree(msg); | ||
| + kfree(msg); | ||
| err_free: | ||
| - if (msg.storage != scratchbuf) | ||
| - kfree(msg.storage); | ||
| + kfree(msg.storage); | ||
| return err; | ||
| } | ||
| static ssize_t proc_control_write(struct file *file, const char __user *ubuf, size_t buflen, loff_t *off) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| --- a/lib/common.Makefile | ||
| +++ b/lib/common.Makefile | ||
| @@ -34,12 +34,6 @@ $(DAEMONSRCS) $(HASHSRCS): $(patsubst %, | ||
| echo '#line 1' && \ | ||
| cat ../daemon/"$@" ) > "$@" | ||
|
|
||
| -%.8: ../docs/%.md | ||
| - cat "$<" | sed '/^# /d; s/^##/#/' | \ | ||
| - pandoc -s -t man \ | ||
| - -M "footer:$(RTPENGINE_VERSION)" \ | ||
| - -M "date:$(BUILD_DATE)" \ | ||
| - -o "$@" | ||
|
|
||
| resample.c codeclib.strhash.c mix.c packet.c: fix_frame_channel_layout.h | ||
|
|
||
| --- a/daemon/Makefile | ||
| +++ b/daemon/Makefile | ||
| @@ -93,11 +93,8 @@ LIBASM= mvr2s_x64_avx2.S mvr2s_x64_avx5 | ||
| endif | ||
| OBJS= $(SRCS:.c=.o) $(LIBSRCS:.c=.o) $(LIBASM:.S=.o) | ||
|
|
||
| -MDS= rtpengine.ronn | ||
| -MANS= $(MDS:.ronn=.8) | ||
|
|
||
| include ../lib/common.Makefile | ||
|
|
||
| install: $(TARGET) $(MANS) | ||
| install -m 0755 -D $(TARGET) $(DESTDIR)/usr/bin/$(TARGET) | ||
| - install -m 0644 -D $(TARGET).8 $(DESTDIR)/usr/share/man/man8/$(TARGET).8 |