From a2ba45bfccc6f7523e4a9c2ed88a7ec79302a7d0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 18 Mar 2014 09:16:17 +0100
Subject: start getty/login when shell requested

---
 package/adk-test-tools/Makefile        | 2 +-
 package/adk-test-tools/files/test.init | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'package')

diff --git a/package/adk-test-tools/Makefile b/package/adk-test-tools/Makefile
index 0a60c5056..c92f0b378 100644
--- a/package/adk-test-tools/Makefile
+++ b/package/adk-test-tools/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		adk-test-tools
 PKG_VERSION:=		0.1
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_DESCR:=		helper tools and scripts for adk-test-framework
 PKG_SECTION:=		misc
 PKG_URL:=		http://openadk.org/
diff --git a/package/adk-test-tools/files/test.init b/package/adk-test-tools/files/test.init
index bb8fca527..bcff55c04 100755
--- a/package/adk-test-tools/files/test.init
+++ b/package/adk-test-tools/files/test.init
@@ -3,6 +3,11 @@
 #INIT 90
 [[ $1 = autostart ]] || exit 0
 echo "Starting test script ..."
+grep shell /proc/cmdline > /dev/null 2&>1
+if [ $? -eq 0 ];then
+	echo "Use user root and password linux123 to login. And quit to finish."
+	exit 0
+fi
 if [ -x /run.sh ];then
 	/run.sh
 	quit
-- 
cgit v1.2.3


From bd89c473ee1f9456d1a2ef0837a61429fccc1158 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 23 Mar 2014 16:00:17 +0100
Subject: use as login shell for job control

---
 package/base-files/files/inittab.shell | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package')

diff --git a/package/base-files/files/inittab.shell b/package/base-files/files/inittab.shell
index 55e5e429f..d12593ca1 100644
--- a/package/base-files/files/inittab.shell
+++ b/package/base-files/files/inittab.shell
@@ -1 +1 @@
-::askfirst:/bin/sh
+::askfirst:-/bin/sh
-- 
cgit v1.2.3


From dff91c4417d64c5c0dae75ec8cc51a8a5c5b709e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 23 Mar 2014 16:46:27 +0100
Subject: fix musl compile

---
 package/ebtables/Makefile               | 2 +-
 package/ebtables/patches/patch-Makefile | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'package')

diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index 59f2ea6ba..e39f58070 100644
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -21,7 +21,7 @@ $(eval $(call PKG_template,EBTABLES,ebtables,${PKG_VERSION}-${PKG_RELEASE},${PKG
 
 CONFIG_STYLE:=		manual
 
-post-install:
+ebtables-install:
 	${INSTALL_DIR} ${IDIR_EBTABLES}/etc
 	${INSTALL_DIR} ${IDIR_EBTABLES}/usr/sbin ${IDIR_EBTABLES}/usr/lib
 	${INSTALL_DATA} ${WRKINST}/etc/ethertypes ${IDIR_EBTABLES}/etc
diff --git a/package/ebtables/patches/patch-Makefile b/package/ebtables/patches/patch-Makefile
index ff5934a70..f4e293eaf 100644
--- a/package/ebtables/patches/patch-Makefile
+++ b/package/ebtables/patches/patch-Makefile
@@ -1,6 +1,6 @@
---- ebtables-v2.0.10-3.orig/Makefile	2011-12-04 10:46:26.000000000 +0100
-+++ ebtables-v2.0.10-3/Makefile	2011-12-11 16:35:34.619464748 +0100
-@@ -10,16 +10,16 @@ LOCKDIR:=$(shell echo $(LOCKFILE) | sed 
+--- ebtables-v2.0.10-4.orig/Makefile	2011-12-15 21:02:47.000000000 +0100
++++ ebtables-v2.0.10-4/Makefile	2014-03-23 15:46:20.000000000 +0100
+@@ -10,16 +10,16 @@ LOCKDIR:=$(shell echo $(LOCKFILE) | sed
  
  # default paths
  LIBDIR:=/usr/lib
-- 
cgit v1.2.3


From a80b51369fb718a1a811fb9c0c9a81e4e9e3b4e3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 23 Mar 2014 16:46:47 +0100
Subject: fix musl compile

---
 package/gkrellm/Makefile                           |  6 ++---
 package/gkrellm/patches/patch-server_Makefile      | 30 ----------------------
 package/gkrellm/patches/patch-server_main_c        | 24 +++++++++++++++++
 .../gkrellm/patches/patch-server_sysdeps-unix_c    | 10 ++++++++
 4 files changed, 37 insertions(+), 33 deletions(-)
 delete mode 100644 package/gkrellm/patches/patch-server_Makefile
 create mode 100644 package/gkrellm/patches/patch-server_main_c
 create mode 100644 package/gkrellm/patches/patch-server_sysdeps-unix_c

(limited to 'package')

diff --git a/package/gkrellm/Makefile b/package/gkrellm/Makefile
index 1b4a6b118..e8efdabd4 100644
--- a/package/gkrellm/Makefile
+++ b/package/gkrellm/Makefile
@@ -4,10 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gkrellm
-PKG_VERSION:=		2.3.4
+PKG_VERSION:=		2.3.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		600f4daa395112ed19a3633deb0829ff
-PKG_DESCR:=		The GNU Krell Monitors Server
+PKG_MD5SUM:=		05d00fa8d6376038b0c7e967583c0b8d
+PKG_DESCR:=		GNU krell monitors server
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		glib libpthread
 PKG_BUILDDEP:=		glib
diff --git a/package/gkrellm/patches/patch-server_Makefile b/package/gkrellm/patches/patch-server_Makefile
deleted file mode 100644
index a1a8747e7..000000000
--- a/package/gkrellm/patches/patch-server_Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- gkrellm-2.3.4.orig/server/Makefile	2008-10-03 23:52:48.000000000 +0200
-+++ gkrellm-2.3.4/server/Makefile	2011-05-17 11:34:14.926610183 +0200
-@@ -26,7 +26,7 @@ SMANDIR ?= $(INSTALLROOT)/share/man/man1
- MANMODE ?= 644
- MANDIRMODE ?= 755
- INSTALL ?= install
--LINK_FLAGS ?= -Wl,-E
-+LINK_FLAGS ?= -Wl,-E $(LDFLAGS)
- EXTRAOBJS =
- 
- SHARED_PATH = ../shared
-@@ -109,15 +109,15 @@ endif
- 
- override CC += -Wall $(FLAGS)
- 
--OS_NAME=$(shell uname -s)
--OS_RELEASE=$(shell uname -r)
-+OS_NAME=Linux
-+OS_RELEASE=2.6
- 
- OBJS = main.o monitor.o mail.o plugins.o glib.o utils.o sysdeps-unix.o log.o
- 
- all:	gkrellmd
- 
- gkrellmd: $(OBJS) $(EXTRAOBJS)
--	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd $(LIBS) $(LINK_FLAGS)
-+	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd $(LINK_FLAGS) $(LIBS)
- 
- static: $(OBJS) $(EXTRAOBJS)
- 	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \
diff --git a/package/gkrellm/patches/patch-server_main_c b/package/gkrellm/patches/patch-server_main_c
new file mode 100644
index 000000000..c02fb8930
--- /dev/null
+++ b/package/gkrellm/patches/patch-server_main_c
@@ -0,0 +1,24 @@
+--- gkrellm-2.3.5.orig/server/main.c	2010-10-02 18:13:29.000000000 +0200
++++ gkrellm-2.3.5/server/main.c	2014-03-23 16:06:59.000000000 +0100
+@@ -39,21 +39,6 @@
+ 	#include <syslog.h>
+ #endif // !WIN32
+ 
+-// win32 defines addrinfo but only supports getaddrinfo call on winxp or newer
+-#if !defined(HAVE_GETADDRINFO) && !defined(WIN32)
+-struct addrinfo
+-	{
+-	int		ai_flags;		/* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */
+-	int		ai_family;		/* PF_xxx */
+-	int		ai_socktype;	/* SOCK_xxx */
+-	int		ai_protocol;	/* 0 or IPPROTO_xxx for IPv4 and IPv6 */
+-	size_t	ai_addrlen;		/* length of ai_addr */
+-	char	*ai_canonname;	/* canonical name for hostname */
+-	struct	sockaddr *ai_addr;	/* binary address */
+-	struct	addrinfo *ai_next;	/* next structure in linked list */
+-	};
+-#endif // !HAVE_GETADDRINFO
+-
+ #if !defined(IPV6_V6ONLY) && defined(IPV6_BINDV6ONLY)
+ #define	IPV6_V6ONLY	IPV6_BINDV6ONLY
+ #endif
diff --git a/package/gkrellm/patches/patch-server_sysdeps-unix_c b/package/gkrellm/patches/patch-server_sysdeps-unix_c
new file mode 100644
index 000000000..e69631735
--- /dev/null
+++ b/package/gkrellm/patches/patch-server_sysdeps-unix_c
@@ -0,0 +1,10 @@
+--- gkrellm-2.3.5.orig/server/sysdeps-unix.c	2010-09-14 18:34:34.000000000 +0200
++++ gkrellm-2.3.5/server/sysdeps-unix.c	2014-03-23 16:13:57.000000000 +0100
+@@ -145,6 +145,7 @@ gkrellm_sensors_linux_name_fix(gchar *id
+ #endif
+ 	}
+ 
++#define HAVE_GETADDRINFO 1
+ #ifdef SENSORS_COMMON
+ gint
+ gkrellm_connect_to(gchar *server, gint server_port)
-- 
cgit v1.2.3


From e3e23911a37596937e472a2c91141e79b295cb4f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 23 Mar 2014 16:47:47 +0100
Subject: fix musl compile, partially from alpinelinxu

---
 package/findutils/Makefile                         |  2 +-
 .../patches/patch-gnulib_lib_freadahead_c          | 15 ++++++++++++
 .../patches/patch-gnulib_lib_freadahead_h          | 24 +++++++++++++++++++
 .../findutils/patches/patch-gnulib_lib_fseeko_c    | 18 +++++++++++++++
 .../findutils/patches/patch-gnulib_m4_fflush_m4    | 27 ++++++++++++++++++++++
 5 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 package/findutils/patches/patch-gnulib_lib_freadahead_c
 create mode 100644 package/findutils/patches/patch-gnulib_lib_freadahead_h
 create mode 100644 package/findutils/patches/patch-gnulib_lib_fseeko_c
 create mode 100644 package/findutils/patches/patch-gnulib_m4_fflush_m4

(limited to 'package')

diff --git a/package/findutils/Makefile b/package/findutils/Makefile
index 46c3e6681..b3b413932 100644
--- a/package/findutils/Makefile
+++ b/package/findutils/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		findutils
 PKG_VERSION:=		4.4.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		351cc4adb07d54877fa15f75fb77d39f
 PKG_DESCR:=		GNU utilities for finding files
 PKG_SECTION:=		utils
diff --git a/package/findutils/patches/patch-gnulib_lib_freadahead_c b/package/findutils/patches/patch-gnulib_lib_freadahead_c
new file mode 100644
index 000000000..d998fbf6c
--- /dev/null
+++ b/package/findutils/patches/patch-gnulib_lib_freadahead_c
@@ -0,0 +1,15 @@
+--- findutils-4.4.2.orig/gnulib/lib/freadahead.c	2009-05-10 23:23:57.000000000 +0200
++++ findutils-4.4.2/gnulib/lib/freadahead.c	2014-03-23 16:27:43.000000000 +0100
+@@ -19,6 +19,7 @@
+ /* Specification.  */
+ #include "freadahead.h"
+ 
++#ifndef HAVE___FREADAHEAD
+ size_t
+ freadahead (FILE *fp)
+ {
+@@ -64,3 +65,4 @@ freadahead (FILE *fp)
+  #error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, fread on your system, then report this to bug-gnulib."
+ #endif
+ }
++#endif
diff --git a/package/findutils/patches/patch-gnulib_lib_freadahead_h b/package/findutils/patches/patch-gnulib_lib_freadahead_h
new file mode 100644
index 000000000..194232201
--- /dev/null
+++ b/package/findutils/patches/patch-gnulib_lib_freadahead_h
@@ -0,0 +1,24 @@
+--- findutils-4.4.2.orig/gnulib/lib/freadahead.h	2009-05-10 23:23:57.000000000 +0200
++++ findutils-4.4.2/gnulib/lib/freadahead.h	2014-03-23 16:27:43.000000000 +0100
+@@ -29,8 +29,21 @@ extern "C" {
+ 
+    STREAM must not be wide-character oriented.  */
+ 
++#if HAVE___FREADAHEAD || (defined(__linux__) && !defined(__GLIBC__) && !defined(__UCLIBC__)) /* musl libc */
++
++#ifndef HAVE___FREADAHEAD
++#define HAVE___FREADAHEAD 1
++#endif
++
++# include <stdio_ext.h>
++# define freadahead(stream) __freadahead (stream)
++
++#else
++
+ extern size_t freadahead (FILE *stream);
+ 
++#endif
++
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/package/findutils/patches/patch-gnulib_lib_fseeko_c b/package/findutils/patches/patch-gnulib_lib_fseeko_c
new file mode 100644
index 000000000..aba9a1133
--- /dev/null
+++ b/package/findutils/patches/patch-gnulib_lib_fseeko_c
@@ -0,0 +1,18 @@
+--- findutils-4.4.2.orig/gnulib/lib/fseeko.c	2009-05-10 23:25:10.000000000 +0200
++++ findutils-4.4.2/gnulib/lib/fseeko.c	2014-03-23 16:35:34.000000000 +0100
+@@ -94,8 +94,14 @@ rpl_fseeko (FILE *fp, off_t offset, int
+   if ((fp->_Mode & _MWRITE ? fp->_Next == fp->_Buf : fp->_Next == fp->_Rend)
+       && fp->_Rback == fp->_Back + sizeof (fp->_Back)
+       && fp->_Rsave == NULL)
++#elif FUNC_FFLUSH_STDIN < 0 && 200809 <= _POSIX_VERSION
++  /* Cross-compiling to some other system advertising conformance to
++     POSIX.1-2008 or later.  Assume fseeko and fflush work as advertised.
++     If this assumption is incorrect, please report the bug to
++     bug-gnulib.  */
++  if (0)
+ #else
+-  #error "Please port gnulib fseeko.c to your platform! Look at the code in fpurge.c, then report this to bug-gnulib."
++  #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib."
+ #endif
+     {
+       off_t pos = lseek (fileno (fp), offset, whence);
diff --git a/package/findutils/patches/patch-gnulib_m4_fflush_m4 b/package/findutils/patches/patch-gnulib_m4_fflush_m4
new file mode 100644
index 000000000..5cee53cc0
--- /dev/null
+++ b/package/findutils/patches/patch-gnulib_m4_fflush_m4
@@ -0,0 +1,27 @@
+--- findutils-4.4.2.orig/gnulib/m4/fflush.m4	2009-05-10 23:23:57.000000000 +0200
++++ findutils-4.4.2/gnulib/m4/fflush.m4	2014-03-23 16:40:29.000000000 +0100
+@@ -32,14 +32,20 @@ AC_DEFUN([gl_FUNC_FFLUSH],
+ 	   return 4;
+ 	 return !(lseek (fd, 0, SEEK_CUR) == 5);
+        ]])], [gl_cv_func_fflush_stdin=yes], [gl_cv_func_fflush_stdin=no],
+-     [dnl Pessimistically assume fflush is broken.  This is wrong for
+-      dnl at least glibc and cygwin; but lib/fflush.c takes this into account.
+-      gl_cv_func_fflush_stdin=no])
++	[gl_cv_func_fflush_stdin=cross])
+      rm conftest.txt
+     ])
+-  if test $gl_cv_func_fflush_stdin = no; then
++  if test $gl_cv_func_fflush_stdin != yes; then
+     gl_REPLACE_FFLUSH
+   fi
++  case $gl_cv_func_fflush_stdin in
++    yes) gl_func_fflush_stdin=1 ;;
++    no)  gl_func_fflush_stdin=0 ;;
++    *)   gl_func_fflush_stdin='(-1)' ;;
++  esac
++  AC_DEFINE_UNQUOTED([FUNC_FFLUSH_STDIN], [$gl_func_fflush_stdin],
++    [Define to 1 if fflush is known to work on stdin as per POSIX.1-2008,
++     0 if fflush is known to not work, -1 if unknown.])
+ ])
+ 
+ AC_DEFUN([gl_REPLACE_FFLUSH],
-- 
cgit v1.2.3


From 2103c803f6f379ba74b931830003d527e59c4c15 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 23 Mar 2014 16:48:09 +0100
Subject: add missed patches

---
 .../ebtables/patches/patch-extensions_ebt_among_c  | 10 ++++++++
 .../patches/patch-extensions_ebt_arpreply_c        | 10 ++++++++
 .../ebtables/patches/patch-extensions_ebt_ip6_c    | 10 ++++++++
 .../ebtables/patches/patch-extensions_ebt_limit_c  | 10 ++++++++
 .../ebtables/patches/patch-extensions_ebt_nat_c    | 10 ++++++++
 .../ebtables/patches/patch-include_ethernetdb_h    | 29 ++++++++++++++++++++++
 package/ebtables/patches/patch-useful_functions_c  | 10 ++++++++
 7 files changed, 89 insertions(+)
 create mode 100644 package/ebtables/patches/patch-extensions_ebt_among_c
 create mode 100644 package/ebtables/patches/patch-extensions_ebt_arpreply_c
 create mode 100644 package/ebtables/patches/patch-extensions_ebt_ip6_c
 create mode 100644 package/ebtables/patches/patch-extensions_ebt_limit_c
 create mode 100644 package/ebtables/patches/patch-extensions_ebt_nat_c
 create mode 100644 package/ebtables/patches/patch-include_ethernetdb_h
 create mode 100644 package/ebtables/patches/patch-useful_functions_c

(limited to 'package')

diff --git a/package/ebtables/patches/patch-extensions_ebt_among_c b/package/ebtables/patches/patch-extensions_ebt_among_c
new file mode 100644
index 000000000..08f3fb7f1
--- /dev/null
+++ b/package/ebtables/patches/patch-extensions_ebt_among_c
@@ -0,0 +1,10 @@
+--- ebtables-v2.0.10-4.orig/extensions/ebt_among.c	2011-12-15 21:02:47.000000000 +0100
++++ ebtables-v2.0.10-4/extensions/ebt_among.c	2014-03-23 15:51:29.000000000 +0100
+@@ -13,7 +13,6 @@
+ #include <ctype.h>
+ #include <unistd.h>
+ #include "../include/ebtables_u.h"
+-#include <netinet/ether.h>
+ #include "../include/ethernetdb.h"
+ #include <linux/if_ether.h>
+ #include <linux/netfilter_bridge/ebt_among.h>
diff --git a/package/ebtables/patches/patch-extensions_ebt_arpreply_c b/package/ebtables/patches/patch-extensions_ebt_arpreply_c
new file mode 100644
index 000000000..32432efb4
--- /dev/null
+++ b/package/ebtables/patches/patch-extensions_ebt_arpreply_c
@@ -0,0 +1,10 @@
+--- ebtables-v2.0.10-4.orig/extensions/ebt_arpreply.c	2011-12-15 21:02:47.000000000 +0100
++++ ebtables-v2.0.10-4/extensions/ebt_arpreply.c	2014-03-23 15:50:38.000000000 +0100
+@@ -12,7 +12,6 @@
+ #include <string.h>
+ #include <getopt.h>
+ #include "../include/ebtables_u.h"
+-#include <netinet/ether.h>
+ #include <linux/netfilter_bridge/ebt_arpreply.h>
+ 
+ static int mac_supplied;
diff --git a/package/ebtables/patches/patch-extensions_ebt_ip6_c b/package/ebtables/patches/patch-extensions_ebt_ip6_c
new file mode 100644
index 000000000..e57677d44
--- /dev/null
+++ b/package/ebtables/patches/patch-extensions_ebt_ip6_c
@@ -0,0 +1,10 @@
+--- ebtables-v2.0.10-4.orig/extensions/ebt_ip6.c	2011-12-15 21:02:47.000000000 +0100
++++ ebtables-v2.0.10-4/extensions/ebt_ip6.c	2014-03-23 15:51:09.000000000 +0100
+@@ -11,6 +11,7 @@
+  *
+  */
+ 
++#include <sys/types.h>
+ #include <errno.h>
+ #include <inttypes.h>
+ #include <limits.h>
diff --git a/package/ebtables/patches/patch-extensions_ebt_limit_c b/package/ebtables/patches/patch-extensions_ebt_limit_c
new file mode 100644
index 000000000..5464611c1
--- /dev/null
+++ b/package/ebtables/patches/patch-extensions_ebt_limit_c
@@ -0,0 +1,10 @@
+--- ebtables-v2.0.10-4.orig/extensions/ebt_limit.c	2011-12-15 21:02:47.000000000 +0100
++++ ebtables-v2.0.10-4/extensions/ebt_limit.c	2014-03-23 15:52:04.000000000 +0100
+@@ -8,6 +8,7 @@
+  * September, 2003
+  */
+ 
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/package/ebtables/patches/patch-extensions_ebt_nat_c b/package/ebtables/patches/patch-extensions_ebt_nat_c
new file mode 100644
index 000000000..1a215e9e7
--- /dev/null
+++ b/package/ebtables/patches/patch-extensions_ebt_nat_c
@@ -0,0 +1,10 @@
+--- ebtables-v2.0.10-4.orig/extensions/ebt_nat.c	2011-12-15 21:02:47.000000000 +0100
++++ ebtables-v2.0.10-4/extensions/ebt_nat.c	2014-03-23 15:50:13.000000000 +0100
+@@ -11,7 +11,6 @@
+ #include <string.h>
+ #include <getopt.h>
+ #include "../include/ebtables_u.h"
+-#include <netinet/ether.h>
+ #include <linux/netfilter_bridge/ebt_nat.h>
+ 
+ static int to_source_supplied, to_dest_supplied;
diff --git a/package/ebtables/patches/patch-include_ethernetdb_h b/package/ebtables/patches/patch-include_ethernetdb_h
new file mode 100644
index 000000000..1bc877d57
--- /dev/null
+++ b/package/ebtables/patches/patch-include_ethernetdb_h
@@ -0,0 +1,29 @@
+--- ebtables-v2.0.10-4.orig/include/ethernetdb.h	2011-12-15 21:02:47.000000000 +0100
++++ ebtables-v2.0.10-4/include/ethernetdb.h	2014-03-23 15:47:35.000000000 +0100
+@@ -38,21 +38,20 @@ struct ethertypeent {
+ 
+ /* Open ethertype data base files and mark them as staying open even
+    after a later search if STAY_OPEN is non-zero.  */
+-extern void setethertypeent(int __stay_open) __THROW;
++extern void setethertypeent(int __stay_open);
+ 
+ /* Close ethertype data base files and clear `stay open' flag.  */
+-extern void endethertypeent(void) __THROW;
++extern void endethertypeent(void);
+ 
+ /* Get next entry from ethertype data base file.  Open data base if
+    necessary.  */
+-extern struct ethertypeent *getethertypeent(void) __THROW;
++extern struct ethertypeent *getethertypeent(void);
+ 
+ /* Return entry from ethertype data base for network with NAME.  */
+-extern struct ethertypeent *getethertypebyname(__const char *__name)
+-    __THROW;
++extern struct ethertypeent *getethertypebyname(__const char *__name);
+ 
+ /* Return entry from ethertype data base which number is PROTO.  */
+-extern struct ethertypeent *getethertypebynumber(int __ethertype) __THROW;
++extern struct ethertypeent *getethertypebynumber(int __ethertype);
+ 
+ 
+ #endif				/* ethernetdb.h */
diff --git a/package/ebtables/patches/patch-useful_functions_c b/package/ebtables/patches/patch-useful_functions_c
new file mode 100644
index 000000000..6e851ecd2
--- /dev/null
+++ b/package/ebtables/patches/patch-useful_functions_c
@@ -0,0 +1,10 @@
+--- ebtables-v2.0.10-4.orig/useful_functions.c	2011-12-15 21:02:47.000000000 +0100
++++ ebtables-v2.0.10-4/useful_functions.c	2014-03-23 15:49:15.000000000 +0100
+@@ -25,7 +25,6 @@
+ #include "include/ebtables_u.h"
+ #include "include/ethernetdb.h"
+ #include <stdio.h>
+-#include <netinet/ether.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <getopt.h>
-- 
cgit v1.2.3


From 2d47641ce6dcfefe89c0f7c9b820b0f250ce1b0c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 23 Mar 2014 20:37:57 +0100
Subject: remove rsh code

---
 package/ipcad/Makefile                  |  2 +-
 package/ipcad/patches/patch-Makefile_in | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'package')

diff --git a/package/ipcad/Makefile b/package/ipcad/Makefile
index 5ee22cba2..57b4d7111 100644
--- a/package/ipcad/Makefile
+++ b/package/ipcad/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ipcad
 PKG_VERSION:=		3.7.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		125605249958894148ec26d3c88189f5
 PKG_DESCR:=		IP Cisco Accounting Daemon
 PKG_SECTION:=		net
diff --git a/package/ipcad/patches/patch-Makefile_in b/package/ipcad/patches/patch-Makefile_in
index 40bcdf546..2fb2eaece 100644
--- a/package/ipcad/patches/patch-Makefile_in
+++ b/package/ipcad/patches/patch-Makefile_in
@@ -1,5 +1,5 @@
 --- ipcad-3.7.3.orig/Makefile.in	2007-04-22 10:08:45.000000000 +0200
-+++ ipcad-3.7.3/Makefile.in	2011-01-11 17:16:15.000000000 +0100
++++ ipcad-3.7.3/Makefile.in	2014-03-23 17:58:49.000000000 +0100
 @@ -6,10 +6,10 @@ sysconfdir= @sysconfdir@
  datadir= @datadir@
  
@@ -15,3 +15,12 @@
  CPPFLAGS+=-DCONFIG_FILE=\"${sysconfdir}/ipcad.conf\"
  CPPFLAGS+=@DEFS@ -D_REENTRANT -D_THREAD_SAFE
  CPPFLAGS+=-DPSRC_@PSRC@ -DIFST_@IFST@
+@@ -28,7 +28,7 @@ PACKAGE=ipcad
+ TARGETS=ipcad
+ VERSION=@IPCAD_VERSION@
+ 
+-IPCAD_OBJS= main.o process.o pps.o disp.o storage.o usage.o cfgy.o cfglex.o cfgread.o cfgvar.o rsh.o rshp.o dump.o import.o nflow.o cshelly.o cslex.o csparse.o service.o rw.o servers.o opt.o pidfile.o sf_lite.o
++IPCAD_OBJS= main.o process.o pps.o disp.o storage.o usage.o cfgy.o cfglex.o cfgread.o cfgvar.o dump.o import.o nflow.o cshelly.o cslex.o csparse.o service.o rw.o servers.o opt.o pidfile.o sf_lite.o
+ IPCAD_OBJS+= ifst_@IFST@.o		# Interface statistics
+ IPCAD_OBJS+= ifs_list.o			# Interface statistics
+ IPCAD_OBJS+= loop-@PSRC@.o		# Method of capturing
-- 
cgit v1.2.3


From af9597a2b212b6ed9faf8bf62efd024fba4e39d8 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 23 Mar 2014 20:38:17 +0100
Subject: remove rsh code

---
 package/ipcad/patches/patch-Makefile | 169 +++++++++++++++++++++++++++++++++++
 package/ipcad/patches/patch-cfg_y    |  60 +++++++++++++
 2 files changed, 229 insertions(+)
 create mode 100644 package/ipcad/patches/patch-Makefile
 create mode 100644 package/ipcad/patches/patch-cfg_y

(limited to 'package')

diff --git a/package/ipcad/patches/patch-Makefile b/package/ipcad/patches/patch-Makefile
new file mode 100644
index 000000000..8ced9f13a
--- /dev/null
+++ b/package/ipcad/patches/patch-Makefile
@@ -0,0 +1,169 @@
+--- ipcad-3.7.3.orig/Makefile	2007-04-22 10:08:45.000000000 +0200
++++ ipcad-3.7.3/Makefile	2014-03-23 17:59:56.000000000 +0100
+@@ -1,4 +1,163 @@
+-all: bootstrap
+ 
+-bootstrap:
+-	./configure && make
++prefix= /usr
++exec_prefix= ${prefix}
++bindir= /usr/bin
++sysconfdir= /etc
++datadir= /usr/share
++
++CC= /home/wbx/hudson/toolchain_x86_64-linux-gnu/usr/bin/arm-openadk-linux-muslgnueabihf-gcc
++LDFLAGS= -L/home/wbx/hudson/target_arm_musl_eabihf/lib -L/home/wbx/hudson/target_arm_musl_eabihf/usr/lib -Wl,-O1 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/hudson/target_arm_musl_eabihf/usr/lib -Wl,-z,relro,-z,now
++LIBS= -lpcap 
++CFLAGS= -march=armv6 -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -fno-unwind-tables -fno-asynchronous-unwind-tables -g3 -DHAVE_CONFIG_H -W -Wall
++CPPFLAGS=-DIPCAD_VERSION=\"3.7.3\"
++CPPFLAGS+=-DCONFIG_FILE=\"${sysconfdir}/ipcad.conf\"
++CPPFLAGS+=-DHAVE_CONFIG_H -D_REENTRANT -D_THREAD_SAFE
++CPPFLAGS+=-DPSRC_pcap -DIFST_linux
++
++YACC=bison -y
++LEX=flex
++INSTALL=/usr/bin/install -c
++
++MANROOT=/usr/share/man/man
++MAN8=${MANROOT}8
++MAN5=${MANROOT}5
++
++NROFF= groff -Tascii -mandoc
++
++PACKAGE=ipcad
++TARGETS=ipcad
++VERSION=3.7.3
++
++IPCAD_OBJS= main.o process.o pps.o disp.o storage.o usage.o cfgy.o cfglex.o cfgread.o cfgvar.o dump.o import.o nflow.o cshelly.o cslex.o csparse.o service.o rw.o servers.o opt.o pidfile.o sf_lite.o
++IPCAD_OBJS+= ifst_linux.o		# Interface statistics
++IPCAD_OBJS+= ifs_list.o			# Interface statistics
++IPCAD_OBJS+= loop-pcap.o		# Method of capturing
++IPCAD_OBJS+= loop-file.o		# Method of capturing
++IPCAD_OBJS+= loop-divert.o		# Method of capturing
++IPCAD_OBJS+= loop-dynamic.o		# Method of capturing
++IPCAD_OBJS+= loop-ulog.o loop-ipq.o	# Methods of capturing
++IPCAD_OBJS+= psrc.o psrc-pcap.o	# Initialize capturers
++IPCAD_OBJS+= psrc-ipq.o psrc-ulog.o	# Initialize capturers
++IPCAD_OBJS+= psrc-file.o		# Initialize capturers
++IPCAD_OBJS+= psrc-dynamic.o		# Initialize capturers
++IPCAD_OBJS+= psrc-divert.o		# Initialize capturers
++IPCAD_OBJS+= wrap_oclose.o		# Special file descriptors cache
++IPCAD_OBJS+= genhash.o			# General hashing
++
++all: ${TARGETS} man
++
++ipcad: ${IPCAD_OBJS}
++	${CC} ${CFLAGS} -o $@ ${IPCAD_OBJS} ${LDFLAGS} ${LIBS}
++
++.SUFFIXES:
++.SUFFIXES: .o .c .0 .8 .5
++
++.c.o:
++	${CC} ${CPPFLAGS} ${CFLAGS} -o $@ -c $<
++
++.8.0:
++	${NROFF} $< > $@
++
++.5.0:
++	${NROFF} $< > $@
++
++cfgy.h cfgy.c: cfg.y
++	${YACC} -p ipcacfg -d cfg.y
++	@mv y.tab.c cfgy.c
++	@mv y.tab.h cfgy.h
++
++cshelly.h cshelly.c: cshell.y
++	${YACC} -p CS -d cshell.y
++	@mv y.tab.c cshelly.c
++	@mv y.tab.h cshelly.h
++
++cslex.c: cslex.l
++	${LEX} -s -p -Cem -ocslex.c -PCS cslex.l
++
++cfglex.c: cfglex.l
++	${LEX} -s -p -Cem -ocfglex.c -Pipcacfg cfglex.l
++
++
++man: ipcad.8 ipcad.conf.5
++
++distdir = $(PACKAGE)-$(VERSION)
++distdir:
++	rm -rf $(distdir)
++	mkdir $(distdir)
++	cp *.c *.h $(distdir)
++	cp ipcad.8 ipcad.conf.5 $(distdir)
++	cp *.y *.l $(distdir)
++	cp *.in configure install-sh $(distdir)
++	cp ipcad.conf.default $(distdir)
++	cp ipcad.conf.simple $(distdir)
++	cp ipcad.spec.in $(distdir)
++	cp Makefile.in Makefile $(distdir)
++	cp ChangeLog INSTALL README TODO BUGS AUTHORS COPYING FAQ $(distdir)
++	cd $(distdir) && make distclean
++
++dist: distdir
++	tar chof - $(distdir) | GZIP="--best" gzip -c > $(distdir).tar.gz
++	rm -rf $(distdir)
++
++clean:
++	rm -f *.o ${TARGETS} *.core 1
++	rm -f *.0
++
++distclean: clean
++	rm -f config.h
++	rm -f config.cache config.log config.status
++	rm -f Makefile
++	rm -f $(distdir).tar.gz
++	rm -f ipcad.spec
++	(echo "all: bootstrap"; echo; echo "bootstrap:"; \
++		echo "	./configure && make") > Makefile
++
++maintainer-clean: distclean
++	@echo "This command is intended for maintainers to use; it"
++	@echo "deletes files that may need special tools to rebuild."
++	rm -f Makefile
++	rm -f *.tab.* cfgy.? *lex.c
++	rm -f config.h.in configure
++
++install: all install-bin install-conf
++
++install-bin:
++	@${INSTALL} -d $(DESTDIR)${bindir}
++	${INSTALL} ipcad $(DESTDIR)${bindir}
++
++install-man: man
++	${INSTALL} -m 444 ipcad.8 $(DESTDIR)${MAN8}/ipcad.8
++	${INSTALL} -m 444 ipcad.conf.5 $(DESTDIR)${MAN5}/ipcad.conf.5
++
++install-conf:
++	@${INSTALL} -d $(DESTDIR)${sysconfdir}
++	${INSTALL} -m 644 ipcad.conf.simple $(DESTDIR)${sysconfdir}/ipcad.conf.simple
++	-@diff ${sysconfdir}/ipcad.conf					\
++	      ${sysconfdir}/ipcad.conf.default >/dev/null 2>&1;		\
++	if [ "$$?" -eq 0 ] || [ ! -f ${sysconfdir}/ipcad.conf ]; then	\
++	echo ${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf.default; \
++	${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf.default; \
++	echo ${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf;	\
++	${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf;	\
++	echo "**********************************************";		\
++	echo "* Please customize ${sysconfdir}/ipcad.conf *";		\
++	echo "**********************************************";		\
++	else								\
++	echo ${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf.default; \
++	${INSTALL} -m 644 ipcad.conf.default $(DESTDIR)${sysconfdir}/ipcad.conf.default; \
++	echo "*********************************************";		\
++	echo "* Updated ${sysconfdir}/ipcad.conf.default *";		\
++	echo "*********************************************";		\
++	fi
++	@echo ""
++	@echo "Now you might want to 'make install-man'"
++	@echo ""
++
++
++uninstall:
++	rm -f ${bindir}/ipcad
++	rm -f ${sysconfdir}/ipcad.conf.default
++	rm -f ${sysconfdir}/ipcad.conf.simple
++	rm -f ${MAN8}/ipcad.8
++	rm -f ${MAN5}/ipcad.conf.5
++
diff --git a/package/ipcad/patches/patch-cfg_y b/package/ipcad/patches/patch-cfg_y
new file mode 100644
index 000000000..11fbc7564
--- /dev/null
+++ b/package/ipcad/patches/patch-cfg_y
@@ -0,0 +1,60 @@
+--- ipcad-3.7.3.orig/cfg.y	2007-04-22 10:08:45.000000000 +0200
++++ ipcad-3.7.3/cfg.y	2014-03-23 18:03:07.000000000 +0100
+@@ -3,7 +3,6 @@
+ #include "headers.h"
+ #include "cfgvar.h"
+ #include "servers.h"
+-#include "rsh.h"
+ #include "opt.h"
+ #include "storage.h"
+ 
+@@ -214,49 +213,6 @@ block:
+ 	| CAPTURE_PORTS DENY {
+ 		conf->capture_ports = 0;
+ 	}
+-	| RSH ALLOW at_ip {
+-		if(add_server(rsh_server, "RSH Server", &($3), 514))
+-			return yyerror("Failed to install RSH server");
+-		fprintf(stderr, "Configured RSH Server listening at %s\n",
+-			inet_ntoa($3));
+-	}
+-	| RSH DENY at_ip {
+-		fprintf(stderr, "Warning: Option at line %d has no effect\n",
+-			ipcacfglineno);
+-	}
+-	| RSH TIMEOUT EQ TOK_STRING {
+-		int to_ms;
+-		to_ms = atoi($4);
+-		free($4);
+-		if(to_ms < 0)
+-			to_ms = -1;	/* INFTIM */
+-		else
+-			to_ms = to_ms * 1000;
+-		rsh_rw_timeout = to_ms;
+-	}
+-	| RSH TOK_STRING privlevel {
+-		cfg_add_rsh_host("", $2, $3);
+-		free($2);
+-	}
+-	| RSH AT TOK_STRING privlevel {
+-		cfg_add_rsh_host("", $3, $4);
+-		free($3);
+-	}
+-	| RSH TOK_STRING AT TOK_STRING privlevel {
+-		cfg_add_rsh_host($2, $4, $5);
+-		free($2); free($4);
+-	}
+-	| RSH TTL EQ TOK_STRING {
+-		conf->rsh_ttl = atoi($4);
+-		free($4);
+-	}
+-	| TTL EQ TOK_STRING {
+-		fprintf(stderr, "WARNING: \"ttl = %s;\" at line %d: "
+-			"Obsolete syntax. Please use \"rsh ttl = %s;\"\n",
+-			$3, ipcacfglineno, $3);
+-		conf->rsh_ttl = atoi($3);
+-		free($3);
+-	}
+ 	| NetFlow
+ 	| CHROOT EQ TOK_STRING {
+ 		if(conf->chroot_to)
-- 
cgit v1.2.3


From c2a34ea858a331a0960f1b4854697de448f55381 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 23 Mar 2014 20:39:13 +0100
Subject: hudson says: you broke uclibc build

---
 package/findutils/Makefile                         | 25 +++++++++++++++-------
 package/findutils/patches/patch-configure_ac       | 11 ++++++++++
 .../findutils/patches/patch-gnulib_m4_fflush_m4    | 12 +++++------
 3 files changed, 33 insertions(+), 15 deletions(-)
 create mode 100644 package/findutils/patches/patch-configure_ac

(limited to 'package')

diff --git a/package/findutils/Makefile b/package/findutils/Makefile
index b3b413932..d89ca77ea 100644
--- a/package/findutils/Makefile
+++ b/package/findutils/Makefile
@@ -5,29 +5,38 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		findutils
 PKG_VERSION:=		4.4.2
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		351cc4adb07d54877fa15f75fb77d39f
 PKG_DESCR:=		GNU utilities for finding files
 PKG_SECTION:=		utils
 PKG_DEPENDS:=		libpthread
+PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://www.gnu.org/software/findutils/
 PKG_SITES:=		http://ftp.gnu.org/pub/gnu/findutils/
 
-PKG_SUBPKGS:=		FINDUTILS LOCATE
-PKGSD_LOCATE:=		Locate utility
+PKG_SUBPKGS:=		FIND XARGS LOCATE
+PKGSD_LOCATE:=		locate utility
+PKGSD_XARGS:=		xargs utility
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FINDUTILS,findutils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FIND,find,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XARGS,xargs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XARGS},${PKG_SECTION}))
 $(eval $(call PKG_template,LOCATE,locate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOCATE},${PKG_SECTION}))
 
+AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ENV+=		gl_cv_func_wcwidth_works=yes \
 			ac_cv_func_working_mktime=yes
 
-findutils-install:
-	$(INSTALL_DIR) $(IDIR_FINDUTILS)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/{find,oldfind,xargs} \
-		 $(IDIR_FINDUTILS)/usr/bin
+find-install:
+	$(INSTALL_DIR) $(IDIR_FIND)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/find \
+		 $(IDIR_FIND)/usr/bin
+
+xargs-install:
+	$(INSTALL_DIR) $(IDIR_XARGS)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/xargs \
+		 $(IDIR_XARGS)/usr/bin
 
 locate-install:
 	${INSTALL_DIR} ${IDIR_LOCATE}/usr/{bin,libexec}
diff --git a/package/findutils/patches/patch-configure_ac b/package/findutils/patches/patch-configure_ac
new file mode 100644
index 000000000..34c03d76f
--- /dev/null
+++ b/package/findutils/patches/patch-configure_ac
@@ -0,0 +1,11 @@
+--- findutils-4.4.2.orig/configure.ac	2009-05-16 17:27:39.000000000 +0200
++++ findutils-4.4.2/configure.ac	2014-03-23 19:39:22.000000000 +0100
+@@ -77,8 +77,6 @@ AC_PROG_CPP
+ dnl for gnulib
+ gl_EARLY
+ 
+-AM_C_PROTOTYPES
+-
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ dnl AC_PROG_LIBTOOL
diff --git a/package/findutils/patches/patch-gnulib_m4_fflush_m4 b/package/findutils/patches/patch-gnulib_m4_fflush_m4
index 5cee53cc0..b3dd6a082 100644
--- a/package/findutils/patches/patch-gnulib_m4_fflush_m4
+++ b/package/findutils/patches/patch-gnulib_m4_fflush_m4
@@ -1,6 +1,6 @@
 --- findutils-4.4.2.orig/gnulib/m4/fflush.m4	2009-05-10 23:23:57.000000000 +0200
-+++ findutils-4.4.2/gnulib/m4/fflush.m4	2014-03-23 16:40:29.000000000 +0100
-@@ -32,14 +32,20 @@ AC_DEFUN([gl_FUNC_FFLUSH],
++++ findutils-4.4.2/gnulib/m4/fflush.m4	2014-03-23 18:40:09.000000000 +0100
+@@ -32,12 +32,18 @@ AC_DEFUN([gl_FUNC_FFLUSH],
  	   return 4;
  	 return !(lseek (fd, 0, SEEK_CUR) == 5);
         ]])], [gl_cv_func_fflush_stdin=yes], [gl_cv_func_fflush_stdin=no],
@@ -11,9 +11,6 @@
       rm conftest.txt
      ])
 -  if test $gl_cv_func_fflush_stdin = no; then
