Merge branch '3.1' into 3.2

Conflicts:
	btrfs-progs/.md5sum
	btrfs-progs/Pkgfile
	curl/.footprint
	vim/Pkgfile
This commit is contained in:
Juergen Daubert 2015-10-09 09:49:35 +02:00
commit 24748ba1d4
9 changed files with 58 additions and 11 deletions

View File

@ -29,6 +29,50 @@ drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/curl-config.1.gz
-rw-r--r-- root/root usr/share/man/man1/curl.1.gz
drwxr-xr-x root/root usr/share/man/man3/
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_ACTIVESOCKET.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_APPCONNECT_TIME.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_CERTINFO.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_CONDITION_UNMET.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_CONNECT_TIME.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_CONTENT_TYPE.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_COOKIELIST.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_EFFECTIVE_URL.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_FILETIME.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_FTP_ENTRY_PATH.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_HEADER_SIZE.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_HTTPAUTH_AVAIL.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_HTTP_CONNECTCODE.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_LASTSOCKET.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_LOCAL_IP.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_LOCAL_PORT.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_NAMELOOKUP_TIME.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_NUM_CONNECTS.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_OS_ERRNO.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_PRETRANSFER_TIME.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_PRIMARY_IP.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_PRIMARY_PORT.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_PRIVATE.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_PROXYAUTH_AVAIL.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_REDIRECT_COUNT.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_REDIRECT_TIME.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_REDIRECT_URL.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_REQUEST_SIZE.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_RESPONSE_CODE.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_RTSP_CLIENT_CSEQ.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_RTSP_CSEQ_RECV.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_RTSP_SERVER_CSEQ.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_RTSP_SESSION_ID.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_SIZE_DOWNLOAD.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_SIZE_UPLOAD.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_SPEED_DOWNLOAD.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_SPEED_UPLOAD.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_SSL_ENGINES.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_SSL_VERIFYRESULT.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_TLS_SESSION.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLINFO_TOTAL_TIME.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLMOPT_MAXCONNECTS.3.gz
@ -75,6 +119,7 @@ drwxr-xr-x root/root usr/share/man/man3/
-rw-r--r-- root/root usr/share/man/man3/CURLOPT_CUSTOMREQUEST.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLOPT_DEBUGDATA.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLOPT_DEBUGFUNCTION.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLOPT_DEFAULT_PROTOCOL.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLOPT_DIRLISTONLY.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3.gz
-rw-r--r-- root/root usr/share/man/man3/CURLOPT_DNS_INTERFACE.3.gz

View File

@ -1 +1 @@
2f924c80bb7124dff1b39f54ffda3781 curl-7.44.0.tar.lzma
c9a0a77f71fdc6b0f925bc3e79eb77f6 curl-7.45.0.tar.lzma

View File

@ -4,7 +4,7 @@
# Depends on: openssl, zlib
name=curl
version=7.44.0
version=7.45.0
release=1
source=(http://curl.haxx.se/download/$name-$version.tar.lzma)

View File

@ -15,12 +15,12 @@ drwxr-xr-x root/root usr/etc/
-rw-r--r-- root/root usr/etc/man_db.conf
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/man-db/
-rwxr-xr-x root/root usr/lib/man-db/libman-2.7.3.so
-rwxr-xr-x root/root usr/lib/man-db/libman-2.7.4.so
-rwxr-xr-x root/root usr/lib/man-db/libman.la
lrwxrwxrwx root/root usr/lib/man-db/libman.so -> libman-2.7.3.so
-rwxr-xr-x root/root usr/lib/man-db/libmandb-2.7.3.so
lrwxrwxrwx root/root usr/lib/man-db/libman.so -> libman-2.7.4.so
-rwxr-xr-x root/root usr/lib/man-db/libmandb-2.7.4.so
-rwxr-xr-x root/root usr/lib/man-db/libmandb.la
lrwxrwxrwx root/root usr/lib/man-db/libmandb.so -> libmandb-2.7.3.so
lrwxrwxrwx root/root usr/lib/man-db/libmandb.so -> libmandb-2.7.4.so
drwxr-xr-x root/root usr/lib/man-db/man-db/
-rwxr-xr-x root/root usr/lib/man-db/man-db/globbing
-rwxr-xr-x root/root usr/lib/man-db/man-db/manconv

View File

@ -1,2 +1,2 @@
df898c82d766dad6492a5a96d5a26647 man-db-2.7.3.tar.xz
1b400af5b03c7ac44769dbfdd28a86fc man-db-2.7.4.tar.xz
43dcb76783c4b2f0578b43a43124f9e9 mandb.cron

View File

@ -4,7 +4,7 @@
# Depends on: zlib gdbm libpipeline
name=man-db
version=2.7.3
version=2.7.4
release=1
source=(http://download.savannah.gnu.org/releases/$name/$name-$version.tar.xz \
mandb.cron)

View File

@ -583,6 +583,7 @@ drwxr-xr-x root/root usr/share/vim/indent/
-rw-r--r-- root/root usr/share/vim/indent/systemverilog.vim
-rw-r--r-- root/root usr/share/vim/indent/tcl.vim
-rw-r--r-- root/root usr/share/vim/indent/tcsh.vim
-rw-r--r-- root/root usr/share/vim/indent/teraterm.vim
-rw-r--r-- root/root usr/share/vim/indent/tex.vim
-rw-r--r-- root/root usr/share/vim/indent/tf.vim
-rw-r--r-- root/root usr/share/vim/indent/tilde.vim
@ -1172,6 +1173,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/
-rw-r--r-- root/root usr/share/vim/syntax/tasm.vim
-rw-r--r-- root/root usr/share/vim/syntax/tcl.vim
-rw-r--r-- root/root usr/share/vim/syntax/tcsh.vim
-rw-r--r-- root/root usr/share/vim/syntax/teraterm.vim
-rw-r--r-- root/root usr/share/vim/syntax/terminfo.vim
-rw-r--r-- root/root usr/share/vim/syntax/tex.vim
-rw-r--r-- root/root usr/share/vim/syntax/texinfo.vim

View File

@ -1 +1 @@
2952442ac4c7a2ffb7ba0d3705c639c4 vim-7.4.764.tar.xz
2ebb9c9beedac71f50443ebee3d35c36 vim-7.4.890.tar.xz

View File

@ -4,8 +4,8 @@
# Depends on: ncurses acl
name=vim
version=7.4.764
release=2
version=7.4.890
release=1
source=(http://crux.nu/files/distfiles/$name-$version.tar.xz)
build () {