Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

This commit is contained in:
Matthias Fischer
2015-06-15 00:43:43 +02:00
50 changed files with 150 additions and 341 deletions

View File

@@ -0,0 +1,4 @@
/usr/sieve
/var/imap
/var/ipfire/cyrusimap
/var/log/imap

View File

@@ -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

View File

@@ -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

View File

@@ -92,7 +92,6 @@ srv/web/ipfire/html/blob.gif
srv/web/ipfire/html/clwarn.cgi
srv/web/ipfire/html/dial.cgi
srv/web/ipfire/html/favicon.ico
#srv/web/ipfire/html/graphs
#srv/web/ipfire/html/images
srv/web/ipfire/html/images/IPFire.png
srv/web/ipfire/html/images/add.gif
@@ -357,3 +356,5 @@ srv/web/ipfire/html/themes/maniac/include/style.css
var/updatecache
var/updatecache/download
var/updatecache/metadata
srv/web/ipfire/html/accounting
srv/web/ipfire/html/graphs

View File

@@ -1,3 +1,7 @@
etc/system-release
etc/issue
opt/pakfire/lib/functions.pl
srv/web/ipfire/cgi-bin/connections.cgi
srv/web/ipfire/cgi-bin/dhcp.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
var/ipfire/langs

View File

@@ -0,0 +1 @@
../../../../common/i586/openssl-sse2

View File

@@ -0,0 +1 @@
../../../../common/i586/strongswan-padlock

View File

@@ -0,0 +1 @@
../../../common/openssh

View File

@@ -0,0 +1 @@
../../../common/openssl

View File

@@ -0,0 +1 @@
../../../common/pcre

View File

@@ -1 +0,0 @@
../../../common/python

View File

@@ -0,0 +1 @@
../../../common/strongswan

View File

@@ -31,16 +31,31 @@ do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
done
# Stop services
/etc/init.d/ipsec stop
# Extract files
extract_files
# Create some missing graphs folders (core90)
mkdir -p /srv/web/ipfire/html/{accounting,graphs}
chmod 777 /srv/web/ipfire/html/{accounting,graphs}
# Update Language cache
update-lang-cache
/usr/local/bin/update-lang-cache
# Regenerate IPsec configuration
sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
sync
# Start services
if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
/etc/init.d/ipsec start
fi
# This update need a reboot...
#touch /var/run/need_reboot
touch /var/run/need_reboot
# Finish
/etc/init.d/fireinfo start

View File

@@ -146,6 +146,7 @@ var/imap/msg
var/imap/proc
var/imap/ptclient
var/imap/socket
var/ipfire/backup/addons/includes/cyrus-imapd
var/ipfire/cyrusimap
var/ipfire/cyrusimap/cyrus.conf
var/ipfire/cyrusimap/imapd.conf

View File

@@ -960,6 +960,9 @@ WARNING: untranslated string: ovpn routes push options
WARNING: untranslated string: p2p block
WARNING: untranslated string: p2p block save notice
WARNING: untranslated string: pakfire ago
WARNING: untranslated string: pptp netconfig
WARNING: untranslated string: pptp peer
WARNING: untranslated string: pptp route
WARNING: untranslated string: proxy reports
WARNING: untranslated string: proxy reports daily
WARNING: untranslated string: proxy reports monthly

View File

@@ -971,6 +971,9 @@ WARNING: untranslated string: ovpn port in root range
WARNING: untranslated string: p2p block
WARNING: untranslated string: p2p block save notice
WARNING: untranslated string: pakfire ago
WARNING: untranslated string: pptp netconfig
WARNING: untranslated string: pptp peer
WARNING: untranslated string: pptp route
WARNING: untranslated string: proxy reports
WARNING: untranslated string: proxy reports daily
WARNING: untranslated string: proxy reports monthly

View File

@@ -708,6 +708,9 @@ WARNING: untranslated string: no data
WARNING: untranslated string: outgoing compression in bytes per second
WARNING: untranslated string: outgoing overhead in bytes per second
WARNING: untranslated string: ovpn add conf
WARNING: untranslated string: pptp netconfig
WARNING: untranslated string: pptp peer
WARNING: untranslated string: pptp route
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed

View File

@@ -749,6 +749,9 @@ WARNING: untranslated string: ovpn dh upload
WARNING: untranslated string: ovpn generating the root and host certificates
WARNING: untranslated string: ovpn ha
WARNING: untranslated string: ovpn hmac
WARNING: untranslated string: pptp netconfig
WARNING: untranslated string: pptp peer
WARNING: untranslated string: pptp route
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added

View File

