Merge branch '2.4' into 2.5
This commit is contained in:
commit
4c2ce6fa2b
@ -2,15 +2,16 @@ drwxr-xr-x root/root usr/
|
|||||||
drwxr-xr-x root/root usr/bin/
|
drwxr-xr-x root/root usr/bin/
|
||||||
-rwxr-xr-x root/root usr/bin/iptables-xml
|
-rwxr-xr-x root/root usr/bin/iptables-xml
|
||||||
drwxr-xr-x root/root usr/include/
|
drwxr-xr-x root/root usr/include/
|
||||||
-rw-r--r-- root/root usr/include/ip6tables.h
|
|
||||||
-rw-r--r-- root/root usr/include/iptables.h
|
|
||||||
-rw-r--r-- root/root usr/include/libipq.h
|
-rw-r--r-- root/root usr/include/libipq.h
|
||||||
drwxr-xr-x root/root usr/include/libiptc/
|
|
||||||
-rw-r--r-- root/root usr/include/libiptc/ipt_kernel_headers.h
|
|
||||||
-rw-r--r-- root/root usr/include/libiptc/libxtc.h
|
|
||||||
-rw-r--r-- root/root usr/include/xtables.h
|
-rw-r--r-- root/root usr/include/xtables.h
|
||||||
drwxr-xr-x root/root usr/lib/
|
drwxr-xr-x root/root usr/lib/
|
||||||
-rw-r--r-- root/root usr/lib/libipq.a
|
-rw-r--r-- root/root usr/lib/libipq.a
|
||||||
|
-rwxr-xr-x root/root usr/lib/libxtables.la
|
||||||
|
lrwxrwxrwx root/root usr/lib/libxtables.so -> libxtables.so.0.0.0
|
||||||
|
lrwxrwxrwx root/root usr/lib/libxtables.so.0 -> libxtables.so.0.0.0
|
||||||
|
-rwxr-xr-x root/root usr/lib/libxtables.so.0.0.0
|
||||||
|
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||||
|
-rw-r--r-- root/root usr/lib/pkgconfig/xtables.pc
|
||||||
drwxr-xr-x root/root usr/lib/xtables/
|
drwxr-xr-x root/root usr/lib/xtables/
|
||||||
-rwxr-xr-x root/root usr/lib/xtables/libip6t_HL.so
|
-rwxr-xr-x root/root usr/lib/xtables/libip6t_HL.so
|
||||||
-rwxr-xr-x root/root usr/lib/xtables/libip6t_LOG.so
|
-rwxr-xr-x root/root usr/lib/xtables/libip6t_LOG.so
|
||||||
|
@ -1 +1 @@
|
|||||||
723fa88d8a0915e184f99e03e9bf06cb iptables-1.4.1.1.tar.bz2
|
a138d1c2e74321e0e4e228a9fb301c9a iptables-1.4.2.tar.bz2
|
||||||
|
@ -3,14 +3,16 @@
|
|||||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||||
|
|
||||||
name=iptables
|
name=iptables
|
||||||
version=1.4.1.1
|
version=1.4.2
|
||||||
release=2
|
release=1
|
||||||
source=(ftp://ftp.netfilter.org/pub/iptables/$name-$version.tar.bz2)
|
source=(ftp://ftp.netfilter.org/pub/iptables/$name-$version.tar.bz2)
|
||||||
|
|
||||||
build () {
|
build () {
|
||||||
cd $name-$version
|
cd $name-$version
|
||||||
|
|
||||||
./configure --prefix=/usr --mandir=/usr/man --libexecdir=/usr/lib \
|
./configure --prefix=/usr \
|
||||||
|
--mandir=/usr/man \
|
||||||
|
--libexecdir=/usr/lib \
|
||||||
--enable-libipq
|
--enable-libipq
|
||||||
|
|
||||||
make
|
make
|
||||||
|
@ -1,3 +1,2 @@
|
|||||||
72a0ccf1ea3c7c233d16db6b2527dca9 modprobe.conf
|
72a0ccf1ea3c7c233d16db6b2527dca9 modprobe.conf
|
||||||
e253b066a1bab1d727ca0d54f001b49c module-init-tools-3.4.1.tar.bz2
|
2b47686247fc9a99bfdb9dd1d1d80e6f module-init-tools-3.5.tar.bz2
|
||||||
6260ee10bb03214ab50c5558d5231c59 module-init-tools-man-3.4.1.tar.bz2
|
|
||||||
|
@ -3,15 +3,13 @@
|
|||||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||||
|
|
||||||
name=module-init-tools
|
name=module-init-tools
|
||||||
version=3.4.1
|
version=3.5
|
||||||
release=1
|
release=1
|
||||||
source=(http://www.kernel.org/pub/linux/kernel/people/rusty/modules/$name-$version.tar.bz2
|
source=(http://www.kernel.org/pub/linux/kernel/people/rusty/modules/$name-$version.tar.bz2
|
||||||
http://crux.nu/~jue/files/dist/$name-man-$version.tar.bz2
|
|
||||||
modprobe.conf)
|
modprobe.conf)
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd $name-$version
|
cd $name-$version
|
||||||
cp $SRC/$name-man-$version/* .
|
|
||||||
./configure --prefix=/usr \
|
./configure --prefix=/usr \
|
||||||
--bindir=/sbin \
|
--bindir=/sbin \
|
||||||
--sbindir=/sbin
|
--sbindir=/sbin
|
||||||
|
Loading…
Reference in New Issue
Block a user