This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 47437b0c07c31ad8941c893ff2058eeb487a5d63 (commit) via e53a08983c38e3e989da3f847064a3a80fc78d36 (commit) via 60e957d0550eff7fb73f0245798b073d291a084a (commit) via f4e1fbab9e1d09deb44d63895ecc29bbfaf58b94 (commit) via 0818bf1120a3e09a29e101ad399f5c5033fc63a3 (commit) via 39a92aabc20996e38c44c8101241318609d138b4 (commit) via fec7a5b72f3c414d92a5a2d925b001c4705dc0a8 (commit) via 0af0f28ab0499b3ce70a18ef61290caeb6b2a6b1 (commit) via ead1c73f2ae606d24b6f812168083cd17d660672 (commit) via d2f2ca6560d85ba74376792c1d5f5a7f1dc8887a (commit) via b5722656633c1bd4386b827a608c6966bde37be6 (commit) via 4ebb37c8ad321f185618349121ebd074df37e5e6 (commit) from 1f02b6e0e15f06284d865247a06457acbb98c1a0 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 47437b0c07c31ad8941c893ff2058eeb487a5d63 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 23 23:11:36 2015 +0200

core92: Ship python

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit e53a08983c38e3e989da3f847064a3a80fc78d36 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 23 23:11:16 2015 +0200

core92: Ship libnetfilter_cttimeout

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 60e957d0550eff7fb73f0245798b073d291a084a Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 23 23:10:08 2015 +0200

core92: Ship iptables again

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit f4e1fbab9e1d09deb44d63895ecc29bbfaf58b94 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 23 20:14:53 2015 +0200

Rootfile update

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 0818bf1120a3e09a29e101ad399f5c5033fc63a3 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 23 14:48:56 2015 +0200

keepalived: Update to 1.2.17

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 39a92aabc20996e38c44c8101241318609d138b4 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 23 14:45:06 2015 +0200

conntrack-tools: Update to 1.4.2

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit fec7a5b72f3c414d92a5a2d925b001c4705dc0a8 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 23 14:01:44 2015 +0200

libnetfilter_cthelper: New package

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 0af0f28ab0499b3ce70a18ef61290caeb6b2a6b1 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 23 13:58:41 2015 +0200

iptables: Cleanup make file

Just some reindentation but no functional changes

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit ead1c73f2ae606d24b6f812168083cd17d660672 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 23 13:56:46 2015 +0200

libnetfilter_cttimeout: Move out of iptables package

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit d2f2ca6560d85ba74376792c1d5f5a7f1dc8887a Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 23 13:51:50 2015 +0200

libnetfilter_queue: Update to version 1.0.2

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit b5722656633c1bd4386b827a608c6966bde37be6 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 23 13:46:46 2015 +0200

libnetfilter_conntrack: Update to version 1.0.4

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 4ebb37c8ad321f185618349121ebd074df37e5e6 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 23 13:37:09 2015 +0200

