Merge branch 'master' of git+ssh://openadk.org/git/openadk

TODO

@@ -1,8 +1,8 @@
+- add PKG_AUTOTOOL logic for packages, which need patches to
+  the autotool infrastructure
+- add grsec kernel patch
+- check for gcc and SSP again
 - port full blown perl
-- implement host build infrastructure, fixes update-patches for the package
-  needed for ncurses, file, mesalib, openldap, python2, ..
-- gcc fixed-includes disabling
-http://www.linuxfromscratch.org/lfs/view/7.1/chapter05/gcc-pass2.html
 - port w3m
 - port libcec for xbmc
 - check xbmc samba/nfs support

mk/build.mk

@@ -12,7 +12,6 @@ CONFIG_CONFIG_IN = Config.in
 CONFIG = config
 DEFCONFIG=		ADK_DEBUG=n \
 			ADK_STATIC=n \
-			ADK_LOCALES=n \
 			ADK_MAKE_PARALLEL=y \
 			ADK_MAKE_JOBS=4 \
 			ADK_LEAVE_ETC_ALONE=n \

mk/package.mk

@@ -99,7 +99,7 @@ build-all-pkgs: ${_IPKGS_COOKIE}
 # 5.) description for the package, $(PKG_DESCR)
 # 6.) section of the package, $(PKG_SECTION)  
 # 7.) special package options $(PKG_OPTS)
-#     noscripts -> do not install scripts to $(STAGING_TARGET_DIR)/target/scripts
+#     noscripts -> do not install scripts to $(STAGING_TARGET_DIR)/scripts
 #		  (needed for example for autoconf/automake)
 #     noremove -> do not remove files from $(STAGING_TARGET_DIR)/target while
 #                 cleaning (needed for toolchain packages like glibc/eglibc)

mk/pkg-bottom.mk

@@ -87,7 +87,7 @@ else ifeq ($(strip ${CONFIG_STYLE}),)
 	    --enable-static \
 	    --disable-dependency-tracking \
 	    --disable-libtool-lock \
-	    $(NLS) \
+	    --disable-nls \
 	    ${CONFIGURE_ARGS} $(MAKE_TRACE)
 else
 	@echo "Invalid CONFIG_STYLE '${CONFIG_STYLE}'" >&2

mk/vars.mk

@@ -242,10 +242,4 @@ ifeq ($(ADK_HOST_CYGWIN),y)
 EXEEXT:=		.exe
 endif
 
-ifeq ($(ADK_LOCALES),y)
-NLS:=			--enable-nls
-else
-NLS:=			--disable-nls
-endif
-
 include $(TOPDIR)/mk/mirrors.mk

package/eglibc/Makefile

@@ -31,9 +31,6 @@ do-install:
 		$(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH); \
 	done
 	$(CP) $(STAGING_TARGET_DIR)/usr/bin/getconf $(IDIR_EGLIBC)/usr/bin
-ifeq ($(ADK_LOCALES),y)
-	$(CP) $(STAGING_TARGET_DIR)/usr/bin/locale $(IDIR_EGLIBC)/usr/bin
-endif
 	${INSTALL_DIR} $(IDIR_EGLIBC)/etc 
 	${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_EGLIBC}/etc
 	${INSTALL_DATA} ./files/nsswitch.conf ${IDIR_EGLIBC}/etc

package/exmap/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		exmap
 PKG_VERSION:=		0.4.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		55aec784e214037e61400287a55b5426
 PKG_DESCR:=		memory analysing client tool
 PKG_SECTION:=		debug

package/exmap/patches/patch-kernel_exmap_c

@@ -1,6 +1,6 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- exmap-console-0.4.1.orig/kernel/exmap.c	2006-10-24 20:45:11.000000000 +0200
-+++ exmap-console-0.4.1/kernel/exmap.c	2009-06-11 12:31:45.000000000 +0200
++++ exmap-console-0.4.1/kernel/exmap.c	2013-10-24 12:27:35.000000000 +0200
 @@ -392,7 +392,11 @@ int setup_from_pid(pid_t pid)
  	struct task_struct *tsk;
  	int errcode = -EINVAL;