@@ -960,6 +960,9 @@ WARNING: untranslated string: ovpn routes push options
WARNING: untranslated string: p2p block
WARNING: untranslated string: p2p block save notice
WARNING: untranslated string: pakfire ago
WARNING: untranslated string: pptp netconfig
WARNING: untranslated string: pptp peer
WARNING: untranslated string: pptp route
WARNING: untranslated string: proxy reports
WARNING: untranslated string: proxy reports daily
WARNING: untranslated string: proxy reports monthly

View File

@@ -954,6 +954,9 @@ WARNING: untranslated string: ovpn no connections
WARNING: untranslated string: ovpn port in root range
WARNING: untranslated string: p2p block
WARNING: untranslated string: p2p block save notice
WARNING: untranslated string: pptp netconfig
WARNING: untranslated string: pptp peer
WARNING: untranslated string: pptp route
WARNING: untranslated string: proxy reports
WARNING: untranslated string: proxy reports daily
WARNING: untranslated string: proxy reports monthly

View File

@@ -687,6 +687,9 @@ WARNING: untranslated string: no data
WARNING: untranslated string: outgoing compression in bytes per second
WARNING: untranslated string: outgoing overhead in bytes per second
WARNING: untranslated string: ovpn add conf
WARNING: untranslated string: pptp netconfig
WARNING: untranslated string: pptp peer
WARNING: untranslated string: pptp route
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed

View File

@@ -437,6 +437,9 @@
< ovpn reneg sec
< p2p block
< p2p block save notice
< pptp netconfig
< pptp peer
< pptp route
< proxy reports
< proxy reports daily
< proxy reports monthly
@@ -1023,6 +1026,9 @@
< ovpn routes push options
< p2p block
< p2p block save notice
< pptp netconfig
< pptp peer
< pptp route
< proxy reports
< proxy reports daily
< proxy reports monthly
@@ -1573,6 +1579,9 @@
< ovpn routes push options
< p2p block
< p2p block save notice
< pptp netconfig
< pptp peer
< pptp route
< proxy reports
< proxy reports daily
< proxy reports monthly
@@ -2126,6 +2135,9 @@
< ovpn reneg sec
< p2p block
< p2p block save notice
< pptp netconfig
< pptp peer
< pptp route
< proxy reports
< proxy reports daily
< proxy reports monthly

View File

