mutt: moved to github
mutt: moved to github

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>


git-svn-id: svn://svn.openwrt.org/openwrt/packages@48566 3c298f89-4303-0410-b956-a3cf2f4a3e73

file:a/admin/sudo/Makefile (deleted)
#  
# Copyright (C) 2006-2011 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=sudo  
PKG_VERSION:=1.7.10p8  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://www.sudo.ws/sudo/dist  
PKG_MD5SUM:=4620e31c28b387dd9582dfd42e930cfb  
 
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/sudo  
SECTION:=admin  
CATEGORY:=Administration  
TITLE:=Delegate authority to run commands  
URL:=http://www.sudo.ws/  
endef  
 
define Package/sudo/description  
Sudo (su "do") allows a system administrator to delegate authority to  
give certain users (or groups of users) the ability to run some (or  
all) commands as root or another user while providing an audit trail of  
the commands and their arguments.  
endef  
 
define Package/sudo/conffiles  
/etc/sudoers  
endef  
 
CONFIGURE_ARGS+= \  
--without-pam \  
--disable-pam-session \  
--with-editor=/bin/vi \  
--without-lecture \  
--disable-zlib  
 
CONFIGURE_VARS+= \  
sudo_cv_uid_t_len=10 \  
sudo_cv_func_unsetenv_void=no  
 
define Package/sudo/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/sudo $(1)/usr/bin/  
chmod 4755 $(1)/usr/bin/sudo  
$(INSTALL_DIR) $(1)/usr/sbin  
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/visudo $(1)/usr/sbin/  
$(INSTALL_DIR) $(1)/etc  
$(CP) $(PKG_INSTALL_DIR)/etc/sudoers $(1)/etc/  
chmod 0440 $(1)/etc/sudoers  
$(INSTALL_DIR) $(1)/etc/sudoers.d  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/sudo_noexec.so $(1)/usr/lib/  
$(INSTALL_DIR) $(1)/etc/init.d  
$(INSTALL_BIN) ./files/sudo.init $(1)/etc/init.d/sudo  
endef  
 
define Package/sudo/postinst  
#!/bin/sh  
 
[ -n "$$IPKG_INSTROOT" ] || {  
/etc/init.d/sudo enable  
/etc/init.d/sudo start  
}  
endef  
 
$(eval $(call BuildPackage,sudo))  
 
#!/bin/sh /etc/rc.common  
# Copyright (C) 2011 OpenWrt.org  
 
START=99  
 
start() {  
[ -d /var/lib/sudo ] || {  
mkdir -m 0755 -p /var/lib/sudo  
chmod 0700 /var/lib/sudo  
}  
}  
 
# #
# Copyright (C) 2006-2010 OpenWrt.org # Copyright (C) 2006-2010 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
   
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
   
PKG_NAME:=dmalloc PKG_NAME:=dmalloc
PKG_VERSION:=5.5.2 PKG_VERSION:=5.5.2
PKG_RELEASE:=1 PKG_RELEASE:=1
   
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
PKG_SOURCE_URL:=http://dmalloc.com/releases/ PKG_SOURCE_URL:=http://dmalloc.com/releases/
PKG_MD5SUM:=f92e5606c23a8092f3d5694e8d1c932e PKG_MD5SUM:=f92e5606c23a8092f3d5694e8d1c932e
   
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_INSTALL:=1 PKG_INSTALL:=1
   
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
   
define Package/dmalloc/Default define Package/dmalloc/Default
SECTION:=devel SECTION:=devel
CATEGORY:=Development CATEGORY:=Development
TITLE:=Dmalloc TITLE:=Dmalloc
URL:=http://www.dmalloc.com/ URL:=http://www.dmalloc.com/
endef endef
   
define Package/libdmalloc define Package/libdmalloc
$(call Package/dmalloc/Default) $(call Package/dmalloc/Default)
TITLE+= (library) TITLE+= (library)
DEPENDS:=@USE_EGLIBC DEPENDS:=@USE_GLIBC
endef endef
   
define Package/dmalloc-utils define Package/dmalloc-utils
$(call Package/dmalloc/Default) $(call Package/dmalloc/Default)
DEPENDS:=+libdmalloc DEPENDS:=+libdmalloc
TITLE+= (utilities) TITLE+= (utilities)
endef endef
   
define Package/dmalloc/description define Package/dmalloc/description
The debug memory allocation or dmalloc library has been designed as a drop in The debug memory allocation or dmalloc library has been designed as a drop in
replacement for the system's malloc, realloc, calloc, free and other memory replacement for the system's malloc, realloc, calloc, free and other memory
management routines while providing powerful debugging facilities configurable management routines while providing powerful debugging facilities configurable
at runtime. These facilities include such things as memory-leak tracking, at runtime. These facilities include such things as memory-leak tracking,
fence-post write detection, file/line number reporting, and general logging of fence-post write detection, file/line number reporting, and general logging of
statistics. statistics.
endef endef
   
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-cxx \ --disable-cxx \
--with-pagesize=12 --with-pagesize=12
   
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
   
MAKE_INSTALL_FLAGS += installsl MAKE_INSTALL_FLAGS += installsl
   
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/include/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/dmalloc.h $(1)/usr/include/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/dmalloc.h $(1)/usr/include/
   
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdmalloc.{a,so*} $(1)/usr/lib/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdmalloc.{a,so*} $(1)/usr/lib/
endef endef
   
define Package/libdmalloc/install define Package/libdmalloc/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdmalloc.so* $(1)/usr/lib/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdmalloc.so* $(1)/usr/lib/
endef endef
   
define Package/dmalloc-utils/install define Package/dmalloc-utils/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dmalloc $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dmalloc $(1)/usr/bin/
endef endef
   
$(eval $(call BuildPackage,libdmalloc)) $(eval $(call BuildPackage,libdmalloc))
$(eval $(call BuildPackage,dmalloc-utils)) $(eval $(call BuildPackage,dmalloc-utils))
   
# #
# Copyright (C) 2008-2010 OpenWrt.org # Copyright (C) 2008-2010 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
   
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
   
PKG_NAME:= electric-fence PKG_NAME:= electric-fence
PKG_VERSION:=2.1.13 PKG_VERSION:=2.1.13
PKG_RELEASE:=1 PKG_RELEASE:=1
   
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)-0.1.tar.gz PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)-0.1.tar.gz
PKG_SOURCE_URL:=http://perens.com/FreeSoftware/ElectricFence PKG_SOURCE_URL:=http://perens.com/FreeSoftware/ElectricFence
PKG_MD5SUM:=59e4e7817a30aff52d8971ce00e1ad35 PKG_MD5SUM:=59e4e7817a30aff52d8971ce00e1ad35
   
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
   
define Package/electric-fence define Package/electric-fence
SECTION:=devel SECTION:=devel
CATEGORY:=Development CATEGORY:=Development
TITLE:=electric-fence TITLE:=electric-fence
URL:=http://perens.com/FreeSoftware/ElectricFence/ URL:=http://perens.com/FreeSoftware/ElectricFence/
DEPENDS:=@USE_EGLIBC DEPENDS:=@USE_GLIBC
MAINTAINER:=Mirko Vogt <mirko@openwrt.org> MAINTAINER:=Mirko Vogt <mirko@openwrt.org>
endef endef
   
TARGET_CFLAGS += -fPIC TARGET_CFLAGS += -fPIC
TARGET_LDFLAGS += -lpthread TARGET_LDFLAGS += -lpthread
   
define Build/Compile define Build/Compile
rm -f $(PKG_BUILD_DIR)/libefence.so $(PKG_BUILD_DIR)/libefence.a rm -f $(PKG_BUILD_DIR)/libefence.so $(PKG_BUILD_DIR)/libefence.a
$(TARGET_CC) $(TARGET_CFLAGS) -c $(PKG_BUILD_DIR)/efence.c -o $(PKG_BUILD_DIR)/efence.o $(TARGET_CC) $(TARGET_CFLAGS) -c $(PKG_BUILD_DIR)/efence.c -o $(PKG_BUILD_DIR)/efence.o
$(TARGET_CC) $(TARGET_CFLAGS) -c $(PKG_BUILD_DIR)/page.c -o $(PKG_BUILD_DIR)/page.o $(TARGET_CC) $(TARGET_CFLAGS) -c $(PKG_BUILD_DIR)/page.c -o $(PKG_BUILD_DIR)/page.o
$(TARGET_CC) $(TARGET_CFLAGS) -c $(PKG_BUILD_DIR)/print.c -o $(PKG_BUILD_DIR)/print.o $(TARGET_CC) $(TARGET_CFLAGS) -c $(PKG_BUILD_DIR)/print.c -o $(PKG_BUILD_DIR)/print.o
$(TARGET_CC) -shared $(TARGET_LDFLAGS) -o $(PKG_BUILD_DIR)/libefence.so $(PKG_BUILD_DIR)/efence.o $(PKG_BUILD_DIR)/page.o $(PKG_BUILD_DIR)/print.o $(TARGET_CC) -shared $(TARGET_LDFLAGS) -o $(PKG_BUILD_DIR)/libefence.so $(PKG_BUILD_DIR)/efence.o $(PKG_BUILD_DIR)/page.o $(PKG_BUILD_DIR)/print.o
$(AR) crv $(LD_FLAGS) $(PKG_BUILD_DIR)/libefence.a $(PKG_BUILD_DIR)/efence.o $(PKG_BUILD_DIR)/page.o $(PKG_BUILD_DIR)/print.o $(AR) crv $(LD_FLAGS) $(PKG_BUILD_DIR)/libefence.a $(PKG_BUILD_DIR)/efence.o $(PKG_BUILD_DIR)/page.o $(PKG_BUILD_DIR)/print.o
endef endef
   
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) \ $(INSTALL_DIR) \
$(1)/usr/lib $(1)/usr/lib
   
$(INSTALL_DATA) \ $(INSTALL_DATA) \
$(PKG_BUILD_DIR)/libefence.so \ $(PKG_BUILD_DIR)/libefence.so \
$(1)/usr/lib/ $(1)/usr/lib/
   
$(INSTALL_DATA) \ $(INSTALL_DATA) \
$(PKG_BUILD_DIR)/libefence.a \ $(PKG_BUILD_DIR)/libefence.a \
$(1)/usr/lib/ $(1)/usr/lib/
endef endef
   
define Package/electric-fence/install define Package/electric-fence/install
$(INSTALL_DIR) \ $(INSTALL_DIR) \
$(1)/usr/lib $(1)/usr/lib
   
$(INSTALL_DATA) \ $(INSTALL_DATA) \
$(PKG_BUILD_DIR)/libefence.so \ $(PKG_BUILD_DIR)/libefence.so \
$(1)/usr/lib/ $(1)/usr/lib/
endef endef
   
$(eval $(call BuildPackage,electric-fence)) $(eval $(call BuildPackage,electric-fence))
   
file:a/devel/ksymoops/Makefile (deleted)
#  
# Copyright (C) 2009 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
include $(INCLUDE_DIR)/kernel.mk  
 
PKG_NAME:=ksymoops  
PKG_VERSION:=2.4.11  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/ksymoops/v2.4/  
PKG_MD5SUM:=4a8249e182a5dbc75e566d162e9f3314  
 
PKG_BUILD_DEPENDS:=binutils  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/ksymoops  
SECTION:=utils  
CATEGORY:=Utilities  
DEPENDS:=@mips||mipsel||m68k||i386 +zlib  
TITLE:=Interpret oops of the kernel  
URL:=http://www.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/  
MENU:=1  
endef  
 
define Package/kexec-tools/description  
endef  
 
define Build/Configure  
endef  
 
TARGET=$(strip $(shell echo $(TARGET_CFLAGS) | cut -d- -f4 | cut -d= -f2))  
 
define Build/Compile  
$(MAKE) -C $(PKG_BUILD_DIR) \  
CC="$(TARGET_CC)" \  
BFD_PREFIX="$(STAGING_DIR)/usr" \  
DEF_TARGET='\"$(TARGET)\"' \  
DEF_ARCH='\"$(ARCH)\"' \  
DEF_MAP='\"$(LINUX_DIR)/System.map\"' \  
CROSS="$(TARGET_CROSS)" \  
INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \  
LDFLAGS="-lz" \  
all install  
endef  
 
define Package/ksymoops/install  
$(INSTALL_DIR) $(1)/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/$(TARGET_CROSS)ksymoops $(1)/bin/ksymoops  
endef  
 
$(eval $(call BuildPackage,ksymoops))  
 
#  
# Copyright (C) 2013 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=lttng-tools  
PKG_VERSION:=2.1.0  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME)  
PKG_MD5SUM:=cfc35db9eb2d4ae09a65c006a70204f6  
PKG_FIXUP:=autoreconf  
 
PKG_USE_MIPS16:=0  
PKG_BUILD_PARALLEL:=1  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/lttng-tools  
SECTION:=devel  
CATEGORY:=Development  
DEPENDS:=+lttng-ust +libpopt  
TITLE:=LTTng tracing tools  
URL:=https://lttng.org/  
endef  
 
TARGET_LDFLAGS += -lurcu-bp  
 
define Package/lttng-tools/description  
LTTng Userspace Tracing Library  
endef  
 
define Package/lttng-tools/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblttng-ctl.so.* $(1)/usr/lib/  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lttng $(1)/usr/lib/  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lttng* $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,lttng-tools))  
 
Make sync_file_range() usage optional  
 
Under uClibc, sync_file_range() is not available under all  
architectures, so we fall back to fdatasync() in this case.  
 
Inspired by the patch done by Thomas Petazzoni for the  
2.0-pre25 version.  
 
Signed-off-by: Samuel Martin <s.martin49@gmail.com>  
---  
configure.ac | 2 +-  
src/common/compat/fcntl.h | 5 +++++  
2 files changed, 6 insertions(+), 1 deletion(-)  
 
--- a/configure.ac  
+++ b/configure.ac  
@@ -150,7 +150,7 @@ AS_IF([test "x$lttng_ust_support" = "xye  
)  
])  
AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$lttng_ust_ctl_found" = xyes])  
-AC_CHECK_FUNCS([sched_getcpu sysconf])  
+AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range])  
 
# check for dlopen  
AC_CHECK_LIB([dl], [dlopen],  
@@ -394,4 +394,3 @@ AS_IF([test "x$consumerd_only" = "xno"],  
])  
 
AS_ECHO()  
-  
--- a/src/common/compat/compat-fcntl.c  
+++ b/src/common/compat/compat-fcntl.c  
@@ -23,7 +23,11 @@  
int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,  
unsigned int flags)  
{  
+#ifdef HAVE_SYNC_FILE_RANGE  
return sync_file_range(fd, offset, nbytes, flags);  
+#else  
+ return fdatasync(fd);  
+#endif  
}  
 
#endif /* __linux__ */  
 
file:a/devel/make/Makefile (deleted)
#  
# Copyright (C) 2007-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=make  
PKG_VERSION:=3.81  
PKG_RELEASE:=1  
PKG_SOURCE_URL:=@GNU/make  
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_MD5SUM:=354853e0b2da90c527e35aabb8d6f1e6  
PKG_INSTALL:=1  
PKG_BUILD_PARALLEL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/make  
SECTION:=devel  
CATEGORY:=Development  
DEPENDS:=+libelf1  
TITLE:=make  
URL:=http://www.gnu.org/software/make/  
endef  
 
define Package/make/description  
The Make package contains a program for compiling packages  
endef  
 
define Package/make/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/make $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,make))  
 
file:a/devel/perf/Makefile (deleted)
#  
# Copyright (C) 2011-2013 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
include $(INCLUDE_DIR)/kernel.mk  
 
PKG_NAME:=perf  
PKG_VERSION:=$(LINUX_VERSION)  
PKG_RELEASE:=2  
 
PKG_USE_MIPS16:=0  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/perf  
SECTION:=devel  
CATEGORY:=Development  
DEPENDS:= +libelf1 +libdw +libpthread +librt +binutils  
TITLE:=Linux performance monitoring tool  
VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE)  
URL:=http://www.kernel.org  
endef  
 
define Package/perf/description  
perf is the Linux performance monitoring tool  
endef  
 
# Perf's makefile and headers are not relocatable and must be built from the  
# Linux sources directory  
define Build/Prepare  
$(RM) -r $(PKG_BUILD_DIR)  
ln -s $(LINUX_DIR)/tools/perf $(PKG_BUILD_DIR)  
endef  
 
# MAKE_FLAGS should be passed again upon cleaning because Perf's makefile  
# always performs checks before processing any rule  
define Build/Clean  
-$(MAKE) -C $(PKG_BUILD_DIR) \  
NO_DWARF=1 \  
$(MAKE_FLAGS) \  
clean  
endef  
 
MAKE_FLAGS = \  
ARCH="$(LINUX_KARCH)" \  
NO_LIBPERL=1 \  
NO_LIBPYTHON=1 \  
NO_NEWT=1 \  
CROSS_COMPILE="$(TARGET_CROSS)" \  
CC="$(TARGET_CC)" \  
LD="$(TARGET_CROSS)ld" \  
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \  
LDFLAGS="$(TARGET_LDFLAGS)" \  
V=1 \  
prefix=/usr  
 
define Package/perf/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(LINUX_DIR)/tools/perf/perf $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,perf))  
 
file:a/lang/jamvm/Makefile (deleted)
#  
# Copyright (C) 2006-2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=jamvm  
PKG_VERSION:=1.6.0-git  
PKG_RELEASE:=2  
 
PKG_SOURCE_PROTO:=git  
PKG_SOURCE_URL:=git://git.berlios.de/jamvm  
PKG_SOURCE_VERSION:=4617da717ecb05654ea5bb9572338061106a414d  
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)  
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz  
PKG_MIRROR_MD5SUM:=66a728a3cb8dad0e3773035c4049eb5f  
 
PKG_USE_MIPS16:=0  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/jamvm  
SUBMENU:=Java  
SECTION:=lang  
CATEGORY:=Languages  
TITLE:=A compact Java Virtual Machine  
URL:=http://sourceforge.net/projects/jamvm  
DEPENDS:=+zlib +libpthread +librt +classpath @!avr32  
endef  
 
define Package/jamvm/description  
JamVM is a new Java Virtual Machine which conforms to the JVM  
specification version (blue book). In comparison to most other VM's (free  
and commercial) it is extremely small.However, unlike other small VMs  
(e.g. KVM) it is designed to support the full specification, and includes  
support for object finalisation, Soft/Weak/Phantom References, the Java  
Native Interface (JNI) and the Reflection API.  
endef  
 
CONFIGURE_ARGS += \  
--with-java-runtime-library=gnuclasspath \  
--with-classpath-install-dir=/usr \  
--disable-int-inlining \  
--disable-shared \  
--without-pic  
 
MAKE_FLAGS += \  
GLIBJ_ZIP=$(STAGING_DIR)/usr/share/classpath/glibj.zip  
 
define Package/jamvm/install  
$(INSTALL_DIR) $(1)/usr  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/bin \  
$(PKG_INSTALL_DIR)/usr/share \  
$(1)/usr/  
endef  
 
define Build/InstallDev  
$(CP) $(PKG_INSTALL_DIR)/* $(1)/  
endef  
 
$(eval $(call BuildPackage,jamvm))  
 
#  
# Copyright (C) 2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PECL_NAME:=bcompiler  
PECL_LONGNAME:=PHP bytecode Compiler  
 
PKG_VERSION:=1.0.2  
PKG_RELEASE:=1  
PKG_MD5SUM:=99f76a5ef536d43180b41036a6a13e43  
 
PKG_NAME:=php5-pecl-$(PECL_NAME)  
PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz  
PKG_SOURCE_URL:=http://pecl.php.net/get/  
 
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION)  
PKG_BUILD_PARALLEL:=1  
 
include $(INCLUDE_DIR)/package.mk  
include $(INCLUDE_DIR)/nls.mk  
include ../php5/pecl.mk  
 
$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),@BROKEN))  
$(eval $(call BuildPackage,$(PKG_NAME)))  
 
#  
# Copyright (C) 2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PECL_NAME:=dio  
PECL_LONGNAME:=Direct I/O functions  
 
PKG_VERSION:=0.0.6  
PKG_RELEASE:=1  
PKG_MD5SUM:=95bde93a41def9c2d97532eeb0c83bd3  
 
PKG_NAME:=php5-pecl-$(PECL_NAME)  
PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz  
PKG_SOURCE_URL:=http://pecl.php.net/get/  
 
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION)  
PKG_BUILD_PARALLEL:=1  
 
include $(INCLUDE_DIR)/package.mk  
include $(INCLUDE_DIR)/nls.mk  
include ../php5/pecl.mk  
 
$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))  
$(eval $(call BuildPackage,$(PKG_NAME)))  
 
--- a/dio.c  
+++ b/dio.c  
@@ -442,6 +442,26 @@ PHP_FUNCTION(dio_tcsetattr)  
 
/* assign to correct values... */  
switch (Baud_Rate) {  
+#ifdef B460800  
+ case 460800:  
+ BAUD = B460800;  
+ break;  
+#endif  
+#ifdef B230400  
+ case 230400:  
+ BAUD = B230400;  
+ break;  
+#endif  
+#ifdef B115200  
+ case 115200:  
+ BAUD = B115200;  
+ break;  
+#endif  
+#ifdef B57600  
+ case 57600:  
+ BAUD = B57600;  
+ break;  
+#endif  
case 38400:  
BAUD = B38400;  
break;  
 
#  
# Copyright (C) 2012-2013 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PECL_NAME:=libevent  
PECL_LONGNAME:=Libevent - event notification  
 
PKG_VERSION:=0.1.0  
PKG_RELEASE:=1  
PKG_MD5SUM:=e091371a9e714098a4c04a6e3daeb56a  
 
PKG_NAME:=php5-pecl-$(PECL_NAME)  
PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz  
PKG_SOURCE_URL:=http://pecl.php.net/get/  
 
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PECL_NAME)-$(PKG_VERSION)  
PKG_BUILD_PARALLEL:=1  
 
include $(INCLUDE_DIR)/package.mk  
include $(INCLUDE_DIR)/nls.mk  
include ../php5/pecl.mk  
 
CONFIGURE_ARGS+= --with-libevent=shared,"$(STAGING_DIR)/usr"  
 
$(eval $(call PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+libevent2))  
$(eval $(call BuildPackage,$(PKG_NAME)))  
 
file:a/lang/pymysql/Makefile (deleted)
#  
# Copyright (C) 2007-2008 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=MySQL-python  
PKG_VERSION:=1.2.2  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@SF/mysql-python  
PKG_MD5SUM:=532268f02870bea18c1d465e88afff30  
 
PKG_BUILD_DEPENDS:=python  
 
include $(INCLUDE_DIR)/package.mk  
$(call include_mk, python-package.mk)  
 
define Package/python-mysql  
SUBMENU:=Python  
SECTION:=lang  
CATEGORY:=Languages  
TITLE:=MySQL database adapter for Python  
URL:=http://mysql-python.sourceforge.net/  
DEPENDS:=+python +libmysqlclient  
endef  
 
define Package/python-mysql/description  
MySQLdb is an thread-compatible interface to the popular MySQL database  
server that provides the Python database API.  
endef  
 
define PyPackage/python-mysql/filespec  
+|$(PYTHON_PKG_DIR)/_mysql.so  
+|$(PYTHON_PKG_DIR)/_mysql_exceptions.py*  
+|$(PYTHON_PKG_DIR)/MySQLdb  
endef  
 
define Build/Compile  
$(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)  
$(call Build/Compile/PyMod,., \  
install --prefix="$(PKG_INSTALL_DIR)/usr", \  
)  
endef  
 
$(eval $(call PyPackage,python-mysql))  
$(eval $(call BuildPackage,python-mysql))  
 
--- MySQL-python-1.2.2/setup.py 2007-02-25 04:37:12.000000000 +0100  
+++ MySQL-python-1.2.2/setup.py 2007-08-15 12:23:18.000000000 +0200  
@@ -2,8 +2,7 @@  
 
import os  
import sys  
-import ez_setup; ez_setup.use_setuptools()  
-from setuptools import setup, Extension  
+from distutils.core import setup, Extension  
 
if sys.version_info < (2, 3):  
raise Error, "Python-2.3 or newer is required"  
 
--- MySQL-python-1.2.2/site_orig.cfg 2007-08-15 12:58:40.000000000 +0200  
+++ MySQL-python-1.2.2/site.cfg 2007-08-15 12:58:49.000000000 +0200  
@@ -4,7 +4,7 @@  
# static: link against a static library (probably required for embedded)  
 
embedded = False  
-threadsafe = True  
+threadsafe = False  
static = False  
 
# The path to mysql_config.  
 
#  
# Copyright (C) 2009-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=pycrypto  
PKG_VERSION:=2.6  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/  
PKG_MD5SUM:=88dad0a270d1fe83a39e0467a66a22bb  
 
include $(INCLUDE_DIR)/package.mk  
$(call include_mk, python-package.mk)  
 
define Package/python-crypto  
SECTION:=lang-python  
CATEGORY:=Languages  
SUBMENU:=Python  
TITLE:=python-crypto  
URL:=http://www.pycrypto.org/  
DEPENDS:=+python +libgmp  
endef  
 
define Package/python-crypto/description  
A collection of both secure hash functions (such as MD5 and SHA),  
and various encryption algorithms (AES, DES, IDEA, RSA, ElGamal, etc.).  
endef  
 
define Build/Compile  
$(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))  
endef  
 
define Package/python-crypto/install  
$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/  
$(CP) \  
$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \  
$(1)$(PYTHON_PKG_DIR)/  
endef  
 
$(eval $(call BuildPackage,python-crypto))  
 