libnfnetlink: Update to 1.0.1

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/conntrack-tools | 11 +++- config/rootfiles/common/iptables | 45 ++------------ config/rootfiles/common/libnetfilter_conntrack | 15 +++++ config/rootfiles/common/libnetfilter_cthelper | 7 +++ config/rootfiles/common/libnetfilter_cttimeout | 7 +++ config/rootfiles/common/libnetfilter_queue | 14 +++++ config/rootfiles/common/libnfnetlink | 9 +++ config/rootfiles/common/python | 2 +- .../66 => core/92}/filelists/conntrack-tools | 0 .../{oldcore/90 => core/92}/filelists/iptables | 0 .../core/92/filelists/libnetfilter_conntrack | 1 + .../core/92/filelists/libnetfilter_cthelper | 1 + .../core/92/filelists/libnetfilter_cttimeout | 1 + .../rootfiles/core/92/filelists/libnetfilter_queue | 1 + config/rootfiles/core/92/filelists/libnfnetlink | 1 + .../{oldcore/59 => core/92}/filelists/python | 0 config/rootfiles/packages/keepalived | 4 +- config/rootfiles/packages/powertop | 35 ++++++----- lfs/conntrack-tools | 4 +- lfs/iptables | 72 +++++----------------- lfs/keepalived | 6 +- lfs/{conntrack-tools => libnetfilter_conntrack} | 6 +- lfs/{conntrack-tools => libnetfilter_cthelper} | 6 +- lfs/{conntrack-tools => libnetfilter_cttimeout} | 6 +- lfs/{conntrack-tools => libnetfilter_queue} | 6 +- lfs/{libmnl => libnfnetlink} | 6 +- make.sh | 5 ++ 27 files changed, 135 insertions(+), 136 deletions(-) create mode 100644 config/rootfiles/common/libnetfilter_conntrack create mode 100644 config/rootfiles/common/libnetfilter_cthelper create mode 100644 config/rootfiles/common/libnetfilter_cttimeout create mode 100644 config/rootfiles/common/libnetfilter_queue create mode 100644 config/rootfiles/common/libnfnetlink copy config/rootfiles/{oldcore/66 => core/92}/filelists/conntrack-tools (100%) copy config/rootfiles/{oldcore/90 => core/92}/filelists/iptables (100%) create mode 120000 config/rootfiles/core/92/filelists/libnetfilter_conntrack create mode 120000 config/rootfiles/core/92/filelists/libnetfilter_cthelper create mode 120000 config/rootfiles/core/92/filelists/libnetfilter_cttimeout create mode 120000 config/rootfiles/core/92/filelists/libnetfilter_queue create mode 120000 config/rootfiles/core/92/filelists/libnfnetlink copy config/rootfiles/{oldcore/59 => core/92}/filelists/python (100%) copy lfs/{conntrack-tools => libnetfilter_conntrack} (96%) copy lfs/{conntrack-tools => libnetfilter_cthelper} (96%) copy lfs/{conntrack-tools => libnetfilter_cttimeout} (96%) copy lfs/{conntrack-tools => libnetfilter_queue} (96%) copy lfs/{libmnl => libnfnetlink} (96%)

Difference in files: diff --git a/config/rootfiles/common/conntrack-tools b/config/rootfiles/common/conntrack-tools index 5ce29aa..52b642a 100644 --- a/config/rootfiles/common/conntrack-tools +++ b/config/rootfiles/common/conntrack-tools @@ -1,6 +1,13 @@ +#usr/lib/conntrack-tools +#usr/lib/conntrack-tools/ct_helper_ftp.la +usr/lib/conntrack-tools/ct_helper_ftp.so +#usr/lib/conntrack-tools/ct_helper_rpc.la +usr/lib/conntrack-tools/ct_helper_rpc.so +#usr/lib/conntrack-tools/ct_helper_tns.la +usr/lib/conntrack-tools/ct_helper_tns.so usr/sbin/conntrack -#usr/sbin/conntrackd -#usr/sbin/nfct +usr/sbin/conntrackd +usr/sbin/nfct #usr/share/man/man8/conntrack.8 #usr/share/man/man8/conntrackd.8 #usr/share/man/man8/nfct.8 diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables index a0f1290..09e827c 100644 --- a/config/rootfiles/common/iptables +++ b/config/rootfiles/common/iptables @@ -54,7 +54,6 @@ lib/xtables #lib/xtables/libipt_ULOG.so #lib/xtables/libipt_ah.so #lib/xtables/libipt_icmp.so -#lib/xtables/libipt_ipp2p.so #lib/xtables/libipt_realm.so #lib/xtables/libipt_ttl.so #lib/xtables/libipt_unclean.so @@ -88,6 +87,7 @@ lib/xtables #lib/xtables/libxt_cluster.so #lib/xtables/libxt_comment.so #lib/xtables/libxt_connbytes.so +#lib/xtables/libxt_connlabel.so #lib/xtables/libxt_connlimit.so #lib/xtables/libxt_connmark.so #lib/xtables/libxt_conntrack.so @@ -137,6 +137,7 @@ sbin/iptables sbin/iptables-restore sbin/iptables-save sbin/iptables-xml +#sbin/nfnl_osf sbin/xtables-multi #usr/include/libipq.h #usr/include/libiptc @@ -145,52 +146,12 @@ sbin/xtables-multi #usr/include/libiptc/libiptc.h #usr/include/libiptc/libxtc.h #usr/include/libiptc/xtcshared.h -#usr/include/libnetfilter_conntrack -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_dccp.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_icmp.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv4.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv6.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h -#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h -#usr/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h -#usr/include/libnetfilter_cttimeout -#usr/include/libnetfilter_cttimeout/libnetfilter_cttimeout.h -#usr/include/libnetfilter_queue -#usr/include/libnetfilter_queue/libnetfilter_queue.h -#usr/include/libnetfilter_queue/linux_nfnetlink_queue.h -#usr/include/libnfnetlink -#usr/include/libnfnetlink/libnfnetlink.h -#usr/include/libnfnetlink/linux_nfnetlink.h -#usr/include/libnfnetlink/linux_nfnetlink_compat.h #usr/include/xtables-version.h #usr/include/xtables.h -#usr/lib/libnetfilter_conntrack.la -usr/lib/libnetfilter_conntrack.so -usr/lib/libnetfilter_conntrack.so.3 -usr/lib/libnetfilter_conntrack.so.3.4.0 -#usr/lib/libnetfilter_cttimeout.la -usr/lib/libnetfilter_cttimeout.so -usr/lib/libnetfilter_cttimeout.so.1 -usr/lib/libnetfilter_cttimeout.so.1.0.0 -#usr/lib/libnetfilter_queue.la -usr/lib/libnetfilter_queue.so -usr/lib/libnetfilter_queue.so.1 -usr/lib/libnetfilter_queue.so.1.2.0 -#usr/lib/libnfnetlink.a -#usr/lib/libnfnetlink.la -usr/lib/libnfnetlink.so -usr/lib/libnfnetlink.so.0 -usr/lib/libnfnetlink.so.0.2.0 #usr/lib/pkgconfig/libip4tc.pc #usr/lib/pkgconfig/libip6tc.pc #usr/lib/pkgconfig/libipq.pc #usr/lib/pkgconfig/libiptc.pc -#usr/lib/pkgconfig/libnetfilter_conntrack.pc -#usr/lib/pkgconfig/libnetfilter_cttimeout.pc -#usr/lib/pkgconfig/libnetfilter_queue.pc -#usr/lib/pkgconfig/libnfnetlink.pc #usr/lib/pkgconfig/xtables.pc #usr/share/man/man1/iptables-xml.1 #usr/share/man/man3/ipq_create_handle.3 @@ -211,3 +172,5 @@ usr/lib/libnfnetlink.so.0.2.0 #usr/share/man/man8/iptables-restore.8 #usr/share/man/man8/iptables-save.8 #usr/share/man/man8/iptables.8 +#usr/share/xtables +usr/share/xtables/pf.os diff --git a/config/rootfiles/common/libnetfilter_conntrack b/config/rootfiles/common/libnetfilter_conntrack new file mode 100644 index 0000000..6095d0b --- /dev/null +++ b/config/rootfiles/common/libnetfilter_conntrack @@ -0,0 +1,15 @@ +#usr/include/libnetfilter_conntrack +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_dccp.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_icmp.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv4.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv6.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h +#usr/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h +#usr/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h +#usr/lib/libnetfilter_conntrack.la +#usr/lib/libnetfilter_conntrack.so +usr/lib/libnetfilter_conntrack.so.3 +usr/lib/libnetfilter_conntrack.so.3.5.0 +#usr/lib/pkgconfig/libnetfilter_conntrack.pc diff --git a/config/rootfiles/common/libnetfilter_cthelper b/config/rootfiles/common/libnetfilter_cthelper new file mode 100644 index 0000000..4e2e9e5 --- /dev/null +++ b/config/rootfiles/common/libnetfilter_cthelper @@ -0,0 +1,7 @@ +#usr/include/libnetfilter_cthelper +#usr/include/libnetfilter_cthelper/libnetfilter_cthelper.h +#usr/lib/libnetfilter_cthelper.la +#usr/lib/libnetfilter_cthelper.so +usr/lib/libnetfilter_cthelper.so.0 +usr/lib/libnetfilter_cthelper.so.0.0.0 +#usr/lib/pkgconfig/libnetfilter_cthelper.pc diff --git a/config/rootfiles/common/libnetfilter_cttimeout b/config/rootfiles/common/libnetfilter_cttimeout new file mode 100644 index 0000000..f1647d1 --- /dev/null +++ b/config/rootfiles/common/libnetfilter_cttimeout @@ -0,0 +1,7 @@ +#usr/include/libnetfilter_cttimeout +#usr/include/libnetfilter_cttimeout/libnetfilter_cttimeout.h +#usr/lib/libnetfilter_cttimeout.la +#usr/lib/libnetfilter_cttimeout.so +usr/lib/libnetfilter_cttimeout.so.1 +usr/lib/libnetfilter_cttimeout.so.1.0.0 +#usr/lib/pkgconfig/libnetfilter_cttimeout.pc diff --git a/config/rootfiles/common/libnetfilter_queue b/config/rootfiles/common/libnetfilter_queue new file mode 100644 index 0000000..418a5df --- /dev/null +++ b/config/rootfiles/common/libnetfilter_queue @@ -0,0 +1,14 @@ +#usr/include/internal.h +#usr/include/libnetfilter_queue +#usr/include/libnetfilter_queue/libnetfilter_queue.h +#usr/include/libnetfilter_queue/libnetfilter_queue_ipv4.h +#usr/include/libnetfilter_queue/libnetfilter_queue_ipv6.h +#usr/include/libnetfilter_queue/libnetfilter_queue_tcp.h +#usr/include/libnetfilter_queue/libnetfilter_queue_udp.h +#usr/include/libnetfilter_queue/linux_nfnetlink_queue.h +#usr/include/libnetfilter_queue/pktbuff.h +#usr/lib/libnetfilter_queue.la +#usr/lib/libnetfilter_queue.so +usr/lib/libnetfilter_queue.so.1 +usr/lib/libnetfilter_queue.so.1.3.0 +#usr/lib/pkgconfig/libnetfilter_queue.pc diff --git a/config/rootfiles/common/libnfnetlink b/config/rootfiles/common/libnfnetlink new file mode 100644 index 0000000..ad97cb5 --- /dev/null +++ b/config/rootfiles/common/libnfnetlink @@ -0,0 +1,9 @@ +#usr/include/libnfnetlink +#usr/include/libnfnetlink/libnfnetlink.h +#usr/include/libnfnetlink/linux_nfnetlink.h +#usr/include/libnfnetlink/linux_nfnetlink_compat.h +#usr/lib/libnfnetlink.la +#usr/lib/libnfnetlink.so +usr/lib/libnfnetlink.so.0 +usr/lib/libnfnetlink.so.0.2.0 +#usr/lib/pkgconfig/libnfnetlink.pc diff --git a/config/rootfiles/common/python b/config/rootfiles/common/python index 6542f0d..a308ae0 100644 --- a/config/rootfiles/common/python +++ b/config/rootfiles/common/python @@ -181,7 +181,7 @@ usr/lib/python2.7/_pyio.pyc usr/lib/python2.7/_strptime.pyc #usr/lib/python2.7/_strptime.pyo #usr/lib/python2.7/_sysconfigdata.py -#usr/lib/python2.7/_sysconfigdata.pyc +usr/lib/python2.7/_sysconfigdata.pyc #usr/lib/python2.7/_sysconfigdata.pyo #usr/lib/python2.7/_threading_local.py usr/lib/python2.7/_threading_local.pyc diff --git a/config/rootfiles/core/92/filelists/conntrack-tools b/config/rootfiles/core/92/filelists/conntrack-tools new file mode 120000 index 0000000..88fbe06 --- /dev/null +++ b/config/rootfiles/core/92/filelists/conntrack-tools @@ -0,0 +1 @@ +../../../common/conntrack-tools \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/iptables b/config/rootfiles/core/92/filelists/iptables new file mode 120000 index 0000000..8caf12b --- /dev/null +++ b/config/rootfiles/core/92/filelists/iptables @@ -0,0 +1 @@ +../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libnetfilter_conntrack b/config/rootfiles/core/92/filelists/libnetfilter_conntrack new file mode 120000 index 0000000..6ef5cc4 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libnetfilter_conntrack @@ -0,0 +1 @@ +../../../common/libnetfilter_conntrack \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libnetfilter_cthelper b/config/rootfiles/core/92/filelists/libnetfilter_cthelper new file mode 120000 index 0000000..02fac03 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libnetfilter_cthelper @@ -0,0 +1 @@ +../../../common/libnetfilter_cthelper \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libnetfilter_cttimeout b/config/rootfiles/core/92/filelists/libnetfilter_cttimeout new file mode 120000 index 0000000..6b1b980 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libnetfilter_cttimeout @@ -0,0 +1 @@ +../../../common/libnetfilter_cttimeout \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libnetfilter_queue b/config/rootfiles/core/92/filelists/libnetfilter_queue new file mode 120000 index 0000000..9344b04 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libnetfilter_queue @@ -0,0 +1 @@ +../../../common/libnetfilter_queue \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libnfnetlink b/config/rootfiles/core/92/filelists/libnfnetlink new file mode 120000 index 0000000..605e72d --- /dev/null +++ b/config/rootfiles/core/92/filelists/libnfnetlink @@ -0,0 +1 @@ +../../../common/libnfnetlink \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/python b/config/rootfiles/core/92/filelists/python new file mode 120000 index 0000000..ffe6e2c --- /dev/null +++ b/config/rootfiles/core/92/filelists/python @@ -0,0 +1 @@ +../../../common/python \ No newline at end of file diff --git a/config/rootfiles/packages/keepalived b/config/rootfiles/packages/keepalived index 410128b..88cfeed 100644 --- a/config/rootfiles/packages/keepalived +++ b/config/rootfiles/packages/keepalived @@ -26,12 +26,12 @@ etc/keepalived/samples #etc/keepalived/samples/keepalived.conf.vrrp.sync #etc/keepalived/samples/root.pem #etc/keepalived/samples/sample.misccheck.smbcheck.sh -#etc/rc.d/init.d/keepalived -#etc/sysconfig #etc/sysconfig/keepalived usr/bin/genhash usr/sbin/keepalived #usr/share/man/man1/genhash.1 #usr/share/man/man5/keepalived.conf.5 #usr/share/man/man8/keepalived.8 +#usr/share/snmp/mibs/KEEPALIVED-MIB +#usr/share/snmp/mibs/VRRP-MIB var/ipfire/backup/addons/includes/keepalived diff --git a/config/rootfiles/packages/powertop b/config/rootfiles/packages/powertop index d14bcee..b7d2550 100644 --- a/config/rootfiles/packages/powertop +++ b/config/rootfiles/packages/powertop @@ -1,17 +1,22 @@ usr/sbin/powertop -#usr/share/locale/de/LC_MESSAGES/powertop.mo -#usr/share/locale/es/LC_MESSAGES/powertop.mo -#usr/share/locale/fi/LC_MESSAGES/powertop.mo -#usr/share/locale/fr/LC_MESSAGES/powertop.mo -#usr/share/locale/hu/LC_MESSAGES/powertop.mo -#usr/share/locale/id/LC_MESSAGES/powertop.mo -#usr/share/locale/it/LC_MESSAGES/powertop.mo -#usr/share/locale/ja/LC_MESSAGES/powertop.mo -#usr/share/locale/nl/LC_MESSAGES/powertop.mo -#usr/share/locale/pl/LC_MESSAGES/powertop.mo -#usr/share/locale/pt_BR/LC_MESSAGES/powertop.mo -#usr/share/locale/ro/LC_MESSAGES/powertop.mo -#usr/share/locale/ru/LC_MESSAGES/powertop.mo -#usr/share/locale/zh_CN/LC_MESSAGES/powertop.mo +#usr/share/locale/ca/LC_MESSAGES/powertop.mo +#usr/share/locale/cs_CZ/LC_MESSAGES/powertop.mo +#usr/share/locale/de_DE +#usr/share/locale/de_DE/LC_MESSAGES +#usr/share/locale/de_DE/LC_MESSAGES/powertop.mo +#usr/share/locale/en_GB/LC_MESSAGES/powertop.mo +#usr/share/locale/en_US/LC_MESSAGES/powertop.mo +#usr/share/locale/es_ES +#usr/share/locale/es_ES/LC_MESSAGES +#usr/share/locale/es_ES/LC_MESSAGES/powertop.mo +#usr/share/locale/hu_HU +#usr/share/locale/hu_HU/LC_MESSAGES +#usr/share/locale/hu_HU/LC_MESSAGES/powertop.mo +#usr/share/locale/id_ID +#usr/share/locale/id_ID/LC_MESSAGES +#usr/share/locale/id_ID/LC_MESSAGES/powertop.mo +#usr/share/locale/nl_NL +#usr/share/locale/nl_NL/LC_MESSAGES +#usr/share/locale/nl_NL/LC_MESSAGES/powertop.mo #usr/share/locale/zh_TW/LC_MESSAGES/powertop.mo -#usr/share/man/man8/powertop.8.gz +#usr/share/man/man8/powertop.8 diff --git a/lfs/conntrack-tools b/lfs/conntrack-tools index f5ea315..d9a60bc 100644 --- a/lfs/conntrack-tools +++ b/lfs/conntrack-tools @@ -24,7 +24,7 @@

include Config

-VER = 1.2.2 +VER = 1.4.2

THISAPP = conntrack-tools-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = a8afc813e16265655f83991fc0df35b6 +$(DL_FILE)_MD5 = b1f9d006e7bf000a77395ff7cd3fac16

install : $(TARGET)

diff --git a/lfs/iptables b/lfs/iptables index ec65ae0..b7ce928 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -35,26 +35,14 @@ TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### # Top-level Rules ############################################################################### -objects = $(DL_FILE) \ - netfilter-layer7-v2.22.tar.gz \ - libnfnetlink-1.0.0.tar.bz2 \ - libnetfilter_queue-1.0.1.tar.bz2 \ - libnetfilter_conntrack-1.0.2.tar.bz2 \ - libnetfilter_cttimeout-1.0.0.tar.bz2 +objects = $(DL_FILE) \ + netfilter-layer7-v2.22.tar.gz

$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz -libnfnetlink-1.0.0.tar.bz2 = $(URL_IPFIRE)/libnfnetlink-1.0.0.tar.bz2 -libnetfilter_queue-1.0.1.tar.bz2 = $(URL_IPFIRE)/libnetfilter_queue-1.0.1.tar.bz2 -libnetfilter_conntrack-1.0.2.tar.bz2 = $(URL_IPFIRE)/libnetfilter_conntrack-1.0.2.tar.bz2 -libnetfilter_cttimeout-1.0.0.tar.bz2 = $(URL_IPFIRE)/libnetfilter_cttimeout-1.0.0.tar.bz2 +netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz

$(DL_FILE)_MD5 = 536d048c8e8eeebcd9757d0863ebb0c0 netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f -libnfnetlink-1.0.0.tar.bz2_MD5 = 016fdec8389242615024c529acc1adb8 -libnetfilter_queue-1.0.1.tar.bz2_MD5 = 08b968cb2d36c24deb7f26a69f5d8602 -libnetfilter_conntrack-1.0.2.tar.bz2_MD5 = 447114b5d61bb9a9617ead3217c3d3ff -libnetfilter_cttimeout-1.0.0.tar.bz2_MD5 = 7697437fc9ebb6f6b83df56a633db7f9

install : $(TARGET)

@@ -83,10 +71,8 @@ $(subst %,%_MD5,$(objects)) :

$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-* $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-* - + @rm -rf $(DIR_APP) $(DIR_SRC)/netfilter-layer7* @cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) -# cp -rf /usr/src/linux/include/linux/netfilter /usr/include/linux

# Layer7 cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.22.tar.gz @@ -96,44 +82,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # imq cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.12-IMQ-test4.diff

- cd $(DIR_APP) && ./configure --prefix=/usr --with-ksource=/usr/src/linux \ - --libdir=/lib --includedir=/usr/include --enable-libipq \ - --libexecdir=/lib --bindir=/sbin \ - --sbindir=/sbin --mandir=/usr/share/man \ - --with-pkgconfigdir=/usr/lib/pkgconfig + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --with-ksource=/usr/src/linux \ + --libdir=/lib \ + --includedir=/usr/include \ + --enable-libipq \ + --libexecdir=/lib \ + --bindir=/sbin \ + --sbindir=/sbin \ + --mandir=/usr/share/man \ + --with-pkgconfigdir=/usr/lib/pkgconfig + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install

- # Iptables doesn't install all headers -# mkdir -p /usr/include/net/netfilter -# cp -f $(DIR_APP)/include/net/netfilter/*.h /usr/include/net/netfilter/ -# mkdir -p /usr/include/iptables -# cp -f $(DIR_APP)/include/iptables/*.h /usr/include/iptables/ -# cp -f $(DIR_APP)/include/iptables.h /usr/include/ -# mkdir -p /usr/include/libipulog -# cp -f $(DIR_APP)/include/libipulog/*.h /usr/include/libipulog/ -# mkdir -p /usr/include/libiptc -# cp -f $(DIR_APP)/include/libiptc/*.h /usr/include/libiptc/ - - cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-1.0.0.tar.bz2 - cd $(DIR_SRC)/libnfnetlink-1.0.0 && ./configure --prefix=/usr - cd $(DIR_SRC)/libnfnetlink-1.0.0 && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_SRC)/libnfnetlink-1.0.0 && make install - - cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_queue-1.0.1.tar.bz2 - cd $(DIR_SRC)/libnetfilter_queue-1.0.1 && ./configure --prefix=/usr - cd $(DIR_SRC)/libnetfilter_queue-1.0.1 && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_SRC)/libnetfilter_queue-1.0.1 && make install - - cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_conntrack-1.0.2.tar.bz2 - cd $(DIR_SRC)/libnetfilter_conntrack-1.0.2 && ./configure --prefix=/usr - cd $(DIR_SRC)/libnetfilter_conntrack-1.0.2 && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_SRC)/libnetfilter_conntrack-1.0.2 && make install - - cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_cttimeout-1.0.0.tar.bz2 - cd $(DIR_SRC)/libnetfilter_cttimeout-1.0.0 && ./configure --prefix=/usr - cd $(DIR_SRC)/libnetfilter_cttimeout-1.0.0 && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_SRC)/libnetfilter_cttimeout-1.0.0 && make install - - @rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-* $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-* + @rm -rf $(DIR_APP) $(DIR_SRC)/netfilter-layer7* @$(POSTBUILD) diff --git a/lfs/keepalived b/lfs/keepalived index 28b7ed8..2054a54 100644 --- a/lfs/keepalived +++ b/lfs/keepalived @@ -24,7 +24,7 @@

