update toolchain with /lib -> /usr/lib move

2025-02-03 09:47:13 +08:00 · 2014-09-16 11:53:45 +00:00 · 2014-09-16 11:53:45 +00:00 · 9a9be0aeb7
commit 9a9be0aeb7
parent 2fd9b7e880
39 changed files with 1865 additions and 698 deletions
--- a/acpi_call-lts/PKGBUILD
+++ b/acpi_call-lts/PKGBUILD
@ -2,12 +2,12 @@

 # Find the kernel name inside the chroot
 _extramodules=extramodules-3.2-lts
-_kver="$(cat /lib/modules/${_extramodules}/version)"
+_kver="$(cat /usr/lib/modules/${_extramodules}/version)"

 pkgname=acpi_call-lts
 _pkgname=acpi_call
 pkgver=1.0.0
-pkgrel=6
+pkgrel=7
 pkgdesc="A kernel module that enables you to call parameterless ACPI methods by writing the method name to /proc/acpi/call, e.g. to turn off discrete graphics card in a dual graphics environment (like NVIDIA Optimus)."
 arch=('x86_64')
 url=("http://github.com/mkottman/acpi_call")
@ -25,7 +25,7 @@ build() {
  cd ${srcdir}/$_pkgname-${pkgver}
  
  sed \
-    -e  's/$(shell uname -r)/3.2.57-1-lts/g' \
+    -e  's/$(shell uname -r)/3.2.63-1-lts/g' \
    -i Makefile

  make
@ -57,5 +57,5 @@ package() {
  #make KDIR=/usr/src/linux-${_kver} clean
  make KDIR=/usr/src/linux-${_kver}

-  install -D -m644 acpi_call.ko $pkgdir/lib/modules/${_kver}/kernel/drivers/acpi/acpi_call.ko
+  install -D -m644 acpi_call.ko $pkgdir/usr/lib/modules/${_kver}/kernel/drivers/acpi/acpi_call.ko
 }
--- a/acpi_call/PKGBUILD
+++ b/acpi_call/PKGBUILD
@ -1,18 +1,18 @@
 #
 # Core Packages for Chakra, part of chakra-project.org

-_extramodules=extramodules-3.15.5-CHAKRA
-_kver="$(cat /lib/modules/${_extramodules}/version)"
+_extramodules=extramodules-3.16-CHAKRA
+_kver="$(cat /usr/lib/modules/${_extramodules}/version)"

 pkgname=acpi_call
 _pkgname=acpi_call
 pkgver=1.1.0
-pkgrel=10
+pkgrel=11
 pkgdesc="A kernel module that enables you to call parameterless ACPI methods by writing the method name to /proc/acpi/call, e.g. to turn off discrete graphics card in a dual graphics environment (like NVIDIA Optimus)."
 arch=('x86_64')
 url=("http://github.com/mkottman/acpi_call")
 license=('GPL')
-depends=('linux>=3.15' 'linux<3.16' 'linux-headers')
+depends=('linux>=3.16' 'linux<3.17' 'linux-headers')
 makedepends=('git')
 provides=('acpi-call')
 replaces=('acpi-call')
@ -24,6 +24,7 @@ md5sums=('f69d40e130b0e5ed17ce8adb19e6dda1')
 build() {
  cd ${srcdir}/$_pkgname-${pkgver}

+  echo make KVERSION=${_kver}
  make KVERSION=${_kver}
 }
 package() {
@ -53,5 +54,5 @@ package() {
  #make KDIR=/usr/src/linux-${_kver} clean
  make KDIR=/usr/src/linux-${_kver}

-  install -D -m644 acpi_call.ko $pkgdir/lib/modules/${_kver}/kernel/drivers/acpi/acpi_call.ko
+  install -D -m644 acpi_call.ko $pkgdir/usr/lib/modules/${_kver}/kernel/drivers/acpi/acpi_call.ko
 }
--- a/binutils/PKGBUILD
+++ b/binutils/PKGBUILD
@ -2,13 +2,13 @@

 pkgname=binutils
 pkgver=2.24
-pkgrel=5
+pkgrel=7
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('x86_64')
 url="http://www.gnu.org/software/binutils/"
 license=('GPL')
 groups=('base-devel')
-depends=('glibc>=2.18' 'zlib')
+depends=('glibc>=2.20' 'zlib')
 checkdepends=('dejagnu' 'bc')
 conflicts=('binutils-multilib')
 replaces=('binutils-multilib')
@ -16,11 +16,14 @@ options=('!libtool' '!distcc' '!ccache' 'staticlibs')
 install=binutils.install
 source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
        binutils-2.24-lto-testsuite.patch
-        binutils-2.24-static-pie-hang.patch)
+        binutils-2.24-gold-testsuite-plugin.patch
+        binutils-2.24-shared-pie.patch)
 md5sums=('e0f71a7b2ddab0f8612336ac81d9636b'
         'SKIP'
-         'b16e895c24ff80acd98a21021eccefad'
-         '4d2cf591560c3d25265778146bbe1941')
+         'e68a1f221545f082baa5bd417cd077af'
+         'e46bbb03abaa5db58c12247644dc4857'
+         'ec59461c4febab9cfe1c1ef33326bc50')
+validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93')

 prepare() {
  cd ${srcdir}/binutils-${pkgver}
@ -28,25 +31,26 @@ prepare() {
  # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure

-  # fix lto testsuite with gcc-4.9 - commit b35d44f1
+  # fix lto testsuite with gcc-4.9 - commits b35d44f1 and 37a6ac44
  patch -p1 -i $srcdir/binutils-2.24-lto-testsuite.patch

-  # fix autoconf hang with -static -fPIE -pie - commits d1ec1e40 and 818d220a
-  patch -p1 -i $srcdir/binutils-2.24-static-pie-hang.patch
+  # fix gold testsuite with gcc-4.9 - commit ae447ddd
+  patch -p1 -i $srcdir/binutils-2.24-gold-testsuite-plugin.patch
+
+  # fix issues with -static -fPIE -pie - commit 4199e3b8
+  patch -p1 -i $srcdir/binutils-2.24-shared-pie.patch

  mkdir ${srcdir}/binutils-build
 }

 build() {
-
  cd ${srcdir}/binutils-build

  ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \
    --with-lib-path=/usr/lib:/usr/local/lib \
    --with-bugurl=http://chakraos.org/bugtracker \
-    --enable-ld=default --enable-gold \
-    --enable-plugins --enable-threads \
-    --enable-shared \
+    --enable-threads --enable-shared --with-pic \
+    --enable-ld=default --enable-gold --enable-plugins \
    --disable-werror

  # check the host environment and makes sure all the necessary tools are available
@ -59,14 +63,14 @@ check() {
  cd ${srcdir}/binutils-build
  
  # unset LDFLAGS as testsuite makes assumptions about which ones are active
-  # do not abort on errors - manually check log files
-  make LDFLAGS="" -k check || true
+  # ignore failures in gold testsuite...
+  make -k LDFLAGS="" check
 }

 package() {
  cd ${srcdir}/binutils-build
  make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
-  
+
  # Remove unwanted files
  rm ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
  rm ${pkgdir}/usr/share/info/{configure,standards}.info
--- a/binutils/binutils-2.24-gold-testsuite-plugin.patch
+++ b/binutils/binutils-2.24-gold-testsuite-plugin.patch
@ -0,0 +1,229 @@
+diff --git a/gold/configure b/gold/configure
+index 2257324..f61307b 100755
+--- a/gold/configure
+++ b/gold/configure
+@@ -594,10 +594,12 @@ LTLIBOBJS
+ MAINT
+ MAINTAINER_MODE_FALSE
+ MAINTAINER_MODE_TRUE
+-HAVE_PUBNAMES_FALSE
+-HAVE_PUBNAMES_TRUE
+ DLOPEN_LIBS
+ CXXCPP
+HAVE_NO_USE_LINKER_PLUGIN_FALSE
+HAVE_NO_USE_LINKER_PLUGIN_TRUE
+HAVE_PUBNAMES_FALSE
+HAVE_PUBNAMES_TRUE
+ HAVE_ZLIB_FALSE
+ HAVE_ZLIB_TRUE
+ LIBOBJS
+@@ -6991,6 +6993,50 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ 
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror -gpubnames"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int i;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  have_pubnames=yes
+else
+  have_pubnames=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+CFLAGS="$save_CFLAGS"
+ if test "$have_pubnames" = "yes"; then
+  HAVE_PUBNAMES_TRUE=
+  HAVE_PUBNAMES_FALSE='#'
+else
+  HAVE_PUBNAMES_TRUE='#'
+  HAVE_PUBNAMES_FALSE=
+fi
+
+
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror -fno-use-linker-plugin"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int i;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  have_no_use_linker_plugin=yes
+else
+  have_no_use_linker_plugin=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+CFLAGS="$save_CFLAGS"
+ if test "$have_no_use_linker_plugin" = "yes"; then
+  HAVE_NO_USE_LINKER_PLUGIN_TRUE=
+  HAVE_NO_USE_LINKER_PLUGIN_FALSE='#'
+else
+  HAVE_NO_USE_LINKER_PLUGIN_TRUE='#'
+  HAVE_NO_USE_LINKER_PLUGIN_FALSE=
+fi
+
+
+ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -7515,28 +7561,6 @@ $as_echo "#define HAVE_STAT_ST_MTIM 1" >>confdefs.h
+ 
+ fi
+ 
+-save_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="$CXXFLAGS -Werror -gpubnames"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-int i;
+-_ACEOF
+-if ac_fn_cxx_try_compile "$LINENO"; then :
+-  have_pubnames=yes
+-else
+-  have_pubnames=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-CXXFLAGS="$save_CXXFLAGS"
+- if test "$have_pubnames" = "yes"; then
+-  HAVE_PUBNAMES_TRUE=
+-  HAVE_PUBNAMES_FALSE='#'
+-else
+-  HAVE_PUBNAMES_TRUE='#'
+-  HAVE_PUBNAMES_FALSE=
+-fi
+-
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -7837,6 +7861,10 @@ if test -z "${HAVE_PUBNAMES_TRUE}" && test -z "${HAVE_PUBNAMES_FALSE}"; then
+   as_fn_error "conditional \"HAVE_PUBNAMES\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+if test -z "${HAVE_NO_USE_LINKER_PLUGIN_TRUE}" && test -z "${HAVE_NO_USE_LINKER_PLUGIN_FALSE}"; then
+  as_fn_error "conditional \"HAVE_NO_USE_LINKER_PLUGIN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+   as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+diff --git a/gold/configure.ac b/gold/configure.ac
+index 803cf46..7ad7302 100644
+--- a/gold/configure.ac
+++ b/gold/configure.ac
+@@ -520,6 +520,25 @@ dnl multiple declarations of functions like basename when compiling
+ dnl with C++.
+ AC_CHECK_DECLS([basename, ffs, asprintf, vasprintf, snprintf, vsnprintf, strverscmp])
+ 
+dnl Check if gcc supports the -gpubnames option.
+dnl Use -Werror in case of compilers that make unknown -g options warnings.
+dnl They would pass the test here, but fail in actual use when $WARN_CFLAGS
+dnl gets set later by default Autoconf magic to include -Werror.  (We are
+dnl assuming here that there is no compiler that groks -gpubnames
+dnl but does not grok -Werror.)
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror -gpubnames"
+AC_COMPILE_IFELSE([int i;], [have_pubnames=yes], [have_pubnames=no])
+CFLAGS="$save_CFLAGS"
+AM_CONDITIONAL(HAVE_PUBNAMES, test "$have_pubnames" = "yes")
+
+dnl Check if gcc supports the -fno-use-linker-plugin option.
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror -fno-use-linker-plugin"
+AC_COMPILE_IFELSE([int i;], [have_no_use_linker_plugin=yes], [have_no_use_linker_plugin=no])
+CFLAGS="$save_CFLAGS"
+AM_CONDITIONAL(HAVE_NO_USE_LINKER_PLUGIN, test "$have_no_use_linker_plugin" = "yes")
+
+ AC_LANG_PUSH(C++)
+ 
+ AC_CHECK_HEADERS(unordered_set unordered_map)
+@@ -601,18 +620,6 @@ if test "$gold_cv_stat_st_mtim" = "yes"; then
+ 	    [Define if struct stat has a field st_mtim with timespec for mtime])
+ fi
+ 
+-dnl Check if gcc supports the -gpubnames option.
+-dnl Use -Werror in case of compilers that make unknown -g options warnings.
+-dnl They would pass the test here, but fail in actual use when $WARN_CFLAGS
+-dnl gets set later by default Autoconf magic to include -Werror.  (We are
+-dnl assuming here that there is no compiler that groks -gpubnames
+-dnl but does not grok -Werror.)
+-save_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="$CXXFLAGS -Werror -gpubnames"
+-AC_COMPILE_IFELSE([int i;], [have_pubnames=yes], [have_pubnames=no])
+-CXXFLAGS="$save_CXXFLAGS"
+-AM_CONDITIONAL(HAVE_PUBNAMES, test "$have_pubnames" = "yes")
+-
+ AC_LANG_POP(C++)
+ 
+ AC_CHECK_HEADERS(locale.h)
+diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
+index aa41290..52cc05e 100644
+--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
+@@ -19,18 +19,25 @@ AM_CPPFLAGS = \
+ 	-DLOCALEDIR="\"$(datadir)/locale\"" \
+ 	@INCINTL@
+ 
+# Some versions of GCC now automatically enable linker plugins,
+# but we want to run our tests without GCC's plugins.
+if HAVE_NO_USE_LINKER_PLUGIN
+OPT_NO_PLUGINS = -fno-use-linker-plugin
+endif
+
+ # COMPILE1, LINK1, CXXCOMPILE1, CXXLINK1 are renamed from COMPILE, LINK,
+ # CXXCOMPILE and CXXLINK generated by automake 1.11.1.  FIXME: they should
+ # be updated if they are different from automake used by gold.
+ COMPILE1 = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(OPT_NO_PLUGINS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ CXXCOMPILE1 = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+-	-o $@
+CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(OPT_NO_PLUGINS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ 
+-# Strip out -Wp,-D_FORTIFY_SOURCE=, which is rrelevant for the gold
+# Strip out -Wp,-D_FORTIFY_SOURCE=, which is irrelevant for the gold
+ # testsuite and incompatible with -O0 used in gold tests, from
+ # COMPILE, LINK, CXXCOMPILE and CXXLINK.
+ COMPILE = `echo $(COMPILE1) | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[0-9[0-9]]*//'`
+diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
+index 60c2c10..da0a338 100644
+--- a/gold/testsuite/Makefile.in
+++ b/gold/testsuite/Makefile.in
+@@ -2096,21 +2096,27 @@ AM_CPPFLAGS = \
+ 	@INCINTL@
+ 
+ 
+# Some versions of GCC now automatically enable linker plugins,
+# but we want to run our tests without GCC's plugins.
+@HAVE_NO_USE_LINKER_PLUGIN_TRUE@OPT_NO_PLUGINS = -fno-use-linker-plugin
+
+ # COMPILE1, LINK1, CXXCOMPILE1, CXXLINK1 are renamed from COMPILE, LINK,
+ # CXXCOMPILE and CXXLINK generated by automake 1.11.1.  FIXME: they should
+ # be updated if they are different from automake used by gold.
+ COMPILE1 = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ 
+-LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(OPT_NO_PLUGINS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+
+ CXXCOMPILE1 = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ 
+-CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+-	-o $@
+CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(OPT_NO_PLUGINS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ 
+ 
+-# Strip out -Wp,-D_FORTIFY_SOURCE=, which is rrelevant for the gold
+# Strip out -Wp,-D_FORTIFY_SOURCE=, which is irrelevant for the gold
+ # testsuite and incompatible with -O0 used in gold tests, from
+ # COMPILE, LINK, CXXCOMPILE and CXXLINK.
+ COMPILE = `echo $(COMPILE1) | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[0-9[0-9]]*//'`
--- a/binutils/binutils-2.24-lto-testsuite.patch
+++ b/binutils/binutils-2.24-lto-testsuite.patch
@ -48,6 +48,31 @@ index 8df42ae..175449a 100644
 	if { [lindex $status 0] == 0 } {
 	    set lto_available_saved 1
 	} else {
-- 
-1.7.1
+diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
+index b14f13c..765d85f 100644
+--- a/ld/testsuite/ld-plugin/lto.exp
+++ b/ld/testsuite/ld-plugin/lto.exp
+@@ -324,7 +324,20 @@ if { [is_elf_format] && [check_lto_shared_available] } {
+ 
+ set testname "Build liblto-11.a"
+ remote_file host delete "tmpdir/liblto-11.a"
+-set catch_output [run_host_cmd "$ar" "rc tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
+set plugin_names {
+    liblto_plugin.so
+    liblto_plugin-0.dll
+    cyglto_plugin-0.dll
+}
+set plug_opt ""
+foreach plug $plugin_names {
+    set plug_so [run_host_cmd $CC "--print-prog-name $plug"]
+    if { $plug_so ne $plug } then {
+	set plug_opt "--plugin $plug_so"
+	break
+    }
+}
+set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
+ if {![string match "" $catch_output]} {
+     unresolved $testname
+     restore_notify
+

--- a/binutils/binutils-2.24-shared-pie.patch
+++ b/binutils/binutils-2.24-shared-pie.patch
@ -0,0 +1,99 @@
+diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
+index 9a2fe89..13f86f0 100644
+--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
+@@ -1480,6 +1480,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+   const char *rpath;
+   asection *sinterp;
+   bfd *abfd;
+  struct elf_link_hash_entry *ehdr_start = NULL;
+  struct bfd_link_hash_entry ehdr_start_save;
+ 
+   if (is_elf_hash_table (link_info.hash))
+     {
+@@ -1504,6 +1506,16 @@ gld${EMULATION_NAME}_before_allocation (void)
+              _bfd_elf_link_hash_hide_symbol (&link_info, h, TRUE);
+              if (ELF_ST_VISIBILITY (h->other) != STV_INTERNAL)
+                h->other = (h->other & ~ELF_ST_VISIBILITY (-1)) | STV_HIDDEN;
+	     /* Don't leave the symbol undefined.  Undefined hidden
+		symbols typically won't have dynamic relocations, but
+		we most likely will need dynamic relocations for
+		__ehdr_start if we are building a PIE or shared
+		library.  */
+	     ehdr_start = h;
+	     ehdr_start_save = h->root;
+	     h->root.type = bfd_link_hash_defined;
+	     h->root.u.def.section = bfd_abs_section_ptr;
+	     h->root.u.def.value = 0;
+            }
+        }
+ 
+@@ -1620,6 +1632,14 @@ ${ELF_INTERPRETER_SET_DEFAULT}
+ 
+   if (!bfd_elf_size_dynsym_hash_dynstr (link_info.output_bfd, &link_info))
+     einfo ("%P%F: failed to set dynamic section sizes: %E\n");
+
+  if (ehdr_start != NULL)
+    {
+      /* If we twiddled __ehdr_start to defined earlier, put it back
+	 as it was.  */
+      ehdr_start->root.type = ehdr_start_save.type;
+      ehdr_start->root.u = ehdr_start_save.u;
+    }
+ }
+ 
+ EOF
+diff --git a/ld/testsuite/ld-elf/ehdr_start-shared.d b/ld/testsuite/ld-elf/ehdr_start-shared.d
+new file mode 100644
+index 0000000..c17516a
+--- /dev/null
+++ b/ld/testsuite/ld-elf/ehdr_start-shared.d
+@@ -0,0 +1,9 @@
+#source: ehdr_start.s
+#ld: -e _start -shared
+#nm: -n
+#target: *-*-linux* *-*-gnu* *-*-nacl*
+#xfail: cris*-*-* frv-*-*
+
+#...
+[0-9a-f]*000 [Adrt] __ehdr_start
+#pass
+diff --git a/ld/testsuite/ld-elf/ehdr_start-userdef.d b/ld/testsuite/ld-elf/ehdr_start-userdef.d
+index 2a88e98..b58ae3f 100644
+--- a/ld/testsuite/ld-elf/ehdr_start-userdef.d
+++ b/ld/testsuite/ld-elf/ehdr_start-userdef.d
+@@ -2,6 +2,7 @@
+ #ld: -e _start -T ehdr_start-userdef.t
+ #readelf: -Ws
+ #target: *-*-linux* *-*-gnu* *-*-nacl*
+#xfail: frv-*-*
+ 
+ #...
+ Symbol table '\.symtab' contains [0-9]+ entries:
+diff --git a/ld/testsuite/ld-elf/ehdr_start-weak.d b/ld/testsuite/ld-elf/ehdr_start-weak.d
+index 8bd9035..24ae34c 100644
+--- a/ld/testsuite/ld-elf/ehdr_start-weak.d
+++ b/ld/testsuite/ld-elf/ehdr_start-weak.d
+@@ -2,6 +2,7 @@
+ #ld: -e _start -T ehdr_start-missing.t
+ #nm: -n
+ #target: *-*-linux* *-*-gnu* *-*-nacl*
+#xfail: frv-*-*
+ 
+ #...
+ \s+[wU] __ehdr_start
+diff --git a/ld/testsuite/ld-elf/ehdr_start.d b/ld/testsuite/ld-elf/ehdr_start.d
+index 52e5b54..d538b66 100644
+--- a/ld/testsuite/ld-elf/ehdr_start.d
+++ b/ld/testsuite/ld-elf/ehdr_start.d
+@@ -2,6 +2,7 @@
+ #ld: -e _start
+ #nm: -n
+ #target: *-*-linux* *-*-gnu* *-*-nacl*
+#xfail: frv-*-*
+ 
+ #...
+ [0-9a-f]*000 [Adrt] __ehdr_start
+-- 
+1.7.1
+
--- a/binutils/binutils-2.24-static-pie-hang.patch
+++ b/binutils/binutils-2.24-static-pie-hang.patch
@ -1,78 +0,0 @@
-diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
-index 4d391e1..d7f59e5 100644
--- a/bfd/elf32-i386.c
-+++ b/bfd/elf32-i386.c
-@@ -2368,8 +2368,13 @@ elf_i386_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
- 
- 	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
- 	    {
-	      p->count -= p->pc_count;
-	      p->pc_count = 0;
-+	      /* Don't update reloc count if there are any non
-+		 pc-relative relocs.  */
-+	      if (!h->pointer_equality_needed)
-+		{
-+		  p->count -= p->pc_count;
-+		  p->pc_count = 0;
-+		}
- 	      if (p->count == 0)
- 		*pp = p->next;
- 	      else
-diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
-index edee8ec..999011b 100644
--- a/bfd/elf64-x86-64.c
-+++ b/bfd/elf64-x86-64.c
-@@ -2463,8 +2463,13 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
- 
- 	  for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
- 	    {
-	      p->count -= p->pc_count;
-	      p->pc_count = 0;
-+	      /* Don't update reloc count if there are any non
-+		 pc-relative relocs.  */
-+	      if (!h->pointer_equality_needed)
-+		{
-+		  p->count -= p->pc_count;
-+		  p->pc_count = 0;
-+		}
- 	      if (p->count == 0)
- 		*pp = p->next;
- 	      else
-diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
-index 4d391e1..e834a5a 100644
--- a/bfd/elf32-i386.c
-+++ b/bfd/elf32-i386.c
-@@ -2390,9 +2390,12 @@ elf_i386_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
- 	}
- 
-       /* Also discard relocs on undefined weak syms with non-default
-    	 visibility.  */
-+    	 visibility.   Don't discard relocs against __ehdr_start which
-+	 will be defined by assign_file_positions_for_non_load_sections
-+	 later.  */
-       if (eh->dyn_relocs != NULL
-	  && h->root.type == bfd_link_hash_undefweak)
-+	  && h->root.type == bfd_link_hash_undefweak
-+	  && strcmp (h->root.root.string, "__ehdr_start") != 0)
- 	{
- 	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
- 	    eh->dyn_relocs = NULL;
-diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
-index edee8ec..f364fe4 100644
--- a/bfd/elf64-x86-64.c
-+++ b/bfd/elf64-x86-64.c
-@@ -2473,9 +2473,12 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
- 	}
- 
-       /* Also discard relocs on undefined weak syms with non-default
-	 visibility.  */
-+    	 visibility.   Don't discard relocs against __ehdr_start which
-+	 will be defined by assign_file_positions_for_non_load_sections
-+	 later.  */
-       if (eh->dyn_relocs != NULL
-	  && h->root.type == bfd_link_hash_undefweak)
-+	  && h->root.type == bfd_link_hash_undefweak
-+	  && strcmp (h->root.root.string, "__ehdr_start") != 0)
- 	{
- 	  if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
- 	    eh->dyn_relocs = NULL;
--- a/broadcom-wl-lts/PKGBUILD
+++ b/broadcom-wl-lts/PKGBUILD
@ -6,8 +6,8 @@ _extramodules=extramodules-3.2-lts
 _kernver="$(cat /lib/modules/${_extramodules}/version)"

 pkgname=broadcom-wl-lts
-pkgver=6.30.223.141
-pkgrel=3
+pkgver=6.30.223.248
+pkgrel=1
 pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver'
 arch=('x86_64')
 url='http://www.broadcom.com/support/802.11/linux_sta.php'
@ -20,7 +20,7 @@ install=install
 source=("http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz"
        'modprobe.d'
        'license.patch')
-sha1sums=('3a2453c71a07030f41a8fc613c87badf8452848c'
+sha1sums=('bd55f1fdc6b0a4d0a70dc4ba4bb4169a824e238c'
          '89bf92286ede30dd85304c6c4e42e89cfdc0f60a'
          'ea7b67982ddc0f56fd3becb9914fd4458fe7d373')

@ -35,9 +35,9 @@ build() {
 package() {
 	cd "${srcdir}"

-	install -D -m 755 wl.ko "${pkgdir}/lib/modules/${_extramodules}/wl.ko"
-	gzip "${pkgdir}/lib/modules/${_extramodules}/wl.ko"
+	install -D -m 755 wl.ko "${pkgdir}/usr/lib/modules/${_extramodules}/wl.ko"
+	gzip "${pkgdir}/usr/lib/modules/${_extramodules}/wl.ko"

 	install -D -m 644 lib/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	install -D -m 644 ${srcdir}/modprobe.d "${pkgdir}"/etc/modprobe.d/broadcom-wl-lts.conf
-}
+}
--- a/broadcom-wl/PKGBUILD
+++ b/broadcom-wl/PKGBUILD
@ -1,16 +1,16 @@
 #maintainer: Neophytos Kolokotronis <tetris4@gmail.com>

-_extramodules=extramodules-3.15.5-CHAKRA
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
+_extramodules=extramodules-3.16-CHAKRA
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"

 pkgname=broadcom-wl
-pkgver=6.30.223.141
-pkgrel=10
+pkgver=6.30.223.248
+pkgrel=1
 pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver'
 url='http://www.broadcom.com/support/802.11/linux_sta.php'
 arch=('x86_64')
 license=('custom')
-depends=('linux')
+depends=('linux>=3.16' 'linux<3.17')
 makedepends=('linux-headers')
 source=("http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz"
         #"http://ftp.de.debian.org/debian/pool/non-free/b/broadcom-sta/broadcom-sta_5.100.82.112.orig.tar.gz" "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${ARCH}-v${pkgver//./_}.tar.gz" we need the debian version, because upstream URL doesn't exist anymore
@ -18,11 +18,11 @@ source=("http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pk
        'license.patch'
        'gcc.patch'
        'linux-recent.patch')
-sha1sums=('3a2453c71a07030f41a8fc613c87badf8452848c'
+sha1sums=('bd55f1fdc6b0a4d0a70dc4ba4bb4169a824e238c'
          '8f5234da6769784b3331d2fefac4a38b20b5723f'
          '81c05d48b234d56ad2e18eaee5ce89b79550ef20'
-          '9ba530076d0b45eb96b2134e6b5d9f3a61adf4e0'
-          'c6a935a08480ca36f9e4b10b745ed46467fccc00')
+          '8a940675e8c0baa65494c378e6155543b26a9a58'
+          '4f07fffec5994bad1a857e3be8bd1e3b85576721')

 backup=('etc/modprobe.d/broadcom-wl.conf')
 install=install
@ -41,15 +41,16 @@ prepare() {

 build() {
 	cd "${srcdir}"
-	make -C /lib/modules/"${_kernver}"/build M=`pwd`
+
+	make -C /usr/lib/modules/"${_kernver}"/build M=`pwd`
 }

 package() {
 	cd "${srcdir}"

-	install -D -m 755 wl.ko "${pkgdir}/lib/modules/${_extramodules}/wl.ko"
-	gzip "${pkgdir}/lib/modules/${_extramodules}/wl.ko"
+	install -Dm644 wl.ko "${pkgdir}/usr/lib/modules/${_extramodules}/wl.ko"
+	gzip "${pkgdir}/usr/lib/modules/${_extramodules}/wl.ko"

-	install -D -m 644 lib/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -D -m 644 ${srcdir}/modprobe.d "${pkgdir}"/etc/modprobe.d/broadcom-wl.conf
+	install -Dm644 lib/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm644 modprobe.d "${pkgdir}/usr/lib/modprobe.d/broadcom-wl.conf"
 }
--- a/broadcom-wl/gcc.patch
+++ b/broadcom-wl/gcc.patch
@ -1,8 +1,8 @@
--- a/Makefile	2013-08-01 08:52:22.000000000 +0200
-+++ b/Makefile	2014-05-03 14:52:47.548492923 +0200
+--- a/Makefile	2014-06-26 10:42:08.000000000 +0000
+++ b/Makefile	2014-07-17 22:44:01.662297228 +0000
@@ -126,6 +126,8 @@
 EXTRA_CFLAGS       += -I$(src)/src/shared/bcmwifi/include
- #EXTRA_CFLAGS       += -DBCMDBG_ASSERT
+ #EXTRA_CFLAGS       += -DBCMDBG_ASSERT -DBCMDBG_ERR
 
 +EXTRA_CFLAGS       += -Wno-date-time
 +
--- a/broadcom-wl/linux-recent.patch
+++ b/broadcom-wl/linux-recent.patch
@ -1,10 +1,10 @@
--- a/src/wl/sys/wl_cfg80211_hybrid.c	2013-08-01 08:52:22.000000000 +0200
-+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2014-06-09 15:57:03.269734785 +0200
-@@ -1841,7 +1841,26 @@
+--- a/src/wl/sys/wl_cfg80211_hybrid.c	2014-06-26 10:42:08.000000000 +0000
+++ b/src/wl/sys/wl_cfg80211_hybrid.c	2014-07-17 22:49:58.707134487 +0000
+@@ -2071,7 +2071,22 @@
 			wl_get_assoc_ies(wl);
 			memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
 			wl_update_bss_info(wl);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
+-			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
 +			{
 +				struct wl_bss_info *bi;
 +				u16 bss_info_channel;
@ -15,169 +15,23 @@
 +				bss_info_channel = bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(bi->chanspec);
 +
 +				freq = ieee80211_channel_to_frequency(bss_info_channel,
-+					(bss_info_channel <= CH_MAX_2G_CHANNEL) ?
-+					IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
+				       (bss_info_channel <= CH_MAX_2G_CHANNEL) ?
+				       IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ);
 +
 +				channel = ieee80211_get_channel(wl_to_wiphy(wl), freq);
 +				cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
 +			}
-+#else
- 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
-+#endif
 			set_bit(WL_STATUS_CONNECTED, &wl->status);
 			wl->profile->active = true;
 		}
--- a/src/wl/sys/wl_linux.c	2013-08-01 08:52:22.000000000 +0200
-+++ b/src/wl/sys/wl_linux.c	2014-06-09 15:56:53.587566642 +0200
-@@ -910,7 +910,11 @@
- 	pci_set_drvdata(pdev, NULL);
- }
+--- a/src/wl/sys/wl_linux.c	2014-06-26 10:42:08.000000000 +0000
+++ b/src/wl/sys/wl_linux.c	2014-07-17 22:51:14.738622782 +0000
+@@ -878,7 +878,7 @@
+ static SIMPLE_DEV_PM_OPS(wl_pm_ops, wl_suspend, wl_resume);
+ #endif
 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- static struct pci_driver wl_pci_driver = {
-+#else
+-static struct pci_driver wl_pci_driver = {
 +static struct pci_driver wl_pci_driver __refdata = {
-+#endif
- 	name:		"wl",
- 	probe:		wl_pci_probe,
- 	suspend:	wl_suspend,
-@@ -3236,7 +3240,12 @@
- wl_tkip_printstats(wl_info_t *wl, bool group_key)
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
-+	struct seq_file sfile;
-+	struct seq_file *debug_buf = &sfile;	
-+#else
- 	char debug_buf[512];
-+#endif
- 	int idx;
- 	if (wl->tkipmodops) {
- 		if (group_key) {
-@@ -3249,7 +3258,11 @@
- 			wl->tkipmodops->print_stats(debug_buf, wl->tkip_ucast_data);
- 		else
- 			return;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
-+		printk("%s: TKIP stats from module: %s\n", debug_buf->buf, group_key?"Bcast":"Ucast");
-+#else
- 		printk("%s: TKIP stats from module: %s\n", debug_buf, group_key?"Bcast":"Ucast");
-+#endif
- 	}
- #endif 
- }
-@@ -3408,11 +3421,19 @@
- 	return 0;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- static int
- wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
- {
- 	wl_info_t * wl = (wl_info_t *)data;
-+#else
-+static int
-+wl_proc_read(struct seq_file *seq, void *offset)
-+{
-+	wl_info_t * wl = (wl_info_t *)seq->private;
-+#endif
- 	int bcmerror, to_user;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- 	int len;
- 
- 	if (offset > 0) {
-@@ -3424,17 +3445,33 @@
- 		WL_ERROR(("%s: Not enough return buf space\n", __FUNCTION__));
- 		return 0;
- 	}
-+#endif
- 	WL_LOCK(wl);
- 	bcmerror = wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- 	len = sprintf(buffer, "%d\n", to_user);
-+#endif
- 	WL_UNLOCK(wl);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- 	return len;
-+#else
-+	seq_printf(seq, "%d\n", to_user);
-+	return bcmerror;
-+#endif
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- static int
- wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *data)
- {
- 	wl_info_t * wl = (wl_info_t *)data;
-+#else
-+static ssize_t 
-+wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *ppos)
-+{
-+	struct seq_file *seq = filp->private_data;
-+	wl_info_t * wl = (wl_info_t *)seq->private;
-+#endif
- 	int from_user = 0;
- 	int bcmerror;
- 
-@@ -3445,7 +3482,11 @@
- 	}
- 	if (copy_from_user(&from_user, buff, 1)) {
- 		WL_ERROR(("%s: copy from user failed\n", __FUNCTION__));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- 		return -EIO;
-+#else
-+		return -EFAULT;
-+#endif
- 	}
- 
- 	if (from_user >= 0x30)
-@@ -3459,22 +3500,48 @@
- 		WL_ERROR(("%s: SET_MONITOR failed with %d\n", __FUNCTION__, bcmerror));
- 		return -EIO;
- 	}
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
-+	*ppos += length;
-+#endif
- 	return length;
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
-+static int wl_proc_open(struct inode *inode, struct file *file)
-+{
-+	return single_open(file, wl_proc_read, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations wl_fops = {
-+	.owner = THIS_MODULE,
-+	.open = wl_proc_open,
-+	.read = seq_read,
-+	.write = wl_proc_write,
-+	.llseek = seq_lseek,
-+	.release = single_release,
-+};
-+#endif
-+
- static int
- wl_reg_proc_entry(wl_info_t *wl)
- {
- 	char tmp[32];
- 	sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- 	if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
- 		WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
-+#else
-+	if ((wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_fops, wl)) == NULL) {
-+		WL_ERROR(("%s: proc_create_data %s failed\n", __FUNCTION__, tmp));
-+#endif
- 		ASSERT(0);
- 		return -1;
- 	}
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- 	wl->proc_entry->read_proc = wl_proc_read;
- 	wl->proc_entry->write_proc = wl_proc_write;
- 	wl->proc_entry->data = wl;
-+#endif
- 	return 0;
- }
- #ifdef WLOFFLD
+ 	.name =		"wl",
+ 	.probe =	wl_pci_probe,
+ 	.remove =	__devexit_p(wl_remove),
--- a/broadcom-wl/user-ioctl.patch
+++ b/broadcom-wl/user-ioctl.patch
@ -1,47 +0,0 @@
-diff -aur old/src/wl/sys/wl_cfg80211.c new/src/wl/sys/wl_cfg80211.c
--- old/src/wl/sys/wl_cfg80211.c	2011-10-23 03:56:55.000000000 +1100
-+++ new/src/wl/sys/wl_cfg80211.c	2012-05-24 18:43:17.324465658 +1000
-@@ -1466,7 +1466,10 @@
- 		scb_val.val = 0;
- 		err = wl_dev_ioctl(dev, WLC_GET_RSSI, &scb_val, sizeof(scb_val_t));
- 		if (err) {
-			WL_ERR(("Could not get rssi (%d)\n", err));
-+			if (err != -EINVAL) {
-+				// Don't fill syslog with EINVAL error
-+				WL_ERR(("Could not get rssi (%d)\n", err));
-+			}
- 			return err;
- 		}
- 		rssi = dtoh32(scb_val.val);
-diff -aur old/src/wl/sys/wl_linux.c new/src/wl/sys/wl_linux.c
--- old/src/wl/sys/wl_linux.c	2011-10-23 03:56:55.000000000 +1100
-+++ new/src/wl/sys/wl_linux.c	2012-05-24 18:43:17.324465658 +1000
-@@ -1579,11 +1579,7 @@
- 	}
- 
- 	WL_LOCK(wl);
-	if (!capable(CAP_NET_ADMIN)) {
-		bcmerror = BCME_EPERM;
-	} else {
-		bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif);
-	}
-+	bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif);
- 	WL_UNLOCK(wl);
- 
- done1:
-diff -aur old/src/wl/sys/wl_cfg80211.c new/src/wl/sys/wl_cfg80211.c.new
--- old/src/wl/sys/wl_cfg80211.c	2013-04-30 18:21:18.190170600 +0300
-+++ new/src/wl/sys/wl_cfg80211.c.new	2013-04-30 18:33:04.516810699 +0300
-@@ -2073,7 +2073,11 @@
- 		ie = ies->data;
- 		ie_len = ies->len;
- 		beacon_interval = bss->beacon_interval;
-		cfg80211_put_bss(bss);
-+		#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
-+	 	cfg80211_put_bss(bss);
-+	#else
-+		cfg80211_put_bss(wl_to_wiphy(wl), bss);
-+	#endif
- 	}
- 
- 	tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM);
--- a/cloog/PKGBUILD
+++ b/cloog/PKGBUILD
@ -5,20 +5,24 @@

 pkgname=cloog
 pkgver=0.18.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Library that generates loops for scanning polyhedra"
 arch=('x86_64')
 url="http://www.bastoul.net/cloog/"
 license=('GPL')
-depends=('isl' 'gmp')
-source=(http://www.bastoul.net/cloog/pages/download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e34fca0540d840e5d0f6427e98c92252')
+depends=('isl')
+source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz
+        cloog-0.18.1-isl-compat.patch)
+md5sums=('e34fca0540d840e5d0f6427e98c92252'
+         '976c999b44c6e364455a670d12523242')

 prepare() {
  cd $srcdir/$pkgname-$pkgver
+  
+  # combination of upstream commits b561f860, 2d8b7c6b and 22643c94
+  patch -p1 -i $srcdir/cloog-0.18.1-isl-compat.patch
 }

-
 build() {
  cd "${srcdir}/${pkgname}-${pkgver}"
  ./configure --prefix=/usr --with-isl=system 
--- a/cloog/cloog-0.18.0-isl-0.11.2.patch
+++ b/cloog/cloog-0.18.0-isl-0.11.2.patch
@ -1,95 +0,0 @@
-diff --git a/test/darte.c b/test/darte.c
-index e185b7a..2a4a1b8 100644
--- a/test/darte.c
-+++ b/test/darte.c
-@@ -6,14 +6,14 @@ if (n >= 1) {
-     }
-   }
-   for (t1=-n+2;t1<=n-1;t1++) {
-    if (t1 >= 2) {
-+    if (t1 >= 0) {
-       for (t3=t1+4;t3<=t1+2*n+2;t3++) {
-         if ((t1+t3)%2 == 0) {
-           S1(t1+1,1,(-t1+t3-2)/2);
-         }
-       }
-     }
-    for (t2=max(-t1+2,t1+2);t2<=-t1+4;t2++) {
-+    for (t2=max(-t1+2,t1+3);t2<=-t1+4;t2++) {
-       for (t3=t2+2;t3<=t2+2*n;t3++) {
-         if ((t1+t2)%2 == 0) {
-           if ((t1+t3)%2 == 0) {
-diff --git a/test/dartef.f b/test/dartef.f
-index 50e1073..3b5e3e2 100644
--- a/test/dartef.f
-+++ b/test/dartef.f
-@@ -6,14 +6,14 @@ IF (n >= 1) THEN
-     END IF
-   END DO
-   DO t1=-n+2, n-1
-    IF (t1 >= 2) THEN
-+    IF (t1 >= 0) THEN
-       DO t3=t1+4, t1+2*n+2
-         IF (MOD(t1+t3, 2) == 0) THEN
-           S1(t1+1,1,(-t1+t3-2)/2)
-         END IF
-       END DO
-     END IF
-    DO t2=MAX(-t1+2,t1+2), -t1+4
-+    DO t2=MAX(-t1+2,t1+3), -t1+4
-       DO t3=t2+2, t2+2*n
-         IF (MOD(t1+t2, 2) == 0) THEN
-           IF (MOD(t1+t3, 2) == 0) THEN
-diff --git a/test/dealII.c b/test/dealII.c
-index 200b257..5d28c4a 100644
--- a/test/dealII.c
-+++ b/test/dealII.c
-@@ -3,10 +3,13 @@ for (scat_0=0;scat_0<=min(T_66,T_2-1);scat_0++) {
-   S1(scat_0);
-   S2(scat_0);
- }
-if ((T_2 == 0) && (T_67 == 0)) {
-+if ((T_2 == 0) && (T_66 >= 0) && (T_67 == 0)) {
-   S1(0);
- }
-for (scat_0=max(0,T_66+1);scat_0<=T_2-1;scat_0++) {
-+if ((T_66 <= -1) && (T_67 == 0)) {
-+  S1(0);
-+}
-+for (scat_0=max(max(0,T_66+1),-T_67+1);scat_0<=T_2-1;scat_0++) {
-   S1(scat_0);
- }
- for (scat_0=T_2;scat_0<=min(T_66,T_67-1);scat_0++) {
-diff --git a/test/isl/jacobi-shared.c b/test/isl/jacobi-shared.c
-index e8e5ec7..9e345c6 100644
--- a/test/isl/jacobi-shared.c
-+++ b/test/isl/jacobi-shared.c
-@@ -1,6 +1,6 @@
- /* Generated from ../../../git/cloog/test/isl/jacobi-shared.cloog by CLooG 0.16.3-2-g5511bef gmp bits in 1.82s. */
- if ((h0+1)%2 == 0) {
-  if ((16*floord(t0-1,16) >= -N+g1+t0+1) && (16*floord(N+15*g1+15*t0+15,16) >= 15*g1+15*t0+19) && (32*floord(t1-1,32) <= g2+t1-3) && (32*floord(t1-1,32) >= -N+g2+t1+1)) {
-+  if ((16*floord(N+15*g1+15*t0+15,16) >= 15*g1+15*t0+19) && (16*floord(N+15*g1+15*t0+15,16) >= 16*g1+15*t0+17) && (32*floord(t1-1,32) <= g2+t1-3) && (32*floord(t1-1,32) >= -N+g2+t1+1)) { 
-     for (c0=max(-16*floord(t0-1,16)+t0,-16*floord(g1+t0-3,16)+t0);c0<=min(32,N-g1-1);c0+=16) {
-       c1 = 32*floord(-t1,32)+t1+32;
-       if (c1 <= 32) {
-diff --git a/test/vasilache.c b/test/vasilache.c
-index 5a00a33..fdff031 100644
--- a/test/vasilache.c
-+++ b/test/vasilache.c
-@@ -15,12 +15,12 @@ for (p1=0;p1<=N-1;p1++) {
-         S6(p1,p3,p5,p7-1);
-         S7(p1,p3,p5,p7);
-       }
-      if (p5 <= floord(N-33,32)) {
-        S6(p1,p3,p5,32*p5+31);
-      }
-      if (p5 >= ceild(N-32,32)) {
-+      if (p5 >= ceild(N-31,32)) {
-         S6(p1,p3,p5,N-1);
-       }
-+      if (p5 <= floord(N-32,32)) {
-+        S6(p1,p3,p5,32*p5+31);
-+      }
-     }
-   }
- }
--- a/cloog/cloog-0.18.1-isl-compat.patch
+++ b/cloog/cloog-0.18.1-isl-compat.patch
--- a/gcc/PKGBUILD
+++ b/gcc/PKGBUILD
@ -1,23 +1,24 @@
 # maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
-pkgver=4.9.0
+pkgver=4.9.1
 _pkgver=4.9
-pkgrel=8
-_snapshot=4.9-20140521
+pkgrel=1
+_snapshot=4.9-20140903
 pkgdesc="The GNU Compiler Collection"
 arch=('x86_64')
 license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org"
-makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'gcc-ada' 'doxygen')
+makedepends=('binutils>=2.24' 'libmpc' 'cloog' 'gcc-ada' 'doxygen' 'isl>=0.13')
 checkdepends=('dejagnu' 'inetutils')
 options=('!emptydirs')
 source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2)
        ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
        gcc-4.8-filename-output.patch
-)
-md5sums=('cd3cbe93ebc7207bf65d30e3c9a74a26'
-         '40cb437805e2f7a006aa0d0c3098ab0f')
+        gcc-4.9-isl-0.13-hack.patch)
+md5sums=('24dfd67139fda4746d2deff18182611d'
+         '40cb437805e2f7a006aa0d0c3098ab0f'
+         'f26ae06b9cbc8abe86f5ee4dc5737da8')

 if [ -n "${_snapshot}" ]; then
  _basedir="${srcdir}/gcc-${_snapshot}"
@ -44,6 +45,10 @@ prepare() {
  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57653
  patch -p0 -i ${srcdir}/gcc-4.8-filename-output.patch

+  # isl-0.13 support - mostly header includes and a function rename
+  # (which does not seem right but causes no testsuite failures...)
+  patch -p1 -i ${srcdir}/gcc-4.9-isl-0.13-hack.patch
+
  mkdir ${srcdir}/gcc-build
 }

@ -65,11 +70,11 @@ build() {
      --disable-libunwind-exceptions --enable-clocale=gnu \
      --disable-libstdcxx-pch --disable-libssp \
      --enable-gnu-unique-object --enable-linker-build-id \
-      --enable-cloog-backend=isl --disable-cloog-version-check \
+      --enable-cloog-backend=isl \
+      --disable-isl-version-check --disable-cloog-version-check \
      --enable-lto --enable-plugin --enable-install-libiberty \
      --with-linker-hash-style=gnu \
      --disable-multilib --disable-werror \
-      --enable-bootstrap \
      --enable-checking=release
  make
  
@ -85,7 +90,7 @@ check() {
  ulimit -s 32768

  # do not abort on error as some are "expected"
-  make -k check | tee gcc-check-log || true
+  make -k check || true
  ${srcdir}/${_basedir}/contrib/test_summary
 }

@ -93,11 +98,12 @@ package_gcc-libs()
 {
  pkgdesc="Runtime libraries shipped by GCC"
  groups=('base')
-  depends=('glibc>=2.17')
-  options=("!emptydirs")
+  depends=('glibc>=2.20')
+  options=('!emptydirs' '!strip')
  install=gcc-libs.install

  cd ${srcdir}/gcc-build
+  
  make -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
  rm ${pkgdir}/${_libdir}/libgcc_eh.a

--- a/gcc/gcc-4.9-isl-0.13-hack.patch
+++ b/gcc/gcc-4.9-isl-0.13-hack.patch
@ -0,0 +1,71 @@
+diff -Naur gcc-4.9-20140604-old/gcc/graphite-clast-to-gimple.c gcc-4.9-20140604/gcc/graphite-clast-to-gimple.c
+--- gcc-4.9-20140604-old/gcc/graphite-clast-to-gimple.c	2014-03-03 21:39:22.000000000 +1000
+++ gcc-4.9-20140604/gcc/graphite-clast-to-gimple.c	2014-06-25 15:07:57.958697105 +1000
+@@ -28,6 +28,8 @@
+ #include <isl/constraint.h>
+ #include <isl/ilp.h>
+ #include <isl/aff.h>
+#include <isl/deprecated/int.h>
+#include <isl/deprecated/ilp_int.h>
+ #include <cloog/cloog.h>
+ #include <cloog/isl/domain.h>
+ #endif
+diff -Naur gcc-4.9-20140604-old/gcc/graphite-interchange.c gcc-4.9-20140604/gcc/graphite-interchange.c
+--- gcc-4.9-20140604-old/gcc/graphite-interchange.c	2014-01-03 08:23:26.000000000 +1000
+++ gcc-4.9-20140604/gcc/graphite-interchange.c	2014-06-25 15:10:06.882899243 +1000
+@@ -29,6 +29,9 @@
+ #include <isl/map.h>
+ #include <isl/union_map.h>
+ #include <isl/ilp.h>
+#include <isl/deprecated/int.h>
+#include <isl/deprecated/ilp_int.h>
+#include <isl/deprecated/constraint_int.h>
+ #include <cloog/cloog.h>
+ #include <cloog/isl/domain.h>
+ #endif
+diff -Naur gcc-4.9-20140604-old/gcc/graphite-optimize-isl.c gcc-4.9-20140604/gcc/graphite-optimize-isl.c
+--- gcc-4.9-20140604-old/gcc/graphite-optimize-isl.c	2014-01-03 08:23:26.000000000 +1000
+++ gcc-4.9-20140604/gcc/graphite-optimize-isl.c	2014-06-25 15:16:57.038386166 +1000
+@@ -28,6 +28,8 @@
+ #include <isl/band.h>
+ #include <isl/aff.h>
+ #include <isl/options.h>
+#include <isl/deprecated/int.h>
+#include <isl/deprecated/aff_int.h>
+ #endif
+ 
+ #include "system.h"
+@@ -373,7 +375,7 @@
+ 	{
+ 	  for (i = ScheduleDimensions - 1 ;  i >= 0 ; i--)
+ 	    {
+-	      if (isl_band_member_is_zero_distance (Band, i))
+	      if (isl_band_member_is_coincident (Band, i))
+ 		{
+ 		  isl_map *TileMap;
+ 		  isl_union_map *TileUMap;
+diff -Naur gcc-4.9-20140604-old/gcc/graphite-poly.c gcc-4.9-20140604/gcc/graphite-poly.c
+--- gcc-4.9-20140604-old/gcc/graphite-poly.c	2014-01-03 08:23:26.000000000 +1000
+++ gcc-4.9-20140604/gcc/graphite-poly.c	2014-06-25 15:18:01.207157796 +1000
+@@ -28,6 +28,8 @@
+ #include <isl/constraint.h>
+ #include <isl/ilp.h>
+ #include <isl/aff.h>
+#include <isl/deprecated/int.h>
+#include <isl/deprecated/ilp_int.h>
+ #include <cloog/cloog.h>
+ #include <cloog/isl/domain.h>
+ #endif
+diff -Naur gcc-4.9-20140604-old/gcc/graphite-sese-to-poly.c gcc-4.9-20140604/gcc/graphite-sese-to-poly.c
+--- gcc-4.9-20140604-old/gcc/graphite-sese-to-poly.c	2014-04-08 20:59:40.000000000 +1000
+++ gcc-4.9-20140604/gcc/graphite-sese-to-poly.c	2014-06-25 15:19:46.575140398 +1000
+@@ -26,6 +26,9 @@
+ #include <isl/union_map.h>
+ #include <isl/constraint.h>
+ #include <isl/aff.h>
+#include <isl/deprecated/int.h>
+#include <isl/deprecated/aff_int.h>
+#include <isl/deprecated/constraint_int.h>
+ #include <cloog/cloog.h>
+ #include <cloog/cloog.h>
+ #include <cloog/isl/domain.h>
--- a/glibc/PKGBUILD
+++ b/glibc/PKGBUILD
@ -2,47 +2,46 @@


 pkgname=glibc
-pkgver=2.19
-pkgrel=4
+pkgver=2.20
+pkgrel=1
 pkgdesc="GNU C Library"
 arch=('x86_64')
 url="http://www.gnu.org/software/libc"
 license=('GPL' 'LGPL')
 groups=('base')
-depends=('linux-api-headers>=3.12.15' 'tzdata')
-makedepends=('gcc>=4.8')
+depends=('linux-api-headers>=3.16.2' 'tzdata' 'filesystem>=2014.07')
+makedepends=('gcc>=4.9')
 backup=(etc/gai.conf
        etc/locale.gen
        etc/nscd.conf)
 options=('!strip' 'staticlibs')
 install=glibc.install
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
-        glibc-2.19-xattr_header.patch
-        glibc-2.19-fix-sign-in-bsloww1-input.patch
-        glibc-2.19-tzselect-default.patch
-        glibc.conf
+	glibc-2.20-getifaddrs_internal-segfault.patch
+	glibc-2.20-linux-3.16-additions.patch
+	glibc-2.20-do_ftell_wide-memleak.patch
        locale.gen.txt
        locale-gen)
-md5sums=('e26b8cc666b162f999404b03970f14e4'
+md5sums=('948a6e06419a01bd51e97206861595b0'
         'SKIP'
-         '39a4876837789e07746f1d84cd8cb46a'
-         '755a1a9d7844a5e338eddaa9a5d974cd'
-         'c772dc99ddd8032ecbf43884ae0cf42e'
-         '8b3298de2392a10905a64ceccf56d2c1'
+         '1c5d5c2017445c75dbc5c6d0c1e45ddb'
+         '8f1059f431b842e54b12bde689620df8'
+         'b50feeab78fa6ce0a8cfb41ee8dc1fd8'
         '07ac979b6ab5eeb778d55f041529d623'
         '476e9113489f93b348b21e144b6a8fcf')

 prepare() {
  cd ${srcdir}/${pkgname}-${pkgver}

-  # fix for {linux,sys}/xattr.h incompatibility - commit fdbe8eae
-  patch -p1 -i $srcdir/glibc-2.19-xattr_header.patch
-
-  # fix issues in sin/cos slow path calculation - commit ffe768a9
-  patch -p1 -i $srcdir/glibc-2.19-fix-sign-in-bsloww1-input.patch
-
-  # fix tzselect with missing TZDIR - commit 893b4f37/c72399fb
-  patch -p1 -i $srcdir/glibc-2.19-tzselect-default.patch
+  # fix segfault in getifaddrs_internal
+  # https://sourceware.org/ml/libc-alpha/2014-09/msg00312.html
+  patch -p1 -i $srcdir/glibc-2.20-getifaddrs_internal-segfault.patch
+  
+  # linux 3.16 additions - commit 0bd72468
+  patch -p1 -i $srcdir/glibc-2.20-linux-3.16-additions.patch
+  
+  # plug memory leak - commit 984c0ea9
+  patch -p1 -i $srcdir/glibc-2.20-do_ftell_wide-memleak.patch

  mkdir ${srcdir}/glibc-build
 }
@ -50,7 +49,8 @@ prepare() {
 build() {
  cd ${srcdir}/glibc-build

-  echo "slibdir=/lib" >> configparms
+  echo "slibdir=/usr/lib" >> configparms
+  echo "rtlddir=/usr/lib" >> configparms

  # remove hardening options for building libraries
  CFLAGS=${CFLAGS/-fstack-protector-strong/}
@ -60,7 +60,7 @@ build() {
      --libdir=/usr/lib --libexecdir=/usr/lib \
      --with-headers=/usr/include \
      --with-bugurl=https://chakraos.org/bugtracker \
-      --enable-add-ons=nptl,libidn \
+      --enable-add-ons \
      --enable-obsolete-rpc \
      --enable-kernel=2.6.32 \
      --enable-bind-now --disable-profile \
@ -79,7 +79,7 @@ build() {
  make

  # remove harding in preparation to run test-suite
-  sed -i '4,6d' configparms
+  sed -i '5,7d' configparms
 }

 check() {
@ -88,7 +88,7 @@ check() {

  cd ${srcdir}/glibc-build

-  make -k check 2>&1 | tee glibc-check-log || true
+  make check || true
 }

 package() {
@ -116,14 +116,6 @@ package() {
  sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
    ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen

-  # fix for the linker
-  sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
-  # Comply with multilib binaries, they look for the linker in /lib64
-  mkdir -p ${pkgdir}/lib64
-  cd ${pkgdir}/lib64
-  ln -v -s ../lib/ld-2* || true
-  ln -v -s ../lib/ld-l* || true
-
  # remove the static libraries that have a shared counterpart
  # libc, libdl, libm and libpthread are required for toolchain testsuites
  # in addition libcrypt appears widely required
@ -145,10 +137,17 @@ package() {

  strip $STRIP_STATIC usr/lib/*.a

-  strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \
-                      lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
-                      lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
-                      lib/{libmemusage,libpcprofile,libSegFault}.so \
+  strip $STRIP_SHARED usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
+                      usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
+                      usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
+                      usr/lib/{libmemusage,libpcprofile,libSegFault}.so \
                      usr/lib/{audit,gconv}/*.so
-  install -Dm644 "$srcdir/glibc.conf" "$pkgdir/etc/ld.so.conf.d/glibc.conf"
+
+  #
+  # add lib symlinks
+  #
+  ln -s usr/lib ${pkgdir}/lib
+  ln -s usr/lib ${pkgdir}/lib64
+  ln -s lib ${pkgdir}/usr/lib64               
+
 }
--- a/glibc/glibc-2.19-fix-sign-in-bsloww1-input.patch
+++ b/glibc/glibc-2.19-fix-sign-in-bsloww1-input.patch
@ -1,71 +0,0 @@
-From ffe768a90912f9bce43b70a82576b3dc99e3121c Mon Sep 17 00:00:00 2001
-From: Siddhesh Poyarekar <siddhesh@redhat.com>
-Date: Thu, 27 Feb 2014 21:29:16 +0530
-Subject: [PATCH] Fix sign of input to bsloww1 (BZ #16623)
-
-In 84ba214c, I removed some redundant sign computations and in the
-process, I incorrectly got rid of a temporary variable, thus passing
-the absolute value of the input to bsloww1.  This caused #16623.
-
-This fix undoes the incorrect change.
---
- sysdeps/ieee754/dbl-64/s_sin.c | 16 ++++++++++------
- 3 files changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/sysdeps/ieee754/dbl-64/s_sin.c b/sysdeps/ieee754/dbl-64/s_sin.c
-index 6105e9f..50109b8 100644
--- a/sysdeps/ieee754/dbl-64/s_sin.c
-+++ b/sysdeps/ieee754/dbl-64/s_sin.c
-@@ -447,19 +447,21 @@ __sin (double x)
- 	    }
- 	  else
- 	    {
-+	      double t;
- 	      if (a > 0)
- 		{
- 		  m = 1;
-+		  t = a;
- 		  db = da;
- 		}
- 	      else
- 		{
- 		  m = 0;
-		  a = -a;
-+		  t = -a;
- 		  db = -da;
- 		}
-	      u.x = big + a;
-	      y = a - (u.x - big);
-+	      u.x = big + t;
-+	      y = t - (u.x - big);
- 	      res = do_sin (u, y, db, &cor);
- 	      cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps;
- 	      retval = ((res == res + cor) ? ((m) ? res : -res)
-@@ -671,19 +673,21 @@ __cos (double x)
- 	    }
- 	  else
- 	    {
-+	      double t;
- 	      if (a > 0)
- 		{
- 		  m = 1;
-+		  t = a;
- 		  db = da;
- 		}
- 	      else
- 		{
- 		  m = 0;
-		  a = -a;
-+		  t = -a;
- 		  db = -da;
- 		}
-	      u.x = big + a;
-	      y = a - (u.x - big);
-+	      u.x = big + t;
-+	      y = t - (u.x - big);
- 	      res = do_sin (u, y, db, &cor);
- 	      cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps;
- 	      retval = ((res == res + cor) ? ((m) ? res : -res)
-- 
-1.9.0
-
--- a/glibc/glibc-2.19-tzselect-default.patch
+++ b/glibc/glibc-2.19-tzselect-default.patch
@ -1,13 +0,0 @@
-diff --git a/timezone/Makefile b/timezone/Makefile
-index 998cd14..d5f647c 100644
--- a/timezone/Makefile
-+++ b/timezone/Makefile
-@@ -118,7 +118,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps)
- 
- $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
- 	sed -e 's|/bin/bash|$(KSH)|g' \
-	    -e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \
-+	    -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \
- 	    -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
- 	    -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
- 	    -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \
--- a/glibc/glibc-2.19-xattr_header.patch
+++ b/glibc/glibc-2.19-xattr_header.patch
@ -1,42 +0,0 @@
-From: Serge Hallyn <serge.hallyn@ubuntu.com>
-Date: Tue, 11 Mar 2014 04:17:07 +0000 (-0500)
-Subject: misc/sys/xattr.h: guard against linux uapi header inclusion
-X-Git-Url: https://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=fdbe8eae;hp=fede7a5ffa188c22c3789135bd5cf82e487dd3d0
-
-misc/sys/xattr.h: guard against linux uapi header inclusion
-
-If the glibc xattr.h header is included after the uapi header,
-compilation fails due to an enum re-using a #define from the
-uapi header.  Protect against this by guarding the define and
-enum inclusions against each other.
-
-(A corresponding kernel patch has been sent here:
-http://lkml.org/lkml/2014/3/7/331 )
-
-(See https://lists.debian.org/debian-glibc/2014/03/msg00029.html
-and https://sourceware.org/glibc/wiki/Synchronizing_Headers
-for more information.)
-
-Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---
-
-diff --git a/misc/sys/xattr.h b/misc/sys/xattr.h
-index 929cd87..796df90 100644
--- a/misc/sys/xattr.h
-+++ b/misc/sys/xattr.h
-@@ -26,6 +26,7 @@ __BEGIN_DECLS
- 
- /* The following constants should be used for the fifth parameter of
-    `*setxattr'.  */
-+#ifndef __USE_KERNEL_XATTR_DEFS
- enum
- {
-   XATTR_CREATE = 1,	/* set value, fail if attr already exists.  */
-@@ -33,6 +34,7 @@ enum
-   XATTR_REPLACE = 2	/* set value, fail if attr does not exist.  */
- #define XATTR_REPLACE	XATTR_REPLACE
- };
-+#endif
- 
- /* Set the attribute NAME of the file pointed to by PATH to VALUE (which
-    is SIZE bytes long).  Return 0 on success, -1 for errors.  */
--- a/glibc/glibc-2.20-do_ftell_wide-memleak.patch
+++ b/glibc/glibc-2.20-do_ftell_wide-memleak.patch
@ -0,0 +1,12 @@
+diff --git a/libio/wfileops.c b/libio/wfileops.c
+index f123add..ebc06e8 100644
+--- a/libio/wfileops.c
+++ b/libio/wfileops.c
+@@ -711,6 +711,7 @@ do_ftell_wide (_IO_FILE *fp)
+ 		return WEOF;
+ 
+ 	      offset += outstop - out;
+	      free (out);
+ 	    }
+ 
+ 	  /* We don't trust _IO_read_end to represent the current file offset
--- a/glibc/glibc-2.20-getifaddrs_internal-segfault.patch
+++ b/glibc/glibc-2.20-getifaddrs_internal-segfault.patch
@ -0,0 +1,29 @@
+diff --git a/sysdeps/unix/sysv/linux/ifaddrs.c b/sysdeps/unix/sysv/linux/ifaddrs.c
+index 2c04e17..a47b2ed 100644
+--- a/sysdeps/unix/sysv/linux/ifaddrs.c
+++ b/sysdeps/unix/sysv/linux/ifaddrs.c
+@@ -770,20 +770,17 @@ getifaddrs_internal (struct ifaddrs **ifap)
+ 
+ 		  if (cp != NULL)
+ 		    {
+-		      char c;
+ 		      unsigned int preflen;
+ 
+-		      if ((max_prefixlen > 0) &&
+-			  (ifam->ifa_prefixlen > max_prefixlen))
+		      if (ifam->ifa_prefixlen > max_prefixlen)
+ 			preflen = max_prefixlen;
+ 		      else
+ 			preflen = ifam->ifa_prefixlen;
+ 
+-		      for (i = 0; i < ((preflen - 1) / 8); i++)
+		      for (i = 0; i < preflen / 8; i++)
+ 			*cp++ = 0xff;
+-		      c = 0xff;
+-		      c <<= ((128 - preflen) % 8);
+-		      *cp = c;
+		      if (preflen % 8)
+			*cp = 0xff << (8 - preflen % 8);
+ 		    }
+ 		}
+ 	    }
--- a/glibc/glibc-2.20-linux-3.16-additions.patch
+++ b/glibc/glibc-2.20-linux-3.16-additions.patch
@ -0,0 +1,15 @@
+diff --git a/sysdeps/gnu/netinet/udp.h b/sysdeps/gnu/netinet/udp.h
+index 32159cd..8cc1c60 100644
+--- a/sysdeps/gnu/netinet/udp.h
+++ b/sysdeps/gnu/netinet/udp.h
+@@ -78,6 +78,10 @@ struct udphdr
+ #define UDP_CORK	1	/* Never send partially complete segments.  */
+ #define UDP_ENCAP	100	/* Set the socket to accept
+ 				   encapsulated packets.  */
+#define UDP_NO_CHECK6_TX 101	/* Disable sending checksum for UDP
+				   over IPv6.  */
+#define UDP_NO_CHECK6_RX 102	/* Disable accepting checksum for UDP
+				   over IPv6.  */
+ 
+ /* UDP encapsulation types */
+ #define UDP_ENCAP_ESPINUDP_NON_IKE 1	/* draft-ietf-ipsec-nat-t-ike-00/01 */
--- a/glibc/glibc.conf
+++ b/glibc/glibc.conf
@ -1 +0,0 @@
-/lib
--- a/isl/PKGBUILD
+++ b/isl/PKGBUILD
@ -4,15 +4,15 @@
 # maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>

 pkgname=isl
-pkgver=0.12.1
-pkgrel=2
+pkgver=0.13
+pkgrel=1
 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints"
 arch=('x86_64')
 url="http://www.kotnet.org/~skimo/isl/"
 depends=('gmp')
 license=('MIT')
 source=("http://isl.gforge.inria.fr/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('27d381085ff1b5733c3e8a9b6ad24a4d')
+md5sums=('e4cf20c4c10d5d613457558b1f46b5e2')

 build() {
  cd "$srcdir/$pkgname-$pkgver"
@ -30,7 +30,7 @@ package() {
  make DESTDIR="$pkgdir/" install

  install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/
-  mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.2.1-gdb.py
+  mv $pkgdir/usr/lib/libisl.so.*-gdb.py $pkgdir/usr/share/gdb/auto-load/usr/lib/
  
  install -Dm644 LICENSE $pkgdir/usr/share/licenses/isl/LICENSE
 }
--- a/kmod/PKGBUILD
+++ b/kmod/PKGBUILD
@ -1,7 +1,7 @@
 # Maintainer: <inkane[at]chakra-project[dot]org>

 pkgname=kmod
-pkgver=16
+pkgver=18
 pkgrel=1
 pkgdesc="Linux kernel module handling"
 arch=('x86_64')
@ -14,7 +14,7 @@ conflicts=('module-init-tools')
 replaces=('module-init-tools')
 source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
        "depmod-search.conf")
-sha1sums=('1b3e8066208098b3b9593b63bff5838a41bbdfb0'
+sha1sums=('6cadc3b088fa5874f712d3bbe4df75ece59c4b77'
          '489b0ce0efd193aab70421a852526ed04dd026c4')

 build() {
@ -23,7 +23,7 @@ build() {
  ./configure \
    --sysconfdir=/etc \
    --with-xz \
-    --with-zlib 
+    --with-zlib

  make
 }
--- a/libtool/PKGBUILD
+++ b/libtool/PKGBUILD
@ -7,8 +7,8 @@

 pkgname=('libtool' 'libltdl')
 pkgver=2.4.2
-_gccver=4.9.0
-pkgrel=16
+_gccver=4.9.1
+pkgrel=17
 pkgdesc="A generic library support script"
 arch=('x86_64')
 url="http://www.gnu.org/software/libtool"
--- a/linux-api-headers/PKGBUILD
+++ b/linux-api-headers/PKGBUILD
@ -6,8 +6,8 @@
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc

 pkgname=linux-api-headers
-pkgver=3.12.15
-_basever=3.12
+pkgver=3.16.2
+_basever=3.16
 pkgrel=1
 pkgdesc="Kernel headers sanitized for use in userspace"
 arch=('i686' 'x86_64')
@ -18,8 +18,8 @@ conflicts=('kernel-headers')
 replaces=('kernel-headers')
 source=(http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.xz
 	http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz)
-md5sums=('cc6ee608854e0da4b64f6c1ff8b6398c'
-         '5c7e75bb6727bc229df1e8233e4fa472')
+md5sums=('5c569ed649a0c9711879f333e90c5386'
+         '926e6e2ee0634ce53730701da749b040')

 build() {
  cd ${srcdir}/linux-${_basever}
--- a/linux-lts/PKGBUILD
+++ b/linux-lts/PKGBUILD
@ -7,7 +7,7 @@ pkgname=('linux-lts' 'linux-lts-headers' 'linux-lts-docs') # Build stock -CHAKRA
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux}
 _basekernel=3.2
-pkgver=3.2.57
+pkgver=3.2.63
 pkgrel=1
 makedepends=('xmlto' 'docbook-xsl')
 arch=('x86_64')
@ -22,7 +22,7 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_basekernel.tar.bz2"
        'linux-lts.preset'
        'change-default-console-loglevel.patch')
 md5sums=('7ceb61f87c097fc17509844b71268935'
-         '6934e452412f80ceb7d725fd93c18007'
+         'b0415bfb76e94590e3d0ab68884af8c9'
         'd73da01f9e20687abda70c10e7e5ea71'
         '232b52576a62c7a333e9fe7a1e1ca359'
         '9d3c56a4b999c8bfbd4018089a62f662')
@ -129,6 +129,13 @@ package_linux-lts() {
  # add real version for building modules and running depmod from post_install/upgrade
  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--CHAKRA-LTS}"
  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--CHAKRA-LTS}/version"
+  
+  # Now we call depmod...
+  depmod -b "$pkgdir" -F System.map "$_kernver"
+
+  # move module tree /lib -> /usr/lib
+  mkdir -p "${pkgdir}/usr"
+  mv "${pkgdir}/lib" "${pkgdir}/usr/"
 }

 package_linux-lts-headers() {
@ -137,10 +144,10 @@ package_linux-lts-headers() {
  conflicts=('kernel26-lts-headers')
  replaces=('kernel26-lts-headers')

-  mkdir -p "${pkgdir}/lib/modules/${_kernver}"
+  install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"

-  cd "${pkgdir}/lib/modules/${_kernver}"
-  ln -sf ../../../usr/src/linux-${_kernver} build
+  cd "${pkgdir}/usr/lib/modules/${_kernver}"
+  ln -sf ../../../src/linux-${_kernver} build

  cd "${srcdir}/linux-${_basekernel}"
  install -D -m644 Makefile \
--- a/linux-lts/linux-lts.install
+++ b/linux-lts/linux-lts.install
@ -2,7 +2,7 @@
 # arg 2:  the old package version

 KERNEL_NAME=-lts
-KERNEL_VERSION=3.2.51-1-lts
+KERNEL_VERSION=3.2.63-1-lts

 post_install () {
  # updating module dependencies
--- a/linux/PKGBUILD
+++ b/linux/PKGBUILD
@ -6,7 +6,7 @@ pkgbase=linux
 pkgname=('linux' 'linux-headers' 'linux-docs') 
 _kernelname=${pkgname#linux}
 _basekernel="3.16"
-pkgver=3.16.1
+pkgver=3.16.2
 pkgrel=1
 arch=('x86_64')
 url="http://www.kernel.org/"
@ -30,8 +30,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz
        'change-default-console-loglevel.patch')

 sha256sums=('4813ad7927a7d92e5339a873ab16201b242b2748934f12cb5df9ba2cfe1d77a0'
-            'd2bf33289acf5c05b57aaca1fd8bb1935ac280c5c4090874e84806d35e17012e'
-            'a3ff475da2d11620bed6de14d858b463d3045fe259de199f92d94c4264f16ee3'
+            '567c903c21a932c6265eae1dee9ac708e33fc5405d69204de2588760ed0bde72'
+            '8aa02ebf8e115b16f454a825bc68536544a013ce3356220d3b84c7a562af3d9b'
            'a91c5affffb9e24cf0e34e1ab1c9e593219f67ef81834e0e4e9572281ef760c0'
            '537150c576a296ddc99c4f8f51fabc2f3577acf3a6e375edbfd60be337c1b122'
            'c5ecc97e669d8bcc4540c12ee74c7aecc4e2e8102993407a96a4f7463be74d80'
@ -180,8 +180,9 @@ package_linux() {
  # Now we call depmod...
  depmod -b "$pkgdir" -F System.map "$_kernver"

-  #TODO: move module tree /lib -> /usr/lib
-  #mv "$pkgdir/lib" "$pkgdir/usr"
+  # move module tree /lib -> /usr/lib
+  mkdir -p "${pkgdir}/usr"
+  mv "${pkgdir}/lib" "${pkgdir}/usr/"
 }

 package_linux-headers() {
@ -190,10 +191,10 @@ package_linux-headers() {
  conflicts=('kernel26-headers')
  replaces=('kernel26-headers')

-  install -dm755 "${pkgdir}/lib/modules/${_kernver}"
+  install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"

-  cd "${pkgdir}/lib/modules/${_kernver}"
-  ln -sf ../../../usr/src/linux-${_kernver} build
+  cd "${pkgdir}/usr/lib/modules/${_kernver}"
+  ln -sf ../../../src/linux-${_kernver} build

  cd "${srcdir}/linux-${_basekernel}"
  install -D -m644 Makefile \
--- a/linux/linux.install
+++ b/linux/linux.install
@ -2,7 +2,7 @@
 # arg 2:  the old package version

 KERNEL_NAME=
-KERNEL_VERSION=3.15.5-1-CHAKRA
+KERNEL_VERSION=3.16.2-1-CHAKRA

 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
@ -10,7 +10,7 @@ export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
 post_install () {
  # updating module dependencies
  echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
+  depmod -b /usr ${KERNEL_VERSION}
  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
  mkinitcpio -p linux${KERNEL_NAME}

@ -40,7 +40,7 @@ post_upgrade() {

  # updating module dependencies
  echo ">>> Updating module dependencies. Please wait ..."
-  depmod ${KERNEL_VERSION}
+  depmod -b /usr ${KERNEL_VERSION}
  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
  mkinitcpio -p linux${KERNEL_NAME}
 }
--- a/ndiswrapper-lts/PKGBUILD
+++ b/ndiswrapper-lts/PKGBUILD
@ -8,7 +8,7 @@ _kver="$(cat /lib/modules/${_extramodules}/version)"
 pkgname=ndiswrapper-lts
 _pkgname=ndiswrapper
 pkgver=1.59
-pkgrel=2
+pkgrel=3
 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For linux-testing."
 license=('GPL')
 arch=('x86_64')
@ -30,11 +30,11 @@ build() {
 package() {
  cd "$srcdir/$_pkgname-$pkgver"

-  make KBUILD=/usr/src/linux-$_kver INST_DIR="lib/modules/$_extramodules" \
+  make KBUILD=/usr/src/linux-$_kver INST_DIR="usr/lib/modules/$_extramodules" \
    KVERS=$_kver DESTDIR="$pkgdir/" install

  # rm ndiswrapper
-  rm -R "$pkgdir/usr" "$pkgdir/sbin"
+  rm -r "$pkgdir/usr/share" "$pkgdir/usr/sbin" "$pkgdir/sbin"

-  gzip "$pkgdir/lib/modules/$_extramodules/$_pkgname.ko"
+  gzip "$pkgdir/usr/lib/modules/$_extramodules/$_pkgname.ko"
 }
--- a/ndiswrapper/PKGBUILD
+++ b/ndiswrapper/PKGBUILD
@ -1,18 +1,18 @@
 # Maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>

-_extramodules=extramodules-3.15.5-CHAKRA
-_kver="$(cat /lib/modules/${_extramodules}/version)"
+_extramodules=extramodules-3.16-CHAKRA
+_kver="$(cat /usr/lib/modules/${_extramodules}/version)"
 _rootOfSourceTree=/usr/src/linux-${_kver}

 pkgname=ndiswrapper
 pkgver=1.59
-pkgrel=6
+pkgrel=7
 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For linux-testing."
 license=('GPL')
 arch=('x86_64')
 url="http://ndiswrapper.sourceforge.net"
 install="ndiswrapper.install"
-depends=('linux>=3.15' 'linux<3.16')
+depends=('linux>=3.16' 'linux<3.17')
 makedepends=( 'linux-headers')
 provides=("ndiswrapper-utils=$pkgver")
 replaces=('ndiswrapper-utils')
@ -25,24 +25,26 @@ source=("http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$p
 sha1sums=('75fbbda677fe91ee07a6f6a8e19b1f3e2479540f'
          'f120e96fa9abab45e1c724aaac29da7b892820f0')

-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  
-  patch -p1 -i ../ndiswrapper-1.59.patch
-  sed -i "/modinfo/s/s/usr\//" driver/Makefile

-  make -C driver KVERS_UNAME=${_kver}
-  make -C utils
+prepare() {
+	[ -z "$_kver" ] && error "Could not get kernel version from '/usr/lib/modules/${_extramodules}/version'..." && false
+	msg "Found kernel version: $_kver"
+}
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	patch -p1 -i ../ndiswrapper-1.59.patch
+        sed -i "/modinfo/s/s/usr\//" driver/Makefile
+	make -C driver KVERS_UNAME=${_kver}
+	make -C utils
 }

 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+	cd "$srcdir/$pkgname-$pkgver"

-  make KBUILD=${_rootOfSourceTree} INST_DIR="lib/modules/$_extramodules" \
-    KVERS=$_kver DESTDIR="$pkgdir/" install
-  
-  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" \
-          "${startdir}/ndiswrapper.install"
+        make sbindir=/usr/sbin usrsbindir=/usr/sbin KBUILD=${_rootOfSourceTree} INST_DIR="usr/lib/modules/$_extramodules" \
+             KVERS=$_kver DESTDIR="$pkgdir/" install

-  gzip "$pkgdir/lib/modules/$_extramodules/$pkgname.ko"
+        sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" \
+               "${startdir}/ndiswrapper.install"
 }
--- a/ndiswrapper/ndiswrapper.install
+++ b/ndiswrapper/ndiswrapper.install
@ -5,7 +5,7 @@ post_install()

 post_upgrade()
 {
-  EXTRAMODULES='extramodules-3.12.6-CHAKRA'
+  EXTRAMODULES='extramodules-3.16-CHAKRA'
  depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }

--- a/vhba-module-lts/PKGBUILD
+++ b/vhba-module-lts/PKGBUILD
@ -6,7 +6,8 @@ _extramodules=extramodules-3.2-lts
 _kver="$(cat /lib/modules/${_extramodules}/version)"

 pkgname=vhba-module-lts
-pkgver=20130607
+_pkgname=vhba-module
+pkgver=20140629
 pkgrel=1
 pkgdesc="Kernel module that emulates SCSI devices"
 arch=('x86_64')
@ -15,18 +16,23 @@ license=('GPL2')
 depends=('linux-lts>=3.2' 'linux-lts<3.4')
 makedepends=('linux-lts-headers')
 install=vhba-module.install
-source=(http://sourceforge.net/projects/cdemu/files/vhba-module/vhba-module-$pkgver.tar.bz2
-        60-vhba.rules)
-md5sums=('660df41d08b1fd86baad1f16a0264438'
+source=("http://sourceforge.net/projects/cdemu/files/vhba-module/vhba-module-$pkgver.tar.bz2"
+        '60-vhba.rules')
+md5sums=('6b307a80df9c163768cc7ecb3ccebb71'
         '4dc37dc348b5a2c83585829bde790dcc')

+prepare() {
+  cd $_pkgname-$pkgver
+}
+
 build() {
-  cd "$srcdir/vhba-module-$pkgver"
-  make -j1 KDIR=/usr/src/linux-${_kver}
+  cd "$_pkgname-$pkgver"
+
+  make KDIR=/usr/lib/modules/$_kver/build
 }

 package() {
-  cd "$srcdir/vhba-module-$pkgver"
-  install -D vhba.ko "$pkgdir/lib/modules/${_extramodules}/vhba.ko"
+  cd $_pkgname-$pkgver
+  install -Dm644 vhba.ko "$pkgdir/usr/lib/modules/${_extramodules}/vhba.ko"
  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/vhba-module.install"
 }
--- a/vhba-module/PKGBUILD
+++ b/vhba-module/PKGBUILD
@ -2,50 +2,40 @@
 # Chakra Packages for Chakra, part of chakra-project.org
 #

-_extramodules=extramodules-3.15.5-CHAKRA
-_kver="$(cat /lib/modules/${_extramodules}/version)"
+_extramodules=extramodules-3.16-CHAKRA
+_kver="$(cat /usr/lib/modules/${_extramodules}/version)"

 pkgname=vhba-module
-pkgver=20130607
-pkgrel=4
+pkgver=20140629
+pkgrel=1
 pkgdesc="Kernel module that emulates SCSI devices"
 arch=('x86_64')
 url="http://cdemu.sourceforge.net/"
 license=('GPL2')
-depends=('linux>=3.15' 'linux<3.16')
+depends=('linux>=3.16' 'linux<3.17')
 makedepends=('linux-headers')
 install=vhba-module.install
 source=("http://sourceforge.net/projects/cdemu/files/vhba-module/vhba-module-$pkgver.tar.bz2"
-        '60-vhba.rules'
-        '0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch')
-md5sums=('660df41d08b1fd86baad1f16a0264438'
-         '4dc37dc348b5a2c83585829bde790dcc'
-         '8c929ef662de89f348d277983cbb3952'
-)
+        '60-vhba.rules')
+md5sums=('6b307a80df9c163768cc7ecb3ccebb71'
+         '4dc37dc348b5a2c83585829bde790dcc')


 prepare() {
  cd $pkgname-$pkgver
-
-  # Fix build with Linux 3.15
-  # http://sourceforge.net/p/cdemu/bugs/76/
-  patch -Np2 -i ../0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch
 }

-
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"

-  make -j1 KDIR=/usr/src/linux-${_kver}
+  make KDIR=/usr/lib/modules/$_kver/build
 }

 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
+  install -Dm644 vhba.ko "$pkgdir/usr/lib/modules/${_extramodules}/vhba.ko"
+  install -Dm644 ../60-vhba.rules "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules"

-  install -D vhba.ko "$pkgdir/lib/modules/${_extramodules}/vhba.ko"
-  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" \
+sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" \
          "${startdir}/vhba-module.install"
-
-  install -Dm644 "$srcdir/60-vhba.rules" \
-	  "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules"
 }
--- a/vhba-module/vhba-module.install
+++ b/vhba-module/vhba-module.install
@ -1,5 +1,5 @@
 post_install() {
-  EXTRAMODULES='extramodules-3.15-CHAKRA'
+  EXTRAMODULES='extramodules-3.16-CHAKRA'
  depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }

@ -8,7 +8,7 @@ post_upgrade() {
 }

 post_remove() {
-  EXTRAMODULES='extramodules-3.15-CHAKRA'
+  EXTRAMODULES='extramodules-3.16-CHAKRA'
  depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }