Merge branch '2.6' into 2.7

This commit is contained in:
Juergen Daubert 2010-08-05 17:10:51 +02:00
commit 4dbf0a1833
8 changed files with 21 additions and 19 deletions

View File

@ -1 +1 @@
9c5921516f16558a168815ad880d388f dhcpcd-5.2.6.tar.bz2
1dcf377270a13cc774c9a26fc50453b5 dhcpcd-5.2.7.tar.bz2

View File

@ -3,7 +3,7 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu
name=dhcpcd
version=5.2.6
version=5.2.7
release=1
source=(http://roy.marples.name/downloads/dhcpcd/$name-$version.tar.bz2)

View File

@ -10,12 +10,8 @@ drwxr-xr-x root/root etc/rc.d/
-rwxr-xr-x root/root etc/rc.d/net
drwxr-xr-x root/root lib/
drwxr-xr-x root/root lib/tc/
-rwxr-xr-x root/root lib/tc/experimental.dist
lrwxrwxrwx root/root lib/tc/m_ipt.so -> m_xt.so
-rwxr-xr-x root/root lib/tc/m_xt.so
-rwxr-xr-x root/root lib/tc/normal.dist
-rwxr-xr-x root/root lib/tc/pareto.dist
-rwxr-xr-x root/root lib/tc/paretonormal.dist
drwxr-xr-x root/root sbin/
-rwxr-xr-x root/root sbin/arpd
lrwxrwxrwx root/root sbin/ctstat -> lnstat
@ -34,6 +30,12 @@ lrwxrwxrwx root/root sbin/rtstat -> lnstat
-rwxr-xr-x root/root sbin/ss
-rwxr-xr-x root/root sbin/tc
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/tc/
-rw-r--r-- root/root usr/lib/tc/experimental.dist
-rw-r--r-- root/root usr/lib/tc/normal.dist
-rw-r--r-- root/root usr/lib/tc/pareto.dist
-rw-r--r-- root/root usr/lib/tc/paretonormal.dist
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man3/
-rw-r--r-- root/root usr/man/man3/libnetlink.3.gz

View File

@ -1,3 +1,2 @@
5c5742bdac05a1688f266512e685b83c iproute2-2.6.34.tar.bz2
2449079ddcc23a1cc08014e025d153ab iproute2-tc_install.patch
b0f281b3124bf04669e18f5fe16d4934 iproute2-2.6.35.tar.bz2
0b01b0404718d043adf55cfa314c80bd net.iproute2

View File

@ -4,14 +4,13 @@
# Depends on: db
name=iproute2
version=2.6.34
release=2
version=2.6.35
release=1
source=(http://devresources.linuxfoundation.org/dev/iproute2/download/$name-$version.tar.bz2 \
net.iproute2 iproute2-tc_install.patch)
net.iproute2)
build() {
cd $name-$version
patch -p1 -i $SRC/iproute2-tc_install.patch
sed -i "s|-O2|$CFLAGS -DIPT_LIB_DIR=\\\\\"/usr/lib/xtables\\\\\"|" Makefile
make
make MANDIR=/usr/man DESTDIR=$PKG install

View File

@ -27,9 +27,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.4.0.0
lrwxrwxrwx root/root usr/lib/libxtables.so.4 -> libxtables.so.4.0.0
-rwxr-xr-x root/root usr/lib/libxtables.so.4.0.0
lrwxrwxrwx root/root usr/lib/libxtables.so -> libxtables.so.5.0.0
lrwxrwxrwx root/root usr/lib/libxtables.so.5 -> libxtables.so.5.0.0
-rwxr-xr-x root/root usr/lib/libxtables.so.5.0.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libiptc.pc
-rw-r--r-- root/root usr/lib/pkgconfig/xtables.pc
@ -57,7 +57,6 @@ drwxr-xr-x root/root usr/lib/xtables/
-rwxr-xr-x root/root usr/lib/xtables/libipt_REDIRECT.so
-rwxr-xr-x root/root usr/lib/xtables/libipt_REJECT.so
-rwxr-xr-x root/root usr/lib/xtables/libipt_SAME.so
-rwxr-xr-x root/root usr/lib/xtables/libipt_SET.so
-rwxr-xr-x root/root usr/lib/xtables/libipt_SNAT.so
-rwxr-xr-x root/root usr/lib/xtables/libipt_TTL.so
-rwxr-xr-x root/root usr/lib/xtables/libipt_ULOG.so
@ -66,7 +65,6 @@ drwxr-xr-x root/root usr/lib/xtables/
-rwxr-xr-x root/root usr/lib/xtables/libipt_ecn.so
-rwxr-xr-x root/root usr/lib/xtables/libipt_icmp.so
-rwxr-xr-x root/root usr/lib/xtables/libipt_realm.so
-rwxr-xr-x root/root usr/lib/xtables/libipt_set.so
-rwxr-xr-x root/root usr/lib/xtables/libipt_ttl.so
-rwxr-xr-x root/root usr/lib/xtables/libipt_unclean.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_CLASSIFY.so
@ -74,14 +72,17 @@ drwxr-xr-x root/root usr/lib/xtables/
-rwxr-xr-x root/root usr/lib/xtables/libxt_CONNSECMARK.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_CT.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_DSCP.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_LED.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_MARK.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_NFLOG.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_NFQUEUE.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_NOTRACK.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_RATEEST.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_SECMARK.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_SET.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_TCPMSS.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_TCPOPTSTRIP.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_TEE.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_TOS.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_TPROXY.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_TRACE.so
@ -111,6 +112,7 @@ drwxr-xr-x root/root usr/lib/xtables/
-rwxr-xr-x root/root usr/lib/xtables/libxt_rateest.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_recent.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_sctp.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_set.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_socket.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_standard.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_state.so

View File

@ -1 +1 @@
697ed89f37af4473a5f6349ba2700f2d iptables-1.4.8.tar.bz2
db1312f7ce5a4c11dc981a2ac76b26e8 iptables-1.4.9.tar.bz2

View File

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