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, thirteen has been updated via 1913c6a86e0d199eb4eec7084ca9c2025a86bfc1 (commit) via 9983d55f6a3ad52a19c7ac3c4ee648f0142b8357 (commit) via 77a03efc2f8f5f802ef1405005e2984593ac4f6e (commit) via 9574fde3f75244eba632d482dc3b20523fe360fb (commit) via cfeb8fa3de05a525900e0b9d05bee5a4c9a97708 (commit) via 48b51e95962a29de229a47a5e6dfeb50018eab1a (commit) via cd1da6ff458909d486a48a32d91c6a21b0d65c20 (commit) via 207c9813bc3e1ef121bb1bac89752c0a850dda6d (commit) via b8e25fcdcd8ce84791799d332b43ea06dde46919 (commit) via 01b5bc917008f92d20016c1e5280b2cb5d2b8d97 (commit) via e218d500dd4e7d17591df9c449387c00359ee728 (commit) via ba890f65844a996100f0c2d32832fec53f194f42 (commit) via 35b5392a958b9f3439dab71a19485326c9d7343b (commit) via 96214c4f67aaba5cc0fb03a68510406ccd801695 (commit) from 79117dc15f51f12163f061e222bb02d77fa9b06d (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 1913c6a86e0d199eb4eec7084ca9c2025a86bfc1 Author: Michael Tremer Date: Tue Oct 9 12:18:34 2012 +0200 Reorder libassuan and libgpg-error. commit 9983d55f6a3ad52a19c7ac3c4ee648f0142b8357 Author: Erik Kapfer Date: Tue Oct 9 11:34:28 2012 +0200 pygpgme: New package + deps. commit 77a03efc2f8f5f802ef1405005e2984593ac4f6e Merge: 9574fde 79117dc Author: Michael Tremer Date: Tue Oct 9 11:17:53 2012 +0200 Merge remote-tracking branch 'origin/thirteen' into thirteen commit 9574fde3f75244eba632d482dc3b20523fe360fb Author: Erik Kapfer Date: Tue Oct 9 11:17:28 2012 +0200 urlgrabber: Update to 3.9.1. commit cfeb8fa3de05a525900e0b9d05bee5a4c9a97708 Author: Erik Kapfer Date: Tue Oct 9 11:16:37 2012 +0200 pycurl: New package. commit 48b51e95962a29de229a47a5e6dfeb50018eab1a Author: Erik Kapfer Date: Tue Oct 9 11:14:01 2012 +0200 pakfire3-deps: Add pycurl as dependency. commit cd1da6ff458909d486a48a32d91c6a21b0d65c20 Author: Erik Kapfer Date: Tue Oct 9 11:12:32 2012 +0200 curl: Update to 7.24.0. commit 207c9813bc3e1ef121bb1bac89752c0a850dda6d Merge: 421102e b8e25fc Author: Michael Tremer Date: Tue Oct 9 00:30:33 2012 +0200 Merge branch 'strongswan-5' into thirteen commit b8e25fcdcd8ce84791799d332b43ea06dde46919 Author: Michael Tremer Date: Tue Oct 9 00:29:38 2012 +0200 strongswan: Update to 5.0.1. commit 01b5bc917008f92d20016c1e5280b2cb5d2b8d97 Author: Michael Tremer Date: Wed Sep 26 23:05:21 2012 +0200 vpnmain.cgi: Support more ciphers and integrity algorithms. commit e218d500dd4e7d17591df9c449387c00359ee728 Merge: ba890f6 c7fa849 Author: Michael Tremer Date: Wed Sep 12 16:14:31 2012 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-5 commit ba890f65844a996100f0c2d32832fec53f194f42 Author: Michael Tremer Date: Wed Aug 8 00:40:43 2012 +0200 ipsecctrl: Don't shout when we have found an interface. commit 35b5392a958b9f3439dab71a19485326c9d7343b Author: Michael Tremer Date: Tue Aug 7 17:04:37 2012 +0200 vpnmain.cgi: Fix saving ENABLED status. The web interface ignores what has been set to the ENABLED checkbox. http://lists.ipfire.org/pipermail/development/2012-August/000047.html commit 96214c4f67aaba5cc0fb03a68510406ccd801695 Author: Michael Tremer Date: Sat Aug 4 11:39:56 2012 +0200 strongswan update: Add absolute path to ipsecctrl binary. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/curl | 2 +- config/rootfiles/core/strongswan/update.sh | 4 +- config/rootfiles/packages/gpgme | 18 +++++++++ config/rootfiles/packages/libassuan | 8 ++++ config/rootfiles/packages/libgpg-error | 25 +++++++++++++ config/rootfiles/packages/pycurl | 53 ++++++++++++++++++++++++++++ config/rootfiles/packages/pygpgme | 7 ++++ config/rootfiles/packages/urlgrabber | 22 +++-------- html/cgi-bin/vpnmain.cgi | 41 +++++++++++++++------ lfs/curl | 8 ++-- lfs/{libsigc++ => gpgme} | 14 +++++-- lfs/{liboping => libassuan} | 13 +++++-- lfs/{libdvbpsi => libgpg-error} | 10 +++--- lfs/pakfire3-deps | 4 +- lfs/{python-mechanize => pycurl} | 16 +++++--- lfs/{python-clientform => pygpgme} | 12 +++--- lfs/strongswan | 4 +- lfs/urlgrabber | 5 ++- make.sh | 5 +++ src/misc-progs/ipsecctrl.c | 6 --- 20 files changed, 206 insertions(+), 71 deletions(-) create mode 100644 config/rootfiles/packages/gpgme create mode 100644 config/rootfiles/packages/libassuan create mode 100644 config/rootfiles/packages/libgpg-error create mode 100644 config/rootfiles/packages/pycurl create mode 100644 config/rootfiles/packages/pygpgme copy lfs/{libsigc++ => gpgme} (94%) copy lfs/{liboping => libassuan} (94%) copy lfs/{libdvbpsi => libgpg-error} (94%) copy lfs/{python-mechanize => pycurl} (88%) copy lfs/{python-clientform => pygpgme} (94%) Difference in files: diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl index 1e962e0..2a9e16b 100644 --- a/config/rootfiles/common/curl +++ b/config/rootfiles/common/curl @@ -16,7 +16,7 @@ usr/bin/curl usr/lib/libcurl.so usr/lib/libcurl.so.3 usr/lib/libcurl.so.4 -usr/lib/libcurl.so.4.1.1 +usr/lib/libcurl.so.4.2.0 #usr/lib/pkgconfig/libcurl.pc #usr/share/man/man1/curl-config.1 #usr/share/man/man1/curl.1 diff --git a/config/rootfiles/core/strongswan/update.sh b/config/rootfiles/core/strongswan/update.sh index 7ef3f2f..c1d5975 100644 --- a/config/rootfiles/core/strongswan/update.sh +++ b/config/rootfiles/core/strongswan/update.sh @@ -34,7 +34,7 @@ done # #Stop services -ipsecctrl D +/usr/local/bin/ipsecctrl D # #Extract files @@ -49,7 +49,7 @@ rm -f /usr/local/bin/vpn-watch # Call the CGI script to regenerate the configuration files. /srv/web/ipfire/cgi-bin/vpnmain.cgi -ipsecctrl S +/usr/local/bin/ipsecctrl S # #Update Language cache diff --git a/config/rootfiles/packages/gpgme b/config/rootfiles/packages/gpgme new file mode 100644 index 0000000..2a03523 --- /dev/null +++ b/config/rootfiles/packages/gpgme @@ -0,0 +1,18 @@ +usr/bin/gpgme-config +#usr/include/gpgme.h +#usr/lib/libgpgme-pthread.la +usr/lib/libgpgme-pthread.so +usr/lib/libgpgme-pthread.so.11 +usr/lib/libgpgme-pthread.so.11.8.1 +#usr/lib/libgpgme.la +usr/lib/libgpgme.so +usr/lib/libgpgme.so.11 +usr/lib/libgpgme.so.11.8.1 +#usr/share/aclocal/gpgme.m4 +usr/share/common-lisp/source/gpgme +usr/share/common-lisp/source/gpgme/gpgme-package.lisp +usr/share/common-lisp/source/gpgme/gpgme.asd +usr/share/common-lisp/source/gpgme/gpgme.lisp +#usr/share/info/gpgme.info +#usr/share/info/gpgme.info-1 +#usr/share/info/gpgme.info-2 diff --git a/config/rootfiles/packages/libassuan b/config/rootfiles/packages/libassuan new file mode 100644 index 0000000..efe0df5 --- /dev/null +++ b/config/rootfiles/packages/libassuan @@ -0,0 +1,8 @@ +usr/bin/libassuan-config +#usr/include/assuan.h +#usr/lib/libassuan.la +usr/lib/libassuan.so +usr/lib/libassuan.so.0 +usr/lib/libassuan.so.0.3.0 +#usr/share/aclocal/libassuan.m4 +#usr/share/info/assuan.info diff --git a/config/rootfiles/packages/libgpg-error b/config/rootfiles/packages/libgpg-error new file mode 100644 index 0000000..dad751c --- /dev/null +++ b/config/rootfiles/packages/libgpg-error @@ -0,0 +1,25 @@ +usr/bin/gpg-error +usr/bin/gpg-error-config +#usr/include/gpg-error.h +#usr/lib/libgpg-error.la +usr/lib/libgpg-error.so +usr/lib/libgpg-error.so.0 +usr/lib/libgpg-error.so.0.8.0 +#usr/share/aclocal/gpg-error.m4 +usr/share/common-lisp +usr/share/common-lisp/source +usr/share/common-lisp/source/gpg-error +usr/share/common-lisp/source/gpg-error/gpg-error-codes.lisp +usr/share/common-lisp/source/gpg-error/gpg-error-package.lisp +usr/share/common-lisp/source/gpg-error/gpg-error.asd +usr/share/common-lisp/source/gpg-error/gpg-error.lisp +#usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo +usr/share/locale/de/LC_MESSAGES/libgpg-error.mo +usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/it/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/nl/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo diff --git a/config/rootfiles/packages/pycurl b/config/rootfiles/packages/pycurl new file mode 100644 index 0000000..ddbe585 --- /dev/null +++ b/config/rootfiles/packages/pycurl @@ -0,0 +1,53 @@ +usr/lib/python2.7/site-packages/curl +usr/lib/python2.7/site-packages/curl/__init__.py +usr/lib/python2.7/site-packages/curl/__init__.pyc +#usr/lib/python2.7/site-packages/pycurl-7.19.0-py2.7.egg-info +usr/lib/python2.7/site-packages/pycurl.so +#usr/share/doc/pycurl +#usr/share/doc/pycurl/COPYING +#usr/share/doc/pycurl/COPYING2 +#usr/share/doc/pycurl/ChangeLog +#usr/share/doc/pycurl/INSTALL +#usr/share/doc/pycurl/README +#usr/share/doc/pycurl/TODO +#usr/share/doc/pycurl/examples +#usr/share/doc/pycurl/examples/basicfirst.py +#usr/share/doc/pycurl/examples/file_upload.py +#usr/share/doc/pycurl/examples/linksys.py +#usr/share/doc/pycurl/examples/retriever-multi.py +#usr/share/doc/pycurl/examples/retriever.py +#usr/share/doc/pycurl/examples/sfquery.py +#usr/share/doc/pycurl/examples/xmlrpc_curl.py +#usr/share/doc/pycurl/html +#usr/share/doc/pycurl/html/callbacks.html +#usr/share/doc/pycurl/html/curlmultiobject.html +#usr/share/doc/pycurl/html/curlobject.html +#usr/share/doc/pycurl/html/curlshareobject.html +#usr/share/doc/pycurl/html/pycurl.html +#usr/share/doc/pycurl/tests +#usr/share/doc/pycurl/tests/test.py +#usr/share/doc/pycurl/tests/test_cb.py +#usr/share/doc/pycurl/tests/test_debug.py +#usr/share/doc/pycurl/tests/test_ftp.py +#usr/share/doc/pycurl/tests/test_getinfo.py +#usr/share/doc/pycurl/tests/test_gtk.py +#usr/share/doc/pycurl/tests/test_internals.py +#usr/share/doc/pycurl/tests/test_memleak.py +#usr/share/doc/pycurl/tests/test_multi.py +#usr/share/doc/pycurl/tests/test_multi2.py +#usr/share/doc/pycurl/tests/test_multi3.py +#usr/share/doc/pycurl/tests/test_multi4.py +#usr/share/doc/pycurl/tests/test_multi5.py +#usr/share/doc/pycurl/tests/test_multi6.py +#usr/share/doc/pycurl/tests/test_multi_socket.py +#usr/share/doc/pycurl/tests/test_multi_socket_select.py +#usr/share/doc/pycurl/tests/test_multi_timer.py +#usr/share/doc/pycurl/tests/test_multi_vs_thread.py +#usr/share/doc/pycurl/tests/test_post.py +#usr/share/doc/pycurl/tests/test_post2.py +#usr/share/doc/pycurl/tests/test_post3.py +#usr/share/doc/pycurl/tests/test_share.py +#usr/share/doc/pycurl/tests/test_socketopen.py +#usr/share/doc/pycurl/tests/test_stringio.py +#usr/share/doc/pycurl/tests/test_xmlrpc.py +#usr/share/doc/pycurl/tests/util.py diff --git a/config/rootfiles/packages/pygpgme b/config/rootfiles/packages/pygpgme new file mode 100644 index 0000000..83ffaf8 --- /dev/null +++ b/config/rootfiles/packages/pygpgme @@ -0,0 +1,7 @@ +usr/lib/python2.7/site-packages/gpgme +usr/lib/python2.7/site-packages/gpgme/__init__.py +usr/lib/python2.7/site-packages/gpgme/__init__.pyc +usr/lib/python2.7/site-packages/gpgme/_gpgme.so +usr/lib/python2.7/site-packages/gpgme/editutil.py +usr/lib/python2.7/site-packages/gpgme/editutil.pyc +#usr/lib/python2.7/site-packages/pygpgme-0.3-py2.7.egg-info diff --git a/config/rootfiles/packages/urlgrabber b/config/rootfiles/packages/urlgrabber index 66b9bb2..5e92a12 100644 --- a/config/rootfiles/packages/urlgrabber +++ b/config/rootfiles/packages/urlgrabber @@ -1,22 +1,12 @@ usr/bin/urlgrabber -#usr/lib/python2.7/site-packages/urlgrabber -#usr/lib/python2.7/site-packages/urlgrabber-3.1.0-py2.7.egg-info -#usr/lib/python2.7/site-packages/urlgrabber/__init__.py +usr/lib/python2.7/site-packages/urlgrabber +usr/lib/python2.7/site-packages/urlgrabber/__init__.py usr/lib/python2.7/site-packages/urlgrabber/__init__.pyc -#usr/lib/python2.7/site-packages/urlgrabber/byterange.py +usr/lib/python2.7/site-packages/urlgrabber/byterange.py usr/lib/python2.7/site-packages/urlgrabber/byterange.pyc -#usr/lib/python2.7/site-packages/urlgrabber/grabber.py +usr/lib/python2.7/site-packages/urlgrabber/grabber.py usr/lib/python2.7/site-packages/urlgrabber/grabber.pyc -#usr/lib/python2.7/site-packages/urlgrabber/keepalive.py -usr/lib/python2.7/site-packages/urlgrabber/keepalive.pyc -#usr/lib/python2.7/site-packages/urlgrabber/mirror.py +usr/lib/python2.7/site-packages/urlgrabber/mirror.py usr/lib/python2.7/site-packages/urlgrabber/mirror.pyc -#usr/lib/python2.7/site-packages/urlgrabber/progress.py +usr/lib/python2.7/site-packages/urlgrabber/progress.py usr/lib/python2.7/site-packages/urlgrabber/progress.pyc -#usr/lib/python2.7/site-packages/urlgrabber/sslfactory.py -usr/lib/python2.7/site-packages/urlgrabber/sslfactory.pyc -#usr/share/doc/urlgrabber-3.1.0 -#usr/share/doc/urlgrabber-3.1.0/ChangeLog -#usr/share/doc/urlgrabber-3.1.0/LICENSE -#usr/share/doc/urlgrabber-3.1.0/README -#usr/share/doc/urlgrabber-3.1.0/TODO diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 831ef93..91c1249 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -436,6 +436,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg goto SAVE_ERROR; } + $vpnsettings{'ENABLED'} = $cgiparams{'ENABLED'}; $vpnsettings{'VPN_IP'} = $cgiparams{'VPN_IP'}; $vpnsettings{'VPN_DELAYED_START'} = $cgiparams{'VPN_DELAYED_START'}; $vpnsettings{'RW_NET'} = $cgiparams{'RW_NET'}; @@ -1817,12 +1818,12 @@ END $cgiparams{'REMOTE_ID'} = ''; #use default advanced value - $cgiparams{'IKE_ENCRYPTION'} = 'aes256|aes128|3des'; #[18]; - $cgiparams{'IKE_INTEGRITY'} = 'sha|md5'; #[19]; - $cgiparams{'IKE_GROUPTYPE'} = '2048'; #[20]; + $cgiparams{'IKE_ENCRYPTION'} = 'aes256|aes192|aes128|3des'; #[18]; + $cgiparams{'IKE_INTEGRITY'} = 'sha2_256|sha|md5'; #[19]; + $cgiparams{'IKE_GROUPTYPE'} = '8192|6144|4096|3072|2048|1536|1024'; #[20]; $cgiparams{'IKE_LIFETIME'} = '1'; #[16]; - $cgiparams{'ESP_ENCRYPTION'} = 'aes256|aes128|3des'; #[21]; - $cgiparams{'ESP_INTEGRITY'} = 'sha1|md5'; #[22]; + $cgiparams{'ESP_ENCRYPTION'} = 'aes256|aes192|aes128|3des'; #[21]; + $cgiparams{'ESP_INTEGRITY'} = 'sha2_256|sha1|md5'; #[22]; $cgiparams{'ESP_GROUPTYPE'} = ''; #[23]; $cgiparams{'ESP_KEYLIFE'} = '8'; #[17]; $cgiparams{'COMPRESSION'} = 'on'; #[13]; @@ -2093,7 +2094,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || goto ADVANCED_ERROR; } foreach my $val (@temp) { - if ($val !~ /^(sha2_512|sha2_256|sha|md5)$/) { + if ($val !~ /^(sha2_512|sha2_384|sha2_256|sha|md5|aesxcbc)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ADVANCED_ERROR; } @@ -2123,7 +2124,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || goto ADVANCED_ERROR; } foreach my $val (@temp) { - if ($val !~ /^(aes256|aes128|3des)$/) { + if ($val !~ /^(aes256|aes192|aes128|3des)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ADVANCED_ERROR; } @@ -2134,13 +2135,13 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || goto ADVANCED_ERROR; } foreach my $val (@temp) { - if ($val !~ /^(sha2_512|sha2_256|sha1|md5)$/) { + if ($val !~ /^(sha2_512|sha2_384|sha2_256|sha1|md5|aesxcbc)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ADVANCED_ERROR; } } if ($cgiparams{'ESP_GROUPTYPE'} ne '' && - $cgiparams{'ESP_GROUPTYPE'} !~ /^modp(1024|1536|2048|3072|4096)$/) { + $cgiparams{'ESP_GROUPTYPE'} !~ /^modp(1024|1536|2048|3072|4096|6144|8192)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ADVANCED_ERROR; } @@ -2205,14 +2206,17 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || ADVANCED_ERROR: $checked{'IKE_ENCRYPTION'}{'aes256'} = ''; + $checked{'IKE_ENCRYPTION'}{'aes192'} = ''; $checked{'IKE_ENCRYPTION'}{'aes128'} = ''; $checked{'IKE_ENCRYPTION'}{'3des'} = ''; my @temp = split('\|', $cgiparams{'IKE_ENCRYPTION'}); foreach my $key (@temp) {$checked{'IKE_ENCRYPTION'}{$key} = "selected='selected'"; } $checked{'IKE_INTEGRITY'}{'sha2_512'} = ''; + $checked{'IKE_INTEGRITY'}{'sha2_384'} = ''; $checked{'IKE_INTEGRITY'}{'sha2_256'} = ''; $checked{'IKE_INTEGRITY'}{'sha'} = ''; $checked{'IKE_INTEGRITY'}{'md5'} = ''; + $checked{'IKE_INTEGRITY'}{'aesxcbc'} = ''; @temp = split('\|', $cgiparams{'IKE_INTEGRITY'}); foreach my $key (@temp) {$checked{'IKE_INTEGRITY'}{$key} = "selected='selected'"; } $checked{'IKE_GROUPTYPE'}{'768'} = ''; @@ -2229,16 +2233,18 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || # 768 is not supported by strongswan $checked{'IKE_GROUPTYPE'}{'768'} = ''; - $checked{'ESP_ENCRYPTION'}{'aes256'} = ''; + $checked{'ESP_ENCRYPTION'}{'aes192'} = ''; $checked{'ESP_ENCRYPTION'}{'aes128'} = ''; $checked{'ESP_ENCRYPTION'}{'3des'} = ''; @temp = split('\|', $cgiparams{'ESP_ENCRYPTION'}); foreach my $key (@temp) {$checked{'ESP_ENCRYPTION'}{$key} = "selected='selected'"; } $checked{'ESP_INTEGRITY'}{'sha2_512'} = ''; + $checked{'ESP_INTEGRITY'}{'sha2_384'} = ''; $checked{'ESP_INTEGRITY'}{'sha2_256'} = ''; $checked{'ESP_INTEGRITY'}{'sha1'} = ''; $checked{'ESP_INTEGRITY'}{'md5'} = ''; + $checked{'ESP_INTEGRITY'}{'aesxcbc'} = ''; @temp = split('\|', $cgiparams{'ESP_INTEGRITY'}); foreach my $key (@temp) {$checked{'ESP_INTEGRITY'}{$key} = "selected='selected'"; } $checked{'ESP_GROUPTYPE'}{$cgiparams{'ESP_GROUPTYPE'}} = "selected='selected'"; @@ -2276,14 +2282,19 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $Lang::tr{'ike encryption'} $Lang::tr{'ike integrity'} $Lang::tr{'ike grouptype'} @@ -2306,13 +2317,19 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $Lang::tr{'esp encryption'} + + + - + + + $Lang::tr{'esp grouptype'}