IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7870 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a48a2034f5320baf32c10ec877d0c3c53cf4c699
by git＠ipfire.org 04 Oct '16

04 Oct '16

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. f65e814e82f11cfbe7f98e96f52c22dc2f3310e8
by git＠ipfire.org 04 Oct '16

04 Oct '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 f65e814e82f11cfbe7f98e96f52c22dc2f3310e8 (commit) via 08c532e264a808baa8294ac3c9289aaa5b2e2abb (commit) from 9ec021753659babcc03d08084c6652c230afd6c3 (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 f65e814e82f11cfbe7f98e96f52c22dc2f3310e8 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Oct 4 11:34:12 2016 +0200 libsepol: Update to 2.5. This is a major update to the latest stable version of libsepol. * New build dependency: flex. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 08c532e264a808baa8294ac3c9289aaa5b2e2abb Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Oct 4 07:50:04 2016 +0200 openjade: Fix FTBFS. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: libsepol/libsepol.nm | 14 ++++++++------ openjade/openjade.nm | 2 +- openjade/patches/openjade-getoptperl.patch | 21 +++++++++++++++++++++ 3 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 openjade/patches/openjade-getoptperl.patch Difference in files: diff --git a/libsepol/libsepol.nm b/libsepol/libsepol.nm index ac64781..951f76e 100644 --- a/libsepol/libsepol.nm +++ b/libsepol/libsepol.nm @@ -4,7 +4,7 @@ ############################################################################### name = libsepol -version = 2.1.5 +version = 2.5 release = 1 groups = System/Libraries @@ -17,16 +17,21 @@ description policies. end -sources = %{thisapp}.tgz +source_dl = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/release… +sources = %{thisapp}.tar.gz build # Keep static libsepol.a for some selinux tools, that needs to link # against it. We will put it into an own package. keep_libraries = %{libdir}/libsepol.a + requires + flex + end + build make clean - make CFLAGS="%{CFLAGS}" %{PARALLELISMFLAGS} + make CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" %{PARALLELISMFLAGS} end # Install libraries to correct place. @@ -40,9 +45,6 @@ build # Remove manpages for binaries rm -rf %{BUILDROOT}/usr/share/man/man8 - - # Fix bad symlink. - ln -svf libsepol.so.1 %{BUILDROOT}%{libdir}/libsepol.so end end diff --git a/openjade/openjade.nm b/openjade/openjade.nm index 1e4fb16..d78fb31 100644 --- a/openjade/openjade.nm +++ b/openjade/openjade.nm @@ -5,7 +5,7 @@ name = openjade version = 1.3.2 -release = 3 +release = 4 groups = Application/Text url = http://openjade.sourceforge.net/ diff --git a/openjade/patches/openjade-getoptperl.patch b/openjade/patches/openjade-getoptperl.patch new file mode 100644 index 0000000..0d835ea --- /dev/null +++ b/openjade/patches/openjade-getoptperl.patch @@ -0,0 +1,21 @@ +diff -urNp openjade-1.3.2-orig/msggen.pl openjade-1.3.2/msggen.pl +--- openjade-1.3.2-orig/msggen.pl 2002-10-20 23:47:23.000000000 +0200 ++++ openjade-1.3.2/msggen.pl 2012-08-10 10:38:28.019081661 +0200 +@@ -4,6 +4,7 @@ + # See the file COPYING for copying permission. + + use POSIX; ++use Getopt::Std; + + # Package and version. + $package = 'openjade'; +@@ -18,8 +19,7 @@ $gen_c = 0; + undef $opt_l; + undef $opt_p; + undef $opt_t; +-do 'getopts.pl'; +-&Getopts('l:p:t:'); ++getopts('l:p:t:'); + $module = $opt_l; + $pot_file = $opt_p; + hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9aa7b0469da00d4ba745b682f0c5874ffa8ac92d
by git＠ipfire.org 03 Oct '16

03 Oct '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 9aa7b0469da00d4ba745b682f0c5874ffa8ac92d (commit) via f75c279b97552118ee06ae660230465d0a469bc8 (commit) from 52587edac4f6e3fba0923cb808740de6c5cbd61e (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 9aa7b0469da00d4ba745b682f0c5874ffa8ac92d Merge: f75c279 52587ed Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Oct 3 17:55:42 2016 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit f75c279b97552118ee06ae660230465d0a469bc8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Oct 3 17:53:13 2016 +0200 unbound: fix reverse lockup of webif defined hosts and make the own host resolveable. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/unbound | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) Difference in files: diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/unbound index dd5c85c..d324457 100644 --- a/src/initscripts/init.d/unbound +++ b/src/initscripts/init.d/unbound @@ -44,6 +44,15 @@ function cidr() { echo "${cidr}/${nbits}" } +ip_address_revptr() { + local addr=${1} + + local a1 a2 a3 a4 + IFS=. read -r a1 a2 a3 a4 <<< ${addr} + + echo "${a4}.${a3}.${a2}.${a1}.in-addr.arpa" +} + read_name_servers() { local i for i in 1 2; do @@ -101,6 +110,23 @@ update_forwarders() { unbound-control -q forward off } +own_hostname() { + local hostname=$(hostname -f) + # 1.1.1.1 is reserved for green only, skip this + if [ -n "${GREEN_ADDRESS}" -a "${GREEN_ADDRESS}" != "1.1.1.1" ]; then + unbound-control -q local_data "${hostname} ${LOCAL_TTL} IN A ${GREEN_ADDRESS}" + fi + + local address + for address in ${GREEN_ADDRESS} ${BLUE_ADDRESS} ${ORANGE_ADDRESS}; do + [ -n "${address}" ] || continue + [ "${address}" = "1.1.1.1" ] && continue + + address=$(ip_address_revptr ${address}) + unbound-control -q local_data "${address} ${LOCAL_TTL} IN PTR ${hostname}" + done +} + update_hosts() { local enabled address hostname domainname @@ -111,6 +137,10 @@ update_hosts() { local fqdn="${hostname}.${domainname}" unbound-control -q local_data "${fqdn} ${LOCAL_TTL} IN A ${address}" + + # Add RDNS + address=$(ip_address_revptr ${address}) + unbound-control -q local_data "${address} ${LOCAL_TTL} IN PTR ${fqdn}" done < /var/ipfire/main/hosts } @@ -307,6 +337,9 @@ case "$1" in boot_mesg "Starting Unbound DNS Proxy..." loadproc /usr/sbin/unbound || exit $? + # Make own hostname resolveable + own_hostname + # Update any known forwarding name servers update_forwarders hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9ec021753659babcc03d08084c6652c230afd6c3
by git＠ipfire.org 03 Oct '16

03 Oct '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 9ec021753659babcc03d08084c6652c230afd6c3 (commit) from 6af225ae05e1f9f12b17e9d299fc0f6f3c0af97a (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 9ec021753659babcc03d08084c6652c230afd6c3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Oct 3 12:07:44 2016 +0100 glibc: Remove -command and -headers package These packages are a bit redundant and got now merged into the main package and the -devel package. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: glibc/glibc.nm | 71 ++++++++++++---------------------------------------------- 1 file changed, 14 insertions(+), 57 deletions(-) Difference in files: diff --git a/glibc/glibc.nm b/glibc/glibc.nm index 943bf0e..5dd018d 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -5,7 +5,7 @@ name = glibc version = 2.24 -release = 1 +release = 2 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Base @@ -179,86 +179,43 @@ end packages package glibc - requires = glibc-common = %{thisver} - if "%{DISTRO_ARCH}" == "armv7hl" provides += ld-linux.so.3 provides += ld-linux.so.3(GLIBC_2.4) provides += ld-linux.so.3(GLIBC_PRIVATE) end - conflicts - kernel < %{OPTIMIZED_KERNEL} - end - end - - package glibc-common - # XXX description and summary are missing - requires - glibc = %{thisver} tzdata end - files - /usr/bin - /usr/sbin - /usr/share - /usr/lib/locale - !/usr/share/zoneinfo + conflicts + kernel < %{OPTIMIZED_KERNEL} + end + + obsoletes + glibc-common < %{thisver} end end package glibc-devel - summary = Object files for development using standard C libraries. - description - The glibc-devel package contains the object files necessary - for developing programs which use the standard C libraries (which are - used by nearly all programs). If you are developing programs which - will use the standard C libraries, your system needs to have these - standard object files available in order to create the - executables. - - Install glibc-devel if you are going to develop programs which will - use the standard C libraries. - end - group = Development/Libraries + template DEVEL requires glibc = %{thisver} glibc-headers = %{thisver} + kernel-headers >= %{OPTIMIZED_KERNEL} end - files - %{includedir} - %{libdir}/*.a - %{libdir}/*.o - end - end - - package glibc-headers - description - The glibc-headers package contains the header files necessary - for developing programs which use the standard C libraries (which are - used by nearly all programs). If you are developing programs which - will use the standard C libraries, your system needs to have these - standard header files available in order to create the - executables. - - Install glibc-headers if you are going to develop programs which will - use the standard C libraries. + provides + glibc-headers = %{thisver} end - requires - glibc = %{thisver} - kernel-headers >= %{OPTIMIZED_KERNEL} + obsoletes + glibc-headers < %{thisver} end - files - /usr/include - !/usr/include/linuxthreads - !/usr/include/gnu/stubs-[32164]*.h - end + files += %{libdir}/*.[ao] end package nscd hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 6af225ae05e1f9f12b17e9d299fc0f6f3c0af97a
by git＠ipfire.org 03 Oct '16