--- a/setup.py  
+++ b/setup.py  
@@ -370,7 +370,7 @@ kw = {'name':"pycrypto",  
'ext_modules': plat_ext + [  
# _fastmath (uses GNU mp library)  
Extension("Crypto.PublicKey._fastmath",  
- include_dirs=['src/','/usr/include/'],  
+ include_dirs=['src/'],  
libraries=['gmp'],  
sources=["src/_fastmath.c"]),  
 
 
#  
# Copyright (C) 2011 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=python-imaging-library  
PKG_VERSION:=1.1.7  
PKG_RELEASE:=2  
 
PKG_SOURCE:=Imaging-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://effbot.org/downloads  
PKG_MD5SUM:=fc14a54e1ce02a0225be8854bfba478e  
 
PKG_BUILD_DIR:=$(BUILD_DIR)/Imaging-$(PKG_VERSION)  
PKG_BUILD_DEPENDS:=python  
 
include $(INCLUDE_DIR)/package.mk  
$(call include_mk, python-package.mk)  
 
define Package/python-imaging-library  
SECTION:=language-python  
CATEGORY:=Languages  
SUBMENU:=Python  
TITLE:=Python Imaging Library (PIL)  
URL:=http://www.pythonware.com/products/pil/  
DEPENDS:=+python +libfreetype +libjpeg +zlib  
endef  
 
define Package/python-imaging-library/description  
The Python Imaging Library adds image processing capabilities to your  
Python interpreter.  
.  
This library provides extensive file format support, an efficient  
internal representation, and fairly powerful image processing  
capabilities.  
.  
The core image library is designed for fast access to data stored in a  
few basic pixel formats. It should provide a solid foundation for a  
general image processing tool.  
endef  
 
define Build/Compile  
$(call Build/Compile/PyMod,., \  
install --prefix="/usr" --root="$(PKG_INSTALL_DIR)", \  
)  
endef  
 
define Package/python-imaging-library/install  
$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)  
$(CP) \  
$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \  
$(1)$(PYTHON_PKG_DIR)/  
endef  
 
$(eval $(call BuildPackage,python-imaging-library))  
 
--- a/setup.py 2011-11-15 01:06:00.000000000 +0100  
+++ b/setup.py 2011-11-15 01:07:32.000000000 +0100  
@@ -147,7 +147,6 @@  
add_directory(library_dirs, "/opt/local/lib")  
add_directory(include_dirs, "/opt/local/include")  
 
- add_directory(library_dirs, "/usr/local/lib")  
# FIXME: check /opt/stuff directories here?  
 
prefix = sysconfig.get_config_var("prefix")  
@@ -199,22 +198,6 @@  
add_directory(include_dirs, include_root)  
 
#  
- # add standard directories  
-  
- # look for tcl specific subdirectory (e.g debian)  
- if _tkinter:  
- tcl_dir = "/usr/include/tcl" + TCL_VERSION  
- if os.path.isfile(os.path.join(tcl_dir, "tk.h")):  
- add_directory(include_dirs, tcl_dir)  
-  
- # standard locations  
- add_directory(library_dirs, "/usr/local/lib")  
- add_directory(include_dirs, "/usr/local/include")  
-  
- add_directory(library_dirs, "/usr/lib")  
- add_directory(include_dirs, "/usr/include")  
-  
- #  
# insert new dirs *before* default libs, to avoid conflicts  
# between Python PYD stub libs and real libraries  
 
 
file:a/lang/pyyaml/Makefile (deleted)
#  
# Copyright (C) 2008 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=PyYAML  
PKG_VERSION:=3.11  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://pyyaml.org/download/pyyaml/  
PKG_MD5SUM:=f50e08ef0fe55178479d3a618efe21db  
 
PKG_BUILD_DEPENDS:=python  
 
include $(INCLUDE_DIR)/package.mk  
$(call include_mk, python-package.mk)  
 
define Package/pyyaml  
SUBMENU:=Python  
SECTION:=lang  
CATEGORY:=Languages  
TITLE:=pyyaml  
URL:=http://pyyaml.org  
DEPENDS:=+python +libyaml  
endef  
 
define Package/pyyaml/description  
yaml python bindings  
endef  
 
define Build/Compile  
$(call Build/Compile/PyMod,,--with-libyaml install --prefix="$(PKG_INSTALL_DIR)/usr")  
endef  
 
define Package/pyyaml/install  
$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)  
$(CP) \  
$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \  
$(1)$(PYTHON_PKG_DIR)  
endef  
 
$(eval $(call BuildPackage,pyyaml))  
 
#  
# Copyright (C) 2011 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=simplejson  
PKG_VERSION:=2.2.1  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://pypi.python.org/packages/source/s/simplejson/  
PKG_MD5SUM:=070c6467462bd63306f1756b01df6d70  
PKG_BUILD_DEPENDS:=python  
 
include $(INCLUDE_DIR)/package.mk  
$(call include_mk, python-package.mk)  
 
define Package/simplejson  
SUBMENU:=Python  
SECTION:=lang  
CATEGORY:=Languages  
TITLE:=Simple, fast, extensible JSON encoder/decoder for Python  
URL:=http://simplejson.readthedocs.org/  
DEPENDS:=+python +distribute  
endef  
 
define Package/simplejson/description  
Simple, fast, extensible JSON encoder/decoder for Python  
endef  
 
define Build/Compile  
$(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))  
endef  
 
define Package/simplejson/install  
$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)  
$(CP) \  
$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \  
$(1)$(PYTHON_PKG_DIR)  
endef  
 
$(eval $(call BuildPackage,simplejson))  
 
file:a/lang/tcl/Makefile (deleted)
#  
# Copyright (C) 2006-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=tcl  
PKG_VERSION:=8.5.8  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION)-src.tar.gz  
PKG_SOURCE_URL:=@SF/tcl  
PKG_MD5SUM:=7f123e53b3daaaba2478d3af5a0752e3  
 
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(PKG_VERSION)  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/tcl  
SECTION:=lang  
CATEGORY:=Languages  
DEPENDS:=+libpthread  
TITLE:=TCL Lang  
URL:=http://www.tcl.tk  
endef  
 
define Package/tcl/description  
Tcl (Tool Command Language) is a very powerful but easy to learn dynamic  
programming language, suitable for a very wide range of uses, including web and  
desktop applications, networking, administration, testing and many more. Open  
source and business-friendly, Tcl is a mature yet evolving language that is truly  
cross platform, easily deployed and highly extensible.  
endef  
 
CONFIGURE_PATH := unix  
 
CONFIGURE_VARS += \  
tcl_cv_strtod_unbroken=ok  
 
CONFIGURE_ARGS += \  
--enable-threads  
 
MAKE_PATH := unix  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/  
 
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtcl*.{a,so*} $(1)/usr/lib/  
endef  
 
define Package/tcl/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so $(1)/usr/lib  
 
$(INSTALL_DIR) $(1)/usr/bin  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin  
endef  
 
$(eval $(call BuildPackage,tcl))  
 
--- a/unix/Makefile.in  
+++ b/unix/Makefile.in  
@@ -817,15 +817,15 @@ install-tzdata: tclsh  
@echo "Installing time zone data"  
@@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \  
TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \  
- ./tclsh $(TOOL_DIR)/installData.tcl \  
- $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata  
+ #./tclsh $(TOOL_DIR)/installData.tcl \  
+ # $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata  
 
install-msgs: tclsh  
@echo "Installing message catalogs"  
@@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \  
TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \  
- ./tclsh $(TOOL_DIR)/installData.tcl \  
- $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs  
+ #./tclsh $(TOOL_DIR)/installData.tcl \  
+ # $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs  
 
install-doc: doc  
@for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3_INSTALL_DIR)" "$(MANN_INSTALL_DIR)" ; \  
 
--- a/generic/tclStrToD.c  
+++ b/generic/tclStrToD.c  
@@ -73,7 +73,7 @@ typedef unsigned int fpu_control_t __att  
* MIPS floating-point units need special settings in control registers  
* to use gradual underflow as we expect.  
*/  
-#if defined(__mips)  
+#if defined(__sgi) && defined(_COMPILER_VERSION)  
#include <sys/fpu.h>  
#endif  
/*  
@@ -2166,7 +2166,7 @@ TclInitDoubleConversion(void)  
} bitwhack;  
#endif  
 
-#if defined(__mips)  
+#if defined(__sgi) && defined(_COMPILER_VERSION)  
union fpc_csr mipsCR;  
 
mipsCR.fc_word = get_fpc_csr();  
 
file:a/lang/urbi/Makefile (deleted)
#  
# Copyright (C) 2007-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=urbi  
PKG_VERSION:=1.0RC2-l455  
PKG_RELEASE:=2  
 
PKG_SOURCE:=$(PKG_NAME)-sdk-$(PKG_VERSION)-src.zip  
PKG_SOURCE_URL:=http://www.gostai.com/downloads/aibo/  
PKG_MD5SUM:=02f64abb6232ddd7b0cb6dc182e2df26  
PKG_FIXUP:=libtool-ucxx  
 
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-sdk  
 
include $(INCLUDE_DIR)/package.mk  
 
TARGET_CFLAGS += $(FPIC)  
 
define Package/urbi  
SECTION:=lang  
CATEGORY:=Languages  
DEPENDS:=+uclibcxx +libpthread @BROKEN  
TITLE:=URBI SDK  
URL:=http://www.urbiforge.com  
endef  
 
define Package/urbi/description  
Universal Real-Time Behavior Interface for robots.  
endef  
 
CONFIGURE_VARS += \  
CXX="g++-uc" \  
CXXFLAGS="$$$$CXXFLAGS -fno-rtti" \  
EXAMPLES=0 \  
 
define Build/Compile  
$(MAKE) -C $(PKG_BUILD_DIR) \  
$(TARGET_CONFIGURE_OPTS) \  
DESTDIR="$(PKG_INSTALL_DIR)" \  
WARNING_CXXFLAGS="-Wall" \  
all install  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include/urbi  
$(CP) $(PKG_INSTALL_DIR)/usr/include/urbi* $(1)/usr/include/urbi/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/liburbi* $(1)/usr/lib/  
endef  
 
define Package/urbi/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/  
$(INSTALL_DIR) $(1)/usr/gostai  
$(CP) $(PKG_INSTALL_DIR)/usr/gostai/* $(1)/usr/gostai/  
endef  
 
$(eval $(call BuildPackage,urbi))  
 
diff -urN urbi-sdk/src/Makefile.am urbi-sdk.new/src/Makefile.am  
--- urbi-sdk/src/Makefile.am 2007-01-31 11:37:04.000000000 +0100  
+++ urbi-sdk.new/src/Makefile.am 2007-10-03 11:17:00.000000000 +0200  
@@ -1,5 +1,5 @@  
SUBDIRS = liburbi  
 
if EXAMPLES  
-SUBDIRS += utils examples  
+SUBDIRS += utils  
endif  
diff -urN urbi-sdk/src/Makefile.in urbi-sdk.new/src/Makefile.in  
--- urbi-sdk/src/Makefile.in 2007-04-10 17:44:07.000000000 +0200  
+++ urbi-sdk.new/src/Makefile.in 2007-10-03 11:14:33.000000000 +0200  
@@ -30,7 +30,7 @@  
POST_UNINSTALL = :  
build_triplet = @build@  
host_triplet = @host@  
-@EXAMPLES_TRUE@am__append_1 = utils examples  
+@EXAMPLES_TRUE@am__append_1 = utils  
subdir = src  
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
@@ -68,7 +68,7 @@  
distclean-recursive maintainer-clean-recursive  
ETAGS = etags  
CTAGS = ctags  
-DIST_SUBDIRS = liburbi utils examples  
+DIST_SUBDIRS = liburbi utils  
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)  
INSTALL_HEADER = @INSTALL_HEADER@  
ACLOCAL = @ACLOCAL@  
 
diff --git a/libport/semaphore.hxx b/libport/semaphore.hxx  
index bb2546d..38b0d8e 100644  
--- a/libport/semaphore.hxx  
+++ b/libport/semaphore.hxx  
@@ -5,6 +5,7 @@  
# include "exception.hh"  
# include <sstream>  
# include <string>  
+# include <cstring>  
 
namespace libport  
{  
--- a/src/liburbi/uconversion.cc 2007-01-31 11:37:04.000000000 +0100  
+++ b/src/liburbi/uconversion.cc 2010-03-29 09:43:00.000000000 +0200  
@@ -1,5 +1,7 @@  
#include "urbi/uconversion.hh"  
 
+#include <cstdio>  
+  
#ifndef NO_IMAGE_CONVERSION  
# include <setjmp.h>  
 
 
file:a/lang/vala/Makefile (deleted)
#  
# Copyright (C) 2006-2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=vala  
PKG_VERSION:=0.16.0  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz  
PKG_SOURCE_URL:=@GNOME/vala/0.16/  
PKG_MD5SUM:=84b742e9cca4c90fde3026c3793c03c1  
 
PKG_BUILD_DEPENDS:=glib2/host vala/host  
HOST_BUILD_DEPENDS:=glib2/host  
 
include $(INCLUDE_DIR)/host-build.mk  
include $(INCLUDE_DIR)/package.mk  
include $(INCLUDE_DIR)/nls.mk  
 
TARGET_LDFLAGS+=\  
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib  
 
define Package/vala  
SECTION:=lang  
CATEGORY:=Languages  
TITLE:=C-sharp like language for the GObject system  
URL:=http://live.gnome.org/Vala  
endef  
 
define Package/vala/description  
Vala is a C-sharp like language for the GObject system. This package contains  
the Vala-to-C compiler.  
endef  
 
define Build/Compile  
$(MAKE) -C $(PKG_BUILD_DIR) \  
DESTDIR="$(PKG_INSTALL_DIR)" \  
all install  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) \  
$(1)/usr/share/vala-0.16/vapi \  
$(1)/usr/lib \  
$(1)/usr/share/pkgconfig \  
$(1)/usr/bin  
 
$(INSTALL_DATA) \  
$(PKG_INSTALL_DIR)/usr/share/vala-0.16/vapi/* \  
$(1)/usr/share/vala-0.16/vapi  
 
$(INSTALL_DATA) \  
$(PKG_INSTALL_DIR)/usr/lib/libvala-0.16.{so*,la} \  
$(1)/usr/lib  
 
$(INSTALL_BIN) \  
$(PKG_INSTALL_DIR)/usr/bin/{vala,vala-0.16,valac,valac-0.16,vapicheck,vapicheck-0.16,vapigen,vapigen-0.16,vala-gen-introspect,vala-gen-introspect-0.16} \  
$(1)/usr/bin  
 
$(INSTALL_DATA) \  
$(PKG_INSTALL_DIR)/usr/share/pkgconfig/*.pc \  
$(1)/usr/share/pkgconfig  
endef  
 
$(eval $(call HostBuild))  
$(eval $(call BuildPackage,vala))  
 
#  
# Copyright (C) 2006-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=bluez-libs  
PKG_VERSION:=3.36  
PKG_RELEASE:=3  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://bluez.sourceforge.net/download  
PKG_MD5SUM:=8c2ca546c0e7bb73dbd0e906fce7f6b1  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/bluez-libs  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=Bluetooth library  
URL:=http://www.bluez.org/  
endef  
 
CONFIGURE_ARGS += \  
--enable-shared \  
--enable-static \  
 
TARGET_CFLAGS += $(FPIC)  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include/bluetooth  
$(CP) $(PKG_INSTALL_DIR)/usr/include/bluetooth/*.h $(1)/usr/include/bluetooth  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.{a,so*} $(1)/usr/lib/  
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/bluez.pc $(1)/usr/lib/pkgconfig/  
endef  
 
define Package/bluez-libs/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,bluez-libs))  
 
diff --git a/configure b/configure  
index 6a387c6..5ffc003 100755  
--- a/configure  
+++ b/configure  
@@ -2430,10 +2430,6 @@ fi  
prefix="${ac_default_prefix}"  
fi  
 
- if (test "${libdir}" = '${exec_prefix}/lib'); then  
- libdir="${prefix}/lib"  
- fi  
-  
if (test "$sysconfdir" = '${prefix}/etc'); then  
configdir="${prefix}/etc/bluetooth"  
else  
 
file:a/libs/boost/Makefile (deleted)
#  
# Copyright (C) 2009-2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
# Dude, this "boost" is really one of the most crude stuff I ported yet.  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=boost  
PKG_VERSION:=1_51_0  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@SF/boost  
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)  
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)_$(PKG_VERSION)  
PKG_MD5SUM:=6a1f32d902203ac70fbec78af95b3cf8  
 
PKG_BUILD_DEPENDS:=boost/host  
PKG_BUILD_PARALLEL:=0  
PKG_USE_MIPS16:=0  
 
PKG_CONFIG_DEPENDS := \  
CONFIG_PACKAGE_boost-date_time \  
CONFIG_PACKAGE_boost-filesystem \  
CONFIG_PACKAGE_boost-graph \  
CONFIG_PACKAGE_boost-iostreams \  
CONFIG_PACKAGE_boost-math \  
CONFIG_PACKAGE_boost-program_options \  
CONFIG_PACKAGE_boost-python \  
CONFIG_PACKAGE_boost-regex \  
CONFIG_PACKAGE_boost-serialization \  
CONFIG_PACKAGE_boost-signals \  
CONFIG_PACKAGE_boost-system \  
CONFIG_PACKAGE_boost-test \  
CONFIG_PACKAGE_boost-thread \  
CONFIG_PACKAGE_boost-wave \  
 
include $(INCLUDE_DIR)/package.mk  
include $(INCLUDE_DIR)/host-build.mk  
 
define Package/boost/Default  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=Boost C++ source libraries  
URL:=http://www.boost.org  
DEPENDS:=+libstdcpp +libpthread +librt  
MAINTAINER:=Mirko Vogt <mirko@openwrt.org>  
endef  
 
define Package/boost/Default/description  
Boost provides free peer-reviewed portable C++ source libraries  
endef  
 
define Package/boost-chrono  
$(call Package/boost/Default)  
TITLE+= (chrono)  
DEPENDS+= +boost-system  
endef  
 
define Package/boost-date_time  
$(call Package/boost/Default)  
TITLE+= (date_time)  
endef  
 
define Package/boost-exception  
$(call Package/boost/Default)  
TITLE+= (exception)  
endef  
 
define Package/boost-filesystem  
$(call Package/boost/Default)  
TITLE+= (filesystem)  
DEPENDS+= +boost-system  
endef  
 
define Package/boost-graph  
$(call Package/boost/Default)  
TITLE+= (graph)  
DEPENDS+= +boost-regex  
endef  
 
define Package/boost-graph_parallel  
$(call Package/boost/Default)  
TITLE+= (graph_parallel)  
endef  
 
define Package/boost-iostreams  
$(call Package/boost/Default)  
TITLE+= (iostreams)  
DEPENDS+= +zlib  
endef  
 
define Package/boost-locale  
$(call Package/boost/Default)  
TITLE+= (locale)  
endef  
 
define Package/boost-math  
$(call Package/boost/Default)  
TITLE+= (math)  
endef  
 
define Package/boost-mpi  
$(call Package/boost/Default)  
TITLE+= (mpi)  
endef  
 
define Package/boost-program_options  
$(call Package/boost/Default)  
TITLE+= (program_options)  
endef  
 
define Package/boost-python  
$(call Package/boost/Default)  
TITLE+= (python)  
DEPENDS+= +PACKAGE_boost-python:python  
endef  
 
define Package/boost-random  
$(call Package/boost/Default)  
TITLE+= (random)  
endef  
 
define Package/boost-regex  
$(call Package/boost/Default)  
TITLE+= (regex)  
endef  
 
define Package/boost-serialization  
$(call Package/boost/Default)  
TITLE+= (serialization)  
endef  
 
define Package/boost-signals  
$(call Package/boost/Default)  
TITLE+= (signals)  
endef  
 
define Package/boost-system  
$(call Package/boost/Default)  
TITLE+= (system)  
endef  
 
define Package/boost-test  
$(call Package/boost/Default)  
TITLE+= (test)  
endef  
 
define Package/boost-thread  
$(call Package/boost/Default)  
TITLE+= (thread)  
DEPENDS+= +boost-system +boost-chrono  
endef  
 
define Package/boost-timer  
$(call Package/boost/Default)  
TITLE+= (timer)  
DEPENDS+= boost-chrono  
endef  
 
define Package/boost-wave  
$(call Package/boost/Default)  
TITLE+= (wave)  
DEPENDS+= +boost-date_time +boost-thread +boost-filesystem  
endef  
 
define Package/boost  
$(call Package/boost/Default)  
TITLE+= (header-only)  
BUILDONLY:=1  
endef  
 
define Build/Configure  
endef  
 
define Host/Compile  
# bjam does not provide a configure-script nor a Makefile  
( cd $(HOST_BUILD_DIR)/tools/build/v2/engine ; ./build.sh gcc )  
endef  
 
CONFIGURE_PREFIX:=$(PKG_INSTALL_DIR)  
TARGET_LDFLAGS += -pthread -lrt  
 
define Build/Compile  
( cd $(PKG_BUILD_DIR) ; \  
echo "using gcc : $(ARCH) : $(GNU_TARGET_NAME)-gcc : <compileflags>\"$(TARGET_CFLAGS)\" <cxxflags>\"$(TARGET_CXXFLAGS)\" <linkflags>\"$(TARGET_LDFLAGS)\" ;" > tools/build/v2/user-config.jam ; \  
$(if $(CONFIG_PACKAGE_boost-python), \  
echo "using python : : $(STAGING_DIR_ROOT)/usr/bin/python : $(STAGING_DIR)/usr/include/python2.7/ ;" >> \  
tools/build/v2/user-config.jam; \  
) \  
bjam \  
'-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \  
--toolset=gcc-$(ARCH) --build-type=minimal --layout=system \  
--disable-long-double \  
$(CONFIGURE_ARGS) \  
$(if $(CONFIG_PACKAGE_boost-chrono),,--without-chrono) \  
$(if $(CONFIG_PACKAGE_boost-date_time),,--without-date_time) \  
$(if $(CONFIG_PACKAGE_boost-exception),,--without-exception) \  
$(if $(CONFIG_PACKAGE_boost-filesystem),,--without-filesystem) \  
$(if $(CONFIG_PACKAGE_boost-graph),,--without-graph) \  
$(if $(CONFIG_PACKAGE_boost-graph_parallel),,--without-graph_parallel) \  
$(if $(CONFIG_PACKAGE_boost-iostreams),,--without-iostreams) \  
$(if $(CONFIG_PACKAGE_boost-locale),,--without-locale) \  
$(if $(CONFIG_PACKAGE_boost-math),,--without-math) \  
$(if $(CONFIG_PACKAGE_boost-mpi),,--without-mpi) \  
$(if $(CONFIG_PACKAGE_boost-program_options),,--without-program_options) \  
$(if $(CONFIG_PACKAGE_boost-python),,--without-python) \  
$(if $(CONFIG_PACKAGE_boost-random),,--without-random) \  
$(if $(CONFIG_PACKAGE_boost-regex),,--without-regex) \  
$(if $(CONFIG_PACKAGE_boost-serialization),,--without-serialization) \  
$(if $(CONFIG_PACKAGE_boost-signals),,--without-signals) \  
$(if $(CONFIG_PACKAGE_boost-system),,--without-system) \  
$(if $(CONFIG_PACKAGE_boost-test),,--without-test) \  
$(if $(CONFIG_PACKAGE_boost-thread),,--without-thread) \  
$(if $(CONFIG_PACKAGE_boost-timer),,--without-timer) \  
$(if $(CONFIG_PACKAGE_boost-wave),,--without-wave) \  
\  
$(if $(CONFIG_PACKAGE_boost-iostreams),-sNO_BZIP2=1 -sZLIB_INCLUDE=$(STAGING_DIR)/usr/include \  
-sZLIB_LIBPATH=$(STAGING_DIR)/usr/lib) \  
install \  
)  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) \  
$(1)/usr/include/boost/  
 
$(CP) \  
$(PKG_INSTALL_DIR)/include/boost/* \  
$(1)/usr/include/boost/ \  
# copies _all_ header files - independent of <--with-library>-argument above  
 
if [ -d $(PKG_INSTALL_DIR)/lib ]; then \  
$(INSTALL_DIR) \  
$(1)/usr/lib; \  
$(CP) \  
$(PKG_INSTALL_DIR)/lib/*.a \  
$(1)/usr/lib/; \  
$(CP) \  
$(PKG_INSTALL_DIR)/lib/*.so* \  
$(1)/usr/lib/; \  
fi  
endef  
 
define Host/Install  
$(INSTALL_DIR) \  
$(STAGING_DIR_HOST)/bin  
 
$(CP) \  
$(HOST_BUILD_DIR)/tools/build/v2/engine/bin.*/bjam \  
$(STAGING_DIR_HOST)/bin/  
endef  
 
define Package/boost/Default/install  
$(INSTALL_DIR) \  
$(1)/usr/lib  
 
$(CP) \  
$(PKG_INSTALL_DIR)/lib/libboost_$(2)*.so* \  
$(1)/usr/lib/  
endef  
 
define Package/boost-chrono/install  
$(call Package/boost/Default/install,$(1),chrono)  
endef  
 
define Package/boost-date_time/install  
$(call Package/boost/Default/install,$(1),date_time)  
endef  
 
define Package/boost-exception/install  
$(call Package/boost/Default/install,$(1),exception)  
endef  
 
define Package/boost-filesystem/install  
$(call Package/boost/Default/install,$(1),filesystem)  
endef  
 
define Package/boost-graph/install  
$(call Package/boost/Default/install,$(1),graph)  
endef  
 
define Package/boost-graph_parallel/install  
$(call Package/boost/Default/install,$(1),graph_parallel)  
endef  
 
define Package/boost-iostreams/install  
$(call Package/boost/Default/install,$(1),iostreams)  
endef  
 
define Package/boost-math/install  
$(call Package/boost/Default/install,$(1),math)  
endef  
 
define Package/boost-mpi/install  
$(call Package/boost/Default/install,$(1),mpi)  
endef  
 
define Package/boost-program_options/install  
$(call Package/boost/Default/install,$(1),program_options)  
endef  
 
define Package/boost-python/install  
$(call Package/boost/Default/install,$(1),python)  
endef  
 
define Package/boost-random/install  
$(call Package/boost/Default/install,$(1),random)  
endef  
 
define Package/boost-regex/install  
$(call Package/boost/Default/install,$(1),regex)  
endef  
 
define Package/boost-serialization/install  
$(call Package/boost/Default/install,$(1),serialization)  
endef  
 
define Package/boost-signals/install  
$(call Package/boost/Default/install,$(1),signals)  
endef  
 
define Package/boost-system/install  
$(call Package/boost/Default/install,$(1),system)  
endef  
 
define Package/boost-test/install  
$(INSTALL_DIR) \  
$(1)/usr/lib  
 
$(CP) \  
$(PKG_INSTALL_DIR)/lib/libboost_unit_test_framework*.so* \  
$(1)/usr/lib/  
 
$(CP) \  
$(PKG_INSTALL_DIR)/lib/libboost_prg_exec_monitor*.so* \  
$(1)/usr/lib/  
endef  
 
define Package/boost-thread/install  
$(call Package/boost/Default/install,$(1),thread)  
endef  
 
define Package/boost-timer/install  
$(call Package/boost/Default/install,$(1),timer)  
endef  
 
define Package/boost-wave/install  
$(call Package/boost/Default/install,$(1),wave)  
endef  
 
$(eval $(call HostBuild))  
$(eval $(call BuildPackage,boost))  
$(eval $(call BuildPackage,boost-chrono))  
$(eval $(call BuildPackage,boost-date_time))  
#$(eval $(call BuildPackage,boost-exception))  
$(eval $(call BuildPackage,boost-filesystem))  
$(eval $(call BuildPackage,boost-graph))  
#$(eval $(call BuildPackage,boost-graph_parallel))  
$(eval $(call BuildPackage,boost-iostreams))  
$(eval $(call BuildPackage,boost-locale))  
$(eval $(call BuildPackage,boost-math))  
#$(eval $(call BuildPackage,boost-mpi))  
$(eval $(call BuildPackage,boost-program_options))  
$(eval $(call BuildPackage,boost-random))  
$(eval $(call BuildPackage,boost-python))  
$(eval $(call BuildPackage,boost-regex))  
$(eval $(call BuildPackage,boost-serialization))  
$(eval $(call BuildPackage,boost-signals))  
$(eval $(call BuildPackage,boost-system))  
$(eval $(call BuildPackage,boost-test))  
$(eval $(call BuildPackage,boost-thread))  
$(eval $(call BuildPackage,boost-timer))  
$(eval $(call BuildPackage,boost-wave))  
 
--- a/tools/build/v2/tools/gcc.jam  
+++ b/tools/build/v2/tools/gcc.jam  
@@ -1063,8 +1063,7 @@ rule setup-threading ( targets * : sourc  
}  
case * :  
{  
- option = -pthread ;  
- libs = rt ;  
+ # pass appropriate options via OpenWrt  
}  
}  
 
--- a/tools/build/v2/tools/gcc.py  
+++ b/tools/build/v2/tools/gcc.py  
@@ -685,8 +685,8 @@ elif bjam.variable('UNIX'):  
# Darwin has no threading options, don't set anything here.  
pass  
else:  
- flags('gcc', 'OPTIONS', ['<threading>multi'], ['-pthread'])  
- flags('gcc', 'FINDLIBS-SA', [], ['rt'])  
+ # pass appropriate options via OpenWrt  
+ pass  
 
def cpu_flags(toolset, variable, architecture, instruction_set, values, default=None):  
#FIXME: for some reason this fails. Probably out of date feature code  
 
--- a/libs/context/src/fcontext.cpp.new 2012-12-11 17:59:59.349131458 +0100  
+++ b/libs/context/src/fcontext.cpp 2012-12-11 18:00:06.925131652 +0100  
@@ -9,6 +9,9 @@  
#include <boost/context/fcontext.hpp>  
 
#include <cstddef>  
+extern "C" {  
+#include <stdint.h>  
+}  
 
#ifdef BOOST_HAS_ABI_HEADERS  
# include BOOST_ABI_PREFIX  
 
file:a/libs/check/Makefile (deleted)
#  
# Copyright (C) 2008-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=check  
PKG_VERSION:=0.9.8  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@SF/check  
PKG_MD5SUM:=5d75e9a6027cde79d2c339ef261e7470  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
TARGET_CFLAGS += $(FPIC)  
 
define Package/check  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=Unit testing framework for C  
URL:=http://check.sourceforge.net/  
DEPENDS:= +libpthread  
endef  
 
define Package/check/description  
Check features a simple interface for defining unit tests, putting little in  
the way of the developer. Tests are run in a separate address space, so Check  
can catch both assertion failures and code errors that cause segmentation  
faults or other signals. The output from unit tests can be used within source  
code editors and IDEs.  
endef  
 
define Build/Configure  
$(CP) $(SCRIPT_DIR)/config.* $(PKG_BUILD_DIR)/build-aux/  
$(call Build/Configure/Default)  
endef  
 
define Build/Install  
$(call Build/Install/Default)  
cd $(PKG_INSTALL_DIR)/usr/lib/ ; ln -nsf libcheck.so libcheck_pic.so  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)  
$(CP) $(PKG_INSTALL_DIR)/* $(1)/  
endef  
 
define Package/check/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcheck.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,check))  
 
file:a/libs/classpath/Makefile (deleted)
#  
# Copyright (C) 2006-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=classpath  
PKG_VERSION:=0.98  
PKG_RELEASE:=4  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@GNU/classpath  
PKG_MD5SUM:=90c6571b8b0309e372faa0f9f6255ea9  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/classpath  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=GNU Classpath  
URL:=http://www.gnu.org/software/classpath/  
MAINTAINER:=Roberto Riggio <roberto.riggio@create-net.org>  
DEPENDS:=+alsa-lib +libgmp +libmagic  
endef  
 
define Package/classpath/Description  
GNU Classpath, Essential Libraries for Java, is a GNU project  
to create free core class libraries for use with virtual  
machines and compilers for the java programming language.  
endef  
 
define Package/classpath-tools  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=GNU Classpath tools  
URL:=http://www.gnu.org/software/classpath/  
MAINTAINER:=Roberto Riggio <roberto.riggio@create-net.org>  
endef  
 
define Download/antlr  
URL:=http://www.antlr.org/download  
FILE:=antlr-3.4-complete.jar  
MD5SUM:=1b91dea1c7d480b3223f7c8a9aa0e172  
endef  
$(eval $(call Download,antlr))  
 
CONFIGURE_ARGS += \  
--without-x \  
--disable-gtk-peer \  
--disable-qt-peer \  
--disable-dssi \  
--disable-plugin \  
--disable-gconf-peer \  
--disable-gjdoc \  
--with-antlr-jar=$(DL_DIR)/antlr-3.4-complete.jar  
 
define Package/classpath/install  
$(INSTALL_DIR) \  
$(1)/usr/lib/classpath \  
$(1)/usr/share/classpath  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/lib/security \  
$(PKG_INSTALL_DIR)/usr/lib/logging.properties \  
$(1)/usr/lib/  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/classpath/*.so* $(1)/usr/lib/classpath/  
$(CP) $(PKG_INSTALL_DIR)/usr/share/classpath/glibj.zip $(1)/usr/share/classpath/  
endef  
 
define Package/classpath-tools/install  
$(INSTALL_DIR) \  
$(1)/usr/bin \  
$(1)/usr/share/classpath  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/share/classpath/tools.zip $(1)/usr/share/classpath/  
endef  
 
define Build/InstallDev  
$(CP) $(PKG_INSTALL_DIR)/* $(1)/  
endef  
 
$(eval $(call BuildPackage,classpath))  
$(eval $(call BuildPackage,classpath-tools))  
 
Index: classpath-0.98/configure.ac  
===================================================================  
--- classpath-0.98.orig/configure.ac 2009-02-06 00:26:08.000000000 +0100  
+++ classpath-0.98/configure.ac 2012-08-22 10:18:53.325876508 +0200  
@@ -762,8 +762,7 @@  
dnl change the name of the corresponding ac_ variable on lines 860...  
if test "x${COMPILE_GMP}" = xyes; then  
AC_CHECK_LIB(gmp, __gmpz_mul_si,  
- [GMP_CFLAGS=-I/usr/include  
- GMP_LIBS=-lgmp ],  
+ [GMP_LIBS=-lgmp ],  
[GMP_CFLAGS=  
GMP_LIBS= ])  
AC_SUBST(GMP_CFLAGS)  
 
# #
# Copyright (C) 2006-2010 OpenWrt.org # Copyright (C) 2006-2010 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
   
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
   
PKG_NAME:=clearsilver PKG_NAME:=clearsilver
PKG_VERSION:=0.10.5 PKG_VERSION:=0.10.5
PKG_RELEASE:=5 PKG_RELEASE:=5
   
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.clearsilver.net/downloads/ PKG_SOURCE_URL:=http://www.clearsilver.net/downloads/
PKG_MD5SUM:=b8c0c7fbe0ef5e06e0c935f134304d44 PKG_MD5SUM:=b8c0c7fbe0ef5e06e0c935f134304d44
   
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_CLEARSILVER_ENABLE_COMPRESSION \ CONFIG_CLEARSILVER_ENABLE_COMPRESSION \
CONFIG_CLEARSILVER_ENABLE_REMOTE_DEBUGGER \ CONFIG_CLEARSILVER_ENABLE_REMOTE_DEBUGGER \
CONFIG_CLEARSILVER_ENABLE_GETTEXT CONFIG_CLEARSILVER_ENABLE_GETTEXT
   
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=0 PKG_BUILD_PARALLEL:=0
   
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
   
define Package/clearsilver define Package/clearsilver
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=ClearSilver template system TITLE:=ClearSilver template system
URL:=http://www.clearsilver.net/ URL:=http://www.clearsilver.net/
MAINTAINER:=Raphaël HUCK <rhk@cksum.org>
DEPENDS:=+CLEARSILVER_ENABLE_COMPRESSION:zlib +CLEARSILVER_ENABLE_GETTEXT:libintl DEPENDS:=+CLEARSILVER_ENABLE_COMPRESSION:zlib +CLEARSILVER_ENABLE_GETTEXT:libintl
endef endef
   
define Package/clearsilver/config define Package/clearsilver/config
menu "Configuration" menu "Configuration"
depends on PACKAGE_clearsilver depends on PACKAGE_clearsilver
source "$(SOURCE)/Config.in" source "$(SOURCE)/Config.in"
endmenu endmenu
endef endef
   
define Package/clearsilver/description define Package/clearsilver/description
Clearsilver is a fast, powerful, and language-neutral HTML template system. In Clearsilver is a fast, powerful, and language-neutral HTML template system. In
both static content sites and dynamic HTML applications, it provides a separation both static content sites and dynamic HTML applications, it provides a separation
between presentation code and application logic which makes working with your between presentation code and application logic which makes working with your
project easier. project easier.
endef endef
   
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--disable-wdb \ --disable-wdb \
--disable-apache \ --disable-apache \
--disable-python \ --disable-python \
--disable-perl \ --disable-perl \
--disable-ruby \ --disable-ruby \
--disable-java \ --disable-java \
--disable-csharp \ --disable-csharp \
--prefix=/usr --prefix=/usr
   
ifeq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_COMPRESSION),y) ifeq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_COMPRESSION),y)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--enable-compression --enable-compression
else else
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--disable-compression --disable-compression
endif endif
   
ifeq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_REMOTE_DEBUGGER),y) ifeq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_REMOTE_DEBUGGER),y)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--enable-remote-debugger --enable-remote-debugger
else else
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--disable-remote-debugger --disable-remote-debugger
endif endif
   
ifeq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_GETTEXT),y) ifeq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_GETTEXT),y)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--enable-gettext --enable-gettext
else else
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--disable-gettext --disable-gettext
endif endif
   
TARGET_CFLAGS+=$(FPIC) TARGET_CFLAGS+=$(FPIC)
   
MAKE_FLAGS+= \ MAKE_FLAGS+= \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
AR="$(AR) cr" \ AR="$(AR) cr" \
LD="$(TARGET_CC) -o" \ LD="$(TARGET_CC) -o" \
OSTYPE=Linux OSTYPE=Linux
   
define Build/InstallDev define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/* $(1)/ $(CP) $(PKG_INSTALL_DIR)/* $(1)/
endef endef
   
define Package/clearsilver/install define Package/clearsilver/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
endef endef
   
$(eval $(call BuildPackage,clearsilver)) $(eval $(call BuildPackage,clearsilver))
   
file:a/libs/elfutils/Makefile (deleted)
#  
# Copyright (C) 2010-2013 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=elfutils  
PKG_VERSION:=0.155  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=http://fedorahosted.org/releases/e/l/$(PKG_NAME)/$(PKG_VERSION)  
PKG_MD5SUM:=163a5712b86f6bdfebdf233cc6e2192d  
 
PKG_INSTALL:=1  
PKG_USE_MIPS16:=0  
 
PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone  
 
include $(INCLUDE_DIR)/package.mk  
include $(INCLUDE_DIR)/nls.mk  
 
define Package/elfutils/Default  
SECTION:=libs  
CATEGORY:=Libraries  
DEPENDS:=$(INTL_DEPENDS)  
TITLE:=ELF manipulation libraries  
URL:=https://fedorahosted.org/elfutils/  
endef  
 
define Package/libdw  
$(call Package/elfutils/Default)  
DEPENDS:=libelf1 +zlib +libbz2  
TITLE+= (libdw)  
endef  
 
define Package/libelf1  
$(call Package/elfutils/Default)  
TITLE+= (libelf)  
endef  
 
ifeq ($(CONFIG_BUILD_NLS),y)  
TARGET_LDFLAGS += "-lintl"  
endif  
 
ifdef CONFIG_USE_UCLIBC  
CONFIGURE_VARS += \  
LIBS="-largp"  
endif  
 
CONFIGURE_ARGS += \  
--disable-werror \  
--without-lzma  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_BUILD_DIR)/libdw/libdw.{a,so*} $(1)/usr/lib/  
$(CP) $(PKG_BUILD_DIR)/libelf/libelf.{a,so*} $(1)/usr/lib/  
endef  
 
define Package/libdw/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_BUILD_DIR)/libdw/libdw.so* $(1)/usr/lib/  
endef  
 
define Package/libelf1/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_BUILD_DIR)/libelf/libelf.so* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,libdw))  
$(eval $(call BuildPackage,libelf1))  
 
--- elfutils/backends/ChangeLog  
+++ elfutils/backends/ChangeLog  
@@ -135,6 +135,10 @@  
* ppc_attrs.c (ppc_check_object_attribute): Handle tag  
GNU_Power_ABI_Struct_Return.  
 
+2009-01-23 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (libebl_%.so): Use $(LD_AS_NEEDED).  
+  
2008-10-04 Ulrich Drepper <drepper@redhat.com>  
 
* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and  
@@ -462,6 +466,11 @@  
* sparc_init.c: Likewise.  
* x86_64_init.c: Likewise.  
 
+2005-11-22 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (LD_AS_NEEDED): New variable, substituted by configure.  
+ (libebl_%.so rule): Use it in place of -Wl,--as-needed.  
+  
2005-11-19 Roland McGrath <roland@redhat.com>  
 
* ppc64_reloc.def: REL30 -> ADDR30.  
@@ -484,6 +493,9 @@  
* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).  
(CLEANFILES): Add libebl_$(m).so.  
 
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
* ppc_reloc.def: Update bits per Alan Modra <amodra@bigpond.net.au>.  
* ppc64_reloc.def: Likewise.  
 
--- elfutils/backends/Makefile.am  
+++ elfutils/backends/Makefile.am  
@@ -111,7 +111,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a  
$(LINK) -shared -o $(@:.map=.so) \  
-Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \  
-Wl,--version-script,$(@:.so=.map) \  
- -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)  
+ -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)  
$(textrel_check)  
 
libebl_i386.so: $(cpu_i386)  
--- elfutils/backends/Makefile.in  
+++ elfutils/backends/Makefile.in  
@@ -38,7 +38,8 @@ build_triplet = @build@  
host_triplet = @host@  
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \  
$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
subdir = backends  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \  
@@ -172,6 +173,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -201,6 +203,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = @VERSION@  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -263,10 +266,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi  
-I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \  
-I$(top_srcdir)/libelf -I$(top_srcdir)/libdw  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1)  
+ $(am__append_1) $(am__append_2)  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
@@ -725,7 +727,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a  
$(LINK) -shared -o $(@:.map=.so) \  
-Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \  
-Wl,--version-script,$(@:.so=.map) \  
- -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)  
+ -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)  
$(textrel_check)  
 
libebl_i386.so: $(cpu_i386)  
--- elfutils/ChangeLog  
+++ elfutils/ChangeLog  
@@ -16,6 +16,8 @@  
 
2012-01-24 Mark Wielaard <mjw@redhat.com>  
 
+ * configure.ac: Wrap AC_COMPILE_IFELSE sources in AC_LANG_SOURCE.  
+  
* COPYING: Fix address. Updated version from gnulib.  
 
2012-01-23 Mark Wielaard <mjw@redhat.com>  
@@ -34,6 +36,9 @@  
 
2011-10-08 Mike Frysinger <vapier@gentoo.org>  
 
+ * configure.ac (--disable-werror): Handle it, controlling BUILD_WERROR  
+ automake option.  
+  
* configure.ac: Fix use of AC_ARG_ENABLE to handle $enableval correctly.  
 
2011-10-02 Ulrich Drepper <drepper@gmail.com>  
@@ -55,6 +60,10 @@  
 
* configure.ac (LOCALEDIR, DATADIRNAME): Removed.  
 
+2009-11-22 Roland McGrath <roland@redhat.com>  
+  
+ * configure.ac: Use sed and expr instead of modern bash extensions.  
+  
2009-09-21 Ulrich Drepper <drepper@redhat.com>  
 
* configure.ac: Update for more modern autoconf.  
@@ -63,6 +72,10 @@  
 
* configure.ac (zip_LIBS): Check for liblzma too.  
 
+2009-08-17 Roland McGrath <roland@redhat.com>  
+  
+ * configure.ac: Check for -fgnu89-inline; add it to WEXTRA if it works.  
+  
2009-04-19 Roland McGrath <roland@redhat.com>  
 
* configure.ac (eu_version): Round down here, not in version.h macros.  
@@ -74,6 +87,8 @@  
 
2009-01-23 Roland McGrath <roland@redhat.com>  
 
+ * configure.ac: Check for __builtin_popcount.  
+  
* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.  
 
* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of  
@@ -154,6 +169,10 @@  
* configure.ac: Add dummy automake conditional to get dependencies  
for non-generic linker right. See src/Makefile.am.  
 
+2005-11-22 Roland McGrath <roland@redhat.com>  
+  
+ * configure.ac: Check for --as-needed linker option.  
+  
2005-11-18 Roland McGrath <roland@redhat.com>  
 
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.  
@@ -201,6 +220,17 @@  
* Makefile.am (all_SUBDIRS): Add libdwfl.  
* configure.ac: Write libdwfl/Makefile.  
 
+2005-05-31 Roland McGrath <roland@redhat.com>  
+  
+ * configure.ac (WEXTRA): Check for -Wextra and set this substitution.  
+  
+ * configure.ac: Check for struct stat st_?tim members.  
+ * src/strip.c (process_file): Use st_?time if st_?tim are not there.  
+  
+ * configure.ac: Check for futimes function.  
+ * src/strip.c (handle_elf) [! HAVE_FUTIMES]: Use utimes instead.  
+ (handle_ar) [! HAVE_FUTIMES]: Likewise.  
+  
2005-05-19 Roland McGrath <roland@redhat.com>  
 
* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.  
--- elfutils/config/ChangeLog  
+++ elfutils/config/ChangeLog  
@@ -19,6 +19,10 @@  
 
* known-dwarf.awk: Use gawk.  
 
+2011-10-08 Mike Frysinger <vapier@gentoo.org>  
+  
+ * eu.am [BUILD_WERROR]: Conditionalize -Werror use on this.  
+  
2010-07-02 Ulrich Drepper <drepper@redhat.com>  
 
* elfutils.spec.in: Add more BuildRequires.  
--- elfutils/config/eu.am  
+++ elfutils/config/eu.am  
@@ -1,6 +1,6 @@  
## Common automake fragments for elfutils subdirectory makefiles.  
##  
-## Copyright (C) 2010 Red Hat, Inc.  
+## Copyright (C) 2010-2011 Red Hat, Inc.  
##  
## This file is part of elfutils.  
##  
@@ -29,14 +29,20 @@  
## not, see <http://www.gnu.org/licenses/>.  
##  
 
+WEXTRA = @WEXTRA@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
+  
DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'  
INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow \  
- $(if $($(*F)_no_Werror),,-Werror) \  
- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \  
+ $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \  
$(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \  
$($(*F)_CFLAGS)  
 
+if BUILD_WERROR  
+AM_CFLAGS += $(if $($(*F)_no_Werror),,-Werror)  
+endif  
+  
if MUDFLAP  
AM_CFLAGS += -fmudflap  
libmudflap = -lmudflap  
--- elfutils/config/Makefile.in  
+++ elfutils/config/Makefile.in  
@@ -76,6 +76,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -105,6 +106,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = @VERSION@  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
--- elfutils/config.h.in  
+++ elfutils/config.h.in  
@@ -6,6 +6,9 @@  
/* Defined if libdw should support GNU ref_alt FORM, dwz multi files. */  
#undef ENABLE_DWZ  
 
+/* Have __builtin_popcount. */  
+#undef HAVE_BUILTIN_POPCOUNT  
+  
/* $libdir subdirectory containing libebl modules. */  
#undef LIBEBL_SUBDIR  
 
@@ -64,4 +67,7 @@  
/* Define for large files, on AIX-style hosts. */  
#undef _LARGE_FILES  
 
+/* Stubbed out if missing compiler support. */  
+#undef __thread  
+  
#include <eu-config.h>  
--- elfutils/configure  
+++ elfutils/configure  
@@ -598,6 +598,8 @@ ZLIB_TRUE  
LIBEBL_SUBDIR  
TESTS_RPATH_FALSE  
TESTS_RPATH_TRUE  
+BUILD_WERROR_FALSE  
+BUILD_WERROR_TRUE  
BUILD_STATIC_FALSE  
BUILD_STATIC_TRUE  
GCOV_FALSE  
@@ -612,6 +614,8 @@ NEVER_TRUE  
base_cpu  
NATIVE_LD_FALSE  
NATIVE_LD_TRUE  
+LD_AS_NEEDED  
+WEXTRA  
LEXLIB  
LEX_OUTPUT_ROOT  
LEX  
@@ -726,6 +730,7 @@ enable_mudflap  
enable_debugpred  
enable_gprof  
enable_gcov  
+enable_werror  
enable_tests_rpath  
enable_libebl_subdir  
with_zlib  
@@ -1379,6 +1384,7 @@ Optional Features:  
prediction  
--enable-gprof build binaries with gprof support  
--enable-gcov build binaries with gcov support  
+ --disable-werror do not build with -Werror  
--enable-tests-rpath build $ORIGIN-using rpath into tests  
--enable-libebl-subdir=DIR  
install libebl_CPU modules in $(libdir)/DIR  
@@ -3920,6 +3926,130 @@ if test "x$ac_cv_c99" != xyes; then :  
as_fn_error $? "gcc with C99 support required" "$LINENO" 5  
fi  
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra option to $CC" >&5  
+$as_echo_n "checking for -Wextra option to $CC... " >&6; }  
+if ${ac_cv_cc_wextra+:} false; then :  
+ $as_echo_n "(cached) " >&6  
+else  
+ old_CFLAGS="$CFLAGS"  
+CFLAGS="$CFLAGS -Wextra"  
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext  
+/* end confdefs.h. */  
+void foo (void) { }  
+_ACEOF  
+if ac_fn_c_try_compile "$LINENO"; then :  
+ ac_cv_cc_wextra=yes  
+else  
+ ac_cv_cc_wextra=no  
+fi  
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext  
+CFLAGS="$old_CFLAGS"  
+fi  
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_wextra" >&5  
+$as_echo "$ac_cv_cc_wextra" >&6; }  
+  
+if test "x$ac_cv_cc_wextra" = xyes; then :  
+ WEXTRA=-Wextra  
+else  
+ WEXTRA=-W  
+fi  
+  
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fgnu89-inline option to $CC" >&5  
+$as_echo_n "checking for -fgnu89-inline option to $CC... " >&6; }  
+if ${ac_cv_cc_gnu89_inline+:} false; then :  
+ $as_echo_n "(cached) " >&6  
+else  
+ old_CFLAGS="$CFLAGS"  
+CFLAGS="$CFLAGS -fgnu89-inline -Werror"  
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext  
+/* end confdefs.h. */  
+  
+void foo (void)  
+{  
+ inline void bar (void) {}  
+ bar ();  
+}  
+extern inline void baz (void) {}  
+  
+_ACEOF  
+if ac_fn_c_try_compile "$LINENO"; then :  
+ ac_cv_cc_gnu89_inline=yes  
+else  
+ ac_cv_cc_gnu89_inline=no  
+fi  
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext  
+CFLAGS="$old_CFLAGS"  
+fi  
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_gnu89_inline" >&5  
+$as_echo "$ac_cv_cc_gnu89_inline" >&6; }  
+if test "x$ac_cv_cc_gnu89_inline" = xyes; then :  
+ WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"  
+fi  
+  
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed linker option" >&5  
+$as_echo_n "checking for --as-needed linker option... " >&6; }  
+if ${ac_cv_as_needed+:} false; then :  
+ $as_echo_n "(cached) " >&6  
+else  
+ cat > conftest.c <<EOF  
+int main (void) { return 0; }  
+EOF  
+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS  
+ -fPIC -shared -o conftest.so conftest.c  
+ -Wl,--as-needed 1>&5'  
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5  
+ (eval $ac_try) 2>&5  
+ ac_status=$?  
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5  
+ test $ac_status = 0; }; }  
+then  
+ ac_cv_as_needed=yes  
+else  
+ ac_cv_as_needed=no  
+fi  
+rm -f conftest*  
+fi  
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_as_needed" >&5  
+$as_echo "$ac_cv_as_needed" >&6; }  
+if test "x$ac_cv_as_needed" = xyes; then :  
+ LD_AS_NEEDED=-Wl,--as-needed  
+else  
+ LD_AS_NEEDED=  
+fi  
+  
+  
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcount" >&5  
+$as_echo_n "checking for __builtin_popcount... " >&6; }  
+if ${ac_cv_popcount+:} false; then :  
+ $as_echo_n "(cached) " >&6  
+else  
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext  
+/* end confdefs.h. */  
+  
+int  
+main ()  
+{  
+exit (__builtin_popcount (127));  
+ ;  
+ return 0;  
+}  
+_ACEOF  
+if ac_fn_c_try_link "$LINENO"; then :  
+ ac_cv_popcount=yes  
+else  
+ ac_cv_popcount=no  
+fi  
+rm -f core conftest.err conftest.$ac_objext \  
+ conftest$ac_exeext conftest.$ac_ext  
+fi  
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_popcount" >&5  
+$as_echo "$ac_cv_popcount" >&6; }  
+if test "x$ac_cv_popcount" = xyes; then :  
+  
+$as_echo "#define HAVE_BUILTIN_POPCOUNT 1" >>confdefs.h  
+  
+fi  
+  
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5  
$as_echo_n "checking for __thread support... " >&6; }  
if ${ac_cv_tls+:} false; then :  
@@ -3956,7 +4086,13 @@ fi  
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5  
$as_echo "$ac_cv_tls" >&6; }  
if test "x$ac_cv_tls" != xyes; then :  
- as_fn_error $? "__thread support required" "$LINENO" 5  
+ if test "$use_locks" = yes; then :  
+ as_fn_error $? "--enable-thread-safety requires __thread support" "$LINENO" 5  
+else  
+  
+$as_echo "#define __thread /* empty: no multi-thread support */" >>confdefs.h  
+  
+fi  
fi  
 
# Check whether --enable-largefile was given.  
@@ -4305,6 +4441,22 @@ else  
fi  
 
 
+# Check whether --enable-werror was given.  
+if test "${enable_werror+set}" = set; then :  
+ enableval=$enable_werror; enable_werror=$enableval  
+else  
+ enable_werror=yes  
+fi  
+  
+ if test "$enable_werror" = yes; then  
+ BUILD_WERROR_TRUE=  
+ BUILD_WERROR_FALSE='#'  
+else  
+ BUILD_WERROR_TRUE='#'  
+ BUILD_WERROR_FALSE=  
+fi  
+  
+  
# Check whether --enable-tests-rpath was given.  
if test "${enable_tests_rpath+set}" = set; then :  
enableval=$enable_tests_rpath; tests_use_rpath=$enableval  
@@ -5025,7 +5177,7 @@ case "$eu_version" in  
esac  
 
