diff options
71 files changed, 551 insertions, 109 deletions
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index d9caa7c4f..0e53be8e4 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -18,6 +18,7 @@ PKG_NOPARALLEL:= 1 PKG_NEED_CXX:= 1 PKG_ARCH_DEPENDS:= !cris +PKG_LIBC_DEPENDS:= uclibc eglibc glibc PKG_SUBPKGS:= ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS PKG_SUBPKGS+= ASTERISK_CHAN_SKINNY ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile index 84517448c..670c97e7c 100644 --- a/package/bridge-utils/Makefile +++ b/package/bridge-utils/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bridge-utils PKG_VERSION:= 1.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= ec7b381160b340648dede58c31bb2238 PKG_DESCR:= Ethernet bridging tools PKG_SECTION:= bridge diff --git a/package/bridge-utils/patches/patch-brctl_brctl_c b/package/bridge-utils/patches/patch-brctl_brctl_c new file mode 100644 index 000000000..5305e47cc --- /dev/null +++ b/package/bridge-utils/patches/patch-brctl_brctl_c @@ -0,0 +1,13 @@ +--- bridge-utils-1.5.orig/brctl/brctl.c 2011-03-29 02:52:54.000000000 +0200 ++++ bridge-utils-1.5/brctl/brctl.c 2013-12-27 20:58:33.000000000 +0100 +@@ -19,8 +19,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-#include <sys/errno.h> ++#include <errno.h> + #include <getopt.h> ++#include <sys/types.h> + + #include "libbridge.h" + #include "config.h" diff --git a/package/bridge-utils/patches/patch-brctl_brctl_cmd_c b/package/bridge-utils/patches/patch-brctl_brctl_cmd_c new file mode 100644 index 000000000..62ccfef49 --- /dev/null +++ b/package/bridge-utils/patches/patch-brctl_brctl_cmd_c @@ -0,0 +1,10 @@ +--- bridge-utils-1.5.orig/brctl/brctl_cmd.c 2011-03-29 02:52:54.000000000 +0200 ++++ bridge-utils-1.5/brctl/brctl_cmd.c 2013-12-27 20:59:48.000000000 +0100 +@@ -20,6 +20,7 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/time.h> ++#include <sys/types.h> + #include <errno.h> + #include <asm/param.h> + #include "libbridge.h" diff --git a/package/bridge-utils/patches/patch-brctl_brctl_disp_c b/package/bridge-utils/patches/patch-brctl_brctl_disp_c new file mode 100644 index 000000000..2adbb9e35 --- /dev/null +++ b/package/bridge-utils/patches/patch-brctl_brctl_disp_c @@ -0,0 +1,10 @@ +--- bridge-utils-1.5.orig/brctl/brctl_disp.c 2011-03-29 02:52:54.000000000 +0200 ++++ bridge-utils-1.5/brctl/brctl_disp.c 2013-12-27 21:00:22.000000000 +0100 +@@ -20,6 +20,7 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/time.h> ++#include <sys/types.h> + + #include "libbridge.h" + #include "brctl.h" diff --git a/package/bridge-utils/patches/patch-libbridge_libbridge_h b/package/bridge-utils/patches/patch-libbridge_libbridge_h index 2d42c496c..bbfd4ccb3 100644 --- a/package/bridge-utils/patches/patch-libbridge_libbridge_h +++ b/package/bridge-utils/patches/patch-libbridge_libbridge_h @@ -1,9 +1,10 @@ --- bridge-utils-1.5.orig/libbridge/libbridge.h 2011-03-29 02:52:54.000000000 +0200 -+++ bridge-utils-1.5/libbridge/libbridge.h 2013-07-12 14:38:31.000000000 +0200 -@@ -20,6 +20,7 @@ ++++ bridge-utils-1.5/libbridge/libbridge.h 2013-12-27 21:01:15.000000000 +0100 +@@ -20,6 +20,8 @@ #define _LIBBRIDGE_H #include <sys/socket.h> ++#include <sys/types.h> +#include <netinet/in.h> #include <linux/if.h> #include <linux/if_bridge.h> diff --git a/package/conntrack-tools/Makefile b/package/conntrack-tools/Makefile index 6cd5d4175..9032d3f06 100644 --- a/package/conntrack-tools/Makefile +++ b/package/conntrack-tools/Makefile @@ -14,6 +14,7 @@ PKG_BUILDDEP:= libtirpc libnetfilter_queue libnetfilter_conntrack libnetfilter_ PKG_URL:= http://conntrack-tools.netfilter.org/ PKG_SITES:= http://www.netfilter.org/projects/conntrack-tools/files/ +PKG_LIBC_DEPENDS:= uclibc eglibc glibc PKG_ARCH_DEPENDS:= !avr32 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/cutter/Makefile b/package/cutter/Makefile index c87667822..ca4b12b21 100755 --- a/package/cutter/Makefile +++ b/package/cutter/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cutter PKG_VERSION:= 1.03 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 50093db9b64277643969ee75b83ebbd1 PKG_DESCR:= Abort TCP/IP connections routed over a firewall PKG_SECTION:= firewall diff --git a/package/cutter/patches/patch-cutter_c b/package/cutter/patches/patch-cutter_c index 03129f87e..0842a6dd9 100644 --- a/package/cutter/patches/patch-cutter_c +++ b/package/cutter/patches/patch-cutter_c @@ -1,6 +1,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- cutter-1.03.orig/cutter.c 2005-04-30 09:01:03.000000000 +0200 -+++ cutter-1.03/cutter.c 2011-08-24 18:49:58.830478484 +0200 ++++ cutter-1.03/cutter.c 2013-12-24 12:14:44.000000000 +0100 @@ -35,6 +35,10 @@ * improvment. */ @@ -12,7 +12,17 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ #include <string.h> #include <stdio.h> #include <unistd.h> -@@ -297,7 +301,7 @@ int send_rst( +@@ -50,7 +54,9 @@ + #include <linux/if_ether.h> + #include <fcntl.h> + #include <netpacket/packet.h> ++#if defined(__GLIBC__) + #include <net/ethernet.h> /* the L2 protocols */ ++#endif + #include <linux/sockios.h> + #include <sys/ioctl.h> + #include <netinet/in.h> +@@ -297,7 +303,7 @@ int send_rst( pheader.placeholder=0; pheader.protocol=IPPROTO_TCP; pheader.tcp_length=htons(TCPHDR); @@ -21,7 +31,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ tpack.tcp.check=in_cksum((unsigned short *)&pheader,TCPHDR+12); /* -@@ -419,7 +423,7 @@ int send_rst( +@@ -419,7 +425,7 @@ int send_rst( pheader.placeholder=0; pheader.protocol=IPPROTO_TCP; pheader.tcp_length=htons(TCPHDR); diff --git a/package/drbd/Makefile b/package/drbd/Makefile index 9adbaa298..49f8169be 100644 --- a/package/drbd/Makefile +++ b/package/drbd/Makefile @@ -4,14 +4,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:= drbd -PKG_VERSION:= 8.4.1 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 3af0cc49ee0b5005ea108c5ba92aa755 +PKG_VERSION:= 8.4.4 +PKG_RELEASE:= 2 +PKG_MD5SUM:= b51815343c1a9151e2936b3b97520388 PKG_DESCR:= DRBD admin tools PKG_SECTION:= fs PKG_URL:= http://www.drbd.org/ PKG_SITES:= http://oss.linbit.com/drbd/8.4/ +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,DRBD,drbd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -31,7 +33,7 @@ post-install: $(INSTALL_DIR) $(IDIR_DRBD)/usr/sbin $(CP) $(WRKINST)/usr/lib/drbd/* \ $(IDIR_DRBD)/usr/lib/drbd/ - $(INSTALL_BIN) $(WRKINST)/sbin/drbd* \ + $(INSTALL_BIN) $(WRKINST)/usr/sbin/drbd* \ $(IDIR_DRBD)/usr/sbin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/drbd/patches/patch-drbd_drbd_buildtag_c b/package/drbd/patches/patch-drbd_drbd_buildtag_c deleted file mode 100644 index 86dd50121..000000000 --- a/package/drbd/patches/patch-drbd_drbd_buildtag_c +++ /dev/null @@ -1,11 +0,0 @@ ---- drbd-8.4.1.orig/drbd/drbd_buildtag.c 2011-12-20 12:43:15.000000000 +0100 -+++ drbd-8.4.1/drbd/drbd_buildtag.c 2012-07-24 23:03:27.000000000 +0200 -@@ -3,5 +3,5 @@ - const char *drbd_buildtag(void) - { - return "GIT-hash: 91b4c048c1a0e06777b5f65d312b38d47abaea80" -- " build by phil@fat-tyre, 2011-12-20 12:43:15"; --} -+ " build by wbx@neon, 2012-07-24 23:03:27"; -+} -\ No newline at end of file diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile index b11d9af1c..813956bfc 100644 --- a/package/dsniff/Makefile +++ b/package/dsniff/Makefile @@ -15,6 +15,7 @@ PKG_URL:= http://www.monkey.org/~dugsong/dsniff/ PKG_SITES:= http://www.monkey.org/~dugsong/dsniff/beta/ PKG_ARCH_DEPENDS:= !arm +PKG_LIBC_DEPENDS:= uclibc eglibc glibc WRKDIST= ${WRKDIR}/${PKG_NAME}-2.4 diff --git a/package/esound/Makefile b/package/esound/Makefile index aabe40bd4..45c3d1529 100644 --- a/package/esound/Makefile +++ b/package/esound/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= esound PKG_VERSION:= 0.2.41 -PKG_RELEASE:= 6 +PKG_RELEASE:= 8 PKG_MD5SUM:= 3d8973ed87053d7acc1f4d44af2c4688 PKG_DESCR:= Enlightened Sound Daemon PKG_SECTION:= multimedia diff --git a/package/esound/patches/patch-esddsp_c b/package/esound/patches/patch-esddsp_c new file mode 100644 index 000000000..3b774f403 --- /dev/null +++ b/package/esound/patches/patch-esddsp_c @@ -0,0 +1,38 @@ +--- esound-0.2.41.orig/esddsp.c 2008-11-18 21:35:19.000000000 +0100 ++++ esound-0.2.41/esddsp.c 2013-12-23 16:08:43.000000000 +0100 +@@ -264,7 +264,7 @@ open_wrapper (int (*func) (const char *, + } + + int +-open (const char *pathname, int flags, ...) ++esd_open (const char *pathname, int flags, ...) + { + static int (*func) (const char *, int, mode_t) = NULL; + va_list args; +@@ -291,7 +291,7 @@ open (const char *pathname, int flags, . + } + + int +-open64 (const char *pathname, int flags, ...) ++esd_open64 (const char *pathname, int flags, ...) + { + static int (*func) (const char *, int, mode_t) = NULL; + va_list args; +@@ -355,7 +355,7 @@ fopen_wrapper (FILE * (*func) (const cha + } + + FILE * +-fopen (const char *path, const char *mode) ++esd_fopen (const char *path, const char *mode) + { + static FILE * (*func) (const char *, const char *) = NULL; + +@@ -375,7 +375,7 @@ fopen (const char *path, const char *mod + } + + FILE * +-fopen64 (const char *path, const char *mode) ++esd_fopen64 (const char *path, const char *mode) + { + static FILE * (*func) (const char *, const char *) = NULL; + diff --git a/package/fbset/Makefile b/package/fbset/Makefile index f0b7cb9ed..6943d6d68 100644 --- a/package/fbset/Makefile +++ b/package/fbset/Makefile @@ -11,6 +11,8 @@ PKG_DESCR:= framebuffer utility PKG_SECTION:= utils PKG_SITES:= http://users.telenet.be/geertu/Linux/fbdev/ +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,FBSET,fbset,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/gdb/patches/patch-gdb_gdbserver_configure b/package/gdb/patches/patch-gdb_gdbserver_configure new file mode 100644 index 000000000..fb32187b2 --- /dev/null +++ b/package/gdb/patches/patch-gdb_gdbserver_configure @@ -0,0 +1,20 @@ +--- gdb-7.6.orig/gdb/gdbserver/configure 2013-03-11 09:35:09.000000000 +0100 ++++ gdb-7.6/gdb/gdbserver/configure 2013-12-23 19:39:06.000000000 +0100 +@@ -4927,9 +4927,6 @@ if test "${GCC}" = yes -a -z "${ERROR_ON + fi + + WERROR_CFLAGS="" +-if test "${ERROR_ON_WARNING}" = yes ; then +- WERROR_CFLAGS="-Werror" +-fi + + build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \ + -Wformat-nonliteral -Wno-char-subscripts -Wempty-body" +@@ -4943,7 +4940,6 @@ $as_echo_n "checking compiler warning fl + # compiled with it enabled. + for w in ${build_warnings}; do + case $w in +- -Werr*) WERROR_CFLAGS=-Werror ;; + *) # Check that GCC accepts it + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $w" diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index bc2a9b72f..71de5e559 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -10,6 +10,7 @@ PKG_SECTION:= debug PKG_DEPENDS:= libthread-db PKG_ARCH_DEPENDS:= !avr32 !m68k +PKG_LIBC_DEPENDS:= uclibc eglibc glibc PKG_SUBPKGS:= GDBSERVER WRKSRC= ${WRKDIST}/gdb/gdbserver diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile index 85b49f5a0..61925e59c 100644 --- a/package/hdparm/Makefile +++ b/package/hdparm/Makefile @@ -4,11 +4,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= hdparm -PKG_VERSION:= 9.15 +PKG_VERSION:= 9.43 PKG_RELEASE:= 1 -PKG_MD5SUM:= 0524dd10ad986285ff4eeb3507f7471c +PKG_MD5SUM:= f73233be118d86c779a8463d8b6a3cdb PKG_DESCR:= get/set ATA drive parameters -PKG_SECTION:= utils +PKG_SECTION:= fs PKG_URL:= http://sourceforge.net/projects/hdparm PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=hdparm/} diff --git a/package/hdparm/patches/patch-Makefile b/package/hdparm/patches/patch-Makefile deleted file mode 100644 index 616b9fccc..000000000 --- a/package/hdparm/patches/patch-Makefile +++ /dev/null @@ -1,36 +0,0 @@ ---- hdparm-9.15.orig/Makefile 2008-12-10 01:14:28.000000000 +0100 -+++ hdparm-9.15/Makefile 2011-01-15 20:46:42.000000000 +0100 -@@ -13,10 +13,10 @@ oldmandir = $(manprefix)/man - CC ?= gcc - STRIP ?= strip - --CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS) -+CFLAGS ?= -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS) - - #LDFLAGS = -s -static --LDFLAGS = -s -+LDFLAGS ?= -s - INSTALL = install - INSTALL_DATA = $(INSTALL) -m 644 - INSTALL_DIR = $(INSTALL) -m 755 -d -@@ -28,7 +28,6 @@ all: hdparm - - hdparm: hdparm.h sgio.h $(OBJS) - $(CC) $(LDFLAGS) -o hdparm $(OBJS) -- $(STRIP) hdparm - - hdparm.o: hdparm.h sgio.h - -@@ -46,9 +45,9 @@ install: all hdparm.8 - if [ -f $(DESTDIR)$(sbindir)/hdparm ]; then rm -f $(DESTDIR)$(sbindir)/hdparm ; fi - if [ -f $(DESTDIR)$(mandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(mandir)/man8/hdparm.8 ;\ - elif [ -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi -- $(INSTALL_PROGRAM) -D hdparm $(DESTDIR)$(sbindir)/hdparm -- if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\ -- elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi -+ $(INSTALL_PROGRAM) hdparm $(DESTDIR)$(sbindir)/hdparm -+ if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\ -+ elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi - - clean: - -rm -f hdparm $(OBJS) core 2>/dev/null diff --git a/package/hdparm/patches/patch-fallocate_c b/package/hdparm/patches/patch-fallocate_c new file mode 100644 index 000000000..b826cdeba --- /dev/null +++ b/package/hdparm/patches/patch-fallocate_c @@ -0,0 +1,11 @@ +--- hdparm-9.43.orig/fallocate.c 2010-10-04 21:38:39.000000000 +0200 ++++ hdparm-9.43/fallocate.c 2013-12-26 10:25:40.000000000 +0100 +@@ -27,7 +27,7 @@ int do_fallocate_syscall (const char *pa + err = EINVAL; + #else + int fd; +- loff_t offset = 0, len; ++ off_t offset = 0, len; + int mode = 0; + + fd = open(path, O_WRONLY|O_CREAT|O_EXCL, 0600); diff --git a/package/hdparm/patches/patch-hdparm_h b/package/hdparm/patches/patch-hdparm_h new file mode 100644 index 000000000..8149ef69c --- /dev/null +++ b/package/hdparm/patches/patch-hdparm_h @@ -0,0 +1,10 @@ +--- hdparm-9.43.orig/hdparm.h 2012-01-06 17:38:59.000000000 +0100 ++++ hdparm-9.43/hdparm.h 2013-12-26 10:25:23.000000000 +0100 +@@ -2,6 +2,7 @@ + + //#undef __KERNEL_STRICT_NAMES + #include <linux/types.h> ++#include <sys/types.h> + + #if !defined(__GNUC__) && !defined(__attribute__) + #define __attribute__(x) diff --git a/package/hdparm/patches/patch-sysfs_c b/package/hdparm/patches/patch-sysfs_c new file mode 100644 index 000000000..b3ffc3191 --- /dev/null +++ b/package/hdparm/patches/patch-sysfs_c @@ -0,0 +1,14 @@ +--- hdparm-9.43.orig/sysfs.c 2010-10-04 21:39:20.000000000 +0200 ++++ hdparm-9.43/sysfs.c 2013-12-26 10:24:57.000000000 +0100 +@@ -11,9 +11,11 @@ + #include <string.h> + #include <stdio.h> + #include <fcntl.h> ++#include <limits.h> + #include <errno.h> + #include <dirent.h> + #include <sys/stat.h> ++#include <sys/types.h> + #include <linux/types.h> + + #include "hdparm.h" diff --git a/package/heyu/Makefile b/package/heyu/Makefile index 9feaa4a67..d4dd07df8 100644 --- a/package/heyu/Makefile +++ b/package/heyu/Makefile @@ -13,6 +13,8 @@ PKG_DEPENDS:= setserial PKG_URL:= http://heyu.tanj.com/ PKG_SITES:= http://heyu.tanj.com/download/ +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz include ${TOPDIR}/mk/package.mk diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index 44d160ee1..6cca7f5d8 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= jamvm PKG_VERSION:= 1.5.4 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176 PKG_DESCR:= A Java Virtual Machine (JVM) implementation PKG_SECTION:= lang diff --git a/package/jamvm/patches/patch-src_os_linux_os_c b/package/jamvm/patches/patch-src_os_linux_os_c new file mode 100644 index 000000000..a867841e3 --- /dev/null +++ b/package/jamvm/patches/patch-src_os_linux_os_c @@ -0,0 +1,17 @@ +--- jamvm-1.5.4.orig/src/os/linux/os.c 2009-12-31 19:40:48.000000000 +0100 ++++ jamvm-1.5.4/src/os/linux/os.c 2013-12-25 16:43:03.000000000 +0100 +@@ -46,10 +46,12 @@ void *nativeStackBase() { + } + + int nativeAvailableProcessors() { +-#ifdef __UCLIBC__ ++#if defined(__UCLIBC__) + return 1; +-#else ++#elif defined(__GLIBC__) + return get_nprocs(); ++#else ++ return 1; + #endif + } + diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile index 2d01191fa..cc4011f7a 100644 --- a/package/libaudiofile/Makefile +++ b/package/libaudiofile/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= audiofile PKG_VERSION:= 0.3.6 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 2731d79bec0acef3d30d2fc86b0b72fd PKG_DESCR:= audiofile library PKG_SECTION:= libs diff --git a/package/libaudiofile/patches/patch-Makefile_in b/package/libaudiofile/patches/patch-Makefile_in new file mode 100644 index 000000000..6753979af --- /dev/null +++ b/package/libaudiofile/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- audiofile-0.3.6.orig/Makefile.in 2013-03-07 08:27:14.000000000 +0100 ++++ audiofile-0.3.6/Makefile.in 2013-12-23 15:53:28.000000000 +0100 +@@ -294,7 +294,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = gtest libaudiofile sfcommands test examples docs ++SUBDIRS = gtest libaudiofile sfcommands + EXTRA_DIST = \ + ACKNOWLEDGEMENTS \ + NOTES \ diff --git a/package/libjansson/Makefile b/package/libjansson/Makefile new file mode 100644 index 000000000..4fef0dd4b --- /dev/null +++ b/package/libjansson/Makefile @@ -0,0 +1,28 @@ +# 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:= libjansson +PKG_VERSION:= 2.5 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 46ac93bec48aacf207b67b51c8fbf7f1 +PKG_DESCR:= JSON library +PKG_SECTION:= libs +PKG_URL:= http://www.digip.org/jansson/ +PKG_SITES:= http://www.digip.org/jansson/releases/ +PKG_OPTS:= dev + +DISTFILES:= jansson-${PKG_VERSION}.tar.gz +WRKDIST= ${WRKDIR}/jansson-${PKG_VERSION} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBJANSSON,libjansson,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +libjansson-install: + $(INSTALL_DIR) $(IDIR_LIBJANSSON)/usr/lib + $(CP) $(WRKINST)/usr/lib/libjansson*.so* \ + $(IDIR_LIBJANSSON)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libnids/Makefile b/package/libnids/Makefile index 29930e729..d93bed8e9 100644 --- a/package/libnids/Makefile +++ b/package/libnids/Makefile @@ -15,10 +15,13 @@ PKG_URL:= http://libnids.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libnids/} PKG_OPTS:= dev +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBNIDS,libnids,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +TARGET_CPPFLAGS+= -D_GNU_SOURCE TARGET_LDFLAGS+= -lpthread CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no CONFIGURE_ARGS+= --with-libpcap=${STAGING_TARGET_DIR}/usr diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile index 7f8207f33..1b8c7beb9 100644 --- a/package/librpcsecgss/Makefile +++ b/package/librpcsecgss/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= libgssglue libtirpc autotool PKG_SITES:= http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/ PKG_OPTS:= dev +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBRPCSECGSS,librpcsecgss,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile index 088a4f589..bda186efb 100644 --- a/package/libtirpc/Makefile +++ b/package/libtirpc/Makefile @@ -15,6 +15,8 @@ PKG_URL:= http://sourceforge.net/projects/libtirpc/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libtirpc/} PKG_OPTS: dev +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 include ${TOPDIR}/mk/package.mk diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile index 7f06db28e..a6c593f19 100644 --- a/package/libvirt/Makefile +++ b/package/libvirt/Makefile @@ -19,6 +19,7 @@ PKG_OPTS:= dev PKG_HOST_DEPENDS:= !freebsd !netbsd !openbsd PKG_ARCH_DEPENDS:= x86 x86_64 +PKG_LIBC_DEPENDS:= eglibc glibc include ${TOPDIR}/mk/package.mk diff --git a/package/lsof/Makefile b/package/lsof/Makefile index 54e9c1ca1..1dd291110 100644 --- a/package/lsof/Makefile +++ b/package/lsof/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= libtirpc PKG_URL:= http://people.freebsd.org/~abe/ PKG_SITES:= ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION} WRKSRC= ${WRKDIR}/${PKG_NAME}_${PKG_VERSION}/${PKG_NAME}_${PKG_VERSION}_src diff --git a/package/madplay/Makefile b/package/madplay/Makefile index cb154ae8c..f18588787 100644 --- a/package/madplay/Makefile +++ b/package/madplay/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= madplay PKG_VERSION:= 0.15.2b -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 6814b47ceaa99880c754c5195aa1aac1 PKG_DESCR:= MPEG audio player in fixed point PKG_SECTION:= multimedia @@ -19,6 +19,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MADPLAY,madplay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" HOSTCC=${CC_FOR_BUILD} \ LIBS="-lz" \ ac_cv_linux_vers=2 \ diff --git a/package/miredo/Makefile b/package/miredo/Makefile index 87aecf3e4..45e1ad42b 100644 --- a/package/miredo/Makefile +++ b/package/miredo/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= miredo PKG_VERSION:= 1.2.6 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 5bcdbaced54f40b6cb1e9c9a8dbac411 PKG_DESCR:= A Teredo client and relay daemon PKG_SECTION:= ipv6 diff --git a/package/miredo/patches/patch-libtun6_tun6_c b/package/miredo/patches/patch-libtun6_tun6_c new file mode 100644 index 000000000..2bddcfb06 --- /dev/null +++ b/package/miredo/patches/patch-libtun6_tun6_c @@ -0,0 +1,15 @@ +--- miredo-1.2.6.orig/libtun6/tun6.c 2012-09-12 15:03:59.000000000 +0200 ++++ miredo-1.2.6/libtun6/tun6.c 2013-12-23 17:23:42.000000000 +0100 +@@ -53,7 +53,12 @@ + const char os_driver[] = "Linux"; + # define USE_LINUX 1 + ++#if defined(__GLIBC__) + # include <linux/if_tun.h> // TUNSETIFF - Linux tunnel driver ++#else ++#define IFF_TUN 0x0001 ++#define TUNSETIFF _IOW('T', 202, int) ++#endif + /* + * <linux/ipv6.h> conflicts with <netinet/in.h> and <arpa/inet.h>, + * so we've got to declare this structure by hand. diff --git a/package/mtr/Makefile b/package/mtr/Makefile index e0a3d589f..83db697d1 100644 --- a/package/mtr/Makefile +++ b/package/mtr/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= ncurses PKG_URL:= http://www.bitwizard.nl/mtr/ PKG_SITES:= ftp://ftp.bitwizard.nl/mtr/ +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MTR,mtr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/net-tools/Makefile b/package/net-tools/Makefile index 711f150ef..e550059a4 100644 --- a/package/net-tools/Makefile +++ b/package/net-tools/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= net-tools PKG_VERSION:= 1.60 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 888774accab40217dde927e21979c165 PKG_DESCR:= Linux net-tools PKG_SECTION:= net diff --git a/package/net-tools/patches/patch-lib_inet_c b/package/net-tools/patches/patch-lib_inet_c new file mode 100644 index 000000000..915cb7131 --- /dev/null +++ b/package/net-tools/patches/patch-lib_inet_c @@ -0,0 +1,11 @@ +--- net-tools-1.60.orig/lib/inet.c 2000-05-22 23:27:13.000000000 +0200 ++++ net-tools-1.60/lib/inet.c 2013-12-27 18:00:30.000000000 +0100 +@@ -224,7 +224,7 @@ static int INET_rresolve(char *name, siz + + static void INET_reserror(char *text) + { +- herror(text); ++ perror(text); + } + + diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index 897f63aaa..18845a0a5 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -18,6 +18,8 @@ PKG_URL:= http://sourceforge.net/projects/nfs PKG_SITES:= http://openadk.org/distfiles/ #PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + PKG_FLAVOURS_NFS_UTILS:=WITH_KERBEROS PKGFD_WITH_KERBEROS:= enable Kerberos support (MIT) PKGFS_WITH_KERBEROS:= libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue kmod-rpcsec-gss-krb5 kmod-sunrpc-gss diff --git a/package/parted/Makefile b/package/parted/Makefile index e0898450b..8223abe7b 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= parted PKG_VERSION:= 3.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 5d89d64d94bcfefa9ce8f59f4b81bdcb PKG_DESCR:= partition table editor PKG_SECTION:= fs diff --git a/package/parted/patches/patch-lib_config_h_in b/package/parted/patches/patch-lib_config_h_in index ba4569ea9..df6cb1f7d 100644 --- a/package/parted/patches/patch-lib_config_h_in +++ b/package/parted/patches/patch-lib_config_h_in @@ -1,7 +1,7 @@ ---- parted-3.0.orig/lib/config.h.in 2011-05-30 09:07:32.000000000 +0200 -+++ parted-3.0/lib/config.h.in 2013-02-11 15:50:00.000000000 +0100 -@@ -1385,6 +1385,11 @@ - # endif +--- parted-3.1.orig/lib/config.h.in 2012-03-02 17:10:29.000000000 +0100 ++++ parted-3.1/lib/config.h.in 2013-12-25 20:03:47.000000000 +0100 +@@ -1424,6 +1424,11 @@ + # define _DARWIN_USE_64_BIT_INODE 1 #endif +/* Enable large inode numbers on Mac OS X 10.5. */ diff --git a/package/parted/patches/patch-libparted_fs_xfs_platform_defs_h b/package/parted/patches/patch-libparted_fs_xfs_platform_defs_h new file mode 100644 index 000000000..9d6fe232d --- /dev/null +++ b/package/parted/patches/patch-libparted_fs_xfs_platform_defs_h @@ -0,0 +1,11 @@ +--- parted-3.1.orig/libparted/fs/xfs/platform_defs.h 2012-01-12 17:38:40.000000000 +0100 ++++ parted-3.1/libparted/fs/xfs/platform_defs.h 2013-12-25 20:53:13.000000000 +0100 +@@ -51,7 +51,7 @@ + # define constpp char * const * + #endif + +-typedef loff_t xfs_off_t; ++typedef off_t xfs_off_t; + typedef uint64_t xfs_ino_t; + typedef uint32_t xfs_dev_t; + typedef int64_t xfs_daddr_t; diff --git a/package/picocom/Makefile b/package/picocom/Makefile index d602f724f..db15a0646 100644 --- a/package/picocom/Makefile +++ b/package/picocom/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= picocom -PKG_VERSION:= 1.4 +PKG_VERSION:= 1.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 08fcc5f6bb9e7676a2569386d5ea9f70 +PKG_MD5SUM:= 8eaba1d31407e8408674d6e57af447ef PKG_DESCR:= minimal dumb-terminal emulation program PKG_SECTION:= serial -PKG_URL:= http://efault.net/npat/hacks/picocom/ -PKG_SITES:= http://efault.net/npat/hacks/picocom/dist/ +PKG_URL:= http://code.google.com/p/picocom +PKG_SITES:= http://picocom.googlecode.com/files/ include ${TOPDIR}/mk/package.mk diff --git a/package/picocom/patches/patch-Makefile b/package/picocom/patches/patch-Makefile index 621e7c211..6c08b9d12 100644 --- a/package/picocom/patches/patch-Makefile +++ b/package/picocom/patches/patch-Makefile @@ -1,13 +1,15 @@ ---- picocom-1.4.orig/Makefile 2004-08-13 13:18:38.000000000 +0200 -+++ picocom-1.4/Makefile 2011-01-21 21:02:02.096749132 +0100 -@@ -2,11 +2,12 @@ - VERSION=1.4 +--- picocom-1.7.orig/Makefile 2012-02-21 06:42:24.000000000 +0100 ++++ picocom-1.7/Makefile 2013-12-26 09:43:38.000000000 +0100 +@@ -4,13 +4,14 @@ VERSION=1.7 + UUCP_LOCK_DIR=/var/lock # CC = gcc --CPPFLAGS=-DVERSION_STR=\"$(VERSION)\" -DUUCP_LOCK_DIR=\"/var/lock\" --CFLAGS = -Wall -g +-CPPFLAGS=-DVERSION_STR=\"$(VERSION)\" \ +CPPFLAGS ?= -+CPPFLAGS += -DVERSION_STR=\"$(VERSION)\" -DUUCP_LOCK_DIR=\"/var/lock\" ++CPPFLAGS+=-DVERSION_STR=\"$(VERSION)\" \ + -DUUCP_LOCK_DIR=\"$(UUCP_LOCK_DIR)\" \ + -DHIGH_BAUD +-CFLAGS = -Wall -g +CFLAGS ?= -Wall -g # LD = gcc diff --git a/package/picocom/patches/patch-term_c b/package/picocom/patches/patch-term_c new file mode 100644 index 000000000..6ed95ab65 --- /dev/null +++ b/package/picocom/patches/patch-term_c @@ -0,0 +1,106 @@ +--- picocom-1.7.orig/term.c 2010-05-29 00:41:19.000000000 +0200 ++++ picocom-1.7/term.c 2013-12-26 09:45:20.000000000 +0100 +@@ -33,11 +33,7 @@ + #include <string.h> + #include <errno.h> + #include <unistd.h> +-#ifdef __linux__ +-#include <termio.h> +-#else + #include <termios.h> +-#endif /* of __linux__ */ + + #include "term.h" + +@@ -945,27 +941,6 @@ term_pulse_dtr (int fd) + break; + } + +-#ifdef __linux__ +- { +- int opins = TIOCM_DTR; +- +- r = ioctl(fd, TIOCMBIC, &opins); +- if ( r < 0 ) { +- term_errno = TERM_EDTRDOWN; +- rval = -1; +- break; +- } +- +- sleep(1); +- +- r = ioctl(fd, TIOCMBIS, &opins); +- if ( r < 0 ) { +- term_errno = TERM_EDTRUP; +- rval = -1; +- break; +- } +- } +-#else + { + struct termios tio, tioold; + +@@ -997,8 +972,6 @@ term_pulse_dtr (int fd) + break; + } + } +-#endif /* of __linux__ */ +- + } while (0); + + return rval; +@@ -1020,19 +993,6 @@ term_raise_dtr(int fd) + rval = -1; + break; + } +- +-#ifdef __linux__ +- { +- int opins = TIOCM_DTR; +- +- r = ioctl(fd, TIOCMBIS, &opins); +- if ( r < 0 ) { +- term_errno = TERM_EDTRUP; +- rval = -1; +- break; +- } +- } +-#else + r = tcsetattr(fd, TCSANOW, &term.currtermios[i]); + if ( r < 0 ) { + /* FIXME: perhaps try to update currtermios */ +@@ -1040,7 +1000,6 @@ term_raise_dtr(int fd) + rval = -1; + break; + } +-#endif /* of __linux__ */ + } while (0); + + return rval; +@@ -1064,18 +1023,6 @@ term_lower_dtr(int fd) + break; + } + +-#ifdef __linux__ +- { +- int opins = TIOCM_DTR; +- +- r = ioctl(fd, TIOCMBIC, &opins); +- if ( r < 0 ) { +- term_errno = TERM_EDTRDOWN; +- rval = -1; +- break; +- } +- } +-#else + { + struct termios tio; + +@@ -1097,7 +1044,6 @@ term_lower_dtr(int fd) + break; + } + } +-#endif /* of __linux__ */ + } while (0); + + return rval; diff --git a/package/procps/Makefile b/package/procps/Makefile index 70765479e..ac309c63d 100644 --- a/package/procps/Makefile +++ b/package/procps/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= procps PKG_VERSION:= 3.2.8 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 9532714b6846013ca9898984ba4cd7e0 PKG_DESCR:= The /proc file system utilities PKG_SECTION:= utils diff --git a/package/procps/patches/patch-Makefile b/package/procps/patches/patch-Makefile index 5b0bcf74a..5849fc343 100644 --- a/package/procps/patches/patch-Makefile +++ b/package/procps/patches/patch-Makefile @@ -1,6 +1,6 @@ $Id$ ---- procps-3.2.7.orig/Makefile Sat Jun 24 09:02:02 2006 -+++ procps-3.2.7/Makefile Tue May 22 14:43:11 2007 +--- procps-3.2.8.orig/Makefile 2009-05-10 20:50:48.000000000 +0200 ++++ procps-3.2.8/Makefile 2013-12-23 16:53:06.000000000 +0100 @@ -27,7 +27,7 @@ TARVERSION := $(VERSION).$(SUBVERSION) ldconfig := ldconfig ln_f := ln -f @@ -19,7 +19,7 @@ $Id$ ALL_CPPFLAGS := $(PKG_CPPFLAGS) $(CPPFLAGS) # Left out -Wconversion due to noise in glibc headers. -@@ -102,11 +102,11 @@ PKG_CFLAGS := -fno-common -ffast-math +@@ -102,11 +102,11 @@ PKG_CFLAGS := -fno-common -ffast-math -Wstrict-prototypes -Wmissing-prototypes # Note that some stuff below is conditional on CFLAGS containing # an option that starts with "-g". (-g, -g2, -g3, -ggdb, etc.) diff --git a/package/procps/patches/patch-proc_readproc_c b/package/procps/patches/patch-proc_readproc_c new file mode 100644 index 000000000..dd4868a69 --- /dev/null +++ b/package/procps/patches/patch-proc_readproc_c @@ -0,0 +1,10 @@ +--- procps-3.2.8.orig/proc/readproc.c 2006-06-16 10:18:13.000000000 +0200 ++++ procps-3.2.8/proc/readproc.c 2013-12-23 16:58:19.000000000 +0100 +@@ -23,6 +23,7 @@ + #include <unistd.h> + #include <signal.h> + #include <fcntl.h> ++#include <limits.h> + #include <sys/dir.h> + #include <sys/types.h> + #include <sys/stat.h> diff --git a/package/rdesktop/Makefile b/package/rdesktop/Makefile index 18b8169d1..784c19ee4 100644 --- a/package/rdesktop/Makefile +++ b/package/rdesktop/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= rdesktop -PKG_VERSION:= 1.6.0 +PKG_VERSION:= 1.8.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= c6fcbed7f0ad7e60ac5fcb2d324d8b16 +PKG_MD5SUM:= f5382c5c85b0d2cc88b9b1aa9bbf1356 PKG_DESCR:= client for Windows Terminal Services PKG_SECTION:= net PKG_BUILDDEP:= libiconv-tiny openssl @@ -17,7 +17,10 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,RDESKTOP,rdesktop,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --with-openssl="${STAGING_TARGET_DIR}/usr" +TARGET_CFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE +CONFIGURE_ARGS+= --with-openssl="${STAGING_TARGET_DIR}/usr" \ + --disable-smartcard \ + --disable-credssp rdesktop-install: $(INSTALL_DIR) $(IDIR_RDESKTOP)/usr/bin diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile index f7aae1d38..7a8bdb15f 100644 --- a/package/rpcbind/Makefile +++ b/package/rpcbind/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP:= libtirpc autotool PKG_URL:= http://sourceforge.net/projects/rpcbind/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=rpcbind/} +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/scanlogd/Makefile b/package/scanlogd/Makefile index 312130771..95d3b28b1 100644 --- a/package/scanlogd/Makefile +++ b/package/scanlogd/Makefile @@ -15,6 +15,7 @@ PKG_URL:= http://www.openwall.com/scanlogd/ PKG_SITES:= http://www.openwall.com/scanlogd/ PKG_ARCH_DEPENDS:= !arm +PKG_LIBC_DEPENDS:= uclibc eglibc glibc include ${TOPDIR}/mk/package.mk diff --git a/package/snort/Makefile b/package/snort/Makefile index 089daab85..07f333207 100644 --- a/package/snort/Makefile +++ b/package/snort/Makefile @@ -15,6 +15,8 @@ PKG_URL:= http://www.snort.org/ PKG_SITES:= http://openadk.org/distfiles/ PKG_NOPARALLEL:= 1 +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SNORT,snort,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/socat/Makefile b/package/socat/Makefile index de459c710..9f9d6d701 100644 --- a/package/socat/Makefile +++ b/package/socat/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= socat -PKG_VERSION:= 1.7.2.0 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 0565dd58800e4c50534c61bbb453b771 +PKG_VERSION:= 1.7.2.2 +PKG_RELEASE:= 2 +PKG_MD5SUM:= fe70c821a104378a834c3ed1b5971e54 PKG_DESCR:= A multipurpose relay (SOcket CAT) PKG_SECTION:= net/misc PKG_DEPENDS:= libpthread libopenssl diff --git a/package/socat/patches/501-honor_ldflags.patch b/package/socat/patches/501-honor_ldflags.patch index a41a929f1..87c777067 100644 --- a/package/socat/patches/501-honor_ldflags.patch +++ b/package/socat/patches/501-honor_ldflags.patch @@ -1,7 +1,7 @@ diff -ruN socat-1.4-old/Makefile.in socat-1.4-new/Makefile.in ---- socat-1.4-old/Makefile.in 2005-09-10 22:09:11.000000000 +0200 -+++ socat-1.4-new/Makefile.in 2005-10-08 17:12:45.000000000 +0200 -@@ -36,7 +36,8 @@ +--- socat-1.7.2.2.orig/Makefile.in 2011-12-06 08:45:03.000000000 +0100 ++++ socat-1.7.2.2/Makefile.in 2013-12-24 16:37:21.000000000 +0100 +@@ -38,7 +38,8 @@ INSTALL = @INSTALL@ #0 CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS) CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(CPPFLAGS) diff --git a/package/socat/patches/patch-sysincludes_h b/package/socat/patches/patch-sysincludes_h new file mode 100644 index 000000000..59387a6ad --- /dev/null +++ b/package/socat/patches/patch-sysincludes_h @@ -0,0 +1,14 @@ +--- socat-1.7.2.2.orig/sysincludes.h 2011-12-06 08:45:03.000000000 +0100 ++++ socat-1.7.2.2/sysincludes.h 2013-12-25 15:43:19.000000000 +0100 +@@ -136,9 +136,11 @@ + #if HAVE_NETINET_IF_ETHER_H + #include <netinet/if_ether.h> + #endif ++#if defined(__GLIBC__) + #if HAVE_LINUX_IF_TUN_H + #include <linux/if_tun.h> + #endif ++#endif + + #if HAVE_TERMIOS_H && _WITH_TERMIOS + #include <termios.h> diff --git a/package/socat/patches/patch-xio-ip4_c b/package/socat/patches/patch-xio-ip4_c new file mode 100644 index 000000000..15d5bd86b --- /dev/null +++ b/package/socat/patches/patch-xio-ip4_c @@ -0,0 +1,12 @@ +--- socat-1.7.2.2.orig/xio-ip4.c 2010-10-06 09:25:30.000000000 +0200 ++++ socat-1.7.2.2/xio-ip4.c 2013-12-25 15:46:30.000000000 +0100 +@@ -13,6 +13,9 @@ + #include "xio-ip.h" + #include "xio-ip4.h" + ++#if !defined(__GLIBC__) ++# define NETDB_INTERNAL -1 ++#endif + + int xioparsenetwork_ip4(const char *rangename, struct xiorange *range) { + struct hostent *maskaddr; diff --git a/package/socat/patches/patch-xio-proxy_c b/package/socat/patches/patch-xio-proxy_c new file mode 100644 index 000000000..f378841cd --- /dev/null +++ b/package/socat/patches/patch-xio-proxy_c @@ -0,0 +1,12 @@ +--- socat-1.7.2.2.orig/xio-proxy.c 2011-12-06 08:45:03.000000000 +0100 ++++ socat-1.7.2.2/xio-proxy.c 2013-12-25 15:47:38.000000000 +0100 +@@ -16,6 +16,9 @@ + + #include "xio-proxy.h" + ++#if !defined(__GLIBC__) ++# define NETDB_INTERNAL -1 ++#endif + + #define PROXYPORT "8080" + diff --git a/package/socat/patches/patch-xio-tun_c b/package/socat/patches/patch-xio-tun_c new file mode 100644 index 000000000..2ad23eb21 --- /dev/null +++ b/package/socat/patches/patch-xio-tun_c @@ -0,0 +1,15 @@ +--- socat-1.7.2.2.orig/xio-tun.c 2011-12-06 08:45:03.000000000 +0100 ++++ socat-1.7.2.2/xio-tun.c 2013-12-25 15:51:46.000000000 +0100 +@@ -14,6 +14,12 @@ + + #include "xio-tun.h" + ++#if !defined(__GLIBC__) ++#define IFF_TUN 0x0001 ++#define IFF_TAP 0x0002 ++#define IFF_NO_PI 0x1000 ++#define TUNSETIFF _IOW('T', 202, int) ++#endif + + static int xioopen_tun(int argc, const char *argv[], struct opt *opts, int xioflags, xiofile_t *fd, unsigned groups, int dummy1, int dummy2, int dummy3); + diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile index 902882f67..f645ff403 100644 --- a/package/strongswan/Makefile +++ b/package/strongswan/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= strongswan -PKG_VERSION:= 5.0.0 +PKG_VERSION:= 5.1.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 1d7bccb50f01020bb04d06e9755e0eec +PKG_MD5SUM:= f624ab041c306af0f5f57c927e9ea2e4 PKG_DESCR:= IPsec software PKG_SECTION:= net/security PKG_DEPENDS:= ip libpthread kmod-net-key kmod-xfrm-user @@ -18,6 +18,8 @@ PKG_DEPENDS+= kmod-crypto-hmac kmod-crypto-cbc kmod-crypto-authenc PKG_URL:= http://strongswan.org/index.htm PKG_SITES:= http://download.strongswan.org/ +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + PKG_CHOICES_STRONGSWAN:=WITH_GMP WITH_OPENSSL WITH_GNUTLS PKGCD_WITH_GMP:= use GMP for crypto PKGCS_WITH_GMP:= libgmp diff --git a/package/systemd/Makefile b/package/systemd/Makefile index f9fd6e624..7094d3a4b 100644 --- a/package/systemd/Makefile +++ b/package/systemd/Makefile @@ -17,7 +17,7 @@ PKG_SITES:= http://www.freedesktop.org/software/systemd/ PKG_LIBNAME:= libudev PKG_OPTS:= dev -PKG_LIBC_DEPENDS:= eglibc glibc musl +PKG_LIBC_DEPENDS:= eglibc glibc PKG_SUBPKGS:= UDEV LIBUDEV PKGSC_LIBUDEV:= libs PKGSD_LIBUDEV:= UDEV library diff --git a/package/tcsh/Makefile b/package/tcsh/Makefile index 3cc6a23d6..b1e93b373 100644 --- a/package/tcsh/Makefile +++ b/package/tcsh/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= tcsh PKG_VERSION:= 6.18.01 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 6eed09dbd4223ab5b6955378450d228a PKG_DESCR:= alternative csh PKG_SECTION:= shells diff --git a/package/tcsh/patches/patch-sh_h b/package/tcsh/patches/patch-sh_h index 029fca58f..c3d460ff6 100644 --- a/package/tcsh/patches/patch-sh_h +++ b/package/tcsh/patches/patch-sh_h @@ -1,6 +1,6 @@ ---- tcsh-6.17.00.orig/sh.h 2009-06-25 23:27:37.000000000 +0200 -+++ tcsh-6.17.00/sh.h 2010-07-31 19:48:01.000000000 +0200 -@@ -338,7 +338,7 @@ static inline void ignore(intptr_t a) +--- tcsh-6.18.01.orig/sh.h 2011-04-14 20:25:25.000000000 +0200 ++++ tcsh-6.18.01/sh.h 2013-12-25 17:12:55.000000000 +0100 +@@ -361,7 +361,7 @@ typedef long tcsh_number_t; # include <sys/filio.h> #endif /* (!FIOCLEX && SUNOS4) || (SYSVREL == 4 && !_SEQUENT_ && !SCO && !_SX ) */ @@ -9,7 +9,7 @@ # include <sys/file.h> #endif /* !_MINIX && !supermax && !WINNT_NATIVE && !defined(IRIS4D) */ -@@ -375,9 +375,11 @@ static inline void ignore(intptr_t a) +@@ -395,9 +395,11 @@ typedef long tcsh_number_t; #include <pwd.h> #include <grp.h> #endif /* WINNT_NATIVE */ diff --git a/package/tcsh/patches/patch-sh_proc_c b/package/tcsh/patches/patch-sh_proc_c new file mode 100644 index 000000000..db32df2eb --- /dev/null +++ b/package/tcsh/patches/patch-sh_proc_c @@ -0,0 +1,11 @@ +--- tcsh-6.18.01.orig/sh.proc.c 2012-01-25 16:34:41.000000000 +0100 ++++ tcsh-6.18.01/sh.proc.c 2013-12-25 17:17:37.000000000 +0100 +@@ -47,7 +47,7 @@ RCSID("$tcsh: sh.proc.c,v 3.121 2012/01/ + # define HZ 16 + #endif /* aiws */ + +-#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) ++#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__GNU__) || defined(__GLIBC__) + # if !defined(__ANDROID__) + # define BSDWAIT + # endif diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile index 10054738b..a172fa7d2 100644 --- a/package/vpnc/Makefile +++ b/package/vpnc/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= vpnc PKG_VERSION:= 0.5.3 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 4378f9551d5b077e1770bbe09995afb3 PKG_DESCR:= client for cisco3000 VPN Concentrator. PKG_SECTION:= net/security @@ -19,6 +19,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,VPNC,vpnc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual +TARGET_CPPFLAGS+= -D_GNU_SOURCE XAKE_FLAGS+= CC="${TARGET_CC}" \ OFLAGS="${TARGET_CFLAGS}" \ OS="Linux" \ diff --git a/package/vpnc/patches/patch-sysdep_c b/package/vpnc/patches/patch-sysdep_c new file mode 100644 index 000000000..abd723471 --- /dev/null +++ b/package/vpnc/patches/patch-sysdep_c @@ -0,0 +1,17 @@ +--- vpnc-0.5.3.orig/sysdep.c 2008-11-19 21:36:12.000000000 +0100 ++++ vpnc-0.5.3/sysdep.c 2013-12-23 14:15:07.000000000 +0100 +@@ -58,14 +58,10 @@ + + #if defined(__DragonFly__) + #include <net/tun/if_tun.h> +-#elif defined(__linux__) +-#include <linux/if_tun.h> + #elif defined(__APPLE__) + /* no header for tun */ + #elif defined(__CYGWIN__) + #include "tap-win32.h" +-#else +-#include <net/if_tun.h> + #endif + + #include "sysdep.h" diff --git a/package/vpnc/patches/patch-sysdep_h b/package/vpnc/patches/patch-sysdep_h new file mode 100644 index 000000000..854a14034 --- /dev/null +++ b/package/vpnc/patches/patch-sysdep_h @@ -0,0 +1,11 @@ +--- vpnc-0.5.3.orig/sysdep.h 2008-11-19 21:36:12.000000000 +0100 ++++ vpnc-0.5.3/sysdep.h 2013-12-23 14:13:51.000000000 +0100 +@@ -37,7 +37,7 @@ int tun_read(int fd, unsigned char *buf, + int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr); + + /***************************************************************************/ +-#if defined(__linux__) || defined(__GLIBC__) ++#if defined(__GLIBC__) + #include <error.h> + + #define HAVE_VASPRINTF 1 diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile index d2e5c3db3..5e5e35d53 100644 --- a/package/xf86-input-evdev/Makefile +++ b/package/xf86-input-evdev/Makefile @@ -13,7 +13,7 @@ PKG_DEPENDS:= xorg-server kmod-input-evdev libudev PKG_BUILDDEP:= xorg-server systemd PKG_SITES:= ${MASTER_SITE_XORG} -PKG_LIBC_DEPENDS:= eglibc glibc musl +PKG_LIBC_DEPENDS:= eglibc glibc PKG_ARCH_DEPENDS:= !avr32 !m68k PKG_CFLINE_XF86_INPUT_EVDEV:= depends on ADK_TARGET_WITH_INPUT diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 3faa23e49..6ca4f67f0 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xorg-server PKG_VERSION:= 1.12.2 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= a95c896fbe8322c3c8d518a13eb74c7a PKG_DESCR:= Xorg server PKG_SECTION:= x11/server diff --git a/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c b/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c new file mode 100644 index 000000000..2a8477cb8 --- /dev/null +++ b/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c @@ -0,0 +1,13 @@ +--- xorg-server-1.12.2.orig/hw/kdrive/linux/linux.c 2012-05-17 19:09:03.000000000 +0200 ++++ xorg-server-1.12.2/hw/kdrive/linux/linux.c 2013-12-22 20:10:03.000000000 +0100 +@@ -66,8 +66,8 @@ static void + LinuxCheckChown(char *file) + { + struct stat st; +- __uid_t u; +- __gid_t g; ++ uid_t u; ++ gid_t g; + + if (stat(file, &st) < 0) + return; diff --git a/package/xz/Makefile b/package/xz/Makefile index 663e552f8..1793f8eaf 100644 --- a/package/xz/Makefile +++ b/package/xz/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= xz -PKG_VERSION:= 5.0.1 +PKG_VERSION:= 5.0.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 60044a5701997e4e0904257197208ea9 +PKG_MD5SUM:= 19d924e066b6fff0bc9d1981b4e53196 PKG_DESCR:= xz compression utility PKG_SECTION:= archive PKG_URL:= http://tukaani.org/xz/ |