From d095aec6ce9898c422e86df46195e3410eb1f163 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 12 Dec 2013 18:48:14 +0100 Subject: new mdev fix --- package/base-files/Makefile | 2 +- package/base-files/src/etc/mdev.conf | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 5c5329a9a..cae7b1009 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 61 +PKG_RELEASE:= 62 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host diff --git a/package/base-files/src/etc/mdev.conf b/package/base-files/src/etc/mdev.conf index 4cc06251a..fc63d80d9 100644 --- a/package/base-files/src/etc/mdev.conf +++ b/package/base-files/src/etc/mdev.conf @@ -10,11 +10,9 @@ rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc device-mapper 0:0 660 @test -d /dev/mapper || mkdir /dev/mapper tun 0:0 660 >net/tun fb0 root:video 660 -audio root:audio 660 >snd/audio -dsp root:audio 660 >snd/dsp -timer root:audio 660 >snd/timer -controlC0 root:audio 660 >snd/controlC0 -pcmC0D0c root:audio 660 >snd/pcmC0D0c -pcmC0D0p root:audio 660 >snd/pcmC0D0p +snd/timer root:audio 660 +snd/controlC0 root:audio 660 +snd/pcmC0D0c root:audio 660 +snd/pcmC0D0p root:audio 660 msr0 root:root 660 @(mkdir -p /dev/cpu/0 && ln -sf /dev/msr0 /dev/cpu/0/msr) .* 0:0 644 @/lib/mdev/init -- cgit v1.2.3 From bde68f551d953927d476dc4f5ccd1c89ca001539 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 20 Dec 2013 18:41:05 +0100 Subject: remove qemu vars from vars.mk --- mk/qemu.mk | 34 ++++++++++++++++++++++++++++++++++ mk/vars.mk | 3 +-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 mk/qemu.mk diff --git a/mk/qemu.mk b/mk/qemu.mk new file mode 100644 index 000000000..f6151eeda --- /dev/null +++ b/mk/qemu.mk @@ -0,0 +1,34 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +ifeq ($(CPU_ARCH),arm) +QEMU:= qemu-arm +endif +ifeq ($(CPU_ARCH),mipsel) +QEMU:= qemu-mipsel +endif +ifeq ($(CPU_ARCH),mips64el) +QEMU:= qemu-mipsel +endif +ifeq ($(CPU_ARCH),mips) +QEMU:= qemu-mips +endif +ifeq ($(CPU_ARCH),mips64) +QEMU:= qemu-mips +endif +ifeq ($(CPU_ARCH),ppc) +QEMU:= qemu-ppc +endif +ifeq ($(CPU_ARCH),i486) +QEMU:= qemu-i386 +endif +ifeq ($(CPU_ARCH),i586) +QEMU:= qemu-i386 +endif +ifeq ($(CPU_ARCH),i686) +QEMU:= qemu-i386 +endif +ifeq ($(CPU_ARCH),x86_64) +QEMU:= qemu-x86_64 +endif + diff --git a/mk/vars.mk b/mk/vars.mk index 50e02a204..9af012dd2 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -155,8 +155,7 @@ HOST_CONFIGURE_OPTS= CC_FOR_BUILD='${CC_FOR_BUILD}' \ CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \ CXX_FOR_BUILD='${CXX_FOR_BUILD}' \ CFLAGS_FOR_BUILD='${CFLAGS_FOR_BUILD}' \ - LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}' \ - QEMU='$(QEMU)' + LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}' PKG_SUFFIX:= $(strip $(subst ",, $(ADK_PACKAGE_SUFFIX))) -- cgit v1.2.3 From 8a9ac05d747444358820c8d2da604904fad1271e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 21 Dec 2013 12:54:11 +0100 Subject: fix build, with a patch from sabotage --- package/DirectFB/Makefile | 2 +- .../patches/patch-lib_direct_os_linux_glibc_system_c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 package/DirectFB/patches/patch-lib_direct_os_linux_glibc_system_c diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile index 3c58d34a0..41da96f05 100644 --- a/package/DirectFB/Makefile +++ b/package/DirectFB/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= DirectFB PKG_VERSION:= 1.6.3 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_EXTRAVER:= 1.6-0 PKG_MD5SUM:= 641e8e999c017770da647f9b5b890906 PKG_DESCR:= Thin graphic library for the Linux framebuffer devices diff --git a/package/DirectFB/patches/patch-lib_direct_os_linux_glibc_system_c b/package/DirectFB/patches/patch-lib_direct_os_linux_glibc_system_c new file mode 100644 index 000000000..cd781b4c6 --- /dev/null +++ b/package/DirectFB/patches/patch-lib_direct_os_linux_glibc_system_c @@ -0,0 +1,19 @@ +--- DirectFB-1.6.3.orig/lib/direct/os/linux/glibc/system.c 2013-01-18 15:57:11.000000000 +0100 ++++ DirectFB-1.6.3/lib/direct/os/linux/glibc/system.c 2013-12-21 12:48:06.000000000 +0100 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #include + +@@ -107,7 +108,7 @@ direct_tgkill( int tgid, int tid, int si + void + direct_trap( const char *domain, int sig ) + { +- sigval_t val; ++ union sigval val; + + D_LOG( Direct_Trap, VERBOSE, "Raising signal %d from %s...\n", sig, domain ); + -- cgit v1.2.3 From bf74f495c3da7b24ff1c580f0653f1664ea5fd32 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 21 Dec 2013 13:38:32 +0100 Subject: fix musl compile, update to latest git version --- package/libcli/Makefile | 8 ++++---- package/libcli/patches/patch-Makefile | 30 ++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/package/libcli/Makefile b/package/libcli/Makefile index 9b105cca8..d4fe39ca3 100755 --- a/package/libcli/Makefile +++ b/package/libcli/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libcli -PKG_VERSION:= 1.9.4 +PKG_VERSION:= 1.9.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= b917617d21b90db214971efe64a33416 +PKG_MD5SUM:= 1b07b09e2840f910defde66afa28fbe7 PKG_DESCR:= Cisco-like command-line interface library PKG_SECTION:= libs -PKG_URL:= http://code.google.com/p/libcli -PKG_SITES:= http://libcli.googlecode.com/files/ +PKG_URL:= http://sites.dparrish.com/libcli +PKG_SITES:= https://github.com/dparrish/libcli PKG_OPTS:= dev include ${TOPDIR}/mk/package.mk diff --git a/package/libcli/patches/patch-Makefile b/package/libcli/patches/patch-Makefile index 03c26c349..8ec1b0f04 100644 --- a/package/libcli/patches/patch-Makefile +++ b/package/libcli/patches/patch-Makefile @@ -1,21 +1,35 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libcli-1.9.4.orig/Makefile 2008-10-09 04:38:01.000000000 +0200 -+++ libcli-1.9.4/Makefile 2009-05-29 17:42:04.310095050 +0200 -@@ -1,15 +1,12 @@ +--- libcli-1.9.7.orig/Makefile 2013-12-21 13:33:31.000000000 +0100 ++++ libcli-1.9.7/Makefile 2013-12-21 13:37:09.000000000 +0100 +@@ -1,6 +1,5 @@ +-UNAME = $(shell sh -c 'uname -s 2>/dev/null || echo not') DESTDIR = -PREFIX = /usr/local +PREFIX = /usr MAJOR = 1 MINOR = 9 - REVISION = 3 +@@ -8,21 +7,15 @@ REVISION = 7 LIB = libcli.so + LIB_STATIC = libcli.a -CC = gcc +-AR = ar ++CC ?= gcc ++AR ?= ar + ARFLAGS = rcs -DEBUG = -g -OPTIM = -O3 --CFLAGS += $(DEBUG) $(OPTIM) -Wall -Wformat-security -Wno-format-zero-length -+CFLAGS += -Wall -Wformat-security -Wno-format-zero-length - LDFLAGS += -shared -Wl,-soname,$(LIB).$(MAJOR).$(MINOR) +-CFLAGS += $(DEBUG) $(OPTIM) -Wall -std=c99 -pedantic -Wformat-security -Wno-format-zero-length -Werror -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wsign-compare -Wcast-align -Wno-unused-parameter ++CFLAGS += -Wall -std=c99 -pedantic -Wformat-security -Wno-format-zero-length -Werror -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wsign-compare -Wcast-align -Wno-unused-parameter + LDFLAGS += -shared LIBPATH += -L. + +-ifeq ($(UNAME),Darwin) +-LDFLAGS += -Wl,-install_name,$(LIB).$(MAJOR).$(MINOR) +-else + LDFLAGS += -Wl,-soname,$(LIB).$(MAJOR).$(MINOR) LIBS = -lcrypt +-endif + + all: $(LIB) $(LIB_STATIC) clitest + -- cgit v1.2.3 From 56f75860814b12a5a1d4b2bb69938e69e81258e0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 21 Dec 2013 14:24:33 +0100 Subject: fix musl compile --- package/l2tpns/Makefile | 2 +- package/l2tpns/patches/patch-cli_c | 10 ++++++++++ package/l2tpns/patches/patch-cluster_c | 10 ++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 package/l2tpns/patches/patch-cli_c create mode 100644 package/l2tpns/patches/patch-cluster_c diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile index d48ec3ee5..e0efe45ad 100644 --- a/package/l2tpns/Makefile +++ b/package/l2tpns/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= l2tpns PKG_VERSION:= 2.1.21 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 385c58055723ebc6c38062acd2db9c2c PKG_DESCR:= A layer 2 tunneling protocol network server (LNS) PKG_SECTION:= net/security diff --git a/package/l2tpns/patches/patch-cli_c b/package/l2tpns/patches/patch-cli_c new file mode 100644 index 000000000..c98c5cfea --- /dev/null +++ b/package/l2tpns/patches/patch-cli_c @@ -0,0 +1,10 @@ +--- l2tpns-2.1.21.orig/cli.c 2005-12-06 10:43:42.000000000 +0100 ++++ l2tpns-2.1.21/cli.c 2013-12-21 14:10:49.000000000 +0100 +@@ -4,6 +4,7 @@ + char const *cvs_name = "$Name: release_2_1_21 $"; + char const *cvs_id_cli = "$Id: cli.c,v 1.71 2005/12/06 09:43:42 bodea Exp $"; + ++#include + #include + #include + #include diff --git a/package/l2tpns/patches/patch-cluster_c b/package/l2tpns/patches/patch-cluster_c new file mode 100644 index 000000000..606ef3062 --- /dev/null +++ b/package/l2tpns/patches/patch-cluster_c @@ -0,0 +1,10 @@ +--- l2tpns-2.1.21.orig/cluster.c 2006-12-02 15:09:14.000000000 +0100 ++++ l2tpns-2.1.21/cluster.c 2013-12-21 14:23:14.000000000 +0100 +@@ -2,6 +2,7 @@ + + char const *cvs_id_cluster = "$Id: cluster.c,v 1.50.2.1 2006/12/02 14:09:14 bodea Exp $"; + ++#include + #include + #include + #include -- cgit v1.2.3 From 9b31cdb293b6de006fab96e037a8e174e6e5b8d4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 21 Dec 2013 14:34:18 +0100 Subject: include the correct header file --- package/l2tpns/Makefile | 2 +- package/l2tpns/patches/patch-cli_c | 4 ++-- package/l2tpns/patches/patch-cluster_c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile index e0efe45ad..073e142a2 100644 --- a/package/l2tpns/Makefile +++ b/package/l2tpns/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= l2tpns PKG_VERSION:= 2.1.21 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 385c58055723ebc6c38062acd2db9c2c PKG_DESCR:= A layer 2 tunneling protocol network server (LNS) PKG_SECTION:= net/security diff --git a/package/l2tpns/patches/patch-cli_c b/package/l2tpns/patches/patch-cli_c index c98c5cfea..e076bde4b 100644 --- a/package/l2tpns/patches/patch-cli_c +++ b/package/l2tpns/patches/patch-cli_c @@ -1,10 +1,10 @@ --- l2tpns-2.1.21.orig/cli.c 2005-12-06 10:43:42.000000000 +0100 -+++ l2tpns-2.1.21/cli.c 2013-12-21 14:10:49.000000000 +0100 ++++ l2tpns-2.1.21/cli.c 2013-12-21 14:33:08.000000000 +0100 @@ -4,6 +4,7 @@ char const *cvs_name = "$Name: release_2_1_21 $"; char const *cvs_id_cli = "$Id: cli.c,v 1.71 2005/12/06 09:43:42 bodea Exp $"; -+#include ++#include #include #include #include diff --git a/package/l2tpns/patches/patch-cluster_c b/package/l2tpns/patches/patch-cluster_c index 606ef3062..68f8ba6b3 100644 --- a/package/l2tpns/patches/patch-cluster_c +++ b/package/l2tpns/patches/patch-cluster_c @@ -1,10 +1,10 @@ --- l2tpns-2.1.21.orig/cluster.c 2006-12-02 15:09:14.000000000 +0100 -+++ l2tpns-2.1.21/cluster.c 2013-12-21 14:23:14.000000000 +0100 ++++ l2tpns-2.1.21/cluster.c 2013-12-21 14:33:19.000000000 +0100 @@ -2,6 +2,7 @@ char const *cvs_id_cluster = "$Id: cluster.c,v 1.50.2.1 2006/12/02 14:09:14 bodea Exp $"; -+#include ++#include #include #include #include -- cgit v1.2.3 From 9a8bf6232fb0ca6a4388efa00ab8cafa6a1cd63e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 21 Dec 2013 15:04:30 +0100 Subject: fix musl compile, ipfw is not used on linux --- package/daq/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/daq/Makefile b/package/daq/Makefile index 7e5c05c00..d0276e49d 100644 --- a/package/daq/Makefile +++ b/package/daq/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= daq PKG_VERSION:= 2.0.0 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= a00855a153647df76d47f1ea454f74ae PKG_DESCR:= daq PKG_SECTION:= libs @@ -21,6 +21,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,DAQ,daq,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ARGS+= --disable-ipfw-module daq-install: $(INSTALL_DIR) $(IDIR_DAQ)/usr/lib/daq -- cgit v1.2.3 From 414cf52c44c7caf09565c9286b9326ac8ac63428 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 21 Dec 2013 15:24:43 +0100 Subject: update to latest upstream version, fix musl compile, add patch from alpinelinux --- package/libnet/Makefile | 6 ++--- .../libnet/patches/patch-src_libnet_link_linux_c | 30 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 package/libnet/patches/patch-src_libnet_link_linux_c diff --git a/package/libnet/Makefile b/package/libnet/Makefile index b1cee13d9..2f765cc71 100644 --- a/package/libnet/Makefile +++ b/package/libnet/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libnet -PKG_VERSION:= 1.1.5 -PKG_RELEASE:= 3 -PKG_MD5SUM:= a9bc1d75a610efcfee200d3e28d8eb8f +PKG_VERSION:= 1.1.6 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 710296fe424a49344e5fcc0d09e53317 PKG_DESCR:= a low-level packet creation library PKG_SECTION:= libs PKG_DEPENDS:= libpcap diff --git a/package/libnet/patches/patch-src_libnet_link_linux_c b/package/libnet/patches/patch-src_libnet_link_linux_c new file mode 100644 index 000000000..565aae510 --- /dev/null +++ b/package/libnet/patches/patch-src_libnet_link_linux_c @@ -0,0 +1,30 @@ +* from alpinelinux +--- libnet-1.1.6.orig/src/libnet_link_linux.c 2012-03-19 17:59:50.000000000 +0100 ++++ libnet-1.1.6/src/libnet_link_linux.c 2013-12-21 15:19:01.000000000 +0100 +@@ -30,26 +30,15 @@ + #include + + #include +-#if (__GLIBC__) + #include + #include +-#else +-#include +-#include +-#endif + + #if (HAVE_PACKET_SOCKET) + #ifndef SOL_PACKET + #define SOL_PACKET 263 + #endif /* SOL_PACKET */ +-#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 + #include + #include /* the L2 protocols */ +-#else +-#include +-#include +-#include /* The L2 protocols */ +-#endif + #endif /* HAVE_PACKET_SOCKET */ + + #include "../include/libnet.h" -- cgit v1.2.3 From ca463b87887d8151b83d222dc35d461991c1dd63 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 21 Dec 2013 21:37:59 +0100 Subject: another musl fix round --- mk/pkg-bottom.mk | 2 +- package/bluez/Makefile | 39 ++------ package/bluez/patches/patch-Makefile_am | 10 ++ package/bluez/patches/patch-Makefile_in | 11 +++ package/bluez/patches/patch-plugins_wiimote_c | 10 ++ .../bluez/patches/patch-profiles_network_bnep_c | 10 ++ package/bluez/patches/patch-tools_bccmd_c | 8 +- package/bluez/patches/patch-tools_csr_usb_c | 10 ++ package/bluez/patches/patch-tools_hciattach_c | 8 +- package/bluez/patches/patch-tools_hciconfig_c | 10 ++ package/bluez/patches/patch-unit_test-sdp_c | 15 +++ package/gperf/Makefile | 6 ++ package/kmod/patches/patch-libkmod_libkmod-util_c | 24 +++++ package/libgcrypt/Makefile | 12 ++- package/pam/Makefile | 11 ++- package/pam/patches/patch-Makefile_in | 24 ----- package/pam/patches/patch-conf_Makefile_in | 11 --- package/pam/patches/patch-configure | 15 ++- package/pam/patches/patch-modules_Makefile_in | 11 +++ .../patches/patch-modules_pam_group_pam_group_c | 19 ++-- .../patch-modules_pam_lastlog_pam_lastlog_c | 21 ++++ .../patch-modules_pam_succeed_if_pam_succeed_if_c | 47 ++------- .../pam/patches/patch-modules_pam_time_pam_time_c | 15 +-- .../patches/patch-modules_pam_timestamp_hmacfile | 107 --------------------- .../patches/patch-modules_pam_unix_pam_unix_acct_c | 10 -- package/systemd/Makefile | 2 +- 26 files changed, 212 insertions(+), 256 deletions(-) create mode 100644 package/bluez/patches/patch-Makefile_am create mode 100644 package/bluez/patches/patch-Makefile_in create mode 100644 package/bluez/patches/patch-plugins_wiimote_c create mode 100644 package/bluez/patches/patch-profiles_network_bnep_c create mode 100644 package/bluez/patches/patch-tools_csr_usb_c create mode 100644 package/bluez/patches/patch-tools_hciconfig_c create mode 100644 package/bluez/patches/patch-unit_test-sdp_c create mode 100644 package/kmod/patches/patch-libkmod_libkmod-util_c delete mode 100644 package/pam/patches/patch-Makefile_in delete mode 100644 package/pam/patches/patch-conf_Makefile_in create mode 100644 package/pam/patches/patch-modules_Makefile_in create mode 100644 package/pam/patches/patch-modules_pam_lastlog_pam_lastlog_c delete mode 100644 package/pam/patches/patch-modules_pam_timestamp_hmacfile delete mode 100644 package/pam/patches/patch-modules_pam_unix_pam_unix_acct_c diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 0358c0382..dd8e81c41 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -180,7 +180,7 @@ ifneq (,$(filter dev,${PKG_OPTS})) done endif @-cd ${WRKINST}; \ - if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" ];then \ + if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" -a "${PKG_NAME}" != "pam" ];then \ find lib \( -name lib\*.so\* -o -name lib\*.a \) \ -exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \ ' fix this!' >&2 \; -quit 2>/dev/null; fi;\ diff --git a/package/bluez/Makefile b/package/bluez/Makefile index d8a0b540f..ae89d6852 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -4,47 +4,34 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bluez -PKG_VERSION:= 4.101 -PKG_RELEASE:= 2 -PKG_MD5SUM:= fb42cb7038c380eb0e2fa208987c96ad +PKG_VERSION:= 5.12 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 981b34c2ae7e2ed2e25a167d8a902a25 PKG_DESCR:= bluetooth applications PKG_SECTION:= bluetooth -PKG_DEPENDS:= kmod-bt libbluetooth +PKG_DEPENDS:= kmod-bt glib dbus libreadline +PKG_BUILDDEP:= autotool glib dbus readline PKG_URL:= http://www.bluez.org/ PKG_SITES:= http://mirror.anl.gov/pub/linux/bluetooth/ -PKG_LIBNAME:= libbluetooth PKG_OPTS:= dev -PKG_SUBPKGS:= BLUEZ LIBBLUETOOTH -PKGSC_LIBBLUETOOTH:= libs -PKGSD_LIBBLUETOOTH:= bluetooth libraries -PKGSS_LIBBLUETOOTH:= glib libusb dbus libusb-compat -PKGSB_LIBBLUETOOTH:= glib libusb dbus libusb-compat - PKG_ARCH_DEPENDS:= !avr32 -ifeq ($(ADK_STATIC),y) -PKG_OPTS+= libmix -endif - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBBLUETOOTH,libbluetooth,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBBLUETOOTH},${PKGSD_LIBBLUETOOTH},${PKGSC_LIBBLUETOOTH},${PKG_OPTS})) +AUTOTOOL_STYLE:= autoreconf ifeq ($(ADK_STATIC),y) XAKE_FLAGS+= CCLD="$(TARGET_CC) -all-static -pthread" endif TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) +TARGET_LDFLAGS+= -lncurses CONFIGURE_ENV+= ac_cv_prog_cc_pie=no CONFIGURE_ARGS+= --enable-tools \ - --enable-alsa \ - --enable-usb \ - --enable-bccmd \ - --enable-hidd \ - --enable-pand \ - --enable-dund \ - --enable-netlink \ + --disable-udev \ + --disable-systemd \ + --disable-obex \ --disable-pie \ --disable-cups @@ -52,16 +39,10 @@ bluez-install: ${INSTALL_DIR} $(IDIR_BLUEZ)/etc/dbus-1/system.d ${INSTALL_DIR} ${IDIR_BLUEZ}/usr/bin ${CP} ${WRKINST}/usr/bin/* ${IDIR_BLUEZ}/usr/bin - ${INSTALL_DIR} ${IDIR_BLUEZ}/usr/sbin - ${CP} ${WRKINST}/usr/sbin/* ${IDIR_BLUEZ}/usr/sbin ${INSTALL_DIR} ${IDIR_BLUEZ}/etc/bluetooth $(INSTALL_DATA) ./files/main.conf \ ${IDIR_BLUEZ}/etc/bluetooth $(INSTALL_DATA) ./files/bluetooth.conf \ $(IDIR_BLUEZ)/etc/dbus-1/system.d -libbluetooth-install: - ${INSTALL_DIR} ${IDIR_LIBBLUETOOTH}/usr/lib - ${CP} ${WRKINST}/usr/lib/libbluetooth.so* ${IDIR_LIBBLUETOOTH}/usr/lib - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/bluez/patches/patch-Makefile_am b/package/bluez/patches/patch-Makefile_am new file mode 100644 index 000000000..ab4c015af --- /dev/null +++ b/package/bluez/patches/patch-Makefile_am @@ -0,0 +1,10 @@ +--- bluez-5.12.orig/Makefile.am 2013-12-10 07:59:06.000000000 +0100 ++++ bluez-5.12/Makefile.am 2013-12-21 20:18:52.000000000 +0100 +@@ -245,6 +245,7 @@ unit_tests += unit/test-sdp + + unit_test_sdp_SOURCES = unit/test-sdp.c \ + src/shared/util.h src/shared/util.c \ ++ src/log.h src/log.c \ + src/sdpd.h src/sdpd-database.c \ + src/sdpd-service.c src/sdpd-request.c + unit_test_sdp_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@ diff --git a/package/bluez/patches/patch-Makefile_in b/package/bluez/patches/patch-Makefile_in new file mode 100644 index 000000000..d1abdecec --- /dev/null +++ b/package/bluez/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- bluez-5.12.orig/Makefile.in 2013-12-10 07:59:32.000000000 +0100 ++++ bluez-5.12/Makefile.in 2013-12-21 20:02:59.000000000 +0100 +@@ -157,7 +157,7 @@ DIST_COMMON = README $(am__configure_dep + @ANDROID_TRUE@ android/bluetoothd android/haltest + @ANDROID_TRUE@am__append_30 = android/libhal-internal.la + @HID2HCI_TRUE@am__append_31 = $(rules_DATA) +-TESTS = $(am__EXEEXT_8) ++TESTS = + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ diff --git a/package/bluez/patches/patch-plugins_wiimote_c b/package/bluez/patches/patch-plugins_wiimote_c new file mode 100644 index 000000000..30ba5e647 --- /dev/null +++ b/package/bluez/patches/patch-plugins_wiimote_c @@ -0,0 +1,10 @@ +--- bluez-5.12.orig/plugins/wiimote.c 2013-12-10 07:59:06.000000000 +0100 ++++ bluez-5.12/plugins/wiimote.c 2013-12-21 19:29:22.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + + #include ++#include + #include + + #include "plugin.h" diff --git a/package/bluez/patches/patch-profiles_network_bnep_c b/package/bluez/patches/patch-profiles_network_bnep_c new file mode 100644 index 000000000..5423f4e45 --- /dev/null +++ b/package/bluez/patches/patch-profiles_network_bnep_c @@ -0,0 +1,10 @@ +--- bluez-5.12.orig/profiles/network/bnep.c 2013-12-10 07:59:06.000000000 +0100 ++++ bluez-5.12/profiles/network/bnep.c 2013-12-21 19:31:52.000000000 +0100 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/package/bluez/patches/patch-tools_bccmd_c b/package/bluez/patches/patch-tools_bccmd_c index 8278a834c..d9ac8ac35 100644 --- a/package/bluez/patches/patch-tools_bccmd_c +++ b/package/bluez/patches/patch-tools_bccmd_c @@ -1,6 +1,6 @@ ---- bluez-4.92.orig/tools/bccmd.c 2010-11-30 15:50:48.000000000 +0100 -+++ bluez-4.92/tools/bccmd.c 2011-05-17 18:19:30.856601139 +0200 -@@ -1183,6 +1183,7 @@ int main(int argc, char *argv[]) +--- bluez-5.12.orig/tools/bccmd.c 2013-09-16 10:36:07.000000000 +0200 ++++ bluez-5.12/tools/bccmd.c 2013-12-21 19:19:21.000000000 +0100 +@@ -1159,6 +1159,7 @@ int main(int argc, char *argv[]) case 115200: bcsp_rate = B115200; break; case 230400: bcsp_rate = B230400; break; case 460800: bcsp_rate = B460800; break; @@ -8,7 +8,7 @@ case 500000: bcsp_rate = B500000; break; case 576000: bcsp_rate = B576000; break; case 921600: bcsp_rate = B921600; break; -@@ -1202,6 +1203,7 @@ int main(int argc, char *argv[]) +@@ -1178,6 +1179,7 @@ int main(int argc, char *argv[]) #ifdef B4000000 case 4000000: bcsp_rate = B4000000; break; #endif diff --git a/package/bluez/patches/patch-tools_csr_usb_c b/package/bluez/patches/patch-tools_csr_usb_c new file mode 100644 index 000000000..509061b56 --- /dev/null +++ b/package/bluez/patches/patch-tools_csr_usb_c @@ -0,0 +1,10 @@ +--- bluez-5.12.orig/tools/csr_usb.c 2013-09-16 10:36:07.000000000 +0200 ++++ bluez-5.12/tools/csr_usb.c 2013-12-21 19:22:48.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/package/bluez/patches/patch-tools_hciattach_c b/package/bluez/patches/patch-tools_hciattach_c index 45c8e2e7f..1021bb9f1 100644 --- a/package/bluez/patches/patch-tools_hciattach_c +++ b/package/bluez/patches/patch-tools_hciattach_c @@ -1,6 +1,6 @@ ---- bluez-4.92.orig/tools/hciattach.c 2010-11-30 15:50:48.000000000 +0100 -+++ bluez-4.92/tools/hciattach.c 2011-05-17 18:18:20.776610031 +0200 -@@ -107,6 +107,7 @@ static int uart_speed(int s) +--- bluez-5.12.orig/tools/hciattach.c 2012-12-24 18:46:55.000000000 +0100 ++++ bluez-5.12/tools/hciattach.c 2013-12-21 19:19:21.000000000 +0100 +@@ -101,6 +101,7 @@ static int uart_speed(int s) return B230400; case 460800: return B460800; @@ -8,7 +8,7 @@ case 500000: return B500000; case 576000: -@@ -137,6 +138,7 @@ static int uart_speed(int s) +@@ -135,6 +136,7 @@ static int uart_speed(int s) case 4000000: return B4000000; #endif diff --git a/package/bluez/patches/patch-tools_hciconfig_c b/package/bluez/patches/patch-tools_hciconfig_c new file mode 100644 index 000000000..6e137449c --- /dev/null +++ b/package/bluez/patches/patch-tools_hciconfig_c @@ -0,0 +1,10 @@ +--- bluez-5.12.orig/tools/hciconfig.c 2013-10-15 15:41:07.000000000 +0200 ++++ bluez-5.12/tools/hciconfig.c 2013-12-21 19:26:45.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/package/bluez/patches/patch-unit_test-sdp_c b/package/bluez/patches/patch-unit_test-sdp_c new file mode 100644 index 000000000..355300b79 --- /dev/null +++ b/package/bluez/patches/patch-unit_test-sdp_c @@ -0,0 +1,15 @@ +--- bluez-5.12.orig/unit/test-sdp.c 2013-10-15 15:41:07.000000000 +0200 ++++ bluez-5.12/unit/test-sdp.c 2013-12-21 20:23:50.000000000 +0100 +@@ -128,12 +128,6 @@ static void sdp_debug(const char *str, v + g_print("%s%s\n", prefix, str); + } + +-void btd_debug(const char *format, ...); +- +-void btd_debug(const char *format, ...) +-{ +-} +- + static void context_quit(struct context *context) + { + g_main_loop_quit(context->main_loop); diff --git a/package/gperf/Makefile b/package/gperf/Makefile index 567613f8d..cfc0aa2f5 100644 --- a/package/gperf/Makefile +++ b/package/gperf/Makefile @@ -9,16 +9,22 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= c1f1db32fb6598d6a93e6e88796a8632 PKG_DESCR:= perfect hash function generator PKG_SECTION:= lang +PKG_BUILDDEP:= gperf-host PKG_DEPENDS:= libstdc++ PKG_URL:= http://www.gnu.org/software/gperf/ PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/} +include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk +$(eval $(call HOST_template,GPERF,gperf,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,GPERF,gperf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +HOST_STYLE:= auto + gperf-install: ${INSTALL_DIR} ${IDIR_GPERF}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/gperf ${IDIR_GPERF}/usr/bin +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/kmod/patches/patch-libkmod_libkmod-util_c b/package/kmod/patches/patch-libkmod_libkmod-util_c new file mode 100644 index 000000000..330fce456 --- /dev/null +++ b/package/kmod/patches/patch-libkmod_libkmod-util_c @@ -0,0 +1,24 @@ +--- kmod-15.orig/libkmod/libkmod-util.c 2013-07-15 17:45:31.000000000 +0200 ++++ kmod-15/libkmod/libkmod-util.c 2013-12-21 18:02:49.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + #include "libkmod.h" +@@ -323,8 +324,12 @@ static inline int is_dir(const char *pat + int mkdir_p(const char *path, int len, mode_t mode) + { + char *start, *end; ++ char buf[PATH_MAX+1]; + +- start = strndupa(path, len); ++ snprintf(buf, sizeof buf, "%s", path); ++ assert(len < sizeof(buf)); ++ buf[len] = 0; ++ start = buf; + end = start + len; + + /* diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index 189b82cce..0f0f4f051 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libgcrypt PKG_VERSION:= 1.5.0 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 78f8f8bec4580f75b25816f7896d0389 PKG_DESCR:= GNU crypto library PKG_SECTION:= libs @@ -22,13 +22,15 @@ $(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE},${P CONFIGURE_ARGS+= --disable-asm \ --with-gpg-error-prefix="${STAGING_TARGET_DIR}/usr" -libgcrypt-install: - ${INSTALL_DIR} ${IDIR_LIBGCRYPT}/usr/lib - ${CP} ${WRKINST}/usr/lib/libgcrypt.so* \ - ${IDIR_LIBGCRYPT}/usr/lib +post-install: # provides own automake macros ${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/share/aclocal ${CP} ${WRKINST}//usr/share/aclocal/libgcrypt.m4 \ ${STAGING_HOST_DIR}/usr/share/aclocal +libgcrypt-install: + ${INSTALL_DIR} ${IDIR_LIBGCRYPT}/usr/lib + ${CP} ${WRKINST}/usr/lib/libgcrypt.so* \ + ${IDIR_LIBGCRYPT}/usr/lib + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pam/Makefile b/package/pam/Makefile index c9a15a4b5..20db87238 100644 --- a/package/pam/Makefile +++ b/package/pam/Makefile @@ -4,13 +4,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:= pam -PKG_VERSION:= 1.1.4 -PKG_RELEASE:= 2 -PKG_MD5SUM:= ff8f3c4382b78ac211e11bcd56ab17bf +PKG_VERSION:= 1.1.8 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 5107bbf54042400b6200e8367cc7feef PKG_DESCR:= Pluggable Authentication Modules PKG_BUILDDEP:= flex PKG_SECTION:= misc -PKG_SITES:= http://openadk.org/distfiles/ +PKG_URL:= http://www.linux-pam.org/ +PKG_SITES:= http://www.linux-pam.org/library/ PKG_OPTS:= dev DISTFILES:= Linux-PAM-$(PKG_VERSION).tar.gz @@ -20,7 +21,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PAM,pam,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -XAKE_FLAGS+= GCC_HONOUR_COPTS=s +#XAKE_FLAGS+= GCC_HONOUR_COPTS=s CONFIGURE_ARGS+= --disable-nis \ --enable-db=no diff --git a/package/pam/patches/patch-Makefile_in b/package/pam/patches/patch-Makefile_in deleted file mode 100644 index 12574da06..000000000 --- a/package/pam/patches/patch-Makefile_in +++ /dev/null @@ -1,24 +0,0 @@ ---- Linux-PAM-1.1.4.orig/Makefile.in 2011-06-24 12:48:16.000000000 +0200 -+++ Linux-PAM-1.1.4/Makefile.in 2011-10-07 11:42:21.000000000 +0200 -@@ -75,8 +75,8 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re - distclean-recursive maintainer-clean-recursive - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc \ -- examples xtests -+DIST_SUBDIRS = libpam tests libpamc libpam_misc modules po conf \ -+ examples - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) -@@ -258,8 +258,8 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news --@STATIC_MODULES_FALSE@SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests --@STATIC_MODULES_TRUE@SUBDIRS = modules libpam libpamc libpam_misc tests po conf doc examples xtests -+@STATIC_MODULES_FALSE@SUBDIRS = libpam tests libpamc libpam_misc modules po conf examples -+@STATIC_MODULES_TRUE@SUBDIRS = modules libpam libpamc libpam_misc tests po conf examples - CLEANFILES = *~ - M4_FILES = m4/gettext.m4 m4/iconv.m4 m4/intlmacosx.m4 \ - m4/japhar_grep_cflags.m4 m4/jh_path_xml_catalog.m4 \ diff --git a/package/pam/patches/patch-conf_Makefile_in b/package/pam/patches/patch-conf_Makefile_in deleted file mode 100644 index b4a0d7afb..000000000 --- a/package/pam/patches/patch-conf_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- Linux-PAM-1.1.4.orig/conf/Makefile.in 2011-06-24 12:48:02.000000000 +0200 -+++ Linux-PAM-1.1.4/conf/Makefile.in 2011-10-07 11:32:37.000000000 +0200 -@@ -236,7 +236,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = pam_conv1 -+SUBDIRS = - CLEANFILES = *~ - EXTRA_DIST = install_conf md5itall pam.conf - all: all-recursive diff --git a/package/pam/patches/patch-configure b/package/pam/patches/patch-configure index 728ff6492..50e967fd8 100644 --- a/package/pam/patches/patch-configure +++ b/package/pam/patches/patch-configure @@ -1,6 +1,6 @@ ---- Linux-PAM-1.1.4.orig/configure 2011-06-24 12:48:18.000000000 +0200 -+++ Linux-PAM-1.1.4/configure 2011-10-12 14:51:42.323559002 +0200 -@@ -2766,8 +2766,6 @@ then +--- Linux-PAM-1.1.8.orig/configure 2013-09-19 10:01:32.000000000 +0200 ++++ Linux-PAM-1.1.8/configure 2013-12-21 18:40:31.000000000 +0100 +@@ -10718,8 +10718,6 @@ then if test ${libdir} = '${exec_prefix}/lib' then case "`uname -m`" in @@ -9,3 +9,12 @@ *) libdir="/lib" ;; esac +@@ -13299,7 +13297,7 @@ $as_echo "$ac_cv_search_crypt" >&6; } + ac_res=$ac_cv_search_crypt + if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +- LIBCRYPT="-l$ac_lib" ++ LIBCRYPT="" + else + LIBCRYPT="" + fi diff --git a/package/pam/patches/patch-modules_Makefile_in b/package/pam/patches/patch-modules_Makefile_in new file mode 100644 index 000000000..4185b299e --- /dev/null +++ b/package/pam/patches/patch-modules_Makefile_in @@ -0,0 +1,11 @@ +--- Linux-PAM-1.1.8.orig/modules/Makefile.in 2013-09-19 10:01:33.000000000 +0200 ++++ Linux-PAM-1.1.8/modules/Makefile.in 2013-12-21 18:45:07.000000000 +0100 +@@ -274,7 +274,7 @@ SUBDIRS = pam_access pam_cracklib pam_de + pam_group pam_issue pam_keyinit pam_lastlog pam_limits \ + pam_listfile pam_localuser pam_loginuid pam_mail \ + pam_mkhomedir pam_motd pam_namespace pam_nologin \ +- pam_permit pam_pwhistory pam_rhosts pam_rootok pam_securetty \ ++ pam_permit pam_pwhistory pam_rootok pam_securetty \ + pam_selinux pam_sepermit pam_shells pam_stress \ + pam_succeed_if pam_tally pam_tally2 pam_time pam_timestamp \ + pam_tty_audit pam_umask \ diff --git a/package/pam/patches/patch-modules_pam_group_pam_group_c b/package/pam/patches/patch-modules_pam_group_pam_group_c index 40c1897d2..bbf25bcfd 100644 --- a/package/pam/patches/patch-modules_pam_group_pam_group_c +++ b/package/pam/patches/patch-modules_pam_group_pam_group_c @@ -1,12 +1,17 @@ ---- Linux-PAM-1.1.4.orig/modules/pam_group/pam_group.c 2011-06-21 11:04:56.000000000 +0200 -+++ Linux-PAM-1.1.4/modules/pam_group/pam_group.c 2011-10-12 14:31:55.693559001 +0200 -@@ -656,7 +656,8 @@ static int check_account(pam_handle_t *p +--- Linux-PAM-1.1.8.orig/modules/pam_group/pam_group.c 2013-06-18 16:11:21.000000000 +0200 ++++ Linux-PAM-1.1.8/modules/pam_group/pam_group.c 2013-12-21 18:30:19.000000000 +0100 +@@ -655,10 +655,13 @@ static int check_account(pam_handle_t *p + continue; } /* If buffer starts with @, we are using netgroups */ ++#ifdef HAVE_INNETGR if (buffer[0] == '@') -- good &= innetgr (&buffer[1], NULL, user, NULL); -+ pam_syslog(pamh, LOG_ERR, "%s: no netgroup supported by C library", PAM_GROUP_CONF); -+ //good &= innetgr (&buffer[1], NULL, user, NULL); + good &= innetgr (&buffer[1], NULL, user, NULL); /* otherwise, if the buffer starts with %, it's a UNIX group */ - else if (buffer[0] == '%') +- else if (buffer[0] == '%') ++ else ++#endif ++ if (buffer[0] == '%') good &= pam_modutil_user_in_group_nam_nam(pamh, user, &buffer[1]); + else + good &= logic_field(pamh,user, buffer, count, is_same); diff --git a/package/pam/patches/patch-modules_pam_lastlog_pam_lastlog_c b/package/pam/patches/patch-modules_pam_lastlog_pam_lastlog_c new file mode 100644 index 000000000..b20bd413d --- /dev/null +++ b/package/pam/patches/patch-modules_pam_lastlog_pam_lastlog_c @@ -0,0 +1,21 @@ +--- Linux-PAM-1.1.8.orig/modules/pam_lastlog/pam_lastlog.c 2013-06-18 16:11:21.000000000 +0200 ++++ Linux-PAM-1.1.8/modules/pam_lastlog/pam_lastlog.c 2013-12-21 18:34:07.000000000 +0100 +@@ -10,6 +10,7 @@ + + #include "config.h" + ++#include + #include + #include + #include +@@ -50,6 +51,10 @@ struct lastlog { + # define _PATH_BTMP "/var/log/btmp" + #endif + ++#ifndef __GLIBC__ ++#define logwtmp(args...) ++#endif ++ + /* XXX - time before ignoring lock. Is 1 sec enough? */ + #define LASTLOG_IGNORE_LOCK_TIME 1 + diff --git a/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c b/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c index 63f82cc4b..93a79ebda 100644 --- a/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c +++ b/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c @@ -1,52 +1,23 @@ ---- Linux-PAM-1.1.4.orig/modules/pam_succeed_if/pam_succeed_if.c 2011-06-21 11:04:56.000000000 +0200 -+++ Linux-PAM-1.1.4/modules/pam_succeed_if/pam_succeed_if.c 2012-07-31 12:02:24.000000000 +0200 -@@ -230,6 +230,7 @@ evaluate_notingroup(pam_handle_t *pamh, - return PAM_AUTH_ERR; - } - /* Return PAM_SUCCESS if the (host,user) is in the netgroup. */ -+/* +--- Linux-PAM-1.1.8.orig/modules/pam_succeed_if/pam_succeed_if.c 2013-06-18 16:11:21.000000000 +0200 ++++ Linux-PAM-1.1.8/modules/pam_succeed_if/pam_succeed_if.c 2013-12-21 18:30:19.000000000 +0100 +@@ -233,16 +233,20 @@ evaluate_notingroup(pam_handle_t *pamh, static int evaluate_innetgr(const char *host, const char *user, const char *group) { -@@ -237,7 +238,9 @@ evaluate_innetgr(const char *host, const ++#ifdef HAVE_INNETGR + if (innetgr(group, host, user, NULL) == 1) return PAM_SUCCESS; ++#endif return PAM_AUTH_ERR; } -+*/ /* Return PAM_SUCCESS if the (host,user) is NOT in the netgroup. */ -+/* static int evaluate_notinnetgr(const char *host, const char *user, const char *group) { -@@ -245,6 +248,7 @@ evaluate_notinnetgr(const char *host, co ++#ifdef HAVE_INNETGR + if (innetgr(group, host, user, NULL) == 0) return PAM_SUCCESS; ++#endif return PAM_AUTH_ERR; } -+*/ - /* Match a triple. */ - static int -@@ -357,19 +361,23 @@ evaluate(pam_handle_t *pamh, int debug, - return evaluate_notingroup(pamh, user, right); - } - /* (Rhost, user) is in this netgroup. */ -+ /* - if (strcasecmp(qual, "innetgr") == 0) { - const void *rhost; - if (pam_get_item(pamh, PAM_RHOST, &rhost) != PAM_SUCCESS) - rhost = NULL; - return evaluate_innetgr(rhost, user, right); - } -+ */ - /* (Rhost, user) is not in this group. */ -+ /* - if (strcasecmp(qual, "notinnetgr") == 0) { - const void *rhost; - if (pam_get_item(pamh, PAM_RHOST, &rhost) != PAM_SUCCESS) - rhost = NULL; - return evaluate_notinnetgr(rhost, user, right); - } -+ */ - /* Fail closed. */ - return PAM_SERVICE_ERR; - } diff --git a/package/pam/patches/patch-modules_pam_time_pam_time_c b/package/pam/patches/patch-modules_pam_time_pam_time_c index e44b2f489..b8670e562 100644 --- a/package/pam/patches/patch-modules_pam_time_pam_time_c +++ b/package/pam/patches/patch-modules_pam_time_pam_time_c @@ -1,13 +1,14 @@ ---- Linux-PAM-1.1.4.orig/modules/pam_time/pam_time.c 2011-06-21 11:04:56.000000000 +0200 -+++ Linux-PAM-1.1.4/modules/pam_time/pam_time.c 2012-07-31 12:02:24.000000000 +0200 -@@ -555,7 +555,9 @@ check_account(pam_handle_t *pamh, const +--- Linux-PAM-1.1.8.orig/modules/pam_time/pam_time.c 2013-06-18 16:11:21.000000000 +0200 ++++ Linux-PAM-1.1.8/modules/pam_time/pam_time.c 2013-12-21 18:30:19.000000000 +0100 +@@ -554,9 +554,11 @@ check_account(pam_handle_t *pamh, const + continue; } /* If buffer starts with @, we are using netgroups */ ++#ifdef HAVE_INNETGR if (buffer[0] == '@') -- good &= innetgr (&buffer[1], NULL, user, NULL); -+ //good &= innetgr (&buffer[1], NULL, user, NULL); -+ pam_syslog(pamh, LOG_ERR, -+ "%s: no netgroup support in C library", PAM_TIME_CONF); + good &= innetgr (&buffer[1], NULL, user, NULL); else ++#endif good &= logic_field(pamh, user, buffer, count, is_same); D(("with user: %s", good ? "passes":"fails" )); + diff --git a/package/pam/patches/patch-modules_pam_timestamp_hmacfile b/package/pam/patches/patch-modules_pam_timestamp_hmacfile deleted file mode 100644 index 5cc35d24e..000000000 --- a/package/pam/patches/patch-modules_pam_timestamp_hmacfile +++ /dev/null @@ -1,107 +0,0 @@ ---- Linux-PAM-1.1.4.orig/modules/pam_timestamp/hmacfile 2011-06-21 11:37:55.000000000 +0200 -+++ Linux-PAM-1.1.4/modules/pam_timestamp/hmacfile 2012-07-31 12:03:27.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /bin/sh -+#! /bin/bash - - # hmacfile - temporary wrapper script for .libs/hmacfile - # Generated by ltmain.sh (GNU libtool) 2.2.6 -@@ -11,7 +11,7 @@ - - # Sed substitution that helps us do robust quoting. It backslashifies - # metacharacters that are still active within double-quoted strings. --Xsed='/bin/sed -e 1s/^X//' -+Xsed='/Volumes/adk/openadk/scripts/sed -e 1s/^X//' - sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - - # Be Bourne compatible -@@ -32,13 +32,13 @@ DUALCASE=1; export DUALCASE # for MKS sh - # if CDPATH is set. - (unset CDPATH) >/dev/null 2>&1 && unset CDPATH - --relink_command="" -+relink_command="(cd /Volumes/adk/openadk/build_qemu_i686_eglibc/w-pam-1.1.4-2/Linux-PAM-1.1.4/modules/pam_timestamp; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=/Volumes/adk/openadk/scripts:/Volumes/adk/openadk/bin/tools:/Volumes/adk/openadk/host_i686_eglibc/bin:/Volumes/adk/openadk/host_i686_eglibc/usr/bin:/Volumes/adk/openadk/target_i686_eglibc/scripts:/opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/MacGPG2/bin:/usr/X11/bin; export PATH; /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -I../../libpam/include -I../../libpamc/include -march=i686 -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wstrict-prototypes -Wwrite-strings -Winline -Wshadow -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -o \$progdir/\$file hmacfile.o hmacsha1.o sha1.o -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/build_qemu_i686_eglibc/w-pam-1.1.4-2/Linux-PAM-1.1.4/libpam /Volumes/adk/openadk/build_qemu_i686_eglibc/w-pam-1.1.4-2/Linux-PAM-1.1.4/libpam/.libs/libpam.so -ldl -Wl,-rpath -Wl,/Volumes/adk/openadk/build_qemu_i686_eglibc/w-pam-1.1.4-2/Linux-PAM-1.1.4/libpam/.libs)" - - # This environment variable determines our operation mode. - if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then - # install mode needs the following variables: - generated_by_libtool_version='2.2.6' -- notinst_deplibs=' /data/git/Linux-PAM/libpam/libpam.la' -+ notinst_deplibs=' /Volumes/adk/openadk/build_qemu_i686_eglibc/w-pam-1.1.4-2/Linux-PAM-1.1.4/libpam/libpam.la' - else - # When we are sourced in execute mode, $file and $ECHO are already set. - if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then -@@ -53,7 +53,7 @@ else - : - else - # Restart under the correct shell, and then maybe $ECHO will work. -- exec /bin/sh "$0" --no-reexec ${1+"$@"} -+ exec /bin/bash "$0" --no-reexec ${1+"$@"} - fi - fi - -@@ -62,7 +62,7 @@ else - test "x$thisdir" = "x$file" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. -- file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'` -+ file=`ls -ld "$file" | /Volumes/adk/openadk/scripts/sed -n 's/.*-> //p'` - while test -n "$file"; do - destdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'` - -@@ -75,7 +75,7 @@ else - fi - - file=`$ECHO "X$file" | $Xsed -e 's%^.*/%%'` -- file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'` -+ file=`ls -ld "$thisdir/$file" | /Volumes/adk/openadk/scripts/sed -n 's/.*-> //p'` - done - - -@@ -98,20 +98,38 @@ else - absdir=`cd "$thisdir" && pwd` - test -n "$absdir" && thisdir="$absdir" - -- program='hmacfile' -+ program=lt-'hmacfile' - progdir="$thisdir/.libs" - -+ if test ! -f "$progdir/$program" || -+ { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /Volumes/adk/openadk/scripts/sed 1q`; \ -+ test "X$file" != "X$progdir/$program"; }; then - -- if test -f "$progdir/$program"; then -- # Add our own library path to LD_LIBRARY_PATH -- LD_LIBRARY_PATH="/data/git/Linux-PAM/libpam/.libs:$LD_LIBRARY_PATH" -+ file="$$-$program" - -- # Some systems cannot cope with colon-terminated LD_LIBRARY_PATH -- # The second colon is a workaround for a bug in BeOS R4 sed -- LD_LIBRARY_PATH=`$ECHO "X$LD_LIBRARY_PATH" | $Xsed -e 's/::*$//'` -+ if test ! -d "$progdir"; then -+ mkdir "$progdir" -+ else -+ rm -f "$progdir/$file" -+ fi - -- export LD_LIBRARY_PATH -+ # relink executable if necessary -+ if test -n "$relink_command"; then -+ if relink_command_output=`eval $relink_command 2>&1`; then : -+ else -+ echo "$relink_command_output" >&2 -+ rm -f "$progdir/$file" -+ exit 1 -+ fi -+ fi -+ -+ mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null || -+ { rm -f "$progdir/$program"; -+ mv -f "$progdir/$file" "$progdir/$program"; } -+ rm -f "$progdir/$file" -+ fi - -+ if test -f "$progdir/$program"; then - if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then - # Run the actual program with our arguments. - diff --git a/package/pam/patches/patch-modules_pam_unix_pam_unix_acct_c b/package/pam/patches/patch-modules_pam_unix_pam_unix_acct_c deleted file mode 100644 index 2ce448f1a..000000000 --- a/package/pam/patches/patch-modules_pam_unix_pam_unix_acct_c +++ /dev/null @@ -1,10 +0,0 @@ ---- Linux-PAM-1.1.4.orig/modules/pam_unix/pam_unix_acct.c 2011-06-21 11:04:56.000000000 +0200 -+++ Linux-PAM-1.1.4/modules/pam_unix/pam_unix_acct.c 2012-07-31 13:08:58.000000000 +0200 -@@ -47,6 +47,7 @@ - #include /* for time() */ - #include - #include -+#include - - #include - diff --git a/package/systemd/Makefile b/package/systemd/Makefile index 030515f28..f9fd6e624 100644 --- a/package/systemd/Makefile +++ b/package/systemd/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= System and Service Manager PKG_SECTION:= utils PKG_DEPENDS:= libblkid libcap PKG_BUILDDEP:= autotool usbutils glib kmod util-linux libcap -PKG_BUILDDEP+= libgcrypt +PKG_BUILDDEP+= libgcrypt gperf-host PKG_URL:= http://freedesktop.org/wiki/Software/systemd/ PKG_SITES:= http://www.freedesktop.org/software/systemd/ PKG_LIBNAME:= libudev -- cgit v1.2.3 From 3538066907a0ce9b3f357d7eded0c725314525da Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Dec 2013 09:10:52 +0100 Subject: fix pam compile --- package/pam/Makefile | 2 +- package/pam/patches/patch-configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pam/Makefile b/package/pam/Makefile index 20db87238..a326655e8 100644 --- a/package/pam/Makefile +++ b/package/pam/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= pam PKG_VERSION:= 1.1.8 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 5107bbf54042400b6200e8367cc7feef PKG_DESCR:= Pluggable Authentication Modules PKG_BUILDDEP:= flex diff --git a/package/pam/patches/patch-configure b/package/pam/patches/patch-configure index 50e967fd8..63e03cf5d 100644 --- a/package/pam/patches/patch-configure +++ b/package/pam/patches/patch-configure @@ -14,7 +14,7 @@ if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - LIBCRYPT="-l$ac_lib" -+ LIBCRYPT="" ++ LIBCRYPT="-lcrypt" else LIBCRYPT="" fi -- cgit v1.2.3 From 38e17878401ef8bec46bc3eba1733e9c3d4293bc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Dec 2013 09:57:45 +0100 Subject: rework bluetooth apps, move to misc,disable broken ones, after bluez5 update --- package/bluez-firmware/Makefile | 2 +- package/bluez/Makefile | 2 +- package/miax/Makefile | 6 +++--- package/miax/patches/01-cross.patch | 6 +++--- package/obexftp/Makefile | 8 ++++---- package/obexftp/patches/patch-obexftp_client_c | 11 +++++++++++ package/openobex/Makefile | 3 +-- package/section.lst | 1 - package/ussp-push/Makefile | 3 ++- 9 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 package/obexftp/patches/patch-obexftp_client_c diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile index a04cec163..45e1eff73 100644 --- a/package/bluez-firmware/Makefile +++ b/package/bluez-firmware/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 1cc3cefad872e937e05de5a0a2b390dd PKG_DESCR:= Bluez firmware for BCM2033 -PKG_SECTION:= bluetooth +PKG_SECTION:= misc PKG_DEPENDS:= kmod-bt bluez PKG_URL:= http://www.bluez.org/ PKG_SITES:= http://bluez.sourceforge.net/download/ diff --git a/package/bluez/Makefile b/package/bluez/Makefile index ae89d6852..e86eac36a 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 5.12 PKG_RELEASE:= 1 PKG_MD5SUM:= 981b34c2ae7e2ed2e25a167d8a902a25 PKG_DESCR:= bluetooth applications -PKG_SECTION:= bluetooth +PKG_SECTION:= misc PKG_DEPENDS:= kmod-bt glib dbus libreadline PKG_BUILDDEP:= autotool glib dbus readline PKG_URL:= http://www.bluez.org/ diff --git a/package/miax/Makefile b/package/miax/Makefile index 581909511..bd7c9de30 100644 --- a/package/miax/Makefile +++ b/package/miax/Makefile @@ -8,11 +8,11 @@ PKG_VERSION:= 1.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 44f0d2ef46ee2697d890b7b96846adc7 PKG_DESCR:= A console iax (asterisk) client -PKG_SECTION:= bluetooth -PKG_DEPENDS:= kmod-bt bluez libpthread -PKG_BUILDDEP:= bluez +PKG_SECTION:= misc +PKG_DEPENDS:= libpthread PKG_URL:= http://sourceforge.net/projects/miax PKG_SITES:= http://mesh.dl.sourceforge.net/sourceforge/miax/ +PKG_CFLINE_MIAX:= depends on ADK_BROKEN PKG_ARCH_DEPENDS:= !avr32 diff --git a/package/miax/patches/01-cross.patch b/package/miax/patches/01-cross.patch index f47c1101d..04ec04d78 100644 --- a/package/miax/patches/01-cross.patch +++ b/package/miax/patches/01-cross.patch @@ -1,6 +1,6 @@ diff -ruN miax-1.4-old/Makefile miax-1.4-new/Makefile ---- miax-1.4-old/Makefile 2005-04-27 18:56:13.000000000 +0200 -+++ miax-1.4-new/Makefile 2005-11-30 01:07:21.000000000 +0100 +--- miax.orig/Makefile 2005-04-27 18:56:13.000000000 +0200 ++++ miax/Makefile 2013-12-22 09:48:41.000000000 +0100 @@ -1,4 +1,5 @@ -CFLAGS= -Iiax/ -Igsm/inc -DIAXC_IAX2 -DLIBIAX -g -DPOSIXSLEEP -DLINUX -O2 +OFLAGS= -02 -g @@ -8,7 +8,7 @@ diff -ruN miax-1.4-old/Makefile miax-1.4-new/Makefile SYSLIBS=-lpthread -lm -lbluetooth -@@ -32,11 +33,10 @@ +@@ -32,11 +33,10 @@ OBJS=\ miax.o all: $(OBJS) diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile index e70519cc6..828d73871 100644 --- a/package/obexftp/Makefile +++ b/package/obexftp/Makefile @@ -7,9 +7,9 @@ PKG_NAME:= obexftp PKG_VERSION:= 0.23 PKG_RELEASE:= 4 PKG_MD5SUM:= f20762061b68bc921e80be4aebc349eb -PKG_DESCR:= bluetooth ftp application -PKG_SECTION:= bluetooth -PKG_DEPENDS:= openobex libobexftp libbluetooth +PKG_DESCR:= OBEX ftp application +PKG_SECTION:= misc +PKG_DEPENDS:= openobex libobexftp PKG_BUILDDEP:= openobex libiconv-tiny PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=openobex/} @@ -39,7 +39,7 @@ endif CONFIGURE_ENV+= OPENOBEX_CFLAGS="-I${STAGING_TARGET_DIR}/usr/include" \ OPENOBEX_LIBS="-L${STAGING_TARGET_DIR}/usr/lib \ - -lopenobex -lbluetooth -liconv" + -lopenobex -liconv" CONFIGURE_ARGS+= --disable-perl \ --disable-ruby \ --disable-tcl \ diff --git a/package/obexftp/patches/patch-obexftp_client_c b/package/obexftp/patches/patch-obexftp_client_c new file mode 100644 index 000000000..f4c90143b --- /dev/null +++ b/package/obexftp/patches/patch-obexftp_client_c @@ -0,0 +1,11 @@ +--- obexftp-0.23.orig/obexftp/client.c 2009-02-17 19:27:48.000000000 +0100 ++++ obexftp-0.23/obexftp/client.c 2013-12-22 09:35:39.000000000 +0100 +@@ -51,8 +51,6 @@ + + #ifdef HAVE_BLUETOOTH + #include "bt_kit.h" +-#else +-#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT + #endif /* HAVE_BLUETOOTH */ + + #include diff --git a/package/openobex/Makefile b/package/openobex/Makefile index e4e95e93f..d0091fe5c 100644 --- a/package/openobex/Makefile +++ b/package/openobex/Makefile @@ -8,8 +8,7 @@ PKG_VERSION:= 1.5 PKG_RELEASE:= 2 PKG_MD5SUM:= 0d83dc86445a46a1b9750107ba7ab65c PKG_DESCR:= implementation of the Object Exchange (OBEX) protocol -PKG_SECTION:= bluetooth -PKG_BUILDDEP:= bluez +PKG_SECTION:= misc PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/WikiStart PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/} PKG_OPTS:= dev diff --git a/package/section.lst b/package/section.lst index b4aa58f3b..795840988 100644 --- a/package/section.lst +++ b/package/section.lst @@ -1,5 +1,4 @@ base Base System -bluetooth Bluetooth browser Browser / Editor / Pager editor Browser / Editor / Pager pager Browser / Editor / Pager diff --git a/package/ussp-push/Makefile b/package/ussp-push/Makefile index 85cde1233..a0302f016 100644 --- a/package/ussp-push/Makefile +++ b/package/ussp-push/Makefile @@ -8,10 +8,11 @@ PKG_VERSION:= 0.11 PKG_RELEASE:= 1 PKG_MD5SUM:= 5c44983ee27809867041feff6bb4423a PKG_DESCR:= OBEX push command -PKG_SECTION:= bluetooth +PKG_SECTION:= misc PKG_DEPENDS:= openobex PKG_BUILDDEP:= openobex PKG_SITES:= http://xmailserver.org/ +PKG_CFLINE_USSP_PUSH:= depends on ADK_BROKEN PKG_ARCH_DEPENDS:= !avr32 -- cgit v1.2.3 From 9abdf6510c2026bd095f39d8d0e23f9c351597d2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Dec 2013 10:10:21 +0100 Subject: fix musl compile --- package/tptest/Makefile | 2 +- package/tptest/patches/patch-apps_unix_server_server_c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 package/tptest/patches/patch-apps_unix_server_server_c diff --git a/package/tptest/Makefile b/package/tptest/Makefile index 68ae6741b..4d6e1e1e8 100644 --- a/package/tptest/Makefile +++ b/package/tptest/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= tptest PKG_VERSION:= 3.1.7 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 46f941bdab738a2a11ecc2a5f757ec77 PKG_DESCR:= Internet bandwidth tester PKG_SECTION:= net diff --git a/package/tptest/patches/patch-apps_unix_server_server_c b/package/tptest/patches/patch-apps_unix_server_server_c new file mode 100644 index 000000000..bdfbba5ac --- /dev/null +++ b/package/tptest/patches/patch-apps_unix_server_server_c @@ -0,0 +1,10 @@ +--- tptest-3.1.7.orig/apps/unix/server/server.c 2002-11-11 18:22:12.000000000 +0100 ++++ tptest-3.1.7/apps/unix/server/server.c 2013-12-22 10:08:55.000000000 +0100 +@@ -31,6 +31,7 @@ + */ + + ++#include + #include + #include + #include -- cgit v1.2.3 From 680045b01f466e4c14909d8101436b4e0c212580 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Dec 2013 10:32:36 +0100 Subject: disable for musl --- package/ether-wake/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/ether-wake/Makefile b/package/ether-wake/Makefile index cb8d8d6d2..1a60edee5 100644 --- a/package/ether-wake/Makefile +++ b/package/ether-wake/Makefile @@ -9,6 +9,8 @@ PKG_RELEASE:= 1 PKG_DESCR:= A Wake-On-LAN (WOL) client PKG_SECTION:= net +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk -- cgit v1.2.3 From b247e33b4c8eef9ef3b9ecd1d8f75b815f434cf3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Dec 2013 11:40:53 +0100 Subject: fix musl compile, update to latest upstream --- package/pptp/Makefile | 6 +++--- package/pptp/patches/patch-Makefile | 22 +++++++++------------- package/pptp/patches/patch-pptp_c | 11 +++++++++++ package/pptp/patches/patch-pqueue_c | 10 ++++++++++ 4 files changed, 33 insertions(+), 16 deletions(-) create mode 100644 package/pptp/patches/patch-pptp_c create mode 100644 package/pptp/patches/patch-pqueue_c diff --git a/package/pptp/Makefile b/package/pptp/Makefile index a2d6fb90a..feea59480 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pptp -PKG_VERSION:= 1.6.0 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 9a706327fb9827541d7c86d48ceb9631 +PKG_VERSION:= 1.8.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 4efce9f263e2c3f38d79d9df222476de PKG_DESCR:= a Point-to-Point Tunneling Protocol (PPTP) client PKG_SECTION:= ppp PKG_DEPENDS:= ppp kmod-net-ipgre diff --git a/package/pptp/patches/patch-Makefile b/package/pptp/patches/patch-Makefile index 1b7ad4a3d..f96b980fe 100644 --- a/package/pptp/patches/patch-Makefile +++ b/package/pptp/patches/patch-Makefile @@ -1,22 +1,18 @@ ---- pptp-1.6.0.orig/Makefile 2005-02-18 02:42:45.000000000 +0100 -+++ pptp-1.6.0/Makefile 2011-01-16 21:44:38.000000000 +0100 -@@ -11,14 +11,15 @@ BINDIR=$(DESTDIR)/usr/sbin +--- pptp-1.8.0.orig/Makefile 2013-10-23 10:10:46.000000000 +0200 ++++ pptp-1.8.0/Makefile 2013-12-22 11:35:12.000000000 +0100 +@@ -14,12 +14,13 @@ BINDIR=$(DESTDIR)/usr/sbin MANDIR=$(DESTDIR)/usr/share/man/man8 PPPDIR=$(DESTDIR)/etc/ppp -CC = gcc +CC ?= gcc RM = rm -f - OPTIMIZE= -O0 + OPTIMIZE= -O -Wuninitialized DEBUG = -g INCLUDE = -CFLAGS = -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE) --LIBS = -lutil --LDFLAGS = -+CPPFLAGS ?= -+CFLAGS ?= -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE) -+LIBS ?= -lutil -+LDFLAGS ?= - - PPTP_BIN = pptp - ++CFLAGS ?= ++CFLAGS += -Wall $(INCLUDE) + # Solaris + # CFLAGS += -D_XPG4_2 -D__EXTENSIONS__ + LIBS = -lutil diff --git a/package/pptp/patches/patch-pptp_c b/package/pptp/patches/patch-pptp_c new file mode 100644 index 000000000..7a4cfb520 --- /dev/null +++ b/package/pptp/patches/patch-pptp_c @@ -0,0 +1,11 @@ +--- pptp-1.8.0.orig/pptp.c 2013-10-23 10:10:46.000000000 +0200 ++++ pptp-1.8.0/pptp.c 2013-12-22 11:40:01.000000000 +0100 +@@ -447,7 +447,7 @@ struct in_addr get_ip_address(char *name + if (host == NULL) { + if (h_errno == HOST_NOT_FOUND) + fatal("gethostbyname '%s': HOST NOT FOUND", name); +- else if (h_errno == NO_ADDRESS) ++ else if (h_errno == NO_DATA) + fatal("gethostbyname '%s': NO IP ADDRESS", name); + else + fatal("gethostbyname '%s': name server error", name); diff --git a/package/pptp/patches/patch-pqueue_c b/package/pptp/patches/patch-pqueue_c new file mode 100644 index 000000000..477f7692b --- /dev/null +++ b/package/pptp/patches/patch-pqueue_c @@ -0,0 +1,10 @@ +--- pptp-1.8.0.orig/pqueue.c 2013-10-23 10:10:46.000000000 +0200 ++++ pptp-1.8.0/pqueue.c 2013-12-22 11:35:52.000000000 +0100 +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + + #include "util.h" // for log() + #include "pqueue.h" -- cgit v1.2.3 From d3d5bb7ed2a8d7d8bccb56638ad977d5d7947371 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Dec 2013 12:11:47 +0100 Subject: disable ppp for musl build --- package/gpm/Makefile | 6 +++--- package/ppp/Makefile | 2 ++ package/rp-pppoe/Makefile | 1 + package/ssltunnel/Makefile | 2 ++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/gpm/Makefile b/package/gpm/Makefile index e664facdd..888233345 100644 --- a/package/gpm/Makefile +++ b/package/gpm/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gpm -PKG_VERSION:= 1.20.6 -PKG_RELEASE:= 2 +PKG_VERSION:= 1.20.7 +PKG_RELEASE:= 1 PKG_MD5SUM:= b75e794bfb9fe8114d0b083932673b8f PKG_DESCR:= console mouse support PKG_SECTION:= misc PKG_URL:= http://launchpad.net/gpm -PKG_SITES:= http://launchpad.net/gpm/main/${PKG_VERSION}/+download/ +PKG_SITES:= http://www.nico.schottelius.org/software/gpm/archives/ PKG_NOPARALLEL:= 1 PKG_OPTS:= dev diff --git a/package/ppp/Makefile b/package/ppp/Makefile index b7aa99f20..2458c68f2 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -15,6 +15,8 @@ PKG_URL:= http://ppp.samba.org/ PKG_SITES:= ftp://ftp.samba.org/pub/ppp/ PKG_MULTI:= 1 +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + PKG_SUBPKGS:= PPP PPP_MOD_PPPOA PPP_MOD_PPPOE PPP_MOD_RADIUS PKG_SUBPKGS+= PPP_MOD_CHAT PPP_MOD_PPPDUMP PPP_MOD_PPPSTATS PPP_MOD_PPPUMTS PKGSS_PPP_MOD_PPPOE:= kmod-pppoe diff --git a/package/rp-pppoe/Makefile b/package/rp-pppoe/Makefile index 3c64eef20..75ed5fee9 100644 --- a/package/rp-pppoe/Makefile +++ b/package/rp-pppoe/Makefile @@ -13,6 +13,7 @@ PKG_DEPENDS:= ppp PKG_URL:= http://www.roaringpenguin.com/ PKG_SITES:= http://www.roaringpenguin.com/files/download/ +PKG_LIBC_DEPENDS:= uclibc eglibc glibc PKG_SUBPKGS:= PPPOE_CLIENT PPPOE_RELAY PPPOE_SERVER PPPOE_SNIFF WRKSRC= ${WRKDIST}/src diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile index 615d67ee0..770268518 100644 --- a/package/ssltunnel/Makefile +++ b/package/ssltunnel/Makefile @@ -13,6 +13,8 @@ PKG_DEPENDS:= libopenssl ppp PKG_BUILDDEP:= openssl ppp PKG_SITES:= http://www.hsc.fr/ressources/outils/ssltunnel/download/ +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SSLTUNNEL,ssltunnel,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -- cgit v1.2.3 From efb53809a4fad1c54e9e8f32b20f5a2bcdf0307a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Dec 2013 13:08:05 +0100 Subject: fix musl compile --- package/gpm/Makefile | 4 +++- package/gpm/patches/patch-Makefile_in | 11 ++++++++++ package/gpm/patches/patch-src_Makefile_in | 8 +++---- .../gpm/patches/patch-src_daemon_open_console_c | 19 ++++++++-------- .../gpm/patches/patch-src_prog_display-buttons_c | 10 +++++++++ .../gpm/patches/patch-src_prog_display-coords_c | 10 +++++++++ package/gpm/patches/patch-src_prog_gpm-root_y | 25 ++++++++++++++++++++++ 7 files changed, 72 insertions(+), 15 deletions(-) create mode 100644 package/gpm/patches/patch-Makefile_in create mode 100644 package/gpm/patches/patch-src_prog_display-buttons_c create mode 100644 package/gpm/patches/patch-src_prog_display-coords_c create mode 100644 package/gpm/patches/patch-src_prog_gpm-root_y diff --git a/package/gpm/Makefile b/package/gpm/Makefile index 888233345..8ea741164 100644 --- a/package/gpm/Makefile +++ b/package/gpm/Makefile