# Round up to the next release API (x.y) version.  
-eu_version=$(( (eu_version + 999) / 1000 ))  
+eu_version=`expr \( $eu_version + 999 \) / 1000`  
 
cat >confcache <<\_ACEOF  
# This file is a shell script that caches the results of configure  
@@ -5188,6 +5340,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes  
as_fn_error $? "conditional \"BUILD_STATIC\" was never defined.  
Usually this means the macro was only invoked conditionally." "$LINENO" 5  
fi  
+if test -z "${BUILD_WERROR_TRUE}" && test -z "${BUILD_WERROR_FALSE}"; then  
+ as_fn_error $? "conditional \"BUILD_WERROR\" was never defined.  
+Usually this means the macro was only invoked conditionally." "$LINENO" 5  
+fi  
if test -z "${TESTS_RPATH_TRUE}" && test -z "${TESTS_RPATH_FALSE}"; then  
as_fn_error $? "conditional \"TESTS_RPATH\" was never defined.  
Usually this means the macro was only invoked conditionally." "$LINENO" 5  
--- elfutils/configure.ac  
+++ elfutils/configure.ac  
@@ -90,6 +90,54 @@ CFLAGS="$old_CFLAGS"])  
AS_IF([test "x$ac_cv_c99" != xyes],  
AC_MSG_ERROR([gcc with C99 support required]))  
 
+AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl  
+old_CFLAGS="$CFLAGS"  
+CFLAGS="$CFLAGS -Wextra"  
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([void foo (void) { }])],  
+ ac_cv_cc_wextra=yes, ac_cv_cc_wextra=no)  
+CFLAGS="$old_CFLAGS"])  
+AC_SUBST(WEXTRA)  
+AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W])  
+  
+AC_CACHE_CHECK([for -fgnu89-inline option to $CC], ac_cv_cc_gnu89_inline, [dnl  
+old_CFLAGS="$CFLAGS"  
+CFLAGS="$CFLAGS -fgnu89-inline -Werror"  
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([  
+void foo (void)  
+{  
+ inline void bar (void) {}  
+ bar ();  
+}  
+extern inline void baz (void) {}  
+])], ac_cv_cc_gnu89_inline=yes, ac_cv_cc_gnu89_inline=no)  
+CFLAGS="$old_CFLAGS"])  
+AS_IF([test "x$ac_cv_cc_gnu89_inline" = xyes],  
+ [WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"])  
+  
+AC_CACHE_CHECK([for --as-needed linker option],  
+ ac_cv_as_needed, [dnl  
+cat > conftest.c <<EOF  
+int main (void) { return 0; }  
+EOF  
+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS  
+ -fPIC -shared -o conftest.so conftest.c  
+ -Wl,--as-needed 1>&AS_MESSAGE_LOG_FD])  
+then  
+ ac_cv_as_needed=yes  
+else  
+ ac_cv_as_needed=no  
+fi  
+rm -f conftest*])  
+AS_IF([test "x$ac_cv_as_needed" = xyes],  
+ [LD_AS_NEEDED=-Wl,--as-needed], [LD_AS_NEEDED=])  
+AC_SUBST(LD_AS_NEEDED)  
+  
+AC_CACHE_CHECK([for __builtin_popcount], ac_cv_popcount, [dnl  
+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[exit (__builtin_popcount (127));]])],  
+ ac_cv_popcount=yes, ac_cv_popcount=no)])  
+AS_IF([test "x$ac_cv_popcount" = xyes],  
+ [AC_DEFINE([HAVE_BUILTIN_POPCOUNT], [1], [Have __builtin_popcount.])])  
+  
AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl  
# Use the same flags that we use for our DSOs, so the test is representative.  
# Some old compiler/linker/libc combinations fail some ways and not others.  
@@ -105,7 +153,10 @@ static __thread int a; int foo (int b) {  
CFLAGS="$save_CFLAGS"  
LDFLAGS="$save_LDFLAGS"])  
AS_IF([test "x$ac_cv_tls" != xyes],  
- AC_MSG_ERROR([__thread support required]))  
+ [AS_IF([test "$use_locks" = yes],  
+ [AC_MSG_ERROR([--enable-thread-safety requires __thread support])],  
+ [AC_DEFINE([__thread], [/* empty: no multi-thread support */],  
+ [Stubbed out if missing compiler support.])])])  
 
dnl This test must come as early as possible after the compiler configuration  
dnl tests, because the choice of the file model can (in principle) affect  
@@ -193,6 +244,11 @@ AM_CONDITIONAL(GCOV, test "$use_gcov" =  
AM_CONDITIONAL(BUILD_STATIC, [dnl  
test "$use_mudflap" = yes -o "$use_gprof" = yes -o "$use_gcov" = yes])  
 
+AC_ARG_ENABLE([werror],  
+AS_HELP_STRING([--disable-werror],[do not build with -Werror]),  
+ [enable_werror=$enableval], [enable_werror=yes])  
+AM_CONDITIONAL(BUILD_WERROR, test "$enable_werror" = yes)  
+  
AC_ARG_ENABLE([tests-rpath],  
AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]),  
[tests_use_rpath=$enableval], [tests_use_rpath=no])  
@@ -304,6 +360,6 @@ case "$eu_version" in  
esac  
 
# Round up to the next release API (x.y) version.  
-eu_version=$(( (eu_version + 999) / 1000 ))  
+eu_version=`expr \( $eu_version + 999 \) / 1000`  
 
AC_OUTPUT  
--- elfutils/lib/ChangeLog  
+++ elfutils/lib/ChangeLog  
@@ -35,6 +35,9 @@  
 
2009-01-23 Roland McGrath <roland@redhat.com>  
 
+ * eu-config.h [! HAVE_BUILTIN_POPCOUNT]  
+ (__builtin_popcount): New inline function.  
+  
* eu-config.h: Add multiple inclusion protection.  
 
2009-01-17 Ulrich Drepper <drepper@redhat.com>  
@@ -91,6 +94,11 @@  
* Makefile.am (libeu_a_SOURCES): Add it.  
* system.h: Declare crc32_file.  
 
+2005-02-07 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
2005-04-30 Ulrich Drepper <drepper@redhat.com>  
 
* Makefile.am: Use -ffunction-sections for xmalloc.c.  
--- elfutils/lib/eu-config.h  
+++ elfutils/lib/eu-config.h  
@@ -162,6 +162,17 @@ asm (".section predict_data, \"aw\"; .pr  
/* This macro is used by the tests conditionalize for standalone building. */  
#define ELFUTILS_HEADER(name) <lib##name.h>  
 
+#ifndef HAVE_BUILTIN_POPCOUNT  
+# define __builtin_popcount hakmem_popcount  
+static inline unsigned int __attribute__ ((unused))  
+hakmem_popcount (unsigned int x)  
+{  
+ /* HAKMEM 169 */  
+ unsigned int n = x - ((x >> 1) & 033333333333) - ((x >> 2) & 011111111111);  
+ return ((n + (n >> 3)) & 030707070707) % 63;  
+}  
+#endif /* HAVE_BUILTIN_POPCOUNT */  
+  
 
#ifdef SHARED  
# define OLD_VERSION(name, version) \  
--- elfutils/lib/Makefile.in  
+++ elfutils/lib/Makefile.in  
@@ -37,7 +37,8 @@ build_triplet = @build@  
host_triplet = @host@  
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \  
$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
subdir = lib  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \  
@@ -100,6 +101,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -129,6 +131,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = @VERSION@  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -190,10 +193,9 @@ zip_LIBS = @zip_LIBS@  
INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \  
-I$(srcdir)/../libelf  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1) -fpic  
+ $(am__append_1) $(am__append_2) -fpic  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
--- elfutils/libasm/ChangeLog  
+++ elfutils/libasm/ChangeLog  
@@ -71,6 +71,11 @@  
* asm_error.c: Add new error ASM_E_IOERROR.  
* libasmP.h: Add ASM_E_IOERROR definition.  
 
+2005-05-31 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
2005-02-15 Ulrich Drepper <drepper@redhat.com>  
 
* Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.  
--- elfutils/libasm/Makefile.in  
+++ elfutils/libasm/Makefile.in  
@@ -39,10 +39,11 @@ host_triplet = @host@  
DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \  
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \  
$(top_srcdir)/config/eu.am ChangeLog  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
@MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)  
@MUDFLAP_TRUE@am_libasm_pic_a_OBJECTS =  
-@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_2 = -lpthread  
+@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_3 = -lpthread  
subdir = libasm  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \  
@@ -153,6 +154,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -182,6 +184,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = 1  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -244,10 +247,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi  
-I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \  
-I$(top_srcdir)/libdw  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1)  
+ $(am__append_1) $(am__append_2)  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
@@ -276,7 +278,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort  
 
@MUDFLAP_FALSE@libasm_pic_a_SOURCES =  
@MUDFLAP_FALSE@am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os)  
-@MUDFLAP_FALSE@libasm_so_LDLIBS = $(am__append_2)  
+@MUDFLAP_FALSE@libasm_so_LDLIBS = $(am__append_3)  
@MUDFLAP_FALSE@libasm_so_SOURCES =  
noinst_HEADERS = libasmP.h symbolhash.h  
EXTRA_DIST = libasm.map  
--- elfutils/libcpu/ChangeLog  
+++ elfutils/libcpu/ChangeLog  
@@ -38,6 +38,9 @@  
 
2009-01-23 Roland McGrath <roland@redhat.com>  
 
+ * i386_disasm.c (i386_disasm): Add abort after assert-constant for old  
+ compilers that don't realize it's noreturn.  
+  
* Makefile.am (i386_parse_CFLAGS): Use quotes around command  
substitution that can produce leading whitespace.  
 
@@ -367,6 +370,11 @@  
* defs/i386.doc: New file.  
* defs/x86_64: New file.  
 
+2005-04-04 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it instead of -Wextra.  
+  
2005-02-15 Ulrich Drepper <drepper@redhat.com>  
 
* Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.  
--- elfutils/libcpu/i386_disasm.c  
+++ elfutils/libcpu/i386_disasm.c  
@@ -822,6 +822,7 @@ i386_disasm (const uint8_t **startp, con  
 
default:  
assert (! "INVALID not handled");  
+ abort ();  
}  
}  
else  
--- elfutils/libcpu/Makefile.in  
+++ elfutils/libcpu/Makefile.in  
@@ -39,7 +39,8 @@ host_triplet = @host@  
DIST_COMMON = $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \  
$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog \  
i386_lex.c i386_parse.c  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = i386_gendis$(EXEEXT)  
subdir = libcpu  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
@@ -117,6 +118,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = lex.$(<F:lex.l=)  
@@ -146,6 +148,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = @VERSION@  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -208,10 +211,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi  
-I$(srcdir)/../libelf -I$(srcdir)/../libebl \  
-I$(srcdir)/../libdw -I$(srcdir)/../libasm  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1) -fpic -fdollars-in-identifiers  
+ $(am__append_1) $(am__append_2) -fpic -fdollars-in-identifiers  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
--- elfutils/libdw/ChangeLog  
+++ elfutils/libdw/ChangeLog  
@@ -82,6 +82,10 @@  
 
* Makefile.am (known-dwarf.h): Run gawk on config/known-dwarf.awk.  
 
+2011-07-20 Mark Wielaard <mjw@redhat.com>  
+  
+ * dwarf_begin_elf.c: Add fallback for be64toh if not defined.  
+  
2011-07-14 Mark Wielaard <mjw@redhat.com>  
 
* libdw.h (dwarf_offdie): Fix documentation to mention .debug_info.  
@@ -441,6 +445,10 @@  
 
* dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.  
 
+2009-08-17 Roland McGrath <roland@redhat.com>  
+  
+ * libdw.h: Disable extern inlines for GCC 4.2.  
+  
2009-08-10 Roland McGrath <roland@redhat.com>  
 
* dwarf_getscopevar.c: Use dwarf_diename.  
@@ -1209,6 +1217,11 @@  
 
2005-05-31 Roland McGrath <roland@redhat.com>  
 
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
+2005-05-31 Roland McGrath <roland@redhat.com>  
+  
* dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to  
formref offset.  
 
--- elfutils/libdw/dwarf_begin_elf.c  
+++ elfutils/libdw/dwarf_begin_elf.c  
@@ -48,6 +48,14 @@  
#if USE_ZLIB  
# include <endian.h>  
# define crc32 loser_crc32  
+# ifndef be64toh  
+# include <byteswap.h>  
+# if __BYTE_ORDER == __LITTLE_ENDIAN  
+# define be64toh(x) bswap_64 (x)  
+# else  
+# define be64toh(x) (x)  
+# endif  
+# endif  
# include <zlib.h>  
# undef crc32  
#endif  
--- elfutils/libdw/libdw.h  
+++ elfutils/libdw/libdw.h  
@@ -831,7 +831,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (  
 
 
/* Inline optimizations. */  
-#ifdef __OPTIMIZE__  
+#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)  
/* Return attribute code of given attribute. */  
__libdw_extern_inline unsigned int  
dwarf_whatattr (Dwarf_Attribute *attr)  
--- elfutils/libdw/Makefile.in  
+++ elfutils/libdw/Makefile.in  
@@ -39,8 +39,9 @@ host_triplet = @host@  
DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \  
$(pkginclude_HEADERS) $(srcdir)/Makefile.am \  
$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
-@BUILD_STATIC_TRUE@am__append_2 = -fpic  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
+@BUILD_STATIC_TRUE@am__append_3 = -fpic  
@MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)  
@MUDFLAP_TRUE@am_libdw_pic_a_OBJECTS =  
subdir = libdw  
@@ -198,6 +199,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -227,6 +229,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = 1  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -288,10 +291,9 @@ zip_LIBS = @zip_LIBS@  
INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \  
-I$(srcdir)/../libelf  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1) $(am__append_2)  
+ $(am__append_1) $(am__append_2) $(am__append_3)  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
--- elfutils/libdwfl/ChangeLog  
+++ elfutils/libdwfl/ChangeLog  
@@ -1420,6 +1420,11 @@  
 
2005-07-21 Roland McGrath <roland@redhat.com>  
 
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
+2005-07-21 Roland McGrath <roland@redhat.com>  
+  
* Makefile.am (noinst_HEADERS): Add loc2c.c.  
 
* test2.c (main): Check sscanf result to quiet warning.  
--- elfutils/libdwfl/Makefile.in  
+++ elfutils/libdwfl/Makefile.in  
@@ -38,11 +38,12 @@ host_triplet = @host@  
DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \  
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \  
$(top_srcdir)/config/eu.am ChangeLog  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
-@MUDFLAP_FALSE@am__append_2 = libdwfl_pic.a  
-@ZLIB_TRUE@am__append_3 = gzip.c  
-@BZLIB_TRUE@am__append_4 = bzip2.c  
-@LZMA_TRUE@am__append_5 = lzma.c  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
+@MUDFLAP_FALSE@am__append_3 = libdwfl_pic.a  
+@ZLIB_TRUE@am__append_4 = gzip.c  
+@BZLIB_TRUE@am__append_5 = bzip2.c  
+@LZMA_TRUE@am__append_6 = lzma.c  
@MUDFLAP_TRUE@am_libdwfl_pic_a_OBJECTS =  
subdir = libdwfl  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
@@ -188,6 +189,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -217,6 +219,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = 1  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -279,10 +282,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi  
-I$(srcdir)/../libelf -I$(srcdir)/../libebl \  
-I$(srcdir)/../libdw  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1)  
+ $(am__append_1) $(am__append_2)  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
@@ -290,7 +292,7 @@ COMPILE.os = $(filter-out -fprofile-arcs  
 
CLEANFILES = *.gcno *.gcda $(am_libdwfl_pic_a_OBJECTS)  
textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
-noinst_LIBRARIES = libdwfl.a $(am__append_2)  
+noinst_LIBRARIES = libdwfl.a $(am__append_3)  
pkginclude_HEADERS = libdwfl.h  
libdwfl_a_SOURCES = dwfl_begin.c dwfl_end.c dwfl_error.c \  
dwfl_version.c dwfl_module.c dwfl_report_elf.c relocate.c \  
@@ -311,8 +313,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en  
dwfl_module_getsym.c dwfl_module_addrname.c \  
dwfl_module_addrsym.c dwfl_module_return_value_location.c \  
dwfl_module_register_names.c dwfl_segment_report_module.c \  
- link_map.c core-file.c open.c image-header.c $(am__append_3) \  
- $(am__append_4) $(am__append_5)  
+ link_map.c core-file.c open.c image-header.c $(am__append_4) \  
+ $(am__append_5) $(am__append_6)  
@MUDFLAP_FALSE@libdwfl = $(libdw)  
@MUDFLAP_TRUE@libdwfl = libdwfl.a $(libdw) $(libebl) $(libelf) $(libeu)  
@MUDFLAP_FALSE@libdw = ../libdw/libdw.so  
--- elfutils/libebl/ChangeLog  
+++ elfutils/libebl/ChangeLog  
@@ -658,6 +658,11 @@  
* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency  
tracking works right.  
 
+2005-05-31 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
2005-05-21 Ulrich Drepper <drepper@redhat.com>  
 
* libebl_x86_64.map: Add x86_64_core_note.  
--- elfutils/libebl/Makefile.in  
+++ elfutils/libebl/Makefile.in  
@@ -38,7 +38,8 @@ host_triplet = @host@  
DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \  
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \  
$(top_srcdir)/config/eu.am ChangeLog  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
subdir = libebl  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \  
@@ -150,6 +151,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -179,6 +181,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = 1  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -241,10 +244,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi  
-I$(srcdir)/../libelf -I$(srcdir)/../libdw \  
-I$(srcdir)/../libasm  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1) -fpic  
+ $(am__append_1) $(am__append_2) -fpic  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
--- elfutils/libelf/ChangeLog  
+++ elfutils/libelf/ChangeLog  
@@ -34,6 +34,11 @@  
 
* elf-knowledge.h (SECTION_STRIP_P): Remove < SHT_NUM check.  
 
+2011-03-10 Roland McGrath <roland@redhat.com>  
+  
+ * gnuhash_xlate.h (elf_cvt_gnuhash): Avoid post-increment in bswap_32  
+ argument, since some implementations are buggy macros.  
+  
2011-02-26 Mark Wielaard <mjw@redhat.com>  
 
* elf_end.c (elf_end): Call rwlock_unlock before rwlock_fini.  
@@ -711,6 +716,11 @@  
 
* elf.h: Update from glibc.  
 
+2005-05-31 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
2005-05-08 Roland McGrath <roland@redhat.com>  
 
* elf_begin.c (read_file) [_MUDFLAP]: Don't use mmap for now.  
--- elfutils/libelf/common.h  
+++ elfutils/libelf/common.h  
@@ -139,7 +139,7 @@ libelf_release_all (Elf *elf)  
(Var) = (sizeof (Var) == 1 \  
? (unsigned char) (Var) \  
: (sizeof (Var) == 2 \  
- ? bswap_16 (Var) \  
+ ? (unsigned short int) bswap_16 (Var) \  
: (sizeof (Var) == 4 \  
? bswap_32 (Var) \  
: bswap_64 (Var))))  
@@ -148,7 +148,7 @@ libelf_release_all (Elf *elf)  
(Dst) = (sizeof (Var) == 1 \  
? (unsigned char) (Var) \  
: (sizeof (Var) == 2 \  
- ? bswap_16 (Var) \  
+ ? (unsigned short int) bswap_16 (Var) \  
: (sizeof (Var) == 4 \  
? bswap_32 (Var) \  
: bswap_64 (Var))))  
--- elfutils/libelf/gnuhash_xlate.h  
+++ elfutils/libelf/gnuhash_xlate.h  
@@ -1,5 +1,5 @@  
/* Conversion functions for versioning information.  
- Copyright (C) 2006, 2007 Red Hat, Inc.  
+ Copyright (C) 2006-2011 Red Hat, Inc.  
This file is part of elfutils.  
Written by Ulrich Drepper <drepper@redhat.com>, 2006.  
 
@@ -68,7 +68,9 @@ elf_cvt_gnuhash (void *dest, const void  
dest32 = (Elf32_Word *) &dest64[bitmask_words];  
while (len >= 4)  
{  
- *dest32++ = bswap_32 (*src32++);  
+ *dest32 = bswap_32 (*src32);  
+ ++dest32;  
+ ++src32;  
len -= 4;  
}  
}  
--- elfutils/libelf/Makefile.in  
+++ elfutils/libelf/Makefile.in  
@@ -39,11 +39,12 @@ host_triplet = @host@  
DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \  
$(pkginclude_HEADERS) $(srcdir)/Makefile.am \  
$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
-@BUILD_STATIC_TRUE@am__append_2 = -fpic  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
+@BUILD_STATIC_TRUE@am__append_3 = -fpic  
@MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)  
@MUDFLAP_TRUE@am_libelf_pic_a_OBJECTS =  
-@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_3 = -lpthread  
+@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_4 = -lpthread  
subdir = libelf  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \  
@@ -195,6 +196,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -224,6 +226,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = 1  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -284,10 +287,9 @@ top_srcdir = @top_srcdir@  
zip_LIBS = @zip_LIBS@  
INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1) $(am__append_2)  
+ $(am__append_1) $(am__append_2) $(am__append_3)  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
@@ -352,7 +354,7 @@ libelf_a_SOURCES = elf_version.c elf_has  
 
@MUDFLAP_FALSE@libelf_pic_a_SOURCES =  
@MUDFLAP_FALSE@am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)  
-@MUDFLAP_FALSE@libelf_so_LDLIBS = $(am__append_3)  
+@MUDFLAP_FALSE@libelf_so_LDLIBS = $(am__append_4)  
@MUDFLAP_FALSE@libelf_so_SOURCES =  
noinst_HEADERS = elf.h abstract.h common.h exttypes.h gelf_xlate.h libelfP.h \  
version_xlate.h gnuhash_xlate.h note_xlate.h dl-hash.h  
--- elfutils/m4/Makefile.in  
+++ elfutils/m4/Makefile.in  
@@ -75,6 +75,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -104,6 +105,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = @VERSION@  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
--- elfutils/Makefile.in  
+++ elfutils/Makefile.in  
@@ -165,6 +165,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -194,6 +195,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = @VERSION@  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
--- elfutils/src/addr2line.c  
+++ elfutils/src/addr2line.c  
@@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl  
bool parsed = false;  
int i, j;  
char *name = NULL;  
- if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2  
+ if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2  
&& string[i] == '\0')  
parsed = adjust_to_section (name, &addr, dwfl);  
- switch (sscanf (string, "%m[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))  
+ switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))  
{  
default:  
break;  
--- elfutils/src/ChangeLog  
+++ elfutils/src/ChangeLog  
@@ -606,8 +606,16 @@  
* readelf.c (attr_callback): Use print_block only when we don't use  
print_ops.  
 
+2009-08-17 Roland McGrath <roland@redhat.com>  
+  
+ * ld.h: Disable extern inlines for GCC 4.2.  
+  
2009-08-14 Roland McGrath <roland@redhat.com>  
 
+ * strings.c (read_block): Conditionalize posix_fadvise use  
+ on [POSIX_FADV_SEQUENTIAL].  
+ From Petr Salinger <Petr.Salinger@seznam.cz>.  
+  
* ar.c (do_oper_extract): Use pathconf instead of statfs.  
 
2009-08-01 Ulrich Drepper <drepper@redhat.com>  
@@ -771,6 +779,8 @@  
* readelf.c (print_debug_frame_section): Use t instead of j formats  
for ptrdiff_t OFFSET.  
 
+ * addr2line.c (handle_address): Use %a instead of %m for compatibility.  
+  
2009-01-21 Ulrich Drepper <drepper@redhat.com>  
 
* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section  
@@ -954,6 +964,11 @@  
that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really  
is valid in RELRO.  
 
+2008-03-01 Roland McGrath <roland@redhat.com>  
+  
+ * readelf.c (dump_archive_index): Tweak portability hack  
+ to match [__GNUC__ < 4] too.  
+  
2008-02-29 Roland McGrath <roland@redhat.com>  
 
* readelf.c (print_attributes): Add a cast.  
@@ -1205,6 +1220,8 @@  
 
* readelf.c (hex_dump): Fix rounding error in whitespace calculation.  
 
+ * Makefile.am (readelf_no_Werror): New variable.  
+  
2007-10-15 Roland McGrath <roland@redhat.com>  
 
* make-debug-archive.in: New file.  
@@ -1644,6 +1661,10 @@  
* elflint.c (valid_e_machine): Add EM_ALPHA.  
Reported by Christian Aichinger <Greek0@gmx.net>.  
 
+ * strings.c (map_file): Define POSIX_MADV_SEQUENTIAL to  
+ MADV_SEQUENTIAL if undefined. Don't call posix_madvise  
+ if neither is defined.  
+  
2006-08-08 Ulrich Drepper <drepper@redhat.com>  
 
* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.  
@@ -1720,6 +1741,10 @@  
* Makefile.am: Add hacks to create dependency files for non-generic  
linker.  
 
+2006-04-05 Roland McGrath <roland@redhat.com>  
+  
+ * strings.c (MAP_POPULATE): Define to 0 if undefined.  
+  
2006-06-12 Ulrich Drepper <drepper@redhat.com>  
 
* ldgeneric.c (ld_generic_generate_sections): Don't create .interp  
@@ -2068,6 +2093,11 @@  
* readelf.c (print_debug_loc_section): Fix indentation for larger  
address size.  
 
+2005-05-31 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
2005-05-30 Roland McGrath <roland@redhat.com>  
 
* readelf.c (print_debug_line_section): Print section offset of each  
--- elfutils/src/findtextrel.c  
+++ elfutils/src/findtextrel.c  
@@ -496,7 +496,11 @@ ptrcompare (const void *p1, const void *  
 
 
static void  
-check_rel (size_t nsegments, struct segments segments[nsegments],  
+check_rel (size_t nsegments, struct segments segments[  
+#if __GNUC__ >= 4  
+ nsegments  
+#endif  
+ ],  
GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw,  
const char *fname, bool more_than_one, void **knownsrcs)  
{  
--- elfutils/src/ld.h  
+++ elfutils/src/ld.h  
@@ -1114,6 +1114,7 @@ extern bool dynamically_linked_p (void);  
 
/* Checked whether the symbol is undefined and referenced from a DSO. */  
extern bool linked_from_dso_p (struct scninfo *scninfo, size_t symidx);  
+#if defined __OPTIMIZE__ && !(__GNUC__ == 4 && __GNUC_MINOR__ == 2)  
#ifdef __GNUC_STDC_INLINE__  
__attribute__ ((__gnu_inline__))  
#endif  
@@ -1131,5 +1132,6 @@ linked_from_dso_p (struct scninfo *scnin  
 
return sym->defined && sym->in_dso;  
}  
+#endif /* Optimizing and not GCC 4.2. */  
 
