diff options
63 files changed, 440 insertions, 587 deletions
diff --git a/package/Pacemaker-Python-GUI/patches/patch-configure b/package/Pacemaker-Python-GUI/patches/patch-configure deleted file mode 100644 index bfbf2ae69..000000000 --- a/package/Pacemaker-Python-GUI/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- Pacemaker-Python-GUI-2.1.0.orig/configure 2011-10-07 11:55:11.000000000 +0200 -+++ Pacemaker-Python-GUI-2.1.0/configure 2011-10-12 18:13:25.563559000 +0200 -@@ -5555,7 +5555,7 @@ case $libdir in - prefix|NONE|*exec_prefix*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which lib directory to use" >&5 - $as_echo_n "checking which lib directory to use... " >&6; } -- for aDir in lib64 lib -+ for aDir in lib - do - trydir="${exec_prefix}/${aDir}" - if diff --git a/package/Pacemaker-Python-GUI/patches/patch-mgmt_daemon_mgmt_crm_c b/package/Pacemaker-Python-GUI/patches/patch-mgmt_daemon_mgmt_crm_c deleted file mode 100644 index 1882093d5..000000000 --- a/package/Pacemaker-Python-GUI/patches/patch-mgmt_daemon_mgmt_crm_c +++ /dev/null @@ -1,32 +0,0 @@ ---- Pacemaker-Python-GUI-2.1.0.orig/mgmt/daemon/mgmt_crm.c 2011-08-03 13:54:23.000000000 +0200 -+++ Pacemaker-Python-GUI-2.1.0/mgmt/daemon/mgmt_crm.c 2011-10-07 16:15:59.000000000 +0200 -@@ -1393,7 +1393,7 @@ on_cleanup_rsc(char* argv[], int argc) - argv[1], cib_error2string(rc)); - } else { - buffer = crm_concat("fail-count", argv[2], '-'); -- delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL, NULL, -+ delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL, - NULL, buffer, NULL, FALSE); - crm_free(dest_node); - crm_free(buffer); -@@ -1403,7 +1403,7 @@ on_cleanup_rsc(char* argv[], int argc) - sleep(2); /* wait for the refresh */ - now_s = crm_itoa(now); - update_attr(cib_conn, cib_sync_call, -- XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE); -+ XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE); - crm_free(now_s); - - crmd_channel->ops->destroy(crmd_channel); -@@ -1509,9 +1509,11 @@ on_get_rsc_status(char* argv[], int argc - strncat(buf, " (orphaned)", sizeof(buf)-strlen(buf)-1); - } - -+ /* - if(is_set(rsc->flags, pe_rsc_failure_ignored)) { - strncat(buf, " (failure ignored)", sizeof(buf)-strlen(buf)-1); - } -+ */ - - ret = mgmt_msg_append(ret, buf); - break; diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index d3a55ad1f..d9caa7c4f 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= asterisk -PKG_VERSION:= 1.8.3 +PKG_VERSION:= 1.8.20.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 79964868c124a921e71fd568fbc9290f +PKG_MD5SUM:= 99204257de80a42c4e287fc93dfe714a PKG_DESCR:= Open Source PBX PKG_SECTION:= phone PKG_DEPENDS:= libncurses libpthread libopenssl libcurl @@ -19,7 +19,7 @@ PKG_NEED_CXX:= 1 PKG_ARCH_DEPENDS:= !cris -PKG_SUBPKGS:= ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS ASTERISK_CHAN_MGCP +PKG_SUBPKGS:= ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS PKG_SUBPKGS+= ASTERISK_CHAN_SKINNY ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM PKG_SUBPKGS+= ASTERISK_PBX_DUNDI ASTERISK_RES_AGI PKGSB_ASTERISK_CODEC_SPEEX:= speex @@ -37,7 +37,7 @@ $(eval $(call PKG_template,ASTERISK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ $(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_ASTERISK_SOUNDS},${PKGSD_ASTERISK_SOUNDS},${PKG_SECTION})) -$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_MGCP},${PKG_SECTION})) +#$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_MGCP},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_SKINNY},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_IAX2},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CODEC_SPEEX},${PKG_SECTION})) @@ -117,8 +117,8 @@ pre-build: post-build: cd ${WRKBUILD}/sounds ; \ - tar xzf asterisk-core-sounds-en-gsm-1.4.20.tar.gz ; \ - rm asterisk-core-sounds-en-gsm-1.4.20.tar.gz + tar xzf asterisk-core-sounds-en-gsm-1.4.22.tar.gz ; \ + rm asterisk-core-sounds-en-gsm-1.4.22.tar.gz do-install: $(CP) $(WRKINST)/* $(IDIR_ASTERISK) diff --git a/package/asterisk/patches/patch-main_dns_c b/package/asterisk/patches/patch-main_dns_c new file mode 100644 index 000000000..0c3684d52 --- /dev/null +++ b/package/asterisk/patches/patch-main_dns_c @@ -0,0 +1,11 @@ +--- asterisk-1.8.20.1.orig/main/dns.c 2012-06-15 17:56:08.000000000 +0200 ++++ asterisk-1.8.20.1/main/dns.c 2013-03-05 14:49:01.000000000 +0100 +@@ -45,6 +45,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi + #include "asterisk/dns.h" + #include "asterisk/endian.h" + ++#undef HAVE_RES_NINIT ++ + #define MAX_SIZE 4096 + + #ifdef __PDP_ENDIAN diff --git a/package/atk/Makefile b/package/atk/Makefile index 8ca4899ad..58781ae99 100644 --- a/package/atk/Makefile +++ b/package/atk/Makefile @@ -4,16 +4,16 @@ include ${TOPDIR}/rules.mk PKG_NAME:= atk -PKG_VERSION:= 2.7.5 +PKG_VERSION:= 1.33.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= 85f4f5ad1c1a89a857c73ebd6adb9dc7 +PKG_MD5SUM:= 4338e0c94f767714f4786878112750dd PKG_DESCR:= atk library PKG_SECTION:= libs PKG_BUILDDEP:= glib PKG_URL:= http://www.gnome.org/ -PKG_SITES:= ${MASTER_SITE_GNOME:=/atk/2.7/} +PKG_SITES:= ${MASTER_SITE_GNOME:=/atk/1.33/} -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz +#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz PKG_SUBPKGS:= LIBATK LIBATK_DEV PKGSC_LIBATK_DEV:= devel diff --git a/package/b43-firmware/Makefile b/package/b43-firmware/Makefile index 3d170b68c..311644bd8 100644 --- a/package/b43-firmware/Makefile +++ b/package/b43-firmware/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= b43-firmware -PKG_VERSION:= 1.1 +PKG_VERSION:= 1.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= b53e1234c596c49f9ee0c11d04d989ed +PKG_MD5SUM:= 37c8d2c029a7e5b82f4433a6fa1e2ee5 PKG_DESCR:= firmware for b43 wireless cards PKG_SECTION:= wifi PKG_SITES:= http://openadk.org/distfiles/ diff --git a/package/beecrypt/Makefile b/package/beecrypt/Makefile index 5e1e71e50..258d070ba 100644 --- a/package/beecrypt/Makefile +++ b/package/beecrypt/Makefile @@ -18,6 +18,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BEECRYPT,beecrypt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) +TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 CONFIGURE_ARGS+= --without-cplusplus \ --without-python \ --without-java diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 5cf30d57d..93453d917 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -4,17 +4,18 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cairo -PKG_VERSION:= 1.12.12 +PKG_VERSION:= 1.10.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9f7315e54885c735dcfdabe77f322d30 +PKG_MD5SUM:= f101a9e88b783337b20b2e26dfd26d5f PKG_DESCR:= cairo graphics library PKG_SECTION:= libs PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 libXrender glib +PKG_BUILDDEP+= libXext PKG_URL:= http://cairographics.org/ PKG_SITES:= http://cairographics.org/releases/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz +#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz PKG_SUBPKGS:= CAIRO CAIRO_DEV PKGSC_CAIRO_DEV:= devel diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile index bb2d63fec..b7b9a6d81 100644 --- a/package/cryptodev-linux/Makefile +++ b/package/cryptodev-linux/Makefile @@ -24,7 +24,7 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual do-build: - ${MAKE} -C "${WRKBUILD}"/tests check + #${MAKE} -C "${WRKBUILD}"/tests check ${MAKE} -C "${WRKBUILD}" version.h GCC_HONOUR_COPTS=0 LDFLAGS="" ${MAKE} ${KERNEL_MAKE_OPTS} \ M="${WRKBUILD}" modules diff --git a/package/db/Makefile b/package/db/Makefile index 2fd961258..82d69ef64 100644 --- a/package/db/Makefile +++ b/package/db/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= db -PKG_VERSION:= 5.3.15 +PKG_VERSION:= 5.3.21 PKG_RELEASE:= 1 -PKG_MD5SUM:= d40e3e4b9a76a23d1db225465aa8bae0 +PKG_MD5SUM:= 3fda0b004acdaa6fa350bfc41a3b95ca PKG_DESCR:= disk file format database which stores key/data-pairs in single files PKG_SECTION:= db PKG_URL:= http://www.oracle.com/technology/software/products/berkeley-db diff --git a/package/epdfview/Makefile b/package/epdfview/Makefile index af7493ff3..f8349b328 100644 --- a/package/epdfview/Makefile +++ b/package/epdfview/Makefile @@ -12,7 +12,9 @@ PKG_SECTION:= x11/apps PKG_DEPENDS:= poppler libgtk PKG_BUILDDEP:= poppler gtk+ PKG_URL:= http://trac.emma-soft.com/epdfview/wiki -PKG_SITES:= http://trac.emma-soft.com/epdfview/chrome/site/releases/ +PKG_SITES:= http://openadk.org/distfiles + +PKG_CFLINE_EPDFVIEW:= depends on ADK_BROKEN include $(TOPDIR)/mk/package.mk diff --git a/package/forked-daapd/Makefile b/package/forked-daapd/Makefile index 19df5b0b1..ac8a41c64 100644 --- a/package/forked-daapd/Makefile +++ b/package/forked-daapd/Makefile @@ -25,6 +25,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,FORKED_DAAPD,forked-daapd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_LDFLAGS+= -levent + forked-daapd-install: $(INSTALL_DIR) $(IDIR_FORKED_DAAPD)/etc $(CP) ./files/forked-daapd.conf \ diff --git a/package/glib/Makefile b/package/glib/Makefile index 7f55e9f0f..ba9efa759 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,10 +4,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.35.7 -PKG_EXTRAVER:= 2.35 +PKG_VERSION:= 2.28.1 +PKG_EXTRAVER:= 2.28 PKG_RELEASE:= 1 -PKG_MD5SUM:= d9f36f01a24fcfd568c7e45ceabcec90 +PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs PKG_DEPENDS:= libintl libiconv libpthread @@ -16,7 +16,7 @@ PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/ PKG_NOPARALLEL:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz +#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz PKG_SUBPKGS:= GLIB GLIB_DEV PKGSC_GLIB_DEV:= devel diff --git a/package/glib/patches/patch-gio_Makefile_in b/package/glib/patches/patch-gio_Makefile_in deleted file mode 100644 index 0bc0dbdc5..000000000 --- a/package/glib/patches/patch-gio_Makefile_in +++ /dev/null @@ -1,34 +0,0 @@ ---- glib-2.35.7.orig/gio/Makefile.in 2013-02-05 21:44:27.000000000 +0100 -+++ glib-2.35.7/gio/Makefile.in 2013-02-12 12:07:43.000000000 +0100 -@@ -1291,6 +1291,7 @@ DISTCLEANFILES = \ - glib_compile_resources_LDADD = \ - $(top_builddir)/glib/libglib-2.0.la \ - $(top_builddir)/gobject/libgobject-2.0.la \ -+ $(top_builddir)/gmodule/libgmodule-2.0.la \ - libgio-2.0.la - - glib_compile_resources_SOURCES = \ -@@ -1318,6 +1319,7 @@ glib_compile_schemas_SOURCES = \ - gsettings_LDADD = \ - $(top_builddir)/glib/libglib-2.0.la \ - $(top_builddir)/gobject/libgobject-2.0.la \ -+ $(top_builddir)/gmodule/libgmodule-2.0.la \ - libgio-2.0.la - - gsettings_SOURCES = gsettings-tool.c -@@ -1326,6 +1328,7 @@ dist_schema_DATA = gschema.dtd - gdbus_SOURCES = gdbus-tool.c - gdbus_LDADD = libgio-2.0.la \ - $(top_builddir)/glib/libglib-2.0.la \ -+ $(top_builddir)/gmodule/libgmodule-2.0.la \ - $(top_builddir)/gobject/libgobject-2.0.la - - completiondir = $(datadir)/bash-completion/completions -@@ -1338,6 +1341,7 @@ gresource_SOURCES = gresource-tool.c - gresource_CPPFLAGS = $(LIBELF_CFLAGS) $(AM_CPPFLAGS) - gresource_LDADD = libgio-2.0.la \ - $(top_builddir)/glib/libglib-2.0.la \ -+ $(top_builddir)/gmodule/libgmodule-2.0.la \ - $(top_builddir)/gobject/libgobject-2.0.la \ - $(LIBELF_LIBS) - diff --git a/package/huawei/Makefile b/package/huawei/Makefile index 6ea2fe069..37d7c2d24 100644 --- a/package/huawei/Makefile +++ b/package/huawei/Makefile @@ -8,8 +8,8 @@ PKG_VERSION:= 0.1 PKG_RELEASE:= 1 PKG_DESCR:= huawei modem control PKG_SECTION:= utils -PKG_DEPENDS:= libusb -PKG_BUILDDEP:= libusb +PKG_DEPENDS:= libusb libusb-compat +PKG_BUILDDEP:= libusb libusb-compat PKG_ARCH_DEPENDS:= !avr32 diff --git a/package/intltool/Makefile b/package/intltool/Makefile index 64b54f566..611a04dcb 100644 --- a/package/intltool/Makefile +++ b/package/intltool/Makefile @@ -4,12 +4,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= intltool -PKG_VERSION:= 0.41.1 +PKG_VERSION:= 0.50.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= d6c91bf06681919ccfdf3624035b75dc +PKG_MD5SUM:= 23fbd879118253cb99aeac067da5f591 PKG_DESCR:= Internationalization Tool Collection PKG_SECTION:= misc -PKG_SITES:= http://edge.launchpad.net/intltool/trunk/0.41.1/+download/ +PKG_SITES:= https://launchpad.net/intltool/trunk/0.50.2/+download/ include $(TOPDIR)/mk/package.mk diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 54f155f89..ec8728410 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= b79aae3055a51f8de5c0f1b8ca6cf619 PKG_DESCR:= IPsec management tools PKG_SECTION:= net/security -PKG_BUILDDEP:= openssl +PKG_BUILDDEP:= openssl flex PKG_DEPENDS:= libopenssl PKG_URL:= http://ipsec-tools.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ipsec-tools/} diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile index 9c167c60b..0d6bc1cef 100644 --- a/package/iptraf/Makefile +++ b/package/iptraf/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iptraf -PKG_VERSION:= 3.0.0 +PKG_VERSION:= 3.0.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 377371c28ee3c21a76f7024920649ea8 +PKG_MD5SUM:= 004c2c005a1b78739e22bc49d33e244d PKG_DESCR:= A console-based network monitoring program. PKG_SECTION:= net PKG_DEPENDS:= libncurses diff --git a/package/iptraf/patches/patch-src_Makefile b/package/iptraf/patches/patch-src_Makefile index c73f68411..15af62737 100644 --- a/package/iptraf/patches/patch-src_Makefile +++ b/package/iptraf/patches/patch-src_Makefile @@ -1,6 +1,6 @@ $Id$ ---- iptraf-3.0.0.orig/src/Makefile 2005-09-13 11:11:17.000000000 +0200 -+++ iptraf-3.0.0/src/Makefile 2011-01-21 13:46:03.628658655 +0100 +--- iptraf-3.0.1.orig/src/Makefile 2005-09-13 11:11:17.000000000 +0200 ++++ iptraf-3.0.1/src/Makefile 2013-03-04 11:42:11.000000000 +0100 @@ -18,7 +18,8 @@ VERSION = -DVERSION=\"$(VERNUMBER)\" BINDIR = ../../iptraf-$(VERNUMBER).bin.$(ARCH) @@ -32,6 +32,15 @@ $Id$ # You can uncomment this one to disable the backspace key in input fields. # This means you must use the Del key or Ctrl+H combination to erase the +@@ -98,7 +101,7 @@ LOCKDIR = /var/run/iptraf + # Object file names + + OBJS = iptraf.o itrafmon.o packet.o tcptable.o othptab.o ifstats.o deskman.o \ +-ipcsum.o hostmon.o fltedit.o tr.o cidr.o \ ++ipcsum.o hostmon.o fltedit.o cidr.o \ + fltselect.o ipfilter.o fltmgr.o ipfrag.o serv.o servname.o instances.o \ + timer.o revname.o pktsize.o landesc.o isdntab.o options.o promisc.o ifaces.o \ + error.o log.o mode.o getpath.o bar.o parseproto.o @@ -106,33 +109,31 @@ error.o log.o mode.o getpath.o bar.o par BINS = iptraf rvnamed rawtime diff --git a/package/iptraf/patches/patch-src_hostmon_c b/package/iptraf/patches/patch-src_hostmon_c index 0c77aad22..da8d6ff69 100644 --- a/package/iptraf/patches/patch-src_hostmon_c +++ b/package/iptraf/patches/patch-src_hostmon_c @@ -1,15 +1,14 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- iptraf-3.0.0.orig/src/hostmon.c 2005-09-13 08:42:54.000000000 +0200 -+++ iptraf-3.0.0/src/hostmon.c 2008-10-09 17:34:11.000000000 +0200 -@@ -30,7 +30,6 @@ details. - #include <netinet/in.h> - #include <linux/if_packet.h> +--- iptraf-3.0.1.orig/src/hostmon.c 2007-09-25 11:18:56.000000000 +0200 ++++ iptraf-3.0.1/src/hostmon.c 2013-03-04 11:41:08.000000000 +0100 +@@ -32,7 +32,6 @@ details. #include <linux/if_ether.h> --#include <linux/if_fddi.h> - #include <linux/if_tr.h> + #include <linux/netdevice.h> + #include <linux/if_fddi.h> +-#include <linux/if_tr.h> #include <net/if_arp.h> #include <stdlib.h> -@@ -293,8 +292,6 @@ void printethent(struct ethtab *table, s + #include <time.h> +@@ -294,8 +293,6 @@ void printethent(struct ethtab *table, s wprintw(table->tabwin, "Ethernet"); else if (entry->un.desc.linktype == LINK_PLIP) wprintw(table->tabwin, "PLIP"); @@ -18,16 +17,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ wprintw(table->tabwin, " HW addr: %s", entry->un.desc.ascaddr); -@@ -722,7 +719,7 @@ void hostmon(const struct OPTIONS *optio +@@ -723,7 +720,6 @@ void hostmon(const struct OPTIONS *optio unsigned long long updtime_usec = 0; struct desclist elist; /* Ethernet description list */ - struct desclist flist; /* FDDI description list */ -+ struct desclist flist; /* Other links description list */ struct desclist *list = NULL; FILE *logfile = NULL; -@@ -786,7 +783,6 @@ void hostmon(const struct OPTIONS *optio +@@ -787,7 +783,6 @@ void hostmon(const struct OPTIONS *optio initethtab(&table, options->actmode); loaddesclist(&elist, LINK_ETHERNET, WITHETCETHERS); @@ -35,18 +33,17 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ if (logging) { if (strcmp(current_logfile, "") == 0) { -@@ -900,9 +896,7 @@ void hostmon(const struct OPTIONS *optio +@@ -901,8 +896,7 @@ void hostmon(const struct OPTIONS *optio if (pkt_result != PACKET_OK) continue; - if ((linktype == LINK_ETHERNET) || (linktype == LINK_FDDI) - || (linktype == LINK_PLIP) || (linktype == LINK_TR) || -- (linktype == LINK_VLAN)) { -+ if ((linktype == LINK_ETHERNET) || (linktype == LINK_PLIP) || (linktype == LINK_TR) || (linktype == LINK_VLAN)) { ++ if ((linktype == LINK_ETHERNET) || (linktype == LINK_PLIP) || + (linktype == LINK_VLAN)) { if (fromaddr.sll_protocol == htons(ETH_P_IP)) - is_ip = 1; -@@ -920,12 +914,6 @@ void hostmon(const struct OPTIONS *optio +@@ -921,18 +915,6 @@ void hostmon(const struct OPTIONS *optio memcpy(scratch_daddr, ((struct ethhdr *) buf)->h_dest, ETH_ALEN); list = &elist; @@ -56,6 +53,20 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ - memcpy(scratch_daddr, ((struct fddihdr *) buf)->daddr, - FDDI_K_ALEN); - list = &flist; - } else if (linktype == LINK_TR) { - memcpy(scratch_saddr, ((struct trh_hdr *) buf)->saddr, - TR_ALEN); +- } else if (linktype == LINK_TR) { +- memcpy(scratch_saddr, ((struct trh_hdr *) buf)->saddr, +- TR_ALEN); +- memcpy(scratch_daddr, ((struct trh_hdr *) buf)->daddr, +- TR_ALEN); +- list = &flist; + } + + entry = in_ethtable(&table, linktype, scratch_saddr); +@@ -999,7 +981,6 @@ void hostmon(const struct OPTIONS *optio + doupdate(); + destroyethtab(&table); + destroydesclist(&elist); +- destroydesclist(&flist); + unmark_facility(LANMONIDFILE, ifptr); + strcpy(current_logfile, ""); + } diff --git a/package/iptraf/patches/patch-src_ifstats_c b/package/iptraf/patches/patch-src_ifstats_c index 555c93075..ac8f39d61 100644 --- a/package/iptraf/patches/patch-src_ifstats_c +++ b/package/iptraf/patches/patch-src_ifstats_c @@ -1,6 +1,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- iptraf-3.0.0.orig/src/ifstats.c 2005-09-13 08:42:54.000000000 +0200 -+++ iptraf-3.0.0/src/ifstats.c 2009-05-21 23:05:17.000000000 +0200 +--- iptraf-3.0.1.orig/src/ifstats.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.1/src/ifstats.c 2013-03-04 11:35:39.000000000 +0100 @@ -167,7 +167,7 @@ void initiflist(struct iflist **list) */ @@ -19,7 +19,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ (*ptmp)->index = plast->index + 1; plast->next_entry = *ptmp; (*ptmp)->prev_entry = plast; -@@ -879,7 +879,7 @@ void detstats(char *iface, const struct +@@ -879,7 +879,7 @@ void detstats(char *iface, const struct update_panels(); doupdate(); diff --git a/package/iptraf/patches/patch-src_othptab_c b/package/iptraf/patches/patch-src_othptab_c index e6b0a9829..3264a6c20 100644 --- a/package/iptraf/patches/patch-src_othptab_c +++ b/package/iptraf/patches/patch-src_othptab_c @@ -1,32 +1,14 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- iptraf-3.0.0.orig/src/othptab.c 2005-09-13 08:42:54.000000000 +0200 -+++ iptraf-3.0.0/src/othptab.c 2009-05-21 23:02:50.000000000 +0200 -@@ -17,13 +17,12 @@ details. - ***/ - +--- iptraf-3.0.1.orig/src/othptab.c 2007-09-25 11:47:35.000000000 +0200 ++++ iptraf-3.0.1/src/othptab.c 2013-03-04 11:39:50.000000000 +0100 +@@ -20,7 +20,6 @@ details. #include <asm/types.h> -+#include "options.h" -+#include "tcptable.h" + #include <sys/socket.h> #include <linux/if_ether.h> - #include <linux/if_tr.h> --#include <linux/if_fddi.h> +-#include <linux/if_tr.h> + #include <linux/netdevice.h> + #include <linux/if_fddi.h> #include <winops.h> - #include "arphdr.h" --#include "options.h" --#include "tcptable.h" - #include "othptab.h" - #include "deskman.h" - #include "attrs.h" -@@ -128,7 +127,7 @@ struct othptabent *add_othp_entry(struct - *nomem = 1; - return NULL; - } -- bzero(new_entry, sizeof(struct othptabent)); -+ memset(new_entry, 0, sizeof(struct othptabent)); - - new_entry->is_ip = is_ip; - new_entry->fragment = fragment; -@@ -139,11 +138,6 @@ struct othptabent *add_othp_entry(struct +@@ -142,16 +141,6 @@ struct othptabent *add_othp_entry(struct new_entry->smacaddr); convmacaddr(((struct ethhdr *) packet)->h_dest, new_entry->dmacaddr); @@ -35,10 +17,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ - new_entry->smacaddr); - convmacaddr(((struct fddihdr *) packet)->daddr, - new_entry->dmacaddr); - } else if (linkproto == LINK_TR) { - convmacaddr(((struct trh_hdr *) packet)->saddr, - new_entry->smacaddr); -@@ -373,8 +367,7 @@ void printothpentry(struct othptable *ta +- } else if (linkproto == LINK_TR) { +- convmacaddr(((struct trh_hdr *) packet)->saddr, +- new_entry->smacaddr); +- convmacaddr(((struct trh_hdr *) packet)->daddr, +- new_entry->dmacaddr); + } + } + +@@ -376,8 +365,7 @@ void printothpentry(struct othptable *ta strcat(msgstring, scratchpad); if ((entry->linkproto == LINK_ETHERNET) || diff --git a/package/iptraf/patches/patch-src_packet_c b/package/iptraf/patches/patch-src_packet_c index 1bc9b5964..85c402678 100644 --- a/package/iptraf/patches/patch-src_packet_c +++ b/package/iptraf/patches/patch-src_packet_c @@ -1,24 +1,14 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- iptraf-3.0.0.orig/src/packet.c 2005-09-13 08:42:54.000000000 +0200 -+++ iptraf-3.0.0/src/packet.c 2009-05-21 23:03:57.000000000 +0200 -@@ -35,7 +35,6 @@ details. - #include <sys/ioctl.h> - #include <linux/if_packet.h> +--- iptraf-3.0.1.orig/src/packet.c 2007-09-25 11:21:18.000000000 +0200 ++++ iptraf-3.0.1/src/packet.c 2013-03-04 11:42:52.000000000 +0100 +@@ -36,7 +36,6 @@ details. #include <linux/if_ether.h> --#include <linux/if_fddi.h> - #include <linux/if_tr.h> + #include <linux/netdevice.h> + #include <linux/if_fddi.h> +-#include <linux/if_tr.h> #include <linux/isdn.h> #include <linux/sockios.h> -@@ -81,8 +80,6 @@ unsigned short getlinktype(unsigned shor - result = LINK_ETHERNET; - else if (strncmp(ifname, "plip", 4) == 0) - result = LINK_PLIP; -- else if (strncmp(ifname, "fddi", 4) == 0) /* For some Ethernet- */ -- result = LINK_ETHERNET; /* emulated FDDI ifaces */ - else if (strncmp(ifname, "dvb", 3) == 0) - result = LINK_ETHERNET; - else if (strncmp(ifname, "sbni", 4) == 0) -@@ -136,9 +133,6 @@ unsigned short getlinktype(unsigned shor + #include <msgboxes.h> +@@ -136,9 +135,6 @@ unsigned short getlinktype(unsigned shor case ARPHRD_PPP: result = LINK_PPP; break; @@ -28,7 +18,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ case ARPHRD_IEEE802: case ARPHRD_IEEE802_TR: result = LINK_TR; -@@ -194,19 +188,6 @@ void adjustpacket(char *tpacket, unsigne +@@ -194,36 +190,6 @@ void adjustpacket(char *tpacket, unsigne *packet = tpacket + 4; *readlen -= 4; break; @@ -45,15 +35,23 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ - memmove(aligned_buf, *packet, min(SNAPSHOT_LEN, *readlen)); - *packet = aligned_buf; - break; - case LINK_TR: - /* - * Token Ring patch supplied by Tomas Dvorak -@@ -337,7 +318,7 @@ int processpacket(char *tpacket, char ** - * Prepare ISDN reference descriptor and table. - */ - -- bzero(&isdntable, sizeof(struct isdntab)); -+ memset(&isdntable, 0, sizeof(struct isdntab)); - isdn_iface_check(&isdnfd, ifname); - - /* +- case LINK_TR: +- /* +- * Token Ring patch supplied by Tomas Dvorak +- */ +- +- /* +- * Get the start of the IP packet from the Token Ring frame. +- */ +- dataoffset = get_tr_ip_offset(tpacket); +- *packet = tpacket + dataoffset; +- *readlen -= dataoffset; +- /* +- * Move IP datagram into an aligned buffer. +- */ +- memmove(aligned_buf, *packet, min(SNAPSHOT_LEN, *readlen)); +- *packet = aligned_buf; +- break; + case LINK_IPIP: + *packet = tpacket; + break; diff --git a/package/iptraf/patches/patch-src_revname_c b/package/iptraf/patches/patch-src_revname_c index 97aae6f8c..d6b4d4d5c 100644 --- a/package/iptraf/patches/patch-src_revname_c +++ b/package/iptraf/patches/patch-src_revname_c @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- iptraf-3.0.0.orig/src/revname.c 2005-09-13 08:42:54.000000000 +0200 -+++ iptraf-3.0.0/src/revname.c 2009-05-21 23:03:07.000000000 +0200 -@@ -164,7 +164,7 @@ int revname(int *lookup, struct in_addr +--- iptraf-3.0.1.orig/src/revname.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.1/src/revname.c 2013-03-04 11:35:39.000000000 +0100 +@@ -164,7 +164,7 @@ int revname(int *lookup, struct in_addr struct timeval tv; int sstat = 0; diff --git a/package/iptraf/patches/patch-src_tcptable_c b/package/iptraf/patches/patch-src_tcptable_c index 6ac96e6d1..80b74ba4f 100644 --- a/package/iptraf/patches/patch-src_tcptable_c +++ b/package/iptraf/patches/patch-src_tcptable_c @@ -1,6 +1,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- iptraf-3.0.0.orig/src/tcptable.c 2005-09-13 08:42:54.000000000 +0200 -+++ iptraf-3.0.0/src/tcptable.c 2009-05-21 23:07:02.000000000 +0200 +--- iptraf-3.0.1.orig/src/tcptable.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.1/src/tcptable.c 2013-03-04 11:38:22.000000000 +0100 @@ -17,6 +17,7 @@ details. ***/ @@ -29,7 +29,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ /* * Set raw port numbers -@@ -596,12 +597,10 @@ void updateentry(struct tcptable *table, +@@ -596,14 +597,10 @@ void updateentry(struct tcptable *table, tableentry->spanbr += bcount; if (opts->mac) { @@ -40,6 +40,8 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ convmacaddr(((struct ethhdr *) packet)->h_source, newmacaddr); - } else if (linkproto == LINK_FDDI) { - convmacaddr(((struct fddihdr *) packet)->saddr, newmacaddr); - } else if (linkproto == LINK_TR) { - convmacaddr(((struct trh_hdr *) packet)->saddr, newmacaddr); +- } else if (linkproto == LINK_TR) { +- convmacaddr(((struct trh_hdr *) packet)->saddr, newmacaddr); } + + if (tableentry->smacaddr[0] != '\0') { diff --git a/package/iptraf/patches/patch-src_tcptable_h b/package/iptraf/patches/patch-src_tcptable_h index a20d69969..f2a0d15c6 100644 --- a/package/iptraf/patches/patch-src_tcptable_h +++ b/package/iptraf/patches/patch-src_tcptable_h @@ -1,27 +1,10 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- iptraf-3.0.0.orig/src/tcptable.h 2005-09-13 08:42:54.000000000 +0200 -+++ iptraf-3.0.0/src/tcptable.h 2009-05-21 22:49:05.000000000 +0200 -@@ -6,7 +6,6 @@ - - ***/ - --#include <stdlib.h> - #include <string.h> - #include <unistd.h> - #include <fcntl.h> -@@ -14,15 +13,12 @@ - #include <panel.h> - #include <netdb.h> - #include <time.h> --#include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> - #include <net/if_arp.h> --#include <asm/types.h> - #include <linux/if_packet.h> +--- iptraf-3.0.1.orig/src/tcptable.h 2007-09-25 11:46:03.000000000 +0200 ++++ iptraf-3.0.1/src/tcptable.h 2013-03-04 11:35:47.000000000 +0100 +@@ -24,7 +24,6 @@ #include <linux/if_ether.h> --#include <linux/if_fddi.h> - #include <linux/if_tr.h> - #include <net/if.h> + #include <linux/netdevice.h> + #include <linux/if_fddi.h> +-#include <linux/if_tr.h> + // #include <net/if.h> #include <netinet/ip.h> + #include <netinet/udp.h> diff --git a/package/iptraf/patches/patch-src_tr_c b/package/iptraf/patches/patch-src_tr_c index 391c26e6c..09c6b544d 100644 --- a/package/iptraf/patches/patch-src_tr_c +++ b/package/iptraf/patches/patch-src_tr_c @@ -1,12 +1,13 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- iptraf-3.0.0.orig/src/tr.c 2005-09-13 08:42:54.000000000 +0200 -+++ iptraf-3.0.0/src/tr.c 2009-05-21 22:59:57.000000000 +0200 -@@ -6,7 +6,7 @@ +--- iptraf-3.0.1.orig/src/tr.c 2005-09-13 08:42:54.000000000 +0200 ++++ iptraf-3.0.1/src/tr.c 2013-03-04 11:41:40.000000000 +0100 +@@ -6,8 +6,7 @@ * Copyright (c) Gerard Paul Java 2002 */ -#include <asm/types.h> +-#include <linux/if_tr.h> +#include <sys/types.h> - #include <linux/if_tr.h> #include <netinet/in.h> + unsigned int get_tr_ip_offset(unsigned char *pkt) diff --git a/package/iptraf/patches/patch-support_listbox_c b/package/iptraf/patches/patch-support_listbox_c index df5521b7f..0d760507a 100644 --- a/package/iptraf/patches/patch-support_listbox_c +++ b/package/iptraf/patches/patch-support_listbox_c @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- iptraf-3.0.0.orig/support/listbox.c 2002-07-19 18:48:11.000000000 +0200 -+++ iptraf-3.0.0/support/listbox.c 2009-05-21 23:06:00.000000000 +0200 -@@ -19,7 +19,7 @@ void tx_init_listbox(struct scroll_list +--- iptraf-3.0.1.orig/support/listbox.c 2002-07-19 18:48:11.000000000 +0200 ++++ iptraf-3.0.1/support/listbox.c 2013-03-04 11:35:39.000000000 +0100 +@@ -19,7 +19,7 @@ void tx_init_listbox(struct scroll_list int mainattr, int borderattr, int selectattr, int keyattr) { diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index 551fcf520..9ea8b22a2 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -21,6 +21,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --enable-aligned +TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 libtorrent-install: ${INSTALL_DIR} ${IDIR_LIBTORRENT}/usr/lib diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile index 392b62638..61e562664 100644 --- a/package/libvirt/Makefile +++ b/package/libvirt/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libvirt -PKG_VERSION:= 0.9.10 +PKG_VERSION:= 1.0.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= a424bb793521e637349da47e93dd5fff +PKG_MD5SUM:= 3d9f85d586c9aa3d819b626622f3fc97 PKG_DESCR:= virtualization API PKG_SECTION:= libs PKG_BUILDDEP:= libxml2 gnutls python2 libpcap parted udev @@ -14,7 +14,7 @@ PKG_DEPENDS:= libxml2 libgnutls python2 libpcap libreadline PKG_DEPENDS+= libintl dmidecode kmod-netfilter-xt-target-checksum PKG_DEPENDS+= dnsmasq qemu libnl PKG_URL:= http://www.libvirt.org/ -PKG_SITES:= ftp://libvirt.org/libvirt/ +PKG_SITES:= http://libvirt.org/sources/ PKG_HOST_DEPENDS:= !freebsd !netbsd !openbsd PKG_ARCH_DEPENDS:= x86 x86_64 @@ -26,6 +26,7 @@ $(eval $(call PKG_template,LIBVIRT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P include ${TOPDIR}/mk/python.mk TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/tirpc +TARGET_CFLAGS+= -fno-stack-protector CONFIGURE_ENV+= gl_cv_warn__fstack_protector_all=no \ ac_cv_path_IPTABLES_PATH=/usr/sbin/iptables \ @@ -38,6 +39,7 @@ CONFIGURE_ARGS+= --without-xen \ --without-lxc \ --without-vbox \ --without-macvtap \ + --without-remote \ --disable-silent-rules \ --without-sasl diff --git a/package/log4cplus/Makefile b/package/log4cplus/Makefile index b2e2aab1a..05458cd0c 100644 --- a/package/log4cplus/Makefile +++ b/package/log4cplus/Makefile @@ -18,6 +18,8 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk +TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 + $(eval $(call PKG_template,LOG4CPLUS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) post-install: diff --git a/package/log4cxx/Makefile b/package/log4cxx/Makefile index ffc5b6fe5..2f0051889 100644 --- a/package/log4cxx/Makefile +++ b/package/log4cxx/Makefile @@ -28,6 +28,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LOG4CXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LOG4CXX_DEV,${PKG_NAME}_dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOG4CXX_DEV},${PKGSC_LOG4CXX_DEV})) +TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 + log4cxx-install: ${INSTALL_DIR} ${IDIR_LOG4CXX}/usr/lib ${CP} ${WRKINST}/usr/lib/*.a ${IDIR_LOG4CXX}/usr/lib diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index f02e7bb3d..5b3822664 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nfs-utils PKG_VERSION:= 1.2.5 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 8395ac770720b83c5c469f88306d7765 PKG_DESCR:= Utilities for NFS kernel server implementation PKG_SECTION:= net/fs -PKG_DEPENDS:= kmod-nfsd keyutils libtirpc rpcbind -PKG_BUILDDEP:= keyutils libtirpc +PKG_DEPENDS:= kmod-nfsd keyutils libtirpc rpcbind libdevmapper +PKG_BUILDDEP:= keyutils libtirpc lvm PKG_URL:= http://sourceforge.net/projects/nfs PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} diff --git a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in index f667eeb61..9e925158b 100644 --- a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in +++ b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in @@ -1,6 +1,6 @@ ---- nspr-4.8.2.orig/mozilla/nsprpub/config/Makefile.in 2009-03-03 23:04:23.000000000 +0100 -+++ nspr-4.8.2/mozilla/nsprpub/config/Makefile.in 2010-05-02 12:25:27.673464050 +0200 -@@ -145,7 +145,7 @@ endif +--- nspr-4.9.5.orig/mozilla/nsprpub/config/Makefile.in 2012-11-14 00:17:57.000000000 +0100 ++++ nspr-4.9.5/mozilla/nsprpub/config/Makefile.in 2013-02-27 16:29:38.000000000 +0100 +@@ -113,7 +113,7 @@ endif $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) diff --git a/package/nspr/patches/patch-mozilla_nsprpub_configure b/package/nspr/patches/patch-mozilla_nsprpub_configure new file mode 100644 index 000000000..70465b40f --- /dev/null +++ b/package/nspr/patches/patch-mozilla_nsprpub_configure @@ -0,0 +1,11 @@ +--- nspr-4.9.5.orig/mozilla/nsprpub/configure 2012-12-19 20:21:31.000000000 +0100 ++++ nspr-4.9.5/mozilla/nsprpub/configure 2013-02-27 16:43:20.000000000 +0100 +@@ -2848,7 +2849,7 @@ esac + if test "$cross_compiling" = "yes"; then + CROSS_COMPILE=1 + else +- CROSS_COMPILE= ++ CROSS_COMPILE=1 + fi + + echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 diff --git a/package/openais/Makefile b/package/openais/Makefile deleted file mode 100644 index 102a7d5f6..000000000 --- a/package/openais/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# 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:= openais -PKG_VERSION:= 1.1.4 -PKG_RELEASE:= 1 -PKG_MD5SUM:= e500ad3c49fdc45d8653f864e80ed82c -PKG_DESCR:= AIS implementation -PKG_SECTION:= ha -PKG_BUILDDEP:= corosync -PKG_DEPENDS:= corosync -PKG_URL:= http://www.openais.org/ -PKG_SITES:= ftp://ftp:download@ftp.openais.org/downloads/openais-1.1.4/ - -PKG_ARCH_DEPENDS:= !avr32 - -include $(TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,OPENAIS,openais,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIGURE_ENV+= ac_cv_func_fnmatch_works=yes - -openais-install: - $(INSTALL_DIR) $(IDIR_OPENAIS)/usr/lib - $(CP) $(WRKINST)/usr/lib/lib*.so* \ - $(IDIR_OPENAIS)/usr/lib - $(INSTALL_DIR) $(IDIR_OPENAIS)/usr/sbin - $(CP) $(WRKINST)/usr/sbin/* \ - $(IDIR_OPENAIS)/usr/sbin - $(INSTALL_DIR) $(IDIR_OPENAIS)/usr/libexec - $(CP) $(WRKINST)/usr/libexec/* \ - $(IDIR_OPENAIS)/usr/libexec - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openais/files/openais.init b/package/openais/files/openais.init deleted file mode 100644 index 25b2d8974..000000000 --- a/package/openais/files/openais.init +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -#PKG openais -#INIT 80 -. /etc/rc.conf - -case $1 in -autostop) ;; -autostart) - test x"${corosync:-NO}" = x"NO" && exit 0 - exec sh $0 start - ;; -start) - [ -d /var/lib/corosync ] || mkdir -p /var/lib/corosync - mkdir -p /var/lib/heartbeat/crm - chown hacluster:haclient /var/lib/heartbeat/crm - chmod 775 /var/lib/heartbeat/crm - mkdir -p /var/lib/pengine - chown hacluster /var/lib/pengine - /usr/sbin/aisexec - ;; -stop) - kill $(pgrep -f corosync) - ;; -restart) - sh $0 stop - sh $0 start - ;; -*) - echo "usage: $0 {start | stop | restart}" - ;; -esac -exit $? diff --git a/package/openais/patches/patch-Makefile_in b/package/openais/patches/patch-Makefile_in deleted file mode 100644 index ab7f536bb..000000000 --- a/package/openais/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- openais-1.1.4.orig/Makefile.in 2010-08-23 21:59:26.000000000 +0200 -+++ openais-1.1.4/Makefile.in 2011-06-25 22:04:16.722682552 +0200 -@@ -285,7 +285,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc - dist_doc_DATA = LICENSE README.amf AUTHORS - corosysconfdir = ${COROSYSCONFDIR} - corosysconf_DATA = conf/amf.conf.example --SUBDIRS = include lib services test pkgconfig man init -+SUBDIRS = include lib services test pkgconfig init - RPMBUILDOPTS = --define "_sourcedir $(abs_builddir)" \ - --define "_specdir $(abs_builddir)" \ - --define "_builddir $(abs_builddir)" \ diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index 78408fd7c..d0bfbea2d 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= oprofile -PKG_VERSION:= 0.9.7 +PKG_VERSION:= 0.9.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= 8b5d1d9b65f84420bcc3234777ad3be3 +PKG_MD5SUM:= 6d127023af1dd1cf24e15411229f3cc8 PKG_DESCR:= system-wide profiles PKG_SECTION:= debug PKG_DEPENDS:= libpopt kmod-oprofile libbfd libstdcxx diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile index a7a682b89..03e7cc974 100644 --- a/package/orbit2/Makefile +++ b/package/orbit2/Makefile @@ -40,7 +40,8 @@ CONFIGURE_ENV+= ac_cv_alignof_CORBA_octet=1 \ ac_cv_alignof_CORBA_double=4 \ ac_cv_alignof_CORBA_long_double=4 \ ac_cv_alignof_CORBA_struct=1 \ - ac_cv_alignof_CORBA_pointer=4 + ac_cv_alignof_CORBA_pointer=4 \ + ac_cv_cflags_gcc_option__Werror_implicit_function_declaration=no orbit2-install: $(INSTALL_DIR) $(IDIR_ORBIT2)/usr/lib diff --git a/package/Pacemaker-Python-GUI/Makefile b/package/pacemaker-mgmt/Makefile index 5a412863e..d4d79ee8e 100644 --- a/package/Pacemaker-Python-GUI/Makefile +++ b/package/pacemaker-mgmt/Makefile @@ -3,45 +3,36 @@ include $(TOPDIR)/rules.mk -PKG_NAME:= Pacemaker-Python-GUI -PKG_VERSION:= 2.1.0 +PKG_NAME:= pacemaker-mgmt +PKG_VERSION:= 2.0.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 22379f78409cec9df10c25983783ef6c -PKG_DESCR:= Pacemaker GUI +PKG_MD5SUM:= be16a38588d1c518f53e64e7e48e1c90 +PKG_DESCR:= Pacemaker management daemon PKG_SECTION:= ha -PKG_BUILDDEP:= pacemaker gnutls pam +PKG_BUILDDEP:= pacemaker gnutls pam python2 PKG_URL:= http://hg.clusterlabs.org/pacemaker/pygui/ PKG_SITES:= http://openadk.org/distfiles/ -PKG_CFLINE_PACEMAKER_PYTHON_GUI:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC PKG_CFLINE_PACEMAKER_MGMTD:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC -PKG_SUBPKGS:= PACEMAKER_PYTHON_GUI PACEMAKER_MGMTD +PKG_SUBPKGS:= PACEMAKER_MGMTD PKGSD_PACEMAKER_MGMTD:= Management daemon for Pacemaker GUI include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,PACEMAKER_PYTHON_GUI,pacemaker-python-gui,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PACEMAKER_MGMTD,pacemaker-mgmtd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +include $(TOPDIR)/mk/python.mk + +CONFIGURE_ENV+= PYTHON=$(PYTHON) CONFIGURE_ARGS+= --with-initdir=/etc/init.d \ --with-ocf-root=/usr/lib/ocf \ + --without-ais-support \ --disable-fatal-warnings TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include/python2.7 \ -I$(STAGING_DIR)/usr/include/pacemaker \ -I$(STAGING_DIR)/usr/include/heartbeat -pacemaker-python-gui-install: - $(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/bin - $(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/lib/heartbeat-gui - $(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/share/heartbeat-gui - $(CP) $(WRKINST)/usr/lib/heartbeat-gui/* \ - $(IDIR_PACEMAKER_PYTHON_GUI)/usr/lib/heartbeat-gui - $(CP) $(WRKINST)/usr/share/heartbeat-gui/* \ - $(IDIR_PACEMAKER_PYTHON_GUI)/usr/share/heartbeat-gui - $(CP) $(WRKINST)/usr/bin/*_gui \ - $(IDIR_PACEMAKER_PYTHON_GUI)/usr/bin - pacemaker-mgmtd-install: $(INSTALL_DIR) $(IDIR_PACEMAKER_MGMTD)/usr/lib $(CP) $(WRKINST)/usr/lib/libhbmgmt*so* \ diff --git a/package/pacemaker-mgmt/patches/patch-configure b/package/pacemaker-mgmt/patches/patch-configure new file mode 100644 index 000000000..cc517cf6e --- /dev/null +++ b/package/pacemaker-mgmt/patches/patch-configure @@ -0,0 +1,109 @@ +--- pacemaker-mgmt-2.0.2.orig/configure 2013-02-28 13:48:44.000000000 +0100 ++++ pacemaker-mgmt-2.0.2/configure 2013-03-04 11:56:52.000000000 +0100 +@@ -1,4 +1,5 @@ + #! /bin/sh ++set -x + # Guess values for system-dependent variables and create Makefiles. + # Generated by GNU Autoconf 2.69. + # +@@ -19866,35 +19867,6 @@ fi + + + +-STACKS="" +-CLUSTERLIBS="" +-if test $SUPPORT_HEARTBEAT = 1; then +- STACKS="$STACKS heartbeat" +- CLUSTERLIBS="$CLUSTERLIBS -lhbclient -lccmclient -lclm" +-fi +- +-if test $SUPPORT_AIS = 1; then +- STACKS="$STACKS $AIS_VERSION" +- #CLUSTERLIBS="$CLUSTERLIBS ${AISMSGLIB}" +-else +- AISPREFIX="" +- LCRSODIR="$libdir" +-fi +- +-PKG_FEATURES="$PKG_FEATURES$STACKS" +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported stacks" >&5 +-$as_echo_n "checking for supported stacks... " >&6; } +-if test x"$STACKS" = x; then +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "You must choose at least one cluster stack to support +-See \`config.log' for more details" "$LINENO" 5; } +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $STACKS" >&5 +-$as_echo "$STACKS" >&6; } +- +- + + + +@@ -21522,62 +21494,9 @@ CPPFLAGS="$save_CPPFLAGS" + + + +-as_ac_File=`$as_echo "ac_cv_file_$sysconfdir/pam.d/common-account" | $as_tr_sh` +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sysconfdir/pam.d/common-account" >&5 +-$as_echo_n "checking for $sysconfdir/pam.d/common-account... " >&6; } +-if eval \${$as_ac_File+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +-if test -r "$sysconfdir/pam.d/common-account"; then +- eval "$as_ac_File=yes" +-else +- eval "$as_ac_File=no" +-fi +-fi +-eval ac_res=\$$as_ac_File +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-if eval test \"x\$"$as_ac_File"\" = x"yes"; then : +- +-fi +- +-as_ac_File=`$as_echo "ac_cv_file_$sysconfdir/pam.d/common-auth" | $as_tr_sh` +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sysconfdir/pam.d/common-auth" >&5 +-$as_echo_n "checking for $sysconfdir/pam.d/common-auth... " >&6; } +-if eval \${$as_ac_File+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +-if test -r "$sysconfdir/pam.d/common-auth"; then +- eval "$as_ac_File=yes" +-else +- eval "$as_ac_File=no" +-fi +-fi +-eval ac_res=\$$as_ac_File +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-if eval test \"x\$"$as_ac_File"\" = x"yes"; then : +- +-fi +- +- if test -f $sysconfdir/pam.d/common-account -a \ +- -f /etc/pam.d/common-auth; then +- USE_PAM_COMMON_TRUE= +- USE_PAM_COMMON_FALSE='#' +-else +- USE_PAM_COMMON_TRUE='#' +- USE_PAM_COMMON_FALSE= +-fi +- ++USE_PAM_COMMON_TRUE='#' ++USE_PAM_COMMON_FALSE= + +- if test "x${enable_mgmt_client}" != "xno" -a "x${PYTHON_INCLUDES}" = "x"; then +- FatalMissingThing "Python.h" \ +- "The GUI managment module needs Python.h (Linux: python-devel package)" +- fi + + if test "$ac_cv_header_security_pam_appl_h" = "no" -a "$ac_cv_header_pam_pam_appl_h" = "no"; then + FatalMissingThing "security/pam_appl.h" \ diff --git a/package/pacemaker/Makefile b/package/pacemaker/Makefile index b81855345..9168fd64d 100644 --- a/package/pacemaker/Makefile +++ b/package/pacemaker/Makefile @@ -4,14 +4,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:= pacemaker -PKG_VERSION:= 1.1.7 +PKG_VERSION:= 1.1.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= 818682b8d937e6c6a6e5f999528328a5 +PKG_MD5SUM:= 3aaa95da2bdce96e0c244a2fb0e8b1e3 PKG_DESCR:= scalable High-Availability cluster resource manager PKG_SECTION:= ha PKG_BUILDDEP:= resource-agents cluster-glue pam gnutls corosync libtool PKG_DEPENDS:= python2 python2-readline python2-bzip2 cluster-glue libuuid -PKG_DEPENDS+= bash resource-agents pam libgnutls glib libxslt libxml2 libltdl +PKG_DEPENDS+= bash resource-agents pam libgnutls glib libxslt libxml2 libltdl librt PKG_URL:= http://www.clusterlabs.org/ PKG_SITES:= http://openadk.org/distfiles/ @@ -22,27 +22,17 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PACEMAKER,pacemaker,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -# disable honour cflags stuff -XAKE_FLAGS+= GCC_HONOUR_COPTS=s - CONFIGURE_ARGS+= --disable-fatal-warnings \ --with-corosync \ --without-ais \ --without-heartbeat CONFIGURE_ENV+= ac_cv_path_HELP2MAN='' -CFLAGS_FOR_BUILD+= -I$(STAGING_DIR)/usr/include/heartbeat -TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/heartbeat - -pre-configure: - $(SED) "s#@@STAGING_DIR@@#$(STAGING_DIR)#" $(WRKBUILD)/configure pacemaker-install: $(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/lib/heartbeat $(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/lib/ocf $(CP) $(WRKINST)/usr/lib/lib*.so* \ $(IDIR_PACEMAKER)/usr/lib - $(CP) $(WRKINST)/usr/lib/heartbeat/* \ - $(IDIR_PACEMAKER)/usr/lib/heartbeat $(CP) $(WRKINST)/usr/lib/ocf/* \ $(IDIR_PACEMAKER)/usr/lib/ocf $(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/share/pacemaker diff --git a/package/pacemaker/patches/patch-cib_Makefile_in b/package/pacemaker/patches/patch-cib_Makefile_in new file mode 100644 index 000000000..c95cdf227 --- /dev/null +++ b/package/pacemaker/patches/patch-cib_Makefile_in @@ -0,0 +1,11 @@ +--- pacemaker-1.1.8.orig/cib/Makefile.in 2013-02-28 11:07:10.000000000 +0100 ++++ pacemaker-1.1.8/cib/Makefile.in 2013-02-28 11:23:15.000000000 +0100 +@@ -450,6 +450,8 @@ hadir = $(sysconfdir)/ha.d + halibdir = $(CRM_DAEMON_DIR) + commmoddir = $(halibdir)/modules/comm + COMMONLIBS = $(top_builddir)/lib/common/libcrmcommon.la \ ++ $(top_builddir)/lib/fencing/libstonithd.la \ ++ $(top_builddir)/lib/pengine/libpe_rules.la \ + $(top_builddir)/lib/cib/libcib.la + + @BUILD_HELP_TRUE@man8_MANS = diff --git a/package/pacemaker/patches/patch-configure b/package/pacemaker/patches/patch-configure deleted file mode 100644 index 363b8595e..000000000 --- a/package/pacemaker/patches/patch-configure +++ /dev/null @@ -1,63 +0,0 @@ ---- pacemaker-1.1.7.orig/configure 2012-07-31 13:24:43.000000000 +0200 -+++ pacemaker-1.1.7/configure 2012-07-31 13:27:31.000000000 +0200 -@@ -12965,7 +12965,7 @@ $as_echo_n "checking for $2 in $1... " > - printf "#include <stdio.h>\n" > ${Cfile}.c - printf "#include <%s>\n" $1 >> ${Cfile}.c - printf "int main(int argc, char **argv) { printf(\"%%s\", %s); return 0; }\n" $2 >> ${Cfile}.c -- $CC $CFLAGS ${Cfile}.c -o ${Cfile} -+ $CC_FOR_BUILD $CFLAGS_FOR_BUILD ${Cfile}.c -o ${Cfile} - value=`${Cfile}` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $value" >&5 - $as_echo "$value" >&6; } -@@ -13208,7 +13208,7 @@ case $libdir in - *prefix*|NONE) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which lib directory to use" >&5 - $as_echo_n "checking which lib directory to use... " >&6; } -- for aDir in lib64 lib -+ for aDir in lib - do - trydir="${exec_prefix}/${aDir}" - if -@@ -13261,33 +13261,11 @@ $as_echo "$as_me: WARNING: $j directory - done - - --case "$host_os" in --*bsd*) LIBS="-L/usr/local/lib" -- CPPFLAGS="$CPPFLAGS -I/usr/local/include" -- INIT_EXT=".sh" -- ;; --*solaris*) -- ;; --*linux*) -- - cat >>confdefs.h <<_ACEOF - #define ON_LINUX 1 - _ACEOF - -- CFLAGS="$CFLAGS -I${prefix}/include" -- ;; --darwin*) -- --cat >>confdefs.h <<_ACEOF --#define ON_DARWIN 1 --_ACEOF -- -- LIBS="$LIBS -L${prefix}/lib" -- CFLAGS="$CFLAGS -I${prefix}/include" -- ;; --esac -- --CFLAGS="$CFLAGS -I${prefix}/include/heartbeat" -+CFLAGS="$CFLAGS -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/heartbeat" - - - { $as_echo "$as_me:${as_lineno-$LINENO}: Host CPU: $host_cpu" >&5 -@@ -18920,7 +18898,6 @@ else - - # We had to eliminate -Wnested-externs because of libtool changes - EXTRA_FLAGS="-fgnu89-inline -- -fstack-protector-all - -Wall - -Waggregate-return - -Wbad-function-cast diff --git a/package/pacemaker/patches/patch-lrmd_Makefile_in b/package/pacemaker/patches/patch-lrmd_Makefile_in new file mode 100644 index 000000000..c30d80227 --- /dev/null +++ b/package/pacemaker/patches/patch-lrmd_Makefile_in @@ -0,0 +1,19 @@ +--- pacemaker-1.1.8.orig/lrmd/Makefile.in 2013-02-28 11:07:12.000000000 +0100 ++++ pacemaker-1.1.8/lrmd/Makefile.in 2013-02-28 12:16:59.000000000 +0100 +@@ -455,11 +455,14 @@ lrmdlibdir = $(CRM_DAEMON_DIR) + lrmd_SOURCES = main.c lrmd.c tls_backend.c + lrmd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \ + $(top_builddir)/lib/services/libcrmservice.la \ +- $(top_builddir)/lib/lrmd/liblrmd.la \ +- $(top_builddir)/lib/fencing/libstonithd.la ++ $(top_builddir)/lib/pengine/libpe_rules.la \ ++ $(top_builddir)/lib/fencing/libstonithd.la \ ++ $(top_builddir)/lib/lrmd/liblrmd.la + + lrmd_test_SOURCES = test.c + lrmd_test_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \ ++ $(top_builddir)/lib/pengine/libpe_rules.la \ ++ $(top_builddir)/lib/fencing/libstonithd.la \ + $(top_builddir)/lib/lrmd/liblrmd.la \ + $(top_builddir)/lib/cib/libcib.la \ + $(top_builddir)/lib/services/libcrmservice.la \ diff --git a/package/pacemaker/patches/patch-mcp_Makefile_in b/package/pacemaker/patches/patch-mcp_Makefile_in new file mode 100644 index 000000000..a3e72277e --- /dev/null +++ b/package/pacemaker/patches/patch-mcp_Makefile_in @@ -0,0 +1,11 @@ +--- pacemaker-1.1.8.orig/mcp/Makefile.in 2013-02-28 11:07:13.000000000 +0100 ++++ pacemaker-1.1.8/mcp/Makefile.in 2013-02-28 11:18:34.000000000 +0100 +@@ -456,7 +456,7 @@ MAINTAINERCLEANFILES = Makefile.in + @BUILD_CS_SUPPORT_TRUE@@HAVE_SYSTEMD_TRUE@systemdunit_DATA = pacemaker.service + @BUILD_CS_SUPPORT_TRUE@noinst_HEADERS = + @BUILD_CS_SUPPORT_TRUE@pacemakerd_SOURCES = pacemaker.c corosync.c +-@BUILD_CS_SUPPORT_TRUE@pacemakerd_LDADD = $(top_builddir)/lib/cluster/libcrmcluster.la $(top_builddir)/lib/common/libcrmcommon.la ++@BUILD_CS_SUPPORT_TRUE@pacemakerd_LDADD = $(top_builddir)/lib/cluster/libcrmcluster.la $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/fencing/libstonithd.la + @BUILD_CS_SUPPORT_TRUE@pacemakerd_LDFLAGS = $(CLUSTERLIBS) + all: all-am + diff --git a/package/pacemaker/patches/patch-mcp_pacemaker_h b/package/pacemaker/patches/patch-mcp_pacemaker_h deleted file mode 100644 index 8848e6976..000000000 --- a/package/pacemaker/patches/patch-mcp_pacemaker_h +++ /dev/null @@ -1,10 +0,0 @@ ---- pacemaker-1.1.7.orig/mcp/pacemaker.h 2012-03-28 08:14:13.000000000 +0200 -+++ pacemaker-1.1.7/mcp/pacemaker.h 2012-07-31 13:43:39.000000000 +0200 -@@ -21,6 +21,7 @@ - #include <sys/param.h> - #include <sys/types.h> - #include <sys/wait.h> -+#include <sys/resource.h> - - #include <stdint.h> - diff --git a/package/pacemaker/patches/patch-tools_Makefile_in b/package/pacemaker/patches/patch-tools_Makefile_in new file mode 100644 index 000000000..36d72e3bd --- /dev/null +++ b/package/pacemaker/patches/patch-tools_Makefile_in @@ -0,0 +1,12 @@ +--- pacemaker-1.1.8.orig/tools/Makefile.in 2013-02-28 11:07:13.000000000 +0100 ++++ pacemaker-1.1.8/tools/Makefile.in 2013-02-28 12:28:59.000000000 +0100 +@@ -570,6 +570,9 @@ INCLUDES = -I$(top_builddir)/include -I$ + COMMONLIBS = \ + $(top_builddir)/lib/common/libcrmcommon.la \ + $(top_builddir)/lib/cib/libcib.la \ ++ $(top_builddir)/lib/pengine/libpe_rules.la \ ++ $(top_builddir)/lib/fencing/libstonithd.la \ ++ $(top_builddir)/lib/services/libcrmservice.la \ + $(CURSESLIBS) $(CLUSTERLIBS) + + headerdir = $(pkgincludedir)/crm diff --git a/package/pango/Makefile b/package/pango/Makefile index f5f4ba30a..8babbb554 100644 --- a/package/pango/Makefile +++ b/package/pango/Makefile @@ -4,17 +4,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pango -PKG_VERSION:= 1.33.7 +PKG_VERSION:= 1.28.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= 0dcdae60523229c20ee6551345206988 +PKG_MD5SUM:= 22ad1c8d3fda7e73b0798035f3dd96bc PKG_DESCR:= pango library PKG_SECTION:= libs PKG_BUILDDEP:= libXft glib cairo libstdcxx harfbuzz fontconfig PKG_URL:= http://www.pango.org/ -PKG_SITES:= ${MASTER_SITE_GNOME:=pango/1.33/} +PKG_SITES:= ${MASTER_SITE_GNOME:=pango/1.28/} PKG_NEED_CXX:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz +#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz PKG_SUBPKGS:= PANGO PANGO_DEV PKGSC_PANGO_DEV:= devel diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile index 631a43e74..1cde53cf7 100644 --- a/package/pciutils/Makefile +++ b/package/pciutils/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pciutils -PKG_VERSION:= 3.1.8 +PKG_VERSION:= 3.1.10 PKG_RELEASE:= 1 -PKG_MD5SUM:= 8362de952d95835d8bf5e5d27f723d66 +PKG_MD5SUM:= 51ded74e4184d4a6c9f2ada95c28c067 PKG_DESCR:= PCI Utilities PKG_SECTION:= utils PKG_DEPENDS:= zlib diff --git a/package/php/files/php-cli.conffiles b/package/php/files/php-cli.conffiles index f1b6b5fc9..e69de29bb 100644 --- a/package/php/files/php-cli.conffiles +++ b/package/php/files/php-cli.conffiles @@ -1 +0,0 @@ -/etc/php.ini diff --git a/package/poppler/Makefile b/package/poppler/Makefile index e124b4bf6..7b5518990 100644 --- a/package/poppler/Makefile +++ b/package/poppler/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= poppler -PKG_VERSION:= 0.18.4 +PKG_VERSION:= 0.22.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 12658f3308597e57f3faff538cc73baf +PKG_MD5SUM:= 50c259fdda538c1ba94b62aa25f7ec87 PKG_DESCR:= pdf rendering library PKG_SECTION:= libs PKG_BUILDDEP:= fontconfig libstdcxx diff --git a/package/ppp/patches/patch-include_linux_if_pppol2tp_h b/package/ppp/patches/patch-include_linux_if_pppol2tp_h index 3f8c404da..9e346beab 100644 --- a/package/ppp/patches/patch-include_linux_if_pppol2tp_h +++ b/package/ppp/patches/patch-include_linux_if_pppol2tp_h @@ -1,6 +1,6 @@ --- ppp-2.4.5.orig/include/linux/if_pppol2tp.h 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5/include/linux/if_pppol2tp.h 2010-08-29 19:36:29.823658423 +0200 -@@ -32,6 +32,20 @@ struct pppol2tp_addr ++++ ppp-2.4.5/include/linux/if_pppol2tp.h 2013-03-04 12:38:54.000000000 +0100 +@@ -32,6 +32,46 @@ struct pppol2tp_addr __u16 d_tunnel, d_session; /* For sending outgoing packets */ }; @@ -18,6 +18,32 @@ + __u32 d_tunnel, d_session; /* For sending outgoing packets */ +}; + ++/* Structure used to connect() the socket to a particular tunnel UDP ++ * * socket over IPv6. ++ * */ ++struct pppol2tpin6_addr { ++ __kernel_pid_t pid; /* pid that owns the fd. ++ * 0 => current */ ++ int fd; /* FD of UDP socket to use */ ++ ++ __u16 s_tunnel, s_session; /* For matching incoming packets */ ++ __u16 d_tunnel, d_session; /* For sending outgoing packets */ ++ ++ struct sockaddr_in6 addr; /* IP address and port to send to */ ++}; ++ ++ ++struct pppol2tpv3in6_addr { ++ __kernel_pid_t pid; /* pid that owns the fd. ++ * 0 => current */ ++ int fd; /* FD of UDP or IP socket to use */ ++ ++ __u32 s_tunnel, s_session; /* For matching incoming packets */ ++ __u32 d_tunnel, d_session; /* For sending outgoing packets */ ++ ++ struct sockaddr_in6 addr; /* IP address and port to send to */ ++}; ++ /* Socket options: * DEBUG - bitmask of debug message categories * SENDSEQ - 0 => don't send packets with sequence numbers diff --git a/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux index 32a86eaf7..93523d958 100644 --- a/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux +++ b/package/ppp/patches/patch-pppd_plugins_pppoatm_Makefile_linux @@ -1,5 +1,5 @@ --- ppp-2.4.5.orig/pppd/plugins/pppoatm/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux 2011-01-21 21:29:58.177408277 +0100 ++++ ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux 2013-03-04 12:31:16.000000000 +0100 @@ -1,15 +1,16 @@ -#CC = gcc -COPTS = -O2 -g @@ -26,7 +26,7 @@ PLUGIN := pppoatm.so PLUGIN_OBJS := pppoatm.o -@@ -22,25 +23,22 @@ PLUGIN_OBJS := pppoatm.o +@@ -22,25 +23,22 @@ PLUGIN_OBJS := pppoatm.o #HAVE_LIBATM=yes ifdef HAVE_LIBATM diff --git a/package/rrs/Makefile b/package/rrs/Makefile deleted file mode 100644 index c69464d32..000000000 --- a/package/rrs/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# 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:= rrs -PKG_VERSION:= 1.70 -PKG_RELEASE:= 2 -PKG_MD5SUM:= b400d03c0e39e3e78a7327ba78f789f0 -PKG_DESCR:= A reverse (connecting) remote shell, with SSL support. -PKG_SECTION:= net/misc -PKG_DEPENDS:= zlib libopenssl -PKG_BUILDDEP:= zlib openssl -PKG_URL:= http://www.cycom.se/dl/rrs/ -PKG_SITES:= http://www.cycom.se/uploads/36/19/ -PKG_NEED_CXX:= 1 -PKG_CXX:= RRS - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,RRS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIG_STYLE:= manual -BUILD_STYLE:= manual -INSTALL_STYLE:= manual - -do-build: - ${MAKE} -C ${WRKBUILD} \ - CC="${TARGET_CC}" \ - CFLAGS="${TARGET_CFLAGS} -I${STAGING_TARGET_DIR}/usr/include ${PKG_FLAGS}" \ - LDFLAGS="-L${STAGING_TARGET_DIR}/usr/lib -L${STAGING_TARGET_DIR}/lib ${PKG_LDFLAGS} -lutil -lssl -lcrypto -lz -lstdc++" \ - generic - -do-install: - ${INSTALL_DIR} ${IDIR_RRS}/usr/bin - ${INSTALL_BIN} ${WRKBUILD}/rrs ${IDIR_RRS}/usr/bin/ - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/rrs/patches/rrs-1.70-shell.patch b/package/rrs/patches/rrs-1.70-shell.patch deleted file mode 100644 index 822ce7c18..000000000 --- a/package/rrs/patches/rrs-1.70-shell.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN rrs-1.70-old/rrs.c rrs-1.70-new/rrs.c ---- rrs-1.70-old/rrs.c 2004-05-30 02:32:03.000000000 +0200 -+++ rrs-1.70-new/rrs.c 2005-10-12 12:41:24.000000000 +0200 -@@ -920,7 +920,7 @@ - close(slave_fd); - signal(SIGHUP, SIG_DFL); - signal(SIGCHLD, SIG_DFL); -- execl("/bin/sh", "", NULL); -+ execl("/bin/sh", "/bin/sh", NULL); - /* should not return */ - exit(1); - } else if (pid > 0) { diff --git a/package/rt61-firmware/Makefile b/package/rt61-firmware/Makefile index ea33868f0..21bc8c802 100644 --- a/package/rt61-firmware/Makefile +++ b/package/rt61-firmware/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= d4c690c93b470bc9a681297c2adc6281 PKG_DESCR:= firmware for rt61/rt2601 wireless cards PKG_SECTION:= wifi -PKG_SITES:= http://www.ralinktech.com.tw/data/ +PKG_SITES:= http://www.openadk.org/distfiles/ DISTFILES:= RT61_Firmware_V1.2.zip WRKDIST= ${WRKDIR}/RT61_Firmware_V1.2 diff --git a/package/squid/Makefile b/package/squid/Makefile index f07c0490c..50751442f 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -19,9 +19,9 @@ PKG_NEED_CXX:= 1 PKG_ARCH_DEPENDS:= !avr32 PKG_SUBPKGS:= SQUID SQUID_MOD_BASIC_AUTH_GETPWNAM SQUID_MOD_BASIC_AUTH_NCSA -PKG_SUBPKGS+= SQUID_MOD_BASIC_AUTH_SMB SQUID_MOD_DIGEST_AUTH_PASSWORD -PKG_SUBPKGS+= SQUID_MOD_EXTERNAL_ACL_IP_USER SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP -PKG_SUBPKGS+= SQUID_MOD_NTLM_AUTH_FAKEAUTH SQUID_MOD_BASIC_AUTH_LDAP +PKG_SUBPKGS+= SQUID_MOD_BASIC_AUTH_SMB SQUID_MOD_DIGEST_AUTH_FILE +PKG_SUBPKGS+= SQUID_MOD_EXTERNAL_ACL_FILE_USERIP SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP +PKG_SUBPKGS+= SQUID_MOD_NTLM_AUTH_FAKE SQUID_MOD_BASIC_AUTH_LDAP PKGSS_SQUID_MOD_BASIC_AUTH_LDAP:= libopenldap PKGSB_SQUID_MOD_BASIC_AUTH_LDAP:= openldap @@ -44,13 +44,13 @@ ifeq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_SMB}${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_ BASIC_AUTH_HELPERS:= none endif -ifneq (${ADK_PACKAGE_SQUID_MOD_DIGEST_AUTH_PASSWORD},) -DIGEST_AUTH_HELPERS:= password +ifneq (${ADK_PACKAGE_SQUID_MOD_DIGEST_AUTH_FILE},) +DIGEST_AUTH_HELPERS:= file else DIGEST_AUTH_HELPERS:= none endif -ifneq (${ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_IP_USER},) -EXTERNAL_ACL_HELPERS+= ip_user +ifneq (${ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_FILE_USERIP},) +EXTERNAL_ACL_HELPERS+= file_userip endif ifneq (${ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP},) EXTERNAL_ACL_HELPERS+= unix_group @@ -59,14 +59,16 @@ ifeq (${ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_IP_USER}${ADK_PACKAGE_SQUID_MOD_EXTER EXTERNAL_ACL_HELPERS:= none endif -ifneq (${ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_FAKEAUTH},) -NTLM_AUTH_HELPERS+= fakeauth +ifneq (${ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_FAKE},) +NTLM_AUTH_HELPERS+= fake else NTLM_AUTH_HELPERS+= none endif include ${TOPDIR}/mk/package.mk +TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 + define PKG_mod_template INSTALL_MODS_$${ADK_PACKAGE_${1}}+= ${2}-install @@ -82,20 +84,20 @@ $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,${PKG_NAME}-mod-basic-a $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_NCSA,${PKG_NAME}-mod-basic-auth-ncsa,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_SMB,${PKG_NAME}-mod-basic-auth-smb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_LDAP,${PKG_NAME}-mod-basic-auth-ldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,${PKG_NAME}-mod-digest-auth-password,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_FILE,${PKG_NAME}-mod-digest-auth-file,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,${PKG_NAME}-mod-external-acl-ip-user,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,${PKG_NAME}-mod-external-acl-unix-group,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,${PKG_NAME}-mod-ntlm-auth-fakeauth,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,getpwname_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,ldap)) -$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_NCSA,ncsa_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_SMB,smb_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,digest_pw_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,ip_user_check)) +$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKE,${PKG_NAME}-mod-ntlm-auth-fake,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,basic_getpwnam_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,basic_ldap_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_NCSA,basic_ncsa_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_SMB,basic_smb_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_DIGEST_AUTH_FILE,digest_pw_file)) +$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_FILE_USERIP,file_userip)) $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_LDAP_GROUP,ldap_auth)) -$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid_unix_group)) -$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,fakeauth_auth)) +$(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,ext_unix_group_acl)) +$(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKE,fake_auth)) TARGET_LDFLAGS+= -lpthread CONFIGURE_ENV+= ac_cv_sizeof_void_p=4 \ diff --git a/package/subversion/Makefile b/package/subversion/Makefile index b1b31e0c4..4bc97d4aa 100644 --- a/package/subversion/Makefile +++ b/package/subversion/Makefile @@ -4,15 +4,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= subversion -PKG_VERSION:= 1.7.6 +PKG_VERSION:= 1.7.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= bf8ce4b6bd8d807719a531d01a605bef +PKG_MD5SUM:= 17fe81c30fe0f785b2100ebadb3dc580 PKG_DESCR:= revision control program PKG_SECTION:= scm PKG_DEPENDS:= zlib apr apr-util libiconv libexpat libsqlite neon PKG_BUILDDEP:= apr-util expat apr zlib libiconv sqlite neon -PKG_SITES:= http://apache.lauf-forum.at/subversion/ PKG_URL:= http://subversion.apache.org/ +PKG_SITES:= http://artfiles.org/apache.org/subversion/ include ${TOPDIR}/mk/package.mk diff --git a/package/subversion/patches/patch-build-outputs_mk b/package/subversion/patches/patch-build-outputs_mk deleted file mode 100644 index cb685806b..000000000 --- a/package/subversion/patches/patch-build-outputs_mk +++ /dev/null @@ -1,67 +0,0 @@ ---- subversion-1.7.6.orig/build-outputs.mk 2012-08-08 16:21:32.000000000 +0200 -+++ subversion-1.7.6/build-outputs.mk 2012-09-23 08:12:18.000000000 +0200 -@@ -22,7 +22,7 @@ RA_SERF_LINK = ../../subversion/libsvn_r - RA_SVN_DEPS = subversion/libsvn_ra_svn/libsvn_ra_svn-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la - RA_SVN_LINK = ../../subversion/libsvn_ra_svn/libsvn_ra_svn-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la - --BUILD_DIRS = subversion/tests/cmdline subversion/tests/libsvn_subr subversion/tests/libsvn_fs_base subversion/tests/libsvn_client subversion/tests/libsvn_wc tools/diff subversion/tests/libsvn_diff subversion/tests/libsvn_fs_fs subversion/tests/libsvn_fs subversion/bindings/javahl/src/org/apache/subversion/javahl/callback subversion/bindings/javahl/classes subversion/bindings/javahl/include subversion/bindings/javahl/src/org/tigris/subversion/javahl subversion/bindings/javahl/tests/org/tigris/subversion/javahl subversion/bindings/javahl/src/org/apache/subversion/javahl subversion/bindings/javahl/src/org/apache/subversion/javahl/types subversion/bindings/javahl/tests/org/apache/subversion/javahl subversion/libsvn_auth_gnome_keyring subversion/libsvn_auth_kwallet subversion/libsvn_client subversion/libsvn_delta subversion/libsvn_diff subversion/libsvn_fs subversion/libsvn_fs_base subversion/libsvn_fs_base/bdb subversion/libsvn_fs_base/util subversion/libsvn_fs_fs subversion/libsvn_fs_util subversion/libsvn_ra subversion/libsvn_ra_local subversion/libsvn_ra_neon subversion/libsvn_ra_serf subversion/libsvn_ra_svn subversion/libsvn_repos subversion/libsvn_subr subversion/bindings/swig/perl/libsvn_swig_perl subversion/bindings/swig/python/libsvn_swig_py subversion/bindings/swig/ruby/libsvn_swig_ruby subversion/tests subversion/libsvn_wc subversion/bindings/javahl/native subversion/po subversion/mod_authz_svn subversion/mod_dav_svn subversion/mod_dav_svn/reports subversion/mod_dav_svn/posts tools/server-side/mod_dontdothat subversion/tests/libsvn_ra_local subversion/tests/libsvn_delta subversion/tests/libsvn_repos subversion/svn tools/server-side subversion/svnadmin subversion/svndumpfilter subversion/svnlook tools/client-side/svnmucc tools/dev/svnraisetreeconflict subversion/svnrdump subversion/svnserve subversion/svnsync subversion/svnversion subversion/bindings/swig subversion/bindings/swig/python subversion/bindings/swig/perl subversion/bindings/swig/ruby subversion/bindings/swig/proxy -+BUILD_DIRS = subversion/tests/cmdline subversion/tests/libsvn_subr subversion/tests/libsvn_fs_base subversion/tests/libsvn_client subversion/tests/libsvn_wc tools/diff subversion/tests/libsvn_diff subversion/tests/libsvn_fs_fs subversion/tests/libsvn_fs subversion/bindings/javahl/src/org/apache/subversion/javahl/callback subversion/bindings/javahl/classes subversion/bindings/javahl/include subversion/bindings/javahl/src/org/tigris/subversion/javahl subversion/bindings/javahl/tests/org/tigris/subversion/javahl subversion/bindings/javahl/src/org/apache/subversion/javahl subversion/bindings/javahl/src/org/apache/subversion/javahl/types subversion/bindings/javahl/tests/org/apache/subversion/javahl subversion/libsvn_auth_gnome_keyring subversion/libsvn_auth_kwallet subversion/libsvn_client subversion/libsvn_delta subversion/libsvn_diff subversion/libsvn_fs subversion/libsvn_fs_base subversion/libsvn_fs_base/bdb subversion/libsvn_fs_base/util subversion/libsvn_fs_fs subversion/libsvn_fs_util subversion/libsvn_ra subversion/libsvn_ra_local subversion/libsvn_ra_neon subversion/libsvn_ra_serf subversion/libsvn_ra_svn subversion/libsvn_repos subversion/libsvn_subr subversion/bindings/swig/perl/libsvn_swig_perl subversion/bindings/swig/python/libsvn_swig_py subversion/bindings/swig/ruby/libsvn_swig_ruby subversion/tests subversion/libsvn_wc subversion/bindings/javahl/native subversion/po subversion/mod_authz_svn subversion/mod_dav_svn subversion/mod_dav_svn/reports subversion/mod_dav_svn/posts subversion/tests/libsvn_ra_local subversion/tests/libsvn_delta subversion/tests/libsvn_repos subversion/svn tools/server-side subversion/svnadmin subversion/svndumpfilter subversion/svnlook tools/client-side/svnmucc tools/dev/svnraisetreeconflict subversion/svnrdump subversion/svnserve subversion/svnsync subversion/svnversion subversion/bindings/swig subversion/bindings/swig/python subversion/bindings/swig/perl subversion/bindings/swig/ruby subversion/bindings/swig/proxy - - BDB_TEST_DEPS = subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT) - -@@ -448,11 +448,6 @@ mod_dav_svn_OBJECTS = activity.lo authz. - subversion/mod_dav_svn/mod_dav_svn.la: $(mod_dav_svn_DEPS) - cd subversion/mod_dav_svn && $(LINK_APACHE_MOD) $(mod_dav_svn_LDFLAGS) -o mod_dav_svn.la $(LT_NO_UNDEFINED) $(mod_dav_svn_OBJECTS) ../../subversion/libsvn_repos/libsvn_repos-1.la ../../subversion/libsvn_fs/libsvn_fs-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS) - --mod_dontdothat_PATH = tools/server-side/mod_dontdothat --mod_dontdothat_DEPS = tools/server-side/mod_dontdothat/mod_dontdothat.lo subversion/libsvn_subr/libsvn_subr-1.la subversion/mod_dav_svn/mod_dav_svn.la --mod_dontdothat_OBJECTS = mod_dontdothat.lo --tools/server-side/mod_dontdothat/mod_dontdothat.la: $(mod_dontdothat_DEPS) -- cd tools/server-side/mod_dontdothat && $(LINK_APACHE_MOD) $(mod_dontdothat_LDFLAGS) -o mod_dontdothat.la $(LT_NO_UNDEFINED) $(mod_dontdothat_OBJECTS) ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_XML_LIBS) $(LIBS) - - op_depth_test_PATH = subversion/tests/libsvn_wc - op_depth_test_DEPS = subversion/tests/libsvn_wc/op-depth-test.lo subversion/tests/libsvn_wc/utils.lo subversion/libsvn_client/libsvn_client-1.la subversion/tests/libsvn_test-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_subr/libsvn_subr-1.la -@@ -877,7 +872,7 @@ swig-rb-lib: subversion/bindings/swig/ru - - test: subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_wc/tree-conflict-data-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) - --tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) -+tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) - - - ######################################## -@@ -1036,7 +1031,7 @@ install-swig-rb-lib: subversion/bindings - $(MKDIR) $(DESTDIR)$(swig_rb_libdir) - cd subversion/bindings/swig/ruby/libsvn_swig_ruby ; $(INSTALL_SWIG_RB_LIB) libsvn_swig_ruby-1.la $(DESTDIR)$(swig_rb_libdir)/libsvn_swig_ruby-1.la - --install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la -+install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) - $(MKDIR) $(DESTDIR)$(toolsdir) - cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT) - cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT) -@@ -1046,7 +1041,6 @@ install-tools: tools/diff/diff$(EXEEXT) - cd tools/server-side ; $(INSTALL_TOOLS) svnauthz-validate$(EXEEXT) $(DESTDIR)$(toolsdir)/svnauthz-validate$(EXEEXT) - cd tools/client-side/svnmucc ; $(INSTALL_TOOLS) svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT) - cd tools/dev/svnraisetreeconflict ; $(INSTALL_TOOLS) svnraisetreeconflict$(EXEEXT) $(DESTDIR)$(toolsdir)/svnraisetreeconflict$(EXEEXT) -- cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la - - - ######################################## -@@ -1150,7 +1144,6 @@ locks-test: subversion/tests/libsvn_fs/l - mergeinfo-test: subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) - mod_authz_svn: subversion/mod_authz_svn/mod_authz_svn.la - mod_dav_svn: subversion/mod_dav_svn/mod_dav_svn.la --mod_dontdothat: tools/server-side/mod_dontdothat/mod_dontdothat.la - op-depth-test: subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) - opt-test: subversion/tests/libsvn_subr/opt-test$(EXEEXT) - parse-diff-test: subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) -@@ -2659,9 +2652,6 @@ tools/diff/diff3.lo: tools/diff/diff3.c - - tools/diff/diff4.lo: tools/diff/diff4.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h - --tools/server-side/mod_dontdothat/mod_dontdothat.lo: tools/server-side/mod_dontdothat/mod_dontdothat.c subversion/include/mod_dav_svn.h subversion/include/private/svn_debug.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h -- $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)tools/server-side/mod_dontdothat/mod_dontdothat.c -- - tools/server-side/svn-populate-node-origins-index.lo: tools/server-side/svn-populate-node-origins-index.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h - - tools/server-side/svn-rep-sharing-stats.lo: tools/server-side/svn-rep-sharing-stats.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/svn_private_config.h diff --git a/package/vlc/Makefile b/package/vlc/Makefile index 875487711..4aa2b38eb 100644 --- a/package/vlc/Makefile +++ b/package/vlc/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= vlc -PKG_VERSION:= 2.0.3 +PKG_VERSION:= 2.0.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= a7e79565e3df07dcf9abc6cad3ac26bb +PKG_MD5SUM:= 4f959c0766ada8cea5a72c65fce94ebe PKG_DESCR:= Media Player PKG_SECTION:= multimedia PKG_BUILDDEP:= ffmpeg xcb-util libtheora libgcrypt libmad PKG_DEPENDS:= libffmpeg xcb-util libtheora libgcrypt PKG_URL:= http://www.videolan.org/vlc/ -PKG_SITES:= http://download.videolan.org/pub/videolan/vlc/2.0.3/ +PKG_SITES:= http://download.videolan.org/pub/videolan/vlc/2.0.5/ PKG_ARCH_DEPENDS:= !cris !avr32 @@ -23,6 +23,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,VLC,vlc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TARGET_CFLAGS+= -fPIC +TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 CONFIGURE_ENV+= ac_cv_func_sched_getaffinity=no CONFIGURE_ARGS+= --disable-lua \ --disable-dbus \ diff --git a/package/xconsole/Makefile b/package/xconsole/Makefile index ee3e846f0..50199844d 100644 --- a/package/xconsole/Makefile +++ b/package/xconsole/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= c617acec432901a3c1a2b23b022624cb PKG_DESCR:= X console app PKG_SECTION:= x11/apps +PKG_BUILDDEP:= libXaw PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= ${MASTER_SITE_XORG} |