diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-01 20:19:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-01 20:19:13 +0100 |
| commit | 8207b8d44693503e1c086aea0fc30c592a59b15d (patch) | |
| tree | 8ebb77c7ae0097d4877bed3099a49ce7518a2f63 | |
| parent | f3f7a7f082ffce3fe30555c73276f4c070c0b6da (diff) | |
another round of updates and musl fixes
63 files changed, 449 insertions, 220 deletions
diff --git a/package/binutils/Makefile b/package/binutils/Makefile index e429001bf..c66ab6d2d 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -42,8 +42,8 @@ else CONFIGURE_ARGS+= --disable-werror endif -pre-build: - @-rm $(STAGING_TARGET_DIR)/lib/libiberty.a $(STAGING_TARGET_DIR)/usr/lib/libiberty.a +post-build: + $(CP) ${WRKBUILD}/libiberty/libiberty.a $(STAGING_TARGET_DIR)/usr/lib libbfd-install: ${INSTALL_DIR} ${IDIR_LIBBFD}/usr/lib diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index 1b4c0a3ff..cde8727d3 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -4,15 +4,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= davfs2 -PKG_VERSION:= 1.4.6 -PKG_RELEASE:= 2 -PKG_MD5SUM:= c9e8aeb15daeba4b6283b40bb640e908 +PKG_VERSION:= 1.4.7 +PKG_RELEASE:= 1 +PKG_MD5SUM:= c75f9d7d260e7364362b89beba2b3186 PKG_DESCR:= WebDAV filesystem PKG_SECTION:= net/fs PKG_DEPENDS:= fuse-utils kmod-fuse-fs neon PKG_BUILDDEP:= libiconv-tiny neon fuse PKG_URL:= http://savannah.nongnu.org/projects/davfs2/ -PKG_SITES:= http://www.very-clever.com/download/nongnu/davfs2/ +PKG_SITES:= http://download.savannah.gnu.org/releases/davfs2/ + +PKG_LIBC_DEPENDS:= uclibc eglibc glibc include ${TOPDIR}/mk/package.mk diff --git a/package/davfs2/patches/patch-src_cache_c b/package/davfs2/patches/patch-src_cache_c index dd03ed67c..f6e5cdce5 100644 --- a/package/davfs2/patches/patch-src_cache_c +++ b/package/davfs2/patches/patch-src_cache_c @@ -1,6 +1,14 @@ ---- davfs2-1.4.6.orig/src/cache.c 2009-11-15 11:15:17.000000000 +0100 -+++ davfs2-1.4.6/src/cache.c 2010-12-27 22:02:47.000000000 +0100 -@@ -55,7 +55,6 @@ +--- davfs2-1.4.7.orig/src/cache.c 2012-07-19 13:26:00.000000000 +0200 ++++ davfs2-1.4.7/src/cache.c 2014-01-01 20:01:21.000000000 +0100 +@@ -24,7 +24,6 @@ + #include <dirent.h> + #endif + #include <errno.h> +-#include <error.h> + #ifdef HAVE_FCNTL_H + #include <fcntl.h> + #endif +@@ -55,7 +54,6 @@ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif diff --git a/package/davfs2/patches/patch-src_coda_h b/package/davfs2/patches/patch-src_coda_h new file mode 100644 index 000000000..9960514d9 --- /dev/null +++ b/package/davfs2/patches/patch-src_coda_h @@ -0,0 +1,15 @@ +--- davfs2-1.4.7.orig/src/coda.h 2009-04-14 21:54:57.000000000 +0200 ++++ davfs2-1.4.7/src/coda.h 2014-01-01 20:12:52.000000000 +0100 +@@ -57,6 +57,12 @@ typedef int int32_t; + typedef unsigned int u_int32_t; + #endif + ++typedef unsigned long u_long; ++typedef unsigned int u_int; ++typedef unsigned short u_short; ++typedef unsigned long long u_quad_t; ++#include <sys/types.h> ++ + + /* + * Cfs constants diff --git a/package/davfs2/patches/patch-src_dav_fuse_c b/package/davfs2/patches/patch-src_dav_fuse_c index fca0e83f2..1a67e1563 100644 --- a/package/davfs2/patches/patch-src_dav_fuse_c +++ b/package/davfs2/patches/patch-src_dav_fuse_c @@ -1,10 +1,11 @@ ---- davfs2-1.4.6.orig/src/dav_fuse.c 2010-02-16 20:29:49.000000000 +0100 -+++ davfs2-1.4.6/src/dav_fuse.c 2010-12-27 22:02:24.000000000 +0100 -@@ -33,6 +33,7 @@ - #ifdef HAVE_STDINT_H - #include <stdint.h> +--- davfs2-1.4.7.orig/src/dav_fuse.c 2012-07-19 13:18:51.000000000 +0200 ++++ davfs2-1.4.7/src/dav_fuse.c 2014-01-01 20:02:55.000000000 +0100 +@@ -48,6 +48,8 @@ + #include <sys/stat.h> #endif -+#include <stdlib.h> - #include <string.h> - #ifdef HAVE_SYSLOG_H - #include <syslog.h> + ++#include <sys/select.h> ++ + #include "defaults.h" + #include "mount_davfs.h" + #include "cache.h" diff --git a/package/davfs2/patches/patch-src_kernel_interface_c b/package/davfs2/patches/patch-src_kernel_interface_c new file mode 100644 index 000000000..5a884cfa3 --- /dev/null +++ b/package/davfs2/patches/patch-src_kernel_interface_c @@ -0,0 +1,10 @@ +--- davfs2-1.4.7.orig/src/kernel_interface.c 2012-07-19 12:58:48.000000000 +0200 ++++ davfs2-1.4.7/src/kernel_interface.c 2014-01-01 20:01:11.000000000 +0100 +@@ -20,7 +20,6 @@ + + #include "config.h" + +-#include <error.h> + #ifdef HAVE_FCNTL_H + #include <fcntl.h> + #endif diff --git a/package/davfs2/patches/patch-src_mount_davfs_c b/package/davfs2/patches/patch-src_mount_davfs_c index 516604ffc..a86657673 100644 --- a/package/davfs2/patches/patch-src_mount_davfs_c +++ b/package/davfs2/patches/patch-src_mount_davfs_c @@ -1,6 +1,16 @@ ---- davfs2-1.4.6.orig/src/mount_davfs.c 2010-01-21 19:50:15.000000000 +0100 -+++ davfs2-1.4.6/src/mount_davfs.c 2010-05-29 21:10:23.041613426 +0200 -@@ -29,7 +29,6 @@ +--- davfs2-1.4.7.orig/src/mount_davfs.c 2012-07-19 13:35:11.000000000 +0200 ++++ davfs2-1.4.7/src/mount_davfs.c 2014-01-01 20:14:21.000000000 +0100 +@@ -20,16 +20,15 @@ + + #include "config.h" + ++#include <paths.h> + #ifdef HAVE_ARGZ_H + #include <argz.h> + #endif + #include <ctype.h> + #include <errno.h> +-#include <error.h> #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif @@ -8,15 +18,15 @@ #include <getopt.h> #include <grp.h> #ifdef HAVE_LIBINTL_H -@@ -677,6 +676,7 @@ check_double_mounts(dav_args *args) +@@ -674,6 +673,7 @@ check_double_mounts(dav_args *args) static void check_fstab(const dav_args *args) { +#if 0 dav_args *n_args = new_args(); n_args->mopts = DAV_USER_MOPTS; - -@@ -733,6 +733,7 @@ check_fstab(const dav_args *args) + setfsent(); +@@ -737,6 +737,7 @@ check_fstab(const dav_args *args) endfsent(); delete_args(n_args); @@ -24,7 +34,7 @@ } -@@ -754,7 +755,7 @@ check_mountpoint(dav_args *args) +@@ -758,7 +759,7 @@ check_mountpoint(dav_args *args) struct passwd *pw; if (*mpoint != '/') { @@ -33,7 +43,7 @@ if (!mp) error(EXIT_FAILURE, 0, _("can't evaluate path of mount point %s"), mpoint); -@@ -1824,6 +1825,7 @@ new_args(void) +@@ -1793,6 +1794,7 @@ new_args(void) static void log_dbg_cmdline(char *argv[]) { @@ -41,8 +51,8 @@ size_t len; char *cmdline; if (argz_create(argv, &cmdline, &len) == 0) { -@@ -1831,6 +1833,7 @@ log_dbg_cmdline(char *argv[]) - syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), cmdline); +@@ -1800,6 +1802,7 @@ log_dbg_cmdline(char *argv[]) + syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "%s", cmdline); free(cmdline); } + */ diff --git a/package/davfs2/patches/patch-src_webdav_c b/package/davfs2/patches/patch-src_webdav_c index 20b125f1a..a2a71fe05 100644 --- a/package/davfs2/patches/patch-src_webdav_c +++ b/package/davfs2/patches/patch-src_webdav_c @@ -1,6 +1,14 @@ ---- davfs2-1.4.6.orig/src/webdav.c 2010-02-16 20:29:59.000000000 +0100 -+++ davfs2-1.4.6/src/webdav.c 2010-05-30 09:52:01.161613627 +0200 -@@ -52,6 +52,8 @@ +--- davfs2-1.4.7.orig/src/webdav.c 2012-07-19 13:27:51.000000000 +0200 ++++ davfs2-1.4.7/src/webdav.c 2014-01-01 20:14:54.000000000 +0100 +@@ -21,7 +21,6 @@ + #include "config.h" + + #include <errno.h> +-#include <error.h> + #ifdef HAVE_FCNTL_H + #include <fcntl.h> + #endif +@@ -52,6 +51,8 @@ #include <sys/stat.h> #endif @@ -9,7 +17,7 @@ #include <ne_alloc.h> #include <ne_auth.h> #include <ne_basic.h> -@@ -1918,6 +1920,7 @@ quota_result(void *userdata, const ne_ur +@@ -1921,6 +1922,7 @@ quota_result(void *userdata, const ne_ur static int ssl_verify(void *userdata, int failures, const ne_ssl_certificate *cert) { @@ -17,7 +25,7 @@ char *issuer = ne_ssl_readable_dname(ne_ssl_cert_issuer(cert)); char *subject = ne_ssl_readable_dname(ne_ssl_cert_subject(cert)); char *digest = ne_calloc(NE_SSL_DIGESTLEN); -@@ -1964,8 +1967,13 @@ ssl_verify(void *userdata, int failures, +@@ -1967,8 +1969,13 @@ ssl_verify(void *userdata, int failures, len = getline(&s, &n, stdin); if (len < 0) abort(); diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile index a681a07a7..a72937e15 100644 --- a/package/dhcp-forwarder/Makefile +++ b/package/dhcp-forwarder/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dhcp-forwarder -PKG_VERSION:= 0.9 +PKG_VERSION:= 0.10 PKG_RELEASE:= 1 -PKG_MD5SUM:= 63630db269ac17523ad085b67277b1c3 +PKG_MD5SUM:= 97b5f3ddbdee5c1f6756321c15907138 PKG_DESCR:= DHCP relay agent PKG_SECTION:= dhcp PKG_URL:= http://www.nongnu.org/dhcp-fwd/ diff --git a/package/dhcp-forwarder/patches/patch-src_parser_c b/package/dhcp-forwarder/patches/patch-src_parser_c new file mode 100644 index 000000000..b05ef56a0 --- /dev/null +++ b/package/dhcp-forwarder/patches/patch-src_parser_c @@ -0,0 +1,10 @@ +--- dhcp-forwarder-0.10.orig/src/parser.c 2012-04-30 12:57:35.000000000 +0200 ++++ dhcp-forwarder-0.10/src/parser.c 2013-12-30 19:16:07.000000000 +0100 +@@ -27,6 +27,7 @@ + #include <fcntl.h> + #include <netinet/in.h> + #include <sys/mman.h> ++#include <sys/stat.h> + + #include "parser.h" + #include "cfg.h" diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile index 8a7b04b55..a7309e882 100644 --- a/package/digitemp/Makefile +++ b/package/digitemp/Makefile @@ -14,6 +14,7 @@ PKG_BUILDDEP:= libusb libusb-compat PKG_URL:= http://www.digitemp.com/software/linux/ PKG_SITES:= http://www.digitemp.com/software/linux/ +PKG_LIBC_DEPENDS:= uclibc eglibc glibc PKG_ARCH_DEPENDS:= !avr32 include ${TOPDIR}/mk/package.mk diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 5515ae209..6cfef381f 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= fuse PKG_VERSION:= 2.9.3 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 33cae22ca50311446400daf8a6255c6a PKG_DESCR:= Filesystem in Userspace (utilities) PKG_SECTION:= fs diff --git a/package/fuse/patches/patch-lib_fuse_c b/package/fuse/patches/patch-lib_fuse_c new file mode 100644 index 000000000..9b3c74e39 --- /dev/null +++ b/package/fuse/patches/patch-lib_fuse_c @@ -0,0 +1,10 @@ +--- fuse-2.9.3.orig/lib/fuse.c 2013-07-01 09:40:39.000000000 +0200 ++++ fuse-2.9.3/lib/fuse.c 2014-01-01 11:45:54.000000000 +0100 +@@ -33,6 +33,7 @@ + #include <dlfcn.h> + #include <assert.h> + #include <poll.h> ++#include <sys/file.h> + #include <sys/param.h> + #include <sys/uio.h> + #include <sys/time.h> diff --git a/package/fuse/patches/patch-lib_fuse_lowlevel_c b/package/fuse/patches/patch-lib_fuse_lowlevel_c new file mode 100644 index 000000000..253b89d27 --- /dev/null +++ b/package/fuse/patches/patch-lib_fuse_lowlevel_c @@ -0,0 +1,10 @@ +--- fuse-2.9.3.orig/lib/fuse_lowlevel.c 2013-07-01 09:40:39.000000000 +0200 ++++ fuse-2.9.3/lib/fuse_lowlevel.c 2014-01-01 11:50:38.000000000 +0100 +@@ -24,6 +24,7 @@ + #include <limits.h> + #include <errno.h> + #include <assert.h> ++#include <sys/file.h> + + #ifndef F_LINUX_SPECIFIC_BASE + #define F_LINUX_SPECIFIC_BASE 1024 diff --git a/package/fuse/patches/patch-lib_mount_util_c b/package/fuse/patches/patch-lib_mount_util_c new file mode 100644 index 000000000..5c8639b43 --- /dev/null +++ b/package/fuse/patches/patch-lib_mount_util_c @@ -0,0 +1,10 @@ +--- fuse-2.9.3.orig/lib/mount_util.c 2013-07-01 09:25:36.000000000 +0200 ++++ fuse-2.9.3/lib/mount_util.c 2014-01-01 11:52:48.000000000 +0100 +@@ -16,6 +16,7 @@ + #include <errno.h> + #include <fcntl.h> + #include <limits.h> ++#include <paths.h> + #ifndef __NetBSD__ + #include <mntent.h> + #endif diff --git a/package/fuse/patches/patch-util_mount_util_c b/package/fuse/patches/patch-util_mount_util_c new file mode 100644 index 000000000..d38196ed0 --- /dev/null +++ b/package/fuse/patches/patch-util_mount_util_c @@ -0,0 +1,10 @@ +--- fuse-2.9.3.orig/util/mount_util.c 2013-07-01 10:02:18.000000000 +0200 ++++ fuse-2.9.3/util/mount_util.c 2014-01-01 11:54:07.000000000 +0100 +@@ -16,6 +16,7 @@ + #include <errno.h> + #include <fcntl.h> + #include <limits.h> ++#include <paths.h> + #ifndef __NetBSD__ + #include <mntent.h> + #endif diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index 51f638578..d6373de34 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= hostapd -PKG_VERSION:= 1.0 +PKG_VERSION:= 2.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 236247a7bbd4f60d5fa3e99849d1ffc9 +PKG_MD5SUM:= ba22e639bc57aa4035d2ea8ffa9bbbee PKG_DESCR:= an IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator PKG_SECTION:= wifi PKG_DEPENDS:= libnl diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile index 2bcffc733..7ae627284 100644 --- a/package/iptraf/Makefile +++ b/package/iptraf/Makefile @@ -22,7 +22,9 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual +TARGET_CPPFLAGS+= -D_GNU_SOURCE TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) +TARGET_LDFLAGS+= -ltinfo do-build: ${MAKE} -C ${WRKBUILD}/src \ diff --git a/package/kismet/Makefile b/package/kismet/Makefile index b5aa3de05..df52c74b8 100644 --- a/package/kismet/Makefile +++ b/package/kismet/Makefile @@ -4,16 +4,18 @@ include ${TOPDIR}/rules.mk PKG_NAME:= kismet -PKG_VERSION:= 2011-01-R1 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 1fb1f024a7ca52814b255e2f2faccf3b +PKG_VERSION:= 2013-03-R1b +PKG_RELEASE:= 1 +PKG_MD5SUM:= 596acdd2940887dd05a498ea27475eea PKG_DESCR:= Kismet PKG_SECTION:= wifi PKG_DEPENDS:= libpcap libncurses libpthread -PKG_BUILDDEP:= libpcap ncurses +PKG_BUILDDEP:= autotool libpcap ncurses PKG_URL:= http://www.kismetwireless.net/ PKG_SITES:= http://www.kismetwireless.net/code/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + PKG_SUBPKGS:= KISMET KISMET_CLIENT KISMET_DRONE KISMET_SERVER PKGSD_KISMET_CLIENT:= Kismet client PKGSD_KISMET_SERVER:= Kismet server @@ -26,6 +28,7 @@ $(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELE $(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_DRONE},${PKG_SECTION})) $(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_SERVER},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf TARGET_LDFLAGS+= -lpthread CONFIGURE_ARGS+= --sysconfdir=/etc/kismet diff --git a/package/kismet/patches/patch-configure_in b/package/kismet/patches/patch-configure_in new file mode 100644 index 000000000..cb7d45cbd --- /dev/null +++ b/package/kismet/patches/patch-configure_in @@ -0,0 +1,12 @@ +--- kismet-2013-03-R1b.orig/configure.in 2013-03-27 15:41:48.000000000 +0100 ++++ kismet-2013-03-R1b/configure.in 2013-12-31 23:14:38.000000000 +0100 +@@ -406,9 +406,6 @@ AC_ARG_ENABLE(client, + ) + AC_SUBST(wantclient) + +-# Add additional cflags since some distros bury panel.h +-CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" +- + termcontrol="none"; + + if test "$wantclient" = "yes"; then diff --git a/package/libunistring/Makefile b/package/libunistring/Makefile index b1e131160..3831e0638 100755 --- a/package/libunistring/Makefile +++ b/package/libunistring/Makefile @@ -13,6 +13,8 @@ PKG_URL:= http://www.gnu.org/software/libunistring/ PKG_SITES:= ${MASTER_SITE_GNU:=libunistring/} PKG_OPTS:= dev +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBUNISTRING,libunistring,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/m4/Makefile b/package/m4/Makefile index 8cb482904..f7fe684b2 100644 --- a/package/m4/Makefile +++ b/package/m4/Makefile @@ -4,7 +4,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= m4 -PKG_VERSION:= 1.4.16 +PKG_VERSION:= 1.4.17 PKG_RELEASE:= 1 PKG_MD5SUM:= a5dfb4f2b7370e9d34293d23fd09b280 PKG_DESCR:= macro processor diff --git a/package/mdadm/Makefile b/package/mdadm/Makefile index 522a57f51..e2543cf00 100644 --- a/package/mdadm/Makefile +++ b/package/mdadm/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mdadm -PKG_VERSION:= 3.2.6 +PKG_VERSION:= 3.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= dd2472f07993496ca4f4e3e8f6746517 +PKG_MD5SUM:= f73bf9c6a72cdd644904b287bc9b7c9e PKG_DESCR:= tool for managing Linux Software RAID arrays PKG_SECTION:= fs PKG_URL:= http://neil.brown.name/blog/mdadm diff --git a/package/mdadm/patches/patch-Makefile b/package/mdadm/patches/patch-Makefile index 7e11c9f8a..d8e182c0c 100644 --- a/package/mdadm/patches/patch-Makefile +++ b/package/mdadm/patches/patch-Makefile @@ -1,25 +1,15 @@ ---- mdadm-3.2.5.orig/Makefile 2012-05-18 09:10:03.000000000 +0200 -+++ mdadm-3.2.5/Makefile 2012-07-25 13:51:12.000000000 +0200 -@@ -42,7 +42,7 @@ KLIBC_GCC = gcc -nostdinc -iwithprefix i +--- mdadm-3.3.orig/Makefile 2013-09-03 06:47:47.000000000 +0200 ++++ mdadm-3.3/Makefile 2013-12-31 18:42:30.000000000 +0100 +@@ -43,7 +43,7 @@ KLIBC_GCC = gcc -nostdinc -iwithprefix i CC = $(CROSS_COMPILE)gcc - CXFLAGS = -ggdb + CXFLAGS ?= -ggdb -CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter +CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter ifdef WARN_UNUSED - CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O + CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3 endif -@@ -76,7 +76,8 @@ FAILED_SLOTS_DIR = /run/mdadm/failed-slo - DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\" - DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\" - DIRFLAGS += -DFAILED_SLOTS_DIR=\"$(FAILED_SLOTS_DIR)\" --CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS) -+CFLAGS ?= -+CFLAGS += $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS) - - # The glibc TLS ABI requires applications that call clone(2) to set up - # TLS data structures, use pthreads until mdmon implements this support -@@ -231,9 +232,10 @@ $(MON_OBJS) : $(INCL) mdmon.h +@@ -257,9 +257,10 @@ $(MON_OBJS) : $(INCL) mdmon.h sha1.o : sha1.c sha1.h md5.h $(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 0841a9070..2455c9a2f 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ncurses PKG_VERSION:= 5.9 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 8cb9c412e5f2d96bc6f459aa8c6282a1 PKG_DESCR:= a terminal handling library PKG_SECTION:= libs @@ -34,6 +34,7 @@ CONFIGURE_ARGS+= --without-cxx \ --enable-symlinks \ --without-ada \ --with-shared \ + --with-termlib \ --without-debug \ --without-profile \ --without-gpm \ @@ -78,7 +79,7 @@ libncurses-install: echo 'GROUP(-lncurses)' >${WRKINST}/usr/lib/libcurses.so # libcurses will not show up in the IPKG, only in STAGING_TARGET_DIR ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/lib - ${CP} ${WRKINST}/usr/lib/lib{form,menu,ncurses,panel}.so* \ + ${CP} ${WRKINST}/usr/lib/lib{tinfo,form,menu,ncurses,panel}.so* \ ${IDIR_LIBNCURSES}/usr/lib for ti in rxvt rxvt-unicode; do \ TERMINFO=${WRKINST}/usr/share/terminfo \ diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile index 07c90a094..04fed494f 100644 --- a/package/net-snmp/Makefile +++ b/package/net-snmp/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= net-snmp PKG_VERSION:= 5.7.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 5bddd02e2f82b62daa79f82717737a14 PKG_DESCR:= SNMP Agent PKG_SECTION:= net/misc diff --git a/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c b/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c index f0be57e78..a4396b963 100644 --- a/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c +++ b/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c @@ -1,6 +1,6 @@ ---- net-snmp-5.6.1.orig/agent/mibgroup/mibII/tcpTable.c 2010-10-20 15:12:08.000000000 +0200 -+++ net-snmp-5.6.1/agent/mibgroup/mibII/tcpTable.c 2011-01-12 14:48:14.000000000 +0100 -@@ -33,6 +33,12 @@ +--- net-snmp-5.7.2.orig/agent/mibgroup/mibII/tcpTable.c 2012-10-10 00:28:58.000000000 +0200 ++++ net-snmp-5.7.2/agent/mibgroup/mibII/tcpTable.c 2014-01-01 17:12:30.000000000 +0100 +@@ -34,6 +34,12 @@ #include <netlink/netlink.h> #include <netlink/msg.h> #include <linux/inet_diag.h> @@ -13,7 +13,7 @@ #endif #include <net-snmp/net-snmp-includes.h> -@@ -565,8 +571,8 @@ tcpTable_load_netlink(void) +@@ -579,8 +585,8 @@ tcpTable_load_netlink(void) } if (nl_connect(nl, NETLINK_INET_DIAG) < 0) { @@ -24,7 +24,7 @@ nl_handle_destroy(nl); return -1; } -@@ -580,8 +586,8 @@ tcpTable_load_netlink(void) +@@ -594,8 +600,8 @@ tcpTable_load_netlink(void) nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0); if (nl_send_auto_complete(nl, nm) < 0) { @@ -35,7 +35,7 @@ nl_handle_destroy(nl); return -1; } -@@ -593,8 +599,8 @@ tcpTable_load_netlink(void) +@@ -607,8 +613,8 @@ tcpTable_load_netlink(void) while (running) { if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) { diff --git a/package/net-snmp/patches/patch-agent_mibgroup_util_funcs_get_pid_from_inode_c b/package/net-snmp/patches/patch-agent_mibgroup_util_funcs_get_pid_from_inode_c new file mode 100644 index 000000000..08097feb3 --- /dev/null +++ b/package/net-snmp/patches/patch-agent_mibgroup_util_funcs_get_pid_from_inode_c @@ -0,0 +1,10 @@ +--- net-snmp-5.7.2.orig/agent/mibgroup/util_funcs/get_pid_from_inode.c 2012-10-10 00:28:58.000000000 +0200 ++++ net-snmp-5.7.2/agent/mibgroup/util_funcs/get_pid_from_inode.c 2014-01-01 17:29:08.000000000 +0100 +@@ -6,6 +6,7 @@ + + #include <ctype.h> + #include <stdio.h> ++#include <limits.h> + #if HAVE_STDLIB_H + #include <stdlib.h> + #endif diff --git a/package/net-snmp/patches/patch-net-snmp-config_in b/package/net-snmp/patches/patch-net-snmp-config_in index 2465be023..7e0623ad7 100644 --- a/package/net-snmp/patches/patch-net-snmp-config_in +++ b/package/net-snmp/patches/patch-net-snmp-config_in @@ -1,6 +1,6 @@ ---- net-snmp-5.6.1.orig/net-snmp-config.in 2010-10-13 11:58:34.000000000 +0200 -+++ net-snmp-5.6.1/net-snmp-config.in 2011-01-21 18:05:18.494919068 +0100 -@@ -127,10 +127,10 @@ else +--- net-snmp-5.7.2.orig/net-snmp-config.in 2012-10-10 00:28:58.000000000 +0200 ++++ net-snmp-5.7.2/net-snmp-config.in 2014-01-01 17:12:30.000000000 +0100 +@@ -138,10 +138,10 @@ else ;; #################################################### compile --base-cflags) diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index 63724cbdb..1d4278fd0 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -15,6 +15,7 @@ PKG_URL:= http://oprofile.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=oprofile/} PKG_ARCH_DEPENDS:= !cris !avr32 !m68k +PKG_LIBC_DEPENDS:= uclibc eglibc glibc PKG_CFLINE_OPROFILE:= select BUSYBOX_EXPR @@ -23,7 +24,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,OPROFILE,oprofile,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TARGET_LDFLAGS+= -lpthread -CONFIGURE_ARGS+= --with-kernel-support oprofile-install: $(INSTALL_DIR) $(IDIR_OPROFILE)/usr/{bin,share} diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile index 618841d7d..15cc231ee 100644 --- a/package/orbit2/Makefile +++ b/package/orbit2/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= ORBit2 PKG_VERSION:= 2.14.19 PKG_EXTRAVER:= 2.14 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 87c69c56c6d0bdafa4de5e18ae115cc9 PKG_DESCR:= a CORBA 2.4-compliant Object Request Broker PKG_SECTION:= libs @@ -22,8 +22,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CFLAGS_FOR_BUILD+= $(shell PATH=$(TARGET_PATH) libIDL-config-2 --cflags) -LDFLAGS_FOR_BUILD+= $(shell PATH=$(TARGET_PATH) libIDL-config-2 --libs) +CFLAGS_FOR_BUILD+= $(shell PATH=$(HOST_PATH) libIDL-config-2 --cflags) +LDFLAGS_FOR_BUILD+= $(shell PATH=$(HOST_PATH) libIDL-config-2 --libs) LDFLAGS_FOR_BUILD+= -lgmodule-2.0 CONFIGURE_ENV+= ac_cv_alignof_CORBA_octet=1 \ ac_cv_alignof_CORBA_boolean=1 \ @@ -43,9 +43,6 @@ orbit2-install: $(INSTALL_DIR) $(IDIR_ORBIT2)/usr/lib $(INSTALL_BIN) $(WRKINST)/usr/lib/libORBit*.so* \ $(IDIR_ORBIT2)/usr/lib - $(INSTALL_DIR) $(IDIR_ORBIT2)/usr/bin - $(CP) $(WRKINST)/usr/bin/orbit-idl-2 \ - $(IDIR_ORBIT2)/usr/bin $(INSTALL_DIR) $(STAGING_DIR)/usr/bin $(CP) $(WRKINST)/usr/bin/orbit-idl-2 \ $(STAGING_DIR)/usr/bin diff --git a/package/orbit2/patches/patch-src_idl-compiler_Makefile_in b/package/orbit2/patches/patch-src_idl-compiler_Makefile_in index 2053d9f29..ec73ef4f3 100644 --- a/package/orbit2/patches/patch-src_idl-compiler_Makefile_in +++ b/package/orbit2/patches/patch-src_idl-compiler_Makefile_in @@ -33,15 +33,6 @@ ORBIT_LIBS = @ORBIT_LIBS@ ORBIT_MAJOR_VERSION = @ORBIT_MAJOR_VERSION@ ORBIT_MICRO_VERSION = @ORBIT_MICRO_VERSION@ -@@ -199,7 +197,7 @@ PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -+PKG_CONFIG_LIBDIR = $(PKG_HOSTLIB_DIR) - PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ - RANLIB = @RANLIB@ - SED = @SED@ @@ -270,8 +268,7 @@ INCLUDES = \ -DVERSION=\"$(ORBIT_VERSION)\" \ -DORBIT2_INTERNAL_API \ diff --git a/package/portsentry/Makefile b/package/portsentry/Makefile index 19a46f0e0..a68b55593 100644 --- a/package/portsentry/Makefile +++ b/package/portsentry/Makefile @@ -12,6 +12,8 @@ PKG_SECTION:= net/security PKG_URL:= http://sourceforge.net/projects/sentrytools PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sentrytools/} +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + WRKDIST= ${WRKDIR}/${PKG_NAME}_beta include ${TOPDIR}/mk/package.mk diff --git a/package/quagga/Makefile b/package/quagga/Makefile index 99de25ba4..59135aeb0 100644 --- a/package/quagga/Makefile +++ b/package/quagga/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= quagga -PKG_VERSION:= 0.99.17 +PKG_VERSION:= 0.99.22.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= 37b9022adca04b03863d2d79787e643f +PKG_MD5SUM:= 27ef98abb1820bae19eb71f631a10853 PKG_DESCR:= A routing software package PKG_SECTION:= route PKG_BUILDDEP:= readline ncurses diff --git a/package/quagga/patches/patch-configure b/package/quagga/patches/patch-configure deleted file mode 100644 index 3780d661a..000000000 --- a/package/quagga/patches/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- quagga-0.99.17.orig/configure 2010-08-19 11:43:02.000000000 +0200 -+++ quagga-0.99.17/configure 2011-02-16 22:51:51.000000000 +0100 -@@ -14188,7 +14188,7 @@ if test "${ac_cv_func_malloc_0_nonnull+s - $as_echo_n "(cached) " >&6 - else - if test "$cross_compiling" = yes; then : -- ac_cv_func_malloc_0_nonnull=no -+ ac_cv_func_malloc_0_nonnull=yes - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -14640,7 +14640,7 @@ if test "${ac_cv_func_realloc_0_nonnull+ - $as_echo_n "(cached) " >&6 - else - if test "$cross_compiling" = yes; then : -- ac_cv_func_realloc_0_nonnull=no -+ ac_cv_func_realloc_0_nonnull=yes - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ diff --git a/package/quagga/patches/patch-lib_queue_h b/package/quagga/patches/patch-lib_queue_h new file mode 100644 index 000000000..2a2ce12ac --- /dev/null +++ b/package/quagga/patches/patch-lib_queue_h @@ -0,0 +1,11 @@ +--- quagga-0.99.22.4.orig/lib/queue.h 2013-08-04 15:01:38.000000000 +0200 ++++ quagga-0.99.22.4/lib/queue.h 2013-12-30 19:57:25.000000000 +0100 +@@ -33,8 +33,6 @@ + #ifndef _SYS_QUEUE_H_ + #define _SYS_QUEUE_H_ + +-#include <sys/cdefs.h> +- + /* + * This file defines four types of data structures: singly-linked lists, + * singly-linked tail queues, lists and tail queues. diff --git a/package/quagga/patches/patch-lib_sockopt_c b/package/quagga/patches/patch-lib_sockopt_c new file mode 100644 index 000000000..c33333766 --- /dev/null +++ b/package/quagga/patches/patch-lib_sockopt_c @@ -0,0 +1,23 @@ +--- quagga-0.99.22.4.orig/lib/sockopt.c 2013-04-14 14:46:07.000000000 +0200 ++++ quagga-0.99.22.4/lib/sockopt.c 2013-12-30 19:56:54.000000000 +0100 +@@ -24,6 +24,20 @@ + #include "sockopt.h" + #include "sockunion.h" + ++#if !defined(__GLIBC__) ++/* For TCP_MD5SIG socket option. */ ++#define TCP_MD5SIG_MAXKEYLEN 80 ++ ++struct tcp_md5sig ++{ ++ struct sockaddr_storage tcpm_addr; /* Address associated. */ ++ u_int16_t __tcpm_pad1; /* Zero. */ ++ u_int16_t tcpm_keylen; /* Key length. */ ++ u_int32_t __tcpm_pad2; /* Zero. */ ++ u_int8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */ ++}; ++#endif ++ + int + setsockopt_so_recvbuf (int sock, int size) + { diff --git a/package/quagga/patches/patch-lib_zebra_h b/package/quagga/patches/patch-lib_zebra_h new file mode 100644 index 000000000..160b4cc20 --- /dev/null +++ b/package/quagga/patches/patch-lib_zebra_h @@ -0,0 +1,10 @@ +--- quagga-0.99.22.4.orig/lib/zebra.h 2013-09-02 14:53:04.000000000 +0200 ++++ quagga-0.99.22.4/lib/zebra.h 2013-12-30 19:58:14.000000000 +0100 +@@ -51,7 +51,6 @@ typedef int socklen_t; + #ifdef HAVE_STROPTS_H + #include <stropts.h> + #endif /* HAVE_STROPTS_H */ +-#include <sys/fcntl.h> + #ifdef HAVE_SYS_SELECT_H + #include <sys/select.h> + #endif /* HAVE_SYS_SELECT_H */ diff --git a/package/quagga/patches/patch-ltmain_sh b/package/quagga/patches/patch-ltmain_sh deleted file mode 100644 index c6711472d..000000000 --- a/package/quagga/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- quagga-0.99.17.orig/ltmain.sh 2010-08-19 11:43:02.000000000 +0200 -+++ quagga-0.99.17/ltmain.sh 2011-01-16 22:05:52.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/quagga/patches/patch-redhat_quagga_spec b/package/quagga/patches/patch-redhat_quagga_spec deleted file mode 100644 index bf00ca130..000000000 --- a/package/quagga/patches/patch-redhat_quagga_spec +++ /dev/null @@ -1,11 +0,0 @@ ---- quagga-0.99.17.orig/redhat/quagga.spec 2010-08-19 11:44:45.000000000 +0200 -+++ quagga-0.99.17/redhat/quagga.spec 2011-01-16 22:05:02.000000000 +0100 -@@ -90,7 +90,7 @@ - Summary: Routing daemon - Name: quagga - Version: 0.99.17 --Release: 20100819%{release_rev} -+Release: 20110116%{release_rev} - License: GPL - Group: System Environment/Daemons - Source0: http://www.quagga.net/snapshots/cvs/%{name}-%{version}.tar.gz diff --git a/package/quagga/patches/patch-vtysh_extract_pl b/package/quagga/patches/patch-vtysh_extract_pl deleted file mode 100644 index dc3229fd2..000000000 --- a/package/quagga/patches/patch-vtysh_extract_pl +++ /dev/null @@ -1,8 +0,0 @@ ---- quagga-0.99.17.orig/vtysh/extract.pl 2010-08-19 11:44:45.000000000 +0200 -+++ quagga-0.99.17/vtysh/extract.pl 2011-01-16 22:05:03.000000000 +0100 -@@ -1,4 +1,4 @@ --#! -+#! /opt/local/bin/perl - ## - ## vtysh/extract.pl. Generated from extract.pl.in by configure. - ## diff --git a/package/rdate/Makefile b/package/rdate/Makefile index 140857170..619b5ad6a 100644 --- a/package/rdate/Makefile +++ b/package/rdate/Makefile @@ -18,6 +18,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,RDATE,rdate,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual +TARGET_CPPFLAGS+= -D_GNU_SOURCE MAKE_FILE= GNUmakefile rdate-install: diff --git a/package/rdate/patches/patch-ntp_c b/package/rdate/patches/patch-ntp_c new file mode 100644 index 000000000..d36d421cd --- /dev/null +++ b/package/rdate/patches/patch-ntp_c @@ -0,0 +1,50 @@ +--- rdate.orig/ntp.c 2007-08-17 17:03:24.000000000 +0200 ++++ rdate/ntp.c 2013-12-30 23:07:06.000000000 +0100 +@@ -37,6 +37,7 @@ + #include <sys/time.h> + #include <netinet/in.h> + #include <arpa/inet.h> ++#include <sys/types.h> + + #include <ctype.h> + #include <err.h> +@@ -100,9 +101,9 @@ struct ntp_data { + double transmit; + double current; + double originate; +- u_int64_t xmitck; +- u_int64_t recvck; +- u_int32_t refid; ++ uint64_t xmitck; ++ uint64_t recvck; ++ uint32_t refid; + u_char status; + u_char version; + u_char mode; +@@ -268,7 +269,7 @@ write_packet(int fd, struct ntp_data *da + + packet[0] = ((nver ? nver : NTP_VERSION) << 3) | (NTP_MODE_CLIENT); + +- data->xmitck = (u_int64_t)arc4random() << 32 | arc4random(); ++ data->xmitck = (uint64_t)arc4random() << 32 | arc4random(); + + /* + * Send out a random 64-bit number as our transmit time. The NTP +@@ -286,7 +287,7 @@ write_packet(int fd, struct ntp_data *da + * the transmit field intelligible. + */ + +- memcpy(packet + NTP_TRANSMIT, &data->xmitck, sizeof (u_int64_t)); ++ memcpy(packet + NTP_TRANSMIT, &data->xmitck, sizeof (uint64_t)); + + data->originate = current_time(JAN_1970); + +@@ -437,7 +438,7 @@ unpack_ntp(struct ntp_data *data, u_char + data->transmit = d / NTP_SCALE; + + /* See write_packet for why this isn't an endian problem. */ +- memcpy(&data->recvck, packet + NTP_ORIGINATE, sizeof (u_int64_t)); ++ memcpy(&data->recvck, packet + NTP_ORIGINATE, sizeof (uint64_t)); + } + + /* diff --git a/package/rdate/patches/patch-rdate_h b/package/rdate/patches/patch-rdate_h new file mode 100644 index 000000000..33c4f1b3a --- /dev/null +++ b/package/rdate/patches/patch-rdate_h @@ -0,0 +1,11 @@ +--- rdate.orig/rdate.h 2007-08-16 12:38:52.000000000 +0200 ++++ rdate/rdate.h 2013-12-30 23:00:23.000000000 +0100 +@@ -10,7 +10,7 @@ + #endif + + #ifdef EXT_A4R +-extern u_int32_t arc4random(void); ++extern uint32_t arc4random(void); + #endif + + #ifdef __MirBSD__ diff --git a/package/rdate/patches/patch-rfc868time_c b/package/rdate/patches/patch-rfc868time_c new file mode 100644 index 000000000..b095278ba --- /dev/null +++ b/package/rdate/patches/patch-rfc868time_c @@ -0,0 +1,11 @@ +--- rdate.orig/rfc868time.c 2007-08-11 01:52:47.000000000 +0200 ++++ rdate/rfc868time.c 2013-12-30 23:07:29.000000000 +0100 +@@ -70,7 +70,7 @@ rfc868time_client (const char *hostname, + { + struct addrinfo hints, *res0, *res; + struct timeval old; +- u_int32_t tim; /* RFC 868 states clearly this is an uint32 */ ++ uint32_t tim; /* RFC 868 states clearly this is an uint32 */ + int s; + int error; + diff --git a/package/rtmpdump/patches/patch-Makefile.orig b/package/rtmpdump/patches/patch-Makefile.orig deleted file mode 100644 index 9b10246bb..000000000 --- a/package/rtmpdump/patches/patch-Makefile.orig +++ /dev/null @@ -1,28 +0,0 @@ ---- rtmpdump-2.4.orig/Makefile 2013-12-15 14:24:48.000000000 +0100 -+++ rtmpdump-2.4/Makefile 2013-12-15 15:17:36.000000000 +0100 -@@ -1,9 +1,9 @@ - VERSION=v2.4 - --prefix=/usr/local -+prefix=/usr - --CC=$(CROSS_COMPILE)gcc --LD=$(CROSS_COMPILE)ld -+CC=$(CROSS)gcc -+LD=$(CROSS)ld - - SYS=posix - #SYS=mingw -@@ -21,8 +21,10 @@ CRYPTO_DEF=$(DEF_$(CRYPTO)) - - DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) - OPT=-O2 --CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) --LDFLAGS=-Wall $(XLDFLAGS) -+CFLAGS?= -+CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF) -+LDFLAGS?= -+LDFLAGS+=-Wall $(XLDFLAGS) - - bindir=$(prefix)/bin - sbindir=$(prefix)/sbin diff --git a/package/scsi-spin/src/scsi-spin.c b/package/scsi-spin/src/scsi-spin.c index 443934c78..b92347ff4 100644 --- a/package/scsi-spin/src/scsi-spin.c +++ b/package/scsi-spin/src/scsi-spin.c @@ -31,6 +31,7 @@ #include <linux/major.h> #include <sys/sysmacros.h> #include <sys/stat.h> +#include <sys/types.h> #define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \ ((M) >= SCSI_DISK1_MAJOR && \ @@ -203,8 +204,8 @@ is_mounted( const char* device, int use_proc, int devmaj, int devmin ) struct stat devstat; int mounted = 0; struct { - __uint32_t dev_id; - __uint32_t host_unique_id; + uint32_t dev_id; + uint32_t host_unique_id; } scsi_dev_id, scsi_id; FILE *mtab; char *mtabfile = use_proc ? "/proc/mounts" : "/etc/mtab"; diff --git a/package/tinc/Makefile b/package/tinc/Makefile index 9e5d8b06b..f5c558bb0 100644 --- a/package/tinc/Makefile +++ b/package/tinc/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tinc -PKG_VERSION:= 1.0.11 +PKG_VERSION:= 1.0.23 PKG_RELEASE:= 1 -PKG_MD5SUM:= ee0b1a3366c6e379cae34be6fa5dcb15 +PKG_MD5SUM:= 762c0d47bdf1b33a40b19165d9c2761f PKG_DESCR:= VPN tunnel daemon PKG_SECTION:= net/security PKG_DEPENDS:= zlib liblzo libopenssl kmod-tun @@ -18,8 +18,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,TINC,tinc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --with-kernel=${LINUX_DIR} \ - --with-zlib=${STAGING_TARGET_DIR}/usr/ \ +CONFIGURE_ARGS+= --with-zlib=${STAGING_TARGET_DIR}/usr/ \ --with-lzo-include=${STAGING_TARGET_DIR}/usr/include/lzo tinc-install: diff --git a/package/tinc/patches/patch-src_Makefile_in b/package/tinc/patches/patch-src_Makefile_in deleted file mode 100644 index 49bcf90dc..000000000 --- a/package/tinc/patches/patch-src_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- tinc-1.0.11.orig/src/Makefile.in 2009-11-01 16:23:33.000000000 +0100 -+++ tinc-1.0.11/src/Makefile.in 2011-01-21 23:31:11.568658762 +0100 -@@ -197,7 +197,7 @@ noinst_HEADERS = conf.h connection.h dev - tincd_LDADD = \ - $(top_builddir)/lib/libvpn.a - --AM_CFLAGS = @CFLAGS@ -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -+AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" - all: all-am - - .SUFFIXES: diff --git a/package/tinc/patches/patch-src_have_h b/package/tinc/patches/patch-src_have_h new file mode 100644 index 000000000..4efd602ac --- /dev/null +++ b/package/tinc/patches/patch-src_have_h @@ -0,0 +1,25 @@ +--- tinc-1.0.23.orig/src/have.h 2013-09-25 21:21:09.000000000 +0200 ++++ tinc-1.0.23/src/have.h 2013-12-30 19:30:24.000000000 +0100 +@@ -175,9 +175,11 @@ + #include <netinet/ip6.h> + #endif + ++#if defined(__GLIBC__) + #ifdef HAVE_NET_ETHERNET_H + #include <net/ethernet.h> + #endif ++#endif + + #ifdef HAVE_NET_IF_ARP_H + #include <net/if_arp.h> +@@ -191,8 +193,10 @@ + #include <netinet/icmp6.h> + #endif + ++#if defined(__GLIBC__) + #ifdef HAVE_NETINET_IF_ETHER_H + #include <netinet/if_ether.h> + #endif ++#endif + + #endif /* __TINC_SYSTEM_H__ */ diff --git a/package/tinc/patches/patch-src_linux_device_c b/package/tinc/patches/patch-src_linux_device_c deleted file mode 100644 index 9a5c09059..000000000 --- a/package/tinc/patches/patch-src_linux_device_c +++ /dev/null @@ -1,20 +0,0 @@ ---- tinc-1.0.11.orig/src/linux/device.c 2009-09-27 12:27:54.000000000 +0200 -+++ tinc-1.0.11/src/linux/device.c 2009-12-06 02:30:32.000000000 +0100 -@@ -61,7 +61,7 @@ bool setup_device(void) { - if (netname != NULL) - iface = xstrdup(netname); - #else -- iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device); -+ iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device); - #endif - device_fd = open(device, O_RDWR | O_NONBLOCK); - -@@ -105,7 +105,7 @@ bool setup_device(void) { - device_type = DEVICE_TYPE_ETHERTAP; - if(iface) - free(iface); -- iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device); -+ iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device); - } - - logger(LOG_INFO, "%s is a %s", device, device_info); diff --git a/package/vnc-reflector/Makefile b/package/vnc-reflector/Makefile index 33b54fcd5..3be33a3a7 100644 --- a/package/vnc-reflector/Makefile +++ b/package/vnc-reflector/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= vnc-reflector PKG_VERSION:= 1.2.4 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= c3f88bc62f228b335c25c07f9744ab0c PKG_DESCR:= specialized VNC server which acts as a proxy PKG_SECTION:= proxy diff --git a/package/vnc-reflector/patches/patch-actions_c b/package/vnc-reflector/patches/patch-actions_c new file mode 100644 index 000000000..afce6980c --- /dev/null +++ b/package/vnc-reflector/patches/patch-actions_c @@ -0,0 +1,10 @@ +--- vnc_reflector.orig/actions.c 2003-04-21 19:20:35.000000000 +0200 ++++ vnc_reflector/actions.c 2013-12-31 17:43:24.000000000 +0100 +@@ -18,6 +18,7 @@ + #include <string.h> + #include <stdlib.h> + #include <unistd.h> ++#include <sys/types.h> + + #include "rfblib.h" + #include "reflector.h" diff --git a/package/vnc-reflector/patches/patch-active_c b/package/vnc-reflector/patches/patch-active_c new file mode 100644 index 000000000..b8385de9e --- /dev/null +++ b/package/vnc-reflector/patches/patch-active_c @@ -0,0 +1,10 @@ +--- vnc_reflector.orig/active.c 2003-04-21 19:20:35.000000000 +0200 ++++ vnc_reflector/active.c 2013-12-31 17:44:10.000000000 +0100 +@@ -18,6 +18,7 @@ + #include <string.h> + #include <stdlib.h> + #include <unistd.h> ++#include <sys/types.h> + + #include "rfblib.h" + #include "reflector.h" diff --git a/package/vnc-reflector/patches/patch-region_c b/package/vnc-reflector/patches/patch-region_c new file mode 100644 index 000000000..4aa2d4c60 --- /dev/null +++ b/package/vnc-reflector/patches/patch-region_c @@ -0,0 +1,10 @@ +--- vnc_reflector.orig/region.c 2002-09-21 14:43:01.000000000 +0200 ++++ vnc_reflector/region.c 2013-12-31 17:45:02.000000000 +0100 +@@ -73,6 +73,7 @@ SOFTWARE. + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <sys/types.h> + + /* Get definitions for CARD16 etc. */ + #include "rfblib.h" diff --git a/package/wifidog/Makefile b/package/wifidog/Makefile index 2b38090af..5971eadc6 100644 --- a/package/wifidog/Makefile +++ b/package/wifidog/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= wifidog PKG_VERSION:= 1.1.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= abe5f7123179a0f08c493ce59fb3cb31 PKG_DESCR:= a complete and embeddable captive portal PKG_SECTION:= wifi diff --git a/package/wifidog/patches/patch-libhttpd_api_c b/package/wifidog/patches/patch-libhttpd_api_c index db790195b..6c76235fb 100644 --- a/package/wifidog/patches/patch-libhttpd_api_c +++ b/package/wifidog/patches/patch-libhttpd_api_c @@ -1,6 +1,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- wifidog-1.1.5.orig/libhttpd/api.c 2007-11-01 21:04:20.000000000 +0100 -+++ wifidog-1.1.5/libhttpd/api.c 2008-10-16 13:15:26.000000000 +0200 ++++ wifidog-1.1.5/libhttpd/api.c 2014-01-01 16:20:22.000000000 +0100 @@ -166,7 +166,7 @@ int httpdAddVariable(request *r, char *n while(*name == ' ' || *name == '\t') name++; @@ -173,7 +173,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ newEntry->name = NULL; newEntry->type = HTTP_WILDCARD; newEntry->indexFlag = HTTP_FALSE; -@@ -755,7 +755,7 @@ int httpdAddCContent(server, dir, name, +@@ -755,7 +755,7 @@ int httpdAddCContent(server, dir, name, newEntry = malloc(sizeof(httpContent)); if (newEntry == NULL) return(-1); @@ -200,7 +200,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ newEntry->name = strdup(name); newEntry->type = HTTP_STATIC; newEntry->indexFlag = indexFlag; -@@ -946,7 +946,7 @@ void httpdProcessRequest(httpd *server, +@@ -946,7 +946,7 @@ void httpdProcessRequest(httpd *server, r->response.responseLength = 0; strncpy(dirName, httpdRequestPath(r), HTTP_MAX_URL); diff --git a/package/wifidog/patches/patch-libhttpd_ip_acl_c b/package/wifidog/patches/patch-libhttpd_ip_acl_c index 932855b5d..95642f2b6 100644 --- a/package/wifidog/patches/patch-libhttpd_ip_acl_c +++ b/package/wifidog/patches/patch-libhttpd_ip_acl_c @@ -1,7 +1,17 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- wifidog-1.1.5.orig/libhttpd/ip_acl.c 2007-03-12 20:37:06.000000000 +0100 -+++ wifidog-1.1.5/libhttpd/ip_acl.c 2008-10-16 13:12:15.000000000 +0200 -@@ -52,22 +52,22 @@ static int scanCidr(val, result, length) ++++ wifidog-1.1.5/libhttpd/ip_acl.c 2014-01-01 16:34:21.000000000 +0100 +@@ -44,30 +44,30 @@ + + static int scanCidr(val, result, length) + char *val; +- u_int *result, ++ unsigned int *result, + *length; + { +- u_int res, res1, res2, res3, res4, res5; ++ unsigned int res, res1, res2, res3, res4, res5; + char *cp; cp = val; res1 = atoi(cp); diff --git a/package/wifidog/patches/patch-libhttpd_protocol_c b/package/wifidog/patches/patch-libhttpd_protocol_c index 767337dd6..6770fc729 100644 --- a/package/wifidog/patches/patch-libhttpd_protocol_c +++ b/package/wifidog/patches/patch-libhttpd_protocol_c @@ -1,7 +1,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- wifidog-1.1.5.orig/libhttpd/protocol.c 2007-11-01 21:04:20.000000000 +0100 -+++ wifidog-1.1.5/libhttpd/protocol.c 2008-10-16 13:12:58.000000000 +0200 -@@ -83,7 +83,7 @@ int _httpd_readChar(request *r, char *cp ++++ wifidog-1.1.5/libhttpd/protocol.c 2014-01-01 16:29:50.000000000 +0100 +@@ -22,6 +22,7 @@ + #include <stdlib.h> + #include <string.h> + #include <ctype.h> ++#include <fcntl.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <time.h> +@@ -83,7 +84,7 @@ int _httpd_readChar(request *r, char *cp { if (r->readBufRemain == 0) { @@ -10,7 +18,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ r->readBufRemain = _httpd_net_read(r->clientSock, r->readBuf, HTTP_READ_BUF_LEN); if (r->readBufRemain < 1) -@@ -352,7 +352,7 @@ void _httpd_storeData(request *r, char * +@@ -352,7 +353,7 @@ void _httpd_storeData(request *r, char * cp = query; cp2 = var; @@ -19,7 +27,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ val = NULL; while(*cp) { -@@ -483,7 +483,7 @@ httpDir *_httpd_findContentDir(server, d +@@ -483,7 +484,7 @@ httpDir *_httpd_findContentDir(server, d if (createFlag == HTTP_TRUE) { curChild = malloc(sizeof(httpDir)); @@ -28,7 +36,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ curChild->name = strdup(curDir); curChild->next = curItem->children; curItem->children = curChild; -@@ -606,7 +606,7 @@ void _httpd_sendFile(httpd *server, requ +@@ -606,7 +607,7 @@ void _httpd_sendFile(httpd *server, requ char *suffix; struct stat sbuf; @@ -37,7 +45,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ if (suffix != NULL) { if (strcasecmp(suffix,".gif") == 0) -@@ -699,7 +699,7 @@ char *_httpd_escape(str) +@@ -699,7 +700,7 @@ char *_httpd_escape(str) if (!ACCEPTABLE((unsigned char)*p)) unacceptable +=2; result = (char *) malloc(p-str + unacceptable + 1); diff --git a/package/wifidog/patches/patch-src_client_list_c b/package/wifidog/patches/patch-src_client_list_c new file mode 100644 index 000000000..ac78a1af6 --- /dev/null +++ b/package/wifidog/patches/patch-src_client_list_c @@ -0,0 +1,11 @@ +--- wifidog-1.1.5.orig/src/client_list.c 2007-03-12 20:36:41.000000000 +0100 ++++ wifidog-1.1.5/src/client_list.c 2014-01-01 17:02:32.000000000 +0100 +@@ -35,7 +35,7 @@ + #include <pthread.h> + #include <sys/wait.h> + #include <sys/types.h> +-#include <sys/unistd.h> ++#include <unistd.h> + + #include <string.h> + diff --git a/package/wifidog/patches/patch-src_firewall_c b/package/wifidog/patches/patch-src_firewall_c new file mode 100644 index 000000000..0ebe0457c --- /dev/null +++ b/package/wifidog/patches/patch-src_firewall_c @@ -0,0 +1,11 @@ +--- wifidog-1.1.5.orig/src/firewall.c 2007-11-01 21:04:20.000000000 +0100 ++++ wifidog-1.1.5/src/firewall.c 2014-01-01 16:47:55.000000000 +0100 +@@ -37,7 +37,7 @@ + #include <pthread.h> + #include <sys/wait.h> + #include <sys/types.h> +-#include <sys/unistd.h> ++#include <unistd.h> + + #include <string.h> + diff --git a/package/wifidog/patches/patch-src_util_c b/package/wifidog/patches/patch-src_util_c new file mode 100644 index 000000000..c4c26926f --- /dev/null +++ b/package/wifidog/patches/patch-src_util_c @@ -0,0 +1,11 @@ +--- wifidog-1.1.5.orig/src/util.c 2007-11-01 21:04:20.000000000 +0100 ++++ wifidog-1.1.5/src/util.c 2014-01-01 17:11:39.000000000 +0100 +@@ -37,7 +37,7 @@ + #include <pthread.h> + #include <sys/wait.h> + #include <sys/types.h> +-#include <sys/unistd.h> ++#include <unistd.h> + #include <netinet/in.h> + #include <sys/ioctl.h> + diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index 42fd4efba..ceb1f82e1 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -15,7 +15,7 @@ PKG_URL:= http://oss.sgi.com/projects/xfs PKG_SITES:= ftp://oss.sgi.com/projects/xfs/cmd_tars/ \ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/ -PKG_LIBC_DEPENDS:= eglibc glibc musl +PKG_LIBC_DEPENDS:= eglibc glibc PKG_TARGET_DEPENDS:= !atmel-ngw100 include ${TOPDIR}/mk/package.mk |