include Config

-VER = 1.2.7 +VER = 1.2.17

THISAPP = keepalived-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = keepalived -PAK_VER = 1 +PAK_VER = 2

DEPS = ""

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 8551a34ee048895dbe5350a031ff29c1 +$(DL_FILE)_MD5 = 8d6400e1be43fc303175164d69125dce

install : $(TARGET)

diff --git a/lfs/libnetfilter_conntrack b/lfs/libnetfilter_conntrack new file mode 100644 index 0000000..3a0dc1f --- /dev/null +++ b/lfs/libnetfilter_conntrack @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.4 + +THISAPP = libnetfilter_conntrack-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 18cf80c4b339a3285e78822dbd4f08d7 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libnetfilter_cthelper b/lfs/libnetfilter_cthelper new file mode 100644 index 0000000..3b469e6 --- /dev/null +++ b/lfs/libnetfilter_cthelper @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.0 + +THISAPP = libnetfilter_cthelper-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = b2efab1a3a198a5add448960ba011acd + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libnetfilter_cttimeout b/lfs/libnetfilter_cttimeout new file mode 100644 index 0000000..a2184b2 --- /dev/null +++ b/lfs/libnetfilter_cttimeout @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.0 + +THISAPP = libnetfilter_cttimeout-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 7697437fc9ebb6f6b83df56a633db7f9 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libnetfilter_queue b/lfs/libnetfilter_queue new file mode 100644 index 0000000..19fe6a2 --- /dev/null +++ b/lfs/libnetfilter_queue @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.2 + +THISAPP = libnetfilter_queue-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = df09befac35cb215865b39a36c96a3fa + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libnfnetlink b/lfs/libnfnetlink new file mode 100644 index 0000000..62350ea --- /dev/null +++ b/lfs/libnfnetlink @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.1 + +THISAPP = libnfnetlink-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 98927583d2016a9fb1936fed992e2c5e + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index d3c23c6..9487883 100755 --- a/make.sh +++ b/make.sh @@ -405,6 +405,11 @@ buildipfire() { ipfiremake freetype ipfiremake grub ipfiremake libmnl + ipfiremake libnfnetlink + ipfiremake libnetfilter_queue + ipfiremake libnetfilter_conntrack + ipfiremake libnetfilter_cthelper + ipfiremake libnetfilter_cttimeout ipfiremake iptables

case "${TARGET_ARCH}" in

hooks/post-receive -- IPFire 2.x development tree