IPFire-SCM June 2015

ipfire-scm@lists.ipfire.org

1 participants
51 discussions

[git.ipfire.org] IPFire 2.x development tree tag, v2.17-core91, created. 1f99566dd268515c18a8d8ae2e8ab526c490b99b
by git＠ipfire.org 12 Jun '15

12 Jun '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The tag, v2.17-core91 has been created at 1f99566dd268515c18a8d8ae2e8ab526c490b99b (commit) - Log ----------------------------------------------------------------- commit 1f99566dd268515c18a8d8ae2e8ab526c490b99b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 12 17:54:38 2015 +0200 openssl: update to 1.0.2c fix ABI problems. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 1f99566dd268515c18a8d8ae2e8ab526c490b99b
by git＠ipfire.org 12 Jun '15

12 Jun '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 1f99566dd268515c18a8d8ae2e8ab526c490b99b (commit) via 5cba4356690f1282b506844505d81bc8b050d32e (commit) from c3e195433152f91a3f14d59d6ea10e8963e6308d (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 1f99566dd268515c18a8d8ae2e8ab526c490b99b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 12 17:54:38 2015 +0200 openssl: update to 1.0.2c fix ABI problems. commit 5cba4356690f1282b506844505d81bc8b050d32e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jun 12 17:54:03 2015 +0200 core91: rebuild grub.cfg to display new core version. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/91/update.sh | 5 +++++ lfs/openssl | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/91/update.sh b/config/rootfiles/core/91/update.sh index 1e55e8b..1104c9f 100644 --- a/config/rootfiles/core/91/update.sh +++ b/config/rootfiles/core/91/update.sh @@ -54,6 +54,11 @@ if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then /etc/init.d/ipsec start fi +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig > /boot/grub/grub.cfg +fi + # This update need a reboot... touch /var/run/need_reboot diff --git a/lfs/openssl b/lfs/openssl index 3b9f3e1..1abc92c 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 1.0.2b +VER = 1.0.2c THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -82,7 +82,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7729b259e2dea7d60b32fc3934d6984b +$(DL_FILE)_MD5 = 8c8d81a9ae7005276e486702edbcd4b6 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. c3e195433152f91a3f14d59d6ea10e8963e6308d
by git＠ipfire.org 12 Jun '15

12 Jun '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via c3e195433152f91a3f14d59d6ea10e8963e6308d (commit) from 6646be5a53c2fa4846f6403d887a2975469800f6 (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 c3e195433152f91a3f14d59d6ea10e8963e6308d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 12 17:15:51 2015 +0200 strongswan: Update to 5.3.2 This release fixes a security issue filed under CVE-2015-4171. https://www.strongswan.org/blog/2015/06/08/strongswan-vulnerability-(cve-20… Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/strongswan | 6 ++---- src/patches/strongswan-5.3.1-build-timeattack.patch | 11 ----------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 src/patches/strongswan-5.3.1-build-timeattack.patch Difference in files: diff --git a/lfs/strongswan b/lfs/strongswan index d1a5b8c..b4438dd 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ include Config -VER = 5.3.1 +VER = 5.3.2 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 66f258901a3d6c271da1a0c7fb3e5013 +$(DL_FILE)_MD5 = fab014be1477ef4ebf9a765e10f8802c install : $(TARGET) @@ -78,10 +78,8 @@ $(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.1-build-timeattack.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-ipfire.patch - cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP) && ./configure \ --prefix="/usr" \ --sysconfdir="/etc" \ diff --git a/src/patches/strongswan-5.3.1-build-timeattack.patch b/src/patches/strongswan-5.3.1-build-timeattack.patch deleted file mode 100644 index 948c4fc..0000000 --- a/src/patches/strongswan-5.3.1-build-timeattack.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - hooks/post-receive -- IPFire 2.x development tree

1 0

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

12 Jun '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 31a849dd53128b3460f3d6f620a9ca286379e729 (commit) via 57a3100d2dc91fd7dea7204e3c77d17d723d66d1 (commit) via 1ea718199ae6cd3d2e6c015fb9d51c62fc8ef74e (commit) via 8be4674c92a9f86661d6ff068008e03e89b37a56 (commit) from 6646be5a53c2fa4846f6403d887a2975469800f6 (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 31a849dd53128b3460f3d6f620a9ca286379e729 Merge: 6646be5 57a3100 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 12 11:56:43 2015 +0200 Merge remote-tracking branch 'earl/tor' into next Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Conflicts: lfs/tor commit 57a3100d2dc91fd7dea7204e3c77d17d723d66d1 Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Fri Jun 12 00:05:02 2015 +0200 tor: update to 0.2.6.9 commit 1ea718199ae6cd3d2e6c015fb9d51c62fc8ef74e Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Thu May 21 20:06:04 2015 +0200 tor: update to 0.2.6.8 commit 8be4674c92a9f86661d6ff068008e03e89b37a56 Merge: b1636ef eb3c6c4 Author: Jan Paul Tuecking <earl(a)ipfire.org> Date: Wed Apr 8 07:47:06 2015 +0200 Merge branch 'master' into tor ----------------------------------------------------------------------- Summary of changes: lfs/tor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/tor b/lfs/tor index 8eca48d..eb18837 100644 --- a/lfs/tor +++ b/lfs/tor @@ -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) hooks/post-receive -- IPFire 2.x development tree

1 0

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

11 Jun '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 77c894147d5f03c3929922c285a8785c8fff7a65 (commit) from e0b49310826c9e99042b0316b6bc9b17186e5e74 (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 77c894147d5f03c3929922c285a8785c8fff7a65 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 11 22:24:31 2015 +0000 diffutils: Disable gnulib testsuite This testsuite does not work well on grsecurity-enabled kernels. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: diffutils/diffutils.nm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) Difference in files: diff --git a/diffutils/diffutils.nm b/diffutils/diffutils.nm index 94d81d4..e1562f1 100644 --- a/diffutils/diffutils.nm +++ b/diffutils/diffutils.nm @@ -5,7 +5,7 @@ name = diffutils version = 3.3 -release = 2 +release = 3 groups = Development/Tools url = http://www.gnu.org/software/diffutils/diffutils.html @@ -27,6 +27,12 @@ build perl end + prepare_cmds + # Disable gnulib test suite which does not work on + # grsecurity kernels + sed -e "s/gnulib-tests//" -i Makefile.{am,in} + end + test make check end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core91, created. 6646be5a53c2fa4846f6403d887a2975469800f6
by git＠ipfire.org 11 Jun '15

11 Jun '15

1 0

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

11 Jun '15

1 0

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