-+  if test $gl_cv_func_fflush_stdin != yes; then
-     gl_REPLACE_FFLUSH
-   fi
 +  case $gl_cv_func_fflush_stdin in
 +    yes) gl_func_fflush_stdin=1 ;;
 +    no)  gl_func_fflush_stdin=0 ;;
@@ -22,6 +19,7 @@
 +  AC_DEFINE_UNQUOTED([FUNC_FFLUSH_STDIN], [$gl_func_fflush_stdin],
 +    [Define to 1 if fflush is known to work on stdin as per POSIX.1-2008,
 +     0 if fflush is known to not work, -1 if unknown.])
++  if test $gl_cv_func_fflush_stdin != yes; then
+     gl_REPLACE_FFLUSH
+   fi
  ])
- 
- AC_DEFUN([gl_REPLACE_FFLUSH],
-- 
cgit v1.2.3


From a0ad2f92a9133af67883899615eeb760f47f8bff Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 23 Mar 2014 20:44:22 +0100
Subject: make optimiztion compiler flags configurable, default -Os -pipe

---
 mk/vars.mk                  |  2 +-
 package/asterisk/Makefile   |  2 +-
 rules.mk                    |  1 +
 target/arm/target.mk        |  1 -
 target/config/Config.in.adk |  7 +++++++
 target/m68k/target.mk       |  1 -
 target/microblaze/target.mk |  1 -
 target/mips/target.mk       |  1 -
 target/ppc/target.mk        |  1 -
 target/ppc64/target.mk      |  1 -
 target/sh/target.mk         |  1 -
 target/sparc/target.mk      |  1 -
 target/sparc64/target.mk    |  1 -
 target/x86/target.mk        |  1 -
 target/x86_64/target.mk     |  1 -
 toolchain/musl/Makefile     | 15 +++++++++------
 16 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'package')