03 Oct '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 6af225ae05e1f9f12b17e9d299fc0f6f3c0af97a (commit) via cdae26171d09e2d09dc9fa84f940c10864057f40 (commit) via 8a909bf4bec3aee5f0b39646481a129d51bd05f9 (commit) via 007f8e5c37d59a878b6598faf36259a15268b41e (commit) via ee5e4c032ba8b3959a7281fae5f529ca8dbad262 (commit) via 215b403d19d98b11d867e089cec8e035db1fd958 (commit) via b80545fc04dbda2a9c61fe7cbc1dcc49ef9cf835 (commit) via 7d1a996cc0d3af31f4882f33d80bd5cfed379a61 (commit) via f5e2b33968b2aa04508fa452c5c28dc237050ef5 (commit) via b48cd6097ea35fcf5d1c4ec0bfd1cda03cee6c3a (commit) via 2374af0b562ae1bd5e566a5b6927e8445852c5df (commit) via bd30175fbbab8c11151807b1ea1f5b79ae1eea9f (commit) via cc2bd2f13d1c2be8bf1202c168d5f511461d2987 (commit) via 968ed82c45888b506a317a5f2aef3211a669d157 (commit) via b31a2e34db24a9dbe97e8e3378d548677df2a029 (commit) via 26c49a05889261641be017666044afdf71838616 (commit) via 1ef5ba3777513d522e6afde1532adf04469b99a4 (commit) via 141a73ab3808c38969bd23cb3b9a345d6e6a6558 (commit) via 67d4db430a8d821e2139010ef0f99cfb76a43941 (commit) via 42e36c7e20829f140654290e7889dcf5ac1af112 (commit) via 5b3631798e33e78fcc63a094ba3bbba412f92bbc (commit) via 6eb986e6a397214be0f3aa685f6bb62133068867 (commit) from d830721f6e0c5f8779663ea1846087a110e7b590 (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 6af225ae05e1f9f12b17e9d299fc0f6f3c0af97a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 18:36:14 2016 -0400 dvdrtools: Drop package Not supported upstream any more Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cdae26171d09e2d09dc9fa84f940c10864057f40 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 18:06:21 2016 -0400 sane: Drop package This has no priority right now Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8a909bf4bec3aee5f0b39646481a129d51bd05f9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 18:06:01 2016 -0400 hplip: Drop package Doesn't build and very outdated Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 007f8e5c37d59a878b6598faf36259a15268b41e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 18:02:03 2016 -0400 cogl: Fix build Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ee5e4c032ba8b3959a7281fae5f529ca8dbad262 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 17:56:40 2016 -0400 texinfo: Fix build Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 215b403d19d98b11d867e089cec8e035db1fd958 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 17:48:00 2016 -0400 compat-mpfr: Drop package This package requires GMP < 6.0 to build which is not part of our system any more. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b80545fc04dbda2a9c61fe7cbc1dcc49ef9cf835 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 17:44:27 2016 -0400 tcpick: Drop package Project seems to be discontinued Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7d1a996cc0d3af31f4882f33d80bd5cfed379a61 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 17:42:30 2016 -0400 slang: Fix build by removing a file with rpath This patch also enables two more plugins for slang Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f5e2b33968b2aa04508fa452c5c28dc237050ef5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 17:41:58 2016 -0400 bwm-ng: Update to 0.6.1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b48cd6097ea35fcf5d1c4ec0bfd1cda03cee6c3a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 16:29:02 2016 -0400 sip: Honour LDFLAGS Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2374af0b562ae1bd5e566a5b6927e8445852c5df Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 16:22:49 2016 -0400 squashfs-tools: Remove package This is actually very outdated and not very commonly used any more because it is lacking some features like ACLs. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bd30175fbbab8c11151807b1ea1f5b79ae1eea9f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 15:55:05 2016 -0400 rsyslog: Drop package This has been replaced by journald Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cc2bd2f13d1c2be8bf1202c168d5f511461d2987 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 15:51:32 2016 -0400 procps: Drop package This was replaced by procps-ng quite a while ago Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 968ed82c45888b506a317a5f2aef3211a669d157 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 14:27:01 2016 -0400 openl2tp: Drop package This is probably unmaintained upstream and nothing in IPFire depends on it right now. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b31a2e34db24a9dbe97e8e3378d548677df2a029 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 14:15:26 2016 -0400 compat-pcre: Fix running test suite Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 26c49a05889261641be017666044afdf71838616 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 14:14:01 2016 -0400 lsof: Cleanup makefile Make package honour our LDFLAGS Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1ef5ba3777513d522e6afde1532adf04469b99a4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 14:05:53 2016 -0400 libyaml: Fix running test suite Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 141a73ab3808c38969bd23cb3b9a345d6e6a6558 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 13:58:48 2016 -0400 libsoup: Fix build Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 67d4db430a8d821e2139010ef0f99cfb76a43941 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 13:52:50 2016 -0400 fuse: Update to 2.9.7 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 42e36c7e20829f140654290e7889dcf5ac1af112 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 13:51:34 2016 -0400 gsettings-desktop-schemas: Requires intltool >= 0.50.1 to build Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5b3631798e33e78fcc63a094ba3bbba412f92bbc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 13:49:58 2016 -0400 compat-db: Fix build on aarch64 Some older versions do not have support for aarch64 in configure, yet. Our automatic macro didn't fix that automatically which requires these lines. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6eb986e6a397214be0f3aa685f6bb62133068867 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 13:40:43 2016 -0400 libmng: Drop package FTBFS and nothing else depends on it Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: bwm-ng/bwm-ng.nm | 4 +- cogl/cogl.nm | 4 +- compat-db/compat-db.nm | 11 +- compat-mpfr/compat-mpfr.nm | 69 -------- compat-pcre/compat-pcre.nm | 3 +- dvdrtools/dvdrtools.nm | 41 ----- fuse/fuse.nm | 7 +- fuse/patches/fuse-2.7.4-openfix.patch | 36 ---- fuse/patches/fuse-2.7.4-udev_rules.patch | 5 - .../fuse-2.9.2-namespace-conflict-fix.patch | 21 +++ .../gsettings-desktop-schemas.nm | 4 +- hplip/hplip.nm | 116 ------------- hplip/patches/hplip-3.10.5-udev-rules.patch | 21 --- libmng/libmng.nm | 55 ------- libsoup/libsoup.nm | 4 +- libyaml/libyaml.nm | 3 +- lsof/lsof.nm | 18 +- openl2tp/openl2tp.nm | 66 -------- procps/patches/procps-3.2.8-selinux.patch | 96 ----------- procps/patches/procps-3.2.8-watch_unicode-2.patch | 148 ----------------- procps/procps.nm | 50 ------ rsyslog/patches/rsyslog-5.7.9-systemd.patch | 14 -- rsyslog/rsyslog.conf | 80 --------- rsyslog/rsyslog.log | 6 - rsyslog/rsyslog.nm | 100 ----------- rsyslog/rsyslog.sysconfig | 5 - sane/patches/sane-1.0.20-lockdir.patch | 30 ---- sane/patches/sane-1.0.21-epson-expression800.patch | 47 ------ sane/patches/sane-1.0.21-i18n.patch | 129 --------------- sane/patches/sane-1.0.21-pkgconfig.patch | 182 --------------------- sane/patches/sane-1.0.21-udev.patch | 66 -------- sane/sane.nm | 60 ------- sip/sip.nm | 6 +- slang/slang.nm | 6 +- squashfs-tools/patches/squashfs-cflags.patch | 13 -- squashfs-tools/patches/squashfs-xz.patch | 11 -- squashfs-tools/squashfs-tools.nm | 50 ------ tcpick/tcpick.nm | 43 ----- texinfo/texinfo.nm | 3 +- 39 files changed, 65 insertions(+), 1568 deletions(-) delete mode 100644 compat-mpfr/compat-mpfr.nm delete mode 100644 dvdrtools/dvdrtools.nm delete mode 100644 fuse/patches/fuse-2.7.4-openfix.patch delete mode 100644 fuse/patches/fuse-2.7.4-udev_rules.patch create mode 100644 fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch delete mode 100644 hplip/hplip.nm delete mode 100644 hplip/patches/hplip-3.10.5-udev-rules.patch delete mode 100644 libmng/libmng.nm delete mode 100644 openl2tp/openl2tp.nm delete mode 100644 procps/patches/procps-3.2.8-selinux.patch delete mode 100644 procps/patches/procps-3.2.8-watch_unicode-2.patch delete mode 100644 procps/procps.nm delete mode 100644 rsyslog/patches/rsyslog-5.7.9-systemd.patch delete mode 100644 rsyslog/rsyslog.conf delete mode 100644 rsyslog/rsyslog.log delete mode 100644 rsyslog/rsyslog.nm delete mode 100644 rsyslog/rsyslog.sysconfig delete mode 100644 sane/patches/sane-1.0.20-lockdir.patch delete mode 100644 sane/patches/sane-1.0.21-epson-expression800.patch delete mode 100644 sane/patches/sane-1.0.21-i18n.patch delete mode 100644 sane/patches/sane-1.0.21-pkgconfig.patch delete mode 100644 sane/patches/sane-1.0.21-udev.patch delete mode 100644 sane/sane.nm delete mode 100644 squashfs-tools/patches/squashfs-cflags.patch delete mode 100644 squashfs-tools/patches/squashfs-xz.patch delete mode 100644 squashfs-tools/squashfs-tools.nm delete mode 100644 tcpick/tcpick.nm Difference in files: diff --git a/bwm-ng/bwm-ng.nm b/bwm-ng/bwm-ng.nm index 24cdfdd..17e8834 100644 --- a/bwm-ng/bwm-ng.nm +++ b/bwm-ng/bwm-ng.nm @@ -4,8 +4,8 @@ ############################################################################### name = bwm-ng -version = 0.6 -release = 2 +version = 0.6.1 +release = 1 groups = Networking/Statistics url = http://www.gropp.org/?id=projects&sub=bwm-ng diff --git a/cogl/cogl.nm b/cogl/cogl.nm index 3a0f3de..af6285a 100644 --- a/cogl/cogl.nm +++ b/cogl/cogl.nm @@ -7,7 +7,7 @@ name = cogl version = %{ver_maj}.%{ver_min} ver_maj = 1.13 ver_min = 2 -release = 1 +release = 2 groups = Development/Libraries url = http://www.clutter-project.org/ @@ -49,6 +49,8 @@ build pango-devel end + export LD_LIBRARY_PATH = %{DIR_APP}/cogl/.libs:%{DIR_APP}/cogl-pango/.libs + configure_options += \ --enable-cairo \ --enable-gdk-pixbuf \ diff --git a/compat-db/compat-db.nm b/compat-db/compat-db.nm index 6c6c040..6a5f767 100644 --- a/compat-db/compat-db.nm +++ b/compat-db/compat-db.nm @@ -6,7 +6,7 @@ name = compat-db version = %{main_version} # Release cannot be reset because the sub-packages won't get updated -release = 7 +release = 8 thisapp = db-%{version} maintainer = Michael Tremer <michael.tremer(a)ipfire.org> @@ -53,6 +53,15 @@ build build for version in %{versions}; do + # Fix autotools on aarch64 + for i in $(find %{DIR_SRC}/db-${version} -name config.guess -or -name config.sub); do + if ! grep -q "aarch64" ${i}; then + if [ -e "%{datadir}/pakfire/$(basename ${i})" ]; then + cp -vf %{datadir}/pakfire/$(basename ${i}) $(dirname ${i}) + fi + fi + done + cd %{DIR_SRC}/db-${version}/build_unix ../dist/configure \ %{configure_options} diff --git a/compat-mpfr/compat-mpfr.nm b/compat-mpfr/compat-mpfr.nm deleted file mode 100644 index d9cfbb6..0000000 --- a/compat-mpfr/compat-mpfr.nm +++ /dev/null @@ -1,69 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-mpfr -version = 2.4.2 -release = 1 - -thisapp = mpfr-%{version} - -groups = System/Libraries -url = http://www.mpfr.org/ -license = LGPLv2+ and GPLv2+ and GFDL -summary = A C library for multiple-precision floating-point computations. - -description - The MPFR library is a C library for multiple-precision floating-point - computations with correct rounding. The MPFR is efficient and - also has a well-defined semantics. It copies the good ideas from the - ANSI/IEEE-754 standard for double-precision floating-point arithmetic - (53-bit mantissa). MPFR is based on the GMP multiple-precision - library. -end - -source_dl = http://ftp.gnu.org/gnu/mpfr/ - -build - requires - gmp-devel >= 4.3.2 - gmp-devel < 6.0.0 - end - - configure_options += \ - --enable-thread-safe \ - --disable-assert - - test - export LD_LIBRARY_PATH=$(pwd)/.libs - make check - end - - install - # Only install libraries. - mkdir -pv %{BUILDROOT}%{libdir} - install -m 644 .libs/libmpfr.so.1.2.2 %{BUILDROOT}%{libdir} - ln -svf libmpfr.so.1.2.2 %{BUILDROOT}%{libdir}/libmpfr.so.1 - end -end - -packages - package %{name} - provides - mpfr = %{thisver} - end - - obsoletes - mpfr-compat - end - - conflicts - mpfr <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-pcre/compat-pcre.nm b/compat-pcre/compat-pcre.nm index 5251971..259d63f 100644 --- a/compat-pcre/compat-pcre.nm +++ b/compat-pcre/compat-pcre.nm @@ -5,7 +5,7 @@ name = compat-pcre version = 8.21 -release = 1 +release = 2 thisapp = pcre-%{version} @@ -42,6 +42,7 @@ build --enable-pcretest-libreadline test + export LD_LIBRARY_PATH=$(pwd)/.libs make check end diff --git a/dvdrtools/dvdrtools.nm b/dvdrtools/dvdrtools.nm deleted file mode 100644 index efa3490..0000000 --- a/dvdrtools/dvdrtools.nm +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = dvdrtools -version = 0.2.1 -release = 1 - -groups = System/Filesystems -url = http://savannah.nongnu.org/projects/dvdrtools/ -license = GPLv2+ -summary = A set of command line programs that allows to record media. - -description - dvdrtools is a fork of cdrtools/cdrecord with support for writing to DVDs. \ - While its primary purpose is writing data DVDs, it includes basic support \ - for mastering video DVDs. -end - -source_dl = -sources = %{thisapp}.tar.bz2 - -build - configure_options += \ - --disable-static \ - --mandir=/usr/share/man - - test - make check - end -end - -packages - package %{name} - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/fuse/fuse.nm b/fuse/fuse.nm index 4974a39..8db4447 100644 --- a/fuse/fuse.nm +++ b/fuse/fuse.nm @@ -4,7 +4,7 @@ ############################################################################### name = fuse -version = 2.8.6 +version = 2.9.7 release = 1 groups = System/Filesystems @@ -18,15 +18,13 @@ description FUSE userspace tools to mount a FUSE filesystem. end -source_dl = http://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp} +source_dl = https://github.com/libfuse/libfuse/releases/download/%{thisapp}/ build requires libselinux-devel end - CFLAGS += -D_GNU_SOURCE - configure_options += \ --disable-static \ --disable-rpath @@ -42,7 +40,6 @@ end packages package %{name} - end package %{name}-devel template DEVEL diff --git a/fuse/patches/fuse-2.7.4-openfix.patch b/fuse/patches/fuse-2.7.4-openfix.patch deleted file mode 100644 index e5b9eae..0000000 --- a/fuse/patches/fuse-2.7.4-openfix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up fuse-2.7.2/lib/fuse.c.BAD fuse-2.7.2/lib/fuse.c ---- a/lib/fuse.c 2008-01-21 09:55:42.000000000 -0500 -+++ b/lib/fuse.c 2008-01-21 09:57:20.000000000 -0500 -@@ -633,17 +633,15 @@ static int fuse_compat_open(struct fuse_ - { - int err; - if (!fs->compat || fs->compat >= 25) -- err = fs->op.open(path, fi); -+ err = (fs->op.open)(path, fi); - else if (fs->compat == 22) { - struct fuse_file_info_compat tmp; - memcpy(&tmp, fi, sizeof(tmp)); -- err = ((struct fuse_operations_compat22 *) &fs->op)->open(path, -- &tmp); -+ err = (((struct fuse_operations_compat22 *) &fs->op)->open)(path, &tmp); - memcpy(fi, &tmp, sizeof(tmp)); - fi->fh = tmp.fh; - } else -- err = ((struct fuse_operations_compat2 *) &fs->op) -- ->open(path, fi->flags); -+ err = (((struct fuse_operations_compat2 *) &fs->op)->open)(path, fi->flags); - return err; - } - -diff -up fuse-2.7.2/lib/fuse_lowlevel.c.BAD fuse-2.7.2/lib/fuse_lowlevel.c ---- a/lib/fuse_lowlevel.c 2008-01-21 09:57:52.000000000 -0500 -+++ b/lib/fuse_lowlevel.c 2008-01-21 09:58:15.000000000 -0500 -@@ -605,7 +605,7 @@ static void do_open(fuse_req_t req, fuse - fi.flags = arg->flags; - - if (req->f->op.open) -- req->f->op.open(req, nodeid, &fi); -+ (req->f->op.open)(req, nodeid, &fi); - else - fuse_reply_open(req, &fi); - } diff --git a/fuse/patches/fuse-2.7.4-udev_rules.patch b/fuse/patches/fuse-2.7.4-udev_rules.patch deleted file mode 100644 index d52fc32..0000000 --- a/fuse/patches/fuse-2.7.4-udev_rules.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/util/udev.rules 2005-11-03 19:38:05.000000000 +0100 -+++ b/util/udev.rules 2005-11-03 19:38:13.000000000 +0100 -@@ -1 +1 @@ --KERNEL=="fuse", MODE="0666" -+KERNEL=="fuse", NAME="%k", MODE="0666",OWNER="root",GROUP="root" diff --git a/fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch b/fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch new file mode 100644 index 0000000..ae67e7d --- /dev/null +++ b/fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch @@ -0,0 +1,21 @@ +diff -up fuse-2.9.2/include/fuse_kernel.h.conflictfix fuse-2.9.2/include/fuse_kernel.h +--- fuse-2.9.2/include/fuse_kernel.h.conflictfix 2013-06-26 09:31:57.862198038 -0400 ++++ fuse-2.9.2/include/fuse_kernel.h 2013-06-26 09:32:19.679198365 -0400 +@@ -88,12 +88,16 @@ + #ifndef _LINUX_FUSE_H + #define _LINUX_FUSE_H + +-#include <sys/types.h> ++#ifdef __linux__ ++#include <linux/types.h> ++#else ++#include <stdint.h> + #define __u64 uint64_t + #define __s64 int64_t + #define __u32 uint32_t + #define __s32 int32_t + #define __u16 uint16_t ++#endif + + /* + * Version negotiation: diff --git a/gsettings-desktop-schemas/gsettings-desktop-schemas.nm b/gsettings-desktop-schemas/gsettings-desktop-schemas.nm index 1c28ab6..b7a1a1d 100644 --- a/gsettings-desktop-schemas/gsettings-desktop-schemas.nm +++ b/gsettings-desktop-schemas/gsettings-desktop-schemas.nm @@ -7,7 +7,7 @@ name = gsettings-desktop-schemas version = %{ver_maj}.%{ver_min} ver_maj = 3.20 ver_min = 0 -release = 1 +release = 2 groups = System/Libraries url = http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas @@ -26,7 +26,7 @@ build requires glib2 >= 2.31.0 gobject-introspection-devel - intltool + intltool >= 0.50.1 end configure_options += \ diff --git a/hplip/hplip.nm b/hplip/hplip.nm deleted file mode 100644 index b09973a..0000000 --- a/hplip/hplip.nm +++ /dev/null @@ -1,116 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = hplip -version = 3.10.9 -release = 3 - -groups = Applications/Printing -url = http://hplipopensource.com/hplip-web/index.html -license = GPLv2* -summary = HP Printer/Scanner Library (full version). - -description - HPLIP (Hewlett-Packard Linux Imaging & Printing) is an HP-developed - olution for printing, scanning, and faxing with HP inkjet and laser based - printers in Linux. The HPLIP project provides printing support for 1,924 - printer models. - This is the full version including printer/scanner support. -end - -source_dl = http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/ - -build - requires - autoconf - automake - cups-devel - dbus-devel - gcc-c++ - libjpeg-devel - libtool - libusb-compat-devel - net-snmp-devel - openssl-devel - pkg-config - python-devel - sane-devel - end - - configure_options += \ - --sysconfdir=%{sysconfdir} \ - --disable-gui-build \ - --disable-qt4 - - install_cmds - # Remove unwanted files. - rm -rvf %{BUILDROOT}%{bindir}/hp-systray - rm -rvf %{BUILDROOT}%{sysconfdir}/sane.d/ - rm -rvf %{BUILDROOT}%{datadir}/installer - - # Remove files for HAL. - rm -rvf %{BUILDROOT}%{datadir}/hal - - # Remove X11 relevated files. - rm -rvf %{BUILDROOT}%{datadir}/applications/ - - # Remove xdg files. - rm -rvf %{BUILDROOT}%{sysconfdir}/xdg/ - end -end - -packages - package %{name} - requires - %{name}-common=%{thisver} - cups - end - end - - package %{name}-common - summary = Files needed by the HPLIP printer and scanner drivers. - description = %{summary} - - files - %{libdir}/udev/ - %{libdir}/python*/ - %{sysconfdir}/udev/ - %{datadir}/hplip - end - end - - package %{name}-libs - template LIBS - end - - package %{name}-devel - template DEVEL - end - - package libsane-hpaio - summary = SANE driver for scanners in HP's multi-function devices. - description = %{summary} - - prerequires += sane - - files - %{libdir}/sane/* - end - - script postin - # Add hplip scanner support to sane. - echo "hpaio" >> %{sysconfdir}/sane.d/dll.conf - end - - script postun - # Remove hplip scanner support from sane. - sed -i "/^hpaio$/d" %{sysconfdir}/sane.d/dll.conf - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/hplip/patches/hplip-3.10.5-udev-rules.patch b/hplip/patches/hplip-3.10.5-udev-rules.patch deleted file mode 100644 index d56fe6c..0000000 --- a/hplip/patches/hplip-3.10.5-udev-rules.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.5/data/rules/56-hpmud_support.rules ---- hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules 2010-05-13 01:44:22.000000000 +0200 -+++ hplip-3.10.5/data/rules/56-hpmud_support.rules 2010-05-17 16:12:42.000000000 +0200 -@@ -6,10 +6,11 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul - - LABEL="pid_test" - -+ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p" - # Check for LaserJet products (0x03f0xx17). --SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" -+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" - # Check for LaserJet products (0x03f0xx2a). --SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" --ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'" -+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" -+ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'" - --LABEL="hpmud_rules_end" -\ No newline at end of file -+LABEL="hpmud_rules_end" - diff --git a/libmng/libmng.nm b/libmng/libmng.nm deleted file mode 100644 index 5b0ba8e..0000000 --- a/libmng/libmng.nm +++ /dev/null @@ -1,55 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = libmng -version = 1.0.10 -release = 1 - -groups = System/Libraries -url = http://www.libmng.org -license = zlib -summary = Library for Multiple-image Network Graphics support. - -description - LibMNG is a library for accessing graphics in MNG (Multi-image Network \ - Graphics) and JNG (JPEG Network Graphics) formats. -end - -source_dl = -sources = %{thisapp}.tar.bz2 - -build - requires - autoconf - automake - libjpeg-devel - libtool - zlib-devel - end - - configure_options += \ - --enable-shared \ - --disable-static \ - --with-zlib \ - --with-jpeg \ - --with-gnu-ld - - prepare_cmds - unmaintained/autogen.sh - end -end - -packages - package %{name} - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libsoup/libsoup.nm b/libsoup/libsoup.nm index 4c2008f..ec16e1b 100644 --- a/libsoup/libsoup.nm +++ b/libsoup/libsoup.nm @@ -7,7 +7,7 @@ name = libsoup version = %{ver_major}.%{ver_minor} ver_major = 2.54 ver_minor = 0.1 -release = 1 +release = 2 groups = System/Libraries url = http://live.gnome.org/LibSoup @@ -38,6 +38,8 @@ build vala-devel >= 0.32 end + export LD_LIBRARY_PATH = %{DIR_APP}/libsoup/.libs + configure_options += \ --enable-introspection=yes \ --disable-tls-check \ diff --git a/libyaml/libyaml.nm b/libyaml/libyaml.nm index f945f23..6a07ec8 100644 --- a/libyaml/libyaml.nm +++ b/libyaml/libyaml.nm @@ -5,7 +5,7 @@ name = libyaml version = 0.1.3 -release = 1 +release = 2 groups = System/Libraries url = http://pyyaml.org/ @@ -25,6 +25,7 @@ build DIR_APP = %{DIR_SRC}/yaml-%{version} test + export LD_LIBRARY_PATH=$(pwd)/src/.libs make check end end diff --git a/lsof/lsof.nm b/lsof/lsof.nm index b10421c..6b8a022 100644 --- a/lsof/lsof.nm +++ b/lsof/lsof.nm @@ -5,7 +5,7 @@ name = lsof version = 4.85 -release = 1 +release = 2 groups = Development/Debuggers url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ @@ -25,18 +25,18 @@ build libselinux-devel end + export LSOF_CFGL = %{CFLAGS} %{LDFLAGS} + build - LINUX_BASE=/proc \ - LSOF_VSTR="2.6.16" \ - ./Configure linux -n - make DEBUG="%{CFLAGS}" %{PARALLELISMFLAGS} + ./Configure -n linux + make %{PARALLELISMFLAGS} end install - mkdir -pv %{BUILDROOT}/usr/sbin - install -m 755 lsof %{BUILDROOT}/usr/sbin - mkdir -pv %{BUILDROOT}/usr/share/man/man8 - cp -vf lsof.8 %{BUILDROOT}/usr/share/man/man8 + mkdir -pv %{BUILDROOT}%{sbindir} + install -m 755 lsof %{BUILDROOT}%{sbindir} + mkdir -pv %{BUILDROOT}%{mandir}/man8 + cp -vf lsof.8 %{BUILDROOT}%{mandir}/man8 end end diff --git a/openl2tp/openl2tp.nm b/openl2tp/openl2tp.nm deleted file mode 100644 index 354edb2..0000000 --- a/openl2tp/openl2tp.nm +++ /dev/null @@ -1,66 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = openl2tp -version = 1.7 -release = 2 - -groups = Networking/PPP -url = http://www.openl2tp.org/ -license = GPL -summary = A Linux L2TP solution for enterprise VPN and ISPs. - -description - OpenL2TP is an open source L2TP client / server, written specifically - for Linux. It has been designed for use as an enterprise L2TP VPN - server or in commercial, Linux-based, embedded networking products and - is able to support hundreds of sessions, each with different - configuration. It is used by several ISPs to provide L2TP services and - by corporations to implement L2TP VPNs. -end - -source_dl = - -build - requires - bison - flex - flex-devel - readline-devel - tcl - end - - CFLAGS += -fno-strict-aliasing - - prepare_cmds - sed -e "s/-lfl/&_pic/g" -i Makefile - - # Remove -Werror from all makefiles. - find . -name Makefile | xargs sed -i -e "s/-Werror//g" - end - - build - make OPT_CFLAGS="%{CFLAGS}" ARCH="%{DISTRO_ARCH}" \ - KERNEL_SRCDIR="/usr" PPPD_VERSION="2.4.5" - end - -# This doesn't really a good testing -#define test -# cd %{DIR_APP} && make test -#endef - - install - make install DESTDIR=%{BUILDROOT} ARCH="%{DISTRO_ARCH}" \ - KERNEL_SRCDIR="/usr" PPPD_VERSION="2.4.5" - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/procps/patches/procps-3.2.8-selinux.patch b/procps/patches/procps-3.2.8-selinux.patch deleted file mode 100644 index a8c1f74..0000000 --- a/procps/patches/procps-3.2.8-selinux.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff --git a/Makefile b/Makefile -index 09fb3ed..4d05900 100644 ---- a/Makefile -+++ b/Makefile -@@ -73,12 +73,12 @@ CURSES := -lncurses - # Something like this is probably needed to make the SE Linux - # library loading not conflict with embedded systems stuff. - # --#ifeq ($(SHARED),1) --#ldl := -ldl --#LIBTYPE := -DSHAREDLIB --#else --#LIBTYPE := -DSTATICLIB --#endif -+ifeq ($(SHARED),1) -+ldl := -ldl -+LIBTYPE := -DSHAREDLIB -+else -+LIBTYPE := -DSTATICLIB -+endif - - # Preprocessor flags. - PKG_CPPFLAGS := -D_GNU_SOURCE -I proc -@@ -103,7 +103,7 @@ PKG_CFLAGS := -fno-common -ffast-math \ - # Note that some stuff below is conditional on CFLAGS containing - # an option that starts with "-g". (-g, -g2, -g3, -ggdb, etc.) - CFLAGS := -O2 -s --ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS) -+ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS) $(LIBTYPE) - - PKG_LDFLAGS := -Wl,-warn-common - LDFLAGS := -diff --git a/ps/output.c b/ps/output.c -index 87bf9de..edbb4cb 100644 ---- a/ps/output.c -+++ b/ps/output.c -@@ -1099,7 +1099,7 @@ static int pr_sgi_p(char *restrict const outbuf, const proc_t *restrict const pp - return snprintf(outbuf, COLWID, "*"); - } - -- -+#ifdef STATICLIB - /****************** FLASK & seLinux security stuff **********************/ - // move the bulk of this to libproc sometime - -@@ -1131,7 +1131,7 @@ fail: - return 1; - } - --#if 0 -+#else - // This needs more study, considering: - // 1. the static linking option (maybe disable this in that case) - // 2. the -z and -Z option issue -diff --git a/ps/parser.c b/ps/parser.c -index 5ad9035..2659d4d 100644 ---- a/ps/parser.c -+++ b/ps/parser.c -@@ -231,7 +231,7 @@ static const char *parse_sysv_option(void){ - // In the meantime, please do not add to it. The list is - // intended to ONLY contain flags defined by the POSIX and UNIX - // standards published by The Open Group, IEEE, and ISO. -- if(!strchr("aAdefgGlnoptuU", *flagptr)) not_pure_unix = 1; // dude, -Z ain't in POSIX -+ if(!strchr("aAdefgGlnoptuUZ", *flagptr)) not_pure_unix = 1; // dude, -Z ain't in POSIX - - switch(*flagptr){ - case 'A': -diff --git a/ps/ps.1 b/ps/ps.1 -index 64953d5..aab2584 100644 ---- a/ps/ps.1 -+++ b/ps/ps.1 -@@ -450,6 +450,9 @@ display virtual memory format - Do not show flags; show rss in place of addr. - This option can only be used with \fB\-l\fR. - -+.opt \-Z -+display security context format (SELinux, etc.) -+ - .opt \-\-format \ format - user\-defined format. Identical to \fB\-o\fR and \fBo\fR. - -diff --git a/w.c b/w.c -index 1b2a0fc..207a8a1 100644 ---- a/w.c -+++ b/w.c -@@ -163,6 +163,10 @@ static const proc_t *getproc(const utmp_t *restrict const u, const char *restric - if(best && tmp->start_time <= best->start_time) continue; - best = tmp; - } -+ /* It is there but SELinux wouldn't allow us to know the detail. Really -+ w should just be given rights */ -+ if(!kill(u->ut_pid, 0) || errno != ESRCH) -+ *found_utpid = 1; - return best ? best : secondbest; - } - diff --git a/procps/patches/procps-3.2.8-watch_unicode-2.patch b/procps/patches/procps-3.2.8-watch_unicode-2.patch deleted file mode 100644 index bfc78d3..0000000 --- a/procps/patches/procps-3.2.8-watch_unicode-2.patch +++ /dev/null @@ -1,148 +0,0 @@ -Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org> -Date: 2009-05-11 -Initial Package Version: 3.2.8 -Upstream Status: Submitted -Origin: http://wiki.linuxfromscratch.org/lfs/ticket/2113 -Description: Fixes a unicode related bug in the watch program - -diff -Naur procps-3.2.8.orig/Makefile procps-3.2.8/Makefile ---- procps-3.2.8.orig/Makefile 2009-05-10 18:50:48.000000000 +0000 -+++ procps-3.2.8/Makefile 2009-05-12 19:06:50.000000000 +0000 -@@ -67,7 +67,7 @@ - # plus the top-level Makefile to make it work stand-alone. - _TARFILES := Makefile - --CURSES := -lncurses -+CURSES := -lncursesw - - # This seems about right for the dynamic library stuff. - # Something like this is probably needed to make the SE Linux -diff -Naur procps-3.2.8.orig/watch.c procps-3.2.8/watch.c ---- procps-3.2.8.orig/watch.c 2007-05-28 03:13:23.000000000 +0000 -+++ procps-3.2.8/watch.c 2009-05-12 19:17:25.000000000 +0000 -@@ -25,6 +25,8 @@ - #include <termios.h> - #include <locale.h> - #include "proc/procps.h" -+#include <wchar.h> -+#include <wctype.h> - - #ifdef FORCE_8BIT - #undef isprint -@@ -134,6 +136,27 @@ - } - } - -+static wint_t -+readwc(FILE *stream, mbstate_t *mbs) -+{ -+ for (;;) { -+ int chr; -+ char c; -+ wchar_t wc; -+ size_t len; -+ -+ chr = getc(stream); -+ if (chr == EOF) -+ return WEOF; -+ c = chr; -+ len = mbrtowc(&wc, &c, 1, mbs); -+ if (len == (size_t)-1) -+ memset(mbs, 0, sizeof(*mbs)); -+ else if (len != (size_t)-2) -+ return wc; -+ } -+} -+ - int - main(int argc, char *argv[]) - { -@@ -239,6 +262,7 @@ - FILE *p; - int x, y; - int oldeolseen = 1; -+ mbstate_t mbs; - - if (screen_size_changed) { - get_terminal_size(); -@@ -266,49 +290,65 @@ - do_exit(2); - } - -+ memset(&mbs, 0, sizeof(mbs)); - for (y = show_title; y < height; y++) { - int eolseen = 0, tabpending = 0; - for (x = 0; x < width; x++) { -- int c = ' '; -- int attr = 0; -+ wint_t c = L' '; -+ int attr = 0, c_width; -+ cchar_t cc; -+ wchar_t wstr[2]; - - if (!eolseen) { - /* if there is a tab pending, just spit spaces until the - next stop instead of reading characters */ - if (!tabpending) - do -- c = getc(p); -- while (c != EOF && !isprint(c) -- && c != '\n' -- && c != '\t'); -- if (c == '\n') -+ c = readwc(p, &mbs); -+ while (c != WEOF && !iswprint(c) -+ && c != L'\n' -+ && c != L'\t'); -+ if (c == L'\n') - if (!oldeolseen && x == 0) { - x = -1; - continue; - } else - eolseen = 1; -- else if (c == '\t') -+ else if (c == L'\t') - tabpending = 1; -- if (c == EOF || c == '\n' || c == '\t') -- c = ' '; -+ if (c == WEOF || c == L'\n' || c == L'\t') -+ c = L' '; - if (tabpending && (((x + 1) % 8) == 0)) - tabpending = 0; - } -+ wstr[0] = c; -+ wstr[1] = 0; -+ setcchar (&cc, wstr, 0, 0, NULL); - move(y, x); - if (option_differences) { -- chtype oldch = inch(); -- char oldc = oldch & A_CHARTEXT; -+ cchar_t oldc; -+ wchar_t oldwstr[2]; -+ attr_t attrs; -+ short colors; -+ -+ in_wch(&oldc); -+ getcchar(&oldc, oldwstr, &attrs, &colors, NULL); - attr = !first_screen -- && ((char)c != oldc -+ && (wstr[0] != oldwstr[0] - || - (option_differences_cumulative -- && (oldch & A_ATTRIBUTES))); -+ && attrs)); - } - if (attr) - standout(); -- addch(c); -+ add_wch(&cc); -+ - if (attr) - standend(); -+ c_width = wcwidth(c); -+ if (c_width > 1) -+ x += c_width - 1; -+ - } - oldeolseen = eolseen; - } diff --git a/procps/procps.nm b/procps/procps.nm deleted file mode 100644 index 817a4f1..0000000 --- a/procps/procps.nm +++ /dev/null @@ -1,50 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = procps -version = 3.2.8 -release = 4 - -groups = Applications/System -url = http://procps.sourceforge.net/ -license = GPLv2+ and LGPLv2+ -summary = System and process monitoring utilities. - -description - The procps package contains a set of system utilities that provide - system information. Procps includes ps, free, skill, pkill, pgrep, - snice, tload, top, uptime, vmstat, w, watch and pdwx. -end - -source_dl = - -build - requires - libselinux-devel - ncurses-devel - end - - make_build_targets += \ - SHARED=1 \ - CFLAGS="%{CFLAGS}" \ - W_SHOWFROM=-DW_SHOWFROM - - make_install_targets += \ - SKIP="/bin/kill /usr/share/man/man1/kill.1" - - install_cmds - chmod -R 755 %{BUILDROOT}/{bin,%{lib},sbin} - end -end - -packages - package %{name} - groups += Base - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/rsyslog/patches/rsyslog-5.7.9-systemd.patch b/rsyslog/patches/rsyslog-5.7.9-systemd.patch deleted file mode 100644 index 1049c31..0000000 --- a/rsyslog/patches/rsyslog-5.7.9-systemd.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up rsyslog-5.7.9/rsyslog.service.in.orig rsyslog-5.7.9/rsyslog.service.in ---- rsyslog-5.7.9/rsyslog.service.in.orig 2011-03-18 18:05:58.760693398 +0100 -+++ rsyslog-5.7.9/rsyslog.service.in 2011-03-18 18:07:20.131691458 +0100 -@@ -2,8 +2,9 @@ - Description=System Logging Service - - [Service] -+EnvironmentFile=-/etc/sysconfig/rsyslog - ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service --ExecStart=@sbindir@/rsyslogd -n -c5 -+ExecStart=@sbindir@/rsyslogd -n $SYSLOGD_OPTIONS - Sockets=syslog.socket - - [Install] diff --git a/rsyslog/rsyslog.conf b/rsyslog/rsyslog.conf deleted file mode 100644 index 36cea98..0000000 --- a/rsyslog/rsyslog.conf +++ /dev/null @@ -1,80 +0,0 @@ -# rsyslog v5 configuration file - -# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html -# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html - -#### MODULES #### - -$ModLoad imuxsock # provides support for local system logging (e.g. via logger command) -$ModLoad imklog # provides kernel logging support (previously done by rklogd) -#$ModLoad immark # provides --MARK-- message capability - -# Provides UDP syslog reception -#$ModLoad imudp -#$UDPServerRun 514 - -# Provides TCP syslog reception -#$ModLoad imtcp -#$InputTCPServerRun 514 - - -#### GLOBAL DIRECTIVES #### - -# Use default timestamp format -$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat - -# File syncing capability is disabled by default. This feature is usually not required, -# not useful and an extreme performance hit -#$ActionFileEnableSync on - -# Include all config files in /etc/rsyslog.d/ -$IncludeConfig /etc/rsyslog.d/*.conf - - -#### RULES #### - -# Log all kernel messages to the console. -# Logging much else clutters up the screen. -#kern.* /dev/console - -# Log anything (except mail) of level info or higher. -# Don't log private authentication messages! -*.info;mail.none;authpriv.none;cron.none /var/log/messages - -# The authpriv file has restricted access. -authpriv.* /var/log/secure - -# Log all the mail messages in one place. -mail.* -/var/log/maillog - - -# Log cron stuff -cron.* /var/log/cron - -# Everybody gets emergency messages -*.emerg * - -# Save news errors of level crit and higher in a special file. -uucp,news.crit /var/log/spooler - -# Save boot messages also to boot.log -local7.* /var/log/boot.log - - -# ### begin forwarding rule ### -# The statement between the begin ... end define a SINGLE forwarding -# rule. They belong together, do NOT split them. If you create multiple -# forwarding rules, duplicate the whole block! -# Remote Logging (we use TCP for reliable delivery) -# -# An on-disk queue is created for this action. If the remote host is -# down, messages are spooled to disk and sent when it is up again. -#$WorkDirectory /var/lib/rsyslog # where to place spool files -#$ActionQueueFileName fwdRule1 # unique name prefix for spool files -#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible) -#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown -#$ActionQueueType LinkedList # run asynchronously -#$ActionResumeRetryCount -1 # infinite retries if host is down -# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional -#*.* @@remote-host:514 -# ### end of the forwarding rule ### diff --git a/rsyslog/rsyslog.log b/rsyslog/rsyslog.log deleted file mode 100644 index 674e9d0..0000000 --- a/rsyslog/rsyslog.log +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/cron { - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true - endscript -} diff --git a/rsyslog/rsyslog.nm b/rsyslog/rsyslog.nm deleted file mode 100644 index 1956a38..0000000 --- a/rsyslog/rsyslog.nm +++ /dev/null @@ -1,100 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = rsyslog -version = 5.8.6 -release = 4 - -groups = System/Daemons -url = http://www.rsyslog.com/ -license = GPLv3+ -summary = Enhanced system logging and kernel message trapping daemon. - -description - Rsyslog is an enhanced, multi-threaded syslog daemon. It supports MySQL, - syslog/TCP, RFC 3195, permitted sender lists, filtering on any message part, - and fine grain output format control. It is compatible with stock sysklogd - and can be used as a drop-in replacement. Rsyslog is simple to set up, with - advanced features suitable for enterprise-class, encryption-protected syslog - relay chains. -end - -source_dl = http://www.rsyslog.com/files/download/rsyslog/ - -build - requires - gnutls-devel - libgcrypt-devel - libnet-devel - zlib-devel - end - - CFLAGS += \ - -DSYSLOGD_PIDNAME=\"syslogd.pid\" - - configure_options += \ - --with-systemdsystemunitdir=/lib/systemd/system \ - --disable-static \ - --disable-testbench \ - --enable-gnutls \ - --disable-gssapi-krb5 \ - --enable-imfile \ - --disable-libdbi \ - --enable-mail \ - --disable-mysql \ - --enable-omprog \ - --enable-omudpspoof \ - --enable-omuxsock \ - --disable-pgsql \ - --enable-pmlastmsg \ - --disable-relp \ - --disable-snmp \ - --enable-unlimited-select - - install_cmds - mkdir -pv %{BUILDROOT}/etc/{logrotate.d,rsyslog.d,sysconfig} - - cp -vf %{DIR_SOURCE}/rsyslog.conf %{BUILDROOT}/etc/rsyslog.conf - cp -vf %{DIR_SOURCE}/rsyslog.sysconfig %{BUILDROOT}/etc/sysconfig/rsyslog - cp -vf %{DIR_SOURCE}/rsyslog.log %{BUILDROOT}/etc/logrotate.d/syslog - end -end - -packages - package %{name} - requires = logrotate - provides += syslog - - prerequires = systemd-units - - script postin - for n in /var/log/{messages,secure,maillog,spooler}; do - [ -f "${n}" ] && continue - umask 066 && touch ${n} - done - end - - script preun - /bin/systemctl --no-reload disable rsyslog.service >/dev/null 2>&1 || : - /bin/systemctl stop rsyslog.service 2>&1 || : - end - - script postun - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - end - - # Disable and stop rsyslog after update, because we use the - # journal daemon from systemd from now. - script postup - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - /bin/systemctl disable rsyslog.service >/dev/null 2>&1 || : - /bin/systemctl stop rsyslog.service >/dev/null 2>&1 || : - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/rsyslog/rsyslog.sysconfig b/rsyslog/rsyslog.sysconfig deleted file mode 100644 index ad9723f..0000000 --- a/rsyslog/rsyslog.sysconfig +++ /dev/null @@ -1,5 +0,0 @@ -# Options for rsyslogd -# Syslogd options are deprecated since rsyslog v3. -# If you want to use them, switch to compatibility mode 2 by "-c 2" -# See rsyslogd(8) for more details -SYSLOGD_OPTIONS="-c 5" diff --git a/sane/patches/sane-1.0.20-lockdir.patch b/sane/patches/sane-1.0.20-lockdir.patch deleted file mode 100644 index 8839976..0000000 --- a/sane/patches/sane-1.0.20-lockdir.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 1e12605eac293b12809ca2933622acc54515c237 -Author: Nils Philippsen <nils(a)redhat.com> -Date: Mon Dec 28 17:00:25 2009 +0100 - - patch: lockdir - - Squashed commit of the following: - - commit 7d26ebc2c0c0c8a8e3254834a700951b49648eeb - Author: Nils Philippsen <nils(a)redhat.com> - Date: Mon Dec 28 16:58:36 2009 +0100 - - improve install-lockpath target - - make robust against problems with setting group on sane lock dir - -diff --git a/backend/Makefile.am b/backend/Makefile.am -index 5165423..3c22cd4 100644 ---- a/backend/Makefile.am -+++ b/backend/Makefile.am -@@ -137,7 +137,8 @@ install-firmware-path: - done - - install-lockpath: -- $(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir) -+ $(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir) || \ -+ $(mkinstalldirs) -m 775 $(DESTDIR)$(locksanedir) - - uninstall-hook: - rm -rf $(DESTDIR)$(libdir)/sane $(DESTDIR)$(configdir) $(DESTDIR)$(locksanedir) diff --git a/sane/patches/sane-1.0.21-epson-expression800.patch b/sane/patches/sane-1.0.21-epson-expression800.patch deleted file mode 100644 index 8a6fb5d..0000000 --- a/sane/patches/sane-1.0.21-epson-expression800.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 305535e303032814b65bf6d889a95f00f08a9071 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen <nils(a)redhat.com> -Date: Wed, 5 May 2010 12:49:02 +0200 -Subject: [PATCH] patch: epson-expression800 - -Squashed commit of the following: - -commit 3b501d7499357438a1fbd63fefb2f977ae3051f5 -Author: Nils Philippsen <nils(a)redhat.com> -Date: Wed May 5 12:14:23 2010 +0200 - - Improve Epson Expression 800 - - Epson Expression 800 models announce themselves as "processor", not - "scanner". ---- - doc/descriptions/epson.desc | 1 + - doc/descriptions/epson2.desc | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/doc/descriptions/epson.desc b/doc/descriptions/epson.desc -index a22325c..55a0136 100644 ---- a/doc/descriptions/epson.desc -+++ b/doc/descriptions/epson.desc -@@ -174,6 +174,7 @@ - :model "Expression 800" - :interface "SCSI" - :status :complete -+:scsi "EPSON" "Expression800" "processor" - - :model "Expression 1600" - :interface "SCSI USB IEEE-1394" -diff --git a/doc/descriptions/epson2.desc b/doc/descriptions/epson2.desc -index 9a14f4f..56cabcd 100644 ---- a/doc/descriptions/epson2.desc -+++ b/doc/descriptions/epson2.desc -@@ -241,6 +241,7 @@ - :model "Expression 800" ; command spec - :interface "SCSI" - :status :complete -+:scsi "EPSON" "Expression800" "processor" - :comment "overseas version of the GT-9600" - - :model "Expression 836XL" ; command spec --- -1.6.6.1 - diff --git a/sane/patches/sane-1.0.21-i18n.patch b/sane/patches/sane-1.0.21-i18n.patch deleted file mode 100644 index ae00d9a..0000000 --- a/sane/patches/sane-1.0.21-i18n.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff -Nur sane-backends-1.0.21/po/LINGUAS sane-backends-1.0.21.mod/po/LINGUAS ---- sane-backends-1.0.21/po/LINGUAS 1969-12-31 19:00:00.000000000 -0500 -+++ sane-backends-1.0.21.mod/po/LINGUAS 2010-04-27 03:38:23.000000000 -0400 -@@ -0,0 +1,21 @@ -+# List of languages -+# try to keep this list ordered -+bg -+cs -+da -+de -+en_GB -+eo -+es -+fi -+fr -+gl -+it -+ja -+nb -+nl -+pl -+pt -+ru -+sv -+uk -diff -Nur sane-backends-1.0.21/po/POTFILES sane-backends-1.0.21.mod/po/POTFILES ---- sane-backends-1.0.21/po/POTFILES 1969-12-31 19:00:00.000000000 -0500 -+++ sane-backends-1.0.21.mod/po/POTFILES 2010-04-27 03:38:16.000000000 -0400 -@@ -0,0 +1,100 @@ -+# List of source files containing translatable strings -+# paths relative to po -+../include/sane/saneopts.h -+../backend/sane_strstatus.c -+ -+../backend/artec_eplus48u.c -+ -+../backend/avision.h -+ -+../backend/canon630u.c -+../backend/canon.c -+../backend/canon-sane.c -+ -+../backend/canon_dr.c -+../backend/canon_dr.h -+ -+../backend/cardscan.c -+../backend/cardscan.h -+ -+../backend/epjitsu.c -+../backend/epjitsu.h -+ -+../backend/epson.c -+../backend/epson.h -+../backend/epson2.c -+../backend/epson2.h -+ -+../backend/fujitsu.c -+../backend/fujitsu.h -+ -+../backend/genesys.c -+ -+../backend/kodak.c -+../backend/kodak.h -+ -+../backend/gt68xx.c -+../backend/gt68xx_low.h -+ -+../backend/hp3500.c -+../backend/hp3900_sane.c -+../backend/hp5400_sane.c -+../backend/hp5590.c -+../backend/hp-option.c -+../backend/hp-option.h -+ -+../backend/leo.c -+../backend/leo.h -+ -+../backend/lexmark.c -+ -+../backend/ma1509.c -+ -+../backend/matsushita.c -+../backend/matsushita.h -+ -+../backend/microtek2.c -+../backend/microtek2.h -+ -+../backend/mustek.c -+../backend/mustek_usb.c -+../backend/mustek_usb2.c -+ -+../backend/niash.c -+ -+../backend/pixma.c -+../backend/pixma_sane_options.c -+ -+../backend/plustek.c -+../backend/plustek_pp.c -+ -+../backend/pnm.c -+ -+../backend/rts8891.c -+ -+../backend/sceptre.c -+../backend/sceptre.h -+ -+../backend/sm3840.c -+ -+../backend/snapscan.c -+../backend/snapscan-options.c -+ -+../backend/stv680.c -+../backend/stv680.h -+ -+../backend/teco1.c -+../backend/teco1.h -+../backend/teco2.c -+../backend/teco2.h -+../backend/teco3.c -+../backend/teco3.h -+ -+../backend/test.c -+ -+../backend/u12.c -+ -+../backend/umax1220u.c -+../backend/umax.c -+../backend/umax_pp.c -+ diff --git a/sane/patches/sane-1.0.21-pkgconfig.patch b/sane/patches/sane-1.0.21-pkgconfig.patch deleted file mode 100644 index 17fa04a..0000000 --- a/sane/patches/sane-1.0.21-pkgconfig.patch +++ /dev/null @@ -1,182 +0,0 @@ -From de99bb00b0084e8a1862398270278a14e099b22b Mon Sep 17 00:00:00 2001 -From: Nils Philippsen <nils(a)redhat.com> -Date: Wed, 5 May 2010 13:23:40 +0200 -Subject: [PATCH] patch: pkgconfig - -Squashed commit of the following: - -commit d615848c499842c5923c3274370d2536dc650916 -Author: Nils Philippsen <nils(a)redhat.com> -Date: Fri Feb 26 17:51:14 2010 +0100 - - pkgconfig file is data - (cherry picked from commit 1f0e85c705a42c7e6ccd938eaad69f531c63f63d) - - Signed-off-by: Nils Philippsen <nils(a)redhat.com> - -commit 119d5af1ddd82dac034d0106a1d86b6d7564f25e -Author: Nils Philippsen <nils(a)redhat.com> -Date: Wed Jun 17 13:09:51 2009 +0200 - - make sane-config multilib-aware on Linux - (cherry picked from commit 52ef5f47ccc0128c78ab3ad38ac7b7918dd7ac88) - - Signed-off-by: Nils Philippsen <nils(a)redhat.com> - -commit 7ee1cbef01d851aca95d86145ac5dda02d9e7354 -Author: Nils Philippsen <nils(a)redhat.com> -Date: Wed May 5 10:22:15 2010 +0200 - - use pkg-config in sane-config ---- - tools/Makefile.am | 14 ++++++++++- - tools/sane-config.in | 66 ++++++++++++++++++++++++++++++++++++++----------- - 2 files changed, 64 insertions(+), 16 deletions(-) - -diff --git a/tools/Makefile.am b/tools/Makefile.am -index f52a39a..ab4e1b7 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -7,6 +7,10 @@ - AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \ - -I$(top_srcdir)/include - -+SUFFIXES = .pc.in .pc -+ -+pkgconfigdir = ${libdir}/pkgconfig -+ - bin_PROGRAMS = sane-find-scanner gamma4scanimage - noinst_PROGRAMS = sane-desc umax_pp - -@@ -26,8 +30,14 @@ noinst_SCRIPTS = $(HOTPLUG) - BUILT_SOURCES = $(HOTPLUG_DIR) - CLEANFILES = $(bin_SCRIPTS) $(dist_noinst_SCRIPTS) - -+pkgconfig_DATA = sane-backends.pc -+ -+.pc.in.pc: -+ cd $(top_builddir) \ -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ - EXTRA_DIST = check-po.awk libtool-get-dll-ext mustek600iin-off.c \ -- RenSaneDlls.cmd README xerox -+ RenSaneDlls.cmd README xerox sane-backends.pc.in - - sane_find_scanner_SOURCES = sane-find-scanner.c check-usb-chip.c \ - ../backend/sane_strstatus.c -@@ -72,5 +82,7 @@ hal/libsane.fdi: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${ - @./sane-desc -m hal -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \ - -d 0 > $@ - -+sane-backends.pc: $(top_builddir)/config.status -+ - clean-local: - rm -f $(HOTPLUG) -diff --git a/tools/sane-config.in b/tools/sane-config.in -index 22c02b5..a9ce6fb 100644 ---- a/tools/sane-config.in -+++ b/tools/sane-config.in -@@ -19,7 +19,7 @@ pkglibdir="@pkglibdir@" - includedir="@includedir@" - mandir="@mandir@" - infodir="@infodir@" --libdir="@libdir@" -+#libdir= - localstatedir="@localstatedir@" - sysconfdir="@sysconfdir@" - datarootdir="@datarootdir@" -@@ -33,6 +33,30 @@ srcdir="@srcdir@" - top_srcdir="@top_srcdir@" - cflags= - -+pkgconfig_package=sane-backends -+use_pkgconfig=0 -+if test -x "@bindir@/pkg-config" && "@bindir@/pkg-config" --exists "$pkgconfig_package"; then -+ use_pkgconfig=1 -+else -+ libdir= -+ if kernel="`uname -s 2>/dev/null`"; then -+ case "$kernel" in -+ Linux) -+ if hw="`uname -i 2>/dev/null`"; then -+ case "$hw" in -+ *64) -+ libdir="@exec_prefix@/lib64" -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ fi -+ if test "x$libdir" = "x"; then -+ libdir="@exec_prefix@/lib" -+ fi -+fi -+ - usage () - { - echo "Usage: " 1>&2 -@@ -60,7 +84,7 @@ if test $# -gt 0; then - if test $# -eq 1; then - usage - elif test $# -eq 2; then -- case $2 in -+ case $2 in - --cflags) - echo "Usage: $0 --cflags" - echo " Print C compiler flags for compiling code that uses SANE." -@@ -86,26 +110,38 @@ if test $# -gt 0; then - ;; - --ldflags) - -- if test -z "$LINKER_RPATH"; then -- echo "-L${libdir} @LDFLAGS@" -+ if test "x$use_pkgconfig" = "x0"; then -+ if test -z "$LINKER_RPATH"; then -+ echo "-L${libdir} @LDFLAGS@" -+ else -+ echo "-L${libdir} @LDFLAGS@ ${LINKER_RPATH}${libdir}" -+ fi - else -- echo "-L${libdir} @LDFLAGS@ ${LINKER_RPATH}${libdir}" -+ pkg-config --libs-only-L "$pkgconfig_package" - fi - ;; - --libs) -- echo "-lsane ${LIBS}" -+ if test "x$use_pkgconfig" = "x0"; then -+ echo "-lsane ${LIBS}" -+ else -+ pkg-config --libs "$pkgconfig_package" -+ fi - ;; - --cflags) -- unique_cflags= -- if test "${includedir}" != "/usr/include"; then -- unique_cflags="${unique_cflags} -I${includedir}" -- fi -- for i in $cflags; do -- if test "${i}" != "-I${includedir}"; then -- unique_cflags="${unique_cflags} $i" -+ if test "x$use_pkgconfig" = "x0"; then -+ unique_cflags= -+ if test "${includedir}" != "/usr/include"; then -+ unique_cflags="${unique_cflags} -I${includedir}" - fi -- done -- echo ${unique_cflags} -+ for i in $cflags; do -+ if test "${i}" != "-I${includedir}"; then -+ unique_cflags="${unique_cflags} $i" -+ fi -+ done -+ echo ${unique_cflags} -+ else -+ pkg-config --cflags "$pkgconfig_package" -+ fi - ;; - --prefix) - echo ${prefix} --- -1.6.6.1 - diff --git a/sane/patches/sane-1.0.21-udev.patch b/sane/patches/sane-1.0.21-udev.patch deleted file mode 100644 index 176008c..0000000 --- a/sane/patches/sane-1.0.21-udev.patch +++ /dev/null @@ -1,66 +0,0 @@ -From ba900ddc747cb89c2600c60a1391862e918541d2 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen <nils(a)redhat.com> -Date: Wed, 5 May 2010 11:49:10 +0200 -Subject: [PATCH] patch: udev - -Squashed commit of the following: - -commit eecfce287372abf2b336f0d6870611445170645b -Author: Nils Philippsen <nils(a)redhat.com> -Date: Wed May 5 11:14:59 2010 +0200 - - adapt generated udev rules for Fedora ---- - tools/sane-desc.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/tools/sane-desc.c b/tools/sane-desc.c -index 658555e..0b24e3b 100644 ---- a/tools/sane-desc.c -+++ b/tools/sane-desc.c -@@ -56,9 +56,9 @@ - #define COLOR_NEW "\"#F00000\"" - #define COLOR_UNKNOWN "\"#000000\"" - --#define DEVMODE "0664" -+#define DEVMODE "0644" - #define DEVOWNER "root" --#define DEVGROUP "scanner" -+#define DEVGROUP "root" - - #ifndef PATH_MAX - # define PATH_MAX 1024 -@@ -3525,8 +3525,8 @@ print_udev (void) - } - } - printf ("\n"); -- printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n", -- usbid->usb_vendor_id + 2, usbid->usb_product_id + 2, DEVMODE, DEVGROUP); -+ printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", ENV{libsane_matched}=\"yes\"\n", -+ usbid->usb_vendor_id + 2, usbid->usb_product_id + 2); - usbid = usbid->next; - } - -@@ -3538,7 +3538,7 @@ print_udev (void) - printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n"); - printf ("LABEL=\"libsane_scsi_rules_begin\"\n"); - printf ("# Generic: SCSI device type 6 indicates a scanner\n"); -- printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP); -+ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", ENV{libsane_matched}=\"yes\"\n"); - printf ("# Some scanners advertise themselves as SCSI device type 3\n"); - - while (scsiid) -@@ -3571,8 +3571,8 @@ print_udev (void) - } - } - printf ("\n"); -- printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n", -- scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVGROUP); -+ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", ENV{libsane_matched}=\"yes\"\n", -+ scsiid->scsi_vendor_id, scsiid->scsi_product_id); - scsiid = scsiid->next; - } - printf ("LABEL=\"libsane_scsi_rules_end\"\n\n"); --- -1.6.6.1 - diff --git a/sane/sane.nm b/sane/sane.nm deleted file mode 100644 index 54b8d0a..0000000 --- a/sane/sane.nm +++ /dev/null @@ -1,60 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = sane -version = 1.0.21 -release = 1 - -groups = Application/Imaging -url = ftp://ftp2.sane-project.org/pub/sane/ -license = GPLv2+ -summary = SANE - Scanner Access Now Easy. - -description - sane-backends - includes: backends (scanner drivers), - command-line-frontend (scanimage), network scanning daemon - (saned) and SANE-API documentation. -end - -source_dl = ftp://ftp2.sane-project.org/pub/sane/sane-backends-%{version}/ -sources = %{name}-backends-%{version}.tar.gz - -build - requires - libjpeg-devel - libtiff-devel - libusb-devel - end - - DIR_APP = %{DIR_SRC}/%{name}-backends-%{version} - - configure_options += \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-parport-directio - - install_cmds - chmod 4755 %{BUILDROOT}/usr/bin/scanimage - install -v -m 644 %{DIR_APP}/include/sane/* %{BUILDROOT}/usr/include/sane - rm -vf %{BUILDROOT}/usr/share/doc/sane-1.0.20/README.solaris - end -end - -packages - package %{name} - end - - package %{name}-libs - template LIBS - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/sip/sip.nm b/sip/sip.nm index f0249d7..9533fa5 100644 --- a/sip/sip.nm +++ b/sip/sip.nm @@ -5,7 +5,7 @@ name = sip version = %{major_ver}.%{minor_ver}.%{rev_ver} -release = 1 +release = 2 epoch = 1 major_ver = 4 @@ -37,7 +37,8 @@ build build python configure.py \ CFLAGS+="%{CFLAGS}" \ - CXXFLAGS+="%{CXXFLAGS}" + CXXFLAGS+="%{CXXFLAGS}" \ + LFLAGS+="%{LDFLAGS}" make %{PARALLELISMFLAGS} end @@ -45,7 +46,6 @@ end packages package %{name} - end package %{name}-devel template DEVEL diff --git a/slang/slang.nm b/slang/slang.nm index 8ec9eb4..7e46ea0 100644 --- a/slang/slang.nm +++ b/slang/slang.nm @@ -5,7 +5,7 @@ name = slang version = 2.3.0 -release = 1 +release = 2 groups = System/Libraries url = http://www.jedsoft.org/slang/ @@ -23,14 +23,16 @@ source_dl = http://www.jedsoft.org/releases/slang/ build requires + libpng-devel ncurses-devel pcre-devel + zlib-devel end PARALLELISMFLAGS = # off install_cmds - rm -rvf %{BUILDROOT}/usr/share/slsh + rm -rvf %{BUILDROOT}%{bindir} %{BUILDROOT}%{datadir}/slsh end end diff --git a/squashfs-tools/patches/squashfs-cflags.patch b/squashfs-tools/patches/squashfs-cflags.patch deleted file mode 100644 index bb325d4..0000000 --- a/squashfs-tools/patches/squashfs-cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- squashfs-tools/Makefile.orig 2010-02-13 14:00:54.000000000 -0600 -+++ squashfs-tools/Makefile 2010-02-13 14:02:58.000000000 -0600 -@@ -27,8 +27,8 @@ - UNSQUASHFS_OBJS = unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o \ - unsquash-4.o swap.o compressor.o gzip_wrapper.o - --CFLAGS = $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -- -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" -O2 -Wall -+CFLAGS = $(RPM_OPT_FLAGS) $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -+ -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" - - LIBS = - ifdef LZMA_SUPPORT diff --git a/squashfs-tools/patches/squashfs-xz.patch b/squashfs-tools/patches/squashfs-xz.patch deleted file mode 100644 index 71fda95..0000000 --- a/squashfs-tools/patches/squashfs-xz.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- squashfs-tools/Makefile.orig 2010-02-13 14:05:21.000000000 -0600 -+++ squashfs-tools/Makefile 2010-02-13 14:05:29.000000000 -0600 -@@ -11,7 +11,7 @@ - # work) - download and unpack it, uncomment and set LZMA_DIR to unpacked source, - # and uncomment the LZMA_SUPPORT line below. - --#XZ_SUPPORT = 1 -+XZ_SUPPORT = 1 - #LZMA_SUPPORT = 1 - #LZMA_DIR = ../../../LZMA/lzma465 - diff --git a/squashfs-tools/squashfs-tools.nm b/squashfs-tools/squashfs-tools.nm deleted file mode 100644 index f687d85..0000000 --- a/squashfs-tools/squashfs-tools.nm +++ /dev/null @@ -1,50 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = squashfs-tools -version = 4.1 -release = 1 - -groups = System/Filesystem -url = http://squashfs.sf.net/ -license = GPLv2+ -summary = Utility for the creation of squashfs filesystems. - -description - Squashfs is a highly compressed read-only filesystem for Linux. -end - -source_dl = http://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp} -sources = squashfs-%{version}.tar.gz - -build - requires - libattr-devel - xz-devel - zlib-devel - end - - DIR_APP = %{DIR_SRC}/squashfs/squashfs-tools - - make_build_targets = RPM_OPT_FLAGS="%{CFLAGS}" - - install - mkdir -pv %{BUILDROOT}/usr/bin - install -m 755 mksquashfs %{BUILDROOT}/usr/bin - install -m 755 unsquashfs %{BUILDROOT}/usr/bin - end -end - -# XXX This package has a very weird dependency to libgcc_s.so.1. -# Can we fix this in a non-hacky way? -packages - package %{name} - requires = libgcc_s.so.1 - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/tcpick/tcpick.nm b/tcpick/tcpick.nm deleted file mode 100644 index ce5f4fb..0000000 --- a/tcpick/tcpick.nm +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = tcpick -version = 0.2.1 -release = 1 - -groups = Networking/Tools -url = http://tcpick.sourceforge.net/ -license = GPLv2 -summary = A libpcap-based textmode sniffer for tcp streams. - -description - Tcpick is able to save the captured flows in different files or - displays them in the terminal, and so it is useful to sniff files that - are transmitted via ftp or http. It can display all the stream on the - terminal, when the connection is closed in different display modes like - hexdump, hexdump + ascii, only printable charachters, raw mode and so - on. Available a color mode too, helpful to read and understand better - the output of the program. Actually it can handle several interfaces, - including ethernet cards and ppp. It is useful to keep track of what - users of a network are doing, and is usable with textmode tools like - grep, sed, awk. -end - -source_dl = http://sourceforge.net/projects/tcpick/files/%{name}/%{version}/ - -build - requires - ncurses-devel - libpcap-devel - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/texinfo/texinfo.nm b/texinfo/texinfo.nm index b441e94..b1b6d82 100644 --- a/texinfo/texinfo.nm +++ b/texinfo/texinfo.nm @@ -5,7 +5,7 @@ name = texinfo version = 6.1 -release = 1 +release = 2 groups = Applications/Publishing url = http://www.gnu.org/software/texinfo/ @@ -24,6 +24,7 @@ build requires help2man ncurses-devel + perl(Data::Dumper) perl-libintl-perl zlib-devel end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 52587edac4f6e3fba0923cb808740de6c5cbd61e
by git＠ipfire.org 03 Oct '16