@@ -438,6 +438,9 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'add'}.'2') {
if ($dhcpsettings{'KEY2'} eq '') { #add or edit ?
unshift (@current2, "$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADDR'},$dhcpsettings{'FIX_ENABLED'},$dhcpsettings{'FIX_NEXTADDR'},$dhcpsettings{'FIX_FILENAME'},$dhcpsettings{'FIX_ROOTPATH'},$dhcpsettings{'FIX_REMARK'}\n");
&General::log($Lang::tr{'fixed ip lease added'});
# Enter edit mode
$dhcpsettings{'KEY2'} = $key;
} else {
@current2[$dhcpsettings{'KEY2'}] = "$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADDR'},$dhcpsettings{'FIX_ENABLED'},$dhcpsettings{'FIX_NEXTADDR'},$dhcpsettings{'FIX_FILENAME'},$dhcpsettings{'FIX_ROOTPATH'},$dhcpsettings{'FIX_REMARK'}\n";
$dhcpsettings{'KEY2'} = ''; # End edit mode

View File

@@ -793,15 +793,15 @@ print <<END
<td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'pptp settings'}</b></td>
</tr>
<tr>
<td width='25%'>Peer</td>
<td width='25%'>$Lang::tr{'pptp peer'}:</td>
<td colspan='3'><input size=50 type='text' name='PPTP_PEER' value='$pppsettings{'PPTP_PEER'}' /></td>
</tr>
<tr>
<td width='25%'>My Netconfig</td>
<td width='25%'>$Lang::tr{'pptp netconfig'}:</td>
<td colspan='3'><input size=50 type='text' name='PPTP_NICCFG' value='$pppsettings{'PPTP_NICCFG'}' /></td>
</tr>
<tr>
<td width='25%'>PPTP Route&nbsp;<img src='/blob.gif' alt='*' /></td>
<td width='25%'>$Lang::tr{'pptp route'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
<td colspan='3'><input size=50 type='text' name='PPTP_ROUTE' value='$pppsettings{'PPTP_ROUTE'}' /></td>
</tr>

View File

@@ -253,8 +253,10 @@ sub writeipsecfiles {
print CONF "\n";
# Add user includes to config file
print CONF "include /etc/ipsec.user.conf\n";
print CONF "\n";
if (-e "/etc/ipsec.user.conf") {
print CONF "include /etc/ipsec.user.conf\n";
print CONF "\n";
}
print SECRETS "include /etc/ipsec.user.secrets\n";
@@ -407,6 +409,14 @@ sub writeipsecfiles {
print CONF "\n";
}#foreach key
# Add post user includes to config file
# After the GUI-connections allows to patch connections.
if (-e "/etc/ipsec.user-post.conf") {
print CONF "include /etc/ipsec.user-post.conf\n";
print CONF "\n";
}
print SECRETS $last_secrets if ($last_secrets);
close(CONF);
close(SECRETS);

View File

@@ -30,7 +30,6 @@ my $acl_src_noaccess_mac = "$apdir/acls/src_noaccess_mac.acl";
my $banner = "A D V A N C E D &nbsp; P R O X Y &nbsp; - &nbsp; W E B &nbsp; A C C E S S &nbsp; M A N A G E R";
my %cgiparams;
my %mainsettings;
my %proxysettings;
my %acl=();
@@ -38,18 +37,10 @@ my @group_defs=();
my @groups=();
### Initialize environment
&readhash("${swroot}/main/settings", \%mainsettings);
&readhash("${swroot}/proxy/advanced/settings", \%proxysettings);
$language = $mainsettings{'LANGUAGE'};
### Initialize language
if ($language =~ /^(\w+)$/) {$language = $1;}
#
# Uncomment this to force a certain language:
# $language='en';
#
require "${swroot}/langs/en.pl";
require "${swroot}/langs/${language}.pl";
require "${swroot}/lang.pl";
&getcgihash(\%cgiparams);

View File

@@ -1822,6 +1822,9 @@
'ppp setup' => 'PPP-Einstellungen',
'pppoe' => 'PPPoE',
'pppoe settings' => 'Zusätzliche PPPoE-Einstellungen:',
'pptp netconfig' => 'Eigene Netzkonfiguration',
'pptp peer' => 'Gegenstelle',
'pptp route' => 'PPTP-Route',
'pptp settings' => 'Zusätzliche PPTP-Einstellungen:',
'pre-shared key is too short' => 'Pre-shared Schlüsel ist zu kurz',
'prefered master' => 'Prefered Master',

View File

@@ -1852,6 +1852,9 @@
'ppp setup' => 'PPP setup',
'pppoe' => 'PPPoE',
'pppoe settings' => 'Additional PPPoE settings:',
'pptp netconfig' => 'My Net Config',
'pptp peer' => 'Peer',
'pptp route' => 'PPTP Route',
'pptp settings' => 'Additional PPTP settings:',
'pre-shared key is too short' => 'Pre-shared key is too short.',
'prefered master' => 'Prefered Master',

View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = cyrus-imapd
PAK_VER = 4
PAK_VER = 5
DEPS = ""
@@ -100,5 +100,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cp -f $(DIR_APP)/tools/mkimap /usr/bin
sudo -u cyrus /usr/bin/mkimap /var/ipfire/cyrusimap/imapd.conf
chown cyrus.mail /var/imap/socket
install -v -m 644 $(DIR_SRC)/config/backup/includes/cyrus-imapd \
/var/ipfire/backup/addons/includes/cyrus-imapd
@rm -rf $(DIR_APP) /usr/include/com_err.h
@$(POSTBUILD)

View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = netsnmpd
PAK_VER = 3
PAK_VER = 4
DEPS = ""
###############################################################################

View File

@@ -24,7 +24,7 @@
include Config
VER = 1.0.2a
VER = 1.0.2b
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -82,7 +82,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = a06c547dac9044161a477211049f60ef
$(DL_FILE)_MD5 = 7729b259e2dea7d60b32fc3934d6984b
install : $(TARGET)

View File

@@ -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)

View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = postfix
PAK_VER = 7
PAK_VER = 8
DEPS = "amavisd mysql"

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2015 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -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)

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2015 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,12 +24,12 @@
include Config
VER = 2.7.1
VER = 2.7.3
include python
PROG = python-optional-src
PAK_VER = 2
PAK_VER = 3
DEPS =
dist:

View File

@@ -24,7 +24,7 @@
include Config
VER = 5.3.0
VER = 5.3.1
THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = c52d4228231c2025d9c320d0e9990327
$(DL_FILE)_MD5 = 66f258901a3d6c271da1a0c7fb3e5013
install : $(TARGET)
@@ -78,10 +78,10 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.3.1-build-timeattack.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-ipfire.patch
cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh
cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP) && ./configure \
--prefix="/usr" \
--sysconfdir="/etc" \

View File

@@ -24,7 +24,7 @@
include Config
VER = 0.2.5.12
VER = 0.2.6.9
THISAPP = tor-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tor
PAK_VER = 11
PAK_VER = 12
DEPS = "libevent2"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 89745069a7efb7aafd01ae263bd0fe5c
$(DL_FILE)_MD5 = 4a1b334c30d7b37ea72fa33425220d5d
install : $(TARGET)

View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vsftpd
PAK_VER = 7
PAK_VER = 8
DEPS = ""

View File

@@ -26,7 +26,7 @@ NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.17" # Version number
CORE="91" # Core Level (Filename)
PAKFIRE_CORE="90" # Core Level (PAKFIRE)
PAKFIRE_CORE="91" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir

View File

@@ -79,18 +79,13 @@ int main(int argc, char *argv[])
freekeyvalues(kv);
kv = NULL;
if (!(gw = fopen(CONFIG_ROOT "/red/remote-ipaddress", "r")))
{
if ((gw = fopen(CONFIG_ROOT "/red/remote-ipaddress", "r"))) {
if (fgets(gateway, STRING_SIZE, gw) == NULL) {
fprintf(stderr, "Couldn't read remote-ipaddress\n");
exit(1);
}
} else {
fprintf(stderr, "Couldn't open remote-ipaddress file\n");
fclose(gw);
gw = NULL;
exit(1);
}
if (fgets(gateway, STRING_SIZE, gw) == NULL)
{
fprintf(stderr, "Couldn't read remote-ipaddress\n");
exit(1);
}
if (!(fd = fopen(CONFIG_ROOT "/main/hosts", "r")))
@@ -112,7 +107,8 @@ int main(int argc, char *argv[])
else
fprintf(hosts, "%s\t%s\n",address,hostname);
fprintf(hosts, "%s\tgateway\n",gateway);
if (strlen(gateway) > 0)
fprintf(hosts, "%s\tgateway\n", gateway);
while (fgets(buffer, STRING_SIZE, fd))
{

View File

@@ -890,6 +890,7 @@ sub checkcryptodb {
unless ( "$ret" eq "0" ) {
message("CRYPTO WARN: The GnuPG isn't configured corectly. Trying now to fix this.");
message("CRYPTO WARN: It's normal to see this on first execution.");
message("CRYPTO WARN: If this message is being shown repeatedly, check if time and date are set correctly, and if IPFire can connect via port 11371 TCP.");
my $command = "gpg --keyserver pgp.ipfire.org --always-trust --status-fd 2";
system("$command --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1");
system("$command --recv-key $trustid >> $Conf::logdir/gnupg-database.log 2>&1");

View File

@@ -22,6 +22,7 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
extract_backup_includes
stop_service ${NAME}
make_backup ${NAME}
remove_files

View File

@@ -22,6 +22,7 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
extract_backup_includes
stop_service ${NAME}
make_backup ${NAME}
remove_files

View File

@@ -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

View File

@@ -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

View File

@@ -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'],

View File

@@ -1,34 +0,0 @@
From 4b59d129fd1026bab37256af0df9ae7ace39e7ba Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 27 Apr 2015 18:49:45 +0200
Subject: [PATCH] stroke: Increase stroke buffer size to 8k
Complicated connections can have lots of arguments
for the ike= and esp= directives in the ipsec.conf
configuration file. strongSwan wouldn't import those
because the size of the message that is send from
stroke to charon exceeded the limit of 4k.
This patch increases the size of the buffer that
can be passed to charon to 8k which should be enough
even for connections with longer configurations.
---
src/stroke/stroke_msg.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/stroke/stroke_msg.h b/src/stroke/stroke_msg.h
index c2b923f6db9a..c391efa00105 100644
--- a/src/stroke/stroke_msg.h
+++ b/src/stroke/stroke_msg.h
@@ -32,7 +32,7 @@
*/
#define STROKE_SOCKET IPSEC_PIDDIR "/charon.ctl"
-#define STROKE_BUF_LEN 4096
+#define STROKE_BUF_LEN 8192
typedef enum list_flag_t list_flag_t;
--
2.1.0

View File

@@ -0,0 +1,11 @@
--- strongswan-5.3.1/scripts/Makefile.am.old 2015-06-04 17:20:43.539244145 +0000
+++ strongswan-5.3.1/scripts/Makefile.am 2015-06-04 17:20:51.760510631 +0000
@@ -42,7 +42,7 @@
dnssec_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
aes_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
settings_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
-timeattack_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
+timeattack_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(RTLIB)
key2keyid.o : $(top_builddir)/config.status