* [git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 1913c6a86e0d199eb4eec7084ca9c2025a86bfc1
@ 2012-10-09 10:18 git
0 siblings, 0 replies; only message in thread
From: git @ 2012-10-09 10:18 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 44412 bytes --]
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 <michael.tremer(a)ipfire.org>
Date: Tue Oct 9 12:18:34 2012 +0200
Reorder libassuan and libgpg-error.
commit 9983d55f6a3ad52a19c7ac3c4ee648f0142b8357
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Tue Oct 9 11:34:28 2012 +0200
pygpgme: New package + deps.
commit 77a03efc2f8f5f802ef1405005e2984593ac4f6e
Merge: 9574fde 79117dc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 9 11:17:53 2012 +0200
Merge remote-tracking branch 'origin/thirteen' into thirteen
commit 9574fde3f75244eba632d482dc3b20523fe360fb
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Tue Oct 9 11:17:28 2012 +0200
urlgrabber: Update to 3.9.1.
commit cfeb8fa3de05a525900e0b9d05bee5a4c9a97708
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Tue Oct 9 11:16:37 2012 +0200
pycurl: New package.
commit 48b51e95962a29de229a47a5e6dfeb50018eab1a
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Tue Oct 9 11:14:01 2012 +0200
pakfire3-deps: Add pycurl as dependency.
commit cd1da6ff458909d486a48a32d91c6a21b0d65c20
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Tue Oct 9 11:12:32 2012 +0200
curl: Update to 7.24.0.
commit 207c9813bc3e1ef121bb1bac89752c0a850dda6d
Merge: 421102e b8e25fc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 9 00:30:33 2012 +0200
Merge branch 'strongswan-5' into thirteen
commit b8e25fcdcd8ce84791799d332b43ea06dde46919
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 9 00:29:38 2012 +0200
strongswan: Update to 5.0.1.
commit 01b5bc917008f92d20016c1e5280b2cb5d2b8d97
Author: Michael Tremer <michael.tremer(a)ipfire.org>
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 <michael.tremer(a)ipfire.org>
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 <michael.tremer(a)ipfire.org>
Date: Wed Aug 8 00:40:43 2012 +0200
ipsecctrl: Don't shout when we have found an interface.
commit 35b5392a958b9f3439dab71a19485326c9d7343b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
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 <michael.tremer(a)ipfire.org>
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'}) ||
<tr><td class='boldbase' align='right' valign='top'>$Lang::tr{'ike encryption'}</td><td class='boldbase' valign='top'>
<select name='IKE_ENCRYPTION' multiple='multiple' size='4'>
<option value='aes256' $checked{'IKE_ENCRYPTION'}{'aes256'}>AES (256 bit)</option>
+ <option value='aes192' $checked{'IKE_ENCRYPTION'}{'aes192'}>AES (192 bit)</option>
<option value='aes128' $checked{'IKE_ENCRYPTION'}{'aes128'}>AES (128 bit)</option>
<option value='3des' $checked{'IKE_ENCRYPTION'}{'3des'}>3DES</option>
</select></td>
<td class='boldbase' align='right' valign='top'>$Lang::tr{'ike integrity'}</td><td class='boldbase' valign='top'>
<select name='IKE_INTEGRITY' multiple='multiple' size='4'>
- <option value='sha' $checked{'IKE_INTEGRITY'}{'sha'}>SHA</option>
+ <option value='sha2_512' $checked{'IKE_INTEGRITY'}{'sha2_512'}>SHA2 512 bit</option>
+ <option value='sha2_384' $checked{'IKE_INTEGRITY'}{'sha2_384'}>SHA2 384 bit</option>
+ <option value='sha2_256' $checked{'IKE_INTEGRITY'}{'sha2_256'}>SHA2 256 bit</option>
+ <option value='sha' $checked{'IKE_INTEGRITY'}{'sha'}>SHA1</option>
<option value='md5' $checked{'IKE_INTEGRITY'}{'md5'}>MD5</option>
+ <option value='aesxcbc' $checked{'IKE_INTEGRITY'}{'aesxcbc'}>AES XCBC</option>
</select></td>
<td class='boldbase' align='right' valign='top'>$Lang::tr{'ike grouptype'}</td><td class='boldbase' valign='top'>
@@ -2306,13 +2317,19 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
<td class='boldbase' align='right' valign='top'>$Lang::tr{'esp encryption'}</td><td class='boldbase' valign='top'>
<select name='ESP_ENCRYPTION' multiple='multiple' size='4'>
<option value='aes256' $checked{'ESP_ENCRYPTION'}{'aes256'}>AES (256 bit)</option>
+ <option value='aes192' $checked{'ESP_ENCRYPTION'}{'aes192'}>AES (192 bit)</option>
<option value='aes128' $checked{'ESP_ENCRYPTION'}{'aes128'}>AES (128 bit)</option>
<option value='3des' $checked{'ESP_ENCRYPTION'}{'3des'}>3DES</option>
<td class='boldbase' align='right' valign='top'>$Lang::tr{'esp integrity'}</td><td class='boldbase' valign='top'>
<select name='ESP_INTEGRITY' multiple='multiple' size='4'>
+ <option value='sha2_512' $checked{'ESP_INTEGRITY'}{'sha2_512'}>SHA2 512 bit</option>
+ <option value='sha2_384' $checked{'ESP_INTEGRITY'}{'sha2_384'}>SHA2 384 bit</option>
+ <option value='sha2_256' $checked{'ESP_INTEGRITY'}{'sha2_256'}>SHA2 256 bit</option>
<option value='sha1' $checked{'ESP_INTEGRITY'}{'sha1'}>SHA1</option>
- <option value='md5' $checked{'ESP_INTEGRITY'}{'md5'}>MD5</option></select></td>
+ <option value='md5' $checked{'ESP_INTEGRITY'}{'md5'}>MD5</option>
+ <option value='aesxcbc' $checked{'ESP_INTEGRITY'}{'aesxcbc'}>AES XCBC</option>
+ </select></td>
<td class='boldbase' align='right' valign='top'>$Lang::tr{'esp grouptype'}</td><td class='boldbase' valign='top'>
<select name='ESP_GROUPTYPE'>
diff --git a/lfs/curl b/lfs/curl
index 2c54c67..5b6e3b8 100644
--- a/lfs/curl
+++ b/lfs/curl
@@ -24,10 +24,10 @@
include Config
-VER = 7.19.5
+VER = 7.24.0
THISAPP = curl-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 426d161661dce70c8ea9ad8f553363a3
+$(DL_FILE)_MD5 = b93420f80a2baaa61a0f45214eddc2ba
install : $(TARGET)
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/gpgme b/lfs/gpgme
new file mode 100644
index 0000000..12da4cb
--- /dev/null
+++ b/lfs/gpgme
@@ -0,0 +1,84 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 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/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.3.2
+
+THISAPP = gpgme-$(VER)
+DL_FILE = $(THISAPP).tar.bz2
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = gpgme
+PAK_VER = 1
+
+DEPS = "libgpg-error libassuan"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 326fe97077141713f0930aa87949a287
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/libassuan b/lfs/libassuan
new file mode 100644
index 0000000..3a32984
--- /dev/null
+++ b/lfs/libassuan
@@ -0,0 +1,84 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 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/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2.0.3
+
+THISAPP = libassuan-$(VER)
+DL_FILE = $(THISAPP).tar.bz2
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = libassuan
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 179d1918325fdb928c7bd90b8a514fc7
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/libgpg-error b/lfs/libgpg-error
new file mode 100644
index 0000000..59108c1
--- /dev/null
+++ b/lfs/libgpg-error
@@ -0,0 +1,84 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 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/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.10
+
+THISAPP = libgpg-error-$(VER)
+DL_FILE = $(THISAPP).tar.bz2
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = libgpg-error
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 736a03daa9dc5873047d4eb4a9c22a16
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/pakfire3-deps b/lfs/pakfire3-deps
index 3a34e4f..1403a81 100644
--- a/lfs/pakfire3-deps
+++ b/lfs/pakfire3-deps
@@ -29,8 +29,8 @@ VER = 0
THISAPP = pakfire3-deps
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = pakfire3-deps
-PAK_VER = 1
-DEPS = "intltool git make libsatsolver python-satsolver python-distutils python-distutils-extra python-lzma python-progressbar python-xattr sqlite urlgrabber"
+PAK_VER = 2
+DEPS = "intltool git make libsatsolver pycurl python-satsolver python-distutils python-distutils-extra python-lzma python-progressbar python-xattr sqlite urlgrabber"
###############################################################################
diff --git a/lfs/pycurl b/lfs/pycurl
new file mode 100644
index 0000000..2bc3c44
--- /dev/null
+++ b/lfs/pycurl
@@ -0,0 +1,86 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 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/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 7.19.0
+
+THISAPP = pycurl-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = pycurl
+PAK_VER = 1
+
+DEPS = "curl"
+
+CFLAGS += -DHAVE_CURL_OPENSSL
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 919d58fe37e69fe87ce4534d8b6a1c7b
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-pycurl-fix-do_curl_reset-refcount.patch
+ cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/python-pycurl-no-static-libs.patch
+ cd $(DIR_APP) && python setup.py install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/pygpgme b/lfs/pygpgme
new file mode 100644
index 0000000..4adf25a
--- /dev/null
+++ b/lfs/pygpgme
@@ -0,0 +1,82 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 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/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.3
+
+THISAPP = pygpgme-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = pygpgme
+PAK_VER = 1
+
+DEPS = "gpgme"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = d38355af73f0352cde3d410b25f34fd0
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python setup.py install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/strongswan b/lfs/strongswan
index 3d22086..e6be0c2 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
include Config
-VER = 5.0.0
+VER = 5.0.1
THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c8b861305def7c0abae04f7bbefec212
+$(DL_FILE)_MD5 = 58fdeb49f133139a58f4d8adafc69a16
install : $(TARGET)
diff --git a/lfs/urlgrabber b/lfs/urlgrabber
index 9752a65..f2966c3 100644
--- a/lfs/urlgrabber
+++ b/lfs/urlgrabber
@@ -24,7 +24,7 @@
include Config
-VER = 3.1.0
+VER = 3.9.1
THISAPP = urlgrabber-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -44,7 +44,8 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2a92d8ce0d89c5e772a98e9b8dcd5b73
+$(DL_FILE)_MD5 = 00c8359bf71062d0946bacea521f80b4
+
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
diff --git a/make.sh b/make.sh
index b0f8b31..64cde45 100755
--- a/make.sh
+++ b/make.sh
@@ -692,6 +692,7 @@ buildipfire() {
ipfiremake iw
ipfiremake wpa_supplicant
ipfiremake hostapd
+ ipfiremake pycurl
ipfiremake urlgrabber
ipfiremake syslinux
ipfiremake tftpd
@@ -760,6 +761,10 @@ buildipfire() {
ipfiremake acpid
ipfiremake fping
ipfiremake telnet
+ ipfiremake libgpg-error
+ ipfiremake libassuan
+ ipfiremake gpgme
+ ipfiremake pygpgme
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild
diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c
index 65a96e0..633004e 100644
--- a/src/misc-progs/ipsecctrl.c
+++ b/src/misc-progs/ipsecctrl.c
@@ -270,22 +270,16 @@ int main(int argc, char *argv[]) {
findkey(kv, "GREEN_DEV", if_green);
if (VALID_DEVICE(if_green))
enable_green++;
- else
- fprintf(stderr, "IPSec enabled on green but green interface is invalid or not found\n");
// Check if ORANGE is enabled.
findkey(kv, "ORANGE_DEV", if_orange);
if (VALID_DEVICE(if_orange))
enable_orange++;
- else
- fprintf(stderr, "IPSec enabled on orange but orange interface is invalid or not found\n");
// Check if BLUE is enabled.
findkey(kv, "BLUE_DEV", if_blue);
if (VALID_DEVICE(if_blue))
enable_blue++;
- else
- fprintf(stderr, "IPSec enabled on blue but blue interface is invalid or not found\n");
freekeyvalues(kv);
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-10-09 10:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-09 10:18 [git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 1913c6a86e0d199eb4eec7084ca9c2025a86bfc1 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox