IPFire-SCM March 2017

ipfire-scm@lists.ipfire.org

1 participants
21 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 73b3a1264fcfbf93390ec9d9cb1f12ec62e73878
by git＠ipfire.org 28 Mar '17

28 Mar '17

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 73b3a1264fcfbf93390ec9d9cb1f12ec62e73878 (commit) via 776363274f82bb389b040bfe8f281edf5307e047 (commit) via 21094f574e5a607159f25e77e25334d52ea31a7b (commit) via 109b1914d1743e85727b01cd7388b19c278a60c2 (commit) via baa8a93fd1817f4ad75aa1c22533a64a9c75b1c4 (commit) via 0be884d6b222193419ddd3fdff02e7348fe92faf (commit) via 2170bad5b99a10eff615e7e8c8b289e073985fc9 (commit) from 4a0d69ca464aba3f27e7e2a98247f1630ef664bb (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 73b3a1264fcfbf93390ec9d9cb1f12ec62e73878 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 28 17:20:50 2017 +0100 core110: Ship updated ntp package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 776363274f82bb389b040bfe8f281edf5307e047 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Mar 25 22:25:09 2017 +0100 ntp: Update to 4.2.8p10 "It addresses 6 medum- and 5 low-severity security issues, 4 informational security topics, 15 bugfixes, and contains other improvements over 4.2.8p9." For a complete list, see: http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 21094f574e5a607159f25e77e25334d52ea31a7b Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Mar 25 22:44:55 2017 +0100 mpd 0.20.6: fixes for lfs-file Package refused to build without initscript. Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 109b1914d1743e85727b01cd7388b19c278a60c2 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Mon Mar 27 21:01:54 2017 +0200 motion 4.0.1: suggested new rootfile Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit baa8a93fd1817f4ad75aa1c22533a64a9c75b1c4 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Mar 25 22:50:18 2017 +0100 motion: Update to 4.0.1 'ffmpeg' seems to need this update. Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0be884d6b222193419ddd3fdff02e7348fe92faf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 28 17:15:35 2017 +0100 network: Create route to gateway Some hosters have their gateway in a different subnet than the RED interface is to save IPv4 address space. This patch sets a host route to that gateway so that IPFire can be installed in data centres that use such technique. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2170bad5b99a10eff615e7e8c8b289e073985fc9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 28 17:14:41 2017 +0100 setup: Allow setting netmask to 255.255.255.255 Some hosters require that the subnet mask of the RED network is set to 255.255.255.255. This was not possible to save before. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/110/filelists/files | 1 + .../{oldcore/100 => core/110}/filelists/ntp | 0 config/rootfiles/packages/motion | 45 +++++++++++++--------- lfs/motion | 12 +++--- lfs/mpd | 7 +++- lfs/ntp | 6 +-- src/initscripts/networking/red | 3 ++ src/setup/netstuff.c | 5 ++- 8 files changed, 49 insertions(+), 30 deletions(-) copy config/rootfiles/{oldcore/100 => core/110}/filelists/ntp (100%) Difference in files: diff --git a/config/rootfiles/core/110/filelists/files b/config/rootfiles/core/110/filelists/files index c6d15d6..4a7d710 100644 --- a/config/rootfiles/core/110/filelists/files +++ b/config/rootfiles/core/110/filelists/files @@ -17,6 +17,7 @@ usr/lib/firewall/ipsec-block usr/lib/libssp.so.0 usr/lib/libssp.so.0.0.0 usr/local/bin/xt_geoip_update +usr/sbin/setup var/ipfire/langs var/ipfire/general-functions.pl var/ipfire/graphs.pl diff --git a/config/rootfiles/core/110/filelists/ntp b/config/rootfiles/core/110/filelists/ntp new file mode 120000 index 0000000..7542d86 --- /dev/null +++ b/config/rootfiles/core/110/filelists/ntp @@ -0,0 +1 @@ +../../../common/ntp \ No newline at end of file diff --git a/config/rootfiles/packages/motion b/config/rootfiles/packages/motion index aa3e5b7..82a8097 100644 --- a/config/rootfiles/packages/motion +++ b/config/rootfiles/packages/motion @@ -1,25 +1,32 @@ -#etc/motion-dist.conf +etc/motion etc/motion.conf +etc/motion/camera1-dist.conf +etc/motion/camera2-dist.conf +etc/motion/camera3-dist.conf +etc/motion/camera4-dist.conf +#etc/motion/motion-dist.conf usr/bin/motion -#usr/share/doc/motion-3.2.12 -#usr/share/doc/motion-3.2.12/CHANGELOG -#usr/share/doc/motion-3.2.12/COPYING -#usr/share/doc/motion-3.2.12/CREDITS -#usr/share/doc/motion-3.2.12/INSTALL -#usr/share/doc/motion-3.2.12/README -#usr/share/doc/motion-3.2.12/motion_guide.html +#usr/share/doc/motion +#usr/share/doc/motion/CHANGELOG +#usr/share/doc/motion/COPYING +#usr/share/doc/motion/CREDITS +#usr/share/doc/motion/README.md +#usr/share/doc/motion/mask1.png +#usr/share/doc/motion/motion_guide.html +#usr/share/doc/motion/normal.jpg +#usr/share/doc/motion/outputmotion1.jpg +#usr/share/doc/motion/outputnormal1.jpg #usr/share/man/man1/motion.1 -#usr/share/motion-3.2.12 -#usr/share/motion-3.2.12/examples -#usr/share/motion-3.2.12/examples/motion-dist.conf -#usr/share/motion-3.2.12/examples/motion.init-Debian -#usr/share/motion-3.2.12/examples/motion.init-Fedora -#usr/share/motion-3.2.12/examples/motion.init-FreeBSD.sh -#usr/share/motion-3.2.12/examples/motion.init-RH -#usr/share/motion-3.2.12/examples/thread1.conf -#usr/share/motion-3.2.12/examples/thread2.conf -#usr/share/motion-3.2.12/examples/thread3.conf -#usr/share/motion-3.2.12/examples/thread4.conf +#usr/share/motion +#usr/share/motion/examples +#usr/share/motion/examples/camera1-dist.conf +#usr/share/motion/examples/camera2-dist.conf +#usr/share/motion/examples/camera3-dist.conf +#usr/share/motion/examples/camera4-dist.conf +#usr/share/motion/examples/motion-dist.conf +#usr/share/motion/examples/motion.init-Debian +#usr/share/motion/examples/motion.init-FreeBSD.sh +#usr/share/motion/examples/motion.service var/ipfire/backup/addons/includes/motion etc/rc.d/init.d/motion etc/rc.d/rc0.d/K01motion diff --git a/lfs/motion b/lfs/motion index a091338..d226c1c 100644 --- a/lfs/motion +++ b/lfs/motion @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2017 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,16 +24,16 @@ include Config -VER = 3.2.12 +VER = 4.0.1 -THISAPP = motion-$(VER) +THISAPP = motion-release-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = motion -PAK_VER = 1 +PAK_VER = 2 DEPS = "ffmpeg" ############################################################################### @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1ba0065ed50509aaffb171594c689f46 +$(DL_FILE)_MD5 = 5c87f90c4118d8cf0fb14700db69118f install : $(TARGET) @@ -81,6 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) #Install obsolete V4L1 videodev.h cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h + cd $(DIR_APP) && autoreconf -fiv + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/mpd b/lfs/mpd index cf28629..3213b27 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -77,7 +77,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) && ./configure --prefix=/usr \ + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ --disable-ipv6 \ --sysconfdir=/etc \ --disable-sqlite \ @@ -91,6 +92,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-icu cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + + #install initscripts + $(call INSTALL_INITSCRIPT,mpd) + @rm -rf $(DIR_APP) touch /var/log/mpd.error.log touch /var/log/mpd.log diff --git a/lfs/ntp b/lfs/ntp index 572bb88..1f1c524 100644 --- a/lfs/ntp +++ b/lfs/ntp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2017 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 = 4.2.8p9 +VER = 4.2.8p10 THISAPP = ntp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 857452b05f5f2e033786f77ade1974ed +$(DL_FILE)_MD5 = 745384ed0dedb3f66b33fe84d66466f9 install : $(TARGET) diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red index 9dfbad6..00e739c 100644 --- a/src/initscripts/networking/red +++ b/src/initscripts/networking/red @@ -124,6 +124,9 @@ case "${1}" in echo -n "${DNS2}" > /var/ipfire/red/dns2 touch /var/ipfire/red/active + # Create route to default gateway + ip route add ${GATEWAY} dev ${DEVICE} + boot_mesg "Setting up default gateway ${GATEWAY}..." ip route add default via ${GATEWAY} dev ${DEVICE} evaluate_retval diff --git a/src/setup/netstuff.c b/src/setup/netstuff.c index 000411c..66592bb 100644 --- a/src/setup/netstuff.c +++ b/src/setup/netstuff.c @@ -75,7 +75,8 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag, int startstatictype = 0; int startdhcptype = 0; int startpppoetype = 0; - + unsigned char buffer[sizeof(struct in_addr)]; + /* Build some key strings. */ sprintf(addressfield, "%s_ADDRESS", colour); sprintf(netmaskfield, "%s_NETMASK", colour); @@ -184,7 +185,7 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag, strcat(message, "\n"); error = 1; } - if (inet_addr(netmaskresult) == INADDR_NONE) + if (inet_pton(AF_INET, netmaskresult, &buffer) == 0) { strcat(message, _("Network mask")); strcat(message, "\n"); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4a0d69ca464aba3f27e7e2a98247f1630ef664bb
by git＠ipfire.org 28 Mar '17

28 Mar '17

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 4a0d69ca464aba3f27e7e2a98247f1630ef664bb (commit) via 128db1a3632fdd4ff95fa0bb865e25cc861f471c (commit) via c20b20092fb7c9263a9cdb17656eb517f3a5cdff (commit) via 5012e53c290b0bb60c4b4617f4ccaa7b63a6927f (commit) via 0a7dca2c5f8284ff61d78c1f851b4716f7f3d9df (commit) from e0174da88ba1e1d36f57b6349544059f08fca164 (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 4a0d69ca464aba3f27e7e2a98247f1630ef664bb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 28 10:29:03 2017 +0100 unbound: Increase memory size on even larger systems Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 128db1a3632fdd4ff95fa0bb865e25cc861f471c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 28 10:25:39 2017 +0100 unbound: Double buffer size Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c20b20092fb7c9263a9cdb17656eb517f3a5cdff Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 28 10:24:40 2017 +0100 unbound: Increase size of send/receive buffers This will allow to not drop any packets when there is a peak in queries Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5012e53c290b0bb60c4b4617f4ccaa7b63a6927f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 28 10:17:33 2017 +0100 unbound: Re-use UDP sockets This will make UDP queries faster Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0a7dca2c5f8284ff61d78c1f851b4716f7f3d9df Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 28 10:16:56 2017 +0100 unbound: Increase number of parallel queries The parameters are the recommended values for libevent Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/initscripts/system/unbound | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) Difference in files: diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound index bbf9c00..7e80429 100644 --- a/src/initscripts/system/unbound +++ b/src/initscripts/system/unbound @@ -244,17 +244,29 @@ write_tuning_conf() { # In the worst case scenario, unbound can use double the # amount of memory allocated to a cache due to malloc overhead + # Even larger systems with more than 8GB of RAM + if [ ${mem} -ge 8192 ]; then + mem=1024 + + # Extra large systems with more than 4GB of RAM + elif [ ${mem} -ge 4096 ]; then + mem=512 + # Large systems with more than 2GB of RAM - if [ ${mem} -ge 2048 ]; then + elif [ ${mem} -ge 2048 ]; then + mem=256 + + # Medium systems with more than 1GB of RAM + elif [ ${mem} -ge 1024 ]; then mem=128 # Small systems with less than 256MB of RAM elif [ ${mem} -le 256 ]; then - mem=8 + mem=16 # Everything else else - mem=32 + mem=64 fi ( @@ -262,6 +274,7 @@ write_tuning_conf() { # We run one thread per processor echo "num-threads: ${processors}" + echo "so-reuseport: yes" # Adjust number of slabs echo "infra-cache-slabs: ${slabs}" @@ -273,6 +286,14 @@ write_tuning_conf() { echo "rrset-cache-size: $(( ${mem} / 2 ))m" echo "msg-cache-size: $(( ${mem} / 4 ))m" echo "key-cache-size: $(( ${mem} / 4 ))m" + + # Increase parallel queries + echo "outgoing-range: 8192" + echo "num-queries-per-thread: 4096" + + # Use larger send/receive buffers + echo "so-sndbuf: 4m" + echo "so-rcvbuf: 4m" ) > /etc/unbound/tuning.conf } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e0174da88ba1e1d36f57b6349544059f08fca164
by git＠ipfire.org 25 Mar '17

25 Mar '17

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cda384a280b11461f4114faf4c86c8589df15eb0
by git＠ipfire.org 24 Mar '17

24 Mar '17

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. c26b1be665de6063d581225b0d8ac675df2f77b8
by git＠ipfire.org 23 Mar '17

23 Mar '17

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 c26b1be665de6063d581225b0d8ac675df2f77b8 (commit) from 9296102c65694af78cf51f319931aed9c311aa48 (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 c26b1be665de6063d581225b0d8ac675df2f77b8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 23 19:17:00 2017 +0100 aiccu: Drop package SixXS is being shut down which is the only project that used the aiccu tool. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: aiccu/aiccu.nm | 58 ----------------- aiccu/patches/0001-setup-script.patch | 56 ---------------- aiccu/patches/0002-gnutls-cleanup.patch | 75 ---------------------- aiccu/patches/0003-allow-tunnels.patch | 70 -------------------- aiccu/patches/0004-skip-strip.patch | 33 ---------- aiccu/patches/0005-binutils-gold.patch | 28 -------- aiccu/patches/0006-spelling-error.patch | 67 ------------------- aiccu/patches/0007-syslog-openlog.patch | 29 --------- aiccu/patches/0008-no-quiet-gcc.patch | 29 --------- aiccu/patches/0009-Revert-setup-script.patch | 56 ---------------- ...etup-script-functionality-to-Linux-client.patch | 68 -------------------- aiccu/systemd/aiccu@.service | 17 ----- network/network.nm | 3 +- 13 files changed, 1 insertion(+), 588 deletions(-) delete mode 100644 aiccu/aiccu.nm delete mode 100644 aiccu/patches/0001-setup-script.patch delete mode 100644 aiccu/patches/0002-gnutls-cleanup.patch delete mode 100644 aiccu/patches/0003-allow-tunnels.patch delete mode 100644 aiccu/patches/0004-skip-strip.patch delete mode 100644 aiccu/patches/0005-binutils-gold.patch delete mode 100644 aiccu/patches/0006-spelling-error.patch delete mode 100644 aiccu/patches/0007-syslog-openlog.patch delete mode 100644 aiccu/patches/0008-no-quiet-gcc.patch delete mode 100644 aiccu/patches/0009-Revert-setup-script.patch delete mode 100644 aiccu/patches/0010-Add-setup-script-functionality-to-Linux-client.patch delete mode 100644 aiccu/systemd/aiccu@.service Difference in files: diff --git a/aiccu/aiccu.nm b/aiccu/aiccu.nm deleted file mode 100644 index 27f1c54..0000000 --- a/aiccu/aiccu.nm +++ /dev/null @@ -1,58 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = aiccu -version = 20070115 -release = 3 - -groups = System/Daemons -url = http://www.sixxs.net/tools/aiccu/ -license = BSD -summary = Automatic IPv6 Connectivity Client Utility for SixXS tunnels. - -description - This client automatically gives one IPv6 connectivity without having - to manually configure interfaces etc. One does need a SixXS account - and at least a tunnel. -end - -source_dl = http://www.sixxs.net/archive/sixxs/aiccu/unix/ -sources = %{name}_%{version}.tar.gz - -build - requires - gnutls-devel - end - - DIR_APP = %{DIR_SRC}/%{name} - - make_build_targets += \ - RPM_OPT_FLAGS="%{CFLAGS}" - - # Remove old sysvinit stuff and emtpy usr/share directory. - install_cmds - rm -rvf %{BUILDROOT}/{etc,usr/share} - end -end - -packages - package %{name} - script postin - systemctl daemon-reload >/dev/null 2>&1 || : - end - - script postup - systemctl daemon-reload >/dev/null 2>&1 || : - end - - script postun - systemctl daemon-reload >/dev/null 2>&1 || : - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/aiccu/patches/0001-setup-script.patch b/aiccu/patches/0001-setup-script.patch deleted file mode 100644 index c782c74..0000000 --- a/aiccu/patches/0001-setup-script.patch +++ /dev/null @@ -1,56 +0,0 @@ -From bdb25774a216925fd1ca275a6e2b3ccc8e9a0200 Mon Sep 17 00:00:00 2001 -From: Reinier Haasjes <reinier(a)haasjes.com> -Date: Fri, 17 Aug 2012 11:29:39 +0200 -Subject: [PATCH 01/10] setup script - - Make setupscript work and add teardownscript setting. - -Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> ---- - common/aiccu.c | 6 +++--- - unix-console/main.c | 5 +++++ - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/common/aiccu.c b/common/aiccu.c -index 9abb334..7697136 100755 ---- a/common/aiccu.c -+++ b/common/aiccu.c -@@ -212,9 +212,6 @@ bool aiccu_SaveConfig(const char *filename) - fprintf(f, "# Try to automatically login and setup the tunnel?\n"); - fprintf(f, "automatic %s\n", g_aiccu->automatic ? "true" : "false"); - fprintf(f, "\n"); -- fprintf(f, "# Script to run after setting up the interfaces (default: none)\n"); -- fprintf(f, "%ssetupscript %s\n", g_aiccu->setupscript ? "" : "#", g_aiccu->setupscript ? g_aiccu->setupscript : "<path>"); -- fprintf(f, "\n"); - fprintf(f, "# TLS Required?\n"); - fprintf(f, "requiretls %s\n", g_aiccu->requiretls ? "true" : "false"); - fprintf(f, "\n"); -@@ -231,6 +228,9 @@ bool aiccu_SaveConfig(const char *filename) - fprintf(f, "# PID File\n"); - fprintf(f, "pidfile %s\n", g_aiccu->pidfile); - fprintf(f, "\n"); -+ fprintf(f, "# Script to run after setting up the interfaces (default: none)\n"); -+ fprintf(f, "%ssetupscript %s\n", g_aiccu->setupscript ? "" : "#", g_aiccu->setupscript ? g_aiccu->setupscript : "<path>"); -+ fprintf(f, "\n"); - fprintf(f, "# Make heartbeats (default true)\n"); - fprintf(f, "# In general you don't want to turn this off\n"); - fprintf(f, "# Of course only applies to AYIYA and heartbeat tunnels not to static ones\n"); -diff --git a/unix-console/main.c b/unix-console/main.c -index 8a4d9a9..1e7b4b4 100755 ---- a/unix-console/main.c -+++ b/unix-console/main.c -@@ -471,6 +471,11 @@ int main(int argc, char *argv[]) - */ - if (aiccu_setup(hTunnel, true)) - { -+ if (g_aiccu->setupscript) -+ { -+ aiccu_exec("%s", g_aiccu->setupscript); -+ } -+ - /* We need to stay running when doing Heartbeat or AYIYA */ - if ( strcasecmp(hTunnel->sType, "6in4-heartbeat") == 0 || - strcasecmp(hTunnel->sType, "ayiya") == 0) --- -1.8.1 - diff --git a/aiccu/patches/0002-gnutls-cleanup.patch b/aiccu/patches/0002-gnutls-cleanup.patch deleted file mode 100644 index 5454264..0000000 --- a/aiccu/patches/0002-gnutls-cleanup.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 61a319c224cda0bbd408514bdfdc533285739fec Mon Sep 17 00:00:00 2001 -From: "Barak A. Pearlmutter" <barak+git(a)cs.nuim.ie> -Date: Fri, 17 Aug 2012 12:23:06 +0200 -Subject: [PATCH 02/10] gnutls cleanup - -Stop ignoring some gnutls return codes. - -Rewrite call to depricated gnutls_set_default_priority() to use -gnutls_priority_set_direct() instead. - -Remove call to deprecated routine -gnutls_certificate_type_set_priority, no changes necessary. - -Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> ---- - common/common.c | 27 +++++++++++++++++---------- - 1 file changed, 17 insertions(+), 10 deletions(-) - -diff --git a/common/common.c b/common/common.c -index 488c145..d45e567 100755 ---- a/common/common.c -+++ b/common/common.c -@@ -271,8 +271,6 @@ TLSSOCKET sock_alloc(void); - TLSSOCKET sock_alloc(void) - { - #ifdef AICCU_GNUTLS -- /* Allow connections to servers that have OpenPGP keys as well */ -- const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 }; - int ret; - #endif /* AICCU_GNUTLS*/ - -@@ -289,7 +287,7 @@ TLSSOCKET sock_alloc(void) - - /* Initialize TLS session */ - ret = gnutls_init(&sock->session, GNUTLS_CLIENT); -- if (ret != 0) -+ if (ret != GNUTLS_E_SUCCESS) - { - dolog(LOG_ERR, "TLS Init failed: %s (%d)\n", gnutls_strerror(ret), ret); - free(sock); -@@ -297,15 +295,24 @@ TLSSOCKET sock_alloc(void) - } - - /* Use default priorities */ -- gnutls_set_default_priority(sock->session); -- /* XXX: Return value is not documented in GNUTLS documentation! */ -- -- gnutls_certificate_type_set_priority(sock->session, cert_type_priority); -- /* XXX: Return value is not documented in GNUTLS documentation! */ -+ ret = gnutls_priority_set_direct(sock->session, "NORMAL", NULL); -+ if (ret != GNUTLS_E_SUCCESS) -+ { -+ dolog(LOG_ERR, "TLS set default priority failed: %s (%d)\n", gnutls_strerror(ret), ret); -+ gnutls_deinit(sock->session); -+ free(sock); -+ return NULL; -+ } - - /* Configure the x509 credentials for the current session */ -- gnutls_credentials_set(sock->session, GNUTLS_CRD_CERTIFICATE, g_aiccu->tls_cred); -- /* XXX: Return value is not documented in GNUTLS documentation! */ -+ ret = gnutls_credentials_set(sock->session, GNUTLS_CRD_CERTIFICATE, g_aiccu->tls_cred); -+ if (ret != GNUTLS_E_SUCCESS) -+ { -+ dolog(LOG_ERR, "TLS credentials set failed: %s (%d)\n", gnutls_strerror(ret), ret); -+ gnutls_deinit(sock->session); -+ free(sock); -+ return NULL; -+ } - - #endif /* AICCU_GNUTLS*/ - --- -1.8.1 - diff --git a/aiccu/patches/0003-allow-tunnels.patch b/aiccu/patches/0003-allow-tunnels.patch deleted file mode 100644 index 3b803dc..0000000 --- a/aiccu/patches/0003-allow-tunnels.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 523105fb00372d2cb95a1b20aed78115aef4ab9a Mon Sep 17 00:00:00 2001 -From: Norman Rasmussen <norman(a)rasmussen.co.za> -Date: Sun, 10 Jan 2010 21:45:55 +0000 -Subject: [PATCH 03/10] allow tunnels - - Allow 'tunnels' mode when there's an already running instance. - -Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> ---- - unix-console/main.c | 30 +++++++++++++++--------------- - 1 file changed, 15 insertions(+), 15 deletions(-) - -diff --git a/unix-console/main.c b/unix-console/main.c -index 1e7b4b4..375b61c 100755 ---- a/unix-console/main.c -+++ b/unix-console/main.c -@@ -50,7 +50,7 @@ int sigrunning(int sig) - /* Close the file again */ - fclose(f); - -- /* If we can HUP it, it still runs */ -+ /* If we can signal it, it still runs */ - return (pid > 0 && kill(pid, sig) == 0 ? 1 : 0); - } - -@@ -302,20 +302,6 @@ int main(int argc, char *argv[]) - return -1; - } - --#ifndef _WIN32 -- /* start or stop? */ -- if ( mode != A_TEST && -- mode != A_AUTOTEST) -- { -- /* Already running? */ -- if (sigrunning(mode == A_STOP ? SIGTERM : 0) == 1) -- { -- dolog(LOG_ERR, "Already running instance HUP'ed, exiting\n"); -- return 0; -- } -- } --#endif -- - /* Verify required parameters */ - if (!g_aiccu->username || !g_aiccu->password) - { -@@ -331,6 +317,20 @@ int main(int argc, char *argv[]) - return ret == 0 ? -1 : 0; - } - -+#ifndef _WIN32 -+ /* start or stop? */ -+ if ( mode != A_TEST && -+ mode != A_AUTOTEST) -+ { -+ /* Already running? */ -+ if (sigrunning(mode == A_STOP ? SIGTERM : 0) == 1) -+ { -+ dolog(LOG_ERR, "Already running instance signaled, exiting\n"); -+ return 0; -+ } -+ } -+#endif -+ - /* Get our tunnel */ - hTunnel = get_tunnel(); - --- -1.8.1 - diff --git a/aiccu/patches/0004-skip-strip.patch b/aiccu/patches/0004-skip-strip.patch deleted file mode 100644 index 64584fe..0000000 --- a/aiccu/patches/0004-skip-strip.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a7a2c3ca751495a36e5ddde5a23f356f56726504 Mon Sep 17 00:00:00 2001 -From: Reinier Haasjes <reinier(a)haasjes.com> -Date: Fri, 17 Aug 2012 11:29:39 +0200 -Subject: [PATCH 04/10] skip strip - -We handle stripping of the binary through dh_strip, thus remove the -upstream code handling that, which does not care about our Debian -build options. - -Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> ---- - unix-console/Makefile | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/unix-console/Makefile b/unix-console/Makefile -index d5e5c07..f746cac 100755 ---- a/unix-console/Makefile -+++ b/unix-console/Makefile -@@ -145,11 +145,6 @@ all: aiccu - - aiccu: $(OBJS) ${SRCS} ${INCS} - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) --ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0) --ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1) -- strip $@ --endif --endif - - clean: - $(RM) -f $(OBJS) aiccu --- -1.8.1 - diff --git a/aiccu/patches/0005-binutils-gold.patch b/aiccu/patches/0005-binutils-gold.patch deleted file mode 100644 index f2561a2..0000000 --- a/aiccu/patches/0005-binutils-gold.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 431ff599307eec2e9fa5eaf52cece9094bac05fa Mon Sep 17 00:00:00 2001 -From: Reinier Haasjes <reinier(a)haasjes.com> -Date: Fri, 17 Aug 2012 11:29:39 +0200 -Subject: [PATCH 05/10] binutils gold - -Make aiccu compile with ld.gold - -Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> ---- - unix-console/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/unix-console/Makefile b/unix-console/Makefile -index f746cac..5db5337 100755 ---- a/unix-console/Makefile -+++ b/unix-console/Makefile -@@ -144,7 +144,7 @@ endif - all: aiccu - - aiccu: $(OBJS) ${SRCS} ${INCS} -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) -+ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) - - clean: - $(RM) -f $(OBJS) aiccu --- -1.8.1 - diff --git a/aiccu/patches/0006-spelling-error.patch b/aiccu/patches/0006-spelling-error.patch deleted file mode 100644 index 5679c88..0000000 --- a/aiccu/patches/0006-spelling-error.patch +++ /dev/null @@ -1,67 +0,0 @@ -From ddeba48a677bfcede8018a74188569bb9a6ac280 Mon Sep 17 00:00:00 2001 -From: Reinier Haasjes <reinier(a)haasjes.com> -Date: Fri, 17 Aug 2012 11:29:39 +0200 -Subject: [PATCH 06/10] spelling error - -Fix some spelling errors to satisfy lintian - -Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> ---- - common/aiccu_test.c | 2 +- - common/common.c | 2 +- - common/tic.c | 6 +++--- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/common/aiccu_test.c b/common/aiccu_test.c -index 25bbdb2..2ac3c86 100755 ---- a/common/aiccu_test.c -+++ b/common/aiccu_test.c -@@ -133,7 +133,7 @@ void aiccu_os_test(struct TIC_Tunnel *hTunnel, bool automatic) - printf("### This confirms the reachability of the other side of the tunnel\n"); - printf("### If it doesn't reply then check your interface and routing tables\n"); - printf("### Don't forget to check your firewall of course\n"); -- printf("### If the previous test was succesful then this could be both\n"); -+ printf("### If the previous test was successful then this could be both\n"); - printf("### a firewalling and a routing/interface problem\n"); - printf("\n"); - system_arg(PING6, PINGCOUNT, hTunnel->sIPv6_POP); -diff --git a/common/common.c b/common/common.c -index d45e567..116897f 100755 ---- a/common/common.c -+++ b/common/common.c -@@ -491,7 +491,7 @@ bool sock_gotls(TLSSOCKET sock) - return false; - } - -- dolog(LOG_DEBUG, "TLS Handshake completed succesfully\n"); -+ dolog(LOG_DEBUG, "TLS Handshake completed successfully\n"); - - sock->tls_active = true; - return true; -diff --git a/common/tic.c b/common/tic.c -index e0d70fe..6009d99 100755 ---- a/common/tic.c -+++ b/common/tic.c -@@ -517,8 +517,8 @@ struct TIC_Tunnel *tic_GetTunnel(struct TIC_conf *tic, const char *sId) - struct in6_addr ipv6_ll, ipv6_local; - char ll[100]; - -- /* Log that the fetch was succesful */ -- dolog(LOG_INFO, "Succesfully retrieved tunnel information for %s\n", sId); -+ /* Log that the fetch was successful */ -+ dolog(LOG_INFO, "Successfully retrieved tunnel information for %s\n", sId); - - /* - * Some TUN/TAP devices don't have any -@@ -652,7 +652,7 @@ struct TIC_POP *tic_GetPOP(struct TIC_conf *tic, const char *sId) - /* All went okay? */ - if (buf[0] == '2' && buf[1] == '0' && buf[2] == '2') - { -- dolog(LOG_INFO, "Succesfully retrieved POP information for %s\n", sId); -+ dolog(LOG_INFO, "Successfully retrieved POP information for %s\n", sId); - return pop; - } - --- -1.8.1 - diff --git a/aiccu/patches/0007-syslog-openlog.patch b/aiccu/patches/0007-syslog-openlog.patch deleted file mode 100644 index a2dc9a5..0000000 --- a/aiccu/patches/0007-syslog-openlog.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 28ad9c07d7e39b8c76174142696e10e8922a4871 Mon Sep 17 00:00:00 2001 -From: Norman Rasmussen <norman(a)rasmussen.co.za> -Date: Sun, 10 Jan 2010 21:43:44 +0000 -Subject: [PATCH 07/10] syslog openlog - - Initialize syslog so that we log with our PID as DAEMON. - -Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> ---- - common/aiccu.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/common/aiccu.c b/common/aiccu.c -index 7697136..4bc7c97 100755 ---- a/common/aiccu.c -+++ b/common/aiccu.c -@@ -58,6 +58,9 @@ bool aiccu_InitConfig() - int ret; - #define CAFILE "ca.pem" - #endif -+#ifndef _WIN32 -+ openlog(NULL, LOG_PID, LOG_DAEMON); -+#endif - /* Allocate & Initialize */ - g_aiccu = (struct AICCU_conf *)malloc(sizeof(*g_aiccu)); - if (!g_aiccu) return false; --- -1.8.1 - diff --git a/aiccu/patches/0008-no-quiet-gcc.patch b/aiccu/patches/0008-no-quiet-gcc.patch deleted file mode 100644 index 1fab53b..0000000 --- a/aiccu/patches/0008-no-quiet-gcc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b09989995d1a7d3804e57d63d3d9d19236a1c8c7 Mon Sep 17 00:00:00 2001 -From: Reinier Haasjes <reinier(a)haasjes.com> -Date: Fri, 17 Aug 2012 11:29:39 +0200 -Subject: [PATCH 08/10] no quiet gcc - -It's better for us to see gcc output in the build log to ease debugging. -Quiet builds make that much harder. - -Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> ---- - unix-console/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/unix-console/Makefile b/unix-console/Makefile -index 5db5337..4764a6f 100755 ---- a/unix-console/Makefile -+++ b/unix-console/Makefile -@@ -26,7 +26,7 @@ CWARNS += -W -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggre - - #CFLAGS += $(CWARNS) -D_GNU_SOURCE -D_DEBUG -g3 -O0 - CFLAGS += $(CWARNS) -D_GNU_SOURCE --CC = @gcc -+CC = gcc - RM = rm - - # Add -O3 when nothing is specified yet --- -1.8.1 - diff --git a/aiccu/patches/0009-Revert-setup-script.patch b/aiccu/patches/0009-Revert-setup-script.patch deleted file mode 100644 index cbef88c..0000000 --- a/aiccu/patches/0009-Revert-setup-script.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 5cb2a912237fca41e50e8c651772bd32d5ff324b Mon Sep 17 00:00:00 2001 -From: Stefan Schantl <stefan.schantl(a)ipfire.org> -Date: Wed, 26 Aug 2015 18:34:20 +0000 -Subject: [PATCH 09/10] Revert "setup script" - -This reverts commit bdb25774a216925fd1ca275a6e2b3ccc8e9a0200. - -Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> ---- - common/aiccu.c | 6 +++--- - unix-console/main.c | 5 ----- - 2 files changed, 3 insertions(+), 8 deletions(-) - -diff --git a/common/aiccu.c b/common/aiccu.c -index 4bc7c97..75aadc8 100755 ---- a/common/aiccu.c -+++ b/common/aiccu.c -@@ -215,6 +215,9 @@ bool aiccu_SaveConfig(const char *filename) - fprintf(f, "# Try to automatically login and setup the tunnel?\n"); - fprintf(f, "automatic %s\n", g_aiccu->automatic ? "true" : "false"); - fprintf(f, "\n"); -+ fprintf(f, "# Script to run after setting up the interfaces (default: none)\n"); -+ fprintf(f, "%ssetupscript %s\n", g_aiccu->setupscript ? "" : "#", g_aiccu->setupscript ? g_aiccu->setupscript : "<path>"); -+ fprintf(f, "\n"); - fprintf(f, "# TLS Required?\n"); - fprintf(f, "requiretls %s\n", g_aiccu->requiretls ? "true" : "false"); - fprintf(f, "\n"); -@@ -231,9 +234,6 @@ bool aiccu_SaveConfig(const char *filename) - fprintf(f, "# PID File\n"); - fprintf(f, "pidfile %s\n", g_aiccu->pidfile); - fprintf(f, "\n"); -- fprintf(f, "# Script to run after setting up the interfaces (default: none)\n"); -- fprintf(f, "%ssetupscript %s\n", g_aiccu->setupscript ? "" : "#", g_aiccu->setupscript ? g_aiccu->setupscript : "<path>"); -- fprintf(f, "\n"); - fprintf(f, "# Make heartbeats (default true)\n"); - fprintf(f, "# In general you don't want to turn this off\n"); - fprintf(f, "# Of course only applies to AYIYA and heartbeat tunnels not to static ones\n"); -diff --git a/unix-console/main.c b/unix-console/main.c -index 375b61c..388d988 100755 ---- a/unix-console/main.c -+++ b/unix-console/main.c -@@ -471,11 +471,6 @@ int main(int argc, char *argv[]) - */ - if (aiccu_setup(hTunnel, true)) - { -- if (g_aiccu->setupscript) -- { -- aiccu_exec("%s", g_aiccu->setupscript); -- } -- - /* We need to stay running when doing Heartbeat or AYIYA */ - if ( strcasecmp(hTunnel->sType, "6in4-heartbeat") == 0 || - strcasecmp(hTunnel->sType, "ayiya") == 0) --- -1.8.1 - diff --git a/aiccu/patches/0010-Add-setup-script-functionality-to-Linux-client.patch b/aiccu/patches/0010-Add-setup-script-functionality-to-Linux-client.patch deleted file mode 100644 index 30d6fb0..0000000 --- a/aiccu/patches/0010-Add-setup-script-functionality-to-Linux-client.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 0268def7364007f78ad0d0411d57e277fd1d1a84 Mon Sep 17 00:00:00 2001 -From: Stefan Schantl <stefan.schantl(a)ipfire.org> -Date: Wed, 26 Aug 2015 18:58:56 +0000 -Subject: [PATCH 10/10] Add setup script functionality to Linux client - -Environment variables are set to pass information about -the tunnel to the called script. - -Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> -Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ---- - common/aiccu_linux.c | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - -diff --git a/common/aiccu_linux.c b/common/aiccu_linux.c -index b86ad67..f8257bd 100755 ---- a/common/aiccu_linux.c -+++ b/common/aiccu_linux.c -@@ -41,6 +41,8 @@ bool aiccu_os_install(void) - - bool aiccu_os_setup(struct TIC_Tunnel *hTunnel) - { -+ char buffer[1024]; -+ - if (hTunnel->uses_tundev == 0) - { - aiccu_exec( -@@ -91,6 +93,24 @@ bool aiccu_os_setup(struct TIC_Tunnel *hTunnel) - g_aiccu->ipv6_interface); - } - -+ if (g_aiccu->setupscript) -+ { -+ setenv("ACTION", "up", 1); -+ setenv("TUNNEL_TYPE", hTunnel->sType, 1); -+ setenv("INTERFACE", g_aiccu->ipv6_interface, 1); -+ setenv("REMOTE_ADDRESS", hTunnel->sIPv6_POP, 1); -+ -+ snprintf(buffer, sizeof(buffer), "%s/%u", -+ hTunnel->sIPv6_Local, hTunnel->nIPv6_PrefixLength); -+ setenv("LOCAL_ADDRESS", buffer, 1); -+ setenv("LINK_LOCAL_ADDRESS", hTunnel->sIPv6_LinkLocal, 1); -+ -+ snprintf(buffer, sizeof(buffer), "%u", hTunnel->nMTU); -+ setenv("MTU", buffer, 1); -+ -+ aiccu_exec("%s", g_aiccu->setupscript); -+ } -+ - return true; - } - -@@ -118,5 +138,12 @@ void aiccu_os_delete(struct TIC_Tunnel *hTunnel) - "ip tunnel del %s", - g_aiccu->ipv6_interface); - } -+ -+ { -+ setenv("ACTION", "down", 1); -+ setenv("INTERFACE", g_aiccu->ipv6_interface, 1); -+ -+ aiccu_exec("%s", g_aiccu->setupscript); -+ } - } - --- -1.8.1 - diff --git a/aiccu/systemd/aiccu@.service b/aiccu/systemd/aiccu@.service deleted file mode 100644 index 38653a6..0000000 --- a/aiccu/systemd/aiccu@.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=AICCU (Automatic IPv6 Connectivity Configuration Utility) on %I - -[Service] -ExecStartPre=/usr/lib/network/helpers/aiccu-config-helper create %I -ExecStart=/usr/sbin/aiccu start /run/network/%I/aiccu.conf -ExecStop=/usr/sbin/aiccu stop /run/network/%I/aiccu.conf -ExecStopPost=/usr/lib/network/helpers/aiccu-config-helper remove %I - -UtmpIdentifier=%I - -# WARNING: never run AICCU from DaemonTools or a similar automated -# 'restart' tool/script. When AICCU does not start, it has a reason -# not to start which it gives on either the stdout or in the (sys)log -# file. The TIC server *will* automatically disable accounts which -# are detected to run in this mode. -Restart=no diff --git a/network/network.nm b/network/network.nm index 10418dc..c0ed825 100644 --- a/network/network.nm +++ b/network/network.nm @@ -6,7 +6,7 @@ name = network epoch = 1 version = 008 -release = 2 +release = 3 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Base Networking/Tools @@ -46,7 +46,6 @@ end packages package %{name} requires - aiccu bash >= 4.0 batctl crda hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e89b407f8894a1378ef9afbdd79180ed3d99a89c
by git＠ipfire.org 22 Mar '17

22 Mar '17

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8714488c7369816fb96e8a9802330851f0c13c4d
by git＠ipfire.org 22 Mar '17

22 Mar '17

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 8714488c7369816fb96e8a9802330851f0c13c4d (commit) from 65c3b7c913760c88f7cbdfccc775d34dfc7fe232 (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 8714488c7369816fb96e8a9802330851f0c13c4d Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Wed Mar 15 14:37:16 2017 +0100 ffmpeg and ffmpeg-libs: update to 3.2.4 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/ffmpeg | 229 +++++++++++++++++++++++++++---- config/rootfiles/packages/ffmpeg-libs | 245 +++++++++++++++++++++++++++++----- lfs/ffmpeg | 34 +++-- lfs/ffmpeg-libs | 6 +- 4 files changed, 428 insertions(+), 86 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg index d403ca1..7fc5e14 100644 --- a/config/rootfiles/packages/ffmpeg +++ b/config/rootfiles/packages/ffmpeg @@ -1,64 +1,237 @@ usr/bin/ffmpeg -usr/bin/ffplay +usr/bin/ffprobe usr/bin/ffserver #usr/include/libavcodec #usr/include/libavcodec/avcodec.h -#usr/include/libavcodec/opt.h +#usr/include/libavcodec/avdct.h +#usr/include/libavcodec/avfft.h +#usr/include/libavcodec/d3d11va.h +#usr/include/libavcodec/dirac.h +#usr/include/libavcodec/dv_profile.h +#usr/include/libavcodec/dxva2.h +#usr/include/libavcodec/jni.h +#usr/include/libavcodec/mediacodec.h +#usr/include/libavcodec/qsv.h +#usr/include/libavcodec/vaapi.h +#usr/include/libavcodec/vda.h +#usr/include/libavcodec/vdpau.h +#usr/include/libavcodec/version.h +#usr/include/libavcodec/videotoolbox.h +#usr/include/libavcodec/vorbis_parser.h +#usr/include/libavcodec/xvmc.h #usr/include/libavdevice #usr/include/libavdevice/avdevice.h +#usr/include/libavdevice/version.h +#usr/include/libavfilter +#usr/include/libavfilter/avfilter.h +#usr/include/libavfilter/avfiltergraph.h +#usr/include/libavfilter/buffersink.h +#usr/include/libavfilter/buffersrc.h +#usr/include/libavfilter/version.h #usr/include/libavformat #usr/include/libavformat/avformat.h #usr/include/libavformat/avio.h -#usr/include/libavformat/rtsp.h -#usr/include/libavformat/rtspcodes.h +#usr/include/libavformat/version.h #usr/include/libavutil #usr/include/libavutil/adler32.h +#usr/include/libavutil/aes.h +#usr/include/libavutil/aes_ctr.h +#usr/include/libavutil/attributes.h +#usr/include/libavutil/audio_fifo.h +#usr/include/libavutil/avassert.h +#usr/include/libavutil/avconfig.h #usr/include/libavutil/avstring.h #usr/include/libavutil/avutil.h #usr/include/libavutil/base64.h +#usr/include/libavutil/blowfish.h +#usr/include/libavutil/bprint.h +#usr/include/libavutil/bswap.h +#usr/include/libavutil/buffer.h +#usr/include/libavutil/camellia.h +#usr/include/libavutil/cast5.h +#usr/include/libavutil/channel_layout.h #usr/include/libavutil/common.h +#usr/include/libavutil/cpu.h #usr/include/libavutil/crc.h +#usr/include/libavutil/des.h +#usr/include/libavutil/dict.h +#usr/include/libavutil/display.h +#usr/include/libavutil/downmix_info.h +#usr/include/libavutil/error.h +#usr/include/libavutil/eval.h +#usr/include/libavutil/ffversion.h #usr/include/libavutil/fifo.h -#usr/include/libavutil/intfloat_readwrite.h +#usr/include/libavutil/file.h +#usr/include/libavutil/frame.h +#usr/include/libavutil/hash.h +#usr/include/libavutil/hmac.h +#usr/include/libavutil/hwcontext.h +#usr/include/libavutil/hwcontext_cuda.h +#usr/include/libavutil/hwcontext_dxva2.h +#usr/include/libavutil/hwcontext_qsv.h +#usr/include/libavutil/hwcontext_vaapi.h +#usr/include/libavutil/hwcontext_vdpau.h +#usr/include/libavutil/imgutils.h +#usr/include/libavutil/intfloat.h +#usr/include/libavutil/intreadwrite.h +#usr/include/libavutil/lfg.h #usr/include/libavutil/log.h #usr/include/libavutil/lzo.h +#usr/include/libavutil/macros.h +#usr/include/libavutil/mastering_display_metadata.h #usr/include/libavutil/mathematics.h #usr/include/libavutil/md5.h #usr/include/libavutil/mem.h -#usr/include/libavutil/random.h +#usr/include/libavutil/motion_vector.h +#usr/include/libavutil/murmur3.h +#usr/include/libavutil/opt.h +#usr/include/libavutil/parseutils.h +#usr/include/libavutil/pixdesc.h +#usr/include/libavutil/pixelutils.h +#usr/include/libavutil/pixfmt.h +#usr/include/libavutil/random_seed.h #usr/include/libavutil/rational.h -#usr/include/libavutil/sha1.h +#usr/include/libavutil/rc4.h +#usr/include/libavutil/replaygain.h +#usr/include/libavutil/ripemd.h +#usr/include/libavutil/samplefmt.h +#usr/include/libavutil/sha.h +#usr/include/libavutil/sha512.h +#usr/include/libavutil/stereo3d.h +#usr/include/libavutil/tea.h +#usr/include/libavutil/threadmessage.h +#usr/include/libavutil/time.h +#usr/include/libavutil/timecode.h +#usr/include/libavutil/timestamp.h +#usr/include/libavutil/tree.h +#usr/include/libavutil/twofish.h +#usr/include/libavutil/version.h +#usr/include/libavutil/xtea.h +#usr/include/libpostproc +#usr/include/libpostproc/postprocess.h +#usr/include/libpostproc/version.h +#usr/include/libswresample +#usr/include/libswresample/swresample.h +#usr/include/libswresample/version.h +#usr/include/libswscale +#usr/include/libswscale/swscale.h +#usr/include/libswscale/version.h #usr/lib/libavcodec.a #usr/lib/libavcodec.so -#usr/lib/libavcodec.so.51 -#usr/lib/libavcodec.so.51.54.0 +#usr/lib/libavcodec.so.57 +#usr/lib/libavcodec.so.57.64.101 #usr/lib/libavdevice.a #usr/lib/libavdevice.so -#usr/lib/libavdevice.so.52 -#usr/lib/libavdevice.so.52.0.0 +#usr/lib/libavdevice.so.57 +#usr/lib/libavdevice.so.57.1.100 +#usr/lib/libavfilter.a +#usr/lib/libavfilter.so +#usr/lib/libavfilter.so.6 +#usr/lib/libavfilter.so.6.65.100 #usr/lib/libavformat.a #usr/lib/libavformat.so -#usr/lib/libavformat.so.52 -#usr/lib/libavformat.so.52.13.0 +#usr/lib/libavformat.so.57 +#usr/lib/libavformat.so.57.56.101 #usr/lib/libavutil.a #usr/lib/libavutil.so -#usr/lib/libavutil.so.49 -#usr/lib/libavutil.so.49.6.0 -#usr/lib/pkgconfig +#usr/lib/libavutil.so.55 +#usr/lib/libavutil.so.55.34.101 +#usr/lib/libpostproc.a +#usr/lib/libpostproc.so +#usr/lib/libpostproc.so.54 +#usr/lib/libpostproc.so.54.1.100 +#usr/lib/libswresample.a +#usr/lib/libswresample.so +#usr/lib/libswresample.so.2 +#usr/lib/libswresample.so.2.3.100 +#usr/lib/libswscale.a +#usr/lib/libswscale.so +#usr/lib/libswscale.so.4 +#usr/lib/libswscale.so.4.2.100 #usr/lib/pkgconfig/libavcodec.pc #usr/lib/pkgconfig/libavdevice.pc +#usr/lib/pkgconfig/libavfilter.pc #usr/lib/pkgconfig/libavformat.pc #usr/lib/pkgconfig/libavutil.pc -#usr/lib/vhook -#usr/lib/vhook/drawtext.so -#usr/lib/vhook/fish.so -#usr/lib/vhook/null.so -#usr/lib/vhook/ppm.so -#usr/lib/vhook/watermark.so -#usr/include/libpostproc -#usr/include/libpostproc/postprocess.h -#usr/lib/libpostproc.a -#usr/lib/libpostproc.so -#usr/lib/libpostproc.so.51 -#usr/lib/libpostproc.so.51.1.0 #usr/lib/pkgconfig/libpostproc.pc +#usr/lib/pkgconfig/libswresample.pc +#usr/lib/pkgconfig/libswscale.pc +#usr/share/doc/ffmpeg +#usr/share/doc/ffmpeg/developer.html +#usr/share/doc/ffmpeg/faq.html +#usr/share/doc/ffmpeg/fate.html +#usr/share/doc/ffmpeg/ffmpeg-all.html +#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html +#usr/share/doc/ffmpeg/ffmpeg-codecs.html +#usr/share/doc/ffmpeg/ffmpeg-devices.html +#usr/share/doc/ffmpeg/ffmpeg-filters.html +#usr/share/doc/ffmpeg/ffmpeg-formats.html +#usr/share/doc/ffmpeg/ffmpeg-protocols.html +#usr/share/doc/ffmpeg/ffmpeg-resampler.html +#usr/share/doc/ffmpeg/ffmpeg-scaler.html +#usr/share/doc/ffmpeg/ffmpeg-utils.html +#usr/share/doc/ffmpeg/ffmpeg.html +#usr/share/doc/ffmpeg/ffprobe-all.html +#usr/share/doc/ffmpeg/ffprobe.html +#usr/share/doc/ffmpeg/ffserver-all.html +#usr/share/doc/ffmpeg/ffserver.html +#usr/share/doc/ffmpeg/general.html +#usr/share/doc/ffmpeg/git-howto.html +#usr/share/doc/ffmpeg/libavcodec.html +#usr/share/doc/ffmpeg/libavdevice.html +#usr/share/doc/ffmpeg/libavfilter.html +#usr/share/doc/ffmpeg/libavformat.html +#usr/share/doc/ffmpeg/libavutil.html +#usr/share/doc/ffmpeg/libswresample.html +#usr/share/doc/ffmpeg/libswscale.html +#usr/share/doc/ffmpeg/nut.html +#usr/share/doc/ffmpeg/platform.html +#usr/share/ffmpeg +#usr/share/ffmpeg/examples +#usr/share/ffmpeg/examples/Makefile +#usr/share/ffmpeg/examples/README +#usr/share/ffmpeg/examples/avio_dir_cmd.c +#usr/share/ffmpeg/examples/avio_reading.c +#usr/share/ffmpeg/examples/decoding_encoding.c +#usr/share/ffmpeg/examples/demuxing_decoding.c +#usr/share/ffmpeg/examples/extract_mvs.c +#usr/share/ffmpeg/examples/filter_audio.c +#usr/share/ffmpeg/examples/filtering_audio.c +#usr/share/ffmpeg/examples/filtering_video.c +#usr/share/ffmpeg/examples/http_multiclient.c +#usr/share/ffmpeg/examples/metadata.c +#usr/share/ffmpeg/examples/muxing.c +#usr/share/ffmpeg/examples/qsvdec.c +#usr/share/ffmpeg/examples/remuxing.c +#usr/share/ffmpeg/examples/resampling_audio.c +#usr/share/ffmpeg/examples/scaling_video.c +#usr/share/ffmpeg/examples/transcode_aac.c +#usr/share/ffmpeg/examples/transcoding.c +#usr/share/ffmpeg/ffprobe.xsd +#usr/share/ffmpeg/libvpx-1080p.ffpreset +#usr/share/ffmpeg/libvpx-1080p50_60.ffpreset +#usr/share/ffmpeg/libvpx-360p.ffpreset +#usr/share/ffmpeg/libvpx-720p.ffpreset +#usr/share/ffmpeg/libvpx-720p50_60.ffpreset +#usr/share/man/man1/ffmpeg-all.1 +#usr/share/man/man1/ffmpeg-bitstream-filters.1 +#usr/share/man/man1/ffmpeg-codecs.1 +#usr/share/man/man1/ffmpeg-devices.1 +#usr/share/man/man1/ffmpeg-filters.1 +#usr/share/man/man1/ffmpeg-formats.1 +#usr/share/man/man1/ffmpeg-protocols.1 +#usr/share/man/man1/ffmpeg-resampler.1 +#usr/share/man/man1/ffmpeg-scaler.1 +#usr/share/man/man1/ffmpeg-utils.1 +#usr/share/man/man1/ffmpeg.1 +#usr/share/man/man1/ffprobe-all.1 +#usr/share/man/man1/ffprobe.1 +#usr/share/man/man1/ffserver-all.1 +#usr/share/man/man1/ffserver.1 +#usr/share/man/man3/libavcodec.3 +#usr/share/man/man3/libavdevice.3 +#usr/share/man/man3/libavfilter.3 +#usr/share/man/man3/libavformat.3 +#usr/share/man/man3/libavutil.3 +#usr/share/man/man3/libswresample.3 +#usr/share/man/man3/libswscale.3 diff --git a/config/rootfiles/packages/ffmpeg-libs b/config/rootfiles/packages/ffmpeg-libs index a58dcd5..7a512f9 100644 --- a/config/rootfiles/packages/ffmpeg-libs +++ b/config/rootfiles/packages/ffmpeg-libs @@ -1,64 +1,237 @@ #usr/bin/ffmpeg -#usr/bin/ffplay +#usr/bin/ffprobe #usr/bin/ffserver #usr/include/libavcodec #usr/include/libavcodec/avcodec.h -#usr/include/libavcodec/opt.h +#usr/include/libavcodec/avdct.h +#usr/include/libavcodec/avfft.h +#usr/include/libavcodec/d3d11va.h +#usr/include/libavcodec/dirac.h +#usr/include/libavcodec/dv_profile.h +#usr/include/libavcodec/dxva2.h +#usr/include/libavcodec/jni.h +#usr/include/libavcodec/mediacodec.h +#usr/include/libavcodec/qsv.h +#usr/include/libavcodec/vaapi.h +#usr/include/libavcodec/vda.h +#usr/include/libavcodec/vdpau.h +#usr/include/libavcodec/version.h +#usr/include/libavcodec/videotoolbox.h +#usr/include/libavcodec/vorbis_parser.h +#usr/include/libavcodec/xvmc.h #usr/include/libavdevice #usr/include/libavdevice/avdevice.h +#usr/include/libavdevice/version.h +#usr/include/libavfilter +#usr/include/libavfilter/avfilter.h +#usr/include/libavfilter/avfiltergraph.h +#usr/include/libavfilter/buffersink.h +#usr/include/libavfilter/buffersrc.h +#usr/include/libavfilter/version.h #usr/include/libavformat #usr/include/libavformat/avformat.h #usr/include/libavformat/avio.h -#usr/include/libavformat/rtsp.h -#usr/include/libavformat/rtspcodes.h +#usr/include/libavformat/version.h #usr/include/libavutil #usr/include/libavutil/adler32.h +#usr/include/libavutil/aes.h +#usr/include/libavutil/aes_ctr.h +#usr/include/libavutil/attributes.h +#usr/include/libavutil/audio_fifo.h +#usr/include/libavutil/avassert.h +#usr/include/libavutil/avconfig.h #usr/include/libavutil/avstring.h #usr/include/libavutil/avutil.h #usr/include/libavutil/base64.h +#usr/include/libavutil/blowfish.h +#usr/include/libavutil/bprint.h +#usr/include/libavutil/bswap.h +#usr/include/libavutil/buffer.h +#usr/include/libavutil/camellia.h +#usr/include/libavutil/cast5.h +#usr/include/libavutil/channel_layout.h #usr/include/libavutil/common.h +#usr/include/libavutil/cpu.h #usr/include/libavutil/crc.h +#usr/include/libavutil/des.h +#usr/include/libavutil/dict.h +#usr/include/libavutil/display.h +#usr/include/libavutil/downmix_info.h +#usr/include/libavutil/error.h +#usr/include/libavutil/eval.h +#usr/include/libavutil/ffversion.h #usr/include/libavutil/fifo.h -#usr/include/libavutil/intfloat_readwrite.h +#usr/include/libavutil/file.h +#usr/include/libavutil/frame.h +#usr/include/libavutil/hash.h +#usr/include/libavutil/hmac.h +#usr/include/libavutil/hwcontext.h +#usr/include/libavutil/hwcontext_cuda.h +#usr/include/libavutil/hwcontext_dxva2.h +#usr/include/libavutil/hwcontext_qsv.h +#usr/include/libavutil/hwcontext_vaapi.h +#usr/include/libavutil/hwcontext_vdpau.h +#usr/include/libavutil/imgutils.h +#usr/include/libavutil/intfloat.h +#usr/include/libavutil/intreadwrite.h +#usr/include/libavutil/lfg.h #usr/include/libavutil/log.h #usr/include/libavutil/lzo.h +#usr/include/libavutil/macros.h +#usr/include/libavutil/mastering_display_metadata.h #usr/include/libavutil/mathematics.h #usr/include/libavutil/md5.h #usr/include/libavutil/mem.h -#usr/include/libavutil/random.h +#usr/include/libavutil/motion_vector.h +#usr/include/libavutil/murmur3.h +#usr/include/libavutil/opt.h +#usr/include/libavutil/parseutils.h +#usr/include/libavutil/pixdesc.h +#usr/include/libavutil/pixelutils.h +#usr/include/libavutil/pixfmt.h +#usr/include/libavutil/random_seed.h #usr/include/libavutil/rational.h -#usr/include/libavutil/sha1.h +#usr/include/libavutil/rc4.h +#usr/include/libavutil/replaygain.h +#usr/include/libavutil/ripemd.h +#usr/include/libavutil/samplefmt.h +#usr/include/libavutil/sha.h +#usr/include/libavutil/sha512.h +#usr/include/libavutil/stereo3d.h +#usr/include/libavutil/tea.h +#usr/include/libavutil/threadmessage.h +#usr/include/libavutil/time.h +#usr/include/libavutil/timecode.h +#usr/include/libavutil/timestamp.h +#usr/include/libavutil/tree.h +#usr/include/libavutil/twofish.h +#usr/include/libavutil/version.h +#usr/include/libavutil/xtea.h +#usr/include/libpostproc +#usr/include/libpostproc/postprocess.h +#usr/include/libpostproc/version.h +#usr/include/libswresample +#usr/include/libswresample/swresample.h +#usr/include/libswresample/version.h +#usr/include/libswscale +#usr/include/libswscale/swscale.h +#usr/include/libswscale/version.h #usr/lib/libavcodec.a -usr/lib/libavcodec.so -usr/lib/libavcodec.so.51 -usr/lib/libavcodec.so.51.54.0 +#usr/lib/libavcodec.so +usr/lib/libavcodec.so.57 +usr/lib/libavcodec.so.57.64.101 #usr/lib/libavdevice.a -usr/lib/libavdevice.so -usr/lib/libavdevice.so.52 -usr/lib/libavdevice.so.52.0.0 +#usr/lib/libavdevice.so +usr/lib/libavdevice.so.57 +usr/lib/libavdevice.so.57.1.100 +#usr/lib/libavfilter.a +#usr/lib/libavfilter.so +usr/lib/libavfilter.so.6 +usr/lib/libavfilter.so.6.65.100 #usr/lib/libavformat.a -usr/lib/libavformat.so -usr/lib/libavformat.so.52 -usr/lib/libavformat.so.52.13.0 +#usr/lib/libavformat.so +usr/lib/libavformat.so.57 +usr/lib/libavformat.so.57.56.101 #usr/lib/libavutil.a -usr/lib/libavutil.so -usr/lib/libavutil.so.49 -usr/lib/libavutil.so.49.6.0 -#usr/lib/pkgconfig -usr/lib/pkgconfig/libavcodec.pc -usr/lib/pkgconfig/libavdevice.pc -usr/lib/pkgconfig/libavformat.pc -usr/lib/pkgconfig/libavutil.pc -#usr/lib/vhook -usr/lib/vhook/drawtext.so -usr/lib/vhook/fish.so -usr/lib/vhook/null.so -usr/lib/vhook/ppm.so -usr/lib/vhook/watermark.so -#usr/include/libpostproc -#usr/include/libpostproc/postprocess.h +#usr/lib/libavutil.so +usr/lib/libavutil.so.55 +usr/lib/libavutil.so.55.34.101 #usr/lib/libpostproc.a -usr/lib/libpostproc.so -usr/lib/libpostproc.so.51 -usr/lib/libpostproc.so.51.1.0 -usr/lib/pkgconfig/libpostproc.pc +#usr/lib/libpostproc.so +usr/lib/libpostproc.so.54 +usr/lib/libpostproc.so.54.1.100 +#usr/lib/libswresample.a +#usr/lib/libswresample.so +usr/lib/libswresample.so.2 +usr/lib/libswresample.so.2.3.100 +#usr/lib/libswscale.a +#usr/lib/libswscale.so +usr/lib/libswscale.so.4 +usr/lib/libswscale.so.4.2.100 +#usr/lib/pkgconfig/libavcodec.pc +#usr/lib/pkgconfig/libavdevice.pc +#usr/lib/pkgconfig/libavfilter.pc +#usr/lib/pkgconfig/libavformat.pc +#usr/lib/pkgconfig/libavutil.pc +#usr/lib/pkgconfig/libpostproc.pc +#usr/lib/pkgconfig/libswresample.pc +#usr/lib/pkgconfig/libswscale.pc +#usr/share/doc/ffmpeg +#usr/share/doc/ffmpeg/developer.html +#usr/share/doc/ffmpeg/faq.html +#usr/share/doc/ffmpeg/fate.html +#usr/share/doc/ffmpeg/ffmpeg-all.html +#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html +#usr/share/doc/ffmpeg/ffmpeg-codecs.html +#usr/share/doc/ffmpeg/ffmpeg-devices.html +#usr/share/doc/ffmpeg/ffmpeg-filters.html +#usr/share/doc/ffmpeg/ffmpeg-formats.html +#usr/share/doc/ffmpeg/ffmpeg-protocols.html +#usr/share/doc/ffmpeg/ffmpeg-resampler.html +#usr/share/doc/ffmpeg/ffmpeg-scaler.html +#usr/share/doc/ffmpeg/ffmpeg-utils.html +#usr/share/doc/ffmpeg/ffmpeg.html +#usr/share/doc/ffmpeg/ffprobe-all.html +#usr/share/doc/ffmpeg/ffprobe.html +#usr/share/doc/ffmpeg/ffserver-all.html +#usr/share/doc/ffmpeg/ffserver.html +#usr/share/doc/ffmpeg/general.html +#usr/share/doc/ffmpeg/git-howto.html +#usr/share/doc/ffmpeg/libavcodec.html +#usr/share/doc/ffmpeg/libavdevice.html +#usr/share/doc/ffmpeg/libavfilter.html +#usr/share/doc/ffmpeg/libavformat.html +#usr/share/doc/ffmpeg/libavutil.html +#usr/share/doc/ffmpeg/libswresample.html +#usr/share/doc/ffmpeg/libswscale.html +#usr/share/doc/ffmpeg/nut.html +#usr/share/doc/ffmpeg/platform.html +#usr/share/ffmpeg +#usr/share/ffmpeg/examples +#usr/share/ffmpeg/examples/Makefile +#usr/share/ffmpeg/examples/README +#usr/share/ffmpeg/examples/avio_dir_cmd.c +#usr/share/ffmpeg/examples/avio_reading.c +#usr/share/ffmpeg/examples/decoding_encoding.c +#usr/share/ffmpeg/examples/demuxing_decoding.c +#usr/share/ffmpeg/examples/extract_mvs.c +#usr/share/ffmpeg/examples/filter_audio.c +#usr/share/ffmpeg/examples/filtering_audio.c +#usr/share/ffmpeg/examples/filtering_video.c +#usr/share/ffmpeg/examples/http_multiclient.c +#usr/share/ffmpeg/examples/metadata.c +#usr/share/ffmpeg/examples/muxing.c +#usr/share/ffmpeg/examples/qsvdec.c +#usr/share/ffmpeg/examples/remuxing.c +#usr/share/ffmpeg/examples/resampling_audio.c +#usr/share/ffmpeg/examples/scaling_video.c +#usr/share/ffmpeg/examples/transcode_aac.c +#usr/share/ffmpeg/examples/transcoding.c +#usr/share/ffmpeg/ffprobe.xsd +#usr/share/ffmpeg/libvpx-1080p.ffpreset +#usr/share/ffmpeg/libvpx-1080p50_60.ffpreset +#usr/share/ffmpeg/libvpx-360p.ffpreset +#usr/share/ffmpeg/libvpx-720p.ffpreset +#usr/share/ffmpeg/libvpx-720p50_60.ffpreset +#usr/share/man/man1/ffmpeg-all.1 +#usr/share/man/man1/ffmpeg-bitstream-filters.1 +#usr/share/man/man1/ffmpeg-codecs.1 +#usr/share/man/man1/ffmpeg-devices.1 +#usr/share/man/man1/ffmpeg-filters.1 +#usr/share/man/man1/ffmpeg-formats.1 +#usr/share/man/man1/ffmpeg-protocols.1 +#usr/share/man/man1/ffmpeg-resampler.1 +#usr/share/man/man1/ffmpeg-scaler.1 +#usr/share/man/man1/ffmpeg-utils.1 +#usr/share/man/man1/ffmpeg.1 +#usr/share/man/man1/ffprobe-all.1 +#usr/share/man/man1/ffprobe.1 +#usr/share/man/man1/ffserver-all.1 +#usr/share/man/man1/ffserver.1 +#usr/share/man/man3/libavcodec.3 +#usr/share/man/man3/libavdevice.3 +#usr/share/man/man3/libavfilter.3 +#usr/share/man/man3/libavformat.3 +#usr/share/man/man3/libavutil.3 +#usr/share/man/man3/libswresample.3 +#usr/share/man/man3/libswscale.3 diff --git a/lfs/ffmpeg b/lfs/ffmpeg index b383886..cd9e8b6 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2017 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,20 +24,17 @@ include Config -VER = 2008-04-13 -THISAPP = ffmpeg-export-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +VER = 3.2.4 +THISAPP = ffmpeg-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ffmpeg -PAK_VER = 5 +PAK_VER = 6 DEPS = "ffmpeg-libs sdl lame libvorbis xvid" -# Don't use PIC for libavcodec -CFLAGS += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack - ############################################################################### # Top-level Rules ############################################################################### @@ -46,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 017ab929ff92be552debb65c589c2183 +$(DL_FILE)_MD5 = 39fd71024ac76ba35f04397021af5606 install : $(TARGET) @@ -78,15 +75,14 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - ln -s $(THISAPP) /usr/src/ffmpeg - cd $(DIR_SRC)/ffmpeg && ./configure --prefix=/usr \ - --enable-shared \ - --enable-postproc \ - --enable-pthreads \ - --enable-gpl - cd $(DIR_SRC)/ffmpeg && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_SRC)/ffmpeg && make install - cd $(DIR_SRC)/ffmpeg && make install-libs + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr \ + --enable-shared \ + --enable-postproc \ + --enable-pthreads \ + --enable-gpl + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + cd $(DIR_APP) && make install-libs @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/ffmpeg-libs b/lfs/ffmpeg-libs index b29c978..0ed657f 100644 --- a/lfs/ffmpeg-libs +++ b/lfs/ffmpeg-libs @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2017 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,10 +24,10 @@ include Config -VER = 2008-04-13 +VER = 3.2.4 THISAPP = ffmpeg-export-$(VER) PROG = ffmpeg-libs -PAK_VER = 5 +PAK_VER = 6 DEPS = "" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 65c3b7c913760c88f7cbdfccc775d34dfc7fe232
by git＠ipfire.org 22 Mar '17

22 Mar '17

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a249ccd2e4e56798fcfe01b24a180eb461999626
by git＠ipfire.org 15 Mar '17

15 Mar '17

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 a249ccd2e4e56798fcfe01b24a180eb461999626 (commit) from d38ed86f8b56436e420eb5f89dcb2393450939e4 (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 a249ccd2e4e56798fcfe01b24a180eb461999626 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 15 13:45:05 2017 +0000 Improve graphs The graphs are using an iframe and PNG images where the resolution did often not fit and the browser had to resize the image. That led to blurred fonts and hard to read graphs. This patch increases the size of the box and the image. With that higher resolution resizing should not be too much of an issue, but since the sizes of the iframe and image have been aligned should not even be necessary. Reported-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cfgroot/graphs.pl | 200 ++++++-------------------- config/rootfiles/core/110/filelists/files | 9 ++ html/cgi-bin/entropy.cgi | 2 +- html/cgi-bin/hardwaregraphs.cgi | 4 +- html/cgi-bin/netovpnsrv.cgi | 2 +- html/cgi-bin/qos.cgi | 4 +- html/cgi-bin/system.cgi | 4 +- html/html/themes/darkdos/include/style.css | 5 + html/html/themes/ipfire/include/css/style.css | 5 + html/html/themes/maniac/include/style.css | 5 + 10 files changed, 79 insertions(+), 161 deletions(-) Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index c3fb43e..7b92992 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -31,6 +31,30 @@ require "${General::swroot}/header.pl"; my $ERROR; +my @GRAPH_ARGS = ( + # Output format + "--imgformat", "PNG", + + # No border + "--border", "0", + + # For a more 'organic' look + "--slope-mode", + + # HxW define the size of the output image + "--full-size-mode", + + # Watermark + "-W www.ipfire.org", + + # Default size + "-w 910", + "-h 300", + + # Use alternative grid + "--alt-y-grid", +); + # Read the global settings files to get the current theme and after this load # colors for this theme @@ -77,11 +101,6 @@ foreach (@sensorsdir){ # 3 if given is the height of the iframe default if nothing is given sub makegraphbox { - my $height = 285; - my $width = 700; - - if ( $_[3] ne "" ){ $height = $_[3]; } - print "<center>"; print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>"; print " - "; @@ -93,7 +112,7 @@ sub makegraphbox { print " - "; print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>"; print "<br></center>"; - print "<iframe src='".$_[0]."?".$_[1]."?".$_[2]."' width='".$width."' height='".$height."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>"; + print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]." scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>"; } # Generate the CPU Graph for the current period of time for values given by @@ -103,16 +122,10 @@ sub updatecpugraph { my $cpucount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/cpu-*/ 2>/dev/null | wc -l`; my $period = $_[0]; my @command = ( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-l 0", "-u 100", "-r", @@ -237,16 +250,10 @@ sub updatecpugraph { sub updateloadgraph { my $period = $_[0]; RRDs::graph( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-l 0", "-r", "-t Load Average ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, @@ -275,16 +282,10 @@ sub updateloadgraph { sub updatememorygraph { my $period = $_[0]; RRDs::graph( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-l 0", "-u 100", "-r", @@ -337,16 +338,10 @@ sub updatememorygraph { sub updateswapgraph { my $period = $_[0]; RRDs::graph( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-l 0", "-u 100", "-r", @@ -395,16 +390,10 @@ sub updateprocessescpugraph { my $count="0"; my @command = ( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-l 0", "-r", "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, @@ -448,16 +437,10 @@ sub updateprocessesmemorygraph { my $count="0"; my @command = ( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-l 0", "-r", "-t ".$Lang::tr{'processes'}." ".$Lang::tr{'memory'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, @@ -498,16 +481,10 @@ sub updatediskgraph { my $disk = $_[0]; my $period = $_[1]; RRDs::graph( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-r", "-t ".$disk." ".$Lang::tr{'disk access per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, @@ -548,16 +525,10 @@ sub updateifgraph { my $interface = $_[0]; my $period = $_[1]; RRDs::graph( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-r", "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, @@ -591,16 +562,10 @@ sub updatevpngraph { my $interface = $_[0]; my $period = $_[1]; RRDs::graph( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-r", "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, @@ -634,16 +599,10 @@ sub updatevpnn2ngraph { my $interface = $_[0]; my $period = $_[1]; RRDs::graph( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-r", "-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, @@ -704,16 +663,10 @@ sub updatevpnn2ngraph { sub updatefwhitsgraph { my $period = $_[0]; RRDs::graph( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-r", "-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, @@ -766,16 +719,10 @@ sub updatepinggraph { my $period = $_[1]; my $host = $_[0]; RRDs::graph( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-l 0", "-r", "-t ".$Lang::tr{'linkq'}." ".$host." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, @@ -812,16 +759,10 @@ sub updatewirelessgraph { my $period = $_[1]; my $interface = $_[0]; RRDs::graph( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-t Wireless ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v dBm", "--color=SHADEA".$color{"color19"}, @@ -855,16 +796,10 @@ sub updatehddgraph { my $disk = $_[0]; my $period = $_[1]; RRDs::graph( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-r", "-t ".$disk." ".$Lang::tr{'harddisk temperature'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v Celsius", @@ -895,16 +830,10 @@ sub updatehwtempgraph { my $period = $_[0]; my @command = ( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-r", "-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, @@ -948,16 +877,10 @@ sub updatehwfangraph { my $period = $_[0]; my @command = ( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-r", "-t ".$Lang::tr{'mbmon fan'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, @@ -1001,16 +924,10 @@ sub updatehwvoltgraph { my $period = $_[0]; my @command = ( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-r", "-t ".$Lang::tr{'mbmon volt'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "--color=SHADEA".$color{"color19"}, @@ -1074,16 +991,10 @@ sub updateqosgraph { my $color="#000000"; my @command = ( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-r", "-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"}, "-v ".$Lang::tr{'bytes per second'}, @@ -1133,16 +1044,10 @@ sub updatecpufreqgraph { my $cpucount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/cpu-*/ 2>/dev/null | wc -l`; my $period = $_[0]; my @command = ( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-r", "-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period."-graph"}, "-v MHz", @@ -1178,16 +1083,10 @@ sub updatethermaltempgraph { my $thermalcount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/thermal-thermal_zone* 2>/dev/null | wc -l`; my $period = $_[0]; my @command = ( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 125", "-r", "-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period."-graph"}, "-v Grad Celsius", @@ -1237,16 +1136,10 @@ sub getprocesses { sub updateentropygraph { my $period = $_[0]; my @command = ( + @GRAPH_ARGS, "-", "--start", "-1".$period, - "-aPNG", - "-i", - "-z", - "-W www.ipfire.org", - "--alt-y-grid", - "-w 600", - "-h 225", "-r", "--lower-limit","0", "-t $Lang::tr{'entropy'}", @@ -1259,6 +1152,7 @@ sub updateentropygraph { "GPRINT:entrmax:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'maximum'}), "GPRINT:entrmin:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'minimum'}), "GPRINT:entravg:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'average'}) . "\\n", + "--color=BACK".$color{"color21"}, ); RRDs::graph (@command); diff --git a/config/rootfiles/core/110/filelists/files b/config/rootfiles/core/110/filelists/files index f06b6d5..e937e49 100644 --- a/config/rootfiles/core/110/filelists/files +++ b/config/rootfiles/core/110/filelists/files @@ -3,9 +3,18 @@ etc/issue etc/httpd/conf/server-tuning.conf etc/rc.d/init.d/unbound etc/sysctl.conf +srv/web/ipfire/cgi-bin/entropy.cgi +srv/web/ipfire/cgi-bin/hardwaregraphs.cgi srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/netovpnsrv.cgi +srv/web/ipfire/cgi-bin/qos.cgi +srv/web/ipfire/cgi-bin/system.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/html/themes/darkdos/include/style.css +srv/web/ipfire/html/themes/ipfire/include/css/style.css +srv/web/ipfire/html/themes/maniac/include/style.css usr/lib/libssp.so.0 usr/lib/libssp.so.0.0.0 usr/local/bin/xt_geoip_update var/ipfire/langs +var/ipfire/graphs.pl diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi index 8e016b6..e5db5c2 100644 --- a/html/cgi-bin/entropy.cgi +++ b/html/cgi-bin/entropy.cgi @@ -45,7 +45,7 @@ if ( $querry[0] ne~ "") { &Header::openbigbox('100%', 'left'); &Header::openbox('100%', 'center', $Lang::tr{'entropy'}); - &Graphs::makegraphbox("entropy.cgi", "day", '', 350); + &Graphs::makegraphbox("entropy.cgi", "day"); &Header::closebox(); # Check for hardware support. diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi index b0a5d3a..7b5a848 100644 --- a/html/cgi-bin/hardwaregraphs.cgi +++ b/html/cgi-bin/hardwaregraphs.cgi @@ -113,7 +113,7 @@ if ( $querry[0] =~ "hwtemp"){ if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/temperature-* 2>/dev/null` ) { &Header::openbox('100%', 'center', "hwtemp $Lang::tr{'graph'}"); - &Graphs::makegraphbox("hardwaregraphs.cgi","hwtemp","day","375"); + &Graphs::makegraphbox("hardwaregraphs.cgi","hwtemp","day"); Header::closebox(); } @@ -125,7 +125,7 @@ if ( $querry[0] =~ "hwtemp"){ if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/voltage-* 2>/dev/null` ) { &Header::openbox('100%', 'center', "hwvolt $Lang::tr{'graph'}"); - &Graphs::makegraphbox("hardwaregraphs.cgi","hwvolt","day","435"); + &Graphs::makegraphbox("hardwaregraphs.cgi","hwvolt","day"); &Header::closebox(); } diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi index 15a95b6..ddf4177 100755 --- a/html/cgi-bin/netovpnsrv.cgi +++ b/html/cgi-bin/netovpnsrv.cgi @@ -59,7 +59,7 @@ if ( $querry[0] ne ""){ if (@vpns){ foreach (@vpns) { &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}"); - &Graphs::makegraphbox("netovpnsrv.cgi",$_, "day",320); + &Graphs::makegraphbox("netovpnsrv.cgi",$_, "day"); &Header::closebox(); } }else{ diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 590ad15..071b93f 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -770,10 +770,10 @@ if ( ($qossettings{'DEFCLASS_INC'} eq '') || ($qossettings{'DEFCLASS_OUT'} eq '' } &Header::openbox('100%', 'center', "$qossettings{'RED_DEV'} $Lang::tr{'graph'}, $Lang::tr{'uplink'}"); - &Graphs::makegraphbox("qos.cgi",$qossettings{'RED_DEV'},"hour","325"); + &Graphs::makegraphbox("qos.cgi",$qossettings{'RED_DEV'},"hour"); &Header::closebox(); &Header::openbox('100%', 'center', "$qossettings{'IMQ_DEV'} $Lang::tr{'graph'}, $Lang::tr{'downlink'}"); - &Graphs::makegraphbox("qos.cgi",$qossettings{'IMQ_DEV'},"hour","325"); + &Graphs::makegraphbox("qos.cgi",$qossettings{'IMQ_DEV'},"hour"); &Header::closebox(); &showclasses($qossettings{'RED_DEV'}); diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi index a0e7655..487ba99 100644 --- a/html/cgi-bin/system.cgi +++ b/html/cgi-bin/system.cgi @@ -57,12 +57,12 @@ if ( $querry[0] =~ "cpufreq"){ &Header::openbigbox('100%', 'left'); &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}"); - &Graphs::makegraphbox("system.cgi","cpu","day","325"); + &Graphs::makegraphbox("system.cgi","cpu","day"); &Header::closebox(); if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/cpufreq/cpufreq-0.rrd"){ &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}"); - &Graphs::makegraphbox("system.cgi","cpufreq","day","325"); + &Graphs::makegraphbox("system.cgi","cpufreq","day"); &Header::closebox(); } diff --git a/html/html/themes/darkdos/include/style.css b/html/html/themes/darkdos/include/style.css index cc4b3c9..b885067 100644 --- a/html/html/themes/darkdos/include/style.css +++ b/html/html/themes/darkdos/include/style.css @@ -466,3 +466,8 @@ table.fw-nat tbody tr td { #rx_kbs { color: green; } #tx_kbs { color: red; } + +iframe.graph { + width: 100%; + min-height: 300px; +} diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css index 1cc18f8..9421fc1 100644 --- a/html/html/themes/ipfire/include/css/style.css +++ b/html/html/themes/ipfire/include/css/style.css @@ -327,3 +327,8 @@ table { table.fw-nat tbody tr td { height: 2.25em; } + +iframe.graph { + width: 100%; + min-height: 300px; +} diff --git a/html/html/themes/maniac/include/style.css b/html/html/themes/maniac/include/style.css index 3cb2741..27d3982 100644 --- a/html/html/themes/maniac/include/style.css +++ b/html/html/themes/maniac/include/style.css @@ -472,3 +472,8 @@ table.fw-nat tbody tr td { #rx_kbs { color: green; } #tx_kbs { color: red; } + +iframe.graph { + width: 100%; + min-height: 300px; +} hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d38ed86f8b56436e420eb5f89dcb2393450939e4
by git＠ipfire.org 15 Mar '17

15 Mar '17

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM March 2017