11 Jun '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 6646be5a53c2fa4846f6403d887a2975469800f6 (commit) via cb82fb206bbff70d8b2a63a3a2036642b46f9809 (commit) via 06a076e0d881f2a4f6c6c57913cb8bf487cf9f2e (commit) via 69a8ce7d9782eeace26c92584a0aa524b573aa43 (commit) via 0ab3e07f9d96074eefb0ecbc4359f90feb520635 (commit) via 3e95f420280d49eebc07d864bc41e6ab3ea0adc3 (commit) via aec0c3102e3061d4df9002efc93e45ec50975be9 (commit) via a26a1e16983dbcfc3dd73ab2cddd1fce69223134 (commit) via 36215f793fd455c1721844ee95a535b19636d1d5 (commit) via e36af11945c8217a2bc957e42aa87c6578ab573e (commit) via b65251c87d28e09f0c299fc1ca0e9c6ce8ccc43f (commit) via 8bd45f85efc8a282c5d1d1f6b3c47609eb265ba7 (commit) via 3d9b9dd30e86b03dce4e31103099a6a0bdc97a98 (commit) via a1c3b6c87fa3a30e12904b9392ba43e64c9be73c (commit) via be58233aee9b2098cce171d017c35df7c1a0b978 (commit) via 4da0506b000ae41025bb5ddb6111171f6f0cf0f5 (commit) via 4c777aeaf06e5697ecc5e540614b4edb2b2de853 (commit) via 57f5c85825d9f6b61e8726c5b146bae1957acfcf (commit) via 41ed4795fe92b1b16c8d946baef3f807adc97a77 (commit) via b2faf4f566b687052d40c8a2c37ed633ed643cb8 (commit) via 5b93b50c6d91cf69d7716c6714808b6a5f87c224 (commit) via bd767b27c85b2c6992cac38781b7bb78a03b694a (commit) via e528fb2c7352bf8f2b5c2bc3e298bfa4c34b9d31 (commit) via bd33c332275ccb041a908c6e53ba78a1fa82f900 (commit) via 557d986cbb406369e0c253879e25f7c21f442830 (commit) via b29a624081f02a3d4161b1c181dcf064429b51c8 (commit) via 6c7290acb29d6a9c7d455406a7bf0dafd4897b58 (commit) via 3560f497c090dafefc1d2d5b89ad7069a58c01f3 (commit) via 3d82ea0ab1b313506bb6daeabedc8c0e760fc7e1 (commit) via a421b8038b927529a4ed08c13539f74f66c18f9e (commit) via 91fc30309fcc929ae3b4b88f6cac67e1214e73a9 (commit) via e97d4c98963477b5247005d33acd9d4b5fe1ca8e (commit) via e80a7ef36a74053fa40adb454700926242970c74 (commit) via 031b9f7b4ffc3138ad4362665ad623ae897e0eed (commit) via 1e23f7cf48b0c087602486460a93b77248ded92a (commit) via 1554e8a3d3ae7a7dd0b3ecc0aa0410e3f301b4a7 (commit) via 81daa02876b36868a6c96a57dd0e07e787910c61 (commit) via ffeecf70b0a7a02a4c3d5a3161e90cb53cef5802 (commit) via 1292598207d74304227a3c77346c1d046eb51975 (commit) via 016e63e8185fb0cb670bfd05d5292aec05bc42ab (commit) via b9f4c9f85f8072048cd835d5a0d913eeb926d2c5 (commit) via f042e1d398bf4bade415773fe5849791f864444c (commit) via 1f8dddccb6f3f8f8b05074d8375708af9ddfb3eb (commit) via 188c4ba444b31343c29b311fcb2d0c0ba84e80ee (commit) via bee99d28c9cf28d167beb416cdcfb9e56b542902 (commit) via 5bf8008bddecb3838f1691a54f819ff4a8d08ffa (commit) via 56d2b9f3603a35718cd490d573d6f8b76d056257 (commit) via e448795559f316992b336b4304fd1b9b7847c16c (commit) via 5d6c888cc523583ab533a7eaf9524bd9ac32e786 (commit) via 1bebab64407f7836d31bc8b86a46db1984d804a9 (commit) via fef975eef76fbc752afcf9be6881d9739471e4dc (commit) via 8377733a388c19864fb55f48cdd3d040e538f549 (commit) via f09f3fd8819de0565c6ac73048b0dcfcff0c75ec (commit) via dc264702f688643dc8cc052f8a18187786481620 (commit) via 82402a051b49a8b89ee23a75d912f8241389fce6 (commit) via 4ec81074d1a918c965a373ae31766bd35475b376 (commit) via efbd3a9abc8354d9c8a0fb9a506a1cde1f978592 (commit) via 7af1cf3949afe6860877cd820e22e690db922316 (commit) via 765423cebe798bb4c8db75755979ce943f484792 (commit) via 9148fbc468aa86504d6e96d5b896b30778d6cad3 (commit) via ae4149506cf64738da74373db8b0c756f260093f (commit) via c199aa774cccd349713c6c917cf5e8f209a713c5 (commit) via bbc7cc3189f7ae5f4a645211951e42f6e761f244 (commit) via cfede492da5a5a02e0766e31565e2791206fe2d7 (commit) via b6128a64b8e7edcd21094406113192c46849544e (commit) via 15a9c45825fd205ca2c996e64969fad2cd467ff6 (commit) via 562cc8f7214635af6c167d1c844f589f57a70054 (commit) from 65712deca2d3dc3d9f94b1434446a617f107403a (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 6646be5a53c2fa4846f6403d887a2975469800f6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 11 17:13:51 2015 +0200 make.sh: Change PAKFIRE_CORE to 91 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cb82fb206bbff70d8b2a63a3a2036642b46f9809 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 11 17:13:34 2015 +0200 core91: Require reboot Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 06a076e0d881f2a4f6c6c57913cb8bf487cf9f2e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 11 17:12:16 2015 +0200 core91: Restart IPsec Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 69a8ce7d9782eeace26c92584a0aa524b573aa43 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 11 17:10:12 2015 +0200 core91: Call update-lang-cache with full path Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/firewall/p2protocols | 18 +- config/rootfiles/common/libnet | 8 + config/rootfiles/common/libtool | 63 ++- config/rootfiles/common/libxml2 | 431 +++++++++++---------- config/rootfiles/common/libxslt | 218 ++++++----- config/rootfiles/common/newt | 6 +- config/rootfiles/common/pcre | 2 +- config/rootfiles/common/slang | 28 +- config/rootfiles/common/web-user-interface | 3 +- config/rootfiles/{oldcore/85 => core/91}/exclude | 0 config/rootfiles/core/91/filelists/files | 7 + .../core/{90 => 91}/filelists/i586/openssl-sse2 | 0 .../91}/filelists/i586/strongswan-padlock | 0 config/rootfiles/core/91/filelists/libnet | 1 + .../{oldcore/66 => core/91}/filelists/libtool | 0 .../{oldcore/77 => core/91}/filelists/libxml2 | 0 config/rootfiles/core/91/filelists/libxslt | 1 + .../{oldcore/87 => core/91}/filelists/newt | 0 .../{oldcore/81 => core/91}/filelists/openssh | 0 .../{oldcore/87 => core/91}/filelists/openssl | 0 .../{oldcore/66 => core/91}/filelists/pcre | 0 .../{oldcore/87 => core/91}/filelists/slang | 0 .../{oldcore/87 => core/91}/filelists/strongswan | 0 config/rootfiles/{oldcore/87 => core/91}/meta | 0 config/rootfiles/{oldcore/82 => core/91}/update.sh | 24 +- doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 5 + doc/language_issues.fr | 5 + doc/language_issues.it | 5 + doc/language_issues.nl | 5 + doc/language_issues.pl | 5 + doc/language_issues.ru | 5 + doc/language_issues.tr | 5 + doc/language_missings | 16 + html/cgi-bin/dhcp.cgi | 29 +- html/cgi-bin/pppsetup.cgi | 6 +- html/cgi-bin/vpnmain.cgi | 14 +- langs/de/cgi-bin/de.pl | 6 +- langs/en/cgi-bin/en.pl | 4 + lfs/libnet | 10 +- lfs/libtool | 6 +- lfs/libxml2 | 6 +- lfs/libxslt | 6 +- lfs/newt | 6 +- lfs/openssh | 3 - lfs/openssl | 4 +- lfs/pcre | 6 +- lfs/python-optional-src | 6 +- lfs/sarg | 8 +- lfs/slang | 6 +- lfs/strongswan | 8 +- make.sh | 4 +- src/misc-progs/rebuildhosts.c | 20 +- src/pakfire/lib/functions.pl | 1 + src/paks/cyrus-imapd/uninstall.sh | 2 +- src/paks/postfix/install.sh | 4 +- src/paks/postfix/uninstall.sh | 3 + .../openssl-1.0.2-fix_parallel_build-1.patch | 340 ++++++++++++++++ ...-stroke-Increase-stroke-buffer-size-to-8k.patch | 34 -- .../strongswan-5.3.1-build-timeattack.patch | 11 + 61 files changed, 967 insertions(+), 449 deletions(-) copy config/rootfiles/{oldcore/85 => core/91}/exclude (100%) create mode 100644 config/rootfiles/core/91/filelists/files copy config/rootfiles/core/{90 => 91}/filelists/i586/openssl-sse2 (100%) copy config/rootfiles/{oldcore/77 => core/91}/filelists/i586/strongswan-padlock (100%) create mode 120000 config/rootfiles/core/91/filelists/libnet copy config/rootfiles/{oldcore/66 => core/91}/filelists/libtool (100%) copy config/rootfiles/{oldcore/77 => core/91}/filelists/libxml2 (100%) create mode 120000 config/rootfiles/core/91/filelists/libxslt copy config/rootfiles/{oldcore/87 => core/91}/filelists/newt (100%) copy config/rootfiles/{oldcore/81 => core/91}/filelists/openssh (100%) copy config/rootfiles/{oldcore/87 => core/91}/filelists/openssl (100%) copy config/rootfiles/{oldcore/66 => core/91}/filelists/pcre (100%) copy config/rootfiles/{oldcore/87 => core/91}/filelists/slang (100%) copy config/rootfiles/{oldcore/87 => core/91}/filelists/strongswan (100%) copy config/rootfiles/{oldcore/87 => core/91}/meta (100%) copy config/rootfiles/{oldcore/82 => core/91}/update.sh (83%) create mode 100644 src/patches/openssl-1.0.2-fix_parallel_build-1.patch delete mode 100644 src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch create mode 100644 src/patches/strongswan-5.3.1-build-timeattack.patch Difference in files: diff --git a/config/firewall/p2protocols b/config/firewall/p2protocols index 7000581..d899809 100644 --- a/config/firewall/p2protocols +++ b/config/firewall/p2protocols @@ -1,9 +1,9 @@ -Applejuice;apple;off; -Ares;ares;off; -Bittorrent;bit;off; -DirectConnect;dc;off; -Edonkey;edk;off; -Gnutella;gnu;off; -KaZaA;kazaa;off; -SoulSeek;soul;off; -WinMX;winmx;off; +Applejuice;apple;on; +Ares;ares;on; +Bittorrent;bit;on; +DirectConnect;dc;on; +Edonkey;edk;on; +Gnutella;gnu;on; +KaZaA;kazaa;on; +SoulSeek;soul;on; +WinMX;winmx;on; diff --git a/config/rootfiles/common/libnet b/config/rootfiles/common/libnet index 8fe7c17..e36695e 100644 --- a/config/rootfiles/common/libnet +++ b/config/rootfiles/common/libnet @@ -1,3 +1,4 @@ +#usr/bin/libnet-config #usr/include/libnet #usr/include/libnet.h #usr/include/libnet/libnet-asn1.h @@ -7,3 +8,10 @@ #usr/include/libnet/libnet-structures.h #usr/include/libnet/libnet-types.h #usr/lib/libnet.a +#usr/lib/libnet.la +#usr/lib/libnet.so +#usr/lib/libnet.so.1 +#usr/lib/libnet.so.1.7.0 +#usr/share/man/man3/libnet-functions.h.3 +#usr/share/man/man3/libnet-macros.h.3 +#usr/share/man/man3/libnet.h.3 diff --git a/config/rootfiles/common/libtool b/config/rootfiles/common/libtool index 5646be2..23753c7 100644 --- a/config/rootfiles/common/libtool +++ b/config/rootfiles/common/libtool @@ -9,9 +9,10 @@ #usr/lib/libltdl.la usr/lib/libltdl.so usr/lib/libltdl.so.7 -usr/lib/libltdl.so.7.3.0 +usr/lib/libltdl.so.7.3.1 #usr/share/aclocal/argz.m4 #usr/share/aclocal/libtool.m4 +#usr/share/aclocal/ltargz.m4 #usr/share/aclocal/ltdl.m4 #usr/share/aclocal/ltoptions.m4 #usr/share/aclocal/ltsugar.m4 @@ -21,6 +22,32 @@ usr/lib/libltdl.so.7.3.0 #usr/share/info/libtool.info-1 #usr/share/info/libtool.info-2 #usr/share/libtool +#usr/share/libtool/config-h.in +#usr/share/libtool/configure +#usr/share/libtool/configure.ac +#usr/share/libtool/COPYING.LIB +#usr/share/libtool/Makefile.am +#usr/share/libtool/Makefile.in +#usr/share/libtool/README +#usr/share/libtool/aclocal.m4 +#usr/share/libtool/lt__alloc.c +#usr/share/libtool/lt__argz.c +#usr/share/libtool/lt__dirent.c +#usr/share/libtool/lt__strl.c +#usr/share/libtool/lt_dlloader.c +#usr/share/libtool/lt_error.c +#usr/share/libtool/ltdl.c +#usr/share/libtool/ltdl.h +#usr/share/libtool/ltdl.mk +#usr/share/libtool/slist.c +#usr/share/libtool/build-aux +#usr/share/libtool/build-aux/compile +#usr/share/libtool/build-aux/config.guess +#usr/share/libtool/build-aux/config.sub +#usr/share/libtool/build-aux/depcomp +#usr/share/libtool/build-aux/install-sh +#usr/share/libtool/build-aux/ltmain.sh +#usr/share/libtool/build-aux/missing #usr/share/libtool/config #usr/share/libtool/config/compile #usr/share/libtool/config/config.guess @@ -41,6 +68,24 @@ usr/lib/libltdl.so.7.3.0 #usr/share/libtool/libltdl/config-h.in #usr/share/libtool/libltdl/configure #usr/share/libtool/libltdl/configure.ac +#usr/share/libtool/libltdl/lt__alloc.c +#usr/share/libtool/libltdl/lt__dirent.c +#usr/share/libtool/libltdl/lt__strl.c +#usr/share/libtool/libltdl/lt_dlloader.c +#usr/share/libtool/libltdl/lt_error.c +#usr/share/libtool/libltdl/ltdl.c +#usr/share/libtool/libltdl/ltdl.h +#usr/share/libtool/libltdl/slist.c +#usr/share/libtool/libltdl/lt__alloc.h +#usr/share/libtool/libltdl/lt__argz_.h +#usr/share/libtool/libltdl/lt__dirent.h +#usr/share/libtool/libltdl/lt__glibc.h +#usr/share/libtool/libltdl/lt__private.h +#usr/share/libtool/libltdl/lt__strl.h +#usr/share/libtool/libltdl/lt_dlloader.h +#usr/share/libtool/libltdl/lt_error.h +#usr/share/libtool/libltdl/lt_system.h +#usr/share/libtool/libltdl/slist.h #usr/share/libtool/libltdl/libltdl #usr/share/libtool/libltdl/libltdl/lt__alloc.h #usr/share/libtool/libltdl/libltdl/lt__dirent.h @@ -59,13 +104,13 @@ usr/lib/libltdl.so.7.3.0 #usr/share/libtool/libltdl/loaders/loadlibrary.c #usr/share/libtool/libltdl/loaders/preopen.c #usr/share/libtool/libltdl/loaders/shl_load.c -#usr/share/libtool/libltdl/lt__alloc.c -#usr/share/libtool/libltdl/lt__dirent.c -#usr/share/libtool/libltdl/lt__strl.c -#usr/share/libtool/libltdl/lt_dlloader.c -#usr/share/libtool/libltdl/lt_error.c -#usr/share/libtool/libltdl/ltdl.c -#usr/share/libtool/libltdl/ltdl.h -#usr/share/libtool/libltdl/slist.c +#usr/share/libtool/loaders +#usr/share/libtool/loaders/dld_link.c +#usr/share/libtool/loaders/dlopen.c +#usr/share/libtool/loaders/dyld.c +#usr/share/libtool/loaders/load_add_on.c +#usr/share/libtool/loaders/loadlibrary.c +#usr/share/libtool/loaders/preopen.c +#usr/share/libtool/loaders/shl_load.c #usr/share/man/man1/libtool.1 #usr/share/man/man1/libtoolize.1 diff --git a/config/rootfiles/common/libxml2 b/config/rootfiles/common/libxml2 index 07c1edd..1298651 100644 --- a/config/rootfiles/common/libxml2 +++ b/config/rootfiles/common/libxml2 @@ -50,11 +50,14 @@ #usr/include/libxml2/libxml/xpath.h #usr/include/libxml2/libxml/xpathInternals.h #usr/include/libxml2/libxml/xpointer.h +#usr/lib/cmake +#usr/lib/cmake/libxml2 +#usr/lib/cmake/libxml2/libxml2-config.cmake #usr/lib/libxml2.a #usr/lib/libxml2.la usr/lib/libxml2.so usr/lib/libxml2.so.2 -usr/lib/libxml2.so.2.6.32 +usr/lib/libxml2.so.2.9.2 #usr/lib/pkgconfig/libxml-2.0.pc usr/lib/python2.7/site-packages/drv_libxml2.py usr/lib/python2.7/site-packages/libxml2.py @@ -63,218 +66,220 @@ usr/lib/python2.7/site-packages/libxml2.py usr/lib/python2.7/site-packages/libxml2mod.so #usr/lib/xml2Conf.sh #usr/share/aclocal/libxml.m4 -#usr/share/doc/libxml2-2.6.32 -#usr/share/doc/libxml2-2.6.32/Copyright -#usr/share/doc/libxml2-2.6.32/examples -#usr/share/doc/libxml2-2.6.32/examples/testHTML.c -#usr/share/doc/libxml2-2.6.32/examples/testSAX.c -#usr/share/doc/libxml2-2.6.32/examples/testXPath.c -#usr/share/doc/libxml2-2.6.32/examples/xmllint.c -#usr/share/doc/libxml2-2.6.32/html -#usr/share/doc/libxml2-2.6.32/html/DOM.gif -#usr/share/doc/libxml2-2.6.32/html/FAQ.html -#usr/share/doc/libxml2-2.6.32/html/Libxml2-Logo-180x168.gif -#usr/share/doc/libxml2-2.6.32/html/Libxml2-Logo-90x34.gif -#usr/share/doc/libxml2-2.6.32/html/encoding.html -#usr/share/doc/libxml2-2.6.32/html/examples.xml -#usr/share/doc/libxml2-2.6.32/html/examples.xsl -#usr/share/doc/libxml2-2.6.32/html/html -#usr/share/doc/libxml2-2.6.32/html/html/book1.html -#usr/share/doc/libxml2-2.6.32/html/html/home.png -#usr/share/doc/libxml2-2.6.32/html/html/index.html -#usr/share/doc/libxml2-2.6.32/html/html/left.png -#usr/share/doc/libxml2-2.6.32/html/html/libxml-DOCBparser.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-HTMLparser.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-HTMLtree.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-SAX.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-SAX2.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-c14n.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-catalog.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-chvalid.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-debugXML.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-dict.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-encoding.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-entities.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-globals.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-hash.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-lib.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-list.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-nanoftp.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-nanohttp.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-parser.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-parserInternals.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-pattern.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-relaxng.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-schemasInternals.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-schematron.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-threads.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-tree.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-uri.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-valid.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xinclude.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xlink.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlIO.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlautomata.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlerror.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlexports.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlmemory.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlmodule.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlreader.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlregexp.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlsave.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlschemas.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlschemastypes.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlstring.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlunicode.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlversion.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlwriter.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xpath.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xpathInternals.html -#usr/share/doc/libxml2-2.6.32/html/html/libxml-xpointer.html -#usr/share/doc/libxml2-2.6.32/html/html/right.png -#usr/share/doc/libxml2-2.6.32/html/html/up.png -#usr/share/doc/libxml2-2.6.32/html/io1.c -#usr/share/doc/libxml2-2.6.32/html/io1.res -#usr/share/doc/libxml2-2.6.32/html/io2.c -#usr/share/doc/libxml2-2.6.32/html/io2.res -#usr/share/doc/libxml2-2.6.32/html/libxml.gif -#usr/share/doc/libxml2-2.6.32/html/parse1.c -#usr/share/doc/libxml2-2.6.32/html/parse2.c -#usr/share/doc/libxml2-2.6.32/html/parse3.c -#usr/share/doc/libxml2-2.6.32/html/parse4.c -#usr/share/doc/libxml2-2.6.32/html/reader1.c -#usr/share/doc/libxml2-2.6.32/html/reader1.res -#usr/share/doc/libxml2-2.6.32/html/reader2.c -#usr/share/doc/libxml2-2.6.32/html/reader3.c -#usr/share/doc/libxml2-2.6.32/html/reader3.res -#usr/share/doc/libxml2-2.6.32/html/reader4.c -#usr/share/doc/libxml2-2.6.32/html/reader4.res -#usr/share/doc/libxml2-2.6.32/html/redhat.gif -#usr/share/doc/libxml2-2.6.32/html/smallfootonly.gif -#usr/share/doc/libxml2-2.6.32/html/structure.gif -#usr/share/doc/libxml2-2.6.32/html/test1.xml -#usr/share/doc/libxml2-2.6.32/html/test2.xml -#usr/share/doc/libxml2-2.6.32/html/test3.xml -#usr/share/doc/libxml2-2.6.32/html/testWriter.c -#usr/share/doc/libxml2-2.6.32/html/tree1.c -#usr/share/doc/libxml2-2.6.32/html/tree1.res -#usr/share/doc/libxml2-2.6.32/html/tree2.c -#usr/share/doc/libxml2-2.6.32/html/tree2.res -#usr/share/doc/libxml2-2.6.32/html/tst.xml -#usr/share/doc/libxml2-2.6.32/html/tutorial -#usr/share/doc/libxml2-2.6.32/html/tutorial/apa.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/apb.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/apc.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/apd.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ape.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/apf.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/apg.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/aph.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/api.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s02.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s03.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s04.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s05.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s06.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s07.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s08.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s09.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/images -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/blank.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/1.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/10.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/2.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/3.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/4.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/5.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/6.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/7.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/8.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/9.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/caution.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/draft.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/home.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/important.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/next.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/note.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/prev.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/tip.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/toc-blank.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/toc-minus.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/toc-plus.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/up.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/images/warning.png -#usr/share/doc/libxml2-2.6.32/html/tutorial/includeaddattribute.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/includeaddkeyword.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/includeconvert.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/includegetattribute.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/includekeyword.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/includexpath.c -#usr/share/doc/libxml2-2.6.32/html/tutorial/index.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/ix01.html -#usr/share/doc/libxml2-2.6.32/html/tutorial/xmltutorial.pdf -#usr/share/doc/libxml2-2.6.32/html/w3c.png -#usr/share/doc/libxml2-2.6.32/html/writer.xml -#usr/share/doc/libxml2-2.6.32/html/xml.html -#usr/share/doc/libxml2-2.6.32/html/xpath1.c -#usr/share/doc/libxml2-2.6.32/html/xpath1.res -#usr/share/doc/libxml2-2.6.32/html/xpath2.c -#usr/share/doc/libxml2-2.6.32/html/xpath2.res -#usr/share/doc/libxml2-python-2.6.32 -#usr/share/doc/libxml2-python-2.6.32/TODO -#usr/share/doc/libxml2-python-2.6.32/examples -#usr/share/doc/libxml2-python-2.6.32/examples/attribs.py -#usr/share/doc/libxml2-python-2.6.32/examples/build.py -#usr/share/doc/libxml2-python-2.6.32/examples/compareNodes.py -#usr/share/doc/libxml2-python-2.6.32/examples/ctxterror.py -#usr/share/doc/libxml2-python-2.6.32/examples/cutnpaste.py -#usr/share/doc/libxml2-python-2.6.32/examples/dtdvalid.py -#usr/share/doc/libxml2-python-2.6.32/examples/error.py -#usr/share/doc/libxml2-python-2.6.32/examples/inbuf.py -#usr/share/doc/libxml2-python-2.6.32/examples/indexes.py -#usr/share/doc/libxml2-python-2.6.32/examples/invalid.xml -#usr/share/doc/libxml2-python-2.6.32/examples/nsdel.py -#usr/share/doc/libxml2-python-2.6.32/examples/outbuf.py -#usr/share/doc/libxml2-python-2.6.32/examples/push.py -#usr/share/doc/libxml2-python-2.6.32/examples/pushSAX.py -#usr/share/doc/libxml2-python-2.6.32/examples/pushSAXhtml.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader2.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader3.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader4.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader5.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader6.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader7.py -#usr/share/doc/libxml2-python-2.6.32/examples/reader8.py -#usr/share/doc/libxml2-python-2.6.32/examples/readererr.py -#usr/share/doc/libxml2-python-2.6.32/examples/readernext.py -#usr/share/doc/libxml2-python-2.6.32/examples/regexp.py -#usr/share/doc/libxml2-python-2.6.32/examples/relaxng.py -#usr/share/doc/libxml2-python-2.6.32/examples/resolver.py -#usr/share/doc/libxml2-python-2.6.32/examples/schema.py -#usr/share/doc/libxml2-python-2.6.32/examples/serialize.py -#usr/share/doc/libxml2-python-2.6.32/examples/sync.py -#usr/share/doc/libxml2-python-2.6.32/examples/test.dtd -#usr/share/doc/libxml2-python-2.6.32/examples/thread2.py -#usr/share/doc/libxml2-python-2.6.32/examples/tst.py -#usr/share/doc/libxml2-python-2.6.32/examples/tst.xml -#usr/share/doc/libxml2-python-2.6.32/examples/tstLastError.py -#usr/share/doc/libxml2-python-2.6.32/examples/tstURI.py -#usr/share/doc/libxml2-python-2.6.32/examples/tstmem.py -#usr/share/doc/libxml2-python-2.6.32/examples/tstxpath.py -#usr/share/doc/libxml2-python-2.6.32/examples/valid.xml -#usr/share/doc/libxml2-python-2.6.32/examples/validDTD.py -#usr/share/doc/libxml2-python-2.6.32/examples/validRNG.py -#usr/share/doc/libxml2-python-2.6.32/examples/validSchemas.py -#usr/share/doc/libxml2-python-2.6.32/examples/validate.py -#usr/share/doc/libxml2-python-2.6.32/examples/walker.py -#usr/share/doc/libxml2-python-2.6.32/examples/xpath.py -#usr/share/doc/libxml2-python-2.6.32/examples/xpathext.py -#usr/share/doc/libxml2-python-2.6.32/examples/xpathns.py -#usr/share/doc/libxml2-python-2.6.32/examples/xpathret.py -#usr/share/gtk-doc -#usr/share/gtk-doc/html +#usr/share/doc/libxml2-2.9.2 +#usr/share/doc/libxml2-2.9.2/Copyright +#usr/share/doc/libxml2-2.9.2/examples +#usr/share/doc/libxml2-2.9.2/examples/testHTML.c +#usr/share/doc/libxml2-2.9.2/examples/testSAX.c +#usr/share/doc/libxml2-2.9.2/examples/testXPath.c +#usr/share/doc/libxml2-2.9.2/examples/xmllint.c +#usr/share/doc/libxml2-2.9.2/html +#usr/share/doc/libxml2-2.9.2/html/DOM.gif +#usr/share/doc/libxml2-2.9.2/html/FAQ.html +#usr/share/doc/libxml2-2.9.2/html/Libxml2-Logo-180x168.gif +#usr/share/doc/libxml2-2.9.2/html/Libxml2-Logo-90x34.gif +#usr/share/doc/libxml2-2.9.2/html/encoding.html +#usr/share/doc/libxml2-2.9.2/html/examples.xml +#usr/share/doc/libxml2-2.9.2/html/examples.xsl +#usr/share/doc/libxml2-2.9.2/html/html +#usr/share/doc/libxml2-2.9.2/html/html/book1.html +#usr/share/doc/libxml2-2.9.2/html/html/home.png +#usr/share/doc/libxml2-2.9.2/html/html/index.html +#usr/share/doc/libxml2-2.9.2/html/html/left.png +#usr/share/doc/libxml2-2.9.2/html/html/libxml-DOCBparser.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-HTMLparser.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-HTMLtree.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-SAX.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-SAX2.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-c14n.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-catalog.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-chvalid.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-debugXML.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-dict.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-encoding.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-entities.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-globals.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-hash.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-lib.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-list.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-nanoftp.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-nanohttp.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-parser.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-parserInternals.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-pattern.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-relaxng.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-schemasInternals.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-schematron.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-threads.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-tree.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-uri.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-valid.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xinclude.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xlink.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlIO.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlautomata.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlerror.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlexports.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlmemory.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlmodule.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlreader.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlregexp.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlsave.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlschemas.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlschemastypes.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlstring.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlunicode.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlversion.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlwriter.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xpath.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xpathInternals.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xpointer.html +#usr/share/doc/libxml2-2.9.2/html/html/libxml-xzlib.html +#usr/share/doc/libxml2-2.9.2/html/html/right.png +#usr/share/doc/libxml2-2.9.2/html/html/up.png +#usr/share/doc/libxml2-2.9.2/html/index.html +#usr/share/doc/libxml2-2.9.2/html/io1.c +#usr/share/doc/libxml2-2.9.2/html/io1.res +#usr/share/doc/libxml2-2.9.2/html/io2.c +#usr/share/doc/libxml2-2.9.2/html/io2.res +#usr/share/doc/libxml2-2.9.2/html/libxml.gif +#usr/share/doc/libxml2-2.9.2/html/parse1.c +#usr/share/doc/libxml2-2.9.2/html/parse2.c +#usr/share/doc/libxml2-2.9.2/html/parse3.c +#usr/share/doc/libxml2-2.9.2/html/parse4.c +#usr/share/doc/libxml2-2.9.2/html/reader1.c +#usr/share/doc/libxml2-2.9.2/html/reader1.res +#usr/share/doc/libxml2-2.9.2/html/reader2.c +#usr/share/doc/libxml2-2.9.2/html/reader3.c +#usr/share/doc/libxml2-2.9.2/html/reader3.res +#usr/share/doc/libxml2-2.9.2/html/reader4.c +#usr/share/doc/libxml2-2.9.2/html/reader4.res +#usr/share/doc/libxml2-2.9.2/html/redhat.gif +#usr/share/doc/libxml2-2.9.2/html/smallfootonly.gif +#usr/share/doc/libxml2-2.9.2/html/structure.gif +#usr/share/doc/libxml2-2.9.2/html/test1.xml +#usr/share/doc/libxml2-2.9.2/html/test2.xml +#usr/share/doc/libxml2-2.9.2/html/test3.xml +#usr/share/doc/libxml2-2.9.2/html/testWriter.c +#usr/share/doc/libxml2-2.9.2/html/tree1.c +#usr/share/doc/libxml2-2.9.2/html/tree1.res +#usr/share/doc/libxml2-2.9.2/html/tree2.c +#usr/share/doc/libxml2-2.9.2/html/tree2.res +#usr/share/doc/libxml2-2.9.2/html/tst.xml +#usr/share/doc/libxml2-2.9.2/html/tutorial +#usr/share/doc/libxml2-2.9.2/html/tutorial/apa.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/apb.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/apc.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/apd.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ape.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/apf.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/apg.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/aph.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/api.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s02.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s03.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s04.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s05.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s06.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s07.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s08.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s09.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/images +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/blank.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/1.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/10.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/2.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/3.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/4.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/5.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/6.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/7.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/8.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/9.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/caution.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/draft.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/home.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/important.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/next.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/note.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/prev.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/tip.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/toc-blank.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/toc-minus.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/toc-plus.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/up.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/images/warning.png +#usr/share/doc/libxml2-2.9.2/html/tutorial/includeaddattribute.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/includeaddkeyword.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/includeconvert.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/includegetattribute.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/includekeyword.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/includexpath.c +#usr/share/doc/libxml2-2.9.2/html/tutorial/index.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/ix01.html +#usr/share/doc/libxml2-2.9.2/html/tutorial/xmltutorial.pdf +#usr/share/doc/libxml2-2.9.2/html/w3c.png +#usr/share/doc/libxml2-2.9.2/html/writer.xml +#usr/share/doc/libxml2-2.9.2/html/xml.html +#usr/share/doc/libxml2-2.9.2/html/xpath1.c +#usr/share/doc/libxml2-2.9.2/html/xpath1.res +#usr/share/doc/libxml2-2.9.2/html/xpath2.c +#usr/share/doc/libxml2-2.9.2/html/xpath2.res +#usr/share/doc/libxml2-python-2.9.2 +#usr/share/doc/libxml2-python-2.9.2/TODO +#usr/share/doc/libxml2-python-2.9.2/examples +#usr/share/doc/libxml2-python-2.9.2/examples/attribs.py +#usr/share/doc/libxml2-python-2.9.2/examples/build.py +#usr/share/doc/libxml2-python-2.9.2/examples/compareNodes.py +#usr/share/doc/libxml2-python-2.9.2/examples/ctxterror.py +#usr/share/doc/libxml2-python-2.9.2/examples/cutnpaste.py +#usr/share/doc/libxml2-python-2.9.2/examples/dtdvalid.py +#usr/share/doc/libxml2-python-2.9.2/examples/error.py +#usr/share/doc/libxml2-python-2.9.2/examples/inbuf.py +#usr/share/doc/libxml2-python-2.9.2/examples/indexes.py +#usr/share/doc/libxml2-python-2.9.2/examples/input_callback.py +#usr/share/doc/libxml2-python-2.9.2/examples/invalid.xml +#usr/share/doc/libxml2-python-2.9.2/examples/nsdel.py +#usr/share/doc/libxml2-python-2.9.2/examples/outbuf.py +#usr/share/doc/libxml2-python-2.9.2/examples/push.py +#usr/share/doc/libxml2-python-2.9.2/examples/pushSAX.py +#usr/share/doc/libxml2-python-2.9.2/examples/pushSAXhtml.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader2.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader3.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader4.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader5.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader6.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader7.py +#usr/share/doc/libxml2-python-2.9.2/examples/reader8.py +#usr/share/doc/libxml2-python-2.9.2/examples/readererr.py +#usr/share/doc/libxml2-python-2.9.2/examples/readernext.py +#usr/share/doc/libxml2-python-2.9.2/examples/regexp.py +#usr/share/doc/libxml2-python-2.9.2/examples/relaxng.py +#usr/share/doc/libxml2-python-2.9.2/examples/resolver.py +#usr/share/doc/libxml2-python-2.9.2/examples/schema.py +#usr/share/doc/libxml2-python-2.9.2/examples/serialize.py +#usr/share/doc/libxml2-python-2.9.2/examples/sync.py +#usr/share/doc/libxml2-python-2.9.2/examples/test.dtd +#usr/share/doc/libxml2-python-2.9.2/examples/thread2.py +#usr/share/doc/libxml2-python-2.9.2/examples/tst.py +#usr/share/doc/libxml2-python-2.9.2/examples/tst.xml +#usr/share/doc/libxml2-python-2.9.2/examples/tstLastError.py +#usr/share/doc/libxml2-python-2.9.2/examples/tstURI.py +#usr/share/doc/libxml2-python-2.9.2/examples/tstmem.py +#usr/share/doc/libxml2-python-2.9.2/examples/tstxpath.py +#usr/share/doc/libxml2-python-2.9.2/examples/valid.xml +#usr/share/doc/libxml2-python-2.9.2/examples/validDTD.py +#usr/share/doc/libxml2-python-2.9.2/examples/validRNG.py +#usr/share/doc/libxml2-python-2.9.2/examples/validSchemas.py +#usr/share/doc/libxml2-python-2.9.2/examples/validate.py +#usr/share/doc/libxml2-python-2.9.2/examples/walker.py +#usr/share/doc/libxml2-python-2.9.2/examples/xpath.py +#usr/share/doc/libxml2-python-2.9.2/examples/xpathext.py +#usr/share/doc/libxml2-python-2.9.2/examples/xpathleak.py +#usr/share/doc/libxml2-python-2.9.2/examples/xpathns.py +#usr/share/doc/libxml2-python-2.9.2/examples/xpathret.py #usr/share/gtk-doc/html/libxml2 #usr/share/gtk-doc/html/libxml2/general.html #usr/share/gtk-doc/html/libxml2/home.png diff --git a/config/rootfiles/common/libxslt b/config/rootfiles/common/libxslt index a6e2ab3..be00b24 100644 --- a/config/rootfiles/common/libxslt +++ b/config/rootfiles/common/libxslt @@ -24,18 +24,19 @@ usr/bin/xsltproc #usr/include/libxslt/xsltInternals.h #usr/include/libxslt/xsltconfig.h #usr/include/libxslt/xsltexports.h +#usr/include/libxslt/xsltlocale.h #usr/include/libxslt/xsltutils.h #usr/lib/libexslt.a #usr/lib/libexslt.la usr/lib/libexslt.so usr/lib/libexslt.so.0 -usr/lib/libexslt.so.0.8.13 +usr/lib/libexslt.so.0.8.17 #usr/lib/libxslt-plugins #usr/lib/libxslt.a #usr/lib/libxslt.la usr/lib/libxslt.so usr/lib/libxslt.so.1 -usr/lib/libxslt.so.1.1.17 +usr/lib/libxslt.so.1.1.28 #usr/lib/pkgconfig/libexslt.pc #usr/lib/pkgconfig/libxslt.pc usr/lib/python2.7/site-packages/libxml2.pyc @@ -44,108 +45,113 @@ usr/lib/python2.7/site-packages/libxml2.pyc #usr/lib/python2.7/site-packages/libxsltmod.la usr/lib/python2.7/site-packages/libxsltmod.so #usr/lib/xsltConf.sh -#usr/man/man1/xsltproc.1 -#usr/man/man3/libexslt.3 -#usr/man/man3/libxslt.3 #usr/share/aclocal/libxslt.m4 -#usr/share/doc/libxslt-1.1.17 -#usr/share/doc/libxslt-1.1.17/html -#usr/share/doc/libxslt-1.1.17/html/API.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk0.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk1.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk2.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk3.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk4.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk5.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk6.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk7.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk8.html -#usr/share/doc/libxslt-1.1.17/html/APIchunk9.html -#usr/share/doc/libxslt-1.1.17/html/APIconstructors.html -#usr/share/doc/libxslt-1.1.17/html/APIfiles.html -#usr/share/doc/libxslt-1.1.17/html/APIfunctions.html -#usr/share/doc/libxslt-1.1.17/html/APIsymbols.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT -#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIchunk0.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIconstructors.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIfiles.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIfunctions.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/APIsymbols.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/bugs.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/docs.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/downloads.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/exslt.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/help.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/index.html -#usr/share/doc/libxslt-1.1.17/html/EXSLT/intro.html -#usr/share/doc/libxslt-1.1.17/html/FAQ.html -#usr/share/doc/libxslt-1.1.17/html/Libxslt-Logo-180x168.gif -#usr/share/doc/libxslt-1.1.17/html/Libxslt-Logo-90x34.gif -#usr/share/doc/libxslt-1.1.17/html/bugs.html -#usr/share/doc/libxslt-1.1.17/html/contexts.gif -#usr/share/doc/libxslt-1.1.17/html/contribs.html -#usr/share/doc/libxslt-1.1.17/html/docbook.html -#usr/share/doc/libxslt-1.1.17/html/docs.html -#usr/share/doc/libxslt-1.1.17/html/downloads.html -#usr/share/doc/libxslt-1.1.17/html/extensions.html -#usr/share/doc/libxslt-1.1.17/html/help.html -#usr/share/doc/libxslt-1.1.17/html/html -#usr/share/doc/libxslt-1.1.17/html/html/book1.html -#usr/share/doc/libxslt-1.1.17/html/html/home.png -#usr/share/doc/libxslt-1.1.17/html/html/index.html -#usr/share/doc/libxslt-1.1.17/html/html/left.png -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-attributes.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-documents.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-extensions.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-extra.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-functions.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-imports.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-keys.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-lib.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-namespaces.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-numbersInternals.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-pattern.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-preproc.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-security.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-templates.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-transform.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-variables.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-xslt.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-xsltInternals.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-xsltexports.html -#usr/share/doc/libxslt-1.1.17/html/html/libxslt-xsltutils.html -#usr/share/doc/libxslt-1.1.17/html/html/right.png -#usr/share/doc/libxslt-1.1.17/html/html/up.png -#usr/share/doc/libxslt-1.1.17/html/index.html -#usr/share/doc/libxslt-1.1.17/html/internals.html -#usr/share/doc/libxslt-1.1.17/html/intro.html -#usr/share/doc/libxslt-1.1.17/html/news.html -#usr/share/doc/libxslt-1.1.17/html/node.gif -#usr/share/doc/libxslt-1.1.17/html/object.gif -#usr/share/doc/libxslt-1.1.17/html/processing.gif -#usr/share/doc/libxslt-1.1.17/html/python.html -#usr/share/doc/libxslt-1.1.17/html/redhat.gif -#usr/share/doc/libxslt-1.1.17/html/smallfootonly.gif -#usr/share/doc/libxslt-1.1.17/html/stylesheet.gif -#usr/share/doc/libxslt-1.1.17/html/templates.gif -#usr/share/doc/libxslt-1.1.17/html/tutorial -#usr/share/doc/libxslt-1.1.17/html/tutorial/libxslt_tutorial.c -#usr/share/doc/libxslt-1.1.17/html/tutorial/libxslttutorial.html -#usr/share/doc/libxslt-1.1.17/html/tutorial/libxslttutorial.xml -#usr/share/doc/libxslt-1.1.17/html/tutorial2 -#usr/share/doc/libxslt-1.1.17/html/tutorial2/libxslt_pipes.c -#usr/share/doc/libxslt-1.1.17/html/tutorial2/libxslt_pipes.html -#usr/share/doc/libxslt-1.1.17/html/tutorial2/libxslt_pipes.xml -#usr/share/doc/libxslt-1.1.17/html/xslt.html -#usr/share/doc/libxslt-1.1.17/html/xsltproc.html -#usr/share/doc/libxslt-1.1.17/html/xsltproc2.html -#usr/share/doc/libxslt-python-1.1.17 -#usr/share/doc/libxslt-python-1.1.17/TODO -#usr/share/doc/libxslt-python-1.1.17/examples -#usr/share/doc/libxslt-python-1.1.17/examples/basic.py -#usr/share/doc/libxslt-python-1.1.17/examples/exslt.py -#usr/share/doc/libxslt-python-1.1.17/examples/extelem.py -#usr/share/doc/libxslt-python-1.1.17/examples/extfunc.py -#usr/share/doc/libxslt-python-1.1.17/examples/pyxsltproc.py -#usr/share/doc/libxslt-python-1.1.17/examples/test.xml -#usr/share/doc/libxslt-python-1.1.17/examples/test.xsl +#usr/share/doc/libxslt-1.1.28 +#usr/share/doc/libxslt-1.1.28/html +#usr/share/doc/libxslt-1.1.28/html/API.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk0.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk1.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk10.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk11.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk12.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk13.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk2.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk3.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk4.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk5.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk6.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk7.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk8.html +#usr/share/doc/libxslt-1.1.28/html/APIchunk9.html +#usr/share/doc/libxslt-1.1.28/html/APIconstructors.html +#usr/share/doc/libxslt-1.1.28/html/APIfiles.html +#usr/share/doc/libxslt-1.1.28/html/APIfunctions.html +#usr/share/doc/libxslt-1.1.28/html/APIsymbols.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT +#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIchunk0.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIconstructors.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIfiles.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIfunctions.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/APIsymbols.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/bugs.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/docs.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/downloads.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/exslt.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/help.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/index.html +#usr/share/doc/libxslt-1.1.28/html/EXSLT/intro.html +#usr/share/doc/libxslt-1.1.28/html/FAQ.html +#usr/share/doc/libxslt-1.1.28/html/Libxslt-Logo-180x168.gif +#usr/share/doc/libxslt-1.1.28/html/Libxslt-Logo-90x34.gif +#usr/share/doc/libxslt-1.1.28/html/bugs.html +#usr/share/doc/libxslt-1.1.28/html/contexts.gif +#usr/share/doc/libxslt-1.1.28/html/contribs.html +#usr/share/doc/libxslt-1.1.28/html/docbook.html +#usr/share/doc/libxslt-1.1.28/html/docs.html +#usr/share/doc/libxslt-1.1.28/html/downloads.html +#usr/share/doc/libxslt-1.1.28/html/extensions.html +#usr/share/doc/libxslt-1.1.28/html/help.html +#usr/share/doc/libxslt-1.1.28/html/html +#usr/share/doc/libxslt-1.1.28/html/html/book1.html +#usr/share/doc/libxslt-1.1.28/html/html/home.png +#usr/share/doc/libxslt-1.1.28/html/html/index.html +#usr/share/doc/libxslt-1.1.28/html/html/left.png +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-attributes.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-documents.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-extensions.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-extra.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-functions.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-imports.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-keys.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-lib.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-namespaces.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-numbersInternals.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-pattern.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-preproc.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-security.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-templates.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-transform.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-variables.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xslt.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xsltInternals.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xsltexports.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xsltlocale.html +#usr/share/doc/libxslt-1.1.28/html/html/libxslt-xsltutils.html +#usr/share/doc/libxslt-1.1.28/html/html/right.png +#usr/share/doc/libxslt-1.1.28/html/html/up.png +#usr/share/doc/libxslt-1.1.28/html/index.html +#usr/share/doc/libxslt-1.1.28/html/internals.html +#usr/share/doc/libxslt-1.1.28/html/intro.html +#usr/share/doc/libxslt-1.1.28/html/news.html +#usr/share/doc/libxslt-1.1.28/html/node.gif +#usr/share/doc/libxslt-1.1.28/html/object.gif +#usr/share/doc/libxslt-1.1.28/html/processing.gif +#usr/share/doc/libxslt-1.1.28/html/python.html +#usr/share/doc/libxslt-1.1.28/html/redhat.gif +#usr/share/doc/libxslt-1.1.28/html/smallfootonly.gif +#usr/share/doc/libxslt-1.1.28/html/stylesheet.gif +#usr/share/doc/libxslt-1.1.28/html/templates.gif +#usr/share/doc/libxslt-1.1.28/html/tutorial +#usr/share/doc/libxslt-1.1.28/html/tutorial/libxslt_tutorial.c +#usr/share/doc/libxslt-1.1.28/html/tutorial/libxslttutorial.html +#usr/share/doc/libxslt-1.1.28/html/tutorial/libxslttutorial.xml +#usr/share/doc/libxslt-1.1.28/html/tutorial2 +#usr/share/doc/libxslt-1.1.28/html/tutorial2/libxslt_pipes.c +#usr/share/doc/libxslt-1.1.28/html/tutorial2/libxslt_pipes.html +#usr/share/doc/libxslt-1.1.28/html/tutorial2/libxslt_pipes.xml +#usr/share/doc/libxslt-1.1.28/html/xslt.html +#usr/share/doc/libxslt-1.1.28/html/xsltproc.html +#usr/share/doc/libxslt-1.1.28/html/xsltproc2.html +#usr/share/doc/libxslt-python-1.1.28 +#usr/share/doc/libxslt-python-1.1.28/TODO +#usr/share/doc/libxslt-python-1.1.28/examples +#usr/share/doc/libxslt-python-1.1.28/examples/basic.py +#usr/share/doc/libxslt-python-1.1.28/examples/exslt.py +#usr/share/doc/libxslt-python-1.1.28/examples/extelem.py +#usr/share/doc/libxslt-python-1.1.28/examples/extfunc.py +#usr/share/doc/libxslt-python-1.1.28/examples/pyxsltproc.py +#usr/share/doc/libxslt-python-1.1.28/examples/test.xml +#usr/share/doc/libxslt-python-1.1.28/examples/test.xsl +#usr/share/man/man1/xsltproc.1 +#usr/share/man/man3/libexslt.3 +#usr/share/man/man3/libxslt.3 diff --git a/config/rootfiles/common/newt b/config/rootfiles/common/newt index 2fbd2b3..adc9b75 100644 --- a/config/rootfiles/common/newt +++ b/config/rootfiles/common/newt @@ -3,7 +3,7 @@ usr/bin/whiptail #usr/lib/libnewt.a #usr/lib/libnewt.so usr/lib/libnewt.so.0.52 -usr/lib/libnewt.so.0.52.17 +usr/lib/libnewt.so.0.52.18 #usr/lib/pkgconfig/libnewt.pc #usr/lib/python2.7/site-packages/_snack.so #usr/lib/python2.7/site-packages/snack.py @@ -13,8 +13,6 @@ usr/lib/libnewt.so.0.52.17 #usr/share/locale/as #usr/share/locale/as/LC_MESSAGES #usr/share/locale/as/LC_MESSAGES/newt.mo -#usr/share/locale/ast -#usr/share/locale/ast/LC_MESSAGES #usr/share/locale/ast/LC_MESSAGES/newt.mo #usr/share/locale/bal #usr/share/locale/bal/LC_MESSAGES @@ -102,8 +100,6 @@ usr/lib/libnewt.so.0.52.17 #usr/share/locale/nn #usr/share/locale/nn/LC_MESSAGES #usr/share/locale/nn/LC_MESSAGES/newt.mo -#usr/share/locale/pa -#usr/share/locale/pa/LC_MESSAGES #usr/share/locale/pa/LC_MESSAGES/newt.mo #usr/share/locale/pl/LC_MESSAGES/newt.mo #usr/share/locale/pt/LC_MESSAGES/newt.mo diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre index 78ac2a2..8c4cc2a 100644 --- a/config/rootfiles/common/pcre +++ b/config/rootfiles/common/pcre @@ -10,7 +10,7 @@ #usr/lib/libpcre.la usr/lib/libpcre.so usr/lib/libpcre.so.1 -usr/lib/libpcre.so.1.2.4 +usr/lib/libpcre.so.1.2.5 #usr/lib/libpcrecpp.la usr/lib/libpcrecpp.so usr/lib/libpcrecpp.so.0 diff --git a/config/rootfiles/common/slang b/config/rootfiles/common/slang index 0ebef78..71802d4 100644 --- a/config/rootfiles/common/slang +++ b/config/rootfiles/common/slang @@ -4,21 +4,26 @@ #usr/include/slcurses.h #usr/lib/libslang.so usr/lib/libslang.so.2 -usr/lib/libslang.so.2.2.4 +usr/lib/libslang.so.2.3.0 #usr/lib/pkgconfig/slang.pc #usr/lib/slang #usr/lib/slang/v2 #usr/lib/slang/v2/modules +usr/lib/slang/v2/modules/base64-module.so +usr/lib/slang/v2/modules/chksum-module.so usr/lib/slang/v2/modules/csv-module.so usr/lib/slang/v2/modules/fcntl-module.so usr/lib/slang/v2/modules/fork-module.so +usr/lib/slang/v2/modules/histogram-module.so usr/lib/slang/v2/modules/iconv-module.so +usr/lib/slang/v2/modules/json-module.so usr/lib/slang/v2/modules/pcre-module.so usr/lib/slang/v2/modules/png-module.so usr/lib/slang/v2/modules/rand-module.so usr/lib/slang/v2/modules/select-module.so usr/lib/slang/v2/modules/slsmg-module.so usr/lib/slang/v2/modules/socket-module.so +usr/lib/slang/v2/modules/stats-module.so usr/lib/slang/v2/modules/sysconf-module.so usr/lib/slang/v2/modules/termios-module.so usr/lib/slang/v2/modules/varray-module.so @@ -35,6 +40,10 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/doc/slsh #usr/share/doc/slsh/html #usr/share/doc/slsh/html/slshfun-1.html +#usr/share/doc/slsh/html/slshfun-10.html +#usr/share/doc/slsh/html/slshfun-11.html +#usr/share/doc/slsh/html/slshfun-12.html +#usr/share/doc/slsh/html/slshfun-13.html #usr/share/doc/slsh/html/slshfun-2.html #usr/share/doc/slsh/html/slshfun-3.html #usr/share/doc/slsh/html/slshfun-4.html @@ -48,13 +57,18 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/slsh #usr/share/slsh/arrayfuns.sl #usr/share/slsh/autoload.sl +#usr/share/slsh/base64.sl +#usr/share/slsh/chksum.sl #usr/share/slsh/cmaps #usr/share/slsh/cmaps/cool.map #usr/share/slsh/cmaps/coolwarm.map #usr/share/slsh/cmaps/copper.map +#usr/share/slsh/cmaps/cubicl.map +#usr/share/slsh/cmaps/cubicyf.map #usr/share/slsh/cmaps/drywet.map #usr/share/slsh/cmaps/ds9b.map #usr/share/slsh/cmaps/ds9sls.map +#usr/share/slsh/cmaps/edge.map #usr/share/slsh/cmaps/gebco.map #usr/share/slsh/cmaps/globe.map #usr/share/slsh/cmaps/gray.map @@ -76,13 +90,20 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/slsh/csv.sl #usr/share/slsh/fcntl.sl #usr/share/slsh/fork.sl +#usr/share/slsh/fswalk.sl #usr/share/slsh/glob.sl #usr/share/slsh/help #usr/share/slsh/help/arrayfuns.hlp +#usr/share/slsh/help/base64funs.hlp +#usr/share/slsh/help/chksumfuns.hlp #usr/share/slsh/help/cmdopt.hlp #usr/share/slsh/help/csvfuns.hlp #usr/share/slsh/help/forkfuns.hlp +#usr/share/slsh/help/fswalk.hlp #usr/share/slsh/help/glob.hlp +#usr/share/slsh/help/histfuns.hlp +#usr/share/slsh/help/jsonfuns.hlp +#usr/share/slsh/help/listfuns.hlp #usr/share/slsh/help/onigfuns.hlp #usr/share/slsh/help/pcrefuns.hlp #usr/share/slsh/help/pngfuns.hlp @@ -95,8 +116,12 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/slsh/help/setfuns.hlp #usr/share/slsh/help/slsmg.hlp #usr/share/slsh/help/sockfuns.hlp +#usr/share/slsh/help/statsfuns.hlp #usr/share/slsh/help/structfuns.hlp +#usr/share/slsh/histogram.sl #usr/share/slsh/iconv.sl +#usr/share/slsh/json.sl +#usr/share/slsh/listfuns.sl #usr/share/slsh/local-packages #usr/share/slsh/onig.sl #usr/share/slsh/pcre.sl @@ -132,6 +157,7 @@ usr/lib/slang/v2/modules/zlib-module.so #usr/share/slsh/slshrl.sl #usr/share/slsh/slsmg.sl #usr/share/slsh/socket.sl +#usr/share/slsh/stats.sl #usr/share/slsh/stkcheck.sl #usr/share/slsh/structfuns.sl #usr/share/slsh/sysconf.sl diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index 08b87a3..3f22b72 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -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 diff --git a/config/rootfiles/core/91/exclude b/config/rootfiles/core/91/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/core/91/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/91/filelists/files b/config/rootfiles/core/91/filelists/files new file mode 100644 index 0000000..7cc5aa2 --- /dev/null +++ b/config/rootfiles/core/91/filelists/files @@ -0,0 +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 diff --git a/config/rootfiles/core/91/filelists/i586/openssl-sse2 b/config/rootfiles/core/91/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/core/91/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/i586/strongswan-padlock b/config/rootfiles/core/91/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/core/91/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libnet b/config/rootfiles/core/91/filelists/libnet new file mode 120000 index 0000000..26e5f79 --- /dev/null +++ b/config/rootfiles/core/91/filelists/libnet @@ -0,0 +1 @@ +../../../common/libnet \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libtool b/config/rootfiles/core/91/filelists/libtool new file mode 120000 index 0000000..54f5666 --- /dev/null +++ b/config/rootfiles/core/91/filelists/libtool @@ -0,0 +1 @@ +../../../common/libtool \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libxml2 b/config/rootfiles/core/91/filelists/libxml2 new file mode 120000 index 0000000..242e69f --- /dev/null +++ b/config/rootfiles/core/91/filelists/libxml2 @@ -0,0 +1 @@ +../../../common/libxml2 \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/libxslt b/config/rootfiles/core/91/filelists/libxslt new file mode 120000 index 0000000..bf9d766 --- /dev/null +++ b/config/rootfiles/core/91/filelists/libxslt @@ -0,0 +1 @@ +../../../common/libxslt \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/newt b/config/rootfiles/core/91/filelists/newt new file mode 120000 index 0000000..fb3eb20 --- /dev/null +++ b/config/rootfiles/core/91/filelists/newt @@ -0,0 +1 @@ +../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/openssh b/config/rootfiles/core/91/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/91/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/openssl b/config/rootfiles/core/91/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/91/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/pcre b/config/rootfiles/core/91/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/core/91/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/slang b/config/rootfiles/core/91/filelists/slang new file mode 120000 index 0000000..228e45e --- /dev/null +++ b/config/rootfiles/core/91/filelists/slang @@ -0,0 +1 @@ +../../../common/slang \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/strongswan b/config/rootfiles/core/91/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/91/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/91/meta b/config/rootfiles/core/91/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/91/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/91/update.sh b/config/rootfiles/core/91/update.sh new file mode 100644 index 0000000..1e55e8b --- /dev/null +++ b/config/rootfiles/core/91/update.sh @@ -0,0 +1,65 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2015 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=91 +for (( i=1; i<=$core; i++ )) +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 +/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 + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Don't report the exitcode last command +exit 0 diff --git a/doc/language_issues.de b/doc/language_issues.de index 1ccc654..90accb3 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -423,6 +423,7 @@ WARNING: translation string unused: outgoing firewall view group WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log diff --git a/doc/language_issues.en b/doc/language_issues.en index b7be862..1f1c78d 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -450,6 +450,7 @@ WARNING: translation string unused: outgoing firewall view group WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log diff --git a/doc/language_issues.es b/doc/language_issues.es index 086dfbd..9910db6 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -382,6 +382,7 @@ WARNING: translation string unused: outgoing firewall reset WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn_fastio @@ -959,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 @@ -973,6 +977,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search WARNING: untranslated string: server restart WARNING: untranslated string: show dh WARNING: untranslated string: show tls-auth key diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 47ee3fb..ef01a1e 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -390,6 +390,7 @@ WARNING: translation string unused: outgoing firewall view group WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn_fastio @@ -970,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 @@ -984,6 +988,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search WARNING: untranslated string: server restart WARNING: untranslated string: show dh WARNING: untranslated string: show tls-auth key diff --git a/doc/language_issues.it b/doc/language_issues.it index 098f440..522fee3 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -445,6 +445,7 @@ WARNING: translation string unused: outgoing firewall view group WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log @@ -707,12 +708,16 @@ 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 WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search WARNING: untranslated string: uncheck all WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 602441d..e7d8e08 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -443,6 +443,7 @@ WARNING: translation string unused: outgoing firewall view group WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn_fastio @@ -748,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 @@ -755,6 +759,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search WARNING: untranslated string: show dh WARNING: untranslated string: show tls-auth key WARNING: untranslated string: software version diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 086dfbd..9910db6 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -382,6 +382,7 @@ WARNING: translation string unused: outgoing firewall reset WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn_fastio @@ -959,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 @@ -973,6 +977,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search WARNING: untranslated string: server restart WARNING: untranslated string: show dh WARNING: untranslated string: show tls-auth key diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 94724d4..95caaa5 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -384,6 +384,7 @@ WARNING: translation string unused: outgoing firewall view group WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log WARNING: translation string unused: ovpn_fastio @@ -953,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 @@ -967,6 +971,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: samba join a domain WARNING: untranslated string: samba join domain +WARNING: untranslated string: search WARNING: untranslated string: server restart WARNING: untranslated string: show dh WARNING: untranslated string: show tls-auth key diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 6f846c7..d57c721 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -445,6 +445,7 @@ WARNING: translation string unused: outgoing firewall view group WARNING: translation string unused: outgoing firewall warning WARNING: translation string unused: override mtu WARNING: translation string unused: ovpn config +WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log @@ -686,10 +687,14 @@ 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 WARNING: untranslated string: routing table +WARNING: untranslated string: search WARNING: untranslated string: uncheck all WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw diff --git a/doc/language_missings b/doc/language_missings index 9fdc0d2..b88db57 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -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 @@ -447,6 +450,7 @@ < red1 < samba join a domain < samba join domain +< search < server restart < show dh < snat new source ip address @@ -1022,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 @@ -1032,6 +1039,7 @@ < red1 < samba join a domain < samba join domain +< search < server restart < Set time on boot < show dh @@ -1571,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 @@ -1581,6 +1592,7 @@ < red1 < samba join a domain < samba join domain +< search < server restart < show dh < snat new source ip address @@ -2123,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 @@ -2133,6 +2148,7 @@ < red1 < samba join a domain < samba join domain +< search < server restart < show dh < snat new source ip address diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index 9a7d983..dd48d58 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -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 @@ -857,12 +860,31 @@ print <<END </tr> </table> </form> +<hr /> END ; #Edited line number (KEY2) passed until cleared by 'save' or 'remove' or 'new sort order' +# Search for static leases +my $search_query = $dhcpsettings{'q'}; + +if (scalar @current2 >= 10) { + print <<END; + <form method="POST" action="#search"> + <a name="search"></a> + <table width='100%'> + <tr> + <td> + <input type="text" name="q" value="$search_query"> + <input type="submit" value="$Lang::tr{'search'}"> + </td> + </tr> + </table> + </form> +END +} + print <<END -<hr /> <table width='100%' class='tbl'> <tr> <th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FETHER'><b>$Lang::tr{'mac address'}</b></a></th> @@ -918,6 +940,11 @@ foreach my $line (@current2) { $gdesc = $Lang::tr{'click to enable'}; } + # Skip all entries that do not match the search query + if ($search_query ne "") { + next if (!grep(/$search_query/, @temp)); + } + if ($dhcpsettings{'KEY2'} eq $key) { print "<tr>"; $col="bgcolor='${Header::colouryellow}'"; diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 33f521e..59677a4 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -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 <img src='/blob.gif' alt='*' /></td> + <td width='25%'>$Lang::tr{'pptp route'}: <img src='/blob.gif' alt='*' /></td> <td colspan='3'><input size=50 type='text' name='PPTP_ROUTE' value='$pppsettings{'PPTP_ROUTE'}' /></td> </tr> diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 9490076..218dafa 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -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); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index e295412..48ade28 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -691,7 +691,7 @@ 'dhcp advopt removed' => 'DHCP Option entfernt', 'dhcp advopt scope' => 'Options-Wertebereich', 'dhcp advopt scope global' => 'Global', -'dhcp advopt scope help' => 'Globaler Bereich oder begenze Bereich auf überprüfte Schnittstellen', +'dhcp advopt scope help' => 'Globaler Bereich oder begrenze Bereich auf überprüfte Schnittstellen', 'dhcp advopt unknown' => 'Name der DHCP Option wurde nicht erkannt', 'dhcp advopt value' => 'Optionswert', 'dhcp allow bootp' => 'BOOTP Clients zulassen', @@ -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', @@ -1950,6 +1953,7 @@ 'save settings' => 'Einstellungen speichern', 'save-adv-options' => 'Erweiterte Optionen speichern', 'script name' => 'Skriptname:', +'search' => 'Suchen', 'secondary dns' => 'Sekundärer DNS:', 'secondary ntp server' => 'Sekundärer NTP-Server', 'secondary wins server address' => 'Sekundäre WINS-Server Adresse', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 80c0552..7964644 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -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', @@ -1982,6 +1985,7 @@ 'save settings' => 'Save settings', 'save-adv-options' => 'Save advanced options', 'script name' => 'Script name:', +'search' => 'Search', 'secondary dns' => 'Secondary DNS:', 'secondary ntp server' => 'Secondary NTP server', 'secondary wins server address' => 'Secondary WINS server address', diff --git a/lfs/libnet b/lfs/libnet index 0547589..a9efd99 100644 --- a/lfs/libnet +++ b/lfs/libnet @@ -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,12 +24,12 @@ include Config -VER = 1.1.2.1 +VER = 1.1.6 THISAPP = libnet-$(VER) -DL_FILE = libnet.tar.gz +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/libnet +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 = be845c41170d72c7db524f3411b50256 +$(DL_FILE)_MD5 = 710296fe424a49344e5fcc0d09e53317 install : $(TARGET) diff --git a/lfs/libtool b/lfs/libtool index e6bcd40..0172145 100644 --- a/lfs/libtool +++ b/lfs/libtool @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.4.2 +VER = 2.4.4 THISAPP = libtool-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2ec8997e0c07249eb4cbd072417d70fe +$(DL_FILE)_MD5 = 51bf400de3354687d68dfa2392506b7e install : $(TARGET) diff --git a/lfs/libxml2 b/lfs/libxml2 index 4a25c4c..ae2621b 100644 --- a/lfs/libxml2 +++ b/lfs/libxml2 @@ -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 = 2.6.32 +VER = 2.9.2 THISAPP = libxml2-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2621d322c16f0257e30f0ff2b13384de +$(DL_FILE)_MD5 = 9e6a9aca9d155737868b3dc5fd82f788 install : $(TARGET) diff --git a/lfs/libxslt b/lfs/libxslt index 47ee4f8..1339f42 100644 --- a/lfs/libxslt +++ b/lfs/libxslt @@ -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 = 1.1.17 +VER = 1.1.28 THISAPP = libxslt-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fde6a7a93c0eb14cba628692fa3a1000 +$(DL_FILE)_MD5 = 9667bf6f9310b957254fdcf6596600b7 install : $(TARGET) diff --git a/lfs/newt b/lfs/newt index daad9dc..ed53562 100644 --- a/lfs/newt +++ b/lfs/newt @@ -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 = 0.52.17 +VER = 0.52.18 THISAPP = newt-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f36d4d908965a0c89fd6fd8b61a6118b +$(DL_FILE)_MD5 = 685721bee1a318570704b19dcf31d268 install : $(TARGET) diff --git a/lfs/openssh b/lfs/openssh index d8f337b..7e6e376 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -70,9 +70,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -ifeq "$(PADLOCK)" "1" - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssh-4.7p1-padlock.patch -endif cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/ssh \ --libexecdir=/usr/lib/openssh --with-md5-passwords \ diff --git a/lfs/openssl b/lfs/openssl index 455dcf1..3b9f3e1 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -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) diff --git a/lfs/pcre b/lfs/pcre index f5c771c..175afc0 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 8.36 +VER = 8.37 THISAPP = pcre-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ff7b4bb14e355f04885cf18ff4125c98 +$(DL_FILE)_MD5 = 6e0cc6d1bdac7a4308151f9b3571b86e install : $(TARGET) diff --git a/lfs/python-optional-src b/lfs/python-optional-src index 7b9e0c7..3b9f1c5 100644 --- a/lfs/python-optional-src +++ b/lfs/python-optional-src @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,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: diff --git a/lfs/sarg b/lfs/sarg index c8794fe..ce309a1 100644 --- a/lfs/sarg +++ b/lfs/sarg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - An Open Source Firewall Solution # -# Copyright (C) 2012 Michael Tremer # +# Copyright (C) 2014 Michael Tremer # # # # 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.3.3 +VER = 2.3.9 THISAPP = sarg-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = sarg -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 09dba9a960d500acd7f17802de62512c +$(DL_FILE)_MD5 = d6e8b854950f1bebb953e0ea2ca13428 install : $(TARGET) diff --git a/lfs/slang b/lfs/slang index 55590f7..d913cdf 100644 --- a/lfs/slang +++ b/lfs/slang @@ -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 = 2.2.4 +VER = 2.3.0 THISAPP = slang-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 86cd8689cd71e281b4720fef8453ceeb +$(DL_FILE)_MD5 = 80f4e64189b6f28fd420b829b44a6723 install : $(TARGET) diff --git a/lfs/strongswan b/lfs/strongswan index f227bba..d1a5b8c 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -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" \ diff --git a/make.sh b/make.sh index 835a3a6..29245bc 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.17" # Version number -CORE="90" # Core Level (Filename) -PAKFIRE_CORE="90" # Core Level (PAKFIRE) +CORE="91" # Core Level (Filename) +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 diff --git a/src/misc-progs/rebuildhosts.c b/src/misc-progs/rebuildhosts.c index 21c5236..f77c2df 100644 --- a/src/misc-progs/rebuildhosts.c +++ b/src/misc-progs/rebuildhosts.c @@ -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)) { diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 6bf85af..d2f77fa 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -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"); diff --git a/src/paks/cyrus-imapd/uninstall.sh b/src/paks/cyrus-imapd/uninstall.sh index 6e1468e..e34fa56 100644 --- a/src/paks/cyrus-imapd/uninstall.sh +++ b/src/paks/cyrus-imapd/uninstall.sh @@ -22,7 +22,7 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh -extract_backup_include +extract_backup_includes stop_service ${NAME} make_backup ${NAME} remove_files diff --git a/src/paks/postfix/install.sh b/src/paks/postfix/install.sh index 56c23e2..0932d2e 100644 --- a/src/paks/postfix/install.sh +++ b/src/paks/postfix/install.sh @@ -23,10 +23,12 @@ # . /opt/pakfire/lib/functions.sh extract_files +restore_backup ${NAME} postalias /etc/aliases # Set postfix's hostname postconf -e "myhostname=$(hostname -f)" -/etc/init.d/postfix start + +start_service ${NAME} # Enable autostart for postfix ln -sf ../init.d/postfix /etc/rc.d/rc0.d/K25postfix diff --git a/src/paks/postfix/uninstall.sh b/src/paks/postfix/uninstall.sh index 39f1ef9..bc70451 100644 --- a/src/paks/postfix/uninstall.sh +++ b/src/paks/postfix/uninstall.sh @@ -22,5 +22,8 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes +stop_service ${NAME} +make_backup ${NAME} remove_files rm -rfv /etc/rc.d/rc*.d/*postfix diff --git a/src/patches/openssl-1.0.2-fix_parallel_build-1.patch b/src/patches/openssl-1.0.2-fix_parallel_build-1.patch new file mode 100644 index 0000000..acfaa72 --- /dev/null +++ b/src/patches/openssl-1.0.2-fix_parallel_build-1.patch @@ -0,0 +1,340 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2015-01-23 +Initial Package Version: 1.0.1e +Upstream Status: Unknown +Origin: https://github.com/Alexpux/Qt-builds/tree/master/patches/openssl +Description: Fixes build when using more than one make job to build the package. + +--- a/crypto/Makefile 2015-01-22 17:12:09.000000000 +0100 ++++ b/crypto/Makefile 2015-01-23 16:42:13.460175569 +0100 +@@ -85,11 +85,11 @@ + @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi + + subdirs: +- @target=all; $(RECURSIVE_MAKE) ++ +@target=all; $(RECURSIVE_MAKE) + + files: + $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO +- @target=files; $(RECURSIVE_MAKE) ++ +@target=files; $(RECURSIVE_MAKE) + + links: + @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) +@@ -100,7 +100,7 @@ + # lib: $(LIB): are splitted to avoid end-less loop + lib: $(LIB) + @touch lib +-$(LIB): $(LIBOBJ) ++$(LIB): $(LIBOBJ) | subdirs + $(AR) $(LIB) $(LIBOBJ) + test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o + $(RANLIB) $(LIB) || echo Never mind. +@@ -111,7 +111,7 @@ + fi + + libs: +- @target=lib; $(RECURSIVE_MAKE) ++ +@target=lib; $(RECURSIVE_MAKE) + + install: + @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... +@@ -120,7 +120,7 @@ + (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ + done; +- @target=install; $(RECURSIVE_MAKE) ++ +@target=install; $(RECURSIVE_MAKE) + + lint: + @target=lint; $(RECURSIVE_MAKE) +--- a/engines/Makefile 2015-01-22 17:12:24.000000000 +0100 ++++ b/engines/Makefile 2015-01-23 16:42:13.461175596 +0100 +@@ -72,7 +72,7 @@ + + all: lib subdirs + +-lib: $(LIBOBJ) ++lib: $(LIBOBJ) | subdirs + @if [ -n "$(SHARED_LIBS)" ]; then \ + set -e; \ + for l in $(LIBNAMES); do \ +@@ -89,7 +89,7 @@ + + subdirs: + echo $(EDIRS) +- @target=all; $(RECURSIVE_MAKE) ++ +@target=all; $(RECURSIVE_MAKE) + + files: + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO +@@ -128,7 +128,7 @@ + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ + done; \ + fi +- @target=install; $(RECURSIVE_MAKE) ++ +@target=install; $(RECURSIVE_MAKE) + + tags: + ctags $(SRC) +--- a/Makefile.org 2015-01-22 15:58:06.000000000 +0100 ++++ b/Makefile.org 2015-01-23 16:42:13.461175596 +0100 +@@ -274,17 +274,17 @@ + build_libs: build_crypto build_ssl build_engines + + build_crypto: +- @dir=crypto; target=all; $(BUILD_ONE_CMD) +-build_ssl: +- @dir=ssl; target=all; $(BUILD_ONE_CMD) +-build_engines: +- @dir=engines; target=all; $(BUILD_ONE_CMD) +-build_apps: +- @dir=apps; target=all; $(BUILD_ONE_CMD) +-build_tests: +- @dir=test; target=all; $(BUILD_ONE_CMD) +-build_tools: +- @dir=tools; target=all; $(BUILD_ONE_CMD) ++ +@dir=crypto; target=all; $(BUILD_ONE_CMD) ++build_ssl: build_crypto ++ +@dir=ssl; target=all; $(BUILD_ONE_CMD) ++build_engines: build_crypto ++ +@dir=engines; target=all; $(BUILD_ONE_CMD) ++build_apps: build_libs ++ +@dir=apps; target=all; $(BUILD_ONE_CMD) ++build_tests: build_libs ++ +@dir=test; target=all; $(BUILD_ONE_CMD) ++build_tools: build_libs ++ +@dir=tools; target=all; $(BUILD_ONE_CMD) + + all_testapps: build_libs build_testapps + build_testapps: +@@ -536,9 +536,9 @@ + dist_pem_h: + (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) + +-install: all install_docs install_sw ++install: install_docs install_sw + +-install_sw: ++install_dirs: + @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ + $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \ + $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \ +@@ -547,12 +547,19 @@ + $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ + $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ + $(INSTALL_PREFIX)$(OPENSSLDIR)/private ++ @$(PERL) $(TOP)/util/mkdir-p.pl \ ++ $(INSTALL_PREFIX)$(MANDIR)/man1 \ ++ $(INSTALL_PREFIX)$(MANDIR)/man3 \ ++ $(INSTALL_PREFIX)$(MANDIR)/man5 \ ++ $(INSTALL_PREFIX)$(MANDIR)/man7 ++ ++install_sw: install_dirs + @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\ + do \ + (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ + done; +- @set -e; target=install; $(RECURSIVE_BUILD_CMD) ++ +@set -e; target=install; $(RECURSIVE_BUILD_CMD) + @set -e; liblist="$(LIBS)"; for i in $$liblist ;\ + do \ + if [ -f "$$i" ]; then \ +@@ -636,12 +643,7 @@ + done; \ + done + +-install_docs: +- @$(PERL) $(TOP)/util/mkdir-p.pl \ +- $(INSTALL_PREFIX)$(MANDIR)/man1 \ +- $(INSTALL_PREFIX)$(MANDIR)/man3 \ +- $(INSTALL_PREFIX)$(MANDIR)/man5 \ +- $(INSTALL_PREFIX)$(MANDIR)/man7 ++install_docs: install_dirs + @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \ + here="`pwd`"; \ + filecase=; \ +--- a/Makefile.shared 2015-01-20 13:33:36.000000000 +0100 ++++ b/Makefile.shared 2015-01-23 16:42:13.461175596 +0100 +@@ -105,6 +105,7 @@ + SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ + LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ + LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ ++ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \ + LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ + $${SHAREDCMD} $${SHAREDFLAGS} \ + -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ +@@ -122,6 +123,7 @@ + done; \ + fi; \ + if [ -n "$$SHLIB_SOVER" ]; then \ ++ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \ + ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \ + ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \ + fi; \ +--- a/test/Makefile 2015-01-22 17:12:26.000000000 +0100 ++++ b/test/Makefile 2015-01-23 16:42:13.461175596 +0100 +@@ -132,7 +132,7 @@ + tags: + ctags $(SRC) + +-tests: exe apps $(TESTS) ++tests: exe $(TESTS) + + apps: + @(cd ..; $(MAKE) DIRS=apps all) +@@ -398,109 +398,109 @@ + link_app.$${shlib_target} + + $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) +- @target=$(RSATEST); $(BUILD_CMD) ++ +@target=$(RSATEST); $(BUILD_CMD) + + $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO) +- @target=$(BNTEST); $(BUILD_CMD) ++ +@target=$(BNTEST); $(BUILD_CMD) + + $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO) +- @target=$(ECTEST); $(BUILD_CMD) ++ +@target=$(ECTEST); $(BUILD_CMD) + + $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO) +- @target=$(EXPTEST); $(BUILD_CMD) ++ +@target=$(EXPTEST); $(BUILD_CMD) + + $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO) +- @target=$(IDEATEST); $(BUILD_CMD) ++ +@target=$(IDEATEST); $(BUILD_CMD) + + $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO) +- @target=$(MD2TEST); $(BUILD_CMD) ++ +@target=$(MD2TEST); $(BUILD_CMD) + + $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO) +- @target=$(SHATEST); $(BUILD_CMD) ++ +@target=$(SHATEST); $(BUILD_CMD) + + $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO) +- @target=$(SHA1TEST); $(BUILD_CMD) ++ +@target=$(SHA1TEST); $(BUILD_CMD) + + $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO) +- @target=$(SHA256TEST); $(BUILD_CMD) ++ +@target=$(SHA256TEST); $(BUILD_CMD) + + $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO) +- @target=$(SHA512TEST); $(BUILD_CMD) ++ +@target=$(SHA512TEST); $(BUILD_CMD) + + $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO) +- @target=$(RMDTEST); $(BUILD_CMD) ++ +@target=$(RMDTEST); $(BUILD_CMD) + + $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO) +- @target=$(MDC2TEST); $(BUILD_CMD) ++ +@target=$(MDC2TEST); $(BUILD_CMD) + + $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO) +- @target=$(MD4TEST); $(BUILD_CMD) ++ +@target=$(MD4TEST); $(BUILD_CMD) + + $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO) +- @target=$(MD5TEST); $(BUILD_CMD) ++ +@target=$(MD5TEST); $(BUILD_CMD) + + $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO) +- @target=$(HMACTEST); $(BUILD_CMD) ++ +@target=$(HMACTEST); $(BUILD_CMD) + + $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO) +- @target=$(WPTEST); $(BUILD_CMD) ++ +@target=$(WPTEST); $(BUILD_CMD) + + $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO) +- @target=$(RC2TEST); $(BUILD_CMD) ++ +@target=$(RC2TEST); $(BUILD_CMD) + + $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO) +- @target=$(BFTEST); $(BUILD_CMD) ++ +@target=$(BFTEST); $(BUILD_CMD) + + $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO) +- @target=$(CASTTEST); $(BUILD_CMD) ++ +@target=$(CASTTEST); $(BUILD_CMD) + + $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO) +- @target=$(RC4TEST); $(BUILD_CMD) ++ +@target=$(RC4TEST); $(BUILD_CMD) + + $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO) +- @target=$(RC5TEST); $(BUILD_CMD) ++ +@target=$(RC5TEST); $(BUILD_CMD) + + $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO) +- @target=$(DESTEST); $(BUILD_CMD) ++ +@target=$(DESTEST); $(BUILD_CMD) + + $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO) +- @target=$(RANDTEST); $(BUILD_CMD) ++ +@target=$(RANDTEST); $(BUILD_CMD) + + $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO) +- @target=$(DHTEST); $(BUILD_CMD) ++ +@target=$(DHTEST); $(BUILD_CMD) + + $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO) +- @target=$(DSATEST); $(BUILD_CMD) ++ +@target=$(DSATEST); $(BUILD_CMD) + + $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO) +- @target=$(METHTEST); $(BUILD_CMD) ++ +@target=$(METHTEST); $(BUILD_CMD) + + $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO) +- @target=$(SSLTEST); $(FIPS_BUILD_CMD) ++ +@target=$(SSLTEST); $(FIPS_BUILD_CMD) + + $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO) +- @target=$(ENGINETEST); $(BUILD_CMD) ++ +@target=$(ENGINETEST); $(BUILD_CMD) + + $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO) +- @target=$(EVPTEST); $(BUILD_CMD) ++ +@target=$(EVPTEST); $(BUILD_CMD) + + $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO) +- @target=$(ECDSATEST); $(BUILD_CMD) ++ +@target=$(ECDSATEST); $(BUILD_CMD) + + $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO) +- @target=$(ECDHTEST); $(BUILD_CMD) ++ +@target=$(ECDHTEST); $(BUILD_CMD) + + $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO) +- @target=$(IGETEST); $(BUILD_CMD) ++ +@target=$(IGETEST); $(BUILD_CMD) + + $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO) +- @target=$(JPAKETEST); $(BUILD_CMD) ++ +@target=$(JPAKETEST); $(BUILD_CMD) + + $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO) +- @target=$(ASN1TEST); $(BUILD_CMD) ++ +@target=$(ASN1TEST); $(BUILD_CMD) + + $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO) +- @target=$(SRPTEST); $(BUILD_CMD) ++ +@target=$(SRPTEST); $(BUILD_CMD) + + $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO) + @target=$(V3NAMETEST); $(BUILD_CMD) +@@ -522,7 +522,7 @@ + # fi + + dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) +- @target=dummytest; $(BUILD_CMD) ++ +@target=dummytest; $(BUILD_CMD) + + # DO NOT DELETE THIS LINE -- make depend depends on it. + diff --git a/src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch b/src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch deleted file mode 100644 index 2252e31..0000000 --- a/src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4b59d129fd1026bab37256af0df9ae7ace39e7ba Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)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 - diff --git a/src/patches/strongswan-5.3.1-build-timeattack.patch b/src/patches/strongswan-5.3.1-build-timeattack.patch new file mode 100644 index 0000000..948c4fc --- /dev/null +++ b/src/patches/strongswan-5.3.1-build-timeattack.patch @@ -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 + hooks/post-receive -- IPFire 2.x development tree

