Merge branch '3.1' into 3.2

This commit is contained in:
Fredrik Rinnestam 2015-08-22 22:38:53 +02:00
commit 06355a5c8f
6 changed files with 19 additions and 15 deletions

View File

@ -11,6 +11,7 @@ drwxr-xr-x root/root usr/include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/
-rw-r--r-- root/root usr/include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h -rw-r--r-- root/root usr/include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
drwxr-xr-x root/root usr/include/gdk-pixbuf-2.0/gdk-pixbuf/ drwxr-xr-x root/root usr/include/gdk-pixbuf-2.0/gdk-pixbuf/
-rw-r--r-- root/root usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h -rw-r--r-- root/root usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
-rw-r--r-- root/root usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-autocleanups.h
-rw-r--r-- root/root usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h -rw-r--r-- root/root usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h
-rw-r--r-- root/root usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h -rw-r--r-- root/root usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
-rw-r--r-- root/root usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-features.h -rw-r--r-- root/root usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-features.h
@ -61,13 +62,13 @@ drwxr-xr-x root/root usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/
drwxr-xr-x root/root usr/lib/girepository-1.0/ drwxr-xr-x root/root usr/lib/girepository-1.0/
-rw-r--r-- root/root usr/lib/girepository-1.0/GdkPixbuf-2.0.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/GdkPixbuf-2.0.typelib
-rwxr-xr-x root/root usr/lib/libgdk_pixbuf-2.0.la -rwxr-xr-x root/root usr/lib/libgdk_pixbuf-2.0.la
lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so -> libgdk_pixbuf-2.0.so.0.3000.8 lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so -> libgdk_pixbuf-2.0.so.0.3100.6
lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so.0 -> libgdk_pixbuf-2.0.so.0.3000.8 lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so.0 -> libgdk_pixbuf-2.0.so.0.3100.6
-rwxr-xr-x root/root usr/lib/libgdk_pixbuf-2.0.so.0.3000.8 -rwxr-xr-x root/root usr/lib/libgdk_pixbuf-2.0.so.0.3100.6
-rwxr-xr-x root/root usr/lib/libgdk_pixbuf_xlib-2.0.la -rwxr-xr-x root/root usr/lib/libgdk_pixbuf_xlib-2.0.la
lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so -> libgdk_pixbuf_xlib-2.0.so.0.3000.8 lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so -> libgdk_pixbuf_xlib-2.0.so.0.3100.6
lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib-2.0.so.0.3000.8 lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib-2.0.so.0.3100.6
-rwxr-xr-x root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0.3000.8 -rwxr-xr-x root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0.3100.6
drwxr-xr-x root/root usr/lib/pkgconfig/ drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/gdk-pixbuf-2.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gdk-pixbuf-2.0.pc
-rw-r--r-- root/root usr/lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc

View File

@ -1,4 +1,3 @@
6c3862a6dfd70e31f8a6a1c3c65caece CVE-2015-4491.patch 67219eb45ed0aba90b3158042b909d4e gdk-pixbuf-2.31.6.tar.xz
4fed0d54432f1b69fc6e66e608bd5542 gdk-pixbuf-2.30.8.tar.xz
d5311640870a5de1dc8aefcb4509a99d gdk-pixbuf-register.sh d5311640870a5de1dc8aefcb4509a99d gdk-pixbuf-register.sh
94f3472231326d5352d007497db82798 gdk-pixbuf.loaders 94f3472231326d5352d007497db82798 gdk-pixbuf.loaders

View File

@ -4,14 +4,13 @@
# Depends on: gobject-introspection libpng libtiff xorg-libx11 # Depends on: gobject-introspection libpng libtiff xorg-libx11
name=gdk-pixbuf name=gdk-pixbuf
version=2.30.8 version=2.31.6
release=3 release=1
source=(http://download.gnome.org/sources/$name/2.30/$name-$version.tar.xz \ source=(http://download.gnome.org/sources/$name/2.31/$name-$version.tar.xz \
gdk-pixbuf.loaders gdk-pixbuf-register.sh CVE-2015-4491.patch) gdk-pixbuf.loaders gdk-pixbuf-register.sh)
build () { build () {
cd $name-$version cd $name-$version
patch -p1 -i $SRC/CVE-2015-4491.patch
./configure --prefix=/usr \ ./configure --prefix=/usr \
--disable-nls \ --disable-nls \

View File

@ -395,6 +395,8 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/
-rw-r--r-- root/root usr/include/wine/windows/iextag.idl -rw-r--r-- root/root usr/include/wine/windows/iextag.idl
-rw-r--r-- root/root usr/include/wine/windows/ifdef.h -rw-r--r-- root/root usr/include/wine/windows/ifdef.h
-rw-r--r-- root/root usr/include/wine/windows/ifmib.h -rw-r--r-- root/root usr/include/wine/windows/ifmib.h
-rw-r--r-- root/root usr/include/wine/windows/iimgctx.h
-rw-r--r-- root/root usr/include/wine/windows/iimgctx.idl
-rw-r--r-- root/root usr/include/wine/windows/imagehlp.h -rw-r--r-- root/root usr/include/wine/windows/imagehlp.h
-rw-r--r-- root/root usr/include/wine/windows/imm.h -rw-r--r-- root/root usr/include/wine/windows/imm.h
-rw-r--r-- root/root usr/include/wine/windows/imnact.h -rw-r--r-- root/root usr/include/wine/windows/imnact.h
@ -687,6 +689,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/
-rw-r--r-- root/root usr/include/wine/windows/taskschd.h -rw-r--r-- root/root usr/include/wine/windows/taskschd.h
-rw-r--r-- root/root usr/include/wine/windows/taskschd.idl -rw-r--r-- root/root usr/include/wine/windows/taskschd.idl
-rw-r--r-- root/root usr/include/wine/windows/tchar.h -rw-r--r-- root/root usr/include/wine/windows/tchar.h
-rw-r--r-- root/root usr/include/wine/windows/tcpestats.h
-rw-r--r-- root/root usr/include/wine/windows/tcpmib.h -rw-r--r-- root/root usr/include/wine/windows/tcpmib.h
-rw-r--r-- root/root usr/include/wine/windows/textserv.h -rw-r--r-- root/root usr/include/wine/windows/textserv.h
-rw-r--r-- root/root usr/include/wine/windows/textstor.h -rw-r--r-- root/root usr/include/wine/windows/textstor.h
@ -1741,6 +1744,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/
-rw-r--r-- root/root usr/lib/wine/libd3d10.def -rw-r--r-- root/root usr/lib/wine/libd3d10.def
-rw-r--r-- root/root usr/lib/wine/libd3d10_1.def -rw-r--r-- root/root usr/lib/wine/libd3d10_1.def
-rw-r--r-- root/root usr/lib/wine/libd3d10core.def -rw-r--r-- root/root usr/lib/wine/libd3d10core.def
-rw-r--r-- root/root usr/lib/wine/libd3d11.def
-rw-r--r-- root/root usr/lib/wine/libd3d8.def -rw-r--r-- root/root usr/lib/wine/libd3d8.def
-rw-r--r-- root/root usr/lib/wine/libd3d9.def -rw-r--r-- root/root usr/lib/wine/libd3d9.def
-rw-r--r-- root/root usr/lib/wine/libd3dcompiler.def -rw-r--r-- root/root usr/lib/wine/libd3dcompiler.def
@ -3181,6 +3185,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/
-rw-r--r-- root/root usr/lib32/wine/libd3d10.def -rw-r--r-- root/root usr/lib32/wine/libd3d10.def
-rw-r--r-- root/root usr/lib32/wine/libd3d10_1.def -rw-r--r-- root/root usr/lib32/wine/libd3d10_1.def
-rw-r--r-- root/root usr/lib32/wine/libd3d10core.def -rw-r--r-- root/root usr/lib32/wine/libd3d10core.def
-rw-r--r-- root/root usr/lib32/wine/libd3d11.def
-rw-r--r-- root/root usr/lib32/wine/libd3d8.def -rw-r--r-- root/root usr/lib32/wine/libd3d8.def
-rw-r--r-- root/root usr/lib32/wine/libd3d9.def -rw-r--r-- root/root usr/lib32/wine/libd3d9.def
-rw-r--r-- root/root usr/lib32/wine/libd3dcompiler.def -rw-r--r-- root/root usr/lib32/wine/libd3dcompiler.def

View File

@ -1,4 +1,4 @@
bb27879f267a20599cacbb4043ebd584 wine-1.7.49.tar.bz2 c8b30bf13c3d418688fd6fa1321edb8a wine-1.7.50.tar.bz2
6cec03fb81eb083c517c9bb2d70a1424 wine-mono-4.5.6.msi 6cec03fb81eb083c517c9bb2d70a1424 wine-mono-4.5.6.msi
490668a7f1cb42ceba56208bfe51334f wine_gecko-2.36-x86.msi 490668a7f1cb42ceba56208bfe51334f wine_gecko-2.36-x86.msi
7f0826b2592d35129c54bcbf612eea63 wine_gecko-2.36-x86_64.msi 7f0826b2592d35129c54bcbf612eea63 wine_gecko-2.36-x86_64.msi

View File

@ -5,7 +5,7 @@
# Depends on: fontconfig-32 freeglut-32 xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 alsa-lib-32 libpng-32 libjpeg-turbo-32 prelink gnutls-32 # Depends on: fontconfig-32 freeglut-32 xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 alsa-lib-32 libpng-32 libjpeg-turbo-32 prelink gnutls-32
name=wine name=wine
version=1.7.49 version=1.7.50
release=1 release=1
source=(http://downloads.sourceforge.net/wine/$name-$version.tar.bz2 source=(http://downloads.sourceforge.net/wine/$name-$version.tar.bz2
http://downloads.sourceforge.net/wine/wine_gecko-2.36-x86.msi http://downloads.sourceforge.net/wine/wine_gecko-2.36-x86.msi