Merge pull request #1469 from jow-/squid-musl-compat

squid: fix musl compatibility

diff --git a/libs/libv4l/patches/030-musl_compatibility.patch b/libs/libv4l/patches/030-musl_compatibility.patch
index bd3f0d7f4a4a544aafaf40703dececfa6e972901..758be2b525a2aba3c5ecd3b4a56ab4955f85f483 100644 (file)
--- a/libs/libv4l/patches/030-musl_compatibility.patch
+++ b/libs/libv4l/patches/030-musl_compatibility.patch
@@ -1,6 +1,6 @@
 --- a/lib/libv4lconvert/libv4lsyscall-priv.h
 +++ b/lib/libv4lconvert/libv4lsyscall-priv.h
-@@ -35,14 +35,19 @@
+@@ -35,18 +35,23 @@
     which is broken on some systems and doesn't include them itself :( */
  
  #ifdef linux
@@ -14,12 +14,16 @@
 +#undef SYS_mmap2
  #define       SYS_mmap2 __NR_mmap2
  #define       MMAP2_PAGE_SHIFT 12
-+#if !(defined(__UCLIBC__) || defined(__GLIBC__))
-+typedef off_t __off_t;
-+#endif
  #else
  #define       SYS_mmap2 SYS_mmap
  #define       MMAP2_PAGE_SHIFT 0
+ #endif
++#if !(defined(__UCLIBC__) || defined(__GLIBC__))
++typedef off_t __off_t;
++#endif
+ #endif
+ 
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 --- a/lib/libv4l1/v4l1compat.c
 +++ b/lib/libv4l1/v4l1compat.c
 @@ -62,7 +62,7 @@ LIBV4L_PUBLIC int open(const char *file,

diff --git a/net/snort/Makefile b/net/snort/Makefile
index 33f8b6d5e9f17d2f51c255697b3e623c0c94c948..9886a5d92abc8a57230fa6d70bdb09edcc574a38 100644 (file)
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -9,7 +9,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=snort
 PKG_VERSION:=2.9.7.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
+
+PKG_LICENSE:=GPL-2.0
+PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.snort.org/downloads/snort/ \

diff --git a/net/snort/patches/100-autoconf-fixes.patch b/net/snort/patches/100-autoconf-fixes.patch
new file mode 100644 (file)
index 0000000..414c0c1
--- /dev/null
+++ b/net/snort/patches/100-autoconf-fixes.patch
@@ -0,0 +1,17 @@
+--- a/configure.in
++++ b/configure.in
+@@ -11,14 +11,6 @@ AM_INIT_AUTOMAKE(snort,2.9.7.2)
+ NO_OPTIMIZE="no"
+ ADD_WERROR="no"
+ 
+-# Test for -Werror and sed it out for now since some of the auto tests,
+-# for example AC_CHECK_LIB, will fail because of
+-# warning: conflicting types for built-in function <func>
+-if eval "echo $CFLAGS | grep -e -Werror"; then
+-    CFLAGS=`echo $CFLAGS | sed -e "s/-Werror//g"`
+-    ADD_WERROR="yes"
+-fi
+-
+ # Disable annoying practice of recursively re-running the autotools
+ AM_MAINTAINER_MODE
+ AC_PROG_CC_STDC

diff --git a/net/sstp-client/Makefile b/net/sstp-client/Makefile
index 6e6526982105b4a01793ab8c33104f8fd29ea455..baea8d2be27bb3c70c8e9123645516e24ddfe77b 100644 (file)
--- a/net/sstp-client/Makefile
+++ b/net/sstp-client/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2014 OpenWrt.org
+# Copyright (C) 2006-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -18,6 +18,8 @@ PKG_LICENSE=GPLv2
 
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CPPFLAGS += -I$(PKG_BUILD_DIR)/include
+
 define Package/sstp-client
   SECTION:=net
   CATEGORY:=Network

diff --git a/net/sstp-client/patches/100-musl-compat.patch b/net/sstp-client/patches/100-musl-compat.patch
new file mode 100644 (file)
index 0000000..d19b2fa
--- /dev/null
+++ b/net/sstp-client/patches/100-musl-compat.patch
@@ -0,0 +1,33 @@
+--- /dev/null
++++ b/include/net/ppp_defs.h
+@@ -0,0 +1,10 @@
++#ifndef _NET_PPP_DEFS_H
++#define _NET_PPP_DEFS_H 1
++
++#define __need_time_t
++#include <time.h>
++
++#include <asm/types.h>
++#include <linux/ppp_defs.h>
++
++#endif /* net/ppp_defs.h */
+--- a/src/libsstp-log/sstp-log-syslog.c
++++ b/src/libsstp-log/sstp-log-syslog.c
+@@ -32,6 +32,7 @@
+ #include <sys/uio.h>
+ #include <sys/un.h>
+ #include <sys/socket.h>
++#include <sys/types.h>
+ #include <unistd.h>
+ 
+ #include <sstp-common.h>
+--- a/src/libsstp-log/sstp-log-std.c
++++ b/src/libsstp-log/sstp-log-std.c
+@@ -25,6 +25,7 @@
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <string.h>
++#include <sys/types.h>
+ #include <sys/uio.h>
+ #include <unistd.h>
+ 

diff --git a/net/usbip/Makefile b/net/usbip/Makefile
index 8aa0df0eb78262bfd3514db8d1058c866a081e53..49130574fa43b0a71ab8b9312f699eafcaf19a25 100644 (file)
--- a/net/usbip/Makefile
+++ b/net/usbip/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=usbip
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 PKG_LICENSE:=GPL-2.0
 
 # Since kernel 2.6.39.1 userspace tools are inside the kernel tree

diff --git a/net/usbip/patches-2.0/100-musl-compat.patch b/net/usbip/patches-2.0/100-musl-compat.patch
new file mode 100644 (file)
index 0000000..a64678c
--- /dev/null
+++ b/net/usbip/patches-2.0/100-musl-compat.patch
@@ -0,0 +1,11 @@
+--- a/src/usbipd.c
++++ b/src/usbipd.c
+@@ -453,7 +453,7 @@ static void set_signal(void)
+       sigaction(SIGTERM, &act, NULL);
+       sigaction(SIGINT, &act, NULL);
+       act.sa_handler = SIG_IGN;
+-      sigaction(SIGCLD, &act, NULL);
++      sigaction(SIGCHLD, &act, NULL);
+ }
+ 
+ static const char *pid_file;

diff --git a/utils/minicom/Makefile b/utils/minicom/Makefile
index ba5677ed3bacf618f53fd5bb5ada15e22edbcd2f..b588993e2a931f5bf2a4b1575c78fef6d3d10cf1 100644 (file)
--- a/utils/minicom/Makefile
+++ b/utils/minicom/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=minicom
 PKG_VERSION:=2.7
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://alioth.debian.org/frs/download.php/file/3977/
@@ -27,7 +27,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/minicom
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=$(ICONV_DEPENDS) +libncurses
+  DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS) +libncurses
   TITLE:=Terminal emulation program
   URL:=http://alioth.debian.org/projects/minicom/
   SUBMENU:=Terminal