Commit ff4e65fe authored by Mateusz Krawczuk's avatar Mateusz Krawczuk
Browse files

Merge branch 'testing' of git://gitorious.org/chakra-packages/platform into testing

parents eb1e352d 9011cd10
......@@ -9,19 +9,24 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=anthy
pkgver=9100h
pkgrel=1
_filecode=37536
pkgrel=2
pkgdesc="Hiragana text to Kana Kanji mixed text Japanese input method"
arch=("i686" "x86_64")
url="http://sourceforge.jp/projects/anthy/"
license=('LGPL' 'GPL')
depends=('glibc')
options=('!libtool' 'force')
source=("http://sourceforge.jp/downloads/anthy/${_filecode}/$pkgname-$pkgver.tar.gz")
md5sums=('1f558ff7ed296787b55bb1c6cf131108')
source=("http://dl.sourceforge.jp/anthy/${_filecode}/${pkgname}-${pkgver}.tar.gz")
sha1sums=('bfea9e74e208c4b976b6bd7ac6784cd290c636fd')
build() {
cd $srcdir/$pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc || return 1
make EMACS=emacs sysconfdir=/etc || return 1
make EMACS=emacs DESTDIR=$pkgdir install || return 1
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --sysconfdir=/etc --disable-static
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make EMACS=emacs DESTDIR="${pkgdir}" install
}
......@@ -6,15 +6,15 @@
pkgname=catalyst-utils
pkgver=11.6
pkgrel=1
pkgrel=2
pkgdesc="AMD/ATI Catalyst drivers utilities and libraries."
arch=('i686' 'x86_64')
url="http://www.ati.amd.com"
license=('custom')
depends=('xorg-server>=1.7.0' 'xorg-server<1.11.0' 'netkit-bsd-finger' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs')
depends=('xorg-server>=1.7.0' 'xorg-server<1.11.0' 'netkit-bsd-finger' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs' 'libgl')
optdepends=('qt: to run ATi Catalyst Control Center (amdcccle)')
conflicts=('catalyst-test' 'nvidia-utils' 'libgl')
provides=('libgl' "libatical=${pkgver}")
conflicts=('catalyst-testing' 'nvidia-utils')
provides=("libatical=${pkgver}")
install=${pkgname}.install
source=(
......@@ -75,7 +75,7 @@ package() {
install -m755 linux/*.so "${pkgdir}/usr/lib/xorg/modules/linux/" || return 1
#install -m755 extensions/libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/" || return 1 #before 11.4
install -m755 extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so" || return 1 # since 11.5
ln -snf /usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" # since 11.4
#ln -snf /usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" # since 11.4
#install -m755 extensions/libdri.so "${pkgdir}/usr/lib/xorg/modules/extensions/libdri.ati" || return 1
# Controlcenter / libraries
......@@ -93,9 +93,9 @@ package() {
install -m755 X11R6/${_lib}/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/fglrx" || return 1 # since 11.5
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/fglrx/libGL.so.1.2" # since 11.4
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/fglrx-libGL.so.1.2" # since 11.4
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1.2" # since 11.4
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1" # since 11.4
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so" # since 11.4
#ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1.2" # since 11.4
#ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1" # since 11.4
#ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so" # since 11.4
install -m755 X11R6/${_lib}/libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/" || return 1 # since 11.4
ln -snf libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/libAMDXvBA.so.1" # since 11.4
ln -snf libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/libAMDXvBA.so" # since 11.4
......
......@@ -32,19 +32,40 @@ check_libdri_so(){
fi
}
link_libgl_so(){
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 /usr/lib/libGL.so.1.2
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 /usr/lib/libGL.so.1
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 /usr/lib/libGL.so
ln -snf /usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so /usr/lib/xorg/modules/extensions/libglx.so
ln -snf libglx.xorg /usr/lib/xorg/modules/extensions/FGL.renamed.libglx.so
ln -snf /usr/lib/libGL.so.1.2.mesa /usr/lib/FGL.renamed.libGL.so.1.2
}
restore_libgl_so(){
ln -snf /usr/lib/libGL.so.1.2.mesa /usr/lib/libGL.so.1.2
ln -snf /usr/lib/libGL.so.1.2.mesa /usr/lib/libGL.so.1
ln -snf /usr/lib/libGL.so.1.2.mesa /usr/lib/libGL.so
ln -snf libglx.xorg /usr/lib/xorg/modules/extensions/libglx.so
rm -f /usr/lib/xorg/modules/extensions/FGL.renamed.libglx.so
rm -f /usr/lib/FGL.renamed.libGL.so.1.2
}
post_install(){
check_libdri_so
link_libgl_so
whisperer
}
post_upgrade(){
check_libdri_so
link_libgl_so
whisperer
}
post_remove(){
# If the symlink is dead, remove it
check_libdri_so
restore_libgl_so
echo "NOTE: Don't forget to recover your original xorg.conf file."
}
......@@ -3,7 +3,7 @@
pkgname=cdparanoia
pkgver=10.2
pkgrel=2
pkgrel=3
pkgdesc="Compact Disc Digital Audio extraction tool"
arch=('i686' 'x86_64')
url="http://www.xiph.org/paranoia/"
......
......@@ -8,8 +8,8 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=chakra-hardware-detection
pkgver=20110110
pkgrel=4
pkgver=20110619
pkgrel=1
pkgdesc="Hardware detection scripts for Chakra"
arch=('any')
url="http://www.chakra-project.org"
......
......@@ -9,7 +9,7 @@ HW_DB_PATH="/opt/chakra/hwdb"
# VERSION OF THE "NVIDIA" DRIVER PKG
# (keep in sync with postinstall config)
NVIDIA_DRV_VER="270"
NVIDIA_DRV_VER="275"
# NVIDIA HW DATABASE FILE NAME
NV_DB="hw_nvidia_hwdb"
......
# $Id: PKGBUILD 66595 2010-02-01 00:00:07Z giovanni $
# Maintainer: kevin <kevin@archlinux.org>
# Contributor: phrakture <aaronmgriffin+gmail+com>
# Contributor: SpepS <dreamspepser at yahoo dot it>
#
# Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=cpufrequtils
pkgver=007
pkgver=008
pkgrel=1
pkgdesc="Userspace tools for the kernel cpufreq subsystem"
arch=('i686' 'x86_64')
......@@ -16,7 +17,7 @@ source=(http://www.kernel.org/pub/linux/utils/kernel/cpufreq/${pkgname}-${pkgver
cpufreq.rcd
cpufreq.confd)
options=(!libtool)
md5sums=('fdd833ce70a9ae40ae8bce5b18f2becf'
md5sums=('c59b71c044d463896f3247e8dd83dd7e'
'7f2b5085df44d2df3e7c2d0b9f6dab08'
'baae1f2abffc6bef2bd32a8dd8263c09')
......
......@@ -10,12 +10,12 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=encfs
pkgver=1.7.4
pkgrel=1
pkgrel=2
pkgdesc='Encrypted filesystem in user-space'
arch=('i686' 'x86_64')
url='http://www.arg0.net/encfs'
license=('GPL')
depends=('rlog' 'openssl' 'fuse' 'boost')
depends=('rlog' 'openssl' 'fuse' 'boost-libs')
makedepends=('boost')
options=('!libtool')
source=("http://encfs.googlecode.com/files/${pkgname}-${pkgver}.tgz")
......
......@@ -8,8 +8,8 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=ffmpeg
pkgver=0.6.3
pkgrel=2
pkgver=0.8
pkgrel=1
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix."
arch=('i686' 'x86_64')
url="http://ffmpeg.org/"
......@@ -17,28 +17,12 @@ license=('GPL3')
depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libva>=1.0.7' 'openjpeg' 'libvpx' 'gsm')
makedepends=('yasm')
options=('force')
source=('http://www.ffmpeg.org/releases/ffmpeg-0.8.tar.bz2')
md5sums=('7e9b8c8a6952de0c477027e48249f3ed')
build() {
cd "${srcdir}"
msg "Connecting to GIT server...."
if [ -d "${pkgname}" ] ; then
cd "${pkgname}" && git pull origin
msg "The local files are updated."
else
# Fetch the required tag from Git
git clone --no-checkout git://git.videolan.org/ffmpeg.git
cd "${pkgname}"
git checkout -q "${pkgname}-${pkgver}"
fi
msg "GIT checkout done or server timeout"
msg "Starting make..."
rm -rf "${srcdir}/${pkgname}-build"
git clone "${srcdir}/${pkgname}" "${srcdir}/${pkgname}-build"
cd "${srcdir}/${pkgname}-build"
cd $srcdir/$pkgbase-$pkgver
./configure \
--prefix=/usr \
......@@ -68,7 +52,7 @@ build() {
}
package() {
cd "${srcdir}/${pkgname}-build"
cd $srcdir/$pkgbase-$pkgver
make DESTDIR="${pkgdir}" install install-man
install -D -m755 tools/qt-faststart "${pkgdir}/usr/bin/qt-faststart"
......
# $Id: PKGBUILD 62079 2010-01-01 23:53:58Z eric $
# Maintainer: Eric Belanger <eric@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# contributor (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=freeglut
pkgver=2.6.0
pkgrel=1
pkgrel=2
pkgdesc="Provides functionality for small OpenGL programs"
arch=('i686' 'x86_64')
url="http://freeglut.sourceforge.net/"
......
#
# Apps Packages for Chakra, part of chakra-project.org
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# contributor (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=ghostscript
pkgver=9.02
pkgrel=1
pkgrel=2
pkgdesc="An interpreter for the PostScript language"
arch=('i686' 'x86_64')
license=('GPL3' 'custom')
......
......@@ -6,14 +6,15 @@
pkgname=gnash
pkgver=0.8.9
pkgrel=2
pkgrel=3
pkgdesc="GNU Flash player and kpath plugin for KDE 4."
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/gnash/"
license=('GPL')
depends=('agg' 'ffmpeg' 'libjpeg' 'libpng' 'giflib' 'zlib' 'curl' 'giflib' 'boost' 'libldap' 'sdl'
depends=('agg' 'ffmpeg' 'libjpeg' 'libpng' 'giflib' 'zlib' 'curl' 'giflib' 'boost-libs' 'libldap' 'sdl'
'speex' 'fontconfig' 'libva' 'libxinerama' 'gstreamer0.10-base' 'gstreamer0.10-ffmpeg'
'libdca' 'kdebase' 'xulrunner')
'libdca' 'kdebase' 'xulrunner' 'hicolor-icon-theme' 'desktop-file-utils' 'pkgconfig')
makedepend=('boost')
provides=('gnash' 'gnash-common')
conflicts=('flashplugin' 'flashplugin-square')
source=("http://ftp.gnu.org/pub/gnu/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
......
# $Id: PKGBUILD 72984 2010-03-21 17:04:24Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=gnutls
pkgver=2.8.6
pkgver=2.12.6.1
pkgrel=1
pkgdesc="A library which provides a secure layer over a reliable transport layer"
arch=(i686 x86_64)
license=('GPL3' 'LGPL')
url="http://www.gnu.org/software/gnutls/"
install=gnutls.install
options=('libtool')
depends=('gcc-libs>=4.4.3' 'libtasn1>=2.5' 'readline>=6.0' 'zlib' 'libgcrypt>=1.4.5' 'texinfo')
options=('libtool' 'zipman')
depends=('gcc-libs>=4.4.3' 'libtasn1>=2.5' 'readline>=6.0' 'zlib' 'libgcrypt>=1.4.5')
source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2)
md5sums=('eb0a6d7d3cb9ac684d971c14f9f6d3ba')
md5sums=('e724e37f96984f3b0a215c11f03729bd')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --with-zlib --disable-guile || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
./configure --prefix=/usr \
--with-zlib \
--with-libgcrypt \
--disable-static \
--disable-guile
make
}
check() {
cd "${srcdir}/${pkgname}-${pkgver}"
#make check # passes all || /bin/true
make check || /bin/true # see https://lists.gnu.org/archive/html/gnutls-devel/2011-06/msg00007.html
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
# lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman
# gzip -9 all files in infodir and manpages manually
find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
}
# $Id: PKGBUILD 79610 2010-05-04 20:23:20Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=gtk2
pkgver=2.22.1
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgbase=gtk2
pkgname=('gtk2' 'gtk-update-icon-cache')
pkgver=2.24.5
pkgrel=1
pkgdesc="The GTK+ Toolkit (v2)"
arch=('i686' 'x86_64')
url="http://www.gtk.org/"
install=gtk2.install
depends=('atk>=1.32.0' 'pango>=1.28.0' 'libxcursor' 'libxinerama' 'libxrandr>=1.3.0' 'libxi>=1.3' 'libxcomposite' 'libxdamage' 'heimdal>=1.3.2' 'gnutls>=2.8.6' 'shared-mime-info' 'cairo>=1.10.0' 'libtiff>=3.9.2-2' 'libcups>=1.4.4' 'gdk-pixbuf2>=2.21.7')
makedepends=('pkgconfig' 'gobject-introspection')
replaces=('gtkprint-cups' 'gail')
conflicts=('gtkprint-cups' 'gail')
provides=('gail=1.22.3')
makedepends=('atk>=1.32.0' 'pango>=1.28.0' 'libxcursor' 'libxinerama' 'libxrandr>=1.3.0' 'libxi>=1.3' 'libxcomposite' 'libxdamage' 'heimdal>=1.3.2' 'gnutls>=2.8.6' 'shared-mime-info' 'cairo>=1.10.0' 'libtiff>=3.9.2-2' 'libcups>=1.4.4' 'gdk-pixbuf2>=2.21.7' 'pkgconfig' 'gobject-introspection')
options=('!libtool' '!docs')
backup=(etc/gtk-2.0/gtkrc)
license=('LGPL')
source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.22/gtk+-${pkgver}.tar.bz2
xid-collision-debug.patch)
sha256sums=('965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07'
'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
xid-collision-debug.patch
gdk_Make_background_changes_queue_a_repaint.patch)
sha256sums=('d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3'
'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
'3573af25e8db2fb490b264f80cb9e617ee1a36e767e36e7bb1d830c0b715db93')
build() {
cd "${srcdir}/gtk+-${pkgver}"
patch -Np1 -i "${srcdir}/xid-collision-debug.patch" || return 1
CXX=/bin/false ./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --with-xinput=yes \
--without-libjasper \
--without-docs \
--with-included-loaders=png || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc" || return 1
cd "${srcdir}/gtk+-${pkgver}"
patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
patch -NRp1 -i "${srcdir}/gdk_Make_background_changes_queue_a_repaint.patch"
CXX=/bin/false ./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--with-xinput=yes
make
}
package_gtk2() {
pkgdesc="The GTK+ Toolkit (v2)"
install=gtk2.install
depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'heimdal' 'gnutls' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
backup=(etc/gtk-2.0/gtkrc)
cd "${srcdir}/gtk+-${pkgver}"
make DESTDIR="${pkgdir}" install
sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc"
#split this out to use with gtk3 too
rm ${pkgdir}/usr/bin/gtk-update-icon-cache
}
package_gtk-update-icon-cache() {
pkgdesc="The GTK+ update icon cache tool"
depends=('gdk-pixbuf2')
cd "${srcdir}/gtk+-${pkgver}/gtk"
install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache
}
From 254b9a4c540e3dff1dcd17db2ceea6a9fa5df973 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 09 Jun 2011 04:29:45 +0000
Subject: gdk: Make background changes queue a repaint
For client-side windows, we need to queue a repaint when the background
changes. For native windows, the windowing system does take care of it,
but client-side windows are our own, so we gotta do it manually.
https://bugzilla.gnome.org/show_bug.cgi?id=652102
---
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index f058570..10d83ab 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -8004,11 +8004,15 @@ gdk_window_set_background (GdkWindow *window,
}
if (!GDK_WINDOW_DESTROYED (window) &&
- gdk_window_has_impl (private) &&
!private->input_only)
{
- impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
- impl_iface->set_background (window, &private->bg_color);
+ if (gdk_window_has_impl (private))
+ {
+ impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
+ impl_iface->set_background (window, &private->bg_color);
+ }
+ else
+ gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL);
}
}
@@ -8077,11 +8081,15 @@ gdk_window_set_back_pixmap (GdkWindow *window,
private->bg_pixmap = GDK_NO_BG;
if (!GDK_WINDOW_DESTROYED (window) &&
- gdk_window_has_impl (private) &&
!private->input_only)
{
- impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
- impl_iface->set_back_pixmap (window, private->bg_pixmap);
+ if (gdk_window_has_impl (private))
+ {
+ impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
+ impl_iface->set_back_pixmap (window, private->bg_pixmap);
+ }
+ else
+ gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL);
}
}
--
cgit v0.9
pkgname=initscripts-systemd
pkgver=0.20110617
pkgver=0.20110627
pkgrel=1
pkgdesc="Chakra GNU/Linux specific systemd initialization/bootup scripts for systemd"
arch=('any')
......@@ -9,7 +9,7 @@ groups=('systemd')
depends=('systemd' 'initscripts')
install=initscripts-systemd.install
source=("http://chakra-project.org/sources/${pkgname}/${pkgname}-${pkgver}-${pkgrel}.tar.xz")
sha256sums=('721d2406fa8de78adfba715f6ca125f63d33b5e21469455df9570fd5c27fbf3e')
sha256sums=('0c25e4512e8bcdfad7471d4dd43b462fc1a2eb6df801a05c8b20c7e6cc942f18')
# create tarball: source PKGBUILD && mksource
......
2009-03-14 Eric Belanger <eric@archlinux.org>
* jasper 1.900.1-2
* Added license
* FHS man pages
* Added ChangeLog
# $Id: PKGBUILD 70975 2010-03-02 21:15:25Z dgriffiths $
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# contributor (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
pkgname=jasper
pkgver=1.900.1
pkgrel=5
pkgrel=6
pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard"
arch=('i686' 'x86_64')
url="http://www.ece.uvic.ca/~mdadams/jasper/"
license=('custom:JasPer2.0')
depends=('libjpeg>=8' 'freeglut' 'libxi' 'libxmu' 'mesa')
depends=('libjpeg' 'freeglut' 'libxi' 'libxmu' 'mesa')
makedepends=('unzip')
options=('!libtool')
source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip jpc_dec.c.patch)
md5sums=('a342b2b4495b3e1394e161eb5d85d754'
'36de7128eea6f701c1e2e13ce5bd8d37')
sha1sums=('9c5735f773922e580bf98c7c7dfda9bbed4c5191'
'c1a0176a15210c0af14d85e55ce566921957d780')
source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip jpc_dec.c.patch
patch-libjasper-stepsizes-overflow.diff jasper-1.900.1-CVE-2008-3520.patch
jasper-1.900.1-CVE-2008-3522.patch)
md5sums=('a342b2b4495b3e1394e161eb5d85d754' '36de7128eea6f701c1e2e13ce5bd8d37'\
'24785d8eb3eea19eec7e77d59f3e6a25' '911bb13529483c093d12c15eed4e9243'\
'ed441f30c4231f319d9ff77d86db2ef9')
sha1sums=('9c5735f773922e580bf98c7c7dfda9bbed4c5191' 'c1a0176a15210c0af14d85e55ce566921957d780'\
'f298566fef08c8a589d072582112cd51c72c3983' '2483dba925670bf29f531d85d73c4e5ada513b01'\
'0e7b6142cd9240ffb15a1ed7297c43c76fa09ee4')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 < ${srcdir}/jpc_dec.c.patch || return 1
./configure --prefix=/usr --mandir=/usr/share/man \
--enable-shared || return 1
make || return 1
patch -Np1 < "${srcdir}/jpc_dec.c.patch"
patch -Np1 < "${srcdir}/patch-libjasper-stepsizes-overflow.diff"
patch -Np1 < "${srcdir}/jasper-1.900.1-CVE-2008-3520.patch"
patch -Np1 < "${srcdir}/jasper-1.900.1-CVE-2008-3522.patch"
./configure --prefix=/usr --mandir=/usr/share/man --enable-shared
make
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR=${pkgdir} install || return 1
make DESTDIR="${pkgdir}" install
install -Dm644 LICENSE \
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
}
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
\ No newline at end of file
This diff is collapsed.
https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522
diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
--- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c 2009-10-22 10:27:45.000000000 +0200
+++ jasper-1.900.1/src/libjasper/base/jas_stream.c 2009-10-22 10:35:53.000000000 +0200
@@ -553,7 +553,7 @@ int jas_stream_printf(jas_stream_t *stre
int ret;
va_start(ap, fmt);
- ret = vsprintf(buf, fmt, ap);
+ ret = vsnprintf(buf, sizeof buf, fmt, ap);
jas_stream_puts(stream, buf);
va_end(ap);