diff options
Diffstat (limited to 'package')
36 files changed, 214 insertions, 70 deletions
diff --git a/package/Config.in b/package/Config.in index e76397d57..507497e0d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -467,10 +467,15 @@ source "package/opencdk/Config.in" source "package/obexftp/Config.in.lib" source "package/openobex/Config.in" source "package/libosip2/Config.in" +source "package/libosip2/Config.in.lib" source "package/libowfat/Config.in" +source "package/libowfat/Config.in.lib" source "package/libp11/Config.in" +source "package/libp11/Config.in.lib" source "package/libpcap/Config.in" +source "package/libpcap/Config.in.lib" source "package/libpri/Config.in" +source "package/libpri/Config.in.lib" source "package/pango/Config.in" source "package/pcre/Config.in" source "package/libpng/Config.in" 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/base-files/extra/etc/network/if-post-down.d/01-bridge b/package/base-files/extra/etc/network/if-post-down.d/01-bridge index eda1fe3bf..47f3c976b 100755 --- a/package/base-files/extra/etc/network/if-post-down.d/01-bridge +++ b/package/base-files/extra/etc/network/if-post-down.d/01-bridge @@ -22,3 +22,5 @@ for IF in $INTERFACES; do done ip link set down dev $IFACE || exit 1 +brctl delbr $IFACE +exit 0 diff --git a/package/base-files/extra/etc/network/if-post-down.d/02-vlan b/package/base-files/extra/etc/network/if-post-down.d/02-vlan new file mode 100755 index 000000000..e448a7641 --- /dev/null +++ b/package/base-files/extra/etc/network/if-post-down.d/02-vlan @@ -0,0 +1,10 @@ +#!/bin/sh + +[ -x /sbin/vconfig ] || exit 0 + +[ -e /proc/net/vlan/$IFACE ] && ( + ip link set down dev $IFACE + vconfig rem $IFACE +) + +exit 0 diff --git a/package/base-files/extra/etc/network/if-pre-up.d/01-atm b/package/base-files/extra/etc/network/if-pre-up.d/01-atm index 08baf73c7..5c168c001 100644..100755 --- a/package/base-files/extra/etc/network/if-pre-up.d/01-atm +++ b/package/base-files/extra/etc/network/if-pre-up.d/01-atm @@ -1,18 +1,15 @@ #!/bin/sh -if [ ! -x /usr/sbin/br2684ctl ] -then - exit 0 -fi +[ -x /usr/sbin/br2684ctl ] || exit 0 -[ "$METHOD" == "atm" ] || exit 0 +[ "${IFACE%%[0-9]*}" = "nas" ] || exit 0 [ "$IF_ATM_ENCAPS" ] || encap=0 [ "$IF_ATM_PAYLOAD" ] || payload=1 -[ "$IF_ATM_VPI" ] || $IF_ATM_VPI=1 -[ "$IF_ATM_VCI" ] || $IF_ATM_VCI=32 +[ "$IF_ATM_VPI" ] || IF_ATM_VPI=1 +[ "$IF_ATM_VCI" ] || IF_ATM_VCI=32 -case "$IF_ATM_PAYLOAD" in +[ "$IF_ATM_PAYLOAD" ] && case "$IF_ATM_PAYLOAD" in bridged) payload=1 ;; @@ -25,7 +22,7 @@ routed) ;; esac -case "$IF_ATM_ENCAPS" in +[ "$IF_ATM_ENCAPS" ] && case "$IF_ATM_ENCAPS" in llc) encap=0 ;; @@ -38,6 +35,7 @@ vc) ;; esac -br2684ctl -b -c 0 -e $encap -p $payload -a $IF_ATM_VPI.$IF_ATM_VCI -ifconfig nas0 up +br2684ctl -b -c ${IFACE##*[a-z]} -e $encap -p $payload -a $IF_ATM_VPI.$IF_ATM_VCI +ifconfig nas${IFACE##*[a-z]} up + exit 0 diff --git a/package/base-files/extra/etc/network/if-pre-up.d/02-vlan b/package/base-files/extra/etc/network/if-pre-up.d/02-vlan new file mode 100755 index 000000000..09b9cf0da --- /dev/null +++ b/package/base-files/extra/etc/network/if-pre-up.d/02-vlan @@ -0,0 +1,35 @@ +#!/bin/sh + +[ -x /sbin/vconfig ] || exit 0 + +case "$IFACE" in + vlan*) + vconfig set_name_type VLAN_PLUS_VID_NO_PAD + VLANID=`echo $IFACE|sed "s/vlan*//"` + ;; + eth*.*) + vconfig set_name_type DEV_PLUS_VID_NO_PAD + VLANID=`echo $IFACE|sed "s/eth[0-9][0-9]*\.*//g"` + IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\(eth[0-9][0-9]*\)\..*/\1/"` + ;; + *) + exit 0 + ;; +esac + +if [ "$IF_VLAN_RAW_DEVICE" != "" ]; then + if ! grep -q "$IF_VLAN_RAW_DEVICE" /proc/net/dev + then + echo "$IF_VLAN_RAW_DEVICE does not exist, unable to create $IFACE" + exit 1 + fi + ip link set up dev $IF_VLAN_RAW_DEVICE + vconfig add $IF_VLAN_RAW_DEVICE $VLANID + if [ "$IF_MAC_ADDRESS" != "" ] + then + ip link set $IF_VLAN_RAW_DEVICE.$VLANID address $IF_MAC_ADDRESS + fi + ip link set up dev $IF_VLAN_RAW_DEVICE.$VLANID +fi + +exit 0 diff --git a/package/base-files/extra/etc/network/if-pre-up.d/02-bridge b/package/base-files/extra/etc/network/if-pre-up.d/03-bridge index 766084de1..41ddb2b58 100755 --- a/package/base-files/extra/etc/network/if-pre-up.d/02-bridge +++ b/package/base-files/extra/etc/network/if-pre-up.d/03-bridge @@ -1,9 +1,6 @@ #!/bin/sh -if [ ! -x /usr/sbin/brctl ] -then - exit 0 -fi +[ -x /usr/sbin/brctl ] || exit 0 case "$IF_BRIDGE_PORTS" in "") diff --git a/package/base-files/extra/etc/network/if-up.d/01-bridge b/package/base-files/extra/etc/network/if-up.d/01-bridge new file mode 100755 index 000000000..e5962f12f --- /dev/null +++ b/package/base-files/extra/etc/network/if-up.d/01-bridge @@ -0,0 +1,4 @@ +#!/bin/sh + +[ "${IFACE%%[0-9]*}" = "br" ] && ip link set up dev $IFACE +exit 0 diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile index c84bb0625..038e04d45 100644 --- a/package/bluez-firmware/Makefile +++ b/package/bluez-firmware/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 1cc3cefad872e937e05de5a0a2b390dd PKG_DESCR:= Bluez firmware for BCM2033 PKG_SECTION:= bluetooth -PKG_DEPENDS:= kmod-bluetooth bluez +PKG_DEPENDS:= kmod-bt bluez PKG_URL:= http://www.bluez.org PKG_SITES:= http://bluez.sourceforge.net/download/ diff --git a/package/bluez/Makefile b/package/bluez/Makefile index 2d8c14735..de238080f 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -4,12 +4,12 @@ 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 +PKG_DEPENDS:= kmod-bt libusb glib dbus PKG_BUILDDEP+= libusb dbus glib PKG_URL:= http://www.bluez.org PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/} 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/cryptsetup/Makefile b/package/cryptsetup/Makefile index ea81a3630..3a51fdf54 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 5eea2a77391a8a1a651b31cbaef59e22 PKG_DESCR:= LUKS cryptsetup tools PKG_SECTION:= crypto -PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc kmod-crypto-sha256 kmod-dm-mod +PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc kmod-crypto-sha256 kmod-blk-dev-dm PKG_BUILDDEP+= libgcrypt popt e2fsprogs lvm PKG_URL:= http://cryptsetup.googlecode.com PKG_SITES:= http://cryptsetup.googlecode.com/files/ diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index 55bd4eddc..b664183c1 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -6,24 +6,24 @@ include ${TOPDIR}/rules.mk PKG_NAME= davfs2 PKG_VERSION= 1.3.3 PKG_RELEASE= 1 +PKG_MD5SUM= 57def26e4d6d63527e01612d10fd0515 +PKG_DESCR:= WebDAV filesystem +PKG_SECTION:= admin PKG_BUILDDEP+= libiconv neon ifneq (${ADK_PACKAGE_DAVFS2_FUSE}${ADK_PACKAGE_DAVFS2_BOTH},) PKG_BUILDDEP+= fuse endif -PKG_MD5SUM= 57def26e4d6d63527e01612d10fd0515 -PKG_DESCR:= WebDAV filesystem -PKG_SECTION:= admin PKG_URL:= http://savannah.nongnu.org/projects/davfs2 PKG_SITES= ${MASTER_SITE_SOURCEFORGE:=dav/} include ${TOPDIR}/mk/package.mk ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y) -PKG_DEPENDS:= fuse-utils kmod-fuse libiconv neon +PKG_DEPENDS:= fuse-utils kmod-fuse-fs libiconv neon else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y) -PKG_DEPENDS:= kmod-fs-coda libiconv neon +PKG_DEPENDS:= kmod-coda-fs libiconv neon else -PKG_DEPENDS:= kmod-fs-coda fuse-utils kmod-fuse libiconv neon +PKG_DEPENDS:= kmod-coda-fs fuse-utils kmod-fuse-fs libiconv neon endif $(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 95e3580e6..692427867 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 4879f06570d2225667534c37fea04213 PKG_DESCR:= Filesystem in Userspace (utilities) PKG_SECTION:= admin -PKG_DEPENDS:= kmod-fuse +PKG_DEPENDS:= kmod-fuse-fs PKG_URL:= http://fuse.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile index b26be8b8d..90a61257a 100644 --- a/package/igmpproxy/Makefile +++ b/package/igmpproxy/Makefile @@ -4,12 +4,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= igmpproxy -PKG_VERSION:= 0.1_beta4 +PKG_VERSION:= 0.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 0a16178aeca5d1bf54c129cec9597f85 -PKG_DESCR:= IGMPproxy is a simple dynamic Multicast Routing Daemon +PKG_MD5SUM:= c56f41ec195bc1fe016369bf74efc5a1 +PKG_DESCR:= a simple dynamic Multicast Routing Daemon PKG_SECTION:= net -PKG_URL:= http://sourceforge.net/projects/igmpproxy +PKG_URL:= http://sourceforge.net/projects/igmpproxy/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=igmpproxy/} include ${TOPDIR}/mk/package.mk diff --git a/package/iptables/Makefile b/package/iptables/Makefile index ae82b7fcf..b7f98121e 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= c67cf30e281a924def6426be0973df56 PKG_DESCR:= The netfilter firewalling software PKG_SECTION:= net -PKG_DEPENDS:= kmod-nf-ip-iptables kmod-nf-conntrack kmod-nf-conntrack-ipv4 kmod-nf-nat kmod-nf-ip-target-masquerade kmod-nf-ip-target-reject kmod-nf-ip-filter +PKG_DEPENDS:= kmod-ip-nf-iptables kmod-nf-conntrack kmod-nf-conntrack-ipv4 kmod-nf-nat kmod-ip-nf-target-masquerade kmod-ip-nf-target-reject kmod-ip-nf-filter PKG_URL:= http://www.netfilter.org PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ \ ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \ 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/miax/Makefile b/package/miax/Makefile index 9e815a0a1..0975cf3f3 100644 --- a/package/miax/Makefile +++ b/package/miax/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= miax PKG_VERSION:= 1.4 PKG_RELEASE:= 1 -PKG_BUILDDEP+= bluez PKG_MD5SUM:= 44f0d2ef46ee2697d890b7b96846adc7 PKG_DESCR:= A console iax (asterisk) client PKG_SECTION:= bluetooth -PKG_DEPENDS:= kmod-bluetooth bluez libpthread +PKG_DEPENDS:= kmod-bt bluez libpthread +PKG_BUILDDEP+= bluez PKG_URL:= http://sourceforge.net/projects/miax PKG_SITES:= http://mesh.dl.sourceforge.net/sourceforge/miax/ diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c index 1230688b1..bd5b50dab 100644 --- a/package/mtd/src/mtd.c +++ b/package/mtd/src/mtd.c @@ -277,7 +277,7 @@ main(int argc, char **argv) buflen = 0; quiet = 0; - while ((ch = getopt(argc, argv, "Fqe:")) != -1) + while ((ch = getopt(argc, argv, "Fqre:")) != -1) switch (ch) { case 'F': quiet = 1; 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/ncurses/Makefile b/package/ncurses/Makefile index 9dd44d4cc..cd41f0f92 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -24,6 +24,7 @@ CONFIGURE_ARGS+= --without-cxx \ --with-build-cc=${HOSTCC} \ --without-progs \ --with-fallbacks \ + --disable-termcap \ --without-ada \ --with-shared \ --with-normal \ @@ -69,8 +70,9 @@ post-install: ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/ for f in ansi dumb linux rxvt screen vt100 vt102 \ vt220 wsvt25 xterm xterm-color xterm-xfree86; do \ + ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}; \ ${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/*/$$f \ - ${IDIR_LIBNCURSES}/usr/share/terminfo/$$f; \ + ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}/$$f; \ done ${INSTALL_DIR} ${IDIR_LIBNCURSES_DEV}/usr/include ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBNCURSES_DEV}/usr/include 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); \ diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 18de2b04e..523711887 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= 9a706327fb9827541d7c86d48ceb9631 PKG_DESCR:= a Point-to-Point Tunneling Protocol (PPTP) client PKG_SECTION:= net -PKG_DEPENDS:= ppp kmod-gre +PKG_DEPENDS:= ppp kmod-net-ipgre PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pptpclient/} include ${TOPDIR}/mk/package.mk diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index 0a5a10b87..463c2ac5c 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -24,7 +24,6 @@ TCFLAGS+= -DSBINDIR=\\\"/usr/sbin\\\" FAKE_FLAGS+= INSTALL="install" post-install: - ${INSTALL_DIR} ${IDIR_PPTPD}/etc ${INSTALL_DIR} ${IDIR_PPTPD}/etc/ppp ${INSTALL_DIR} ${IDIR_PPTPD}/usr/sbin ${INSTALL_DATA} ./files/pptpd.conf ${IDIR_PPTPD}/etc/ diff --git a/package/sangam-atm/Makefile b/package/sangam-atm/Makefile index ed1377642..52cb218fe 100644 --- a/package/sangam-atm/Makefile +++ b/package/sangam-atm/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 3843f3e670967fe81561770ac960c1cd PKG_DESCR:= sangam-atm DSL modem driver for TI AR7 boards PKG_SECTION:= kernel +PKG_DEPENDS:= kmod-fw-loader kmod-atm PKG_SITES:= http://openadk.org/distfiles/ PKG_TARGET_DEPENDS:= ag241 @@ -16,7 +17,7 @@ PKG_TARGET_DEPENDS:= ag241 include ${TOPDIR}/mk/package.mk include ${TOPDIR}/mk/kernel-vars.mk -$(eval $(call PKG_template,KMOD_SANGAM_ATM,kmod-sangam-atm,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,KMOD_SANGAM_ATM,kmod-sangam-atm,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index 7e92a9fa4..c704097e1 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tcpdump PKG_VERSION:= 4.0.0 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libpcap PKG_MD5SUM:= b22ca72890df2301d922c9f2d17867f9 PKG_DESCR:= A tool for network monitoring and data acquisition. PKG_SECTION:= net PKG_DEPENDS:= libpcap +PKG_BUILDDEP+= libpcap PKG_URL:= http://www.tcpdump.org PKG_SITES:= http://www.tcpdump.org/release/ \ http://www.sfr-fresh.com/unix/misc/ \ diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile index b3343b8a7..4de64d7b0 100644 --- a/package/util-linux-ng/Makefile +++ b/package/util-linux-ng/Makefile @@ -6,10 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= util-linux-ng PKG_VERSION:= 2.16.1 PKG_RELEASE:= 2 -PKG_BUILDDEP+= e2fsprogs ncurses PKG_MD5SUM:= fc57e5fd5be9e569b026b5077fafe84f PKG_DESCR:= Linux utilities PKG_SECTION:= admin +PKG_BUILDDEP+= e2fsprogs ncurses PKG_URL:= http://userweb.kernel.org/~kzak/util-linux-ng PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/util-linux-ng/v2.16/} @@ -18,7 +18,7 @@ PKG_DESCR_SFDISK:= Scriptable Partition table manipulation utility PKG_DESCR_SWAP:= Swap space management utilities PKG_DEPENDS_SWAP:= libblkid PKG_DESCR_LOOP:= Loop devices setup and control utility -PKG_DEPENDS_LOOP:= kmod-loop +PKG_DEPENDS_LOOP:= kmod-blk-dev-loop include ${TOPDIR}/mk/package.mk diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile index 71951046c..a9abb551b 100644 --- a/package/wdfs/Makefile +++ b/package/wdfs/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME= wdfs PKG_VERSION= 1.4.2 PKG_RELEASE= 2 -PKG_BUILDDEP+= openssl fuse neon glib PKG_MD5SUM= 628bb44194d04c1cf8aacc446ed0a230 PKG_DESCR:= WebDAV filesystem PKG_SECTION:= net -PKG_DEPENDS:= libopenssl fuse-utils kmod-fuse neon glib +PKG_DEPENDS:= libopenssl fuse-utils kmod-fuse-fs neon glib +PKG_BUILDDEP+= openssl fuse neon glib PKG_SITES= http://noedler.de/projekte/wdfs/ include ${TOPDIR}/mk/package.mk diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 4380f3663..790a01d7e 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 913a672cbd6da516de15965d594e20b9 PKG_DESCR:= Xorg server PKG_SECTION:= x11 -PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile libfontenc +PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile libfontenc xkeyboard-config xkbcomp PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto scrnsaverproto resourceproto fontsproto videoproto compositeproto evieext libxkbfile libXfont pixman libpciaccess openssl xf86dgaproto PKG_URL:= http://www.x.org PKG_SITES:= ${MASTER_SITE_XORG} |