diff options
author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-02-25 16:54:28 -0200 |
---|---|---|
committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-02-25 16:54:28 -0200 |
commit | 0654480be225ba2d71ba22d1882b4aa9d37312ac (patch) | |
tree | 1b75fa5b1fa8754f8c2b486a37b14e490ff4ac5d /libre | |
parent | ad4e656602a146469f1588b8027dafc64ed7eaac (diff) | |
parent | 7e64f3e2f53da081c5d9acb791d20c0fb8652657 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre')
-rw-r--r-- | libre/calibre-libre/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/cdrkit-libre/PKGBUILD | 42 | ||||
-rw-r--r-- | libre/h-client/PKGBUILD | 8 | ||||
-rw-r--r-- | libre/hplip-libre/PKGBUILD | 15 | ||||
-rw-r--r-- | libre/icecat/PKGBUILD | 18 | ||||
-rw-r--r-- | libre/icecat/mozconfig.pgo | 4 | ||||
-rw-r--r-- | libre/lame-libre/PKGBUILD | 40 | ||||
-rw-r--r-- | libre/linux-libre-kmod-alx/PKGBUILD | 12 | ||||
-rw-r--r-- | libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 10 | ||||
-rw-r--r-- | libre/linux-libre-lts/linux-libre-lts.install | 2 | ||||
-rw-r--r-- | libre/linux-libre/CVE-2013-1763.patch | 35 | ||||
-rw-r--r-- | libre/linux-libre/PKGBUILD | 20 | ||||
-rw-r--r-- | libre/linux-libre/config.i686 | 2 | ||||
-rw-r--r-- | libre/linux-libre/config.x86_64 | 2 | ||||
-rw-r--r-- | libre/linux-libre/linux-libre.install | 2 | ||||
-rw-r--r-- | libre/virtualbox-libre-modules/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch | 8 | ||||
-rw-r--r-- | libre/xulrunner-libre/PKGBUILD | 17 |
19 files changed, 119 insertions, 132 deletions
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 39c40f9ea..125a8b3d6 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.19 +pkgver=0.9.20 pkgrel=1 pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)" arch=('i686' 'x86_64') @@ -27,7 +27,7 @@ install=calibre.install source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('1977c75613209b8fcade35e9185a8ee0' +md5sums=('860b4b28029ae40e5ea59ec4f50b1144' '42c07b43d575b5e7e7524bd7b9528f0e' '675cd87d41342119827ef706055491e7') diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD index 5e71171f9..af8125f1f 100644 --- a/libre/cdrkit-libre/PKGBUILD +++ b/libre/cdrkit-libre/PKGBUILD @@ -1,42 +1,35 @@ +# $Id: PKGBUILD 157442 2012-04-28 11:27:45Z allan $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Maintainer: Henry Jensen <hjensen@connochaetos.org> # Contributor: Alexander Fehr <pizzapunk gmail com> +_pkgname=cdrkit pkgname=cdrkit-libre pkgver=1.1.11 -pkgrel=2 -pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction" -arch=('i686' 'x86_64') +pkgrel=2.4 +pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction (without nonfree apple_driver utility)" +arch=('i686' 'x86_64' 'mips64el') url="http://cdrkit.org/" license=('GPL2') -depends=('file' 'bzip2' 'perl') +depends=('file' 'bzip2') +optdepends=('perl: for dirsplit') makedepends=('cmake') -provides=('cdrtools' "cdrkit=${pkgver}") -conflicts=('cdrtools' 'cdrkit') -replaces=('cdrtools' 'cdrkit') -source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz) +provides=("cdrkit=${pkgver}" 'cdrtools') +conflicts=('cdrkit' 'cdrtools') +replaces=('cdrkit' 'cdrtools') +source=(http://cdrkit.org/releases/$_pkgname-$pkgver.tar.gz) +md5sums=('efe08e2f3ca478486037b053acd512e9') -mksource() { - if [ ! -d ${pkgname}-${pkgver} ]; then - wget -O - http://cdrkit.org/releases/${pkgname/-libre/}-${pkgver}.tar.gz | \ - bsdtar xzf - - - mv -v ${pkgname/-libre/}-${pkgver} ${pkgname}-${pkgver} - fi +build() { + cd "$srcdir/$_pkgname-$pkgver" - rm -rvf ${pkgname}-${pkgver}/{doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{c,8}} + # Remove nonfree apple_driver utility + rm -rvf {doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{c,8}} - tar czf ${pkgname}-${pkgver}.tar.gz ${pkgname}-${pkgver}/ - rm -r ${pkgname}-${pkgver}/ -} - -build() { - cd "$srcdir/$pkgname-$pkgver" make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$_pkgname-$pkgver" make PREFIX="$pkgdir/usr" install # Make symlinks for cdrtools compatibility @@ -54,4 +47,3 @@ package() { ln -s genisoimage.1 mkhybrid.1 ln -s icedax.1 cdda2wav.1 } -md5sums=('e851c2d69ca17df7cfaabfa0d0e8e435') diff --git a/libre/h-client/PKGBUILD b/libre/h-client/PKGBUILD index 821517397..5e988d060 100644 --- a/libre/h-client/PKGBUILD +++ b/libre/h-client/PKGBUILD @@ -1,20 +1,20 @@ # Maintainer: Michał Masłowski <mtjm@mtjm.eu> pkgname=h-client -_pkgver=0.0a0.dev-r118 +_pkgver=0.0a0.dev-r129 pkgver=${_pkgver/-/.} pkgrel=1 pkgdesc="A client for an h-source server (such as http://www.h-node.org/)" arch=('any') url="https://savannah.nongnu.org/projects/h-client/" license=('GPL3') -depends=('python2' 'python2-distribute' 'python-pycurl' 'pygtk') +depends=('python2' 'python2-distribute' 'python2-pycurl' 'pygtk') options=(!emptydirs) # Official source is in SVN, this is made by "python2 setup.py sdist" # on a machine having Subversion 1.6.x (e.g. on Trisquel 4.0). source=("https://mtjm.eu/releases/hclient-${_pkgver}.tar.gz"{,.sig}) -sha512sums=('af962c67b363435cfa74f7c420760b0254ba3e7c1e6611d5ff276e6595e30dadf1b5d588cd2469647efdbb0099f70a027b9f65d8aeefc70ea712c9ef5d7cbace' - '7d4746297c4a0bd328b1e57f596e827b4a12d2f703d074f7e87ea0c9e3f747c2cfd48da971e81fdaf27939d463b359fac4638820f08486ef28502e769168692d') +sha512sums=('e4f8f88db5cd27bb3304c1421bd661da9c52a15297d273cd6fa81ccfd0f1c9b210dc87373ecc6d414585c525a570c7f783d706fa67e247562fd8c7fa5e59a9e7' + '5712b41c4a4d45482e96825762955855212c3594b61624495e6ddec0b85a4718e080da1c99be22cb91aa644ee65d3708cc06b004f84b6facf2531b7b4c897c03') build() { cd "$srcdir/hclient-${_pkgver}" diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 069fa612d..37c9fae8f 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172168 2012-11-30 14:31:06Z tomegun $ +# $Id: PKGBUILD 178145 2013-02-16 23:09:01Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> @@ -6,8 +6,8 @@ _pkgname=hplip pkgname=hplip-libre -pkgver=3.12.11 -pkgrel=2 +pkgver=3.13.2 +pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)" arch=('i686' 'x86_64') url="http://hplipopensource.com" @@ -49,9 +49,6 @@ build() { sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py - # fix rc script path - FS#31921 - sed -i 's|\/etc\/init.d\/cupsys|\/etc\/rc.d\/cupsd|g' setup.py - # https://bugs.archlinux.org/task/30085 - hack found in Gentoo # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip # The hpcups driver does not use foomatic-rip @@ -92,7 +89,9 @@ package() { rm -rf "$pkgdir"/usr/share/hal # log dir should not be world writeable chmod 775 "$pkgdir"/var/log/hp{,/tmp} + # remove rc script + rm -rf "$pkgdir"/etc/init.d } -md5sums=('6caadc4a9e49076c284b146e2dce2937' - '835d3b854d097f229a32291338fa2320' +md5sums=('cd7edef6b2df2cdb468b145cd2127e1b' + 'cc3fc6de33ccf8bfce0bc890e30bd4e1' 'ef64578c6cb3ce252dbdcb0f1c2f4a47') diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index c5a35a16c..785e3e077 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -77,7 +77,7 @@ source=( md5sums=( c88a29aa92fc41a07e777a0e63ac5f7e 2a35cf0054d0459993e3c3bae3d9841d - 383e8e2a97a8b13fe56d153adb6878b6 + dfeb4ab2c96aae3356a4c347eee0b97b 3009b176cc5f9b1e416b1bf7c45b064b fcd2d895a0335c1b5fb652401e9da0d5 b41f82994fa056ffa5f8e6d99570e27a @@ -137,20 +137,12 @@ build() { chmod +x build/unix/run-icecat.sh # fix bug for bad file permition if $_pgo; then - export MOZ_PGO=1 - export DISPLAY=:99 - Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & - _fail=0 - - make -f client.mk build || _fail=1 + LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & + LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS=$MAKEFLAGS + kill $! || true else - _fail=0 - - make -f client.mk build || _fail=1 + LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS fi - - kill $! || true - return $_fail } package() { diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo index 2f4ebe32b..30464c38c 100644 --- a/libre/icecat/mozconfig.pgo +++ b/libre/icecat/mozconfig.pgo @@ -1,3 +1,5 @@ # PGO -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10' +ac_add_options --enable-profile-guided-optimization +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' diff --git a/libre/lame-libre/PKGBUILD b/libre/lame-libre/PKGBUILD deleted file mode 100644 index 2dac12636..000000000 --- a/libre/lame-libre/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 151867 2012-03-03 15:53:13Z schiv $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: Ionut Biru <ibiru@archlinux.org> -# Contributor: Hugo Doria <hugo@archlinux.org> -# Maintainer: Henry Jensen <hjensen@connochaetos.org> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> - -_pkgname=lame -pkgname=lame-libre -pkgver=3.99.5 -pkgrel=1 -pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder" -arch=('i686' 'x86_64') -url="http://lame.sourceforge.net/" -depends=('ncurses') -makedepends=('nasm') -replaces=('lame') -provides=("lame=${pkgver}") -conflicts=('lame') -license=('LGPL') -options=('!libtool') -source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.gz") -md5sums=('84835b313d4a8b68f5349816d33e07ce') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - ./configure --prefix=/usr \ - --enable-nasm \ - --enable-shared - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 756507986..33220b55a 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> _kernver=3.8 -_kernrel=1 +_kernrel=2 pkgname=('linux-libre-kmod-alx') -_version=v3.8 -_pkgver=3.8-1-u -pkgver=3.8.1 -pkgrel=1 +_version=v3.8-rc7 +_pkgver=3.8-rc7-1-u +pkgver=3.8rc7.1 +pkgrel=5 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' @@ -19,7 +19,7 @@ provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz) -md5sums=('557e3099c642455ec272d9ddf46de484') +md5sums=('3a1c7f870ff2fb96534b0d69245a4dab') build() { diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 7aa2c127b..4120e933f 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.65 +_kernver=3.0.66 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=3 +pkgrel=4 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 298bbd2fb..3717e9627 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178204 2013-02-18 00:59:48Z foutrelis $ +# $Id: PKGBUILD 178426 2013-02-21 22:37:33Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=65 +_sublevel=66 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.64 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.65 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '080f45e61f2b17015ac68279a801c17b' + 'b27bb5195c9fdb7fa6f609307a7d208b' '99f9c408b64393aceb2482c9a3e329ee' 'fba95bf1857ce6bf863e13a1ab73f584' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '62baade17c89e99f9aefc364a4304e78') + '7a7c3165d735a73cada5851d1b5d04ca') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 67065a1ef..2650a9f83 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.65-1-LIBRE-LTS +KERNEL_VERSION=3.0.66-1-LIBRE-LTS # 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' diff --git a/libre/linux-libre/CVE-2013-1763.patch b/libre/linux-libre/CVE-2013-1763.patch new file mode 100644 index 000000000..82b59a6dc --- /dev/null +++ b/libre/linux-libre/CVE-2013-1763.patch @@ -0,0 +1,35 @@ +From 6e601a53566d84e1ffd25e7b6fe0b6894ffd79c0 Mon Sep 17 00:00:00 2001 +From: Mathias Krause <minipli@googlemail.com> +Date: Sat, 23 Feb 2013 01:13:47 +0000 +Subject: [PATCH] sock_diag: Fix out-of-bounds access to sock_diag_handlers[] + +Userland can send a netlink message requesting SOCK_DIAG_BY_FAMILY +with a family greater or equal then AF_MAX -- the array size of +sock_diag_handlers[]. The current code does not test for this +condition therefore is vulnerable to an out-of-bound access opening +doors for a privilege escalation. + +Signed-off-by: Mathias Krause <minipli@googlemail.com> +Acked-by: Eric Dumazet <edumazet@google.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + net/core/sock_diag.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c +index 602cd63..750f44f 100644 +--- a/net/core/sock_diag.c ++++ b/net/core/sock_diag.c +@@ -121,6 +121,9 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) + if (nlmsg_len(nlh) < sizeof(*req)) + return -EINVAL; + ++ if (req->sdiag_family >= AF_MAX) ++ return -EINVAL; ++ + hndl = sock_diag_lock_handler(req->sdiag_family); + if (hndl == NULL) + err = -ENOENT; +-- +1.7.6.5 + diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 6842b2712..15bb939d0 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178342 2013-02-20 12:32:29Z tpowa $ +# $Id: PKGBUILD 178533 2013-02-25 11:02:32Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> @@ -13,7 +13,7 @@ _basekernel=3.8 #_sublevel=9 #pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel} -pkgrel=1 +pkgrel=2 #_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -29,16 +29,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild' 'Kbuild.platforms' 'boot-logo.patch' - 'change-default-console-loglevel.patch') + 'change-default-console-loglevel.patch' + 'CVE-2013-1763.patch') #"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'd0ceaebf20b53184c50e7f4980ed45d1' - '0b483b23413dbc451f2b041b9a475c03' + '101e798e00fd9b66a4c86cd30d28b844' + '5f3338af83af116b99746eb8a3ca65e4' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662') + '9d3c56a4b999c8bfbd4018089a62f662' + '420991808fe4cba143013427c0737aa9') #if [ "$CARCH" != "mips64el" ]; then # # Don't use the Loongson-specific patches on non-mips64el arches. # unset source[${#source[@]}-1] @@ -58,6 +60,10 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" + # Fix security vulnetability CVE-2013-1763.patch + # https://bugs.archlinux.org/task/34005 + patch -Np1 -i "${srcdir}/CVE-2013-1763.patch" + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) @@ -246,7 +252,7 @@ _package-headers() { mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" - for i in acpi asm-generic config crypto drm generated linux math-emu \ + for i in acpi asm-generic config crypto drm generated keys linux math-emu \ media net pcmcia scsi sound trace uapi video xen; do cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" done diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 1491a2ff6..f6af7876a 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -5866,7 +5866,7 @@ CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 # CONFIG_SECURITY_YAMA is not set diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index dcf662c3c..5818aa984 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -5639,7 +5639,7 @@ CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 # CONFIG_SECURITY_YAMA is not set diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index c94a54bcc..fb7fa81c2 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.0-1-LIBRE +KERNEL_VERSION=3.8.0-2-LIBRE # 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' diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index b78d365db..7152ca13c 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.6 _extramodules=extramodules-3.8-LIBRE -pkgrel=7 +pkgrel=7.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -36,7 +36,7 @@ package_virtualbox-libre-host-modules(){ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)' - depends=('linux-libre>=3.7' 'linux-libre<3.8') + depends=('linux-libre>=3.8' 'linux-libre<3.9') provides=("virtualbox-host-modules=${pkgver}") replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') @@ -54,7 +54,7 @@ package_virtualbox-libre-guest-modules(){ pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)' license=('GPL') - depends=('linux-libre>=3.7' 'linux-libre<3.8') + depends=('linux-libre>=3.8' 'linux-libre<3.9') provides=("virtualbox-guest-modules=${pkgver}") replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') diff --git a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index f59454192..b7bd659a0 100644 --- a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -184,10 +184,10 @@ index 260bc29..52b32cc 100644 -64_firefox=Bookmarks Backups
+64_self=Bookmarks Backups
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 687c8d8..203d8cf 100644
+index 96cedd3..a0f8a75 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
-@@ -39,7 +39,7 @@ toolkit.jar:
+@@ -42,7 +42,7 @@ toolkit.jar:
+ content/global/mozilla.xhtml (mozilla.xhtml)
content/global/nsDragAndDrop.js (nsDragAndDrop.js)
content/global/resetProfile.css (resetProfile.css)
@@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index e3dd0df..ef7bb74 100644
+index 1045665..04bd1aa 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()
+@@ -3698,7 +3698,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD index c2847b2e8..66154fb0c 100644 --- a/libre/xulrunner-libre/PKGBUILD +++ b/libre/xulrunner-libre/PKGBUILD @@ -6,7 +6,7 @@ # We're getting this from Debian Experimental _debname=iceweasel -_debver=18.0.1 +_debver=19.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -15,7 +15,7 @@ _pkgname=xulrunner pkgname=xulrunner-libre pkgver=${_debver}.${_debrel} pkgrel=1 -pkgdesc="Mozilla Runtime Environment" +pkgdesc="Mozilla Runtime Environment (built from Debian Iceweasel source code)" arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libvpx' 'python2') @@ -31,12 +31,12 @@ options=('!emptydirs') conflicts=('xulrunner') provides=("xulrunner=${_debver}") replaces=('xulrunner-oss' 'xulrunner') -md5sums=('5d481dd35a304702d1f311eeb3f1149f' - '6a4781e8ddc1b166f36930c4864e095f' +md5sums=('b4c109e987f869f94220188a901d4425' + 'e1d6920cb49c9de88b8e00eb14b1b0e7' '7f3317c25308a631ca31d8d280991bb4' '27271ce647a83906ef7a24605e840d61' '52e52f840a49eb1d14be1c0065b03a93' - '46a4b19b414065b99b870ea79b454f6e') + '2fde2f4bc158b217f3d71b33ef0bc626') build() { # WebRTC build tries to execute "python" and expects Python 2 @@ -45,9 +45,13 @@ build() { ln -s /usr/bin/python2 "$srcdir/python2-path/python" export PATH="$srcdir/python2-path:$PATH" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver::4}" + export PYTHON="/usr/bin/python2" + export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' + mv mozilla-release "${_debname}-${_debver}" mv debian "${_debname}-${_debver}" cd "${_debname}-${_debver}" @@ -73,9 +77,6 @@ build() { patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" patch -Np1 -i "$srcdir/shared-libs.patch" - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver::4}" - export PYTHON="/usr/bin/python2" - make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" } |