summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-08-28 19:47:44 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2009-08-28 19:47:44 (GMT)
commit0a3d29e18ca731cafed7155b73a92a8f2756ca27 (patch)
tree01c464d54b6d00a3334bf4b72c4c66a2c6ffc859 /package
parent58e2e795851d40c1e298354a264aa03eca1717e8 (diff)
make allmodconfig round for lemote yeelong target
Diffstat (limited to 'package')
-rw-r--r--package/bitlbee/patches/patch-Makefile22
-rw-r--r--package/bitlbee/patches/patch-lib_Makefile24
-rw-r--r--package/bitlbee/patches/patch-protocols_Makefile24
-rw-r--r--package/bitlbee/patches/patch-protocols_jabber_Makefile22
-rw-r--r--package/bitlbee/patches/patch-protocols_msn_Makefile24
-rw-r--r--package/bitlbee/patches/patch-protocols_oscar_Makefile22
-rw-r--r--package/bitlbee/patches/patch-protocols_yahoo_Makefile22
-rw-r--r--package/ctorrent/Config.in2
-rw-r--r--package/elinks/Makefile6
-rw-r--r--package/elinks/patches/patch-Makefile_lib17
-rw-r--r--package/gnutls/Config.in2
-rw-r--r--package/gnutls/Makefile2
-rw-r--r--package/id3lib/Config.in2
-rw-r--r--package/jamvm/Makefile2
-rw-r--r--package/jamvm/patches/patch-configure_ac10
-rw-r--r--package/libtorrent/Makefile6
-rw-r--r--package/libtorrent/patches/patch-rak_functional_h11
-rw-r--r--package/libtorrent/patches/patch-src_data_chunk_cc11
-rw-r--r--package/libtorrent/patches/patch-src_data_chunk_list_h11
-rw-r--r--package/libtorrent/patches/patch-src_net_address_list_cc12
-rw-r--r--package/libtorrent/patches/patch-src_protocol_extensions_cc11
-rw-r--r--package/libtorrent/patches/patch-src_torrent_data_file_list_iterator_h11
-rw-r--r--package/libtorrent/patches/patch-src_torrent_exceptions_cc11
-rw-r--r--package/libtorrent/patches/patch-src_torrent_poll_epoll_cc10
-rw-r--r--package/libtorrent/patches/patch-src_torrent_tracker_list_h11
-rw-r--r--package/libtorrent/patches/patch-src_tracker_tracker_dht_cc11
-rw-r--r--package/libtorrent/patches/patch-src_tracker_tracker_udp_cc8
-rw-r--r--package/libtorrent/patches/patch-src_utils_diffie_hellman_cc11
-rw-r--r--package/mac80211/Makefile20
-rw-r--r--package/mgetty/Makefile6
-rw-r--r--package/mgetty/patches/mgetty.patch98
-rw-r--r--package/mgetty/patches/patch-Makefile59
-rw-r--r--package/mgetty/patches/patch-g3_Makefile12
-rw-r--r--package/mgetty/patches/patch-logfile_c17
-rw-r--r--package/mysql/Makefile4
-rw-r--r--package/mysql/patches/patch-configure491
-rw-r--r--package/mysql/patches/patch-include_my_global_h8
-rw-r--r--package/nmap/patches/patch-ncat_Makefile_in11
-rw-r--r--package/rtorrent/Makefile4
-rw-r--r--package/rtorrent/patches/patch-rak_functional_h12
-rw-r--r--package/rtorrent/patches/patch-src_command_download_cc10
-rw-r--r--package/rtorrent/patches/patch-src_command_events_cc10
-rw-r--r--package/rtorrent/patches/patch-src_command_ui_cc12
-rw-r--r--package/rtorrent/patches/patch-src_display_text_element_value_cc6
-rw-r--r--package/rtorrent/patches/patch-src_rpc_parse_cc8
-rw-r--r--package/ruby/Makefile4
-rw-r--r--package/sane-backends/Config.in11
-rw-r--r--package/sane-backends/Makefile2
-rw-r--r--package/sane-backends/files/sane-backend-qcam.conffiles1
-rw-r--r--package/subversion/Makefile2
-rw-r--r--package/ulogd/patches/patch-libipulog_Makefile_in12
51 files changed, 505 insertions, 653 deletions
diff --git a/package/bitlbee/patches/patch-Makefile b/package/bitlbee/patches/patch-Makefile
new file mode 100644
index 0000000..8269d19
--- /dev/null
+++ b/package/bitlbee/patches/patch-Makefile
@@ -0,0 +1,22 @@
+--- bitlbee-1.2.3.orig/Makefile 2008-09-06 14:33:14.000000000 +0200
++++ bitlbee-1.2.3/Makefile 2009-08-28 11:18:09.268088045 +0200
+@@ -111,16 +111,16 @@ $(subdirs):
+
+ $(objects): %.o: %.c
+ @echo '*' Compiling $<
+- @$(CC) -c $(CFLAGS) $< -o $@
++ $(CC) -c $(CFLAGS) $< -o $@
+
+ $(objects): Makefile Makefile.settings config.h
+
+ $(OUTFILE): $(objects) $(subdirs)
+ @echo '*' Linking $(OUTFILE)
+- @$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LFLAGS) $(EFLAGS)
++ $(CC) -shared $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS) $(EFLAGS)
+ ifndef DEBUG
+ @echo '*' Stripping $(OUTFILE)
+- @-$(STRIP) $(OUTFILE)
++ -$(STRIP) $(OUTFILE)
+ endif
+
+ encode: crypting.c
diff --git a/package/bitlbee/patches/patch-lib_Makefile b/package/bitlbee/patches/patch-lib_Makefile
new file mode 100644
index 0000000..e43ddb2
--- /dev/null
+++ b/package/bitlbee/patches/patch-lib_Makefile
@@ -0,0 +1,24 @@
+--- bitlbee-1.2.3.orig/lib/Makefile 2008-09-06 14:33:13.000000000 +0200
++++ bitlbee-1.2.3/lib/Makefile 2009-08-28 11:12:29.546939473 +0200
+@@ -12,7 +12,7 @@
+ objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+
+ CFLAGS += -Wall
+-LFLAGS += -r
++#LFLAGS += -r
+
+ # [SH] Phony targets
+ all: lib.o
+@@ -32,10 +32,10 @@ distclean: clean $(subdirs)
+
+ lib.o: $(objects) $(subdirs)
+ @echo '*' Linking lib.o
+- @$(LD) $(LFLAGS) $(objects) -o lib.o
++ $(CC) -shared $(LDFLAGS) $(objects) -o lib.o
+
+ $(objects): ../Makefile.settings Makefile
+
+ $(objects): %.o: %.c
+ @echo '*' Compiling $<
+- @$(CC) -c $(CFLAGS) $< -o $@
++ $(CC) -c $(CFLAGS) $< -o $@
diff --git a/package/bitlbee/patches/patch-protocols_Makefile b/package/bitlbee/patches/patch-protocols_Makefile
new file mode 100644
index 0000000..9e0f621
--- /dev/null
+++ b/package/bitlbee/patches/patch-protocols_Makefile
@@ -0,0 +1,24 @@
+--- bitlbee-1.2.3.orig/protocols/Makefile 2008-09-06 14:33:13.000000000 +0200
++++ bitlbee-1.2.3/protocols/Makefile 2009-08-28 11:13:32.079800935 +0200
+@@ -21,7 +21,7 @@ subdirobjs = $(PROTOOBJS)
+ # Expansion of variables
+ subdirobjs := $(join $(subdirs),$(addprefix /,$(subdirobjs)))
+ CFLAGS += -Wall
+-LFLAGS += -r
++#LFLAGS += -r
+
+ # [SH] Phony targets
+ all: protocols.o
+@@ -44,10 +44,10 @@ $(subdirs):
+
+ protocols.o: $(objects) $(subdirs)
+ @echo '*' Linking protocols.o
+- @$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
++ $(CC) -shared $(LDFLAGS) $(objects) $(subdirobjs) -o protocols.o
+
+ $(objects): ../Makefile.settings Makefile
+
+ $(objects): %.o: %.c
+ @echo '*' Compiling $<
+- @$(CC) -c $(CFLAGS) $< -o $@
++ $(CC) -c $(CFLAGS) $< -o $@
diff --git a/package/bitlbee/patches/patch-protocols_jabber_Makefile b/package/bitlbee/patches/patch-protocols_jabber_Makefile
new file mode 100644
index 0000000..5bf3580
--- /dev/null
+++ b/package/bitlbee/patches/patch-protocols_jabber_Makefile
@@ -0,0 +1,22 @@
+--- bitlbee-1.2.3.orig/protocols/jabber/Makefile 2008-09-06 14:33:13.000000000 +0200
++++ bitlbee-1.2.3/protocols/jabber/Makefile 2009-08-28 11:15:01.100110500 +0200
+@@ -12,7 +12,7 @@
+ objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o
+
+ CFLAGS += -Wall
+-LFLAGS += -r
++#LFLAGS += -r
+
+ # [SH] Phony targets
+ all: jabber_mod.o
+@@ -34,8 +34,8 @@ $(objects): ../../Makefile.settings Make
+
+ $(objects): %.o: %.c
+ @echo '*' Compiling $<
+- @$(CC) -c $(CFLAGS) $< -o $@
++ $(CC) -c $(CFLAGS) $< -o $@
+
+ jabber_mod.o: $(objects)
+ @echo '*' Linking jabber_mod.o
+- @$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
++ $(CC) -shared $(LDFLAGS) $(objects) -o jabber_mod.o
diff --git a/package/bitlbee/patches/patch-protocols_msn_Makefile b/package/bitlbee/patches/patch-protocols_msn_Makefile
new file mode 100644
index 0000000..df4370d
--- /dev/null
+++ b/package/bitlbee/patches/patch-protocols_msn_Makefile
@@ -0,0 +1,24 @@
+--- bitlbee-1.2.3.orig/protocols/msn/Makefile 2008-09-06 14:33:13.000000000 +0200
++++ bitlbee-1.2.3/protocols/msn/Makefile 2009-08-28 11:13:50.455844911 +0200
+@@ -12,7 +12,7 @@
+ objects = msn.o msn_util.o ns.o passport.o sb.o tables.o
+
+ CFLAGS += -Wall
+-LFLAGS += -r
++#LFLAGS += -r
+
+ # [SH] Phony targets
+ all: msn_mod.o
+@@ -34,10 +34,10 @@ $(objects): ../../Makefile.settings Make
+
+ $(objects): %.o: %.c
+ @echo '*' Compiling $<
+- @$(CC) -c $(CFLAGS) $< -o $@
++ $(CC) -c $(CFLAGS) $< -o $@
+
+ msn_mod.o: $(objects)
+ @echo '*' Linking msn_mod.o
+- @$(LD) $(LFLAGS) $(objects) -o msn_mod.o
++ $(CC) -shared $(LDFLAGS) $(objects) -o msn_mod.o
+
+
diff --git a/package/bitlbee/patches/patch-protocols_oscar_Makefile b/package/bitlbee/patches/patch-protocols_oscar_Makefile
new file mode 100644
index 0000000..2ff7108
--- /dev/null
+++ b/package/bitlbee/patches/patch-protocols_oscar_Makefile
@@ -0,0 +1,22 @@
+--- bitlbee-1.2.3.orig/protocols/oscar/Makefile 2008-09-06 14:33:13.000000000 +0200
++++ bitlbee-1.2.3/protocols/oscar/Makefile 2009-08-28 11:16:04.032452435 +0200
+@@ -12,7 +12,7 @@
+ objects = admin.o auth.o bos.o buddylist.o chat.o chatnav.o conn.o icq.o im.o info.o misc.o msgcookie.o rxhandlers.o rxqueue.o search.o service.o snac.o ssi.o stats.o tlv.o txqueue.o oscar_util.o oscar.o
+
+ CFLAGS += -Wall
+-LFLAGS += -r
++#LFLAGS += -r
+
+ # [SH] Phony targets
+ all: oscar_mod.o
+@@ -34,8 +34,8 @@ $(objects): ../../Makefile.settings Make
+
+ $(objects): %.o: %.c
+ @echo '*' Compiling $<
+- @$(CC) -c $(CFLAGS) $< -o $@
++ $(CC) -c $(CFLAGS) $< -o $@
+
+ oscar_mod.o: $(objects)
+ @echo '*' Linking oscar_mod.o
+- @$(LD) $(LFLAGS) $(objects) -o oscar_mod.o
++ $(CC) -shared $(LDFLAGS) $(objects) -o oscar_mod.o
diff --git a/package/bitlbee/patches/patch-protocols_yahoo_Makefile b/package/bitlbee/patches/patch-protocols_yahoo_Makefile
new file mode 100644
index 0000000..51a294a
--- /dev/null
+++ b/package/bitlbee/patches/patch-protocols_yahoo_Makefile
@@ -0,0 +1,22 @@
+--- bitlbee-1.2.3.orig/protocols/yahoo/Makefile 2008-09-06 14:33:13.000000000 +0200
++++ bitlbee-1.2.3/protocols/yahoo/Makefile 2009-08-28 11:14:08.877306693 +0200
+@@ -12,7 +12,7 @@
+ objects = yahoo.o crypt.o libyahoo2.o yahoo_fn.o yahoo_httplib.o yahoo_util.o
+
+ CFLAGS += -Wall -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STRCHR -DHAVE_MEMCPY -DHAVE_GLIB
+-LFLAGS += -r
++#LFLAGS += -r
+
+ # [SH] Phony targets
+ all: yahoo_mod.o
+@@ -34,8 +34,8 @@ $(objects): ../../Makefile.settings Make
+
+ $(objects): %.o: %.c
+ @echo '*' Compiling $<
+- @$(CC) -c $(CFLAGS) $< -o $@
++ $(CC) -c $(CFLAGS) $< -o $@
+
+ yahoo_mod.o: $(objects)
+ @echo '*' Linking yahoo_mod.o
+- @$(LD) $(LFLAGS) $(objects) -o yahoo_mod.o
++ $(CC) -shared $(LDFLAGS) $(objects) -o yahoo_mod.o
diff --git a/package/ctorrent/Config.in b/package/ctorrent/Config.in
index 1695466..862b8c4 100644
--- a/package/ctorrent/Config.in
+++ b/package/ctorrent/Config.in
@@ -13,7 +13,7 @@ config ADK_PACKAGE_CTORRENT
choice
prompt "C++ library to use"
depends on ADK_PACKAGE_CTORRENT
-default ADK_COMPILE_CTORRENT_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_CTORRENT_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
default ADK_COMPILE_CTORRENT_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
config ADK_COMPILE_CTORRENT_WITH_STDCXX
diff --git a/package/elinks/Makefile b/package/elinks/Makefile
index 672c982..eba5074 100644
--- a/package/elinks/Makefile
+++ b/package/elinks/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= elinks
-PKG_VERSION:= 0.11.6
+PKG_VERSION:= 0.11.7
PKG_RELEASE:= 1
-PKG_MD5SUM:= fd85c1f38d4e2da8e59b60886a30a843
+PKG_MD5SUM:= 145c510cae41c204d0f23dce4bdd23ab
PKG_DESCR:= advanced text web browser
PKG_SECTION:= text
PKG_DEPENDS:= libopenssl
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+= --enable-small \
--without-x \
--without-zlib
BUILD_STYLE:= auto
-MAKE_FLAGS+= CC='${TARGET_CC}' LD='${TARGET_CROSS}ld'
+MAKE_FLAGS+= V=1 CC='${TARGET_CC}' LD='${TARGET_CC}'
do-install:
${INSTALL_DIR} ${IDIR_ELINKS}/usr/bin
diff --git a/package/elinks/patches/patch-Makefile_lib b/package/elinks/patches/patch-Makefile_lib
new file mode 100644
index 0000000..28b35fc
--- /dev/null
+++ b/package/elinks/patches/patch-Makefile_lib
@@ -0,0 +1,17 @@
+--- elinks-0.11.7.orig/Makefile.lib 2009-08-22 13:15:08.000000000 +0200
++++ elinks-0.11.7/Makefile.lib 2009-08-28 12:26:30.526558172 +0200
+@@ -43,12 +43,12 @@ quiet_cmd_compile = ' [$(CC_COLOR)C
+
+ # Rule to compile a set of .o files into one .o file
+ quiet_cmd_ld_objs = " [$(LD_COLOR)LD$(END_COLOR)] $(RELPATH)$@"
+- cmd_ld_objs = $(LD) -r -o $@ $(filter $(OBJS), $^) \
++ cmd_ld_objs = $(LD) -shared -o $@ $(filter $(OBJS), $^) \
+ $(foreach subdir,$(sort $(filter-out src,$(SUBDIRS))), \
+ `test -e $(subdir)/$(LIB_O_NAME) && echo $(subdir)/$(LIB_O_NAME)`)
+
+ quiet_cmd_link = ' [$(LINK_COLOR)LINK$(END_COLOR)] $(RELPATH)$@'
+- cmd_link = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
++ cmd_link = $(CC) -shared $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ quiet_cmd_sparse = ' [SPARSE] $(RELPATH)$(2)'
+ cmd_sparse = $(SPARSE) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(SPARSE_FLAGS) $(2)
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index 83db1d7..c42bae5 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -85,7 +85,7 @@ config ADK_PACKAGE_LIBGNUTLSXX
choice
prompt "C++ library to use"
depends on ADK_PACKAGE_LIBGNUTLSXX
-default ADK_COMPILE_GNUTLS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_GNUTLS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
default ADK_COMPILE_GNUTLS_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
config ADK_COMPILE_GNUTLS_WITH_STDCXX
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index d8d090a..358b69b 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -34,6 +34,8 @@ $(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE}
TCFLAGS+= -lncurses
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --without-libopencdk-prefix \
+ --disable-camellia \
+ --with-libgcrypt-prefix=${STAGING_DIR}/usr \
--without-libz-prefix
BUILD_STYLE= auto
INSTALL_STYLE= auto
diff --git a/package/id3lib/Config.in b/package/id3lib/Config.in
index 973fbe4..ab45259 100644
--- a/package/id3lib/Config.in
+++ b/package/id3lib/Config.in
@@ -13,7 +13,7 @@ config ADK_PACKAGE_ID3LIB
choice
prompt "C++ library to use"
depends on ADK_PACKAGE_ID3LIB
-default ADK_COMPILE_ID3LIB_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_ID3LIB_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
default ADK_COMPILE_ID3LIB_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
config ADK_COMPILE_ID3LIB_WITH_STDCXX
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index 230bfd9..6b4c778 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -17,7 +17,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,JAMVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE= autotool gnu
CONFIGURE_ARGS+= --enable-ffi
do-build:
diff --git a/package/jamvm/patches/patch-configure_ac b/package/jamvm/patches/patch-configure_ac
new file mode 100644
index 0000000..a9f1285
--- /dev/null
+++ b/package/jamvm/patches/patch-configure_ac
@@ -0,0 +1,10 @@
+--- jamvm-1.5.3.orig/configure.ac 2009-04-14 03:05:57.000000000 +0200
++++ jamvm-1.5.3/configure.ac 2009-08-28 14:10:40.855322815 +0200
+@@ -39,6 +39,7 @@ i386-*-solaris*) host_cpu=x86 host_os=so
+ x86_64-*-linux*) host_os=linux ;;
+ hppa*-*-linux*) host_cpu=parisc host_os=linux ;;
+ mipsel-*-linux*) host_cpu=mips host_os=linux ;;
++mips64el-*-linux*) host_cpu=mips host_os=linux ;;
+ amd64-*-openbsd*) host_os=bsd libdl_needed=no ;;
+ amd64-*-freebsd*) host_os=bsd libdl_needed=no ;;
+ arm*-*-linux*) host_cpu=arm host_os=linux ;;
diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile
index 3cbe6d0..74ab79c 100644
--- a/package/libtorrent/Makefile
+++ b/package/libtorrent/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= libtorrent
-PKG_VERSION:= 0.12.2
+PKG_VERSION:= 0.12.4
PKG_RELEASE:= 1
-PKG_MD5SUM:= 0831ca06f8906c7898fd67931ab239c7
+PKG_MD5SUM:= 7e4b4c29a69c86c38e3e60ec11fc2255
PKG_DESCR:= A bittorrent library
PKG_SECTION:= libs
PKG_DEPENDS:= libopenssl libsigc++
@@ -32,7 +32,7 @@ endif
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-aligned
BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+INSTALL_STYLE= auto
ifeq (${ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX},y)
# add workaround because libtool tries to link libstdc++
diff --git a/package/libtorrent/patches/patch-rak_functional_h b/package/libtorrent/patches/patch-rak_functional_h
deleted file mode 100644
index 1b8347d..0000000
--- a/package/libtorrent/patches/patch-rak_functional_h
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtorrent-0.12.2.orig/rak/functional.h 2008-05-07 14:19:14.000000000 +0200
-+++ libtorrent-0.12.2/rak/functional.h 2008-12-14 21:36:38.000000000 +0100
-@@ -37,6 +37,7 @@
- #ifndef RAK_FUNCTIONAL_H
- #define RAK_FUNCTIONAL_H
-
-+#include <cstdlib>
- #include <functional>
-
- namespace rak {
diff --git a/package/libtorrent/patches/patch-src_data_chunk_cc b/package/libtorrent/patches/patch-src_data_chunk_cc
deleted file mode 100644
index af7c2c6..0000000
--- a/package/libtorrent/patches/patch-src_data_chunk_cc
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtorrent-0.12.2.orig/src/data/chunk.cc 2008-05-07 14:19:13.000000000 +0200
-+++ libtorrent-0.12.2/src/data/chunk.cc 2008-12-14 21:42:29.000000000 +0100
-@@ -38,6 +38,7 @@
-
- #include <algorithm>
- #include <functional>
-+#include <cstring>
-
- #include "torrent/exceptions.h"
-
diff --git a/package/libtorrent/patches/patch-src_data_chunk_list_h b/package/libtorrent/patches/patch-src_data_chunk_list_h
deleted file mode 100644
index c1a324b..0000000
--- a/package/libtorrent/patches/patch-src_data_chunk_list_h
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtorrent-0.12.2.orig/src/data/chunk_list.h 2008-05-07 14:19:13.000000000 +0200
-+++ libtorrent-0.12.2/src/data/chunk_list.h 2008-12-14 21:34:31.000000000 +0100
-@@ -38,6 +38,7 @@
- #define LIBTORRENT_DATA_CHUNK_LIST_H
-
- #include <vector>
-+#include <string>
- #include <rak/error_number.h>
- #include <rak/functional.h>
-
diff --git a/package/libtorrent/patches/patch-src_net_address_list_cc b/package/libtorrent/patches/patch-src_net_address_list_cc
deleted file mode 100644
index 4f888d1..0000000
--- a/package/libtorrent/patches/patch-src_net_address_list_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtorrent-0.12.2.orig/src/net/address_list.cc 2008-05-07 14:19:12.000000000 +0200
-+++ libtorrent-0.12.2/src/net/address_list.cc 2008-12-14 21:47:24.000000000 +0100
-@@ -38,6 +38,8 @@
-
- #include <rak/functional.h>
-
-+#include <algorithm>
-+
- #include "download/download_info.h" // for SocketAddressCompact
-
- #include "address_list.h"
diff --git a/package/libtorrent/patches/patch-src_protocol_extensions_cc b/package/libtorrent/patches/patch-src_protocol_extensions_cc
index 9647dcf..9f3c605 100644
--- a/package/libtorrent/patches/patch-src_protocol_extensions_cc
+++ b/package/libtorrent/patches/patch-src_protocol_extensions_cc
@@ -1,11 +1,10 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtorrent-0.12.2.orig/src/protocol/extensions.cc 2008-05-07 14:19:12.000000000 +0200
-+++ libtorrent-0.12.2/src/protocol/extensions.cc 2009-05-21 23:39:00.000000000 +0200
-@@ -36,6 +36,7 @@
-
+--- libtorrent-0.12.4.orig/src/protocol/extensions.cc 2008-08-26 22:15:15.000000000 +0200
++++ libtorrent-0.12.4/src/protocol/extensions.cc 2009-08-28 17:38:49.879440210 +0200
+@@ -37,6 +37,7 @@
#include "config.h"
-+#include <cstdio>
#include <limits>
++#include <cstdio>
#include <sstream>
+ #include "download/available_list.h"
diff --git a/package/libtorrent/patches/patch-src_torrent_data_file_list_iterator_h b/package/libtorrent/patches/patch-src_torrent_data_file_list_iterator_h
deleted file mode 100644
index d20b9f9..0000000
--- a/package/libtorrent/patches/patch-src_torrent_data_file_list_iterator_h
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtorrent-0.12.2.orig/src/torrent/data/file_list_iterator.h 2008-05-07 14:19:13.000000000 +0200
-+++ libtorrent-0.12.2/src/torrent/data/file_list_iterator.h 2008-12-14 21:31:54.000000000 +0100
-@@ -39,6 +39,7 @@
-
- #include <torrent/common.h>
- #include <torrent/data/file_list.h>
-+#include <cstdlib>
-
- namespace torrent {
-
diff --git a/package/libtorrent/patches/patch-src_torrent_exceptions_cc b/package/libtorrent/patches/patch-src_torrent_exceptions_cc
deleted file mode 100644
index 2ed644a..0000000
--- a/package/libtorrent/patches/patch-src_torrent_exceptions_cc
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtorrent-0.12.2.orig/src/torrent/exceptions.cc 2008-05-07 14:19:13.000000000 +0200
-+++ libtorrent-0.12.2/src/torrent/exceptions.cc 2008-12-14 21:40:48.000000000 +0100
-@@ -37,6 +37,7 @@
- #include "config.h"
-
- #include <cerrno>
-+#include <cstring>
-
- #include "exceptions.h"
-
diff --git a/package/libtorrent/patches/patch-src_torrent_poll_epoll_cc b/package/libtorrent/patches/patch-src_torrent_poll_epoll_cc
new file mode 100644
index 0000000..c542f95
--- /dev/null
+++ b/package/libtorrent/patches/patch-src_torrent_poll_epoll_cc
@@ -0,0 +1,10 @@
+--- libtorrent-0.12.4.orig/src/torrent/poll_epoll.cc 2008-10-28 12:49:47.000000000 +0100
++++ libtorrent-0.12.4/src/torrent/poll_epoll.cc 2009-08-28 17:34:23.579476292 +0200
+@@ -37,6 +37,7 @@
+ #include "config.h"
+
+ #include <cerrno>
++#include <cstdio>
+ #include <cstring>
+
+ #include <unistd.h>
diff --git a/package/libtorrent/patches/patch-src_torrent_tracker_list_h b/package/libtorrent/patches/patch-src_torrent_tracker_list_h
deleted file mode 100644
index b307908..0000000
--- a/package/libtorrent/patches/patch-src_torrent_tracker_list_h
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtorrent-0.12.2.orig/src/torrent/tracker_list.h 2008-05-07 14:19:13.000000000 +0200
-+++ libtorrent-0.12.2/src/torrent/tracker_list.h 2008-12-14 22:31:57.000000000 +0100
-@@ -39,6 +39,7 @@
-
- #include <algorithm>
- #include <vector>
-+#include <string>
- #include <torrent/common.h>
-
- namespace torrent {
diff --git a/package/libtorrent/patches/patch-src_tracker_tracker_dht_cc b/package/libtorrent/patches/patch-src_tracker_tracker_dht_cc
index 841918c..94dc7b1 100644
--- a/package/libtorrent/patches/patch-src_tracker_tracker_dht_cc
+++ b/package/libtorrent/patches/patch-src_tracker_tracker_dht_cc
@@ -1,11 +1,10 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtorrent-0.12.2.orig/src/tracker/tracker_dht.cc 2008-05-07 14:19:13.000000000 +0200
-+++ libtorrent-0.12.2/src/tracker/tracker_dht.cc 2009-05-21 23:43:05.000000000 +0200
-@@ -36,6 +36,7 @@
-
+--- libtorrent-0.12.4.orig/src/tracker/tracker_dht.cc 2008-08-26 22:18:34.000000000 +0200
++++ libtorrent-0.12.4/src/tracker/tracker_dht.cc 2009-08-28 17:44:05.940697717 +0200
+@@ -37,6 +37,7 @@
#include "config.h"
-+#include <cstdio>
#include <sstream>
++#include <cstdio>
#include "dht/dht_router.h"
+ #include "torrent/connection_manager.h"
diff --git a/package/libtorrent/patches/patch-src_tracker_tracker_udp_cc b/package/libtorrent/patches/patch-src_tracker_tracker_udp_cc
index 5b3567f..5a0b906 100644
--- a/package/libtorrent/patches/patch-src_tracker_tracker_udp_cc
+++ b/package/libtorrent/patches/patch-src_tracker_tracker_udp_cc
@@ -1,11 +1,11 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtorrent-0.12.2.orig/src/tracker/tracker_udp.cc 2008-05-07 14:19:13.000000000 +0200
-+++ libtorrent-0.12.2/src/tracker/tracker_udp.cc 2009-05-21 23:39:25.000000000 +0200
-@@ -36,6 +36,7 @@
+--- libtorrent-0.12.4.orig/src/tracker/tracker_udp.cc 2008-05-07 14:19:13.000000000 +0200
++++ libtorrent-0.12.4/src/tracker/tracker_udp.cc 2009-08-28 17:51:08.510691244 +0200
+@@ -36,6 +36,8 @@
#include "config.h"
+#include <cstdio>
++
#include <sigc++/adaptors/bind.h>
#include <torrent/connection_manager.h>
diff --git a/package/libtorrent/patches/patch-src_utils_diffie_hellman_cc b/package/libtorrent/patches/patch-src_utils_diffie_hellman_cc
deleted file mode 100644
index 3608b70..0000000
--- a/package/libtorrent/patches/patch-src_utils_diffie_hellman_cc
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtorrent-0.12.2.orig/src/utils/diffie_hellman.cc 2008-05-07 14:19:12.000000000 +0200
-+++ libtorrent-0.12.2/src/utils/diffie_hellman.cc 2008-12-14 21:51:18.000000000 +0100
-@@ -37,6 +37,7 @@
- #include "config.h"
-
- #include <string>
-+#include <cstring>
-
- #ifdef USE_OPENSSL
- #include <openssl/bn.h>
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index b3af9aa..d03f594 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -67,14 +67,18 @@ DISABLED_DRIVERS:= CONFIG_AR9170_USB=n \
CONFIG_USB_NET_RNDIS_HOST=n \
CONFIG_USB_NET_RNDIS_WLAN=n
-XAKE_FLAGS:= ARCH="${ARCH}" \
- CROSS_COMPILE="${TARGET_CROSS}" \
- KLIB_BUILD="$(LINUX_DIR)" \
- KLIB="${WRKINST}/lib/modules/${KERNEL_VERSION}" \
- MODPROBE=: \
- LDFLAGS="" \
- ${DISABLED_DRIVERS} \
- V=1
+BUILD_STYLE:= manual
+
+do-build:
+ ARCH="${ARCH}" \
+ CROSS_COMPILE="${TARGET_CROSS}" \
+ KLIB_BUILD="$(LINUX_DIR)" \
+ KLIB="${WRKINST}/lib/modules/${KERNEL_VERSION}" \
+ MODPROBE=: \
+ LDFLAGS="" \
+ ${DISABLED_DRIVERS} \
+ V=1 \
+ $(MAKE) -C ${WRKBUILD}/
do-install:
${INSTALL_DIR} ${IDIR_KMOD_MAC80211}/etc/modules.d/
diff --git a/package/mgetty/Makefile b/package/mgetty/Makefile
index 3628f70..b6b3196 100644
--- a/package/mgetty/Makefile
+++ b/package/mgetty/Makefile
@@ -4,10 +4,10 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= mgetty
-PKG_VERSION:= 1.1.35
-PKG_XVERSION:= Feb22
+PKG_VERSION:= 1.1.36
+PKG_XVERSION:= Jun15
PKG_RELEASE:= 1
-PKG_MD5SUM:= 6805f8e31423bb777be80e3a856001cb
+PKG_MD5SUM:= 0320e98c6b86bcca48fc5f355b94ead4
PKG_DESCR:= mgetty + sendfax
PKG_SECTION:= misc
PKG_SITES:= ftp://alpha.greenie.net/pub/mgetty/source/1.1/
diff --git a/package/mgetty/patches/mgetty.patch b/package/mgetty/patches/mgetty.patch
deleted file mode 100644
index c5ffb6f..0000000
--- a/package/mgetty/patches/mgetty.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Only in mgetty-1.1.31: .prepared
-diff -ur mgetty-1.1.31-old/Makefile mgetty-1.1.31/Makefile
---- mgetty-1.1.31-old/Makefile 2006-01-02 00:37:56.000000000 +0000
-+++ mgetty-1.1.31/Makefile 2006-01-02 00:43:57.000000000 +0000
-@@ -164,7 +164,9 @@
- #
- # if your systems doesn't have one, use the shell script that I provide
- # in "inst.sh" (taken from X11R5). Needed on IRIX5.2
--INSTALL=install -c -o bin -g bin
-+STRIP=$(STAGING_DIR)sstrip
-+INSTALL=install -c -o root -g root
-+#INSTALL=install -c -o bin -g bin
- #INSTALL=install -c -o root -g wheel # NeXT/BSD
- #INSTALL=/usr/ucb/install -c -o bin -g bin # AIX, Solaris 2.x
- #INSTALL=installbsd -c -o bin -g bin # OSF/1, AIX 4.1, 4.2
-@@ -216,7 +218,7 @@
- # (it's possible to run faxrunq(d) as root, but the FAX_OUT_USER
- # MUST NOT BE root or any other privileged account).
- #
--FAX_OUT_USER=fax
-+FAX_OUT_USER=root
- #
- #
- # Where section 1 manual pages should be placed
-@@ -416,7 +418,12 @@
- ./mksed >sedscript
- chmod 700 sedscript
-
--mksed: mksed.c policy.h Makefile
-+REALGCC:=/usr/bin/gcc
-+mksed: mksed.c policy.h Makefile
-+ ( echo $(REALGCC); $(MAKE) "CC=$(REALGCC)" "CFLAGS=$(CFLAGS)" mksed-wrong;\
-+ );
-+
-+mksed-wrong: mksed.c policy.h Makefile
- $(CC) $(CFLAGS) -DBINDIR=\"$(BINDIR)\" -DSBINDIR=\"$(SBINDIR)\" \
- -DLIBDIR=\"$(LIBDIR)\" \
- -DCONFDIR=\"$(CONFDIR)\" \
-@@ -590,8 +597,10 @@
- -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
- -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
- -mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old
-- $(INSTALL) -s -m 700 mgetty $(SBINDIR)
-- $(INSTALL) -s -m 755 sendfax $(SBINDIR)
-+ $(INSTALL) -m 700 mgetty $(SBINDIR)
-+ $(STRIP) $(SBINDIR)/mgetty
-+ $(INSTALL) -m 755 sendfax $(SBINDIR)
-+ $(STRIP) $(SBINDIR)/sendfax
- #
- # data files + directories
- #
-@@ -653,7 +662,8 @@
- if [ ! -z "$(INSTALL_MECHO)" ] ; then \
- cd compat ; \
- $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
-- $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \
-+ $(INSTALL) -m 755 mg.echo $(BINDIR) && \
-+ $(STRIP) $(BINDIR)/mg.echo ; \
- fi
-
- #
-Only in mgetty-1.1.31-old: Makefile.orig
-Only in mgetty-1.1.31-old: Makefile.rej
-diff -ur mgetty-1.1.31-old/g3/Makefile mgetty-1.1.31/g3/Makefile
---- mgetty-1.1.31-old/g3/Makefile 2006-01-02 00:37:56.000000000 +0000
-+++ mgetty-1.1.31/g3/Makefile 2006-01-02 00:42:17.000000000 +0000
-@@ -40,7 +40,8 @@
- # install programs
- #
- for f in $(G3_PROGRAMS) ; do \
-- $(INSTALL) -s -m 755 $$f $(BINDIR) ; \
-+ $(INSTALL) -m 755 $$f $(BINDIR) ; \
-+ $(STRIP) $(BINDIR)/$$f ; \
- done
- #
- # make symlink for "g3topbm" (so third-party fax viewers won't fail)
-diff -ur mgetty-1.1.31-old/logfile.c mgetty-1.1.31/logfile.c
---- mgetty-1.1.31-old/logfile.c 2006-01-02 00:37:56.000000000 +0000
-+++ mgetty-1.1.31/logfile.c 2006-01-02 00:42:17.000000000 +0000
-@@ -327,12 +327,11 @@
- }
- else /* ERROR or FATAL */
- {
-- fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: %s",
-+ fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: #%d",
- tm->tm_mon+1, tm->tm_mday,
- tm->tm_hour, tm->tm_min, tm->tm_sec,
- log_infix, ws,
-- ( errnr <= sys_nerr ) ? sys_errlist[errnr]:
-- "<error not in list>" );
-+ errnr );
- #ifdef SYSLOG
- syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws );
- #endif
-Only in mgetty-1.1.31-old/voice/libutil: access.c.orig
-Only in mgetty-1.1.31-old/voice/libvoice: Lucent.c.orig
-Only in mgetty-1.1.31-old/voice/libvoice: V253modem.c.orig
-Only in mgetty-1.1.31-old/voice/pvftools: pvftormd.c.orig
diff --git a/package/mgetty/patches/patch-Makefile b/package/mgetty/patches/patch-Makefile
new file mode 100644
index 0000000..cf2f650
--- /dev/null
+++ b/package/mgetty/patches/patch-Makefile
@@ -0,0 +1,59 @@
+--- mgetty-1.1.36.orig/Makefile 2007-06-15 13:15:56.000000000 +0200
++++ mgetty-1.1.36/Makefile 2009-08-28 15:17:14.235450692 +0200
+@@ -164,7 +164,9 @@ LIBS=
+ #
+ # if your systems doesn't have one, use the shell script that I provide
+ # in "inst.sh" (taken from X11R5). Needed on IRIX5.2
+-INSTALL=install -c -o bin -g bin
++STRIP=$(STAGING_DIR)sstrip
++INSTALL=install -c -o root -g root
++#INSTALL=install -c -o bin -g bin
+ #INSTALL=install -c -o root -g wheel # NeXT/BSD
+ #INSTALL=/usr/ucb/install -c -o bin -g bin # AIX, Solaris 2.x
+ #INSTALL=installbsd -c -o bin -g bin # OSF/1, AIX 4.1, 4.2
+@@ -216,7 +218,7 @@ FAX_SPOOL_OUT=$(FAX_SPOOL)/outgoing
+ # (it's possible to run faxrunq(d) as root, but the FAX_OUT_USER
+ # MUST NOT BE root or any other privileged account).
+ #
+-FAX_OUT_USER=fax
++FAX_OUT_USER=root
+ #
+ #
+ # Where section 1 manual pages should be placed
+@@ -421,7 +423,12 @@ sedscript: mksed
+ ./mksed >sedscript
+ chmod +x sedscript
+
+-mksed: mksed.c policy.h Makefile
++REALGCC:=/usr/bin/gcc
++mksed: mksed.c policy.h Makefile
++ ( echo $(REALGCC); $(MAKE) "CC=$(REALGCC)" "CFLAGS=$(CFLAGS)" mksed-wrong;\
++ );
++
++mksed-wrong: mksed.c policy.h Makefile
+ $(CC) $(CFLAGS) -DBINDIR=\"$(BINDIR)\" -DSBINDIR=\"$(SBINDIR)\" \
+ -DLIBDIR=\"$(LIBDIR)\" \
+ -DCONFDIR=\"$(CONFDIR)\" \
+@@ -586,8 +593,10 @@ install.bin: mgetty sendfax newslock \
+ -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
+ -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
+ -mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old
+- $(INSTALL) -s -m 700 mgetty $(SBINDIR)
+- $(INSTALL) -s -m 755 sendfax $(SBINDIR)
++ $(INSTALL) -m 700 mgetty $(SBINDIR)
++ $(STRIP) $(SBINDIR)/mgetty
++ $(INSTALL) -m 755 sendfax $(SBINDIR)
++ $(STRIP) $(SBINDIR)/sendfax
+ #
+ # data files + directories
+ #
+@@ -649,7 +658,8 @@ install.bin: mgetty sendfax newslock \
+ if [ ! -z "$(INSTALL_MECHO)" ] ; then \
+ cd compat ; \
+ $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
+- $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \
++ $(INSTALL) -m 755 mg.echo $(BINDIR) && \
++ $(STRIP) $(BINDIR)/mg.echo ; \
+ fi
+
+ #
diff --git a/package/mgetty/patches/patch-g3_Makefile b/package/mgetty/patches/patch-g3_Makefile
new file mode 100644
index 0000000..3cb6cf2
--- /dev/null
+++ b/package/mgetty/patches/patch-g3_Makefile
@@ -0,0 +1,12 @@
+--- mgetty-1.1.36.orig/g3/Makefile 2006-02-22 18:25:34.000000000 +0100
++++ mgetty-1.1.36/g3/Makefile 2009-08-28 15:17:14.239450922 +0200
+@@ -37,7 +37,8 @@ install: all
+ # install programs
+ #
+ for f in $(G3_PROGRAMS) ; do \
+- $(INSTALL) -s -m 755 $$f $(BINDIR) ; \
++ $(INSTALL) -m 755 $$f $(BINDIR) ; \
++ $(STRIP) $(BINDIR)/$$f ; \
+ done
+ #
+ # make symlink for "g3topbm" (so third-party fax viewers won't fail)
diff --git a/package/mgetty/patches/patch-logfile_c b/package/mgetty/patches/patch-logfile_c
new file mode 100644
index 0000000..e2c4fdc
--- /dev/null
+++ b/package/mgetty/patches/patch-logfile_c
@@ -0,0 +1,17 @@
+--- mgetty-1.1.36.orig/logfile.c 2005-11-26 14:48:16.000000000 +0100
++++ mgetty-1.1.36/logfile.c 2009-08-28 15:17:14.239450922 +0200
+@@ -327,12 +327,11 @@ static int first_open = TRUE;
+ }
+ else /* ERROR or FATAL */
+ {
+- fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: %s",
++ fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: #%d",
+ tm->tm_mon+1, tm->tm_mday,
+ tm->tm_hour, tm->tm_min, tm->tm_sec,
+ log_infix, ws,
+- ( errnr <= sys_nerr ) ? sys_errlist[errnr]:
+- "<error not in list>" );
++ errnr );
+ #ifdef SYSLOG
+ syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws );
+ #endif
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index 5ed4e54..7c3ffbc 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= mysql
-PKG_VERSION:= 5.0.83
+PKG_VERSION:= 5.0.85
PKG_RELEASE:= 1
-PKG_MD5SUM:= 051392064a1e32cca5c23a593908b10e
+PKG_MD5SUM:= f672ec5154f8ea3db87fec5e0b227f4c
PKG_DESCR:= MySQL client library
PKG_SECTION:= libs
PKG_DEPENDS:= libncurses zlib
diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure
index 2cde7e4..4fe4d41 100644
--- a/package/mysql/patches/patch-configure
+++ b/package/mysql/patches/patch-configure
@@ -1,7 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- mysql-5.0.81.orig/configure 2009-04-16 13:56:58.000000000 +0200
-+++ mysql-5.0.81/configure 2009-05-12 10:59:57.000000000 +0200
-@@ -885,8 +885,6 @@ MYSQLD_EXTRA_LIBS
+--- mysql-5.0.85.orig/configure 2009-08-11 12:56:42.000000000 +0200
++++ mysql-5.0.85/configure 2009-08-27 22:35:38.879725240 +0200
+@@ -835,8 +835,6 @@ MYSQLD_EXTRA_LIBS
CLIENT_EXTRA_LDFLAGS
MYSQLD_EXTRA_LDFLAGS
LIBDL
@@ -10,39 +9,30 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
pstack_libs
pstack_dirs
WRAPLIBS
-@@ -21587,165 +21585,11 @@ else
+@@ -16480,89 +16478,10 @@ else
$as_echo "no" >&6; }
fi
-
-
--{ $as_echo "$as_me:$LINENO: checking \"return type of sprintf\"" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking \"return type of sprintf\"" >&5
-$as_echo_n "checking \"return type of sprintf\"... " >&6; }
-
-#check the return type of sprintf
-case $SYSTEM_TYPE in
- *netware*)
-- cat >>confdefs.h <<\_ACEOF
--#define SPRINTF_RETURNS_INT 1
--_ACEOF
-- { $as_echo "$as_me:$LINENO: result: \"int\"" >&5
+- $as_echo "#define SPRINTF_RETURNS_INT 1" >>confdefs.h
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"int\"" >&5
-$as_echo "\"int\"" >&6; }
- ;;
- *)
--if test "$cross_compiling" = yes; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-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_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
-else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- int main()
@@ -56,56 +46,20 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
- }
-
-_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
+-if ac_fn_c_try_run "$LINENO"; then :
-
-+# return type of sprintf is int for Linux glibc/uClibc
- cat >>confdefs.h <<\_ACEOF
- #define SPRINTF_RETURNS_INT 1
- _ACEOF
-
-- { $as_echo "$as_me:$LINENO: result: \"int\"" >&5
+-$as_echo "#define SPRINTF_RETURNS_INT 1" >>confdefs.h
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"int\"" >&5
-$as_echo "\"int\"" >&6; }
-else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--if test "$cross_compiling" = yes; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+- 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_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
-else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- int main()
@@ -116,71 +70,43 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
- return 0;
- return -1;
- }
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
--
--cat >>confdefs.h <<\_ACEOF
--#define SPRINTF_RETURNS_PTR 1
--_ACEOF
++# return type of sprintf is int for Linux glibc/uClibc
++cat >>confdefs.h <<\_ACEOF
++#define SPRINTF_RETURNS_INT 1
+ _ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-
+-$as_echo "#define SPRINTF_RETURNS_PTR 1" >>confdefs.h
-
-- { $as_echo "$as_me:$LINENO: result: \"ptr\"" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"ptr\"" >&5
-$as_echo "\"ptr\"" >&6; }
-else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
--( exit $ac_status )
+-$as_echo "#define SPRINTF_RETURNS_GARBAGE 1" >>confdefs.h
-
--cat >>confdefs.h <<\_ACEOF
--#define SPRINTF_RETURNS_GARBAGE 1
--_ACEOF
--
-- { $as_echo "$as_me:$LINENO: result: \"garbage\"" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"garbage\"" >&5
-$as_echo "\"garbage\"" >&6; }
-fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
--
-fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
--
- ;;
-esac
# Extract the first word of "uname", so it can be a program name with args.
set dummy uname; ac_word=$2
-@@ -22841,98 +22685,8 @@ $as_echo "no" >&6; }
+@@ -17587,97 +17506,7 @@ $as_echo "no" >&6; }
+ rm -f conftest.ic conftest.h
fi
-
+-
-# Look for PS usage. We use double dollar-signs in FIND_PROC because this
-# value is written to a makefile, which interprets away one level of
-# dollar-signs. So, interpretation stages are m4 and then shell in autoconf,
@@ -188,9 +114,9 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
-# no unprotected single quotes should appear in the expression.
-# Extract the first word of "ps", so it can be a program name with args.
-set dummy ps; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PS+set}" = set; then
+-if test "${ac_cv_path_PS+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $PS in
@@ -203,14 +129,14 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
+- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PS="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
--done
+- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_PS" && ac_cv_path_PS="ps"
@@ -219,18 +145,18 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
-fi
-PS=$ac_cv_path_PS
-if test -n "$PS"; then
-- { $as_echo "$as_me:$LINENO: result: $PS" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PS" >&5
-$as_echo "$PS" >&6; }
-else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
--{ $as_echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking \"how to check if pid exists\"" >&5
-$as_echo_n "checking \"how to check if pid exists\"... " >&6; }
-PS=$ac_cv_path_PS
- # Linux style
+-# Linux style
-if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
-then
- FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
@@ -265,25 +191,23 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
- FIND_PROC=
- ;;
- *)
-- { { $as_echo "$as_me:$LINENO: error: Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual." >&5
--$as_echo "$as_me: error: Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual." >&2;}
-- { (exit 1); exit 1; }; }
+- as_fn_error "Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual." "$LINENO" 5
- esac
-fi
-
--{ $as_echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$FIND_PROC\"" >&5
-$as_echo "\"$FIND_PROC\"" >&6; }
+FIND_PROC="/bin/ps wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
# Check if a pid is valid
# Extract the first word of "kill", so it can be a program name with args.
-@@ -26681,350 +26435,14 @@ fi
+@@ -19842,218 +19671,9 @@ fi
fi
-
-if test "$TARGET_LINUX" = "true"; then
-- { $as_echo "$as_me:$LINENO: checking for atomic operations" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for atomic operations" >&5
-$as_echo_n "checking for atomic operations... " >&6; }
-
-
@@ -295,20 +219,13 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
-
-
- atom_ops=
-- if test "$cross_compiling" = yes; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+- 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_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
-else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <asm/atomic.h>
@@ -322,59 +239,23 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
-}
-
-_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
--
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_ATOMIC_ADD 1
--_ACEOF
+-if ac_fn_cxx_try_run "$LINENO"; then :
-
-- atom_ops="${atom_ops}atomic_add "
--else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+-$as_echo "#define HAVE_ATOMIC_ADD 1" >>confdefs.h
-
+- atom_ops="${atom_ops}atomic_add "
-fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
--
-- if test "$cross_compiling" = yes; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+- 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_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
-else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <asm/atomic.h>
@@ -388,48 +269,19 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
-}
-
-_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_ATOMIC_SUB 1
--_ACEOF
+-if ac_fn_cxx_try_run "$LINENO"; then :
-
-- atom_ops="${atom_ops}atomic_sub "
--else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+-$as_echo "#define HAVE_ATOMIC_SUB 1" >>confdefs.h
-
+- atom_ops="${atom_ops}atomic_sub "
-fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
--
- if test -z "$atom_ops"; then atom_ops="no"; fi
-- { $as_echo "$as_me:$LINENO: result: $atom_ops" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $atom_ops" >&5
-$as_echo "$atom_ops" >&6; }
-
- ac_ext=c
@@ -441,7 +293,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
-
-
-# Check whether --with-pstack was given.
--if test "${with_pstack+set}" = set; then
+-if test "${with_pstack+set}" = set; then :
- withval=$with_pstack; USE_PSTACK=$withval
-else
- USE_PSTACK=no
@@ -453,18 +305,14 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
- then
- have_libiberty= have_libbfd=
- my_save_LIBS="$LIBS"
-- { $as_echo "$as_me:$LINENO: checking for fdmatch in -liberty" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdmatch in -liberty" >&5
-$as_echo_n "checking for fdmatch in -liberty... " >&6; }
--if test "${ac_cv_lib_iberty_fdmatch+set}" = set; then
+-if test "${ac_cv_lib_iberty_fdmatch+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-liberty $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
@@ -482,56 +330,27 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
- return 0;
-}
-_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
+-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_iberty_fdmatch=yes
-else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_iberty_fdmatch=no
+- ac_cv_lib_iberty_fdmatch=no
-fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_iberty_fdmatch" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iberty_fdmatch" >&5
-$as_echo "$ac_cv_lib_iberty_fdmatch" >&6; }
--if test "x$ac_cv_lib_iberty_fdmatch" = x""yes; then
+-if test "x$ac_cv_lib_iberty_fdmatch" = x""yes; then :
- have_libiberty=yes
-- { $as_echo "$as_me:$LINENO: checking for bfd_openr in -lbfd" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
-$as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
--if test "${ac_cv_lib_bfd_bfd_openr+set}" = set; then
+-if test "${ac_cv_lib_bfd_bfd_openr+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbfd -liberty $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
@@ -548,45 +367,19 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
- ;
- return 0;
-}
-+#define HAVE_ATOMIC_ADD 0
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_bfd_bfd_openr=yes
-else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_bfd_bfd_openr=no
+- ac_cv_lib_bfd_bfd_openr=no
-fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bfd_bfd_openr" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
-$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
--if test "x$ac_cv_lib_bfd_bfd_openr" = x""yes; then
+-if test "x$ac_cv_lib_bfd_bfd_openr" = x""yes; then :
- have_libbfd=yes
-fi
-
@@ -602,12 +395,9 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
- with_mysqld_ldflags="-all-static"
-
-
-
- cat >>confdefs.h <<\_ACEOF
--#define USE_PSTACK 1
-+#define HAVE_ATOMIC_SUB 0
- _ACEOF
-
+-
+-$as_echo "#define USE_PSTACK 1" >>confdefs.h
+-
- else
- USE_PSTACK="no"
- fi
@@ -623,39 +413,35 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
- COMPILE_PSTACK_FALSE=
-fi
-
--{ $as_echo "$as_me:$LINENO: checking if we should use pstack" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should use pstack" >&5
-$as_echo_n "checking if we should use pstack... " >&6; }
--{ $as_echo "$as_me:$LINENO: result: $USE_PSTACK" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_PSTACK" >&5
-$as_echo "$USE_PSTACK" >&6; }
++$as_echo "#define HAVE_ATOMIC_ADD 0" >>confdefs.h
++$as_echo "#define HAVE_ATOMIC_SUB 0" >>confdefs.h
++$as_echo "#define USE_PSTACK 0" >>confdefs.h
# Check for gtty if termio.h doesn't exists
if test "$ac_cv_header_termio_h" = "no" -a "$ac_cv_header_termios_h" = "no"
-@@ -27201,96 +26619,6 @@ fi
+@@ -20116,59 +19736,6 @@ fi
# Later in this script LIBS will be augmented with a threads library.
NON_THREADED_LIBS="$LIBS"
--{ $as_echo "$as_me:$LINENO: checking for int8" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for int8" >&5
-$as_echo_n "checking for int8... " >&6; }
-case $SYSTEM_TYPE in
- *netware)
-- { $as_echo "$as_me:$LINENO: result: no" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- ;;
- *)
--if test "$cross_compiling" = yes; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-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_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
-else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#ifdef HAVE_STDLIB_H
@@ -677,67 +463,34 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
-}
-
-_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_INT_8_16_32 1
--_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
-
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "#define HAVE_INT_8_16_32 1" >>confdefs.h
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-- $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ $as_echo "$as_me:$LINENO: result: no" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
--
- ;;
-esac
--
+
#
# Some system specific hacks
- #
-@@ -43458,13 +42786,6 @@ $as_echo "$as_me: error: conditional \"A
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+@@ -27705,10 +27272,6 @@ if test -z "${ASSEMBLER_TRUE}" && test -
+ as_fn_error "conditional \"ASSEMBLER\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${COMPILE_PSTACK_TRUE}" && test -z "${COMPILE_PSTACK_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"COMPILE_PSTACK\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"COMPILE_PSTACK\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
+- as_fn_error "conditional \"COMPILE_PSTACK\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${HAVE_YASSL_TRUE}" && test -z "${HAVE_YASSL_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_YASSL\" was never defined.
+ as_fn_error "conditional \"HAVE_YASSL\" was never defined.
diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h
index cbdc5ba..0513e1c 100644
--- a/package/mysql/patches/patch-include_my_global_h
+++ b/package/mysql/patches/patch-include_my_global_h
@@ -1,6 +1,6 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- mysql-5.0.81.orig/include/my_global.h 2009-04-16 13:48:04.000000000 +0200
-+++ mysql-5.0.81/include/my_global.h 2009-05-12 10:59:28.000000000 +0200
+--- mysql-5.0.85.orig/include/my_global.h 2009-08-11 12:50:17.000000000 +0200
++++ mysql-5.0.85/include/my_global.h 2009-08-27 22:21:39.363259500 +0200
@@ -350,29 +350,32 @@ C_MODE_END
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -45,7 +45,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
/*
A lot of our programs uses asserts, so better to always include it
-@@ -826,9 +829,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
+@@ -791,9 +794,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
#define finite(x) (1.0 / fabs(x) > 0.0)
#endif
@@ -56,4 +56,4 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+*/
#ifdef HAVE_ISINF
- /* isinf() can be used in both C and C++ code */
+ /* Check if C compiler is affected by GCC bug #39228 */
diff --git a/package/nmap/patches/patch-ncat_Makefile_in b/package/nmap/patches/patch-ncat_Makefile_in
new file mode 100644
index 0000000..e7bbafe
--- /dev/null
+++ b/package/nmap/patches/patch-ncat_Makefile_in
@@ -0,0 +1,11 @@
+--- nmap-5.00.orig/ncat/Makefile.in 2009-04-29 06:14:04.000000000 +0200
++++ nmap-5.00/ncat/Makefile.in 2009-08-28 16:01:37.061874972 +0200
+@@ -126,7 +126,7 @@ $(NSOCKDIR)/libnsock.a: $(NSOCKDIR)/Make
+ install: $(TARGET)
+ @echo Installing Ncat;
+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(mandir)/man1
+- $(INSTALL) -c -m 755 -s ncat $(DESTDIR)$(bindir)/ncat
++ $(INSTALL) -c -m 755 ncat $(DESTDIR)$(bindir)/ncat
+ $(INSTALL) -c -m 644 $(DATAFILES) $(DESTDIR)$(pkgdatadir)/
+ $(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/$(TARGET).1
+
diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile
index dc3ee50..e068e8e 100644
--- a/package/rtorrent/Makefile
+++ b/package/rtorrent/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= rtorrent
-PKG_VERSION:= 0.8.2
+PKG_VERSION:= 0.8.4
PKG_RELEASE:= 1
-PKG_MD5SUM:= a2456182e1767e5aed7341dbbd058f60
+PKG_MD5SUM:= dc0f37d933b0b6c713ad617e09441f3b
PKG_DESCR:= console torrent application
PKG_SECTION:= net
PKG_DEPENDS:= libncurses libtorrent libcurl
diff --git a/package/rtorrent/patches/patch-rak_functional_h b/package/rtorrent/patches/patch-rak_functional_h
deleted file mode 100644
index aec1456..0000000
--- a/package/rtorrent/patches/patch-rak_functional_h
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- rtorrent-0.8.2.orig/rak/functional.h 2008-05-07 14:19:12.000000000 +0200
-+++ rtorrent-0.8.2/rak/functional.h 2008-12-14 22:51:25.000000000 +0100
-@@ -37,6 +37,8 @@
- #ifndef RAK_FUNCTIONAL_H
- #define RAK_FUNCTIONAL_H
-
-+#include <cstdlib>
-+
- #include <functional>
-
- namespace rak {
diff --git a/package/rtorrent/patches/patch-src_command_download_cc b/package/rtorrent/patches/patch-src_command_download_cc
new file mode 100644
index 0000000..4c1e50a
--- /dev/null
+++ b/package/rtorrent/patches/patch-src_command_download_cc
@@ -0,0 +1,10 @@
+--- rtorrent-0.8.4.orig/src/command_download.cc 2008-11-19 18:01:20.000000000 +0100
++++ rtorrent-0.8.4/src/command_download.cc 2009-08-28 18:01:37.606461520 +0200
+@@ -36,6 +36,7 @@
+
+ #include "config.h"
+
++#include <cstdio>
+ #include <functional>
+ #include <unistd.h>
+ #include <rak/file_stat.h>
diff --git a/package/rtorrent/patches/patch-src_command_events_cc b/package/rtorrent/patches/patch-src_command_events_cc
new file mode 100644
index 0000000..dcd5227
--- /dev/null
+++ b/package/rtorrent/patches/patch-src_command_events_cc
@@ -0,0 +1,10 @@
+--- rtorrent-0.8.4.orig/src/command_events.cc 2008-11-11 11:37:20.000000000 +0100
++++ rtorrent-0.8.4/src/command_events.cc 2009-08-28 18:14:19.096303800 +0200
+@@ -36,6 +36,7 @@
+
+ #include "config.h"
+
++#include <cstdio>
+ #include <functional>
+ #include <rak/file_stat.h>
+ #include <rak/path.h>
diff --git a/package/rtorrent/patches/patch-src_command_ui_cc b/package/rtorrent/patches/patch-src_command_ui_cc
deleted file mode 100644
index 0383d92..0000000
--- a/package/rtorrent/patches/patch-src_command_ui_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- rtorrent-0.8.2.orig/src/command_ui.cc 2008-05-07 14:19:11.000000000 +0200
-+++ rtorrent-0.8.2/src/command_ui.cc 2008-12-14 22:56:02.000000000 +0100
-@@ -36,6 +36,8 @@
-
- #include "config.h"
-
-+#include <ctime>
-+
- #include <rak/functional.h>
- #include <rak/functional_fun.h>
- #include <sigc++/adaptors/bind.h>
diff --git a/package/rtorrent/patches/patch-src_display_text_element_value_cc b/package/rtorrent/patches/patch-src_display_text_element_value_cc
index 01391f8..0afd7d1 100644
--- a/package/rtorrent/patches/patch-src_display_text_element_value_cc
+++ b/package/rtorrent/patches/patch-src_display_text_element_value_cc
@@ -1,7 +1,7 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- rtorrent-0.8.2.orig/src/display/text_element_value.cc 2008-05-07 14:19:11.000000000 +0200
-+++ rtorrent-0.8.2/src/display/text_element_value.cc 2008-12-14 22:14:58.000000000 +0100
-@@ -39,6 +39,8 @@
+--- rtorrent-0.8.4.orig/src/display/text_element_value.cc 2008-11-16 11:04:41.000000000 +0100
++++ rtorrent-0.8.4/src/display/text_element_value.cc 2009-08-28 17:58:13.596279559 +0200
+@@ -41,6 +41,8 @@
#include "globals.h"
#include "text_element_value.h"
diff --git a/package/rtorrent/patches/patch-src_rpc_parse_cc b/package/rtorrent/patches/patch-src_rpc_parse_cc
index 09189e9..38530b3 100644
--- a/package/rtorrent/patches/patch-src_rpc_parse_cc
+++ b/package/rtorrent/patches/patch-src_rpc_parse_cc
@@ -1,9 +1,9 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- rtorrent-0.8.2.orig/src/rpc/parse.cc 2008-05-07 14:19:10.000000000 +0200
-+++ rtorrent-0.8.2/src/rpc/parse.cc 2009-05-29 01:27:36.000000000 +0200
-@@ -37,6 +37,8 @@
- #include "config.h"
+--- rtorrent-0.8.4.orig/src/rpc/parse.cc 2008-08-26 22:14:33.000000000 +0200
++++ rtorrent-0.8.4/src/rpc/parse.cc 2009-08-28 17:58:13.616282106 +0200
+@@ -38,6 +38,8 @@
+ #include <cstring>
#include <locale>
+#include <cstdio>
+#include <cstring>
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index 414c135..349d86c 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= ruby
-PKG_VERSION:= 1.9.1-p129
+PKG_VERSION:= 1.9.1-p243
PKG_RELEASE:= 1
-PKG_MD5SUM:= c71f413514ee6341c627be2957023a5c
+PKG_MD5SUM:= 515bfd965814e718c0943abf3dde5494
PKG_DESCR:= interpreter for the ruby language
PKG_SECTION:= net
PKG_URL:= http://www.ruby-lang.org
diff --git a/package/sane-backends/Config.in b/package/sane-backends/Config.in
index de3c1ec..01d5758 100644
--- a/package/sane-backends/Config.in
+++ b/package/sane-backends/Config.in
@@ -433,17 +433,6 @@ config ADK_PACKAGE_SANE_BACKEND_PLUSTEK
http://www.sane-project.org
-config ADK_PACKAGE_SANE_BACKEND_QCAM
- prompt "sane-backend-qcam............... Scanner Access Now Easy (QCAM)"
- tristate
- default n
- depends on ADK_PACKAGE_SANE_BACKENDS
- select ADK_PACKAGE_LIBUSB
- help
- SANE (Scanner Access Now Easy) is a universal scanner interface.
-
- http://www.sane-project.org
-
config ADK_PACKAGE_SANE_BACKEND_RICOH
prompt "sane-backend-ricoh.............. Scanner Access Now Easy (RICOH)"
tristate
diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile
index dcfb9b6..55785bc 100644
--- a/package/sane-backends/Makefile
+++ b/package/sane-backends/Makefile
@@ -72,7 +72,6 @@ $(eval $(call PKG_template,SANE_BACKEND_PIE,sane-backend-pie,${PKG_VERSION}-${PK
$(eval $(call PKG_template,SANE_BACKEND_PIXMA,sane-backend-pixma,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,SANE_BACKEND_PLUSTEK_PP,sane-backend-plustek-pp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,SANE_BACKEND_PLUSTEK,sane-backend-plustek,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,SANE_BACKEND_QCAM,sane-backend-qcam,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,SANE_BACKEND_RICOH,sane-backend-ricoh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,SANE_BACKEND_S9036,sane-backend-s9036,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,SANE_BACKEND_SCEPTRE,sane-backend-sceptre,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -132,7 +131,6 @@ $(eval $(call PKG_mod_template,SANE_BACKEND_PIE,pie))
$(eval $(call PKG_mod_template,SANE_BACKEND_PIXMA,pixma))
$(eval $(call PKG_mod_template,SANE_BACKEND_PLUSTEK_PP,plustek_pp))
$(eval $(call PKG_mod_template,SANE_BACKEND_PLUSTEK,plustek))
-$(eval $(call PKG_mod_template,SANE_BACKEND_QCAM,qcam))
$(eval $(call PKG_mod_template,SANE_BACKEND_RICOH,ricoh))
$(eval $(call PKG_mod_template,SANE_BACKEND_S9036,s9036))
$(eval $(call PKG_mod_template,SANE_BACKEND_SCEPTRE,sceptre))
diff --git a/package/sane-backends/files/sane-backend-qcam.conffiles b/package/sane-backends/files/sane-backend-qcam.conffiles
index dd760db..e69de29 100644
--- a/package/sane-backends/files/sane-backend-qcam.conffiles
+++ b/package/sane-backends/files/sane-backend-qcam.conffiles
@@ -1 +0,0 @@
-/etc/sane.d/qcam.conf
diff --git a/package/subversion/Makefile b/package/subversion/Makefile
index a543361..d83753e 100644
--- a/package/subversion/Makefile
+++ b/package/subversion/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --without-jdk
CONFIGURE_ARGS+= --disable-javahl
CONFIGURE_ARGS+= --without-berkeley-db
-LIBS= -laprutil-0 -lapr-0 -lexpat -liconv
+LIBS= -laprutil-0 -lapr-0 -lexpat -liconv -lsqlite3
ifeq ($(ADK_PACKAGE_SUBVERSION_NEON),y)
CONFIGURE_ARGS+= -disable-neon-version-check
diff --git a/package/ulogd/patches/patch-libipulog_Makefile_in b/package/ulogd/patches/patch-libipulog_Makefile_in
index 8ce425d..002e6e1 100644
--- a/package/ulogd/patches/patch-libipulog_Makefile_in
+++ b/package/ulogd/patches/patch-libipulog_Makefile_in
@@ -1,7 +1,7 @@
$Id$
---- ulogd-1.24.orig/libipulog/Makefile.in 2005-11-25 19:58:25.000000000 +0000
-+++ ulogd-1.24/libipulog/Makefile.in 2007-02-15 21:29:49.000000000 +0000
-@@ -1,7 +1,7 @@
+--- ulogd-1.24.orig/libipulog/Makefile.in 2005-11-25 20:58:25.000000000 +0100
++++ ulogd-1.24/libipulog/Makefile.in 2009-08-28 20:28:09.339447238 +0200
+@@ -1,10 +1,10 @@
#
include @top_srcdir@/Rules.make
@@ -9,4 +9,8 @@ $Id$
+CFLAGS+=-Iinclude
libipulog.a: libipulog.o
- $(LD) -i $< -o $@
+- $(LD) -i $< -o $@
++ $(CC) -shared $< -o $@
+
+ distrib:
+