diff --git a/mk/vars.mk b/mk/vars.mk
index f22717c2e..4bdd4ae9f 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -127,7 +127,7 @@ ifneq ($(ADK_DEBUG),)
 TARGET_CFLAGS+=		-g3 -fno-omit-frame-pointer
 else
 TARGET_CPPFLAGS+=	-DNDEBUG
-TARGET_CFLAGS+=		-fomit-frame-pointer $(TARGET_OPTIMIZATION)
+TARGET_CFLAGS+=		-fomit-frame-pointer $(ADK_TARGET_CFLAGS_OPT)
 # stop generating eh_frame stuff
 TARGET_CFLAGS+=		-fno-unwind-tables -fno-asynchronous-unwind-tables
 # always add debug information
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 051ad3ea3..e43b4d275 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -105,7 +105,7 @@ TARGET_LDFLAGS+=	-lm -ltinfo -ldl -lpthread
 MAKE_ENV=		ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \
 			ASTLDFLAGS="${TARGET_LDFLAGS}"
 MAKE_FLAGS+=		DESTDIR="$(WRKINST)" \
-			OPTIMIZE="${TARGET_OPTIMIZATION}" \
+			OPTIMIZE="${TARGET_CFLAGS}" \
 			NOISY_BUILD=1
 ALL_TARGET:=		all install samples
 
