Merge branch '2.7' into 2.8

Conflicts:
	util-linux-ng/.md5sum
	util-linux/Pkgfile
This commit is contained in:
Juergen Daubert 2012-10-11 13:05:32 +02:00
commit 0a904cc529
6 changed files with 10 additions and 7 deletions

View File

@ -64,6 +64,7 @@ drwxr-xr-x root/root usr/man/man3/
-rw-r--r-- root/root usr/man/man3/curl_multi_socket_action.3.gz
-rw-r--r-- root/root usr/man/man3/curl_multi_strerror.3.gz
-rw-r--r-- root/root usr/man/man3/curl_multi_timeout.3.gz
-rw-r--r-- root/root usr/man/man3/curl_multi_wait.3.gz
-rw-r--r-- root/root usr/man/man3/curl_share_cleanup.3.gz
-rw-r--r-- root/root usr/man/man3/curl_share_init.3.gz
-rw-r--r-- root/root usr/man/man3/curl_share_setopt.3.gz

View File

@ -1 +1 @@
1b669875527ba4b943a0cdb5b255a02c curl-7.27.0.tar.lzma
f8a9f99d9db71d8ce1d2c4ccea3c3850 curl-7.28.0.tar.lzma

View File

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

View File

@ -9,6 +9,7 @@ drwxr-xr-x root/root usr/include/libiptc/
-rw-r--r-- root/root usr/include/libiptc/libiptc.h
-rw-r--r-- root/root usr/include/libiptc/libxtc.h
-rw-r--r-- root/root usr/include/libiptc/xtcshared.h
-rw-r--r-- root/root usr/include/xtables-version.h
-rw-r--r-- root/root usr/include/xtables.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libip4tc.la
@ -28,9 +29,9 @@ lrwxrwxrwx root/root usr/lib/libiptc.so -> libiptc.so.0.0.0
lrwxrwxrwx root/root usr/lib/libiptc.so.0 -> libiptc.so.0.0.0
-rwxr-xr-x root/root usr/lib/libiptc.so.0.0.0
-rwxr-xr-x root/root usr/lib/libxtables.la
lrwxrwxrwx root/root usr/lib/libxtables.so -> libxtables.so.7.1.0
lrwxrwxrwx root/root usr/lib/libxtables.so.7 -> libxtables.so.7.1.0
-rwxr-xr-x root/root usr/lib/libxtables.so.7.1.0
lrwxrwxrwx root/root usr/lib/libxtables.so -> libxtables.so.9.0.0
lrwxrwxrwx root/root usr/lib/libxtables.so.9 -> libxtables.so.9.0.0
-rwxr-xr-x root/root usr/lib/libxtables.so.9.0.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libip4tc.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libip6tc.pc
@ -156,6 +157,7 @@ drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/ip6tables-restore.8.gz
-rw-r--r-- root/root usr/man/man8/ip6tables-save.8.gz
-rw-r--r-- root/root usr/man/man8/ip6tables.8.gz
-rw-r--r-- root/root usr/man/man8/iptables-extensions.8.gz
-rw-r--r-- root/root usr/man/man8/iptables-restore.8.gz
-rw-r--r-- root/root usr/man/man8/iptables-save.8.gz
-rw-r--r-- root/root usr/man/man8/iptables.8.gz

View File

@ -1 +1 @@
8bf564ea8348522fc1db727868828def iptables-1.4.15.tar.bz2
57220bb26866a713073e5614f88071fc iptables-1.4.16.2.tar.bz2

View File

@ -3,7 +3,7 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu
name=iptables
version=1.4.15
version=1.4.16.2
release=1
source=(ftp://ftp.netfilter.org/pub/iptables/$name-$version.tar.bz2)