summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaco Kroon <jaco@uls.co.za>2021-03-13 14:13:02 +0200
committerJoonas Niilola <juippis@gentoo.org>2021-03-19 10:51:49 +0200
commit2c7d0aa6515bffacdaed2237cd28231100465422 (patch)
tree05b6a57d502370f1966e10b5a97733e7659179d6 /net-misc/asterisk/files
parentnet-misc/asterisk: Enable voicemail_storage_file by default, and libxml2 BDEP... (diff)
downloadgentoo-2c7d0aa6515bffacdaed2237cd28231100465422.tar.gz
gentoo-2c7d0aa6515bffacdaed2237cd28231100465422.tar.bz2
gentoo-2c7d0aa6515bffacdaed2237cd28231100465422.zip
net-misc/asterisk: version bump for 13.
This is primarily aimed to fixing bugs, asterisk 13 is sec-only upstream, so no further fixes will be made except to address bugs reported to bus.gentoo.org. Note that bugs aren't being closed since 16* is still affected (will be fixed on next bump, just waiting for 16.17.0 to be cut). Bug: https://bugs.gentoo.org/775005 net-misc/asterisk: injects some CFLAGS. Thanks Sam. Bug: https://bugs.gentoo.org/767262 systemd automagic dependency. Bug: https://bugs.gentoo.org/775353 Make asterisk depend on the pjproject SUBSLOT. Ie, rebuild if pjproject gets updated. Bug: https://bugs.gentoo.org/761442 Repair "security" issue in that /var/lib/asterisk can now be root:root. The problem with having it asterisk: is that any arbitrary code vuln becomes a data modification one. So with this as root:root we can at least prevent modifications to /var/lib/asterisk whilst still allowing /var/lib/asterisk/astdb to be modified as required. Repair default voicemail selection. Thank you pkgcheck scan. Drop ASTCFLAGS= and ASTLDFLAGS since ./configure already imports these. I believe Tony added this as a hammer to deal with 775005 above since these got re-added again after the asterisk injected ones. By setting DEBUG= and OPTIMIZE= this problem should now be something of the past. Introduce GENTOO_ASTERISK_CUSTOM_MENUSELECT= environment variable that can be set from make.conf and takes a string similar to USE flags, except that these gets passed to menuselect one by one, if -option as --disable option, else --enable option. Prefixes + and - is supported, and will be stripped before passing to menuselect. menuselect has been patched to exit non-zero in case of invalid option passed to --enable or --disable, resulting in above being reliable (if you have something invalid in there, it will die). Accordingly drop format_ogg_speex which doesn't exist in asterisk 13. Drop no longer required ncurses dependencies (system libedit). Signed-off-by: Jaco Kroon <jaco@uls.co.za> Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'net-misc/asterisk/files')
-rw-r--r--net-misc/asterisk/files/asterisk-13.38.2-r1-menuselect-exitcodes.patch67
1 files changed, 67 insertions, 0 deletions
diff --git a/net-misc/asterisk/files/asterisk-13.38.2-r1-menuselect-exitcodes.patch b/net-misc/asterisk/files/asterisk-13.38.2-r1-menuselect-exitcodes.patch
new file mode 100644
index 000000000000..90c97e9df5e3
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk-13.38.2-r1-menuselect-exitcodes.patch
@@ -0,0 +1,67 @@
+From 840eaa67e1ee0d10aa6bfb1e34659efa3095b772 Mon Sep 17 00:00:00 2001
+From: Jaco Kroon <jaco@uls.co.za>
+Date: Sat, 13 Mar 2021 13:01:50 +0200
+Subject: [PATCH] menuselect: exit non-zero in case of failure on
+ --enable|disable options.
+
+Change-Id: I77e3466435f5a51a57538b29addb68d811af238d
+Signed-off-by: Jaco Kroon <jaco@uls.co.za>
+---
+ menuselect/menuselect.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/menuselect/menuselect.c b/menuselect/menuselect.c
+index 2eea3f09eb..adb6fa1777 100644
+--- a/menuselect/menuselect.c
++++ b/menuselect/menuselect.c
+@@ -2090,6 +2090,7 @@ int main(int argc, char *argv[])
+ /* Reset options processing */
+ option_index = 0;
+ optind = 1;
++ res = 0;
+
+ while ((c = getopt_long(argc, argv, "", long_options, &option_index)) != -1) {
+ print_debug("Got option %c\n", c);
+@@ -2100,6 +2101,7 @@ int main(int argc, char *argv[])
+ set_member_enabled(mem);
+ } else {
+ fprintf(stderr, "'%s' not found\n", optarg);
++ res = 1;
+ }
+ }
+ break;
+@@ -2109,6 +2111,7 @@ int main(int argc, char *argv[])
+ set_all(cat, 1);
+ } else {
+ fprintf(stderr, "'%s' not found\n", optarg);
++ res = 1;
+ }
+ }
+ break;
+@@ -2123,6 +2126,7 @@ int main(int argc, char *argv[])
+ clear_member_enabled(mem);
+ } else {
+ fprintf(stderr, "'%s' not found\n", optarg);
++ res = 1;
+ }
+ }
+ break;
+@@ -2132,6 +2136,7 @@ int main(int argc, char *argv[])
+ set_all(cat, 0);
+ } else {
+ fprintf(stderr, "'%s' not found\n", optarg);
++ res = 1;
+ }
+ }
+ break;
+@@ -2146,7 +2151,6 @@ int main(int argc, char *argv[])
+ break;
+ }
+ }
+- res = 0;
+ }
+
+ if (!res) {
+--
+2.26.2
+