diff --git a/rules.mk b/rules.mk
index f822642d1..09323e912 100644
--- a/rules.mk
+++ b/rules.mk
@@ -36,6 +36,7 @@ ADK_TARGET_FPU:=			$(strip $(subst ",, $(ADK_TARGET_FPU)))
 ADK_TARGET_ARM_MODE:=			$(strip $(subst ",, $(ADK_TARGET_ARM_MODE)))
 ADK_TARGET_CPU_ARCH:=			$(strip $(subst ",, $(ADK_TARGET_CPU_ARCH)))
 ADK_TARGET_CFLAGS:=			$(strip $(subst ",, $(ADK_TARGET_CFLAGS)))
+ADK_TARGET_CFLAGS_OPT:=			$(strip $(subst ",, $(ADK_TARGET_CFLAGS_OPT)))
 ADK_TARGET_ABI_CFLAGS:=			$(strip $(subst ",, $(ADK_TARGET_ABI_CFLAGS)))
 ADK_TARGET_ABI:=			$(strip $(subst ",, $(ADK_TARGET_ABI)))
 ADK_TARGET_MIPS_ABI:=			$(strip $(subst ",, $(ADK_TARGET_MIPS_ABI)))
diff --git a/target/arm/target.mk b/target/arm/target.mk
index 677e112f7..87db1e279 100644
--- a/target/arm/target.mk
+++ b/target/arm/target.mk
@@ -1,5 +1,4 @@
 include $(TOPDIR)/mk/kernel-ver.mk
 ARCH:=			arm
 CPU_ARCH:=		$(ADK_TARGET_CPU_ARCH)
-TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=    $(ADK_TARGET_CFLAGS)
diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk
index 27b72941e..0c598e50c 100644
--- a/target/config/Config.in.adk
+++ b/target/config/Config.in.adk
@@ -19,6 +19,13 @@ config ADK_DL_DIR
 	  Configure the download directory for all source packages.
 	  Use an absolute path.
 
+config ADK_TARGET_CFLAGS_OPT
+	string "optimization flags for compiler"
+	default "-Os -pipe"
+	help
+	  Compilation is only verfied with optimization for code size (Os).
+	  Other stuff (O2) might break. Will not be used when ADK_DEBUG is on.
+
 config ADK_DEBUG
 	bool "Compile applications with debug support by default"
 	default n
diff --git a/target/m68k/target.mk b/target/m68k/target.mk
index 1460b732b..80b1424a6 100644
--- a/target/m68k/target.mk
+++ b/target/m68k/target.mk
@@ -1,5 +1,4 @@
 include $(TOPDIR)/mk/kernel-ver.mk
 ARCH:=			m68k
 CPU_ARCH:=		$(ADK_TARGET_CPU_ARCH)
-TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=    $(ADK_TARGET_CFLAGS)
diff --git a/target/microblaze/target.mk b/target/microblaze/target.mk
index bee74e465..c179123f9 100644
--- a/target/microblaze/target.mk
+++ b/target/microblaze/target.mk
@@ -1,5 +1,4 @@
 include $(TOPDIR)/mk/kernel-ver.mk
 ARCH:=			microblaze
 CPU_ARCH:=		$(ADK_TARGET_CPU_ARCH)
-TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=    $(ADK_TARGET_CFLAGS)
diff --git a/target/mips/target.mk b/target/mips/target.mk
index f4864d2cc..8b13be890 100644
--- a/target/mips/target.mk
+++ b/target/mips/target.mk
@@ -1,5 +1,4 @@
 include $(TOPDIR)/mk/kernel-ver.mk
 ARCH:=			mips
 CPU_ARCH:=		$(ADK_TARGET_CPU_ARCH)
-TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=    $(ADK_TARGET_CFLAGS)
diff --git a/target/ppc/target.mk b/target/ppc/target.mk
index bd6624fe7..47ae3121f 100644
--- a/target/ppc/target.mk
+++ b/target/ppc/target.mk
@@ -1,5 +1,4 @@
 include $(TOPDIR)/mk/kernel-ver.mk
 ARCH:=			powerpc
 CPU_ARCH:=		ppc
-TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=	$(ADK_TARGET_CFLAGS) -Wl,--secure-plt
diff --git a/target/ppc64/target.mk b/target/ppc64/target.mk
index 7ccf65b9c..5a0ecc30f 100644
--- a/target/ppc64/target.mk
+++ b/target/ppc64/target.mk
@@ -1,5 +1,4 @@
 include $(TOPDIR)/mk/kernel-ver.mk
 ARCH:=			powerpc
 CPU_ARCH:=		ppc64
-TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=	$(ADK_TARGET_CFLAGS)
diff --git a/target/sh/target.mk b/target/sh/target.mk
index b5630cced..408dd12c5 100644
--- a/target/sh/target.mk
+++ b/target/sh/target.mk
@@ -1,5 +1,4 @@
 include $(TOPDIR)/mk/kernel-ver.mk
 ARCH:=			sh
 CPU_ARCH:=		$(ADK_TARGET_CPU_ARCH)
-TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=    $(ADK_TARGET_CFLAGS)
diff --git a/target/sparc/target.mk b/target/sparc/target.mk
index 4de28f960..960a7cf19 100644
--- a/target/sparc/target.mk
+++ b/target/sparc/target.mk
@@ -1,5 +1,4 @@
 include $(TOPDIR)/mk/kernel-ver.mk
 ARCH:=			sparc
 CPU_ARCH:=		sparc
-TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=    $(ADK_TARGET_CFLAGS)
diff --git a/target/sparc64/target.mk b/target/sparc64/target.mk
index 663e42d23..dda789e55 100644
--- a/target/sparc64/target.mk
+++ b/target/sparc64/target.mk
@@ -1,5 +1,4 @@
 include $(TOPDIR)/mk/kernel-ver.mk
 ARCH:=			sparc
 CPU_ARCH:=		sparc64
-TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=    $(ADK_TARGET_CFLAGS)
diff --git a/target/x86/target.mk b/target/x86/target.mk
index 30e558283..ecb811221 100644
--- a/target/x86/target.mk
+++ b/target/x86/target.mk
@@ -1,5 +1,4 @@
 include $(TOPDIR)/mk/kernel-ver.mk
 ARCH:=			x86
 CPU_ARCH:=		$(strip $(subst ",, $(ADK_TARGET_CPU_ARCH)))
-TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=	$(ADK_TARGET_CFLAGS)
diff --git a/target/x86_64/target.mk b/target/x86_64/target.mk
index 3eed00bf5..f381673fa 100644
--- a/target/x86_64/target.mk
+++ b/target/x86_64/target.mk
@@ -1,5 +1,4 @@
 include $(TOPDIR)/mk/kernel-ver.mk
 ARCH:=			x86
 CPU_ARCH:=		x86_64
-TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=    $(ADK_TARGET_CFLAGS)
diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile
index 6701c502a..7b0eeb104 100644
--- a/toolchain/musl/Makefile
+++ b/toolchain/musl/Makefile
@@ -12,6 +12,7 @@ endif
 
 $(WRKBUILD)/.headers:
 	(cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \
+		CFLAGS='$(TARGET_CFLAGS)' \
 		./configure --prefix=/usr \
 		--target=$(GNU_TARGET_NAME) \
 		--disable-gcc-wrapper \
@@ -22,29 +23,31 @@ $(WRKBUILD)/.headers:
 
 $(WRKBUILD)/.compiled:
 	# reconfigure musl, otherwise linking with libgcc or libgcc_eh is disabled
-	$(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) clean
+	$(MAKE) -C $(WRKBUILD) clean
 	(cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \
+		CFLAGS='$(TARGET_CFLAGS)' \
 		./configure --prefix=/usr \
 		--target=$(GNU_TARGET_NAME) \
 		--disable-gcc-wrapper \
 	)
-	$(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) all
+	$(MAKE) -C $(WRKBUILD) CFLAGS='$(TARGET_CFLAGS)' all
 	touch $@
 
 $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
-	$(MAKE) -C $(WRKBUILD) DESTDIR=$(STAGING_TARGET_DIR) install
+	$(MAKE) -C $(WRKBUILD) CFLAGS='$(TARGET_CFLAGS)' DESTDIR=$(STAGING_TARGET_DIR) install
 	touch $@
 
 $(WRKBUILD)/.fixup:
 	# reconfigure musl, otherwise linking with libgcc or libgcc_eh is disabled
-	$(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) clean
+	$(MAKE) -C $(WRKBUILD) clean
 	(cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \
+		CFLAGS='$(TARGET_CFLAGS)' \
 		./configure --prefix=/usr \
 		--target=$(GNU_TARGET_NAME) \
 		--disable-gcc-wrapper \
 	)
-	$(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) all
-	$(MAKE) -C $(WRKBUILD) DESTDIR=$(STAGING_TARGET_DIR) install
+	$(MAKE) -C $(WRKBUILD) CFLAGS='$(TARGET_CFLAGS)' all
+	$(MAKE) -C $(WRKBUILD) CFLAGS='$(TARGET_CFLAGS)' DESTDIR=$(STAGING_TARGET_DIR) install
 	# cleanup toolchain
 	-find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete
 ifeq ($(ADK_TOOLCHAIN),y)
-- 
cgit v1.2.3


From 15ce6d4a74407a920b82b0f7b7422a668a78f7c2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 23 Mar 2014 20:52:10 +0100
Subject: use shell instead of getty for test-framework

---
 package/adk-test-tools/Makefile        | 2 +-
 package/adk-test-tools/files/test.init | 1 -
 target/config/Config.in.runtime        | 1 +
 target/linux/config/Config.in.debug    | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'package')

diff --git a/package/adk-test-tools/Makefile b/package/adk-test-tools/Makefile
index c92f0b378..72327170a 100644
--- a/package/adk-test-tools/Makefile
+++ b/package/adk-test-tools/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		adk-test-tools
 PKG_VERSION:=		0.1
-PKG_RELEASE:=		4
+PKG_RELEASE:=		5
 PKG_DESCR:=		helper tools and scripts for adk-test-framework
 PKG_SECTION:=		misc
 PKG_URL:=		http://openadk.org/
diff --git a/package/adk-test-tools/files/test.init b/package/adk-test-tools/files/test.init
index bcff55c04..e33bece47 100755
--- a/package/adk-test-tools/files/test.init
+++ b/package/adk-test-tools/files/test.init
@@ -5,7 +5,6 @@
 echo "Starting test script ..."
 grep shell /proc/cmdline > /dev/null 2&>1
 if [ $? -eq 0 ];then
-	echo "Use user root and password linux123 to login. And quit to finish."
 	exit 0
 fi
 if [ -x /run.sh ];then
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 7acdd26ed..a6f504a49 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -39,6 +39,7 @@ config ADK_RUNTIME_TIMEZONE
 choice
 prompt "Start getty or shell after bootup"
 default ADK_RUNTIME_GETTY
+default ADK_RUNTIME_SHELL if ADK_PKG_TEST
 
 config ADK_RUNTIME_GETTY
 	boolean "start a getty after bootup"
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index 019c439d8..a1c7ae6c9 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -34,7 +34,7 @@ config ADK_KERNEL_PRINTK
 	boolean
 	select ADK_KERNEL_EARLY_PRINTK
 	default y
-	#depends on !ADK_PKG_TEST
+	depends on !ADK_PKG_TEST
 	help
 	  Disable printk to save space and quieten bootup.
 
-- 
cgit v1.2.3


From cfac84e0994edb1d6eb835dd685cabb0b9ae4bb5 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 24 Mar 2014 09:58:11 +0100
Subject: disable for musl

---
 package/shat/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'package')

diff --git a/package/shat/Makefile b/package/shat/Makefile
index a28087c75..3bc6fc9ff 100644
--- a/package/shat/Makefile
+++ b/package/shat/Makefile
@@ -7,10 +7,12 @@ PKG_NAME:=		shat
 PKG_VERSION:=		0.9.7
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		da06846f35838b14d1513523dad84d24
-PKG_DESCR:=		Source Hardware Address Translation - a tool for nomadic routing
+PKG_DESCR:=		a tool for nomadic routing
 PKG_SECTION:=		net/misc
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=shat/}
 
+PKG_LIBC_DEPENDS:=	uclibc glibc
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SHAT,shat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-- 
cgit v1.2.3


From e27ccf2bc39bc5bd22af970dde175c02e7d422d2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 24 Mar 2014 09:58:36 +0100
Subject: fix for musl, update to latest

---
 package/xinetd/Makefile                         |  7 ++++---
 package/xinetd/patches/patch-Makefile_in        | 13 ++-----------
 package/xinetd/patches/patch-xinetd_confparse_c | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 package/xinetd/patches/patch-xinetd_confparse_c

(limited to 'package')

diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile
index 42e3f7b83..deae22563 100644
--- a/package/xinetd/Makefile
+++ b/package/xinetd/Makefile
@@ -4,18 +4,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xinetd
-PKG_VERSION:=		2.3.14
+PKG_VERSION:=		2.3.15
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		567382d7972613090215c6c54f9b82d9
+PKG_MD5SUM:=		77358478fd58efa6366accae99b8b04c
 PKG_DESCR:=		a powerful and secure superserver
 PKG_SECTION:=		net/misc
 PKG_URL:=		http://www.xinetd.org/
-PKG_SITES:=		http://www.xinetd.org/
+PKG_SITES:=		ftp://mirror.ovh.net/gentoo-distfiles/distfiles/
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XINETD,xinetd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIGURE_ENV+=		xinetd_cv_type_rlim_t=yes
 CONFIGURE_ARGS+=	--without-libwrap \
 			--with-loadavg
 ALL_TARGET:=		build
diff --git a/package/xinetd/patches/patch-Makefile_in b/package/xinetd/patches/patch-Makefile_in
index a89962c2e..bfc02b9ab 100644
--- a/package/xinetd/patches/patch-Makefile_in
+++ b/package/xinetd/patches/patch-Makefile_in
@@ -1,14 +1,5 @@
---- xinetd-2.3.14.orig/Makefile.in	2003-08-15 16:00:45.000000000 +0200
-+++ xinetd-2.3.14/Makefile.in	2011-01-22 20:53:07.924898364 +0100
-@@ -14,7 +14,7 @@ topdir = @top_srcdir@
- 
- LIBS = -lsio -lstr -lmisc -lxlog -lportable -lpset @LIBS@
- 
--CFLAGS += @CFLAGS@ 
-+CFLAGS = @CFLAGS@ 
- DCFLAGS = -Wall -Wredundant-decls -W -Wfloat-equal -Wundef -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Wmissing-format-attribute -Wshadow -Wpointer-arith -g
- 
- 
+--- xinetd-2.3.15.orig/Makefile.in	2007-09-20 19:01:52.000000000 +0200
++++ xinetd-2.3.15/Makefile.in	2014-03-23 22:50:01.000000000 +0100
 @@ -75,15 +75,15 @@ dlibxlog: dlibsio dlibstr
  
  install: build
diff --git a/package/xinetd/patches/patch-xinetd_confparse_c b/package/xinetd/patches/patch-xinetd_confparse_c
new file mode 100644
index 000000000..e6aa32e68
--- /dev/null
+++ b/package/xinetd/patches/patch-xinetd_confparse_c
@@ -0,0 +1,18 @@
+--- xinetd-2.3.15.orig/xinetd/confparse.c	2007-09-20 16:58:27.000000000 +0200
++++ xinetd-2.3.15/xinetd/confparse.c	2014-03-23 22:39:37.000000000 +0100
+@@ -746,6 +746,7 @@ static status_e check_entry( struct serv
+    }
+ 
+ /* #ifndef NO_RPC */
++#if 0
+ #if defined(HAVE_RPC_RPCENT_H) || defined(HAVE_NETDB_H)
+    if ( SC_IS_RPC( scp ) && !SC_IS_UNLISTED( scp ) )
+    {
+@@ -760,6 +761,7 @@ static status_e check_entry( struct serv
+    }
+    else
+ #endif   /* ! NO_RPC */
++#endif
+    {
+        if ( !SC_IS_UNLISTED( scp ) ) 
+        { 
-- 
cgit v1.2.3


From 7433cac2c4ac2a8b5abd2445db4afac0a58dc32d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 24 Mar 2014 10:06:03 +0100
Subject: update to latest upstream

---
 package/bash/Makefile                           |  6 +++---
 package/bash/patches/patch-Makefile_in          | 13 -------------
 package/bash/patches/patch-builtins_Makefile_in | 11 -----------
 3 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 package/bash/patches/patch-Makefile_in
 delete mode 100644 package/bash/patches/patch-builtins_Makefile_in

(limited to 'package')

diff --git a/package/bash/Makefile b/package/bash/Makefile
index dc5c5b911..801d5920a 100644
--- a/package/bash/Makefile
+++ b/package/bash/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		bash
-PKG_VERSION:=		4.2
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		3fb927c7c33022f1c327f14a81c0d4b0
+PKG_VERSION:=		4.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		81348932d5da294953e15d4814c74dd1
 PKG_DESCR:=		Bourne-Again SHell
 PKG_SECTION:=		shells
 PKG_URL:=		http://www.gnu.org/software/bash/
diff --git a/package/bash/patches/patch-Makefile_in b/package/bash/patches/patch-Makefile_in
deleted file mode 100644
index 8e6cfb1ac..000000000
--- a/package/bash/patches/patch-Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
---- bash-4.2.orig/Makefile.in	2010-12-01 01:22:42.000000000 +0100
-+++ bash-4.2/Makefile.in	2011-03-09 20:03:07.163370779 +0100
-@@ -710,8 +710,8 @@ pathnames.h:		Makefile $(srcdir)/pathnam
- 	@${RM} pathnames.tmp
- 
- # comment out for distribution
--$(srcdir)/configure:	$(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
--	cd $(srcdir) && autoconf
-+#$(srcdir)/configure:	$(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
-+#	cd $(srcdir) && autoconf
- 
- # for chet
- reconfig: force
diff --git a/package/bash/patches/patch-builtins_Makefile_in b/package/bash/patches/patch-builtins_Makefile_in
deleted file mode 100644
index 69c175663..000000000
--- a/package/bash/patches/patch-builtins_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- bash-4.0.orig/builtins/Makefile.in	2009-01-04 20:32:22.000000000 +0100
-+++ bash-4.0/builtins/Makefile.in	2009-10-21 13:17:04.681674304 +0200
-@@ -56,7 +56,7 @@ LIBBUILD = ${BUILD_DIR}/lib
- 
- PROFILE_FLAGS = @PROFILE_FLAGS@
- CFLAGS = @CFLAGS@
--CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ @CROSS_COMPILE@
-+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
- CPPFLAGS = @CPPFLAGS@
- CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
- LOCAL_CFLAGS = @LOCAL_CFLAGS@ ${DEBUG}
-- 
cgit v1.2.3


From 4dcf409cd5a7aaaa09e06ba9ca8e2218802fc9c3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 24 Mar 2014 13:30:06 +0100
Subject: add new package

---
 package/check/Makefile | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/check/Makefile

(limited to 'package')

diff --git a/package/check/Makefile b/package/check/Makefile
new file mode 100644
index 000000000..5e7a9803a
--- /dev/null
+++ b/package/check/Makefile
@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		check
+PKG_VERSION:=		0.9.12
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		46fe540d1a03714c7a1967dbc6d484e7
+PKG_DESCR:=		unit testing framework for C
+PKG_SECTION:=		libs
+PKG_URL:=		http://check.sourceforge.net/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=check/}
+PKG_LIBNAME:=		libcheck
+PKG_OPTS:=		dev
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBCHECK,libcheck,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+libcheck-install:
+	$(INSTALL_DIR) $(IDIR_CHECK)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libcheck*.so* \
+		$(IDIR_CHECK)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From ef403e4a6b60767876a2a7aa50f7f9056975f504 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 24 Mar 2014 13:30:17 +0100
Subject: update to latest upstream version, fix musl compile

---
 package/kbd/Makefile                              | 11 +++-
 package/kbd/patches/patch-src_kbdinfo_c           | 46 +++++++++++++++
 package/kbd/patches/patch-src_kbdrate_c           | 10 ++++
 package/kbd/patches/patch-src_libkeymap_dump_c    | 11 ++++
 package/kbd/patches/patch-src_libkeymap_kmap_c    |  7 +++
 package/kbd/patches/patch-src_libkeymap_summary_c | 11 ++++
 package/kbd/patches/patch-src_openvt_c            |  8 +++
 package/kbd/patches/patch-src_setvtrgb_c          | 70 +++++++++++++++++++++++
 8 files changed, 171 insertions(+), 3 deletions(-)
 create mode 100644 package/kbd/patches/patch-src_kbdinfo_c
 create mode 100644 package/kbd/patches/patch-src_kbdrate_c
 create mode 100644 package/kbd/patches/patch-src_libkeymap_dump_c
 create mode 100644 package/kbd/patches/patch-src_libkeymap_kmap_c
 create mode 100644 package/kbd/patches/patch-src_libkeymap_summary_c
 create mode 100644 package/kbd/patches/patch-src_openvt_c
 create mode 100644 package/kbd/patches/patch-src_setvtrgb_c

(limited to 'package')

diff --git a/package/kbd/Makefile b/package/kbd/Makefile
index 0293849de..901ae6266 100644
--- a/package/kbd/Makefile
+++ b/package/kbd/Makefile
@@ -4,17 +4,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		kbd
-PKG_VERSION:=		1.15.3
+PKG_VERSION:=		2.0.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		8143e179a0f3c25646ce5085e8777200
+PKG_MD5SUM:=		cc0ee9f2537d8636cae85a8c6541ed2e
 PKG_DESCR:=		keyboard utility
 PKG_SECTION:=		utils
-PKG_SITES:=		ftp://ftp.altlinux.org/pub/people/legion/kbd/
+PKG_DEPENDS:=		libcheck
+PKG_BUILDDEP:=		check
+PKG_URL:=		http://kbd-project.org/
+PKG_SITES:=		http://kbd-project.org/download/
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,KBD,kbd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIGURE_ARGS+=	--disable-vlock
+
 kbd-install:
 	$(INSTALL_DIR) $(IDIR_KBD)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/loadkeys \
diff --git a/package/kbd/patches/patch-src_kbdinfo_c b/package/kbd/patches/patch-src_kbdinfo_c
new file mode 100644
index 000000000..cd322eb3c
--- /dev/null
+++ b/package/kbd/patches/patch-src_kbdinfo_c
@@ -0,0 +1,46 @@
+--- kbd-2.0.1.orig/src/kbdinfo.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/kbdinfo.c	2014-03-24 13:24:51.000000000 +0100
+@@ -1,6 +1,6 @@
+ #include <stdio.h>
+ #include <errno.h>
+-#include <error.h>
++#include <err.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <linux/kd.h>
+@@ -75,7 +75,7 @@ main(int argc, char **argv) {
+ 
+ 	if (!strcasecmp("GETMODE", action)) {
+ 		if (ioctl(fd, KDGETMODE, &mode) == -1)
+-			error(EXIT_FAILURE, errno, "ioctl");
++			err(EXIT_FAILURE, "ioctl");
+ 
+ 		switch (mode) {
+ 			case KD_TEXT:		rc = answer("text");		break;
+@@ -84,7 +84,7 @@ main(int argc, char **argv) {
+ 
+ 	} else if (!strcasecmp("GKBMODE", action)) {
+ 		if (ioctl(fd, KDGKBMODE, &mode) == -1)
+-			error(EXIT_FAILURE, errno, "ioctl");
++			err(EXIT_FAILURE, "ioctl");
+ 
+ 		switch (mode) {
+ 			case K_RAW:		rc = answer("raw");		break;
+@@ -95,7 +95,7 @@ main(int argc, char **argv) {
+ 
+ 	} else if (!strcasecmp("GKBMETA", action)) {
+ 		if (ioctl(fd, KDGKBMETA, &mode) == -1)
+-			error(EXIT_FAILURE, errno, "ioctl");
++			err(EXIT_FAILURE, "ioctl");
+ 
+ 		switch (mode) {
+ 			case K_METABIT:		rc = answer("metabit");		break;
+@@ -104,7 +104,7 @@ main(int argc, char **argv) {
+ 
+ 	} else if (!strcasecmp("GKBLED", action)) {
+ 		if (ioctl(fd, KDGKBLED, &flags) == -1)
+-			error(EXIT_FAILURE, errno, "ioctl");
++			err(EXIT_FAILURE, "ioctl");
+ 
+ 		mode = (flags & 0x7);
+ 
diff --git a/package/kbd/patches/patch-src_kbdrate_c b/package/kbd/patches/patch-src_kbdrate_c
new file mode 100644
index 000000000..8d267789d
--- /dev/null
+++ b/package/kbd/patches/patch-src_kbdrate_c
@@ -0,0 +1,10 @@
+--- kbd-2.0.1.orig/src/kbdrate.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/kbdrate.c	2014-03-24 12:40:34.000000000 +0100
+@@ -68,6 +68,7 @@ beats rebuilding the kernel!
+ 
+ */
+ 
++#include <fcntl.h>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <stdlib.h>
diff --git a/package/kbd/patches/patch-src_libkeymap_dump_c b/package/kbd/patches/patch-src_libkeymap_dump_c
new file mode 100644
index 000000000..23c883910
--- /dev/null
+++ b/package/kbd/patches/patch-src_libkeymap_dump_c
@@ -0,0 +1,11 @@
+--- kbd-2.0.1.orig/src/libkeymap/dump.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/dump.c	2014-03-24 12:18:50.000000000 +0100
+@@ -9,6 +9,8 @@
+  * This file is covered by the GNU General Public License,
+  * which should be included with kbd as the file COPYING.
+  */
++
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
diff --git a/package/kbd/patches/patch-src_libkeymap_kmap_c b/package/kbd/patches/patch-src_libkeymap_kmap_c
new file mode 100644
index 000000000..2016772ab
--- /dev/null
+++ b/package/kbd/patches/patch-src_libkeymap_kmap_c
@@ -0,0 +1,7 @@
+--- kbd-2.0.1.orig/src/libkeymap/kmap.c	2013-10-07 16:13:31.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/kmap.c	2014-03-24 12:17:45.000000000 +0100
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
diff --git a/package/kbd/patches/patch-src_libkeymap_summary_c b/package/kbd/patches/patch-src_libkeymap_summary_c
new file mode 100644
index 000000000..b6637f99f
--- /dev/null
+++ b/package/kbd/patches/patch-src_libkeymap_summary_c
@@ -0,0 +1,11 @@
+--- kbd-2.0.1.orig/src/libkeymap/summary.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/libkeymap/summary.c	2014-03-24 12:23:53.000000000 +0100
+@@ -6,6 +6,8 @@
+  * This file is covered by the GNU General Public License,
+  * which should be included with kbd as the file COPYING.
+  */
++
++#include <sys/types.h>
+ #include <string.h>
+ #include <errno.h>
+ #include <sys/ioctl.h>
diff --git a/package/kbd/patches/patch-src_openvt_c b/package/kbd/patches/patch-src_openvt_c
new file mode 100644
index 000000000..efb8736cc
--- /dev/null
+++ b/package/kbd/patches/patch-src_openvt_c
@@ -0,0 +1,8 @@
+--- kbd-2.0.1.orig/src/openvt.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/openvt.c	2014-03-24 12:48:07.000000000 +0100
+@@ -1,3 +1,5 @@
++#include <fcntl.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <unistd.h>
diff --git a/package/kbd/patches/patch-src_setvtrgb_c b/package/kbd/patches/patch-src_setvtrgb_c
new file mode 100644
index 000000000..fc72c2409
--- /dev/null
+++ b/package/kbd/patches/patch-src_setvtrgb_c
@@ -0,0 +1,70 @@
+--- kbd-2.0.1.orig/src/setvtrgb.c	2013-08-27 22:45:33.000000000 +0200
++++ kbd-2.0.1/src/setvtrgb.c	2014-03-24 13:10:47.000000000 +0100
+@@ -5,7 +5,7 @@
+ #include <sys/ioctl.h>
+ #include <linux/kd.h>
+ #include <errno.h>
+-#include <error.h>
++#include <err.h>
+ #include "kbd.h"
+ #include "getfd.h"
+ #include "nls.h"
+@@ -60,7 +60,7 @@ set_colormap(unsigned char *colormap)
+ 
+ 	/* Apply the color map to the tty via ioctl */
+ 	if (ioctl(fd, PIO_CMAP, colormap) == -1)
+-		error(EXIT_FAILURE, errno, "ioctl");
++		err(EXIT_FAILURE, "ioctl");
+ 
+ 	close(fd);
+ }
+@@ -72,7 +72,7 @@ parse_file(FILE *fd, const char *filenam
+ 	unsigned int rows, cols, val;
+ 
+ 	if ((cmap = calloc(3 * 16, sizeof(unsigned char))) == NULL)
+-		error(EXIT_FAILURE, errno, "calloc");
++		err(EXIT_FAILURE, "calloc");
+ 
+ 	for (rows = 0; rows < 3; rows++) {
+ 		cols = 0;
+@@ -80,26 +80,26 @@ parse_file(FILE *fd, const char *filenam
+ 		while (cols < 16) {
+ 			if ((c = fscanf(fd, "%u", &val)) != 1) {
+ 				if (c == EOF)
+-					error(EXIT_FAILURE, errno, "fscanf");
++					err(EXIT_FAILURE, "fscanf");
+ 
+-				error(EXIT_FAILURE, 0, _("Error: %s: Invalid value in field %u in line %u."),
++				err(EXIT_FAILURE, _("Error: %s: Invalid value in field %u in line %u."),
+ 				      filename, rows + 1, cols + 1);
+ 			}
+ 
+ 			cmap[rows + cols * 3] = (unsigned char) val;
+ 
+ 			if (cols < 15 && fgetc(fd) != ',')
+-				error(EXIT_FAILURE, 0, _("Error: %s: Insufficient number of fields in line %u."),
++				err(EXIT_FAILURE, _("Error: %s: Insufficient number of fields in line %u."),
+ 				      filename, rows + 1);
+ 			cols++;
+ 		}
+ 
+ 		if ((c = fgetc(fd)) == EOF)
+-			error(EXIT_FAILURE, 0, _("Error: %s: Line %u has ended unexpectedly.\n"),
++			err(EXIT_FAILURE, _("Error: %s: Line %u has ended unexpectedly.\n"),
+ 			      filename, rows + 1); 
+ 
+ 		if (c != '\n')
+-			error(EXIT_FAILURE, 0, _("Error: %s: Line %u is too long.\n"),
++			err(EXIT_FAILURE, _("Error: %s: Line %u is too long.\n"),
+ 			      filename, rows + 1);
+ 	}
+ }
+@@ -141,7 +141,7 @@ main(int argc, char **argv) {
+ 
+ 	} else {
+ 		if ((fd = fopen(file, "r")) == NULL)
+-			error(EXIT_FAILURE, errno, "fopen");
++			err(EXIT_FAILURE, "fopen");
+ 
+ 		parse_file(fd, file);
+ 		fclose(fd);
-- 
cgit v1.2.3


From 273514a8b8904da7feee90f64ac664ebac4d5fe8 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 24 Mar 2014 13:40:43 +0100
Subject: update eudev, fix udev.pc file install

---
 package/eudev/Makefile | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'package')

diff --git a/package/eudev/Makefile b/package/eudev/Makefile
index 4bce0928c..72eb76a8f 100644
--- a/package/eudev/Makefile
+++ b/package/eudev/Makefile
@@ -4,10 +4,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		eudev
-PKG_VERSION:=		1.3
+PKG_VERSION:=		1.5.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		164df78f6f0093578a20bdd00335845f
-PKG_DESCR:=		udev device manager
+PKG_MD5SUM:=		51380938b489385cc394f4ebabc048f0
+PKG_DESCR:=		device manager (udev clone)
 PKG_SECTION:=		utils
 PKG_BUILDDEP:=		gperf-host glib
 PKG_DEPENDS:=		glib
@@ -16,20 +16,22 @@ PKG_SITES:=		http://dev.gentoo.org/~blueness/eudev/
 PKG_LIBNAME:=		libudev
 PKG_OPTS:=		dev
 
-PKG_SUBPKGS:=		UDEV LIBUDEV LIBGUDEV
-PKGSC_LIBGUDEV:=	libs
-PKGSD_LIBGUDEV:=	GUDEV library
+PKG_SUBPKGS:=		UDEV LIBUDEV
+PKGSD_UDEV:=		Dynamic device management manager
 PKGSC_LIBUDEV:=		libs
-PKGSD_LIBUDEV:=		UDEV library
-PKGSD_UDEV:=		Dynamic device management subsystem
+PKGSD_LIBUDEV:=		Dynamic device management library
+
+ifeq ($(ADK_STATIC),y)
+PKG_OPTS+=		libmix
+endif
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,UDEV,udev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,LIBUDEV,libudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBGUDEV,libgudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--disable-manpages \
+			--datadir=${STAGING_TARGET_PREFIX}/usr/lib \
 			--disable-gtk-doc
 
 udev-install:
@@ -43,8 +45,4 @@ libudev-install:
 	${INSTALL_DIR} ${IDIR_LIBUDEV}/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libudev.so* $(IDIR_LIBUDEV)/usr/lib
 
-libgudev-install:
-	${INSTALL_DIR} ${IDIR_LIBGUDEV}/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libgudev*.so* $(IDIR_LIBGUDEV)/usr/lib
-
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From 76ffcba54b786e9c9e17c10998e3ca14b800326e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 24 Mar 2014 13:40:56 +0100
Subject: explicitely enable libcec

---
 package/xbmc/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'package')

diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index fed181d92..e8fc5cc40 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -69,6 +69,7 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--enable-libbluray \
 			--enable-external-libraries \
 			--enable-rtmp \
+			--enable-libcec \
 			--disable-libusb \
 			--disable-libcap \
 			--disable-sdl \
-- 
cgit v1.2.3


From c0c6f1a00ae612aca71a9c404056ff5656263513 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 24 Mar 2014 13:42:50 +0100
Subject: update to stable, add git patches

---
 package/libpciaccess/Makefile                      |   6 +-
 .../libpciaccess/patches/patch-src_freebsd_pci_c   |  18 +++
 .../libpciaccess/patches/patch-src_linux_sysfs_c   | 143 ++++++++++++++++++---
 .../libpciaccess/patches/patch-src_netbsd_pci_c    |  18 +++
 .../libpciaccess/patches/patch-src_openbsd_pci_c   |  26 ++++
 .../patches/patch-src_pciaccess_private_h          |  10 ++
 .../libpciaccess/patches/patch-src_solx_devfs_c    |  10 ++
 package/libpciaccess/patches/patch-src_x86_pci_c   |  10 ++
 8 files changed, 219 insertions(+), 22 deletions(-)
 create mode 100644 package/libpciaccess/patches/patch-src_freebsd_pci_c
 create mode 100644 package/libpciaccess/patches/patch-src_netbsd_pci_c
 create mode 100644 package/libpciaccess/patches/patch-src_openbsd_pci_c
 create mode 100644 package/libpciaccess/patches/patch-src_pciaccess_private_h
 create mode 100644 package/libpciaccess/patches/patch-src_solx_devfs_c
 create mode 100644 package/libpciaccess/patches/patch-src_x86_pci_c

(limited to 'package')

diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile
index 8b598d792..cc2df0005 100644
--- a/package/libpciaccess/Makefile
+++ b/package/libpciaccess/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libpciaccess
-PKG_VERSION:=		0.13.1
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		3a95b70913621840bf8af616ea01d7d9
+PKG_VERSION:=		0.13.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c49bd638c78fa4124e11432c1a94b5f4
 PKG_DESCR:=		X.org PCI access library
 PKG_SECTION:=		x11/libs
 PKG_SITES:=		${MASTER_SITE_XORG}
diff --git a/package/libpciaccess/patches/patch-src_freebsd_pci_c b/package/libpciaccess/patches/patch-src_freebsd_pci_c
new file mode 100644
index 000000000..3a1c22fd1
--- /dev/null
+++ b/package/libpciaccess/patches/patch-src_freebsd_pci_c
@@ -0,0 +1,18 @@
+--- libpciaccess-0.13.2.orig/src/freebsd_pci.c	2013-07-21 00:54:34.000000000 +0200
++++ libpciaccess-0.13.2/src/freebsd_pci.c	2014-03-24 13:26:10.476152263 +0100
+@@ -579,6 +579,7 @@ pci_device_freebsd_open_legacy_io(struct
+ 
+ 	ret->base = base;
+ 	ret->size = size;
++	ret->is_legacy = 1;
+ 	return ret;
+ #elif defined(PCI_MAGIC_IO_RANGE)
+ 	ret->memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
+@@ -588,6 +589,7 @@ pci_device_freebsd_open_legacy_io(struct
+ 
+ 	ret->base = base;
+ 	ret->size = size;
++	ret->is_legacy = 1;
+ 	return ret;
+ #else
+ 	return NULL;
diff --git a/package/libpciaccess/patches/patch-src_linux_sysfs_c b/package/libpciaccess/patches/patch-src_linux_sysfs_c
index ad31ac509..b84340706 100644
--- a/package/libpciaccess/patches/patch-src_linux_sysfs_c
+++ b/package/libpciaccess/patches/patch-src_linux_sysfs_c
@@ -1,19 +1,124 @@
---- libpciaccess-0.13.1.orig/src/linux_sysfs.c	2012-04-09 19:02:57.000000000 +0200
-+++ libpciaccess-0.13.1/src/linux_sysfs.c	2013-12-01 18:26:04.000000000 +0100
-@@ -34,6 +34,7 @@
- 
- #define _GNU_SOURCE
- 
-+#include <limits.h>
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
-@@ -45,7 +46,7 @@
- #include <dirent.h>
- #include <errno.h>
- 
--#if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
-+#if defined(__i386__) || defined(__x86_64__)
- #include <sys/io.h>
- #else
- #define inb(x) -1
+--- libpciaccess-0.13.2.orig/src/linux_sysfs.c	2013-07-21 00:54:34.000000000 +0200
++++ libpciaccess-0.13.2/src/linux_sysfs.c	2014-03-24 13:26:10.484152334 +0100
+@@ -759,6 +759,7 @@ pci_device_linux_sysfs_open_device_io(st
+ 
+     ret->base = base;
+     ret->size = size;
++    ret->is_legacy = 0;
+ 
+     return ret;
+ }
+@@ -796,6 +797,7 @@ pci_device_linux_sysfs_open_legacy_io(st
+ 
+     ret->base = base;
+     ret->size = size;
++    ret->is_legacy = 1;
+ 
+     return ret;
+ }
+@@ -813,10 +815,14 @@ pci_device_linux_sysfs_read32(struct pci
+ {
+     uint32_t ret;
+ 
+-    if (handle->fd > -1)
+-	pread(handle->fd, &ret, 4, port + handle->base);
+-    else
++    if (handle->fd > -1) {
++	if (handle->is_legacy)
++	    pread(handle->fd, &ret, 4, port + handle->base);
++	else
++	    pread(handle->fd, &ret, 4, port);
++    } else {
+ 	ret = inl(port + handle->base);
++    }
+ 	
+     return ret;
+ }
+@@ -826,10 +832,14 @@ pci_device_linux_sysfs_read16(struct pci
+ {
+     uint16_t ret;
+ 
+-    if (handle->fd > -1)
+-	pread(handle->fd, &ret, 2, port + handle->base);
+-    else
++    if (handle->fd > -1) {
++	if (handle->is_legacy)
++	    pread(handle->fd, &ret, 2, port + handle->base);
++	else
++	    pread(handle->fd, &ret, 2, port);
++    } else {
+ 	ret = inw(port + handle->base);
++    }
+ 
+     return ret;
+ }
+@@ -839,10 +849,14 @@ pci_device_linux_sysfs_read8(struct pci_
+ {
+     uint8_t ret;
+ 
+-    if (handle->fd > -1)
+-	pread(handle->fd, &ret, 1, port + handle->base);
+-    else
++    if (handle->fd > -1) {
++	if (handle->is_legacy)
++	    pread(handle->fd, &ret, 1, port + handle->base);
++	else
++	    pread(handle->fd, &ret, 1, port);
++    } else {
+ 	ret = inb(port + handle->base);
++    }
+ 
+     return ret;
+ }
+@@ -851,30 +865,42 @@ static void
+ pci_device_linux_sysfs_write32(struct pci_io_handle *handle, uint32_t port,
+ 			       uint32_t data)
+ {
+-    if (handle->fd > -1)
+-	pwrite(handle->fd, &data, 4, port + handle->base);
+-    else
++    if (handle->fd > -1) {
++	if (handle->is_legacy)
++	    pwrite(handle->fd, &data, 4, port + handle->base);
++	else
++	    pwrite(handle->fd, &data, 4, port);
++    } else {
+ 	outl(data, port + handle->base);
++    }
+ }
+ 
+ static void
+ pci_device_linux_sysfs_write16(struct pci_io_handle *handle, uint32_t port,
+ 			       uint16_t data)
+ {
+-    if (handle->fd > -1)
+-	pwrite(handle->fd, &data, 2, port + handle->base);
+-    else
++    if (handle->fd > -1) {
++	if (handle->is_legacy)
++	    pwrite(handle->fd, &data, 2, port + handle->base);
++	else
++	    pwrite(handle->fd, &data, 2, port);
++    } else {
+ 	outw(data, port + handle->base);
++    }
+ }
+ 
+ static void
+ pci_device_linux_sysfs_write8(struct pci_io_handle *handle, uint32_t port,
+ 			      uint8_t data)
+ {
+-    if (handle->fd > -1)
+-	pwrite(handle->fd, &data, 1, port + handle->base);
+-    else
++    if (handle->fd > -1) {
++	if (handle->is_legacy)
++	    pwrite(handle->fd, &data, 1, port + handle->base);
++	else
++	    pwrite(handle->fd, &data, 1, port);
++    } else {
+ 	outb(data, port + handle->base);
++    }
+ }
+ 
+ static int
diff --git a/package/libpciaccess/patches/patch-src_netbsd_pci_c b/package/libpciaccess/patches/patch-src_netbsd_pci_c
new file mode 100644
index 000000000..9b7a31b7e
--- /dev/null
+++ b/package/libpciaccess/patches/patch-src_netbsd_pci_c
@@ -0,0 +1,18 @@
+--- libpciaccess-0.13.2.orig/src/netbsd_pci.c	2013-07-21 00:54:34.000000000 +0200
++++ libpciaccess-0.13.2/src/netbsd_pci.c	2014-03-24 13:26:10.484152334 +0100
+@@ -733,6 +733,7 @@ pci_device_netbsd_open_legacy_io(struct
+ 
+ 	ret->base = base;
+ 	ret->size = size;
++	ret->is_legacy = 1;
+ 	return ret;
+ #elif defined(__amd64__)
+ 	struct x86_64_iopl_args ia;
+@@ -743,6 +744,7 @@ pci_device_netbsd_open_legacy_io(struct
+ 
+ 	ret->base = base;
+ 	ret->size = size;
++	ret->is_legacy = 1;
+ 	return ret;
+ #else
+ 	return NULL;
diff --git a/package/libpciaccess/patches/patch-src_openbsd_pci_c b/package/libpciaccess/patches/patch-src_openbsd_pci_c
new file mode 100644
index 000000000..0c7180b72
--- /dev/null
+++ b/package/libpciaccess/patches/patch-src_openbsd_pci_c
@@ -0,0 +1,26 @@
+--- libpciaccess-0.13.2.orig/src/openbsd_pci.c	2013-07-21 00:54:34.000000000 +0200
++++ libpciaccess-0.13.2/src/openbsd_pci.c	2014-03-24 13:26:10.484152334 +0100
+@@ -412,6 +412,7 @@ pci_device_openbsd_open_legacy_io(struct
+ 
+ 	ret->base = base;
+ 	ret->size = size;
++	ret->is_legacy = 1;
+ 	return ret;
+ #elif defined(__amd64__)
+ 	struct amd64_iopl_args ia;
+@@ -422,6 +423,7 @@ pci_device_openbsd_open_legacy_io(struct
+ 
+ 	ret->base = base;
+ 	ret->size = size;
++	ret->is_legacy = 1;
+ 	return ret;
+ #elif defined(PCI_MAGIC_IO_RANGE)
+ 	ret->memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
+@@ -431,6 +433,7 @@ pci_device_openbsd_open_legacy_io(struct
+ 
+ 	ret->base = base;
+ 	ret->size = size;
++	ret->is_legacy = 1;
+ 	return ret;
+ #else
+ 	return NULL;
diff --git a/package/libpciaccess/patches/patch-src_pciaccess_private_h b/package/libpciaccess/patches/patch-src_pciaccess_private_h
new file mode 100644
index 000000000..e3ec7d0f1
--- /dev/null
+++ b/package/libpciaccess/patches/patch-src_pciaccess_private_h
@@ -0,0 +1,10 @@
+--- libpciaccess-0.13.2.orig/src/pciaccess_private.h	2013-07-21 00:54:34.000000000 +0200
++++ libpciaccess-0.13.2/src/pciaccess_private.h	2014-03-24 13:26:10.492152406 +0100
+@@ -109,6 +109,7 @@ struct pci_io_handle {
+     pciaddr_t size;
+     void *memory;
+     int fd;
++    int is_legacy;
+ };
+ 
+ struct pci_device_private {
diff --git a/package/libpciaccess/patches/patch-src_solx_devfs_c b/package/libpciaccess/patches/patch-src_solx_devfs_c
new file mode 100644
index 000000000..f6ee2c03e
--- /dev/null
+++ b/package/libpciaccess/patches/patch-src_solx_devfs_c
@@ -0,0 +1,10 @@
+--- libpciaccess-0.13.2.orig/src/solx_devfs.c	2013-07-21 00:54:34.000000000 +0200
++++ libpciaccess-0.13.2/src/solx_devfs.c	2014-03-24 13:26:10.496152442 +0100
+@@ -911,6 +911,7 @@ pci_device_solx_devfs_open_legacy_io(str
+     if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) == 0) {
+ 	ret->base = base;
+ 	ret->size = size;
++	ret->is_legacy = 1;
+ 	return ret;
+     }
+ #endif
diff --git a/package/libpciaccess/patches/patch-src_x86_pci_c b/package/libpciaccess/patches/patch-src_x86_pci_c
new file mode 100644
index 000000000..07c18d419
--- /dev/null
+++ b/package/libpciaccess/patches/patch-src_x86_pci_c
@@ -0,0 +1,10 @@
+--- libpciaccess-0.13.2.orig/src/x86_pci.c	2013-07-21 00:54:34.000000000 +0200
++++ libpciaccess-0.13.2/src/x86_pci.c	2014-03-24 13:26:10.496152442 +0100
+@@ -558,6 +558,7 @@ pci_device_x86_open_legacy_io(struct pci
+ 
+     ret->base = base;
+     ret->size = size;
++    ret->is_legacy = 1;
+ 
+     return ret;
+ }
-- 
cgit v1.2.3