03 Oct '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 52587edac4f6e3fba0923cb808740de6c5cbd61e (commit) via 64602fdf7da260801cdf6d07b5390ab41129e32b (commit) from 642b831b72b42c7ecab4ac05828db2ebc29c3845 (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 52587edac4f6e3fba0923cb808740de6c5cbd61e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Oct 3 11:45:36 2016 +0100 core106: Ship updated libidn Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 64602fdf7da260801cdf6d07b5390ab41129e32b Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Mon Oct 3 08:58:48 2016 +0200 libidn: Update to 1.33 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/libidn | 3 ++- config/rootfiles/core/106/filelists/libidn | 1 + lfs/libidn | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 120000 config/rootfiles/core/106/filelists/libidn Difference in files: diff --git a/config/rootfiles/common/libidn b/config/rootfiles/common/libidn index c8ee31a..3d46e96 100644 --- a/config/rootfiles/common/libidn +++ b/config/rootfiles/common/libidn @@ -10,7 +10,7 @@ usr/bin/idn #usr/lib/libidn.la usr/lib/libidn.so usr/lib/libidn.so.11 -usr/lib/libidn.so.11.5.28 +usr/lib/libidn.so.11.6.16 #usr/lib/pkgconfig/libidn.pc #usr/share/emacs #usr/share/emacs/site-lisp @@ -19,6 +19,7 @@ usr/lib/libidn.so.11.5.28 #usr/share/info/libidn-components.png #usr/share/info/libidn.info #usr/share/man/man1/idn.1 +#usr/share/man/man3/idn_free.3 #usr/share/man/man3/idna_strerror.3 #usr/share/man/man3/idna_to_ascii_4i.3 #usr/share/man/man3/idna_to_ascii_4z.3 diff --git a/config/rootfiles/core/106/filelists/libidn b/config/rootfiles/core/106/filelists/libidn new file mode 120000 index 0000000..7e35489 --- /dev/null +++ b/config/rootfiles/core/106/filelists/libidn @@ -0,0 +1 @@ +../../../common/libidn \ No newline at end of file diff --git a/lfs/libidn b/lfs/libidn index 7ea2d46..53b256e 100644 --- a/lfs/libidn +++ b/lfs/libidn @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 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 = 0.6.14 +VER = 1.33 THISAPP = libidn-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 040f012a45feb56168853998bb87ad4d +$(DL_FILE)_MD5 = a9aa7e003665de9c82bd3f9fc6ccf308 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 642b831b72b42c7ecab4ac05828db2ebc29c3845
by git＠ipfire.org 02 Oct '16

