Merge branch '2.5' into 2.6
Conflicts: lftp/.md5sum sudo/.md5sum sudo/Pkgfile
This commit is contained in:
commit
427532386c
@ -1,4 +1,4 @@
|
||||
e0514e5840c0e58cc4e7982a7e14fc4b apache
|
||||
75a919be7ff65f443287b094eaf6a162 apache-ssl_cert.patch
|
||||
bd931fee9d102c361e95ad318d199674 crux.layout
|
||||
3e98bcb14a7122c274d62419566431bb httpd-2.2.11.tar.bz2
|
||||
7d30c7195883c26a6eaf59a85b42c6ef httpd-2.2.12.tar.bz2
|
||||
|
@ -5,7 +5,7 @@
|
||||
# Group: apache
|
||||
|
||||
name=apache
|
||||
version=2.2.11
|
||||
version=2.2.12
|
||||
release=1
|
||||
source=(http://www.apache.org/dist/httpd/httpd-$version.tar.bz2 \
|
||||
$name-ssl_cert.patch crux.layout apache)
|
||||
|
@ -1 +1 @@
|
||||
fae5c93df514a92e1e826b1a9cb897ca dosfstools-3.0.4.tar.bz2
|
||||
0ac8c2119d2288958f4e2fd3dd942657 dosfstools-3.0.5.tar.bz2
|
||||
|
@ -5,7 +5,7 @@
|
||||
# Depends on:
|
||||
|
||||
name=dosfstools
|
||||
version=3.0.4
|
||||
version=3.0.5
|
||||
release=1
|
||||
source=(http://www.daniel-baumann.ch/software/$name/$name-$version.tar.bz2)
|
||||
|
||||
|
@ -16,29 +16,29 @@ drwxr-xr-x root/root usr/include/nvidia/GL/
|
||||
-r--r--r-- root/root usr/include/nvidia/GL/glxext.h
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rwxr-xr-x root/root usr/lib/libGL.la
|
||||
-rwxr-xr-x root/root usr/lib/libGL.so.185.18.14
|
||||
lrwxrwxrwx root/root usr/lib/libGL_so_1_2_nvidia -> libGL.so.185.18.14
|
||||
lrwxrwxrwx root/root usr/lib/libGLcore.so -> libGLcore.so.185.18.14
|
||||
-rwxr-xr-x root/root usr/lib/libGLcore.so.185.18.14
|
||||
-rwxr-xr-x root/root usr/lib/libcuda.so.185.18.14
|
||||
-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.185.18.14
|
||||
-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.185.18.14
|
||||
-rwxr-xr-x root/root usr/lib/libvdpau.so.185.18.14
|
||||
-rwxr-xr-x root/root usr/lib/libvdpau_nvidia.so.185.18.14
|
||||
-rwxr-xr-x root/root usr/lib/libvdpau_trace.so.185.18.14
|
||||
-rwxr-xr-x root/root usr/lib/libGL.so.185.18.29
|
||||
lrwxrwxrwx root/root usr/lib/libGL_so_1_2_nvidia -> libGL.so.185.18.29
|
||||
lrwxrwxrwx root/root usr/lib/libGLcore.so -> libGLcore.so.185.18.29
|
||||
-rwxr-xr-x root/root usr/lib/libGLcore.so.185.18.29
|
||||
-rwxr-xr-x root/root usr/lib/libcuda.so.185.18.29
|
||||
-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.185.18.29
|
||||
-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.185.18.29
|
||||
-rwxr-xr-x root/root usr/lib/libvdpau.so.185.18.29
|
||||
-rwxr-xr-x root/root usr/lib/libvdpau_nvidia.so.185.18.29
|
||||
-rwxr-xr-x root/root usr/lib/libvdpau_trace.so.185.18.29
|
||||
drwxr-xr-x root/root usr/lib/tls/
|
||||
-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.185.18.14
|
||||
-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.185.18.29
|
||||
drwxr-xr-x root/root usr/lib/xorg/
|
||||
-r--r--r-- root/root usr/lib/xorg/libXvMCNVIDIA.a
|
||||
-rwxr-xr-x root/root usr/lib/xorg/libXvMCNVIDIA.so.185.18.14
|
||||
-rwxr-xr-x root/root usr/lib/xorg/libXvMCNVIDIA.so.185.18.29
|
||||
drwxr-xr-x root/root usr/lib/xorg/modules/
|
||||
drwxr-xr-x root/root usr/lib/xorg/modules/drivers/
|
||||
-rwxr-xr-x root/root usr/lib/xorg/modules/drivers/nvidia_drv.so
|
||||
drwxr-xr-x root/root usr/lib/xorg/modules/extensions/
|
||||
lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libGLcore.so -> /usr/lib/libGLcore.so
|
||||
-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.185.18.14
|
||||
lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.185.18.14
|
||||
-rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.185.18.14
|
||||
-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.185.18.29
|
||||
lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.185.18.29
|
||||
-rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.185.18.29
|
||||
drwxr-xr-x root/root usr/man/
|
||||
drwxr-xr-x root/root usr/man/man1/
|
||||
-rw-r--r-- root/root usr/man/man1/nvidia-settings.1.gz
|
||||
|
@ -1,2 +1,2 @@
|
||||
a91d31a9dec5deb2f9e4ca9a09e0019f NVIDIA-Linux-x86-185.18.14-pkg0.run
|
||||
e771348fc18b1d049a3af2a94feeab25 NVIDIA-Linux-x86-185.18.29-pkg0.run
|
||||
8921f37eaad3576532f0023d291b9e51 nvidia-makefile.patch
|
||||
|
@ -5,7 +5,7 @@
|
||||
# Depends on: gtk gl-select
|
||||
|
||||
name=nvidia
|
||||
version=185.18.14
|
||||
version=185.18.29
|
||||
release=1
|
||||
source=(http://us.download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version-pkg0.run \
|
||||
$name-makefile.patch)
|
||||
|
@ -1 +1 @@
|
||||
d3f799e0ae7953cd3426d9e0b6e2708d wireshark-1.2.0.tar.bz2
|
||||
957d1b11a6c9b305bcd106d4084ff71e wireshark-1.2.1.tar.bz2
|
||||
|
@ -5,7 +5,7 @@
|
||||
# Depends on: gtk libpcap libpcre
|
||||
|
||||
name=wireshark
|
||||
version=1.2.0
|
||||
version=1.2.1
|
||||
release=1
|
||||
source=(http://www.$name.org/download/src/all-versions/$name-$version.tar.bz2)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user