From 5d22477377dff808644fffa9566134a427db2772 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Tue, 27 Jan 2009 23:34:16 -0800 Subject: Updated, recompiled to reflect new kernel. --- abs/core-testing/aufs-utils/PKGBUILD | 29 ++++++++++++++---------- abs/core-testing/aufs/PKGBUILD | 19 +++++++++------- abs/core-testing/aufs/aufs.install | 6 ++--- abs/core-testing/madwifi/PKGBUILD | 8 +++---- abs/core-testing/madwifi/madwifi-ng.install | 6 ++--- abs/core-testing/ndiswrapper/PKGBUILD | 8 +++---- abs/core-testing/ndiswrapper/ndiswrapper.install | 6 ++--- abs/core-testing/nvidia-96xx/PKGBUILD | 10 ++++---- abs/core-testing/nvidia-96xx/nvidia-96xx.install | 4 ++-- abs/core-testing/nvidia-utils/PKGBUILD | 8 +++---- abs/core-testing/nvidia/PKGBUILD | 13 +++++------ abs/core-testing/nvidia/nvidia.install | 4 ++-- abs/core-testing/rt2500/PKGBUILD | 8 +++---- abs/core-testing/rt2500/rt2500.install | 6 ++--- abs/core-testing/tiacx/PKGBUILD | 8 +++---- abs/core-testing/tiacx/acx.install | 6 ++--- 16 files changed, 78 insertions(+), 71 deletions(-) diff --git a/abs/core-testing/aufs-utils/PKGBUILD b/abs/core-testing/aufs-utils/PKGBUILD index ee0932c..e5b3476 100644 --- a/abs/core-testing/aufs-utils/PKGBUILD +++ b/abs/core-testing/aufs-utils/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 15034 2008-10-12 11:58:48Z thomas $ +# $Id: PKGBUILD 22882 2008-12-29 19:41:01Z tpowa $ # Contributor: Paul Mattal # Maintainer: Paul Mattal pkgname=aufs-utils -pkgver=20081012 -pkgrel=1 -_kernver='2.6.27-ARCH' +pkgver=20081226 +pkgrel=2 +_kernver='2.6.28-ARCH' pkgdesc="Another Unionfs Implementation that supports NFS branches" arch=('i686' 'x86_64') url="http://aufs.sourceforge.net/" license=('GPL2') depends=('glibc') -source=(ftp://ftp.archlinux.org/other/aufs/aufs-$pkgver.tar.gz) -md5sums=('fb5eaa69b2c7e6e521cb9a9cae9ac23f') +source=(ftp://ftp.archlinux.org/other/aufs/aufs-$pkgver.tar.bz2) build() { - cd $startdir/src/aufs || return 1 + cd $srcdir/aufs || return 1 # Fix TMPFS_MAGIC error sed 's|-le 26|-le 27|g' -i fs/aufs25/Makefile || return 1 + # disable debug, broken in 2.6.28! + sed -i 's|CONFIG_AUFS_DEBUG = y|CONFIG_AUFS_DEBUG = |' \ + local.mk || return 1 + # configure for NFS by: # 1) configure local.mk to use FILP and LHASH sed -i 's|CONFIG_AUFS_PUT_FILP_PATCH =|CONFIG_AUFS_PUT_FILP_PATCH = y|' \ @@ -33,11 +36,13 @@ build() { make KDIR=/usr/src/linux-$_kernver/ -f local.mk || return 1 # install - install -D -m755 util/aufind.sh $startdir/pkg/usr/bin/aufind.sh || return 1 - install -D -m755 util/aulchown $startdir/pkg/usr/bin/aulchown || return 1 - install -D -m755 util/auplink $startdir/pkg/usr/bin/auplink || return 1 - install -D -m755 util/mount.aufs $startdir/pkg/sbin/mount.aufs || return 1 - install -D -m755 util/umount.aufs $startdir/pkg/sbin/umount.aufs || return 1 + install -D -m755 util/aufind.sh $pkgdir/usr/bin/aufind.sh || return 1 + install -D -m755 util/aulchown $pkgdir/usr/bin/aulchown || return 1 + install -D -m755 util/auplink $pkgdir/usr/bin/auplink || return 1 + install -D -m755 util/mount.aufs $pkgdir/sbin/mount.aufs || return 1 + install -D -m755 util/umount.aufs $pkgdir/sbin/umount.aufs || return 1 + install -D -m644 util/etc_default_aufs $pkgdir/etc/default/aufs || return 1 } # vim:set ts=2 sw=2 et: +md5sums=('e855ed9edc16953028f22cae393690de') diff --git a/abs/core-testing/aufs/PKGBUILD b/abs/core-testing/aufs/PKGBUILD index 37ae95f..f0270fe 100644 --- a/abs/core-testing/aufs/PKGBUILD +++ b/abs/core-testing/aufs/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 15519 2008-10-14 07:05:41Z thomas $ +# $Id: PKGBUILD 22431 2008-12-26 20:13:34Z tpowa $ # Contributor: Paul Mattal # Maintainer: Paul Mattal pkgname=aufs -pkgver=20081012 -pkgrel=2 -_kernver='2.6.27-ARCH' +pkgver=20081226 +pkgrel=1 +_kernver='2.6.28-ARCH' pkgdesc="Another Unionfs Implementation that supports NFS branches" arch=('i686' 'x86_64') url="http://aufs.sourceforge.net/" license=('GPL2') -depends=('kernel26>=2.6.27' 'kernel26<2.6.28' 'glibc' 'aufs-utils=20081012') +depends=('kernel26>=2.6.28' 'kernel26<2.6.29' 'glibc' 'aufs-utils=20081226') install=$pkgname.install -source=(ftp://ftp.archlinux.org/other/aufs/$pkgname-$pkgver.tar.gz) +source=(ftp://ftp.archlinux.org/other/aufs/$pkgname-$pkgver.tar.bz2) options=(!libtool !makeflags) -md5sums=('fb5eaa69b2c7e6e521cb9a9cae9ac23f') build() { - cd $startdir/src/$pkgname || return 1 + cd $srcdir/$pkgname || return 1 # Fix TMPFS_MAGIC error sed 's|-le 26|-le 27|g' -i fs/aufs25/Makefile || return 1 @@ -42,6 +41,9 @@ build() { # ??? sed -i 's|.*CONFIG_AUFS_SHWH =.*|CONFIG_AUFS_SHWH = y|' \ local.mk || return 1 + # disable debug, broken in 2.6.28! + sed -i 's|CONFIG_AUFS_DEBUG = y|CONFIG_AUFS_DEBUG = |' \ + local.mk || return 1 # configure for NFS by: # 1) configure local.mk to use FILP and LHASH @@ -66,3 +68,4 @@ build() { } # vim:set ts=2 sw=2 et: +md5sums=('e855ed9edc16953028f22cae393690de') diff --git a/abs/core-testing/aufs/aufs.install b/abs/core-testing/aufs/aufs.install index 1a303d6..41cd96e 100644 --- a/abs/core-testing/aufs/aufs.install +++ b/abs/core-testing/aufs/aufs.install @@ -5,7 +5,7 @@ pre_install() { post_install() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - KERNEL_VERSION=2.6.27-ARCH + KERNEL_VERSION=2.6.28-ARCH depmod -v $KERNEL_VERSION > /dev/null 2>&1 /bin/true } @@ -13,7 +13,7 @@ post_install() { post_upgrade() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - KERNEL_VERSION=2.6.27-ARCH + KERNEL_VERSION=2.6.28-ARCH depmod -v $KERNEL_VERSION > /dev/null 2>&1 /bin/true } @@ -21,7 +21,7 @@ post_upgrade() { post_remove() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - KERNEL_VERSION=2.6.27-ARCH + KERNEL_VERSION=2.6.28-ARCH depmod -v $KERNEL_VERSION > /dev/null 2>&1 /bin/true } diff --git a/abs/core-testing/madwifi/PKGBUILD b/abs/core-testing/madwifi/PKGBUILD index d14d5f1..d1b895a 100644 --- a/abs/core-testing/madwifi/PKGBUILD +++ b/abs/core-testing/madwifi/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 14765 2008-10-10 15:32:35Z thomas $ +# $Id: PKGBUILD 22482 2008-12-26 22:45:43Z tpowa $ # Originally by kleptophobiac # Modified by James Rayner for the repositories -_kernver=2.6.27-ARCH; +_kernver=2.6.28-ARCH; pkgname=madwifi pkgver=0.9.4.3844 -pkgrel=2 +pkgrel=3 pkgdesc="Madwifi drivers for Atheros wireless chipsets. For stock arch 2.6 kernel" arch=(i686 x86_64) license=('GPL') url="http://madwifi.org" -depends=('madwifi-utils' 'kernel26>=2.6.27' 'kernel26<2.6.28') +depends=('madwifi-utils' 'kernel26>=2.6.28' 'kernel26<2.6.29') makedepends=('sharutils') install=madwifi-ng.install # subversion source: svn checkout http://svn.madwifi.org/madwifi/trunk madwifi diff --git a/abs/core-testing/madwifi/madwifi-ng.install b/abs/core-testing/madwifi/madwifi-ng.install index 2b02087..cae804d 100644 --- a/abs/core-testing/madwifi/madwifi-ng.install +++ b/abs/core-testing/madwifi/madwifi-ng.install @@ -1,20 +1,20 @@ # arg 1: the new package version post_install() { - KERNEL_VERSION='2.6.27-ARCH' + KERNEL_VERSION='2.6.28-ARCH' depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1 } # arg 1: the new package version # arg 2: the old package version post_upgrade() { - KERNEL_VERSION='2.6.27-ARCH' + KERNEL_VERSION='2.6.28-ARCH' depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1 } # arg 1: the old package version post_remove() { - KERNEL_VERSION='2.6.27-ARCH' + KERNEL_VERSION='2.6.28-ARCH' depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1 } diff --git a/abs/core-testing/ndiswrapper/PKGBUILD b/abs/core-testing/ndiswrapper/PKGBUILD index 9e4a0f1..552c9b4 100644 --- a/abs/core-testing/ndiswrapper/PKGBUILD +++ b/abs/core-testing/ndiswrapper/PKGBUILD @@ -1,16 +1,16 @@ -#$Id: PKGBUILD 18549 2008-11-07 09:00:55Z tpowa $ +#$Id: PKGBUILD 22488 2008-12-26 22:47:09Z tpowa $ #Maintainer: Tobias Powalowski pkgname=ndiswrapper -_kernver=2.6.27-ARCH +_kernver=2.6.28-ARCH pkgver=1.53 -pkgrel=3 +pkgrel=4 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For stock arch 2.6 kernel." license=('GPL') arch=(i686 x86_64) url="http://ndiswrapper.sourceforge.net" install="ndiswrapper.install" -depends=("ndiswrapper-utils=$pkgver" 'kernel26>=2.6.27' 'kernel26<2.6.28') +depends=("ndiswrapper-utils=$pkgver" 'kernel26>=2.6.28' 'kernel26<2.6.29') source=(http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz kernel-2.6.27.patch ndiswrapper-CVE-2008-4395.patch) diff --git a/abs/core-testing/ndiswrapper/ndiswrapper.install b/abs/core-testing/ndiswrapper/ndiswrapper.install index 06bf5c9..62a25c6 100644 --- a/abs/core-testing/ndiswrapper/ndiswrapper.install +++ b/abs/core-testing/ndiswrapper/ndiswrapper.install @@ -2,7 +2,7 @@ post_install() { ndiswrapper -m - KERNEL_VERSION='2.6.27-ARCH' + KERNEL_VERSION='2.6.28-ARCH' depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1 } @@ -11,14 +11,14 @@ post_install() post_upgrade() { ndiswrapper -m - KERNEL_VERSION='2.6.27-ARCH' + KERNEL_VERSION='2.6.28-ARCH' depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1 } # arg 1: the old package version post_remove() { - KERNEL_VERSION='2.6.27-ARCH' + KERNEL_VERSION='2.6.28-ARCH' depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1 } diff --git a/abs/core-testing/nvidia-96xx/PKGBUILD b/abs/core-testing/nvidia-96xx/PKGBUILD index 0041d95..06efbab 100644 --- a/abs/core-testing/nvidia-96xx/PKGBUILD +++ b/abs/core-testing/nvidia-96xx/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 19057 2008-11-14 11:41:03Z pierre $ +# $Id: PKGBUILD 22496 2008-12-26 22:51:15Z tpowa $ # Maintainer : Tobias Powalowski pkgname=nvidia-96xx pkgver=96.43.09 -_kernver='2.6.27-ARCH' -pkgrel=1 +_kernver='2.6.28-ARCH' +pkgrel=2 pkgdesc="NVIDIA legacy drivers for kernel26, 96xx branch" arch=(i686 x86_64) license=('custom:NVIDIA') [ "$CARCH" = "i686" ] && ARCH=x86 [ "$CARCH" = "x86_64" ] && ARCH=x86_64 url="http://www.nvidia.com/" -depends=('kernel26>=2.6.27' 'kernel26<2.6.28' 'nvidia-96xx-utils') +depends=('kernel26>=2.6.28' 'kernel26<2.6.29' 'nvidia-96xx-utils') conflicts=('nvidia' 'nvidia-71xx' 'nvidia-legacy') install=nvidia-96xx.install license=('custom') source=(http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run) md5sums=('758c739114b81ea2cb7da7c22ab80a7e') -[ "$CARCH" = "x86_64" ] && md5sums=('c03bd2469292d91dde8767af1418c4e1') +[ "$CARCH" = "x86_64" ] && md5sums=('00a4cd93adc956f8cf173ab1036a5bf7') build() { diff --git a/abs/core-testing/nvidia-96xx/nvidia-96xx.install b/abs/core-testing/nvidia-96xx/nvidia-96xx.install index dfded65..511deb0 100644 --- a/abs/core-testing/nvidia-96xx/nvidia-96xx.install +++ b/abs/core-testing/nvidia-96xx/nvidia-96xx.install @@ -1,6 +1,6 @@ # arg 1: the new package version post_install() { - KERNEL_VERSION='2.6.27-ARCH' + KERNEL_VERSION='2.6.28-ARCH' depmod -v $KERNEL_VERSION > /dev/null 2>&1 } @@ -13,7 +13,7 @@ post_upgrade() { # arg 1: the old package version post_remove() { - KERNEL_VERSION='2.6.27-ARCH' + KERNEL_VERSION='2.6.28-ARCH' depmod -v $KERNEL_VERSION > /dev/null 2>&1 } diff --git a/abs/core-testing/nvidia-utils/PKGBUILD b/abs/core-testing/nvidia-utils/PKGBUILD index 384086a..5f43be3 100644 --- a/abs/core-testing/nvidia-utils/PKGBUILD +++ b/abs/core-testing/nvidia-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 19054 2008-11-14 11:36:20Z pierre $ +# $Id: PKGBUILD 24052 2009-01-12 12:52:05Z pierre $ # Maintainer: Thomas Baechler # Contributor: James Rayner pkgname=nvidia-utils -pkgver=177.82 +pkgver=180.22 pkgrel=1 pkgdesc="NVIDIA drivers utilities and libraries." arch=('i686' 'x86_64') @@ -18,9 +18,9 @@ license=('custom') install=nvidia.install source=(http://us.download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run \ supported-cards.txt) -md5sums=('882f34a662f0175682fdc4a9bec909ba' +md5sums=('265a984e973bcf5a7c2feeba4b0927a9' 'bf8d68d66757096c3ab17653230bf2a8') -[ "$CARCH" = "x86_64" ] && md5sums=('6a6d04411529c8d7616deee3d68c5346' +[ "$CARCH" = "x86_64" ] && md5sums=('91a40e758b06429453d780932f51d6d9' 'bf8d68d66757096c3ab17653230bf2a8') options=(docs !strip) diff --git a/abs/core-testing/nvidia/PKGBUILD b/abs/core-testing/nvidia/PKGBUILD index b1a5f33..ed0b48c 100644 --- a/abs/core-testing/nvidia/PKGBUILD +++ b/abs/core-testing/nvidia/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 19051 2008-11-14 11:33:00Z pierre $ +# $Id: PKGBUILD 24051 2009-01-12 12:47:18Z pierre $ # Maintainer : Thomas Baechler pkgname=nvidia -pkgver=177.82 -_kernver='2.6.27-ARCH' +pkgver=180.22 +_kernver='2.6.28-ARCH' pkgrel=1 pkgdesc="NVIDIA drivers for kernel26." arch=('i686' 'x86_64') [ "$CARCH" = "i686" ] && ARCH=x86 [ "$CARCH" = "x86_64" ] && ARCH=x86_64 url="http://www.nvidia.com/" -depends=('kernel26>=2.6.27' 'kernel26<2.6.28' 'nvidia-utils') +depends=('kernel26>=2.6.28' 'kernel26<2.6.29' 'nvidia-utils') conflicts=('nvidia-96xx' 'nvidia-71xx' 'nvidia-legacy') license=('custom') install=nvidia.install source=(http://us.download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run) -md5sums=('882f34a662f0175682fdc4a9bec909ba') -[ "$CARCH" = "x86_64" ] && md5sums=('6a6d04411529c8d7616deee3d68c5346') +md5sums=('265a984e973bcf5a7c2feeba4b0927a9') +[ "$CARCH" = "x86_64" ] && md5sums=('91a40e758b06429453d780932f51d6d9') build() { @@ -26,7 +26,6 @@ build() cd NVIDIA-Linux-$ARCH-${pkgver}-pkg0 # Any extra patches are applied in here... - cd usr/src/nv/ ln -s Makefile.kbuild Makefile make SYSSRC=/lib/modules/${_kernver}/build module || return 1 diff --git a/abs/core-testing/nvidia/nvidia.install b/abs/core-testing/nvidia/nvidia.install index dfded65..511deb0 100644 --- a/abs/core-testing/nvidia/nvidia.install +++ b/abs/core-testing/nvidia/nvidia.install @@ -1,6 +1,6 @@ # arg 1: the new package version post_install() { - KERNEL_VERSION='2.6.27-ARCH' + KERNEL_VERSION='2.6.28-ARCH' depmod -v $KERNEL_VERSION > /dev/null 2>&1 } @@ -13,7 +13,7 @@ post_upgrade() { # arg 1: the old package version post_remove() { - KERNEL_VERSION='2.6.27-ARCH' + KERNEL_VERSION='2.6.28-ARCH' depmod -v $KERNEL_VERSION > /dev/null 2>&1 } diff --git a/abs/core-testing/rt2500/PKGBUILD b/abs/core-testing/rt2500/PKGBUILD index b0f442fa..13bde0e 100644 --- a/abs/core-testing/rt2500/PKGBUILD +++ b/abs/core-testing/rt2500/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 14783 2008-10-10 15:36:02Z thomas $ +# $Id: PKGBUILD 22503 2008-12-26 22:53:05Z tpowa $ # Maintainer: James Rayner pkgname=rt2500 -_kernver=2.6.27-ARCH +_kernver=2.6.28-ARCH pkgver=1.1.0_B4 _pkgver=1.1.0-b4 -pkgrel=25 +pkgrel=26 pkgdesc="Drivers for rt2500 chipset wireless cards" url="http://rt2x00.serialmonkey.com/wiki/index.php/Main_Page" license=('GPL2') -depends=('kernel26>=2.6.27' 'kernel26<2.6.28') +depends=('kernel26>=2.6.28' 'kernel26<2.6.29') arch=('i686' 'x86_64') install=rt2500.install source=(http://downloads.sourceforge.net/sourceforge/rt2400/rt2500-${_pkgver}.tar.gz \ diff --git a/abs/core-testing/rt2500/rt2500.install b/abs/core-testing/rt2500/rt2500.install index 40f9aa9..e30bcd5 100644 --- a/abs/core-testing/rt2500/rt2500.install +++ b/abs/core-testing/rt2500/rt2500.install @@ -1,7 +1,7 @@ # arg 1: the new package version post_install() { - KERNEL_VERSION='2.6.27-ARCH' + KERNEL_VERSION='2.6.28-ARCH' depmod -v $KERNEL_VERSION > /dev/null 2>&1 } @@ -9,14 +9,14 @@ post_install() # arg 2: the old package version post_upgrade() { - KERNEL_VERSION='2.6.27-ARCH' + KERNEL_VERSION='2.6.28-ARCH' depmod -v $KERNEL_VERSION > /dev/null 2>&1 } # arg 1: the old package version post_remove() { - KERNEL_VERSION='2.6.27-ARCH' + KERNEL_VERSION='2.6.28-ARCH' depmod -v $KERNEL_VERSION > /dev/null 2>&1 } diff --git a/abs/core-testing/tiacx/PKGBUILD b/abs/core-testing/tiacx/PKGBUILD index 2e2e831..6f61ca0 100644 --- a/abs/core-testing/tiacx/PKGBUILD +++ b/abs/core-testing/tiacx/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 14786 2008-10-10 15:36:27Z thomas $ +# $Id: PKGBUILD 22506 2008-12-26 22:54:41Z tpowa $ # Maintainer: James Rayner pkgname=tiacx pkgver=20080210 -pkgrel=7 +pkgrel=8 pkgdesc="OpenSource module for Texas Instruments ACX100/ACX111 wireless chips. For stock arch 2.6 kernel" arch=(i686 x86_64) url="http://acx100.sourceforge.net/" license=('MPL') -depends=('wireless_tools' 'kernel26>=2.6.27' 'kernel26<2.6.28' 'tiacx-firmware') +depends=('wireless_tools' 'kernel26>=2.6.28' 'kernel26<2.6.29' 'tiacx-firmware') install=acx.install source=(http://downloads.sourceforge.net/sourceforge/acx100/acx-$pkgver.tar.bz2 kernel-2.6.27.patch) md5sums=('7d5ce3215708e4e9f95cf567a9ee3a12' '9895f72f8d0c84956b0f6c3b16df0fe8') -_kernver=2.6.27-ARCH +_kernver=2.6.28-ARCH build() { cd $startdir/src/acx-$pkgver diff --git a/abs/core-testing/tiacx/acx.install b/abs/core-testing/tiacx/acx.install index e5bd1dc..22bc076 100644 --- a/abs/core-testing/tiacx/acx.install +++ b/abs/core-testing/tiacx/acx.install @@ -1,20 +1,20 @@ # arg 1: the new package version post_install() { - KERNEL_VERSION='2.6.27-ARCH' + KERNEL_VERSION='2.6.28-ARCH' depmod -v $KERNEL_VERSION > /dev/null 2>&1 } # arg 1: the new package version # arg 2: the old package version post_upgrade() { - KERNEL_VERSION='2.6.27-ARCH' + KERNEL_VERSION='2.6.28-ARCH' depmod -v $KERNEL_VERSION > /dev/null 2>&1 } # arg 1: the old package version post_remove() { - KERNEL_VERSION='2.6.27-ARCH' + KERNEL_VERSION='2.6.28-ARCH' depmod -v $KERNEL_VERSION > /dev/null 2>&1 } -- cgit v0.12