@@ -13,27 +13,54 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	if (tsk == NULL) {
  		printk (KERN_ALERT
  			"/proc/%s: can't find task for pid %d\n",
-@@ -507,7 +511,7 @@ int init_module ()
- 							NULL);
+@@ -497,40 +501,29 @@ static int procfile_read (char *buffer,
+ 	return ret;
+ }
+ 
++static const struct file_operations proc_file_fops = {
++ .owner = THIS_MODULE,
++ .write  = procfile_write,
++ .read  = procfile_read,
++};
++
++
+ int init_module ()
+ {
+ 	struct proc_dir_entry *exmap_proc_file;
+ 	printk (KERN_INFO "/proc/%s: insert\n", PROCFS_NAME);
+ 	
+-	exmap_proc_file = create_proc_entry (PROCFS_NAME,
++	exmap_proc_file = proc_create (PROCFS_NAME,
+ 							0644,
+-							NULL);
++							NULL,
++					&proc_file_fops);
  
  	if (exmap_proc_file == NULL) {
 -		remove_proc_entry (PROCFS_NAME, &proc_root);
-+		remove_proc_entry (PROCFS_NAME, NULL);
  		printk (KERN_ALERT "/proc/%s: could not initialize\n",
  			PROCFS_NAME);
  		return -ENOMEM;
-@@ -515,7 +519,6 @@ int init_module ()
+ 	}
  	
- 	exmap_proc_file->read_proc = procfile_read;
- 	exmap_proc_file->write_proc = procfile_write;
+-	exmap_proc_file->read_proc = procfile_read;
+-	exmap_proc_file->write_proc = procfile_write;
 -	exmap_proc_file->owner = THIS_MODULE;
- 	
- 	/*     exmap_proc_file->mode         = S_IFREG | S_IRUGO; */
- 	/* TODO - this is quite probably a security problem */
-@@ -532,5 +535,5 @@ int init_module ()
- void cleanup_module ()
- {
- 	printk (KERN_INFO "/proc/%s: remove\n", PROCFS_NAME);
--	remove_proc_entry (PROCFS_NAME, &proc_root);
-+	remove_proc_entry (PROCFS_NAME, NULL);
+-	
+-	/*     exmap_proc_file->mode         = S_IFREG | S_IRUGO; */
+-	/* TODO - this is quite probably a security problem */
+-	exmap_proc_file->mode = 0666;
+-	
+-	exmap_proc_file->uid = 0;
+-	exmap_proc_file->gid = 0;
+-	exmap_proc_file->size = 0;
+-
+ 	init_local_data();
+ 	return 0;
  }
+-
+-void cleanup_module ()
+-{
+-	printk (KERN_INFO "/proc/%s: remove\n", PROCFS_NAME);
+-	remove_proc_entry (PROCFS_NAME, &proc_root);
+-}

package/freeglut/Makefile

@@ -4,12 +4,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		freeglut
-PKG_VERSION:=		2.6.0
+PKG_VERSION:=		2.8.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		39f0f2de89f399529d2b981188082218
+PKG_MD5SUM:=		918ffbddcffbac83c218bc52355b6d5a
 PKG_DESCR:=		OpenGL Utility Toolkit libraries
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		MesaLib
+PKG_DEPENDS:=		libglu
+PKG_BUILDDEP:=		glu
 PKG_URL:=		http://freeglut.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=freeglut/}
 PKG_NEED_CXX:=		1

package/freeglut/patches/patch-ltmain_sh

@@ -1,11 +0,0 @@
---- freeglut-2.6.0.orig/ltmain.sh	2008-04-29 23:33:55.000000000 +0200
-+++ freeglut-2.6.0/ltmain.sh	2011-01-14 21:40:47.000000000 +0100
-@@ -1676,7 +1676,7 @@ EOF
-       # -F/path gives path to uninstalled frameworks, gcc on darwin
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.

package/glibc/Makefile

@@ -38,9 +38,6 @@ do-install:
 	done
 	${INSTALL_DIR} $(IDIR_GLIBC)/usr/bin
 	$(CP) $(STAGING_TARGET_DIR)/usr/bin/getconf $(IDIR_GLIBC)/usr/bin
-ifeq ($(ADK_LOCALES),y)
-	$(CP) $(STAGING_TARGET_DIR)/usr/bin/locale $(IDIR_GLIBC)/usr/bin
-endif
 	${INSTALL_DIR} ${IDIR_GLIBC}/etc
 	${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_GLIBC}/etc
 	${INSTALL_DATA} ./files/nsswitch.conf ${IDIR_GLIBC}/etc

package/glu/Makefile

@@ -0,0 +1,28 @@
+# 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:=		glu
+PKG_VERSION:=		9.0.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		be9249132ff49275461cf92039083030
+PKG_DESCR:=		GLU library
+PKG_SECTION:=		libs
+PKG_URL:=		http://cgit.freedesktop.org/mesa/glu/
+PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/glu/
+PKG_LIBNAME:=		libglu
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBGLU,libglu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+libglu-install:
+	$(INSTALL_DIR) $(IDIR_LIBGLU)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libGLU.so* \
+		$(IDIR_LIBGLU)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/libiconv/patches/patch-srclib_stdio_in_h

@@ -0,0 +1,29 @@
+--- libiconv-1.14.orig/srclib/stdio.in.h	2011-08-07 15:42:06.000000000 +0200
++++ libiconv-1.14/srclib/stdio.in.h	2013-10-24 16:56:53.000000000 +0200
+@@ -679,22 +679,11 @@ _GL_WARN_ON_USE (getline, "getline is un
+ # endif
+ #endif
+ 
+-#if @GNULIB_GETS@
+-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-#   undef gets
+-#   define gets rpl_gets
+-#  endif
+-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
+-_GL_CXXALIAS_RPL (gets, char *, (char *s));
+-# else
+-_GL_CXXALIAS_SYS (gets, char *, (char *s));
+-#  undef gets
+-# endif
+-_GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.  Assume it is
+-   always declared, since it is required by C89.  */
++   so any use of gets warrants an unconditional warning; besides, C11
++   removed it.  */
++#undef gets
++#if HAVE_RAW_DECL_GETS
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
+ 

target/config/Config.in.adk

@@ -12,12 +12,6 @@ config ADK_HOST
 	help
 	  Configure host for IPKG package management.
 
-config ADK_LOCALES
-	bool "Enable locale support in C library and applications"
-	default n
-	help
-	  Multilanguage support.
-
 config ADK_DEBUG
 	bool "Compile applications with debug support by default"
 	default n

toolchain/eglibc/Makefile.inc

@@ -16,7 +16,7 @@ EGLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 			--with-__thread \
 			--with-tls \
 			--enable-add-ons \
-			$(NLS)
+			--disable-nls
 EGLIBC_ENV:=		PATH='${TARGET_PATH}' \
 			BUILD_CC=${CC_FOR_BUILD} \
 			GCC_HONOUR_COPTS=s \