summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-03-28 16:07:18 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-03-28 16:07:18 +0200
commit8bee65a9cbd1905e356ff468a48e90608a08a8e6 (patch)
treeafdb76c6fa9e0e91482680497f0f5c27c56a9d4b /package
parent98c4842cbff9e4802092c5011feb0ecbb8e4881d (diff)
parentbf5f8fc2eaded785753175367f7f1a52192c2d62 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/Config.in4
-rw-r--r--package/asterisk/Makefile4
-rw-r--r--package/base-files/src/lib/mdev/init5
-rwxr-xr-xpackage/base-files/src/sbin/adkupdate8
-rw-r--r--package/bash/Makefile4
-rw-r--r--package/bind/Makefile4
-rw-r--r--package/bitlbee/patches/patch-lib_Makefile20
-rw-r--r--package/bitlbee/patches/patch-protocols_Makefile20
-rw-r--r--package/bitlbee/patches/patch-protocols_jabber_Makefile17
-rw-r--r--package/bitlbee/patches/patch-protocols_msn_Makefile19
-rw-r--r--package/bitlbee/patches/patch-protocols_oscar_Makefile17
-rw-r--r--package/bitlbee/patches/patch-protocols_yahoo_Makefile17
-rw-r--r--package/busybox/Makefile20
-rw-r--r--package/busybox/config/findutils/Config.in3
-rw-r--r--package/busybox/config/util-linux/Config.in1
-rw-r--r--package/cryptinit/Makefile4
-rw-r--r--package/cryptsetup/Makefile6
-rw-r--r--package/cryptsetup/patches/patch-Makefile_in58
-rw-r--r--package/cryptsetup/patches/patch-configure175
-rw-r--r--package/cryptsetup/patches/patch-configure_in47
-rw-r--r--package/cryptsetup/patches/patch-lib_Makefile_in8
-rw-r--r--package/cryptsetup/patches/patch-lib_setup_c17
-rw-r--r--package/cryptsetup/patches/patch-luks_Makefile_in8
-rw-r--r--package/cryptsetup/patches/patch-man_Makefile_in8
-rw-r--r--package/cryptsetup/patches/patch-src_Makefile_in8
-rw-r--r--package/cryptsetup/patches/patch-tests_Makefile_in8
-rw-r--r--package/cvs/patches/patch-lib_getline_c11
-rw-r--r--package/cvs/patches/patch-lib_getline_h11
-rw-r--r--package/elinks/Makefile4
-rw-r--r--package/elinks/patches/patch-Makefile_lib11
-rw-r--r--package/font-adobe-100dpi/Makefile2
-rw-r--r--package/font-adobe-75dpi/Makefile2
-rw-r--r--package/font-bh-100dpi/Makefile2
-rw-r--r--package/font-bh-75dpi/Makefile2
-rw-r--r--package/font-bh-lucidatypewriter-100dpi/Makefile2
-rw-r--r--package/font-bh-lucidatypewriter-75dpi/Makefile2
-rw-r--r--package/font-bh-ttf/Makefile2
-rw-r--r--package/font-bh-type1/Makefile2
-rw-r--r--package/font-bitstream-100dpi/Makefile2
-rw-r--r--package/font-bitstream-75dpi/Makefile2
-rw-r--r--package/font-bitstream-type1/Makefile2
-rw-r--r--package/font-misc-misc/Makefile2
-rw-r--r--package/font-xfree86-type1/Makefile2
-rw-r--r--package/fontconfig/Makefile2
-rw-r--r--package/gcc/Makefile6
-rw-r--r--package/git/Makefile4
-rw-r--r--package/glib/Makefile4
-rw-r--r--package/grep/Makefile24
-rw-r--r--package/jamvm/Makefile2
-rw-r--r--package/libXft/Makefile1
-rw-r--r--package/libpciaccess/Makefile6
-rw-r--r--package/libusb-compat/Makefile6
-rw-r--r--package/libusb/Makefile4
-rw-r--r--package/libxml2/Makefile7
-rw-r--r--package/lvm/Makefile20
-rw-r--r--package/lvm/patches/patch-Makefile_in12
-rw-r--r--package/lvm/patches/patch-doc_Makefile_in13
-rw-r--r--package/lvm/patches/patch-libdm_Makefile_in32
-rw-r--r--package/lvm/patches/patch-tools_Makefile_in37
-rw-r--r--package/moc/Makefile6
-rw-r--r--package/moc/patches/patch-configure12
-rw-r--r--package/moc/patches/patch-options_c11
-rw-r--r--package/mpg123/Makefile4
-rw-r--r--package/mplayer/Makefile4
-rw-r--r--package/mplayer/patches/patch-configure11
-rw-r--r--package/parted/Makefile2
-rw-r--r--package/pkgmaker2
-rw-r--r--package/readline/Makefile8
-rw-r--r--package/rxvt-unicode/Makefile4
-rw-r--r--package/setserial/Makefile2
-rw-r--r--package/setserial/patches/patch-setserial_c10
-rw-r--r--package/shorewall-common/Makefile8
-rw-r--r--package/srelay/Makefile5
-rw-r--r--package/subversion/Makefile8
-rw-r--r--package/tor/Makefile4
-rw-r--r--package/usbutils/Makefile4
-rw-r--r--package/xf86-input-keyboard/Makefile2
-rw-r--r--package/xf86-input-mouse/Makefile2
-rw-r--r--package/xf86-video-fbdev/Makefile25
-rw-r--r--package/xf86-video-siliconmotion/Makefile27
-rw-r--r--package/xorg-server/Makefile12
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h11
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c32
83 files changed, 496 insertions, 473 deletions
diff --git a/package/Config.in b/package/Config.in
index 68c81aad1..29c32ede3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -260,6 +260,7 @@ source "package/libpcap/Config.in"
source "package/libpcap/Config.in.lib"
source "package/libpri/Config.in"
source "package/libpri/Config.in.lib"
+source "package/lvm/Config.in.lib"
source "package/pango/Config.in"
source "package/pcre/Config.in"
source "package/pcre/Config.in.lib"
@@ -551,6 +552,7 @@ source "package/cpufrequtils/Config.in"
source "package/fbset/Config.in"
source "package/file/Config.in"
source "package/findutils/Config.in"
+source "package/grep/Config.in"
source "package/hdparm/Config.in"
source "package/usbutils/Config.in"
source "package/patch/Config.in"
@@ -581,6 +583,8 @@ menu "X server and drivers"
source "package/xorg-server/Config.in"
source "package/xf86-video-cirrus/Config.in"
source "package/xf86-video-geode/Config.in"
+source "package/xf86-video-fbdev/Config.in"
+source "package/xf86-video-siliconmotion/Config.in"
source "package/xf86-input-mouse/Config.in"
source "package/xf86-input-keyboard/Config.in"
source "package/xf86-input-evtouch/Config.in"
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index bebd71ef9..595bae027 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= asterisk
-PKG_VERSION:= 1.6.2.1
+PKG_VERSION:= 1.6.2.5
PKG_RELEASE:= 1
-PKG_MD5SUM:= 8fbc60f9d80e686c749ae95292e225d8
+PKG_MD5SUM:= 9d1f7bcf6833605ced4b2740d14bd576
PKG_DESCR:= Open Source PBX
PKG_SECTION:= net
PKG_MULTI:= 1
diff --git a/package/base-files/src/lib/mdev/init b/package/base-files/src/lib/mdev/init
index d2ae13e9c..de368c80c 100644
--- a/package/base-files/src/lib/mdev/init
+++ b/package/base-files/src/lib/mdev/init
@@ -1,9 +1,4 @@
#!/bin/sh
-if [ "$ACTION" == "add" ];then
- if [ "$DEVPATH" == "/bus/usb" ];then
- mount -t usbfs usbfs /proc/bus/usb
- fi
-fi
if [ "$SUBSYSTEM" == "firmware" ];then
logger "Firmware load for $FIRMWARE requested"
if [ "$ACTION" == "add" ];then
diff --git a/package/base-files/src/sbin/adkupdate b/package/base-files/src/sbin/adkupdate
index bc1082b1c..8a97495ed 100755
--- a/package/base-files/src/sbin/adkupdate
+++ b/package/base-files/src/sbin/adkupdate
@@ -23,7 +23,9 @@ check_exit() {
prepare() {
cd /
- umount -f /etc
+ if [ -x /sbin/cfgfs ];then
+ umount -f /etc
+ fi
mount -o remount,rw /
if [ "$system" == "RB532" ];then
mount -t yaffs2 /dev/mtdblock0 /boot
@@ -77,7 +79,9 @@ case $1 in
esac
sync
-mount -o bind /etc /tmp/.cfgfs/root
+if [ -x /sbin/cfgfs ];then
+ mount -o bind /etc /tmp/.cfgfs/root
+fi
if [ "$system" == "RB532" ];then
umount -f /boot
elif [ "$system" == "FOXG20" ];then
diff --git a/package/bash/Makefile b/package/bash/Makefile
index 82b6c2334..b06ee4991 100644
--- a/package/bash/Makefile
+++ b/package/bash/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= bash
-PKG_VERSION:= 4.0
+PKG_VERSION:= 4.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= a90a1b5a6db4838483f05438e05e8eb9
+PKG_MD5SUM:= 9800d8724815fd84994d9be65ab5e7b8
PKG_DESCR:= Bourne-Again SHell
PKG_SECTION:= shells
PKG_URL:= http://www.gnu.org/software/bash/
diff --git a/package/bind/Makefile b/package/bind/Makefile
index 70ff2f923..eb6eb46da 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= bind
-PKG_VERSION:= 9.6.1-P3
+PKG_VERSION:= 9.7.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= a0952d589b3051538033387be4c983f9
+PKG_MD5SUM:= c245b5d1aa0a4f53d9538faa1efe2c3f
PKG_DESCR:= popular DNS server
PKG_SECTION:= net
PKG_DEPENDS:= libopenssl libbind libxml2
diff --git a/package/bitlbee/patches/patch-lib_Makefile b/package/bitlbee/patches/patch-lib_Makefile
new file mode 100644
index 000000000..8fc2484cc
--- /dev/null
+++ b/package/bitlbee/patches/patch-lib_Makefile
@@ -0,0 +1,20 @@
+--- bitlbee-1.2.4.orig/lib/Makefile 2009-10-17 17:26:46.000000000 +0200
++++ bitlbee-1.2.4/lib/Makefile 2010-03-07 19:58:49.626028152 +0100
+@@ -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 += -Wl,-r -nostdlib
+
+ # [SH] Phony targets
+ all: lib.o
+@@ -32,7 +32,7 @@ distclean: clean $(subdirs)
+
+ lib.o: $(objects) $(subdirs)
+ @echo '*' Linking lib.o
+- @$(LD) $(LFLAGS) $(objects) -o lib.o
++ @$(CC) $(LFLAGS) $(objects) -o lib.o
+
+ $(objects): ../Makefile.settings Makefile
+
diff --git a/package/bitlbee/patches/patch-protocols_Makefile b/package/bitlbee/patches/patch-protocols_Makefile
new file mode 100644
index 000000000..ffb47b391
--- /dev/null
+++ b/package/bitlbee/patches/patch-protocols_Makefile
@@ -0,0 +1,20 @@
+--- bitlbee-1.2.4.orig/protocols/Makefile 2009-10-17 17:26:46.000000000 +0200
++++ bitlbee-1.2.4/protocols/Makefile 2010-03-07 20:02:06.789785295 +0100
+@@ -21,7 +21,7 @@ subdirobjs = $(PROTOOBJS)
+ # Expansion of variables
+ subdirobjs := $(join $(subdirs),$(addprefix /,$(subdirobjs)))
+ CFLAGS += -Wall
+-LFLAGS += -r
++LFLAGS += -Wl,-r -nostdlib
+
+ # [SH] Phony targets
+ all: protocols.o
+@@ -44,7 +44,7 @@ $(subdirs):
+
+ protocols.o: $(objects) $(subdirs)
+ @echo '*' Linking protocols.o
+- @$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
++ @$(CC) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
+
+ $(objects): ../Makefile.settings Makefile
+
diff --git a/package/bitlbee/patches/patch-protocols_jabber_Makefile b/package/bitlbee/patches/patch-protocols_jabber_Makefile
new file mode 100644
index 000000000..b1dc63a0e
--- /dev/null
+++ b/package/bitlbee/patches/patch-protocols_jabber_Makefile
@@ -0,0 +1,17 @@
+--- bitlbee-1.2.4.orig/protocols/jabber/Makefile 2009-10-17 17:26:46.000000000 +0200
++++ bitlbee-1.2.4/protocols/jabber/Makefile 2010-03-07 20:00:36.426039459 +0100
+@@ -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 += -Wl,-r -nostdlib
+
+ # [SH] Phony targets
+ all: jabber_mod.o
+@@ -38,4 +38,4 @@ $(objects): %.o: %.c
+
+ jabber_mod.o: $(objects)
+ @echo '*' Linking jabber_mod.o
+- @$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
++ @$(CC) $(LFLAGS) $(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 000000000..8f634c5f6
--- /dev/null
+++ b/package/bitlbee/patches/patch-protocols_msn_Makefile
@@ -0,0 +1,19 @@
+--- bitlbee-1.2.4.orig/protocols/msn/Makefile 2009-10-17 17:26:46.000000000 +0200
++++ bitlbee-1.2.4/protocols/msn/Makefile 2010-03-07 20:00:17.406036329 +0100
+@@ -12,7 +12,7 @@
+ objects = msn.o msn_util.o ns.o passport.o sb.o tables.o
+
+ CFLAGS += -Wall
+-LFLAGS += -r
++LFLAGS += -Wl,-r -nostdlib
+
+ # [SH] Phony targets
+ all: msn_mod.o
+@@ -38,6 +38,6 @@ $(objects): %.o: %.c
+
+ msn_mod.o: $(objects)
+ @echo '*' Linking msn_mod.o
+- @$(LD) $(LFLAGS) $(objects) -o msn_mod.o
++ @$(CC) $(LFLAGS) $(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 000000000..2d7e0dde0
--- /dev/null
+++ b/package/bitlbee/patches/patch-protocols_oscar_Makefile
@@ -0,0 +1,17 @@
+--- bitlbee-1.2.4.orig/protocols/oscar/Makefile 2009-10-17 17:26:46.000000000 +0200
++++ bitlbee-1.2.4/protocols/oscar/Makefile 2010-03-07 20:00:56.836124250 +0100
+@@ -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 += -Wl,-r -nostdlib
+
+ # [SH] Phony targets
+ all: oscar_mod.o
+@@ -38,4 +38,4 @@ $(objects): %.o: %.c
+
+ oscar_mod.o: $(objects)
+ @echo '*' Linking oscar_mod.o
+- @$(LD) $(LFLAGS) $(objects) -o oscar_mod.o
++ @$(CC) $(LFLAGS) $(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 000000000..4df3cc046
--- /dev/null
+++ b/package/bitlbee/patches/patch-protocols_yahoo_Makefile
@@ -0,0 +1,17 @@
+--- bitlbee-1.2.4.orig/protocols/yahoo/Makefile 2009-10-17 17:26:46.000000000 +0200
++++ bitlbee-1.2.4/protocols/yahoo/Makefile 2010-03-07 20:01:11.066203660 +0100
+@@ -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 += -Wl,-r -nostdlib
+
+ # [SH] Phony targets
+ all: yahoo_mod.o
+@@ -38,4 +38,4 @@ $(objects): %.o: %.c
+
+ yahoo_mod.o: $(objects)
+ @echo '*' Linking yahoo_mod.o
+- @$(LD) $(LFLAGS) $(objects) -o yahoo_mod.o
++ @$(CC) $(LFLAGS) $(objects) -o yahoo_mod.o
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index ab50a5aec..400be01e6 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= busybox
PKG_VERSION:= 1.15.2
-PKG_RELEASE:= 3
+PKG_RELEASE:= 4
PKG_MD5SUM:= 495e320537f0772125f2db3c098e437c
PKG_DESCR:= Core utilities for embedded Linux systems
PKG_SECTION:= base
@@ -16,9 +16,9 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIG_STYLE:= manual
-BUILD_STYLE:= manual
-INSTALL_STYLE:= manual
+CONFIG_STYLE:= manual
+BUILD_STYLE:= manual
+INSTALL_STYLE:= manual
${TOPDIR}/.busyboxcfg: ${TOPDIR}/.config
grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
@@ -32,31 +32,31 @@ do-configure: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
ifeq ($(ADK_NATIVE),y)
yes '' | \
$(MAKE) V=1 \
- IPKG_ARCH="$(ARCH)" \
+ IPKG_ARCH="$(CPU_ARCH)" \
ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
else
yes '' | \
$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
- EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(ARCH)" \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(CPU_ARCH)" \
ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
endif
do-build: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
ifeq ($(ADK_NATIVE),y)
$(MAKE) V=1 \
- IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
+ IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
else
$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
- IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
+ IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
endif
do-install: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config
ifeq ($(ADK_NATIVE),y)
$(MAKE) V=1 \
- IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
+ IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
else
$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
- IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
+ IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
endif
$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
ifeq ($(ADK_DEBUG),y)
diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in
index ba2e5f557..1a1e0f4d5 100644
--- a/package/busybox/config/findutils/Config.in
+++ b/package/busybox/config/findutils/Config.in
@@ -182,7 +182,8 @@ config BUSYBOX_FEATURE_FIND_CONTEXT
config BUSYBOX_GREP
bool "grep"
- default y
+ default y if !ADK_PACKAGE_GREP
+ depends on !ADK_PACKAGE_GREP
help
grep is used to search files for a specified pattern.
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index 01020bde9..5951e8dec 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -283,6 +283,7 @@ config BUSYBOX_HD
config BUSYBOX_HWCLOCK
bool "hwclock"
+ default y if ADK_TARGET_WITH_RTC
default n
help
The hwclock utility is used to read and set the hardware clock
diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile
index c9298e15d..b82e67e51 100644
--- a/package/cryptinit/Makefile
+++ b/package/cryptinit/Makefile
@@ -6,13 +6,15 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= cryptinit
PKG_VERSION:= 1.0.2
PKG_RELEASE:= 1
-PKG_BUILDDEP+= cryptsetup
+PKG_BUILDDEP+= cryptsetup lvm
PKG_DESCR:= init for encrypted rootfilesystem
PKG_SECTION:= base
WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
NO_DISTFILES:= 1
+CFLINE_CRYPTINIT:= depends on ADK_TARGET_ROOTFS_ENCRYPTED
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,CRYPTINIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index 4d8973482..4b23156ef 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= cryptsetup
-PKG_VERSION:= 1.1.0
+PKG_VERSION:= 1.0.7
PKG_RELEASE:= 1
-PKG_MD5SUM:= 8177f1833f4d6aaacc5812046d2010b6
+PKG_MD5SUM:= 5eea2a77391a8a1a651b31cbaef59e22
PKG_DESCR:= LUKS cryptsetup tools
PKG_SECTION:= crypto
PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt \
@@ -24,7 +24,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_ARGS+= --disable-selinux
+CONFIGURE_ARGS+= --disable-selinux --disable-static
post-install:
${INSTALL_DIR} ${IDIR_CRYPTSETUP}/usr/sbin ${IDIR_CRYPTSETUP}/usr/lib
diff --git a/package/cryptsetup/patches/patch-Makefile_in b/package/cryptsetup/patches/patch-Makefile_in
deleted file mode 100644
index 828b25c11..000000000
--- a/package/cryptsetup/patches/patch-Makefile_in
+++ /dev/null
@@ -1,58 +0,0 @@
---- cryptsetup-1.1.0.orig/Makefile.in 2010-01-17 11:29:23.000000000 +0100
-+++ cryptsetup-1.1.0/Makefile.in 2010-02-16 20:32:36.876861682 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -323,7 +323,7 @@ distclean-libtool:
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -348,7 +348,7 @@ $(RECURSIVE_TARGETS):
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -512,7 +512,8 @@ distdir: $(DISTFILES)
- fi; \
- done
- -test -n "$(am__skip_mode_fix)" \
-- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+ || find "$(distdir)" -type d ! -perm -755 \
-+ -exec chmod u+rwx,go+rx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -556,17 +557,17 @@ dist dist-all: distdir
- distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
-- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
-- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.xz*) \
- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
diff --git a/package/cryptsetup/patches/patch-configure b/package/cryptsetup/patches/patch-configure
deleted file mode 100644
index be8bf3375..000000000
--- a/package/cryptsetup/patches/patch-configure
+++ /dev/null
@@ -1,175 +0,0 @@
---- cryptsetup-1.1.0.orig/configure 2010-01-17 11:29:24.000000000 +0100
-+++ cryptsetup-1.1.0/configure 2010-02-16 20:32:36.868858986 +0100
-@@ -894,7 +894,6 @@ enable_nls
- enable_rpath
- with_libiconv_prefix
- with_libintl_prefix
--enable_shared_library
- enable_selinux
- with_plain_hash
- with_plain_cipher
-@@ -1543,7 +1542,7 @@ Optional Features:
- --disable-largefile omit support for large files
- --disable-nls do not use Native Language Support
- --disable-rpath do not hardcode runtime library paths
-- --disable-shared-library
-+ --disable-shared
- disable building of shared cryptsetup library
- --disable-selinux disable selinux support [default=auto]
-
-@@ -5966,13 +5965,13 @@ if test "${lt_cv_nm_interface+set}" = se
- else
- lt_cv_nm_interface="BSD nm"
- echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:5969: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:5968: $ac_compile\"" >&5)
- (eval "$ac_compile" 2>conftest.err)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:5972: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:5971: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:5975: output\"" >&5)
-+ (eval echo "\"\$as_me:5974: output\"" >&5)
- cat conftest.out >&5
- if $GREP 'External.*some_variable' conftest.out > /dev/null; then
- lt_cv_nm_interface="MS dumpbin"
-@@ -7177,7 +7176,7 @@ ia64-*-hpux*)
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 7180 "configure"' > conftest.$ac_ext
-+ echo '#line 7179 "configure"' > conftest.$ac_ext
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -8409,11 +8408,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8412: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8411: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8416: \$? = $ac_status" >&5
-+ echo "$as_me:8415: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -8748,11 +8747,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8751: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8750: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8755: \$? = $ac_status" >&5
-+ echo "$as_me:8754: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -8853,11 +8852,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8856: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8855: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8860: \$? = $ac_status" >&5
-+ echo "$as_me:8859: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -8908,11 +8907,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8911: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8910: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8915: \$? = $ac_status" >&5
-+ echo "$as_me:8914: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -11292,7 +11291,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 11295 "configure"
-+#line 11294 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -11388,7 +11387,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 11391 "configure"
-+#line 11390 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -14409,14 +14408,14 @@ POPT_LIBS=$LIBS
- LIBS=$saved_LIBS
-
-
--# Check whether --enable-shared-library was given.
--if test "${enable_shared_library+set}" = set; then :
-- enableval=$enable_shared_library;
-+# Check whether --enable-shared was given.
-+if test "${enable_shared+set}" = set; then :
-+ enableval=$enable_shared;
- else
-- enable_shared_library=yes
-+ enable_shared=yes
- fi
-
-- if test x$enable_shared_library = xno; then
-+ if test x$enable_shared = xno; then
- STATIC_LIBRARY_TRUE=
- STATIC_LIBRARY_FALSE='#'
- else
-@@ -14619,7 +14618,7 @@ _ACEOF
-
- fi
-
-- if test x$enable_static = xyes; then
-+ if test x$enable_static_cryptsetup = xyes; then
- SELINUX_STATIC_LIBS=$LIBS
- # Check if we need -pthread with --enable-static and selinux
- saved_LIBS2=$LIBS
-@@ -14684,7 +14683,7 @@ fi
- fi
- fi
-
--if test x$enable_static = xyes; then
-+if test x$enable_static_cryptsetup = xyes; then
- saved_LIBS2=$LIBS
- LIBS="$LIBS -static"
- # Check if it there is still not some missing dependency like static selinux libs
-@@ -14916,7 +14915,7 @@ fi
-
-
-
-- if test x$enable_static = xyes; then
-+ if test x$enable_static_cryptsetup = xyes; then
- STATIC_CRYPTSETUP_TRUE=
- STATIC_CRYPTSETUP_FALSE='#'
- else
-@@ -14924,7 +14923,7 @@ else
- STATIC_CRYPTSETUP_FALSE=
- fi
-
-- if test x$enable_static = xno; then
-+ if test x$enable_static_cryptsetup = xno; then
- DYNAMIC_CRYPTSETUP_TRUE=
- DYNAMIC_CRYPTSETUP_FALSE='#'
- else
diff --git a/package/cryptsetup/patches/patch-configure_in b/package/cryptsetup/patches/patch-configure_in
deleted file mode 100644
index 6d88412f5..000000000
--- a/package/cryptsetup/patches/patch-configure_in
+++ /dev/null
@@ -1,47 +0,0 @@
---- cryptsetup-1.1.0.orig/configure.in 2010-01-17 11:26:31.000000000 +0100
-+++ cryptsetup-1.1.0/configure.in 2010-02-16 20:32:36.868858986 +0100
-@@ -62,11 +62,11 @@ LIBS=$saved_LIBS
-
- dnl ==========================================================================
-
--AC_ARG_ENABLE(shared-library,
--[ --disable-shared-library
-+AC_ARG_ENABLE(shared,
-+[ --disable-shared
- disable building of shared cryptsetup library],,
--enable_shared_library=yes)
--AM_CONDITIONAL(STATIC_LIBRARY, test x$enable_shared_library = xno)
-+enable_shared=yes)
-+AM_CONDITIONAL(STATIC_LIBRARY, test x$enable_shared = xno)
-
- AC_ARG_ENABLE(selinux,
- [ --disable-selinux disable selinux support [[default=auto]]],[], [])
-@@ -80,7 +80,7 @@ LIBS=$saved_LIBS
- if test "x$enable_selinux" != xno; then
- AC_CHECK_LIB(sepol, sepol_bool_set)
- AC_CHECK_LIB(selinux, is_selinux_enabled)
-- if test x$enable_static = xyes; then
-+ if test x$enable_static_cryptsetup = xyes; then
- SELINUX_STATIC_LIBS=$LIBS
- # Check if we need -pthread with --enable-static and selinux
- saved_LIBS2=$LIBS
-@@ -91,7 +91,7 @@ if test "x$enable_selinux" != xno; then
- fi
- fi
-
--if test x$enable_static = xyes; then
-+if test x$enable_static_cryptsetup = xyes; then
- saved_LIBS2=$LIBS
- LIBS="$LIBS -static"
- # Check if it there is still not some missing dependency like static selinux libs
-@@ -135,8 +135,8 @@ CS_NUM_WITH([luks1-keybits],[key length
-
- dnl ==========================================================================
-
--AM_CONDITIONAL(STATIC_CRYPTSETUP, test x$enable_static = xyes)
--AM_CONDITIONAL(DYNAMIC_CRYPTSETUP, test x$enable_static = xno)
-+AM_CONDITIONAL(STATIC_CRYPTSETUP, test x$enable_static_cryptsetup = xyes)
-+AM_CONDITIONAL(DYNAMIC_CRYPTSETUP, test x$enable_static_cryptsetup = xno)
-
- dnl ==========================================================================
-
diff --git a/package/cryptsetup/patches/patch-lib_Makefile_in b/package/cryptsetup/patches/patch-lib_Makefile_in
deleted file mode 100644
index 812950459..000000000
--- a/package/cryptsetup/patches/patch-lib_Makefile_in
+++ /dev/null
@@ -1,8 +0,0 @@
---- cryptsetup-1.1.0.orig/lib/Makefile.in 2010-01-17 11:29:22.000000000 +0100
-+++ cryptsetup-1.1.0/lib/Makefile.in 2010-02-16 20:32:36.872861451 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/package/cryptsetup/patches/patch-lib_setup_c b/package/cryptsetup/patches/patch-lib_setup_c
new file mode 100644
index 000000000..97b356f68
--- /dev/null
+++ b/package/cryptsetup/patches/patch-lib_setup_c
@@ -0,0 +1,17 @@
+already added in svn upstream
+--- cryptsetup-1.0.7.orig/lib/setup.c 2009-07-22 13:12:44.000000000 +0200
++++ cryptsetup-1.0.7/lib/setup.c 2009-08-22 15:10:32.000000000 +0200
+@@ -542,7 +542,12 @@ static int __crypt_luks_open(int arg, st
+ start:
+ mk=NULL;
+
+- if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
++ if(options->passphrase) {
++ passwordLen = strlen(options->passphrase);
++ password = safe_alloc(passwordLen + 1);
++ strncpy(password, options->passphrase, passwordLen + 1);
++ tries = 0;
++ } else if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
+ tries--;
+ else
+ tries = 0;
diff --git a/package/cryptsetup/patches/patch-luks_Makefile_in b/package/cryptsetup/patches/patch-luks_Makefile_in
deleted file mode 100644
index 208b1f396..000000000
--- a/package/cryptsetup/patches/patch-luks_Makefile_in
+++ /dev/null
@@ -1,8 +0,0 @@
---- cryptsetup-1.1.0.orig/luks/Makefile.in 2010-01-17 11:29:22.000000000 +0100
-+++ cryptsetup-1.1.0/luks/Makefile.in 2010-02-16 20:32:36.876861682 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/package/cryptsetup/patches/patch-man_Makefile_in b/package/cryptsetup/patches/patch-man_Makefile_in
deleted file mode 100644
index 66fdcb7cf..000000000
--- a/package/cryptsetup/patches/patch-man_Makefile_in
+++ /dev/null
@@ -1,8 +0,0 @@
---- cryptsetup-1.1.0.orig/man/Makefile.in 2010-01-17 11:29:23.000000000 +0100
-+++ cryptsetup-1.1.0/man/Makefile.in 2010-02-16 20:32:36.880860794 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/package/cryptsetup/patches/patch-src_Makefile_in b/package/cryptsetup/patches/patch-src_Makefile_in
deleted file mode 100644
index 6c0b0096f..000000000
--- a/package/cryptsetup/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,8 +0,0 @@
---- cryptsetup-1.1.0.orig/src/Makefile.in 2010-01-17 11:29:23.000000000 +0100
-+++ cryptsetup-1.1.0/src/Makefile.in 2010-02-16 20:32:36.880860794 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/package/cryptsetup/patches/patch-tests_Makefile_in b/package/cryptsetup/patches/patch-tests_Makefile_in
deleted file mode 100644
index 30e05580d..000000000
--- a/package/cryptsetup/patches/patch-tests_Makefile_in
+++ /dev/null
@@ -1,8 +0,0 @@
---- cryptsetup-1.1.0.orig/tests/Makefile.in 2010-01-17 11:29:23.000000000 +0100
-+++ cryptsetup-1.1.0/tests/Makefile.in 2010-02-16 20:32:36.888860137 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/package/cvs/patches/patch-lib_getline_c b/package/cvs/patches/patch-lib_getline_c
new file mode 100644
index 000000000..c522c6a0a
--- /dev/null
+++ b/package/cvs/patches/patch-lib_getline_c
@@ -0,0 +1,11 @@
+--- cvs-1.11.23.orig/lib/getline.c 2005-04-04 22:46:05.000000000 +0200
++++ cvs-1.11.23/lib/getline.c 2010-03-07 20:38:26.117286460 +0100
+@@ -155,7 +155,7 @@ getstr (lineptr, n, stream, terminator,
+ }
+
+ int
+-getline (lineptr, n, stream)
++get_line (lineptr, n, stream)
+ char **lineptr;
+ size_t *n;
+ FILE *stream;
diff --git a/package/cvs/patches/patch-lib_getline_h b/package/cvs/patches/patch-lib_getline_h
new file mode 100644
index 000000000..33e01c6bd
--- /dev/null
+++ b/package/cvs/patches/patch-lib_getline_h
@@ -0,0 +1,11 @@
+--- cvs-1.11.23.orig/lib/getline.h 2005-04-04 22:46:05.000000000 +0200
++++ cvs-1.11.23/lib/getline.h 2010-03-07 20:38:36.898630307 +0100
+@@ -12,7 +12,7 @@
+ #define GETLINE_NO_LIMIT -1
+
+ int
+- getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
++ get_line __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
+ int
+ getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
+ int limit));
diff --git a/package/elinks/Makefile b/package/elinks/Makefile
index b2d0c6014..a555a5db6 100644
--- a/package/elinks/Makefile
+++ b/package/elinks/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= elinks
PKG_VERSION:= 0.11.7
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 145c510cae41c204d0f23dce4bdd23ab
PKG_DESCR:= advanced text web browser
PKG_SECTION:= text
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+= --enable-small \
--without-spidermonkey \
--without-x \
--without-zlib
-MAKE_FLAGS+= CC='${TARGET_CC}' LD='${TARGET_LD}'
+MAKE_FLAGS+= CC='${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 000000000..122e6c13d
--- /dev/null
+++ b/package/elinks/patches/patch-Makefile_lib
@@ -0,0 +1,11 @@
+--- elinks-0.11.7.orig/Makefile.lib 2009-08-22 13:15:08.000000000 +0200
++++ elinks-0.11.7/Makefile.lib 2010-03-06 11:28:58.000000000 +0100
+@@ -43,7 +43,7 @@ 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 = $(CC) -Wl,-r -nostdlib -o $@ $(filter $(OBJS), $^) \
+ $(foreach subdir,$(sort $(filter-out src,$(SUBDIRS))), \
+ `test -e $(subdir)/$(LIB_O_NAME) && echo $(subdir)/$(LIB_O_NAME)`)
+
diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile
index d41034333..1e97fa654 100644
--- a/package/font-adobe-100dpi/Makefile
+++ b/package/font-adobe-100dpi/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP+= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_ADOBE_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile
index 2af0aa60c..a59275335 100644
--- a/package/font-adobe-75dpi/Makefile
+++ b/package/font-adobe-75dpi/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP+= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_ADOBE_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bh-100dpi/Makefile b/package/font-bh-100dpi/Makefile
index e70fb4810..3accee27e 100644
--- a/package/font-bh-100dpi/Makefile
+++ b/package/font-bh-100dpi/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BH_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bh-75dpi/Makefile b/package/font-bh-75dpi/Makefile
index e3e3aa3d4..04e6f1a25 100644
--- a/package/font-bh-75dpi/Makefile
+++ b/package/font-bh-75dpi/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BH_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bh-lucidatypewriter-100dpi/Makefile b/package/font-bh-lucidatypewriter-100dpi/Makefile
index 9d8635e55..be19a95d1 100644
--- a/package/font-bh-lucidatypewriter-100dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-100dpi/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BH_LUCIDATYPEWRITER_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bh-lucidatypewriter-75dpi/Makefile b/package/font-bh-lucidatypewriter-75dpi/Makefile
index a84ebb107..cfb5b1892 100644
--- a/package/font-bh-lucidatypewriter-75dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-75dpi/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BH_LUCIDATYPEWRITER_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bh-ttf/Makefile b/package/font-bh-ttf/Makefile
index 5d816443f..12582a873 100644
--- a/package/font-bh-ttf/Makefile
+++ b/package/font-bh-ttf/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BH_TTF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bh-type1/Makefile b/package/font-bh-type1/Makefile
index 81ff1c74c..122a0a9a4 100644
--- a/package/font-bh-type1/Makefile
+++ b/package/font-bh-type1/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BH_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bitstream-100dpi/Makefile b/package/font-bitstream-100dpi/Makefile
index efb8e66a2..56869767b 100644
--- a/package/font-bitstream-100dpi/Makefile
+++ b/package/font-bitstream-100dpi/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BITSTREAM_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bitstream-75dpi/Makefile b/package/font-bitstream-75dpi/Makefile
index 6a7dcae13..07b3edfd5 100644
--- a/package/font-bitstream-75dpi/Makefile
+++ b/package/font-bitstream-75dpi/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BITSTREAM_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-bitstream-type1/Makefile b/package/font-bitstream-type1/Makefile
index 4672b2463..a6618b5e0 100644
--- a/package/font-bitstream-type1/Makefile
+++ b/package/font-bitstream-type1/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_BITSTREAM_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-misc-misc/Makefile b/package/font-misc-misc/Makefile
index 1c16cf0c5..f60f867ad 100644
--- a/package/font-misc-misc/Makefile
+++ b/package/font-misc-misc/Makefile
@@ -13,6 +13,8 @@ PKG_BUILDDEP+= font-util
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_MISC_MISC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/font-xfree86-type1/Makefile b/package/font-xfree86-type1/Makefile
index 41e6c0d34..74f1a8aef 100644
--- a/package/font-xfree86-type1/Makefile
+++ b/package/font-xfree86-type1/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:= x11
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_XFREE86_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile
index 2c6b18a65..0a1bee2dd 100644
--- a/package/fontconfig/Makefile
+++ b/package/fontconfig/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 77e15a92006ddc2adbb06f840d591c0e
PKG_DESCR:= fontconfig
PKG_SECTION:= libs
+PKG_DEPENDS:= libxml2
+PKG_BUILDDEP+= freetype libxml2
PKG_URL:= http://fontconfig.org
PKG_SITES:= http://fontconfig.org/release/
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 3c6e0b701..4de63c4f7 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -11,15 +11,15 @@ PKG_DEPENDS:= libgmp mpfr
PKG_BUILDDEP+= gmp mpfr
ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
-PKG_DEPENDS:= uclibc-dev
+PKG_DEPENDS+= uclibc-dev
PKG_BUILDDEP+= uclibc
endif
ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
-PKG_DEPENDS:= eglibc-dev
+PKG_DEPENDS+= eglibc-dev
PKG_BUILDDEP+= eglibc
endif
ifeq ($(ADK_TARGET_LIB_GLIBC),y)
-PKG_DEPENDS:= glibc-dev
+PKG_DEPENDS+= glibc-dev
PKG_BUILDDEP+= glibc
endif
diff --git a/package/git/Makefile b/package/git/Makefile
index 4fb5abf26..fb9f114a3 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= git
-PKG_VERSION:= 1.6.6
+PKG_VERSION:= 1.7.0.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 08af805fd59f68d9ad00a2f878cf820e
+PKG_MD5SUM:= 05485caf5c503ce378a87759bc3a0509
PKG_DESCR:= fast version control system
PKG_SECTION:= scm
PKG_DEPENDS:= libopenssl libcurl libexpat libpthread
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 8d1430ea7..4db94344a 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= glib
-PKG_VERSION:= 2.22.2
+PKG_VERSION:= 2.22.3
PKG_RELEASE:= 1
-PKG_MD5SUM:= 00eb873975e2ef9361b8177131c7c943
+PKG_MD5SUM:= e699a93d62c01e0ee07caef3e11eddd8
PKG_DESCR:= low-level core library that forms the basis of GTK+
PKG_SECTION:= libs
PKG_DEPENDS:= gettext libiconv libpthread
diff --git a/package/grep/Makefile b/package/grep/Makefile
new file mode 100644
index 000000000..6f2eba00e
--- /dev/null
+++ b/package/grep/Makefile
@@ -0,0 +1,24 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= grep
+PKG_VERSION:= 2.5.4
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 92258031d98d4f12dfc6a6d24057e672
+PKG_DESCR:= global search for a regular expression and print out matched lines
+PKG_SECTION:= text
+PKG_URL:= http://www.gnu.org/software/grep/
+PKG_SITES:= ftp://ftp.gnu.org/gnu/grep/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GREP,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_GREP)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/grep \
+ $(IDIR_GREP)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index 0a734af58..6f7262dc5 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP+= libffi zlib
PKG_URL:= http://jamvm.sourceforge.net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/}
-PKG_TARGET_DEPENDS:= !foxboard
+PKG_TARGET_DEPENDS:= !foxboard !lemote
include ${TOPDIR}/mk/package.mk
diff --git a/package/libXft/Makefile b/package/libXft/Makefile
index 03a06ab75..c9e990ab2 100644
--- a/package/libXft/Makefile
+++ b/package/libXft/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 0a1e129b1d8b2d3905dc02a64255b781
PKG_DESCR:= X FreeType library
PKG_SECTION:= x11
+PKG_BUILDDEP+= libXrender
PKG_SITES:= ${MASTER_SITE_XORG}
include $(TOPDIR)/mk/package.mk
diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile
index 9fe0cd9ef..3b4e9a2b0 100644
--- a/package/libpciaccess/Makefile
+++ b/package/libpciaccess/Makefile
@@ -4,12 +4,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libpciaccess
-PKG_VERSION:= 0.10.9
+PKG_VERSION:= 0.11.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= 5dad6221c2766d5a727ef32e83a0a878
+PKG_MD5SUM:= 8f7ea197384e5ddd1c355f55e639f677
PKG_DESCR:= X.org libpciaccess library
PKG_SECTION:= x11
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/
include $(TOPDIR)/mk/package.mk
diff --git a/package/libusb-compat/Makefile b/package/libusb-compat/Makefile
index d10c06083..ce41c1d1d 100644
--- a/package/libusb-compat/Makefile
+++ b/package/libusb-compat/Makefile
@@ -4,10 +4,10 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= libusb-compat
-PKG_VERSION:= 0.1.1
+PKG_VERSION:= 0.1.3
PKG_RELEASE:= 1
-PKG_MD5SUM:= 32c775b97da7a11c6be7c487a0c9fc00
-PKG_DESCR:= a Library for accessing Linux USB devices
+PKG_MD5SUM:= 570ac2ea085b80d1f74ddc7c6a93c0eb
+PKG_DESCR:= a library for accessing Linux USB devices
PKG_SECTION:= libs
PKG_BUILDDEP+= libusb
PKG_URL:= http://libusb.wiki.sourceforge.net
diff --git a/package/libusb/Makefile b/package/libusb/Makefile
index a5dec2885..8b68fdb79 100644
--- a/package/libusb/Makefile
+++ b/package/libusb/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= libusb
-PKG_VERSION:= 1.0.3
+PKG_VERSION:= 1.0.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= 03af26d0c49705fa46c1f732e1018e73
+PKG_MD5SUM:= 818c7c02112a53e0c182666ee83f2057
PKG_DESCR:= a library for accessing Linux USB devices
PKG_SECTION:= libs
PKG_URL:= http://libusb.wiki.sourceforge.net
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index c6a911370..511663c2b 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -4,16 +4,15 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= libxml2
-PKG_VERSION:= 2.7.3
+PKG_VERSION:= 2.7.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= 8f4fda3969237c2a33bdb1583b5d06b2
+PKG_MD5SUM:= 7740a8ec23878a2f50120e1faa2730f2
PKG_DESCR:= XML C parser and toolkit
PKG_SECTION:= libs
PKG_DEPENDS:= zlib
PKG_BUILDDEP+= zlib
PKG_URL:= http://www.xmlsoft.org/
-PKG_SITES:= http://xmlsoft.org/sources/ \
- ftp://fr.rpmfind.net/pub/libxml/
+PKG_SITES:= http://xmlsoft.org/sources/
include ${TOPDIR}/mk/package.mk
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index d67bbc43e..5013b1645 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -4,16 +4,17 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= lvm
-PKG_VERSION:= 2.02.51
+PKG_VERSION:= 2.02.61
PKG_RELEASE:= 1
-PKG_MD5SUM:= 725d07794007e021bfc592b1636100c7
+PKG_MD5SUM:= 0fdac768c78d96525d47b5a3df4c67de
PKG_DESCR:= logical volume management
PKG_SECTION:= misc
-PKG_DEPENDS:= device-mapper libncurses
+PKG_DEPENDS:= libdevmapper libncurses
PKG_URL:= http://sourceware.org/lvm2/
PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/
-PKG_DESCR_DM:= device-mapper library and utility
+PKG_DESCR_DM:= device-mapper utility
+PKG_DESCR_LIBDM:= device-mapper library
DISTFILES:= LVM2.${PKG_VERSION}.tgz
WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION}
@@ -21,6 +22,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_DM},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIBDM},${PKG_SECTION}))
CONFIGURE_ARGS+= --with-user="" --with-group="" \
--with-optimisation="" \
@@ -30,12 +32,14 @@ post-install:
# lvm
${INSTALL_DIR} ${IDIR_LVM}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/lvm ${IDIR_LVM}/usr/sbin/lvm
- # device-mapper
- ${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin ${IDIR_DEVICE_MAPPER}/usr/lib
+ # libdevmapper
+ ${INSTALL_DIR} ${IDIR_LIBDEVMAPPER}/usr/lib
${CP} ${WRKINST}/usr/lib/libdevmapper.so* \
- ${IDIR_DEVICE_MAPPER}/usr/lib
+ ${IDIR_LIBDEVMAPPER}/usr/lib
+ chmod u+w ${IDIR_LIBDEVMAPPER}/usr/lib/*.so*
+ # device-mapper
+ ${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \
${IDIR_DEVICE_MAPPER}/usr/sbin
- chmod u+w ${IDIR_DEVICE_MAPPER}/usr/lib/*.so*
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in
index d0e22571f..fd15b0060 100644
--- a/package/lvm/patches/patch-Makefile_in
+++ b/package/lvm/patches/patch-Makefile_in
@@ -1,15 +1,15 @@
---- LVM2.2.02.51.orig/Makefile.in 2009-07-31 13:49:53.000000000 +0200
-+++ LVM2.2.02.51/Makefile.in 2009-08-22 15:24:06.000000000 +0200
-@@ -16,7 +16,7 @@ srcdir = @srcdir@
- top_srcdir = @top_srcdir@
+--- LVM2.2.02.61.orig/Makefile.in 2009-10-02 21:10:31.000000000 +0200
++++ LVM2.2.02.61/Makefile.in 2010-03-03 19:43:58.976123551 +0100
+@@ -17,7 +17,7 @@ top_srcdir = @top_srcdir@
+ top_builddir = @top_builddir@
VPATH = @srcdir@
-SUBDIRS = doc include man scripts
-+SUBDIRS = doc include
++SUBDIRS = include
ifeq ("@UDEV_RULES@", "yes")
SUBDIRS += udev
-@@ -60,7 +60,7 @@ po: tools daemons
+@@ -64,7 +64,7 @@ po: tools daemons
libdm.device-mapper: include.device-mapper
daemons.device-mapper: libdm.device-mapper
tools.device-mapper: libdm.device-mapper
diff --git a/package/lvm/patches/patch-doc_Makefile_in b/package/lvm/patches/patch-doc_Makefile_in
deleted file mode 100644
index 381e0ceea..000000000
--- a/package/lvm/patches/patch-doc_Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
-bsd compatibility
---- LVM2.2.02.51.orig/doc/Makefile.in 2009-05-11 12:28:46.000000000 +0200
-+++ LVM2.2.02.51/doc/Makefile.in 2009-08-22 15:24:06.000000000 +0200
-@@ -23,7 +23,8 @@ include $(top_srcdir)/make.tmpl
- install_lvm2:
- @if [ ! -e $(confdir)/$(CONFDEST) ]; then \
- echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \
-- @INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
-+ @INSTALL@ -d $(confdir); \
-+ @INSTALL@ $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
- $(confdir)/$(CONFDEST); \
- fi
-
diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in
index 0a7799b33..52a52a0fd 100644
--- a/package/lvm/patches/patch-libdm_Makefile_in
+++ b/package/lvm/patches/patch-libdm_Makefile_in
@@ -1,41 +1,42 @@
-always install static library
---- LVM2.2.02.51.orig/libdm/Makefile.in Wed Apr 8 16:04:35 2009
-+++ LVM2.2.02.51/libdm/Makefile.in Mon Feb 15 23:25:01 2010
-@@ -34,9 +34,9 @@ SOURCES =\
+--- LVM2.2.02.61.orig/libdm/Makefile.in 2009-10-02 21:10:36.000000000 +0200
++++ LVM2.2.02.61/libdm/Makefile.in 2010-03-08 06:27:03.000000000 +0100
+@@ -35,9 +35,7 @@ SOURCES =\
- INCLUDES = -I$(interface) -I.
+ INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir)
-ifeq ("@STATIC_LINK@", "yes")
-+#ifeq ("@STATIC_LINK@", "yes")
LIB_STATIC = $(interface)/libdevmapper.a
-endif
-+#endif
ifeq ("@LIB_SUFFIX@","dylib")
LIB_SHARED = $(interface)/libdevmapper.dylib
-@@ -59,9 +59,9 @@ device-mapper: all
+@@ -60,9 +58,7 @@ device-mapper: all
INSTALL_TYPE = install_dynamic
-ifeq ("@STATIC_LINK@", "yes")
-+#ifeq ("@STATIC_LINK@", "yes")
- INSTALL_TYPE += install_static
+- INSTALL_TYPE += install_static
-endif
-+#endif
++INSTALL_TYPE += install_static
ifeq ("@PKGCONFIG@", "yes")
INSTALL_TYPE += install_pkgconfig
-@@ -72,7 +72,8 @@ install: $(INSTALL_TYPE) install_include
+@@ -73,26 +69,32 @@ install: $(INSTALL_TYPE) install_include
install_device-mapper: install
install_include:
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \
+ $(INSTALL) -d $(includedir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 444 libdevmapper.h \
++ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \
$(includedir)/libdevmapper.h
install_dynamic: install_@interface@
-@@ -83,15 +84,17 @@ install_static: install_@interface@_static
++ $(INSTALL) -d $(libdir)
+ $(LN_S) -f libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM) \
+ $(libdir)/libdevmapper.$(LIB_SUFFIX)
+
+ install_static: install_@interface@_static
++ $(INSTALL) -d $(libdir)
$(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a
install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
@@ -52,6 +53,7 @@ always install static library
install_ioctl_static: ioctl/libdevmapper.a
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
++ $(INSTALL) -d $(libdir)
+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
$(libdir)/libdevmapper.a.$(LIB_VERSION_DM)
diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in
index 8d6e49a3f..ae6fcbf8f 100644
--- a/package/lvm/patches/patch-tools_Makefile_in
+++ b/package/lvm/patches/patch-tools_Makefile_in
@@ -1,33 +1,28 @@
---- LVM2.2.02.51.orig/tools/Makefile.in Thu May 21 13:11:29 2009
-+++ LVM2.2.02.51/tools/Makefile.in Mon Feb 15 23:30:04 2010
-@@ -137,7 +137,7 @@ liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
-
- .commands: commands.h cmdnames.h Makefile
- $(CC) -E -P cmdnames.h 2> /dev/null | \
-- egrep -v '^ *(|#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands
-+ egrep -v '^ *\(|#.*|dumpconfig|formats|help|pvdata|segtypes|version\) *$$' > .commands
-
- .PHONY: install_cmdlib_dynamic install_cmdlib_static \
- install_tools_dynamic install_tools_static
-@@ -160,21 +160,24 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.rtree lvm.rxref
+--- LVM2.2.02.61.orig/tools/Makefile.in 2010-01-19 02:10:47.000000000 +0100
++++ LVM2.2.02.61/tools/Makefile.in 2010-03-03 19:46:06.396138753 +0100
+@@ -165,21 +165,26 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.r
endif
install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ $(INSTALL) -d $(libdir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
$(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)
$(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) $(libdir)/liblvm2cmd.$(LIB_SUFFIX)
- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
++ $(INSTALL) -d $(includedir)
++ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
$(includedir)/lvm2cmd.h
install_cmdlib_static: liblvm2cmd-static.a
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ $(INSTALL) -d $(libdir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
$(libdir)/liblvm2cmd.a.$(LIB_VERSION)
$(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
++ $(INSTALL) -d $(includedir)
++ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
$(includedir)/lvm2cmd.h
install_tools_dynamic: lvm .commands
@@ -37,13 +32,13 @@
$(sbindir)/lvm
@echo Creating symbolic links for individual commands in $(sbindir)
@( \
-@@ -185,14 +188,17 @@ install_tools_dynamic: lvm .commands
+@@ -190,14 +195,17 @@ install_tools_dynamic: lvm .commands
)
install_tools_static: lvm.static
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ $(INSTALL) -d $(sbindir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
$(staticdir)/lvm.static
install_dmsetup_dynamic: dmsetup
diff --git a/package/moc/Makefile b/package/moc/Makefile
index 3aa1a16f7..77cd7cf7c 100644
--- a/package/moc/Makefile
+++ b/package/moc/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= moc
-PKG_VERSION:= 2.4.4
+PKG_VERSION:= 2.5.0-alpha4
PKG_RELEASE:= 1
-PKG_MD5SUM:= 647c770a5542a4ae5437386807a89796
+PKG_MD5SUM:= 2dd0cb6481d77fda09c58ec3154a21c0
PKG_DESCR:= console music player
PKG_SECTION:= sound
PKG_DEPENDS:= libmad libvorbis libcurl libflac ffmpeg libiconv
@@ -14,7 +14,7 @@ PKG_DEPENDS+= libncurses libid3tag
PKG_BUILDDEP+= ncurses libvorbis curl libmad flac ffmpeg libiconv
PKG_BUILDDEP+= libid3tag
PKG_URL:= http://moc.daper.net
-PKG_SITES:= ftp://ftp.daper.net/pub/soft/moc/stable/
+PKG_SITES:= ftp://ftp.daper.net/pub/soft/moc/unstable/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/moc/patches/patch-configure b/package/moc/patches/patch-configure
index 0968574d6..2330e0f4c 100644
--- a/package/moc/patches/patch-configure
+++ b/package/moc/patches/patch-configure
@@ -1,6 +1,6 @@
---- moc-2.4.4.orig/configure 2009-01-04 09:28:51.000000000 +0100
-+++ moc-2.4.4/configure 2010-02-06 01:22:38.464334671 +0100
-@@ -13910,7 +13910,7 @@ DECODER_PLUGIN_DIR=decoder_plugins
+--- moc-2.5.0-alpha4.orig/configure 2009-09-25 10:54:41.000000000 +0200
++++ moc-2.5.0-alpha4/configure 2010-03-06 11:37:45.867276809 +0100
+@@ -17669,7 +17669,7 @@ DECODER_PLUGIN_DIR=decoder_plugins
PLUGIN_LDFLAGS='-module -avoid-version'
@@ -9,12 +9,12 @@
case "$OS" in
Linux)
-@@ -13929,7 +13929,7 @@ _ACEOF
+@@ -17688,7 +17688,7 @@ _ACEOF
;;
esac
-LDFLAGS="$LDFLAGS -export-dynamic"
+LDFLAGS="$LDFLAGS"
- { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
diff --git a/package/moc/patches/patch-options_c b/package/moc/patches/patch-options_c
new file mode 100644
index 000000000..b5e9ca676
--- /dev/null
+++ b/package/moc/patches/patch-options_c
@@ -0,0 +1,11 @@
+--- moc-2.5.0-alpha4.orig/options.c 2009-09-16 12:04:53.000000000 +0200
++++ moc-2.5.0-alpha4/options.c 2010-03-06 11:38:50.596035001 +0100
+@@ -327,7 +327,7 @@ static void option_add_symb (const char
+ char *val = va_arg (va, char *);
+ if (strlen (val) == 0 ||
+ strlen (val) != strspn (val, valid) ||
+- index (first, val[0]) != NULL)
++ strchr (first, val[0]) != NULL)
+ fatal ("Invalid symbol in '%s' constraint list.", name);
+ ((char **) options[pos].constraints)[ix] = xstrdup (val);
+ if (!strcasecmp (val, value))
diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile
index 30e632b5f..ab54b4b09 100644
--- a/package/mpg123/Makefile
+++ b/package/mpg123/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 0005c9a89c381484e2d2ff450b3dfe5e
PKG_DESCR:= mp3 console player
PKG_SECTION:= sound
-PKG_DEPENDS:= libpthread alsa-lib
+PKG_DEPENDS:= libpthread alsa-lib libltdl
PKG_BUILDDEP+= alsa-lib
PKG_URL:= http://www.mpg123.de/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mpg123/}
@@ -22,7 +22,9 @@ $(eval $(call PKG_template,MPG123,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PK
post-install:
$(INSTALL_DIR) $(IDIR_MPG123)/usr/bin $(IDIR_MPG123)/usr/lib
+ $(INSTALL_DIR) $(IDIR_MPG123)/usr/lib/mpg123
$(CP) $(WRKINST)/usr/lib/libmpg123.so* $(IDIR_MPG123)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/mpg123/*.so $(IDIR_MPG123)/usr/lib/mpg123
$(INSTALL_BIN) $(WRKINST)/usr/bin/mpg123 \
$(IDIR_MPG123)/usr/bin
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index a5a612bac..71e6190d8 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -17,7 +17,7 @@ PKG_BUILDDEP+= libX11 libXv libpng libXext
PKG_URL:= http://www.mplayerhq.hu
PKG_SITES:= http://openadk.org/distfiles/
-PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle
+PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle lemote
include ${TOPDIR}/mk/package.mk
@@ -25,6 +25,8 @@ $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P
CONFIG_STYLE:= manual
+FAKE_FLAGS+= INSTALLSTRIP=''
+
ifeq (${ADK_LINUX_X86_ALIX1C},y)
CONFIGURE_CPU_OPTS:= \
--disable-ssse3 \
diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure
new file mode 100644
index 000000000..dcebb8645
--- /dev/null
+++ b/package/mplayer/patches/patch-configure
@@ -0,0 +1,11 @@
+--- mplayer-1.0-29987.orig/configure 2009-12-10 13:18:20.000000000 +0100
++++ mplayer-1.0-29987/configure 2010-03-06 12:52:36.000000000 +0100
+@@ -2266,7 +2266,7 @@ EOF
+ _optimizing="$proc"
+ ;;
+
+- mips)
++ mips|mips64|mipsel|mips64el)
+ _arch='SGI_MIPS'
+ _target_arch='ARCH_SGI_MIPS = yes'
+ iproc='sgi-mips'
diff --git a/package/parted/Makefile b/package/parted/Makefile
index 03df2e270..b54746dda 100644
--- a/package/parted/Makefile
+++ b/package/parted/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 055305bc7bcf472ce38f9abf69a9d94d
PKG_DESCR:= GNU parted
PKG_SECTION:= admin
-PKG_DEPENDS:= libuuid libreadline device-mapper libpthread
+PKG_DEPENDS:= libuuid libreadline libdevmapper libpthread
PKG_BUILDDEP+= e2fsprogs lvm readline
PKG_URL:= http://www.gnu.org/software/parted/index.shtml
PKG_SITES:= ${MASTER_SITE_GNU:=parted/}
diff --git a/package/pkgmaker b/package/pkgmaker
index ccd619ac5..ea89424e7 100644
--- a/package/pkgmaker
+++ b/package/pkgmaker
@@ -43,7 +43,7 @@ done
for dn in */Makefile; do
dn=${dn%/*}
# skip if we take care of this one manually
- [[ -s $dn/Config.in.manual ]] && continue
+ [[ $dn != "base-files" ]] && [[ -s $dn/Config.in.manual ]] && continue
pbar="Pass 2: $dn ..."
print -nu2 "$pbar\r"
cd $dn
diff --git a/package/readline/Makefile b/package/readline/Makefile
index 644a87271..542f72d9a 100644
--- a/package/readline/Makefile
+++ b/package/readline/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= readline
-PKG_VERSION:= 5.2
+PKG_VERSION:= 6.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= e39331f32ad14009b9ff49cc10c5e751
+PKG_MD5SUM:= fc2f7e714fe792db1ce6ddc4c9fb4ef3
PKG_DESCR:= Command line editing library
PKG_SECTION:= libs
PKG_DEPENDS:= libncurses
@@ -21,8 +21,8 @@ CONFIGURE_ARGS+= --with-curses
post-install:
${INSTALL_DIR} ${IDIR_LIBREADLINE}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libhistory.so.* ${IDIR_LIBREADLINE}/usr/lib/
- ${CP} ${WRKINST}/usr/lib/libreadline.so.* ${IDIR_LIBREADLINE}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libhistory.so* ${IDIR_LIBREADLINE}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libreadline.so* ${IDIR_LIBREADLINE}/usr/lib/
chmod u+w ${IDIR_LIBREADLINE}/usr/lib/*
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile
index f6918ad68..626c9bf54 100644
--- a/package/rxvt-unicode/Makefile
+++ b/package/rxvt-unicode/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 49bb52c99e002bf85eb41d8385d903b5
PKG_DESCR:= x-term with unicode support
PKG_SECTION:= x11
-PKG_DEPENDS:= libx11 fontconfig libxft
-PKG_BUILDDEP+= libX11 fontconfig libXft
+PKG_DEPENDS:= libx11 fontconfig libxft libxml2
+PKG_BUILDDEP+= libX11 fontconfig libXft libxml2
PKG_URL:= http://software.schmorp.de/pkg/rxvt-unicode.html
PKG_SITES:= http://dist.schmorp.de/rxvt-unicode/
diff --git a/package/setserial/Makefile b/package/setserial/Makefile
index b106d11a0..e95c9e6b5 100644
--- a/package/setserial/Makefile
+++ b/package/setserial/Makefile
@@ -17,6 +17,8 @@ $(eval $(call PKG_template,SETSERIAL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},$
INSTALL_STYLE:= manual
+TCFLAGS+= -DFIOQSIZE=1
+
do-install:
${INSTALL_DIR} ${IDIR_SETSERIAL}/usr/sbin
${INSTALL_BIN} ${WRKBUILD}/setserial ${IDIR_SETSERIAL}/usr/sbin/
diff --git a/package/setserial/patches/patch-setserial_c b/package/setserial/patches/patch-setserial_c
new file mode 100644
index 000000000..ec2cb3c84
--- /dev/null
+++ b/package/setserial/patches/patch-setserial_c
@@ -0,0 +1,10 @@
+--- setserial-2.17.orig/setserial.c 2000-01-27 16:40:52.000000000 +0100
++++ setserial-2.17/setserial.c 2010-03-05 17:42:26.316553683 +0100
+@@ -11,6 +11,7 @@
+ */
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <fcntl.h>
+ #include <termios.h>
+ #include <string.h>
diff --git a/package/shorewall-common/Makefile b/package/shorewall-common/Makefile
index bfa99f834..5e311d358 100644
--- a/package/shorewall-common/Makefile
+++ b/package/shorewall-common/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= shorewall-common
PKG_VERSION:= 4.0.7
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 2df43356b1fdbc91920d48c5595aa101
PKG_DESCR:= high-level netfilter configuration tool
PKG_SECTION:= net
@@ -17,7 +17,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,SHOREWALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SHOREWALL,shorewall,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
@@ -41,7 +41,7 @@ endif
do-install:
${INSTALL_DIR} ${IDIR_SHOREWALL}/etc/shorewall
${INSTALL_DIR} ${IDIR_SHOREWALL}/usr/share/shorewall
- ${INSTALL_DIR} ${IDIR_SHOREWALL}/sbin
+ ${INSTALL_DIR} ${IDIR_SHOREWALL}/usr/sbin
${INSTALL_DATA} ${WRKINST}/etc/shorewall/* \
${IDIR_SHOREWALL}/etc/shorewall/
${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/actions.std \
@@ -66,6 +66,6 @@ do-install:
${IDIR_SHOREWALL}/usr/share/shorewall/
${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/wait4ifup \
${IDIR_SHOREWALL}/usr/share/shorewall/
- ${INSTALL_BIN} ${WRKINST}/sbin/shorewall ${IDIR_SHOREWALL}/sbin
+ ${INSTALL_BIN} ${WRKINST}/sbin/shorewall ${IDIR_SHOREWALL}/usr/sbin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/srelay/Makefile b/package/srelay/Makefile
index b1f772faa..bdda82b64 100644
--- a/package/srelay/Makefile
+++ b/package/srelay/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= srelay
-PKG_VERSION:= 0.4.7b2
+PKG_VERSION:= 0.4.7p3
PKG_RELEASE:= 1
-PKG_MD5SUM:= 73904ecbb5d305135b3e8907ce7d0513
+PKG_MD5SUM:= 214ca8bc476c5e0eab54adb01972be6a
PKG_DESCR:= A socks 4/5 proxy server
PKG_SECTION:= net
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=socks-relay/}
@@ -17,7 +17,6 @@ $(eval $(call PKG_template,SRELAY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PK
INSTALL_STYLE:= manual
-CONFIGURE_ENV+= ac_cv_lib_nsl_getaddrinfo=no
CONFIGURE_ARGS+= --disable-thread \
--with-libwrap=no
diff --git a/package/subversion/Makefile b/package/subversion/Makefile
index fcae1474c..3af2bc6da 100644
--- a/package/subversion/Makefile
+++ b/package/subversion/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= subversion
-PKG_VERSION:= 1.6.6
+PKG_VERSION:= 1.6.9
PKG_RELEASE:= 1
-PKG_MD5SUM:= 0ab0f26f6eb056add1b9d3059a3f4247
+PKG_MD5SUM:= facaa0ee78c8f24b9af12c74662bbd24
PKG_DESCR:= revision control program
PKG_SECTION:= scm
PKG_DEPENDS:= zlib apr apr-util libiconv libexpat libsqlite
@@ -50,7 +50,7 @@ INSTALL_TARGET:= external-install local-install
post-install:
${INSTALL_DIR} ${IDIR_SUBVERSION}/usr/{bin,lib}
- ${CP} ${WRKINST}/usr/bin/* ${IDIR_SUBVERSION}/usr/bin
- ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_SUBVERSION}/usr/lib
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/svn ${IDIR_SUBVERSION}/usr/bin
+ ${CP} ${WRKINST}/usr/lib/libsvn*.so* ${IDIR_SUBVERSION}/usr/lib
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tor/Makefile b/package/tor/Makefile
index 414d50a30..b6e1fc093 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= tor
-PKG_VERSION:= 0.2.1.20
+PKG_VERSION:= 0.2.1.24
PKG_RELEASE:= 1
-PKG_MD5SUM:= 0d62ee2332fdd95de43debac7435df19
+PKG_MD5SUM:= cb5629b2709ada82d34c22fef3ed77a9
PKG_DESCR:= An anonymous Internet communication system
PKG_SECTION:= net
PKG_DEPENDS:= libevent libopenssl zlib libpthread
diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index 8d8cba862..d5d5d21ee 100644
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= usbutils
-PKG_VERSION:= 0.73
+PKG_VERSION:= 0.86
PKG_RELEASE:= 1
-PKG_MD5SUM:= 88978b4ad891f610620b1b8e5e0f43eb
+PKG_MD5SUM:= 34979f675d2bcb3e1b45012fa830a53f
PKG_DESCR:= A program to list USB devices
PKG_SECTION:= misc
PKG_DEPENDS:= libusb libusb-compat libpthread
diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile
index 0b66eea6e..5ed7240d7 100644
--- a/package/xf86-input-keyboard/Makefile
+++ b/package/xf86-input-keyboard/Makefile
@@ -13,7 +13,7 @@ PKG_BUILDDEP+= xorg-server
PKG_DEPENDS:= xorg-server
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_TARGET_DEPENDS:= alix1c
+PKG_TARGET_DEPENDS:= alix1c lemote
include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile
index 4755fedc1..959a2a071 100644
--- a/package/xf86-input-mouse/Makefile
+++ b/package/xf86-input-mouse/Makefile
@@ -13,7 +13,7 @@ PKG_DEPENDS:= xorg-server
PKG_BUILDDEP+= xorg-server
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_TARGET_DEPENDS:= alix1c
+PKG_TARGET_DEPENDS:= alix1c lemote
include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile
new file mode 100644
index 000000000..43e20a7ee
--- /dev/null
+++ b/package/xf86-video-fbdev/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= xf86-video-fbdev
+PKG_VERSION:= 0.4.1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= c297e40b93b3636a72189cfac43d1a87
+PKG_DESCR:= X11 driver for Linux Framebuffer devices
+PKG_SECTION:= x11
+PKG_DEPENDS:= xorg-server
+PKG_BUILDDEP+= xorg-server
+PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XF86_VIDEO_FBDEV,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_XF86_VIDEO_FBDEV}/usr/lib/xorg/modules/drivers
+ ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/fbdev_*.so \
+ ${IDIR_XF86_VIDEO_FBDEV}/usr/lib/xorg/modules/drivers/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile
new file mode 100644
index 000000000..b9847902b
--- /dev/null
+++ b/package/xf86-video-siliconmotion/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= xf86-video-siliconmotion
+PKG_VERSION:= 1.7.3
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 39da891cd368960443613e7a61398216
+PKG_DESCR:= X11 driver for Silicon Motion VGA chips
+PKG_SECTION:= x11
+PKG_DEPENDS:= xorg-server
+PKG_BUILDDEP+= xorg-server
+PKG_SITES:= http://xorg.freedesktop.org/releases/individual/driver/
+
+PKG_TARGET_DEPENDS:= lemote
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XF86_VIDEO_SILICONMOTION,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_XF86_VIDEO_SILICONMOTION}/usr/lib/xorg/modules/drivers
+ ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/siliconmotion_*.so \
+ ${IDIR_XF86_VIDEO_SILICONMOTION}/usr/lib/xorg/modules/drivers/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 35b7597a6..977710c4f 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xorg-server
-PKG_VERSION:= 1.7.1
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 913a672cbd6da516de15965d594e20b9
+PKG_VERSION:= 1.7.5
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 866917789c71e7616a016ad256fe9b8f
PKG_DESCR:= Xorg server
PKG_SECTION:= x11
PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile \
@@ -18,7 +18,7 @@ PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto \
compositeproto evieext libxkbfile libXfont pixman \
libpciaccess openssl xf86dgaproto
PKG_URL:= http://www.x.org
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://xorg.freedesktop.org/archive/individual/xserver/
CFLINE_XORG_SERVER:= depends on ADK_TARGET_WITH_VGA
@@ -32,6 +32,7 @@ CONFIGURE_ARGS+= \
--enable-dga \
--enable-xorg \
--enable-xv \
+ --enable-xaa \
--disable-aiglx \
--disable-config-hal \
--disable-dpms \
@@ -56,6 +57,7 @@ CONFIGURE_ARGS+= \
--with-vendor-web="http://openadk.org"
post-install:
+ $(INSTALL_DIR) $(IDIR_XORG_SERVER)/etc/X11
$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin
$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/linux
$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
@@ -72,5 +74,7 @@ post-install:
$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/linux
${CP} ${WRKINST}/usr/lib/xorg/modules/multimedia/*.so \
$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia
+ -$(CP) $(TOPDIR)/target/$(ADK_TARGET)/xorg.conf \
+ $(IDIR_XORG_SERVER)/etc/X11
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h b/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
new file mode 100644
index 000000000..91c04f1ec
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
@@ -0,0 +1,11 @@
+--- xorg-server-1.7.5.orig/hw/xfree86/dri/sarea.h 2009-02-10 08:23:28.000000000 +0100
++++ xorg-server-1.7.5/hw/xfree86/dri/sarea.h 2010-03-08 19:21:40.000000000 +0100
+@@ -42,6 +42,8 @@
+ /* SAREA area needs to be at least a page */
+ #if defined(__alpha__)
+ #define SAREA_MAX 0x2000
++#elif defined(__mips__)
++#define SAREA_MAX 0x4000
+ #elif defined(__ia64__)
+ #define SAREA_MAX 0x10000 /* 64kB */
+ #else
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
new file mode 100644
index 000000000..8c93131b1
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
@@ -0,0 +1,32 @@
+--- xorg-server-1.7.5.orig/hw/xfree86/os-support/linux/lnx_video.c 2010-02-16 01:24:23.000000000 +0100
++++ xorg-server-1.7.5/hw/xfree86/os-support/linux/lnx_video.c 2010-03-08 21:31:20.000000000 +0100
+@@ -497,7 +497,7 @@ volatile unsigned char *ioBase = NULL;
+ Bool
+ xf86EnableIO(void)
+ {
+-#if defined(__powerpc__)
++#if defined(__powerpc__) || defined(__mips__)
+ int fd;
+ unsigned int ioBase_phys;
+ #endif
+@@ -524,6 +524,20 @@ xf86EnableIO(void)
+ #endif
+ }
+ close(fd);
++#elif defined(__mips__)
++ fd = open("/dev/mem", O_RDWR);
++ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
++ PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0x1fd00000);
++ if (IOPortBase == MAP_FAILED) {
++ xf86Msg(X_WARNING,
++ "xf86EnableIOPorts: Failed to map iobase (%s)\n",
++ strerror(errno));
++ return FALSE;
++ }
++ close(fd);
++ xf86Msg(X_WARNING,
++ "xf86EnableIOPorts: map iobase (%x)\n",
++ IOPortBase);
+ #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__)
+ if (ioperm(0, 1024, 1) || iopl(3)) {
+ if (errno == ENODEV)