update to latest upstream version

12 files changed, 28 insertions, 142 deletions

diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile
index 53824599e..990464f50 100644
--- a/package/apr-util/Makefile
+++ b/package/apr-util/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		apr-util
-PKG_VERSION:=		1.3.10
+PKG_VERSION:=		1.4.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		82acd25cf3df8c72eba44eaee8b80c19
+PKG_MD5SUM:=		666a5d56098a9debf998510e304c8095
 PKG_DESCR:=		Apache Portable Runtime utility library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libexpat apr
diff --git a/package/apr/Makefile b/package/apr/Makefile
index 3362e3d31..586495e24 100644
--- a/package/apr/Makefile
+++ b/package/apr/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		apr
-PKG_VERSION:=		1.4.2
+PKG_VERSION:=		1.4.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		fc80cb54f158c2674f9eeb47a1f672cd
+PKG_MD5SUM:=		76cc4457fbb71eefdafa27dba8f511fb
 PKG_DESCR:=		Apache Portable Runtime library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libpthread
diff --git a/package/apr/patches/patch-build_ltmain_sh b/package/apr/patches/patch-build_ltmain_sh
deleted file mode 100644
index 0ce8441f6..000000000
--- a/package/apr/patches/patch-build_ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- apr-1.4.2.orig/build/ltmain.sh	2010-01-21 08:59:41.000000000 +0100
-+++ apr-1.4.2/build/ltmain.sh	2011-01-14 11:41:48.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/apr/patches/patch-include_apr_want_h b/package/apr/patches/patch-include_apr_want_h
index 5f1a11c5e..596a498da 100644
--- a/package/apr/patches/patch-include_apr_want_h
+++ b/package/apr/patches/patch-include_apr_want_h
@@ -1,9 +1,9 @@
---- apr-1.4.2.orig/include/apr_want.h	2010-01-06 12:36:50.000000000 +0100
-+++ apr-1.4.2/include/apr_want.h	2010-05-29 17:56:14.201613974 +0200
-@@ -89,11 +89,13 @@
- 
- #else
+--- apr-1.4.6.orig/include/apr_want.h	2011-03-28 07:32:20.000000000 +0200
++++ apr-1.4.6/include/apr_want.h	2012-07-17 10:42:01.000000000 +0200
+@@ -91,11 +91,13 @@
  
+ #ifndef APR_IOVEC_DEFINED
+ #define APR_IOVEC_DEFINED
 +/*
  struct iovec
  {
@@ -11,6 +11,6 @@
      size_t iov_len;
  };
 +*/
+ #endif /* !APR_IOVEC_DEFINED */
  
- #endif
- 
+ #endif /* APR_HAVE_IOVEC */
diff --git a/package/bzr/Makefile b/package/bzr/Makefile
index e13eff65c..a1af88c2e 100644
--- a/package/bzr/Makefile
+++ b/package/bzr/Makefile
@@ -4,15 +4,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		bzr
-PKG_VERSION:=		2.3.0
+PKG_VERSION:=		2.5.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		2d8bc55d43209189a209361178d9d372
+PKG_MD5SUM:=		ce62de3329096e384967e5f1a65658db
 PKG_DESCR:=		bazaar
 PKG_SECTION:=		scm
 PKG_BUILDDEP:=		python2
 PKG_DEPENDS:=		python2
 PKG_URL:=		http://bazaar.canonical.com/en/
-PKG_SITES:=		http://launchpad.net/bzr/2.3/${PKG_VERSION}/+download/
+PKG_SITES:=		https://launchpad.net/bzr/2.5/2.5.1/+download/
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/cvs/Makefile b/package/cvs/Makefile
index 13e750f6d..8c39a3de4 100644
--- a/package/cvs/Makefile
+++ b/package/cvs/Makefile
@@ -16,7 +16,9 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,CVS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+CONFIGURE_ENV+=		ac_cv_lib_nsl_main=no
+
+cvs-install:
 	$(INSTALL_DIR) $(IDIR_CVS)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/cvs \
 		$(IDIR_CVS)/usr/bin
diff --git a/package/git/Makefile b/package/git/Makefile
index ad415a8fd..86f70a5ca 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
-PKG_VERSION:=		1.7.7
+PKG_VERSION:=		1.7.11.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		5d645884e688921e773186783b65ce33
+PKG_MD5SUM:=		91e01a22032f5d0ca2941ae7fd49d587
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		scm
 PKG_BUILDDEP:=		openssl curl expat
@@ -18,7 +18,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 \
+MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 NO_INSTALL_HARDLINKS=1 \
 			CURLDIR=${STAGING_TARGET_DIR} EXPATDIR=${STAGING_TARGET_DIR}
 XAKE_FLAGS+=		uname_S=Linux uname_O=GNU/Linux
 CONFIGURE_ENV+=		ac_cv_c_c99_format=yes \
diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile
deleted file mode 100644
index 03923cc01..000000000
--- a/package/git/patches/patch-Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
---- git-1.7.3.2.orig/Makefile	2010-10-22 05:49:16.000000000 +0200
-+++ git-1.7.3.2/Makefile	2010-11-23 23:14:56.960685586 +0100
-@@ -1615,9 +1615,7 @@ builtin/help.s builtin/help.o: EXTRA_CPP
- 
- $(BUILT_INS): git$X
- 	$(QUIET_BUILT_IN)$(RM) $@ && \
--	ln git$X $@ 2>/dev/null || \
--	ln -s git$X $@ 2>/dev/null || \
--	cp git$X $@
-+	ln -s git$X $@ 2>/dev/null
- 
- common-cmds.h: ./generate-cmdlist.sh command-list.txt
- 
-@@ -1932,9 +1930,7 @@ git-http-push$X: revision.o http.o http-
- 
- $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
- 	$(QUIET_LNCP)$(RM) $@ && \
--	ln $< $@ 2>/dev/null || \
--	ln -s $< $@ 2>/dev/null || \
--	cp $< $@
-+	ln -s $< $@ 2>/dev/null
- 
- $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o $(GITLIBS)
- 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
-@@ -2123,29 +2119,21 @@ endif
- 	{ test "$$bindir/" = "$$execdir/" || \
- 	  for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
- 		$(RM) "$$execdir/$$p" && \
--		test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
--		ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
- 		cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
- 	  done; \
- 	} && \
- 	for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
- 		$(RM) "$$bindir/$$p" && \
--		ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
--		ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
--		cp "$$bindir/git$X" "$$bindir/$$p" || exit; \
-+		ln -s "git$X" "$$bindir/$$p" 2>/dev/null || exit; \
- 	done && \
- 	for p in $(BUILT_INS); do \
- 		$(RM) "$$execdir/$$p" && \
--		ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
--		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
--		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
-+		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || exit; \
- 	done && \
- 	remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \
- 	for p in $$remote_curl_aliases; do \
- 		$(RM) "$$execdir/$$p" && \
--		ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
--		ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
--		cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
-+		ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || exit; \
- 	done && \
- 	./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
- 
diff --git a/package/libffi/Makefile b/package/libffi/Makefile
index 15548dabf..4bdd10ed4 100644
--- a/package/libffi/Makefile
+++ b/package/libffi/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libffi
-PKG_VERSION:=		3.0.9
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		1f300a7a7f975d4046f51c3022fa5ff1
+PKG_VERSION:=		3.0.11
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		f69b9693227d976835b4857b1ba7d0e3
 PKG_DESCR:=		Foreign Function Interface library
 PKG_SECTION:=		libs
 PKG_URL:=		http://sourceware.org/libffi/
@@ -21,6 +21,8 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBFFI_DEV,libffi-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBFFI_DEV},${PKGSC_LIBFFI_DEV}))
 
+CONFIGURE_ARGS+=	--disable-builddir
+
 libffi-install:
 	${INSTALL_DIR} ${IDIR_LIBFFI}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libffi.so* ${IDIR_LIBFFI}/usr/lib
diff --git a/package/libffi/patches/patch-ltmain_sh b/package/libffi/patches/patch-ltmain_sh
deleted file mode 100644
index 02c12cbfb..000000000
--- a/package/libffi/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- libffi-3.0.9.orig/ltmain.sh	2009-12-31 13:38:48.000000000 +0100
-+++ libffi-3.0.9/ltmain.sh	2011-01-14 19:48:53.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/subversion/Makefile b/package/subversion/Makefile
index e4d050daa..67553b054 100644
--- a/package/subversion/Makefile
+++ b/package/subversion/Makefile
@@ -4,14 +4,14 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		subversion
-PKG_VERSION:=		1.6.16
+PKG_VERSION:=		1.7.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ead9183361819deab9127a224e5ebca0
+PKG_MD5SUM:=		badb502508625512763f7e2b4e735c3e
 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://subversion.tigris.org/downloads/
+PKG_SITES:=		http://apache.lauf-forum.at/subversion/
 PKG_URL:=		http://subversion.apache.org/
 
 include ${TOPDIR}/mk/package.mk
diff --git a/package/subversion/patches/patch-build_ltmain_sh b/package/subversion/patches/patch-build_ltmain_sh
deleted file mode 100644
index afcd82fd9..000000000
--- a/package/subversion/patches/patch-build_ltmain_sh
+++ /dev/null
@@ -1,39 +0,0 @@
---- subversion-1.6.12.orig/build/ltmain.sh	2010-03-31 20:37:12.000000000 +0200
-+++ subversion-1.6.12/build/ltmain.sh	2011-01-17 15:25:25.000000000 +0100
-@@ -1676,7 +1676,7 @@ EOF
-       # -F/path gives path to uninstalled frameworks, gcc on darwin
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.
-@@ -2561,27 +2561,6 @@ EOF
- 	      esac
- 	    fi
- 
--	    # Hardcode the library path.
--	    # Skip directories that are in the system default run-time
--	    # search path.
--	    case " $sys_lib_dlsearch_path " in
--	    *" $absdir "*) ;;
--	    *)
--	      case "$compile_rpath " in
--	      *" $absdir "*) ;;
--	      *) compile_rpath="$compile_rpath $absdir"
--	      esac
--	      ;;
--	    esac
--	    case " $sys_lib_dlsearch_path " in
--	    *" $libdir "*) ;;
--	    *)
--	      case "$finalize_rpath " in
--	      *" $libdir "*) ;;
--	      *) finalize_rpath="$finalize_rpath $libdir"
--	      esac
--	      ;;
--	    esac
- 	  fi # $linkmode,$pass = prog,link...
- 
- 	  if test "$alldeplibs" = yes &&