#endif /* ld.h */  
--- elfutils/src/Makefile.am  
+++ elfutils/src/Makefile.am  
@@ -95,6 +95,9 @@ addr2line_no_Wformat = yes  
# XXX While the file is not finished, don't warn about this  
ldgeneric_no_Wunused = yes  
 
+# Buggy old compilers.  
+readelf_no_Werror = yes  
+  
readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl  
nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \  
$(demanglelib)  
--- elfutils/src/Makefile.in  
+++ elfutils/src/Makefile.in  
@@ -40,7 +40,8 @@ host_triplet = @host@  
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \  
$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog \  
ldlex.c ldscript.c  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEEXT) size$(EXEEXT) \  
strip$(EXEEXT) ld$(EXEEXT) elflint$(EXEEXT) \  
findtextrel$(EXEEXT) addr2line$(EXEEXT) elfcmp$(EXEEXT) \  
@@ -49,9 +50,9 @@ bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEE  
@NATIVE_LD_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)  
# We never build this library but we need to get the dependency files  
# of all the linker backends that might be used in a non-generic linker.  
-@NEVER_TRUE@am__append_2 = libdummy.a  
+@NEVER_TRUE@am__append_3 = libdummy.a  
# -ldl is always needed for libebl.  
-@NATIVE_LD_TRUE@am__append_3 = libld_elf.a  
+@NATIVE_LD_TRUE@am__append_4 = libld_elf.a  
@NATIVE_LD_TRUE@am_libld_elf_i386_pic_a_OBJECTS =  
subdir = src  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
@@ -115,7 +116,7 @@ am_ld_OBJECTS = ld.$(OBJEXT) ldgeneric.$  
versionhash.$(OBJEXT)  
ld_OBJECTS = $(am_ld_OBJECTS)  
ld_DEPENDENCIES = $(libebl) $(libelf) $(libeu) $(am__DEPENDENCIES_1) \  
- $(am__append_3)  
+ $(am__append_4)  
ld_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ld_LDFLAGS) $(LDFLAGS) -o \  
$@  
am_libld_elf_i386_so_OBJECTS =  
@@ -235,6 +236,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -264,6 +266,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = @VERSION@  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -327,10 +330,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi  
-I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \  
-I$(srcdir)/../libasm  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1)  
+ $(am__append_1) $(am__append_2)  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
@@ -346,8 +348,8 @@ AM_LFLAGS = -Pld -olex.yy.c  
native_ld = @native_ld@  
ld_dsos = libld_elf_i386_pic.a  
@NATIVE_LD_FALSE@noinst_LIBRARIES = libld_elf.a libar.a $(ld_dsos) \  
-@NATIVE_LD_FALSE@ $(am__append_2)  
-@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_2)  
+@NATIVE_LD_FALSE@ $(am__append_3)  
+@NATIVE_LD_TRUE@noinst_LIBRARIES = libld_elf.a libar.a $(am__append_3)  
@NATIVE_LD_TRUE@native_ld_cflags = -DBASE_ELF_NAME=elf_$(base_cpu)  
@NEVER_TRUE@libdummy_a_SOURCES = i386_ld.c  
ld_SOURCES = ld.c ldgeneric.c ldlex.l ldscript.y symbolhash.c sectionhash.c \  
@@ -376,6 +378,9 @@ strings_no_Wformat = yes  
addr2line_no_Wformat = yes  
# XXX While the file is not finished, don't warn about this  
ldgeneric_no_Wunused = yes  
+  
+# Buggy old compilers.  
+readelf_no_Werror = yes  
readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl  
nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \  
$(demanglelib)  
@@ -383,7 +388,7 @@ nm_LDADD = $(libdw) $(libebl) $(libelf)  
size_LDADD = $(libelf) $(libeu) $(libmudflap)  
strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl  
ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \  
- $(am__append_3)  
+ $(am__append_4)  
ld_LDFLAGS = -rdynamic  
elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl  
findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)  
--- elfutils/src/readelf.c  
+++ elfutils/src/readelf.c  
@@ -3949,10 +3949,11 @@ struct listptr  
#define listptr_offset_size(p) ((p)->dwarf64 ? 8 : 4)  
#define listptr_address_size(p) ((p)->addr64 ? 8 : 4)  
 
+static const char *listptr_name;  
static int  
-compare_listptr (const void *a, const void *b, void *arg)  
+compare_listptr (const void *a, const void *b)  
{  
- const char *name = arg;  
+ const char *const name = listptr_name;  
struct listptr *p1 = (void *) a;  
struct listptr *p2 = (void *) b;  
 
@@ -4033,8 +4034,11 @@ static void  
sort_listptr (struct listptr_table *table, const char *name)  
{  
if (table->n > 0)  
- qsort_r (table->table, table->n, sizeof table->table[0],  
- &compare_listptr, (void *) name);  
+ {  
+ listptr_name = name;  
+ qsort (table->table, table->n, sizeof table->table[0],  
+ &compare_listptr);  
+ }  
}  
 
static bool  
@@ -8442,7 +8446,7 @@ dump_archive_index (Elf *elf, const char  
if (unlikely (elf_rand (elf, as_off) == 0)  
|| unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))  
== NULL))  
-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7)  
+#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 7) || __GNUC__ < 4  
while (1)  
#endif  
error (EXIT_FAILURE, 0,  
--- elfutils/src/strings.c  
+++ elfutils/src/strings.c  
@@ -43,6 +43,10 @@  
 
#include <system.h>  
 
+#ifndef MAP_POPULATE  
+# define MAP_POPULATE 0  
+#endif  
+  
 
/* Prototypes of local functions. */  
static int read_fd (int fd, const char *fname, off64_t fdlen);  
@@ -483,8 +487,13 @@ map_file (int fd, off64_t start_off, off  
fd, start_off);  
if (mem != MAP_FAILED)  
{  
+#if !defined POSIX_MADV_SEQUENTIAL && defined MADV_SEQUENTIAL  
+# define POSIX_MADV_SEQUENTIAL MADV_SEQUENTIAL  
+#endif  
+#ifdef POSIX_MADV_SEQUENTIAL  
/* We will go through the mapping sequentially. */  
(void) posix_madvise (mem, map_size, POSIX_MADV_SEQUENTIAL);  
+#endif  
break;  
}  
if (errno != EINVAL && errno != ENOMEM)  
@@ -576,9 +585,11 @@ read_block (int fd, const char *fname, o  
elfmap_off = from & ~(ps - 1);  
elfmap_base = elfmap = map_file (fd, elfmap_off, fdlen, &elfmap_size);  
 
+#ifdef POSIX_FADV_SEQUENTIAL  
if (unlikely (elfmap == MAP_FAILED))  
/* Let the kernel know we are going to read everything in sequence. */  
(void) posix_fadvise (fd, 0, 0, POSIX_FADV_SEQUENTIAL);  
+#endif  
}  
 
if (unlikely (elfmap == MAP_FAILED))  
--- elfutils/src/strip.c  
+++ elfutils/src/strip.c  
@@ -45,6 +45,12 @@  
#include <libebl.h>  
#include <system.h>  
 
+#ifdef HAVE_FUTIMES  
+# define FUTIMES(fd, fname, tvp) futimes (fd, tvp)  
+#else  
+# define FUTIMES(fd, fname, tvp) utimes (fname, tvp)  
+#endif  
+  
typedef uint8_t GElf_Byte;  
 
/* Name and version of program. */  
@@ -318,8 +324,18 @@ process_file (const char *fname)  
 
/* If we have to preserve the timestamp, we need it in the  
format utimes() understands. */  
+#ifdef HAVE_STRUCT_STAT_ST_ATIM  
TIMESPEC_TO_TIMEVAL (&tv[0], &pre_st.st_atim);  
+#else  
+ tv[0].tv_sec = pre_st.st_atime;  
+ tv[0].tv_usec = 0;  
+#endif  
+#ifdef HAVE_STRUCT_STAT_ST_MTIM  
TIMESPEC_TO_TIMEVAL (&tv[1], &pre_st.st_mtim);  
+#else  
+ tv[1].tv_sec = pre_st.st_atime;  
+ tv[1].tv_usec = 0;  
+#endif  
}  
 
/* Open the file. */  
@@ -2055,7 +2071,7 @@ while computing checksum for debug infor  
/* If requested, preserve the timestamp. */  
if (tvp != NULL)  
{  
- if (futimes (fd, tvp) != 0)  
+ if (FUTIMES (fd, output_fname, tvp) != 0)  
{  
error (0, errno, gettext ("\  
cannot set access and modification date of '%s'"),  
@@ -2112,7 +2128,7 @@ handle_ar (int fd, Elf *elf, const char  
 
if (tvp != NULL)  
{  
- if (unlikely (futimes (fd, tvp) != 0))  
+ if (unlikely (FUTIMES (fd, fname, tvp) != 0))  
{  
error (0, errno, gettext ("\  
cannot set access and modification date of '%s'"), fname);  
--- elfutils/tests/ChangeLog  
+++ elfutils/tests/ChangeLog  
@@ -439,6 +439,8 @@  
 
2008-01-21 Roland McGrath <roland@redhat.com>  
 
+ * line2addr.c (main): Revert last change.  
+  
* testfile45.S.bz2: Add tests for cltq, cqto.  
* testfile45.expect.bz2: Adjust.  
 
@@ -1147,6 +1149,11 @@  
* Makefile.am (TESTS): Add run-elflint-test.sh.  
(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.  
 
+2005-05-31 Roland McGrath <roland@redhat.com>  
+  
+ * Makefile.am (WEXTRA): New variable, substituted by configure.  
+ (AM_CFLAGS): Use it in place of -Wextra.  
+  
2005-05-24 Ulrich Drepper <drepper@redhat.com>  
 
* get-files.c (main): Use correct format specifier.  
--- elfutils/tests/line2addr.c  
+++ elfutils/tests/line2addr.c  
@@ -124,7 +124,7 @@ main (int argc, char *argv[])  
{  
struct args a = { .arg = argv[cnt] };  
 
- switch (sscanf (a.arg, "%m[^:]:%d", &a.file, &a.line))  
+ switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line))  
{  
default:  
case 0:  
--- elfutils/tests/Makefile.in  
+++ elfutils/tests/Makefile.in  
@@ -35,14 +35,15 @@ build_triplet = @build@  
host_triplet = @host@  
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \  
$(top_srcdir)/config/eu.am ChangeLog  
-@MUDFLAP_TRUE@am__append_1 = -fmudflap  
-@STANDALONE_FALSE@am__append_2 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \  
+@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)  
+@MUDFLAP_TRUE@am__append_2 = -fmudflap  
+@STANDALONE_FALSE@am__append_3 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \  
@STANDALONE_FALSE@ -I$(top_srcdir)/libdwfl \  
@STANDALONE_FALSE@ -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \  
@STANDALONE_FALSE@ -I$(top_srcdir)/lib -I..  
 
-@STANDALONE_FALSE@am__append_3 = -Wl,-rpath-link,../libasm:../libdw:../libelf  
-@TESTS_RPATH_TRUE@am__append_4 = -Wl,-rpath,$(BUILD_RPATH)  
+@STANDALONE_FALSE@am__append_4 = -Wl,-rpath-link,../libasm:../libdw:../libelf  
+@TESTS_RPATH_TRUE@am__append_5 = -Wl,-rpath,$(BUILD_RPATH)  
check_PROGRAMS = arextract$(EXEEXT) arsymtest$(EXEEXT) \  
newfile$(EXEEXT) saridx$(EXEEXT) scnnames$(EXEEXT) \  
sectiondump$(EXEEXT) showptable$(EXEEXT) update1$(EXEEXT) \  
@@ -92,12 +93,12 @@ TESTS = run-arextract.sh run-arsymtest.s  
run-readelf-gdb_index.sh run-unstrip-n.sh run-low_high_pc.sh \  
run-macro-test.sh run-elf_cntl_gelf_getshdr.sh \  
run-test-archive64.sh $(am__EXEEXT_1) $(am__EXEEXT_3) \  
- $(am__append_9)  
-@STANDALONE_FALSE@am__append_5 = msg_tst md5-sha1-test  
+ $(am__append_10)  
@STANDALONE_FALSE@am__append_6 = msg_tst md5-sha1-test  
-@HAVE_LIBASM_TRUE@am__append_7 = $(asm_TESTS)  
+@STANDALONE_FALSE@am__append_7 = msg_tst md5-sha1-test  
@HAVE_LIBASM_TRUE@am__append_8 = $(asm_TESTS)  
-@ENABLE_DWZ_TRUE@am__append_9 = run-readelf-dwz-multi.sh  
+@HAVE_LIBASM_TRUE@am__append_9 = $(asm_TESTS)  
+@ENABLE_DWZ_TRUE@am__append_10 = run-readelf-dwz-multi.sh  
subdir = tests  
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4  
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \  
@@ -412,6 +413,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@  
INSTALL_SCRIPT = @INSTALL_SCRIPT@  
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@  
LDFLAGS = @LDFLAGS@  
+LD_AS_NEEDED = @LD_AS_NEEDED@  
LEX = @LEX@  
LEXLIB = @LEXLIB@  
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@  
@@ -441,6 +443,7 @@ SHELL = @SHELL@  
STRIP = @STRIP@  
USE_NLS = @USE_NLS@  
VERSION = @VERSION@  
+WEXTRA = @WEXTRA@  
XGETTEXT = @XGETTEXT@  
XGETTEXT_015 = @XGETTEXT_015@  
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@  
@@ -499,12 +502,11 @@ top_build_prefix = @top_build_prefix@  
top_builddir = @top_builddir@  
top_srcdir = @top_srcdir@  
zip_LIBS = @zip_LIBS@  
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_2)  
+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_3)  
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \  
- $($(*F)_no_Werror),,-Werror) $(if \  
- $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \  
+ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \  
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \  
- $(am__append_1)  
+ $(am__append_1) $(am__append_2)  
@MUDFLAP_FALSE@libmudflap =  
@MUDFLAP_TRUE@libmudflap = -lmudflap  
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\  
@@ -514,7 +516,7 @@ CLEANFILES = *.gcno *.gcda  
textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
@MUDFLAP_FALSE@BUILD_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf  
@MUDFLAP_TRUE@BUILD_RPATH = \$$ORIGIN/../backends  
-AM_LDFLAGS = $(am__append_3) $(am__append_4)  
+AM_LDFLAGS = $(am__append_4) $(am__append_5)  
@TESTS_RPATH_FALSE@tests_rpath = no  
@TESTS_RPATH_TRUE@tests_rpath = yes  
asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \  
 
--- a/Makefile.am  
+++ b/Makefile.am  
@@ -31,7 +31,7 @@ pkginclude_HEADERS = version.h  
 
# Add doc back when we have some real content.  
SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \  
- src po tests  
+ src po  
 
EXTRA_DIST = elfutils.spec GPG-KEY NOTES EXCEPTION  
 
--- a/Makefile.in  
+++ b/Makefile.in  
@@ -249,7 +249,7 @@ pkginclude_HEADERS = version.h  
 
# Add doc back when we have some real content.  
SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \  
- src po tests  
+ src po  
 
EXTRA_DIST = elfutils.spec GPG-KEY NOTES EXCEPTION  
 
 
--- a/libelf/libelf.h  
+++ b/libelf/libelf.h  
@@ -34,6 +34,11 @@  
/* Get the ELF types. */  
#include <elf.h>  
 
+#ifndef _LIBC  
+#ifndef __mempcpy  
+#define __mempcpy mempcpy  
+#endif  
+#endif  
 
/* Known translation types. */  
typedef enum  
 
--- a/Makefile.am  
+++ b/Makefile.am  
@@ -23,8 +23,7 @@ ACLOCAL_AMFLAGS = -I m4  
pkginclude_HEADERS = version.h  
 
# Add doc back when we have some real content.  
-SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \  
- src po  
+SUBDIRS = config m4 lib libelf libebl libdwfl libdw  
 
EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \  
COPYING COPYING-GPLV2 COPYING-LGPLV3  
--- a/Makefile.in  
+++ b/Makefile.in  
@@ -258,8 +258,7 @@ ACLOCAL_AMFLAGS = -I m4  
pkginclude_HEADERS = version.h  
 
# Add doc back when we have some real content.  
-SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \  
- src po  
+SUBDIRS = config m4 lib libelf libebl libdwfl libdw  
 
EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \  
COPYING COPYING-GPLV2 COPYING-LGPLV3  
 
--- a/libdw/Makefile.am  
+++ b/libdw/Makefile.am  
@@ -111,7 +111,7 @@ libdw.so: $(srcdir)/libdw.map libdw_pic.  
-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \  
-Wl,--version-script,$<,--no-undefined \  
-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\  
- -ldl $(zip_LIBS)  
+ -ldl $(zip_LIBS) $(LIBS)  
if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
ln -fs $@ $@.$(VERSION)  
 
--- a/libdw/Makefile.in  
+++ b/libdw/Makefile.in  
@@ -845,7 +845,7 @@ uninstall-am: uninstall-includeHEADERS u  
@MUDFLAP_FALSE@ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \  
@MUDFLAP_FALSE@ -Wl,--version-script,$<,--no-undefined \  
@MUDFLAP_FALSE@ -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\  
-@MUDFLAP_FALSE@ -ldl $(zip_LIBS)  
+@MUDFLAP_FALSE@ -ldl $(zip_LIBS) $(LIBS)  
@MUDFLAP_FALSE@ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
@MUDFLAP_FALSE@ ln -fs $@ $@.$(VERSION)  
 
 
--- a/libasm/Makefile.am  
+++ b/libasm/Makefile.am  
@@ -69,7 +69,6 @@ libasm.so: libasm_pic.a libasm.map  
-Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \  
-Wl,--soname,$@.$(VERSION) \  
../libebl/libebl.a ../libelf/libelf.so $(libasm_so_LDLIBS)  
- if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
ln -fs $@ $@.$(VERSION)  
 
install: install-am libasm.so  
--- a/libasm/Makefile.in  
+++ b/libasm/Makefile.in  
@@ -656,7 +656,6 @@ uninstall-am: uninstall-libLIBRARIES uni  
@MUDFLAP_FALSE@ -Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \  
@MUDFLAP_FALSE@ -Wl,--soname,$@.$(VERSION) \  
@MUDFLAP_FALSE@ ../libebl/libebl.a ../libelf/libelf.so $(libasm_so_LDLIBS)  
-@MUDFLAP_FALSE@ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
@MUDFLAP_FALSE@ ln -fs $@ $@.$(VERSION)  
 
@MUDFLAP_FALSE@install: install-am libasm.so  
--- a/libdw/Makefile.am  
+++ b/libdw/Makefile.am  
@@ -112,7 +112,6 @@ libdw.so: $(srcdir)/libdw.map libdw_pic.  
-Wl,--version-script,$<,--no-undefined \  
-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\  
-ldl $(zip_LIBS) $(LIBS)  
- if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
ln -fs $@ $@.$(VERSION)  
 
install: install-am libdw.so  
--- a/libdw/Makefile.in  
+++ b/libdw/Makefile.in  
@@ -846,7 +846,6 @@ uninstall-am: uninstall-includeHEADERS u  
@MUDFLAP_FALSE@ -Wl,--version-script,$<,--no-undefined \  
@MUDFLAP_FALSE@ -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\  
@MUDFLAP_FALSE@ -ldl $(zip_LIBS) $(LIBS)  
-@MUDFLAP_FALSE@ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
@MUDFLAP_FALSE@ ln -fs $@ $@.$(VERSION)  
 
@MUDFLAP_FALSE@install: install-am libdw.so  
--- a/libelf/Makefile.am  
+++ b/libelf/Makefile.am  
@@ -106,7 +106,6 @@ libelf.so: libelf_pic.a libelf.map  
$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \  
-Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \  
-Wl,--soname,$@.$(VERSION),-z,defs,-z,relro $(libelf_so_LDLIBS)  
- if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
ln -fs $@ $@.$(VERSION)  
 
install: install-am libelf.so  
--- a/libelf/Makefile.in  
+++ b/libelf/Makefile.in  
@@ -832,7 +832,6 @@ uninstall-am: uninstall-includeHEADERS u  
@MUDFLAP_FALSE@ $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \  
@MUDFLAP_FALSE@ -Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \  
@MUDFLAP_FALSE@ -Wl,--soname,$@.$(VERSION),-z,defs,-z,relro $(libelf_so_LDLIBS)  
-@MUDFLAP_FALSE@ if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi  
@MUDFLAP_FALSE@ ln -fs $@ $@.$(VERSION)  
 
@MUDFLAP_FALSE@install: install-am libelf.so  
 
file:a/libs/fftw3/Makefile (deleted)
#  
# Copyright (C) 2007-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=fftw3  
PKG_VERSION:=3.2.2  
PKG_RELEASE:=2  
 
PKG_SOURCE:=fftw-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://www.fftw.org  
PKG_MD5SUM:=b616e5c91218cc778b5aa735fefb61ae  
 
PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/fftw-$(PKG_VERSION)  
PKG_FIXUP:=autoreconf  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/fftw3  
SECTION:=libs  
CATEGORY:=Libraries  
DEPENDS:=@!avr32 +libpthread  
VARIANT:=double  
TITLE:=Fast Fourier transform library  
URL:=http://www.fftw.org/  
endef  
 
define Package/fftw3f  
$(call Package/fftw3)  
VARIANT:=single  
TITLE+= (single precision)  
endef  
 
define Package/fftw3l  
$(call Package/fftw3)  
DEPENDS:=@BROKEN  
VARIANT:=long-double  
TITLE+= (long-double precision)  
endef  
 
define Package/fftw3/description  
FFTW is a collection of fast C routines for computing the  
Discrete Fourier Transform in one or more dimensions. It  
includes complex, real, and parallel transforms, and can  
handle arbitrary array sizes efficiently.  
endef  
 
define Package/fftw3f/description  
$(call Package/fftw3/description)  
 
This package contains the single precision library.  
endef  
 
define Package/fftw3l/description  
$(call Package/fftw3/description)  
 
This package contains the long-double precision library.  
endef  
 
TARGET_CFLAGS += $(FPIC)  
 
CONFIGURE_ARGS += \  
--prefix=/usr \  
--without-libiconv-prefix \  
--without-libintl-prefix \  
--disable-nls \  
--enable-shared \  
--enable-threads \  
--enable-type-prefix \  
--disable-debug \  
--disable-fortran  
 
ifeq ($(BUILD_VARIANT), single)  
CONFIGURE_ARGS += \  
--enable-single  
endif  
 
ifeq ($(BUILD_VARIANT), long-double)  
CONFIGURE_ARGS += \  
--enable-long-double  
endif  
 
define Build/Compile  
$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/fftw3.h $(1)/usr/include  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfftw3*.{a,la} $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfftw3*.so* $(1)/usr/lib  
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/  
endef  
 
define Package/fftw3/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfftw3.so* $(1)/usr/lib/  
endef  
 
define Package/fftw3f/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfftw3f.so* $(1)/usr/lib/  
endef  
 
define Package/fftw3l/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfftw3l.so* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,fftw3))  
$(eval $(call BuildPackage,fftw3f))  
$(eval $(call BuildPackage,fftw3l))  
 
--- a/Makefile.in  
+++ b/Makefile.in  
@@ -110,7 +110,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re  
ETAGS = etags  
CTAGS = ctags  
DIST_SUBDIRS = support genfft kernel simd dft rdft reodft api threads \  
- cell libbench2 . tests doc tools m4  
+ cell libbench2 . doc tools m4  
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)  
distdir = $(PACKAGE)-$(VERSION)  
top_distdir = $(distdir)  
@@ -278,7 +278,7 @@ lib_LTLIBRARIES = libfftw3@PREC_SUFFIX@.  
@MAINTAINER_MODE_TRUE@GENFFT = genfft  
ACLOCAL_AMFLAGS = -I m4  
SUBDIRS = support $(GENFFT) kernel simd dft rdft reodft api threads \  
-cell libbench2 . tests doc tools m4  
+cell libbench2 . m4  
 
EXTRA_DIST = COPYRIGHT bootstrap.sh CONVENTIONS fftw.pc.in README.Cell  
@HAVE_SIMD_TRUE@SIMD_LIBS = \  
 
file:a/libs/giflib/Makefile (deleted)
#  
# Copyright (C) 2006-2014 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=giflib  
PKG_VERSION:=5.1.0  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=@SF/giflib  
PKG_MD5SUM:=c7e9f1c10b755ab955156d4c1ac7fc5d  
 
PKG_LICENSE:=MIT  
PKG_LICENSE_FILES:=COPYING  
 
PKG_FIXUP:=autoreconf  
PKG_REMOVE_FILES:=autogen.sh aclocal.m4  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/giflib  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=GIF libraries  
URL:=http://sourceforge.net/projects/giflib  
endef  
 
define Package/giflib/description  
giflib is a library for reading and writing gif images.  
It is API and ABI compatible with libungif which was in wide use while  
the LZW compression algorithm was patented.  
endef  
 
TARGET_CFLAGS += $(FPIC)  
CONFIGURE_ARGS += --enable-x11=no  
 
define Build/Compile  
$(MAKE) -C $(PKG_BUILD_DIR)  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/{lib,include}  
$(CP) $(PKG_BUILD_DIR)/lib/.libs/lib*so* $(1)/usr/lib  
$(CP) $(PKG_BUILD_DIR)/lib/.libs/libgif.a $(1)/usr/lib  
$(CP) $(PKG_BUILD_DIR)/lib/libgif.la $(1)/usr/lib  
$(CP) $(PKG_BUILD_DIR)/lib/*.h $(1)/usr/include/  
endef  
 
define Package/giflib/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_BUILD_DIR)/lib/.libs/lib*so* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,giflib))  
 
file:a/libs/gperf/Makefile (deleted)
#  
# Copyright (C) 2006-2008 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=gperf  
PKG_VERSION:=3.0.3  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@GNU/gperf  
PKG_MD5SUM:=cc20e58975a38075440423c8fb85fd00  
PKG_HOST_ONLY=1  
 
include $(INCLUDE_DIR)/host-build.mk  
include $(INCLUDE_DIR)/package.mk  
 
define Package/gperf  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=Perfect hash function generator  
BUILDONLY:=1  
URL:=http://www.gnu.org/software/gperf  
endef  
 
define Package/lua/Default/description  
gperf is a perfect hash function generator  
endef  
 
define Host/Install  
$(MAKE) -C $(HOST_BUILD_DIR) install  
endef  
 
 
$(eval $(call HostBuild))  
$(eval $(call BuildPackage,gperf))  
 
file:a/libs/jansson/Makefile (deleted)
#  
# Copyright (C) 2011-2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=jansson  
PKG_VERSION:=2.2.1  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://www.digip.org/jansson/releases/  
PKG_MD5SUM:=ebf4ebc7af47de27f7b9d79ad5853176  
 
PKG_INSTALL:=1  
PKG_BUILD_PARALLEL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/jansson  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=JSON library  
endef  
 
TARGET_CFLAGS += $(FPIC)  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/{lib,include}  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjansson* $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/  
endef  
 
define Package/jansson/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjansson*so* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,jansson))  
 
This patch adds a function which can be used to update  
json key values on all levels, not just one, automagically  
adding new keys to objects which do not exist in old object.  
 
Signed-off-by: Roman Yeryomin <roman@advem.lv>  
 
--- a/src/value.c 2011-04-21 13:15:58.000000000 +0300  
+++ b/src/value.c 2011-07-01 00:23:05.105103308 +0300  
@@ -215,6 +215,41 @@  
return 0;  
}  
 
+int json_object_deep_update(json_t *object, json_t *other)  
+{  
+ void *iter;  
+  
+ if(!json_is_object(object) || !json_is_object(other))  
+ return -1;  
+  
+ iter = json_object_iter(other);  
+ while(iter) {  
+ const char *key;  
+ json_t *value;  
+  
+ key = json_object_iter_key(iter);  
+ value = json_object_iter_value(iter);  
+  
+ if (!json_is_object(value)) {  
+ if ( json_object_set_nocheck( object, key, value ) )  
+ return -1;  
+ } else {  
+ json_t *subobj = json_object_get(object, key);  
+ if (!subobj) {  
+ json_object_set_nocheck( object, key, value );  
+ iter = json_object_iter_next(other, iter);  
+ continue;  
+ }  
+ if (json_object_deep_update( subobj, value ) == -1)  
+ return -1;  
+ }  
+  
+ iter = json_object_iter_next(other, iter);  
+ }  
+  
+ return 0;  
+}  
+  
void *json_object_iter(json_t *json)  
{  
json_object_t *object;  
 
--- a/src/jansson.h  
+++ b/src/jansson.h  
@@ -126,6 +126,7 @@ int json_object_set_new_nocheck(json_t *  
int json_object_del(json_t *object, const char *key);  
int json_object_clear(json_t *object);  
int json_object_update(json_t *object, json_t *other);  
+int json_object_deep_update(json_t *object, json_t *other);  
void *json_object_iter(json_t *object);  
void *json_object_iter_at(json_t *object, const char *key);  
void *json_object_iter_next(json_t *object, void *iter);  
 
file:a/libs/ldns/Makefile (deleted)
#  
# Copyright (C) 2011-2014 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=ldns  
PKG_VERSION:=1.6.17  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://www.nlnetlabs.nl/downloads/ldns  
PKG_MD5SUM:=a79423bcc4129e6d59b616b1cae11e5e  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libldns/Default  
URL:=http://www.nlnetlabs.nl/projects/ldns/  
DEPENDS:=+libopenssl  
endef  
 
define Package/libldns  
$(call Package/libldns/Default)  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=A library to simplify DNS programming  
endef  
 
define Package/libldns/description  
The goal of ldns is to simplify DNS programming, it supports recent RFCs like  
the DNSSEC documents, and allows developers to easily create software  
conforming to current RFCs, and experimental software for current Internet  
Drafts.  
endef  
 
define Package/drill  
$(call Package/libldns/Default)  
SECTION:=net  
CATEGORY:=Network  
SUBMENU:=IP Addresses and Names  
TITLE:=DNS(SEC) information tool  
DEPENDS+= +libldns  
endef  
 
define Package/drill/description  
drill is a tool to designed to get all sorts of information out of the DNS. It  
is specificly designed to be used with DNSSEC.  
endef  
 
CONFIGURE_ARGS += \  
--disable-ecdsa \  
--disable-gost \  
--with-drill \  
--with-ssl="$(STAGING_DIR)/usr"  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/ldns $(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libldns.{a,so*} $(1)/usr/lib/  
endef  
 
define Package/libldns/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libldns.so.* $(1)/usr/lib/  
endef  
 
define Package/drill/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/drill $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,libldns))  
$(eval $(call BuildPackage,drill))  
 
file:a/libs/libdaq/Makefile (deleted)
#  
# Copyright (C) 2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=libdaq  
PKG_VERSION:=1.1.1  
PKG_RELEASE:=1  
 
PKG_SOURCE_URL:=http://www.snort.org/dl/snort-current/  
PKG_SOURCE:=daq-$(PKG_VERSION).tar.gz  
PKG_MD5SUM:=bc204ea09165b4ecbb1bb49c7c1a2ad4  
PKG_BUILD_DIR:=$(BUILD_DIR)/daq-$(PKG_VERSION)  
 
include $(INCLUDE_DIR)/package.mk  
include $(INCLUDE_DIR)/nls.mk  
 
define Package/libdaq  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=DAQ library  
URL:=$(PKG_SOURCE_URL)  
DEPENDS:=+libdnet +libpcap  
endef  
 
define Package/libdaq/description  
Data Acquisition library for packet I/O.  
endef  
 
CONFIGURE_ARGS+= \  
--disable-static \  
--disable-nfq-module \  
--with-dnet-includes="$(STAGING_DIR)/usr/include" \  
--with-dnet-libraries="$(STAGING_DIR)/usr/lib" \  
--with-libpcap-includes="$(STAGING_DIR)/usr/include" \  
--with-libpcap-libraries="$(STAGING_DIR)/usr/lib" \  
 
define Build/Compile  
$(MAKE) $(MAKE_FLAGS) -C $(PKG_BUILD_DIR)  
endef  
 
define Build/Install  
$(MAKE) $(MAKE_FLAGS) -C $(PKG_BUILD_DIR) install DESTDIR=$(PKG_INSTALL_DIR)  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(STAGING_DIR)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include/  
$(INSTALL_DIR) $(STAGING_DIR)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib/  
$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/daq  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/daq/* $(STAGING_DIR)/usr/lib/daq/  
$(INSTALL_DIR) $(STAGING_DIR)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/daq-modules-config $(STAGING_DIR)/usr/bin/  
endef  
 
define Package/libdaq/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/  
$(INSTALL_DIR) $(1)/usr/lib/daq  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/daq/*.so* $(1)/usr/lib/daq/  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/daq-modules-config $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,libdaq))  
 
--- daq-1.1.1/configure 2012-07-10 21:32:51.000000000 +0200  
+++ daq-new/configure 2012-08-03 15:47:07.654945651 +0200  
@@ -12717,10 +12717,11 @@  
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpcap version >= \"1.0.0\"" >&5  
$as_echo_n "checking for libpcap version >= \"1.0.0\"... " >&6; }  
if test "$cross_compiling" = yes; then :  
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5  
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}  
-as_fn_error $? "cannot run test program while cross compiling  
-See \`config.log' for more details" "$LINENO" 5; }  
+# { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5  
+#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}  
+#as_fn_error $? "cannot run test program while cross compiling  
+#See \`config.log' for more details" "$LINENO" 5; }  
+ echo " No cross compiling test."  
else  
cat confdefs.h - <<_ACEOF >conftest.$ac_ext  
/* end confdefs.h. */  
 
file:a/libs/libdnet/Makefile (deleted)
#  
# Copyright (C) 2006-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=libdnet  
PKG_VERSION:=1.11  
PKG_RELEASE:=2  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@SF/$(PKG_NAME)  
PKG_MD5SUM:=04c394ed8e1e7fc455456e79e908916d  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
PKG_CONFIG_DEPENDS:=\  
CONFIG_PACKAGE_libdnet \  
CONFIG_PACKAGE_pydnet  
 
PKG_BUILD_DEPENDS:=PACKAGE_pydnet:python  
 
include $(INCLUDE_DIR)/package.mk  
$(call include_mk, python-package.mk)  
 
define Package/libdnet/Default  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=Low-level network library  
URL:=http://sourceforge.net/projects/libdnet/  
endef  
 
define Package/libdnet/Default/description  
libdnet is a library of simplified, portable interface to several  
low-level networking routines.  
endef  
 
define Package/libdnet  
$(call Package/libdnet/Default)  
endef  
 
define Package/libdnet/description  
$(call Package/libdnet/Default/description)  
endef  
 
define Package/pydnet  
$(call Package/libdnet/Default)  
DEPENDS:=libdnet +python-mini  
endef  
 
define Package/pydnet/description  
$(call Package/libdnet/Default/description)  
This package contains the python dnet library.  
endef  
 
TARGET_CFLAGS += $(FPIC)  
 
CONFIGURE_ARGS += \  
--enable-shared \  
--enable-static \  
--without-check \  
--without-python  
 
CONFIGURE_VARS += \  
ac_cv_dnet_bsd_bpf=no  
 
MAKE_FLAGS += \  
CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"  
 
define Build/Configure  
(cd $(PKG_BUILD_DIR); \  
ln -sf config/acinclude.m4 . ; \  
autoreconf -v --install || exit 1 \  
);  
$(call Build/Configure/Default)  
endef  
 
define Build/Compile  
$(call Build/Compile/Default)  
$(if $(CONFIG_PACKAGE_pydnet), \  
$(call Build/Compile/PyMod, \  
python/, \  
build \  
) \  
)  
endef  
 
define Build/Install  
$(call Build/Install/Default)  
$(if $(CONFIG_PACKAGE_pydnet), \  
$(call Build/Compile/PyMod, \  
python/, \  
install --no-compile --prefix $(PKG_INSTALL_DIR)/usr \  
) \  
)  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(2)/bin  
$(INSTALL_BIN) \  
$(PKG_INSTALL_DIR)/usr/bin/dnet-config \  
$(2)/bin/  
$(SED) \  
's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \  
$(2)/bin/dnet-config  
 
$(INSTALL_DIR) $(1)/usr/include  
$(INSTALL_DATA)\  
$(PKG_INSTALL_DIR)/usr/include/dnet.h \  
$(1)/usr/include/  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/include/dnet \  
$(1)/usr/include/  
 
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/lib/libdnet.{la,a,so*} \  
$(1)/usr/lib/  
endef  
 
define Package/libdnet/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/lib/libdnet.so.* \  
$(1)/usr/lib/  
 
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) \  
$(PKG_INSTALL_DIR)/usr/sbin/dnet \  
$(1)/usr/sbin/  
endef  
 
define Package/pydnet/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/python* $(1)/usr/lib/  
endef  
 
 
$(eval $(call BuildPackage,libdnet))  
$(eval $(call BuildPackage,pydnet))  
 
--- a/dnet-config.in  
+++ b/dnet-config.in  
@@ -45,10 +45,18 @@ while test $# -gt 0; do  
done  
 
if test "$echo_cflags" = "yes"; then  
- echo -I@includedir@  
+ includes=  
+ if test "@includedir@" != "/usr/include" ; then  
+ includes=-I@includedir@  
+ fi  
+ echo $includes  
fi  
 
if test "$echo_libs" = "yes"; then  
- echo -L@libdir@ -ldnet @LIBS@  
+ libs=  
+ if test "@libdir@" != "/usr/lib" ; then  
+ libs=-I@libdir@  
+ fi  
+ echo $libs -ldnet @LIBS@  
fi  
 
 
--- a/config/config.sub  
+++ b/config/config.sub  
@@ -228,7 +228,7 @@ case $basic_machine in  
| a29k \  
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \  
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \  
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \  
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \  
| c4x | clipper \  
| d10v | d30v | dlx | dsp16xx \  
| fr30 | frv \  
@@ -290,7 +290,7 @@ case $basic_machine in  
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \  
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \  
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \  
- | avr-* \  
+ | avr-* | avr32-* \  
| bs2000-* \  
| c[123]* | c30-* | [cjt]90-* | c54x-* \  
| clipper-* | cydra-* \  
 
--- a/python/dnet.c  
+++ b/python/dnet.c  
@@ -2726,7 +2726,7 @@ static PyObject *__pyx_f_4dnet_15__addr_  
PyObject *__pyx_3 = 0;  
unsigned short __pyx_4;  
Py_INCREF(__pyx_v_self);  
- ((PyObject*)__pyx_v_next) = Py_None; Py_INCREF(((PyObject*)__pyx_v_next));  
+ __pyx_v_next = Py_None; Py_INCREF(((PyObject*)__pyx_v_next));  
 
/* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":634 */  
__pyx_1 = (((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->cur <= ((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->max);  
@@ -2738,7 +2738,7 @@ static PyObject *__pyx_f_4dnet_15__addr_  
Py_DECREF(__pyx_2); __pyx_2 = 0;  
if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_4dnet_addr)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;}  
Py_DECREF(((PyObject *)__pyx_v_next));  
- ((PyObject *)__pyx_v_next) = __pyx_3;  
+ __pyx_v_next = __pyx_3;  
__pyx_3 = 0;  
 
/* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":636 */  
 
file:a/libs/libgee/Makefile (deleted)
#  
# Copyright (C) 2006-2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=libgee  
PKG_VERSION:=0.6.4  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz  
PKG_SOURCE_URL:=@GNOME/libgee/0.6/  
PKG_MD5SUM:=a32bf498cf33d5e3417823a7b252ad22  
 
PKG_BUILD_DEPENDS:=vala/host glib2  
 
TARGET_LDFLAGS+=\  
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib  
 
include $(INCLUDE_DIR)/package.mk  
include $(INCLUDE_DIR)/nls.mk  
 
define Package/libgee  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=GObject based collection library  
URL:=http://live.gnome.org/Libgee  
DEPENDS:=+glib2  
endef  
 
define Package/libgee/description  
libgee is a collection library providing GObject-based interfaces and classes  
for commonly used data structures.  
endef  
 
define Build/Compile  
$(MAKE) -C $(PKG_BUILD_DIR) \  
DESTDIR="$(PKG_INSTALL_DIR)" \  
all install  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/gee-1.0}  
 
$(CP) \  
$(PKG_INSTALL_DIR)/usr/lib/libgee.{so*,la} \  
$(1)/usr/lib/  
 
$(INSTALL_DATA) \  
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \  
$(1)/usr/lib/pkgconfig/  
 
$(INSTALL_DATA) \  
$(PKG_INSTALL_DIR)/usr/include/gee-1.0/gee.h \  
$(1)/usr/include/gee-1.0/  
 
$(INSTALL_DIR) $(1)/usr/share/vala/vapi  
 
$(INSTALL_DATA) \  
$(PKG_INSTALL_DIR)/usr/share/vala/vapi/gee-1.0.vapi \  
$(1)/usr/share/vala/vapi  
endef  
 
define Package/libgee/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/lib/libgee.so* \  
$(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,libgee))  
 
#  
# Copyright (C) 2011-2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=libmicrohttpd  
PKG_VERSION:=0.9.19  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@GNU/libmicrohttpd  
PKG_MD5SUM:=0f4c55ba224ce75b3b993b558e072a6b  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libmicrohttpd  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=Microhttpd  
URL:=http://www.gnu.org/software/libmicrohttpd  
DEPENDS:=+libpthread  
endef  
 
define Package/libmicrohttpd/description  
GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application.  
endef  
 
CONFIGURE_ARGS+= \  
--disable-curl \  
--disable-https \  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/microhttpd.h $(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.{a,so*} $(1)/usr/lib/  
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmicrohttpd.pc $(1)/usr/lib/pkgconfig/  
endef  
 
define Package/libmicrohttpd/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmicrohttpd.so* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,libmicrohttpd))  
 
#  
# Copyright (C) 2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=libmicroxml  
PKG_VERSION:=2012-06-11  
PKG_RELEASE=$(PKG_SOURCE_VERSION)  
 
PKG_SOURCE_PROTO:=git  
PKG_SOURCE_URL:=git://dev.freecwmp.org/microxml  
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)  
PKG_SOURCE_VERSION:=72965423184f24cc0b963d91c2d1863cdb01b6aa  
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz  
 
PKG_FIXUP:=autoreconf  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libmicroxml  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=XML library  
endef  
 
define Package/libmicroxml/description  
A micro sized XML library  
endef  
 
CONFIGURE_ARGS += \  
--disable-threads \  
--enable-static \  
--enable-shared  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_BUILD_DIR)/microxml.h $(1)/usr/include  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib  
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
$(CP) $(PKG_BUILD_DIR)/microxml.pc $(1)/usr/lib/pkgconfig  
endef  
 
