resolve various build failures

14 files changed, 45 insertions, 101 deletions

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/epdfview/Makefile b/package/epdfview/Makefile
index af7493ff3..1df62a8fc 100644
--- a/package/epdfview/Makefile
+++ b/package/epdfview/Makefile
@@ -12,7 +12,7 @@ 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
 
 include $(TOPDIR)/mk/package.mk
 
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/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/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/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/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) {