Merge branch '3.1' into 3.2

Conflicts:
	btrfs-progs/.md5sum
	btrfs-progs/Pkgfile
	kmod/Pkgfile
	wget/Pkgfile
This commit is contained in:
Juergen Daubert 2015-11-18 20:02:27 +01:00
commit 8d1e601f37
5 changed files with 9 additions and 9 deletions

@ -4,8 +4,8 @@ drwxr-xr-x root/root etc/
drwxr-xr-x root/root etc/depmod.d/
drwxr-xr-x root/root etc/modprobe.d/
drwxr-xr-x root/root lib/
lrwxrwxrwx root/root lib/libkmod.so.2 -> libkmod.so.2.2.11
-rwxr-xr-x root/root lib/libkmod.so.2.2.11
lrwxrwxrwx root/root lib/libkmod.so.2 -> libkmod.so.2.3.0
-rwxr-xr-x root/root lib/libkmod.so.2.3.0
drwxr-xr-x root/root sbin/
lrwxrwxrwx root/root sbin/depmod -> kmod
lrwxrwxrwx root/root sbin/insmod -> kmod
@ -19,7 +19,7 @@ drwxr-xr-x root/root usr/include/
-rw-r--r-- root/root usr/include/libkmod.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libkmod.la
lrwxrwxrwx root/root usr/lib/libkmod.so -> ../../lib/libkmod.so.2.2.11
lrwxrwxrwx root/root usr/lib/libkmod.so -> ../../lib/libkmod.so.2.3.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libkmod.pc
drwxr-xr-x root/root usr/share/

@ -1 +1 @@
ee246fab2e1cba9fbdcad6a86ec31531 kmod-21.tar.xz
4371b847f3fbfaa4e9aa890ad616748f kmod-22.tar.xz

@ -3,8 +3,8 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu
name=kmod
version=21
release=2
version=22
release=1
source=(https://www.kernel.org/pub/linux/utils/kernel/$name/$name-$version.tar.xz)
build() {

@ -1,2 +1,2 @@
d2e4455781a70140ae83b54ca594ce21 wget-1.16.3.tar.xz
b8cff5a2f88f5ce60a2b0e361e030b46 wget-1.17.tar.xz
fa717c9970a09e8ee1775a93e51fb694 wgetrc

@ -4,8 +4,8 @@
# Depends on: openssl
name=wget
version=1.16.3
release=2
version=1.17
release=1
source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.xz \
wgetrc)