define Package/libmicroxml/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib  
endef  
 
$(eval $(call BuildPackage,libmicroxml))  
 
file:a/libs/libnfc/Makefile (deleted)
#  
# Copyright (C) 2010-2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=libnfc  
PKG_VERSION:=1.7.0  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=http://libnfc.googlecode.com/files  
PKG_MD5SUM:=8d8aced79cc0859c605c04d59e4484b3  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libnfc/Default  
TITLE:=Near Field Communication (NFC) library  
URL:=http://www.libnfc.org  
endef  
 
define Package/libnfc  
$(call Package/libnfc/Default)  
SECTION:=libs  
CATEGORY:=Libraries  
DEPENDS:=+libusb-compat +pcscd +ccid  
endef  
 
define Package/libnfc/description  
libnfc is a free software library used to handle NFC capable devices.  
It supports the four main NFC modulations:  
* ISO14443-A (NXP MIFARE),  
* ISO14443-B,  
* JIS X 6319-4 (Sony Felica) and  
* Jewel Topaz (Innovision Research & Development).  
And depending on hardware, it supports:  
* Read (RFID @13.56Mhz),  
* Emulation and  
* Peer2Peer mode.  
endef  
 
define Package/libnfc-bin  
$(call Package/libnfc/Default)  
TITLE+= (binaries)  
SECTION:=utils  
CATEGORY:=Utilities  
DEPENDS:=+libnfc  
endef  
 
define Package/libnfc-bin/description  
libnfc is provided with some useful tools:  
* nfc-list: target listing;  
* nfc-mfclassic: Mifare Classic operations;  
* nfc-mfultralight: Mifare Ultralight operations.  
endef  
 
define Package/libnfc-examples  
$(call Package/libnfc/Default)  
TITLE+= (examples)  
SECTION:=utils  
CATEGORY:=Utilities  
DEPENDS:=+libnfc  
endef  
 
define Package/libnfc-examples/description  
libnfc is provided with some examples like:  
* various targets emulation;  
* NFC frames relay (ie. over network);  
* manually done anticollision;  
* etc.  
endef  
 
TARGET_CFLAGS += $(FPIC)  
CONFIGURE_ARGS += --without-readline  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/nfc $(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfc.{a,so*} $(1)/usr/lib/  
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnfc.pc $(1)/usr/lib/pkgconfig/  
endef  
 
define Package/libnfc/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfc.so.* $(1)/usr/lib/  
endef  
 
define Package/libnfc-bin/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-list $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-mfclassic $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-mfultralight $(1)/usr/bin/  
endef  
 
define Package/libnfc-examples/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-anticol $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-dep-initiator $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-dep-target $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-emulate-forum-tag4 $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-emulate-tag $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-emulate-uid $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-poll $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-relay $(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/nfc-relay-picc $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,libnfc))  
$(eval $(call BuildPackage,libnfc-bin))  
$(eval $(call BuildPackage,libnfc-examples))  
 
file:a/libs/libshout/Makefile (deleted)
#  
# Copyright (C) 2008-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=libshout  
PKG_VERSION:=2.3.1  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/libshout/  
PKG_MD5SUM:=11765b2592e7ea623ccd93d3f8df172c  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
TARGET_CFLAGS += $(FPIC) -Wl,-rpath-link=$(STAGING_DIR)/usr/lib  
 
define Package/libshout  
SECTION:=libs  
DEPENDS:= +libspeex +libtheora +libvorbis +libvorbisidec +libpthread  
CATEGORY:=Libraries  
TITLE:=Library which can be used to write a source client like ices  
URL:=http://www.icecast.org/download.php  
endef  
 
define Package/libshout/description  
libshout allows applications to easily communicate and broadcast  
to an Icecast streaming media server. It handles the socket connections,  
metadata communication, and data streaming for the calling application,  
and lets developers focus on feature sets instead of implementation  
details.  
endef  
 
define Build/Configure  
$(call Build/Configure/Default, \  
VORBIS_CFLAGS="-I$(STAGING_DIR)/usr/include/tremor/" \  
VORBIS_LIBS="$(TARGET_LDFLAGS) -lvorbis -lvorbisidec" \  
--enable-shared \  
--enable-static \  
)  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include/shout  
$(CP) $(PKG_INSTALL_DIR)/usr/include/shout/shout.h $(1)/usr/include/shout  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libshout.{a,so*} $(1)/usr/lib/  
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
$(SED) 's|/usr/include|$(STAGING_DIR)/usr/include|' \  
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/shout.pc  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/shout.pc $(1)/usr/lib/pkgconfig/  
endef  
 
define Package/libshout/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libshout.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,libshout))  
 
--- a/src/vorbis.c  
+++ b/src/vorbis.c  
@@ -28,7 +28,7 @@  
#endif  
#include <stdlib.h>  
 
-#include <vorbis/codec.h>  
+#include <tremor/ivorbiscodec.h>  
 
#include "shout_private.h"  
#include "shout_ogg.h"  
 
--- a/Makefile.in  
+++ b/Makefile.in  
@@ -288,12 +288,12 @@ top_builddir = @top_builddir@  
top_srcdir = @top_srcdir@  
AUTOMAKE_OPTIONS = 1.6 foreign  
ACLOCAL_AMFLAGS = -I m4  
-SUBDIRS = include src examples debian doc win32  
+SUBDIRS = include src debian  
EXTRA_DIST = INSTALL m4/shout.m4 m4/acx_pthread.m4 \  
m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \  
m4/xiph_types.m4  
 
-doc_DATA = COPYING NEWS README examples/example.c examples/nonblocking.c  
+doc_DATA = COPYING NEWS README  
m4datadir = $(datadir)/aclocal  
m4data_DATA = m4/shout.m4  
@HAVE_PKGCONFIG_TRUE@pkgconfigdir = $(libdir)/pkgconfig  
 
#  
# Copyright (C) 2007-2013 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=libtorrent  
PKG_VERSION:=0.13.3-git  
PKG_RELEASE=$(PKG_SOURCE_VERSION)-1  
 
PKG_SOURCE_PROTO:=git  
PKG_SOURCE_URL:=https://github.com/rakshasa/libtorrent.git  
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)  
PKG_SOURCE_VERSION:=680576e23e7d5f642ee51486fdf301ac0195e188  
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz  
 
PKG_FIXUP:=autoreconf  
PKG_BUILD_PARALLEL:=1  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libtorrent  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=Rakshasa's BitTorrent library  
URL:=http://libtorrent.rakshasa.no/  
DEPENDS:=+libopenssl +libsigcxx  
endef  
 
define Package/libtorrent/description  
LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on  
high performance and good code. The library differentiates itself from other  
implementations by transfering directly from file pages to the network stack.  
On high-bandwidth connections it is able to seed at 3 times the speed of the  
official client.  
endef  
 
TARGET_LDFLAGS += $(LIBGCC_S)  
 
CONFIGURE_ARGS+= \  
--enable-shared \  
--enable-static \  
--enable-aligned \  
--disable-debug \  
--enable-openssl \  
--disable-instrumentation  
 
define Build/Configure  
( cd $(PKG_BUILD_DIR); ./autogen.sh );  
$(call Build/Configure/Default)  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/torrent $(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent.{a,so*} $(1)/usr/lib/  
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtorrent.pc $(1)/usr/lib/pkgconfig/  
endef  
 
define Package/libtorrent/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,libtorrent))  
 
--- a/configure.ac  
+++ b/configure.ac  
@@ -19,7 +19,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO  
 
AM_INIT_AUTOMAKE  
AC_CONFIG_HEADERS(config.h)  
-AM_PATH_CPPUNIT(1.9.6)  
 
AC_PROG_CXX  
 
--- a/scripts/checks.m4  
+++ b/scripts/checks.m4  
@@ -96,7 +96,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [  
AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [  
AC_MSG_CHECKING(whether kqueue supports pipes and ptys)  
 
- AC_RUN_IFELSE([AC_LANG_SOURCE([  
+ AC_LINK_IFELSE([AC_LANG_SOURCE([  
#include <fcntl.h>  
#include <stdlib.h>  
#include <unistd.h>  
--- a/scripts/common.m4  
+++ b/scripts/common.m4  
@@ -223,7 +223,7 @@ dnl Need to fix this so that it uses t  
AC_DEFUN([TORRENT_CHECK_EXECINFO], [  
AC_MSG_CHECKING(for execinfo.h)  
 
- AC_RUN_IFELSE([AC_LANG_SOURCE([  
+ AC_LINK_IFELSE([AC_LANG_SOURCE([  
#include <execinfo.h>  
int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}  
])],  
@@ -238,7 +238,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [  
AC_DEFUN([TORRENT_CHECK_ALIGNED], [  
AC_MSG_CHECKING(the byte alignment)  
 
- AC_RUN_IFELSE([AC_LANG_SOURCE([  
+ AC_LINK_IFELSE([AC_LANG_SOURCE([  
#include <inttypes.h>  
int main() {  
char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 };  
 
--- a/src/net/socket_datagram.cc  
+++ b/src/net/socket_datagram.cc  
@@ -73,6 +73,23 @@ SocketDatagram::write_datagram(const voi  
int r;  
 
if (sa != NULL) {  
+#ifdef RAK_USE_INET6  
+ if (m_ipv6_socket && sa->family() == rak::socket_address::pf_inet) {  
+ uint32_t addr32[4];  
+ sockaddr_in6 mapped_addr;  
+ memset(&mapped_addr, 0, sizeof(mapped_addr));  
+ mapped_addr.sin6_family = AF_INET6;  
+ addr32[0] = 0;  
+ addr32[1] = 0;  
+ addr32[2] = htonl(0xffff);  
+ addr32[3] = sa->sa_inet()->address_n();  
+ memcpy(mapped_addr.sin6_addr.s6_addr, addr32, sizeof(uint32_t) * 4);  
+ mapped_addr.sin6_port = sa->sa_inet()->port_n();  
+ r = ::sendto(m_fileDesc, buffer, length, 0, (sockaddr*)&mapped_addr, sizeof(mapped_addr));  
+ } else if (m_ipv6_socket && sa->family() == rak::socket_address::pf_inet6) {  
+ r = ::sendto(m_fileDesc, buffer, length, 0, sa->sa_inet6()->c_sockaddr(), sizeof(rak::socket_address_inet6));  
+ } else  
+#endif  
r = ::sendto(m_fileDesc, buffer, length, 0, sa->sa_inet()->c_sockaddr(), sizeof(rak::socket_address_inet));  
} else {  
r = ::send(m_fileDesc, buffer, length, 0);  
 
file:a/libs/libugpio/Makefile (deleted)
#  
# Copyright (C) 2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=libugpio  
PKG_VERSION:=0.0.1  
PKG_RELEASE=$(PKG_SOURCE_VERSION)-1  
 
PKG_SOURCE_PROTO:=git  
PKG_SOURCE_URL:=git://github.com/mhei/libugpio.git  
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)  
PKG_SOURCE_VERSION:=8235d04096bfa9db594d5df75c5cd634a3bbc39a  
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz  
 
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libugpio  
SECTION:=libs  
CATEGORY:=Libraries  
URL:=https://github.com/mhei/libugpio  
TITLE:=Library for using sysfs gpio interface from C programs  
DEPENDS:=@GPIO_SUPPORT  
endef  
 
define Package/libugpio/description  
libugpio is a library to ease the use of linux kernel's sysfs  
gpio interface from C programs and/or other libraries.  
endef  
 
define Package/gpioctl-sysfs  
SECTION:=utils  
CATEGORY:=Utilities  
TITLE:=Tool for controlling gpio pins  
DEPENDS:=+libugpio  
endef  
 
define Package/gpioctl-sysfs/description  
Tool for controlling gpio pins using the sysfs api provided by the kernel.  
endef  
 
define Build/Configure  
( cd "$(PKG_BUILD_DIR)"; ./autogen.sh )  
$(call Build/Configure/Default)  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/ugpio $(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libugpio.{so*,a} $(1)/usr/lib/  
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libugpio.pc $(1)/usr/lib/pkgconfig/  
endef  
 
define Package/libugpio/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libugpio.so* $(1)/usr/lib/  
endef  
 
define Package/gpioctl-sysfs/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gpioctl $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,libugpio))  
$(eval $(call BuildPackage,gpioctl-sysfs))  
 
file:a/libs/libyaml/Makefile (deleted)
#  
# Copyright (C) 2008-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=yaml  
PKG_VERSION:=0.1.6  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://pyyaml.org/download/libyaml/  
PKG_MD5SUM:=5fe00cda18ca5daeb43762b80c38e06e  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
TARGET_CFLAGS += $(FPIC)  
 
define Package/libyaml  
SUBMENU:=Python  
SECTION:=lang  
CATEGORY:=Languages  
TITLE:=libyaml  
URL:=http://pyyaml.org/wiki/LibYAML  
endef  
 
define Package/libyaml/description  
yaml library written in c  
endef  
 
define Package/libyaml/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libyaml.so $(1)/usr/lib/  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib  
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/  
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libyaml.{a,la} $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,libyaml))  
 
file:a/libs/lttng-ust/Makefile (deleted)
#  
# Copyright (C) 2013 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=lttng-ust  
PKG_VERSION:=2.1.0  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME)  
PKG_MD5SUM:=2032e66f3438949c51ec9922c6f8542b  
 
PKG_BUILD_PARALLEL:=1  
PKG_USE_MIPS16:=0  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/lttng-ust  
SECTION:=libs  
CATEGORY:=Libraries  
DEPENDS:=+liburcu +libuuid +librt  
TITLE:=LTTng Userspace Tracing Library  
URL:=https://lttng.org/  
endef  
 
define Package/lttng-ust/description  
LTTng Userspace Tracing Library  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/lttng* $(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblttng-ust*.{a,so*} $(1)/usr/lib/  
endef  
 
define Package/lttng-ust/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblttng-ust*.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,lttng-ust))  
 
diff -urN lttng-ust-2.1.0/Makefile.am lttng-ust-2.1.0.new/Makefile.am  
--- lttng-ust-2.1.0/Makefile.am 2012-12-10 21:29:20.000000000 +0100  
+++ lttng-ust-2.1.0.new/Makefile.am 2013-01-14 14:25:41.923661688 +0100  
@@ -5,9 +5,7 @@  
liblttng-ust-ctl \  
liblttng-ust-fork \  
liblttng-ust-libc-wrapper \  
- tools \  
- tests \  
- doc  
+ tools  
 
if BUILD_JNI_INTERFACE  
SUBDIRS += liblttng-ust-java  
diff -urN lttng-ust-2.1.0/Makefile.in lttng-ust-2.1.0.new/Makefile.in  
--- lttng-ust-2.1.0/Makefile.in 2012-12-20 19:24:57.000000000 +0100  
+++ lttng-ust-2.1.0.new/Makefile.in 2013-01-14 14:25:31.247661789 +0100  
@@ -135,7 +135,7 @@  
CTAGS = ctags  
DIST_SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \  
liblttng-ust liblttng-ust-ctl liblttng-ust-fork \  
- liblttng-ust-libc-wrapper tools tests doc liblttng-ust-java  
+ liblttng-ust-libc-wrapper tools liblttng-ust-java  
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)  
distdir = $(PACKAGE)-$(VERSION)  
top_distdir = $(distdir)  
@@ -307,7 +307,7 @@  
ACLOCAL_AMFLAGS = -I config  
SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \  
liblttng-ust liblttng-ust-ctl liblttng-ust-fork \  
- liblttng-ust-libc-wrapper tools tests doc $(am__append_1)  
+ liblttng-ust-libc-wrapper tools $(am__append_1)  
 
#temporarily disabled  
# liblttng-ust-malloc  
 
file:a/libs/mxml/Makefile (deleted)
#  
# Copyright (C) 2010 Tobias Schneider  
# Copyright (C) 2007 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=mxml  
PKG_VERSION:=2.8  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://www.msweet.org/files/project3/  
PKG_FIXUP:=autoreconf  
PKG_MD5SUM:=d85ee6d30de053581242c4a86e79a5d2  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/mxml  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=mini-xml  
URL:=http://www.minixml.org/  
endef  
 
define Package/mxml/description  
A small xml library.  
endef  
 
TARGET_CFLAGS += $(FPIC)  
 
define Build/Configure  
$(call Build/Configure/Default, \  
--enable-shared \  
--enable-static \  
)  
endef  
 
define Build/InstallDev  
mkdir -p $(1)/usr/include  
$(CP) $(PKG_BUILD_DIR)/mxml.h $(1)/usr/include/  
mkdir -p $(1)/usr/lib  
$(CP) $(PKG_BUILD_DIR)/libmxml.so* $(1)/usr/lib/  
mkdir -p $(1)/usr/lib/pkgconfig  
$(CP) $(PKG_BUILD_DIR)/mxml.pc $(1)/usr/lib/pkgconfig/  
endef  
 
define Package/mxml/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_BUILD_DIR)/libmxml.so* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,mxml))  
 
--- a/Makefile.in  
+++ b/Makefile.in  
@@ -88,7 +88,7 @@ PUBLIBOBJS = mxml-attr.o mxml-entity.o m  
mxml-index.o mxml-node.o mxml-search.o mxml-set.o  
LIBOBJS = $(PUBLIBOBJS) mxml-private.o mxml-string.o  
OBJS = mxmldoc.o testmxml.o $(LIBOBJS)  
-TARGETS = $(LIBMXML) mxmldoc testmxml mxml.xml doc/mxml.man  
+TARGETS = $(LIBMXML)  
 
 
#  
 
file:a/libs/ortp/Makefile (deleted)
#  
# Copyright (C) 2010-2014 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=ortp  
PKG_VERSION:=0.16.3  
PKG_RELEASE:=2  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:= \  
http://download.savannah.gnu.org/releases-noredirect/linphone/ortp/sources/ \  
http://www.very-clever.com/download/nongnu/linphone/ortp/sources/  
PKG_MD5SUM:=2b0281600cb958d1c94e318a86b62fe3  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libortp  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=Real-time Transport Protocol (RTP) library  
URL:=http://www.linphone.org/index.php/eng/code_review/ortp  
DEPENDS:= +libpthread  
endef  
 
ifneq ($(CONFIG_avr32),)  
TARGET_CFLAGS += -fsigned-char  
endif  
 
CONFIGURE_ARGS += \  
--disable-debug \  
--enable-ipv6 \  
--enable-perf \  
--disable-ssl-hmac \  
--disable-so-reuseaddr \  
--without-srtp \  
 
CONFIGURE_VARS += \  
ac_cv_header_srtp_srtp_h=no \  
ac_cv_lib_srtp_srtp_init=no \  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
( cd $(PKG_INSTALL_DIR); $(CP) \  
./usr/include/ortp \  
$(1)/usr/include/ \  
)  
$(INSTALL_DIR) $(1)/usr/lib  
( cd $(PKG_INSTALL_DIR); $(CP) \  
./usr/lib/libortp.{a,so*} \  
$(1)/usr/lib/ \  
)  
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
( cd $(PKG_INSTALL_DIR); $(CP) \  
./usr/lib/pkgconfig/ortp.pc \  
$(1)/usr/lib/pkgconfig/ \  
)  
endef  
 
define Package/libortp/install  
$(INSTALL_DIR) $(1)/usr/lib  
( cd $(PKG_INSTALL_DIR); $(CP) \  
./usr/lib/libortp.so.* \  
$(1)/usr/lib/ \  
)  
endef  
 
$(eval $(call BuildPackage,libortp))  
 
--- a/src/stun.c  
+++ b/src/stun.c  
@@ -399,7 +399,7 @@ stunParseMessage( char* buf, unsigned in  
char* body;  
unsigned int size;  
ortp_debug("stun: Received stun message: %i bytes\n", bufLen);  
- memset(msg, 0, sizeof(msg));  
+ memset(msg, 0, sizeof(*msg));  
 
if (sizeof(StunMsgHdr) > bufLen)  
{  
 
file:a/libs/pthsem/Makefile (deleted)
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=pthsem  
PKG_VERSION:=2.0.8  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://www.auto.tuwien.ac.at/~mkoegler/pth/  
PKG_MD5SUM:=9144b26dcc27e67498d63dd5456f934c  
 
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)  
PKG_FIXUP:=autoreconf  
PKG_BUILD_PARALLEL:=1  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/pthsem  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=GNU pth extended with semaphore support  
URL:=http://www.auto.tuwien.ac.at/~mkoegler/index.php/pth  
DEPENDS:=@USE_EGLIBC @TARGET_x86  
endef  
 
define Package/pthsem/description  
GNU pth is a user mode multi threading library.  
pthsem is an extend version, with support for semaphores added. It can be installed parallel to a normal pth.  
endef  
 
MAKE_FLAGS += \  
OPTIM="$(TARGET_CFLAGS)" \  
CFLAGS="$(TARGET_CFLAGS)" \  
DESTDIR="$(PKG_INSTALL_DIR)"  
 
define Build/InstallDev  
$(INSTALL_DIR) $(2)/bin  
$(INSTALL_BIN) \  
$(PKG_INSTALL_DIR)/usr/bin/pthsem-config \  
$(2)/bin/  
$(SED) \  
's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \  
$(2)/bin/pthsem-config  
 
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h \  
$(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpthsem.{a,la,so*} \  
$(1)/usr/lib/  
endef  
 
define Package/pthsem/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpthsem.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,pthsem))  
 
file:a/libs/qrencode/Makefile (deleted)
#  
# Copyright (C) 2006-2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=qrencode  
PKG_VERSION:=3.4.3  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://fukuchi.org/works/qrencode/  
PKG_MD5SUM:=2bb7fb7c7bd1a4042d4910b29609319e  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libqrencode  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=Library for encoding data in a QR Code symbol  
URL:=http://fukuchi.org/works/qrencode/  
endef  
 
define Package/libqrencode/description  
Libqrencode is a C library for encoding data in a QR Code symbol,  
a kind of 2D symbology that can be scanned by handy terminals such  
as a mobile phone with CCD. The capacity of QR Code is up to 7000  
digits or 4000 characters, and is highly robust.  
 
 
endef  
 
CONFIGURE_ARGS+= \  
--enable-shared \  
--enable-static \  
--disable-rpath \  
--disable-sdltest \  
--without-tools \  
--without-tests  
 
TARGET_LDFLAGS+= -s  
 
define Build/Compile  
$(MAKE) -C $(PKG_BUILD_DIR) \  
$(TARGET_CONFIGURE_OPTS) \  
CFLAGS="$(TARGET_CFLAGS)" \  
LDFLAGS="$(TARGET_LDFLAGS)" \  
DESTDIR="$(PKG_INSTALL_DIR)" \  
all install  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig  
$(CP) $(PKG_INSTALL_DIR)/usr/include/qrencode.h $(1)/usr/include/  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libqrencode.{a,so*} $(1)/usr/lib/  
$(CP) $(PKG_BUILD_DIR)/libqrencode.pc $(1)/usr/lib/pkgconfig/  
endef  
 
define Package/libqrencode/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libqrencode.so* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,libqrencode))  
 
#  
# Copyright (C) 2007 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
# $Id: Makefile 9173 2007-10-07 03:20:26Z blogic $  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=rblibtorrent  
PKG_VERSION:=0.14.7  
PKG_RELEASE:=1  
 
PKG_SOURCE:=libtorrent-rasterbar-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@SF/libtorrent  
PKG_MD5SUM:=6959f719245d82758235fd73d93373b2  
PKG_BUILD_DIR:=$(BUILD_DIR)/libtorrent-rasterbar-$(PKG_VERSION)  
PKG_BUILD_DEPENDS:=libtool  
BOOSTPOSTFIX=mt  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/rblibtorrent  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=Rasterbar BitTorrent library  
URL:=http://www.rasterbar.com/products/libtorrent/  
DEPENDS:=+boost +boost-python +boost-filesystem +boost-regex +boost-thread +boost-program_options +boost-system +libopenssl @BROKEN  
endef  
 
define Package/rblibtorrent/description  
Rasterbar libtorrent is a C++ library that aims to be a good alternative to  
all the other bittorrent implementations around. It is a library and not a  
full featured client, although it comes with a working example client.  
endef  
 
CONFIGURE_ARGS+= \  
--enable-shared \  
--disable-debug \  
--enable-python-binding \  
--with-ssl=$(STAGING_DIR)/usr \  
--with-boost=$(STAGING_DIR)/usr/include \  
--with-boost-libdir=$(STAGING_DIR)/usr/lib \  
--with-zlib=detect \  
--with-boost-system=boost_system-$(BOOSTPOSTFIX) \  
--with-boost-filesystem=boost_filesystem-$(BOOSTPOSTFIX) \  
--with-boost-thread=boost_thread-$(BOOSTPOSTFIX) \  
--with-boost-regex=boost_regex-$(BOOSTPOSTFIX) \  
--with-boost-python=boost_python-$(BOOSTPOSTFIX) \  
--with-boost-program_options=boost_program_options-$(BOOSTPOSTFIX)  
 
CONFIGURE_VARS+=CC="$(TARGET_CXX)"  
 
EXTRA_LDFLAGS+=-lz -lpthread  
 
define Build/Compile  
$(call Build/Compile/Default)  
$(call Build/Install/Default)  
endef  
 
define Build/InstallDev  
mkdir -p $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/libtorrent $(1)/usr/include/  
mkdir -p $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/  
mkdir -p $(1)/usr/lib/pkgconfig  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtorrent-rasterbar.pc $(1)/usr/lib/pkgconfig/  
endef  
 
define Package/rblibtorrent/install  
$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/lib/python2.6/site-packages/  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.6/site-packages/*.so* $(1)/usr/lib/python2.6/site-packages/  
endef  
 
$(eval $(call BuildPackage,rblibtorrent))  
 
--- libtorrent-rasterbar-0.14.7/bindings/python/Makefile.in 2009-11-18 09:25:39.000000000 +0100  
+++ libtorrent-rasterbar-0.14.7/bindings/python/Makefile.in 2010-02-26 13:27:58.000000000 +0100  
@@ -408,7 +408,7 @@  
 
 
@ENABLE_PYTHON_BINDING_TRUE@all-local:  
-@ENABLE_PYTHON_BINDING_TRUE@ $(PYTHON) setup.py build  
+@ENABLE_PYTHON_BINDING_TRUE@ CXX="$(CXX) -pthread -shared" $(PYTHON) setup.py build  
 
@ENABLE_PYTHON_BINDING_TRUE@install-exec-local:  
@ENABLE_PYTHON_BINDING_TRUE@ $(PYTHON) setup.py install @PYTHON_INSTALL_PARAMS@  
 
file:a/libs/sctp/Makefile (deleted)
#  
# Copyright (C) 2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=lksctp-tools  
PKG_VERSION:=1.0.11  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@SF/lksctp/  
PKG_MD5SUM:=e9cf6c57402c9d4f1173a9529466e16d  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
#####  
## lksctp library: provides sctp_* functions in user space  
#####  
 
define Package/sctp  
SECTION:=libs  
CATEGORY:=Network  
TITLE:=SCTP user-land library  
URL:=http://lksctp.sourceforge.net  
DEPENDS:=+kmod-sctp  
endef  
 
define Package/sctp/description  
SCTP user-land library for sctp_* functions (when socket API is too limited).  
endef  
 
TARGET_LDFLAGS := -L$(STAGING_DIR)/usr/lib $(TARGET_LDFLAGS)  
 
define Package/sctp/install  
# Install the library in the router  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/lib/libsctp.so* \  
$(1)/usr/lib/  
# And also in staging for dependent packages  
$(INSTALL_DIR) $(STAGING_DIR)/usr/include/netinet  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/include/netinet/* \  
$(STAGING_DIR)/usr/include/netinet/  
$(INSTALL_DIR) $(STAGING_DIR)/usr/lib  
$(CP) \  
$(PKG_INSTALL_DIR)/usr/lib/libsctp.so* \  
$(STAGING_DIR)/usr/lib/  
 
endef  
 
$(eval $(call BuildPackage,sctp))  
 
 
diff -Nur uClibc++-0.2.4.orig/Makefile uClibc++-0.2.4/Makefile  
--- uClibc++-0.2.4.orig/Makefile 2012-05-25 23:15:31.000000000 +0200  
+++ uClibc++-0.2.4/Makefile 2013-03-11 11:50:03.000000000 +0100  
@@ -1,4 +1,3 @@  
-MAKE = make  
SUBDIRS = bin include src  
 
# User defines:  
 
file:a/mail/alpine/Makefile (deleted)
#  
# Copyright (C) 2013 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=alpine  
PKG_VERSION:=2.11  
PKG_RELEASE:=1  
 
PKG_SOURCE_URL:=http://patches.freeiz.com/alpine/release/src/  
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz  
PKG_MD5SUM:=a3bba218787691080d706b36215eec06  
 
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/alpine  
SECTION:=mail  
CATEGORY:=Mail  
DEPENDS:=+libopenssl +libncurses +libpthread +libpam  
TITLE:=Alternatively Licensed Program for Internet News and Email  
URL:=http://www.washington.edu/alpine  
endef  
 
define Package/alpine/description  
Alpine (Alternatively Licenced Program for Internet News and Email) is a  
free software email client developed at the University of Washington.  
It is suitable for both the inexperienced email user as well as for  
the most demanding power user.  
endef  
 
CONFIGURE_ARGS += \  
--with-ssl-include-dir=$(STAGING_DIR)/usr/include/openssl/. \  
--with-ssl-lib-dir=$(STAGING_DIR)/usr/lib \  
--without-tcl \  
--without-ldap \  
--without-krb5 \  
--with-system-pinerc=/etc/pine.conf \  
--with-system-fixed-pinerc=/etc/pine.conf.fixed \  
--disable-debug \  
--disable-mouse \  
--with-c-client-target=slx \  
 
ifeq ($(CONFIG_IPV6),y)  
DISABLE_IPV6:=  
else  
DISABLE_IPV6:=--without-ipv6  
endif  
 
define Build/Compile  
( cd $(PKG_BUILD_DIR)/pith ; \  
$(HOSTCC) help_h_gen.c -c -o help_h_gen.o ; \  
$(HOSTCC) help_h_gen.o -o help_h_gen ; \  
$(HOSTCC) help_c_gen.c -c -o help_c_gen.o ; \  
$(HOSTCC) help_c_gen.o -o help_c_gen ; \  
)  
$(call Build/Compile/Default)  
endef  
 
define Package/alpine/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/alpine $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,alpine))  
 
file:a/mail/msmtp/Makefile (deleted)
#  
# Copyright (C) 2009 David Cooper <dave@kupesoft.com>  
# Copyright (C) 2009-2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=msmtp  
PKG_VERSION:=1.4.27  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=@SF/msmtp  
PKG_MD5SUM:=2d6d10d9c59ed2b2635554ed35fb9226  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
 
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/msmtp/Default  
SECTION:=mail  
CATEGORY:=Mail  
TITLE:=Simple sendmail SMTP forwarding  
URL:=http://msmtp.sourceforge.net/  
endef  
 
define Package/msmtp/Default/description  
msmtp is an SMTP client. In the default mode, it transmits a mail to  
an SMTP server (for example at a free mail provider) which does the  
delivery. To use this program with your mail user agent (MUA), create  
a configuration file with your mail account(s) and tell your MUA to  
call msmtp instead of /usr/sbin/sendmail.  
endef  
 
define Package/msmtp  
$(call Package/msmtp/Default)  
DEPENDS+= +libopenssl  
TITLE+= (with SSL support)  
VARIANT:=ssl  
endef  
 
define Package/msmtp/conffiles  
/etc/msmtprc  
endef  
 
define Package/msmtp/description  
$(call Package/msmtp/Default/description)  
This package is built with SSL support.  
endef  
 
define Package/msmtp-nossl  
$(call Package/msmtp/Default)  
TITLE+= (without SSL support)  
VARIANT:=nossl  
endef  
 
define Package/msmtp-nossl/description  
$(call Package/msmtp/Default/description)  
This package is built without SSL support.  
endef  
 
define Package/msmtp-queue  
$(call Package/msmtp/Default)  
DEPENDS+= +bash  
TITLE+= (queue scripts)  
endef  
 
define Package/msmtp-queue/description  
$(call Package/msmtp/Default/description)  
This package contains the msmtp queue scripts.  
endef  
 
CONFIGURE_ARGS += \  
--disable-rpath \  
--without-libintl-prefix \  
--without-libgsasl \  
--without-libidn  
 
MAKE_FLAGS :=  
 
ifeq ($(BUILD_VARIANT),ssl)  
CONFIGURE_ARGS += \  
--with-ssl=openssl  
endif  
 
ifeq ($(BUILD_VARIANT),nossl)  
CONFIGURE_ARGS += \  
--with-ssl=no  
endif  
 
define Package/msmtp/install  
$(INSTALL_DIR) $(1)/etc  
$(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/msmtprc-system.example \  
$(1)/etc/msmtprc  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/msmtp $(1)/usr/bin/  
$(INSTALL_DIR) $(1)/usr/sbin  
endef  
 
define Package/msmtp/postinst  
ln -sf ../bin/msmtp $${IPKG_INSTROOT}/usr/sbin/sendmail  
endef  
 
Package/msmtp-nossl/conffiles = $(Package/msmtp/conffiles)  
Package/msmtp-nossl/install = $(Package/msmtp/install)  
Package/msmtp-nossl/postinst = $(Package/msmtp/postinst)  
 
define Package/msmtp-queue/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/msmtpq/msmtp{q,-queue} $(1)/usr/bin/  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/msmtpqueue/msmtp-{en,list,run}queue.sh $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,msmtp))  
$(eval $(call BuildPackage,msmtp-nossl))  
$(eval $(call BuildPackage,msmtp-queue))  
 
file:a/mail/mutt/Makefile (deleted)
#  
# Copyright (C) 2006-2010 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=mutt  
PKG_VERSION:=1.5.21  
PKG_RELEASE:=1  
 
PKG_SOURCE_URL:=@SF/mutt  
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_MD5SUM:=a29db8f1d51e2f10c070bf88e8a553fd  
 
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/mutt  
SECTION:=mail  
CATEGORY:=Mail  
DEPENDS:=+libopenssl +libncursesw  
TITLE:=Console mail client  
URL:=http://www.mutt.org/  
endef  
 
define Package/mutt/description  
Mutt is a small but very powerful text-based mail client for Unix  
operating systems.  
endef  
 
CONFIGURE_ARGS += \  
--includedir=$(PKG_BUILD_DIR)/. \  
--oldincludedir=$(PKG_BUILD_DIR)/. \  
--enable-pop \  
--enable-imap \  
--with-ssl \  
--without-idn  
 
define Package/mutt/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mutt $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,mutt))  
 
--- a/Makefile.in  
+++ b/Makefile.in  
@@ -342,7 +342,7 @@ top_srcdir = @top_srcdir@  
AUTOMAKE_OPTIONS = 1.6 foreign  
@BUILD_IMAP_TRUE@IMAP_SUBDIR = imap  
@BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap  
-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)  
+SUBDIRS = m4 intl contrib $(IMAP_SUBDIR)  
bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@  
@BUILD_HCACHE_TRUE@HCVERSION = hcversion.h  
BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h $(HCVERSION)  
 
config TVHEADEND_CWC_SUPPORT  
bool "NewCamD support"  
default n  
 
config TVHEADEND_V4L_SUPPORT  
bool "Video4Linux v2 support"  
default n  
 
config TVHEADEND_LINUXDVB_SUPPORT  
bool "Linux DVB support"  
default n  
 
config TVHEADEND_DVBSCAN_SUPPORT  
bool "Fetch DVB-scan data"  
depends on TVHEADEND_LINUXDVB_SUPPORT  
default TVHEADEND_LINUXDVB_SUPPORT  
 
config TVHEADEND_AVAHI_SUPPORT  
bool "Avahi client support"  
select PACKAGE_libavahi-client  
default n  
 
#  
# Copyright (C) 2012 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=tvheadend  
PKG_VERSION:=3.4patch1  
PKG_RELEASE:=0.1  
 
PKG_SOURCE:=$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=https://github.com/tvheadend/tvheadend/archive/  
PKG_MD5SUM:=86d1be0ad6e02bd2aecd3d529a026797  
 
PKG_USE_MIPS16:=0  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/tvheadend  
SECTION:=multimedia  
CATEGORY:=Multimedia  
TITLE:=Tvheadend is a TV streaming server for Linux  
DEPENDS:=+libcurl +libopenssl +librt +zlib +TVHEADEND_AVAHI_SUPPORT:libavahi-client  
URL:=https://tvheadend.org/  
endef  
 
define Package/tvheadend/description  
Tvheadend is a TV streaming server for Linux supporting DVB, ATSC, IPTV,  
and Analog video (V4L) as input sources.  
Can be used as a backend to Showtime, XBMC and various other clients.  
endef  
 
define Package/tvheadend/config  
menu "Configuration"  
depends on PACKAGE_tvheadend  
source "$(SOURCE)/Config.in"  
endmenu  
endef  
 
ifeq ($(CONFIG_TVHEADEND_CWC_SUPPORT),)  
CONFIGURE_ARGS += --disable-cwc  
endif  
 
ifeq ($(CONFIG_TVHEADEND_V4L_SUPPORT),)  
CONFIGURE_ARGS += --disable-v4l  
endif  
 
ifeq ($(CONFIG_TVHEADEND_LINUXDVB_SUPPORT),)  
CONFIGURE_ARGS += --disable-linuxdvb  
endif  
 
ifeq ($(CONFIG_TVHEADEND_DVBSCAN_SUPPORT),)  
CONFIGURE_ARGS += --disable-dvbscan  
endif  
 
ifeq ($(CONFIG_TVHEADEND_AVAHI_SUPPORT),)  
CONFIGURE_ARGS += --disable-avahi  
else  
CONFIGURE_ARGS += --enable-avahi  
endif  
 
CONFIGURE_ARGS += \  
--release \  
--enable-bundle  
 
define Package/tvheadend/install  
$(INSTALL_DIR) $(1)/etc/tvheadend  
$(INSTALL_DIR) $(1)/etc/init.d  
$(INSTALL_BIN) ./files/tvheadend.init $(1)/etc/init.d/tvheadend  
$(INSTALL_DIR) $(1)/lib/upgrade/keep.d  
$(INSTALL_DATA) ./files/tvheadend.upgrade $(1)/lib/upgrade/keep.d/tvheadend  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/build.linux/tvheadend $(1)/usr/bin/  
endef  
 
$(eval $(call BuildPackage,tvheadend))  
 
#!/bin/sh /etc/rc.common  
# Copyright (C) 2012 OpenWrt.org  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
START=80  
 
start() {  
service_start /usr/bin/tvheadend -f -c /etc/tvheadend  
}  
 
stop() {  
service_stop /usr/bin/tvheadend  
}  
 
/etc/tvheadend  
 
--- a/Makefile  
+++ b/Makefile  
@@ -282,7 +282,7 @@ include support/${OSENV}.mk  
# Bundle files  
$(BUILDDIR)/bundle.o: $(BUILDDIR)/bundle.c  
@mkdir -p $(dir $@)  
- $(CC) -I${CURDIR}/src -c -o $@ $<  
+ $(CC) $(CFLAGS) -I${CURDIR}/src -c -o $@ $<  
 
$(BUILDDIR)/bundle.c:  
@mkdir -p $(dir $@)  
 
#  
# Copyright (C) 2006-2011 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=aircrack-ng  
PKG_VERSION:=1.1  
PKG_RELEASE:=3  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://download.aircrack-ng.org/ \  
http://archive.aircrack-ng.org/aircrack-ng/$(PKG_VERSION)/  
PKG_MD5SUM:=f7a24ed8fad122c4187d06bfd6f998b4  
 
PKG_BUILD_PARALLEL:=0  
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/aircrack-ng  
SECTION:=net  
CATEGORY:=Network  
DEPENDS:=+libpthread +libopenssl +libpcap  
TITLE:=next generation of aircrack with new features  
URL:=http://www.aircrack-ng.org/  
SUBMENU:=wireless  
endef  
 
define Package/aircrack-ng/description  
Aircrack-ng is the next generation of aircrack with new features  
endef  
 
MAKE_FLAGS += \  
CFLAGS="$(TARGET_CFLAGS) -Wall -Iinclude/ $(TARGET_CPPFLAGS) -D_REVISION=0" \  
LDFLAGS="$(TARGET_LDFLAGS)" \  
OSNAME=Linux \  
prefix="/usr" \  
sqlite="false" \  
unstable="true"  
 
define Package/aircrack-ng/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/  
$(INSTALL_DIR) $(1)/usr/sbin  
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/  
endef  
 
$(eval $(call BuildPackage,aircrack-ng))  
 
--- a/src/aireplay-ng.c  
+++ b/src/aireplay-ng.c  
@@ -200,7 +200,9 @@ char usage[] =  
"\n"  
" Miscellaneous options:\n"  
"\n"  
-" -R : disable /dev/rtc usage\n"  
+" -R : disable /dev/rtc usage\n"  
+" --ignore-negative-one : if the interface's channel can't be determined,\n"  
+" ignore the mismatch, needed for unpatched cfg80211\n"  
"\n"  
" Attack modes (numbers can still be used):\n"  
"\n"  
@@ -268,6 +270,7 @@ struct options  
int bittest;  
 
int nodetect;  
+ int ignore_negative_one;  
int rtc;  
}  
opt;  
@@ -715,6 +718,13 @@ int attack_check(uchar* bssid, char* ess  
 
iface_chan = wi_get_channel(wi);  
 
+ if(iface_chan == -1 && !opt.ignore_negative_one)  
+ {  
+ PCT; printf("Couldn't determine current channel for %s, you should either force the operation with --ignore-negative-one or apply a kernel patch\n",  
+ wi_get_ifname(wi));  
+ return -1;  
+ }  
+  
if(bssid != NULL)  
{  
ap_chan = wait_for_beacon(bssid, capa, essid);  
@@ -723,7 +733,7 @@ int attack_check(uchar* bssid, char* ess  
PCT; printf("No such BSSID available.\n");  
return -1;  
}  
- if(ap_chan != iface_chan)  
+ if((ap_chan != iface_chan) && (iface_chan != -1 || !opt.ignore_negative_one))  
{  
PCT; printf("%s is on channel %d, but the AP uses channel %d\n", wi_get_ifname(wi), iface_chan, ap_chan);  
return -1;  
@@ -5765,6 +5775,7 @@ int main( int argc, char *argv[] )  
{"help", 0, 0, 'H'},  
{"fast", 0, 0, 'F'},  
{"bittest", 0, 0, 'B'},  
+ {"ignore-negative-one", 0, &opt.ignore_negative_one, 1},  
{0, 0, 0, 0 }  
};  
 
 
file:a/net/aodv-uu/Makefile (deleted)
#  
# Copyright (C) 2006-2008 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
include $(INCLUDE_DIR)/kernel.mk  
 
PKG_NAME:=aodv-uu  
PKG_VERSION:=0.9.3  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://core.it.uu.se/core/files/  
PKG_MD5SUM:=05460543054449cb4b170252a7168c65  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/aodv-uu/Default  
TITLE:=Ad-hoc On-demand Distance Vector Routing  
DEPENDS:=@BROKEN  
URL:=http://core.it.uu.se/core/index.php/AODV-UU  
endef  
 
define Package/aodv-uu/Default/description  
AODV is the Ad-hoc On-demand Distance Vector routing protocol  
implementation created at Uppsala University.  
endef  
 
define Package/aodv-uu  
$(call Package/aodv-uu/Default)  
SECTION:=net  
CATEGORY:=Network  
TITLE+= (daemon)  
endef  
 
define Package/aodv-uu/description  
$(call Package/aodv-uu/Default/description)  
This package contains the AODV userland daemon.  
endef  
 
define KernelPackage/aodv-uu  
$(call Package/aodv-uu/Default)  
TITLE+= (kernel module)  
FILES:=$(PKG_BUILD_DIR)/lnx/kaodv.$(LINUX_KMOD_SUFFIX)  
SUBMENU:=Network Support  
AUTOLOAD:=$(call AutoLoad,80,$(shell cat ./files/aodv-uu.modules))  
endef  
 
define KernelPackage/aodv-uu/description  
$(call Package/aodv-uu/Default/description)  
This package contains the AODV kernel module.  
endef  
 
ifneq ($(CONFIG_LINUX_2_4),y)  
define Build/Compile/linux26  
$(MAKE) -C $(LINUX_DIR) \  
ARCH="$(LINUX_KARCH)" \  
CROSS_COMPILE="$(TARGET_CROSS)" \  
PATCHLEVEL="$(LINUX_VERSION)" \  
KERNDIR="$(LINUX_DIR)" \  
SUBDIRS="$(PKG_BUILD_DIR)/lnx" \  
modules  
endef  
else  
# We assume 2.4 builds are only for brcm-2.4 yet  
define Build/Compile/linux24-brcm  
$(call Build/Compile/Default,\  
KERNEL_DIR="$(LINUX_DIR)" \  
KCC="$(TARGET_CC)" \  
CFLAGS="$(TARGET_CFLAGS)" \  
kaodv-mips \  
)  
cp $(PKG_BUILD_DIR)/lnx/kaodv-mips.$(LINUX_KMOD_SUFFIX) $(PKG_BUILD_DIR)/lnx/kaodv.$(LINUX_KMOD_SUFFIX)  
endef  
endif  
 
define Build/Compile  
$(call Build/Compile/linux26)  
$(call Build/Compile/linux24-brcm)  
$(call Build/Compile/Default,\  
KERNEL_DIR="$(LINUX_DIR)" \  
KCC="$(TARGET_CC)" \  
CFLAGS="$(TARGET_CFLAGS)" \  
aodvd \  
)  
endef  
 
define Package/aodv-uu/install  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/aodvd $(1)/usr/sbin  
endef  
 
define Package/kmod-aodv-uu/install  
$(INSTALL_DIR) $(1)/etc/modules.d  
$(INSTALL_DATA) ./files/aodv-uu.modules $(1)/etc/modules.d/80-aodv-uu  
$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)  
$(CP) $(PKG_BUILD_DIR)/lnx/kaodv.$(LINUX_KMOD_SUFFIX) $(1)/lib/modules/$(LINUX_VERSION)/  
endef  
 
$(eval $(call BuildPackage,aodv-uu))  
$(eval $(call KernelPackage,aodv-uu))  
 
kaodv  
 
Index: aodv-uu-0.9.3/lnx/Makefile  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/Makefile 2007-06-04 13:22:19.859836128 +0200  
+++ aodv-uu-0.9.3/lnx/Makefile 2007-06-04 13:22:19.932825032 +0200  
@@ -30,7 +30,7 @@  
KCFLAGS=-Wall -Wno-strict-aliasing -O2 $(KDEFS) $(KINC) $(XDEFS)  
KCFLAGS_ARM=-Wall -O2 -D__KERNEL__ -DMODULE -nostdinc $(shell $(ARM_CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp') -I$(KERNEL_INC)  
KCFLAGS_MIPS=-Wall -mips2 -O2 -fno-pic -mno-abicalls -mlong-calls -G0 -msoft-float -D__KERNEL__ -DMODULE -nostdinc $(shell $(MIPS_CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp') -I$(KERNEL_INC) $(XDEFS)  
-  
+endif  
.PHONY: clean clean-2.4 clean-2.6 indent default  
 
# Check for kernel version  
@@ -89,5 +89,3 @@  
etags *.c *.h  
indent:  
indent -kr -i8 -ts8 -sob -l80 -ss -ncs *.c *.h  
-endif  
-  
Index: aodv-uu-0.9.3/Makefile  
===================================================================  
--- aodv-uu-0.9.3.orig/Makefile 2007-06-04 13:22:19.866835064 +0200  
+++ aodv-uu-0.9.3/Makefile 2007-06-04 13:22:19.932825032 +0200  
@@ -87,7 +87,7 @@  
mips: aodvd-mips kaodv-mips  
 
endian.h:  
- $(CC) $(CFLAGS) -o endian endian.c  
+ gcc -o endian endian.c  
./endian > endian.h  
 
$(OBJS): %.o: %.c Makefile  
@@ -143,19 +143,18 @@  
@makedepend -Y./ -- $(DEFS) -- $(SRC) &>/dev/null  
@makedepend -a -Y./ -- $(KDEFS) kaodv.c &>/dev/null  
 
-install: default  
- install -s -m 755 aodvd /usr/sbin/aodvd  
- @if [ ! -d /lib/modules/$(KERNEL)/aodv ]; then \  
- mkdir /lib/modules/$(KERNEL)/aodv; \  
- fi  
-  
- @echo "Installing kernel module in /lib/modules/$(KERNEL)/aodv/";  
- @if [ -f ./kaodv.ko ]; then \  
- install -m 644 kaodv.ko /lib/modules/$(KERNEL)/aodv/kaodv.ko; \  
- else \  
- install -m 644 kaodv.o /lib/modules/$(KERNEL)/aodv/kaodv.o; \  
- fi  
- /sbin/depmod -a  
+install: install-aodvd install-kaodv  
+  
+install-aodvd:  
+ @echo "Installing aodv in $(DESTDIR)/usr/sbin";  
+ install -d -m0755 $(DESTDIR)/usr/sbin/  
+ install -m0755 aodvd $(DESTDIR)/usr/sbin/aodvd  
+  
+install-kaodv:  
+ @echo "Installing kernel module in $(DESTDIR)/lib/modules/$(KERNEL)/";  
+ install -d -m0644 $(DESTDIR)/lib/modules/$(KERNEL)/  
+ install -m 644 lnx/kaodv.$(KMOD_SUFFIX) $(DESTDIR)/lib/modules/$(KERNEL)/kaodv.$(KMOD_SUFFIX);  
+  
uninstall:  
rm -f /usr/sbin/aodvd  
rm -rf /lib/modules/$(KERNEL)/aodv  
 
Index: aodv-uu-0.9.3/lnx/kaodv-mod.c  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-mod.c 2007-06-04 13:22:19.830840536 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-mod.c 2007-06-04 13:22:20.130794936 +0200  
@@ -19,7 +19,7 @@  
 
*  
*****************************************************************************/  
-#include <linux/config.h>  
+#include <linux/autoconf.h>  
#include <linux/version.h>  
 
#ifdef KERNEL26  
@@ -258,7 +258,11 @@  
if (!(*skb))  
return NF_STOLEN;  
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)  
+ ip_route_me_harder(skb, RTN_UNSPEC);  
+#else  
ip_route_me_harder(skb);  
+#endif  
}  
break;  
case NF_IP_POST_ROUTING:  
Index: aodv-uu-0.9.3/lnx/kaodv-queue.c  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-queue.c 2007-06-04 13:22:19.837839472 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-queue.c 2007-06-04 13:22:20.130794936 +0200  
@@ -29,6 +29,7 @@  
#include <linux/spinlock.h>  
#include <linux/sysctl.h>  
#include <linux/proc_fs.h>  
+#include <linux/version.h>  
#include <net/sock.h>  
#include <net/route.h>  
#include <net/icmp.h>  
@@ -246,7 +247,11 @@  
if (!entry->skb)  
goto next;  
}  
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)  
+ ip_route_me_harder(&entry->skb, RTN_UNSPEC);  
+#else  
ip_route_me_harder(&entry->skb);  
+#endif  
 
pkts++;  
 
 
Index: aodv-uu-0.9.3/lnx/kaodv-netlink.c  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-netlink.c 2007-06-04 13:22:19.810843576 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-netlink.c 2007-06-04 13:22:20.326765144 +0200  
@@ -284,7 +284,11 @@  
/* RCV_SKB_FAIL(-EINVAL); */  
 
#ifdef KERNEL26  
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)  
+ if (security_netlink_recv(skb, CAP_NET_ADMIN))  
+# else  
if (security_netlink_recv(skb))  
+# endif  
RCV_SKB_FAIL(-EPERM);  
#endif  
//write_lock_bh(&queue_lock);  
 
Index: aodv-uu-0.9.3/main.c  
===================================================================  
--- aodv-uu-0.9.3.orig/main.c 2007-06-04 13:22:19.782847832 +0200  
+++ aodv-uu-0.9.3/main.c 2007-06-04 13:22:20.513736720 +0200  
@@ -26,6 +26,8 @@  
#include <sys/types.h>  
#include <sys/socket.h>  
#include <sys/stat.h>  
+#include <linux/types.h>  
+#include <linux/if.h>  
#include <linux/sockios.h>  
#include <linux/wireless.h>  
#include <getopt.h>  
Index: aodv-uu-0.9.3/nl.c  
===================================================================  
--- aodv-uu-0.9.3.orig/nl.c 2007-06-04 13:22:19.789846768 +0200  
+++ aodv-uu-0.9.3/nl.c 2007-06-04 13:22:20.513736720 +0200  
@@ -33,6 +33,10 @@  
#include <netinet/in.h>  
#include <arpa/inet.h>  
#include <linux/rtnetlink.h>  
+#include <linux/version.h>  
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)  
+#include <linux/if_addr.h>  
+#endif  
 
#include "defs.h"  
#include "lnx/kaodv-netlink.h"  
 
Index: aodv-uu-0.9.3/lnx/kaodv-compat.h  
===================================================================  
--- /dev/null 1970-01-01 00:00:00.000000000 +0000  
+++ aodv-uu-0.9.3/lnx/kaodv-compat.h 2007-06-17 02:49:46.844217144 +0200  
@@ -0,0 +1,15 @@  
+#ifndef __KAODV_COMPAT_H  
+#define __KAODV_COMPAT_H  
+  
+#include <linux/version.h>  
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)  
+  
+#define ip_hdr(_skb) (_skb)->nh.iph  
+#define skb_reset_network_header(_skb) do { \  
+ _skb->nh.iph = (struct iphdr *)_skb->data; \  
+ } while (0);  
+  
+  
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) */  
+  
+#endif  
Index: aodv-uu-0.9.3/lnx/kaodv-ipenc.c  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-ipenc.c 2007-06-17 02:31:56.448941960 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-ipenc.c 2007-06-17 02:45:50.420159064 +0200  
@@ -64,7 +64,7 @@  
if (skb->sk != NULL)  
skb_set_owner_w(nskb, skb->sk);  
 
- iph = skb->nh.iph;  
+ iph = ip_hdr(skb);  
 
skb_put(nskb, sizeof(struct min_ipenc_hdr));  
 
@@ -78,7 +78,8 @@  
skb = nskb;  
 
/* Update pointers */  
- iph = skb->nh.iph = (struct iphdr *)skb->data;  
+ skb_reset_network_header(skb);  
+ iph = (struct iphdr *)skb->data;  
 
ipe = (struct min_ipenc_hdr *)(skb->data + (iph->ihl << 2));  
 
@@ -99,8 +100,8 @@  
 
ip_send_check(iph);  
 
- if (skb->nh.iph->id == 0)  
- ip_select_ident(skb->nh.iph, skb->dst, NULL);  
+ if (ip_hdr(skb)->id == 0)  
+ ip_select_ident(ip_hdr(skb), skb->dst, NULL);  
 
return skb;  
}  
@@ -108,9 +109,7 @@  
struct sk_buff *ip_pkt_decapsulate(struct sk_buff *skb)  
{  
struct min_ipenc_hdr *ipe;  
- /* skb->nh.iph is probably not set yet */  
- struct iphdr *iph = skb->nh.iph;  
-  
+ struct iphdr *iph = ip_hdr(skb);  
 
ipe = (struct min_ipenc_hdr *)((char *)iph + (iph->ihl << 2));  
 
@@ -123,8 +122,9 @@  
skb->len - (iph->ihl << 2) - sizeof(struct min_ipenc_hdr));  
 
skb_trim(skb, skb->len - sizeof(struct min_ipenc_hdr));  
-  
- skb->nh.iph = iph = (struct iphdr *)skb->data;  
+  
+ skb_reset_network_header(skb);  
+ iph = (struct iphdr *)skb->data;  
 
iph->tot_len = htons((ntohs(iph->tot_len) - sizeof(struct min_ipenc_hdr)));  
ip_send_check(iph);  
Index: aodv-uu-0.9.3/lnx/kaodv-ipenc.h  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-ipenc.h 2007-06-17 02:44:13.881835120 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-ipenc.h 2007-06-17 02:44:16.549429584 +0200  
@@ -27,6 +27,7 @@  
#include <linux/ip.h>  
#include <linux/skbuff.h>  
#include <asm/byteorder.h>  
+#include "kaodv-compat.h"  
 
#define IPPROTO_MIPE 55  
 
Index: aodv-uu-0.9.3/lnx/kaodv-mod.c  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-mod.c 2007-06-17 02:43:33.776931992 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-mod.c 2007-06-17 02:43:39.008136728 +0200  
@@ -120,7 +120,7 @@  
const struct net_device *out,  
int (*okfn) (struct sk_buff *))  
{  
- struct iphdr *iph = (*skb)->nh.iph;  
+ struct iphdr *iph = ip_hdr(*skb);  
struct expl_entry e;  
struct in_addr ifaddr, bcaddr;  
int res = 0;  
@@ -188,7 +188,7 @@  
if (is_gateway && iph->protocol == IPPROTO_MIPE &&  
iph->daddr == ifaddr.s_addr) {  
ip_pkt_decapsulate(*skb);  
- iph = (*skb)->nh.iph;  
+ iph = ip_hdr(*skb);  
return NF_ACCEPT;  
}  
/* Ignore packets generated locally or that are for this  
Index: aodv-uu-0.9.3/lnx/kaodv-mod.h  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-mod.h 2007-06-17 02:44:32.498005032 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-mod.h 2007-06-17 02:44:34.662675952 +0200  
@@ -5,6 +5,7 @@  
#include <linux/inetdevice.h>  
#include <linux/list.h>  
#include <linux/spinlock.h>  
+#include "kaodv-compat.h"  
 
/* Interface information */  
struct if_info {  
Index: aodv-uu-0.9.3/lnx/kaodv-queue.c  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-queue.c 2007-06-17 02:45:01.513593992 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-queue.c 2007-06-17 02:45:11.534070648 +0200  
@@ -152,7 +152,7 @@  
{  
int status = -EINVAL;  
struct kaodv_queue_entry *entry;  
- struct iphdr *iph = skb->nh.iph;  
+ struct iphdr *iph = ip_hdr(skb);  
 
entry = kmalloc(sizeof(*entry), GFP_ATOMIC);  
 
Index: aodv-uu-0.9.3/lnx/kaodv-queue.h  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-queue.h 2007-06-17 02:44:50.537262648 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-queue.h 2007-06-17 02:44:53.629792512 +0200  
@@ -21,6 +21,7 @@  
*****************************************************************************/  
#ifndef _KAODV_QUEUE_H  
#define _KAODV_QUEUE_H  
+#include "kaodv-compat.h"  
 
#define KAODV_QUEUE_DROP 1  
#define KAODV_QUEUE_SEND 2  
Index: aodv-uu-0.9.3/lnx/kaodv-netlink.c  
===================================================================  
--- aodv-uu-0.9.3.orig/lnx/kaodv-netlink.c 2007-06-17 02:47:48.927143264 +0200  
+++ aodv-uu-0.9.3/lnx/kaodv-netlink.c 2007-06-17 02:49:11.604574384 +0200  
@@ -338,8 +338,10 @@  
netlink_register_notifier(&kaodv_nl_notifier);  
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14))  
kaodvnl = netlink_kernel_create(NETLINK_AODV, kaodv_netlink_rcv_sk);  
-#else  
+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))  
kaodvnl = netlink_kernel_create(NETLINK_AODV, AODVGRP_MAX, kaodv_netlink_rcv_sk, THIS_MODULE);  
+#else  
+ kaodvnl = netlink_kernel_create(NETLINK_AODV, AODVGRP_MAX, kaodv_netlink_rcv_sk, NULL, THIS_MODULE);  
#endif  
if (kaodvnl == NULL) {  
printk(KERN_ERR "kaodv_netlink: failed to create netlink socket\n");  
 
file:a/net/apcupsd/Makefile (deleted)
#  
# Copyright (C) 2006-2011 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=apcupsd  
PKG_VERSION:=3.14.7  
PKG_RELEASE:=2  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@SF/apcupsd  
PKG_MD5SUM:=bb2f8e4fc6b2f5d7b3e236eb57b81640  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/apcupsd  
SECTION:=utils  
CATEGORY:=Utilities  
DEPENDS:=+libpthread +libusb-compat  
TITLE:=UPS control software  
URL:=http://www.apcupsd.org/  
endef  
 
define Build/Configure  
$(CP) $(SCRIPT_DIR)/config.* $(PKG_BUILD_DIR)/autoconf/  
$(call Build/Configure/Default, \  
--with-distname=unknown \  
--sysconfdir=/etc/apcupsd \  
--enable-usb \  
--without-x \  
)  
endef  
 
define Build/Compile  
$(MAKE) -C $(PKG_BUILD_DIR) \  
DESTDIR="$(PKG_INSTALL_DIR)" \  
LD="$(TARGET_CC)" \  
all install  
endef  
 
define Package/apcupsd/install  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/apcupsd $(1)/usr/sbin/  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/smtp $(1)/usr/sbin/  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/apctest $(1)/usr/sbin/  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/apcaccess $(1)/usr/sbin/  
$(INSTALL_DIR) $(1)/etc/apcupsd  
$(INSTALL_CONF) ./files/apcupsd.conf $(1)/etc/apcupsd/  
$(INSTALL_CONF) ./files/apcupsd_mail.conf $(1)/etc/apcupsd/  
$(INSTALL_BIN) ./files/changeme $(1)/etc/apcupsd/  
$(INSTALL_BIN) ./files/commfailure $(1)/etc/apcupsd/  
$(INSTALL_BIN) ./files/commok $(1)/etc/apcupsd/  
$(INSTALL_BIN) ./files/offbattery $(1)/etc/apcupsd/  
$(INSTALL_BIN) ./files/onbattery $(1)/etc/apcupsd/  
$(INSTALL_BIN) ./files/apccontrol $(1)/etc/apcupsd/  
$(INSTALL_DIR) $(1)/etc/init.d  
$(INSTALL_BIN) ./files/apcupsd.init $(1)/etc/init.d/apcupsd  
endef  
 
define Package/apcupsd/conffiles  
/etc/apcupsd/apcupsd.conf  
/etc/apcupsd/apcupsd_mail.conf  
/etc/apcupsd/changeme  
/etc/apcupsd/commfailure  
/etc/apcupsd/commok  
/etc/apcupsd/offbattery  
/etc/apcupsd/onbattery  
endef  
 
$(eval $(call BuildPackage,apcupsd))  
 
#!/bin/sh  
#  
# Copyright (C) 1999-2002 Riccardo Facchetti <riccardo@master.oasi.gpa.it>  
#  
# for apcupsd release 3.14.1 (04 May 2007) - unknown  
#  
# platforms/apccontrol. Generated from apccontrol.in by configure.  
#  
# Note, this is a generic file that can be used by most  
# systems. If a particular system needs to have something  
# special, start with this file, and put a copy in the  
# platform subdirectory.  
#  
 
#  
# These variables are needed for set up the autoconf other variables.  
#  
prefix=/usr  
exec_prefix=/usr  
 
APCPID=/var/run/apcupsd.pid  
APCUPSD=/usr/sbin/apcupsd  
SHUTDOWN=/sbin/shutdown  
SCRIPTSHELL=/bin/sh  
SCRIPTDIR=/etc/apcupsd  
WALL=true  
 
#  
# Concatenate all output from this script to the events file  
# Note, the following kills the script in a power fail situation  
# where the disks are mounted read-only.  
# exec >>/var/log/apcupsd.events 2>&1  
 
#  
# This piece is to substitute the default behaviour with your own script,  
# perl, or C program.  
# You can customize every single command creating an executable file (may be a  
# script or a compiled program) and calling it the same as the $1 parameter  
# passed by apcupsd to this script.  
#  
# After executing your script, apccontrol continues with the default action.  
# If you do not want apccontrol to continue, exit your script with exit  
# code 99. E.g. "exit 99".  
#  
# WARNING: the apccontrol file will be overwritten every time you update your  
# apcupsd, doing `make install'. Your own customized scripts will _not_ be  
# overwritten. If you wish to make changes to this file (discouraged), you  
# should change apccontrol.sh.in and then rerun the configure process.  
#  
if [ -f ${SCRIPTDIR}/${1} -a -x ${SCRIPTDIR}/${1} ]  
then  
${SCRIPTDIR}/${1} ${2} ${3} ${4}  
# exit code 99 means he does not want us to do default action  
if [ $? = 99 ] ; then  
exit 0  
fi