02 Oct '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 642b831b72b42c7ecab4ac05828db2ebc29c3845 (commit) via e24d6112bb364697d925ca436dddd5436448b477 (commit) from 5edc06b701548df78adf746bb4023ef61460d957 (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 642b831b72b42c7ecab4ac05828db2ebc29c3845 Merge: e24d611 5edc06b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Oct 2 16:36:57 2016 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit e24d6112bb364697d925ca436dddd5436448b477 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Oct 2 16:35:50 2016 +0200 index.cgi: display unbound dns servers Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/106/filelists/files | 1 + html/cgi-bin/index.cgi | 20 +++++++------------- src/initscripts/init.d/unbound | 2 ++ 3 files changed, 10 insertions(+), 13 deletions(-) Difference in files: diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files index 3d8cf8d..3468c58 100644 --- a/config/rootfiles/core/106/filelists/files +++ b/config/rootfiles/core/106/filelists/files @@ -15,6 +15,7 @@ srv/web/ipfire/cgi-bin/dns.cgi srv/web/ipfire/cgi-bin/dnsforward.cgi srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/hosts.cgi +srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/services.cgi diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index eafbdb1..c142a65 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -200,26 +200,20 @@ END END } - my @dns_servers = (); - foreach my $f ("${General::swroot}/red/dns1", "${General::swroot}/red/dns2") { - open(DNS, "<$f"); - my $dns_server = <DNS>; - close(DNS); - - chomp($dns_server); - if ($dns_server) { - push(@dns_servers, $dns_server); - } + my $dns_servers; + if ( -e "${General::swroot}/red/dns" ) { + open (TMP, "<${General::swroot}/red/dns"); + $dns_servers = <TMP>; + chomp($dns_servers); + close TMP; } - my $dns_servers_str = join(", ", @dns_servers); - print <<END; <tr> <td> <b>$Lang::tr{'dns servers'}:</b> </td> <td style='text-align:center;'> - $dns_servers_str + $dns_servers </td> <td></td> </tr> diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/unbound index 4d2b266..dd5c85c 100644 --- a/src/initscripts/init.d/unbound +++ b/src/initscripts/init.d/unbound @@ -90,12 +90,14 @@ update_forwarders() { boot_mesg "Configuring upstream name server(s): ${forwarders:1}" ${INFO} echo_ok + echo "${forwarders}" > /var/ipfire/red/dns unbound-control -q forward ${forwarders} return 0 fi fi # If forwarders cannot be used we run in recursor mode + echo "local recursor" > /var/ipfire/red/dns unbound-control -q forward off } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5edc06b701548df78adf746bb4023ef61460d957
by git＠ipfire.org 02 Oct '16

