IPFire-SCM September 2016

ipfire-scm@lists.ipfire.org

1 participants
55 discussions

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. ad7e47072b4993d96749f4e8f0f106b409ed77ca
by git＠ipfire.org 18 Sep '16

18 Sep '16

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 ad7e47072b4993d96749f4e8f0f106b409ed77ca (commit) via 59d8f64e50bdcc339b95f306e4cebf85c36a3a4e (commit) from 7331b247574f78c835551d9f2944483cb1381b94 (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 ad7e47072b4993d96749f4e8f0f106b409ed77ca Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Fri Sep 2 20:35:23 2016 +0200 Libvirt: Fix update.sh script The virtlogd could only be restarted when the daemons run. The update.sh script tried to restart the daemon no matter if the daemons run or not. This behaviour produce problems. An If statement now checks if the daemon runs or not and execute the command that is suitable for the situation. Fixes: #11172 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 59d8f64e50bdcc339b95f306e4cebf85c36a3a4e Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Sun Aug 28 19:59:19 2016 +0200 Update libvirt to 2.1 This is the update of libvirt to the latest version 2.1. The most important change from a packager view is the new virtlogd daemon. This daemon handles the qemu output and wrote it to log files. The require some changes: - A new init script to start, stop restart the daemon called virtlogd. The daemon is restart with SIGUSR1 (this is important because the daemon keeps all pipelines etc. open). This introduces a problem with the uninstall.sh install.sh script. It is not possible to stop the daemon while virtual machines are running, so the script update.sh execute from now not uninstall.sh and install.sh instead it contains all steps from uninstall.sh install.sh expect the start / stop routine for virtlogd. The daemon is just restarted after the update, which makes sure that all changes take effect. - new symlinks in the uninstall.sh and install.sh script and some root file changes because of the new virtlogd init script. - the archive format changes from tar.gz to tar.xz For Changelogs see: https://libvirt.org/news-2015.html https://libvirt.org/news.html (2017 and later: https://libvirt.org/news-2016.html ) Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/i586/initscripts | 1 + config/rootfiles/common/x86_64/initscripts | 1 + config/rootfiles/packages/libvirt | 301 ++++++++++++++------------ lfs/libvirt | 11 +- src/initscripts/init.d/{libvirtd => virtlogd} | 25 +-- src/paks/libvirt/install.sh | 6 + src/paks/libvirt/uninstall.sh | 3 +- src/paks/libvirt/update.sh | 64 +++++- 8 files changed, 253 insertions(+), 159 deletions(-) copy src/initscripts/init.d/{libvirtd => virtlogd} (54%) Difference in files: diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 443dee3..ee5a4ab 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -141,6 +141,7 @@ etc/rc.d/init.d/udev_retry etc/rc.d/init.d/upnpd #etc/rc.d/init.d/vdr #etc/rc.d/init.d/vdradmin +#etc/rc.d/init.d/virtlogd etc/rc.d/init.d/vnstat #etc/rc.d/init.d/vsftpd etc/rc.d/init.d/waitdrives diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 443dee3..ee5a4ab 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -141,6 +141,7 @@ etc/rc.d/init.d/udev_retry etc/rc.d/init.d/upnpd #etc/rc.d/init.d/vdr #etc/rc.d/init.d/vdradmin +#etc/rc.d/init.d/virtlogd etc/rc.d/init.d/vnstat #etc/rc.d/init.d/vsftpd etc/rc.d/init.d/waitdrives diff --git a/config/rootfiles/packages/libvirt b/config/rootfiles/packages/libvirt index b193987..d2d164b 100644 --- a/config/rootfiles/packages/libvirt +++ b/config/rootfiles/packages/libvirt @@ -1,4 +1,5 @@ #etc/libvirt +etc/libvirt/libvirt-admin.conf etc/libvirt/libvirt.conf etc/libvirt/libvirtd.conf #etc/libvirt/nwfilter @@ -21,7 +22,9 @@ etc/libvirt/libvirtd.conf #etc/libvirt/nwfilter/qemu-announce-self.xml etc/libvirt/qemu-lockd.conf etc/libvirt/qemu.conf +etc/libvirt/virt-login-shell.conf etc/libvirt/virtlockd.conf +etc/libvirt/virtlogd.conf etc/logrotate.d/libvirtd etc/logrotate.d/libvirtd.libxl #etc/logrotate.d/libvirtd.lxc @@ -29,11 +32,16 @@ etc/logrotate.d/libvirtd.qemu #etc/logrotate.d/libvirtd.uml etc/rc.d/init.d/libvirt-guests etc/rc.d/init.d/libvirtd +etc/rc.d/init.d/virtlogd usr/bin/virsh +usr/bin/virt-admin usr/bin/virt-host-validate +usr/bin/virt-login-shell usr/bin/virt-pki-validate usr/bin/virt-xml-validate #usr/include/libvirt +#usr/include/libvirt/libvirt-admin.h +#usr/include/libvirt/libvirt-common.h #usr/include/libvirt/libvirt-domain-snapshot.h #usr/include/libvirt/libvirt-domain.h #usr/include/libvirt/libvirt-event.h @@ -49,23 +57,25 @@ usr/bin/virt-xml-validate #usr/include/libvirt/libvirt-stream.h #usr/include/libvirt/libvirt.h #usr/include/libvirt/virterror.h +#usr/lib/libnss_libvirt.la +usr/lib/libnss_libvirt.so.2 #usr/lib/libvirt #usr/lib/libvirt-admin.la #usr/lib/libvirt-admin.so usr/lib/libvirt-admin.so.0 -usr/lib/libvirt-admin.so.0.1002.18 +usr/lib/libvirt-admin.so.0.2001.0 #usr/lib/libvirt-lxc.la #usr/lib/libvirt-lxc.so usr/lib/libvirt-lxc.so.0 -usr/lib/libvirt-lxc.so.0.1002.18 +usr/lib/libvirt-lxc.so.0.2001.0 #usr/lib/libvirt-qemu.la #usr/lib/libvirt-qemu.so usr/lib/libvirt-qemu.so.0 -usr/lib/libvirt-qemu.so.0.1002.18 +usr/lib/libvirt-qemu.so.0.2001.0 #usr/lib/libvirt.la #usr/lib/libvirt.so usr/lib/libvirt.so.0 -usr/lib/libvirt.so.0.1002.18 +usr/lib/libvirt.so.0.2001.0 #usr/lib/libvirt/connection-driver #usr/lib/libvirt/connection-driver/libvirt_driver_interface.la usr/lib/libvirt/connection-driver/libvirt_driver_interface.so @@ -82,6 +92,7 @@ usr/lib/libvirt/connection-driver/libvirt_driver_storage.so #usr/lib/libvirt/lock-driver #usr/lib/libvirt/lock-driver/lockd.la usr/lib/libvirt/lock-driver/lockd.so +#usr/lib/pkgconfig/libvirt-admin.pc #usr/lib/pkgconfig/libvirt-lxc.pc #usr/lib/pkgconfig/libvirt-qemu.pc #usr/lib/pkgconfig/libvirt.pc @@ -90,6 +101,7 @@ usr/lib/sysctl.d/60-libvirtd.conf usr/libexec/libvirt_iohelper usr/sbin/libvirtd usr/sbin/virtlockd +usr/sbin/virtlogd #usr/share/augeas #usr/share/augeas/lenses #usr/share/augeas/lenses/libvirt_lockd.aug @@ -100,137 +112,150 @@ usr/sbin/virtlockd #usr/share/augeas/lenses/tests/test_libvirtd.aug #usr/share/augeas/lenses/tests/test_libvirtd_qemu.aug #usr/share/augeas/lenses/tests/test_virtlockd.aug +#usr/share/augeas/lenses/tests/test_virtlogd.aug #usr/share/augeas/lenses/virtlockd.aug -#usr/share/doc/libvirt-1.2.18.3 -#usr/share/doc/libvirt-1.2.18.3/html -#usr/share/doc/libvirt-1.2.18.3/html/32favicon.png -#usr/share/doc/libvirt-1.2.18.3/html/404.html -#usr/share/doc/libvirt-1.2.18.3/html/acl.html -#usr/share/doc/libvirt-1.2.18.3/html/aclpolkit.html -#usr/share/doc/libvirt-1.2.18.3/html/api.html -#usr/share/doc/libvirt-1.2.18.3/html/api_extension.html -#usr/share/doc/libvirt-1.2.18.3/html/apps.html -#usr/share/doc/libvirt-1.2.18.3/html/archdomain.html -#usr/share/doc/libvirt-1.2.18.3/html/architecture.gif -#usr/share/doc/libvirt-1.2.18.3/html/architecture.html -#usr/share/doc/libvirt-1.2.18.3/html/archnetwork.html -#usr/share/doc/libvirt-1.2.18.3/html/archnode.html -#usr/share/doc/libvirt-1.2.18.3/html/archstorage.html -#usr/share/doc/libvirt-1.2.18.3/html/auditlog.html -#usr/share/doc/libvirt-1.2.18.3/html/auth.html -#usr/share/doc/libvirt-1.2.18.3/html/bindings.html -#usr/share/doc/libvirt-1.2.18.3/html/bugs.html -#usr/share/doc/libvirt-1.2.18.3/html/cgroups.html -#usr/share/doc/libvirt-1.2.18.3/html/compiling.html -#usr/share/doc/libvirt-1.2.18.3/html/contact.html -#usr/share/doc/libvirt-1.2.18.3/html/csharp.html -#usr/share/doc/libvirt-1.2.18.3/html/deployment.html -#usr/share/doc/libvirt-1.2.18.3/html/devguide.html -#usr/share/doc/libvirt-1.2.18.3/html/docs.html -#usr/share/doc/libvirt-1.2.18.3/html/downloads.html -#usr/share/doc/libvirt-1.2.18.3/html/drivers.html -#usr/share/doc/libvirt-1.2.18.3/html/drvbhyve.html -#usr/share/doc/libvirt-1.2.18.3/html/drvesx.html -#usr/share/doc/libvirt-1.2.18.3/html/drvhyperv.html -#usr/share/doc/libvirt-1.2.18.3/html/drvlxc.html -#usr/share/doc/libvirt-1.2.18.3/html/drvopenvz.html -#usr/share/doc/libvirt-1.2.18.3/html/drvparallels.html -#usr/share/doc/libvirt-1.2.18.3/html/drvphyp.html -#usr/share/doc/libvirt-1.2.18.3/html/drvqemu.html -#usr/share/doc/libvirt-1.2.18.3/html/drvremote.html -#usr/share/doc/libvirt-1.2.18.3/html/drvtest.html -#usr/share/doc/libvirt-1.2.18.3/html/drvuml.html -#usr/share/doc/libvirt-1.2.18.3/html/drvvbox.html -#usr/share/doc/libvirt-1.2.18.3/html/drvvmware.html -#usr/share/doc/libvirt-1.2.18.3/html/drvxen.html -#usr/share/doc/libvirt-1.2.18.3/html/errors.html -#usr/share/doc/libvirt-1.2.18.3/html/et.png -#usr/share/doc/libvirt-1.2.18.3/html/firewall.html -#usr/share/doc/libvirt-1.2.18.3/html/footer_corner.png -#usr/share/doc/libvirt-1.2.18.3/html/footer_pattern.png -#usr/share/doc/libvirt-1.2.18.3/html/format.html -#usr/share/doc/libvirt-1.2.18.3/html/formatcaps.html -#usr/share/doc/libvirt-1.2.18.3/html/formatdomain.html -#usr/share/doc/libvirt-1.2.18.3/html/formatdomaincaps.html -#usr/share/doc/libvirt-1.2.18.3/html/formatnetwork.html -#usr/share/doc/libvirt-1.2.18.3/html/formatnode.html -#usr/share/doc/libvirt-1.2.18.3/html/formatnwfilter.html -#usr/share/doc/libvirt-1.2.18.3/html/formatsecret.html -#usr/share/doc/libvirt-1.2.18.3/html/formatsnapshot.html -#usr/share/doc/libvirt-1.2.18.3/html/formatstorage.html -#usr/share/doc/libvirt-1.2.18.3/html/formatstorageencryption.html -#usr/share/doc/libvirt-1.2.18.3/html/generic.css -#usr/share/doc/libvirt-1.2.18.3/html/goals.html -#usr/share/doc/libvirt-1.2.18.3/html/governance.html -#usr/share/doc/libvirt-1.2.18.3/html/hacking.html -#usr/share/doc/libvirt-1.2.18.3/html/hooks.html -#usr/share/doc/libvirt-1.2.18.3/html/html -#usr/share/doc/libvirt-1.2.18.3/html/html/home.png -#usr/share/doc/libvirt-1.2.18.3/html/html/index.html -#usr/share/doc/libvirt-1.2.18.3/html/html/left.png -#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-domain-snapshot.html -#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-domain.html -#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-event.html -#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-host.html -#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-interface.html -#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-network.html -#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-nodedev.html -#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-nwfilter.html -#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-secret.html -#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-storage.html -#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-stream.html -#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-virterror.html -#usr/share/doc/libvirt-1.2.18.3/html/html/right.png -#usr/share/doc/libvirt-1.2.18.3/html/html/up.png -#usr/share/doc/libvirt-1.2.18.3/html/hvsupport.html -#usr/share/doc/libvirt-1.2.18.3/html/index.html -#usr/share/doc/libvirt-1.2.18.3/html/internals -#usr/share/doc/libvirt-1.2.18.3/html/internals.html -#usr/share/doc/libvirt-1.2.18.3/html/internals/command.html -#usr/share/doc/libvirt-1.2.18.3/html/internals/locking.html -#usr/share/doc/libvirt-1.2.18.3/html/internals/oomtesting.html -#usr/share/doc/libvirt-1.2.18.3/html/internals/rpc.html -#usr/share/doc/libvirt-1.2.18.3/html/intro.html -#usr/share/doc/libvirt-1.2.18.3/html/java.html -#usr/share/doc/libvirt-1.2.18.3/html/libvirt-daemon-arch.png -#usr/share/doc/libvirt-1.2.18.3/html/libvirt-driver-arch.png -#usr/share/doc/libvirt-1.2.18.3/html/libvirt-header-bg.png -#usr/share/doc/libvirt-1.2.18.3/html/libvirt-header-logo.png -#usr/share/doc/libvirt-1.2.18.3/html/libvirt-net-logical.png -#usr/share/doc/libvirt-1.2.18.3/html/libvirt-net-physical.png -#usr/share/doc/libvirt-1.2.18.3/html/libvirt-object-model.png -#usr/share/doc/libvirt-1.2.18.3/html/libvirt.css -#usr/share/doc/libvirt-1.2.18.3/html/libvirtLogo.png -#usr/share/doc/libvirt-1.2.18.3/html/locking-lockd.html -#usr/share/doc/libvirt-1.2.18.3/html/locking-sanlock.html -#usr/share/doc/libvirt-1.2.18.3/html/locking.html -#usr/share/doc/libvirt-1.2.18.3/html/logging.html -#usr/share/doc/libvirt-1.2.18.3/html/madeWith.png -#usr/share/doc/libvirt-1.2.18.3/html/main.css -#usr/share/doc/libvirt-1.2.18.3/html/migration-managed-direct.png -#usr/share/doc/libvirt-1.2.18.3/html/migration-managed-p2p.png -#usr/share/doc/libvirt-1.2.18.3/html/migration-native.png -#usr/share/doc/libvirt-1.2.18.3/html/migration-tunnel.png -#usr/share/doc/libvirt-1.2.18.3/html/migration-unmanaged-direct.png -#usr/share/doc/libvirt-1.2.18.3/html/migration.html -#usr/share/doc/libvirt-1.2.18.3/html/news.html -#usr/share/doc/libvirt-1.2.18.3/html/node.gif -#usr/share/doc/libvirt-1.2.18.3/html/pending.html -#usr/share/doc/libvirt-1.2.18.3/html/php.html -#usr/share/doc/libvirt-1.2.18.3/html/python.html -#usr/share/doc/libvirt-1.2.18.3/html/relatedlinks.html -#usr/share/doc/libvirt-1.2.18.3/html/remote.html -#usr/share/doc/libvirt-1.2.18.3/html/secureusage.html -#usr/share/doc/libvirt-1.2.18.3/html/securityprocess.html -#usr/share/doc/libvirt-1.2.18.3/html/sitemap.html -#usr/share/doc/libvirt-1.2.18.3/html/storage.html -#usr/share/doc/libvirt-1.2.18.3/html/testapi.html -#usr/share/doc/libvirt-1.2.18.3/html/testsuites.html -#usr/share/doc/libvirt-1.2.18.3/html/testtck.html -#usr/share/doc/libvirt-1.2.18.3/html/todo.html -#usr/share/doc/libvirt-1.2.18.3/html/uri.html -#usr/share/doc/libvirt-1.2.18.3/html/virshcmdref.html -#usr/share/doc/libvirt-1.2.18.3/html/windows.html +#usr/share/augeas/lenses/virtlogd.aug +#usr/share/doc/libvirt-2.1.0 +#usr/share/doc/libvirt-2.1.0/html +#usr/share/doc/libvirt-2.1.0/html/32favicon.png +#usr/share/doc/libvirt-2.1.0/html/404.html +#usr/share/doc/libvirt-2.1.0/html/acl.html +#usr/share/doc/libvirt-2.1.0/html/aclpolkit.html +#usr/share/doc/libvirt-2.1.0/html/api.html +#usr/share/doc/libvirt-2.1.0/html/api_extension.html +#usr/share/doc/libvirt-2.1.0/html/apps.html +#usr/share/doc/libvirt-2.1.0/html/archdomain.html +#usr/share/doc/libvirt-2.1.0/html/architecture.gif +#usr/share/doc/libvirt-2.1.0/html/architecture.html +#usr/share/doc/libvirt-2.1.0/html/archnetwork.html +#usr/share/doc/libvirt-2.1.0/html/archnode.html +#usr/share/doc/libvirt-2.1.0/html/archstorage.html +#usr/share/doc/libvirt-2.1.0/html/auditlog.html +#usr/share/doc/libvirt-2.1.0/html/auth.html +#usr/share/doc/libvirt-2.1.0/html/bindings.html +#usr/share/doc/libvirt-2.1.0/html/bugs.html +#usr/share/doc/libvirt-2.1.0/html/cgroups.html +#usr/share/doc/libvirt-2.1.0/html/compiling.html +#usr/share/doc/libvirt-2.1.0/html/contact.html +#usr/share/doc/libvirt-2.1.0/html/csharp.html +#usr/share/doc/libvirt-2.1.0/html/deployment.html +#usr/share/doc/libvirt-2.1.0/html/devguide.html +#usr/share/doc/libvirt-2.1.0/html/docs.html +#usr/share/doc/libvirt-2.1.0/html/downloads.html +#usr/share/doc/libvirt-2.1.0/html/drivers.html +#usr/share/doc/libvirt-2.1.0/html/drvbhyve.html +#usr/share/doc/libvirt-2.1.0/html/drvesx.html +#usr/share/doc/libvirt-2.1.0/html/drvhyperv.html +#usr/share/doc/libvirt-2.1.0/html/drvlxc.html +#usr/share/doc/libvirt-2.1.0/html/drvopenvz.html +#usr/share/doc/libvirt-2.1.0/html/drvphyp.html +#usr/share/doc/libvirt-2.1.0/html/drvqemu.html +#usr/share/doc/libvirt-2.1.0/html/drvremote.html +#usr/share/doc/libvirt-2.1.0/html/drvtest.html +#usr/share/doc/libvirt-2.1.0/html/drvuml.html +#usr/share/doc/libvirt-2.1.0/html/drvvbox.html +#usr/share/doc/libvirt-2.1.0/html/drvvirtuozzo.html +#usr/share/doc/libvirt-2.1.0/html/drvvmware.html +#usr/share/doc/libvirt-2.1.0/html/drvxen.html +#usr/share/doc/libvirt-2.1.0/html/errors.html +#usr/share/doc/libvirt-2.1.0/html/firewall.html +#usr/share/doc/libvirt-2.1.0/html/format.html +#usr/share/doc/libvirt-2.1.0/html/formatcaps.html +#usr/share/doc/libvirt-2.1.0/html/formatdomain.html +#usr/share/doc/libvirt-2.1.0/html/formatdomaincaps.html +#usr/share/doc/libvirt-2.1.0/html/formatnetwork.html +#usr/share/doc/libvirt-2.1.0/html/formatnode.html +#usr/share/doc/libvirt-2.1.0/html/formatnwfilter.html +#usr/share/doc/libvirt-2.1.0/html/formatsecret.html +#usr/share/doc/libvirt-2.1.0/html/formatsnapshot.html +#usr/share/doc/libvirt-2.1.0/html/formatstorage.html +#usr/share/doc/libvirt-2.1.0/html/formatstorageencryption.html +#usr/share/doc/libvirt-2.1.0/html/generic.css +#usr/share/doc/libvirt-2.1.0/html/goals.html +#usr/share/doc/libvirt-2.1.0/html/governance.html +#usr/share/doc/libvirt-2.1.0/html/hacking.html +#usr/share/doc/libvirt-2.1.0/html/hooks.html +#usr/share/doc/libvirt-2.1.0/html/html +#usr/share/doc/libvirt-2.1.0/html/html/home.png +#usr/share/doc/libvirt-2.1.0/html/html/index.html +#usr/share/doc/libvirt-2.1.0/html/html/left.png +#usr/share/doc/libvirt-2.1.0/html/html/libvirt-libvirt-common.html +#usr/share/doc/libvirt-2.1.0/html/html/libvirt-libvirt-domain-snapshot.html +#usr/share/doc/libvirt-2.1.0/html/html/libvirt-libvirt-domain.html +#usr/share/doc/libvirt-2.1.0/html/html/libvirt-libvirt-event.html +#usr/share/doc/libvirt-2.1.0/html/html/libvirt-libvirt-host.html +#usr/share/doc/libvirt-2.1.0/html/html/libvirt-libvirt-interface.html +#usr/share/doc/libvirt-2.1.0/html/html/libvirt-libvirt-network.html +#usr/share/doc/libvirt-2.1.0/html/html/libvirt-libvirt-nodedev.html +#usr/share/doc/libvirt-2.1.0/html/html/libvirt-libvirt-nwfilter.html +#usr/share/doc/libvirt-2.1.0/html/html/libvirt-libvirt-secret.html +#usr/share/doc/libvirt-2.1.0/html/html/libvirt-libvirt-storage.html +#usr/share/doc/libvirt-2.1.0/html/html/libvirt-libvirt-stream.html +#usr/share/doc/libvirt-2.1.0/html/html/libvirt-virterror.html +#usr/share/doc/libvirt-2.1.0/html/html/right.png +#usr/share/doc/libvirt-2.1.0/html/html/up.png +#usr/share/doc/libvirt-2.1.0/html/hvsupport.html +#usr/share/doc/libvirt-2.1.0/html/index.html +#usr/share/doc/libvirt-2.1.0/html/internals +#usr/share/doc/libvirt-2.1.0/html/internals.html +#usr/share/doc/libvirt-2.1.0/html/internals/command.html +#usr/share/doc/libvirt-2.1.0/html/internals/eventloop.html +#usr/share/doc/libvirt-2.1.0/html/internals/locking.html +#usr/share/doc/libvirt-2.1.0/html/internals/oomtesting.html +#usr/share/doc/libvirt-2.1.0/html/internals/rpc.html +#usr/share/doc/libvirt-2.1.0/html/intro.html +#usr/share/doc/libvirt-2.1.0/html/java.html +#usr/share/doc/libvirt-2.1.0/html/libvirt-daemon-arch.png +#usr/share/doc/libvirt-2.1.0/html/libvirt-driver-arch.png +#usr/share/doc/libvirt-2.1.0/html/libvirt-header-bg.png +#usr/share/doc/libvirt-2.1.0/html/libvirt-header-logo.png +#usr/share/doc/libvirt-2.1.0/html/libvirt-net-logical.png +#usr/share/doc/libvirt-2.1.0/html/libvirt-net-physical.png +#usr/share/doc/libvirt-2.1.0/html/libvirt-object-model.png +#usr/share/doc/libvirt-2.1.0/html/libvirt.css +#usr/share/doc/libvirt-2.1.0/html/libvirtLogo.png +#usr/share/doc/libvirt-2.1.0/html/locking-lockd.html +#usr/share/doc/libvirt-2.1.0/html/locking-sanlock.html +#usr/share/doc/libvirt-2.1.0/html/locking.html +#usr/share/doc/libvirt-2.1.0/html/logging.html +#usr/share/doc/libvirt-2.1.0/html/madeWith.png +#usr/share/doc/libvirt-2.1.0/html/main.css +#usr/share/doc/libvirt-2.1.0/html/migration-managed-direct.png +#usr/share/doc/libvirt-2.1.0/html/migration-managed-p2p.png +#usr/share/doc/libvirt-2.1.0/html/migration-native.png +#usr/share/doc/libvirt-2.1.0/html/migration-tunnel.png +#usr/share/doc/libvirt-2.1.0/html/migration-unmanaged-direct.png +#usr/share/doc/libvirt-2.1.0/html/migration.html +#usr/share/doc/libvirt-2.1.0/html/news-2005.html +#usr/share/doc/libvirt-2.1.0/html/news-2006.html +#usr/share/doc/libvirt-2.1.0/html/news-2007.html +#usr/share/doc/libvirt-2.1.0/html/news-2008.html +#usr/share/doc/libvirt-2.1.0/html/news-2009.html +#usr/share/doc/libvirt-2.1.0/html/news-2010.html +#usr/share/doc/libvirt-2.1.0/html/news-2011.html +#usr/share/doc/libvirt-2.1.0/html/news-2012.html +#usr/share/doc/libvirt-2.1.0/html/news-2013.html +#usr/share/doc/libvirt-2.1.0/html/news-2014.html +#usr/share/doc/libvirt-2.1.0/html/news-2015.html +#usr/share/doc/libvirt-2.1.0/html/news.html +#usr/share/doc/libvirt-2.1.0/html/node.gif +#usr/share/doc/libvirt-2.1.0/html/nss.html +#usr/share/doc/libvirt-2.1.0/html/pending.html +#usr/share/doc/libvirt-2.1.0/html/php.html +#usr/share/doc/libvirt-2.1.0/html/python.html +#usr/share/doc/libvirt-2.1.0/html/relatedlinks.html +#usr/share/doc/libvirt-2.1.0/html/remote.html +#usr/share/doc/libvirt-2.1.0/html/secureusage.html +#usr/share/doc/libvirt-2.1.0/html/securityprocess.html +#usr/share/doc/libvirt-2.1.0/html/sitemap.html +#usr/share/doc/libvirt-2.1.0/html/storage.html +#usr/share/doc/libvirt-2.1.0/html/testapi.html +#usr/share/doc/libvirt-2.1.0/html/testsuites.html +#usr/share/doc/libvirt-2.1.0/html/testtck.html +#usr/share/doc/libvirt-2.1.0/html/todo.html +#usr/share/doc/libvirt-2.1.0/html/uri.html +#usr/share/doc/libvirt-2.1.0/html/virshcmdref.html +#usr/share/doc/libvirt-2.1.0/html/windows.html #usr/share/gtk-doc/html/libvirt #usr/share/gtk-doc/html/libvirt/general.html #usr/share/gtk-doc/html/libvirt/home.png @@ -243,6 +268,7 @@ usr/sbin/virtlockd #usr/share/gtk-doc/html/libvirt/up.png #usr/share/libvirt #usr/share/libvirt/api +usr/share/libvirt/api/libvirt-admin-api.xml usr/share/libvirt/api/libvirt-api.xml usr/share/libvirt/api/libvirt-lxc-api.xml usr/share/libvirt/api/libvirt-qemu-api.xml @@ -265,13 +291,17 @@ usr/share/libvirt/schemas/storagecommon.rng usr/share/libvirt/schemas/storagepool.rng usr/share/libvirt/schemas/storagevol.rng #usr/share/man/man1/virsh.1 +#usr/share/man/man1/virt-admin.1 #usr/share/man/man1/virt-host-validate.1 +#usr/share/man/man1/virt-login-shell.1 #usr/share/man/man1/virt-pki-validate.1 #usr/share/man/man1/virt-xml-validate.1 #usr/share/man/man8/libvirtd.8 #usr/share/man/man8/virtlockd.8 +#usr/share/man/man8/virtlogd.8 #var/cache/libvirt #var/cache/libvirt/qemu +var/ipfire/backup/addons/includes/libvirt #var/lib/libvirt #var/lib/libvirt/boot #var/lib/libvirt/filesystems @@ -283,6 +313,3 @@ usr/share/libvirt/schemas/storagevol.rng #var/log/libvirt/lxc #var/log/libvirt/qemu #var/log/libvirt/uml -etc/rc.d/init.d/libvirt-guests -etc/rc.d/init.d/libvirtd -var/ipfire/backup/addons/includes/libvirt diff --git a/lfs/libvirt b/lfs/libvirt index 854c52c..8ebca73 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -24,16 +24,16 @@ include Config -VER = 1.2.18.3 +VER = 2.1.0 THISAPP = libvirt-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = libvirt -PAK_VER = 9 +PAK_VER = 11 DEPS = "libpciaccess libyajl ncat qemu" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = bcb0738ff66972ddb25cfe0d086c5c37 +$(DL_FILE)_MD5 = fd1c054a8b59235e877efb728de79386 install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) @@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libvirt/0001-Change-default-behavior-of-libvirt-guests.sh-for-IPF.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc \ @@ -90,6 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/libvirtd /etc/rc.d/init.d/libvirtd + install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/virtlogd /etc/rc.d/init.d/virtlogd mv /usr/libexec/libvirt-guests.sh /etc/rc.d/init.d/libvirt-guests # Backup install -v -m 644 $(DIR_SRC)/config/backup/includes/libvirt /var/ipfire/backup/addons/includes/libvirt diff --git a/src/initscripts/init.d/virtlogd b/src/initscripts/init.d/virtlogd new file mode 100644 index 0000000..1482686 --- /dev/null +++ b/src/initscripts/init.d/virtlogd @@ -0,0 +1,46 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/virtlogd +# +# Description : virtlogd init script +# +# Authors : Jonatan Schlag - jonatan.schlag(a)ipfire.org +# +# Version : 01.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. $rc_functions + +case $1 in + start) + boot_mesg "Starting virtlogd Daemon..." + loadproc /usr/sbin/virtlogd -d -p /var/run/virtlogd.pid + + ;; + + stop) + boot_mesg "Stopping virtlogd Daemon..." + killproc /usr/sbin/virtlogd + ;; + + restart) + boot_mesg "Restart virtlogd Daemon..." + kill -10 $(cat /var/run/virtlogd.pid) + evaluate_retval + ;; + + status) + statusproc /usr/sbin/virtlogd + ;; + + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/virtlogd diff --git a/src/paks/libvirt/install.sh b/src/paks/libvirt/install.sh index 4a693b9..a11caa4 100644 --- a/src/paks/libvirt/install.sh +++ b/src/paks/libvirt/install.sh @@ -45,7 +45,13 @@ chown -R nobody:kvm /var/lib/libvirt/images # restore the backup restore_backup ${NAME} +start_service virtlogd start_service --background libvirtd + +ln -svf /etc/init.d/virtlogd /etc/rc.d/rc0.d/K21virtlogd +ln -svf /etc/init.d/virtlogd /etc/rc.d/rc3.d/S69virtlogd +ln -svf /etc/init.d/virtlogd /etc/rc.d/rc6.d/K21virtlogd + ln -svf /etc/init.d/libvirtd /etc/rc.d/rc0.d/K20libvirtd ln -svf /etc/init.d/libvirtd /etc/rc.d/rc3.d/S70libvirtd ln -svf /etc/init.d/libvirtd /etc/rc.d/rc6.d/K20libvirtd diff --git a/src/paks/libvirt/uninstall.sh b/src/paks/libvirt/uninstall.sh index 23c86e5..0d96e36 100644 --- a/src/paks/libvirt/uninstall.sh +++ b/src/paks/libvirt/uninstall.sh @@ -23,7 +23,7 @@ # . /opt/pakfire/lib/functions.sh stop_service libvirtd - +stop_service virtlogd extract_backup_includes make_backup ${NAME} @@ -31,4 +31,5 @@ remove_files rm -f /etc/rc.d/rc*.d/*libvirt-guests rm -f /etc/rc.d/rc*.d/*libvirtd +rm -f /etc/rc.d/rc*.d/*virtlogd diff --git a/src/paks/libvirt/update.sh b/src/paks/libvirt/update.sh index d0b3ba1..ab57cbf 100644 --- a/src/paks/libvirt/update.sh +++ b/src/paks/libvirt/update.sh @@ -22,6 +22,66 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh + +# +#uninstall +# +stop_service libvirtd +extract_backup_includes +make_backup ${NAME} + +remove_files + +rm -f /etc/rc.d/rc*.d/*libvirt-guests +rm -f /etc/rc.d/rc*.d/*libvirtd +rm -f /etc/rc.d/rc*.d/*virtlogd + +# +#install +# + +# creates a new user and group called libvirt-remote if they not exist +getent group libvirt-remote >/dev/null || groupadd libvirt-remote +getent passwd libvirt-remote >/dev/null || \ +useradd -m -g libvirt-remote -s /bin/bash "libvirt-remote" + +extract_files + +# create diretorys in var +mkdir -p /var/cache/libvirt/qemu \ +/var/lib/libvirt/boot \ +/var/lib/libvirt/filesystems \ +/var/lib/libvirt/images \ +/var/lib/libvirt/lockd/files \ +/var/lib/libvirt/qemu \ +/var/log/libvirt/qemu +# set the permissions +chown -R nobody:kvm /var/cache/libvirt/qemu +chown -R nobody:kvm /var/lib/libvirt/qemu +chown -R nobody:kvm /var/lib/libvirt/images +# restore the backup +restore_backup ${NAME} + +#restart virtlogd to use the new version +if [ -f "/var/run/virtlogd.pid" ]; then +# the daemon runs restart him +/etc/init.d/virtlogd restart +else +# the daemon runs not start him +/etc/init.d/virtlogd start +fi + +start_service --background libvirtd + +ln -svf /etc/init.d/virtlogd /etc/rc.d/rc0.d/K21virtlogd +ln -svf /etc/init.d/virtlogd /etc/rc.d/rc3.d/S69virtlogd +ln -svf /etc/init.d/virtlogd /etc/rc.d/rc6.d/K21virtlogd + +ln -svf /etc/init.d/libvirtd /etc/rc.d/rc0.d/K20libvirtd +ln -svf /etc/init.d/libvirtd /etc/rc.d/rc3.d/S70libvirtd +ln -svf /etc/init.d/libvirtd /etc/rc.d/rc6.d/K20libvirtd + +ln -svf /etc/init.d/libvirt-guests /etc/rc.d/rc0.d/K19libvirt-guests +ln -svf /etc/init.d/libvirt-guests /etc/rc.d/rc3.d/S71libvirt-guests +ln -svf /etc/init.d/libvirt-guests /etc/rc.d/rc6.d/K19libvirt-guests hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bbe8e009b824aef745c9ab9718dce9a1b557f5fc
by git＠ipfire.org 15 Sep '16

15 Sep '16

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 bbe8e009b824aef745c9ab9718dce9a1b557f5fc (commit) from f5ab60e9aa9d77fd9ef4b29f082eb6b00cb211f3 (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 bbe8e009b824aef745c9ab9718dce9a1b557f5fc Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Sep 15 15:31:48 2016 +0200 BUG11184: Error if DNAT address ends with 0 or 255 now disabled When using dnat addresses, it is possible to use big subnets and host addresses like 172.16.0.0/12. These addresses where rejected because it was recognised as network address. The check is now removed. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/firewall.cgi | 10 ---------- 1 file changed, 10 deletions(-) Difference in files: diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 8007182..face0f4 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -539,16 +539,6 @@ sub checktarget #check DNAT settings (has to be single Host and single Port or portrange) if ($fwdfwsettings{'USE_NAT'} eq 'ON' && $fwdfwsettings{'nat'} eq 'dnat'){ if($fwdfwsettings{'grp2'} eq 'tgt_addr' || $fwdfwsettings{'grp2'} eq 'cust_host_tgt' || $fwdfwsettings{'grp2'} eq 'ovpn_host_tgt'){ - #check if manual ip is a single Host (if set) - if ($fwdfwsettings{'grp2'} eq 'tgt_addr'){ - my @tmp= split (/\./,$fwdfwsettings{$fwdfwsettings{'grp2'}}); - my @tmp1= split ("/",$tmp[3]); - if (($tmp1[0] eq "0") || ($tmp1[0] eq "255")) - { - $errormessage=$Lang::tr{'fwdfw dnat error'}."<br>"; - return $errormessage; - } - } #check if Port is a single Port or portrange if ($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'grp3'} eq 'TGT_PORT'){ if(($fwdfwsettings{'PROT'} ne 'TCP'|| $fwdfwsettings{'PROT'} ne 'UDP') && $fwdfwsettings{'TGT_PORT'} eq ''){ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f5ab60e9aa9d77fd9ef4b29f082eb6b00cb211f3
by git＠ipfire.org 15 Sep '16

15 Sep '16

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 f5ab60e9aa9d77fd9ef4b29f082eb6b00cb211f3 (commit) from 48b1876a48ae485f371fe6baa5fe3c1d000ef7d8 (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 f5ab60e9aa9d77fd9ef4b29f082eb6b00cb211f3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 15 11:04:11 2016 +0100 Rootfile update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/initscripts | 2 +- config/rootfiles/common/i586/initscripts | 2 +- config/rootfiles/common/x86_64/initscripts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 9b62320..a1db665 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -162,7 +162,7 @@ etc/rc.d/rc0.d/K49cyrus-sasl etc/rc.d/rc0.d/K51vnstat etc/rc.d/rc0.d/K78snort etc/rc.d/rc0.d/K79leds -etc/rc.d/rc6.d/K79unbound +etc/rc.d/rc0.d/K79unbound etc/rc.d/rc0.d/K80network etc/rc.d/rc0.d/K82wlanclient #etc/rc.d/rc0.d/K84bluetooth diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 9ac1ce4..ca90758 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -164,7 +164,7 @@ etc/rc.d/rc0.d/K49cyrus-sasl etc/rc.d/rc0.d/K51vnstat etc/rc.d/rc0.d/K78snort etc/rc.d/rc0.d/K79leds -etc/rc.d/rc6.d/K79unbound +etc/rc.d/rc0.d/K79unbound etc/rc.d/rc0.d/K80network etc/rc.d/rc0.d/K82wlanclient #etc/rc.d/rc0.d/K84bluetooth diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 9ac1ce4..ca90758 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -164,7 +164,7 @@ etc/rc.d/rc0.d/K49cyrus-sasl etc/rc.d/rc0.d/K51vnstat etc/rc.d/rc0.d/K78snort etc/rc.d/rc0.d/K79leds -etc/rc.d/rc6.d/K79unbound +etc/rc.d/rc0.d/K79unbound etc/rc.d/rc0.d/K80network etc/rc.d/rc0.d/K82wlanclient #etc/rc.d/rc0.d/K84bluetooth hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 48b1876a48ae485f371fe6baa5fe3c1d000ef7d8
by git＠ipfire.org 14 Sep '16

14 Sep '16

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 48b1876a48ae485f371fe6baa5fe3c1d000ef7d8 (commit) via 3f1b94b9faf319ef82f1fde727563b02c9772c6b (commit) via d20ef9d703dd4f4c16d8ce68f6b093d21d1a04ca (commit) via 74a5ab67fef3726f1d47bee6181423cd9d18a2c1 (commit) via b8dd42b9a6b42d69bcabbedb962bc13ecc44d22a (commit) from ccba93959baf64aefe8c63d4e44888bb7500b036 (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 48b1876a48ae485f371fe6baa5fe3c1d000ef7d8 Merge: 3f1b94b ccba939 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Sep 14 16:41:38 2016 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 3f1b94b9faf319ef82f1fde727563b02c9772c6b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Sep 14 16:41:12 2016 +0100 python-ipaddress: New package Required for the unbound DHCP leases bridge Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d20ef9d703dd4f4c16d8ce68f6b093d21d1a04ca Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Sep 14 16:35:41 2016 +0100 unbound+DHCP: Make sure to only remove old leases and not static hosts Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 74a5ab67fef3726f1d47bee6181423cd9d18a2c1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Sep 14 16:29:53 2016 +0100 unbound+DHCP: Read correct DHCP domain name for lease Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b8dd42b9a6b42d69bcabbedb962bc13ecc44d22a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Sep 14 15:54:36 2016 +0100 unbound+DHCP: Read existing leases from unbound This allows us to restart unbound and all DHCP leases will be re-imported even if the unbound-dhcp-leases-bridge is not restarted. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/python-ipaddress | 8 +++ config/unbound/unbound-dhcp-leases-bridge | 103 ++++++++++++++++++++++++++---- lfs/{python-inotify => python-ipaddress} | 6 +- make.sh | 1 + 4 files changed, 101 insertions(+), 17 deletions(-) create mode 100644 config/rootfiles/common/python-ipaddress copy lfs/{python-inotify => python-ipaddress} (96%) Difference in files: diff --git a/config/rootfiles/common/python-ipaddress b/config/rootfiles/common/python-ipaddress new file mode 100644 index 0000000..a81a5e6 --- /dev/null +++ b/config/rootfiles/common/python-ipaddress @@ -0,0 +1,8 @@ +usr/lib/python2.7/site-packages/ipaddress.py +usr/lib/python2.7/site-packages/ipaddress.pyc +#usr/lib/python2.7/site-packages/py2_ipaddress-3.4.1-py2.7.egg-info +#usr/lib/python2.7/site-packages/py2_ipaddress-3.4.1-py2.7.egg-info/PKG-INFO +#usr/lib/python2.7/site-packages/py2_ipaddress-3.4.1-py2.7.egg-info/SOURCES.txt +#usr/lib/python2.7/site-packages/py2_ipaddress-3.4.1-py2.7.egg-info/dependency_links.txt +#usr/lib/python2.7/site-packages/py2_ipaddress-3.4.1-py2.7.egg-info/top_level.txt +#usr/lib/python2.7/site-packages/py2_ipaddress-3.4.1-py2.7.egg-info/zip-safe diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge index 06bff2e..0ef14e1 100644 --- a/config/unbound/unbound-dhcp-leases-bridge +++ b/config/unbound/unbound-dhcp-leases-bridge @@ -22,6 +22,7 @@ import argparse import datetime import daemon +import ipaddress import logging import logging.handlers import re @@ -220,7 +221,47 @@ class Lease(object): @property def domain(self): - return "local" # XXX + # Load ethernet settings + ethernet_settings = self.read_settings("/var/ipfire/ethernet/settings") + + # Load DHCP settings + dhcp_settings = self.read_settings("/var/ipfire/dhcp/settings") + + subnets = {} + for zone in ("GREEN", "BLUE"): + if not dhcp_settings.get("ENABLE_%s" % zone) == "on": + continue + + netaddr = ethernet_settings.get("%s_NETADDRESS" % zone) + submask = ethernet_settings.get("%s_NETMASK" % zone) + + subnet = ipaddress.ip_network("%s/%s" % (netaddr, submask)) + domain = dhcp_settings.get("DOMAIN_NAME_%s" % zone) + + subnets[subnet] = domain + + address = ipaddress.ip_address(self.ipaddr) + + for subnet, domain in subnets.items(): + if address in subnet: + return domain + + # Fall back to localdomain if no match could be found + return "localdomain" + + @staticmethod + def read_settings(filename): + settings = {} + + with open(filename) as f: + for line in f.readlines(): + # Remove line-breaks + line = line.rstrip() + + k, v = line.split("=", 1) + settings[k] = v + + return settings @property def fqdn(self): @@ -257,10 +298,10 @@ class Lease(object): def rrset(self): return [ # Forward record - (self.fqdn, LOCAL_TTL, "IN A", self.ipaddr), + (self.fqdn, "%s" % LOCAL_TTL, "IN A", self.ipaddr), # Reverse record - (self.ipaddr, LOCAL_TTL, "IN PTR", self.fqdn), + (self.ipaddr, "%s" % LOCAL_TTL, "IN PTR", self.fqdn), ] @@ -268,33 +309,67 @@ class UnboundConfigWriter(object): def __init__(self, path): self.path = path - self._cached_leases = [] + @property + def existing_leases(self): + local_data = self._control("list_local_data") + ret = {} + + for line in local_data.splitlines(): + try: + hostname, ttl, x, record_type, content = line.split("\t") + except ValueError: + continue + + # Ignore everything that is not A or PTR + if not record_type in ("A", "PTR"): + continue + + if hostname.endswith("."): + hostname = hostname[:-1] + + if content.endswith("."): + content = content[:-1] + + if record_type == "A": + ret[hostname] = content + elif record_type == "PTR": + ret[content] = hostname + + return ret def update_dhcp_leases(self, leases): + # Cache all expired or inactive leases + expired_leases = [l for l in leases if l.expired or not l.active] + + # Find any leases that have expired or do not exist any more + # but are still in the unbound local data + removed_leases = [] + for fqdn, address in self.existing_leases.items(): + if fqdn in (l.fqdn for l in expired_leases): + removed_leases += [fqdn, address] + # Strip all non-active or expired leases leases = [l for l in leases if l.active and not l.expired] - # Find any leases that have expired or do not exist any more - removed_leases = [l for l in self._cached_leases if l.expired or l not in leases] - # Find any leases that have been added - new_leases = [l for l in leases if l not in self._cached_leases] + new_leases = [l for l in leases + if l.fqdn not in self.existing_leases] # End here if nothing has changed if not new_leases and not removed_leases: return - self._cached_leases = leases - # Write out all leases self.write_dhcp_leases(leases) # Update unbound about changes - for l in removed_leases: - self._control("local_data_remove", l.fqdn) + for hostname in removed_leases: + log.debug("Removing all records for %s" % hostname) + self._control("local_data_remove", hostname) for l in new_leases: for rr in l.rrset: + log.debug("Adding new record %s" % " ".join(rr)) self._control("local_data", *rr) @@ -305,11 +380,11 @@ class UnboundConfigWriter(object): f.write("local-data: \"%s\"\n" % " ".join(rr)) def _control(self, *args): - command = ["unbound-control", "-q"] + command = ["unbound-control"] command.extend(args) try: - subprocess.check_call(command) + return subprocess.check_output(command) # Log any errors except subprocess.CalledProcessError as e: diff --git a/lfs/python-ipaddress b/lfs/python-ipaddress new file mode 100644 index 0000000..dd96289 --- /dev/null +++ b/lfs/python-ipaddress @@ -0,0 +1,75 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 3.4.1 + +THISAPP = py2-ipaddress-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 47734313c841068e3d5386d048d01c3d + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && python setup.py install --root=/ + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 73feacb..951f3dc 100755 --- a/make.sh +++ b/make.sh @@ -608,6 +608,7 @@ buildipfire() { ipfiremake python-inotify ipfiremake python-docutils ipfiremake python-daemon + ipfiremake python-ipaddress ipfiremake glib ipfiremake GeoIP ipfiremake fwhits hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.19-core104, created. 7331b247574f78c835551d9f2944483cb1381b94
by git＠ipfire.org 14 Sep '16

14 Sep '16

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.19-core104 has been created at 7331b247574f78c835551d9f2944483cb1381b94 (commit) - Log ----------------------------------------------------------------- commit 7331b247574f78c835551d9f2944483cb1381b94 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 13 19:39:43 2016 +0200 kernel: update to 3.14.79. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5caf3364f5d9c3faa2a461749dd815166cb8bd4c
by git＠ipfire.org 13 Sep '16

13 Sep '16

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 5caf3364f5d9c3faa2a461749dd815166cb8bd4c (commit) from d9157db9289ad3fdc86d5239163a25244161c597 (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 5caf3364f5d9c3faa2a461749dd815166cb8bd4c Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Sep 13 20:14:11 2016 +0200 libtdb: Move tools into own sub-package Move the tools to open tdb databases into an own sub-package, which will save space on installed systems. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: libtdb/libtdb.nm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) Difference in files: diff --git a/libtdb/libtdb.nm b/libtdb/libtdb.nm index 855025d..872df04 100644 --- a/libtdb/libtdb.nm +++ b/libtdb/libtdb.nm @@ -5,7 +5,7 @@ name = libtdb version = 1.3.11 -release = 1 +release = 2 groups = System/Libraries url = http://tdb.samba.org/ @@ -36,6 +36,22 @@ end packages package %{name} + package tdb-tools + summary = Tools to manage Tdb files. + description + %{summary} + end + + requires + %{name} = %{thisver} + end + + files + %{bindir} + %{mandir}/man8/*.* + end + end + package %{name}-devel template DEVEL end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ccba93959baf64aefe8c63d4e44888bb7500b036
by git＠ipfire.org 13 Sep '16

13 Sep '16

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 ccba93959baf64aefe8c63d4e44888bb7500b036 (commit) via 7331b247574f78c835551d9f2944483cb1381b94 (commit) via 1d843cda2b28d1ba842ca496a95f4cd88afe54dc (commit) from 077ea717e035aa5fa37ce670957d3312fcaabcf1 (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 ccba93959baf64aefe8c63d4e44888bb7500b036 Merge: 077ea71 7331b24 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 13 19:41:36 2016 +0200 Merge branch 'core104' into next ----------------------------------------------------------------------- Summary of changes: config/xen-image/xen-image-maker.sh | 6 ++++-- lfs/linux | 19 +++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) Difference in files: diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh index 00abb89..d10ea21 100644 --- a/config/xen-image/xen-image-maker.sh +++ b/config/xen-image/xen-image-maker.sh @@ -121,12 +121,15 @@ tar -C $MNThdd/ -xvf $TMPDIR/$SNAME-$VERSION.tar \ --exclude=lib/modules* --exclude=boot* --numeric-owner #Install Kernel +mkdir $MNThdd/proc +mkdir $MNThdd/boot/grub +echo "flags : pae " > $MNThdd/proc/cpuinfo # fake pae detection tar -C $MNThdd/opt/pakfire/tmp -xvf $TMPDIR/$KERNEL --numeric-owner chroot $MNThdd /opt/pakfire/tmp/install.sh rm -rf $MNThdd/opt/pakfire/tmp/* +rm -rf $MNThdd/proc/cpuinfo #Create grub menuentry for pygrub -mkdir $MNThdd/boot/grub echo "timeout 10" > $MNThdd/boot/grub/grub.conf echo "default 0" >> $MNThdd/boot/grub/grub.conf echo "title IPFire ($KERN_TYPE-kernel)" >> $MNThdd/boot/grub/grub.conf @@ -155,7 +158,6 @@ echo "LANGUAGE=en" >> $MNThdd/var/ipfire/main/settings echo "HOSTNAME=$SNAME" >> $MNThdd/var/ipfire/main/settings echo "THEME=ipfire" >> $MNThdd/var/ipfire/main/settings touch $MNThdd/lib/modules/$KVER-ipfire-$KERN_TYPE/modules.dep -mkdir $MNThdd/proc mount --bind /proc $MNThdd/proc mount --bind /dev $MNThdd/dev mount --bind /sys $MNThdd/sys diff --git a/lfs/linux b/lfs/linux index e365be6..da13c17 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ include Config -VER = 3.14.77 -RPI_PATCHES = 3.14.77-grsec-ipfire1 -A7M_PATCHES = 3.14.77-grsec-ipfire1 -GRS_PATCHES = grsecurity-3.1ipfire-3.14.77-v1.patch.xz +VER = 3.14.79 +RPI_PATCHES = 3.14.79-grsec-ipfire1 +A7M_PATCHES = 3.14.79-grsec-ipfire1 +GRS_PATCHES = grsecurity-3.1ipfire-3.14.79-v1.patch.xz THISAPP = linux-$(VER) @@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 71 +PAK_VER = 72 DEPS = "" KERNEL_ARCH = $(MACHINE) @@ -83,10 +83,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES). arm7-multi-patches-$(A7M_PATCHES).patch.xz = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = 7ecb8518498d0666a7b88f359e566f4c -rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 3213020a9627ea73cc9668e2db4ff8a4 -arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 56949a37637656d5ea23658cc9222f64 -$(GRS_PATCHES)_MD5 = 5ed67f97c3b0de1b290f9155eb166c56 +$(DL_FILE)_MD5 = ec5b09d8ad2ebf92e6f51a727a338559 +rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = a02a7fd54c642c1e3578a00ed22f54f8 +arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 6c3b11e51caa278dbeacd1e23c2b171b +$(GRS_PATCHES)_MD5 = 7fe448b53558082395f68c5db94af1a7 install : $(TARGET) @@ -132,7 +132,6 @@ ifneq "$(KCFG)" "-headers" cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1 cd $(DIR_APP) && rm localversion-grsec cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.77-gsrec_tcp_input_access_once_rw.patch endif # DVB Patches hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7331b247574f78c835551d9f2944483cb1381b94
by git＠ipfire.org 13 Sep '16

13 Sep '16

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 7331b247574f78c835551d9f2944483cb1381b94 (commit) via 1d843cda2b28d1ba842ca496a95f4cd88afe54dc (commit) from 69f3684cf5337d34963b1ee6a5c8ac2072c6eaf6 (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 7331b247574f78c835551d9f2944483cb1381b94 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 13 19:39:43 2016 +0200 kernel: update to 3.14.79. commit 1d843cda2b28d1ba842ca496a95f4cd88afe54dc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 13 19:37:58 2016 +0200 xen-image: fix kernel installation. linux-pae will refuse to install if pae is not detected but /proc was not exist at image cration. fixed by adding a fake cpuinfo file... ----------------------------------------------------------------------- Summary of changes: config/xen-image/xen-image-maker.sh | 6 ++++-- lfs/linux | 19 +++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) Difference in files: diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh index 00abb89..d10ea21 100644 --- a/config/xen-image/xen-image-maker.sh +++ b/config/xen-image/xen-image-maker.sh @@ -121,12 +121,15 @@ tar -C $MNThdd/ -xvf $TMPDIR/$SNAME-$VERSION.tar \ --exclude=lib/modules* --exclude=boot* --numeric-owner #Install Kernel +mkdir $MNThdd/proc +mkdir $MNThdd/boot/grub +echo "flags : pae " > $MNThdd/proc/cpuinfo # fake pae detection tar -C $MNThdd/opt/pakfire/tmp -xvf $TMPDIR/$KERNEL --numeric-owner chroot $MNThdd /opt/pakfire/tmp/install.sh rm -rf $MNThdd/opt/pakfire/tmp/* +rm -rf $MNThdd/proc/cpuinfo #Create grub menuentry for pygrub -mkdir $MNThdd/boot/grub echo "timeout 10" > $MNThdd/boot/grub/grub.conf echo "default 0" >> $MNThdd/boot/grub/grub.conf echo "title IPFire ($KERN_TYPE-kernel)" >> $MNThdd/boot/grub/grub.conf @@ -155,7 +158,6 @@ echo "LANGUAGE=en" >> $MNThdd/var/ipfire/main/settings echo "HOSTNAME=$SNAME" >> $MNThdd/var/ipfire/main/settings echo "THEME=ipfire" >> $MNThdd/var/ipfire/main/settings touch $MNThdd/lib/modules/$KVER-ipfire-$KERN_TYPE/modules.dep -mkdir $MNThdd/proc mount --bind /proc $MNThdd/proc mount --bind /dev $MNThdd/dev mount --bind /sys $MNThdd/sys diff --git a/lfs/linux b/lfs/linux index e365be6..da13c17 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ include Config -VER = 3.14.77 -RPI_PATCHES = 3.14.77-grsec-ipfire1 -A7M_PATCHES = 3.14.77-grsec-ipfire1 -GRS_PATCHES = grsecurity-3.1ipfire-3.14.77-v1.patch.xz +VER = 3.14.79 +RPI_PATCHES = 3.14.79-grsec-ipfire1 +A7M_PATCHES = 3.14.79-grsec-ipfire1 +GRS_PATCHES = grsecurity-3.1ipfire-3.14.79-v1.patch.xz THISAPP = linux-$(VER) @@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 71 +PAK_VER = 72 DEPS = "" KERNEL_ARCH = $(MACHINE) @@ -83,10 +83,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES). arm7-multi-patches-$(A7M_PATCHES).patch.xz = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = 7ecb8518498d0666a7b88f359e566f4c -rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 3213020a9627ea73cc9668e2db4ff8a4 -arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 56949a37637656d5ea23658cc9222f64 -$(GRS_PATCHES)_MD5 = 5ed67f97c3b0de1b290f9155eb166c56 +$(DL_FILE)_MD5 = ec5b09d8ad2ebf92e6f51a727a338559 +rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = a02a7fd54c642c1e3578a00ed22f54f8 +arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 6c3b11e51caa278dbeacd1e23c2b171b +$(GRS_PATCHES)_MD5 = 7fe448b53558082395f68c5db94af1a7 install : $(TARGET) @@ -132,7 +132,6 @@ ifneq "$(KCFG)" "-headers" cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1 cd $(DIR_APP) && rm localversion-grsec cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.77-gsrec_tcp_input_access_once_rw.patch endif # DVB Patches hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core104, updated. 7331b247574f78c835551d9f2944483cb1381b94
by git＠ipfire.org 13 Sep '16

13 Sep '16

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, core104 has been updated via 7331b247574f78c835551d9f2944483cb1381b94 (commit) via 1d843cda2b28d1ba842ca496a95f4cd88afe54dc (commit) from 69f3684cf5337d34963b1ee6a5c8ac2072c6eaf6 (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 7331b247574f78c835551d9f2944483cb1381b94 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 13 19:39:43 2016 +0200 kernel: update to 3.14.79. commit 1d843cda2b28d1ba842ca496a95f4cd88afe54dc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 13 19:37:58 2016 +0200 xen-image: fix kernel installation. linux-pae will refuse to install if pae is not detected but /proc was not exist at image cration. fixed by adding a fake cpuinfo file... ----------------------------------------------------------------------- Summary of changes: config/xen-image/xen-image-maker.sh | 6 ++++-- lfs/linux | 19 +++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) Difference in files: diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh index 00abb89..d10ea21 100644 --- a/config/xen-image/xen-image-maker.sh +++ b/config/xen-image/xen-image-maker.sh @@ -121,12 +121,15 @@ tar -C $MNThdd/ -xvf $TMPDIR/$SNAME-$VERSION.tar \ --exclude=lib/modules* --exclude=boot* --numeric-owner #Install Kernel +mkdir $MNThdd/proc +mkdir $MNThdd/boot/grub +echo "flags : pae " > $MNThdd/proc/cpuinfo # fake pae detection tar -C $MNThdd/opt/pakfire/tmp -xvf $TMPDIR/$KERNEL --numeric-owner chroot $MNThdd /opt/pakfire/tmp/install.sh rm -rf $MNThdd/opt/pakfire/tmp/* +rm -rf $MNThdd/proc/cpuinfo #Create grub menuentry for pygrub -mkdir $MNThdd/boot/grub echo "timeout 10" > $MNThdd/boot/grub/grub.conf echo "default 0" >> $MNThdd/boot/grub/grub.conf echo "title IPFire ($KERN_TYPE-kernel)" >> $MNThdd/boot/grub/grub.conf @@ -155,7 +158,6 @@ echo "LANGUAGE=en" >> $MNThdd/var/ipfire/main/settings echo "HOSTNAME=$SNAME" >> $MNThdd/var/ipfire/main/settings echo "THEME=ipfire" >> $MNThdd/var/ipfire/main/settings touch $MNThdd/lib/modules/$KVER-ipfire-$KERN_TYPE/modules.dep -mkdir $MNThdd/proc mount --bind /proc $MNThdd/proc mount --bind /dev $MNThdd/dev mount --bind /sys $MNThdd/sys diff --git a/lfs/linux b/lfs/linux index e365be6..da13c17 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ include Config -VER = 3.14.77 -RPI_PATCHES = 3.14.77-grsec-ipfire1 -A7M_PATCHES = 3.14.77-grsec-ipfire1 -GRS_PATCHES = grsecurity-3.1ipfire-3.14.77-v1.patch.xz +VER = 3.14.79 +RPI_PATCHES = 3.14.79-grsec-ipfire1 +A7M_PATCHES = 3.14.79-grsec-ipfire1 +GRS_PATCHES = grsecurity-3.1ipfire-3.14.79-v1.patch.xz THISAPP = linux-$(VER) @@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 71 +PAK_VER = 72 DEPS = "" KERNEL_ARCH = $(MACHINE) @@ -83,10 +83,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES). arm7-multi-patches-$(A7M_PATCHES).patch.xz = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = 7ecb8518498d0666a7b88f359e566f4c -rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 3213020a9627ea73cc9668e2db4ff8a4 -arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 56949a37637656d5ea23658cc9222f64 -$(GRS_PATCHES)_MD5 = 5ed67f97c3b0de1b290f9155eb166c56 +$(DL_FILE)_MD5 = ec5b09d8ad2ebf92e6f51a727a338559 +rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = a02a7fd54c642c1e3578a00ed22f54f8 +arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 6c3b11e51caa278dbeacd1e23c2b171b +$(GRS_PATCHES)_MD5 = 7fe448b53558082395f68c5db94af1a7 install : $(TARGET) @@ -132,7 +132,6 @@ ifneq "$(KCFG)" "-headers" cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1 cd $(DIR_APP) && rm localversion-grsec cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.77-gsrec_tcp_input_access_once_rw.patch endif # DVB Patches hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 077ea717e035aa5fa37ce670957d3312fcaabcf1
by git＠ipfire.org 12 Sep '16

12 Sep '16

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 077ea717e035aa5fa37ce670957d3312fcaabcf1 (commit) via 811f3d3050c713c9e86572c922734a5f44d70797 (commit) via cc53e7ef230255bbf2ebf6ed6af8206d88206e8e (commit) via 36792be6ce3775b86a58e4696f793ead2dc97e7f (commit) via 6f5d8f0cce3c8eeab754f00ad2e367ffc83112b2 (commit) via a66c4880d9a43893933bdaf19ca64654a6ebe210 (commit) from 266735a12faddf4635d2b3a772c4f4e9a472763c (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 077ea717e035aa5fa37ce670957d3312fcaabcf1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 12 21:14:44 2016 +0100 unbound+DHCP: Set TTL for local leases to 1m Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 811f3d3050c713c9e86572c922734a5f44d70797 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 12 21:13:25 2016 +0100 unbound: Start service after network has been brought up Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cc53e7ef230255bbf2ebf6ed6af8206d88206e8e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 12 20:52:51 2016 +0100 unbound: Restart after local hosts have been modified Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 36792be6ce3775b86a58e4696f793ead2dc97e7f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 12 20:46:02 2016 +0100 DNS: Import local hosts into unbound Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6f5d8f0cce3c8eeab754f00ad2e367ffc83112b2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 12 20:20:08 2016 +0100 Start unbound+DHCP bridge only when DHCP server is running Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a66c4880d9a43893933bdaf19ca64654a6ebe210 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 12 20:11:47 2016 +0100 unbound: Start service at system boot Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/initscripts | 3 ++ config/rootfiles/common/i586/initscripts | 3 ++ config/rootfiles/common/x86_64/initscripts | 3 ++ config/unbound/unbound-dhcp-leases-bridge | 6 ++- html/cgi-bin/hosts.cgi | 1 + lfs/initscripts | 3 ++ src/initscripts/init.d/dhcp | 12 +++++ src/initscripts/init.d/unbound | 31 ++++++----- src/misc-progs/rebuildhosts.c | 79 ---------------------------- 9 files changed, 47 insertions(+), 94 deletions(-) Difference in files: diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index e3d48c2..9b62320 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -162,6 +162,7 @@ etc/rc.d/rc0.d/K49cyrus-sasl etc/rc.d/rc0.d/K51vnstat etc/rc.d/rc0.d/K78snort etc/rc.d/rc0.d/K79leds +etc/rc.d/rc6.d/K79unbound etc/rc.d/rc0.d/K80network etc/rc.d/rc0.d/K82wlanclient #etc/rc.d/rc0.d/K84bluetooth @@ -182,6 +183,7 @@ etc/rc.d/rc3.d/S15fireinfo etc/rc.d/rc3.d/S19smartenabler etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S20network +etc/rc.d/rc3.d/S21unbound etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl etc/rc.d/rc3.d/S25random @@ -211,6 +213,7 @@ etc/rc.d/rc6.d/K49cyrus-sasl etc/rc.d/rc6.d/K51vnstat etc/rc.d/rc6.d/K78snort etc/rc.d/rc6.d/K79leds +etc/rc.d/rc6.d/K79unbound etc/rc.d/rc6.d/K80network etc/rc.d/rc6.d/K82wlanclient #etc/rc.d/rc6.d/K84bluetooth diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 8fb1680..9ac1ce4 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -164,6 +164,7 @@ etc/rc.d/rc0.d/K49cyrus-sasl etc/rc.d/rc0.d/K51vnstat etc/rc.d/rc0.d/K78snort etc/rc.d/rc0.d/K79leds +etc/rc.d/rc6.d/K79unbound etc/rc.d/rc0.d/K80network etc/rc.d/rc0.d/K82wlanclient #etc/rc.d/rc0.d/K84bluetooth @@ -186,6 +187,7 @@ etc/rc.d/rc3.d/S15fireinfo etc/rc.d/rc3.d/S19smartenabler etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S20network +etc/rc.d/rc3.d/S21unbound etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl etc/rc.d/rc3.d/S25random @@ -215,6 +217,7 @@ etc/rc.d/rc6.d/K49cyrus-sasl etc/rc.d/rc6.d/K51vnstat etc/rc.d/rc6.d/K78snort etc/rc.d/rc6.d/K79leds +etc/rc.d/rc6.d/K79unbound etc/rc.d/rc6.d/K80network etc/rc.d/rc6.d/K82wlanclient #etc/rc.d/rc6.d/K84bluetooth diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 8fb1680..9ac1ce4 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -164,6 +164,7 @@ etc/rc.d/rc0.d/K49cyrus-sasl etc/rc.d/rc0.d/K51vnstat etc/rc.d/rc0.d/K78snort etc/rc.d/rc0.d/K79leds +etc/rc.d/rc6.d/K79unbound etc/rc.d/rc0.d/K80network etc/rc.d/rc0.d/K82wlanclient #etc/rc.d/rc0.d/K84bluetooth @@ -186,6 +187,7 @@ etc/rc.d/rc3.d/S15fireinfo etc/rc.d/rc3.d/S19smartenabler etc/rc.d/rc3.d/S19wlanclient etc/rc.d/rc3.d/S20network +etc/rc.d/rc3.d/S21unbound etc/rc.d/rc3.d/S21leds etc/rc.d/rc3.d/S24cyrus-sasl etc/rc.d/rc3.d/S25random @@ -215,6 +217,7 @@ etc/rc.d/rc6.d/K49cyrus-sasl etc/rc.d/rc6.d/K51vnstat etc/rc.d/rc6.d/K78snort etc/rc.d/rc6.d/K79leds +etc/rc.d/rc6.d/K79unbound etc/rc.d/rc6.d/K80network etc/rc.d/rc6.d/K82wlanclient #etc/rc.d/rc6.d/K84bluetooth diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge index 61bd5d0..06bff2e 100644 --- a/config/unbound/unbound-dhcp-leases-bridge +++ b/config/unbound/unbound-dhcp-leases-bridge @@ -30,6 +30,8 @@ import subprocess import inotify.adapters +LOCAL_TTL = 60 + def setup_logging(loglevel=logging.INFO): log = logging.getLogger("dhcp") log.setLevel(loglevel) @@ -255,10 +257,10 @@ class Lease(object): def rrset(self): return [ # Forward record - (self.fqdn, "IN A", self.ipaddr), + (self.fqdn, LOCAL_TTL, "IN A", self.ipaddr), # Reverse record - (self.ipaddr, "IN PTR", self.fqdn), + (self.ipaddr, LOCAL_TTL, "IN PTR", self.fqdn), ] diff --git a/html/cgi-bin/hosts.cgi b/html/cgi-bin/hosts.cgi index e3463d1..41fe8a5 100644 --- a/html/cgi-bin/hosts.cgi +++ b/html/cgi-bin/hosts.cgi @@ -462,4 +462,5 @@ sub SortDataFile # sub BuildConfiguration { system '/usr/local/bin/rebuildhosts'; + system '/usr/local/bin/unboundctrl restart &>/dev/null'; } diff --git a/lfs/initscripts b/lfs/initscripts index 5e2cd24..4369ffe 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -127,6 +127,9 @@ $(TARGET) : ln -sf ../init.d/network /etc/rc.d/rc0.d/K80network ln -sf ../init.d/network /etc/rc.d/rc3.d/S20network ln -sf ../init.d/network /etc/rc.d/rc6.d/K80network + ln -sf ../init.d/unbound /etc/rc.d/rc0.d/K79unbound + ln -sf ../init.d/unbound /etc/rc.d/rc3.d/S21unbound + ln -sf ../init.d/unbound /etc/rc.d/rc6.d/K79unbound ln -sf ../init.d/random /etc/rc.d/rc0.d/K45random ln -sf ../init.d/random /etc/rc.d/rc3.d/S25random ln -sf ../init.d/random /etc/rc.d/rc6.d/K45random diff --git a/src/initscripts/init.d/dhcp b/src/initscripts/init.d/dhcp index 083a555..2182bc4 100644 --- a/src/initscripts/init.d/dhcp +++ b/src/initscripts/init.d/dhcp @@ -7,7 +7,9 @@ . /etc/sysconfig/rc . $rc_functions + eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) +eval $(/usr/local/bin/readhash /var/ipfire/dhcp/settings) function flush_chains() { iptables -F DHCPGREENINPUT @@ -36,6 +38,12 @@ case "$1" in boot_mesg "Starting DHCP Server..." loadproc /usr/sbin/dhcpd -q ${devices} + # Start Unbound DHCP Lease Bridge unless RFC2136 is used + if [ "${DNS_UPDATE_ENABLED}" != on ]; then + boot_mesg "Starting Unbound DHCP Leases Bridge..." + loadproc /usr/sbin/unbound-dhcp-leases-bridge -d + fi + (sleep 5 && chmod 644 /var/run/dhcpd.pid) & # Fix because silly dhcpd creates its pid with mode 640 ;; @@ -52,6 +60,9 @@ case "$1" in echo_ok; exit 0 fi + + boot_mesg "Stopping Unbound DHCP Leases Bridge..." + killproc /usr/sbin/unbound-dhcp-leases-bridge ;; reload) @@ -67,6 +78,7 @@ case "$1" in status) statusproc /usr/sbin/dhcpd + statusproc /usr/sbin/unbound-dhcp-leases-bridge ;; *) diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/unbound index f3d35cf..6496265 100644 --- a/src/initscripts/init.d/unbound +++ b/src/initscripts/init.d/unbound @@ -3,15 +3,15 @@ # Description : Unbound DNS resolver boot script for IPfire # Author : Marcel Lorenz <marcel.lorenz(a)ipfire.org> -# -# Comment : This init script additional starts the dhcpd watcher daemon -# if DNS-Update (RFC2136) in web interface enabled . /etc/sysconfig/rc . ${rc_functions} USE_FORWARDERS=1 +# Cache any local zones for 60 seconds +LOCAL_TTL=60 + # Load optional configuration [ -e "/etc/sysconfig/unbound" ] && . /etc/sysconfig/unbound @@ -67,6 +67,19 @@ update_forwarders() { fi } +update_hosts() { + local enabled address hostname domainname + + while IFS="," read -r enabled address hostname domainname; do + [ "${enabled}" = "on" ] || continue + + # Build FQDN + local fqdn="${hostname}.${domainname}" + + unbound-control -q local_data "${fqdn} ${LOCAL_TTL} IN A ${address}" + done < /var/ipfire/main/hosts +} + write_interfaces_conf() { ( config_header @@ -169,7 +182,6 @@ get_memory_amount() { case "$1" in start) eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) - eval $(/usr/local/bin/readhash /var/ipfire/dhcp/settings) # Create control keys at first run if [ ! -r "/etc/unbound/unbound_control.key" ]; then @@ -187,17 +199,11 @@ case "$1" in # Update any known forwarding name servers update_forwarders - # Start Unbound DHCP Lease Bridge unless RFC2136 is used - if [ "${DNS_UPDATE_ENABLED}" != on ]; then - boot_mesg "Starting Unbound DHCP Leases Bridge..." - loadproc /usr/sbin/unbound-dhcp-leases-bridge -d - fi + # Update hosts + update_hosts ;; stop) - boot_mesg "Stopping Unbound DHCP Leases Bridge..." - killproc /usr/sbin/unbound-dhcp-leases-bridge - boot_mesg "Stopping Unbound DNS Proxy..." killproc /usr/sbin/unbound ;; @@ -210,7 +216,6 @@ case "$1" in status) statusproc /usr/sbin/unbound - statusproc /usr/sbin/unbound-dhcp-leases-bridge ;; update-forwarders) diff --git a/src/misc-progs/rebuildhosts.c b/src/misc-progs/rebuildhosts.c index f77c2df..549c653 100644 --- a/src/misc-progs/rebuildhosts.c +++ b/src/misc-progs/rebuildhosts.c @@ -14,16 +14,13 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#include <fcntl.h> #include <string.h> #include <sys/types.h> #include <sys/stat.h> -#include <signal.h> #include "setuid.h" #include "netutil.h" -FILE *fd = NULL; FILE *hosts = NULL; FILE *gw = NULL; struct keyvalue *kv = NULL; @@ -32,8 +29,6 @@ void exithandler(void) { if (kv) freekeyvalues(kv); - if (fd) - fclose(fd); if (hosts) fclose(hosts); if (gw) @@ -42,22 +37,16 @@ void exithandler(void) int main(int argc, char *argv[]) { - int fdpid; char hostname[STRING_SIZE] = ""; char domainname[STRING_SIZE] = ""; char gateway[STRING_SIZE] = ""; - char buffer[STRING_SIZE]; char address[STRING_SIZE] = ""; - char *active, *ip, *host, *domain; - int pid; if (!(initsetuid())) exit(1); atexit(exithandler); - memset(buffer, 0, STRING_SIZE); - kv = initkeyvalues(); if (!(readkeyvalues(kv, CONFIG_ROOT "/ethernet/settings"))) { @@ -88,17 +77,9 @@ int main(int argc, char *argv[]) fprintf(stderr, "Couldn't open remote-ipaddress file\n"); } - if (!(fd = fopen(CONFIG_ROOT "/main/hosts", "r"))) - { - fprintf(stderr, "Couldn't open main hosts file\n"); - exit(1); - } - if (!(hosts = fopen("/etc/hosts", "w"))) { fprintf(stderr, "Couldn't open /etc/hosts file\n"); - fclose(fd); - fd = NULL; exit(1); } fprintf(hosts, "127.0.0.1\tlocalhost\n"); @@ -110,65 +91,5 @@ int main(int argc, char *argv[]) if (strlen(gateway) > 0) fprintf(hosts, "%s\tgateway\n", gateway); - while (fgets(buffer, STRING_SIZE, fd)) - { - buffer[strlen(buffer) - 1] = 0; - if (buffer[0]==',') continue; /* disabled if empty field */ - active = strtok(buffer, ","); - if (strcmp(active, "off")==0) continue; /* or 'off' */ - - ip = strtok(NULL, ","); - host = strtok(NULL, ","); - domain = strtok(NULL, ","); - - if (!(ip && host)) - continue; // bad line ? skip - - if (!VALID_IP(ip)) - { - fprintf(stderr, "Bad IP: %s\n", ip); - continue; /* bad ip, skip */ - } - - if (strspn(host, LETTERS_NUMBERS "-") != strlen(host)) - { - fprintf(stderr, "Bad Host: %s\n", host); - continue; /* bad name, skip */ - } - - if (domain) - fprintf(hosts, "%s\t%s.%s\t%s\n",ip,host,domain,host); - else - fprintf(hosts, "%s\t%s\n",ip,host); - } - fclose(fd); - fd = NULL; - fclose(hosts); - hosts = NULL; - - if ((fdpid = open("/var/run/dnsmasq.pid", O_RDONLY)) == -1) - { - fprintf(stderr, "Couldn't open pid file\n"); - exit(1); - } - if (read(fdpid, buffer, STRING_SIZE - 1) == -1) - { - fprintf(stderr, "Couldn't read from pid file\n"); - close(fdpid); - exit(1); - } - close(fdpid); - pid = atoi(buffer); - if (pid <= 1) - { - fprintf(stderr, "Bad pid value\n"); - exit(1); - } - if (kill(pid, SIGHUP) == -1) - { - fprintf(stderr, "Unable to send SIGHUP\n"); - exit(1); - } - return 0; } 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 September 2016