1 0

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

11 Jun '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 0ab3e07f9d96074eefb0ecbc4359f90feb520635 (commit) via 3e95f420280d49eebc07d864bc41e6ab3ea0adc3 (commit) from aec0c3102e3061d4df9002efc93e45ec50975be9 (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 0ab3e07f9d96074eefb0ecbc4359f90feb520635 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 11 17:05:27 2015 +0200 core91: Ship openssh after openssl has been updated Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3e95f420280d49eebc07d864bc41e6ab3ea0adc3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 11 17:03:56 2015 +0200 openssl: Update to version 1.0.2b https://www.openssl.org/news/secadv_20150611.txt Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{90 => 91}/filelists/i586/openssl-sse2 | 0 config/rootfiles/{oldcore/81 => core/91}/filelists/openssh | 0 config/rootfiles/{oldcore/87 => core/91}/filelists/openssl | 0 lfs/openssl | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) copy config/rootfiles/core/{90 => 91}/filelists/i586/openssl-sse2 (100%) copy config/rootfiles/{oldcore/81 => core/91}/filelists/openssh (100%) copy config/rootfiles/{oldcore/87 => core/91}/filelists/openssl (100%) Difference in files: diff --git a/config/rootfiles/core/91/filelists/i586/openssl-sse2 b/config/rootfiles/core/91/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/core/91/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/openssh b/config/rootfiles/core/91/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/91/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/openssl b/config/rootfiles/core/91/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/91/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/lfs/openssl b/lfs/openssl index 455dcf1..3b9f3e1 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -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) hooks/post-receive -- IPFire 2.x development tree

1 0

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

11 Jun '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via aec0c3102e3061d4df9002efc93e45ec50975be9 (commit) from a26a1e16983dbcfc3dd73ab2cddd1fce69223134 (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 aec0c3102e3061d4df9002efc93e45ec50975be9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 11 14:44:52 2015 +0200 Update translations Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: doc/language_issues.es | 3 +++ doc/language_issues.fr | 3 +++ doc/language_issues.it | 3 +++ doc/language_issues.nl | 3 +++ doc/language_issues.pl | 3 +++ doc/language_issues.ru | 3 +++ doc/language_issues.tr | 3 +++ doc/language_missings | 12 ++++++++++++ 8 files changed, 33 insertions(+) Difference in files: diff --git a/doc/language_issues.es b/doc/language_issues.es index fe8b726..9910db6 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -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 diff --git a/doc/language_issues.fr b/doc/language_issues.fr index fee481d..ef01a1e 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -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 diff --git a/doc/language_issues.it b/doc/language_issues.it index 2f61cb6..522fee3 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -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 diff --git a/doc/language_issues.nl b/doc/language_issues.nl index fadc792..e7d8e08 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -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 diff --git a/doc/language_issues.pl b/doc/language_issues.pl index fe8b726..9910db6 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -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 diff --git a/doc/language_issues.ru b/doc/language_issues.ru index a9e9001..95caaa5 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -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 diff --git a/doc/language_issues.tr b/doc/language_issues.tr index d94953a..d57c721 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -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 diff --git a/doc/language_missings b/doc/language_missings index 03a9e3f..b88db57 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -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 hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM June 2015