02 Oct '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 5edc06b701548df78adf746bb4023ef61460d957 (commit) from cc60329d88d647a425812b8fb1ff31bb6752f576 (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 5edc06b701548df78adf746bb4023ef61460d957 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 2 15:13:55 2016 +0100 Remove IPAC stuff This is unused for a very very very long time and serves no purpose any more. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cfgroot/net-traffic-admin.pl | 257 ----------- config/cfgroot/net-traffic-lib.pl | 518 ----------------------- config/rootfiles/common/armv5tel/initscripts | 2 - config/rootfiles/common/configroot | 5 - config/rootfiles/common/i586/initscripts | 2 - config/rootfiles/common/stage2 | 1 - config/rootfiles/common/x86_64/initscripts | 2 - config/rootfiles/common/x86_64/stage2 | 1 - config/rootfiles/core/106/update.sh | 7 + doc/language_issues.de | 3 + doc/language_issues.en | 3 + doc/language_issues.es | 3 + doc/language_issues.fr | 3 + doc/language_issues.it | 3 + doc/language_issues.nl | 3 + doc/language_issues.pl | 3 + doc/language_issues.ru | 3 + doc/language_issues.tr | 3 + html/cgi-bin/traffic.cgi | 2 - lfs/configroot | 6 +- lfs/stage2 | 2 +- src/initscripts/helper/writeipac.pl | 67 --- src/initscripts/init.d/networking/red.up/40-ipac | 6 - 23 files changed, 37 insertions(+), 868 deletions(-) delete mode 100644 config/cfgroot/net-traffic-admin.pl delete mode 100644 config/cfgroot/net-traffic-lib.pl delete mode 100644 src/initscripts/helper/writeipac.pl delete mode 100644 src/initscripts/init.d/networking/red.up/40-ipac Difference in files: diff --git a/config/cfgroot/net-traffic-admin.pl b/config/cfgroot/net-traffic-admin.pl deleted file mode 100644 index 9638ad9..0000000 --- a/config/cfgroot/net-traffic-admin.pl +++ /dev/null @@ -1,257 +0,0 @@ -#!/usr/bin/perl -# -# This file is a library file for the Net-Traffic Addon. -# -# Copyright (C) 2006 Achim Weber <dotzball(a)users.sourceforge.net> -# -# $Id: net-traffic-admin.pl,v 1.13 2006/12/10 13:46:00 dotzball Exp $ -# -# 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 2 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, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -package NETTRAFF; - -use strict; -use LWP::UserAgent; - -require '/var/ipfire/general-functions.pl'; -require "${General::swroot}/lang.pl"; -require "${General::swroot}/header.pl"; - -$|=1; # line buffering - -my $updateUrl = "http://blockouttraffic.de/version/Net-Traffic.latest"; -my $latestVersionFile = "${General::swroot}/net-traffic/latestVersion"; - -%NETTRAFF::settings; - - -$NETTRAFF::settingsfile = "${General::swroot}/net-traffic/settings"; -$NETTRAFF::versionfile = "${General::swroot}/net-traffic/version"; -$NETTRAFF::logfile = "/var/log/net-traffic.log"; -$NETTRAFF::colorOk = '#00FF00'; -$NETTRAFF::colorWarn = '#FFFF00'; -$NETTRAFF::colorMax = '#FF0000'; - - -#~ $NETTRAFF::settingsCGI = '/cgi-bin/fwrulesadm.cgi'; -#~ $NETTRAFF::configCGI = '/cgi-bin/fwrules.cgi'; -#~ $NETTRAFF::advConfCGI = '/cgi-bin/fwadvconf.cgi'; - - -@NETTRAFF::longmonths = ( $Lang::tr{'january'}, $Lang::tr{'february'}, $Lang::tr{'march'}, - $Lang::tr{'april'}, $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, $Lang::tr{'august'}, - $Lang::tr{'september'}, $Lang::tr{'october'}, $Lang::tr{'november'}, - $Lang::tr{'december'} ); - -@NETTRAFF::months = ( 0,1,2,3,4,5,6,7,8,9,10,11 ); - -@NETTRAFF::years=("2001","2002","2003","2004","2005","2006","2007","2008","2009"); - -#workaround to suppress a warning when a variable is used only once -my @dummy = ( $General::version ); -undef (@dummy); - - -# Init Settings -$NETTRAFF::settings{'MONTHLY_VOLUME_ON'} = 'off'; -$NETTRAFF::settings{'MONTHLY_VOLUME'} = '1'; -$NETTRAFF::settings{'STARTDAY'} = '1'; -$NETTRAFF::settings{'WARN_ON'} = 'off'; -$NETTRAFF::settings{'WARN'} = '80'; -$NETTRAFF::settings{'CALC_INTERVAL'} = '60'; -$NETTRAFF::settings{'SHOW_AT_HOME'} = 'on'; -$NETTRAFF::settings{'SEND_EMAIL_ON'} = 'off'; -$NETTRAFF::settings{'EMAIL_TO'} = ''; -$NETTRAFF::settings{'EMAIL_FROM'} = ''; -$NETTRAFF::settings{'EMAIL_USR'} = ''; -$NETTRAFF::settings{'EMAIL_PW'} = ''; -$NETTRAFF::settings{'EMAIL_SERVER'} = ''; -$NETTRAFF::settings{'VERSION_CHECK_ON'} = 'off'; - -&NETTRAFF::readSettings(); - - -sub readSettings -{ - &General::readhash($NETTRAFF::settingsfile, \%NETTRAFF::settings); -} - - -sub showNetTrafficVersion -{ - my %versionSettings = (); - - &General::readhash($NETTRAFF::versionfile, \%versionSettings); - - print <<END; - <a href="http://$versionSettings{'URL'}" target="_blank"> - <b>Net-Traffic $versionSettings{'VERSION_INSTALLED'} - - -END - print "Build $versionSettings{'BUILD_INSTALLED'}"; - - if ($versionSettings{'IS_TESTVERSION'} == 1) { - print " - Testversion $versionSettings{'TESTVERSION'}"; - } - print "</b></a><br /><br />\n"; - - # check for new version - &checkForNewVersion(); -} - -sub traffPercentbar -{ - my $percent = $_[0]; - my $fg = '#a0a0a0'; - my $bg = '#e2e2e2'; - - if ($percent =~ m/^(\d+)%$/ ) - { - print <<END; - <table width='100%' border='1' cellspacing='0' cellpadding='0' style='border-width:1px;border-style:solid;border-color:$fg;width:100%;height:10px;'> - <tr> -END - - if ($percent eq "100%" || $1 > 100) - { - $fg = $NETTRAFF::colorMax; - print "<td width='100%' bgcolor='$fg' style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'>" - } - elsif ($percent eq "0%") - { - print "<td width='100%' bgcolor='$bg' style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>" - } - else - { - if($NETTRAFF::settings{'WARN_ON'} eq 'on' - && $1 >= $NETTRAFF::settings{'WARN'}) - { - $fg = $NETTRAFF::colorWarn; - } - - print "<td width='$percent' bgcolor='$fg' style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'></td><td width='" . (100-$1) . "%' bgcolor='$bg' style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>" - } - print <<END; - <img src='/images/null.gif' width='1' height='1' alt='' /> - </td> - </tr> - </table> -END - - } -} - - -sub checkForNewVersion -{ - if ($NETTRAFF::settings{'VERSION_CHECK_ON'} ne 'on') - { - return; - } - - # download latest version - &downloadLatestVersionInfo(); - - if(-e $latestVersionFile) - { - my %versionSettings = (); - &General::readhash($NETTRAFF::versionfile, \%versionSettings); - - my %latestVersion = (); - &General::readhash($latestVersionFile, \%latestVersion); - - if( $versionSettings{'VERSION_INSTALLED'} lt $latestVersion{'VERSION_AVAILABLE'} - || ( $versionSettings{'VERSION_INSTALLED'} le $latestVersion{'VERSION_AVAILABLE'} - && $versionSettings{'BUILD_INSTALLED'} lt $latestVersion{'BUILD_AVAILABLE'} ) ) - { - &Header::openbox('100%', 'left', $Lang::tr{'info'}); - print <<END; - <table width="100%"> - <tr> - <td> - $Lang::tr{'net traffic newversion'} - <a href="$latestVersion{'URL_UPDATE'}" target="_blank"> - <b>$latestVersion{'URL_UPDATE'}</b> - </a> - </td> - </tr> - <tr> - <td> - <b>v$latestVersion{'VERSION_AVAILABLE'} - Build $latestVersion{'BUILD_AVAILABLE'} - </table> -END - - &Header::closebox(); - } - } -} - -sub downloadLatestVersionInfo -{ - # only check if we are online - if (! -e '/var/ipfire/red/active') - { - return; - } - - # download latest version file if it is not existing or outdated (i.e. 5 days old) - if((! -e $latestVersionFile) || (int(-M $latestVersionFile) > 5)) - { - my %versionSettings = (); - &General::readhash($NETTRAFF::versionfile, \%versionSettings); - - my $ua = LWP::UserAgent->new; - $ua->timeout(120); - $ua->agent("Mozilla/4.0 (compatible; IPFire $General::version; $versionSettings{'VERSION_INSTALLED'})"); - my $content = $ua->get($updateUrl); - - if ( $content->is_success ) - { -#~ open(FILE, ">$latestVersionFile") or die "Could not write file: $latestVersionFile"; -#~ flock (FILE, 2); -#~ print FILE "$content->content\n"; -#~ close(FILE); - - my %latestVersion = (); - - # latest versions, format is: MOD_VERSION="1.3.0" - $content->content =~ /MOD_VERSION="(.+?)"/; - $latestVersion{'VERSION_AVAILABLE'} = $1; - - # latest build, format is: MOD_BUILD="0" - $content->content =~ /MOD_BUILD="(.+?)"/; - $latestVersion{'BUILD_AVAILABLE'} = $1; - - # URL format is: MOD_URL="http://blockouttraffic.de/nt_index.php" - $content->content =~ /MOD_URL="(.+?)"/; - $latestVersion{'URL_UPDATE'} = $1; - - &General::writehash($latestVersionFile, \%latestVersion); - } - } -} - - -sub getFormatedDate -{ - my $time = shift; - my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($time); - - return sprintf("%04d-%02d-%02d, %02d:%02d", 1900+$year, $mon+1, $mday, $hour, $min);; - -} -# always return 1; -1; -# EOF diff --git a/config/cfgroot/net-traffic-lib.pl b/config/cfgroot/net-traffic-lib.pl deleted file mode 100644 index 37afdbf..0000000 --- a/config/cfgroot/net-traffic-lib.pl +++ /dev/null @@ -1,518 +0,0 @@ -#!/usr/bin/perl -# -# $Id: net-traffic-lib.pl,v 1.10 2007/01/09 19:00:35 dotzball Exp $ -# -# Summarize all IP accounting files from start to end time -# -# Copyright (C) 1997 - 2000 Moritz Both -# 2001 - 2002 Al Zaharov -# -# 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 2 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, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# The author can be reached via email: moritz(a)daneben.de, or by -# snail mail: Moritz Both, Im Moore 26, 30167 Hannover, -# Germany. Phone: +49-511-1610129 -# -# -# 22 June 2004 By Achim Weber dotzball(a)users.sourceforge.net -# - changed to use it with Net-Traffic Addon -# - renamed to avoid issues when calling this file or original ipacsum -# - this file is net-traffic-lib.pl for IPCop 1.4.0 -# - -package Traffic; - -use 5.000; -use Getopt::Long; -use POSIX qw(strftime); -use Time::Local; -use Socket; -use IO::Handle; -#use warnings; -#use strict; - -$|=1; # line buffering - -my @moff = (0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 ); - -# =()<$datdelim="@<DATDELIM>@";>()= -my $datdelim="#-#-#-#-#"; -# =()<$prefix="@<prefix>@";>()= -my $prefix="/usr"; -# =()<$exec_prefix="@<exec_prefix>@";>()= -my $exec_prefix="${prefix}"; -# =()<$INSTALLPATH="@<INSTALLPATH>@";>()= -my $INSTALLPATH="${exec_prefix}/sbin"; -my $datdir="/var/log/ip-acct"; - -my $me=$0; -$me =~ s|^.*/([^/]+)$|$1|; -my $now = time; -my $fetchipac="$INSTALLPATH/fetchipac"; -my $rule_regex = ".*"; # match rules with this regex only -my $machine_name; -my $fetchipac_options; -my ($newest_timestamp_before_starttime, $oldest_timestamp_after_endtime); -my (%rule_firstfile, %rule_lastfile); -my $count; -my @timestamps; -my $rulenumber; -my ($starttime, $endtime); - -## Net-Traffic variables ## -my %allDays; -my $allDaysBytes; -my $tzoffset = 0; -my $displayMode = "daily"; -my ($curMonth, $curYear); -${Traffic::blue_in} = 'incoming BLUE'; -${Traffic::green_in} = 'incoming GREEN'; -${Traffic::orange_in} = 'incoming ORANGE'; -${Traffic::red_in} = 'incoming RED'; -${Traffic::blue_out} = 'outgoing BLUE'; -${Traffic::green_out} = 'outgoing GREEN'; -${Traffic::orange_out} = 'outgoing ORANGE'; -${Traffic::red_out} = 'outgoing RED'; - - -sub calcTraffic{ - $allDaysBytes = shift; - $starttime = shift; - $endtime = shift; - $displayMode = shift; - - # init - %allDays = (); - $starttime =~ /^(\d\d\d\d)(\d\d)/; - $curYear = $1; - $curMonth = $2; - - # calculate time zone offset in seconds - use difference of output of date - # command and time function, round it - $tzoffset = time-timegm(localtime()); - $machine_name = undef; - - if($displayMode ne "exactTimeframe") - { - $starttime = makeunixtime($starttime); - if($displayMode ne 'exactEnd') { - $endtime = makeunixtime($endtime); - } - } - $endtime -= 1; - - # options that we need to pass to fetchipac if we call it. - $fetchipac_options = "--directory=$datdir"; - - $endtime = $now if ($endtime > $now); - $starttime = 0 if ($starttime < 0); -#~ $mystarttime = &makemydailytime($starttime); -#~ $myendtime = &makemydailytime($endtime); - %rule_firstfile = ( ); - %rule_lastfile = ( ); - @timestamps = (); - - # find out which timestamps we need to read. - # remember newest timestamp before starttime so we know when data for - # the first file starts - # also remember oldest timestamp after end time - $newest_timestamp_before_starttime = ""; - $oldest_timestamp_after_endtime = ""; - open(DATA, "$fetchipac $fetchipac_options --timestamps=$starttime,$endtime ". - "--machine-output-format|") || die "$me: cant run $fetchipac\n"; - # the first thing is the timestamp count - $count=<DATA>; - if ($count == 0) { - return (); - } - while(<DATA>) - { - if (/^(.)\s(\d+)$/) { - my $ts = $2; - if ($1 eq "-") { - $newest_timestamp_before_starttime=$ts; - } - elsif ($1 eq "+") { - $oldest_timestamp_after_endtime=$ts; - } - elsif ($1 eq "*") { - push(@timestamps, $ts); - } - else { - die "$me: illegal output from $fetchipac: \"$_\"\n"; - } - } - else { - die "$me: illegal output from $fetchipac: \"$_\"\n"; - } - } - close DATA; - - push(@timestamps, $oldest_timestamp_after_endtime) - if ($oldest_timestamp_after_endtime); - unshift(@timestamps, $newest_timestamp_before_starttime) - if ($newest_timestamp_before_starttime); - - $rulenumber = 0; - - # read all data we need and put the data into memory. - &read_data; - - my @days_sorted = sort keys %allDays; - return @days_sorted; -} -########################## -# END OF MAIN PROGRAM -########################## - -# read all data (@timestmaps contains the timestamps, must be sorted!) -# and put the data into our global memory data -# structures. special care must be taken with data of the first and -# the last timestamps we read, since we only want data which is from our -# time frame. Furthermore, data from before and after this time frame -# must be preserved in special data structures because we might replace -# them (option --replace) and have to write extra data for these times -# then. -sub read_data { - my $run_s; - my $s; - my $i; - my $in_time = 0; - my $after_time = 0; - - my $curDay = $starttime; - - # feed the timestamp list to fetchipac on its stdin. - socketpair(CHILD, PARENT, AF_UNIX, SOCK_STREAM, PF_UNSPEC) - or die "socketpair: $!"; - CHILD->autoflush(1); - PARENT->autoflush(1); - my $pid = open(CHILD, "-|"); - die "$me: can't fork: $!\n" unless defined $pid; - if ($pid == 0) { - # child - close CHILD; - open(FETCHIPAC, "|$fetchipac $fetchipac_options --record " - ."--machine-output-format") - or die "$me: cant exec fetchipac\n"; - -#this is much more efficient than the original code (Manfred Weihs) -# and it adds more troubles than solves (Al Zakharov) - if ($timestamps[0] == $newest_timestamp_before_starttime) { - print(FETCHIPAC $timestamps[1],"-",$timestamps[$count],"\n"); - } else { - print(FETCHIPAC $timestamps[0],"-",$timestamps[$count-1],"\n"); - } - close(FETCHIPAC); - close(PARENT); - exit; - } - close PARENT; - - my $laststamp = undef; - $laststamp = $newest_timestamp_before_starttime - if ($newest_timestamp_before_starttime); - $i = 0; - $i++ if ($laststamp); - while (<CHILD>) { - # first line of fetchipac output: "ADD" - /^ADD\s*$/i or die "$me: bad line from fetchipac: $_\n"; - # second line of fetchipac output: timestamp no_of_records - $_ = <CHILD> || last; - /^(\d+)\s(\d+)$/ or die "$me: bad line from fetchipac: $_\n"; - my $timestamp = int $1; - my $number_of_records = int $2; - my $do_collect = 1; - - if ($displayMode =~ /^daily/) { - # increment Day aslong current timestamp is not in current Day - while ( ($timestamp-$curDay) > 86399) { - $curDay += 86400; - } - } - else - { - my @dummy = localtime($timestamp); - # increment Month aslong current timestamp is not in current Month - while ($curMonth < ($dummy[4]+1) || $curYear<($dummy[5]+1900)) { - $curMonth++; - if ($curMonth > 12) { - $curMonth = 1; - $curYear++; - } - my $newMonth = $curYear; - $newMonth .= $curMonth < 10 ? "0".$curMonth."01" : $curMonth."01"; - $newMonth .= "01"; - $curDay = &makeunixtime($newMonth); - } - } - - if ($timestamp < $starttime) { - # this record is too old, we dont need the data. - # However, the timestamp gives us a clue on the - # time period the next item covers. - $do_collect = 0; - } - - my $irec; - # read each record - my $data = &read_data_record(CHILD, $number_of_records); - - if ($do_collect && $in_time == 0) { - # the data is from after starttime. if it is the - # first one, split the data (if we know for how - # long this data is valid, and if $laststamp is not - # equal to $starttime in which case the split is - # redundant). If we don't have a clue about the - # last file time before our first file was created, - # we do not know how much of the file data is in our - # time frame. we assume everything belongs to us. - $in_time = 1; -# if ($laststamp && $laststamp != $starttime) { - if ($laststamp && $laststamp != $newest_timestamp_before_starttime) { - my $newdata = &split_data($data, - $laststamp, $timestamp, $starttime); -#~ $glb_data_before = $data; - $data = $newdata; - $laststamp = $starttime; - } - } - - if ($timestamp > $endtime) { - # this data is too new, but the data in it may have - # begun within our time frame. (if endtime eq laststamp - # we do a redundant split here, too - it works for now - # and --replace relies on it, but it is ugly.) - if ($after_time == 0) { - $after_time = 1; - if ($laststamp) { -#~ $glb_data_after = -#~ &split_data($data,$laststamp,$timestamp,$endtime); - &split_data($data,$laststamp,$timestamp,$endtime); - } else { - $do_collect = 0; - } - } else { - $do_collect = 0; # just too new. - } - } - - if ($do_collect) { - &collect_data($data, $i, $curDay); - } - $laststamp = $timestamp; - $i++; - } - close CHILD; - wait; -} - -# split the data in $1 (format as from read_data) into a pair of two -# such data sets. The set referenced to as $1 will afterwards contain -# the first part of the data, another set which is returned contains -# the second part of the data. -# interpret the data as having start time=$2 and end time=$3 and split -# time=$4 -sub split_data { - my $data = shift; - my $mstart = shift; - my $mend = shift; - my $msplit = shift; - - # calculate factors for multiplications - my $ust = $mstart; - my $uperiod = $mend - $ust; - my $usplit = $msplit - $ust; - - if ($uperiod < 0) { - # hmmm? die Daten sind rueckwaerts??? - $uperiod = -$uperiod; - } - my $fac1; - if ($usplit < 0) { - $fac1 = 0; - } - elsif ($usplit > $uperiod) { - $fac1 = 1; - } - else { - $fac1 = $usplit / $uperiod; - } - - # $fac1 now says us how much weight the first result has. - # initialize the set we will return. - my @ret = ( ); - - foreach my $set (@$data) { - my ($rule, $bytes, $pkts) = @$set; - $$set[1] = int($bytes * $fac1 + 0.5); - $$set[2] = int($pkts * $fac1 + 0.5); - push(@ret, [ $rule, $bytes - $$set[1], $pkts - $$set[2] ]); - } - return \@ret; -} - -# put data from one file into global data structures -# must be called in correct sorted file name order to set rules_lastfile -# and rules_firstfile (which are currently useless) -# arguments: -# $1=index number of file; $2 = reference to array with data from file -sub collect_data { - my($filedata, $ifile, $i, $day); - - $filedata = shift; - $ifile=shift; - $day =shift; - - # if day first appeared in this file, initialize its - # life. - if (!defined($allDays{$day})) { - return if (&init_filter_id($day)); - $allDays{$day} = $rulenumber++; - } - - for ($i=0; $i<=$#$filedata; $i++) { - my $set = $$filedata[$i]; - my $rule = $$set[0]; - my $bytes = $$set[1]; - my $pkts = $$set[2]; - - $_ = $rule; - /^(.*) \(.*$/; - $_ = $1; - /^forwarded (.*)$/; - $rule = $1; - $allDaysBytes->{$day}{$rule} += $bytes; - } -} - -# initialize data variables for a new rule - if it is new -sub init_filter_id { - my($s, $ifile) = @_; - - if (!defined $allDaysBytes->{$s}) { - if ($displayMode =~ /^daily/) { - my $newDay = &makemydailytime($s); - $newDay =~ /^\d\d\d\d-(\d\d)-\d\d$/; - - return 1 if ($1 > $curMonth && $displayMode ne "daily_multi"); - - $allDaysBytes->{$s}{'Day'} = $newDay; - } - else { - $allDaysBytes->{$s}{'Day'} = &makemymonthlytime($s); - } - $allDaysBytes->{$s}{${Traffic::blue_in}} = int(0); - $allDaysBytes->{$s}{${Traffic::green_in}} = int(0); - $allDaysBytes->{$s}{${Traffic::orange_in}} = int(0); - $allDaysBytes->{$s}{${Traffic::red_in}} = int(0); - $allDaysBytes->{$s}{${Traffic::blue_out}} = int(0); - $allDaysBytes->{$s}{${Traffic::green_out}} = int(0); - $allDaysBytes->{$s}{${Traffic::orange_out}} = int(0); - $allDaysBytes->{$s}{${Traffic::red_out}} = int(0); - } - return 0; -} - -# read data record from filehandle $1 -# number of records is $2 -# Return value: reference to array a of length n; -# n is the number of rules -# each field in a is an array aa with 3 fields -# the fields in arrays aa are: [0]=name of rule; [1]=byte count; -# [2]=packet count -# function does not use global variables -sub read_data_record { - my($file, $number_of_records, $beforedata, $indata, $i, $irec); - my($pkts, $bytes, $rule); - my(@result); - - $file=shift; - $number_of_records = shift; - $indata=0; - $beforedata=1; - - for($irec = 0; $irec < $number_of_records; $irec++) { - $_ = <$file>; - chop; - /^$\s*(.*)$/ or die "$me: bad line from fetchipac (expecting machine name): $_\n"; - $machine_name = $1; # remember final machine name - while(<$file>) { - last if (/^$$/); # terminating line ')' - /^(\d+)\s(\d+)\s\|(.*)\|$/ - or die "$me: bad line from fetchipac (expecting rule item): $_\n"; - $bytes = $1; - $pkts = $2; - $rule = $3; - if ($rule =~ /$rule_regex/) { - push(@result, [ $rule, $bytes, $pkts]); - } - } - } - # read another emtpy line (data format consistency) - $_ = <$file>; - die "$me: bad data from fetchipac (expected emtpy line): $_\n" - if ($_ !~ /^$/); - \@result; -} - -# given a string in format YYYYMMDD[hh[mm[ss]]], make unix time -# use time zone offset $tzoffset (input=wall clock time, output=UTC) -sub makeunixtime { - my($y, $m, $d, $h, $i, $e); - my $s = shift; - - $h=0; $i=0; $e=0; - if ($s =~ /^(\d\d\d\d)(\d\d)(\d\d)/) { - ($y, $m, $d) = ($1, $2, $3); - if ($s =~ /^\d\d\d\d\d\d\d\d-?(\d\d)/) { - $h=$1; - if ($s =~ /^\d\d\d\d\d\d\d\d-?\d\d(\d\d)/) { - $i=$1; - if ($s =~ /^\d\d\d\d\d\d\d\d-?\d\d\d\d(\d\d)/) { - $e=$1; - } - } - } - } - else { - return 0; - } - - $y-=1970; - $s = (($y)*365) + int(($y+2)/4) + $moff[$m-1] + $d-1; - $s-- if (($y+2)%4 == 0 && $m < 3); - $s*86400 + $h*3600 + $i*60 + $e + $tzoffset; -} - -# return the given unix time in localtime in "mydaily" time format -sub makemydailytime { - my($s)=shift; - - my($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = - localtime($s); - return sprintf("%04d-%02d-%02d", 1900+$year, $mon+1, $mday); -} - -# return the given unix time in localtime in "mymonthly" time format -sub makemymonthlytime { - my($s)=shift; - - my($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = - localtime($s); - return sprintf("%04d-%02d", 1900+$year, $mon+1); -} - -# EOF diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index a1db665..5cf7061 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -2,7 +2,6 @@ etc/init.d #etc/rc.d #etc/rc.d/helper etc/rc.d/helper/getdnsfromdhcpc.pl -etc/rc.d/helper/writeipac.pl #etc/rc.d/init.d #etc/rc.d/init.d/alsa #etc/rc.d/init.d/amavisd @@ -93,7 +92,6 @@ etc/rc.d/init.d/networking/red.up/24-RS-qos etc/rc.d/init.d/networking/red.up/27-RS-squid etc/rc.d/init.d/networking/red.up/30-ddns #etc/rc.d/init.d/networking/red.up/35-guardian -etc/rc.d/init.d/networking/red.up/40-ipac etc/rc.d/init.d/networking/red.up/50-ipsec etc/rc.d/init.d/networking/red.up/50-ovpn etc/rc.d/init.d/networking/red.up/98-leds diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 7552b96..8b5d9f4 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -121,11 +121,6 @@ var/ipfire/modem #var/ipfire/modem/settings var/ipfire/modem-lib.pl var/ipfire/network-functions.pl -var/ipfire/net-traffic -#var/ipfire/net-traffic/net-traffic-admin.pl -#var/ipfire/net-traffic/net-traffic-lib.pl -#var/ipfire/net-traffic/settings -#var/ipfire/net-traffic/templates #var/ipfire/nfs #var/ipfire/nfs/nfs-server var/ipfire/optionsfw diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index ca90758..352fac6 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -2,7 +2,6 @@ etc/init.d #etc/rc.d #etc/rc.d/helper etc/rc.d/helper/getdnsfromdhcpc.pl -etc/rc.d/helper/writeipac.pl #etc/rc.d/init.d etc/rc.d/init.d/acpid #etc/rc.d/init.d/alsa @@ -95,7 +94,6 @@ etc/rc.d/init.d/networking/red.up/24-RS-qos etc/rc.d/init.d/networking/red.up/27-RS-squid etc/rc.d/init.d/networking/red.up/30-ddns #etc/rc.d/init.d/networking/red.up/35-guardian -etc/rc.d/init.d/networking/red.up/40-ipac etc/rc.d/init.d/networking/red.up/50-ipsec etc/rc.d/init.d/networking/red.up/50-ovpn etc/rc.d/init.d/networking/red.up/98-leds diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index bfca1bf..ec36774 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -162,7 +162,6 @@ var/log/btmp var/log/calamaris var/log/counter var/log/lastlog -#var/log/net-traffic.log var/log/wtmp var/mail #var/opt diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index ca90758..352fac6 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -2,7 +2,6 @@ etc/init.d #etc/rc.d #etc/rc.d/helper etc/rc.d/helper/getdnsfromdhcpc.pl -etc/rc.d/helper/writeipac.pl #etc/rc.d/init.d etc/rc.d/init.d/acpid #etc/rc.d/init.d/alsa @@ -95,7 +94,6 @@ etc/rc.d/init.d/networking/red.up/24-RS-qos etc/rc.d/init.d/networking/red.up/27-RS-squid etc/rc.d/init.d/networking/red.up/30-ddns #etc/rc.d/init.d/networking/red.up/35-guardian -etc/rc.d/init.d/networking/red.up/40-ipac etc/rc.d/init.d/networking/red.up/50-ipsec etc/rc.d/init.d/networking/red.up/50-ovpn etc/rc.d/init.d/networking/red.up/98-leds diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2 index d21c3ff..95eff36 100644 --- a/config/rootfiles/common/x86_64/stage2 +++ b/config/rootfiles/common/x86_64/stage2 @@ -164,7 +164,6 @@ var/log/btmp var/log/calamaris var/log/counter var/log/lastlog -#var/log/net-traffic.log var/log/wtmp var/mail #var/opt diff --git a/config/rootfiles/core/106/update.sh b/config/rootfiles/core/106/update.sh index 4d50d90..e025cfd 100644 --- a/config/rootfiles/core/106/update.sh +++ b/config/rootfiles/core/106/update.sh @@ -55,6 +55,13 @@ rm -vf \ /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq \ /usr/sbin/dnsmasq +# Delete old net-traffic stuff +rm -vrf \ + /etc/rc.d/helper/writeipac.pl \ + /etc/rc.d/init.d/networking/red.up/40-ipac \ + /var/ipfire/net-traffic \ + /var/log/net-traffic.log* + # update linker config ldconfig diff --git a/doc/language_issues.de b/doc/language_issues.de index 81807d9..26069ce 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -295,6 +295,7 @@ WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in WARNING: translation string unused: incorrect password +WARNING: translation string unused: info WARNING: translation string unused: insert floppy WARNING: translation string unused: install new update WARNING: translation string unused: installed @@ -325,6 +326,7 @@ WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset WARNING: translation string unused: keys +WARNING: translation string unused: lang WARNING: translation string unused: lateprompting WARNING: translation string unused: length WARNING: translation string unused: line @@ -383,6 +385,7 @@ WARNING: translation string unused: net WARNING: translation string unused: net address WARNING: translation string unused: net config type WARNING: translation string unused: net config type help +WARNING: translation string unused: net traffic newversion WARNING: translation string unused: net-traffic configuration WARNING: translation string unused: network added WARNING: translation string unused: network configuration diff --git a/doc/language_issues.en b/doc/language_issues.en index a6c55d9..e1bf78b 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -322,6 +322,7 @@ WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in WARNING: translation string unused: incorrect password +WARNING: translation string unused: info WARNING: translation string unused: insert floppy WARNING: translation string unused: insert removable device WARNING: translation string unused: install new update @@ -353,6 +354,7 @@ WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset WARNING: translation string unused: keys +WARNING: translation string unused: lang WARNING: translation string unused: lateprompting WARNING: translation string unused: length WARNING: translation string unused: line @@ -411,6 +413,7 @@ WARNING: translation string unused: net WARNING: translation string unused: net address WARNING: translation string unused: net config type WARNING: translation string unused: net config type help +WARNING: translation string unused: net traffic newversion WARNING: translation string unused: net-traffic configuration WARNING: translation string unused: network added WARNING: translation string unused: network configuration diff --git a/doc/language_issues.es b/doc/language_issues.es index f99cb90..e0b420d 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -269,6 +269,7 @@ WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in WARNING: translation string unused: incorrect password +WARNING: translation string unused: info WARNING: translation string unused: insert floppy WARNING: translation string unused: insert removable device WARNING: translation string unused: install new update @@ -299,6 +300,7 @@ WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset WARNING: translation string unused: keys +WARNING: translation string unused: lang WARNING: translation string unused: lateprompting WARNING: translation string unused: length WARNING: translation string unused: line @@ -357,6 +359,7 @@ WARNING: translation string unused: net WARNING: translation string unused: net address WARNING: translation string unused: net config type WARNING: translation string unused: net config type help +WARNING: translation string unused: net traffic newversion WARNING: translation string unused: net-traffic configuration WARNING: translation string unused: network added WARNING: translation string unused: network configuration diff --git a/doc/language_issues.fr b/doc/language_issues.fr index c9714b5..c0edce6 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -266,6 +266,7 @@ WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in WARNING: translation string unused: incorrect password +WARNING: translation string unused: info WARNING: translation string unused: insert floppy WARNING: translation string unused: insert removable device WARNING: translation string unused: install new update @@ -296,6 +297,7 @@ WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset WARNING: translation string unused: keys +WARNING: translation string unused: lang WARNING: translation string unused: lateprompting WARNING: translation string unused: length WARNING: translation string unused: line @@ -354,6 +356,7 @@ WARNING: translation string unused: net WARNING: translation string unused: net address WARNING: translation string unused: net config type WARNING: translation string unused: net config type help +WARNING: translation string unused: net traffic newversion WARNING: translation string unused: net-traffic configuration WARNING: translation string unused: network added WARNING: translation string unused: network configuration diff --git a/doc/language_issues.it b/doc/language_issues.it index b271c22..0358b2c 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -316,6 +316,7 @@ WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in WARNING: translation string unused: incorrect password +WARNING: translation string unused: info WARNING: translation string unused: insert floppy WARNING: translation string unused: insert removable device WARNING: translation string unused: install new update @@ -347,6 +348,7 @@ WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset WARNING: translation string unused: keys +WARNING: translation string unused: lang WARNING: translation string unused: lateprompting WARNING: translation string unused: length WARNING: translation string unused: line @@ -405,6 +407,7 @@ WARNING: translation string unused: net WARNING: translation string unused: net address WARNING: translation string unused: net config type WARNING: translation string unused: net config type help +WARNING: translation string unused: net traffic newversion WARNING: translation string unused: net-traffic configuration WARNING: translation string unused: network added WARNING: translation string unused: network configuration diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 4ae42a6..c8cd0d8 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -315,6 +315,7 @@ WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in WARNING: translation string unused: incorrect password +WARNING: translation string unused: info WARNING: translation string unused: insert floppy WARNING: translation string unused: insert removable device WARNING: translation string unused: install new update @@ -346,6 +347,7 @@ WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset WARNING: translation string unused: keys +WARNING: translation string unused: lang WARNING: translation string unused: lateprompting WARNING: translation string unused: length WARNING: translation string unused: line @@ -404,6 +406,7 @@ WARNING: translation string unused: net WARNING: translation string unused: net address WARNING: translation string unused: net config type WARNING: translation string unused: net config type help +WARNING: translation string unused: net traffic newversion WARNING: translation string unused: net-traffic configuration WARNING: translation string unused: network added WARNING: translation string unused: network configuration diff --git a/doc/language_issues.pl b/doc/language_issues.pl index f99cb90..e0b420d 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -269,6 +269,7 @@ WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in WARNING: translation string unused: incorrect password +WARNING: translation string unused: info WARNING: translation string unused: insert floppy WARNING: translation string unused: insert removable device WARNING: translation string unused: install new update @@ -299,6 +300,7 @@ WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset WARNING: translation string unused: keys +WARNING: translation string unused: lang WARNING: translation string unused: lateprompting WARNING: translation string unused: length WARNING: translation string unused: line @@ -357,6 +359,7 @@ WARNING: translation string unused: net WARNING: translation string unused: net address WARNING: translation string unused: net config type WARNING: translation string unused: net config type help +WARNING: translation string unused: net traffic newversion WARNING: translation string unused: net-traffic configuration WARNING: translation string unused: network added WARNING: translation string unused: network configuration diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 8c5d4bb..9daa20f 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -261,6 +261,7 @@ WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in WARNING: translation string unused: incorrect password +WARNING: translation string unused: info WARNING: translation string unused: insert floppy WARNING: translation string unused: insert removable device WARNING: translation string unused: install new update @@ -291,6 +292,7 @@ WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset WARNING: translation string unused: keys +WARNING: translation string unused: lang WARNING: translation string unused: lateprompting WARNING: translation string unused: length WARNING: translation string unused: line @@ -348,6 +350,7 @@ WARNING: translation string unused: net WARNING: translation string unused: net address WARNING: translation string unused: net config type WARNING: translation string unused: net config type help +WARNING: translation string unused: net traffic newversion WARNING: translation string unused: net-traffic configuration WARNING: translation string unused: network added WARNING: translation string unused: network configuration diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 1389408..8f060dc 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -324,6 +324,7 @@ WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in WARNING: translation string unused: incorrect password +WARNING: translation string unused: info WARNING: translation string unused: insert floppy WARNING: translation string unused: insert removable device WARNING: translation string unused: install new update @@ -355,6 +356,7 @@ WARNING: translation string unused: kernel version WARNING: translation string unused: key stuff WARNING: translation string unused: keyreset WARNING: translation string unused: keys +WARNING: translation string unused: lang WARNING: translation string unused: lateprompting WARNING: translation string unused: length WARNING: translation string unused: line @@ -413,6 +415,7 @@ WARNING: translation string unused: net WARNING: translation string unused: net address WARNING: translation string unused: net config type WARNING: translation string unused: net config type help +WARNING: translation string unused: net traffic newversion WARNING: translation string unused: net-traffic configuration WARNING: translation string unused: network added WARNING: translation string unused: network configuration diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi index 58a51d0..fbffecb 100644 --- a/html/cgi-bin/traffic.cgi +++ b/html/cgi-bin/traffic.cgi @@ -28,8 +28,6 @@ use strict; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; -require "${General::swroot}/net-traffic/net-traffic-admin.pl"; -require "${General::swroot}/net-traffic/net-traffic-lib.pl"; my %color = (); my %mainsettings = (); diff --git a/lfs/configroot b/lfs/configroot index f02894e..760505e 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -52,7 +52,7 @@ $(TARGET) : # Create all directories for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dns dnsforward \ ethernet extrahd/bin fwlogs fwhosts firewall isdn key langs logging mac main \ - menu.d modem net-traffic net-traffic/templates nfs optionsfw \ + menu.d modem nfs optionsfw \ ovpn patches pakfire portfw ppp private proxy/advanced/cre \ proxy/calamaris/bin qos/bin red remote sensors snort time \ updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \ @@ -66,7 +66,7 @@ $(TARGET) : dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/geoipblock firewall/input firewall/outgoing \ fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customgeoipgrp fwlogs/ipsettings fwlogs/portsettings \ - isdn/settings mac/settings main/hosts main/routing main/settings net-traffic/settings optionsfw/settings \ + isdn/settings mac/settings main/hosts main/routing main/settings optionsfw/settings \ ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ qos/tosconfig snort/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \ @@ -91,8 +91,6 @@ $(TARGET) : cp $(DIR_SRC)/config/menu/* $(CONFIG_ROOT)/menu.d/ cp $(DIR_SRC)/config/cfgroot/modem-defaults $(CONFIG_ROOT)/modem/defaults cp $(DIR_SRC)/config/cfgroot/modem-settings $(CONFIG_ROOT)/modem/settings - cp $(DIR_SRC)/config/cfgroot/net-traffic-lib.pl $(CONFIG_ROOT)/net-traffic/net-traffic-lib.pl - cp $(DIR_SRC)/config/cfgroot/net-traffic-admin.pl $(CONFIG_ROOT)/net-traffic/net-traffic-admin.pl cp $(DIR_SRC)/config/cfgroot/nfs-server $(CONFIG_ROOT)/nfs/nfs-server cp $(DIR_SRC)/config/cfgroot/proxy-acl $(CONFIG_ROOT)/proxy/acl-1.4 cp $(DIR_SRC)/config/qos/* $(CONFIG_ROOT)/qos/bin/ diff --git a/lfs/stage2 b/lfs/stage2 index ec5d117..2d2a645 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -126,7 +126,7 @@ endif -mkdir -pv /var/{opt,cache,lib/{misc,locate},local} -mkdir -pv /var/log/{counter,calamaris} chown nobody.nobody /var/log/calamaris - touch /var/log/{btmp,lastlog,wtmp,net-traffic.log} + touch /var/log/{btmp,lastlog,wtmp} chgrp -v utmp /var/log/lastlog chmod -v 664 /var/log/lastlog diff --git a/src/initscripts/helper/writeipac.pl b/src/initscripts/helper/writeipac.pl deleted file mode 100644 index 5b0b754..0000000 --- a/src/initscripts/helper/writeipac.pl +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/perl -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -use strict; -require '/var/ipfire/general-functions.pl'; - -my %settings; -my $iface; - -General::readhash("${General::swroot}/ethernet/settings", \%settings); - -if (!open(FILE, '>/etc/ipac-ng/rules.conf')) { - die "Unable to create /etc/ipac-ng/rules.conf"; } - -if (open(IFACE, "${General::swroot}/red/iface")) -{ - $iface = <IFACE>; - close IFACE; - chomp ($iface); -} - -print FILE "incoming GREEN ($settings{'GREEN_DEV'})|ipac~o|$settings{'GREEN_DEV'}|all|||\n"; -print FILE "outgoing GREEN ($settings{'GREEN_DEV'})|ipac~i|$settings{'GREEN_DEV'}|all|||\n"; -print FILE "forwarded incoming GREEN ($settings{'GREEN_DEV'})|ipac~fi|$settings{'GREEN_DEV'}|all|||\n"; -print FILE "forwarded outgoing GREEN ($settings{'GREEN_DEV'})|ipac~fo|$settings{'GREEN_DEV'}|all|||\n"; - -if ($settings{'CONFIG_TYPE'} =~ /^(2|4)$/ ) -{ - print FILE "incoming ORANGE ($settings{'ORANGE_DEV'})|ipac~o|$settings{'ORANGE_DEV'}|all|||\n"; - print FILE "outgoing ORANGE ($settings{'ORANGE_DEV'})|ipac~i|$settings{'ORANGE_DEV'}|all|||\n"; - print FILE "forwarded incoming ORANGE ($settings{'ORANGE_DEV'})|ipac~fi|$settings{'ORANGE_DEV'}|all|||\n"; - print FILE "forwarded outgoing ORANGE ($settings{'ORANGE_DEV'})|ipac~fo|$settings{'ORANGE_DEV'}|all|||\n"; -} - -if ($settings{'CONFIG_TYPE'} =~ /^(3|4)$/ ) -{ - print FILE "incoming BLUE ($settings{'BLUE_DEV'})|ipac~o|$settings{'BLUE_DEV'}|all|||\n"; - print FILE "outgoing BLUE ($settings{'BLUE_DEV'})|ipac~i|$settings{'BLUE_DEV'}|all|||\n"; - print FILE "forwarded incoming BLUE ($settings{'BLUE_DEV'})|ipac~fi|$settings{'BLUE_DEV'}|all|||\n"; - print FILE "forwarded outgoing BLUE ($settings{'BLUE_DEV'})|ipac~fo|$settings{'BLUE_DEV'}|all|||\n"; -} -if ($iface) { - print FILE "incoming RED ($iface)|ipac~o|$iface|all|||\n"; - print FILE "outgoing RED ($iface)|ipac~i|$iface|all|||\n"; - print FILE "forwarded incoming RED ($iface)|ipac~fi|$iface|all|||\n"; - print FILE "forwarded outgoing RED ($iface)|ipac~fo|$iface|all|||\n"; -} - -close FILE; diff --git a/src/initscripts/init.d/networking/red.up/40-ipac b/src/initscripts/init.d/networking/red.up/40-ipac deleted file mode 100644 index 301bc35..0000000 --- a/src/initscripts/init.d/networking/red.up/40-ipac +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -#/etc/rc.d/helper/writeipac.pl -#/usr/sbin/fetchipac -S - -exit 0 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cc60329d88d647a425812b8fb1ff31bb6752f576
by git＠ipfire.org 02 Oct '16

02 Oct '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 cc60329d88d647a425812b8fb1ff31bb6752f576 (commit) via b29c97b1685c4eafdbc30841f5eae358befc8343 (commit) via f58002a83f279246cdd58bfb5e9dfbf9d5aa99c7 (commit) via 9f50355a8c192e453998b6bd15c26b94eabcc72f (commit) from a1de9f6fc9cd011cc33708bae31a731394b6d26a (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 cc60329d88d647a425812b8fb1ff31bb6752f576 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Oct 2 15:32:14 2016 +0200 Add search domain to /etc/resolv.conf at boot time unbound does not append the local domain to the request any more (like dnsmasq did). Therefore, the client needs to do that if desired. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b29c97b1685c4eafdbc30841f5eae358befc8343 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Oct 2 15:25:23 2016 +0200 unbound: Test upstream name servers before using unbound has some trouble with validating DNSSEC-enabled domains when the upstream name server is stripping signatures from the authoritative responses. This script now checks that, removes any broken upstream name servers from the list and prints a warning. If all name servers fail the test, unbound falls back into recursor mode. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit f58002a83f279246cdd58bfb5e9dfbf9d5aa99c7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Oct 2 13:36:07 2016 +0200 core106: Add DNS root key to exclude list Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 9f50355a8c192e453998b6bd15c26b94eabcc72f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Oct 2 13:35:45 2016 +0200 unbound: Update to 1.5.10 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/unbound | 2 +- config/rootfiles/core/106/exclude | 1 + config/rootfiles/core/106/filelists/files | 1 + lfs/unbound | 4 +- src/initscripts/init.d/localnet | 10 ++ src/initscripts/init.d/unbound | 151 ++++++++++++++++++++++++++++-- 6 files changed, 157 insertions(+), 12 deletions(-) Difference in files: diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index 463f5dc..722d730 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -10,7 +10,7 @@ etc/unbound/unbound.conf #usr/lib/libunbound.la #usr/lib/libunbound.so usr/lib/libunbound.so.2 -usr/lib/libunbound.so.2.4.1 +usr/lib/libunbound.so.2.4.2 usr/sbin/unbound usr/sbin/unbound-anchor usr/sbin/unbound-checkconf diff --git a/config/rootfiles/core/106/exclude b/config/rootfiles/core/106/exclude index 7ddeae0..1d8d74e 100644 --- a/config/rootfiles/core/106/exclude +++ b/config/rootfiles/core/106/exclude @@ -23,6 +23,7 @@ var/ipfire/dma var/ipfire/time var/ipfire/ovpn var/lib/alternatives +var/lib/unbound/root.key var/log/cache var/state/dhcp/dhcpd.leases var/updatecache diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files index 1d5d4df..3d8cf8d 100644 --- a/config/rootfiles/core/106/filelists/files +++ b/config/rootfiles/core/106/filelists/files @@ -2,6 +2,7 @@ etc/system-release etc/issue etc/login.defs etc/rc.d/init.d/dhcp +etc/rc.d/init.d/localnet etc/rc.d/init.d/network etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders diff --git a/lfs/unbound b/lfs/unbound index 9c85893..b2ef6ac 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -24,7 +24,7 @@ include Config -VER = 1.5.9 +VER = 1.5.10 THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0cefa62c1690b4db18583db84bff00e3 +$(DL_FILE)_MD5 = 0a3a236811f1ab5c1dc31974fa74e047 install : $(TARGET) diff --git a/src/initscripts/init.d/localnet b/src/initscripts/init.d/localnet index c1e5b29..ff374bb 100644 --- a/src/initscripts/init.d/localnet +++ b/src/initscripts/init.d/localnet @@ -15,6 +15,13 @@ . /etc/sysconfig/rc . ${rc_functions} +write_resolv_conf() { + ( + [ -n "${DOMAINNAME}" ] && echo "search ${DOMAINNAME}" + echo "nameserver 127.0.0.1" + ) > /etc/resolv.conf +} + case "${1}" in start) eval $(/usr/local/bin/readhash /var/ipfire/main/settings) @@ -32,6 +39,9 @@ case "${1}" in domainname ${DOMAINNAME} evaluate_retval fi + + # Update resolv.conf + write_resolv_conf ;; stop) diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/unbound index 1b2649f..4d2b266 100644 --- a/src/initscripts/init.d/unbound +++ b/src/initscripts/init.d/unbound @@ -7,6 +7,11 @@ . /etc/sysconfig/rc . ${rc_functions} +TEST_DOMAIN="ipfire.org" + +# This domain will never validate +TEST_DOMAIN_FAIL="dnssec-failed.org" + USE_FORWARDERS=1 # Cache any local zones for 60 seconds @@ -53,18 +58,45 @@ config_header() { } update_forwarders() { - local forwarders="$(read_name_servers)" + if [ "${USE_FORWARDERS}" = "1" -a -e "/var/ipfire/red/active" ]; then + local forwarders + local broken_forwarders + + local ns + for ns in $(read_name_servers); do + test_name_server ${ns} &>/dev/null + case "$?" in + # Only use DNSSEC-validating or DNSSEC-aware name servers + 0|2) + forwarders="${forwarders} ${ns}" + ;; + *) + broken_forwarders="${broken_forwarders} ${ns}" + ;; + esac + done + + # Show warning for any broken upstream name servers + if [ -n "${broken_forwarders}" ]; then + boot_mesg "Ignoring broken upstream name server(s): ${broken_forwarders:1}" ${WARNING} + echo_warning + fi - if [ "${USE_FORWARDERS}" = "1" ] && [ -n "${forwarders}" ]; then - boot_mesg "Using Name Server(s): ${forwarders}" - boot_mesg_flush + if [ -n "${broken_forwarders}" -a -z "${forwarders}" ]; then + boot_mesg "Falling back to recursor mode" ${WARNING} + echo_warning - unbound-control -q forward ${forwarders} + elif [ -n "${forwarders}" ]; then + boot_mesg "Configuring upstream name server(s): ${forwarders:1}" ${INFO} + echo_ok - # If forwarders cannot be used we run in recursor mode - else - unbound-control -q forward off + unbound-control -q forward ${forwarders} + return 0 + fi fi + + # If forwarders cannot be used we run in recursor mode + unbound-control -q forward off } update_hosts() { @@ -179,6 +211,77 @@ get_memory_amount() { done < /proc/meminfo } +test_name_server() { + local ns=${1} + + # Return codes: + # 0 DNSSEC validating + # 1 Error: unreachable, etc. + # 2 DNSSEC aware + # 3 NOT DNSSEC-aware + + # Exit when the server is not reachable + ns_is_online ${ns} || return 1 + + # Return 0 if validating + ns_is_validating ${ns} && return 0 + + local errors + for rr in DNSKEY DS RRSIG; do + if ! ns_forwards_${rr} ${ns}; then + errors="${errors} ${rr}" + fi + done + + if [ -n "${errors}" ]; then + echo >&2 "Unable to retrieve the following resource records from ${ns}: ${errors:1}" + return 3 + fi + + # Is DNSSEC-aware + return 2 +} + +# Sends an A query to the nameserver w/o DNSSEC +ns_is_online() { + local ns=${1} + + dig @${ns} +nodnssec A ${TEST_DOMAIN} >/dev/null +} + +# Resolving ${TEST_DOMAIN_FAIL} will fail if the nameserver is validating +ns_is_validating() { + local ns=${1} + + dig @${ns} A ${TEST_DOMAIN_FAIL} | grep -q SERVFAIL +} + +# Checks if we can retrieve the DNSKEY for this domain. +# dig will print the SOA if nothing was found +ns_forwards_DNSKEY() { + local ns=${1} + + dig @${ns} DNSKEY ${TEST_DOMAIN} | grep -qv SOA +} + +ns_forwards_DS() { + local ns=${1} + + dig @${ns} DS ${TEST_DOMAIN} | grep -qv SOA +} + +ns_forwards_RRSIG() { + local ns=${1} + + dig @${ns} +dnssec A ${TEST_DOMAIN} | grep -q RRSIG +} + +ns_supports_tcp() { + local ns=${1} + + dig @${ns} +tcp A ${TEST_DOMAIN} >/dev/null || return 1 +} + case "$1" in start) # Print a nicer messagen when unbound is already running @@ -228,8 +331,38 @@ case "$1" in update_forwarders ;; + test-name-server) + ns=${2} + + test_name_server ${ns} + ret=${?} + + case "${ret}" in + 0) + echo "${ns} is validating" + ;; + 2) + echo "${ns} is DNSSEC-aware" + ;; + 3) + echo "${ns} is NOT DNSSEC-aware" + ;; + *) + echo "Test failed for an unknown reason" + ;; + esac + + if ns_supports_tcp ${ns}; then + echo "${ns} supports TCP fallback" + else + echo "${ns} does not support TCP fallback" + fi + + exit ${ret} + ;; + *) - echo "Usage: $0 {start|stop|restart|status|update-forwarders}" + echo "Usage: $0 {start|stop|restart|status|update-forwarders|test-name-server}" exit 1 ;; esac hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. d830721f6e0c5f8779663ea1846087a110e7b590
by git＠ipfire.org 01 Oct '16

01 Oct '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 d830721f6e0c5f8779663ea1846087a110e7b590 (commit) from c5facb1d4163b7633f0e5e5fcd3eae07f92276a0 (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 d830721f6e0c5f8779663ea1846087a110e7b590 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 1 21:04:17 2016 +0100 tzdata: Update to 2016g Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: tzdata/tzdata.nm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/tzdata/tzdata.nm b/tzdata/tzdata.nm index dfff383..1f76208 100644 --- a/tzdata/tzdata.nm +++ b/tzdata/tzdata.nm @@ -3,8 +3,8 @@ # Copyright (C) - IPFire Development Team <info(a)ipfire.org> # ############################################################################### -tzdata_version = 2016f -tzcode_version = 2016f +tzdata_version = 2016g +tzcode_version = 2016g name = tzdata version = %{tzdata_version} hooks/post-receive -- IPFire 3.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM