summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-11-17 12:51:22 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-11-17 12:51:22 +0100
commit9f02979caebb6e900fe101a257d8e6c344a7a173 (patch)
tree350b808ae23e8abb4ff08d472b76104a89e1f35a /package
parentafb9908771db100ee97bb933fcca850c4f49af5a (diff)
parentee3c54b1570b9dd8ea900a11d496ced1ad1ae356 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/collectd/Makefile12
-rw-r--r--package/collectd/patches/patch-configure56
-rw-r--r--package/collectd/patches/patch-ltmain_sh11
-rw-r--r--package/collectd/patches/patch-src_Makefile_in13
-rw-r--r--package/collectd/patches/patch-src_libcollectdclient_Makefile_in12
-rw-r--r--package/curl/Makefile2
-rw-r--r--package/drbd/patches/patch-Makefile_in10
-rw-r--r--package/drbd/patches/patch-drbd_Makefile12
-rw-r--r--package/e2fsprogs/Makefile3
-rw-r--r--package/eglibc/Makefile4
-rw-r--r--package/ffmpeg/Makefile1
-rw-r--r--package/forked-daapd/Makefile2
-rw-r--r--package/gtk+/patches/patch-Makefile_in11
-rw-r--r--package/gtk+/patches/patch-gtk_gtktypefuncs_c78
-rw-r--r--package/iproute2/Makefile8
-rw-r--r--package/iproute2/patches/patch-tc_m_xt_c28
-rw-r--r--package/libXt/Makefile1
-rw-r--r--package/libXt/patches/patch-util_Makefile_in4
-rw-r--r--package/libcapi20/Makefile3
-rw-r--r--package/mdadm/patches/patch-Makefile11
-rw-r--r--package/microperl/files/uconfig.h.i4864462
-rw-r--r--package/microperl/files/uconfig.h.i5864462
-rw-r--r--package/microperl/files/uconfig.h.i6864462
-rw-r--r--package/net-tools/Makefile36
-rw-r--r--package/net-tools/files/config.h74
-rw-r--r--package/net-tools/files/config.make35
-rw-r--r--package/net-tools/patches/patch-Makefile36
-rw-r--r--package/net-tools/patches/patch-Makefile.orig34
-rw-r--r--package/net-tools/patches/patch-lib_Makefile11
-rw-r--r--package/net-tools/patches/patch-lib_interface_c13
-rw-r--r--package/openldap/Makefile9
-rw-r--r--package/openldap/files/slapd.conf8
-rw-r--r--package/orbit2/Makefile2
-rw-r--r--package/pycurl/Makefile16
-rw-r--r--package/python2/Makefile1
-rw-r--r--package/python2/files/sysconfig.py572
-rw-r--r--package/ruby-ldap/Makefile40
-rw-r--r--package/ruby-ldap/mkmf.log1192
-rw-r--r--package/ruby-ldap/patches/patch-conn_c24
-rw-r--r--package/ruby-ldap/patches/patch-ldap_c13
-rw-r--r--package/ruby/Makefile24
-rw-r--r--package/ruby/patches/patch-Makefile_in11
-rw-r--r--package/ruby/patches/patch-configure11
-rw-r--r--package/samba/Makefile4
-rw-r--r--package/setserial/patches/patch-Makefile_in5
-rw-r--r--package/squid/Makefile4
-rw-r--r--package/squid/patches/autotool.patch177050
-rw-r--r--package/squid/patches/patch-src_Makefile_in11
-rw-r--r--package/xawtv/Makefile2
-rw-r--r--package/xfsprogs/patches/patch-doc_Makefile11
-rw-r--r--package/xterm/Makefile2
-rw-r--r--package/yasm/patches/patch-Makefile_in38
-rw-r--r--package/yasm/patches/patch-Makefile_in.orig29
53 files changed, 15777 insertions, 177209 deletions
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 33b5b4519..942e88942 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= collectd
-PKG_VERSION:= 4.10.0
+PKG_VERSION:= 5.0.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= c473cf8e9f22f5a9f7ef4c5be1b0c436
+PKG_MD5SUM:= a405d6cca021748fea43b60348b72b0c
PKG_DESCR:= System statistics collection daemon
PKG_SECTION:= misc
PKG_DEPENDS:= libpthread
@@ -101,14 +101,14 @@ CONFIGURE_ARGS+= --disable-apache \
--with-nan-emulation
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
-XAKE_FLAGS+= LIBS='-lm'
+XAKE_FLAGS+= LIBS='-lm -lltdl'
post-install:
${INSTALL_DIR} ${IDIR_COLLECTD}/usr/lib/collectd \
- ${IDIR_COLLECTD}/usr/sbin/ ${IDIR_COLLECTD}/etc
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin/
+ ${IDIR_COLLECTD}/usr/sbin ${IDIR_COLLECTD}/etc
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin
${CP} ${WRKINST}/usr/lib/collectd/*.so \
- ${IDIR_COLLECTD}/usr/lib/collectd/
+ ${IDIR_COLLECTD}/usr/lib/collectd
${INSTALL_DATA} ./files/collectd.conf \
${IDIR_COLLECTD}/etc
diff --git a/package/collectd/patches/patch-configure b/package/collectd/patches/patch-configure
deleted file mode 100644
index 24d0c04b5..000000000
--- a/package/collectd/patches/patch-configure
+++ /dev/null
@@ -1,56 +0,0 @@
---- collectd-4.10.0.orig/configure 2010-05-01 11:16:01.000000000 +0200
-+++ collectd-4.10.0/configure 2010-06-14 15:51:32.263465769 +0200
-@@ -16636,53 +16636,6 @@ $as_echo "#define HAVE_GEN_GETMNTENT 1"
-
- fi
-
--# Check for htonll
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if have htonll defined" >&5
--$as_echo_n "checking if have htonll defined... " >&6; }
--
-- have_htonll="no"
-- 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; }
--else
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--
--#include <sys/types.h>
--#include <netinet/in.h>
--#if HAVE_INTTYPES_H
--# include <inttypes.h>
--#endif
--
--int
--main ()
--{
--
-- return htonll(0);
--
-- ;
-- return 0;
--}
--
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
-- have_htonll="yes"
--
--$as_echo "#define HAVE_HTONLL 1" >>confdefs.h
--
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_htonll" >&5
--$as_echo "$have_htonll" >&6; }
-
- # Check for structures
- ac_fn_c_check_member "$LINENO" "struct if_data" "ifi_ibytes" "ac_cv_member_struct_if_data_ifi_ibytes" "
diff --git a/package/collectd/patches/patch-ltmain_sh b/package/collectd/patches/patch-ltmain_sh
deleted file mode 100644
index d53645853..000000000
--- a/package/collectd/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- collectd-4.10.0.orig/ltmain.sh 2010-05-01 11:15:57.000000000 +0200
-+++ collectd-4.10.0/ltmain.sh 2011-01-14 20:29:06.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
diff --git a/package/collectd/patches/patch-src_Makefile_in b/package/collectd/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..d1580516a
--- /dev/null
+++ b/package/collectd/patches/patch-src_Makefile_in
@@ -0,0 +1,13 @@
+--- collectd-5.0.1.orig/src/Makefile.in 2011-10-14 22:54:14.000000000 +0200
++++ collectd-5.0.1/src/Makefile.in 2011-10-22 18:57:51.000000000 +0200
+@@ -56,8 +56,8 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT)
+ # too. -octo
+ @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_13 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
+ @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_14 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
+-@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = $(LIBLTDL) liboconfig/liboconfig.la
+-@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = $(LIBLTDL) liboconfig/liboconfig.la
++@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = liboconfig/liboconfig.la
++@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = liboconfig/liboconfig.la
+ @BUILD_WITH_OWN_LIBOCONFIG_FALSE@am__append_17 = -loconfig
+ @BUILD_WITH_LIBSOCKET_TRUE@am__append_18 = -lsocket
+ @BUILD_AIX_TRUE@am__append_19 = -lm
diff --git a/package/collectd/patches/patch-src_libcollectdclient_Makefile_in b/package/collectd/patches/patch-src_libcollectdclient_Makefile_in
deleted file mode 100644
index a51a010ea..000000000
--- a/package/collectd/patches/patch-src_libcollectdclient_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- collectd-4.10.0.orig/src/libcollectdclient/Makefile.in 2010-05-01 11:16:00.000000000 +0200
-+++ collectd-4.10.0/src/libcollectdclient/Makefile.in 2010-06-14 15:49:28.563473998 +0200
-@@ -327,7 +327,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign no-dependencies
--@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror
-+@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall
- pkginclude_HEADERS = client.h lcc_features.h
- lib_LTLIBRARIES = libcollectdclient.la
- nodist_pkgconfig_DATA = libcollectdclient.pc
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 3888c84dc..7d058fcf1 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -68,6 +68,8 @@ libcurl-install:
${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib
libcurl-dev-install:
+ ${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libcurl.a ${IDIR_LIBCURL_DEV}/usr/lib
${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl
${CP} ${WRKINST}/usr/include/curl/*.h \
${IDIR_LIBCURL_DEV}/usr/include/curl
diff --git a/package/drbd/patches/patch-Makefile_in b/package/drbd/patches/patch-Makefile_in
index 71ece3f6f..ad87d221d 100644
--- a/package/drbd/patches/patch-Makefile_in
+++ b/package/drbd/patches/patch-Makefile_in
@@ -1,9 +1,11 @@
--- drbd-8.3.10.orig/Makefile.in 2011-01-26 14:57:59.000000000 +0100
-+++ drbd-8.3.10/Makefile.in 2011-05-23 17:11:50.000000000 +0200
-@@ -56,7 +56,7 @@ KDIR ?= /lib/modules/$(KVER)/build
- # and not in e.g. dash. I'm too lazy to fix it to be compatible.
- SHELL=/bin/bash
++++ drbd-8.3.10/Makefile.in 2011-10-23 10:20:12.000000000 +0200
+@@ -54,9 +54,7 @@ KDIR ?= /lib/modules/$(KVER)/build
+ # for some reason some of the commands below only work correctly in bash,
+ # and not in e.g. dash. I'm too lazy to fix it to be compatible.
+-SHELL=/bin/bash
+-
-SUBDIRS = user scripts documentation drbd
+SUBDIRS = user scripts drbd
diff --git a/package/drbd/patches/patch-drbd_Makefile b/package/drbd/patches/patch-drbd_Makefile
index dffd1e258..62f61cab4 100644
--- a/package/drbd/patches/patch-drbd_Makefile
+++ b/package/drbd/patches/patch-drbd_Makefile
@@ -1,6 +1,14 @@
--- drbd-8.3.10.orig/drbd/Makefile 2011-01-26 14:57:59.000000000 +0100
-+++ drbd-8.3.10/drbd/Makefile 2011-05-23 17:11:50.000000000 +0200
-@@ -133,7 +133,7 @@ else
++++ drbd-8.3.10/drbd/Makefile 2011-10-23 10:22:50.000000000 +0200
+@@ -65,7 +65,6 @@ else
+
+ # for some reason some of the commands below only work correctly in bash,
+ # and not in e.g. dash. I'm too lazy to fix it to be compatible.
+- SHELL=/bin/bash
+
+ DRBDSRC := $(shell pwd)
+
+@@ -133,7 +132,7 @@ else
grep return $@ ; \
fi ; \
echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}"; \
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 7b76c5629..39b3d6674 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -130,6 +130,9 @@ libcom-err-dev-install:
${INSTALL_DIR} ${IDIR_LIBCOM_ERR_DEV}/usr/include/et
${CP} ${WRKINST}/usr/include/et/com_err.h \
${IDIR_LIBCOM_ERR_DEV}/usr/include/et
+ ${INSTALL_DIR} ${IDIR_LIBCOM_ERR_DEV}/usr/bin
+ ${CP} ${WRKINST}/usr/bin/compile_et \
+ ${IDIR_LIBCOM_ERR_DEV}/usr/bin
libss-install:
${INSTALL_DIR} ${IDIR_LIBSS}/usr/lib
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 0378d6200..f14779f28 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -75,7 +75,7 @@ ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
$(CP) $(STAGING_TARGET_DIR)/lib/libssp.so* $(IDIR_EGLIBC)/lib
endif
$(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/lib
- -for file in libc libcrypt libdl libm libresolv librt libutil libnss_dns libnss_files; do \
+ -for file in libc libcrypt libdl libm libresolv librt libutil libnsl libnss_dns libnss_files; do \
$(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/lib; \
$(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib; \
done
@@ -103,7 +103,7 @@ ifeq ($(ADK_TARGET_ABI_N64),y)
endif
${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_EGLIBC_DEV}/usr/lib
${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_EGLIBC_DEV}/usr/lib
- -for file in libcrypt libdl libm libresolv librt libutil; do \
+ -for file in libcrypt libdl libm libresolv librt libutil libnsl; do \
cd $(IDIR_EGLIBC_DEV)/lib/; ln -sf $$file-$(PKG_VERSION).so $$file.so; \
done
# header package
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index aabe94394..0bf164017 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -112,6 +112,7 @@ CONFIGURE_ARGS:= --prefix=/usr \
--host-cc=$(CC_FOR_BUILD) \
--disable-doc \
--disable-debug \
+ --disable-yasm \
--disable-optimizations \
--disable-stripping \
--enable-shared \
diff --git a/package/forked-daapd/Makefile b/package/forked-daapd/Makefile
index 824d05636..49583bb11 100644
--- a/package/forked-daapd/Makefile
+++ b/package/forked-daapd/Makefile
@@ -18,6 +18,8 @@ PKG_SITES:= http://alioth.debian.org/~jblache/forked-daapd/
PKG_CFLINE_FORKED_DAAPD:= select ADK_KERNEL_INOTIFY_USER
PKG_ARCH_DEPENDS:= !ppc
+# gperf problem
+PKG_HOST_DEPENDS:= !freebsd
include $(TOPDIR)/mk/package.mk
diff --git a/package/gtk+/patches/patch-Makefile_in b/package/gtk+/patches/patch-Makefile_in
new file mode 100644
index 000000000..2303be5c0
--- /dev/null
+++ b/package/gtk+/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- gtk+-2.24.6.orig/Makefile.in 2011-08-30 22:23:21.000000000 +0200
++++ gtk+-2.24.6/Makefile.in 2011-11-08 18:27:10.745082865 +0100
+@@ -459,7 +459,7 @@ XVFB_START = \
+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ && DISPLAY=:$$XID && export DISPLAY
+
+-SRC_SUBDIRS = gdk gtk modules demos tests perf
++SRC_SUBDIRS = gdk gtk modules tests perf
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
+
+ # require automake 1.4
diff --git a/package/gtk+/patches/patch-gtk_gtktypefuncs_c b/package/gtk+/patches/patch-gtk_gtktypefuncs_c
new file mode 100644
index 000000000..2a98f9002
--- /dev/null
+++ b/package/gtk+/patches/patch-gtk_gtktypefuncs_c
@@ -0,0 +1,78 @@
+--- gtk+-2.24.6.orig/gtk/gtktypefuncs.c 2011-08-30 22:24:44.000000000 +0200
++++ gtk+-2.24.6/gtk/gtktypefuncs.c 2011-11-08 18:06:50.273051952 +0100
+@@ -54,8 +54,8 @@
+ *tp++ = gdk_pixbuf_simple_anim_get_type();
+ *tp++ = gdk_pixbuf_simple_anim_iter_get_type();
+ *tp++ = gdk_pixmap_get_type();
+-*tp++ = gdk_property_state_get_type();
+ *tp++ = gdk_prop_mode_get_type();
++*tp++ = gdk_property_state_get_type();
+ *tp++ = gdk_rectangle_get_type();
+ *tp++ = gdk_rgb_dither_get_type();
+ *tp++ = gdk_screen_get_type();
+@@ -190,14 +190,14 @@
+ *tp++ = gtk_icon_view_drop_position_get_type();
+ *tp++ = gtk_icon_view_get_type();
+ *tp++ = gtk_identifier_get_type();
+-*tp++ = gtk_image_get_type();
+-*tp++ = gtk_image_menu_item_get_type();
+-*tp++ = gtk_image_type_get_type();
+ *tp++ = gtk_im_context_get_type();
+ *tp++ = gtk_im_context_simple_get_type();
+ *tp++ = gtk_im_multicontext_get_type();
+ *tp++ = gtk_im_preedit_style_get_type();
+ *tp++ = gtk_im_status_style_get_type();
++*tp++ = gtk_image_get_type();
++*tp++ = gtk_image_menu_item_get_type();
++*tp++ = gtk_image_type_get_type();
+ *tp++ = gtk_info_bar_get_type();
+ *tp++ = gtk_invisible_get_type();
+ *tp++ = gtk_item_get_type();
+@@ -281,10 +281,10 @@
+ *tp++ = gtk_response_type_get_type();
+ *tp++ = gtk_scale_button_get_type();
+ *tp++ = gtk_scale_get_type();
+-*tp++ = gtk_scrollbar_get_type();
+-*tp++ = gtk_scrolled_window_get_type();
+ *tp++ = gtk_scroll_step_get_type();
+ *tp++ = gtk_scroll_type_get_type();
++*tp++ = gtk_scrollbar_get_type();
++*tp++ = gtk_scrolled_window_get_type();
+ *tp++ = gtk_selection_data_get_type();
+ *tp++ = gtk_selection_mode_get_type();
+ *tp++ = gtk_sensitivity_type_get_type();
+@@ -301,11 +301,11 @@
+ *tp++ = gtk_sort_type_get_type();
+ *tp++ = gtk_spin_button_get_type();
+ *tp++ = gtk_spin_button_update_policy_get_type();
+-*tp++ = gtk_spinner_get_type();
+ *tp++ = gtk_spin_type_get_type();
++*tp++ = gtk_spinner_get_type();
+ *tp++ = gtk_state_type_get_type();
+-*tp++ = gtk_statusbar_get_type();
+ *tp++ = gtk_status_icon_get_type();
++*tp++ = gtk_statusbar_get_type();
+ *tp++ = gtk_style_get_type();
+ *tp++ = gtk_submenu_direction_get_type();
+ *tp++ = gtk_submenu_placement_get_type();
+@@ -329,16 +329,16 @@
+ *tp++ = gtk_toggle_action_get_type();
+ *tp++ = gtk_toggle_button_get_type();
+ *tp++ = gtk_toggle_tool_button_get_type();
+-*tp++ = gtk_toolbar_child_type_get_type();
+-*tp++ = gtk_toolbar_get_type();
+-*tp++ = gtk_toolbar_space_style_get_type();
+-*tp++ = gtk_toolbar_style_get_type();
+ *tp++ = gtk_tool_button_get_type();
+ *tp++ = gtk_tool_item_get_type();
+ *tp++ = gtk_tool_item_group_get_type();
+ *tp++ = gtk_tool_palette_drag_targets_get_type();
+ *tp++ = gtk_tool_palette_get_type();
+ *tp++ = gtk_tool_shell_get_type();
++*tp++ = gtk_toolbar_child_type_get_type();
++*tp++ = gtk_toolbar_get_type();
++*tp++ = gtk_toolbar_space_style_get_type();
++*tp++ = gtk_toolbar_style_get_type();
+ *tp++ = gtk_tooltip_get_type();
+ *tp++ = gtk_tree_drag_dest_get_type();
+ *tp++ = gtk_tree_drag_source_get_type();
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 3c6ff16eb..cd5b54a3f 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -4,13 +4,13 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= iproute2
-PKG_VERSION:= 2.6.37
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 9774ff9d74ebd301bf56bd8d74473786
+PKG_VERSION:= 2.6.38
+PKG_RELEASE:= 1
+PKG_MD5SUM:= a243bfea837e71824b7ca26c3bb45fa8
PKG_DESCR:= iproute2 routing control utility
PKG_SECTION:= route
PKG_URL:= http://www.linuxfoundation.org/en/Net:Iproute2
-PKG_SITES:= http://devresources.linuxfoundation.org/dev/iproute2/download/
+PKG_SITES:= http://distfiles.gentoo.org/distfiles/
PKG_SUBPKGS:= IP TC TC_ATM TC_IPT IFSTAT LNSTAT ROUTEL RTMON SS
PKGSD_TC:= iproute2 traffic control utility
diff --git a/package/iproute2/patches/patch-tc_m_xt_c b/package/iproute2/patches/patch-tc_m_xt_c
new file mode 100644
index 000000000..8399e779a
--- /dev/null
+++ b/package/iproute2/patches/patch-tc_m_xt_c
@@ -0,0 +1,28 @@
+--- iproute2-2.6.38.orig/tc/m_xt.c 2011-03-17 18:05:47.000000000 +0100
++++ iproute2-2.6.38/tc/m_xt.c 2011-11-09 16:15:44.527071563 +0100
+@@ -162,7 +162,11 @@ static int parse_ipt(struct action_util
+ return -1;
+ }
+ tcipt_globals.opts =
+- xtables_merge_options(tcipt_globals.opts,
++ xtables_merge_options(
++#if XTABLES_VERSION_CODE > 5
++ tcipt_globals.orig_opts,
++#endif
++ tcipt_globals.opts,
+ m->extra_opts,
+ &m->option_offset);
+ } else {
+@@ -307,7 +311,11 @@ print_ipt(struct action_util *au,FILE *
+ }
+
+ tcipt_globals.opts =
+- xtables_merge_options(tcipt_globals.opts,
++ xtables_merge_options(
++#if XTABLES_VERSION_CODE > 5
++ tcipt_globals.orig_opts,
++#endif
++ tcipt_globals.opts,
+ m->extra_opts,
+ &m->option_offset);
+ } else {
diff --git a/package/libXt/Makefile b/package/libXt/Makefile
index 87e593339..84d467951 100644
--- a/package/libXt/Makefile
+++ b/package/libXt/Makefile
@@ -21,6 +21,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,LIBXT_DEV,libxt-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXT_DEV},${PKGSC_LIBXT_DEV}))
+CFLAGS_FOR_BUILD+= -I/usr/local/include
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --disable-malloc0returnsnull
diff --git a/package/libXt/patches/patch-util_Makefile_in b/package/libXt/patches/patch-util_Makefile_in
index 8b2d3079c..856fa8e79 100644
--- a/package/libXt/patches/patch-util_Makefile_in
+++ b/package/libXt/patches/patch-util_Makefile_in
@@ -1,5 +1,5 @@
--- libXt-1.0.9.orig/util/Makefile.in 2010-10-28 21:04:12.000000000 +0200
-+++ libXt-1.0.9/util/Makefile.in 2011-01-24 17:53:22.000000000 +0100
++++ libXt-1.0.9/util/Makefile.in 2011-11-05 16:05:13.000000000 +0100
@@ -108,7 +108,7 @@ CFLAGS = @CFLAGS_FOR_BUILD@
CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
CHANGELOG_CMD = @CHANGELOG_CMD@
@@ -14,7 +14,7 @@
top_srcdir = @top_srcdir@
EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE)
-makestrs_CFLAGS = $(XT_CFLAGS)
-+makestrs_CFLAGS =
++makestrs_CFLAGS = $(CFLAGS_FOR_BUILD)
makestrs_SOURCES = makestrs.c
# Man page
diff --git a/package/libcapi20/Makefile b/package/libcapi20/Makefile
index 3ecc85245..0ec18ff69 100644
--- a/package/libcapi20/Makefile
+++ b/package/libcapi20/Makefile
@@ -25,6 +25,9 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBCAPI20,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,LIBCAPI20_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCAPI20_DEV},${PKGSC_LIBCAPI20_DEV},${PKG_OPTS}))
+pre-install:
+ ${INSTALL_DIR} ${WRKINST}/usr/lib
+
libcapi20-install:
${INSTALL_DIR} ${IDIR_LIBCAPI20}/usr/lib
${CP} ${WRKINST}/usr/lib/libcapi*.so* ${IDIR_LIBCAPI20}/usr/lib
diff --git a/package/mdadm/patches/patch-Makefile b/package/mdadm/patches/patch-Makefile
index cbe429082..b669eab54 100644
--- a/package/mdadm/patches/patch-Makefile
+++ b/package/mdadm/patches/patch-Makefile
@@ -1,5 +1,5 @@
--- mdadm-3.1.1.orig/Makefile 2009-11-16 23:55:41.000000000 +0100
-+++ mdadm-3.1.1/Makefile 2010-02-06 01:09:39.963074463 +0100
++++ mdadm-3.1.1/Makefile 2011-11-09 16:50:02.083123679 +0100
@@ -42,7 +42,7 @@ KLIBC_GCC = gcc -nostdinc -iwithprefix i
CC = $(CROSS_COMPILE)gcc
@@ -19,6 +19,15 @@
# If you want a static binary, you might uncomment these
# LDFLAGS = -static
+@@ -105,7 +106,7 @@ ASSEMBLE_SRCS += $(ASSEMBLE_AUTO_SRCS)
+ ASSEMBLE_FLAGS += -DMDASSEMBLE_AUTO
+ endif
+
+-all : mdadm mdmon mdadm.man md.man mdadm.conf.man mdmon.man
++all : mdadm mdmon
+
+ everything: all mdadm.static swap_super test_stripe \
+ mdassemble mdassemble.auto mdassemble.static mdassemble.man \
@@ -186,29 +187,36 @@ sha1.o : sha1.c sha1.h md5.h
$(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c
diff --git a/package/microperl/files/uconfig.h.i486 b/package/microperl/files/uconfig.h.i486
new file mode 100644
index 000000000..92e29edf8
--- /dev/null
+++ b/package/microperl/files/uconfig.h.i486
@@ -0,0 +1,4462 @@
+/*
+ * This file was produced by running the config_h.SH script, which
+ * gets its values from config.sh, which is generally produced by
+ * running Configure.
+ *
+ * Feel free to modify any of this as the need arises. Note, however,
+ * that running config_h.SH again will wipe out any changes you've made.
+ * For a more permanent change edit config.sh and rerun config_h.SH.
+ *
+ * $Id: Config_h.U,v 3.0.1.5 1997/02/28 14:57:43 ram Exp $
+ */
+
+/*
+ * Package name : perl5
+ * Source directory : .
+ * Configuration time: Mon Sep 14 22:24:11 CEST 2009
+ * Configured by : OpenADK
+ * Target system : linux linux 2.6.30.5 #4 smp fri sep 11 13:47:48 cest 2009 x86_64 unknown
+ */
+
+#ifndef _config_h_
+#define _config_h_
+
+/* LOC_SED:
+ * This symbol holds the complete pathname to the sed program.
+ */
+#define LOC_SED "/bin/sed" /**/
+
+/* HAS_ALARM:
+ * This symbol, if defined, indicates that the alarm routine is
+ * available.
+ */
+#define HAS_ALARM /**/
+
+/* HAS_BCMP:
+ * This symbol is defined if the bcmp() routine is available to
+ * compare blocks of memory.
+ */
+/*#define HAS_BCMP / **/
+
+/* HAS_BCOPY:
+ * This sy