summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/pkg-bottom.mk6
-rw-r--r--package/atk/Makefile2
-rw-r--r--package/aufs2-util/Makefile2
-rw-r--r--package/bluez/Makefile6
-rw-r--r--package/bluez/patches/patch-Makefile_in27
-rw-r--r--package/bluez/patches/patch-scripts_bluetooth_rules7
-rw-r--r--package/bluez/patches/patch-tools_hciattach_c8
-rw-r--r--package/bogofilter/patches/patch-configure_ac6
-rw-r--r--package/krb5/Makefile3
-rw-r--r--package/krb5/patches/patch-src_Makefile_in6
-rw-r--r--package/libX11/Makefile1
-rw-r--r--package/mysql/patches/patch-configure19
-rw-r--r--package/mysql/patches/patch-include_my_global_h54
-rw-r--r--package/openssl/Makefile4
14 files changed, 122 insertions, 29 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 3a7320d6e..a3ca4590c 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -20,11 +20,13 @@ ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE}
ifneq ($(filter autotool,${CONFIGURE_STYLE}),)
cd ${WRKBUILD}; \
- autoreconf -vif $(MAKE_TRACE)
+ env AUTOCONF_VERSION=2.62 \
+ AUTOMAKE_VERSION=1.9 \
+ autoreconf -vif $(MAKE_TRACE)
endif
ifneq ($(filter autoconf,${CONFIGURE_STYLE}),)
cd ${WRKBUILD}; \
- autoconf $(MAKE_TRACE)
+ env AUTOCONF_VERSION=2.62 autoconf $(MAKE_TRACE)
endif
ifneq ($(filter gnu,${CONFIGURE_STYLE}),)
@$(CMD_TRACE) "configuring... "
diff --git a/package/atk/Makefile b/package/atk/Makefile
index f7172b76b..0980de0cc 100644
--- a/package/atk/Makefile
+++ b/package/atk/Makefile
@@ -6,10 +6,10 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= atk
PKG_VERSION:= 1.29.3
PKG_RELEASE:= 1
-PKG_BUILDDEP+= glib
PKG_MD5SUM:= f587d9285b2d0ac35ea95acef673517c
PKG_DESCR:= atk library
PKG_SECTION:= libs
+PKG_BUILDDEP+= glib
PKG_URL:= http://www.gnome.org
PKG_SITES:= ${MASTER_SITE_GNOME:=/atk/1.29/}
diff --git a/package/aufs2-util/Makefile b/package/aufs2-util/Makefile
index 3d100010d..36b1b7bba 100644
--- a/package/aufs2-util/Makefile
+++ b/package/aufs2-util/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_DESCR:= aufs2 utilities
PKG_SECTION:= admin
PKG_URL:= http://aufs.sf.net/
-PKG_HOST_DEPENDS:= !cygwin !freebsd
+PKG_HOST_DEPENDS:= !cygwin !freebsd !openbsd
NO_DISTFILES:= 1
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index 2d8c14735..d5b1bc48c 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= bluez
-PKG_VERSION:= 4.57
-PKG_RELEASE:= 2
-PKG_MD5SUM:= dc29e54f1204ac4215caeeee062b26f6
+PKG_VERSION:= 4.59
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 1c7cee215bc84656b1edee019cee78f5
PKG_DESCR:= bluetooth libraries and applications
PKG_SECTION:= bluetooth
PKG_DEPENDS:= kmod-bluetooth libusb glib dbus
diff --git a/package/bluez/patches/patch-Makefile_in b/package/bluez/patches/patch-Makefile_in
new file mode 100644
index 000000000..4334402d7
--- /dev/null
+++ b/package/bluez/patches/patch-Makefile_in
@@ -0,0 +1,27 @@
+--- bluez-4.59.orig/Makefile.in Thu Dec 24 17:42:48 2009
++++ bluez-4.59/Makefile.in Tue Dec 29 01:31:12 2009
+@@ -48,7 +48,6 @@ noinst_PROGRAMS = $(am__EXEEXT_7) $(am__EXEEXT_8) $(am
+ $(am__EXEEXT_10) $(am__EXEEXT_11)
+ @SBC_TRUE@am__append_1 = sbc/libsbc.la
+ @SBC_TRUE@am__append_2 = sbc/sbcinfo sbc/sbcdec sbc/sbcenc
+-@SBC_TRUE@@SNDFILE_TRUE@am__append_3 = sbc/sbctester
+ @NETLINK_TRUE@am__append_4 = plugins/netlink.la
+ @ECHOPLUGIN_TRUE@am__append_5 = echo
+ @ECHOPLUGIN_TRUE@am__append_6 = plugins/echo.c
+@@ -318,7 +317,6 @@ sbc_libsbc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(
+ @DUND_TRUE@am__EXEEXT_6 = compat/dund$(EXEEXT)
+ @SBC_TRUE@am__EXEEXT_7 = sbc/sbcinfo$(EXEEXT) sbc/sbcdec$(EXEEXT) \
+ @SBC_TRUE@ sbc/sbcenc$(EXEEXT)
+-@SBC_TRUE@@SNDFILE_TRUE@am__EXEEXT_8 = sbc/sbctester$(EXEEXT)
+ @TOOLS_TRUE@am__EXEEXT_9 = tools/avinfo$(EXEEXT) tools/ppporc$(EXEEXT) \
+ @TOOLS_TRUE@ tools/hcieventmask$(EXEEXT) \
+ @TOOLS_TRUE@ tools/hcisecfilter$(EXEEXT)
+@@ -918,8 +916,6 @@ lib_libbluetooth_la_DEPENDENCIES = $(local_headers)
+ @SBC_TRUE@sbc_sbcdec_LDADD = sbc/libsbc.la
+ @SBC_TRUE@sbc_sbcenc_SOURCES = sbc/sbcenc.c sbc/formats.h
+ @SBC_TRUE@sbc_sbcenc_LDADD = sbc/libsbc.la
+-@SBC_TRUE@@SNDFILE_TRUE@sbc_sbctester_LDADD = @SNDFILE_LIBS@
+-@SBC_TRUE@@SNDFILE_TRUE@sbc_sbctest_CFLAGS = @SNDFILE_CFLAGS@
+ @NETLINK_TRUE@plugins_netlink_la_LIBADD = @NETLINK_LIBS@
+ @NETLINK_TRUE@plugins_netlink_la_LDFLAGS = -module -avoid-version -no-undefined
+ @NETLINK_TRUE@plugins_netlink_la_CFLAGS = -fvisibility=hidden @DBUS_CFLAGS@ \
diff --git a/package/bluez/patches/patch-scripts_bluetooth_rules b/package/bluez/patches/patch-scripts_bluetooth_rules
new file mode 100644
index 000000000..0ff2c0ef3
--- /dev/null
+++ b/package/bluez/patches/patch-scripts_bluetooth_rules
@@ -0,0 +1,7 @@
+--- bluez-4.59.orig/scripts/bluetooth.rules Thu Dec 24 17:43:09 2009
++++ bluez-4.59/scripts/bluetooth.rules Tue Dec 29 01:26:46 2009
+@@ -1,3 +1,3 @@
+ # Run helper every time a Bluetooth device appears
+ # On remove actions, bluetoothd should go away by itself
+-ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/usr/local/sbin/bluetoothd --udev"
++ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/bluetoothd --udev"
diff --git a/package/bluez/patches/patch-tools_hciattach_c b/package/bluez/patches/patch-tools_hciattach_c
index ae8f70f57..e5a84de4f 100644
--- a/package/bluez/patches/patch-tools_hciattach_c
+++ b/package/bluez/patches/patch-tools_hciattach_c
@@ -1,7 +1,7 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- bluez-4.12.orig/tools/hciattach.c 2008-08-05 23:14:56.000000000 +0200
-+++ bluez-4.12/tools/hciattach.c 2009-05-12 18:14:29.000000000 +0200
-@@ -107,6 +107,7 @@ static int uart_speed(int s)
+--- bluez-4.59.orig/tools/hciattach.c Tue May 19 11:04:10 2009
++++ bluez-4.59/tools/hciattach.c Tue Dec 29 01:26:35 2009
+@@ -100,6 +100,7 @@ static int uart_speed(int s)
return B57600;
case 115200:
return B115200;
@@ -9,7 +9,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
case 230400:
return B230400;
case 460800:
-@@ -125,6 +126,7 @@ static int uart_speed(int s)
+@@ -118,6 +119,7 @@ static int uart_speed(int s)
return B1500000;
case 2000000:
return B2000000;
diff --git a/package/bogofilter/patches/patch-configure_ac b/package/bogofilter/patches/patch-configure_ac
index 8d79ed50f..c3c254400 100644
--- a/package/bogofilter/patches/patch-configure_ac
+++ b/package/bogofilter/patches/patch-configure_ac
@@ -1,7 +1,7 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- bogofilter-1.2.0.orig/configure.ac 2009-02-21 21:41:43.000000000 +0100
-+++ bogofilter-1.2.0/configure.ac 2009-05-28 19:47:00.466710794 +0200
-@@ -550,49 +550,6 @@ Cannot link against libdb? Try these ste
+--- bogofilter-1.2.0.orig/configure.ac Sat Feb 21 21:41:43 2009
++++ bogofilter-1.2.0/configure.ac Tue Dec 29 01:38:12 2009
+@@ -550,49 +550,6 @@ Cannot link against libdb? Try these steps to solve th
AH_TEMPLATE([HAVE_DB_H], [Have suitable db.h header])
AC_SUBST(LIBDB)
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 9de7e2127..089197773 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= krb5
PKG_VERSION:= 1.7
PKG_RELEASE:= 2
-PKG_BUILDDEP+= ncurses e2fsprogs
PKG_MD5SUM:= 9f7b3402b4731a7fa543db193bf1b564
PKG_DESCR:= MIT kerberos server
PKG_SECTION:= net
PKG_DEPENDS:= krb5-libs libncurses libss libcom-err
+PKG_BUILDDEP+= ncurses e2fsprogs
PKG_URL:= http://web.mit.edu/kerberos
PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.7/
@@ -28,6 +28,7 @@ $(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-${PKG_RELEASE},,${
TCFLAGS+= -I${STAGING_DIR}/usr/include/et
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --disable-static \
+ --disable-profiled \
--with-system-ss \
--with-system-et \
--without-tcl
diff --git a/package/krb5/patches/patch-src_Makefile_in b/package/krb5/patches/patch-src_Makefile_in
index ba9aff1f1..ef48b68ed 100644
--- a/package/krb5/patches/patch-src_Makefile_in
+++ b/package/krb5/patches/patch-src_Makefile_in
@@ -1,6 +1,6 @@
---- krb5-1.7.orig/src/Makefile.in 2009-04-15 22:07:03.000000000 +0200
-+++ krb5-1.7/src/Makefile.in 2009-11-11 19:45:39.281234175 +0100
-@@ -13,7 +13,6 @@ SUBDIRS=util include lib kdc kadmin @lda
+--- krb5-1.7.orig/src/Makefile.in Wed Apr 15 22:07:03 2009
++++ krb5-1.7/src/Makefile.in Mon Dec 28 16:13:47 2009
+@@ -13,7 +13,6 @@ SUBDIRS=util include lib kdc kadmin @ldap_plugin_dir@
plugins/kdb/db2 \
plugins/preauth/pkinit \
plugins/preauth/encrypted_challenge \
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 3e76da9eb..e1a990ada 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -23,6 +23,7 @@ $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
XAKE_FLAGS+= HOSTCPPFLAGS=-I${STAGING_DIR}/usr/include/xproto
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --enable-xlocale \
+ --disable-specs \
--disable-xf86bigfont \
--disable-malloc0returnsnull \
--without-xcb
diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure
index cf3239b22..0ce1eac1e 100644
--- a/package/mysql/patches/patch-configure
+++ b/package/mysql/patches/patch-configure
@@ -1,6 +1,6 @@
---- mysql-5.1.41.orig/configure 2009-11-04 19:37:28.000000000 +0100
-+++ mysql-5.1.41/configure 2009-12-25 12:18:01.000000000 +0100
-@@ -46976,197 +46976,14 @@ $as_echo "$as_me: error: unknown endiann
+--- mysql-5.1.41.orig/configure Wed Nov 4 19:37:28 2009
++++ mysql-5.1.41/configure Tue Dec 29 13:28:43 2009
+@@ -46976,198 +46976,15 @@ $as_echo "$as_me: error: unknown endianness
esac
@@ -177,7 +177,7 @@
- { $as_echo "$as_me:$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
@@ -195,13 +195,15 @@
-fi
-
-
-
+-
{ $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5
$as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; }
-@@ -47284,101 +47101,6 @@ fi
+ # either define HAVE_IB_SOLARIS_ATOMICS or not
+@@ -47283,101 +47100,6 @@ _ACEOF
+ fi
done
-
+-
- { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by Solaris libc atomic functions" >&5
-$as_echo_n "checking whether pthread_t can be used by Solaris libc atomic functions... " >&6; }
- # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
@@ -296,7 +298,6 @@
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
--
- # this is needed to know which one of atomic_cas_32() or atomic_cas_64()
+
diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h
new file mode 100644
index 000000000..2b262bbb4
--- /dev/null
+++ b/package/mysql/patches/patch-include_my_global_h
@@ -0,0 +1,54 @@
+--- mysql-5.1.41.orig/include/my_global.h Wed Nov 4 19:28:15 2009
++++ mysql-5.1.41/include/my_global.h Tue Dec 29 13:39:20 2009
+@@ -18,6 +18,8 @@
+ #ifndef _global_h
+ #define _global_h
+
++#include <sys/param.h>
++
+ /*
+ InnoDB depends on some MySQL internals which other plugins should not
+ need. This is because of InnoDB's foreign key support, "safe" binlog
+@@ -424,7 +426,7 @@ C_MODE_END
+ #ifdef HAVE_FLOAT_H
+ #include <float.h>
+ #endif
+-#ifdef HAVE_FENV_H
++#if defined(HAVE_FENV_H) && !defined(BSD)
+ #include <fenv.h> /* For fesetround() */
+ #endif
+
+@@ -454,15 +456,20 @@ C_MODE_END
+ #undef HAVE_ALLOCA
+ #undef HAVE_ALLOCA_H
+ #endif
+-#ifdef HAVE_ALLOCA_H
++#if defined(HAVE_ALLOCA_H) && !defined(BSD)
+ #include <alloca.h>
+ #endif
+
+ #include <errno.h> /* Recommended by debian */
+ /* We need the following to go around a problem with openssl on solaris */
++#ifdef BSD
++#include <pwd.h>
++#include <unistd.h>
++#else
+ #if defined(HAVE_CRYPT_H)
+ #include <crypt.h>
+ #endif
++#endif
+
+ /*
+ A lot of our programs uses asserts, so better to always include it
+@@ -879,9 +886,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
+ #endif /* HAVE_FINITE */
+ #endif /* isfinite */
+
++/*
+ #ifndef HAVE_ISNAN
+ #define isnan(x) ((x) != (x))
+ #endif
++*/
+
+ #ifdef HAVE_ISINF
+ /* Check if C compiler is affected by GCC bug #39228 */
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 17de862f3..587abbd6e 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -33,10 +33,10 @@ INSTALL_STYLE:= auto
INSTALL_TARGET:= install_sw
FAKE_FLAGS+= INSTALL_PREFIX=${WRKINST}
-OPENSSL_OPTIONS = shared no-ec no-err no-hw no-krb5 no-threads zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast
+OPENSSL_OPTIONS = shared no-ec no-err no-krb5 no-threads zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast
post-extract:
- @find ${WRKBUILD} -name *.rej -delete
+ @find ${WRKBUILD} -name *.rej -exec rm {} \;
do-configure:
(cd $(WRKBUILD); \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 04:09:08 +0000