IPFire-SCM June 2015

ipfire-scm@lists.ipfire.org

1 participants
51 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a26a1e16983dbcfc3dd73ab2cddd1fce69223134
by git＠ipfire.org 11 Jun '15

11 Jun '15

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 a26a1e16983dbcfc3dd73ab2cddd1fce69223134 (commit) via e36af11945c8217a2bc957e42aa87c6578ab573e (commit) from 36215f793fd455c1721844ee95a535b19636d1d5 (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 a26a1e16983dbcfc3dd73ab2cddd1fce69223134 Merge: e36af11 36215f7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 11 14:30:44 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit e36af11945c8217a2bc957e42aa87c6578ab573e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 10 21:12:04 2015 +0200 paks: Remove unintentional tab Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: Difference in files: hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 36215f793fd455c1721844ee95a535b19636d1d5
by git＠ipfire.org 11 Jun '15

11 Jun '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b65251c87d28e09f0c299fc1ca0e9c6ce8ccc43f
by git＠ipfire.org 10 Jun '15

10 Jun '15

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 b65251c87d28e09f0c299fc1ca0e9c6ce8ccc43f (commit) via 8bd45f85efc8a282c5d1d1f6b3c47609eb265ba7 (commit) from 3d9b9dd30e86b03dce4e31103099a6a0bdc97a98 (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 b65251c87d28e09f0c299fc1ca0e9c6ce8ccc43f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jun 10 18:45:29 2015 +0200 postfix: add backup/restore at package update. commit 8bd45f85efc8a282c5d1d1f6b3c47609eb265ba7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jun 10 18:38:41 2015 +0200 cyrus-imapd: fix typo at backup include extraction. ----------------------------------------------------------------------- Summary of changes: src/paks/cyrus-imapd/uninstall.sh | 2 +- src/paks/default/uninstall.sh | 2 +- src/paks/postfix/install.sh | 4 +++- src/paks/postfix/uninstall.sh | 3 +++ 4 files changed, 8 insertions(+), 3 deletions(-) Difference in files: diff --git a/src/paks/cyrus-imapd/uninstall.sh b/src/paks/cyrus-imapd/uninstall.sh index 6e1468e..e34fa56 100644 --- a/src/paks/cyrus-imapd/uninstall.sh +++ b/src/paks/cyrus-imapd/uninstall.sh @@ -22,7 +22,7 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh -extract_backup_include +extract_backup_includes stop_service ${NAME} make_backup ${NAME} remove_files diff --git a/src/paks/default/uninstall.sh b/src/paks/default/uninstall.sh index a7b8a53..88f5faf 100644 --- a/src/paks/default/uninstall.sh +++ b/src/paks/default/uninstall.sh @@ -1,4 +1,4 @@ -#!/bin/bash + #!/bin/bash ############################################################################ # # # This file is part of the IPFire Firewall. # diff --git a/src/paks/postfix/install.sh b/src/paks/postfix/install.sh index 56c23e2..0932d2e 100644 --- a/src/paks/postfix/install.sh +++ b/src/paks/postfix/install.sh @@ -23,10 +23,12 @@ # . /opt/pakfire/lib/functions.sh extract_files +restore_backup ${NAME} postalias /etc/aliases # Set postfix's hostname postconf -e "myhostname=$(hostname -f)" -/etc/init.d/postfix start + +start_service ${NAME} # Enable autostart for postfix ln -sf ../init.d/postfix /etc/rc.d/rc0.d/K25postfix diff --git a/src/paks/postfix/uninstall.sh b/src/paks/postfix/uninstall.sh index 39f1ef9..bc70451 100644 --- a/src/paks/postfix/uninstall.sh +++ b/src/paks/postfix/uninstall.sh @@ -22,5 +22,8 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes +stop_service ${NAME} +make_backup ${NAME} remove_files rm -rfv /etc/rc.d/rc*.d/*postfix hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3d9b9dd30e86b03dce4e31103099a6a0bdc97a98
by git＠ipfire.org 10 Jun '15

10 Jun '15

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 3d9b9dd30e86b03dce4e31103099a6a0bdc97a98 (commit) from a1c3b6c87fa3a30e12904b9392ba43e64c9be73c (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 3d9b9dd30e86b03dce4e31103099a6a0bdc97a98 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jun 10 12:21:03 2015 +0200 Revert "Python: Update to 2.7.9" This reverts commit 765423cebe798bb4c8db75755979ce943f484792. build fails. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/python | 234 +----------------------------- config/rootfiles/core/91/filelists/python | 1 - lfs/python | 6 +- lfs/python-optional-src | 2 +- src/patches/Python-2.7.9-gdbm-1.patch | 21 --- 5 files changed, 8 insertions(+), 256 deletions(-) delete mode 120000 config/rootfiles/core/91/filelists/python delete mode 100644 src/patches/Python-2.7.9-gdbm-1.patch Difference in files: diff --git a/config/rootfiles/common/python b/config/rootfiles/common/python index 4f11c56..3472e25 100644 --- a/config/rootfiles/common/python +++ b/config/rootfiles/common/python @@ -171,18 +171,12 @@ usr/lib/python2.7/__phello__.foo.pyc #usr/lib/python2.7/_abcoll.py usr/lib/python2.7/_abcoll.pyc #usr/lib/python2.7/_abcoll.pyo -#usr/lib/python2.7/_osx_support.py -#usr/lib/python2.7/_osx_support.pyc -#usr/lib/python2.7/_osx_support.pyo #usr/lib/python2.7/_pyio.py usr/lib/python2.7/_pyio.pyc #usr/lib/python2.7/_pyio.pyo #usr/lib/python2.7/_strptime.py 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.pyo #usr/lib/python2.7/_threading_local.py usr/lib/python2.7/_threading_local.pyc #usr/lib/python2.7/_threading_local.pyo @@ -611,9 +605,6 @@ usr/lib/python2.7/ctypes/macholib/framework.pyc #usr/lib/python2.7/ctypes/test/test_win32.py #usr/lib/python2.7/ctypes/test/test_win32.pyc #usr/lib/python2.7/ctypes/test/test_win32.pyo -#usr/lib/python2.7/ctypes/test/test_wintypes.py -#usr/lib/python2.7/ctypes/test/test_wintypes.pyc -#usr/lib/python2.7/ctypes/test/test_wintypes.pyo #usr/lib/python2.7/ctypes/util.py usr/lib/python2.7/ctypes/util.pyc #usr/lib/python2.7/ctypes/util.pyo @@ -1461,19 +1452,6 @@ usr/lib/python2.7/encodings/uu_codec.pyc #usr/lib/python2.7/encodings/zlib_codec.py usr/lib/python2.7/encodings/zlib_codec.pyc #usr/lib/python2.7/encodings/zlib_codec.pyo -#usr/lib/python2.7/ensurepip -#usr/lib/python2.7/ensurepip/__init__.py -#usr/lib/python2.7/ensurepip/__init__.pyc -#usr/lib/python2.7/ensurepip/__init__.pyo -#usr/lib/python2.7/ensurepip/__main__.py -#usr/lib/python2.7/ensurepip/__main__.pyc -#usr/lib/python2.7/ensurepip/__main__.pyo -#usr/lib/python2.7/ensurepip/_bundled -#usr/lib/python2.7/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl -#usr/lib/python2.7/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl -#usr/lib/python2.7/ensurepip/_uninstall.py -#usr/lib/python2.7/ensurepip/_uninstall.pyc -#usr/lib/python2.7/ensurepip/_uninstall.pyo #usr/lib/python2.7/filecmp.py usr/lib/python2.7/filecmp.pyc #usr/lib/python2.7/filecmp.pyo @@ -1605,13 +1583,6 @@ usr/lib/python2.7/httplib.pyc #usr/lib/python2.7/idlelib/Icons #usr/lib/python2.7/idlelib/Icons/folder.gif #usr/lib/python2.7/idlelib/Icons/idle.icns -#usr/lib/python2.7/idlelib/Icons/idle.ico -#usr/lib/python2.7/idlelib/Icons/idle_16.gif -#usr/lib/python2.7/idlelib/Icons/idle_16.png -#usr/lib/python2.7/idlelib/Icons/idle_32.gif -#usr/lib/python2.7/idlelib/Icons/idle_32.png -#usr/lib/python2.7/idlelib/Icons/idle_48.gif -#usr/lib/python2.7/idlelib/Icons/idle_48.png #usr/lib/python2.7/idlelib/Icons/minusnode.gif #usr/lib/python2.7/idlelib/Icons/openfolder.gif #usr/lib/python2.7/idlelib/Icons/plusnode.gif @@ -1730,77 +1701,6 @@ usr/lib/python2.7/httplib.pyc #usr/lib/python2.7/idlelib/idle.pyc #usr/lib/python2.7/idlelib/idle.pyo #usr/lib/python2.7/idlelib/idle.pyw -#usr/lib/python2.7/idlelib/idle_test -#usr/lib/python2.7/idlelib/idle_test/README.txt -#usr/lib/python2.7/idlelib/idle_test/__init__.py -#usr/lib/python2.7/idlelib/idle_test/__init__.pyc -#usr/lib/python2.7/idlelib/idle_test/__init__.pyo -#usr/lib/python2.7/idlelib/idle_test/htest.py -#usr/lib/python2.7/idlelib/idle_test/htest.pyc -#usr/lib/python2.7/idlelib/idle_test/htest.pyo -#usr/lib/python2.7/idlelib/idle_test/mock_idle.py -#usr/lib/python2.7/idlelib/idle_test/mock_idle.pyc -#usr/lib/python2.7/idlelib/idle_test/mock_idle.pyo -#usr/lib/python2.7/idlelib/idle_test/mock_tk.py -#usr/lib/python2.7/idlelib/idle_test/mock_tk.pyc -#usr/lib/python2.7/idlelib/idle_test/mock_tk.pyo -#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.py -#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.pyc -#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.pyo -#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.py -#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.pyc -#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.pyo -#usr/lib/python2.7/idlelib/idle_test/test_calltips.py -#usr/lib/python2.7/idlelib/idle_test/test_calltips.pyc -#usr/lib/python2.7/idlelib/idle_test/test_calltips.pyo -#usr/lib/python2.7/idlelib/idle_test/test_config_name.py -#usr/lib/python2.7/idlelib/idle_test/test_config_name.pyc -#usr/lib/python2.7/idlelib/idle_test/test_config_name.pyo -#usr/lib/python2.7/idlelib/idle_test/test_configdialog.py -#usr/lib/python2.7/idlelib/idle_test/test_configdialog.pyc -#usr/lib/python2.7/idlelib/idle_test/test_configdialog.pyo -#usr/lib/python2.7/idlelib/idle_test/test_delegator.py -#usr/lib/python2.7/idlelib/idle_test/test_delegator.pyc -#usr/lib/python2.7/idlelib/idle_test/test_delegator.pyo -#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.py -#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyc -#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyo -#usr/lib/python2.7/idlelib/idle_test/test_grep.py -#usr/lib/python2.7/idlelib/idle_test/test_grep.pyc -#usr/lib/python2.7/idlelib/idle_test/test_grep.pyo -#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.py -#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyc -#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyo -#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.py -#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.pyc -#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.pyo -#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.py -#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.pyc -#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.pyo -#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.py -#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.pyc -#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.pyo -#usr/lib/python2.7/idlelib/idle_test/test_rstrip.py -#usr/lib/python2.7/idlelib/idle_test/test_rstrip.pyc -#usr/lib/python2.7/idlelib/idle_test/test_rstrip.pyo -#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.py -#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.pyc -#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.pyo -#usr/lib/python2.7/idlelib/idle_test/test_searchengine.py -#usr/lib/python2.7/idlelib/idle_test/test_searchengine.pyc -#usr/lib/python2.7/idlelib/idle_test/test_searchengine.pyo -#usr/lib/python2.7/idlelib/idle_test/test_text.py -#usr/lib/python2.7/idlelib/idle_test/test_text.pyc -#usr/lib/python2.7/idlelib/idle_test/test_text.pyo -#usr/lib/python2.7/idlelib/idle_test/test_textview.py -#usr/lib/python2.7/idlelib/idle_test/test_textview.pyc -#usr/lib/python2.7/idlelib/idle_test/test_textview.pyo -#usr/lib/python2.7/idlelib/idle_test/test_warning.py -#usr/lib/python2.7/idlelib/idle_test/test_warning.pyc -#usr/lib/python2.7/idlelib/idle_test/test_warning.pyo -#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.py -#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.pyc -#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.pyo #usr/lib/python2.7/idlelib/idlever.py #usr/lib/python2.7/idlelib/idlever.pyc #usr/lib/python2.7/idlelib/idlever.pyo @@ -1909,9 +1809,6 @@ usr/lib/python2.7/json/scanner.pyc #usr/lib/python2.7/json/tests/test_speedups.py #usr/lib/python2.7/json/tests/test_speedups.pyc #usr/lib/python2.7/json/tests/test_speedups.pyo -#usr/lib/python2.7/json/tests/test_tool.py -#usr/lib/python2.7/json/tests/test_tool.pyc -#usr/lib/python2.7/json/tests/test_tool.pyo #usr/lib/python2.7/json/tests/test_unicode.py #usr/lib/python2.7/json/tests/test_unicode.pyc #usr/lib/python2.7/json/tests/test_unicode.pyo @@ -1922,7 +1819,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -usr/lib/python2.7/lib-dynload/Python-2.7.9-py2.7.egg-info +usr/lib/python2.7/lib-dynload/Python-2.7.3-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -1963,7 +1860,7 @@ usr/lib/python2.7/lib-dynload/cStringIO.so usr/lib/python2.7/lib-dynload/cmath.so usr/lib/python2.7/lib-dynload/crypt.so usr/lib/python2.7/lib-dynload/datetime.so -#usr/lib/python2.7/lib-dynload/dbm_failed.so +usr/lib/python2.7/lib-dynload/dbm.so usr/lib/python2.7/lib-dynload/dl.so usr/lib/python2.7/lib-dynload/fcntl.so usr/lib/python2.7/lib-dynload/future_builtins.so @@ -2029,27 +1926,12 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.py #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.pyo -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.py -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.pyc -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.pyo -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.py -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyc -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyo -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.py -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.pyc -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.pyo #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.py #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyo #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.py #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyo -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.py -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.pyc -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.pyo -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.py -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.pyc -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.pyo #usr/lib/python2.7/lib-tk/test/test_ttk #usr/lib/python2.7/lib-tk/test/test_ttk/__init__.py #usr/lib/python2.7/lib-tk/test/test_ttk/__init__.pyc @@ -2069,9 +1951,6 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.py #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.pyc #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.pyo -#usr/lib/python2.7/lib-tk/test/widget_tests.py -#usr/lib/python2.7/lib-tk/test/widget_tests.pyc -#usr/lib/python2.7/lib-tk/test/widget_tests.pyo #usr/lib/python2.7/lib-tk/tkColorChooser.py #usr/lib/python2.7/lib-tk/tkColorChooser.pyc #usr/lib/python2.7/lib-tk/tkColorChooser.pyo @@ -2098,9 +1977,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.9.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.3.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.9.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.3.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo @@ -2126,9 +2005,6 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib2to3/fixes/fix_apply.py #usr/lib/python2.7/lib2to3/fixes/fix_apply.pyc #usr/lib/python2.7/lib2to3/fixes/fix_apply.pyo -#usr/lib/python2.7/lib2to3/fixes/fix_asserts.py -#usr/lib/python2.7/lib2to3/fixes/fix_asserts.pyc -#usr/lib/python2.7/lib2to3/fixes/fix_asserts.pyo #usr/lib/python2.7/lib2to3/fixes/fix_basestring.py #usr/lib/python2.7/lib2to3/fixes/fix_basestring.pyc #usr/lib/python2.7/lib2to3/fixes/fix_basestring.pyo @@ -2331,7 +2207,6 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib2to3/tests/data/bom.py #usr/lib/python2.7/lib2to3/tests/data/crlf.py #usr/lib/python2.7/lib2to3/tests/data/different_encoding.py -#usr/lib/python2.7/lib2to3/tests/data/false_encoding.py #usr/lib/python2.7/lib2to3/tests/data/fixers #usr/lib/python2.7/lib2to3/tests/data/fixers/bad_order.py #usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes @@ -2753,33 +2628,12 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/__init__.py #usr/lib/python2.7/test/__init__.pyc #usr/lib/python2.7/test/__init__.pyo -#usr/lib/python2.7/test/_mock_backport.py -#usr/lib/python2.7/test/_mock_backport.pyc -#usr/lib/python2.7/test/_mock_backport.pyo -#usr/lib/python2.7/test/audiodata -#usr/lib/python2.7/test/audiodata/pluck-pcm16.aiff -#usr/lib/python2.7/test/audiodata/pluck-pcm16.au -#usr/lib/python2.7/test/audiodata/pluck-pcm16.wav -#usr/lib/python2.7/test/audiodata/pluck-pcm24.aiff -#usr/lib/python2.7/test/audiodata/pluck-pcm24.wav -#usr/lib/python2.7/test/audiodata/pluck-pcm32.aiff -#usr/lib/python2.7/test/audiodata/pluck-pcm32.au -#usr/lib/python2.7/test/audiodata/pluck-pcm32.wav -#usr/lib/python2.7/test/audiodata/pluck-pcm8.aiff -#usr/lib/python2.7/test/audiodata/pluck-pcm8.au -#usr/lib/python2.7/test/audiodata/pluck-pcm8.wav -#usr/lib/python2.7/test/audiodata/pluck-ulaw.aifc -#usr/lib/python2.7/test/audiodata/pluck-ulaw.au #usr/lib/python2.7/test/audiotest.au -#usr/lib/python2.7/test/audiotests.py -#usr/lib/python2.7/test/audiotests.pyc -#usr/lib/python2.7/test/audiotests.pyo #usr/lib/python2.7/test/autotest.py #usr/lib/python2.7/test/autotest.pyc #usr/lib/python2.7/test/autotest.pyo #usr/lib/python2.7/test/bad_coding.py #usr/lib/python2.7/test/bad_coding2.py -#usr/lib/python2.7/test/bad_coding3.py #usr/lib/python2.7/test/badcert.pem #usr/lib/python2.7/test/badkey.pem #usr/lib/python2.7/test/badsyntax_future3.py @@ -2793,11 +2647,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/buffer_tests.py #usr/lib/python2.7/test/buffer_tests.pyc #usr/lib/python2.7/test/buffer_tests.pyo -#usr/lib/python2.7/test/capath -#usr/lib/python2.7/test/capath/4e1295a3.0 -#usr/lib/python2.7/test/capath/5ed36f99.0 -#usr/lib/python2.7/test/capath/6e88d7b8.0 -#usr/lib/python2.7/test/capath/99d0fa06.0 #usr/lib/python2.7/test/cfgparser.1 #usr/lib/python2.7/test/check_soundcard.vbs #usr/lib/python2.7/test/cjkencodings @@ -2981,7 +2830,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/decimaltestdata/tointegral.decTest #usr/lib/python2.7/test/decimaltestdata/tointegralx.decTest #usr/lib/python2.7/test/decimaltestdata/xor.decTest -#usr/lib/python2.7/test/dh512.pem #usr/lib/python2.7/test/doctest_aliases.py #usr/lib/python2.7/test/doctest_aliases.pyc #usr/lib/python2.7/test/doctest_aliases.pyo @@ -3001,18 +2849,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/greyrgb.uue #usr/lib/python2.7/test/https_svn_python_org_root.pem #usr/lib/python2.7/test/ieee754.txt -#usr/lib/python2.7/test/imghdrdata -#usr/lib/python2.7/test/imghdrdata/python.bmp -#usr/lib/python2.7/test/imghdrdata/python.gif -#usr/lib/python2.7/test/imghdrdata/python.jpg -#usr/lib/python2.7/test/imghdrdata/python.pbm -#usr/lib/python2.7/test/imghdrdata/python.pgm -#usr/lib/python2.7/test/imghdrdata/python.png -#usr/lib/python2.7/test/imghdrdata/python.ppm -#usr/lib/python2.7/test/imghdrdata/python.ras -#usr/lib/python2.7/test/imghdrdata/python.sgi -#usr/lib/python2.7/test/imghdrdata/python.tiff -#usr/lib/python2.7/test/imghdrdata/python.xbm #usr/lib/python2.7/test/infinite_reload.py #usr/lib/python2.7/test/infinite_reload.pyc #usr/lib/python2.7/test/infinite_reload.pyo @@ -3022,29 +2858,18 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/inspect_fodder2.py #usr/lib/python2.7/test/inspect_fodder2.pyc #usr/lib/python2.7/test/inspect_fodder2.pyo -#usr/lib/python2.7/test/keycert.passwd.pem #usr/lib/python2.7/test/keycert.pem -#usr/lib/python2.7/test/keycert2.pem -#usr/lib/python2.7/test/keycert3.pem -#usr/lib/python2.7/test/keycert4.pem #usr/lib/python2.7/test/list_tests.py #usr/lib/python2.7/test/list_tests.pyc #usr/lib/python2.7/test/list_tests.pyo #usr/lib/python2.7/test/lock_tests.py #usr/lib/python2.7/test/lock_tests.pyc #usr/lib/python2.7/test/lock_tests.pyo -#usr/lib/python2.7/test/make_ssl_certs.py -#usr/lib/python2.7/test/make_ssl_certs.pyc -#usr/lib/python2.7/test/make_ssl_certs.pyo #usr/lib/python2.7/test/mapping_tests.py #usr/lib/python2.7/test/mapping_tests.pyc #usr/lib/python2.7/test/mapping_tests.pyo #usr/lib/python2.7/test/math_testcases.txt -#usr/lib/python2.7/test/mp_fork_bomb.py -#usr/lib/python2.7/test/mp_fork_bomb.pyc -#usr/lib/python2.7/test/mp_fork_bomb.pyo #usr/lib/python2.7/test/nokia.pem -#usr/lib/python2.7/test/nullbytecert.pem #usr/lib/python2.7/test/nullcert.pem #usr/lib/python2.7/test/outstanding_bugs.py #usr/lib/python2.7/test/outstanding_bugs.pyc @@ -3055,7 +2880,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/profilee.py #usr/lib/python2.7/test/profilee.pyc #usr/lib/python2.7/test/profilee.pyo -#usr/lib/python2.7/test/pycacert.pem #usr/lib/python2.7/test/pyclbr_input.py #usr/lib/python2.7/test/pyclbr_input.pyc #usr/lib/python2.7/test/pyclbr_input.pyo @@ -3083,20 +2907,12 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/reperf.py #usr/lib/python2.7/test/reperf.pyc #usr/lib/python2.7/test/reperf.pyo -#usr/lib/python2.7/test/revocation.crl #usr/lib/python2.7/test/sample_doctest.py #usr/lib/python2.7/test/sample_doctest.pyc #usr/lib/python2.7/test/sample_doctest.pyo -#usr/lib/python2.7/test/sample_doctest_no_docstrings.py -#usr/lib/python2.7/test/sample_doctest_no_docstrings.pyc -#usr/lib/python2.7/test/sample_doctest_no_docstrings.pyo -#usr/lib/python2.7/test/sample_doctest_no_doctests.py -#usr/lib/python2.7/test/sample_doctest_no_doctests.pyc -#usr/lib/python2.7/test/sample_doctest_no_doctests.pyo #usr/lib/python2.7/test/script_helper.py #usr/lib/python2.7/test/script_helper.pyc #usr/lib/python2.7/test/script_helper.pyo -#usr/lib/python2.7/test/selfsigned_pythontestdotnet.pem #usr/lib/python2.7/test/seq_tests.py #usr/lib/python2.7/test/seq_tests.pyc #usr/lib/python2.7/test/seq_tests.pyo @@ -3106,11 +2922,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/sortperf.pyc #usr/lib/python2.7/test/sortperf.pyo #usr/lib/python2.7/test/ssl_cert.pem -#usr/lib/python2.7/test/ssl_key.passwd.pem #usr/lib/python2.7/test/ssl_key.pem -#usr/lib/python2.7/test/ssl_servers.py -#usr/lib/python2.7/test/ssl_servers.pyc -#usr/lib/python2.7/test/ssl_servers.pyo #usr/lib/python2.7/test/string_tests.py #usr/lib/python2.7/test/string_tests.pyc #usr/lib/python2.7/test/string_tests.pyo @@ -3118,9 +2930,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyc #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyo -#usr/lib/python2.7/test/symlink_support.py -#usr/lib/python2.7/test/symlink_support.pyc -#usr/lib/python2.7/test/symlink_support.pyo #usr/lib/python2.7/test/test_MimeWriter.py #usr/lib/python2.7/test/test_MimeWriter.pyc #usr/lib/python2.7/test/test_MimeWriter.pyo @@ -3139,9 +2948,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test__locale.py #usr/lib/python2.7/test/test__locale.pyc #usr/lib/python2.7/test/test__locale.pyo -#usr/lib/python2.7/test/test__osx_support.py -#usr/lib/python2.7/test/test__osx_support.pyc -#usr/lib/python2.7/test/test__osx_support.pyo #usr/lib/python2.7/test/test_abc.py #usr/lib/python2.7/test/test_abc.pyc #usr/lib/python2.7/test/test_abc.pyo @@ -3474,9 +3280,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_email_renamed.py #usr/lib/python2.7/test/test_email_renamed.pyc #usr/lib/python2.7/test/test_email_renamed.pyo -#usr/lib/python2.7/test/test_ensurepip.py -#usr/lib/python2.7/test/test_ensurepip.pyc -#usr/lib/python2.7/test/test_ensurepip.pyo #usr/lib/python2.7/test/test_enumerate.py #usr/lib/python2.7/test/test_enumerate.pyc #usr/lib/python2.7/test/test_enumerate.pyo @@ -3507,9 +3310,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_file2k.py #usr/lib/python2.7/test/test_file2k.pyc #usr/lib/python2.7/test/test_file2k.pyo -#usr/lib/python2.7/test/test_file_eintr.py -#usr/lib/python2.7/test/test_file_eintr.pyc -#usr/lib/python2.7/test/test_file_eintr.pyo #usr/lib/python2.7/test/test_filecmp.py #usr/lib/python2.7/test/test_filecmp.pyc #usr/lib/python2.7/test/test_filecmp.pyo @@ -3645,9 +3445,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_httpservers.py #usr/lib/python2.7/test/test_httpservers.pyc #usr/lib/python2.7/test/test_httpservers.pyo -#usr/lib/python2.7/test/test_idle.py -#usr/lib/python2.7/test/test_idle.pyc -#usr/lib/python2.7/test/test_idle.pyo #usr/lib/python2.7/test/test_imageop.py #usr/lib/python2.7/test/test_imageop.pyc #usr/lib/python2.7/test/test_imageop.pyo @@ -3657,9 +3454,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_imgfile.py #usr/lib/python2.7/test/test_imgfile.pyc #usr/lib/python2.7/test/test_imgfile.pyo -#usr/lib/python2.7/test/test_imghdr.py -#usr/lib/python2.7/test/test_imghdr.pyc -#usr/lib/python2.7/test/test_imghdr.pyo #usr/lib/python2.7/test/test_imp.py #usr/lib/python2.7/test/test_imp.pyc #usr/lib/python2.7/test/test_imp.pyo @@ -3747,9 +3541,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_macpath.py #usr/lib/python2.7/test/test_macpath.pyc #usr/lib/python2.7/test/test_macpath.pyo -#usr/lib/python2.7/test/test_macurl2path.py -#usr/lib/python2.7/test/test_macurl2path.pyc -#usr/lib/python2.7/test/test_macurl2path.pyo #usr/lib/python2.7/test/test_mailbox.py #usr/lib/python2.7/test/test_mailbox.pyc #usr/lib/python2.7/test/test_mailbox.pyo @@ -3819,9 +3610,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_nis.py #usr/lib/python2.7/test/test_nis.pyc #usr/lib/python2.7/test/test_nis.pyo -#usr/lib/python2.7/test/test_nntplib.py -#usr/lib/python2.7/test/test_nntplib.pyc -#usr/lib/python2.7/test/test_nntplib.pyo #usr/lib/python2.7/test/test_normalization.py #usr/lib/python2.7/test/test_normalization.pyc #usr/lib/python2.7/test/test_normalization.pyo @@ -4053,9 +3841,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_sort.py #usr/lib/python2.7/test/test_sort.pyc #usr/lib/python2.7/test/test_sort.pyo -#usr/lib/python2.7/test/test_spwd.py -#usr/lib/python2.7/test/test_spwd.pyc -#usr/lib/python2.7/test/test_spwd.pyo #usr/lib/python2.7/test/test_sqlite.py #usr/lib/python2.7/test/test_sqlite.pyc #usr/lib/python2.7/test/test_sqlite.pyo @@ -4065,9 +3850,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_startfile.py #usr/lib/python2.7/test/test_startfile.pyc #usr/lib/python2.7/test/test_startfile.pyo -#usr/lib/python2.7/test/test_stat.py -#usr/lib/python2.7/test/test_stat.pyc -#usr/lib/python2.7/test/test_stat.pyo #usr/lib/python2.7/test/test_str.py #usr/lib/python2.7/test/test_str.pyc #usr/lib/python2.7/test/test_str.pyo @@ -4101,9 +3883,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_subprocess.py #usr/lib/python2.7/test/test_subprocess.pyc #usr/lib/python2.7/test/test_subprocess.pyo -#usr/lib/python2.7/test/test_sunau.py -#usr/lib/python2.7/test/test_sunau.pyc -#usr/lib/python2.7/test/test_sunau.pyo #usr/lib/python2.7/test/test_sunaudiodev.py #usr/lib/python2.7/test/test_sunaudiodev.pyc #usr/lib/python2.7/test/test_sunaudiodev.pyo @@ -4176,9 +3955,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_tokenize.py #usr/lib/python2.7/test/test_tokenize.pyc #usr/lib/python2.7/test/test_tokenize.pyo -#usr/lib/python2.7/test/test_tools.py -#usr/lib/python2.7/test/test_tools.pyc -#usr/lib/python2.7/test/test_tools.pyo #usr/lib/python2.7/test/test_trace.py #usr/lib/python2.7/test/test_trace.pyc #usr/lib/python2.7/test/test_trace.pyo @@ -4624,6 +4400,4 @@ usr/lib/python2.7/xmlrpclib.pyc #usr/lib/python2.7/zipfile.py usr/lib/python2.7/zipfile.pyc #usr/lib/python2.7/zipfile.pyo -#usr/share/man/man1/python.1 -#usr/share/man/man1/python2.1 #usr/share/man/man1/python2.7.1 diff --git a/config/rootfiles/core/91/filelists/python b/config/rootfiles/core/91/filelists/python deleted file mode 120000 index ffe6e2c..0000000 --- a/config/rootfiles/core/91/filelists/python +++ /dev/null @@ -1 +0,0 @@ -../../../common/python \ No newline at end of file diff --git a/lfs/python b/lfs/python index acd230c..6095e5e 100644 --- a/lfs/python +++ b/lfs/python @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2011 IPFire Team <info(a)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 # @@ -24,7 +24,7 @@ include Config -VER = 2.7.9 +VER = 2.7.3 THISAPP = Python-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 38d530f7efc373d64a8fb1637e3baaa7 +$(DL_FILE)_MD5 = 62c4c1699170078c469f79ddfed21bc0 install : $(TARGET) diff --git a/lfs/python-optional-src b/lfs/python-optional-src index d09f4a4..3b9f1c5 100644 --- a/lfs/python-optional-src +++ b/lfs/python-optional-src @@ -24,7 +24,7 @@ include Config -VER = 2.7.9 +VER = 2.7.3 include python diff --git a/src/patches/Python-2.7.9-gdbm-1.patch b/src/patches/Python-2.7.9-gdbm-1.patch deleted file mode 100644 index c72b452..0000000 --- a/src/patches/Python-2.7.9-gdbm-1.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur Python-2.7-org/setup.py Python-2.7/setup.py ---- Python-2.7-org/setup.py 2010-06-27 14:36:16.000000000 +0200 -+++ Python-2.7/setup.py 2010-07-13 22:23:04.000000000 +0200 -@@ -1125,7 +1125,7 @@ - 'ndbm'): - ndbm_libs = ['ndbm'] - else: -- ndbm_libs = [] -+ ndbm_libs = ['gdbm', 'gdbm_compat' ] - print "building dbm using ndbm" - dbmext = Extension('dbm', ['dbmmodule.c'], - define_macros=[ -@@ -1140,7 +1140,7 @@ - if self.compiler.find_library_file(lib_dirs, - 'gdbm_compat'): - gdbm_libs.append('gdbm_compat') -- if find_file("gdbm/ndbm.h", inc_dirs, []) is not None: -+ if find_file("ndbm.h", inc_dirs, []) is not None: - print "building dbm using gdbm" - dbmext = Extension( - 'dbm', ['dbmmodule.c'], hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a1c3b6c87fa3a30e12904b9392ba43e64c9be73c
by git＠ipfire.org 09 Jun '15

09 Jun '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. be58233aee9b2098cce171d017c35df7c1a0b978
by git＠ipfire.org 09 Jun '15

09 Jun '15

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. e0b49310826c9e99042b0316b6bc9b17186e5e74
by git＠ipfire.org 08 Jun '15

08 Jun '15

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 3.x development tree". The branch, master has been updated via e0b49310826c9e99042b0316b6bc9b17186e5e74 (commit) via ce284ff341d25a4b280023101d324be4e5294bfb (commit) from 3712f5e1e69264bc6b5327625781888f3f8c6e80 (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 e0b49310826c9e99042b0316b6bc9b17186e5e74 Merge: ce284ff 3712f5e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 8 19:42:38 2015 +0000 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit ce284ff341d25a4b280023101d324be4e5294bfb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 8 13:12:24 2015 +0000 ulogd2: Update to version 2.0.5 This package adds logging of the flows and packets to an sqlite database that can be used to get statistical output. Logging to syslog as known from IPFire 2 has been added as well but is only temporary until there is a way to view the logged packets on the console. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../ulogd2-2.0.5-better-sqlite-debugging.patch | 26 ++++ ulogd2/sqlite3.table | 145 ++++++++++++++++++--- ulogd2/ulogd.conf | 51 +++----- ulogd2/ulogd.logrotate | 7 - ulogd2/ulogd2.nm | 18 ++- 5 files changed, 180 insertions(+), 67 deletions(-) create mode 100644 ulogd2/patches/ulogd2-2.0.5-better-sqlite-debugging.patch delete mode 100644 ulogd2/ulogd.logrotate Difference in files: diff --git a/ulogd2/patches/ulogd2-2.0.5-better-sqlite-debugging.patch b/ulogd2/patches/ulogd2-2.0.5-better-sqlite-debugging.patch new file mode 100644 index 0000000..f9c5f7d --- /dev/null +++ b/ulogd2/patches/ulogd2-2.0.5-better-sqlite-debugging.patch @@ -0,0 +1,26 @@ +diff --git a/output/sqlite3/ulogd_output_SQLITE3.c b/output/sqlite3/ulogd_output_SQLITE3.c +index 5c49055..e3eff6f 100644 +--- a/output/sqlite3/ulogd_output_SQLITE3.c ++++ b/output/sqlite3/ulogd_output_SQLITE3.c +@@ -212,7 +212,8 @@ sqlite3_interp(struct ulogd_pluginstance *pi) + return ULOGD_IRET_OK; + + err_bind: +- ulogd_log(ULOGD_ERROR, "SQLITE: bind: %s\n", sqlite3_errmsg(priv->dbh)); ++ ulogd_log(ULOGD_ERROR, "SQLITE: bind: %s (field: %s)\n", sqlite3_errmsg(priv->dbh), ++ f->key->name); + + return ULOGD_IRET_ERR; + } +@@ -353,8 +354,10 @@ sqlite3_init_db(struct ulogd_pluginstance *pi) + } + strncpy(f->name, buf, ULOGD_MAX_KEYLEN); + +- if ((f->key = ulogd_find_key(pi, buf)) == NULL) ++ if ((f->key = ulogd_find_key(pi, buf)) == NULL) { ++ ulogd_log(ULOGD_ERROR, "SQLITE3: Could not find field %s\n", buf); + return -1; ++ } + + TAILQ_INSERT_TAIL(&priv->fields, f, link); + } diff --git a/ulogd2/sqlite3.table b/ulogd2/sqlite3.table index 200a4c4..c38474d 100644 --- a/ulogd2/sqlite3.table +++ b/ulogd2/sqlite3.table @@ -1,21 +1,126 @@ -CREATE TABLE ulog ( - raw_mac VARCHAR(80), - oob_time_sec INT UNSIGNED, - oob_time_usec INT UNSIGNED, - ip_saddr INT UNSIGNED, - ip_daddr INT UNSIGNED, - ip_protocol TINYINT UNSIGNED, - ip_totlen SMALLINT UNSIGNED, - tcp_sport SMALLINT UNSIGNED, - tcp_dport SMALLINT UNSIGNED, - udp_sport SMALLINT UNSIGNED, - udp_dport SMALLINT UNSIGNED, - udp_len SMALLINT UNSIGNED, - icmp_type TINYINT UNSIGNED, - icmp_code TINYINT UNSIGNED, - icmp_echoid SMALLINT UNSIGNED, - icmp_echoseq SMALLINT UNSIGNED, - icmp_gateway INT UNSIGNED, - icmp_fragmtu SMALLINT UNSIGNED - ); +CREATE TABLE hits ( + oob_time_sec INTEGER NOT NULL, + oob_time_usec INTEGER NOT NULL, + oob_hook INTEGER, + oob_prefix TEXT, + mac_saddr_str TEXT, + mac_daddr_str TEXT, + oob_in TEXT, + oob_out TEXT, + oob_family INTEGER, + oob_protocol INTEGER, + oob_uid INTEGER, + oob_gid INTEGER, + oob_mark INTEGER, + ip_saddr BLOB, + ip_saddr_str TEXT, + ip_daddr BLOB, + ip_daddr_str TEXT, + ip_protocol INTEGER, + ip_tos INTEGER, + ip_ttl INTEGER, + ip_totlen INTEGER, + ip_id INTEGER, + ip_fragoff INTEGER, + ip6_payloadlen INTEGER, + ip6_priority INTEGER, + ip6_hoplimit INTEGER, + ip6_flowlabel INTEGER, + ip6_nexthdr INTEGER, + ip6_fragoff INTEGER, + ip6_fragid INTEGER, + tcp_sport INTEGER, + tcp_dport INTEGER, + tcp_seq INTEGER, + tcp_ackseq INTEGER, + tcp_window INTEGER, + tcp_syn INTEGER, + tcp_ack INTEGER, + tcp_rst INTEGER, + tcp_fin INTEGER, + tcp_urg INTEGER, + tcp_urgp INTEGER, + udp_sport INTEGER, + udp_dport INTEGER, + udp_len INTEGER, + icmp_type INTEGER, + icmp_code INTEGER, + icmp_echoid INTEGER, + icmp_echoseq INTEGER, + icmp_gateway INTEGER, + icmp_fragmtu INTEGER, + icmpv6_type INTEGER, + icmpv6_code INTEGER, + icmpv6_echoid INTEGER, + icmpv6_echoseq INTEGER, + icmpv6_csum INTEGER, + ahesp_spi INTEGER, + arp_hwtype INTEGER, + arp_protocoltype INTEGER, + arp_operation INTEGER, + arp_shwaddr BLOB, + arp_saddr_str TEXT, + arp_dhwaddr BLOB, + arp_daddr_str TEXT, + sctp_sport INTEGER, + sctp_dport INTEGER, + sctp_csum INTEGER +); +CREATE INDEX hits_time ON hits(oob_time_sec); +CREATE INDEX hits_prefix ON hits(oob_prefix); +CREATE INDEX hits_oob_family ON hits(oob_family); + +/* Layer 2 - MAC addresses */ +CREATE INDEX hits_mac_saddr ON hits(mac_saddr_str); +CREATE INDEX hits_mac_daddr ON hits(mac_daddr_str); + +/* Layer 3 - IP */ +CREATE INDEX hits_ip_saddr ON hits(ip_saddr); +CREATE INDEX hits_ip_daddr ON hits(ip_daddr); +CREATE INDEX hits_ip_protocol ON hits(ip_protocol); + +/* Layer 4 protocols */ +CREATE INDEX hits_tcp_sport ON hits(tcp_sport); +CREATE INDEX hits_tcp_dport ON hits(tcp_dport); +CREATE INDEX hits_udp_sport ON hits(udp_sport); +CREATE INDEX hits_udp_dport ON hits(udp_dport); +CREATE INDEX hits_sctp_sport ON hits(sctp_sport); +CREATE INDEX hits_sctp_dport ON hits(sctp_dport); + +CREATE INDEX hits_icmpv6_type ON hits(icmpv6_type); +CREATE INDEX hits_icmp_type ON hits(icmp_type); + +CREATE TABLE flows ( + flow_start_sec INTEGER, + flow_start_usec INTEGER, + flow_end_sec INTEGER, + flow_end_usec INTEGER, + orig_ip_saddr BLOB NOT NULL, + orig_ip_saddr_str TEXT NOT NULL, + orig_ip_daddr BLOB NOT NULL, + orig_ip_daddr_str TEXT NOT NULL, + orig_ip_protocol INTEGER NOT NULL, + orig_l4_sport INTEGER, + orig_l4_dport INTEGER, + orig_raw_pktcount INTEGER NOT NULL, + orig_raw_pktlen INTEGER NOT NULL, + reply_ip_saddr BLOB NOT NULL, + reply_ip_saddr_str BLOB NOT NULL, + reply_ip_daddr BLOB NOT NULL, + reply_ip_daddr_str BLOB NOT NULL, + reply_ip_protocol INTEGER NOT NULL, + reply_l4_sport INTEGER, + reply_l4_dport INTEGER, + reply_raw_pktcount INTEGER NOT NULL, + reply_raw_pktlen INTEGER NOT NULL, + icmp_code INTEGER, + icmp_type INTEGER, + ct_id INTEGER NOT NULL, + ct_event INTEGER NOT NULL, + ct_mark INTEGER +); + +CREATE INDEX flows_ip_saddr ON flows(orig_ip_saddr); +CREATE INDEX flows_ip_daddr ON flows(orig_ip_daddr); +CREATE INDEX flows_ip_protocol ON flows(orig_ip_protocol); diff --git a/ulogd2/ulogd.conf b/ulogd2/ulogd.conf index c2b8e6d..565579f 100644 --- a/ulogd2/ulogd.conf +++ b/ulogd2/ulogd.conf @@ -5,9 +5,6 @@ # GLOBAL OPTIONS ###################################################################### -# logfile for status messages -logfile="/var/log/ulogd/ulogd.log" - # loglevel: debug(1), info(3), notice(5), error(7) or fatal(8) loglevel=7 @@ -22,7 +19,7 @@ loglevel=7 # 2. options for each plugin in seperate section below plugin="/usr/lib/ulogd/ulogd_inppkt_NFLOG.so" -plugin="/usr/lib/ulogd/ulogd_inppkt_ULOG.so" +#plugin="/usr/lib/ulogd/ulogd_inppkt_ULOG.so" plugin="/usr/lib/ulogd/ulogd_inpflow_NFCT.so" plugin="/usr/lib/ulogd/ulogd_filter_IFINDEX.so" plugin="/usr/lib/ulogd/ulogd_filter_IP2STR.so" @@ -31,7 +28,7 @@ plugin="/usr/lib/ulogd/ulogd_filter_PRINTPKT.so" plugin="/usr/lib/ulogd/ulogd_filter_HWHDR.so" plugin="/usr/lib/ulogd/ulogd_filter_PRINTFLOW.so" #plugin="/usr/lib/ulogd/ulogd_filter_MARK.so" -plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so" +#plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so" plugin="/usr/lib/ulogd/ulogd_output_SYSLOG.so" #plugin="/usr/lib/ulogd/ulogd_output_OPRINT.so" #plugin="/usr/lib/ulogd/ulogd_output_NACCT.so" @@ -42,38 +39,26 @@ plugin="/usr/lib/ulogd/ulogd_output_SYSLOG.so" plugin="/usr/lib/ulogd/ulogd_output_SQLITE3.so" plugin="/usr/lib/ulogd/ulogd_raw2packet_BASE.so" -# this is a stack for logging packet send by system via LOGEMU -stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU - -# this is a stack for NFLOG packet-based logging to PCAP -#stack=log1:NFLOG,base1:BASE,pcap1:PCAP - -# this is a stack for logging packet to sqlite -#stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2bin1:IP2BIN,mac2str1:HWHDR,sqlite1:SQLITE3 +# Log packets +stack=src-pkt:NFLOG,base:BASE,ifindex:IFINDEX,ip2str:IP2STR,hw:HWHDR,db-packets:SQLITE3 +stack=src-pkt:NFLOG,base:BASE,ifindex:IFINDEX,ip2str:IP2STR,print:PRINTPKT,syslog:SYSLOG -# this is a stack for logging packets to syslog after a collect via NFLOG -#stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,sys1:SYSLOG +# Log connection tracking events +stack=src-ct:NFCT,ip2bin:IP2BIN,ip2str:IP2STR,print-flow:PRINTFLOW,db-flows:SQLITE3 -# Logging of system packet through NFLOG -[log1] -# netlink multicast group (the same as the iptables --nflog-group param) -# Group O is used by the kernel to log connection tracking invalid message +[src-pkt] group=0 -#netlink_socket_buffer_size=217088 -#netlink_socket_buffer_maxsize=1085440 -# set number of packet to queue inside kernel -#netlink_qthreshold=1 -# set the delay before flushing packet in the queue inside kernel (in ms) -#netlink_qtimeout=1000 bind=1 -[emu1] -file="/var/log/ulogd/syslogemu.log" -sync=1 +[src-ct] +# Only receive DESTROY events +event_mask=0x00000004 +hash_enable=1 -[pcap1] -sync=1 +[db-packets] +db=/var/lib/ulogd/ulogd.db +table=hits -[sqlite1] -db=/var/log/ulogd/ulogd.db -table=ulog +[db-flows] +db=/var/lib/ulogd/ulogd.db +table=flows diff --git a/ulogd2/ulogd.logrotate b/ulogd2/ulogd.logrotate deleted file mode 100644 index b3fb6d1..0000000 --- a/ulogd2/ulogd.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/ulogd.log /var/log/ulogd.syslogemu /var/log/ulogd.pktlog /var/log/ulogd.pcap { - missingok - sharedscripts - postrotate - /bin/killall -HUP ulogd 2> /dev/null || true - endscript -} diff --git a/ulogd2/ulogd2.nm b/ulogd2/ulogd2.nm index 5a153a2..4d639a8 100644 --- a/ulogd2/ulogd2.nm +++ b/ulogd2/ulogd2.nm @@ -4,7 +4,7 @@ ############################################################################### name = ulogd2 -version = 2.0.4 +version = 2.0.5 release = 1 epoch = 1 @@ -40,15 +40,15 @@ build # Set libdir to "/usr/lib" for every architecture to install the ulogd2 plugins # to this folder. configure_options+= \ - --sysconfdir=/etc \ --libdir=%{prefix}/lib install_cmds - mkdir -pv %{BUILDROOT}/etc - cp -vf %{DIR_SOURCE}/ulogd.conf %{BUILDROOT}/etc/ulogd.conf + mkdir -pv %{BUILDROOT}%{sysconfdir} + cp -vf %{DIR_SOURCE}/ulogd.conf %{BUILDROOT}%{sysconfdir}/ulogd.conf - mkdir -pv %{BUILDROOT}/var/log/ulogd - sqlite3 -echo %{BUILDROOT}/var/log/ulogd/ulogd.db < %{DIR_SOURCE}/sqlite3.table + mkdir -pv %{BUILDROOT}%{sharedstatedir}/ulogd + sqlite3 -echo %{BUILDROOT}%{sharedstatedir}/ulogd/ulogd.db \ + < %{DIR_SOURCE}/sqlite3.table end end @@ -61,7 +61,11 @@ packages end configfiles - /etc/ulogd.conf + %{sysconfdir}/ulogd.conf + end + + datafiles + %{sharedstatedir}/ulogd/ulogd.db end script postin hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4da0506b000ae41025bb5ddb6111171f6f0cf0f5
by git＠ipfire.org 08 Jun '15

08 Jun '15

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 4da0506b000ae41025bb5ddb6111171f6f0cf0f5 (commit) via 4c777aeaf06e5697ecc5e540614b4edb2b2de853 (commit) from 57f5c85825d9f6b61e8726c5b146bae1957acfcf (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 4da0506b000ae41025bb5ddb6111171f6f0cf0f5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jun 8 14:29:31 2015 +0200 core91: Ship updated pcre package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4c777aeaf06e5697ecc5e540614b4edb2b2de853 Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sun May 17 15:36:13 2015 +0200 pcre: Update to 8.37 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/pcre | 2 +- config/rootfiles/{oldcore/66 => core/91}/filelists/pcre | 0 lfs/pcre | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) copy config/rootfiles/{oldcore/66 => core/91}/filelists/pcre (100%) Difference in files: diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre index 78ac2a2..8c4cc2a 100644 --- a/config/rootfiles/common/pcre +++ b/config/rootfiles/common/pcre @@ -10,7 +10,7 @@ #usr/lib/libpcre.la usr/lib/libpcre.so usr/lib/libpcre.so.1 -usr/lib/libpcre.so.1.2.4 +usr/lib/libpcre.so.1.2.5 #usr/lib/libpcrecpp.la usr/lib/libpcrecpp.so usr/lib/libpcrecpp.so.0 diff --git a/config/rootfiles/core/91/filelists/pcre b/config/rootfiles/core/91/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/core/91/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/lfs/pcre b/lfs/pcre index f5c771c..175afc0 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # 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 # @@ -24,7 +24,7 @@ include Config -VER = 8.36 +VER = 8.37 THISAPP = pcre-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ff7b4bb14e355f04885cf18ff4125c98 +$(DL_FILE)_MD5 = 6e0cc6d1bdac7a4308151f9b3571b86e install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 3712f5e1e69264bc6b5327625781888f3f8c6e80
by git＠ipfire.org 06 Jun '15

06 Jun '15

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 3.x development tree". The branch, master has been updated via 3712f5e1e69264bc6b5327625781888f3f8c6e80 (commit) from a3c2794b5bc5fd2e1a318839d357fabae8f719df (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 3712f5e1e69264bc6b5327625781888f3f8c6e80 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 6 22:23:54 2015 +0200 libmpc: Update to version 1.0.3 Fixes #10802 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: libmpc/libmpc.nm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/libmpc/libmpc.nm b/libmpc/libmpc.nm index d5f68e6..68a9852 100644 --- a/libmpc/libmpc.nm +++ b/libmpc/libmpc.nm @@ -4,8 +4,8 @@ ############################################################################### name = libmpc -version = 1.0 -release = 2 +version = 1.0.3 +release = 1 thisapp = mpc-%{version} groups = System/Libraries @@ -32,7 +32,7 @@ build --disable-static test - #export LD_LIBRARY_PATH=$(pwd)/src/.libs + export LD_LIBRARY_PATH=$(pwd)/src/.libs make check end end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. a3c2794b5bc5fd2e1a318839d357fabae8f719df
by git＠ipfire.org 06 Jun '15

06 Jun '15

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 3.x development tree". The branch, master has been updated via a3c2794b5bc5fd2e1a318839d357fabae8f719df (commit) via c78c81f1f45a14374093a2969b5d7eea3c7f6740 (commit) via df5c0559f471892bf5b53d5d4f0ade37e2d06d17 (commit) via 7717fb553613bd3f0172c87117124c949ffef477 (commit) via 335921f21f0a03d347d7eba299f769e054be3f16 (commit) via aad04cd04d77531f741c8299e537df3cba7f1ecf (commit) via ac85a00a9c91227695c63b0eb2b73ce80c398303 (commit) from 3f933e235dc5b788635a2fe933e648fb3c2c84df (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 a3c2794b5bc5fd2e1a318839d357fabae8f719df Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 6 21:14:29 2015 +0200 libidn: Update to version 1.30 Fixes #10800 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c78c81f1f45a14374093a2969b5d7eea3c7f6740 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 6 21:13:25 2015 +0200 libgcrypt: Update to version 1.6.3 Fixes #10801 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit df5c0559f471892bf5b53d5d4f0ade37e2d06d17 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 6 21:12:46 2015 +0200 wget: Update to version 1.16.3 Fixes #10799 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7717fb553613bd3f0172c87117124c949ffef477 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 6 18:16:16 2015 +0200 zlib: Update to version 1.2.8 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 335921f21f0a03d347d7eba299f769e054be3f16 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 6 18:03:51 2015 +0200 firewall: Drop the old firewall package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit aad04cd04d77531f741c8299e537df3cba7f1ecf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 6 18:02:07 2015 +0200 iptables: Remove package This is replaced by nftables. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ac85a00a9c91227695c63b0eb2b73ce80c398303 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 6 17:40:04 2015 +0200 pdns-recursor: Drop package pdns-recursor is not needed any more has we have replaced it mostly by unbound already where ever we are using it. The main reason for that is the lack of support for DNSSEC. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: firewall/firewall.nm | 48 ----- firewall/src/firewall | 111 ---------- firewall/src/functions | 111 ---------- firewall/src/functions.commands | 29 --- firewall/src/functions.config | 70 ------- firewall/src/functions.firewall | 59 ------ firewall/src/functions.ip | 231 --------------------- firewall/src/functions.iptables | 181 ---------------- firewall/src/functions.macros | 75 ------- firewall/src/functions.zones | 102 --------- firewall/src/macros/DHCP | 5 - firewall/src/macros/HTTP | 4 - firewall/src/macros/HTTPS | 4 - firewall/src/macros/WWW | 5 - firewall/src/zones.green | 38 ---- firewall/src/zones.orange | 38 ---- firewall/src/zones.red | 38 ---- firewall/systemd/firewall.service | 13 -- iproute2/iproute2.nm | 8 +- iptables/iptables.nm | 78 ------- libgcrypt/libgcrypt.nm | 2 +- libidn/libidn.nm | 2 +- .../patches/pdns-recursor-fixmakefile.patch | 19 -- .../patches/pdns-recursor-fixsysconfdir.patch | 9 - pdns-recursor/pdns-recursor.nm | 108 ---------- pdns-recursor/pdns-recursor.tmpfiles | 1 - pdns-recursor/recursor.conf | 19 -- pdns-recursor/systemd/pdns-recursor.service | 12 -- pdns/pdns.nm | 6 +- squid/squid.nm | 3 +- wget/wget.nm | 2 +- zlib/zlib.nm | 2 +- 32 files changed, 8 insertions(+), 1425 deletions(-) delete mode 100644 firewall/firewall.nm delete mode 100644 firewall/src/firewall delete mode 100644 firewall/src/functions delete mode 100644 firewall/src/functions.commands delete mode 100644 firewall/src/functions.config delete mode 100644 firewall/src/functions.firewall delete mode 100644 firewall/src/functions.ip delete mode 100644 firewall/src/functions.iptables delete mode 100644 firewall/src/functions.macros delete mode 100644 firewall/src/functions.zones delete mode 100644 firewall/src/macros/DHCP delete mode 100644 firewall/src/macros/HTTP delete mode 100644 firewall/src/macros/HTTPS delete mode 100644 firewall/src/macros/WWW delete mode 100644 firewall/src/zones.green delete mode 100644 firewall/src/zones.orange delete mode 100644 firewall/src/zones.red delete mode 100644 firewall/systemd/firewall.service delete mode 100644 iptables/iptables.nm delete mode 100644 pdns-recursor/patches/pdns-recursor-fixmakefile.patch delete mode 100644 pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch delete mode 100644 pdns-recursor/pdns-recursor.nm delete mode 100644 pdns-recursor/pdns-recursor.tmpfiles delete mode 100644 pdns-recursor/recursor.conf delete mode 100644 pdns-recursor/systemd/pdns-recursor.service Difference in files: diff --git a/firewall/firewall.nm b/firewall/firewall.nm deleted file mode 100644 index 53b3c8f..0000000 --- a/firewall/firewall.nm +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = firewall -version = 0.1 -release = 2 - -maintainer = Michael Tremer <michael.tremer(a)ipfire.org> -groups = Networking/Firewall -url = http://www.ipfire.org/ -license = GPLv3+ -summary = The IPFire Firewall Engine. - -description - This script installs IPFire's firewall. -end - -# No tarball. -sources = - -build - DIR_APP = %{DIR_SOURCE}/src - - build - : # Do nothing. - end - - install - mkdir -pv %{BUILDROOT}/usr/{lib,share}/firewall %{BUILDROOT}/usr/bin - for i in %{DIR_APP}/{functions,zones}*; do \ - install -m 644 -v $i %{BUILDROOT}/usr/lib/firewall; \ - done - cp -avf %{DIR_APP}/macros %{BUILDROOT}/usr/share/firewall/ - install -m 755 -v %{DIR_APP}/firewall %{BUILDROOT}/usr/bin - end -end - -packages - package %{name} - requires = iproute2 iptables - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/firewall/src/firewall b/firewall/src/firewall deleted file mode 100644 index 44d0937..0000000 --- a/firewall/src/firewall +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # -# # -# 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/>. # -# # -############################################################################### - -############################################################################### -# This is the script, that is runned by the user to contol the firewall # -# We only do some actions here and call the functions from the libs. # -# # -# Actions (as known at the moment): # -# - start/stop/restart/reload # -# - show # -# - running? # -# - serveral config # -# - calc (cidr|subnets|...) # -# - ... # -# # -############################################################################### - -PATH=/usr/local/sbin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin - -LIBDIR=/usr/lib/firewall - -function include() { - local file=$1 - local path - for path in $LIBDIR .; do - if [ -f "$path/$file" ]; then - . $path/$file - return # found - fi - done - echo "Couldn't include $file. File was not found!" >&2 - _exit 1 -} - -function usage() { - echo "Usage: $0 [global options] command [command options]" - echo - _exit ${1-1} -} - -include functions - -while [ "$#" -gt 0 ]; do - arg=$1 - shift - case "$arg" in - --debug|-d) - debug 1 - decho "Debug mode is enabled." - ;; - --verbose|-v) - verbose 1 - vecho "${BOLD}Verbose mode is enabled.${NORMAL}" - ;; - calc) - shift - case "$1" in - mask2cidr) - mask_to_cidr $@ - _exit $? - ;; - *) - usage - ;; - esac - ;; - config) - config_load $@ - _exit $? - ;; - help|-h|--help) - usage 0 - ;; - notify) - ;; - reload) - ;; - start|restart) - _start - _exit $@ - ;; - stop) - _stop - _exit $@ - ;; - *) - usage - ;; - esac -done - -error "No command was given." -usage diff --git a/firewall/src/functions b/firewall/src/functions deleted file mode 100644 index d8fb597..0000000 --- a/firewall/src/functions +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # -# # -# 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/>. # -# # -############################################################################### - -DEBUG= -VERBOSE= -TMPDIR=$(mktemp -d) - -BOLD="\\033[1;39m" -NORMAL="\\033[0;39m" -ERROR="\\033[1;31m" - -function debug() { - if [ -n "$1" ]; then - DEBUG=$1 - verbose $1 - return - else - if [ "$DEBUG" = "1" ]; then - return 0 - else - return 1 - fi - fi - -} - -function verbose() { - if [ -n "$1" ]; then - VERBOSE=$1 - return - else - if [ "$VERBOSE" = "1" ]; then - return 0 - else - return 1 - fi - fi -} - -function decho() { - debug && echo -e "${ERROR}$@${NORMAL}" -} - -function vecho() { - verbose && echo -e "$@" -} - -function error() { - echo -e "${ERROR}ERROR${NORMAL}: $@" >&2 - _exit 1 -} - -function ifs() { - if [ -n "$1" ]; then - IFS_SAVE=$IFS - echo $1 - else - echo $IFS_SAVE - fi -} - -function uppercase() { - tr [a-z] [A-Z] <<< "$@" -} - -include functions.commands -include functions.config -include functions.firewall -include functions.ip -include functions.iptables -include functions.macros -include functions.zones - -function _start() { - local zone - local policy - - firewall_init - zones_local_add - - for zone in $(network zone list); do - zone=$(basename ${zone}) - policy=${zone%%[0-9]*} - zones_${policy}_add ${zone} - done - - iptables_commit -} - -function _stop() { - iptables_flush - iptables_commit -} diff --git a/firewall/src/functions.commands b/firewall/src/functions.commands deleted file mode 100644 index d46a536..0000000 --- a/firewall/src/functions.commands +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # -# # -# 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/>. # -# # -############################################################################### - -function cmd_quiet() { - $@ &>/dev/null -} - -function _exit() { - rm -rf $TMPDIR - exit $@ -} diff --git a/firewall/src/functions.config b/firewall/src/functions.config deleted file mode 100644 index 8abda04..0000000 --- a/firewall/src/functions.config +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # -# # -# 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/>. # -# # -############################################################################### - -CONFIG_NONE=0 -CONFIG_TEXT=1 -CONFIG_SQLITE=2 - -function config_type() { - if _config_is_sqlite $1; then - echo $CONFIG_SQLITE - else - echo $CONFIG_TEXT - fi -} - -function config_load() { - local file - local type - file=$1 - - if ! [ -f "$file" ]; then - error "Cannot load config file $file. File does not exist!" - exit 1 - fi - - vecho "Loading config file: $file" - - type=$(config_type $file) - if [ "$type" = "$CONFIG_SQLITE" ]; then - eval $(_config_load_sqlite $file) - else - eval $(_config_load_text $file) - fi -} - -function _config_is_sqlite() { - file $1 2>/dev/null | grep -q "SQLite 3.x database" -} - -function _config_dump_sqlite() { - sqlite3 -noheader -column $1 "SELECT * FROM config;" -} - -function _config_load_sqlite() { - _config_dump_sqlite $1 | while read KEY VALUE; do - echo "$KEY=$VALUE" - done -} - -function _config_load_text() { - readhash $1 -} diff --git a/firewall/src/functions.firewall b/firewall/src/functions.firewall deleted file mode 100644 index b98128b..0000000 --- a/firewall/src/functions.firewall +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # -# # -# 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/>. # -# # -############################################################################### - -function firewall_init() { - decho "Initializing firewall interface." - iptables_init - firewall_tcp_state_flags - firewall_connection_tracking -} - -function firewall_tcp_state_flags() { - vecho "Adding ${BOLD}TCP State Flags${NORMAL} chain..." - chain_create BADTCP_LOG - iptables -A BADTCP_LOG -p tcp -j $(iptables_LOG "Illegal TCP state: ") - iptables -A BADTCP_LOG -j DROP - - chain_create BADTCP - iptables -A BADTCP -p tcp --tcp-flags ALL NONE -j BADTCP_LOG - iptables -A BADTCP -p tcp --tcp-flags SYN,FIN SYN,FIN -j BADTCP_LOG - iptables -A BADTCP -p tcp --tcp-flags SYN,RST SYN,RST -j BADTCP_LOG - iptables -A BADTCP -p tcp --tcp-flags FIN,RST FIN,RST -j BADTCP_LOG - iptables -A BADTCP -p tcp --tcp-flags ACK,FIN FIN -j BADTCP_LOG - iptables -A BADTCP -p tcp --tcp-flags ACK,PSH PSH -j BADTCP_LOG - iptables -A BADTCP -p tcp --tcp-flags ACK,URG URG -j BADTCP_LOG - - iptables -A INPUT -p tcp -j BADTCP - iptables -A OUTPUT -p tcp -j BADTCP - iptables -A FORWARD -p tcp -j BADTCP -} - -function firewall_connection_tracking() { - vecho "Adding ${BOLD}Connection Tracking${NORMAL} chain..." - chain_create CONNTRACK - iptables -A CONNTRACK -m state --state ESTABLISHED,RELATED -j ACCEPT - iptables -A CONNTRACK -m state --state INVALID -j $(iptables_LOG "INVALID packet: ") - iptables -A CONNTRACK -m state --state INVALID -j DROP - - iptables -A INPUT -p tcp -j CONNTRACK - iptables -A OUTPUT -p tcp -j CONNTRACK - iptables -A FORWARD -p tcp -j CONNTRACK -} diff --git a/firewall/src/functions.ip b/firewall/src/functions.ip deleted file mode 100644 index 78a29ac..0000000 --- a/firewall/src/functions.ip +++ /dev/null @@ -1,231 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # -# # -# 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/>. # -# # -############################################################################### - -############################################################################### -# General IP address manipulation functions -# ip_encode - Encodes an IP to an integer -# Parameters: ip address (e.g. 192.168.0.1) -# Returns : integer -# ip_decode - Decodes an integer to an IP -# Parameters: integer -# Returns : ip address -# ip_valid - Checks if given IP is valid -# Parameters: IP -# Returns : boolean -# -# General subnet functions -# ip_range - Enumerates members of an IP range -# Parameters: ip range (e.g. 192.168.0.1-192.168.0.128) -# Returns : several subnets/IPs -# ip_range_explicit - Enumerates ALL IP addresses of an IP range -# Parameters: ip range -# Returns : several IPs -# subnet_network - Calculates the network address of a CIDR -# Parameters: CIDR network (e.g. 192.168.0.0/24) -# Returns : Network address -# subnet_broadcast - Calculates the broadcast address of a CIDR -# Parameters: CIDR network -# Returns : Broadcast address -# ip_in_subnet - Checks if an IP is in given subnet -# Parameters: IP address, subnet -# Returns : Boolean -# mask_to_cidr - Converts a subnet mask to cidr type -# Parameters: subnet (e.g. 255.255.255.0) -# Returns : CIDR (e.g. 24) -# - -function ip_encode() { - IFS=$(ifs .) - - local int=0 - for field in $1; do - int=$(( $(( $int << 8 )) | $field )) - done - - echo $int - IFS=$(ifs) -} - -function ip_decode() { - addr=$1 - - local x - local y - - y=$(($addr & 255)) - for x in 1 2 3; do - addr=$(($addr >> 8)) - y=$(($addr & 255)).$y - done - - echo $y -} - -function ip_range() { - local first - local last - local l - local x - local y - local z - local vlsm - - case "$1" in - !*) - echo $1 - return - ;; - [0-9]*.*.*.*-*.*.*.*) - ;; - *) - echo $1 - return - ;; - esac - - first=$(ip_encode ${1%-*}) - last=$(ip_encode ${1#*-}) - - if [ $first -gt $last ]; then - error "Invalid IP address range: $1" - fi - - l=$(( $last + 1 )) - - while [ $l -gt $first ]; do - vlsm= - x=31 - y=2 - z=1 - - while [ $(( $first % $y )) -eq 0 ] && [ $l -gt $(( $first + $y )) ]; do - vlsm=/$x - x=$(( $x - 1 )) - z=$y - y=$(( $y * 2 )) - done - - echo $(ip_decode $first)$vlsm - first=$(($first + $z)) - done -} - -function ip_range_explicit() { - local first - local last - - case $1 in - [0-9]*.*.*.*-*.*.*.*) - ;; - *) - echo $1 - return - ;; - esac - - first=$(ip_encode ${1%-*}) - last=$(ip_encode ${1#*-}) - - if [ $first -gt $last ]; then - error "Invalid IP address range: $1" - fi - - while ! [ $first -gt $last ]; do - echo $(ip_decode $first) - first=$(($first + 1)) - done -} - -function _netmask() { - local vlsm - vlsm=${1#*/} - [ $vlsm -eq 0 ] && echo 0 || echo $(( -1 << $(( 32 - $vlsm )) )) -} - -function subnet_network() { - local encodedaddr - encodedaddr=$(ip_encode ${1%/*}) - local netmask - netmask=$(_netmask $1) - - echo $(ip_decode $(($encodedaddr & $netmask))) -} - -function _broadcast() { - local x - x=$(( 32 - ${1#*/} )) - [ $x -eq 32 ] && echo -1 || echo $(( $(( 1 << $x )) - 1 )) -} - -function subnet_broadcast() { - local encodedaddr - encodedaddr=$(ip_encode ${1%/*}) - local netmask - netmask=$(_netmask $1) - local broadcast - broadcast=$(_broadcast $1) - - echo $(ip_decode $(( $(($encodedaddr & $netmask)) | $broadcast ))) -} - -function ip_in_subnet() { - local netmask - netmask=$(_netmask $2) - [ $(( $(ip_encode $1) & $netmask)) = $(( $(ip_encode ${2%/*}) & $netmask )) ] -} - -function mask_to_cidr() { - local mask - mask=$(ip_encode $1) - local cidr - cidr=0 - local x - x=$(( 128 << 24 )) # 0x80000000 - - while [ $(( $x & $mask )) -ne 0 ]; do - [ $mask -eq $x ] && mask=0 || mask=$(( $mask << 1 )) - cidr=$(($cidr + 1)) - done - - if [ $(( $mask & 2147483647 )) -ne 0 ]; then # 2147483647 = 0x7fffffff - echo "Invalid net mask: $1" >&2 - else - echo $cidr - fi -} - -function ip_valid() { - local x - IFS=$(ifs .) - for x in $1; do - case $x in - [0-9]|[0-9][0-9]|[1-2][0-9][0-9]) - [ $x -lt 256 ] || { IFS=$(ifs); return 1; } - ;; - *) - IFS=$(ifs) - return 1 - ;; - esac - done - IFS=$(ifs) - return 0 -} diff --git a/firewall/src/functions.iptables b/firewall/src/functions.iptables deleted file mode 100644 index 630bcce..0000000 --- a/firewall/src/functions.iptables +++ /dev/null @@ -1,181 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # -# # -# 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/>. # -# # -############################################################################### - -IPTABLES_FILE=$TMPDIR/iptables - -function iptables() { - local arg - local args - local table - - table=filter - - # Parsing arguments - while [ $# -gt 0 ]; do - arg=${1} - shift - case "${arg}" in - -t) - table=${1} - shift - ;; - -A) - args="${args} -A $(uppercase ${1})" - shift - ;; - *) - args="${args} ${arg}" - ;; - esac - done - echo "${args:1:${#args}}" >> ${IPTABLES_FILE}-${table} -} - -function iptables_flush() { - decho "Flushing iptables" - iptables "* filter" - chain_create INPUT ACCEPT - chain_create OUTPUT ACCEPT - chain_create FORWARD ACCEPT -} - -function iptables_init() { - iptables "* filter" - chain_create -t filter INPUT DROP - chain_create -t filter OUTPUT DROP - chain_create -t filter FORWARD DROP - - iptables -t mangle "* mangle" - chain_create -t mangle PREROUTING ACCEPT - chain_create -t mangle INPUT ACCEPT - chain_create -t mangle OUTPUT ACCEPT - chain_create -t mangle FORWARD ACCEPT - chain_create -t mangle POSTROUTING ACCEPT - - iptables -t nat "* nat" - chain_create -t nat PREROUTING ACCEPT - chain_create -t nat OUTPUT ACCEPT - chain_create -t nat POSTROUTING ACCEPT -} - -function iptables_commit() { - local chain - - vecho "Committing firewall configuration." - iptables -t filter "COMMIT" - iptables -t mangle "COMMIT" - iptables -t nat "COMMIT" - - for table in filter mangle nat; do - [ -e ${IPTABLES_FILE}-${table} ] || continue - cat ${IPTABLES_FILE}-${table} >> $IPTABLES_FILE - done - - decho "Dumping iptables output" - if debug; then - counter=1 - cat $IPTABLES_FILE | while read LINE; do - printf "%4d | %s\n" "$counter" "$LINE" - counter=$(( $counter + 1 )) - done - fi - - iptables-restore $(debug && echo "-v") < $IPTABLES_FILE -} - -function chain_create() { - local args - if [ "${1}" = "-t" ]; then - args="${1} ${2}" - shift 2 - fi - iptables ${args} ":$1 ${2--} [0:0]" -} - -function iptables_LOG() { - local prefix - prefix=$1 - - if [ "$LOG_FACILITY" = "syslog" ]; then - echo -n "LOG" - [ -n "$prefix" ] && echo -n " --log-prefix \"$prefix\"" - else - echo -n "NFLOG" - [ -n "$prefix" ] && echo -n " --nflog-prefix \"$prefix\"" - echo -n " --nflog-threshold 30" - fi - echo -} - -function iptables_protocol() { - local PROTO - PROTO=$1 - for proto in tcp udp esp ah; do - if [ "$PROTO" = "$proto" ]; then - echo "-p $PROTO" - break - fi - done -} - -IPTABLES_PORT=0 -IPTABLES_MULTIPORT=1 -IPTABLES_PORTRANGE=2 - -function _iptables_port_range() { - grep -q ":" <<< $@ -} - -function _iptables_port_multiport() { - grep -q "," <<< $@ -} - -function _iptables_port() { - if _iptables_port_range "$@"; then - echo $IPTABLES_PORTRANGE - elif _iptables_port_multiport "$@"; then - echo $IPTABLES_MULTIPORT - else - echo $IPTABLES_PORT - fi -} - -function iptables_source_port() { - [ -z "$@" ] && return - local type - type=$(_iptables_port $@) - if [ "$type" = "$IPTABLES_MULTIPORT" ]; then - echo "-m multiport --source-ports $@" - else - echo "--sport $@" - fi -} - -function iptables_destination_port() { - [ -z "$@" ] && return - local type - type=$(_iptables_port $@) - if [ "$type" = "$IPTABLES_MULTIPORT" ]; then - echo "-m multiport --destination-ports $@" - else - echo "--dport $@" - fi -} diff --git a/firewall/src/functions.macros b/firewall/src/functions.macros deleted file mode 100644 index 2ea6f37..0000000 --- a/firewall/src/functions.macros +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # -# # -# 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/>. # -# # -############################################################################### - -function macro() { - local file - local line - local rules - - file=$1 - if [ "${file:0:1}" != "/" ]; then - file="/usr/share/firewall/macros/$file" - fi - shift - - if _config_is_sqlite $file; then - rules=$(macro_parse $@ < $file) - else - rules=$(sqlite3 -noheader -column $file | macro_parse $@) - fi - - while read line <<< ${rules}; do - iptables ${line} - done -} - -function macro_parse() { - local STRING - grep -v "^#" | while read ACTION SOURCE DESTINATION PROTOCOL LOCAL_PORT REMOTE_PORT RATE; do - STRING="" - - # Handle inlcudes - if [ "$ACTION" = "INCLUDE" ]; then - marco $SOURCE $@ - fi - - # Protocol - STRING="$STRING $(iptables_protocol $PROTOCOL)" - # Ports - if [ -n "$PORT_SWITCH" ]; then - # Switch ports for upload rule - STRING="$STRING $(iptables_source_port $REMOTE_PORT)" - STRING="$STRING $(iptables_destination_port $LOCAL_PORT)" - else - STRING="$STRING $(iptables_source_port $LOCAL_PORT)" - STRING="$STRING $(iptables_destination_port $REMOTE_PORT)" - fi - - if [ "$ACTION" = "ACCEPT" ]; then - STRING="$STRING -j ACCEPT" - - elif [ "$ACTION" = "DROP" ]; then - STRING="$STRING -j DROP" - - fi - [ -n "$STRING" ] && echo "$STRING $@" - done -} diff --git a/firewall/src/functions.zones b/firewall/src/functions.zones deleted file mode 100644 index fbc41a1..0000000 --- a/firewall/src/functions.zones +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # -# # -# 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/>. # -# # -############################################################################### - -include zones.green -include zones.orange -include zones.red - -function zones_global_add() { - local device - local name - - device=$1 - - vecho "Adding zone \"$device\"" - - name=$(uppercase "ZONE_$device") - - ### FILTER - chain_create $name - iptables -A INPUT -i $device -j $name - iptables -A FORWARD -i $device -j $name - iptables -A FORWARD -o $device -j $name - iptables -A OUTPUT -o $device -j $name - - # Leave some space for own rules - chain_create ${name}_CUSTOM - iptables -A $name -j ${name}_CUSTOM - - # Intrusion Preventions System - chain_create ${name}_IPS - iptables -A $name -i $device -j ${name}_IPS - - # Portforwarding - chain_create ${name}_PORTFW - iptables -A $name -i $device -j ${name}_PORTFW - - # Outgoing firewall - chain_create ${name}_OUTFW - iptables -A $name -o $device -j ${name}_OUTFW - - # Policy rules - chain_create ${name}_POLICY - iptables -A $name -j ${name}_POLICY - - ### MANGLE - chain_create -t mangle $name - iptables -t mangle -A PREROUTING -i $device -j $name - iptables -t mangle -A POSTROUTING -o $device -j $name - - # Quality of Service - chain_create -t mangle ${name}_QOS_INC - iptables -t mangle -A $name -i $device -j ${name}_QOS_INC - chain_create -t mangle ${name}_QOS_OUT - iptables -t mangle -A $name -o $device -j ${name}_QOS_OUT - - ### NAT - chain_create -t nat ${name} - iptables -t nat -A PREROUTING -i $device -j ${name} - iptables -t nat -A POSTROUTING -o $device -j ${name} - - # Network Address Translation - chain_create -t nat ${name}_NAT - iptables -t nat -A $name -i $device -j ${name}_NAT - - # Portforwarding - chain_create -t nat ${name}_PORTFW - iptables -t nat -A $name -i $device -j ${name}_PORTFW - - # UPNP - chain_create -t nat ${name}_UPNP - iptables -t nat -A $name -j ${name}_UPNP -} - - -### LOCAL ZONE -function zones_local_add() { - - decho "Adding zone \"local\"" - - # Accept everything on lo - iptables -A INPUT -i lo -j ACCEPT - iptables -A OUTPUT -o lo -j ACCEPT - -} diff --git a/firewall/src/macros/DHCP b/firewall/src/macros/DHCP deleted file mode 100644 index 41d8a87..0000000 --- a/firewall/src/macros/DHCP +++ /dev/null @@ -1,5 +0,0 @@ -# IPFire Macro -# This macro handles the dynamic host configuration protocol. -# ACTION SRC DST PROTO LOCAL_PORT REMOTE_PORT RATE -CUSTOM - - tcp 68 67 -CUSTOM - - udp 68 67 diff --git a/firewall/src/macros/HTTP b/firewall/src/macros/HTTP deleted file mode 100644 index bce11f9..0000000 --- a/firewall/src/macros/HTTP +++ /dev/null @@ -1,4 +0,0 @@ -# IPFire Macro -# This macro handles plaintext HTTP (WWW) traffic. -# ACTION SRC DST PROTO LOCAL_PORT REMOTE_PORT RATE -CUSTOM - - tcp - 80 diff --git a/firewall/src/macros/HTTPS b/firewall/src/macros/HTTPS deleted file mode 100644 index 65b2e9e..0000000 --- a/firewall/src/macros/HTTPS +++ /dev/null @@ -1,4 +0,0 @@ -# IPFire Macro -# This macro handles secure HTTP (WWW) traffic. -# ACTION SRC DST PROTO LOCAL_PORT REMOTE_PORT RATE -CUSTOM - - tcp - 443 diff --git a/firewall/src/macros/WWW b/firewall/src/macros/WWW deleted file mode 100644 index ca72d0f..0000000 --- a/firewall/src/macros/WWW +++ /dev/null @@ -1,5 +0,0 @@ -# IPFire Macro -# This macro handles WWW traffic. -# ACTION SRC DST PROTO SRC_PORT DST_PORT RATE -INCLUDE HTTP -INCLUDE HTTPS diff --git a/firewall/src/zones.green b/firewall/src/zones.green deleted file mode 100644 index 5566587..0000000 --- a/firewall/src/zones.green +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # -# # -# 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/>. # -# # -############################################################################### - -function zones_green_add() { - # $1 = device - - zones_global_add $1 - zones_policy_green $1 - -} - -function zones_policy_green() { - local device - - device=$1 - - # Accept any traffic from green - iptables -A ZONE_${device}_POLICY -i $device -j ACCEPT - iptables -A ZONE_${device}_POLICY -o $device -j ACCEPT -} diff --git a/firewall/src/zones.orange b/firewall/src/zones.orange deleted file mode 100644 index 55f5acc..0000000 --- a/firewall/src/zones.orange +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # -# # -# 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/>. # -# # -############################################################################### - -function zones_orange_add() { - # $1 = device - - zones_global_add $1 - zones_policy_orange $1 - -} - -function zones_policy_orange() { - local device - local name - - device=$1 - name=$(uppercase "$device") - - : # TODO -} diff --git a/firewall/src/zones.red b/firewall/src/zones.red deleted file mode 100644 index 549300c..0000000 --- a/firewall/src/zones.red +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # -# # -# 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/>. # -# # -############################################################################### - -function zones_red_add() { - # $1 = device - - zones_global_add $1 - zones_policy_red $1 - -} - -function zones_policy_red() { - local device - local name - - device=$1 - name=$(uppercase "$device") - - : # TODO -} diff --git a/firewall/systemd/firewall.service b/firewall/systemd/firewall.service deleted file mode 100644 index bdce760..0000000 --- a/firewall/systemd/firewall.service +++ /dev/null @@ -1,13 +0,0 @@ - -[Unit] -Description=Firewall -After=network.target - -[Service] -ExecStart=/usr/bin/firewall start -ExecStop=/usr/bin/firewall stop -ExecReload=/usr/bin/firewall restart - -[Install] -WantedBy=multi-user.target - diff --git a/iproute2/iproute2.nm b/iproute2/iproute2.nm index f11c7a8..27d8dea 100644 --- a/iproute2/iproute2.nm +++ b/iproute2/iproute2.nm @@ -5,7 +5,7 @@ name = iproute2 version = 3.14.0 -release = 1 +release = 2 groups = Networking/Tools url = http://www.linuxfoundation.org/en/Net:Iproute2 @@ -28,7 +28,6 @@ build libdb-devel libnl-devel linux-atm-devel >= 2.5.1 - iptables-devel >= 1.4.19 end prepare_cmds @@ -60,10 +59,7 @@ build ln -svf lnstat %{BUILDROOT}%{sbindir}/rtstat # Install libs. - for lib in tc/q_atm.so tc/m_xt.so; do - install -v -m 755 ${lib} %{BUILDROOT}%{libdir}/tc - done - ln -svf m_xt.so %{BUILDROOT}%{libdir}/tc/m_ipt.so + install -v -m 755 tc/q_atm.so %{BUILDROOT}%{libdir}/tc # libnetlink install -v -m 644 include/libnetlink.h %{BUILDROOT}%{includedir} diff --git a/iptables/iptables.nm b/iptables/iptables.nm deleted file mode 100644 index 0350b17..0000000 --- a/iptables/iptables.nm +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = iptables -version = 1.4.19.1 -release = 1 - -groups = Networking/Tools -url = http://www.netfilter.org/ -license = GPL+ -summary = Tools for managing Linux kernel packet filtering capabilities. - -description - The iptables utility controls the network packet filtering code in the - Linux kernel. If you need to set up firewalls and/or IP masquerading, - you should install this package. -end - -source_dl = http://ftp.netfilter.org/pub/iptables/ -sources = %{thisapp}.tar.bz2 - -build - requires - libnfnetlink-devel - libselinux-devel - end - - CFLAGS += -fno-strict-aliasing - - configure_options += \ - --libexecdir=/%{lib} \ - --sysconfdir=/etc \ - --with-pkgconfigdir=%{libdir}/pkgconfig \ - --mandir=/usr/share/man \ - --with-kernel=/usr \ - --with-kbuild=/usr \ - --with-ksource=/usr \ - --enable-devel \ - --enable-libipq - - prepare_cmds - # Make more space for target name on output. - sed -e "s/%-9s/%-18s/g" -i iptables/ip{,6}tables.c - - sed -i extensions/GNUmakefile* \ - -e "s@ip6t_NETMAP_LIBADD.*@& -L../libiptc/.libs@" - end - - install_cmds - # install ip*tables.h header files - mkdir -pv %{BUILDROOT}/usr/include/{iptables,libiptc} - install -v -m 644 include/ip{,6}tables.h \ - %{BUILDROOT}/usr/include - install -v -m 644 include/iptables/internal.h \ - %{BUILDROOT}/usr/include/iptables/ - install -v -m 644 include/libiptc/*.h \ - %{BUILDROOT}/usr/include/libiptc - - # Remove relative symlinks. - ln -svf ../sbin/xtables-multi %{BUILDROOT}/usr/bin/iptables-xml - end -end - -packages - package %{name} - groups += Base - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libgcrypt/libgcrypt.nm b/libgcrypt/libgcrypt.nm index 6bb11ca..1f6e017 100644 --- a/libgcrypt/libgcrypt.nm +++ b/libgcrypt/libgcrypt.nm @@ -4,7 +4,7 @@ ############################################################################### name = libgcrypt -version = 1.6.2 +version = 1.6.3 release = 1 groups = System/Libraries diff --git a/libidn/libidn.nm b/libidn/libidn.nm index 50e537d..4cd9dd4 100644 --- a/libidn/libidn.nm +++ b/libidn/libidn.nm @@ -4,7 +4,7 @@ ############################################################################### name = libidn -version = 1.25 +version = 1.30 release = 1 groups = System/Libraries diff --git a/pdns-recursor/patches/pdns-recursor-fixmakefile.patch b/pdns-recursor/patches/pdns-recursor-fixmakefile.patch deleted file mode 100644 index 2c39187..0000000 --- a/pdns-recursor/patches/pdns-recursor-fixmakefile.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up pdns-recursor-3.2-rc2/Makefile.orig pdns-recursor-3.2-rc2/Makefile ---- pdns-recursor-3.2-rc2/Makefile.orig 2010-03-01 16:52:23.000000000 +0100 -+++ pdns-recursor-3.2-rc2/Makefile 2010-03-01 16:53:10.000000000 +0100 -@@ -71,15 +71,12 @@ basic_checks: - install: all - -mkdir -p $(DESTDIR)/$(SBINDIR) - mv pdns_recursor $(DESTDIR)/$(SBINDIR) -- strip $(DESTDIR)/$(SBINDIR)/pdns_recursor - mkdir -p $(DESTDIR)/$(BINDIR) - mv rec_control $(DESTDIR)/$(BINDIR) -- strip $(DESTDIR)/$(BINDIR)/rec_control - -mkdir -p $(DESTDIR)/$(CONFIGDIR) - $(DESTDIR)/$(SBINDIR)/pdns_recursor --config > $(DESTDIR)/$(CONFIGDIR)/recursor.conf-dist - -mkdir -p $(DESTDIR)/usr/share/man/man1 - cp pdns_recursor.1 rec_control.1 $(DESTDIR)/usr/share/man/man1 -- $(OS_SPECIFIC_INSTALL) - - clean: binclean - -rm -f dep *~ *.gcda *.gcno optional/*.gcda optional/*.gcno diff --git a/pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch b/pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch deleted file mode 100644 index 1ea6f3f..0000000 --- a/pdns-recursor/patches/pdns-recursor-fixsysconfdir.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up pdns-recursor-3.2-rc2/config.h.orig pdns-recursor-3.2-rc2/config.h ---- pdns-recursor-3.2-rc2/config.h.orig 2010-03-01 16:54:06.000000000 +0100 -+++ pdns-recursor-3.2-rc2/config.h 2010-03-01 16:54:18.000000000 +0100 -@@ -1,4 +1,4 @@ --#define SYSCONFDIR "/etc/powerdns/" -+#define SYSCONFDIR "/etc/pdns-recursor/" - #define LOCALSTATEDIR "/var/run/" - #define VERSION "3.2" - #define RECURSOR diff --git a/pdns-recursor/pdns-recursor.nm b/pdns-recursor/pdns-recursor.nm deleted file mode 100644 index cbcaa2e..0000000 --- a/pdns-recursor/pdns-recursor.nm +++ /dev/null @@ -1,108 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = pdns-recursor -version = 3.3 -release = 9 - -groups = Networking/DNS -url = http://powerdns.com/ -license = GPLv2 -summary = A modern, advanced and high performance recursing nameserver. - -description - PowerDNS Recursor is a non authoritative/recursing DNS server. Use this - package if you need a dns cache for your network. -end - -source_dl = http://downloads.powerdns.com/releases/ -sources = %{thisapp}.tar.bz2 - -build - requires - gcc-c++ - boost-devel - lua-devel - shadow-utils - end - - prepare_cmds - %{create_user} - end - - build - LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua \ - make OPTFLAGS="%{CFLAGS}" #%{PARALLELISMFLAGS} - end - - install - make install DESTDIR=%{BUILDROOT} \ - CONFIGDIR="%{sysconfdir}/pdns" - - # Remove sysvinit file - rm -rf %{BUILDROOT}/etc/init.d - - # Remove shipped config file - rm -rf %{BUILDROOT}%{sysconfdir}/pdns/recursor.conf-dist - - # Install our default config file - cp -vf %{DIR_SOURCE}/recursor.conf \ - %{BUILDROOT}%{sysconfdir}/pdns/recursor.conf - - # Create folder for chroot - mkdir -pv %{BUILDROOT}/var/lib/pdns-recursor - - # Create directory for socket and stuff. - mkdir -pv %{BUILDROOT}/run/pdns-recursor - chown -v pdns-recursor.pdns-recursor %{BUILDROOT}/run/pdns-recursor - end -end - -create_user - getent group pdns-recursor >/dev/null || groupadd -r pdns-recursor - getent passwd pdns-recursor >/dev/null || \ - useradd -r -g pdns-recursor -d /var/lib/pdns-recursor -s /sbin/nologin \ - pdns-recursor -end - -packages - package %{name} - configfiles - %{sysconfdir}/pdns/recursor.conf - end - - prerequires - shadow-utils - systemd-units - end - - script prein - %{create_user} - end - - script postin - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - /bin/systemctl --no-reload enable pdns-recursor.service >/dev/null 2>&1 || : - end - - script preun - /bin/systemctl --no-reload disable pdns-recursor.service >/dev/null 2>&1 || : - /bin/systemctl stop pdns-recursor.service >/dev/null 2>&1 || : - end - - script postun - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - end - - script postup - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - /bin/systemctl try-restart pdns-recursor.service >/dev/null 2>&1 || : - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/pdns-recursor/pdns-recursor.tmpfiles b/pdns-recursor/pdns-recursor.tmpfiles deleted file mode 100644 index 2fbee00..0000000 --- a/pdns-recursor/pdns-recursor.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/pdns-recursor 0755 pdns-recursor pdns-recursor - diff --git a/pdns-recursor/recursor.conf b/pdns-recursor/recursor.conf deleted file mode 100644 index 284da99..0000000 --- a/pdns-recursor/recursor.conf +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -# Listen settings -local-address=::1 -local-port=54 - -# Socket settings -socket-dir=/run/pdns-recursor -socket-group=pdns-recursor -socket-owner=pdns-recursor -socket-mode=660 - -# Security settings -chroot=/var/lib/pdns-recursor -setgid=pdns-recursor -setuid=pdns-recursor diff --git a/pdns-recursor/systemd/pdns-recursor.service b/pdns-recursor/systemd/pdns-recursor.service deleted file mode 100644 index 095b595..0000000 --- a/pdns-recursor/systemd/pdns-recursor.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Power DNS Recursor Daemon -After=network.target - -[Service] -ExecStart=/usr/sbin/pdns_recursor --config-dir=/etc/pdns --daemon=no -ExecStopPost=/bin/rm -f /run/pdns-recursor/pdns_recursor.pid -ExecStopPost=/bin/rm -f /run/pdns-recursor/pdns_recursor.controlsocket -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/pdns/pdns.nm b/pdns/pdns.nm index 7d27149..3c25e9d 100644 --- a/pdns/pdns.nm +++ b/pdns/pdns.nm @@ -5,7 +5,7 @@ name = pdns version = 3.3.1 -release = 1 +release = 2 groups = Networking/DNS url = http://powerdns.com/ @@ -99,10 +99,6 @@ packages sqlite end - requires - pdns-recursor >= 3.3-8 - end - configfiles %{sysconfdir}/pdns/pdns.conf end diff --git a/squid/squid.nm b/squid/squid.nm index 7a8fa12..52821cf 100644 --- a/squid/squid.nm +++ b/squid/squid.nm @@ -6,7 +6,7 @@ name = squid major_ver = 3.1 version = %{major_ver}.19 -release = 1 +release = 2 maintainer = Christian Schmidt <christian.schmidt(a)ipfire.org> groups = Networking/Daemons @@ -32,7 +32,6 @@ build openssl-devel openldap-devel samba-devel - iptables-devel pam-devel libcap-devel /usr/bin/smbclient diff --git a/wget/wget.nm b/wget/wget.nm index dfdf4cd..4c51337 100644 --- a/wget/wget.nm +++ b/wget/wget.nm @@ -4,7 +4,7 @@ ############################################################################### name = wget -version = 1.16 +version = 1.16.3 release = 1 groups = Applications/Internet diff --git a/zlib/zlib.nm b/zlib/zlib.nm index 1737687..6c7fc3c 100644 --- a/zlib/zlib.nm +++ b/zlib/zlib.nm @@ -4,7 +4,7 @@ ############################################################################### name = zlib -version = 1.2.7 +version = 1.2.8 release = 1 groups = System/Libraries hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM June 2015