From 064731fb86e4a3e227483d7e8d5845a1b9a207c5 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 28 Jan 2016 00:54:31 +0100
Subject: [PATCH 1/2] curl: cleanup options

---
 packages/web/curl/package.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/web/curl/package.mk b/packages/web/curl/package.mk
index 2a73c35659..c4eb32e7f4 100644
--- a/packages/web/curl/package.mk
+++ b/packages/web/curl/package.mk
@@ -60,8 +60,9 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_lib_rtmp_RTMP_Init=yes \
                            --disable-tftp \
                            --disable-pop3 \
                            --disable-imap \
+                           --disable-smb \
                            --disable-smtp \
-                           --disable-gophper \
+                           --disable-gopher \
                            --disable-manual \
                            --enable-libgcc \
                            --enable-ipv6 \
@@ -72,7 +73,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_lib_rtmp_RTMP_Init=yes \
                            --disable-sspi \
                            --enable-crypto-auth \
                            --enable-cookies \
-                           --enable-hidden-symbols \
+                           --enable-symbol-hiding \
                            --disable-soname-bump \
                            --with-gnu-ld \
                            --without-krb4 \
@@ -88,6 +89,8 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_lib_rtmp_RTMP_Init=yes \
                            --without-nss \
                            --with-ca-bundle=$SSL_CERTIFICATES/cacert.pem \
                            --without-ca-path \
+                           --without-libpsl \
+                           --without-libmetalink \
                            --without-libssh2 \
                            --with-librtmp=$SYSROOT_PREFIX/usr \
                            --without-libidn"
@@ -98,6 +101,7 @@ pre_configure_target() {
 }
 
 post_makeinstall_target() {
+  rm -rf $INSTALL/usr/share/zsh
   rm -rf $INSTALL/usr/bin/curl-config
 
   sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/curl-config

From 922fc2d39819bbb3e07d7072ae9f373fdc94a72e Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 28 Jan 2016 00:54:36 +0100
Subject: [PATCH 2/2] gdb: add / to auto-load safe-path

---
 packages/debug/gdb/package.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/debug/gdb/package.mk b/packages/debug/gdb/package.mk
index 351f296374..d3bce7c087 100644
--- a/packages/debug/gdb/package.mk
+++ b/packages/debug/gdb/package.mk
@@ -18,7 +18,7 @@
 
 PKG_NAME="gdb"
 PKG_VERSION="7.10.1"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/gdb/"
@@ -43,6 +43,7 @@ pre_configure_target() {
 PKG_CONFIGURE_OPTS_TARGET="bash_cv_have_mbstate_t=set \
                            --disable-shared \
                            --enable-static \
+                           --with-auto-load-safe-path=/ \
                            --disable-nls \
                            --disable-sim \
                            --without-x \