IPFire-SCM February 2022

ipfire-scm@lists.ipfire.org

1 participants
52 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4e6fcc73f14fbf16db9f84703bc6239a9f25bce7
by Peter Müller 19 Feb '22

19 Feb '22

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cf21dcaa979a9a27e946efb8af4ff66ffcf534f3
by Peter Müller 19 Feb '22

19 Feb '22

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 66c3619872bcf723d7bac550165ad5658de95644
by Peter Müller 18 Feb '22

18 Feb '22

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 66c3619872bcf723d7bac550165ad5658de95644 (commit) from b5aec71462d90bec69621d76b960d0c11aab2a01 (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 66c3619872bcf723d7bac550165ad5658de95644 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Feb 18 23:54:57 2022 +0000 Early spring clean: Remove trailing whitespaces, and correct licence headers Bumping across one of our scripts with very long trailing whitespaces, I thought it might be a good idea to clean these up. Doing so, some missing or inconsistent licence headers were fixed. There is no need in shipping all these files en bloc, as their functionality won't change. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/aliases.cgi | 40 +- html/cgi-bin/atm-status.cgi | 14 +- html/cgi-bin/chpasswd.cgi | 2 +- html/cgi-bin/connections.cgi | 10 +- html/cgi-bin/connscheduler.cgi | 8 +- html/cgi-bin/dhcp.cgi | 78 +-- html/cgi-bin/dnsforward.cgi | 2 +- html/cgi-bin/extrahd.cgi | 4 +- html/cgi-bin/firewall.cgi | 32 +- html/cgi-bin/fwhosts.cgi | 90 +-- html/cgi-bin/getrrdimage.cgi | 8 +- html/cgi-bin/gpl.cgi | 2 +- html/cgi-bin/hosts.cgi | 18 +- html/cgi-bin/index.cgi | 6 +- html/cgi-bin/iptables.cgi | 10 +- html/cgi-bin/logs.cgi/calamaris.dat | 10 +- html/cgi-bin/logs.cgi/firewalllog.dat | 30 +- html/cgi-bin/logs.cgi/firewalllogcountry.dat | 10 +- html/cgi-bin/logs.cgi/firewalllogip.dat | 14 +- html/cgi-bin/logs.cgi/firewalllogport.dat | 6 +- html/cgi-bin/logs.cgi/ids.dat | 8 +- html/cgi-bin/logs.cgi/ovpnclients.dat | 2 +- html/cgi-bin/logs.cgi/proxylog.dat | 20 +- html/cgi-bin/logs.cgi/showrequestfromcountry.dat | 28 +- html/cgi-bin/logs.cgi/showrequestfromip.dat | 20 +- html/cgi-bin/logs.cgi/showrequestfromport.dat | 22 +- html/cgi-bin/logs.cgi/summary.dat | 2 +- html/cgi-bin/logs.cgi/urlfilter.dat | 12 +- html/cgi-bin/mac.cgi | 56 +- html/cgi-bin/mail.cgi | 10 +- html/cgi-bin/modem.cgi | 4 +- html/cgi-bin/netexternal.cgi | 8 +- html/cgi-bin/ovpnmain.cgi | 682 +++++++++++----------- html/cgi-bin/proxy.cgi | 2 +- html/cgi-bin/remote.cgi | 6 +- html/cgi-bin/routing.cgi | 18 +- html/cgi-bin/samba.cgi | 6 +- html/cgi-bin/speed.cgi | 2 +- html/cgi-bin/time.cgi | 6 +- html/cgi-bin/updatexlrator.cgi | 2 +- html/cgi-bin/urlfilter.cgi | 8 +- html/cgi-bin/vulnerabilities.cgi | 2 +- html/cgi-bin/wakeonlan.cgi | 22 +- html/cgi-bin/webaccess.cgi | 4 +- html/cgi-bin/wireless.cgi | 14 +- html/cgi-bin/wirelessclient.cgi | 4 +- html/cgi-bin/zoneconf.cgi | 8 +- html/html/include/rrdimage.js | 8 +- html/html/redirect-templates/legacy/template.html | 2 +- html/html/redirect.cgi | 2 +- html/html/themes/ipfire/include/functions.pl | 2 +- lfs/7zip | 2 +- lfs/Config | 2 +- lfs/alac | 2 +- lfs/alsa | 2 +- lfs/apcupsd | 2 +- lfs/avahi | 6 +- lfs/aws-cli | 2 +- lfs/backup | 6 +- lfs/bacula | 2 +- lfs/binutils | 6 +- lfs/bird | 2 +- lfs/br2684ctl | 4 +- lfs/bwm-ng | 2 +- lfs/c-ares | 2 +- lfs/ca-certificates | 6 +- lfs/cifs-utils | 2 +- lfs/clamav | 4 +- lfs/cleanup-toolchain | 4 +- lfs/collectd | 4 +- lfs/core-updates | 2 +- lfs/cpufrequtils | 4 +- lfs/cups-filters | 2 +- lfs/dbus | 2 +- lfs/ddrescue | 4 +- lfs/dehydrated | 2 +- lfs/dnsdist | 2 +- lfs/ebtables | 2 +- lfs/elfutils | 2 +- lfs/elinks | 2 +- lfs/epson-inkjet-printer-escpr | 2 +- lfs/faad2 | 2 +- lfs/fake-environ | 6 +- lfs/fcron | 2 +- lfs/fetchmail | 2 +- lfs/ffmpeg | 2 +- lfs/firmware-update | 2 +- lfs/flac | 2 +- lfs/flashrom | 2 +- lfs/flex | 4 +- lfs/foomatic | 2 +- lfs/fping | 2 +- lfs/freefont | 2 +- lfs/freeradius | 2 +- lfs/frr | 2 +- lfs/gcc | 12 +- lfs/ghostscript | 2 +- lfs/gnump3d | 2 +- lfs/gptfdisk | 4 +- lfs/gutenprint | 4 +- lfs/haproxy | 2 +- lfs/hplip | 4 +- lfs/htop | 4 +- lfs/i2c-tools | 2 +- lfs/icinga | 2 +- lfs/iftop | 2 +- lfs/igmpproxy | 2 +- lfs/intltool | 2 +- lfs/iperf | 2 +- lfs/iptraf-ng | 2 +- lfs/jansson | 4 +- lfs/joe | 2 +- lfs/jq | 2 +- lfs/json-c | 2 +- lfs/keyutils | 2 +- lfs/knot | 2 +- lfs/krb5 | 2 +- lfs/lame | 2 +- lfs/lcdproc | 4 +- lfs/libaio | 2 +- lfs/libarchive | 2 +- lfs/libassuan | 2 +- lfs/libcdada | 4 +- lfs/libdaemon | 2 +- lfs/libedit | 2 +- lfs/libexif | 2 +- lfs/libffi | 2 +- lfs/libid3tag | 2 +- lfs/libinih | 2 +- lfs/libmad | 2 +- lfs/libmpdclient | 2 +- lfs/libmpeg2 | 2 +- lfs/libnl | 2 +- lfs/libnl-3 | 2 +- lfs/libogg | 2 +- lfs/libpri | 2 +- lfs/libshout | 2 +- lfs/libsolv | 2 +- lfs/libstatgrab | 2 +- lfs/libtalloc | 2 +- lfs/libtiff | 2 +- lfs/libtool | 2 +- lfs/liburcu | 2 +- lfs/libvirt | 2 +- lfs/libvorbis | 2 +- lfs/libyang | 2 +- lfs/linux | 2 +- lfs/lm_sensors | 2 +- lfs/lmdb | 2 +- lfs/logwatch | 4 +- lfs/lshw | 6 +- lfs/lvm2 | 2 +- lfs/lz4 | 2 +- lfs/make | 2 +- lfs/mc | 2 +- lfs/mcelog | 2 +- lfs/mdadm | 2 +- lfs/mdns-repeater | 2 +- lfs/minicom | 2 +- lfs/minidlna | 4 +- lfs/mpc | 2 +- lfs/mpd | 4 +- lfs/mpfire | 6 +- lfs/mtr | 2 +- lfs/multipath-tools | 2 +- lfs/nagios-plugins | 2 +- lfs/nagios_nrpe | 2 +- lfs/ncat | 2 +- lfs/ncdu | 4 +- lfs/netatalk | 2 +- lfs/netpbm | 2 +- lfs/nfs | 2 +- lfs/ninja | 2 +- lfs/ntfs-3g | 2 +- lfs/nut | 2 +- lfs/observium-agent | 2 +- lfs/openvmtools | 2 +- lfs/opus | 4 +- lfs/pakfire | 6 +- lfs/parted | 2 +- lfs/pcmciautils | 2 +- lfs/perl-Archive-Tar | 2 +- lfs/perl-Archive-Zip | 2 +- lfs/perl-Authen-SASL | 2 +- lfs/perl-BerkeleyDB | 2 +- lfs/perl-Carp-Clan | 2 +- lfs/perl-Convert-TNEF | 2 +- lfs/perl-Convert-UUlib | 2 +- lfs/perl-Date-Calc | 2 +- lfs/perl-Date-Manip | 2 +- lfs/perl-File-Tail | 2 +- lfs/perl-IO-Stringy | 2 +- lfs/perl-MIME-Base64 | 2 +- lfs/perl-Net-SMTP-SSL | 2 +- lfs/perl-Net-Server | 2 +- lfs/perl-Parse-Yapp | 2 +- lfs/perl-TimeDate | 2 +- lfs/perl-gettext | 2 +- lfs/pigz | 2 +- lfs/pmacct | 2 +- lfs/postfix | 2 +- lfs/powertop | 2 +- lfs/proxy-accounting | 6 +- lfs/python3-packaging | 2 +- lfs/python3-pyasn1 | 2 +- lfs/python3-pyproject2setuppy | 2 +- lfs/python3-toml | 2 +- lfs/python3-tomli | 2 +- lfs/qemu | 2 +- lfs/qemu-ga | 10 +- lfs/rpcbind | 2 +- lfs/rsync | 2 +- lfs/rtl8189es | 2 +- lfs/rtl8812au | 2 +- lfs/rtl8822bu | 2 +- lfs/rust-aho-corasick | 2 +- lfs/rust-autocfg | 2 +- lfs/rust-block-buffer | 2 +- lfs/rust-cfg-if | 2 +- lfs/rust-cipher | 2 +- lfs/rust-crossbeam-channel | 2 +- lfs/rust-crossbeam-deque | 2 +- lfs/rust-crossbeam-epoch | 2 +- lfs/rust-crossbeam-utils | 2 +- lfs/rust-crypto-common | 2 +- lfs/rust-ctor | 2 +- lfs/rust-digest | 2 +- lfs/rust-dirs | 2 +- lfs/rust-dissimilar | 2 +- lfs/rust-either | 2 +- lfs/rust-generic-array | 2 +- lfs/rust-getrandom | 2 +- lfs/rust-ghost | 2 +- lfs/rust-glob | 2 +- lfs/rust-hex | 2 +- lfs/rust-home | 2 +- lfs/rust-indoc | 2 +- lfs/rust-indoc-impl | 2 +- lfs/rust-instant | 2 +- lfs/rust-inventory | 2 +- lfs/rust-inventory-impl | 2 +- lfs/rust-itoa | 2 +- lfs/rust-lazy-static | 2 +- lfs/rust-libc | 2 +- lfs/rust-lock_api | 2 +- lfs/rust-log | 2 +- lfs/rust-memchr | 2 +- lfs/rust-memoffset | 2 +- lfs/rust-num_cpus | 2 +- lfs/rust-once_cell | 2 +- lfs/rust-parking_lot | 2 +- lfs/rust-parking_lot_core | 2 +- lfs/rust-paste | 2 +- lfs/rust-paste-impl | 2 +- lfs/rust-pest | 2 +- lfs/rust-ppv-lite86 | 2 +- lfs/rust-proc-macro-hack | 2 +- lfs/rust-proc-macro2 | 2 +- lfs/rust-pyo3 | 2 +- lfs/rust-pyo3-build-config | 2 +- lfs/rust-pyo3-macros | 2 +- lfs/rust-pyo3-macros-backend | 2 +- lfs/rust-quote | 2 +- lfs/rust-rand | 2 +- lfs/rust-rand-0.4 | 2 +- lfs/rust-rand_chacha | 2 +- lfs/rust-rand_core | 2 +- lfs/rust-rand_core-0.3.1 | 2 +- lfs/rust-rand_core-0.4.2 | 2 +- lfs/rust-rand_hc | 2 +- lfs/rust-rayon | 2 +- lfs/rust-rayon-core | 2 +- lfs/rust-rdrand | 2 +- lfs/rust-regex | 2 +- lfs/rust-regex-syntax | 2 +- lfs/rust-remove_dir_all | 2 +- lfs/rust-ryu | 2 +- lfs/rust-same-file | 2 +- lfs/rust-scopeguard | 2 +- lfs/rust-semver | 2 +- lfs/rust-semver-parser | 2 +- lfs/rust-serde | 2 +- lfs/rust-serde_derive | 2 +- lfs/rust-serde_json | 2 +- lfs/rust-smallvec | 2 +- lfs/rust-syn | 2 +- lfs/rust-synstructure | 2 +- lfs/rust-tempdir | 2 +- lfs/rust-termcolor | 2 +- lfs/rust-toml | 2 +- lfs/rust-toolchain_find | 2 +- lfs/rust-trybuild | 2 +- lfs/rust-typenum | 2 +- lfs/rust-ucd-trie | 2 +- lfs/rust-unicode-xid | 2 +- lfs/rust-unindent | 2 +- lfs/rust-version-check | 2 +- lfs/rust-walkdir | 2 +- lfs/sarg | 2 +- lfs/sdparm | 2 +- lfs/sed | 4 +- lfs/shairport-sync | 2 +- lfs/socat | 4 +- lfs/sox | 2 +- lfs/soxr | 2 +- lfs/spandsp | 2 +- lfs/spectre-meltdown-checker | 2 +- lfs/speedtest-cli | 2 +- lfs/spice | 2 +- lfs/squid | 2 +- lfs/squidclamav | 2 +- lfs/squidguard | 4 +- lfs/sshfs | 2 +- lfs/sslh | 2 +- lfs/stage2 | 4 +- lfs/stress | 2 +- lfs/swatch | 2 +- lfs/sysbench | 2 +- lfs/sysvinit | 2 +- lfs/taglib | 2 +- lfs/tcpdump | 2 +- lfs/telnet | 4 +- lfs/tftpd | 2 +- lfs/tmux | 2 +- lfs/traceroute | 4 +- lfs/transmission | 2 +- lfs/tshark | 2 +- lfs/u-boot | 4 +- lfs/u-boot-friendlyarm | 2 +- lfs/vdr | 2 +- lfs/vdr_dvbapi | 2 +- lfs/vdr_eepg | 2 +- lfs/vdr_epgsearch | 2 +- lfs/vdr_streamdev | 2 +- lfs/vdradmin | 2 +- lfs/vnstat | 2 +- lfs/w_scan | 2 +- lfs/watchdog | 4 +- lfs/wavemon | 2 +- lfs/web-user-interface | 4 +- lfs/whatmask | 2 +- lfs/wio | 6 +- lfs/xfsprogs | 2 +- lfs/xinetd | 2 +- lfs/xradio | 2 +- lfs/xvid | 2 +- lfs/zerofree | 2 +- lfs/zstd | 2 +- src/br2684ctl/br2684ctl.c | 50 +- src/initscripts/helper/aws-setup | 19 + src/initscripts/helper/azure-setup | 19 + src/initscripts/helper/exoscale-setup | 19 + src/initscripts/helper/gcp-setup | 19 + src/initscripts/helper/getdnsfromdhcpc.pl | 2 +- src/initscripts/helper/oci-setup | 19 + src/initscripts/networking/any | 41 +- src/initscripts/networking/dhcpcd.exe | 31 +- src/initscripts/networking/functions.network | 33 +- src/initscripts/networking/red | 79 +-- src/initscripts/networking/wpa_supplicant.exe | 37 +- src/initscripts/packages/alsa | 27 +- src/initscripts/packages/amazon-ssm-agent | 24 +- src/initscripts/packages/apcupsd | 24 +- src/initscripts/packages/avahi | 28 +- src/initscripts/packages/bacula | 24 +- src/initscripts/packages/bird | 24 +- src/initscripts/packages/clamav | 22 +- src/initscripts/packages/cpufreq | 35 +- src/initscripts/packages/cups | 27 +- src/initscripts/packages/cyrus-sasl | 28 +- src/initscripts/packages/dnsdist | 27 +- src/initscripts/packages/fetchmail | 33 +- src/initscripts/packages/freeradius | 26 +- src/initscripts/packages/frr | 27 +- src/initscripts/packages/gnump3d | 33 +- src/initscripts/packages/guardian | 33 +- src/initscripts/packages/haproxy | 27 +- src/initscripts/packages/hostapd | 20 + src/initscripts/packages/keepalived | 27 +- src/initscripts/packages/lcdproc | 33 +- src/initscripts/packages/lcr | 45 -- src/initscripts/packages/libvirtd | 33 +- src/initscripts/packages/mdns-repeater | 24 +- src/initscripts/packages/messagebus | 28 +- src/initscripts/packages/minidlna | 31 +- src/initscripts/packages/monit | 27 +- src/initscripts/packages/mpd | 27 +- src/initscripts/packages/netatalk | 24 +- src/initscripts/packages/netsnmpd | 35 +- src/initscripts/packages/nfs-server | 28 +- src/initscripts/packages/nrpe | 22 +- src/initscripts/packages/nut | 19 + src/initscripts/packages/openvmtools | 35 +- src/initscripts/packages/pmacct | 24 +- src/initscripts/packages/postfix | 28 +- src/initscripts/packages/qemu-ga | 24 +- src/initscripts/packages/rpcbind | 33 +- src/initscripts/packages/samba | 25 +- src/initscripts/packages/shairport-sync | 24 +- src/initscripts/packages/sslh | 25 +- src/initscripts/packages/stunnel | 27 +- src/initscripts/packages/tftpd | 33 +- src/initscripts/packages/tor | 27 +- src/initscripts/packages/transmission | 33 +- src/initscripts/packages/vdr | 35 +- src/initscripts/packages/vdradmin | 36 +- src/initscripts/packages/virtlogd | 33 +- src/initscripts/packages/watchdog | 27 +- src/initscripts/packages/xinetd | 28 +- src/initscripts/packages/zabbix_agentd | 33 +- src/initscripts/sysconfig/rc.local | 2 +- src/initscripts/system/acpid | 27 +- src/initscripts/system/apache | 27 +- src/initscripts/system/beep | 39 +- src/initscripts/system/checkfs | 46 +- src/initscripts/system/cleanfs | 33 +- src/initscripts/system/cloud-init | 24 +- src/initscripts/system/collectd | 24 +- src/initscripts/system/connectd | 34 +- src/initscripts/system/conntrackd | 24 +- src/initscripts/system/console | 46 +- src/initscripts/system/dhcp | 26 +- src/initscripts/system/dhcrelay | 27 +- src/initscripts/system/fcron | 28 +- src/initscripts/system/fireinfo | 33 +- src/initscripts/system/firewall | 19 + src/initscripts/system/firstsetup | 19 + src/initscripts/system/fsresize | 33 +- src/initscripts/system/functions | 34 +- src/initscripts/system/halt | 33 +- src/initscripts/system/leds | 27 +- src/initscripts/system/localnet | 33 +- src/initscripts/system/lvmetad | 26 +- src/initscripts/system/modules | 33 +- src/initscripts/system/mountfs | 33 +- src/initscripts/system/mountkernfs | 33 +- src/initscripts/system/mounttmpfs | 27 +- src/initscripts/system/network | 33 +- src/initscripts/system/ntp | 22 +- src/initscripts/system/pakfire | 27 +- src/initscripts/system/partresize | 35 +- src/initscripts/system/random | 22 +- src/initscripts/system/rc | 33 +- src/initscripts/system/reboot | 33 +- src/initscripts/system/rngd | 29 +- src/initscripts/system/sendsignals | 33 +- src/initscripts/system/setclock | 31 +- src/initscripts/system/smartenabler | 22 +- src/initscripts/system/smt | 24 +- src/initscripts/system/squid | 22 +- src/initscripts/system/sshd | 28 +- src/initscripts/system/static-routes | 19 + src/initscripts/system/suricata | 39 +- src/initscripts/system/swap | 33 +- src/initscripts/system/swconfig | 29 +- src/initscripts/system/sysctl | 37 +- src/initscripts/system/sysklogd | 33 +- src/initscripts/system/template | 33 +- src/initscripts/system/udev | 33 +- src/initscripts/system/udev_retry | 35 +- src/initscripts/system/unbound | 25 +- src/initscripts/system/vnstat | 22 +- src/initscripts/system/waitdrives | 33 +- src/initscripts/system/wlanclient | 29 +- src/libsmooth/libsmooth.h | 4 +- src/libsmooth/main.c | 30 +- src/libsmooth/varval.c | 30 +- src/misc-progs/addonctrl.c | 2 +- src/misc-progs/fireinfoctrl.c | 8 +- src/misc-progs/getipstat.c | 10 +- src/misc-progs/iowrap.c | 10 +- src/misc-progs/ipfirereboot.c | 2 +- src/misc-progs/ipsecctrl.c | 14 +- src/misc-progs/openvpnctrl.c | 8 +- src/misc-progs/rebuildhosts.c | 4 +- src/misc-progs/sambactrl.c | 2 +- src/misc-progs/setaliases.c | 6 +- src/misc-progs/setuid.h | 2 +- src/misc-progs/sshctrl.c | 8 +- src/misc-progs/syslogdctrl.c | 4 +- src/misc-progs/updxlratorctrl.c | 2 +- src/misc-progs/urlfilterctrl.c | 2 +- src/misc-progs/wiohelper.c | 2 +- src/pakfire/lib/functions.pl | 114 ++-- src/pakfire/pakfire | 58 +- src/scripts/archive.files | 2 +- src/scripts/backupiso | 19 + src/scripts/captive-cleanup | 2 +- src/scripts/connscheduler | 36 +- src/scripts/consort.sh | 8 +- src/scripts/convert-dns-settings | 8 +- src/scripts/convert-ovpn | 2 +- src/scripts/convert-to-location | 3 +- src/scripts/filesystem-cleanup | 40 +- src/scripts/hddshutdown | 8 +- src/scripts/ipsec-interfaces | 2 +- src/scripts/makegraphs | 3 +- src/scripts/openvpn-metrics | 40 +- src/scripts/ovpn-ccd-convert | 21 +- src/scripts/ovpn-collectd-convert | 21 +- src/scripts/qosd | 63 +- src/scripts/rebuild-initrd | 43 +- src/scripts/scanhd | 20 + src/scripts/settime | 32 +- src/scripts/timecheck | 31 +- src/scripts/timezone-transition | 42 +- src/scripts/update-ids-ruleset | 2 +- src/scripts/update-lang-cache | 20 + src/scripts/update-location-database | 2 +- tools/check_manualpages.pl | 6 +- tools/sort_strings.pl | 2 +- 511 files changed, 3703 insertions(+), 2565 deletions(-) delete mode 100644 src/initscripts/packages/lcr Difference in files: diff --git a/html/cgi-bin/aliases.cgi b/html/cgi-bin/aliases.cgi index 85ed27204..7b80b3c84 100644 --- a/html/cgi-bin/aliases.cgi +++ b/html/cgi-bin/aliases.cgi @@ -62,7 +62,7 @@ $settings{'IP'} = ''; $settings{'ENABLED'} = 'off'; # Every check box must be set to off $settings{'NAME'} = ''; my @nosaved=('IP','ENABLED','NAME'); # List here ALL setting2 fields. Mandatory - + $settings{'ACTION'} = ''; # add/edit/remove $settings{'KEY1'} = ''; # point record for ACTION @@ -94,16 +94,16 @@ if (open(FILE, "$datafile")) { # Remove if no Setting1 needed # if ($settings{'ACTION'} eq $Lang::tr{'save'}) { - + # #Validate static Settings1 here # unless ($errormessage) { # Everything is ok, save settings - #map (delete ($settings{$_}) ,(@nosaved,'ACTION','KEY1'));# Must never be saved + #map (delete ($settings{$_}) ,(@nosaved,'ACTION','KEY1'));# Must never be saved #&General::writehash($setting, \%settings); # Save good settings #$settings{'ACTION'} = $Lang::tr{'save'}; # Recreate 'ACTION' #map ($settings{$_}= '',(@nosaved,'KEY1')); # and reinit var to empty - + # Rebuild configuration file if needed &BuildConfiguration; @@ -133,14 +133,14 @@ if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { $temp[2] = '' if ( $temp[2] eq '' ); @current[$settings{'KEY1'}] = join (',',@temp)."\n"; $settings{'KEY1'} = ''; # End edit mode - + &General::log($Lang::tr{'ip alias changed'}); - + #Save current open(FILE, ">$datafile") or die 'Unable to open aliases file.'; print FILE @current; close(FILE); - + # Rebuild configuration file &BuildConfiguration; @@ -230,7 +230,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { # Handle Suricata related actions. &HandleSuricata(); - + ## ## if entering data line is repetitive, choose here to not erase fields between each addition ## @@ -253,7 +253,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'edit'}) { } if ($settings{'ACTION'} eq $Lang::tr{'remove'}) { - splice (@current,$settings{'KEY1'},1); # Delete line + splice (@current,$settings{'KEY1'},1); # Delete line open(FILE, ">$datafile") or die 'Unable to open aliases file.'; print FILE @current; close(FILE); @@ -291,7 +291,7 @@ if ($ENV{'QUERY_STRING'} =~ /$sortstring/ ) { if ($settings{'ACTION'} eq '' ) { # First launch from GUI $settings{'ENABLED'} ='on'; } - + &Header::openpage($Lang::tr{'external aliases configuration'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); my %checked =(); # Checkbox manipulations @@ -314,7 +314,7 @@ END ; &Header::closebox(); } - + # # Second check box is for editing the list # @@ -406,7 +406,7 @@ foreach my $line (@current) { $gdesc = $Lang::tr{'click to disable'}; } else { $gif = 'off.gif'; - $gdesc = $Lang::tr{'click to enable'}; + $gdesc = $Lang::tr{'click to enable'}; } #Colorize each line @@ -488,7 +488,7 @@ END sub SortDataFile { our %entries = (); - + # Sort pair of record received in $a $b special vars. # When IP is specified use numeric sort else alpha. # If sortname ends with 'Rev', do reverse sort. @@ -527,27 +527,27 @@ sub SortDataFile foreach my $line (@current) { chomp( $line); #remove newline because can be on field 5 or 6 (addition of REMARK) my @temp = split (',',$line); - + # Build a pair 'Field Name',value for each of the data dataline. # Each SORTABLE field must have is pair. # Other data fields (non sortable) can be grouped in one - + # Exemple # F1,F2,F3,F4,F5 only F1 F2 for sorting # my @record = ('KEY',$key++, # 'F1',$temp[0], # 'F2',$temp[1], # 'DATA',join(',',@temp[2..4]) ); #group remainning values, with separator (,) - + # The KEY,key record permits doublons. If removed, then F1 becomes the key without doublon permitted. - - + + my @record = ('KEY',$key++,'IP',$temp[0],'ENABLED',$temp[1],'NAME',$temp[2]); my $record = {}; # create a reference to empty hash %{$record} = @record; # populate that hash with @record $entries{$record->{KEY}} = $record; # add this to a hash of hashes } - + open(FILE, ">$datafile") or die 'Unable to open aliases file.'; # Each field value is printed , with the newline ! Don't forget separator and order of them. @@ -562,7 +562,7 @@ sub SortDataFile close (FILE); } -# +# # Build the configuration file for application aliases # sub BuildConfiguration { diff --git a/html/cgi-bin/atm-status.cgi b/html/cgi-bin/atm-status.cgi index 49f19209d..fb38dc030 100644 --- a/html/cgi-bin/atm-status.cgi +++ b/html/cgi-bin/atm-status.cgi @@ -53,18 +53,18 @@ foreach (@modems){ my $value= `cat /sys/class/atm/$modem/parameters/$param`; chomp($param); chomp($value); - if (!($param =~"uevent") + if (!($param =~"uevent") && !($param =~"resource") && !($param eq "") ) { - + $lines++; if ($lines % 2){ print "<tr bgcolor='$color{'color22'}'>"; }else{ print "<tr bgcolor='$color{'color20'}'>"; } - print "<td align='left'>$param</td><td align='left'>$value</td> "; + print "<td align='left'>$param</td><td align='left'>$value</td> "; } } my @pfile = `grep . /sys/class/atm/$modem/device/* 2>/dev/null`; @@ -74,8 +74,8 @@ foreach (@modems){ my $value= `cat /sys/class/atm/$modem/device/$param`; chomp($param); chomp($value); - if (!($param =~"uevent") - && !($param =~"modalias") + if (!($param =~"uevent") + && !($param =~"modalias") && !($param =~"bInterface") && !($param =~"bAlternateSetting") && !($param =~"bNumEndpoints") @@ -83,14 +83,14 @@ foreach (@modems){ && !($param =~"resource") && !($param eq "") ) { - + $lines++; if ($lines % 2){ print "<tr bgcolor='$color{'color22'}'>"; }else{ print "<tr bgcolor='$color{'color20'}'>"; } - print "<td align='left'>$param</td><td align='left'>$value</td> "; + print "<td align='left'>$param</td><td align='left'>$value</td> "; } } print "</table><br>\n"; diff --git a/html/cgi-bin/chpasswd.cgi b/html/cgi-bin/chpasswd.cgi index 0a66062ed..4930c4ca3 100644 --- a/html/cgi-bin/chpasswd.cgi +++ b/html/cgi-bin/chpasswd.cgi @@ -240,7 +240,7 @@ sub readhash { $val =~ s/^\'//g; $val =~ s/\'$//g; - + # Untaint variables read from hash $var =~ /([A-Za-z0-9_-]*)/; $var = $1; $val =~ /([\w\W]*)/; $val = $1; diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index 10ac8748c..7f06a5594 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -57,7 +57,7 @@ if (length ($ENV{'QUERY_STRING'}) > 0){ ($name, $value) = split(/=/, $pair); $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg; # e.g. "%20" => " " $value =~ s/[^a-zA-Z0-9]*//g; # a-Z 0-9 will pass - $cgiin{$name} = $value; + $cgiin{$name} = $value; } } @@ -96,8 +96,8 @@ if ( $cgiin{'sort_field'} ~~ [ '1','2','3','4','5','6','7','8','9' ] ) { } # Read and sort the connection tracking table -# do sorting -if ($SORT_FIELD and $SORT_ORDER) { +# do sorting +if ($SORT_FIELD and $SORT_ORDER) { # field sorting when sorting arguments are sane open(CONNTRACK, "/usr/local/bin/getconntracktable | /usr/local/bin/consort.sh $SORT_FIELD $SORT_ORDER |") or die "Unable to read conntrack table"; } else { @@ -247,13 +247,13 @@ if (-e "${General::swroot}/ovpn/settings") { # Add OpenVPN net for custom OVPNs if (-e "${General::swroot}/ovpn/ccd.conf") { - open(OVPNSUB, "${General::swroot}/ovpn/ccd.conf"); + open(OVPNSUB, "${General::swroot}/ovpn/ccd.conf"); my @ovpnsub = <OVPNSUB>; close(OVPNSUB); foreach (@ovpnsub) { my ($network, $mask) = split '/', (split ',', $_)[2]; - + $mask = ipv4_cidr2msk($mask) unless &General::validip($mask); push(@network, $network); diff --git a/html/cgi-bin/connscheduler.cgi b/html/cgi-bin/connscheduler.cgi index 1393df65f..cc78cbc1b 100644 --- a/html/cgi-bin/connscheduler.cgi +++ b/html/cgi-bin/connscheduler.cgi @@ -138,7 +138,7 @@ if ( $cgiparams{'ACTION'} eq 'toggle' ) { $CONNSCHED::config[$cgiparams{'ID'}]{'ACTIVE'} = 'on'; } - + &CONNSCHED::WriteConfig; } @@ -194,7 +194,7 @@ if ( ($cgiparams{'ACTION'} eq 'add') || ($cgiparams{'ACTION'} eq 'update') ) if ( $cgiparams{'ACTION'} eq 'edit' ) { $i = $cgiparams{'ID'}; - + $selected_hour = substr($CONNSCHED::config[$i]{'TIME'},0,2); $selected_minute = substr($CONNSCHED::config[$i]{'TIME'},3,2); @@ -412,7 +412,7 @@ END my $col=""; for my $id ( 0 .. $#CONNSCHED::config ) { - if ( ($cgiparams{'ACTION'} eq 'edit') && ($id == $cgiparams{'ID'}) ) + if ( ($cgiparams{'ACTION'} eq 'edit') && ($id == $cgiparams{'ID'}) ) { print "<tr>"; $col="bgcolor='${Header::colouryellow}'"; @@ -422,7 +422,7 @@ for my $id ( 0 .. $#CONNSCHED::config ) print "<tr>"; $col="bgcolor='$color{'color20'}'"; } - else + else { print "<tr>"; $col="bgcolor='$color{'color22'}'"; diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index f1fbfd235..0a0a21d68 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -47,7 +47,7 @@ my $warnNTPmessage = ''; my @nosaved=(); my %color = (); -#Basic syntax allowed for new Option definition. Not implemented: RECORDS & array of RECORDS +#Basic syntax allowed for new Option definition. Not implemented: RECORDS & array of RECORDS our $OptionTypes = 'boolean|((un)?signed )?integer (8|16|32)|ip-address|text|string|encapsulate \w+|array of ip-address'; &Header::showhttpheaders(); @@ -153,14 +153,14 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) { $errormessage = "DHCP on ${itf}: " . $Lang::tr{'invalid end address'}; goto ERROR; } - if (! &General::IpInSubnet ( $dhcpsettings{"START_ADDR_${itf}"}, + if (! &General::IpInSubnet ( $dhcpsettings{"START_ADDR_${itf}"}, $netsettings{"${itf}_NETADDRESS"}, $netsettings{"${itf}_NETMASK"})) { $errormessage = "DHCP on ${itf}: " . $Lang::tr{'invalid start address'}; goto ERROR; } } - + if ($dhcpsettings{"END_ADDR_${itf}"}) { if (!(&General::validip($dhcpsettings{"END_ADDR_${itf}"}))) { $errormessage = "DHCP on ${itf}: " . $Lang::tr{'invalid end address'}; @@ -170,9 +170,9 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) { $errormessage = "DHCP on ${itf}: " . $Lang::tr{'invalid start address'}; goto ERROR; } - if (! &General::IpInSubnet ( $dhcpsettings{"END_ADDR_${itf}"}, + if (! &General::IpInSubnet ( $dhcpsettings{"END_ADDR_${itf}"}, $netsettings{"${itf}_NETADDRESS"}, - $netsettings{"${itf}_NETMASK"})) { + $netsettings{"${itf}_NETMASK"})) { $errormessage = "DHCP on ${itf}: " . $Lang::tr{'invalid end address'}; goto ERROR; } @@ -214,7 +214,7 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) { goto ERROR; } if (! $dhcpsettings{"DNS1_${itf}"}) { - $errormessage = "DHCP on ${itf}: " . $Lang::tr{'cannot specify secondary dns without specifying primary'}; + $errormessage = "DHCP on ${itf}: " . $Lang::tr{'cannot specify secondary dns without specifying primary'}; goto ERROR; } } @@ -233,7 +233,7 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) { if (! $dhcpsettings{"WINS1_${itf}"} ) { $errormessage = "DHCP on ${itf}: " . $Lang::tr{'cannot specify secondary wins without specifying primary'}; goto ERROR; - } + } } if ($dhcpsettings{"NEXT_${itf}"}) { if (!(&General::validip($dhcpsettings{"NEXT_${itf}"}))) { @@ -295,14 +295,14 @@ if ($ENV{'QUERY_STRING'} =~ /^FETHER|^FIPADDR/ ) { &General::writehash($setting, \%dhcpsettings); &sortcurrent2; $dhcpsettings{'ACTION'} = 'SORT'; # create an 'ACTION' - map ($dhcpsettings{$_} = '',@nosaved,'KEY1','KEY2');# and reinit vars to empty + map ($dhcpsettings{$_} = '',@nosaved,'KEY1','KEY2');# and reinit vars to empty } #Sorting of allocated leases &Header::CheckSortOrder; -## Now manipulate the two multi-line list with Settings2. +## Now manipulate the two multi-line list with Settings2. # '1' suffix is for ADVANCED OPTIONS # '2' suffix is for FIXED LEASES @@ -319,12 +319,12 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'toggle enable disable'}.'1') { open(FILE, ">$filename1") or die 'Unable to open dhcp advanced options file.'; print FILE @current1; close(FILE); - + #Write changes to dhcpd.conf. &buildconf; } - + if ($dhcpsettings{'ACTION'} eq $Lang::tr{'add'}.'1' && $dhcpsettings{'SUBMIT'} ne $Lang::tr{'dhcp advopt help'}) { @@ -334,7 +334,7 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'add'}.'1' && if ($dhcpsettings{'ADVOPT_DATA'} eq '') { $errormessage=$Lang::tr{'dhcp advopt blank value'}; } - + # Test for a new option definition string (join field name & data) if (ExistNewOptionDefinition ($dhcpsettings{'ADVOPT_NAME'} . ' ' . $dhcpsettings{'ADVOPT_DATA'})) { #only edit permitted if option definition exists @@ -352,7 +352,7 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'add'}.'1' && } unless ($errormessage) { - + my $scope = ''; foreach my $itf (@ITFs) { # buils "RED,GREEN,ORANGE,... based on selection $scope .= $dhcpsettings{"ADVOPT_SCOPE_${itf}"} eq 'on' ? "\t$itf" : "\toff" ; @@ -387,7 +387,7 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'edit'}.'1') { if ($itf ne 'off') # Only is an interface name is read { $dhcpsettings{"ADVOPT_SCOPE_${itf}"} = 'on'; - } + } } } @@ -416,7 +416,7 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'toggle enable disable'}.'2') { open(FILE, ">$filename2") or die 'Unable to open fixed leases file.'; print FILE @current2; close(FILE); - + #Write changes to dhcpd.conf. &buildconf; } @@ -428,7 +428,7 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'add'}.'2') { if ($dhcpsettings{'FIX_NEXTADDR'}) { unless(&General::validip($dhcpsettings{'FIX_NEXTADDR'})) { $errormessage = $Lang::tr{'invalid fixed ip address'}; } } - + my $key = 0; CHECK:foreach my $line (@current2) { my @temp = split(/\,/,$line); @@ -438,13 +438,13 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'add'}.'2') { # Also it may be needed to put duplicate fixed lease in their right subnet definition.. foreach my $itf (@ITFs) { my $scoped = &General::IpInSubnet($dhcpsettings{'FIX_ADDR'}, - $netsettings{"${itf}_NETADDRESS"}, + $netsettings{"${itf}_NETADDRESS"}, $netsettings{"${itf}_NETMASK"}) && $dhcpsettings{"ENABLE_${itf}"} eq 'on'; if ( $scoped && (lc($dhcpsettings{'FIX_MAC'}) eq lc($temp[0])) && &General::IpInSubnet($temp[1], - $netsettings{"${itf}_NETADDRESS"}, + $netsettings{"${itf}_NETADDRESS"}, $netsettings{"${itf}_NETMASK"})) { $errormessage = "$Lang::tr{'mac address in use'} $dhcpsettings{'FIX_MAC'}"; last CHECK; @@ -755,10 +755,10 @@ print <<END END ; -# Put a checkbox for each interface. Checkbox visible disabled if interface is disabled +# Put a checkbox for each interface. Checkbox visible disabled if interface is disabled foreach my $itf (@ITFs) { my $lc_itf=lc($itf); - $checked{'ADVOPT_SCOPE_${itf}'}{'on'} = $dhcpsettings{"ADVOPT_SCOPE_${itf}"} ne 'on' ? '' : "checked='checked'"; + $checked{'ADVOPT_SCOPE_${itf}'}{'on'} = $dhcpsettings{"ADVOPT_SCOPE_${itf}"} ne 'on' ? '' : "checked='checked'"; print "$Lang::tr{\"${lc_itf}\"} <input type='checkbox' name='ADVOPT_SCOPE_${itf}' $checked{'ADVOPT_SCOPE_${itf}'}{'on'} "; print $dhcpsettings{"ENABLE_${itf}"} eq 'on' ? "/>" : "disabled='disabled' />"; print "   "; @@ -812,7 +812,7 @@ if ($dhcpsettings{'SUBMIT'} eq $Lang::tr{'dhcp advopt help'}) { print '<tr><td>wpad</td><td>code 252=text</td></tr>'; print '<tr><td>wpad</td><td>"http://www.server.fr/path-to/proxy.pac"</td></tr>'; print '</table>'; - + } print <<END @@ -838,7 +838,7 @@ foreach my $line (@current1) { $gdesc = $Lang::tr{'click to disable'}; } else { $gif = 'off.gif'; - $gdesc = $Lang::tr{'click to enable'}; + $gdesc = $Lang::tr{'click to enable'}; } if ($dhcpsettings{'KEY1'} eq $key) { @@ -846,7 +846,7 @@ foreach my $line (@current1) { } elsif ($key % 2) { print "<tr bgcolor='$color{'color22'}'>"; } else { - print "<tr bgcolor='$color{'color20'}'>"; + print "<tr bgcolor='$color{'color20'}'>"; } print <<END @@ -867,8 +867,8 @@ END } else { $global = $Lang::tr{'dhcp advopt scope global'}; } - - + + # Print each checked interface for (my $key=0; $key<@ITFs; $key++) { my $itf = $temp[3+$key]; @@ -1024,18 +1024,18 @@ my %ipoutside = (); foreach my $line (@current2) { my @temp = split(/\,/,$line); $macdupl{$temp[0]} += 1; - if ($macdupl{$temp[0]} > 1) { + if ($macdupl{$temp[0]} > 1) { $ipdup = 1; # Flag up duplicates for use later } $ipinuse{$temp[1]} += 1; - if ($ipinuse{$temp[1]} > 1) { + if ($ipinuse{$temp[1]} > 1) { $ipdup = 1; # Flag up duplicates for use later } # Mark IP addresses outwith known subnets $ipoutside{$temp[1]} = 1; foreach my $itf (@ITFs) { if ( &General::IpInSubnet($temp[1], - $netsettings{"${itf}_NETADDRESS"}, + $netsettings{"${itf}_NETADDRESS"}, $netsettings{"${itf}_NETMASK"})) { $ipoutside{$temp[1]} = 0; } @@ -1055,7 +1055,7 @@ foreach my $line (@current2) { $gdesc = $Lang::tr{'click to disable'}; } else { $gif = 'off.gif'; - $gdesc = $Lang::tr{'click to enable'}; + $gdesc = $Lang::tr{'click to enable'}; } # Skip all entries that do not match the search query @@ -1081,15 +1081,15 @@ foreach my $line (@current2) { my $TAG2 = ''; my $TAG3 = ''; my $TAG4 = ''; - if ($ipinuse{$temp[1]} > 1) { + if ($ipinuse{$temp[1]} > 1) { $TAG0 = '<b>'; $TAG1 = '</b>'; } - if ($macdupl{$temp[0]} > 1) { + if ($macdupl{$temp[0]} > 1) { $TAG2 = '<b>'; $TAG3 = '</b>'; } - if ($ipoutside{$temp[1]} > 0) { + if ($ipoutside{$temp[1]} > 0) { $TAG4 = "bgcolor='orange'" if ($dhcpsettings{'KEY2'} ne $key); } @@ -1230,7 +1230,7 @@ sub sortcurrent2 # use combination of ether & IP as key to allow duplicates in either but not both $entries{$record->{FETHER} . $record->{FIPADDR}} = $record; # add this to a hash of hashes } - + open(FILE, ">$filename2") or die 'Unable to open fixed lease file.'; foreach my $entry ( sort fixedleasesort keys %entries) { print FILE "$entries{$entry}->{FETHER},$entries{$entry}->{FIPADDR},$entries{$entry}->{DATA}\n"; @@ -1243,7 +1243,7 @@ sub sortcurrent2 close (FILE); undef (%entries); #This array is reused latter. Clear it. } - + # Build the configuration file mixing settings, fixed leases and advanced options sub buildconf { open(FILE, ">/${General::swroot}/dhcp/dhcpd.conf") or die "Unable to write dhcpd.conf file"; @@ -1263,7 +1263,7 @@ sub buildconf { } else { print FILE "ddns-update-style none;\n"; } - + # Write first new option definition foreach my $line (@current1) { chomp($line); # remove newline @@ -1276,7 +1276,7 @@ sub buildconf { foreach my $line (@current1) { chomp($line); # remove newline my @temp = split(/\t/,$line); - + if ($temp[0] eq 'on' && !ExistNewOptionDefinition ($temp[1] . ' ' . $temp[2])){ # active & !definition my $global=1; for (my $key=0; $key<@ITFs; $key++) { @@ -1289,7 +1289,7 @@ sub buildconf { if ($global) { print FILE "option $temp[1] $temp[2];\n"; } - }# on + }# on }# foreach line print FILE "\n"; @@ -1329,7 +1329,7 @@ sub buildconf { foreach my $line (@current1) { chomp($line); # remove newline my @temp = split(/\t/,$line); # Use TAB separator ! - + if ($temp[0] eq 'on'){ for (my $key=0; $key<@ITFs; $key++) { if ($itf eq $temp[3+$key]) # Only is an interface name is read @@ -1337,7 +1337,7 @@ sub buildconf { print FILE "\toption $temp[1] $temp[2];\n"; } } - }# on + }# on }# foreach line print FILE "} #$itf\n\n"; diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi index e2843a81f..4af5ed200 100644 --- a/html/cgi-bin/dnsforward.cgi +++ b/html/cgi-bin/dnsforward.cgi @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # # # ############################################################################### - + use strict; # enable only the following on debugging purpose diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi index 154efd7b2..36c0efc2e 100644 --- a/html/cgi-bin/extrahd.cgi +++ b/html/cgi-bin/extrahd.cgi @@ -100,8 +100,8 @@ END ; &General::system("/usr/local/bin/extrahdctrl", "mount", "$extrahdsettings{'PATH'}"); } -} -elsif ($extrahdsettings{'ACTION'} eq $Lang::tr{'delete'}) +} +elsif ($extrahdsettings{'ACTION'} eq $Lang::tr{'delete'}) { if ( &General::system("/usr/local/bin/extrahdctrl", "umount", "$extrahdsettings{'PATH'}")) { open( FILE, "< $devicefile" ) or die "Unable to read $devicefile"; diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 1341f5209..681d42770 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -100,7 +100,7 @@ my @protocols; &General::readhash("${General::swroot}/firewall/settings", \%fwdfwsettings); &General::readhash("${General::swroot}/main/settings", \%mainsettings); &General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color); -&General::readhash($fwoptions, \%optionsfw); +&General::readhash($fwoptions, \%optionsfw); &General::readhash($ifacesettings, \%ifaces); &General::readhash("$configovpn", \%ovpnsettings); &General::readhash("$configipsecrw", \%ipsecsettings); @@ -554,7 +554,7 @@ sub checksource if (&General::validport($_)){ push (@values,$_); }else{ - + } } } @@ -836,7 +836,7 @@ sub checkrule if (&General::validport($_)){ push (@values,$_); }else{ - + } } } @@ -974,16 +974,16 @@ sub checkvpn # A Test if manual ip is part of dynamic openvpn subnet is made in getcolor # because if one creates a custom host with the ip, we need to check the color there! # It does not make sense to check this here - + # Test if manual IP is part of an OpenVPN N2N subnet does also not make sense here # Is also checked in getcolor - + # Test if manual ip is part of an IPsec Network is also checked in getcolor return 1; } sub checkvpncolor { - + } sub deleterule { @@ -1247,7 +1247,7 @@ END print"<tr><td valign='top'><input type='radio' name='$grp' id='ipsec_net_$srctgt' value='ipsec_net_$srctgt' $checked{$grp}{'ipsec_net_'.$srctgt}></td><td >$Lang::tr{'fwhost ipsec net'}</td><td align='right'><select name='ipsec_net_$srctgt' style='width:200px;'><select></td></tr>"; } if ($show eq '1'){$show='';print"</select></td></tr>";} - + print"</table>"; print"</td></tr></table><br>"; } @@ -1585,10 +1585,10 @@ sub newrule $fwdfwsettings{'RULE_ACTION'} = $hash{$key}[0]; $fwdfwsettings{'chain'} = $hash{$key}[1]; $fwdfwsettings{'ACTIVE'} = $hash{$key}[2]; - $fwdfwsettings{'grp1'} = $hash{$key}[3]; - $fwdfwsettings{$fwdfwsettings{'grp1'}} = $hash{$key}[4]; - $fwdfwsettings{'grp2'} = $hash{$key}[5]; - $fwdfwsettings{$fwdfwsettings{'grp2'}} = $hash{$key}[6]; + $fwdfwsettings{'grp1'} = $hash{$key}[3]; + $fwdfwsettings{$fwdfwsettings{'grp1'}} = $hash{$key}[4]; + $fwdfwsettings{'grp2'} = $hash{$key}[5]; + $fwdfwsettings{$fwdfwsettings{'grp2'}} = $hash{$key}[6]; $fwdfwsettings{'USE_SRC_PORT'} = $hash{$key}[7]; $fwdfwsettings{'PROT'} = $hash{$key}[8]; $fwdfwsettings{'ICMP_TYPES'} = $hash{$key}[9]; @@ -1695,7 +1695,7 @@ sub newrule if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){ $fwdfwsettings{'oldorange'} ='on'; } - } + } } # Split manual source and target address and delete the subnet my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}}); @@ -1811,7 +1811,7 @@ END #---TARGET------------------------------------------------------ &Header::openbox('100%', 'left', $Lang::tr{'fwdfw target'}); print<<END; - <table width='100%' border='0'> + <table width='100%' border='0'> <tr><td width='1%'><input type='radio' name='grp2' value='tgt_addr' checked></td><td width='60%' nowrap='nowrap'>$Lang::tr{'fwdfw targetip'}<input type='TEXT' name='tgt_addr' value='$fwdfwsettings{'tgt_addr'}' size='16' maxlength='18'><td width='1%'><input type='radio' name='grp2' id='ipfire' value='ipfire' $checked{'grp2'}{'ipfire'}></td><td><b>Firewall</b></td> END print"<td align='right'><select name='ipfire' style='width:200px;'>"; @@ -2031,7 +2031,7 @@ END print"<tr><td width='12%'>$Lang::tr{'remark'}:</td><td width='88%' align='left'><input type='text' name='ruleremark' maxlength='255' value='$fwdfwsettings{'ruleremark'}' style='width:99%;'></td></tr>"; if($fwdfwsettings{'updatefwrule'} eq 'on' || $fwdfwsettings{'copyfwrule'} eq 'on'){ print "<tr><td width='12%'>$Lang::tr{'fwdfw rulepos'}:</td><td><select name='rulepos' >"; - for (my $count =1; $count <= $sum; $count++){ + for (my $count =1; $count <= $sum; $count++){ print"<option value='$count' "; print"selected='selected'" if($fwdfwsettings{'oldrulenumber'} eq $count); print">$count</option>"; @@ -2110,7 +2110,7 @@ END print "<option $selected{'TIME_FROM'}{$time}>$i:$j</option>\n"; } } - print<<END; + print<<END; </select> &dash; <select name='TIME_TO'> END @@ -2590,7 +2590,7 @@ END $color="$color{'color14'}"; $coloryellow=''; }elsif($coloryellow eq ''){ - if ($count % 2){ + if ($count % 2){ $color="$color{'color22'}"; } else{ diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index c66e3002a..baf745a0a 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -145,7 +145,7 @@ if ($fwhostsettings{'ACTION'} eq 'updatenet' ) $fwhostsettings{'netremark'} = $customnetwork{$key}[3]; $fwhostsettings{'count'} = $customnetwork{$key}[4]; delete $customnetwork{$key}; - + } } &General::writehasharray("$confignet", \%customnetwork); @@ -284,7 +284,7 @@ if ($fwhostsettings{'ACTION'} eq 'savenet' ) #convert ip if leading '0' exists $fwhostsettings{'IP'} = &Network::ip_remove_zero($fwhostsettings{'IP'}); - #check valid ip + #check valid ip if (!&General::validipandmask($fwhostsettings{'IP'}."/".$fwhostsettings{'SUBNET'})) { $errormessage=$errormessage.$Lang::tr{'fwhost err addr'}; @@ -448,7 +448,7 @@ if ($fwhostsettings{'ACTION'} eq 'savehost') } } #only check plausi when no error till now - if (!$errormessage){ + if (!$errormessage){ &plausicheck("edithost"); } if($fwhostsettings{'actualize'} eq 'on' && $fwhostsettings{'newhost'} ne 'on' && $errormessage){ @@ -465,7 +465,7 @@ if ($fwhostsettings{'ACTION'} eq 'savehost') $customhost{$key}[3] = $fwhostsettings{'orgremark'}; &General::writehasharray("$confighost", \%customhost); undef %customhost; - } + } if (!$errormessage){ #get count if host was edited if($fwhostsettings{'actualize'} eq 'on'){ @@ -560,7 +560,7 @@ if ($fwhostsettings{'ACTION'} eq 'savegrp') #check standard networks if ($fwhostsettings{'grp2'} eq 'std_net'){ @target=$fwhostsettings{'DEFAULT_SRC_ADR'}; - $type='Standard Network'; + $type='Standard Network'; } #check custom networks if ($fwhostsettings{'grp2'} eq 'cust_net' && $fwhostsettings{'CUST_SRC_NET'} ne ''){ @@ -626,7 +626,7 @@ if ($fwhostsettings{'ACTION'} eq 'savegrp') $fwhostsettings{'remark'}=''; } #check if host/net exists in grp - + my $test="$grp,$fwhostsettings{'oldremark'},@target,$type"; foreach my $key (keys %customgrp) { my $test1="$customgrp{$key}[0],$customgrp{$key}[1],$customgrp{$key}[2],$customgrp{$key}[3]"; @@ -636,7 +636,7 @@ if ($fwhostsettings{'ACTION'} eq 'savegrp') } } } - + if (!$errormessage){ #on first save, we have an empty @target, so fill it with nothing my $targetvalues=@target; @@ -1168,7 +1168,7 @@ if ($fwhostsettings{'ACTION'} eq 'changegrpremark') { $customgrp{$key}[1]=''; $customgrp{$key}[1]=$fwhostsettings{'newrem'}; - } + } } &General::writehasharray("$configgrp", \%customgrp); $fwhostsettings{'update'}='on'; @@ -1218,7 +1218,7 @@ if ($fwhostsettings{'ACTION'} eq 'changesrvgrpremark') { $customservicegrp{$key}[1]=''; $customservicegrp{$key}[1]=$fwhostsettings{'newsrvrem'}; - } + } } &General::writehasharray("$configsrvgrp", \%customservicegrp); $fwhostsettings{'updatesrvgrp'}='on'; @@ -1323,7 +1323,7 @@ sub showmenu { <tr><td colspan='6'></td></tr></table> END &Header::closebox(); - + } # Add sub addnet @@ -1367,11 +1367,11 @@ END if ($fwhostsettings{'ACTION'} eq 'edithost' || $fwhostsettings{'error'} eq 'on') { - + print " <td colspan='4' align='right'><input type='submit' value='$Lang::tr{'update'}' style='min-width:100px;'/><input type='hidden' name='ACTION' value='updatehost'><input type='hidden' name='orgremark' value='$fwhostsettings{'orgremark'}' ><input type='hidden' name='orgname' value='$fwhostsettings{'orgname'}' ><input type='hidden' name='update' value='on'><input type='hidden' name='newhost' value='$fwhostsettings{'newhost'}'></form>"; }else{ print " <td colspan='4' align='right'><input type='submit' name='savehost' value='$Lang::tr{'save'}' style='min-width:100px;' /><input type='hidden' name='ACTION' value='savehost' /><input type='hidden' name='newhost' value='on'>"; - } + } print " </form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;' ><input type='hidden' name='ACTION' value='resethost'></form></td></tr></table>"; &Header::closebox(); } @@ -1397,7 +1397,7 @@ sub addgrp $fwhostsettings{'oldgrpname'}=$fwhostsettings{'grp_name'}; my $grp=$fwhostsettings{'grp_name'}; my $rem=$fwhostsettings{'remark'}; - if ($fwhostsettings{'update'} eq ''){ + if ($fwhostsettings{'update'} eq ''){ print<<END; <table width='100%' border='0'> <tr> @@ -1869,9 +1869,9 @@ sub viewtablenet &General::readhasharray("$fwconfiginp", \%fwinp); &General::readhasharray("$fwconfigout", \%fwout); - if (!keys %customnetwork) - { - print "<center><b>$Lang::tr{'fwhost empty'}</b>"; + if (!keys %customnetwork) + { + print "<center><b>$Lang::tr{'fwhost empty'}</b>"; }else{ print<<END; <table width='100%' cellspacing='0' class='tbl'> @@ -1885,7 +1885,7 @@ END print" <tr>"; $col="bgcolor='${Header::colouryellow}'"; }elsif ($count % 2) - { + { $col="bgcolor='$color{'color20'}'"; print" <tr>"; }else @@ -1915,7 +1915,7 @@ END } print"</table>"; &Header::closebox(); - } + } } sub getcolor @@ -2015,9 +2015,9 @@ sub viewtablehost &General::readhasharray("$fwconfiginp", \%fwinp); &General::readhasharray("$fwconfigout", \%fwout); &General::readhasharray("$configgrp", \%customgrp); - if (!keys %customhost) - { - print "<center><b>$Lang::tr{'fwhost empty'}</b>"; + if (!keys %customhost) + { + print "<center><b>$Lang::tr{'fwhost empty'}</b>"; }else{ print<<END; <table width='100%' cellspacing='0' class='tbl'> @@ -2085,7 +2085,7 @@ sub viewtablegrp my $delflag; my @counter; my %hash; - if (!keys %customgrp) + if (!keys %customgrp) { print "<center><b>$Lang::tr{'fwhost err emptytable'}</b>"; }else{ @@ -2136,7 +2136,7 @@ sub viewtablegrp print"<tr>"; $col="bgcolor='$color{'color22'}'"; } - my $ip=&getipforgroup($customgrp{$key}[2],$customgrp{$key}[3]); + my $ip=&getipforgroup($customgrp{$key}[2],$customgrp{$key}[3]); if ($ip eq ''){ print"<tr>"; $col="bgcolor='${Header::colouryellow}'"; @@ -2548,7 +2548,7 @@ sub checkname } } return 1; - + } sub checkgroup { @@ -2574,7 +2574,7 @@ sub checkservice } sub checkip { - + my %hash=%{(shift)}; my $a=shift; foreach my $key (keys %hash) { @@ -2603,7 +2603,7 @@ sub checkservicegroup foreach my $key (keys %customservicegrp) { if( $customservicegrp{$key}[0] eq $fwhostsettings{'SRVGRP_NAME'} ){ $errormessage.=$Lang::tr{'fwhost err grpexist'}."<br>"; - + } } } @@ -2667,7 +2667,7 @@ sub get_name foreach my $network (sort keys %defaultNetworks) { return "$network" if ($val eq $defaultNetworks{$network}{'NAME'}); - } + } } sub gethostcount { @@ -2827,7 +2827,7 @@ sub deletefromgrp } } &General::writehasharray("$config",\%hash); - + } sub plausicheck { @@ -2893,13 +2893,13 @@ sub plausicheck $errormessage=$errormessage."<br>".$Lang::tr{'fwhost err netexist'}; $fwhostsettings{'HOSTNAME'} = $fwhostsettings{'orgname'}; if ($fwhostsettings{'update'} eq 'on'){$fwhostsettings{'ACTION'}=$edit;} - } - #check if network ip already exists + } + #check if network ip already exists if (!&checkip(\%customnetwork,1)) { $errormessage=$errormessage."<br>".$Lang::tr{'fwhost err net'}; if ($fwhostsettings{'update'} eq 'on'){$fwhostsettings{'ACTION'}=$edit;} - } + } #check if host with this name already exists &General::readhasharray("$confighost", \%customhost); if (!&checkname(\%customhost)) @@ -2920,7 +2920,7 @@ sub getipforgroup my $name=$_[0], my $type=$_[1]; my $value; - + #get address from IPSEC NETWORK if ($type eq 'IpSec Network'){ foreach my $key (keys %ipsecconf) { @@ -2946,7 +2946,7 @@ sub getipforgroup } &deletefromgrp($name,$configgrp); } - + #get address from IPSEC HOST if ($type eq 'IpSec Host'){ foreach my $key (keys %ipsecconf) { @@ -2956,7 +2956,7 @@ sub getipforgroup } &deletefromgrp($name,$configgrp); } - + #get address from ovpn ccd Net-2-Net if ($type eq 'OpenVPN N-2-N'){ foreach my $key (keys %ccdhost) { @@ -2968,7 +2968,7 @@ sub getipforgroup } &deletefromgrp($name,$configgrp); } - + #get address from ovpn ccd static host if ($type eq 'OpenVPN static host'){ foreach my $key (keys %ccdhost) { @@ -2980,7 +2980,7 @@ sub getipforgroup } &deletefromgrp($name,$configgrp); } - + #get address from ovpn ccd static net if ($type eq 'OpenVPN static network'){ foreach my $key (keys %ccdnet) { @@ -2991,7 +2991,7 @@ sub getipforgroup } } } - + #check custom addresses if ($type eq 'Custom Host'){ foreach my $key (keys %customhost) { @@ -3001,7 +3001,7 @@ sub getipforgroup } } } - + ##check custom networks if ($type eq 'Custom Network'){ foreach my $key (keys %customnetwork) { @@ -3010,7 +3010,7 @@ sub getipforgroup } } } - + #check standard networks if ($type eq 'Standard Network'){ if ($name =~ /OpenVPN/i){ @@ -3060,7 +3060,7 @@ sub decrease } } } - + if (($customgrp{$key}[0] eq $grp) && ($customgrp{$key}[3] eq 'Custom Host')){ foreach my $key2 (sort keys %customhost){ if ($customhost{$key2}[0] eq $customgrp{$key}[2]){ @@ -3068,7 +3068,7 @@ sub decrease last; } } - + } } &General::writehasharray("$confignet", \%customnetwork); @@ -3079,7 +3079,7 @@ sub decreaseservice my $grp=$_[0]; &General::readhasharray("$configsrv", \%customservice); &General::readhasharray("$configsrvgrp", \%customservicegrp); - + foreach my $key (sort keys %customservicegrp){ if ($customservicegrp{$key}[0] eq $grp ){ foreach my $key2 (sort keys %customservice){ @@ -3090,7 +3090,7 @@ sub decreaseservice } } &General::writehasharray("$configsrv", \%customservice); - + } sub changenameinfw { @@ -3130,7 +3130,7 @@ sub changenameinfw } sub checkports { - + my %hash=%{(shift)}; #check empty fields if ($fwhostsettings{'SRV_NAME'} eq '' ){ @@ -3145,7 +3145,7 @@ sub checkports } #change dashes with : $fwhostsettings{'SRV_PORT'}=~ tr/-/:/; - + if ($fwhostsettings{'SRV_PORT'} eq "*") { $fwhostsettings{'SRV_PORT'} = "1:65535"; } diff --git a/html/cgi-bin/getrrdimage.cgi b/html/cgi-bin/getrrdimage.cgi index 26bcf0905..26e026bba 100644 --- a/html/cgi-bin/getrrdimage.cgi +++ b/html/cgi-bin/getrrdimage.cgi @@ -52,8 +52,8 @@ my $range = lc $query{'range'}; # lower case unless(($origin =~ /^\w+?\.cgi$/) && ($graph =~ /^[\w\-.,; ]+?$/) && ($range ~~ @Graphs::time_ranges)) { # Send HTTP headers _start_svg_output(); - - _print_error("URL parameters missing or malformed."); + + _print_error("URL parameters missing or malformed."); exit; } @@ -62,13 +62,13 @@ unless(($origin =~ /^\w+?\.cgi$/) && ($graph =~ /^[\w\-.,; ]+?$/) && ($range ~~ unless(($origin ~~ @supported_origins) || ($origin eq "getrrdimage.cgi")) { # Rewrite to old URL format: /[graph origin cgi]?[graph name]?[time range] my $location = "https://$ENV{'SERVER_NAME'}:$ENV{'SERVER_PORT'}/cgi-bin/${origin}?${graph}?${range}"; - + # Send HTTP redirect print "Status: 302 Found\n"; print "Location: $location\n"; print "Content-type: text/html; charset=UTF-8\n"; print "\n"; # End of HTTP headers - + print "Unsupported origin, request redirected to '$location'"; exit; } diff --git a/html/cgi-bin/gpl.cgi b/html/cgi-bin/gpl.cgi index 140fd2178..029b048e8 100644 --- a/html/cgi-bin/gpl.cgi +++ b/html/cgi-bin/gpl.cgi @@ -57,7 +57,7 @@ print <<END; $Lang::tr{'gpl please read carefully the general public license and accept it below'}. <br /><br /> END -; +; if ( -e "/usr/share/doc/licenses/GPLv3" ) { print '<textarea rows=\'25\' cols=\'75\' readonly=\'readonly\'>'; diff --git a/html/cgi-bin/hosts.cgi b/html/cgi-bin/hosts.cgi index a99d1364a..c06af91e7 100644 --- a/html/cgi-bin/hosts.cgi +++ b/html/cgi-bin/hosts.cgi @@ -54,7 +54,7 @@ $settings{'HOST'} = ''; $settings{'DOM'} = ''; $settings{'PTR'} = ''; my @nosaved=('EN','IP','HOST','DOM','PTR'); # List here ALL setting2 fields. Mandatory - + $settings{'ACTION'} = ''; # add/edit/remove $settings{'KEY1'} = ''; # point record for ACTION @@ -101,14 +101,14 @@ if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { $temp[0] = $temp[0] ne '' ? '' : 'on'; # Toggle the field @current[$settings{'KEY1'}] = join (',',@temp)."\n"; $settings{'KEY1'} = ''; # End edit mode - + &General::log($Lang::tr{'hosts config changed'}); #Save current open(FILE, ">$datafile") or die 'hosts datafile error'; print FILE @current; close(FILE); - + # Rebuild configuration file &BuildConfiguration; } @@ -140,7 +140,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { # Write changes to config file. &SortDataFile; # sort newly added/modified entry &BuildConfiguration; # then re-build new host - + #map ($settings{$_}='' ,@nosaved); # Clear fields } } @@ -162,7 +162,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'edit'}) { } if ($settings{'ACTION'} eq $Lang::tr{'remove'}) { - splice (@current,$settings{'KEY1'},1); # Delete line + splice (@current,$settings{'KEY1'},1); # Delete line open(FILE, ">$datafile") or die 'hosts datafile error'; print FILE @current; close(FILE); @@ -331,7 +331,7 @@ foreach my $line (@current) { $gdesc = $Lang::tr{'click to disable'}; } else { $gif = 'off.gif'; - $gdesc = $Lang::tr{'click to enable'}; + $gdesc = $Lang::tr{'click to enable'}; } if ($temp[4] eq '' || $temp[4] eq 'on') { @@ -418,7 +418,7 @@ END sub SortDataFile { our %entries = (); - + # Sort pair of record received in $a $b special vars. # When IP is specified use numeric sort else alpha. # If sortname ends with 'Rev', do reverse sort. @@ -462,13 +462,13 @@ sub SortDataFile # Build a pair 'Field Name',value for each of the data dataline. # Each SORTABLE field must have is pair. # Other data fields (non sortable) can be grouped in one - + my @record = ('KEY',$key++,'EN',$temp[0],'IP',$temp[1],'HOST',$temp[2],'DOM',$temp[3],'PTR',$temp[4]); my $record = {}; # create a reference to empty hash %{$record} = @record; # populate that hash with @record $entries{$record->{KEY}} = $record; # add this to a hash of hashes } - + open(FILE, ">$datafile") or die 'hosts datafile error'; # Each field value is printed , with the newline ! Don't forget separator and order of them. diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 2b7ccdb0f..18c26942e 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -113,7 +113,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'}) chmod 0600, "${General::swroot}/ppp/secrets"; close FILE; - &General::log("$Lang::tr{'profile made current'} $tempcgiparams{'PROFILENAME'}"); + &General::log("$Lang::tr{'profile made current'} $tempcgiparams{'PROFILENAME'}"); $cgiparams{'ACTION'} = "$Lang::tr{'dial'}"; } @@ -138,7 +138,7 @@ for ($c = 1; $c <= $maxprofiles; $c++) } my %selected; for ($c = 1; $c <= $maxprofiles; $c++) { - $selected{'PROFILE'}{$c} = ''; + $selected{'PROFILE'}{$c} = ''; } $selected{'PROFILE'}{$pppsettings{'PROFILE'}} = "selected='selected'"; my $dialButtonDisabled = "disabled='disabled'"; @@ -572,7 +572,7 @@ foreach my $line (@df) { # and root size should not vary during time $warnmessage .= "<li>$Lang::tr{'filesystem full'}: $temp[0] <b>$Lang::tr{'free'}=$1M</b> !</li>"; } - + } else { # $line =~ m/^.* (\d+)m.*$/; $line =~ m/^.* (\d+)\%.*$/; diff --git a/html/cgi-bin/iptables.cgi b/html/cgi-bin/iptables.cgi index f900562d9..a27d6a920 100644 --- a/html/cgi-bin/iptables.cgi +++ b/html/cgi-bin/iptables.cgi @@ -100,7 +100,7 @@ END } $chainname = $chainstring[1]; - $chains{$chainname."start"} = $lines; + $chains{$chainname."start"} = $lines; } $lines++; @@ -222,11 +222,11 @@ END } $chainname = $chainstring[1]; - $chainsman{$chainname."start"} = $manlines; + $chainsman{$chainname."start"} = $manlines; } $manlines++; - + } $chainsman{$chainname."end"} = $manlines-1; close (FILE); @@ -349,11 +349,11 @@ END } $chainname = $chainstring[1]; - $chainsnat{$chainname."start"} = $natlines; + $chainsnat{$chainname."start"} = $natlines; } $natlines++; - + } $chainsnat{$chainname."end"} = $natlines-1; close (FILE); diff --git a/html/cgi-bin/logs.cgi/calamaris.dat b/html/cgi-bin/logs.cgi/calamaris.dat index 07fdf8a88..dcc812e47 100644 --- a/html/cgi-bin/logs.cgi/calamaris.dat +++ b/html/cgi-bin/logs.cgi/calamaris.dat @@ -39,7 +39,7 @@ my $hintcolour='#FFFFCC'; my $commandline=''; -my %monthidx = (qw(Jan 0 Feb 1 Mar 2 Apr 3 May 4 Jun 5 Jul 6 Aug 7 Sep 8 Oct 9 Nov 10 Dec 11)); +my %monthidx = (qw(Jan 0 Feb 1 Mar 2 Apr 3 May 4 Jun 5 Jul 6 Aug 7 Sep 8 Oct 9 Nov 10 Dec 11)); my @longmonths = ( $Lang::tr{'january'}, $Lang::tr{'february'}, $Lang::tr{'march'}, $Lang::tr{'april'}, $Lang::tr{'may'}, $Lang::tr{'june'}, $Lang::tr{'july'}, @@ -350,7 +350,7 @@ print <<END <select name='DAY_BEGIN'> END ; -for ($day_begin = 1; $day_begin <= 31; $day_begin++) +for ($day_begin = 1; $day_begin <= 31; $day_begin++) { print "\t<option "; if ($day_begin == $reportsettings{'DAY_BEGIN'}) { @@ -364,7 +364,7 @@ print <<END <select name='YEAR_BEGIN'> END ; -for ($year_begin = $year-2; $year_begin <= $year+1; $year_begin++) +for ($year_begin = $year-2; $year_begin <= $year+1; $year_begin++) { print "\t<option "; if ($year_begin == $reportsettings{'YEAR_BEGIN'}) { @@ -393,7 +393,7 @@ print <<END <select name='DAY_END'> END ; -for ($day_end = 1; $day_end <= 31; $day_end++) +for ($day_end = 1; $day_end <= 31; $day_end++) { print "\t<option "; if ($day_end == $reportsettings{'DAY_END'}) { @@ -407,7 +407,7 @@ print <<END <select name='YEAR_END'> END ; -for ($year_end = $year-2; $year_end <= $year+1; $year_end++) +for ($year_end = $year-2; $year_end <= $year+1; $year_end++) { print "\t<option "; if ($year_end == $reportsettings{'YEAR_END'}) { diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat index 73596d8cd..467d06008 100644 --- a/html/cgi-bin/logs.cgi/firewalllog.dat +++ b/html/cgi-bin/logs.cgi/firewalllog.dat @@ -122,7 +122,7 @@ my $date = $cgiparams{'DAY'} == 0 ? '' : $cgiparams{'DAY'} <= 9 ? "0$cgiparams{ { my $xday; - + # Calculate time. If future date, calculate for past year !!! if (( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) || ( $cgiparams{'MONTH'} > $now[4] ) ) { @@ -216,7 +216,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'export'}) $day =~ tr / /0/; my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ; print "$time $3\r\n"; - + } exit 0; } @@ -248,7 +248,7 @@ for (my $month = 0; $month < 12; $month++) { print "\t<option "; if ($month == $cgiparams{'MONTH'}) { - print "selected='selected' "; + print "selected='selected' "; } print "value='$month'>$longmonths[$month]</option>\n"; } @@ -261,11 +261,11 @@ print <<END END ; print "<option value='0'>$Lang::tr{'all'}</option>\n"; -for (my $day = 1; $day <= 31; $day++) +for (my $day = 1; $day <= 31; $day++) { print "\t<option "; if ($day == $cgiparams{'DAY'}) { - print "selected='selected' "; + print "selected='selected' "; } print "value='$day'>$day</option>\n"; } @@ -298,7 +298,7 @@ if ($start == 0) { $prev = $start - ${Header::viewsize}; $prev = 0 if ( $prev < 0); } - + my $next; if ($start == $lastPageIndex) { $next = -1; @@ -339,7 +339,7 @@ foreach $_ (@log) my $day = $1; $day =~ tr / /0/; my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ; - my $chain = $3; + my $chain = $3; my ($iface, $srcaddr, $dstaddr, $macaddr, $proto, $srcport, $dstport); if ($packet =~ /PHYSIN=(\w+)/) { $iface=$1; } elsif ($packet =~ /IN=(\w+)/) { $iface = $1; } @@ -364,7 +364,7 @@ foreach $_ (@log) my $servi = uc(getservbyport($srcport, lc($proto))); if ($servi ne '' && $srcport < 1024) { - $srcport = "$srcport($servi)"; + $srcport = "$srcport($servi)"; } $servi = uc(getservbyport($dstport, lc($proto))); if ($servi ne '' && $dstport < 1024) { @@ -375,11 +375,11 @@ foreach $_ (@log) my $col=""; if ($lines % 2) { print "<tr>"; - $col="bgcolor='$color{'color20'}'"; + $col="bgcolor='$color{'color20'}'"; } else { print "<tr>"; - $col="bgcolor='$color{'color22'}'"; + $col="bgcolor='$color{'color22'}'"; } print <<END @@ -428,21 +428,21 @@ END print "<td align='center' width='50%'>"; if ($prev != -1) { - print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?0,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'first'}</a> "; - print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'older'}</a>"; + print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?0,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'first'}</a> "; + print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'older'}</a>"; } else { - print "$Lang::tr{'first'} $Lang::tr{'older'}"; + print "$Lang::tr{'first'} $Lang::tr{'older'}"; } print "</td>\n"; print "<td align='center' width='50%'>"; if ($next >= 0) { print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'newer'}</a> "; - print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$lastPageIndex,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'last'}</a>"; + print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$lastPageIndex,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'last'}</a>"; } else { - print "$Lang::tr{'newer'} $Lang::tr{'last'} "; + print "$Lang::tr{'newer'} $Lang::tr{'last'} "; } print "</td>\n"; diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi-bin/logs.cgi/firewalllogcountry.dat index a55b80511..4e998a567 100644 --- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat +++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat @@ -4,7 +4,7 @@ # # This code is distributed under the terms of the GPL # -# JC HERITIER +# JC HERITIER # page inspired from the initial firewalllog.dat # # Modified for IPFire by Christian Schmidt @@ -150,7 +150,7 @@ my $longmonthstr = $longmonths[$cgiparams{'MONTH'}]; my $day = $cgiparams{'DAY'}; my $daystr=''; if ($day <= 9) { - $daystr = " $day"; + $daystr = " $day"; } else { $daystr = $day; @@ -182,7 +182,7 @@ if (!$skip) $lines++; } } - close (FILE); + close (FILE); } $skip=0; @@ -249,7 +249,7 @@ print <<END <select name='DAY'> END ; -for ($day = 1; $day <= 31; $day++) +for ($day = 1; $day <= 31; $day++) { print "\t<option "; if ($day == $cgiparams{'DAY'}) { @@ -386,7 +386,7 @@ my @numb; my $o; if($cgiparams{'otherspie'} == 2 ){} -else{ +else{ my $numothers; for($o=0;$o<$pienumber;$o++){ $numothers = $numothers + $numb[$o]; diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat index 4474a8c59..a7c6e5f80 100644 --- a/html/cgi-bin/logs.cgi/firewalllogip.dat +++ b/html/cgi-bin/logs.cgi/firewalllogip.dat @@ -4,7 +4,7 @@ # # This code is distributed under the terms of the GPL # -# JC HERITIER +# JC HERITIER # page inspired from the initial firewalllog.dat # # Modified for IPFire by Christian Schmidt @@ -181,7 +181,7 @@ if (!$skip) $lines++; } } - close (FILE); + close (FILE); } $skip=0; @@ -237,7 +237,7 @@ for ($month = 0; $month < 12; $month++) { print "\t<option "; if ($month == $cgiparams{'MONTH'}) { - print "selected='selected' "; + print "selected='selected' "; } print "value='$month'>$longmonths[$month]</option>\n"; } @@ -249,11 +249,11 @@ print <<END <select name='DAY'> END ; -for ($day = 1; $day <= 31; $day++) +for ($day = 1; $day <= 31; $day++) { print "\t<option "; if ($day == $cgiparams{'DAY'}) { - print "selected='selected' "; + print "selected='selected' "; } print "value='$day'>$day</option>\n"; } @@ -359,7 +359,7 @@ my @numb; my $o; if($cgiparams{'otherspie'} == 2 ){} -else{ +else{ my $numothers; for($o=0;$o<$pienumber;$o++){ $numothers = $numothers + $numb[$o]; @@ -437,7 +437,7 @@ for($s=0;$s<$lines;$s++) # Get country code. my $ccode = &Location::Functions::lookup_country_code($key[$s]); - + $color++; print "<td align='center' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='$Lang::tr{'details'}'></form></td>"; print "<td align='center' $col><a href='/cgi-bin/ipinfo.cgi?ip=$key[$s]'>$key[$s]</a></td>"; diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cgi/firewalllogport.dat index bcaffad70..60b3b0603 100644 --- a/html/cgi-bin/logs.cgi/firewalllogport.dat +++ b/html/cgi-bin/logs.cgi/firewalllogport.dat @@ -4,7 +4,7 @@ # # This code is distributed under the terms of the GPL # -# JC HERITIER +# JC HERITIER # page inspired from the initial firewalllog.dat # # Modified for IPFire by Christian Schmidt @@ -249,7 +249,7 @@ print <<END <select name='DAY'> END ; -for ($day = 1; $day <= 31; $day++) +for ($day = 1; $day <= 31; $day++) { print "\t<option "; if ($day == $cgiparams{'DAY'}) { @@ -360,7 +360,7 @@ my @numb; my $o; if($cgiparams{'otherspie'} == 2 ){} -else{ +else{ my $numothers; for($o=0;$o<$pienumber;$o++){ $numothers = $numothers + $numb[$o]; diff --git a/html/cgi-bin/logs.cgi/ids.dat b/html/cgi-bin/logs.cgi/ids.dat index b9c19aa17..35c0dd1fd 100644 --- a/html/cgi-bin/logs.cgi/ids.dat +++ b/html/cgi-bin/logs.cgi/ids.dat @@ -71,7 +71,7 @@ if ($ENV{'QUERY_STRING'} && $cgiparams{'ACTION'} ne $Lang::tr{'update'}) my @temp = split(',',$ ENV{'QUERY_STRING'}); $start = $temp[0]; $cgiparams{'MONTH'} = $temp[1]; - $cgiparams{'DAY'} = $temp[2]; + $cgiparams{'DAY'} = $temp[2]; } if (!($cgiparams{'MONTH'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11)$/) || @@ -116,7 +116,7 @@ if (($cgiparams{'DAY'} ne $now[3]) || ($cgiparams{'MONTH'} ne $now[4])) @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 )); } $tdoy = $then[7]; - my $lastleap=($year-1)%4; + my $lastleap=($year-1)%4; if ($tdoy>$doy) { if ($lastleap == 0 && $tdoy < 60) { $doy=$doy+366; @@ -158,7 +158,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'export'}) { print "Content-type: text/plain\n\n"; print "IPFire IPS log\r\n"; - print "Date: $cgiparams{'DAY'} $longmonths[$cgiparams{'MONTH'}]\r\n"; + print "Date: $cgiparams{'DAY'} $longmonths[$cgiparams{'MONTH'}]\r\n"; print "\r\n"; if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @log = reverse @log; } @@ -231,7 +231,7 @@ print <<END <select name='DAY'> END ; -for (my $day = 1; $day <= 31; $day++) +for (my $day = 1; $day <= 31; $day++) { print "\t<option "; if ($day == $cgiparams{'DAY'}) { diff --git a/html/cgi-bin/logs.cgi/ovpnclients.dat b/html/cgi-bin/logs.cgi/ovpnclients.dat index 100573214..8fbf4f8fa 100755 --- a/html/cgi-bin/logs.cgi/ovpnclients.dat +++ b/html/cgi-bin/logs.cgi/ovpnclients.dat @@ -329,7 +329,7 @@ unless ($errormessage) { } # If nothing has been fetched, the amount of lines is still zero. -# In this case display a hint about no data. +# In this case display a hint about no data. unless ($lines) { print "<tr><td bgcolor='$color{'color22'}' colspan='6' align='center'>$Lang::tr{'no entries'}</td></tr>\n"; } diff --git a/html/cgi-bin/logs.cgi/proxylog.dat b/html/cgi-bin/logs.cgi/proxylog.dat index 8724768ea..5109ca4cf 100644 --- a/html/cgi-bin/logs.cgi/proxylog.dat +++ b/html/cgi-bin/logs.cgi/proxylog.dat @@ -50,7 +50,7 @@ my $doy = $now[7]; # day of year (0..364) my $tdoy = $now[7]; my $year = $now[5]+1900; -$cgiparams{'DAY'} = $now[3]; +$cgiparams{'DAY'} = $now[3]; $cgiparams{'MONTH'} = $now[4]; $cgiparams{'SOURCE_IP'} = 'ALL'; $cgiparams{'FILTER'} = "[.](gif|jpeg|jpg|png|css|js)\$"; @@ -70,7 +70,7 @@ if ($cgiparams{'ACTION'} eq '') if ($cgiparams{'ACTION'} eq $Lang::tr{'restore defaults'}) { $cgiparams{'FILTER'} = "[.](gif|jpeg|jpg|png|css|js)\$"; - $cgiparams{'ENABLE_FILTER'} = 'off'; + $cgiparams{'ENABLE_FILTER'} = 'off'; } { @@ -88,7 +88,7 @@ if ($ENV{'QUERY_STRING'} && $cgiparams{'ACTION'} ne $Lang::tr{'update'}) my @temp = split(',',$ENV{'QUERY_STRING'}); $start = $temp[0]; $cgiparams{'MONTH'} = $temp[1]; - $cgiparams{'DAY'} = $temp[2]; + $cgiparams{'DAY'} = $temp[2]; $cgiparams{'SOURCE_IP'} = $temp[3]; $cgiparams{'USERNAME'} = &Header::escape($temp[4]); } @@ -151,7 +151,7 @@ my $daystr = $cgiparams{'DAY'} == 0 ? '' :$cgiparams{'DAY'} <= 9 ? "0$cgiparams{ # Calculate time. If future date, calculate for past year !!! if (( $cgiparams{'MONTH'} eq $now[4]) && ($cgiparams{'DAY'} > $now[3]) || - ( $cgiparams{'MONTH'} > $now[4] ) ) { + ( $cgiparams{'MONTH'} > $now[4] ) ) { $xday = POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1901 ); $daystr = "$longmonths[$cgiparams{'MONTH'}] $daystr, ". int($year-1); } else { @@ -210,14 +210,14 @@ if ($@ ne '') $temp_now[2] = $temp_now[1] = $temp_now[0] = 0; # start at 00:00:00 $temp_now[3] = 1 if ($cgiparams{'DAY'}==0); # All days selected, start at '1' - my $mintime = POSIX::mktime(@temp_now); + my $mintime = POSIX::mktime(@temp_now); my $maxtime; if ($cgiparams{'DAY'}==0) { # full month if ($temp_now[4]++ == 12){ $temp_now[4] = 0; $temp_now[5]++; }; - $maxtime = POSIX::mktime(@temp_now); + $maxtime = POSIX::mktime(@temp_now); } else { $maxtime = $mintime + 86400; # full day } @@ -248,7 +248,7 @@ if ($@ ne '') # $datetime = $maxtime; # we have read viewsize lines, stop main loop # last READ; # exit read file } - } + } } # finish loop when date of lines are past maxtime @@ -278,7 +278,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'export'}) { print "Content-type: text/plain\n\n"; print "IPFire proxy log\r\n"; - print "$Lang::tr{'date'}: $daystr\r\n"; + print "$Lang::tr{'date'}: $daystr\r\n"; print "Source IP: $cgiparams{'SOURCE_IP'}\r\n"; print "Username: $cgiparams{'USERNAME'}\r\n"; if ($cgiparams{'ENABLE_FILTER'} eq 'on') { @@ -350,7 +350,7 @@ print <<END END ; print "<option value='0'>$Lang::tr{'all'}</option>"; -for (my $day = 1; $day <= 31; $day++) +for (my $day = 1; $day <= 31; $day++) { print "\t<option "; if ($day == $cgiparams{'DAY'}) { @@ -464,7 +464,7 @@ foreach $_ (@log) $url =~ /(^.{0,60})/; my $part = $1; - unless (length($part) < 60) { $part = "${part}..."; } + unless (length($part) < 60) { $part = "${part}..."; } $url = &Header::cleanhtml($url,"y"); $part = &Header::cleanhtml($part,"y"); if ($cgiparams{'DAY'}==0) { # full month diff --git a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat index f81994f87..39f60cd5d 100644 --- a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat +++ b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat @@ -3,7 +3,7 @@ # # This code is distributed under the terms of the GPL # -# JC HERITIER +# JC HERITIER # page inspired from the initial firewalllog.dat # # Modified for IPFire by Christian Schmidt (www.ipfire.org) @@ -168,7 +168,7 @@ if (!$skip) if ($packet =~ /PHYSIN=(\w+)/) { $iface = $1; } elsif ($packet =~ /IN=(\w+)/) { $iface = $1; } # Extract ipv4 and ipv6 addresses if (($packet =~ /SRC\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($packet =~ /SRC\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) { - $srcaddr = $1; + $srcaddr = $1; } if($iface eq $country) { @@ -186,7 +186,7 @@ if (!$skip) } } } - close (FILE); + close (FILE); } $skip=0; @@ -257,7 +257,7 @@ for ($month = 0; $month < 12; $month++) { print "\t<option "; if ($month == $cgiparams{'MONTH'}) { - print "selected='selected' "; + print "selected='selected' "; } print "value='$month'>$longmonths[$month]</option>\n"; } @@ -269,7 +269,7 @@ print <<END <select name='DAY'> END ; -for ($day = 1; $day <= 31; $day++) +for ($day = 1; $day <= 31; $day++) { print "\t<option "; if ($day == $cgiparams{'DAY'}) { @@ -295,7 +295,7 @@ END print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>"; if ($start == -1) { - $start = $lines - ${Header::viewsize}; + $start = $lines - ${Header::viewsize}; } if ($start >= $lines - ${Header::viewsize}) { $start = $lines - ${Header::viewsize}; }; if ($start < 0) { $start = 0; } @@ -336,9 +336,9 @@ foreach $_ (@slice) if (/^... (..) (..:..:..) [\w\-]+ kernel:(.*)(PHYSIN=.*)$/) {} elsif (/^... (..) (..:..:..) [\w\-]+ kernel:(.*)(IN=.*)$/) {}; my $packet = $4; - my $iface = ''; + my $iface = ''; # If ipv6 uses bridge, use PHYSIN otherwise use IN - if ($packet =~ /PHYSIN=(\w+)/) { $iface = $1; } elsif ($packet =~ /IN=(\w+)/) { $iface = $1; } + if ($packet =~ /PHYSIN=(\w+)/) { $iface = $1; } elsif ($packet =~ /IN=(\w+)/) { $iface = $1; } if ( $1 =~ /2./ ){ $iface=""; } my $srcaddr = ''; # Extract ipv4 and ipv6 addresses @@ -377,10 +377,10 @@ foreach $_ (@slice) if ($a =~ /DPT\=([\d\.]+)/){ $dstport = $1; } if ($lines % 2) { - print "<tr bgcolor='${Header::table1colour}'>\n"; + print "<tr bgcolor='${Header::table1colour}'>\n"; } else { - print "<tr bgcolor='${Header::table2colour}'>\n"; + print "<tr bgcolor='${Header::table2colour}'>\n"; } print <<END <td align='center'>$time</td> @@ -432,19 +432,19 @@ END print "<td align='center' width='50%'>"; if ($prev != -1) { - print "<a href='/cgi-bin/logs.cgi/showrequestfromcountry.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{country}'>$Lang::tr{'older'}</a>"; + print "<a href='/cgi-bin/logs.cgi/showrequestfromcountry.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{country}'>$Lang::tr{'older'}</a>"; } else { - print "$Lang::tr{'older'}"; + print "$Lang::tr{'older'}"; } print "</td>\n"; print "<td align='center' width='50%'>"; if ($next != -1) { - print "<a href='/cgi-bin/logs.cgi/showrequestfromcountry.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{country}'>$Lang::tr{'newer'}</a>"; + print "<a href='/cgi-bin/logs.cgi/showrequestfromcountry.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{country}'>$Lang::tr{'newer'}</a>"; } else { - print "$Lang::tr{'newer'}"; + print "$Lang::tr{'newer'}"; } print "</td>\n"; diff --git a/html/cgi-bin/logs.cgi/showrequestfromip.dat b/html/cgi-bin/logs.cgi/showrequestfromip.dat index 31cd42c33..d7bb8c6a4 100644 --- a/html/cgi-bin/logs.cgi/showrequestfromip.dat +++ b/html/cgi-bin/logs.cgi/showrequestfromip.dat @@ -3,7 +3,7 @@ # # This code is distributed under the terms of the GPL # -# JC HERITIER +# JC HERITIER # page inspired from the initial firewalllog.dat # # Modified for IPFire by Christian Schmidt (www.ipfire.org) @@ -162,7 +162,7 @@ if (!$skip) } } } - close (FILE); + close (FILE); } $skip=0; @@ -230,7 +230,7 @@ print <<END <select name='DAY'> END ; -for ($day = 1; $day <= 31; $day++) +for ($day = 1; $day <= 31; $day++) { print "\t<option "; if ($day == $cgiparams{'DAY'}) { @@ -256,7 +256,7 @@ END print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>"; if ($start == -1) { - $start = $lines - ${Header::viewsize}; + $start = $lines - ${Header::viewsize}; } if ($start >= $lines - ${Header::viewsize}) { $start = $lines - ${Header::viewsize}; }; if ($start < 0) { $start = 0; } @@ -320,10 +320,10 @@ foreach $_ (@slice) { if ($a =~ /DPT\=([\d\.]+)/){ $dstport = $1; } if ($lines % 2) { - print "<tr bgcolor='${Header::table1colour}'>\n"; + print "<tr bgcolor='${Header::table1colour}'>\n"; } else { - print "<tr bgcolor='${Header::table2colour}'>\n"; + print "<tr bgcolor='${Header::table2colour}'>\n"; } print <<END <td align='center'>$time</td> @@ -375,19 +375,19 @@ END print "<td align='center' width='50%'>"; if ($prev != -1) { - print "<a href='/cgi-bin/logs.cgi/showrequestfromip.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{ip}'>$Lang::tr{'older'}</a>"; + print "<a href='/cgi-bin/logs.cgi/showrequestfromip.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{ip}'>$Lang::tr{'older'}</a>"; } else { - print "$Lang::tr{'older'}"; + print "$Lang::tr{'older'}"; } print "</td>\n"; print "<td align='center' width='50%'>"; if ($next != -1) { - print "<a href='/cgi-bin/logs.cgi/showrequestfromip.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{ip}'>$Lang::tr{'newer'}</a>"; + print "<a href='/cgi-bin/logs.cgi/showrequestfromip.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{ip}'>$Lang::tr{'newer'}</a>"; } else { - print "$Lang::tr{'newer'}"; + print "$Lang::tr{'newer'}"; } print "</td>\n"; diff --git a/html/cgi-bin/logs.cgi/showrequestfromport.dat b/html/cgi-bin/logs.cgi/showrequestfromport.dat index 004a00e6a..d0dd036b2 100644 --- a/html/cgi-bin/logs.cgi/showrequestfromport.dat +++ b/html/cgi-bin/logs.cgi/showrequestfromport.dat @@ -4,14 +4,14 @@ # # This code is distributed under the terms of the GPL # -# JC HERITIER +# JC HERITIER # page inspired from the initial firewalllog.dat # # Modified for IPFire by Christian Schmidt (www.ipfire.org) #Aug 28 14:54:30 shite kernel: IN=ppp0 OUT= MAC= SRC=213.48.150.1 #DST=213.208.115.234 LEN=110 TOS=0x00 PREC=0x00 TTL=60 ID=30699 DF PROTO=TCP -#SPT=6667 DPT=62593 WINDOW=2505 RES=0x00 ACK PSH URGP=0 +#SPT=6667 DPT=62593 WINDOW=2505 RES=0x00 ACK PSH URGP=0 use strict; @@ -170,7 +170,7 @@ if (!$skip) } } } - close (FILE); + close (FILE); } $skip=0; @@ -238,7 +238,7 @@ print <<END <select name='DAY'> END ; -for ($day = 1; $day <= 31; $day++) +for ($day = 1; $day <= 31; $day++) { print "\t<option "; if ($day == $cgiparams{'DAY'}) { @@ -264,7 +264,7 @@ END print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>"; if ($start == -1) { - $start = $lines - ${Header::viewsize}; + $start = $lines - ${Header::viewsize}; } if ($start >= $lines - ${Header::viewsize}) { $start = $lines - ${Header::viewsize}; }; if ($start < 0) { $start = 0; } @@ -330,10 +330,10 @@ foreach $_ (@slice) if ($a =~ /DPT\=([\d\.]+)/){ $dstport = $1; } if ($lines % 2) { - print "<tr bgcolor='${Header::table1colour}'>\n"; + print "<tr bgcolor='${Header::table1colour}'>\n"; } else { - print "<tr bgcolor='${Header::table2colour}'>\n"; + print "<tr bgcolor='${Header::table2colour}'>\n"; } print <<END <td align='center'>$time</td> @@ -385,19 +385,19 @@ END print "<td align='center' width='50%'>"; if ($prev != -1) { - print "<a href='/cgi-bin/logs.cgi/showrequestfromport.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{port}'>$Lang::tr{'older'}</a>"; + print "<a href='/cgi-bin/logs.cgi/showrequestfromport.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{port}'>$Lang::tr{'older'}</a>"; } else { - print "$Lang::tr{'older'}"; + print "$Lang::tr{'older'}"; } print "</td>\n"; print "<td align='center' width='50%'>"; if ($next != -1) { - print "<a href='/cgi-bin/logs.cgi/showrequestfromport.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{port}'>$Lang::tr{'newer'}</a>"; + print "<a href='/cgi-bin/logs.cgi/showrequestfromport.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'},$cgiparams{port}'>$Lang::tr{'newer'}</a>"; } else { - print "$Lang::tr{'newer'}"; + print "$Lang::tr{'newer'}"; } print "</td>\n"; diff --git a/html/cgi-bin/logs.cgi/summary.dat b/html/cgi-bin/logs.cgi/summary.dat index 1efe8b71f..cbca48c49 100644 --- a/html/cgi-bin/logs.cgi/summary.dat +++ b/html/cgi-bin/logs.cgi/summary.dat @@ -152,7 +152,7 @@ print <<END <select name='DAY'> END ; -for (my $day = 1; $day <= 31; $day++) +for (my $day = 1; $day <= 31; $day++) { print "\t<option "; if ($day == $cgiparams{'DAY'}) { diff --git a/html/cgi-bin/logs.cgi/urlfilter.dat b/html/cgi-bin/logs.cgi/urlfilter.dat index 554169ab0..283db52cd 100644 --- a/html/cgi-bin/logs.cgi/urlfilter.dat +++ b/html/cgi-bin/logs.cgi/urlfilter.dat @@ -107,8 +107,8 @@ if ($ENV{'QUERY_STRING'} && $cgiparams{'ACTION'} ne $Lang::tr{'update'}) @temp = split(',',$ ENV{'QUERY_STRING'}); $start = $temp[0]; $cgiparams{'MONTH'} = $temp[1]; - $cgiparams{'DAY'} = $temp[2]; - $cgiparams{'LOGTYPE'} = $temp[3]; + $cgiparams{'DAY'} = $temp[2]; + $cgiparams{'LOGTYPE'} = $temp[3]; } if (!($cgiparams{'MONTH'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11)$/) || @@ -153,7 +153,7 @@ if (($cgiparams{'DAY'} ne $now[3]) || ($cgiparams{'MONTH'} ne $now[4])) @then = localtime(POSIX::mktime( 0, 0, 0, $cgiparams{'DAY'}, $cgiparams{'MONTH'}, $year - 1900 )); } $tdoy = $then[7]; - $lastleap=($year-1)%4; + $lastleap=($year-1)%4; if ($tdoy>$doy) { if ($lastleap == 0 && $tdoy < 60) { $doy=$tdoy+366; @@ -180,7 +180,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'export'}) print "Content-type: text/plain\n\n"; print "IPCop URL filter log\r\n"; print "Section: $cgiparams{'LOGTYPE'}\r\n"; - print "Date: $daystr $longmonthstr\r\n"; + print "Date: $daystr $longmonthstr\r\n"; print "\r\n"; if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @log = reverse @log; } @@ -258,7 +258,7 @@ print <<END <select name='DAY'> END ; -for ($day = 1; $day <= 31; $day++) +for ($day = 1; $day <= 31; $day++) { print "\t<option "; if ($day == $cgiparams{'DAY'}) { @@ -434,7 +434,7 @@ sub processevent close(LOG); } } - @log = sort { substr($a,11,8) cmp substr($b,11,8) } @log; + @log = sort { substr($a,11,8) cmp substr($b,11,8) } @log; } } diff --git a/html/cgi-bin/mac.cgi b/html/cgi-bin/mac.cgi index f4c5aa2d4..6811fa89c 100644 --- a/html/cgi-bin/mac.cgi +++ b/html/cgi-bin/mac.cgi @@ -45,11 +45,11 @@ my $errormessage = ''; if ($macsettings{'ACTION'} eq $Lang::tr{'save'}) { $macsettings{'MAC'} =~ s/\-/:/g; my @mac = split(/:/,$macsettings{"MAC"}); - if ($#mac == 5) { + if ($#mac == 5) { foreach (@mac) { unless ($_ =~ /^[a-fA-F0-9]{1,2}$/) { $errormessage = $Lang::tr{'mac address error not valid'}; - last; + last; } } } else { @@ -58,11 +58,11 @@ if ($macsettings{'ACTION'} eq $Lang::tr{'save'}) { $macsettings{'MAC1'} =~ s/\-/:/g; if ( not ($macsettings{'MAC1'} eq "" )) { my @mac = split(/:/,$macsettings{"MAC1"}); - if ($#mac == 5) { + if ($#mac == 5) { foreach (@mac) { unless ($_ =~ /^[a-fA-F0-9]{1,2}$/) { $errormessage = $Lang::tr{'mac address error not valid'}; - last; + last; } } } else { @@ -72,11 +72,11 @@ if ($macsettings{'ACTION'} eq $Lang::tr{'save'}) { $macsettings{'MAC2'} =~ s/\-/:/g; if ( not ($macsettings{'MAC2'} eq "" )) { my @mac = split(/:/,$macsettings{"MAC2"}); - if ($#mac == 5) { + if ($#mac == 5) { foreach (@mac) { unless ($_ =~ /^[a-fA-F0-9]{1,2}$/) { $errormessage = $Lang::tr{'mac address error not valid'}; - last; + last; } } } else { @@ -87,8 +87,8 @@ if ($macsettings{'ACTION'} eq $Lang::tr{'save'}) { $macsettings{'MAC'} =~ s/\:/-/g; $macsettings{'MAC1'} =~ s/\:/-/g; $macsettings{'MAC2'} =~ s/\:/-/g; - &General::writehash("${General::swroot}/mac/settings", \%macsettings); - &Header::openbox('100%', 'left', $Lang::tr{'mac address saved'}); + &General::writehash("${General::swroot}/mac/settings", \%macsettings); + &Header::openbox('100%', 'left', $Lang::tr{'mac address saved'}); print "<font class='base'>$Lang::tr{'mac address saved txt'}</font>\n"; &Header::closebox(); } @@ -97,13 +97,13 @@ if ($macsettings{'ACTION'} eq $Lang::tr{'reconnect'}) { &General::system_background("/usr/local/bin/redctrl", "restart"); &Header::openbox('100%', 'left', $Lang::tr{'mac address recon'} ); print "<font class='base'>$Lang::tr{'mac address done'}</font>\n"; - &Header::closebox(); + &Header::closebox(); } if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) { system("cat /dev/null > ${General::swroot}/mac/settings &"); &Header::openbox('100%', 'left', $Lang::tr{'mac address deleted'} ); print "<font class='base'>$Lang::tr{'mac address deleted txt'}</font>\n"; - &Header::closebox(); + &Header::closebox(); } if ($macsettings{'ACTION'} eq $Lang::tr{'reboot'}) { &General::log($Lang::tr{'rebooting ipfire'}); @@ -138,17 +138,17 @@ print <<END END ; if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) { -print <<END +print <<END <input type="text" name="MAC" maxlength="17" value=''/></td> END ; -} else { +} else { print <<END <input type="text" name="MAC" maxlength="17" value='$macsettings{"MAC"}'/></td> END -; -} -print <<END +; +} +print <<END </tr> <tr> <td> </td> @@ -158,17 +158,17 @@ print <<END END ; if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) { -print <<END +print <<END <input type="text" name="MAC1" maxlength="17" value=''/></td> END ; -} else { +} else { print <<END <input type="text" name="MAC1" maxlength="17" value='$macsettings{"MAC1"}'/></td> END -; -} -print <<END +; +} +print <<END </tr> <tr> <td> </td> @@ -178,18 +178,18 @@ print <<END END ; if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) { -print <<END +print <<END <input type="text" name="MAC2" maxlength="17" value=''/></td> END ; -} else { +} else { print <<END <input type="text" name="MAC2" maxlength="17" value='$macsettings{"MAC2"}'/></td> END -; -} +; +} -print <<END +print <<END </tr> <tr> <td colspan="2"><br><hr /></td> @@ -208,7 +208,7 @@ print <<END <input type='submit' name='ACTION' value='$Lang::tr{'reboot'}' /> END ; -} elsif ($macsettings{'ACTION'} eq $Lang::tr{'save'} && $errormessage eq "") { +} elsif ($macsettings{'ACTION'} eq $Lang::tr{'save'} && $errormessage eq "") { print <<END <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />      @@ -217,12 +217,12 @@ print <<END <input type='submit' name='ACTION' value='$Lang::tr{'reconnect'}' /> END ; -} elsif ($macsettings{'ACTION'} eq $Lang::tr{'save'}) { +} elsif ($macsettings{'ACTION'} eq $Lang::tr{'save'}) { print <<END <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /> END ; -} else { +} else { print <<END <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />      diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi index 68c516660..4ebc6b033 100755 --- a/html/cgi-bin/mail.cgi +++ b/html/cgi-bin/mail.cgi @@ -18,9 +18,9 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # # # ############################################################################### - + use MIME::Lite; - + #enable only the following on debugging purpose #use warnings; #use CGI::Carp 'fatalsToBrowser'; @@ -157,14 +157,14 @@ sub configsite{ $selected{'mail_tls'}{'explicit'} = 'selected' if exists $dma{'STARTTLS'}; $selected{'mail_tls'}{'implicit'} = 'selected' if (exists $dma{'SECURETRANSFER'}) and (not exists $dma{'STARTTLS'}); $selected{'mail_tls'}{'disabled'} = 'selected' if (not exists $dma{'SECURETRANSFER'}) and (not exists $dma{'STARTTLS'}); - + #Open site &Header::openpage($Lang::tr{'email settings'}, 1, ''); &Header::openbigbox('100%', 'center'); &error; &info; &Header::openbox('100%', 'left', $Lang::tr{'email config'}); - + #### JAVA SCRIPT #### print<<END; <script> @@ -257,7 +257,7 @@ END </form> END &Header::closebox(); - &Header::closebigbox(); + &Header::closebigbox(); &Header::closepage(); exit 0; } diff --git a/html/cgi-bin/modem.cgi b/html/cgi-bin/modem.cgi index bf5080d01..640a0a049 100644 --- a/html/cgi-bin/modem.cgi +++ b/html/cgi-bin/modem.cgi @@ -40,13 +40,13 @@ $modemsettings{'VALID'} = ''; &Header::getcgihash(\%modemsettings); if ($modemsettings{'ACTION'} eq $Lang::tr{'save'}) -{ +{ if (!($modemsettings{'TIMEOUT'} =~ /^\d+$/)) { $errormessage = $Lang::tr{'timeout must be a number'}; goto ERROR; } -ERROR: +ERROR: if ($errormessage) { $modemsettings{'VALID'} = 'no'; } else { diff --git a/html/cgi-bin/netexternal.cgi b/html/cgi-bin/netexternal.cgi index cc5667044..fb1097d61 100644 --- a/html/cgi-bin/netexternal.cgi +++ b/html/cgi-bin/netexternal.cgi @@ -83,13 +83,13 @@ if ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} e if ($dhcpinfo{'dhcp_lease_time'} ne "") { $lsetme=$dhcpinfo{'dhcp_lease_time'}; $lsetme=($lsetme/60); - + if ($lsetme > 59) { $lsetme=($lsetme/60); $leasetime=$lsetme." Hour"; }else{ $leasetime=$lsetme." Minute"; } - + if ($lsetme > 1) { $leasetime=$leasetime."s"; } @@ -101,13 +101,13 @@ if ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} e if ($dhcpinfo{'dhcp_renewal_time'} ne "") { $rentme=$dhcpinfo{'dhcp_renewal_time'}; $rentme=($rentme/60); - + if ($rentme > 59){ $rentme=($rentme/60); $rnwltime=$rentme." Hour"; }else{ $rnwltime=$rentme." Minute"; } - + if ($rentme > 1){ $rnwltime=$rnwltime."s"; } diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 5985d534c..fd6d14ab3 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -264,11 +264,11 @@ sub pkiconfigcheck } sub writeserverconf { - my %sovpnsettings = (); - my @temp = (); + my %sovpnsettings = (); + my @temp = (); &General::readhash("${General::swroot}/ovpn/settings", \%sovpnsettings); &read_routepushfile; - + open(CONF, ">${General::swroot}/ovpn/server.conf") or die "Unable to open ${General::swroot}/ovpn/server.conf: $!"; flock CONF, 2; print CONF "#OpenVPN Server conf\n"; @@ -332,9 +332,9 @@ sub writeserverconf { print CONF "fragment $sovpnsettings{'FRAGMENT'}\n"; } - if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0) { + if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0) { print CONF "keepalive $sovpnsettings{'KEEPALIVE_1'} $sovpnsettings{'KEEPALIVE_2'}\n"; - } + } print CONF "status-version 1\n"; print CONF "status /var/run/ovpnserver.log 30\n"; print CONF "ncp-disable\n"; @@ -363,13 +363,13 @@ sub writeserverconf { if ($sovpnsettings{DHCP_WINS} ne '') { print CONF "push \"dhcp-option WINS $sovpnsettings{DHCP_WINS}\"\n"; } - + if ($sovpnsettings{MAX_CLIENTS} eq '') { print CONF "max-clients 100\n"; } if ($sovpnsettings{MAX_CLIENTS} ne '') { print CONF "max-clients $sovpnsettings{MAX_CLIENTS}\n"; - } + } print CONF "tls-verify /usr/lib/openvpn/verify\n"; print CONF "crl-verify /var/ipfire/ovpn/crls/cacrl.pem\n"; print CONF "user nobody\n"; @@ -402,9 +402,9 @@ sub writeserverconf { close (LSC); } print CONF "\n"; - + close(CONF); -} +} sub emptyserverlog{ if (open(FILE, ">/var/run/ovpnserver.log")) { @@ -415,7 +415,7 @@ sub emptyserverlog{ } -sub delccdnet +sub delccdnet { my %ccdconfhash = (); my %ccdhash = (); @@ -436,7 +436,7 @@ sub delccdnet } } &General::writehasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); - + &writeserverconf; return 0; } @@ -452,21 +452,21 @@ sub addccdnet my $checkup; my $ccdip; my $baseaddress; - - - #check name - if ($ccdname eq '') + + + #check name + if ($ccdname eq '') { $errormessage=$errormessage.$Lang::tr{'ccd err name'}."<br>"; return } - + if(!&General::validhostname($ccdname)) { $errormessage=$Lang::tr{'ccd err invalidname'}; return; } - + ($ccdip,$subcidr) = split (/\//,$ccdnet); $subcidr=&General::iporsubtocidr($subcidr); #check subnet @@ -499,7 +499,7 @@ sub addccdnet sub modccdnet { - + my $newname=$_[0]; my $oldname=$_[1]; my %ccdconfhash=(); @@ -526,7 +526,7 @@ sub modccdnet } } } - + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); foreach my $key (keys %ccdhash) { if ($ccdhash{$key}[32] eq $oldname) { @@ -535,7 +535,7 @@ sub modccdnet last; } } - + return 0; } sub ccdmaxclients @@ -554,7 +554,7 @@ sub ccdmaxclients return $e-1; } -sub getccdadresses +sub getccdadresses { my $ipin=$_[0]; my ($ip1,$ip2,$ip3,$ip4)=split /\./, $ipin; @@ -591,7 +591,7 @@ sub getccdadresses sub fillselectbox { my $boxname=$_[1]; - my ($ccdip,$subcidr) = split("/",$_[0]); + my ($ccdip,$subcidr) = split("/",$_[0]); my $tz=$_[2]; my @allccdips=&getccdadresses($ccdip,$subcidr,&ccdmaxclients($ccdip."/".$subcidr),$tz); print"<select name='$boxname' STYLE='font-family : arial; font-size : 9pt; width:130px;' >"; @@ -628,10 +628,10 @@ sub check_routes_push open(FILE,"${General::swroot}/ovpn/routes_push"); while (<FILE>) { $_=~s/\s*$//g; - + my ($ip2,$cidr2) = split (/\//,"$_"); my $val2=$ip2."/".&General::iporsubtodec($cidr2); - + if($val eq $val2){ return 0; } @@ -682,7 +682,7 @@ sub check_ccdconf if (&General::IpInSubnet ($ip,$ip2,&General::cidrtosub($cidr2))){ return 0; } - + } return 1; } @@ -697,7 +697,7 @@ sub validdotmask if (&General::validip($ipdotmask)) { return 0; } if (!($ipdotmask =~ /^(.*?)\/(.*?)$/)) { } my $mask = $2; - if (($mask =~ /\./ )) { return 0; } + if (($mask =~ /\./ )) { return 0; } return 1; } @@ -710,7 +710,7 @@ sub write_routepushfile if ($vpnsettings{'ROUTES_PUSH'} ne '') { print FILE $vpnsettings{'ROUTES_PUSH'}; } - close(FILE); + close(FILE); } sub read_routepushfile @@ -721,7 +721,7 @@ sub read_routepushfile while (<FILE>) { $vpnsettings{'ROUTES_PUSH'} .= $_ }; close(FILE); $cgiparams{'ROUTES_PUSH'} = $vpnsettings{'ROUTES_PUSH'}; - + } } @@ -777,18 +777,18 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'start ovpn server'} || if ($cgiparams{'ACTION'} eq $Lang::tr{'start ovpn server'}){ &emptyserverlog(); &General::system("/usr/local/bin/openvpnctrl", "-s"); - } + } #stop openvpn server if ($cgiparams{'ACTION'} eq $Lang::tr{'stop ovpn server'}){ &General::system("/usr/local/bin/openvpnctrl", "-k"); - &emptyserverlog(); - } + &emptyserverlog(); + } # #restart openvpn server # if ($cgiparams{'ACTION'} eq $Lang::tr{'restart ovpn server'}){ -#workarund, till SIGHUP also works when running as nobody -# system('/usr/local/bin/openvpnctrl', '-r'); -# &emptyserverlog(); -# } +#workarund, till SIGHUP also works when running as nobody +# system('/usr/local/bin/openvpnctrl', '-r'); +# &emptyserverlog(); +# } } ### @@ -813,11 +813,11 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { $vpnsettings{'DHCP_WINS'} = $cgiparams{'DHCP_WINS'}; $vpnsettings{'ROUTES_PUSH'} = $cgiparams{'ROUTES_PUSH'}; my @temp=(); - + if ($cgiparams{'FRAGMENT'} eq '') { delete $vpnsettings{'FRAGMENT'}; } else { - if ($cgiparams{'FRAGMENT'} !~ /^[0-9]+$/) { + if ($cgiparams{'FRAGMENT'} !~ /^[0-9]+$/) { $errormessage = "Incorrect value, please insert only numbers."; goto ADV_ERROR; } else { @@ -852,29 +852,29 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { if ($cgiparams{'ROUTES_PUSH'} ne ''){ @temp = split(/\n/,$cgiparams{'ROUTES_PUSH'}); undef $vpnsettings{'ROUTES_PUSH'}; - + foreach my $tmpip (@temp) { s/^\s+//g; s/\s+$//g; - + if ($tmpip) { - $tmpip=~s/\s*$//g; + $tmpip=~s/\s*$//g; unless (&General::validipandmask($tmpip)) { $errormessage = "$tmpip ".$Lang::tr{'ovpn errmsg invalid ip or mask'}; goto ADV_ERROR; } my ($ip, $cidr) = split("\/",&General::ipcidr2msk($tmpip)); - + if ($ip eq $netsettings{'GREEN_NETADDRESS'} && $cidr eq $netsettings{'GREEN_NETMASK'}) { $errormessage = $Lang::tr{'ovpn errmsg green already pushed'}; goto ADV_ERROR; } -# a.marx ccd +# a.marx ccd my %ccdroutehash=(); &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); foreach my $key (keys %ccdroutehash) { - foreach my $i (1 .. $#{$ccdroutehash{$key}}) { + foreach my $i (1 .. $#{$ccdroutehash{$key}}) { if ( $ip."/".$cidr eq $ccdroutehash{$key}[$i] ){ $errormessage="Route $ip\/$cidr ".$Lang::tr{'ccd err inuse'}." $ccdroutehash{$key}[0]" ; goto ADV_ERROR; @@ -886,9 +886,9 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { } } } - + # ccd end - + $vpnsettings{'ROUTES_PUSH'} .= $tmpip."\n"; } } @@ -904,20 +904,20 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { goto ADV_ERROR; } if ($cgiparams{'KEEPALIVE_1'} ne '') { - if ($cgiparams{'KEEPALIVE_1'} !~ /^[0-9]+$/) { + if ($cgiparams{'KEEPALIVE_1'} !~ /^[0-9]+$/) { $errormessage = $Lang::tr{'invalid input for keepalive 1'}; goto ADV_ERROR; } } if ($cgiparams{'KEEPALIVE_2'} ne ''){ - if ($cgiparams{'KEEPALIVE_2'} !~ /^[0-9]+$/) { + if ($cgiparams{'KEEPALIVE_2'} !~ /^[0-9]+$/) { $errormessage = $Lang::tr{'invalid input for keepalive 2'}; goto ADV_ERROR; } } if ($cgiparams{'KEEPALIVE_2'} < ($cgiparams{'KEEPALIVE_1'} * 2)){ $errormessage = $Lang::tr{'invalid input for keepalive 1:2'}; - goto ADV_ERROR; + goto ADV_ERROR; } &General::writehash("${General::swroot}/ovpn/settings", \%vpnsettings); &writeserverconf();#hier ok @@ -936,38 +936,38 @@ my $ovsubnet = "$ovsubnettemp[0].$ovsubnettemp[1].$ovsubnettemp[2]"; my $tunmtu = ''; unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";} -unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}", 0770 or die "Unable to create dir $!";} +unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}", 0770 or die "Unable to create dir $!";} open(SERVERCONF, ">${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Unable to open ${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf: $!"; - + flock SERVERCONF, 2; - print SERVERCONF "# IPFire n2n Open VPN Server Config by ummeegge und m.a.d\n"; - print SERVERCONF "\n"; + print SERVERCONF "# IPFire n2n Open VPN Server Config by ummeegge und m.a.d\n"; + print SERVERCONF "\n"; print SERVERCONF "# User Security\n"; print SERVERCONF "user nobody\n"; print SERVERCONF "group nobody\n"; print SERVERCONF "persist-tun\n"; print SERVERCONF "persist-key\n"; print SERVERCONF "script-security 2\n"; - print SERVERCONF "# IP/DNS for remote Server Gateway\n"; + print SERVERCONF "# IP/DNS for remote Server Gateway\n"; if ($cgiparams{'REMOTE'} ne '') { print SERVERCONF "remote $cgiparams{'REMOTE'}\n"; } print SERVERCONF "float\n"; - print SERVERCONF "# IP adresses of the VPN Subnet\n"; - print SERVERCONF "ifconfig $ovsubnet.1 $ovsubnet.2\n"; - print SERVERCONF "# Client Gateway Network\n"; + print SERVERCONF "# IP adresses of the VPN Subnet\n"; + print SERVERCONF "ifconfig $ovsubnet.1 $ovsubnet.2\n"; + print SERVERCONF "# Client Gateway Network\n"; print SERVERCONF "route $remsubnet[0] $remsubnet[1]\n"; print SERVERCONF "up \"/etc/init.d/static-routes start\"\n"; - print SERVERCONF "# tun Device\n"; - print SERVERCONF "dev tun\n"; + print SERVERCONF "# tun Device\n"; + print SERVERCONF "dev tun\n"; print SERVERCONF "#Logfile for statistics\n"; print SERVERCONF "status-version 1\n"; print SERVERCONF "status /var/run/openvpn/$cgiparams{'NAME'}-n2n 10\n"; - print SERVERCONF "# Port and Protokol\n"; - print SERVERCONF "port $cgiparams{'DEST_PORT'}\n"; + print SERVERCONF "# Port and Protokol\n"; + print SERVERCONF "port $cgiparams{'DEST_PORT'}\n"; if ($cgiparams{'PROTOCOL'} eq 'tcp') { print SERVERCONF "proto tcp4-server\n"; @@ -975,23 +975,23 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General if ($cgiparams{'MTU'} eq '') {$tunmtu = '1400'} else {$tunmtu = $cgiparams{'MTU'}}; print SERVERCONF "tun-mtu $tunmtu\n"; } - + if ($cgiparams{'PROTOCOL'} eq 'udp') { print SERVERCONF "proto udp4\n"; print SERVERCONF "# Paketsize\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}}; print SERVERCONF "tun-mtu $tunmtu\n"; - if ($cgiparams{'FRAGMENT'} ne '') {print SERVERCONF "fragment $cgiparams{'FRAGMENT'}\n";} + if ($cgiparams{'FRAGMENT'} ne '') {print SERVERCONF "fragment $cgiparams{'FRAGMENT'}\n";} if ($cgiparams{'MSSFIX'} eq 'on') {print SERVERCONF "mssfix\n"; } else { print SERVERCONF "mssfix 0\n" }; } - print SERVERCONF "# Auth. Server\n"; - print SERVERCONF "tls-server\n"; - print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n"; - print SERVERCONF "cert ${General::swroot}/ovpn/certs/servercert.pem\n"; - print SERVERCONF "key ${General::swroot}/ovpn/certs/serverkey.pem\n"; + print SERVERCONF "# Auth. Server\n"; + print SERVERCONF "tls-server\n"; + print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n"; + print SERVERCONF "cert ${General::swroot}/ovpn/certs/servercert.pem\n"; + print SERVERCONF "key ${General::swroot}/ovpn/certs/serverkey.pem\n"; print SERVERCONF "dh ${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}\n"; - print SERVERCONF "# Cipher\n"; + print SERVERCONF "# Cipher\n"; print SERVERCONF "cipher $cgiparams{'DCIPHER'}\n"; # If GCM cipher is used, do not use --auth @@ -1012,14 +1012,14 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print SERVERCONF "# Enable Compression\n"; print SERVERCONF "comp-lzo\n"; } - print SERVERCONF "# Debug Level\n"; - print SERVERCONF "verb 3\n"; - print SERVERCONF "# Tunnel check\n"; - print SERVERCONF "keepalive 10 60\n"; - print SERVERCONF "# Start as daemon\n"; - print SERVERCONF "daemon $cgiparams{'NAME'}n2n\n"; - print SERVERCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; - print SERVERCONF "# Activate Management Interface and Port\n"; + print SERVERCONF "# Debug Level\n"; + print SERVERCONF "verb 3\n"; + print SERVERCONF "# Tunnel check\n"; + print SERVERCONF "keepalive 10 60\n"; + print SERVERCONF "# Start as daemon\n"; + print SERVERCONF "daemon $cgiparams{'NAME'}n2n\n"; + print SERVERCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; + print SERVERCONF "# Activate Management Interface and Port\n"; if ($cgiparams{'OVPN_MGMT'} eq '') {print SERVERCONF "management localhost $cgiparams{'DEST_PORT'}\n"} else {print SERVERCONF "management localhost $cgiparams{'OVPN_MGMT'}\n"}; close(SERVERCONF); @@ -1037,36 +1037,36 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq 'net' && my $ovsubnet = "$ovsubnettemp[0].$ovsubnettemp[1].$ovsubnettemp[2]"; my @remsubnet = split(/\//,$cgiparams{'REMOTE_SUBNET'}); my $tunmtu = ''; - + unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";} unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}", 0770 or die "Unable to create dir $!";} - + open(CLIENTCONF, ">${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Unable to open ${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf: $!"; - + flock CLIENTCONF, 2; print CLIENTCONF "# IPFire rewritten n2n Open VPN Client Config by ummeegge und m.a.d\n"; - print CLIENTCONF "#\n"; + print CLIENTCONF "#\n"; print CLIENTCONF "# User Security\n"; print CLIENTCONF "user nobody\n"; print CLIENTCONF "group nobody\n"; print CLIENTCONF "persist-tun\n"; print CLIENTCONF "persist-key\n"; print CLIENTCONF "script-security 2\n"; - print CLIENTCONF "# IP/DNS for remote Server Gateway\n"; + print CLIENTCONF "# IP/DNS for remote Server Gateway\n"; print CLIENTCONF "remote $cgiparams{'REMOTE'}\n"; print CLIENTCONF "float\n"; - print CLIENTCONF "# IP adresses of the VPN Subnet\n"; - print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; - print CLIENTCONF "# Server Gateway Network\n"; - print CLIENTCONF "route $remsubnet[0] $remsubnet[1]\n"; + print CLIENTCONF "# IP adresses of the VPN Subnet\n"; + print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; + print CLIENTCONF "# Server Gateway Network\n"; + print CLIENTCONF "route $remsubnet[0] $remsubnet[1]\n"; print CLIENTCONF "up \"/etc/init.d/static-routes start\"\n"; - print CLIENTCONF "# tun Device\n"; - print CLIENTCONF "dev tun\n"; + print CLIENTCONF "# tun Device\n"; + print CLIENTCONF "dev tun\n"; print CLIENTCONF "#Logfile for statistics\n"; print CLIENTCONF "status-version 1\n"; print CLIENTCONF "status /var/run/openvpn/$cgiparams{'NAME'}-n2n 10\n"; - print CLIENTCONF "# Port and Protokol\n"; - print CLIENTCONF "port $cgiparams{'DEST_PORT'}\n"; + print CLIENTCONF "# Port and Protokol\n"; + print CLIENTCONF "port $cgiparams{'DEST_PORT'}\n"; if ($cgiparams{'PROTOCOL'} eq 'tcp') { print CLIENTCONF "proto tcp4-client\n"; @@ -1074,7 +1074,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General if ($cgiparams{'MTU'} eq '') {$tunmtu = '1400'} else {$tunmtu = $cgiparams{'MTU'}}; print CLIENTCONF "tun-mtu $tunmtu\n"; } - + if ($cgiparams{'PROTOCOL'} eq 'udp') { print CLIENTCONF "proto udp4\n"; print CLIENTCONF "# Paketsize\n"; @@ -1093,9 +1093,9 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General } else { print CLIENTCONF "remote-cert-tls server\n"; } - print CLIENTCONF "# Auth. Client\n"; - print CLIENTCONF "tls-client\n"; - print CLIENTCONF "# Cipher\n"; + print CLIENTCONF "# Auth. Client\n"; + print CLIENTCONF "tls-client\n"; + print CLIENTCONF "# Cipher\n"; print CLIENTCONF "cipher $cgiparams{'DCIPHER'}\n"; print CLIENTCONF "pkcs12 ${General::swroot}/ovpn/certs/$cgiparams{'NAME'}.p12\r\n"; @@ -1117,14 +1117,14 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print CLIENTCONF "# Enable Compression\n"; print CLIENTCONF "comp-lzo\n"; } - print CLIENTCONF "# Debug Level\n"; - print CLIENTCONF "verb 3\n"; - print CLIENTCONF "# Tunnel check\n"; - print CLIENTCONF "keepalive 10 60\n"; - print CLIENTCONF "# Start as daemon\n"; + print CLIENTCONF "# Debug Level\n"; + print CLIENTCONF "verb 3\n"; + print CLIENTCONF "# Tunnel check\n"; + print CLIENTCONF "keepalive 10 60\n"; + print CLIENTCONF "# Start as daemon\n"; print CLIENTCONF "daemon $cgiparams{'NAME'}n2n\n"; - print CLIENTCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; - print CLIENTCONF "# Activate Management Interface and Port\n"; + print CLIENTCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; + print CLIENTCONF "# Activate Management Interface and Port\n"; if ($cgiparams{'OVPN_MGMT'} eq '') {print CLIENTCONF "management localhost $cgiparams{'DEST_PORT'}\n"} else {print CLIENTCONF "management localhost $cgiparams{'OVPN_MGMT'}\n"}; close(CLIENTCONF); @@ -1151,26 +1151,26 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg goto SETTINGS_ERROR; } my @tmpovpnsubnet = split("\/",$cgiparams{'DOVPN_SUBNET'}); - - if (&General::IpInSubnet ( $netsettings{'RED_ADDRESS'}, + + if (&General::IpInSubnet ( $netsettings{'RED_ADDRESS'}, $tmpovpnsubnet[0], $tmpovpnsubnet[1])) { $errormessage = "$Lang::tr{'ovpn subnet overlap'} IPFire RED Network $netsettings{'RED_ADDRESS'}"; goto SETTINGS_ERROR; } - - if (&General::IpInSubnet ( $netsettings{'GREEN_ADDRESS'}, + + if (&General::IpInSubnet ( $netsettings{'GREEN_ADDRESS'}, $tmpovpnsubnet[0], $tmpovpnsubnet[1])) { $errormessage = "$Lang::tr{'ovpn subnet overlap'} IPFire Green Network $netsettings{'GREEN_ADDRESS'}"; goto SETTINGS_ERROR; } - if (&General::IpInSubnet ( $netsettings{'BLUE_ADDRESS'}, + if (&General::IpInSubnet ( $netsettings{'BLUE_ADDRESS'}, $tmpovpnsubnet[0], $tmpovpnsubnet[1])) { $errormessage = "$Lang::tr{'ovpn subnet overlap'} IPFire Blue Network $netsettings{'BLUE_ADDRESS'}"; goto SETTINGS_ERROR; } - - if (&General::IpInSubnet ( $netsettings{'ORANGE_ADDRESS'}, + + if (&General::IpInSubnet ( $netsettings{'ORANGE_ADDRESS'}, $tmpovpnsubnet[0], $tmpovpnsubnet[1])) { $errormessage = "$Lang::tr{'ovpn subnet overlap'} IPFire Orange Network $netsettings{'ORANGE_ADDRESS'}"; goto SETTINGS_ERROR; @@ -1181,10 +1181,10 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg chomp($_); my @tempalias = split(/\,/,$_); if ($tempalias[1] eq 'on') { - if (&General::IpInSubnet ($tempalias[0] , + if (&General::IpInSubnet ($tempalias[0] , $tmpovpnsubnet[0], $tmpovpnsubnet[1])) { $errormessage = "$Lang::tr{'ovpn subnet overlap'} IPFire alias entry $tempalias[0]"; - } + } } } close(ALIASES); @@ -1199,7 +1199,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg $errormessage = $Lang::tr{'invalid mtu input'}; goto SETTINGS_ERROR; } - + unless (&General::validport($cgiparams{'DDEST_PORT'})) { $errormessage = $Lang::tr{'invalid port'}; goto SETTINGS_ERROR; @@ -1250,7 +1250,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg unlink("${General::swroot}/ovpn/enable"); } -#new settings for daemon +#new settings for daemon &General::writehash("${General::swroot}/ovpn/settings", \%vpnsettings); &writeserverconf();#hier ok SETTINGS_ERROR: @@ -1671,7 +1671,7 @@ END exit(0); } - + ### ### Download host certificate ### @@ -1906,7 +1906,7 @@ END # refresh #system ('/bin/touch', "${General::swroot}/ovpn/gencanow"); - + # Create the CA certificate my $pid = open(OPENSSL, "|-"); $SIG{ALRM} = sub { $errormessage = $Lang::tr{'broken pipe'}; goto ROOTCERT_ERROR;}; @@ -1971,7 +1971,7 @@ END goto ROOTCERT_ERROR; } } - + # Sign the host certificate request # This system call is safe, because all argeuments are passed as an array. system('/usr/bin/openssl', 'ca', '-days', '999999', @@ -2004,7 +2004,7 @@ END unlink ("${General::swroot}/ovpn/certs/serverkey.pem"); unlink ("${General::swroot}/ovpn/certs/servercert.pem"); unlink ("${General::swroot}/ovpn/ca/cacert.pem"); - unlink ("${General::swroot}/ovpn/crls/cacrl.pem"); + unlink ("${General::swroot}/ovpn/crls/cacrl.pem"); &cleanssldatabase(); goto ROOTCERT_ERROR; # } else { @@ -2069,7 +2069,7 @@ END <td class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_STATE' value='$cgiparams{'ROOTCERT_STATE'}' size='32' /></td> <td colspan='2'> </td></tr> <tr><td class='base'>$Lang::tr{'country'}:</td> - <td class='base'><select name='ROOTCERT_COUNTRY'> + <td class='base'><select name='ROOTCERT_COUNTRY'> END ; @@ -2093,7 +2093,7 @@ END <tr><td> </td> <td><input type='submit' name='ACTION' value='$Lang::tr{'generate root/host certificates'}' /></td> - <td> </td><td> </td></tr> + <td> </td><td> </td></tr> <tr><td class='base' colspan='4' align='left'> <img src='/blob.gif' valign='top' alt='*' /> $Lang::tr{'required field'}</td></tr> <tr><td colspan='2'><br></td></tr> @@ -2149,7 +2149,7 @@ END ### }elsif ($cgiparams{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { - + &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); my $n2nactive = ''; @@ -2158,7 +2158,7 @@ END if(grep(/$confighash{$cgiparams{'KEY'}}[1]/, @ps)) { $n2nactive = "1"; } - + if ($confighash{$cgiparams{'KEY'}}) { if ($confighash{$cgiparams{'KEY'}}[0] eq 'off') { $confighash{$cgiparams{'KEY'}}[0] = 'on'; @@ -2201,19 +2201,19 @@ END ### if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ - + my $zipname = "$confighash{$cgiparams{'KEY'}}[1]-Client.zip"; my $zippathname = "$zippath$zipname"; - $clientovpn = "$confighash{$cgiparams{'KEY'}}[1].conf"; + $clientovpn = "$confighash{$cgiparams{'KEY'}}[1].conf"; my @ovsubnettemp = split(/\./,$confighash{$cgiparams{'KEY'}}[27]); my $ovsubnet = "$ovsubnettemp[0].$ovsubnettemp[1].$ovsubnettemp[2]"; - my $tunmtu = ''; + my $tunmtu = ''; my @remsubnet = split(/\//,$confighash{$cgiparams{'KEY'}}[8]); my $n2nfragment = ''; - + open(CLIENTCONF, ">$tempdir/$clientovpn") or die "Unable to open tempfile: $!"; flock CLIENTCONF, 2; - + my $zip = Archive::Zip->new(); print CLIENTCONF "# IPFire n2n Open VPN Client Config by ummeegge und m.a.d\n"; print CLIENTCONF "# \n"; @@ -2223,28 +2223,28 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ print CLIENTCONF "persist-tun\n"; print CLIENTCONF "persist-key\n"; print CLIENTCONF "script-security 2\n"; - print CLIENTCONF "# IP/DNS for remote Server Gateway\n"; + print CLIENTCONF "# IP/DNS for remote Server Gateway\n"; print CLIENTCONF "remote $vpnsettings{'VPN_IP'}\n"; print CLIENTCONF "float\n"; - print CLIENTCONF "# IP adresses of the VPN Subnet\n"; - print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; - print CLIENTCONF "# Server Gateway Network\n"; + print CLIENTCONF "# IP adresses of the VPN Subnet\n"; + print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; + print CLIENTCONF "# Server Gateway Network\n"; print CLIENTCONF "route $remsubnet[0] $remsubnet[1]\n"; - print CLIENTCONF "# tun Device\n"; - print CLIENTCONF "dev tun\n"; + print CLIENTCONF "# tun Device\n"; + print CLIENTCONF "dev tun\n"; print CLIENTCONF "#Logfile for statistics\n"; print CLIENTCONF "status-version 1\n"; print CLIENTCONF "status /var/run/openvpn/$cgiparams{'NAME'}-n2n 10\n"; - print CLIENTCONF "# Port and Protokoll\n"; - print CLIENTCONF "port $confighash{$cgiparams{'KEY'}}[29]\n"; - + print CLIENTCONF "# Port and Protokoll\n"; + print CLIENTCONF "port $confighash{$cgiparams{'KEY'}}[29]\n"; + if ($confighash{$cgiparams{'KEY'}}[28] eq 'tcp') { print CLIENTCONF "proto tcp4-client\n"; print CLIENTCONF "# Packet size\n"; if ($confighash{$cgiparams{'KEY'}}[31] eq '') {$tunmtu = '1400'} else {$tunmtu = $confighash{$cgiparams{'KEY'}}[31]}; print CLIENTCONF "tun-mtu $tunmtu\n"; } - + if ($confighash{$cgiparams{'KEY'}}[28] eq 'udp') { print CLIENTCONF "proto udp4\n"; print CLIENTCONF "# Paketsize\n"; @@ -2262,11 +2262,11 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ } else { print CLIENTCONF "remote-cert-tls server\n"; } - print CLIENTCONF "# Auth. Client\n"; - print CLIENTCONF "tls-client\n"; + print CLIENTCONF "# Auth. Client\n"; + print CLIENTCONF "tls-client\n"; print CLIENTCONF "# Cipher\n"; print CLIENTCONF "cipher $confighash{$cgiparams{'KEY'}}[40]\n"; - if ($confighash{$cgiparams{'KEY'}}[4] eq 'cert' && -f "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12") { + if ($confighash{$cgiparams{'KEY'}}[4] eq 'cert' && -f "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12") { print CLIENTCONF "pkcs12 ${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12\r\n"; $zip->addFile( "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12", "$confighash{$cgiparams{'KEY'}}[1].p12") or die "Can't add file $confighash{$cgiparams{'KEY'}}[1].p12\n"; } @@ -2286,21 +2286,21 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ print CLIENTCONF "# Enable Compression\n"; print CLIENTCONF "comp-lzo\n"; } - print CLIENTCONF "# Debug Level\n"; - print CLIENTCONF "verb 3\n"; - print CLIENTCONF "# Tunnel check\n"; - print CLIENTCONF "keepalive 10 60\n"; - print CLIENTCONF "# Start as daemon\n"; - print CLIENTCONF "daemon $confighash{$cgiparams{'KEY'}}[1]n2n\n"; - print CLIENTCONF "writepid /var/run/$confighash{$cgiparams{'KEY'}}[1]n2n.pid\n"; - print CLIENTCONF "# Activate Management Interface and Port\n"; + print CLIENTCONF "# Debug Level\n"; + print CLIENTCONF "verb 3\n"; + print CLIENTCONF "# Tunnel check\n"; + print CLIENTCONF "keepalive 10 60\n"; + print CLIENTCONF "# Start as daemon\n"; + print CLIENTCONF "daemon $confighash{$cgiparams{'KEY'}}[1]n2n\n"; + print CLIENTCONF "writepid /var/run/$confighash{$cgiparams{'KEY'}}[1]n2n.pid\n"; + print CLIENTCONF "# Activate Management Interface and Port\n"; if ($confighash{$cgiparams{'KEY'}}[22] eq '') {print CLIENTCONF "management localhost $confighash{$cgiparams{'KEY'}}[29]\n"} else {print CLIENTCONF "management localhost $confighash{$cgiparams{'KEY'}}[22]\n"}; print CLIENTCONF "# remsub $confighash{$cgiparams{'KEY'}}[11]\n"; - + close(CLIENTCONF); - + $zip->addFile( "$tempdir/$clientovpn", $clientovpn) or die "Can't add file $clientovpn\n"; my $status = $zip->writeToFileNamed($zippathname); @@ -2320,12 +2320,12 @@ else ### # m.a.d net2net ### - + open(CLIENTCONF, ">$tempdir/$clientovpn") or die "Unable to open tempfile: $!"; flock CLIENTCONF, 2; - + my $zip = Archive::Zip->new(); - + print CLIENTCONF "#OpenVPN Client conf\r\n"; print CLIENTCONF "tls-client\r\n"; print CLIENTCONF "client\r\n"; @@ -2336,29 +2336,29 @@ else if ( $vpnsettings{'ENABLED'} eq 'on'){ print CLIENTCONF "remote $vpnsettings{'VPN_IP'} $vpnsettings{'DDEST_PORT'}\r\n"; - if ( $vpnsettings{'ENABLED_BLUE'} eq 'on' && (&haveBlueNet())){ - print CLIENTCONF "#Coment the above line and uncoment the next line, if you want to connect on the Blue interface\r\n"; + if ( $vpnsettings{'ENABLED_BLUE'} eq 'on' && (&haveBlueNet())){ + print CLIENTCONF "#Coment the above line and uncoment the next line, if you want to connect on the Blue interface\r\n"; print CLIENTCONF ";remote $netsettings{'BLUE_ADDRESS'} $vpnsettings{'DDEST_PORT'}\r\n"; } if ( $vpnsettings{'ENABLED_ORANGE'} eq 'on' && (&haveOrangeNet())){ - print CLIENTCONF "#Coment the above line and uncoment the next line, if you want to connect on the Orange interface\r\n"; + print CLIENTCONF "#Coment the above line and uncoment the next line, if you want to connect on the Orange interface\r\n"; print CLIENTCONF ";remote $netsettings{'ORANGE_ADDRESS'} $vpnsettings{'DDEST_PORT'}\r\n"; } } elsif ( $vpnsettings{'ENABLED_BLUE'} eq 'on' && (&haveBlueNet())){ print CLIENTCONF "remote $netsettings{'BLUE_ADDRESS'} $vpnsettings{'DDEST_PORT'}\r\n"; if ( $vpnsettings{'ENABLED_ORANGE'} eq 'on' && (&haveOrangeNet())){ - print CLIENTCONF "#Coment the above line and uncoment the next line, if you want to connect on the Orange interface\r\n"; + print CLIENTCONF "#Coment the above line and uncoment the next line, if you want to connect on the Orange interface\r\n"; print CLIENTCONF ";remote $netsettings{'ORANGE_ADDRESS'} $vpnsettings{'DDEST_PORT'}\r\n"; } } elsif ( $vpnsettings{'ENABLED_ORANGE'} eq 'on' && (&haveOrangeNet())){ print CLIENTCONF "remote $netsettings{'ORANGE_ADDRESS'} $vpnsettings{'DDEST_PORT'}\r\n"; } - + my $file_crt = new File::Temp( UNLINK => 1 ); my $file_key = new File::Temp( UNLINK => 1 ); my $include_certs = 0; - if ($confighash{$cgiparams{'KEY'}}[4] eq 'cert' && -f "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12") { + if ($confighash{$cgiparams{'KEY'}}[4] eq 'cert' && -f "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12") { if ($cgiparams{'MODE'} eq 'insecure') { $include_certs = 1; @@ -2396,7 +2396,7 @@ else print CLIENTCONF "cert $confighash{$cgiparams{'KEY'}}[1]cert.pem\r\n"; print CLIENTCONF "key $confighash{$cgiparams{'KEY'}}[1].key\r\n"; $zip->addFile( "${General::swroot}/ovpn/ca/cacert.pem", "cacert.pem") or die "Can't add file cacert.pem\n"; - $zip->addFile( "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem", "$confighash{$cgiparams{'KEY'}}[1]cert.pem") or die "Can't add file $confighash{$cgiparams{'KEY'}}[1]cert.pem\n"; + $zip->addFile( "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem", "$confighash{$cgiparams{'KEY'}}[1]cert.pem") or die "Can't add file $confighash{$cgiparams{'KEY'}}[1]cert.pem\n"; } print CLIENTCONF "cipher $vpnsettings{DCIPHER}\r\n"; print CLIENTCONF "auth $vpnsettings{'DAUTH'}\r\n"; @@ -2493,7 +2493,7 @@ else close (LCC); } close(CLIENTCONF); - + $zip->addFile( "$tempdir/$clientovpn", $clientovpn) or die "Can't add file $clientovpn\n"; my $status = $zip->writeToFileNamed($zippathname); @@ -2504,9 +2504,9 @@ else print @fileholder; exit (0); } - - - + + + ### ### Remove connection ### @@ -2548,7 +2548,7 @@ else { unlink "${General::swroot}/ovpn/ccd/$confighash{$cgiparams{'KEY'}}[2]"; } - + &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); foreach my $key (keys %ccdroutehash) { if ($ccdroutehash{$key}[0] eq $confighash{$cgiparams{'KEY'}}[1]){ @@ -2556,7 +2556,7 @@ else } } &General::writehasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); - + &General::readhasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); foreach my $key (keys %ccdroute2hash) { if ($ccdroute2hash{$key}[0] eq $confighash{$cgiparams{'KEY'}}[1]){ @@ -2699,10 +2699,10 @@ else my $disabled; &General::readhash("${General::swroot}/ovpn/settings", \%cgiparams); read_routepushfile; - - + + # if ($cgiparams{'CLIENT2CLIENT'} eq '') { -# $cgiparams{'CLIENT2CLIENT'} = 'on'; +# $cgiparams{'CLIENT2CLIENT'} = 'on'; # } ADV_ERROR: if ($cgiparams{'MAX_CLIENTS'} eq '') { @@ -2748,10 +2748,10 @@ ADV_ERROR: $selected{'LOG_VERB'}{'10'} = ''; $selected{'LOG_VERB'}{'11'} = ''; $selected{'LOG_VERB'}{$cgiparams{'LOG_VERB'}} = 'SELECTED'; - + &Header::showhttpheaders(); &Header::openpage($Lang::tr{'status ovpn'}, 1, ''); - &Header::openbigbox('100%', 'LEFT', '', $errormessage); + &Header::openbigbox('100%', 'LEFT', '', $errormessage); if ($errormessage) { &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'}); print "<class name='base'>$errormessage\n"; @@ -2767,23 +2767,23 @@ ADV_ERROR: </tr> <tr> <td width='25%'></td> <td width='20%'> </td><td width='25%'> </td><td width='30%'></td> - </tr> - <tr> + </tr> + <tr> <td class='base'>Domain</td> <td><input type='TEXT' name='DHCP_DOMAIN' value='$cgiparams{'DHCP_DOMAIN'}' size='30' /></td> </tr> - <tr> + <tr> <td class='base'>DNS</td> <td><input type='TEXT' name='DHCP_DNS' value='$cgiparams{'DHCP_DNS'}' size='30' /></td> - </tr> - <tr> + </tr> + <tr> <td class='base'>WINS</td> <td><input type='TEXT' name='DHCP_WINS' value='$cgiparams{'DHCP_WINS'}' size='30' /></td> </tr> <tr> <td colspan='4'><b>$Lang::tr{'ovpn routes push options'}</b></td> </tr> - <tr> + <tr> <td class='base'>$Lang::tr{'ovpn routes push'}</td> <td colspan='2'> <textarea name='ROUTES_PUSH' cols='26' rows='6' wrap='off'> @@ -2894,14 +2894,14 @@ print" <br><b><font color='#990000'>$Lang::tr{'attention'}:</b></font><br> <td> </td> <td allign='center'><input type='submit' name='ACTION' value='$Lang::tr{'save-adv-options'}' disabled='disabled' /></td> <td allign='center'><input type='submit' name='ACTION' value='$Lang::tr{'cancel-adv-options'}' /></td> - <td> </td> + <td> </td> </tr> -</table> +</table> </form> END -; - - +; + + }else{ print<<END; @@ -2910,25 +2910,25 @@ END <td> </td> <td allign='center'><input type='submit' name='ACTION' value='$Lang::tr{'save-adv-options'}' /></td> <td allign='center'><input type='submit' name='ACTION' value='$Lang::tr{'cancel-adv-options'}' /></td> - <td> </td> + <td> </td> </tr> -</table> +</table> </form> END -; +; } &Header::closebox(); # print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>"; &Header::closebigbox(); &Header::closepage(); exit(0); - + # A.Marx CCD Add,delete or edit CCD net -} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'ccd net'} || - $cgiparams{'ACTION'} eq $Lang::tr{'ccd add'} || - $cgiparams{'ACTION'} eq "kill" || +} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'ccd net'} || + $cgiparams{'ACTION'} eq $Lang::tr{'ccd add'} || + $cgiparams{'ACTION'} eq "kill" || $cgiparams{'ACTION'} eq "edit" || $cgiparams{'ACTION'} eq 'editsave'){ &Header::showhttpheaders(); @@ -2938,14 +2938,14 @@ END if ($cgiparams{'ACTION'} eq "kill"){ &delccdnet($cgiparams{'net'}); } - + if ($cgiparams{'ACTION'} eq 'editsave'){ my ($a,$b) =split (/\|/,$cgiparams{'ccdname'}); if ( $a ne $b){ &modccdnet($a,$b);} $cgiparams{'ccdname'}=''; $cgiparams{'ccdsubnet'}=''; } - + if ($cgiparams{'ACTION'} eq $Lang::tr{'ccd add'}) { &addccdnet($cgiparams{'ccdname'},$cgiparams{'ccdsubnet'}); } @@ -2953,10 +2953,10 @@ END &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'}); print "<class name='base'>$errormessage"; print " </class>"; - &Header::closebox(); + &Header::closebox(); } if ($cgiparams{'ACTION'} eq "edit"){ - + &Header::openbox('100%', 'LEFT', $Lang::tr{'ccd modify'}); print <<END; @@ -2994,7 +2994,7 @@ else{ <td colspan='4' align='right'><input type='hidden' name='ACTION' value='$Lang::tr{'ccd add'}' /><input type='submit' value='$Lang::tr{'add'}' /><input type='hidden' name='DOVPN_SUBNET' value='$cgiparams{'DOVPN_SUBNET'}'/></td></tr> </table></form> END - + &Header::closebox(); } &Header::openbox('100%', 'LEFT',$Lang::tr{'ccd net'} ); @@ -3002,7 +3002,7 @@ END print "<b>$Lang::tr{'attention'}:</b><br>"; print "$Lang::tr{'ccd noaddnet'}<br><hr>"; } - + print <<END; <table width='100%' cellpadding='0' cellspacing='1'> <tr> @@ -3010,8 +3010,8 @@ END END ; } - my %ccdconfhash=(); - &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + my %ccdconfhash=(); + &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); my @ccdconf=(); my $count=0; foreach my $key (sort { uc($ccdconfhash{$a}[0]) cmp uc($ccdconfhash{$b}[0]) } keys %ccdconfhash) { @@ -3035,14 +3035,14 @@ END <input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' /></form></td></tr> END ; - } + } print "</table></form>"; &Header::closebox(); print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>"; &Header::closebigbox(); &Header::closepage(); exit(0); - + #END CCD ### @@ -3056,7 +3056,7 @@ END # # <td><b>$Lang::tr{'protocol'}</b></td> -# protocol temp removed +# protocol temp removed print <<END; <table width='100%' cellpadding='2' cellspacing='0' class='tbl'> <tr> @@ -3087,10 +3087,10 @@ END { chomp($line); if ( $line =~ /^Updated,(.+)/){ - @match = split( /^Updated,(.+)/, $line); + @match = split( /^Updated,(.+)/, $line); $status = $match[1]; } -#gian +#gian if ( $line =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/) { @match = split(m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $line); if ($match[1] ne "Common Name") { @@ -3108,7 +3108,7 @@ END my $flag_icon = &Location::Functions::get_flag_icon($ccode); $users[$uid]{'Country'} = "<a href='country.cgi#$ccode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode' title='$ccode' /></a>"; $uid++; - } + } } if ( $line =~ /^(\d+\.\d+\.\d+\.\d+),(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(.+)/) { @match = split(m/^(\d+\.\d+\.\d+\.\d+),(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(.+)/, $line); @@ -3141,7 +3141,7 @@ END print "<td align='left' $col>$users[$idx-1]{'LastRef'}</td>"; } } - + print "</table>"; print <<END; <table width='100%' border='0' cellpadding='2' cellspacing='0'> @@ -3152,7 +3152,7 @@ END <tr><td align='center' >$Lang::tr{'the statistics were last updated at'} <b>$status</b></td></tr> </table> END -; +; &Header::closebox(); print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>"; &Header::closebigbox(); @@ -3182,7 +3182,7 @@ END ### } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { - + &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); @@ -3244,7 +3244,7 @@ if ( -s "${General::swroot}/ovpn/settings") { <td class='base'>$Lang::tr{'host to net vpn'}</td></tr> <tr><td><input type='radio' name='TYPE' value='net' /></td> <td class='base'>$Lang::tr{'net to net vpn'}</td></tr> - <tr><td><input type='radio' name='TYPE' value='net2net' /></td> + <tr><td><input type='radio' name='TYPE' value='net2net' /></td> <td class='base'>$Lang::tr{'net to net vpn'} (Upload Client Package)</td></tr> <tr><td> </td><td class='base'><input type='file' name='FH' size='30'></td></tr> <tr><td> </td><td>Import Connection Name</td></tr> @@ -3254,7 +3254,7 @@ if ( -s "${General::swroot}/ovpn/settings") { </form></table> END ; - + } else { print <<END; @@ -3288,11 +3288,11 @@ END my $uplp12name2 = ''; my @rem_subnet; my @rem_subnet2; - my @tmposupnet3; + my @tmposupnet3; my $key; my @n2nname; - &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); # Check if a file is uploaded unless (ref ($cgiparams{'FH'})) { @@ -3311,7 +3311,7 @@ END my $zip = Archive::Zip->new(); my $zipName = $filename; my $status = $zip->read( $zipName ); - if ($status != AZ_OK) { + if ($status != AZ_OK) { $errormessage = "Read of $zipName failed\n"; goto N2N_ERROR; } @@ -3332,7 +3332,7 @@ END } if ( $_ =~ /.p12$/){ $uplp12name = $_; - } + } } if (($uplconffilename eq '') || ($uplp12name eq '')){ $errormessage = "Either no *.conf or no *.p12 file found\n"; @@ -3352,11 +3352,11 @@ END ### # m.a.d net2net ### - + if ($cgiparams{'n2nname'} ne ''){ - $uplconffilename2 = "$cgiparams{'n2nname'}.conf"; - $uplp12name2 = "$cgiparams{'n2nname'}.p12"; + $uplconffilename2 = "$cgiparams{'n2nname'}.conf"; + $uplp12name2 = "$cgiparams{'n2nname'}.p12"; $n2nname[0] = $cgiparams{'n2nname'}; my @n2nname2 = split(/\./,$uplconffilename); $n2nname2[0] =~ s/\n|\r//g; @@ -3379,9 +3379,9 @@ END $uplp12name2 = $uplp12name; @n2nname = split(/\./,$uplconffilename); $n2nname[0] =~ s/\n|\r//g; - } + } unless(-d "${General::swroot}/ovpn/n2nconf/"){mkdir "${General::swroot}/ovpn/n2nconf", 0755 or die "Unable to create dir $!";} - unless(-d "${General::swroot}/ovpn/n2nconf/$n2nname[0]"){mkdir "${General::swroot}/ovpn/n2nconf/$n2nname[0]", 0770 or die "Unable to create dir $!";} + unless(-d "${General::swroot}/ovpn/n2nconf/$n2nname[0]"){mkdir "${General::swroot}/ovpn/n2nconf/$n2nname[0]", 0770 or die "Unable to create dir $!";} #Add collectd settings to configfile open(FILE, ">> $tempdir/$uplconffilename") or die 'Unable to open config file.'; @@ -3395,7 +3395,7 @@ END unlink ($filename); goto N2N_ERROR; } - + unless(move("$tempdir/$uplp12name", "${General::swroot}/ovpn/certs/$uplp12name2")) { $errormessage = "$Lang::tr{'certificate file move failed'}: $!"; unlink ($filename); @@ -3403,7 +3403,7 @@ END } chmod 0600, "${General::swroot}/ovpn/certs/$uplp12name"; - + my $complzoactive; my $mssfixactive; my $authactive; @@ -3413,7 +3413,7 @@ my @n2nproto = split(/-/, $n2nproto2[1]); my @n2nport = split(/ /, (grep { /^port/ } @firen2nconf)[0]); my @n2ntunmtu = split(/ /, (grep { /^tun-mtu/ } @firen2nconf)[0]); my @n2ncomplzo = grep { /^comp-lzo/ } @firen2nconf; -if ($n2ncomplzo[0] =~ /comp-lzo/){$complzoactive = "on";} else {$complzoactive = "off";} +if ($n2ncomplzo[0] =~ /comp-lzo/){$complzoactive = "on";} else {$complzoactive = "off";} my @n2nmssfix = grep { /^mssfix/ } @firen2nconf; if ($n2nmssfix[0] =~ /mssfix/){$mssfixactive = "on";} else {$mssfixactive = "off";} #my @n2nmssfix = split(/ /, (grep { /^mssfix/ } @firen2nconf)[0]); @@ -3462,7 +3462,7 @@ chomp ($mssfixactive); unlink ("${General::swroot}/ovpn/n2nconf/$n2nname[0]/$n2nname[0].conf") or die "Removing Configfile fail: $!"; unlink ("${General::swroot}/ovpn/certs/$n2nname[0].p12") or die "Removing Certfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$n2nname[0]") || die "Removing Directory fail: $!"; - goto N2N_ERROR; + goto N2N_ERROR; } } @@ -3476,7 +3476,7 @@ foreach my $dkey (keys %confighash) { unlink ("${General::swroot}/ovpn/n2nconf/$n2nname[0]/$n2nname[0].conf") or die "Removing Configfile fail: $!"; unlink ("${General::swroot}/ovpn/certs/$n2nname[0].p12") or die "Removing Certfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$n2nname[0]") || die "Removing Directory fail: $!"; - goto N2N_ERROR; + goto N2N_ERROR; } } @@ -3490,25 +3490,25 @@ foreach my $dkey (keys %confighash) { unlink ("${General::swroot}/ovpn/n2nconf/$n2nname[0]/$n2nname[0].conf") or die "Removing Configfile fail: $!"; unlink ("${General::swroot}/ovpn/certs/$n2nname[0].p12") or die "Removing Certfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$n2nname[0]") || die "Removing Directory fail: $!"; - goto N2N_ERROR; + goto N2N_ERROR; } } - - - + + + $key = &General::findhasharraykey (\%confighash); foreach my $i (0 .. 42) { $confighash{$key}[$i] = "";} $confighash{$key}[0] = 'off'; $confighash{$key}[1] = $n2nname[0]; - $confighash{$key}[2] = $n2nname[0]; + $confighash{$key}[2] = $n2nname[0]; $confighash{$key}[3] = 'net'; - $confighash{$key}[4] = 'cert'; - $confighash{$key}[6] = 'client'; + $confighash{$key}[4] = 'cert'; + $confighash{$key}[6] = 'client'; $confighash{$key}[8] = $n2nlocalsub[2]; $confighash{$key}[10] = $n2nremote[1]; - $confighash{$key}[11] = "$n2nremsub[1]/$n2nremsub[2]"; + $confighash{$key}[11] = "$n2nremsub[1]/$n2nremsub[2]"; $confighash{$key}[22] = $n2nmgmt[2]; $confighash{$key}[23] = $mssfixactive; $confighash{$key}[24] = $n2nfragment[1]; @@ -3524,9 +3524,9 @@ foreach my $dkey (keys %confighash) { $confighash{$key}[41] = 'disabled'; &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - + N2N_ERROR: - + &Header::showhttpheaders(); &Header::openpage('Validate imported configuration', 1, ''); &Header::openbigbox('100%', 'LEFT', '', $errormessage); @@ -3534,10 +3534,10 @@ foreach my $dkey (keys %confighash) { &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'}); print "<class name='base'>$errormessage"; print " </class>"; - &Header::closebox(); + &Header::closebox(); - } else - { + } else + { &Header::openbox('100%', 'LEFT', 'import ipfire net2net config'); } if ($errormessage eq ''){ @@ -3546,8 +3546,8 @@ foreach my $dkey (keys %confighash) { <table width='100%'> <tr><td width='25%'> </td><td width='25%'> </td></tr> <tr><td class='boldbase'>$Lang::tr{'name'}:</td><td><b>$n2nname[0]</b></td></tr> - <tr><td> </td><td> </td></tr> - <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'Act as'}</td><td><b>$confighash{$key}[6]</b></td></tr> + <tr><td> </td><td> </td></tr> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'Act as'}</td><td><b>$confighash{$key}[6]</b></td></tr> <tr><td class='boldbase' nowrap='nowrap'>Remote Host </td><td><b>$confighash{$key}[10]</b></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'local subnet'}</td><td><b>$confighash{$key}[8]</b></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'remote subnet'}:</td><td><b>$confighash{$key}[11]</b></td></tr> @@ -3561,21 +3561,21 @@ foreach my $dkey (keys %confighash) { <tr><td class='boldbase' nowrap='nowrap'>Management Port </td><td><b>$confighash{$key}[22]</b></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn tls auth'}:</td><td><b>$confighash{$key}[39]</b></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'cipher'}</td><td><b>$confighash{$key}[40]</b></td></tr> - <tr><td> </td><td> </td></tr> + <tr><td> </td><td> </td></tr> </table> END -; +; &Header::closebox(); } if ($errormessage) { print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>"; - } else { - print "<div align='center'><form method='post' ENCTYPE='multipart/form-data'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' />"; + } else { + print "<div align='center'><form method='post' ENCTYPE='multipart/form-data'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' />"; print "<input type='hidden' name='TYPE' value='net2netakn' />"; - print "<input type='hidden' name='KEY' value='$key' />"; + print "<input type='hidden' name='KEY' value='$key' />"; print "<input type='submit' name='ACTION' value='$Lang::tr{'cancel'}' /></div></form>"; - } + } &Header::closebigbox(); &Header::closepage(); exit(0); @@ -3592,7 +3592,7 @@ END ### } elsif (($cgiparams{'ACTION'} eq $Lang::tr{'cancel'}) && ($cgiparams{'TYPE'} eq 'net2netakn')){ - + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); if ($confighash{$cgiparams{'KEY'}}) { @@ -3603,12 +3603,12 @@ if ($confighash{$cgiparams{'KEY'}}) { unlink ($conffile) or die "Removing $conffile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}}[1]") || die "Kann Verzeichnis nicht loeschen: $!"; delete $confighash{$cgiparams{'KEY'}}; - &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); } else { $errormessage = $Lang::tr{'invalid key'}; - } - + } + ### # m.a.d net2net @@ -3621,7 +3621,7 @@ if ($confighash{$cgiparams{'KEY'}}) { } elsif (($cgiparams{'ACTION'} eq $Lang::tr{'add'}) || ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) || ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'ADVANCED'} eq '')) { - + &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); &General::readhasharray("${General::swroot}/ovpn/caconfig", \%cahash); &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); @@ -3662,7 +3662,7 @@ if ($confighash{$cgiparams{'KEY'}}) { $cgiparams{'TLSAUTH'} = $confighash{$cgiparams{'KEY'}}[41]; } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'}); - + #A.Marx CCD check iroute field and convert it to decimal if ($cgiparams{'TYPE'} eq 'host') { my @temp=(); @@ -3687,7 +3687,7 @@ if ($cgiparams{'TYPE'} eq 'host') { my $val=0; foreach $val (@temp){ chomp($val); - $val=~s/\s*$//g; + $val=~s/\s*$//g; #check if iroute exists in ccdroute or if new iroute is part of an existing one foreach my $key (keys %ccdroutehash) { foreach my $oldiroute ( 1 .. $#{$ccdroutehash{$key}}){ @@ -3701,8 +3701,8 @@ if ($cgiparams{'TYPE'} eq 'host') { if (&General::IpInSubnet ($ip1,$ip2,$cidr2)){ $errormessage=$errormessage.$Lang::tr{'ccd err irouteexist'}; goto VPNCONF_ERROR; - } - + } + } } if (!&General::validipandmask($val)){ @@ -3713,9 +3713,9 @@ if ($cgiparams{'TYPE'} eq 'host') { $ip=&General::getnetworkip($ip,&General::iporsubtocidr($cidr)); $cidr=&General::iporsubtodec($cidr); $ccdroutehash{$keypoint}[$i] = $ip."/".$cidr; - + } - + #check for existing network IP's if (&General::IpInSubnet ($ip,$netsettings{GREEN_NETADDRESS},$netsettings{GREEN_NETMASK}) && $netsettings{GREEN_NETADDRESS} ne '0.0.0.0') { @@ -3734,7 +3734,7 @@ if ($cgiparams{'TYPE'} eq 'host') { $errormessage=$Lang::tr{'ccd err orange'}; goto VPNCONF_ERROR; } - + if (&General::validipandmask($val)){ $ccdroutehash{$keypoint}[$i] = $ip."/".$cidr; }else{ @@ -3753,7 +3753,7 @@ if ($cgiparams{'TYPE'} eq 'host') { &General::writehasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); &writeserverconf; } - } + } } undef @temp; #check route field and convert it to decimal @@ -3778,7 +3778,7 @@ if ($cgiparams{'TYPE'} eq 'host') { &General::readhash("${General::swroot}/ethernet/settings", \%ownnet); foreach $val (@temp){ chomp($val); - $val=~s/\s*$//g; + $val=~s/\s*$//g; if ($val eq $Lang::tr{'green'}) { $val=$ownnet{GREEN_NETADDRESS}."/".$ownnet{GREEN_NETMASK}; @@ -3792,9 +3792,9 @@ if ($cgiparams{'TYPE'} eq 'host') { $val=$ownnet{ORANGE_NETADDRESS}."/".$ownnet{ORANGE_NETMASK}; } my ($ip,$cidr) = split (/\//, $val); - + if ($val ne $Lang::tr{'ccd none'}) - { + { if (! &check_routes_push($val)){$errormessage=$errormessage."Route $val ".$Lang::tr{'ccd err routeovpn2'}." ($val)";goto VPNCONF_ERROR;} if (! &check_ccdroute($val)){$errormessage=$errormessage."<br>Route $val ".$Lang::tr{'ccd err inuse'}." ($val)" ;goto VPNCONF_ERROR;} if (! &check_ccdconf($val)){$errormessage=$errormessage."<br>Route $val ".$Lang::tr{'ccd err routeovpn'}." ($val)";goto VPNCONF_ERROR;} @@ -3809,7 +3809,7 @@ if ($cgiparams{'TYPE'} eq 'host') { $ccdroute2hash{$keypoint}[$i]=''; } $i++; - } + } &General::writehasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); #check dns1 ip @@ -3831,7 +3831,7 @@ if ($cgiparams{'TYPE'} eq 'host') { #CCD End - + if ($cgiparams{'TYPE'} !~ /^(host|net)$/) { $errormessage = $Lang::tr{'connection type is invalid'}; if ($cgiparams{'TYPE'} eq 'net') { @@ -3879,7 +3879,7 @@ if ($cgiparams{'TYPE'} eq 'net') { $errormessage = $Lang::tr{'openvpn destination port used'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; - goto VPNCONF_ERROR; + goto VPNCONF_ERROR; } #Bugfix 10357 foreach my $key (sort keys %confighash){ @@ -3887,14 +3887,14 @@ if ($cgiparams{'TYPE'} eq 'net') { $errormessage = $Lang::tr{'openvpn destination port used'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; - goto VPNCONF_ERROR; + goto VPNCONF_ERROR; } } if ($cgiparams{'DEST_PORT'} eq '') { $errormessage = $Lang::tr{'invalid port'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; - goto VPNCONF_ERROR; + goto VPNCONF_ERROR; } # Check if the input for the transfer net is valid. @@ -3909,7 +3909,7 @@ if ($cgiparams{'TYPE'} eq 'net') { $errormessage = $Lang::tr{'openvpn subnet is used'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; - goto VPNCONF_ERROR; + goto VPNCONF_ERROR; } if (($cgiparams{'PROTOCOL'} eq 'tcp') && ($cgiparams{'MSSFIX'} eq 'on')) { @@ -3918,7 +3918,7 @@ if ($cgiparams{'TYPE'} eq 'net') { rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } - + if (($cgiparams{'PROTOCOL'} eq 'tcp') && ($cgiparams{'FRAGMENT'} ne '')) { $errormessage = $Lang::tr{'openvpn fragment allowed with udp'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; @@ -3931,22 +3931,22 @@ if ($cgiparams{'TYPE'} eq 'net') { unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; - } - + } + if ( &validdotmask ($cgiparams{'OVPN_SUBNET'})) { $errormessage = $Lang::tr{'openvpn prefix openvpn subnet'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; - } - + } + if ( &validdotmask ($cgiparams{'REMOTE_SUBNET'})) { $errormessage = $Lang::tr{'openvpn prefix remote subnet'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } - + if ($cgiparams{'DEST_PORT'} <= 1023) { $errormessage = $Lang::tr{'ovpn port in root range'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; @@ -3955,9 +3955,9 @@ if ($cgiparams{'TYPE'} eq 'net') { } if ($cgiparams{'OVPN_MGMT'} eq '') { - $cgiparams{'OVPN_MGMT'} = $cgiparams{'DEST_PORT'}; + $cgiparams{'OVPN_MGMT'} = $cgiparams{'DEST_PORT'}; } - + if ($cgiparams{'OVPN_MGMT'} <= 1023) { $errormessage = $Lang::tr{'ovpn mgmt in root range'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; @@ -4023,7 +4023,7 @@ if ($cgiparams{'TYPE'} eq 'net') { if ($cgiparams{'TYPE'} ne 'host') { unless (&General::validipandmask($cgiparams{'LOCAL_SUBNET'})) { - $errormessage = $Lang::tr{'local subnet is invalid'}; + $errormessage = $Lang::tr{'local subnet is invalid'}; if ($cgiparams{'TYPE'} eq 'net') { unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; @@ -4033,8 +4033,8 @@ if ($cgiparams{'TYPE'} eq 'net') { # Check if there is no other entry without IP-address and PSK if ($cgiparams{'REMOTE'} eq '') { foreach my $key (keys %confighash) { - if(($cgiparams{'KEY'} ne $key) && - ($confighash{$key}[4] eq 'psk' || $cgiparams{'AUTH'} eq 'psk') && + if(($cgiparams{'KEY'} ne $key) && + ($confighash{$key}[4] eq 'psk' || $cgiparams{'AUTH'} eq 'psk') && $confighash{$key}[10] eq '') { $errormessage = $Lang::tr{'you can only define one roadwarrior connection when using pre-shared key authentication'}; goto VPNCONF_ERROR; @@ -4125,7 +4125,7 @@ if ($cgiparams{'TYPE'} eq 'net') { last; } } - + $cgiparams{'CERT_NAME'} = $temp; $cgiparams{'CERT_NAME'} =~ s/,//g; $cgiparams{'CERT_NAME'} =~ s/\'//g; @@ -4246,7 +4246,7 @@ if ($cgiparams{'TYPE'} eq 'net') { $errormessage = $Lang::tr{'password too short'}; goto VPNCONF_ERROR; } - } + } if ($cgiparams{'CERT_PASS1'} ne $cgiparams{'CERT_PASS2'}) { $errormessage = $Lang::tr{'passwords do not match'}; goto VPNCONF_ERROR; @@ -4311,7 +4311,7 @@ if ($cgiparams{'TYPE'} eq 'net') { goto VPNCONF_ERROR; } } - + # Sign the host certificate request # The system call is safe, because all arguments are passed as an array. system('/usr/bin/openssl', 'ca', '-days', "$cgiparams{'DAYS_VALID'}", @@ -4333,12 +4333,12 @@ if ($cgiparams{'TYPE'} eq 'net') { # Create the pkcs12 file # The system call is safe, because all arguments are passed as an array. - system('/usr/bin/openssl', 'pkcs12', '-export', + system('/usr/bin/openssl', 'pkcs12', '-export', '-inkey', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}key.pem", '-in', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem", '-name', $cgiparams{'NAME'}, '-passout', "pass:$cgiparams{'CERT_PASS1'}", - '-certfile', "${General::swroot}/ovpn/ca/cacert.pem", + '-certfile', "${General::swroot}/ovpn/ca/cacert.pem", '-caname', "$vpnsettings{'ROOTCERT_ORGANIZATION'} CA", '-out', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}.p12"); if ($?) { @@ -4369,7 +4369,7 @@ if ($cgiparams{'TYPE'} eq 'net') { # Save the config my $key = $cgiparams{'KEY'}; - + if (! $key) { $key = &General::findhasharraykey (\%confighash); foreach my $i (0 .. 43) { $confighash{$key}[$i] = "";} @@ -4379,7 +4379,7 @@ if ($cgiparams{'TYPE'} eq 'net') { if ((! $cgiparams{'KEY'}) && $cgiparams{'AUTH'} ne 'psk') { $confighash{$key}[2] = $cgiparams{'CERT_NAME'}; } - + $confighash{$key}[3] = $cgiparams{'TYPE'}; if ($cgiparams{'AUTH'} eq 'psk') { $confighash{$key}[4] = 'psk'; @@ -4402,7 +4402,7 @@ if ($cgiparams{'TYPE'} eq 'net') { $confighash{$key}[24] = $cgiparams{'FRAGMENT'}; $confighash{$key}[25] = $cgiparams{'REMARK'}; $confighash{$key}[26] = $cgiparams{'INTERFACE'}; -# new fields +# new fields $confighash{$key}[27] = $cgiparams{'OVPN_SUBNET'}; $confighash{$key}[28] = $cgiparams{'PROTOCOL'}; $confighash{$key}[29] = $cgiparams{'DEST_PORT'}; @@ -4423,9 +4423,9 @@ if ($cgiparams{'TYPE'} eq 'net') { } &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - + if ($cgiparams{'CHECK1'} ){ - + my ($ccdip,$ccdsub)=split "/",$cgiparams{$name}; my ($a,$b,$c,$d) = split (/\./,$ccdip); if ( -e "${General::swroot}/ovpn/ccd/$confighash{$key}[2]"){ @@ -4495,12 +4495,12 @@ if ($cgiparams{'TYPE'} eq 'net') { ### # m.a.d n2n begin ### - + if ($cgiparams{'TYPE'} eq 'net') { - + if (-e "/var/run/$confighash{$key}[1]n2n.pid") { &General::system("/usr/local/bin/openvpnctrl", "-kn2n", "$confighash{$cgiparams{'KEY'}}[1]"); - + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); my $key = $cgiparams{'KEY'}; if (! $key) { @@ -4512,14 +4512,14 @@ if ($cgiparams{'TYPE'} eq 'net') { $confighash{$key}[0] = 'on'; &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - + &General::system("/usr/local/bin/openvpnctrl", "-sn2n", "$confighash{$cgiparams{'KEY'}}[1]"); } } ### # m.a.d n2n end -### +### if ($cgiparams{'EDIT_ADVANCED'} eq 'on') { $cgiparams{'KEY'} = $key; @@ -4530,13 +4530,13 @@ if ($cgiparams{'TYPE'} eq 'net') { $cgiparams{'ENABLED'} = 'on'; ### # m.a.d n2n begin -### +### $cgiparams{'MSSFIX'} = 'on'; $cgiparams{'FRAGMENT'} = '1300'; $cgiparams{'DAUTH'} = 'SHA512'; ### # m.a.d n2n end -### +### $cgiparams{'SIDE'} = 'left'; if ( ! -f "${General::swroot}/ovpn/ca/cakey.pem" ) { $cgiparams{'AUTH'} = 'psk'; @@ -4572,7 +4572,7 @@ if ($cgiparams{'TYPE'} eq 'net') { $selected{'SIDE'}{'server'} = ''; $selected{'SIDE'}{'client'} = ''; $selected{'SIDE'}{$cgiparams{'SIDE'}} = 'SELECTED'; - + $selected{'PROTOCOL'}{'udp'} = ''; $selected{'PROTOCOL'}{'tcp'} = ''; $selected{'PROTOCOL'}{$cgiparams{'PROTOCOL'}} = 'SELECTED'; @@ -4585,7 +4585,7 @@ if ($cgiparams{'TYPE'} eq 'net') { $checked{'AUTH'}{$cgiparams{'AUTH'}} = 'CHECKED'; $selected{'INTERFACE'}{$cgiparams{'INTERFACE'}} = 'SELECTED'; - + $checked{'COMPLZO'}{'off'} = ''; $checked{'COMPLZO'}{'on'} = ''; $checked{'COMPLZO'}{$cgiparams{'COMPLZO'}} = 'CHECKED'; @@ -4656,7 +4656,7 @@ if ($cgiparams{'TYPE'} eq 'net') { print "<table width='100%' border='0'>\n"; print "<tr><td width='14%' class='boldbase'>$Lang::tr{'name'}: <img src='/blob.gif' alt='*' /></td>"; - + if ($cgiparams{'TYPE'} eq 'host') { if ($cgiparams{'KEY'}) { print "<td width='35%' class='base'><input type='hidden' name='NAME' value='$cgiparams{'NAME'}' />$cgiparams{'NAME'}</td>"; @@ -4691,7 +4691,7 @@ if ($cgiparams{'TYPE'} eq 'net') { print <<END; <td width='25%'> </td> - <td width='25%'> </td></tr> + <td width='25%'> </td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'Act as'}</td> <td><select name='SIDE'> <option value='server' $selected{'SIDE'}{'server'}>$Lang::tr{'openvpn server'}</option> @@ -4718,7 +4718,7 @@ if ($cgiparams{'TYPE'} eq 'net') { <option value='udp' $selected{'PROTOCOL'}{'udp'}>UDP</option> <option value='tcp' $selected{'PROTOCOL'}{'tcp'}>TCP</option></select></td> </tr> - + <tr> <td class='boldbase'>$Lang::tr{'destination port'}: <img src='/blob.gif' alt='*' /></td> <td><input type='TEXT' name='DEST_PORT' value='$cgiparams{'DEST_PORT'}' size='5' /></td> @@ -4728,7 +4728,7 @@ if ($cgiparams{'TYPE'} eq 'net') { </tr> <tr><td colspan=4><hr /></td></tr><tr> - + <tr> <td class'base'><b>$Lang::tr{'MTU settings'}</b></td> </tr> @@ -4811,14 +4811,14 @@ END #jumper print "<tr><td class='boldbase'>$Lang::tr{'remark title'}</td>"; print "<td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' maxlength='50' /></td></tr></table>"; - + if ($cgiparams{'TYPE'} eq 'host') { print "<tr><td>$Lang::tr{'enabled'} <input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>"; - } + } print"</tr></table><br><br>"; -#A.Marx CCD new client -if ($cgiparams{'TYPE'} eq 'host') { +#A.Marx CCD new client +if ($cgiparams{'TYPE'} eq 'host') { print "<table border='0' width='100%' cellspacing='1' cellpadding='0'><tr><td colspan='3'><hr><br><b>$Lang::tr{'ccd choose net'}</td></tr><tr><td height='20' colspan='3'></td></tr>"; my %vpnnet=(); my $vpnip; @@ -4835,8 +4835,8 @@ if ($cgiparams{'TYPE'} eq 'host') { print"</td></tr></table><br><br>"; my $name=$cgiparams{'CHECK1'}; $checked{'RG'}{$cgiparams{'RG'}} = 'CHECKED'; - - if (! -z "${General::swroot}/ovpn/ccd.conf"){ + + if (! -z "${General::swroot}/ovpn/ccd.conf"){ print"<table border='0' width='100%' cellspacing='1' cellpadding='0'><tr><td width='1%'></td><td width='30%' class='boldbase' align='center'><b>$Lang::tr{'ccd name'}</td><td width='15%' class='boldbase' align='center'><b>$Lang::tr{'network'}</td><td class='boldbase' align='center' width='18%'><b>$Lang::tr{'ccd clientip'}</td></tr>"; foreach my $key (sort { uc($ccdconfhash{$a}[0]) cmp uc($ccdconfhash{$b}[0]) } keys %ccdconfhash) { $count++; @@ -4852,24 +4852,24 @@ if ($cgiparams{'TYPE'} eq 'host') { # ccd end &Header::closebox(); if ($cgiparams{'KEY'} && $cgiparams{'AUTH'} eq 'psk') { - + } elsif (! $cgiparams{'KEY'}) { - - + + my $disabled=''; my $cakeydisabled=''; my $cacrtdisabled=''; if ( ! -f "${General::swroot}/ovpn/ca/cakey.pem" ) { $cakeydisabled = "disabled='disabled'" } else { $cakeydisabled = "" }; if ( ! -f "${General::swroot}/ovpn/ca/cacert.pem" ) { $cacrtdisabled = "disabled='disabled'" } else { $cacrtdisabled = "" }; - + &Header::openbox('100%', 'LEFT', $Lang::tr{'authentication'}); - - + + if ($cgiparams{'TYPE'} eq 'host') { print <<END; <table width='100%' cellpadding='0' cellspacing='5' border='0'> - + <tr><td><input type='radio' name='AUTH' value='certreq' $checked{'AUTH'}{'certreq'} $cakeydisabled /></td><td class='base'>$Lang::tr{'upload a certificate request'}</td><td class='base' rowspan='2'><input type='file' name='FH' size='30' $cacrtdisabled></td></tr> <tr><td><input type='radio' name='AUTH' value='certfile' $checked{'AUTH'}{'certfile'} $cacrtdisabled /></td><td class='base'>$Lang::tr{'upload a certificate'}</td></tr> <tr><td colspan='3'> </td></tr> @@ -4894,7 +4894,7 @@ END print <<END; <table width='100%' cellpadding='0' cellspacing='5' border='0'> - + <tr><td><input type='radio' name='AUTH' value='certgen' $checked{'AUTH'}{'certgen'} $cakeydisabled /></td><td class='base'>$Lang::tr{'generate a certificate'}</td><td> </td></tr> <tr><td> </td><td class='base'>$Lang::tr{'users fullname or system hostname'}: <img src='/blob.gif' alt='*' /></td><td class='base' nowrap='nowrap'><input type='text' name='CERT_NAME' value='$cgiparams{'CERT_NAME'}' SIZE='32' $cakeydisabled /></td></tr> <tr><td> </td><td class='base'>$Lang::tr{'users email'}:</td><td class='base' nowrap='nowrap'><input type='text' name='CERT_EMAIL' value='$cgiparams{'CERT_EMAIL'}' SIZE='32' $cakeydisabled /></td></tr> @@ -4903,8 +4903,8 @@ END <tr><td> </td><td class='base'>$Lang::tr{'city'}:</td><td class='base' nowrap='nowrap'><input type='text' name='CERT_CITY' value='$cgiparams{'CERT_CITY'}' SIZE='32' $cakeydisabled /></td></tr> <tr><td> </td><td class='base'>$Lang::tr{'state or province'}:</td><td class='base' nowrap='nowrap'><input type='text' name='CERT_STATE' value='$cgiparams{'CERT_STATE'}' SIZE='32' $cakeydisabled /></td></tr> <tr><td> </td><td class='base'>$Lang::tr{'country'}:</td><td class='base'><select name='CERT_COUNTRY' $cakeydisabled> - - + + END ; @@ -4950,7 +4950,7 @@ END <tr><td colspan='3'><hr /></td></tr> <tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' /> $Lang::tr{'required field'}</td></tr> </table> - + END } @@ -4959,15 +4959,15 @@ END ### ; &Header::closebox(); - + } -#A.Marx CCD new client +#A.Marx CCD new client if ($cgiparams{'TYPE'} eq 'host') { print"<br><br>"; &Header::openbox('100%', 'LEFT', "$Lang::tr{'ccd client options'}:"); - + print <<END; <table border='0' width='100%'> <tr><td width='20%'>Redirect Gateway:</td><td colspan='3'><input type='checkbox' name='RG' $checked{'RG'}{'on'} /></td></tr> @@ -4975,7 +4975,7 @@ if ($cgiparams{'TYPE'} eq 'host') { <tr><td colspan='4'>&nbsp</td></tr> <tr><td valign='top'>$Lang::tr{'ccd iroute'}</td><td align='left' width='30%'><textarea name='IR' cols='26' rows='6' wrap='off'> END - + if ($cgiparams{'IR'} ne ''){ print $cgiparams{'IR'}; }else{ @@ -4991,13 +4991,13 @@ END } } } - + print <<END; </textarea></td><td valign='top' colspan='2'>$Lang::tr{'ccd iroutehint'}</td></tr> <tr><td colspan='4'><br></td></tr> <tr><td valign='top' rowspan='3'>$Lang::tr{'ccd iroute2'}</td><td align='left' valign='top' rowspan='3'><select name='IFROUTE' style="width: 205px"; size='6' multiple> END - + my $set=0; my $selorange=0; my $selblue=0; @@ -5007,12 +5007,12 @@ END my $other=0; my $none=0; my @temp=(); - + our @current = (); open(FILE, "${General::swroot}/main/routing") ; @current = <FILE>; close (FILE); - &General::readhasharray ("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); + &General::readhasharray ("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); #check for "none" foreach my $key (keys %ccdroute2hash) { if($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}){ @@ -5029,7 +5029,7 @@ END } #check if static routes are defined for client foreach my $line (@current) { - chomp($line); + chomp($line); $line=~s/\s*$//g; # remove newline @temp=split(/\,/,$line); $temp[1] = '' unless defined $temp[1]; # not always populated @@ -5045,7 +5045,7 @@ END } } if ($set == '1' && $#temp != -1){ print"<option selected>$temp[1]</option>";$set=0;}elsif($set == '0' && $#temp != -1){print"<option>$temp[1]</option>";} - } + } my %vpnconfig = (); &General::readhasharray("${General::swroot}/vpn/config", \%vpnconfig); @@ -5097,14 +5097,14 @@ END } } if (&haveBlueNet() && $selblue == '1'){ print"<option selected>$Lang::tr{'blue'}</option>";$selblue=0;}elsif(&haveBlueNet() && $selblue == '0'){print"<option>$Lang::tr{'blue'}</option>";} - if (&haveOrangeNet() && $selorange == '1'){ print"<option selected>$Lang::tr{'orange'}</option>";$selorange=0;}elsif(&haveOrangeNet() && $selorange == '0'){print"<option>$Lang::tr{'orange'}</option>";} + if (&haveOrangeNet() && $selorange == '1'){ print"<option selected>$Lang::tr{'orange'}</option>";$selorange=0;}elsif(&haveOrangeNet() && $selorange == '0'){print"<option>$Lang::tr{'orange'}</option>";} if ($selgreen == '1' || $other == '0'){ print"<option selected>$Lang::tr{'green'}</option>";$set=0;}else{print"<option>$Lang::tr{'green'}</option>";}; - + print<<END; </select></td><td valign='top'>DNS1:</td><td valign='top'><input type='TEXT' name='CCD_DNS1' value='$cgiparams{'CCD_DNS1'}' size='30' /></td></tr> <tr valign='top'><td>DNS2:</td><td><input type='TEXT' name='CCD_DNS2' value='$cgiparams{'CCD_DNS2'}' size='30' /></td></tr> <tr valign='top'><td valign='top'>WINS:</td><td><input type='TEXT' name='CCD_WINS' value='$cgiparams{'CCD_WINS'}' size='30' /></td></tr></table><br><hr> - + END ; &Header::closebox(); @@ -5147,7 +5147,7 @@ END } } } - + #default setzen if ($cgiparams{'DCIPHER'} eq '') { $cgiparams{'DCIPHER'} = 'AES-256-CBC'; @@ -5275,8 +5275,8 @@ END $activeonrun = ""; } else { $activeonrun = "disabled='disabled'"; - } - &Header::openbox('100%', 'LEFT', $Lang::tr{'global settings'}); + } + &Header::openbox('100%', 'LEFT', $Lang::tr{'global settings'}); print <<END; <table width='100%' border='0'> <form method='post'> @@ -5293,7 +5293,7 @@ END print "<tr><td class='boldbase'>$Lang::tr{'ovpn on blue'}</td>"; print "<td><input type='checkbox' name='ENABLED_BLUE' $checked{'ENABLED_BLUE'}{'on'} /></td>"; } - if (&haveOrangeNet()) { + if (&haveOrangeNet()) { print "<tr><td class='boldbase'>$Lang::tr{'ovpn on orange'}</td>"; print "<td><input type='checkbox' name='ENABLED_ORANGE' $checked{'ENABLED_ORANGE'}{'on'} /></td>"; } @@ -5310,7 +5310,7 @@ END <td class='boldbase' nowrap='nowrap' colspan='2'>$Lang::tr{'ovpn subnet'}<br /><input type='TEXT' name='DOVPN_SUBNET' value='$cgiparams{'DOVPN_SUBNET'}' size='30' /></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'protocol'}</td> <td><select name='DPROTOCOL'><option value='udp' $selected{'DPROTOCOL'}{'udp'}>UDP</option> - <option value='tcp' $selected{'DPROTOCOL'}{'tcp'}>TCP</option></select></td> + <option value='tcp' $selected{'DPROTOCOL'}{'tcp'}>TCP</option></select></td> <td class='boldbase'>$Lang::tr{'destination port'}:</td> <td><input type='TEXT' name='DDEST_PORT' value='$cgiparams{'DDEST_PORT'}' size='5' /></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'} </td> @@ -5363,12 +5363,12 @@ END <tr><td colspan='4'><br><br></td></tr> END -; - +; + if ( $srunning eq "yes" ) { print "<tr><td align='right' colspan='4'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' disabled='disabled' />"; print "<input type='submit' name='ACTION' value='$Lang::tr{'ccd net'}' />"; - print "<input type='submit' name='ACTION' value='$Lang::tr{'advanced server'}' />"; + print "<input type='submit' name='ACTION' value='$Lang::tr{'advanced server'}' />"; print "<input type='submit' name='ACTION' value='$Lang::tr{'stop ovpn server'}' /></td></tr>"; } else{ print "<tr><td align='right' colspan='4'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' />"; @@ -5378,13 +5378,13 @@ END -e "${General::swroot}/ovpn/ca/dh1024.pem" && -e "${General::swroot}/ovpn/certs/servercert.pem" && -e "${General::swroot}/ovpn/certs/serverkey.pem") && - (( $cgiparams{'ENABLED'} eq 'on') || + (( $cgiparams{'ENABLED'} eq 'on') || ( $cgiparams{'ENABLED_BLUE'} eq 'on') || ( $cgiparams{'ENABLED_ORANGE'} eq 'on'))){ print "<input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' /></td></tr>"; } else { - print "<input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' disabled='disabled' /></td></tr>"; - } + print "<input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' disabled='disabled' /></td></tr>"; + } } print "</form></table>"; &Header::closebox(); @@ -5476,7 +5476,7 @@ END my @output = ""; my @tustate = ""; my $tport = $confighash{$key}[22]; - my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); + my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); if ($tport ne '') { $tnet->open('127.0.0.1'); @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/'); @@ -5526,7 +5526,7 @@ END print <<END; <td align='center' $col1>$active</td> - + <form method='post' name='frm${key}a'><td align='center' $col> <input type='image' name='$Lang::tr{'dl client arch'}' src='/images/openvpn.png' alt='$Lang::tr{'dl client arch'}' title='$Lang::tr{'dl client arch'}' border='0' /> <input type='hidden' name='ACTION' value='$Lang::tr{'dl client arch'}' /> @@ -5560,7 +5560,7 @@ END ; } else { print "<td> </td>"; } - if ($confighash{$key}[4] eq 'cert' && -f "${General::swroot}/ovpn/certs/$confighash{$key}[1].p12") { + if ($confighash{$key}[4] eq 'cert' && -f "${General::swroot}/ovpn/certs/$confighash{$key}[1].p12") { print <<END; <form method='post' name='frm${key}c'><td align='center' $col> <input type='image' name='$Lang::tr{'download pkcs12 file'}' src='/images/media-floppy.png' alt='$Lang::tr{'download pkcs12 file'}' title='$Lang::tr{'download pkcs12 file'}' border='0' /> @@ -5929,7 +5929,7 @@ END </tr> </table> </form> - + <br><hr> END ; diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 8faf4490c..0111a240b 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -3606,7 +3606,7 @@ END print ASNBLFILE<<END TESTDATA = (10.0.0.1, 0) (127.0.0.1, 0) (fe80::1, 0) -ACTIVE_ASNBLS = +ACTIVE_ASNBLS = END ; diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi index 2bb85851d..38f7599d7 100644 --- a/html/cgi-bin/remote.cgi +++ b/html/cgi-bin/remote.cgi @@ -72,7 +72,7 @@ if ( (($remotesettings{'ACTION'} eq $Lang::tr{'save'}) || ($remotesettings{'ACTI &General::log($Lang::tr{'ssh is disabled'}); unlink "${General::swroot}/remote/enablessh"; } - + if ($remotesettings{'SSH_PORT'} eq 'on') { &General::log("SSH Port 22"); @@ -81,7 +81,7 @@ if ( (($remotesettings{'ACTION'} eq $Lang::tr{'save'}) || ($remotesettings{'ACTI { &General::log("SSH Port 222"); } - + if ( $remotesettings{'ACTION'} eq $Lang::tr{'ssh tempstart15'} || $remotesettings{'ACTION'} eq $Lang::tr{'ssh tempstart30'} ){ if ($remotesettings{'ENABLE_SSH'} eq 'off') { @@ -90,7 +90,7 @@ if ( $remotesettings{'ACTION'} eq $Lang::tr{'ssh tempstart15'} || $remotesetting } if ( $remotesettings{'ACTION'} eq $Lang::tr{'ssh tempstart15'} ) { $counter = 900;} elsif ( $remotesettings{'ACTION'} eq $Lang::tr{'ssh tempstart30'} ) { $counter = 1800;} - + system("/usr/local/bin/sshctrl tempstart $counter >/dev/null"); } else { diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index e69dc425a..109fc3e3e 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -49,7 +49,7 @@ $settings{'IP'} = ''; $settings{'GATEWAY'} = ''; $settings{'REMARK'} = ''; my @nosaved=('EN','IP','GATEWAY','REMARK'); # List here ALL setting2 fields. Mandatory - + $settings{'ACTION'} = ''; # add/edit/remove $settings{'KEY1'} = ''; # point record for ACTION @@ -105,14 +105,14 @@ if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { $temp[0] = $temp[0] ne '' ? '' : 'on'; # Toggle the field @current[$settings{'KEY1'}] = join (',',@temp)."\n"; $settings{'KEY1'} = ''; # End edit mode - + &General::log($Lang::tr{'routing config changed'}); #Save current open(FILE, ">$datafile") or die 'routing datafile error'; print FILE @current; close(FILE); - + # Rebuild configuration file &BuildConfiguration; } @@ -174,7 +174,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { # Write changes to config file. &SortDataFile; # sort newly added/modified entry &BuildConfiguration; # then re-build routing - + #map ($settings{$_}='' ,@nosaved); # Clear fields } } @@ -192,7 +192,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'edit'}) { } if ($settings{'ACTION'} eq $Lang::tr{'remove'}) { - splice (@current,$settings{'KEY1'},1); # Delete line + splice (@current,$settings{'KEY1'},1); # Delete line open(FILE, ">$datafile") or die 'route datafile error'; print FILE @current; close(FILE); @@ -315,7 +315,7 @@ foreach my $line (@current) { $gdesc = $Lang::tr{'click to disable'}; } else { $gif = 'off.gif'; - $gdesc = $Lang::tr{'click to enable'}; + $gdesc = $Lang::tr{'click to enable'}; } #Colorize each line @@ -405,7 +405,7 @@ if ( $output != "" ) { sub SortDataFile { our %entries = (); - + # Sort pair of record received in $a $b special vars. # When IP is specified use numeric sort else alpha. # If sortname ends with 'Rev', do reverse sort. @@ -449,13 +449,13 @@ sub SortDataFile # Build a pair 'Field Name',value for each of the data dataline. # Each SORTABLE field must have is pair. # Other data fields (non sortable) can be grouped in one - + my @record = ('KEY',$key++,'EN',$temp[0],'IP',$temp[1],'GATEWAY',$temp[2],'REMARK',$temp[3]); my $record = {}; # create a reference to empty hash %{$record} = @record; # populate that hash with @record $entries{$record->{KEY}} = $record; # add this to a hash of hashes } - + open(FILE, ">$datafile") or die 'routing datafile error'; # Each field value is printed , with the newline ! Don't forget separator and order of them. diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 9289b4519..0a3cd8c04 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -142,7 +142,7 @@ if ($sambasettings{'ACTION'} eq $Lang::tr{'save'}) { } &General::readhash("${General::swroot}/samba/settings", \%sambasettings); - + if ($errormessage) { @@ -759,7 +759,7 @@ sub isrunning { if (/^Name:\W+(.*)/) { - $testcmd = $1; + $testcmd = $1; } } close FILE; @@ -775,7 +775,7 @@ sub isrunning sub writeconfiguration() { open (FILE, ">${General::swroot}/samba/global") or die "Can't save the global settings: $!"; flock (FILE, 2); - + print FILE <<END; # global.settings by IPFire Project diff --git a/html/cgi-bin/speed.cgi b/html/cgi-bin/speed.cgi index d4b83df4f..f46eaca94 100644 --- a/html/cgi-bin/speed.cgi +++ b/html/cgi-bin/speed.cgi @@ -43,7 +43,7 @@ my $data_last = $ENV{'QUERY_STRING'}; my $rxb_last = 0; my $txb_last = 0; -my (@fields, $field, $name, $value); +my (@fields, $field, $name, $value); @fields = split(/&/, $data_last); foreach $field (@fields) { ($name, $value) = split(/=/, $field); diff --git a/html/cgi-bin/time.cgi b/html/cgi-bin/time.cgi index 6bf3dcc84..57a02a4b6 100644 --- a/html/cgi-bin/time.cgi +++ b/html/cgi-bin/time.cgi @@ -50,7 +50,7 @@ $timesettings{'ENABLESETONBOOT'} = 'off'; &Header::getcgihash(\%timesettings); if ($timesettings{'ACTION'} eq $Lang::tr{'save'}) -{ +{ if ($timesettings{'ENABLENTP'} eq 'on') { if ( ! ( &General::validfqdn($timesettings{'NTP_ADDR_1'}) || @@ -144,7 +144,7 @@ ERROR: } else { unlink "${General::swroot}/time/allowclients"; } - + } else { @@ -222,7 +222,7 @@ $selected{'UPDATE_PERIOD'}{'weekly'} = ''; $selected{'UPDATE_PERIOD'}{'monthly'} = ''; $selected{'UPDATE_PERIOD'}{$timesettings{'UPDATE_PERIOD'}} = "selected='selected'"; -# added to v0.0.4 to refresh screen if syncro event queued +# added to v0.0.4 to refresh screen if syncro event queued my $refresh = ''; if ( -e "/var/lock/time/settimenow") { $refresh = "<meta http-equiv='refresh' content='60;' />"; diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi index 629f8ca0e..fb3959457 100644 --- a/html/cgi-bin/updatexlrator.cgi +++ b/html/cgi-bin/updatexlrator.cgi @@ -80,7 +80,7 @@ my @vendors=(); my %vendorstats=(); my $repository = "/var/updatecache/"; -my $webhome = "/srv/web/ipfire/html"; +my $webhome = "/srv/web/ipfire/html"; my $hintcolour = '#FFFFCC'; my $colourgray = '#808080'; diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi index 3a28721a9..1e54372f1 100644 --- a/html/cgi-bin/urlfilter.cgi +++ b/html/cgi-bin/urlfilter.cgi @@ -2954,10 +2954,10 @@ sub writeconfigfile foreach $category (@categories) { $blacklist = $category; $category =~ s/\//_/g; - + if ( $filtersettings{"FILTER_".uc($category)} ne "on" ){ my $constraintrule = "false"; - + foreach (@tclist){ chomp; @tc = split(/\,/); @@ -2966,12 +2966,12 @@ sub writeconfigfile $constraintrule = "true"; } } - + if ( $constraintrule eq "false"){ next; } } - + print FILE "dest $category {\n"; if (-e "$dbdir/$blacklist/domains") { print FILE " domainlist $blacklist\/domains\n"; diff --git a/html/cgi-bin/vulnerabilities.cgi b/html/cgi-bin/vulnerabilities.cgi index 926f043b8..5dfd344f2 100644 --- a/html/cgi-bin/vulnerabilities.cgi +++ b/html/cgi-bin/vulnerabilities.cgi @@ -239,7 +239,7 @@ sub check_status($) { if ($status =~ /^(Vulnerable|Mitigation): (.*)$/) { return ($1, $2); - } + } return $status; } diff --git a/html/cgi-bin/wakeonlan.cgi b/html/cgi-bin/wakeonlan.cgi index 164cec2de..c3c4c6911 100644 --- a/html/cgi-bin/wakeonlan.cgi +++ b/html/cgi-bin/wakeonlan.cgi @@ -86,7 +86,7 @@ if ( $cgiparams{'ACTION'} eq 'add' ) unless( &General::validmac($cgiparams{'CLIENT_MAC'}) ) { - $errormessage = $Lang::tr{'invalid mac address'}; + $errormessage = $Lang::tr{'invalid mac address'}; goto ADDEXIT; } @@ -122,7 +122,7 @@ if ( $cgiparams{'ACTION'} eq 'update' ) unless( &General::validmac($cgiparams{'CLIENT_MAC'}) ) { - $errormessage = $Lang::tr{'invalid mac address'}; + $errormessage = $Lang::tr{'invalid mac address'}; goto UPDATEEXIT; } @@ -241,11 +241,11 @@ END ; print "<option value='green' $selected{'CLIENT_IFACE'}{'green'}>$Lang::tr{'green'}</option>"; -if (&haveBlueNet()) +if (&haveBlueNet()) { print "<option value='blue' $selected{'CLIENT_IFACE'}{'blue'}>$Lang::tr{'blue'}</option>"; } -if (&haveOrangeNet()) +if (&haveOrangeNet()) { print "<option value='orange' $selected{'CLIENT_IFACE'}{'orange'}>$Lang::tr{'orange'}</option>"; } @@ -269,7 +269,7 @@ print <<END END ; -if ( ($cgiparams{'ACTION'} eq 'edit') || ($cgiparams{'ACTION'} eq 'update') ) +if ( ($cgiparams{'ACTION'} eq 'edit') || ($cgiparams{'ACTION'} eq 'update') ) { print "<input type='hidden' name='ID' value='$cgiparams{'ID'}' />\n"; print "<input type='hidden' name='ACTION' value='update' />"; @@ -309,12 +309,12 @@ for $i ( 0 .. $#wol_devices ) my $wol_iface = $wol_devices[$i]{'IFace'}; my $wol_txt = &Header::cleanhtml($wol_devices[$i]{'Comment'}); - if ( (($cgiparams{'ACTION'} eq 'edit') || ($cgiparams{'ACTION'} eq 'update')) && ($i == $cgiparams{'ID'}) ) + if ( (($cgiparams{'ACTION'} eq 'edit') || ($cgiparams{'ACTION'} eq 'update')) && ($i == $cgiparams{'ID'}) ) { print "<tr>"; $col="bgcolor='${Header::colouryellow}'"; } - elsif ( $i % 2) + elsif ( $i % 2) { print "<tr>"; $col="bgcolor='$color{'color20'}'"; @@ -332,7 +332,7 @@ for $i ( 0 .. $#wol_devices ) <td align='center' $col> END ; - if ( (($wol_iface eq 'blue') && ! &haveBlueNet()) + if ( (($wol_iface eq 'blue') && ! &haveBlueNet()) || (($wol_iface eq 'orange') && ! &haveOrangeNet()) ) { # configured IFace (momentarily) not available -> now wakeup button/image @@ -384,7 +384,7 @@ sub ReadConfig { # datafileformat: # ID,MAC,IFACE,,Comment - # + # my @tmpfile = (); if ( open(FILE, "$datafile") ) { @@ -421,14 +421,14 @@ sub WriteConfig unless(&General::validmac($wol_devices[$i]{'MAC'})) { next; } unshift (@tmp_clients, uc($wol_devices[$i]{'MAC'}).",$wol_devices[$i]{'IFace'},,$wol_devices[$i]{'Comment'}"); } - + # sort tmp_clients on MAC @tmp_clients = sort ( @tmp_clients ); open(FILE, ">$datafile") or die 'hosts datafile error'; my $count = 0; - foreach $line (@tmp_clients) + foreach $line (@tmp_clients) { print FILE "$count,$line\n"; $count++; diff --git a/html/cgi-bin/webaccess.cgi b/html/cgi-bin/webaccess.cgi index 934fe6beb..b819dd309 100644 --- a/html/cgi-bin/webaccess.cgi +++ b/html/cgi-bin/webaccess.cgi @@ -82,7 +82,7 @@ if ((-e $svhosts_file) && (!-z $svhosts_file)) if (($cgiparams{'ACTION'} eq 'submit') && ($is_supervisor)) { - if ( ($cgiparams{'PASSWORD'} eq $proxysettings{'SUPERVISOR_PASSWORD'}) && (!($proxysettings{'SUPERVISOR_PASSWORD'} eq '')) || + if ( ($cgiparams{'PASSWORD'} eq $proxysettings{'SUPERVISOR_PASSWORD'}) && (!($proxysettings{'SUPERVISOR_PASSWORD'} eq '')) || ((defined($proxysettings{'SUPERVISOR_PASSWORD'})) && ($proxysettings{'SUPERVISOR_PASSWORD'} eq ''))) { &write_acl; @@ -269,7 +269,7 @@ sub readhash { $val =~ s/^\'//g; $val =~ s/\'$//g; - + # Untaint variables read from hash $var =~ /([A-Za-z0-9_-]*)/; $var = $1; $val =~ /([\w\W]*)/; $val = $1; diff --git a/html/cgi-bin/wireless.cgi b/html/cgi-bin/wireless.cgi index 35bdaaa60..27a2d9dd7 100644 --- a/html/cgi-bin/wireless.cgi +++ b/html/cgi-bin/wireless.cgi @@ -39,7 +39,7 @@ my %checked=(); my $errormessage = ''; my $filename = "${General::swroot}/wireless/config"; my $hostsfile = "${General::swroot}/main/hosts"; -our %dhcpsettings=(); +our %dhcpsettings=(); our %netsettings=(); $cgiparams{'ENABLED'} = 'off'; @@ -92,9 +92,9 @@ if ($cgiparams{'ACTION'} eq 'add') { $cgiparams{'SOURCE_IP'} = 'NONE'; } else { - unless(&General::validipormask($cgiparams{'SOURCE_IP'})) + unless(&General::validipormask($cgiparams{'SOURCE_IP'})) { - $errormessage = $Lang::tr{'invalid fixed ip address'}; + $errormessage = $Lang::tr{'invalid fixed ip address'}; goto ADDERROR; } } @@ -102,9 +102,9 @@ if ($cgiparams{'ACTION'} eq 'add') { $cgiparams{'SOURCE_MAC'} = 'NONE'; } else { - unless(&General::validmac($cgiparams{'SOURCE_MAC'})) - { - $errormessage = $Lang::tr{'invalid fixed mac address'}; + unless(&General::validmac($cgiparams{'SOURCE_MAC'})) + { + $errormessage = $Lang::tr{'invalid fixed mac address'}; } } @@ -323,7 +323,7 @@ foreach my $line (@current) } if ( $hname eq "" ) { my ($aliases, $addrtype, $length, @addrs); - ($hname, $aliases, $addrtype, $length, @addrs) = + ($hname, $aliases, $addrtype, $length, @addrs) = gethostbyaddr(pack("C4", split(/\./, $sourceip)), 2); } } diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi index 7cd23aed4..00d177904 100644 --- a/html/cgi-bin/wirelessclient.cgi +++ b/html/cgi-bin/wirelessclient.cgi @@ -303,7 +303,7 @@ END $gdesc = $Lang::tr{'click to disable'}; } else { $gif = 'off.gif'; - $gdesc = $Lang::tr{'click to enable'}; + $gdesc = $Lang::tr{'click to enable'}; } # Colorize each line @@ -576,7 +576,7 @@ sub showEditBox() { <br> <hr> - + <strong> $Lang::tr{'wlan client advanced settings'}: </strong> diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi index 62f18e308..07a1f51da 100644 --- a/html/cgi-bin/zoneconf.cgi +++ b/html/cgi-bin/zoneconf.cgi @@ -67,7 +67,7 @@ my $extraHead = <<END #zoneconf td.heading { background-color: lightgrey; color: white; - } + } #zoneconf td.heading.bold::first-line { font-weight: bold; line-height: 1.6; @@ -310,7 +310,7 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) { } $VALIDATE_nic_check{"VLAN $mac $vlan_tag"} = 1; - + # check VLAN tag range: 1..4094 (0, 4095 are reserved) unless (looks_like_number($vlan_tag) && ($vlan_tag >= 1) && ($vlan_tag <= 4094)) { $VALIDATE_error = $Lang::tr{"zoneconf val vlan tag range error"}; @@ -507,7 +507,7 @@ END if ($access_selected{"NONE"} eq "") { $highlight = $_; } - + print <<END <td class="$highlight"> <select name="ACCESS $uc $mac" data-zone="$uc" data-mac="$mac" onchange="highlightAccess(this)"> @@ -542,7 +542,7 @@ foreach (@zones) { # load settings and prepare form elements for each zone my $stp_available = $ethsettings{"${uc}_MODE"} eq "bridge"; # STP is only available in bridge mode my $stp_enabled = $ethsettings{"${uc}_STP"} eq "on"; my $stp_priority = $ethsettings{"${uc}_STP_PRIORITY"}; - + # set priority to default value if no numerical value is configured $stp_priority = 32768 unless looks_like_number($stp_priority); diff --git a/html/html/include/rrdimage.js b/html/html/include/rrdimage.js index e7ee4c769..c6f5930c9 100644 --- a/html/html/include/rrdimage.js +++ b/html/html/include/rrdimage.js @@ -27,8 +27,8 @@ function rrdimage_selectRange(buttonObj) { // Get selected time range from button const range = buttonObj.dataset.range; - - // Get surrounding div box and select new range + + // Get surrounding div box and select new range let graphBox = $(buttonObj).closest('div'); _rrdimg_setRange(graphBox, range); } @@ -60,7 +60,7 @@ function _rrdimg_setRange(graphBox, range, initMode = false) { // Check if the time range is changed if((graphBox.data('range') !== range) || initMode) { graphBox.data('range', range); //Store new range - + // Update button highlighting graphBox.find('button').removeClass('selected'); graphBox.find(`button[data-range="${range}"]`).addClass('selected'); @@ -105,7 +105,7 @@ function _rrdimg_setRange(graphBox, range, initMode = false) { // graphBox: jQuery object (graph element must be valid) function _rrdimg_reload(graphBox) { const origin = graphBox.data('origin'); - const graph = graphBox.data('graph'); + const graph = graphBox.data('graph'); const timestamp = Date.now(); // Get user selected range or fall back to default diff --git a/html/html/redirect-templates/legacy/template.html b/html/html/redirect-templates/legacy/template.html index 297561e3a..fedf81121 100644 --- a/html/html/redirect-templates/legacy/template.html +++ b/html/html/redirect-templates/legacy/template.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>ACCESS MESSAGE</title> <style content="text/css"> td.image { diff --git a/html/html/redirect.cgi b/html/html/redirect.cgi index 4f9d2278e..5fed0084c 100644 --- a/html/html/redirect.cgi +++ b/html/html/redirect.cgi @@ -103,7 +103,7 @@ sub readhash { if ($var) { $val =~ s/^\'//g; $val =~ s/\'$//g; - + # Untaint variables read from hash $var =~ /([A-Za-z0-9_-]*)/; $var = $1; $val =~ /([\w\W]*)/; $val = $1; diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index 54f8966d5..d74c962e4 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -39,7 +39,7 @@ require "${General::swroot}/lang.pl"; # @param submenu entries sub showsubmenu() { my $submenus = shift; - + print "<ul>"; foreach my $item (sort keys %$submenus) { $link = getlink($submenus->{$item}); diff --git a/lfs/7zip b/lfs/7zip index 40b4fcda6..76e0e27f1 100644 --- a/lfs/7zip +++ b/lfs/7zip @@ -73,7 +73,7 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) : $(subst %,%_MD5,$(objects)) : @$(MD5) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/Config b/lfs/Config index d4c3df535..92d719892 100644 --- a/lfs/Config +++ b/lfs/Config @@ -244,7 +244,7 @@ endef # Common Macro Definitions ############################################################################### -# For each package we create a list of files that it installed under +# For each package we create a list of files that it installed under # log/<TARGET> name. Modified files are not identified # define FIND_FILES diff --git a/lfs/alac b/lfs/alac index abae8a2f9..17b8386fb 100644 --- a/lfs/alac +++ b/lfs/alac @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/alsa b/lfs/alsa index f8f45a6e8..ab6eeca70 100644 --- a/lfs/alsa +++ b/lfs/alsa @@ -67,7 +67,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/apcupsd b/lfs/apcupsd index 82c61f12a..0bbc476ce 100644 --- a/lfs/apcupsd +++ b/lfs/apcupsd @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/avahi b/lfs/avahi index c2b7aa4c7..19b5624cc 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### @@ -106,10 +106,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Install initscript $(call INSTALL_INITSCRIPTS,$(SERVICES)) - + #install backup definition install -v -m 644 ${DIR_SRC}/config/backup/includes/avahi \ /var/ipfire/backup/addons/includes/avahi - + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/aws-cli b/lfs/aws-cli index 5e004f722..0af0ee0f1 100644 --- a/lfs/aws-cli +++ b/lfs/aws-cli @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/backup b/lfs/backup index 8fcfd8616..211f3570f 100644 --- a/lfs/backup +++ b/lfs/backup @@ -44,13 +44,13 @@ SERVICES = install : $(TARGET) -check : +check : download : -md5 : +md5 : -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/bacula b/lfs/bacula index 71ba3b877..63391f7ad 100644 --- a/lfs/bacula +++ b/lfs/bacula @@ -61,7 +61,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/binutils b/lfs/binutils index 33555fa23..121e8aa54 100644 --- a/lfs/binutils +++ b/lfs/binutils @@ -62,7 +62,7 @@ ifeq "$(PASS)" "1" --with-lib-path=$(TOOLS_DIR)/lib \ --disable-nls EXTRA_MAKE = - EXTRA_INSTALL = + EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools2 EXTRA_ENV = \ @@ -76,8 +76,8 @@ else --with-lib-path=$(TOOLS_DIR)/lib \ --with-sysroot \ --disable-nls - EXTRA_MAKE = - EXTRA_INSTALL = + EXTRA_MAKE = + EXTRA_INSTALL = endif endif diff --git a/lfs/bird b/lfs/bird index 48c3e42b4..76f82f282 100644 --- a/lfs/bird +++ b/lfs/bird @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/br2684ctl b/lfs/br2684ctl index 149aa4076..dd1526379 100644 --- a/lfs/br2684ctl +++ b/lfs/br2684ctl @@ -35,11 +35,11 @@ TARGET = $(DIR_INFO)/$(THISAPP) install : $(TARGET) -check : +check : download : -md5 : +md5 : ############################################################################### # Installation Details diff --git a/lfs/bwm-ng b/lfs/bwm-ng index df153e3ca..30c7ddc02 100644 --- a/lfs/bwm-ng +++ b/lfs/bwm-ng @@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/c-ares b/lfs/c-ares index 07f7b02fe..96a3fd8a2 100644 --- a/lfs/c-ares +++ b/lfs/c-ares @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/ca-certificates b/lfs/ca-certificates index 0eb8c0933..4474a59cd 100644 --- a/lfs/ca-certificates +++ b/lfs/ca-certificates @@ -36,11 +36,11 @@ TARGET = $(DIR_INFO)/$(THISAPP) install : $(TARGET) -check : +check : -download : +download : -md5 : +md5 : ############################################################################### # Installation Details diff --git a/lfs/cifs-utils b/lfs/cifs-utils index 712c74f9d..524c3bcee 100644 --- a/lfs/cifs-utils +++ b/lfs/cifs-utils @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/clamav b/lfs/clamav index adc9cb344..58837ad9c 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -SUMMARY = Antivirus Toolkit +SUMMARY = Antivirus Toolkit VER = 0.104.2 @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain index f2e08d1e3..3e48ae2f4 100644 --- a/lfs/cleanup-toolchain +++ b/lfs/cleanup-toolchain @@ -40,11 +40,11 @@ GCC_VER = 4.1.2 # Top-level Rules ############################################################################### -objects = +objects = install : $(TARGET) -check : +check : download : diff --git a/lfs/collectd b/lfs/collectd index 09d8c6fcf..d749c61c7 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -126,8 +126,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mv /etc/collectd.vpn /var/ipfire/ovpn/collectd.vpn chown nobody.nobody /var/ipfire/ovpn/collectd.vpn ln -f -s ../var/ipfire/ovpn/collectd.vpn /etc/collectd.vpn - ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd + ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S29collectd - ln -f -s ../init.d/collectd /etc/rc.d/rc6.d/K50collectd + ln -f -s ../init.d/collectd /etc/rc.d/rc6.d/K50collectd @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/core-updates b/lfs/core-updates index 08d72310e..a3329c1d8 100644 --- a/lfs/core-updates +++ b/lfs/core-updates @@ -66,7 +66,7 @@ core/%: #remove excluded files from ROOTFILES grep -f $(DIR_SRC)/config/rootfiles/$@/exclude -v /tmp/ROOTFILES.tmp > /tmp/ROOTFILES rm -rf /tmp/ROOTFILES.tmp - + #Change KVER to Kernelversion sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES diff --git a/lfs/cpufrequtils b/lfs/cpufrequtils index 11a34fcf8..e0cad1f86 100644 --- a/lfs/cpufrequtils +++ b/lfs/cpufrequtils @@ -24,7 +24,7 @@ include Config -SUMMARY = Tools to Determine and Set CPUfreq Settings +SUMMARY = Tools to Determine and Set CPUfreq Settings VER = 008 @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/cups-filters b/lfs/cups-filters index 5abd4677b..69b75fc3e 100644 --- a/lfs/cups-filters +++ b/lfs/cups-filters @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/dbus b/lfs/dbus index 9452081fd..3f5ec3f71 100644 --- a/lfs/dbus +++ b/lfs/dbus @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/ddrescue b/lfs/ddrescue index 3bf528ad5..9f9be697e 100644 --- a/lfs/ddrescue +++ b/lfs/ddrescue @@ -24,7 +24,7 @@ include Config -SUMMARY = Data Copying in the Presence of I/O Errors +SUMMARY = Data Copying in the Presence of I/O Errors VER = 1.25 @@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/dehydrated b/lfs/dehydrated index 1b8544a17..237768ccf 100644 --- a/lfs/dehydrated +++ b/lfs/dehydrated @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/dnsdist b/lfs/dnsdist index e611f1bdd..95c386a1e 100644 --- a/lfs/dnsdist +++ b/lfs/dnsdist @@ -62,7 +62,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/ebtables b/lfs/ebtables index 58631244e..f57f84fcd 100644 --- a/lfs/ebtables +++ b/lfs/ebtables @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/elfutils b/lfs/elfutils index cd35659aa..e4a59a41f 100644 --- a/lfs/elfutils +++ b/lfs/elfutils @@ -24,7 +24,7 @@ include Config -SUMMARY = Higher-level library to access ELF files +SUMMARY = Higher-level library to access ELF files VER = 0.186 diff --git a/lfs/elinks b/lfs/elinks index b60c986ab..7a6aae2d5 100644 --- a/lfs/elinks +++ b/lfs/elinks @@ -71,7 +71,7 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) : $(subst %,%_MD5,$(objects)) : @$(MD5) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/epson-inkjet-printer-escpr b/lfs/epson-inkjet-printer-escpr index e48bcd2fb..9da67ab4a 100644 --- a/lfs/epson-inkjet-printer-escpr +++ b/lfs/epson-inkjet-printer-escpr @@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/faad2 b/lfs/faad2 index 9e68b7f19..c5327c484 100644 --- a/lfs/faad2 +++ b/lfs/faad2 @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/fake-environ b/lfs/fake-environ index 38b36aa95..e9f77740f 100644 --- a/lfs/fake-environ +++ b/lfs/fake-environ @@ -36,11 +36,11 @@ TARGET = $(DIR_INFO)/$(THISAPP)-tools install : $(TARGET) -check : +check : -download : +download : -md5 : +md5 : ############################################################################### # Installation Details diff --git a/lfs/fcron b/lfs/fcron index 97f67e5cc..d16de3567 100644 --- a/lfs/fcron +++ b/lfs/fcron @@ -96,7 +96,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) #Create Placeholder files echo "Place scripts run minutely here ..." > /etc/fcron.minutely/info.txt - echo "Place scripts run cyclic here ..." > /etc/fcron.cyclic/info.txt + echo "Place scripts run cyclic here ..." > /etc/fcron.cyclic/info.txt echo "Place scripts run hourly here ..." > /etc/fcron.hourly/info.txt echo "Place scripts run daily here ..." > /etc/fcron.daily/info.txt echo "Place scripts run weekly here ..." > /etc/fcron.weekly/info.txt diff --git a/lfs/fetchmail b/lfs/fetchmail index e05cf0e81..8aab43f00 100644 --- a/lfs/fetchmail +++ b/lfs/fetchmail @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/ffmpeg b/lfs/ffmpeg index 97ed7ea90..06b0c4a91 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -66,7 +66,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/firmware-update b/lfs/firmware-update index fd30b9f7e..31c703db7 100644 --- a/lfs/firmware-update +++ b/lfs/firmware-update @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/flac b/lfs/flac index c81d47283..7a4bddde2 100644 --- a/lfs/flac +++ b/lfs/flac @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/flashrom b/lfs/flashrom index 20f3d4a1d..e459e7a76 100644 --- a/lfs/flashrom +++ b/lfs/flashrom @@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/flex b/lfs/flex index 2653cbec6..67df10ec6 100644 --- a/lfs/flex +++ b/lfs/flex @@ -36,8 +36,8 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) EXTRA_CONFIG = --prefix=/usr --disable-nls - EXTRA_MAKE = - EXTRA_INSTALL = + EXTRA_MAKE = + EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools diff --git a/lfs/foomatic b/lfs/foomatic index 0ede44bf2..a869a1f71 100644 --- a/lfs/foomatic +++ b/lfs/foomatic @@ -74,7 +74,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/fping b/lfs/fping index fd2e8260e..60ad388ef 100644 --- a/lfs/fping +++ b/lfs/fping @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/freefont b/lfs/freefont index d944a7790..e7eba8755 100644 --- a/lfs/freefont +++ b/lfs/freefont @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/freeradius b/lfs/freeradius index 6b2e6f8e5..ab8019c62 100644 --- a/lfs/freeradius +++ b/lfs/freeradius @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/frr b/lfs/frr index 81840dc05..2ed931a70 100644 --- a/lfs/frr +++ b/lfs/frr @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/gcc b/lfs/gcc index f9502562d..869c03380 100644 --- a/lfs/gcc +++ b/lfs/gcc @@ -105,8 +105,8 @@ ifeq "$(PASS)" "1" --without-ppl \ --without-cloog \ --enable-languages=c,c++ - EXTRA_MAKE = - EXTRA_INSTALL = + EXTRA_MAKE = + EXTRA_INSTALL = else ifeq "$(PASS)" "2" TARGET = $(DIR_INFO)/$(THISAPP)-tools2 @@ -125,8 +125,8 @@ ifeq "$(PASS)" "2" --disable-libstdcxx-pch \ --disable-multilib \ --disable-libgomp - EXTRA_MAKE = - EXTRA_INSTALL = + EXTRA_MAKE = + EXTRA_INSTALL = ifeq "$(FULL_BOOTSTRAP)" "1" EXTRA_CONFIG += --enable-bootstrap @@ -149,8 +149,8 @@ else --disable-libstdcxx-threads \ --disable-libstdcxx-pch \ --with-gxx-include-dir=$(TOOLS_DIR)/$(CROSSTARGET)/include/c++/$(VER) - EXTRA_MAKE = - EXTRA_INSTALL = + EXTRA_MAKE = + EXTRA_INSTALL = endif endif endif diff --git a/lfs/ghostscript b/lfs/ghostscript index e5ca19a40..53eb31ae4 100644 --- a/lfs/ghostscript +++ b/lfs/ghostscript @@ -64,7 +64,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/gnump3d b/lfs/gnump3d index 06d22a48f..5434a4de3 100644 --- a/lfs/gnump3d +++ b/lfs/gnump3d @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/gptfdisk b/lfs/gptfdisk index 073d57c7e..54f78c5eb 100644 --- a/lfs/gptfdisk +++ b/lfs/gptfdisk @@ -35,7 +35,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = gptfdisk PAK_VER = 1 -DEPS = +DEPS = ############################################################################### # Top-level Rules @@ -55,7 +55,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/gutenprint b/lfs/gutenprint index 4468acb1e..1993ed60d 100644 --- a/lfs/gutenprint +++ b/lfs/gutenprint @@ -24,7 +24,7 @@ include Config -SUMMARY = Printer drivers for CUPS from the Gutenprint project +SUMMARY = Printer drivers for CUPS from the Gutenprint project VER = 5.2.9 @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/haproxy b/lfs/haproxy index 1101eeafc..2e29fbe38 100644 --- a/lfs/haproxy +++ b/lfs/haproxy @@ -24,7 +24,7 @@ include Config -SUMMARY = The Reliable, High Performance TCP/HTTP Load Balancer +SUMMARY = The Reliable, High Performance TCP/HTTP Load Balancer VER = 2.2.4 diff --git a/lfs/hplip b/lfs/hplip index fb45605f7..63d9cf383 100644 --- a/lfs/hplip +++ b/lfs/hplip @@ -24,7 +24,7 @@ include Config -SUMMARY = HP's Printing, Scanning, and Faxing Software +SUMMARY = HP's Printing, Scanning, and Faxing Software VER = 3.21.6 @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/htop b/lfs/htop index aa63b0285..a3cfc5257 100644 --- a/lfs/htop +++ b/lfs/htop @@ -24,7 +24,7 @@ include Config -SUMMARY = An Interactive text-mode Process Viewer for Linux +SUMMARY = An Interactive text-mode Process Viewer for Linux VER = 3.1.2 @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/i2c-tools b/lfs/i2c-tools index d16e4aaae..9a5581325 100644 --- a/lfs/i2c-tools +++ b/lfs/i2c-tools @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/icinga b/lfs/icinga index 4e82efa7e..715d91021 100644 --- a/lfs/icinga +++ b/lfs/icinga @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/iftop b/lfs/iftop index 73ac2157d..5e0f5ae7d 100644 --- a/lfs/iftop +++ b/lfs/iftop @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/igmpproxy b/lfs/igmpproxy index 6a48d0df0..4e6b5de28 100644 --- a/lfs/igmpproxy +++ b/lfs/igmpproxy @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/intltool b/lfs/intltool index 3b936c984..11d82e12a 100644 --- a/lfs/intltool +++ b/lfs/intltool @@ -72,7 +72,7 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) : $(subst %,%_MD5,$(objects)) : @$(MD5) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/iperf b/lfs/iperf index 9e9264cd2..260639e30 100644 --- a/lfs/iperf +++ b/lfs/iperf @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/iptraf-ng b/lfs/iptraf-ng index 2cd47b130..ab9835fb7 100644 --- a/lfs/iptraf-ng +++ b/lfs/iptraf-ng @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/jansson b/lfs/jansson index b2b02ff26..f3bf277f0 100644 --- a/lfs/jansson +++ b/lfs/jansson @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### @@ -73,7 +73,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/joe b/lfs/joe index 51032f8ee..a31a7a2bf 100644 --- a/lfs/joe +++ b/lfs/joe @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/jq b/lfs/jq index 067063e1f..b44571dff 100644 --- a/lfs/jq +++ b/lfs/jq @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/json-c b/lfs/json-c index 6a0b6c0f8..97ede64ef 100644 --- a/lfs/json-c +++ b/lfs/json-c @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/keyutils b/lfs/keyutils index 67b6f44fa..aef432543 100644 --- a/lfs/keyutils +++ b/lfs/keyutils @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/knot b/lfs/knot index 2a2c5e9d7..3749bf83c 100644 --- a/lfs/knot +++ b/lfs/knot @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/krb5 b/lfs/krb5 index 59853704c..f67429c9d 100644 --- a/lfs/krb5 +++ b/lfs/krb5 @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/lame b/lfs/lame index 38ca186cc..f170b5567 100644 --- a/lfs/lame +++ b/lfs/lame @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/lcdproc b/lfs/lcdproc index c5e758b8d..e5ed03bcd 100644 --- a/lfs/lcdproc +++ b/lfs/lcdproc @@ -36,7 +36,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = lcdproc PAK_VER = 2 -DEPS = +DEPS = SERVICES = lcdproc @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/libaio b/lfs/libaio index 1fb4c0b1d..acf3f639f 100644 --- a/lfs/libaio +++ b/lfs/libaio @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libarchive b/lfs/libarchive index 29bde8d60..82cd00903 100644 --- a/lfs/libarchive +++ b/lfs/libarchive @@ -51,7 +51,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libassuan b/lfs/libassuan index 934d38411..00c8c857c 100644 --- a/lfs/libassuan +++ b/lfs/libassuan @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libcdada b/lfs/libcdada index 7ab12e835..c7d2034c1 100644 --- a/lfs/libcdada +++ b/lfs/libcdada @@ -37,7 +37,7 @@ PROG = libcdada PAK_VER = 2 -DEPS = +DEPS = SERVICES = @@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libdaemon b/lfs/libdaemon index 7018efa41..d474c929d 100644 --- a/lfs/libdaemon +++ b/lfs/libdaemon @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libedit b/lfs/libedit index 3e58896ad..146542eeb 100644 --- a/lfs/libedit +++ b/lfs/libedit @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libexif b/lfs/libexif index 8c15e2ce7..31e2ccba6 100644 --- a/lfs/libexif +++ b/lfs/libexif @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libffi b/lfs/libffi index 8574ca067..bbb135aa2 100644 --- a/lfs/libffi +++ b/lfs/libffi @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libid3tag b/lfs/libid3tag index 1e0c4f3ad..bdd263ee1 100644 --- a/lfs/libid3tag +++ b/lfs/libid3tag @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libinih b/lfs/libinih index 3c25bdbfa..476a4c06b 100644 --- a/lfs/libinih +++ b/lfs/libinih @@ -52,7 +52,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libmad b/lfs/libmad index 968383f56..5172c27d7 100644 --- a/lfs/libmad +++ b/lfs/libmad @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libmpdclient b/lfs/libmpdclient index 65a7e8545..a9cf0c45f 100644 --- a/lfs/libmpdclient +++ b/lfs/libmpdclient @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libmpeg2 b/lfs/libmpeg2 index 97b5515d8..7c57d3d7e 100644 --- a/lfs/libmpeg2 +++ b/lfs/libmpeg2 @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libnl b/lfs/libnl index 4944a4b2a..f3afca8c2 100644 --- a/lfs/libnl +++ b/lfs/libnl @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libnl-3 b/lfs/libnl-3 index 15a7138dc..3f16981f8 100644 --- a/lfs/libnl-3 +++ b/lfs/libnl-3 @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libogg b/lfs/libogg index afc527beb..5f35f9541 100644 --- a/lfs/libogg +++ b/lfs/libogg @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libpri b/lfs/libpri index be62f0a4f..4ff1f28d8 100644 --- a/lfs/libpri +++ b/lfs/libpri @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/libshout b/lfs/libshout index 09baa141a..a761cd0a8 100644 --- a/lfs/libshout +++ b/lfs/libshout @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libsolv b/lfs/libsolv index 1a316dad6..97a4d45e3 100644 --- a/lfs/libsolv +++ b/lfs/libsolv @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist : +dist : @$(PAK) ############################################################################### diff --git a/lfs/libstatgrab b/lfs/libstatgrab index eef514773..428b93568 100644 --- a/lfs/libstatgrab +++ b/lfs/libstatgrab @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libtalloc b/lfs/libtalloc index 6f400b3ad..6b451bd7c 100644 --- a/lfs/libtalloc +++ b/lfs/libtalloc @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/libtiff b/lfs/libtiff index f9b7afc63..8e6e4423d 100644 --- a/lfs/libtiff +++ b/lfs/libtiff @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/libtool b/lfs/libtool index 940230cf7..a7d50118d 100644 --- a/lfs/libtool +++ b/lfs/libtool @@ -65,7 +65,7 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) : $(subst %,%_MD5,$(objects)) : @$(MD5) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/liburcu b/lfs/liburcu index 0a21c0f21..ceda88709 100644 --- a/lfs/liburcu +++ b/lfs/liburcu @@ -51,7 +51,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libvirt b/lfs/libvirt index d9df3bdbe..658b05cb1 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/libvorbis b/lfs/libvorbis index 336aae9c0..8a2b0ee8e 100644 --- a/lfs/libvorbis +++ b/lfs/libvorbis @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/libyang b/lfs/libyang index 0d7149333..a0cde3f7e 100644 --- a/lfs/libyang +++ b/lfs/libyang @@ -54,7 +54,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/linux b/lfs/linux index 7a7236eab..1fca83156 100644 --- a/lfs/linux +++ b/lfs/linux @@ -241,7 +241,7 @@ ifeq "$(LASTKERNEL)" "1" # Blacklist new drm framebuffer modules for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm -name *.ko.xz); do \ echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \ - done + done sed -i -e "s|.ko.xz||g" /etc/modprobe.d/framebuffer.conf # Disable ipv6 at runtime diff --git a/lfs/lm_sensors b/lfs/lm_sensors index 42c55d6d6..dfc462c7b 100644 --- a/lfs/lm_sensors +++ b/lfs/lm_sensors @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/lmdb b/lfs/lmdb index 1f496cd61..c28977272 100644 --- a/lfs/lmdb +++ b/lfs/lmdb @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/logwatch b/lfs/logwatch index 628dafe6f..cfea09f86 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @cd $(DIR_APP) && chmod 755 install_logwatch.sh cd $(DIR_APP) && yes "" | ./install_logwatch.sh - + #sed -i 's/^Print = .*$$/Print = Yes/' /etc/log.d/conf/logwatch.conf # comment out line with unused example #sed -i '/-zz-network/s/Service/#Service/' /etc/log.d/conf/logwatch.conf @@ -97,7 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # done cp -f $(DIR_SRC)/config/logwatch/dialup /usr/share/logwatch/scripts/services/dialup cp -f $(DIR_SRC)/config/logwatch/dialup.conf /usr/share/logwatch/dist.conf/services/dialup.conf - + -mkdir -p /var/cache/logwatch chmod -v 777 /var/cache/logwatch -mkdir -p /var/log/logwatch diff --git a/lfs/lshw b/lfs/lshw index d568d4af5..de18f09d8 100644 --- a/lfs/lshw +++ b/lfs/lshw @@ -25,7 +25,7 @@ include Config -SUMMARY = HardWare LiSter +SUMMARY = HardWare LiSter VER = B.02.19.2 @@ -37,7 +37,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = lshw PAK_VER = 1 -DEPS = +DEPS = SERVICES = @@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/lvm2 b/lfs/lvm2 index fc87e333a..8e5b9eb6e 100644 --- a/lfs/lvm2 +++ b/lfs/lvm2 @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/lz4 b/lfs/lz4 index b09191c5e..2c57a6d93 100644 --- a/lfs/lz4 +++ b/lfs/lz4 @@ -51,7 +51,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/make b/lfs/make index 3c2d81542..4000a1e31 100644 --- a/lfs/make +++ b/lfs/make @@ -69,7 +69,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/mc b/lfs/mc index d8324e898..55cd5d438 100644 --- a/lfs/mc +++ b/lfs/mc @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/mcelog b/lfs/mcelog index 72123c915..f5a83cbca 100644 --- a/lfs/mcelog +++ b/lfs/mcelog @@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/mdadm b/lfs/mdadm index c42ad8d59..ece902fe0 100644 --- a/lfs/mdadm +++ b/lfs/mdadm @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/mdns-repeater b/lfs/mdns-repeater index 310129658..e97453226 100644 --- a/lfs/mdns-repeater +++ b/lfs/mdns-repeater @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/minicom b/lfs/minicom index c8cb05559..996273684 100644 --- a/lfs/minicom +++ b/lfs/minicom @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/minidlna b/lfs/minidlna index b84b07a83..490ff72f5 100644 --- a/lfs/minidlna +++ b/lfs/minidlna @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### @@ -93,7 +93,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) #install initscripts $(call INSTALL_INITSCRIPTS,$(SERVICES)) - + #install backup definition install -v -m 644 ${DIR_SRC}/config/backup/includes/minidlna \ /var/ipfire/backup/addons/includes/minidlna diff --git a/lfs/mpc b/lfs/mpc index f8643f094..0d3518552 100644 --- a/lfs/mpc +++ b/lfs/mpc @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/mpd b/lfs/mpd index a86f2852d..29167dae1 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -24,7 +24,7 @@ include Config -SUMMARY = Music Player Daemon +SUMMARY = Music Player Daemon VER = 0.22.6 @@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/mpfire b/lfs/mpfire index fc8a1dd59..ce2296917 100644 --- a/lfs/mpfire +++ b/lfs/mpfire @@ -46,13 +46,13 @@ objects = install : $(TARGET) -check : +check : download : -md5 : +md5 : -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/mtr b/lfs/mtr index 50fd054a8..6095a29ee 100644 --- a/lfs/mtr +++ b/lfs/mtr @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/multipath-tools b/lfs/multipath-tools index 1ce0e1ce5..97d91bcba 100644 --- a/lfs/multipath-tools +++ b/lfs/multipath-tools @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/nagios-plugins b/lfs/nagios-plugins index 140db54c8..47ad3275c 100644 --- a/lfs/nagios-plugins +++ b/lfs/nagios-plugins @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe index cdbe747b4..f513d0300 100644 --- a/lfs/nagios_nrpe +++ b/lfs/nagios_nrpe @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/ncat b/lfs/ncat index c994706dd..f0f06365c 100644 --- a/lfs/ncat +++ b/lfs/ncat @@ -81,7 +81,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ncat-7.91-fix-a-unix-domain-socket-crash.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ncat-7.91-fix-a-unix-domain-socket-crash.patch $(UPDATE_AUTOMAKE) cd $(DIR_APP) && mkdir -p build cd $(DIR_APP) && ./configure \ diff --git a/lfs/ncdu b/lfs/ncdu index e75187317..e96e84a25 100644 --- a/lfs/ncdu +++ b/lfs/ncdu @@ -37,7 +37,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = ncdu PAK_VER = 2 -DEPS = +DEPS = SERVICES = @@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/netatalk b/lfs/netatalk index e84376a71..3c7f5533a 100644 --- a/lfs/netatalk +++ b/lfs/netatalk @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/netpbm b/lfs/netpbm index f16d670f7..1e8804826 100644 --- a/lfs/netpbm +++ b/lfs/netpbm @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/nfs b/lfs/nfs index 9ebc3b660..4f580c881 100644 --- a/lfs/nfs +++ b/lfs/nfs @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/ninja b/lfs/ninja index ed9f8b778..692212afd 100644 --- a/lfs/ninja +++ b/lfs/ninja @@ -83,7 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && python3 configure.py --bootstrap --verbose # Build ninja - cd $(DIR_APP) && ./ninja -v all + cd $(DIR_APP) && ./ninja -v all # Install ninja. cd $(DIR_APP) && install -vm755 ninja /usr/bin/ diff --git a/lfs/ntfs-3g b/lfs/ntfs-3g index 3f0ae8134..0ee7dab93 100644 --- a/lfs/ntfs-3g +++ b/lfs/ntfs-3g @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/nut b/lfs/nut index 625f7f094..41957de88 100644 --- a/lfs/nut +++ b/lfs/nut @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/observium-agent b/lfs/observium-agent index d1c800a61..1f7db9c50 100644 --- a/lfs/observium-agent +++ b/lfs/observium-agent @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/openvmtools b/lfs/openvmtools index 91c3baeb6..18d526c2c 100644 --- a/lfs/openvmtools +++ b/lfs/openvmtools @@ -62,7 +62,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) dist: - @$(PAK) + @$(PAK) ############################################################################### # Downloading, checking, md5sum ############################################################################### diff --git a/lfs/opus b/lfs/opus index bce8b618d..4e85b9612 100644 --- a/lfs/opus +++ b/lfs/opus @@ -57,7 +57,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### @@ -69,7 +69,7 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) : $(patsubst %,$(DIR_DL)/%,$(objects)) : @$(LOAD) - + $(subst %,%_MD5,$(objects)) : @$(MD5) diff --git a/lfs/pakfire b/lfs/pakfire index 3711bde98..c60d17a4d 100644 --- a/lfs/pakfire +++ b/lfs/pakfire @@ -38,11 +38,11 @@ PAKFIRE_VERSION = $(VERSION)-$(BUILD_ARCH) install : $(TARGET) -check : +check : -download : +download : -md5 : +md5 : ############################################################################### # Installation Details diff --git a/lfs/parted b/lfs/parted index 91b4c45c2..ae57a9b2c 100644 --- a/lfs/parted +++ b/lfs/parted @@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/pcmciautils b/lfs/pcmciautils index fc77f4b3e..e2d070c3e 100644 --- a/lfs/pcmciautils +++ b/lfs/pcmciautils @@ -60,7 +60,7 @@ md5 : $(subst %,%_MD5,$(objects)) dist : @$(PAK) - + ############################################################################### # Downloading, checking, md5sum ############################################################################### diff --git a/lfs/perl-Archive-Tar b/lfs/perl-Archive-Tar index 6b14079d4..c428c3a15 100644 --- a/lfs/perl-Archive-Tar +++ b/lfs/perl-Archive-Tar @@ -51,7 +51,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -#dist: +#dist: # make-packages.sh Archive-Tar $(THISAPP)-ipfire-beta-1 ############################################################################### diff --git a/lfs/perl-Archive-Zip b/lfs/perl-Archive-Zip index 442682967..1b6f86761 100644 --- a/lfs/perl-Archive-Zip +++ b/lfs/perl-Archive-Zip @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -#dist: +#dist: # make-packages.sh Archive-Zip $(THISAPP)-ipfire-beta-1 ############################################################################### diff --git a/lfs/perl-Authen-SASL b/lfs/perl-Authen-SASL index c69d24333..246a1377f 100644 --- a/lfs/perl-Authen-SASL +++ b/lfs/perl-Authen-SASL @@ -57,7 +57,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/perl-BerkeleyDB b/lfs/perl-BerkeleyDB index 3e37f181f..a0d3a0ec7 100644 --- a/lfs/perl-BerkeleyDB +++ b/lfs/perl-BerkeleyDB @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -#dist: +#dist: # make-packages.sh BerkeleyDB $(THISAPP)-ipfire-beta-1 ############################################################################### diff --git a/lfs/perl-Carp-Clan b/lfs/perl-Carp-Clan index 4d52b16b0..0dcb527b9 100644 --- a/lfs/perl-Carp-Clan +++ b/lfs/perl-Carp-Clan @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/perl-Convert-TNEF b/lfs/perl-Convert-TNEF index 136bc71d0..703be0372 100644 --- a/lfs/perl-Convert-TNEF +++ b/lfs/perl-Convert-TNEF @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -#dist: +#dist: # make-packages.sh Convert-TNEF $(THISAPP)-ipfire-beta-1 ############################################################################### diff --git a/lfs/perl-Convert-UUlib b/lfs/perl-Convert-UUlib index 95f6bc4bb..d9f02ae24 100644 --- a/lfs/perl-Convert-UUlib +++ b/lfs/perl-Convert-UUlib @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -#dist: +#dist: # make-packages.sh Convert-UUlib $(THISAPP)-ipfire-beta-1 ############################################################################### diff --git a/lfs/perl-Date-Calc b/lfs/perl-Date-Calc index 50500dc50..3605aa553 100644 --- a/lfs/perl-Date-Calc +++ b/lfs/perl-Date-Calc @@ -57,7 +57,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/perl-Date-Manip b/lfs/perl-Date-Manip index 6ab212450..fb05a5aca 100644 --- a/lfs/perl-Date-Manip +++ b/lfs/perl-Date-Manip @@ -57,7 +57,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/perl-File-Tail b/lfs/perl-File-Tail index c310404ac..f98e3c354 100644 --- a/lfs/perl-File-Tail +++ b/lfs/perl-File-Tail @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/perl-IO-Stringy b/lfs/perl-IO-Stringy index d277b9e2f..921149795 100644 --- a/lfs/perl-IO-Stringy +++ b/lfs/perl-IO-Stringy @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -#dist: +#dist: # make-packages.sh IO-Stringy $(THISAPP)-ipfire-beta-1 ############################################################################### diff --git a/lfs/perl-MIME-Base64 b/lfs/perl-MIME-Base64 index 1f98a7f18..32584849b 100644 --- a/lfs/perl-MIME-Base64 +++ b/lfs/perl-MIME-Base64 @@ -57,7 +57,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/perl-Net-SMTP-SSL b/lfs/perl-Net-SMTP-SSL index 66c7c446f..706597f44 100644 --- a/lfs/perl-Net-SMTP-SSL +++ b/lfs/perl-Net-SMTP-SSL @@ -57,7 +57,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/perl-Net-Server b/lfs/perl-Net-Server index 554d9e8d6..952327e6a 100644 --- a/lfs/perl-Net-Server +++ b/lfs/perl-Net-Server @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -#dist: +#dist: # make-packages.sh Net-Server $(THISAPP)-ipfire-beta-1 ############################################################################### diff --git a/lfs/perl-Parse-Yapp b/lfs/perl-Parse-Yapp index 9b3ac5671..e43870bfe 100644 --- a/lfs/perl-Parse-Yapp +++ b/lfs/perl-Parse-Yapp @@ -57,7 +57,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/perl-TimeDate b/lfs/perl-TimeDate index 612d84db1..f69a1c6e6 100644 --- a/lfs/perl-TimeDate +++ b/lfs/perl-TimeDate @@ -57,7 +57,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/perl-gettext b/lfs/perl-gettext index a2a51ba28..889ae22fb 100644 --- a/lfs/perl-gettext +++ b/lfs/perl-gettext @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/pigz b/lfs/pigz index 80dbd91aa..289c03f20 100644 --- a/lfs/pigz +++ b/lfs/pigz @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/pmacct b/lfs/pmacct index 9fef56729..7d62a0cda 100644 --- a/lfs/pmacct +++ b/lfs/pmacct @@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/postfix b/lfs/postfix index 728c71cd2..29b0a3af0 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -80,7 +80,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/powertop b/lfs/powertop index c21853797..0e2192389 100644 --- a/lfs/powertop +++ b/lfs/powertop @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/proxy-accounting b/lfs/proxy-accounting index 024f249be..e3fbc4020 100644 --- a/lfs/proxy-accounting +++ b/lfs/proxy-accounting @@ -29,13 +29,13 @@ SERVICES = install : $(TARGET) -check : +check : download : -md5 : +md5 : -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/python3-packaging b/lfs/python3-packaging index 9250f3de5..712469c70 100644 --- a/lfs/python3-packaging +++ b/lfs/python3-packaging @@ -52,7 +52,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/python3-pyasn1 b/lfs/python3-pyasn1 index d08d21a00..a9b19713d 100644 --- a/lfs/python3-pyasn1 +++ b/lfs/python3-pyasn1 @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/python3-pyproject2setuppy b/lfs/python3-pyproject2setuppy index 3308e1abe..2100e54fe 100644 --- a/lfs/python3-pyproject2setuppy +++ b/lfs/python3-pyproject2setuppy @@ -52,7 +52,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/python3-toml b/lfs/python3-toml index 7edb926ac..c4e5ffdc6 100644 --- a/lfs/python3-toml +++ b/lfs/python3-toml @@ -52,7 +52,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/python3-tomli b/lfs/python3-tomli index e29b81130..f5856ab34 100644 --- a/lfs/python3-tomli +++ b/lfs/python3-tomli @@ -52,7 +52,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/qemu b/lfs/qemu index 48d6187ae..e15d67668 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -71,7 +71,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/qemu-ga b/lfs/qemu-ga index 62523ab3d..d6f012b69 100644 --- a/lfs/qemu-ga +++ b/lfs/qemu-ga @@ -32,7 +32,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = qemu-ga PAK_VER = 1 -DEPS = +DEPS = SERVICES = qemu-ga @@ -42,18 +42,18 @@ SERVICES = qemu-ga install : $(TARGET) -download : +download : -md5 : +md5 : -dist: +dist: @$(PAK) ############################################################################### # Installation Details ############################################################################### -$(TARGET) : +$(TARGET) : @$(PREBUILD) #install initscripts diff --git a/lfs/rpcbind b/lfs/rpcbind index a1be60a0a..921715764 100644 --- a/lfs/rpcbind +++ b/lfs/rpcbind @@ -24,7 +24,7 @@ include Config -SUMMARY = Transport independent RPC portmapper +SUMMARY = Transport independent RPC portmapper VER = 1.2.6 diff --git a/lfs/rsync b/lfs/rsync index 714e14c1a..066a320c3 100644 --- a/lfs/rsync +++ b/lfs/rsync @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rtl8189es b/lfs/rtl8189es index c1d39793b..7aef0f6d2 100644 --- a/lfs/rtl8189es +++ b/lfs/rtl8189es @@ -53,7 +53,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/rtl8812au b/lfs/rtl8812au index c458db427..da18dd684 100644 --- a/lfs/rtl8812au +++ b/lfs/rtl8812au @@ -53,7 +53,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/rtl8822bu b/lfs/rtl8822bu index 9693d8abd..3db209d85 100644 --- a/lfs/rtl8822bu +++ b/lfs/rtl8822bu @@ -53,7 +53,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/rust-aho-corasick b/lfs/rust-aho-corasick index f7d34b6d2..fe8ec23ea 100644 --- a/lfs/rust-aho-corasick +++ b/lfs/rust-aho-corasick @@ -52,7 +52,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-autocfg b/lfs/rust-autocfg index 9bd1b3dbe..2f1381f36 100644 --- a/lfs/rust-autocfg +++ b/lfs/rust-autocfg @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-block-buffer b/lfs/rust-block-buffer index ab7b99836..6b5a36d22 100644 --- a/lfs/rust-block-buffer +++ b/lfs/rust-block-buffer @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-cfg-if b/lfs/rust-cfg-if index ab619bda0..d944b3840 100644 --- a/lfs/rust-cfg-if +++ b/lfs/rust-cfg-if @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-cipher b/lfs/rust-cipher index 93a87fd09..c5f414067 100644 --- a/lfs/rust-cipher +++ b/lfs/rust-cipher @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-crossbeam-channel b/lfs/rust-crossbeam-channel index abc4b187d..03accfa70 100644 --- a/lfs/rust-crossbeam-channel +++ b/lfs/rust-crossbeam-channel @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-crossbeam-deque b/lfs/rust-crossbeam-deque index e16c1e714..86de02a0d 100644 --- a/lfs/rust-crossbeam-deque +++ b/lfs/rust-crossbeam-deque @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-crossbeam-epoch b/lfs/rust-crossbeam-epoch index 4abf4fc58..6526068e1 100644 --- a/lfs/rust-crossbeam-epoch +++ b/lfs/rust-crossbeam-epoch @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-crossbeam-utils b/lfs/rust-crossbeam-utils index ed30b18ef..99d81685f 100644 --- a/lfs/rust-crossbeam-utils +++ b/lfs/rust-crossbeam-utils @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-crypto-common b/lfs/rust-crypto-common index 5ecb4d0a2..2b93d1ee9 100644 --- a/lfs/rust-crypto-common +++ b/lfs/rust-crypto-common @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-ctor b/lfs/rust-ctor index 41841f594..3971b789f 100644 --- a/lfs/rust-ctor +++ b/lfs/rust-ctor @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-digest b/lfs/rust-digest index 0cbcccf38..283a96939 100644 --- a/lfs/rust-digest +++ b/lfs/rust-digest @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-dirs b/lfs/rust-dirs index 1a6e4886b..29abc080e 100644 --- a/lfs/rust-dirs +++ b/lfs/rust-dirs @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-dissimilar b/lfs/rust-dissimilar index 6412cec84..1533e837e 100644 --- a/lfs/rust-dissimilar +++ b/lfs/rust-dissimilar @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-either b/lfs/rust-either index 895ffe693..0ce26c9c4 100644 --- a/lfs/rust-either +++ b/lfs/rust-either @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-generic-array b/lfs/rust-generic-array index 7b8713f2e..baf5c3beb 100644 --- a/lfs/rust-generic-array +++ b/lfs/rust-generic-array @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-getrandom b/lfs/rust-getrandom index 80021a4ee..617176ca5 100644 --- a/lfs/rust-getrandom +++ b/lfs/rust-getrandom @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-ghost b/lfs/rust-ghost index 6622a5893..787802d07 100644 --- a/lfs/rust-ghost +++ b/lfs/rust-ghost @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-glob b/lfs/rust-glob index 84664ece2..8141fbe0b 100644 --- a/lfs/rust-glob +++ b/lfs/rust-glob @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-hex b/lfs/rust-hex index 0b56c7a55..a12f463fe 100644 --- a/lfs/rust-hex +++ b/lfs/rust-hex @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-home b/lfs/rust-home index 26aa071bb..79fa66790 100644 --- a/lfs/rust-home +++ b/lfs/rust-home @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-indoc b/lfs/rust-indoc index 1c8eb304b..501331775 100644 --- a/lfs/rust-indoc +++ b/lfs/rust-indoc @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-indoc-impl b/lfs/rust-indoc-impl index e2ddc7add..1a07d202a 100644 --- a/lfs/rust-indoc-impl +++ b/lfs/rust-indoc-impl @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-instant b/lfs/rust-instant index 37235cdee..0a00ea232 100644 --- a/lfs/rust-instant +++ b/lfs/rust-instant @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-inventory b/lfs/rust-inventory index 9d06bc6c4..df9e2120c 100644 --- a/lfs/rust-inventory +++ b/lfs/rust-inventory @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-inventory-impl b/lfs/rust-inventory-impl index 56acac67a..d0fa441c3 100644 --- a/lfs/rust-inventory-impl +++ b/lfs/rust-inventory-impl @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-itoa b/lfs/rust-itoa index ad407a013..609f84807 100644 --- a/lfs/rust-itoa +++ b/lfs/rust-itoa @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-lazy-static b/lfs/rust-lazy-static index 1c93e4653..971a8463c 100644 --- a/lfs/rust-lazy-static +++ b/lfs/rust-lazy-static @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-libc b/lfs/rust-libc index ac7288bd4..21d4dcc3b 100644 --- a/lfs/rust-libc +++ b/lfs/rust-libc @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-lock_api b/lfs/rust-lock_api index 078e168a1..225a5af0b 100644 --- a/lfs/rust-lock_api +++ b/lfs/rust-lock_api @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-log b/lfs/rust-log index 7b0fc7cb9..378fb715f 100644 --- a/lfs/rust-log +++ b/lfs/rust-log @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-memchr b/lfs/rust-memchr index c20958cb8..d268e5290 100644 --- a/lfs/rust-memchr +++ b/lfs/rust-memchr @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-memoffset b/lfs/rust-memoffset index 257464223..6ff5621bd 100644 --- a/lfs/rust-memoffset +++ b/lfs/rust-memoffset @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-num_cpus b/lfs/rust-num_cpus index d5dcaa6bb..efc7324e7 100644 --- a/lfs/rust-num_cpus +++ b/lfs/rust-num_cpus @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-once_cell b/lfs/rust-once_cell index 77575d913..f7362cb28 100644 --- a/lfs/rust-once_cell +++ b/lfs/rust-once_cell @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-parking_lot b/lfs/rust-parking_lot index 808cbd7e9..26e50d792 100644 --- a/lfs/rust-parking_lot +++ b/lfs/rust-parking_lot @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-parking_lot_core b/lfs/rust-parking_lot_core index fdacf4425..7447f9160 100644 --- a/lfs/rust-parking_lot_core +++ b/lfs/rust-parking_lot_core @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-paste b/lfs/rust-paste index ed9da7e89..a6080b882 100644 --- a/lfs/rust-paste +++ b/lfs/rust-paste @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-paste-impl b/lfs/rust-paste-impl index 821413925..6f29671f2 100644 --- a/lfs/rust-paste-impl +++ b/lfs/rust-paste-impl @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-pest b/lfs/rust-pest index 9118cbd34..e5199cdb7 100644 --- a/lfs/rust-pest +++ b/lfs/rust-pest @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-ppv-lite86 b/lfs/rust-ppv-lite86 index 596d33877..4f02edd2c 100644 --- a/lfs/rust-ppv-lite86 +++ b/lfs/rust-ppv-lite86 @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-proc-macro-hack b/lfs/rust-proc-macro-hack index f1d4a62e1..7151c51cb 100644 --- a/lfs/rust-proc-macro-hack +++ b/lfs/rust-proc-macro-hack @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-proc-macro2 b/lfs/rust-proc-macro2 index a4ef4ea45..2d5e4ea7b 100644 --- a/lfs/rust-proc-macro2 +++ b/lfs/rust-proc-macro2 @@ -52,7 +52,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-pyo3 b/lfs/rust-pyo3 index d3d64d3f9..adf724b77 100644 --- a/lfs/rust-pyo3 +++ b/lfs/rust-pyo3 @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-pyo3-build-config b/lfs/rust-pyo3-build-config index 9caa9d066..2495e81df 100644 --- a/lfs/rust-pyo3-build-config +++ b/lfs/rust-pyo3-build-config @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-pyo3-macros b/lfs/rust-pyo3-macros index c09317cf8..c21392f2f 100644 --- a/lfs/rust-pyo3-macros +++ b/lfs/rust-pyo3-macros @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-pyo3-macros-backend b/lfs/rust-pyo3-macros-backend index b7881dac3..ec0dd56a1 100644 --- a/lfs/rust-pyo3-macros-backend +++ b/lfs/rust-pyo3-macros-backend @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-quote b/lfs/rust-quote index b6925f1e8..361db01de 100644 --- a/lfs/rust-quote +++ b/lfs/rust-quote @@ -52,7 +52,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-rand b/lfs/rust-rand index 33b350bd4..c3a94444b 100644 --- a/lfs/rust-rand +++ b/lfs/rust-rand @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-rand-0.4 b/lfs/rust-rand-0.4 index 0599eff9d..e104fa428 100644 --- a/lfs/rust-rand-0.4 +++ b/lfs/rust-rand-0.4 @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-rand_chacha b/lfs/rust-rand_chacha index 36a338b59..fb2472e79 100644 --- a/lfs/rust-rand_chacha +++ b/lfs/rust-rand_chacha @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-rand_core b/lfs/rust-rand_core index a97b0fd0f..58b82b9a2 100644 --- a/lfs/rust-rand_core +++ b/lfs/rust-rand_core @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-rand_core-0.3.1 b/lfs/rust-rand_core-0.3.1 index c08bf2959..896fd1449 100644 --- a/lfs/rust-rand_core-0.3.1 +++ b/lfs/rust-rand_core-0.3.1 @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-rand_core-0.4.2 b/lfs/rust-rand_core-0.4.2 index c7fb73b7b..8fb350baa 100644 --- a/lfs/rust-rand_core-0.4.2 +++ b/lfs/rust-rand_core-0.4.2 @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-rand_hc b/lfs/rust-rand_hc index 2f0da184d..664122c46 100644 --- a/lfs/rust-rand_hc +++ b/lfs/rust-rand_hc @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-rayon b/lfs/rust-rayon index b96c3d58b..308d6590b 100644 --- a/lfs/rust-rayon +++ b/lfs/rust-rayon @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-rayon-core b/lfs/rust-rayon-core index cfd0e4ecb..002ba4864 100644 --- a/lfs/rust-rayon-core +++ b/lfs/rust-rayon-core @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-rdrand b/lfs/rust-rdrand index 1f6225627..06b72588f 100644 --- a/lfs/rust-rdrand +++ b/lfs/rust-rdrand @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-regex b/lfs/rust-regex index d85f80174..2ac346d88 100644 --- a/lfs/rust-regex +++ b/lfs/rust-regex @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-regex-syntax b/lfs/rust-regex-syntax index 9b10afd24..a26ae74fc 100644 --- a/lfs/rust-regex-syntax +++ b/lfs/rust-regex-syntax @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-remove_dir_all b/lfs/rust-remove_dir_all index da430436a..f2db33894 100644 --- a/lfs/rust-remove_dir_all +++ b/lfs/rust-remove_dir_all @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-ryu b/lfs/rust-ryu index e3ff37223..67a76ab31 100644 --- a/lfs/rust-ryu +++ b/lfs/rust-ryu @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-same-file b/lfs/rust-same-file index 1d758dea2..96af3d766 100644 --- a/lfs/rust-same-file +++ b/lfs/rust-same-file @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-scopeguard b/lfs/rust-scopeguard index a04f3bc4c..00868589e 100644 --- a/lfs/rust-scopeguard +++ b/lfs/rust-scopeguard @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-semver b/lfs/rust-semver index 79a354cc6..e1205ba5d 100644 --- a/lfs/rust-semver +++ b/lfs/rust-semver @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-semver-parser b/lfs/rust-semver-parser index ae0706a65..2785e3ffc 100644 --- a/lfs/rust-semver-parser +++ b/lfs/rust-semver-parser @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-serde b/lfs/rust-serde index 13e638e28..b3fbd3c7f 100644 --- a/lfs/rust-serde +++ b/lfs/rust-serde @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-serde_derive b/lfs/rust-serde_derive index aa661f46e..4f55e5047 100644 --- a/lfs/rust-serde_derive +++ b/lfs/rust-serde_derive @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-serde_json b/lfs/rust-serde_json index 03d06f7f2..34a5e8c73 100644 --- a/lfs/rust-serde_json +++ b/lfs/rust-serde_json @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-smallvec b/lfs/rust-smallvec index 8f8590c83..8791096f8 100644 --- a/lfs/rust-smallvec +++ b/lfs/rust-smallvec @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-syn b/lfs/rust-syn index a49a7ad84..afd16d9ff 100644 --- a/lfs/rust-syn +++ b/lfs/rust-syn @@ -52,7 +52,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-synstructure b/lfs/rust-synstructure index 1c3ce4115..a0455bac4 100644 --- a/lfs/rust-synstructure +++ b/lfs/rust-synstructure @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-tempdir b/lfs/rust-tempdir index 0fdafbc25..a23bcf50b 100644 --- a/lfs/rust-tempdir +++ b/lfs/rust-tempdir @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-termcolor b/lfs/rust-termcolor index 68fd6ba7b..19b823fd4 100644 --- a/lfs/rust-termcolor +++ b/lfs/rust-termcolor @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-toml b/lfs/rust-toml index c171761ad..b3f205329 100644 --- a/lfs/rust-toml +++ b/lfs/rust-toml @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-toolchain_find b/lfs/rust-toolchain_find index fe124c0c6..03ddaf709 100644 --- a/lfs/rust-toolchain_find +++ b/lfs/rust-toolchain_find @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-trybuild b/lfs/rust-trybuild index 1d7a21532..0b6ec235d 100644 --- a/lfs/rust-trybuild +++ b/lfs/rust-trybuild @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-typenum b/lfs/rust-typenum index 58ed4626a..5d4bf9742 100644 --- a/lfs/rust-typenum +++ b/lfs/rust-typenum @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-ucd-trie b/lfs/rust-ucd-trie index 9177af1bf..cb296e416 100644 --- a/lfs/rust-ucd-trie +++ b/lfs/rust-ucd-trie @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-unicode-xid b/lfs/rust-unicode-xid index 5b120effc..67e1f16a6 100644 --- a/lfs/rust-unicode-xid +++ b/lfs/rust-unicode-xid @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-unindent b/lfs/rust-unindent index 85b3f8ffb..64e116321 100644 --- a/lfs/rust-unindent +++ b/lfs/rust-unindent @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-version-check b/lfs/rust-version-check index af4cd98ed..87e5ebabd 100644 --- a/lfs/rust-version-check +++ b/lfs/rust-version-check @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/rust-walkdir b/lfs/rust-walkdir index 87aeacc5a..24d4e076d 100644 --- a/lfs/rust-walkdir +++ b/lfs/rust-walkdir @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/sarg b/lfs/sarg index b20ce29f9..b9f0b8474 100644 --- a/lfs/sarg +++ b/lfs/sarg @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/sdparm b/lfs/sdparm index f6fb52db0..46b71fbdc 100644 --- a/lfs/sdparm +++ b/lfs/sdparm @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/sed b/lfs/sed index 9c5b33e4a..12aa644a0 100644 --- a/lfs/sed +++ b/lfs/sed @@ -41,8 +41,8 @@ ifeq "$(ROOT)" "" else TARGET = $(DIR_INFO)/$(THISAPP)-tools EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls - EXTRA_MAKE = - EXTRA_INSTALL = + EXTRA_MAKE = + EXTRA_INSTALL = endif ############################################################################### diff --git a/lfs/shairport-sync b/lfs/shairport-sync index 748b323d0..205bff962 100644 --- a/lfs/shairport-sync +++ b/lfs/shairport-sync @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/socat b/lfs/socat index 422949799..1956d4e7b 100644 --- a/lfs/socat +++ b/lfs/socat @@ -37,7 +37,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = socat PAK_VER = 2 -DEPS = +DEPS = SERVICES = @@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/sox b/lfs/sox index 2ca7c204e..8544fe107 100644 --- a/lfs/sox +++ b/lfs/sox @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/soxr b/lfs/soxr index f55e3caac..fb4be2973 100644 --- a/lfs/soxr +++ b/lfs/soxr @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/spandsp b/lfs/spandsp index 53898a11e..cd9d03f9f 100644 --- a/lfs/spandsp +++ b/lfs/spandsp @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/spectre-meltdown-checker b/lfs/spectre-meltdown-checker index 36cc7ccd8..35f4e8a16 100644 --- a/lfs/spectre-meltdown-checker +++ b/lfs/spectre-meltdown-checker @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/speedtest-cli b/lfs/speedtest-cli index f35efaaf2..04f0708ff 100644 --- a/lfs/speedtest-cli +++ b/lfs/speedtest-cli @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/spice b/lfs/spice index 63578a354..3cf876d75 100644 --- a/lfs/spice +++ b/lfs/spice @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/squid b/lfs/squid index 4b723a8e1..47c70fc64 100644 --- a/lfs/squid +++ b/lfs/squid @@ -178,7 +178,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chmod 775 /var/updatecache/metadata chmod 755 /var/log/updatexlrator chmod 755 /srv/web/ipfire/html/images/updbooster - + chown squid:squid /var/log/squid ln -sf /usr/lib/squid /usr/lib/squid/auth cp -f $(DIR_SRC)/config/proxy/proxy.pac /srv/web/ipfire/html/proxy.pac diff --git a/lfs/squidclamav b/lfs/squidclamav index c73e37da8..2587f086d 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/squidguard b/lfs/squidguard index d5eb30377..4c688859f 100644 --- a/lfs/squidguard +++ b/lfs/squidguard @@ -38,7 +38,7 @@ CFLAGS += -fcommon # Top-level Rules ############################################################################### -objects = $(DL_FILE) +objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) @@ -104,7 +104,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp -f $(DIR_CONF)/urlfilter/autoupdate.pl /var/ipfire/urlfilter/bin/autoupdate.pl chmod 755 /var/ipfire/urlfilter/bin/autoupdate.pl echo "1.5-beta" > /var/ipfire/urlfilter/version - + # Wrapper cp -f $(DIR_CONF)/urlfilter/redirect_wrapper /usr/sbin chmod 755 /usr/sbin/redirect_wrapper diff --git a/lfs/sshfs b/lfs/sshfs index f9a585572..740e8fc46 100644 --- a/lfs/sshfs +++ b/lfs/sshfs @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/sslh b/lfs/sslh index 48ee91305..a0f933843 100644 --- a/lfs/sslh +++ b/lfs/sslh @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/stage2 b/lfs/stage2 index 3876060ce..c72b8599b 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -116,7 +116,7 @@ endif mv -vf /usr/local/bin/ovpn-ccd-convert /usr/sbin/ mv -vf /usr/local/bin/ovpn-collectd-convert /usr/sbin/ mv -vf /usr/local/bin/captive-cleanup /usr/bin/ - + # Install firewall scripts. mkdir -pv /usr/lib/firewall install -m 755 $(DIR_SRC)/config/firewall/rules.pl \ @@ -142,7 +142,7 @@ endif # Permissions chmod 0711 /var/empty - + # A small hack to include /root to the iso but not all of it's files. touch /root/ipfire diff --git a/lfs/stress b/lfs/stress index 1c18b1752..5c41bb10e 100644 --- a/lfs/stress +++ b/lfs/stress @@ -43,7 +43,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/swatch b/lfs/swatch index d6e107342..471f23f71 100644 --- a/lfs/swatch +++ b/lfs/swatch @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/sysbench b/lfs/sysbench index a185adef7..e09e87955 100644 --- a/lfs/sysbench +++ b/lfs/sysbench @@ -44,7 +44,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/sysvinit b/lfs/sysvinit index 7b195bfae..1045dd49c 100644 --- a/lfs/sysvinit +++ b/lfs/sysvinit @@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && sed -i src/mountpoint.c src/bootlogd.c \ -e "/include.*sys\/stat.h/a#include <sys/sysmacros.h>\n" cd $(DIR_APP) && sed -e "s/libcrypt.a/libcrypt.so/g" -i src/Makefile - cd $(DIR_APP) && make $(MAKETUNING) -C src + cd $(DIR_APP) && make $(MAKETUNING) -C src cd $(DIR_APP) && make -C src install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/taglib b/lfs/taglib index 2a535e35a..536913b11 100644 --- a/lfs/taglib +++ b/lfs/taglib @@ -57,7 +57,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/tcpdump b/lfs/tcpdump index 032b8582c..4df2d34cd 100644 --- a/lfs/tcpdump +++ b/lfs/tcpdump @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/telnet b/lfs/telnet index 7bae0cc16..64c556f7b 100644 --- a/lfs/telnet +++ b/lfs/telnet @@ -61,7 +61,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### @@ -102,7 +102,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/telnet-0.17-errno_test_sys_bsd.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/netkit-telnet-0.17-reallynodns.patch cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make + cd $(DIR_APP) && make cd $(DIR_APP) && make install rm -f /usr/sbin/telnetd rm -f /usr/man/man8/in.telnetd.8 diff --git a/lfs/tftpd b/lfs/tftpd index 63ebd632a..7efd3bd9b 100644 --- a/lfs/tftpd +++ b/lfs/tftpd @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/tmux b/lfs/tmux index 918712e77..f23450aa1 100644 --- a/lfs/tmux +++ b/lfs/tmux @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/traceroute b/lfs/traceroute index 9334f47a2..8f1eb0745 100644 --- a/lfs/traceroute +++ b/lfs/traceroute @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### @@ -82,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-ipfire.patch - cd $(DIR_APP) && make + cd $(DIR_APP) && make cd $(DIR_APP) && make install prefix=/usr bindir=/usr/sbin chmod u-s /usr/sbin/traceroute @rm -rf $(DIR_APP) diff --git a/lfs/transmission b/lfs/transmission index f06f0be08..2d048cdf9 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/tshark b/lfs/tshark index 676fc4ab2..81321babd 100644 --- a/lfs/tshark +++ b/lfs/tshark @@ -57,7 +57,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist : +dist : @$(PAK) ############################################################################### diff --git a/lfs/u-boot b/lfs/u-boot index b68cd6faf..d081061fa 100644 --- a/lfs/u-boot +++ b/lfs/u-boot @@ -72,7 +72,7 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) : $(subst %,%_MD5,$(objects)) : @$(MD5) -dist: +dist: @$(PAK) ############################################################################### @@ -221,7 +221,7 @@ else endif # create an empty 128 KB File for the u-boot env dd if=/dev/zero of=/boot/uboot.env bs=1K count=128 - + # config (uEnv.txt and boot.*) cp -vf $(DIR_SRC)/config/u-boot/* /boot/ # patch real Kernel version to uEnv.txt diff --git a/lfs/u-boot-friendlyarm b/lfs/u-boot-friendlyarm index ab3353dba..07742a745 100644 --- a/lfs/u-boot-friendlyarm +++ b/lfs/u-boot-friendlyarm @@ -67,7 +67,7 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) : $(subst %,%_MD5,$(objects)) : @$(MD5) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/vdr b/lfs/vdr index 8cac18138..9e5e8ae85 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -81,7 +81,7 @@ download : $(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi index 54adcb2bb..1b128adac 100644 --- a/lfs/vdr_dvbapi +++ b/lfs/vdr_dvbapi @@ -81,7 +81,7 @@ download : $(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/vdr_eepg b/lfs/vdr_eepg index bdaf4ace8..760d5398c 100644 --- a/lfs/vdr_eepg +++ b/lfs/vdr_eepg @@ -68,7 +68,7 @@ download : $(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch index 5b67969a5..6c27e0e8e 100644 --- a/lfs/vdr_epgsearch +++ b/lfs/vdr_epgsearch @@ -65,7 +65,7 @@ download : $(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev index ee4590d7a..c97a89ae3 100644 --- a/lfs/vdr_streamdev +++ b/lfs/vdr_streamdev @@ -66,7 +66,7 @@ download : $(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/vdradmin b/lfs/vdradmin index 2abf8a943..d877a0b68 100644 --- a/lfs/vdradmin +++ b/lfs/vdradmin @@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/vnstat b/lfs/vnstat index d66a4b2e4..79c1db815 100644 --- a/lfs/vnstat +++ b/lfs/vnstat @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/w_scan b/lfs/w_scan index 571703381..b0716f3dc 100644 --- a/lfs/w_scan +++ b/lfs/w_scan @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/watchdog b/lfs/watchdog index c84de5abc..2488cd81a 100644 --- a/lfs/watchdog +++ b/lfs/watchdog @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### @@ -87,6 +87,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) #install initscripts $(call INSTALL_INITSCRIPTS,$(SERVICES)) install -v -m 644 $(DIR_SRC)/config/backup/includes/watchdog \ - /var/ipfire/backup/addons/includes/watchdog + /var/ipfire/backup/addons/includes/watchdog @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/wavemon b/lfs/wavemon index 2db9cc767..1c45c1670 100644 --- a/lfs/wavemon +++ b/lfs/wavemon @@ -43,7 +43,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/web-user-interface b/lfs/web-user-interface index bce6d8eb8..36188e80a 100644 --- a/lfs/web-user-interface +++ b/lfs/web-user-interface @@ -37,11 +37,11 @@ TARGET = $(DIR_INFO)/$(THISAPP) install: $(TARGET) -check: +check: download: -md5: +md5: ############################################################################### # Installation Details diff --git a/lfs/whatmask b/lfs/whatmask index a9beb54a1..2485d1636 100644 --- a/lfs/whatmask +++ b/lfs/whatmask @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/wio b/lfs/wio index 82df5f486..d30faea3c 100644 --- a/lfs/wio +++ b/lfs/wio @@ -29,13 +29,13 @@ SERVICES = install : $(TARGET) -check : +check : download : -md5 : +md5 : -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/xfsprogs b/lfs/xfsprogs index 54cf82ff7..32204e984 100644 --- a/lfs/xfsprogs +++ b/lfs/xfsprogs @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/xinetd b/lfs/xinetd index 5ba90ea42..6d8a940e5 100644 --- a/lfs/xinetd +++ b/lfs/xinetd @@ -60,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/xradio b/lfs/xradio index 1f92f6975..0d919dd07 100644 --- a/lfs/xradio +++ b/lfs/xradio @@ -55,7 +55,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### diff --git a/lfs/xvid b/lfs/xvid index 45f5e9304..6a2aaa82a 100644 --- a/lfs/xvid +++ b/lfs/xvid @@ -58,7 +58,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/zerofree b/lfs/zerofree index 20a6137a3..e8e90dbbc 100644 --- a/lfs/zerofree +++ b/lfs/zerofree @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/lfs/zstd b/lfs/zstd index cebfc44f6..9d7c48fac 100644 --- a/lfs/zstd +++ b/lfs/zstd @@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### diff --git a/src/br2684ctl/br2684ctl.c b/src/br2684ctl/br2684ctl.c index a8a71b893..67734d0b8 100644 --- a/src/br2684ctl/br2684ctl.c +++ b/src/br2684ctl/br2684ctl.c @@ -17,7 +17,7 @@ Modified feb 2001 by Stephen Aaskov (saa(a)lasat.com) - Added daemonization code - Added syslog - + TODO: Delete interfaces after exit? */ @@ -39,7 +39,7 @@ void fatal(const char *str, int i) void exitFunc(void) { - syslog (LOG_PID,"Daemon terminated\n"); + syslog (LOG_PID,"Daemon terminated\n"); } @@ -62,7 +62,7 @@ int create_pidfile(int num) int create_br(char *nstr) { int num, err; - + if(lastsock<0) { lastsock = socket(PF_ATMPVC, SOCK_DGRAM, ATM_AAL5); } @@ -78,7 +78,7 @@ int create_br(char *nstr) ni.mtu = 1500; sprintf(ni.ifname, "nas%d", num); err=ioctl (lastsock, ATM_NEWBACKENDIF, &ni); - + if (err == 0) syslog(LOG_INFO, "Interface \"%s\" created sucessfully\n",ni.ifname); else @@ -105,7 +105,7 @@ int assign_vcc(char *astr, int encap, int bufsize, struct atm_qos qos) err=text2atm(astr,(struct sockaddr *)(&addr), sizeof(addr), T2A_PVC); if (err!=0) syslog(LOG_ERR,"Could not parse ATM parameters (error=%d)\n",err); - + #if 0 addr.sap_family = AF_ATMPVC; addr.sap_addr.itf = itf; @@ -116,10 +116,10 @@ int assign_vcc(char *astr, int encap, int bufsize, struct atm_qos qos) addr.sap_addr.vpi, addr.sap_addr.vci, encap?"VC mux":"LLC"); - + if ((fd = socket(PF_ATMPVC, SOCK_DGRAM, ATM_AAL5)) < 0) syslog(LOG_ERR,"failed to create socket %d, reason: %s", errno,strerror(errno)); - + if (qos.aal == 0) { qos.aal = ATM_AAL5; qos.txtp.traffic_class = ATM_UBR; @@ -130,17 +130,17 @@ int assign_vcc(char *astr, int encap, int bufsize, struct atm_qos qos) if ( (err=setsockopt(fd,SOL_SOCKET,SO_SNDBUF, &bufsize ,sizeof(bufsize))) ) syslog(LOG_ERR,"setsockopt SO_SNDBUF: (%d) %s\n",err, strerror(err)); - + if (setsockopt(fd, SOL_ATM, SO_ATMQOS, &qos, sizeof(qos)) < 0) syslog(LOG_ERR,"setsockopt SO_ATMQOS %d", errno); err = connect(fd, (struct sockaddr*)&addr, sizeof(struct sockaddr_atmpvc)); - + if (err < 0) fatal("failed to connect on socket", err); - + /* attach the vcc to device: */ - + be.backend_num = ATM_BACKEND_BR2684; be.ifspec.method = BR2684_FIND_BYIFNAME; sprintf(be.ifspec.spec.ifname, "nas%d", lastitf); @@ -177,7 +177,7 @@ int main (int argc, char **argv) int itfnum; lastsock=-1; lastitf=0; - + /* st qos to 0 */ memset(&reqqos, 0, sizeof(reqqos)); @@ -187,7 +187,7 @@ int main (int argc, char **argv) switch (c) { case 'q': printf ("optarg : %s",optarg); - if (text2qos(optarg,&reqqos,0)) fprintf(stderr,"QOS parameter invalid\n"); + if (text2qos(optarg,&reqqos,0)) fprintf(stderr,"QOS parameter invalid\n"); break; case 'a': assign_vcc(optarg, encap, sndbuf, reqqos); @@ -222,25 +222,25 @@ int main (int argc, char **argv) usage(argv[0]); if (argc != optind) usage(argv[0]); - + if(lastsock>=0) close(lastsock); - + if (background) { pid_t pid; - + pid=fork(); if (pid < 0) { fprintf(stderr,"Error detaching\n"); exit(2); - } else if (pid) + } else if (pid) exit(0); // This is the parent - + // Become a process group and session group leader if (setsid()<0) { fprintf (stderr,"Could not set process group\n"); exit(2); } - + // Fork again to let process group leader exit pid = fork(); if (pid < 0) { @@ -248,23 +248,23 @@ int main (int argc, char **argv) exit(2); } else if (pid) exit(0); // This is the parent - + // Now we're ready for buisness chdir("/"); // Don't keep directories in use close(0); close(1); close(2); // Close stdin, -out and -error /* - Note that this implementation does not keep an open + Note that this implementation does not keep an open stdout/err. If we need them they can be opened now */ - + } - + create_pidfile(itfnum); - syslog (LOG_INFO, "RFC 1483/2684 bridge daemon started\n"); + syslog (LOG_INFO, "RFC 1483/2684 bridge daemon started\n"); atexit (exitFunc); - + while (1) sleep(30); /* to keep the sockets... */ return 0; } diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup index 4867540bd..a40d4beeb 100644 --- a/src/initscripts/helper/aws-setup +++ b/src/initscripts/helper/aws-setup @@ -1,4 +1,23 @@ #!/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} diff --git a/src/initscripts/helper/azure-setup b/src/initscripts/helper/azure-setup index 12a06acf2..1eff57799 100644 --- a/src/initscripts/helper/azure-setup +++ b/src/initscripts/helper/azure-setup @@ -1,4 +1,23 @@ #!/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} diff --git a/src/initscripts/helper/exoscale-setup b/src/initscripts/helper/exoscale-setup index 2ff8a18a2..e9295cc9c 100644 --- a/src/initscripts/helper/exoscale-setup +++ b/src/initscripts/helper/exoscale-setup @@ -1,4 +1,23 @@ #!/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} diff --git a/src/initscripts/helper/gcp-setup b/src/initscripts/helper/gcp-setup index 8868750db..935194931 100644 --- a/src/initscripts/helper/gcp-setup +++ b/src/initscripts/helper/gcp-setup @@ -1,4 +1,23 @@ #!/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} diff --git a/src/initscripts/helper/getdnsfromdhcpc.pl b/src/initscripts/helper/getdnsfromdhcpc.pl index e4d461d57..11e898e24 100644 --- a/src/initscripts/helper/getdnsfromdhcpc.pl +++ b/src/initscripts/helper/getdnsfromdhcpc.pl @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2022 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 # diff --git a/src/initscripts/helper/oci-setup b/src/initscripts/helper/oci-setup index 0763a96e7..4dbc05ae3 100644 --- a/src/initscripts/helper/oci-setup +++ b/src/initscripts/helper/oci-setup @@ -1,4 +1,23 @@ #!/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} diff --git a/src/initscripts/networking/any b/src/initscripts/networking/any index 7ca1ab2c3..0facf23d8 100644 --- a/src/initscripts/networking/any +++ b/src/initscripts/networking/any @@ -1,21 +1,25 @@ #!/bin/sh -######################################################################## -# Begin -# -# Description : ANY Device Script -# -# Authors : Nathan Coulson - nathan(a)linuxfromscratch.org -# Kevin P. Fleming - kpfleming(a)linuxfromscratch.org -# Michael Tremer - mitch(a)ipfire.org -# Maniacikarus - maniacikarus(a)ipfire.org -# -# Version : 01.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### -. /etc/sysconfig/rc +. /etc/sysconfig/rc . ${rc_functions} eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) @@ -56,7 +60,7 @@ case "${1}" in start) boot_mesg "Bringing up the ${DEVICE} interface..." boot_mesg_flush - + # Check if an interface is there... if ip link show ${DEVICE} > /dev/null 2>&1; then link_status=`ip link show ${DEVICE} 2> /dev/null` @@ -81,7 +85,7 @@ case "${1}" in # Create & Enable vnstat data collection /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1 - + if [ ! "${ADDRESS}" == "1.1.1.1" ]; then boot_mesg "Adding IPv4 address ${ADDRESS} to the ${DEVICE} interface..." ip addr add ${args} dev ${DEVICE} @@ -101,4 +105,3 @@ case "${1}" in exit 0; ;; esac -# End diff --git a/src/initscripts/networking/dhcpcd.exe b/src/initscripts/networking/dhcpcd.exe index 7a9889b5b..c243ce1a7 100644 --- a/src/initscripts/networking/dhcpcd.exe +++ b/src/initscripts/networking/dhcpcd.exe @@ -1,15 +1,22 @@ -######################################################################## -# Begin -# -# Description : DHCP Client Script -# -# Authors : Arne Fitzenreiter - arne_f(a)ipfire.org -# -# Version : 02.10 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions diff --git a/src/initscripts/networking/functions.network b/src/initscripts/networking/functions.network index 656e6a7ab..7ec50f436 100644 --- a/src/initscripts/networking/functions.network +++ b/src/initscripts/networking/functions.network @@ -1,22 +1,27 @@ #!/bin/sh -# -######################################################################## -# Begin -# -# Description : A collection of functions for the IPFire network scripts -# -# Authors : IPFire Development Team <developers(a)ipfire.org> -# -# Version : 01.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions - eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) eval $(/usr/local/bin/readhash /var/ipfire/dns/settings) diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red index 56f8ebb66..38129deeb 100644 --- a/src/initscripts/networking/red +++ b/src/initscripts/networking/red @@ -1,21 +1,25 @@ #!/bin/sh -######################################################################## -# Begin -# -# Description : RED Device Script -# -# Authors : Michael Tremer - mitch(a)ipfire.org -# Maniacikarus - maniacikarus(a)ipfire.org -# Inspired by : Nathan Coulson - nathan(a)linuxfromscratch.org -# Kevin P. Fleming - kpfleming(a)linuxfromscratch.org -# -# Version : 01.00 -# -# Notes : -# -######################################################################## - -. /etc/sysconfig/rc +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +. /etc/sysconfig/rc . ${rc_functions} . /etc/init.d/networking/functions.network @@ -47,7 +51,7 @@ if [ "$TYPE" == "STATIC" ] || [ "$TYPE" == "DHCP" ]; then [ "${1}" == "start" ] && exit 0 fi fi - + if [ "${TYPE}" == "STATIC" ]; then if [ "${DEVICE}" != "${GREEN_DEV}" ]; then ADDRESS="${RED_ADDRESS}" @@ -85,7 +89,7 @@ case "${1}" in if [ -n "${link_status}" ]; then if ! echo "${link_status}" | grep -q UP; then if [ -n "$MAC" ]; then - boot_mesg "Setting mac address on ${DEVICE} to ${MAC}" + boot_mesg "Setting mac address on ${DEVICE} to ${MAC}" ip link set dev ${DEVICE} address ${MAC} evaluate_retval fi @@ -101,7 +105,7 @@ case "${1}" in ## Create & Enable vnstat /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1 - + if [ "${TYPE}" == "STATIC" ]; then # Set the MTU if [ -n "${MTU}" ]; then @@ -123,14 +127,14 @@ case "${1}" in echo "$GATEWAY gateway" >> /tmp/hosts mv /tmp/hosts /etc/hosts touch /var/ipfire/red/active - + # Create route to default gateway ip route add ${GATEWAY} dev ${DEVICE} boot_mesg "Setting up default gateway ${GATEWAY}..." ip route add default via ${GATEWAY} dev ${DEVICE} evaluate_retval - + if [ -d "/sys/class/net/${DEVICE}" ]; then # has carrier ? if [ ! "$(</sys/class/net/${DEVICE}/carrier)" = "1" ]; then @@ -182,9 +186,9 @@ case "${1}" in echo_failure exit 1 fi - + eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings) - + [ -c "/dev/ppp" ] || mknod /dev/ppp c 108 0 # We force the plugin method, anyway. @@ -192,7 +196,6 @@ case "${1}" in PPP_NIC=${DEVICE} - if [ "$TYPE" == "pppoeatm" ] || [ "$TYPE" == "pptpatm" ]; then PPP_NIC=nas${ATM_DEV} DEVICE=nas${ATM_DEV} @@ -245,7 +248,7 @@ case "${1}" in modprobe 8021q vconfig add ${DEVICE} ${IPTV_VLAN} if [ -n "$MAC2" ]; then - boot_mesg "Setting mac address on ${DEVICE}.${IPTV_VLAN} to ${MAC2}" + boot_mesg "Setting mac address on ${DEVICE}.${IPTV_VLAN} to ${MAC2}" ip link set dev ${DEVICE}.${IPTV_VLAN} address ${MAC2} evaluate_retval fi @@ -335,13 +338,13 @@ case "${1}" in else boot_mesg "Bringing up the PPP via ${TYPE} on ${COMPORT}..." fi - + ### ### ### Configuring the pppd ### ### ### - + ### Plugin Options - # + # if [ "$TYPE" == "pppoe" ]; then [ "${METHOD}" == "PPPOE_PLUGIN" ] && \ PLUGOPTS="plugin rp-pppoe.so" @@ -351,7 +354,7 @@ case "${1}" in # #PPPOE_SYNC=-s #PPPD_SYNC=sync - + ### Access Concentrator Name # if [ -n "${CONCENTRATORNAME}" ]; then @@ -378,7 +381,7 @@ case "${1}" in AUTH="" fi - ### Dial On Demand + ### Dial On Demand # if [ "${RECONNECTION}" != "persistent" ]; then if [ "${TIMEOUT}" != "0" ] && [ "${TIMEOUT}" != "" ]; then @@ -392,13 +395,13 @@ case "${1}" in DEMAND+=" ipcp-accept-remote ipcp-accept-local noipdefault ktune" fi fi - + if [ "$TYPE" == "pppoe" ]; then ### When using pppoe-plugin the device has to be the last option # [ "${METHOD}" == "PPPOE_PLUGIN" ] && PLUGOPTS+=" $PPP_NIC" fi - + if [ "$TYPE" == "modem" ]; then PLUGOPTS=" /dev/${COMPORT} ${DTERATE} connect /etc/ppp/dialer lock modem crtscts" METHOD="PPPOE_PLUGIN" @@ -406,7 +409,7 @@ case "${1}" in PLUGOPTS=" /dev/${COMPORT} ${DTERATE} connect /bin/true lock modem crtscts" METHOD="PPPOE_PLUGIN" fi - + ### Standard PPP options we always use # PPP_STD_OPTIONS="$PLUGOPTS usepeerdns defaultroute noipdefault noauth" @@ -422,7 +425,7 @@ case "${1}" in if [ -n "${MRU}" ]; then PPP_STD_OPTIONS="${PPP_STD_OPTIONS} mru ${MRU}" fi - + ### Debugging # if [ "${DEBUG}" == "on" ]; then @@ -430,7 +433,7 @@ case "${1}" in else DEBUG="" fi - + ### PPPoE invocation # if [ "$TYPE" == "pppoe" ]; then @@ -444,7 +447,7 @@ case "${1}" in PPPOE_CMD="pptp $PPTP_PEER --nolaunchpppd" METHOD="" fi - + ### Run everything # if [ "$METHOD" == "PPPOE_PLUGIN" ]; then @@ -536,5 +539,3 @@ case "${1}" in exit 0; ;; esac - -# End diff --git a/src/initscripts/networking/wpa_supplicant.exe b/src/initscripts/networking/wpa_supplicant.exe index b5ad8ffa1..b891855b2 100644 --- a/src/initscripts/networking/wpa_supplicant.exe +++ b/src/initscripts/networking/wpa_supplicant.exe @@ -1,20 +1,25 @@ #!/bin/bash -######################################################################## -# Begin -# -# Description : wpa_supplicant Script -# -# Authors : IPFire Development Team <developers(a)ipfire.org> -# -# Version : 01.00 -# -# Notes : This script starts/stops the dhclient if a WPA/WPA2 -# connection to an AP successfull has been established -# or disconnected. -# -######################################################################## - -. /etc/sysconfig/rc +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +. /etc/sysconfig/rc . ${rc_functions} . /etc/init.d/networking/functions.network diff --git a/src/initscripts/packages/alsa b/src/initscripts/packages/alsa index 5da0b2c8f..348e33846 100644 --- a/src/initscripts/packages/alsa +++ b/src/initscripts/packages/alsa @@ -1,10 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/alsa - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org -# ALSA specific parts by Mark Hymers - markh(a)linuxfromscratch.org -# Stores mixer settings in the default location: /etc/asound.state +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -28,5 +41,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/alsa diff --git a/src/initscripts/packages/amazon-ssm-agent b/src/initscripts/packages/amazon-ssm-agent index eeaa7b7e5..40fe09cc0 100644 --- a/src/initscripts/packages/amazon-ssm-agent +++ b/src/initscripts/packages/amazon-ssm-agent @@ -1,7 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/amazon-ssm-agent -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -44,5 +60,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/amazon-ssm-agent diff --git a/src/initscripts/packages/apcupsd b/src/initscripts/packages/apcupsd index 329dd80ac..11c600812 100644 --- a/src/initscripts/packages/apcupsd +++ b/src/initscripts/packages/apcupsd @@ -1,7 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/apcupsd - -# Based on sysklogd script from LFS-3.1 and earlier. +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -23,5 +39,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/apcupsd \ No newline at end of file diff --git a/src/initscripts/packages/avahi b/src/initscripts/packages/avahi index 7413f56f1..9f1791121 100755 --- a/src/initscripts/packages/avahi +++ b/src/initscripts/packages/avahi @@ -1,11 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/avahi - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org - -#$LastChangedBy: bdubbs $ -#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -41,5 +53,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/avahi diff --git a/src/initscripts/packages/bacula b/src/initscripts/packages/bacula index 2b925ad4f..39f237111 100644 --- a/src/initscripts/packages/bacula +++ b/src/initscripts/packages/bacula @@ -1,7 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/bacula - -# Based on sysklogd script from LFS-3.1 and earlier. +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -24,5 +40,3 @@ case "$1" in ;; esac -# End $rc_base/init.d/bacula - diff --git a/src/initscripts/packages/bird b/src/initscripts/packages/bird index 041db5edc..321ecd0db 100755 --- a/src/initscripts/packages/bird +++ b/src/initscripts/packages/bird @@ -1,7 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/bird -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -37,5 +53,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/bird diff --git a/src/initscripts/packages/clamav b/src/initscripts/packages/clamav index 439c20579..23fd89c0e 100644 --- a/src/initscripts/packages/clamav +++ b/src/initscripts/packages/clamav @@ -1,5 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/clamav +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -71,5 +89,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/clamav diff --git a/src/initscripts/packages/cpufreq b/src/initscripts/packages/cpufreq index ae8fef477..beee532b5 100644 --- a/src/initscripts/packages/cpufreq +++ b/src/initscripts/packages/cpufreq @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/cpufreq -# -# Description : Initalisize and startup cpufreq and set a governor -# -# Authors : Arne Fitzenreiter - arne_f(a)ipfire.org -# -# Version : 01.01 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -67,7 +74,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/cpufreq - - diff --git a/src/initscripts/packages/cups b/src/initscripts/packages/cups index 1e6f8ea64..193e7e985 100644 --- a/src/initscripts/packages/cups +++ b/src/initscripts/packages/cups @@ -1,10 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/cups - -#$LastChangedBy: bdubbs $ -#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ - -# Start or stop the CUPS server based upon the first argument to the script. +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -40,5 +53,3 @@ case $1 in exit 1 ;; esac - -# End $rc_base/init.d/cups diff --git a/src/initscripts/packages/cyrus-sasl b/src/initscripts/packages/cyrus-sasl index 31d31471d..e3b102b70 100644 --- a/src/initscripts/packages/cyrus-sasl +++ b/src/initscripts/packages/cyrus-sasl @@ -1,11 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/cyrus-sasl - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org - -#$LastChangedBy: bdubbs $ -#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -36,5 +48,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/cyrus-sasl diff --git a/src/initscripts/packages/dnsdist b/src/initscripts/packages/dnsdist index 35cc3c653..52de82d0b 100644 --- a/src/initscripts/packages/dnsdist +++ b/src/initscripts/packages/dnsdist @@ -1,10 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/dnsdist -# -# Description : dnsdist - A DNS load-balancer and more -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -70,5 +83,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/dnsdist diff --git a/src/initscripts/packages/fetchmail b/src/initscripts/packages/fetchmail index be0d1263a..ede04c05e 100644 --- a/src/initscripts/packages/fetchmail +++ b/src/initscripts/packages/fetchmail @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/fetchmail -# -# Description : Fetchmail Init Script -# -# Authors : Michael Tremer (ms(a)ipfire.org) -# -# Version : 01.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -47,5 +54,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/fetchmail diff --git a/src/initscripts/packages/freeradius b/src/initscripts/packages/freeradius index 7aff4634d..af11b2c4d 100644 --- a/src/initscripts/packages/freeradius +++ b/src/initscripts/packages/freeradius @@ -1,9 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/freeradius -# -# Description : Initscript for the FreeRADIUS Server -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -42,5 +56,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/freeradius diff --git a/src/initscripts/packages/frr b/src/initscripts/packages/frr index 5fa4e9fa8..867c4b98d 100755 --- a/src/initscripts/packages/frr +++ b/src/initscripts/packages/frr @@ -1,10 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/frr -# -# Description : FRRouting Suite -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -59,5 +72,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/frr diff --git a/src/initscripts/packages/gnump3d b/src/initscripts/packages/gnump3d index f1dac3aa2..26bcde4e5 100644 --- a/src/initscripts/packages/gnump3d +++ b/src/initscripts/packages/gnump3d @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/gnump3d -# -# Description : GNUMP3d Init Script -# -# Authors : Michael Tremer (ms(a)ipfire.org) -# -# Version : 01.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -42,5 +49,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/gnump3d diff --git a/src/initscripts/packages/guardian b/src/initscripts/packages/guardian index 0ff59b715..a5ab16c6a 100755 --- a/src/initscripts/packages/guardian +++ b/src/initscripts/packages/guardian @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/guardian -# -# Description : Guardian Initscript -# -# Authors : Kim Wölfel for ipfire.org -# -# Version : 01.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -52,5 +59,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/guardian diff --git a/src/initscripts/packages/haproxy b/src/initscripts/packages/haproxy index 78d64cee4..80427373c 100644 --- a/src/initscripts/packages/haproxy +++ b/src/initscripts/packages/haproxy @@ -1,10 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/haproxy -# -# Description : HAProxy init script -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -43,5 +56,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/haproxy diff --git a/src/initscripts/packages/hostapd b/src/initscripts/packages/hostapd index c559b26f0..cd2aef9b1 100644 --- a/src/initscripts/packages/hostapd +++ b/src/initscripts/packages/hostapd @@ -1,4 +1,24 @@ #!/bin/sh +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + . /etc/sysconfig/rc . ${rc_functions} diff --git a/src/initscripts/packages/keepalived b/src/initscripts/packages/keepalived index 4dda336d5..8186b4ff2 100644 --- a/src/initscripts/packages/keepalived +++ b/src/initscripts/packages/keepalived @@ -1,10 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/keepalived -# -# Description : keepalive daemon initscript -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -48,5 +61,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/keepalived diff --git a/src/initscripts/packages/lcdproc b/src/initscripts/packages/lcdproc index 88e61424a..179214bac 100644 --- a/src/initscripts/packages/lcdproc +++ b/src/initscripts/packages/lcdproc @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/lcdproc -# -# Description : -# -# Authors : -# -# Version : 00.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -67,5 +74,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/lcdproc diff --git a/src/initscripts/packages/lcr b/src/initscripts/packages/lcr deleted file mode 100644 index dd7296752..000000000 --- a/src/initscripts/packages/lcr +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/lcr -# -# Description : Linux Call Router Script -# -# Authors : Arne Fitzenreiter (arne_f(a)ipfire.org) -# -# Version : 01.00 -# -# Notes : -# -######################################################################## - -. /etc/sysconfig/rc -. ${rc_functions} - -case "${1}" in - start) - boot_mesg "Starting Linux Call Router..." - nice --10 /usr/sbin/lcr fork >> /var/log/lcr/console.log 2>&1 - evaluate_retval - ;; - - stop) - boot_mesg "Stopping Linux Call Router..." - killproc /usr/sbin/lcr - ;; - - restart) - ${0} stop - sleep 1 - ${0} start - ;; - - status) - statusproc /usr/sbin/lcr - ;; - *) - echo "Usage: ${0} {start|stop|restart|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/lcr diff --git a/src/initscripts/packages/libvirtd b/src/initscripts/packages/libvirtd index f0a0b1e8a..b3b7bc65b 100644 --- a/src/initscripts/packages/libvirtd +++ b/src/initscripts/packages/libvirtd @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/libvirtd -# -# Description : libvirtd init script -# -# Authors : Jonatan Schlag - jonatan.schlag(a)ipfire.org -# -# Version : 01.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -50,5 +57,3 @@ case $1 in exit 1 ;; esac - -# End $rc_base/init.d/libvirtd diff --git a/src/initscripts/packages/mdns-repeater b/src/initscripts/packages/mdns-repeater index 49717a1a1..2f4a30b63 100644 --- a/src/initscripts/packages/mdns-repeater +++ b/src/initscripts/packages/mdns-repeater @@ -1,7 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/mdns-repeater -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -44,5 +60,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/mdns-repeater diff --git a/src/initscripts/packages/messagebus b/src/initscripts/packages/messagebus index 3ea80bc92..399b4c041 100644 --- a/src/initscripts/packages/messagebus +++ b/src/initscripts/packages/messagebus @@ -1,11 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/messagebus - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org - -#$LastChangedBy: dnicholson $ -#$Date: 2007-10-21 11:33:30 -0500 (Sun, 21 Oct 2007) $ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -46,5 +58,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/messagebus diff --git a/src/initscripts/packages/minidlna b/src/initscripts/packages/minidlna index 74ad8f880..50a1607e7 100644 --- a/src/initscripts/packages/minidlna +++ b/src/initscripts/packages/minidlna @@ -1,14 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/minidlna -# -# Description : minidlna - UPNP/DLNA streaming server -# -# Authors : Michael Tremer <michael.tremer(a)ipfire.org> -# -# Version : 01.00 -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -44,5 +53,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/minidlna diff --git a/src/initscripts/packages/monit b/src/initscripts/packages/monit index 02f47e481..cb485af4e 100644 --- a/src/initscripts/packages/monit +++ b/src/initscripts/packages/monit @@ -1,10 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/monit -# -# Description : monit monitoring daemon -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -35,5 +48,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/monit diff --git a/src/initscripts/packages/mpd b/src/initscripts/packages/mpd index 4733326e9..977001140 100644 --- a/src/initscripts/packages/mpd +++ b/src/initscripts/packages/mpd @@ -1,10 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/mpd - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org -# ALSA specific parts by Mark Hymers - markh(a)linuxfromscratch.org -# Stores mixer settings in the default location: /etc/asound.state +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -34,5 +47,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/alsa diff --git a/src/initscripts/packages/netatalk b/src/initscripts/packages/netatalk index c0e0771df..e680a5794 100644 --- a/src/initscripts/packages/netatalk +++ b/src/initscripts/packages/netatalk @@ -1,7 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/netatalk -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -37,5 +53,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/netatalk diff --git a/src/initscripts/packages/netsnmpd b/src/initscripts/packages/netsnmpd index cadb54824..46b16a4ab 100644 --- a/src/initscripts/packages/netsnmpd +++ b/src/initscripts/packages/netsnmpd @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/net-snmp -# -# Description : This is a script that starts net-snmp as deamon -# -# Authors : Peter Pfeiffer (peterman(a)ipfire.org) -# -# Version : 01.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -21,7 +28,7 @@ case "${1}" in loadproc /usr/sbin/snmpd -c /etc/snmpd.conf > /dev/null evaluate_retval ;; - + stop) boot_mesg "Stopping net-snmp - SNMPD..." killproc /usr/sbin/snmpd @@ -42,5 +49,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/net-snmp diff --git a/src/initscripts/packages/nfs-server b/src/initscripts/packages/nfs-server index a81faf7bb..2ad06cecb 100644 --- a/src/initscripts/packages/nfs-server +++ b/src/initscripts/packages/nfs-server @@ -1,11 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/nfs-server - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org - -#$LastChangedBy: bdubbs $ -#$Date: 2006-09-10 19:41:47 -0500 (Sun, 10 Sep 2006) $ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -96,5 +108,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/nfs-server diff --git a/src/initscripts/packages/nrpe b/src/initscripts/packages/nrpe index 8de798c06..0a49244a3 100644 --- a/src/initscripts/packages/nrpe +++ b/src/initscripts/packages/nrpe @@ -1,5 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/nrpe +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -34,5 +52,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/nrpe diff --git a/src/initscripts/packages/nut b/src/initscripts/packages/nut index 9b4623ece..ef0b2030d 100644 --- a/src/initscripts/packages/nut +++ b/src/initscripts/packages/nut @@ -1,4 +1,23 @@ #! /bin/sh +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin diff --git a/src/initscripts/packages/openvmtools b/src/initscripts/packages/openvmtools index a3bd0736e..d27598be8 100644 --- a/src/initscripts/packages/openvmtools +++ b/src/initscripts/packages/openvmtools @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/ -# -# Description : init-script for open-vm-tools -# -# Authors : Jan Paul Tuecking (earl(a)ipfire.org) -# -# Version : 1.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -32,7 +39,7 @@ case "${1}" in fi fi ;; - + stop) if ps ax | grep -v grep | grep /usr/bin/vmtoolsd > /dev/null then @@ -60,5 +67,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/ diff --git a/src/initscripts/packages/pmacct b/src/initscripts/packages/pmacct index 45d4c336a..47087557f 100644 --- a/src/initscripts/packages/pmacct +++ b/src/initscripts/packages/pmacct @@ -1,7 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/pmacct - -# Based on sysklogd script from LFS-3.1 and earlier. +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -29,5 +45,3 @@ case "$1" in ;; esac -# End $rc_base/init.d/pmacct - diff --git a/src/initscripts/packages/postfix b/src/initscripts/packages/postfix index f7fc2dd73..92042e2d2 100644 --- a/src/initscripts/packages/postfix +++ b/src/initscripts/packages/postfix @@ -1,11 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/postfix - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org - -#$LastChangedBy: bdubbs $ -#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -60,5 +72,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/postfix diff --git a/src/initscripts/packages/qemu-ga b/src/initscripts/packages/qemu-ga index 68863f86f..a517b05cb 100755 --- a/src/initscripts/packages/qemu-ga +++ b/src/initscripts/packages/qemu-ga @@ -1,6 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/qemu-guest-agent - +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -33,6 +50,3 @@ case "$1" in exit 1 ;; esac - - -# End $rc_base/init.d/qemu-guest-agent diff --git a/src/initscripts/packages/rpcbind b/src/initscripts/packages/rpcbind index 57571fd7a..8691f5122 100644 --- a/src/initscripts/packages/rpcbind +++ b/src/initscripts/packages/rpcbind @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/rpcbind -# -# Description : rpcbind init script -# -# Authors : Jonatan Schlag jonatan.schlag(a)ipfire.org -# -# Version : 01.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -42,5 +49,3 @@ case "$1" in ;; esac - -# End $rc_base/init.d/rpcbind diff --git a/src/initscripts/packages/samba b/src/initscripts/packages/samba index fbab2dabe..93f14cd29 100644 --- a/src/initscripts/packages/samba +++ b/src/initscripts/packages/samba @@ -1,8 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/samba - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -68,5 +83,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/samba diff --git a/src/initscripts/packages/shairport-sync b/src/initscripts/packages/shairport-sync index a5d81a99d..92b5a108d 100755 --- a/src/initscripts/packages/shairport-sync +++ b/src/initscripts/packages/shairport-sync @@ -1,7 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/shairport-sync -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -37,5 +53,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/shairport-sync diff --git a/src/initscripts/packages/sslh b/src/initscripts/packages/sslh index 43e58f392..e7d21f234 100644 --- a/src/initscripts/packages/sslh +++ b/src/initscripts/packages/sslh @@ -1,8 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/sslh - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -46,5 +61,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/sslh diff --git a/src/initscripts/packages/stunnel b/src/initscripts/packages/stunnel index 9494b5d9b..f961cf184 100644 --- a/src/initscripts/packages/stunnel +++ b/src/initscripts/packages/stunnel @@ -1,10 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/stunnel -# -# Description : Provides an SSL encryption wrapper. -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -35,5 +48,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/stunnel diff --git a/src/initscripts/packages/tftpd b/src/initscripts/packages/tftpd index 3abf00c8b..f2cc2313a 100644 --- a/src/initscripts/packages/tftpd +++ b/src/initscripts/packages/tftpd @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/tftpd -# -# Description : This script controls the tftpd server -# -# Authors : Michael Tremer <ms(a)ipfire.org> -# -# Version : 01.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -41,5 +48,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/tftpd diff --git a/src/initscripts/packages/tor b/src/initscripts/packages/tor index 754a2786f..47797265c 100644 --- a/src/initscripts/packages/tor +++ b/src/initscripts/packages/tor @@ -1,10 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/tor -# -# Description : Anonymizing overlay network for TCP -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -99,5 +112,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/tor diff --git a/src/initscripts/packages/transmission b/src/initscripts/packages/transmission index 6fd7cd533..589fbdc4e 100644 --- a/src/initscripts/packages/transmission +++ b/src/initscripts/packages/transmission @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/ -# -# Description : -# -# Authors : -# -# Version : 00.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -45,5 +52,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/ diff --git a/src/initscripts/packages/vdr b/src/initscripts/packages/vdr index 759ad344d..f0c158d8d 100644 --- a/src/initscripts/packages/vdr +++ b/src/initscripts/packages/vdr @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/vdr -# -# Description : This is a script that starts vdr as deamon -# -# Authors : Arne Fitzenreiter (arne(a)ipfire.org) -# -# Version : 01.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -21,7 +28,7 @@ case "${1}" in /usr/sbin/runvdr >/dev/null 2>&1 & evaluate_retval ;; - + stop) boot_mesg "Stopping Video Disk Recorder..." killproc /usr/sbin/vdr @@ -43,5 +50,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/vdr diff --git a/src/initscripts/packages/vdradmin b/src/initscripts/packages/vdradmin index a0858de35..02add78bf 100644 --- a/src/initscripts/packages/vdradmin +++ b/src/initscripts/packages/vdradmin @@ -1,17 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/vdradmin -# -# Description : This is a script that starts vdradmind as deamon -# -# Authors : Arne Fitzenreiter (arne(a)ipfire.org) -# -# Version : 01.00 -# -# Notes : Changes in 01.01 -# : v.2.6.7 needs /var/run/vdradmin dir (earl(a)ipfire.org) -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -23,7 +29,7 @@ case "${1}" in loadproc /usr/bin/vdradmind > /dev/null evaluate_retval ;; - + stop) boot_mesg "Stopping VDR Webadministration Tool..." killproc /usr/bin/vdradmind @@ -44,5 +50,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/vdradmin diff --git a/src/initscripts/packages/virtlogd b/src/initscripts/packages/virtlogd index 148268621..090ce821d 100644 --- a/src/initscripts/packages/virtlogd +++ b/src/initscripts/packages/virtlogd @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/virtlogd -# -# Description : virtlogd init script -# -# Authors : Jonatan Schlag - jonatan.schlag(a)ipfire.org -# -# Version : 01.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -42,5 +49,3 @@ case $1 in exit 1 ;; esac - -# End $rc_base/init.d/virtlogd diff --git a/src/initscripts/packages/watchdog b/src/initscripts/packages/watchdog index a21949ad7..6dbcd4c34 100644 --- a/src/initscripts/packages/watchdog +++ b/src/initscripts/packages/watchdog @@ -1,10 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/watchdog -# -# Description : watchdog daemon initscript -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -43,5 +56,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/watchdog diff --git a/src/initscripts/packages/xinetd b/src/initscripts/packages/xinetd index 36ef45a2b..e948fb2ca 100644 --- a/src/initscripts/packages/xinetd +++ b/src/initscripts/packages/xinetd @@ -1,11 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/xinetd - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org - -#$LastChangedBy: bdubbs $ -#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -41,5 +53,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/xinetd diff --git a/src/initscripts/packages/zabbix_agentd b/src/initscripts/packages/zabbix_agentd index bffbc4893..055968ef0 100644 --- a/src/initscripts/packages/zabbix_agentd +++ b/src/initscripts/packages/zabbix_agentd @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/zabbix_agentd -# -# Description : This script starts the Zabbix Agent as a daemon (zabbix_agentd) -# -# Authors : Alexander Koch (ipfire(a)starkstromkonsument.de) -# -# Version : 01.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -46,5 +53,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/zabbix_agentd diff --git a/src/initscripts/sysconfig/rc.local b/src/initscripts/sysconfig/rc.local index 83ea8e703..5ae485a89 100644 --- a/src/initscripts/sysconfig/rc.local +++ b/src/initscripts/sysconfig/rc.local @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2022 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 # diff --git a/src/initscripts/system/acpid b/src/initscripts/system/acpid index fba487405..5fbf4a96c 100644 --- a/src/initscripts/system/acpid +++ b/src/initscripts/system/acpid @@ -1,10 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/acpid -# -# Description : ACPI daemon init script -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -36,5 +49,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/acpid diff --git a/src/initscripts/system/apache b/src/initscripts/system/apache index d9cc7fa48..0f4fe4a71 100644 --- a/src/initscripts/system/apache +++ b/src/initscripts/system/apache @@ -1,8 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/apache - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -80,7 +95,7 @@ case "$1" in /usr/sbin/apachectl -k restart evaluate_retval ;; - + reload) boot_mesg "Reloading Apache daemon..." /usr/sbin/apachectl -k graceful @@ -96,5 +111,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/apache diff --git a/src/initscripts/system/beep b/src/initscripts/system/beep index 6498e293a..12c814543 100644 --- a/src/initscripts/system/beep +++ b/src/initscripts/system/beep @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/beep -# -# Description : Plays a short melody when system goes up or down -# -# Authors : Michael Tremer - mitch(a)ipfire.org -# -# Version : 01.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -28,7 +35,7 @@ case "${1}" in for i in 440 466 494 523 554 587 622 659 698 740 764 831 880; do play $i done - + ;; stop) @@ -36,13 +43,13 @@ case "${1}" in play $i done ;; - + up) for i in 440 622 880; do play $i done ;; - + down) for i in 880 622 440; do play $i @@ -54,5 +61,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/beep diff --git a/src/initscripts/system/checkfs b/src/initscripts/system/checkfs index 1127099e0..99efcd594 100644 --- a/src/initscripts/system/checkfs +++ b/src/initscripts/system/checkfs @@ -1,29 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/checkfs -# -# Description : File System Check -# -# Authors : Gerard Beekmans - gerard(a)linuxfromscratch.org -# A. Luebke - luebke(a)users.sourceforge.net -# -# Version : 00.00 -# -# Notes : -# -# Based on checkfs script from LFS-3.1 and earlier. -# -# From man fsck -# 0 - No errors -# 1 - File system errors corrected -# 2 - System should be rebooted -# 4 - File system errors left uncorrected -# 8 - Operational error -# 16 - Usage or syntax error -# 32 - Fsck canceled by user request -# 128 - Shared library error -# -######################################################################### +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -125,5 +119,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/checkfs diff --git a/src/initscripts/system/cleanfs b/src/initscripts/system/cleanfs index 28bafd2a1..d1cbb2547 100644 --- a/src/initscripts/system/cleanfs +++ b/src/initscripts/system/cleanfs @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/cleanfs -# -# Description : Clean file system -# -# Authors : Gerard Beekmans - gerard(a)linuxfromscratch.org -# -# Version : 00.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -149,5 +156,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/cleanfs diff --git a/src/initscripts/system/cloud-init b/src/initscripts/system/cloud-init index 0da4e259a..7721b5b8c 100644 --- a/src/initscripts/system/cloud-init +++ b/src/initscripts/system/cloud-init @@ -1,7 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/cloud-init -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -91,5 +107,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/cloud-init diff --git a/src/initscripts/system/collectd b/src/initscripts/system/collectd index 20072780a..6c58ac3a6 100644 --- a/src/initscripts/system/collectd +++ b/src/initscripts/system/collectd @@ -1,5 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/collecd +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -127,7 +145,7 @@ case "$1" in else sed -i -e "s|^#LoadPlugin swap|LoadPlugin swap|g" /etc/collectd.conf fi - + # sync after config update... sync @@ -169,5 +187,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/collectd diff --git a/src/initscripts/system/connectd b/src/initscripts/system/connectd index 75d51d260..5ab186108 100644 --- a/src/initscripts/system/connectd +++ b/src/initscripts/system/connectd @@ -1,7 +1,25 @@ #!/bin/bash -# +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### -. /etc/sysconfig/rc +. /etc/sysconfig/rc . ${rc_functions} # Stop if nothing is configured @@ -39,7 +57,7 @@ case "$1" in start) boot_mesg "Starting connection daemon..." echo_ok - + while [ "$COUNT" -lt "$MAX" ]; do if [ ! -e "/var/ipfire/red/keepconnected" ]; then # User pressed disconnect in gui @@ -59,9 +77,9 @@ case "$1" in sleep 5 (( COUNT+=1 )) done - + /etc/rc.d/init.d/network stop red - + (( ATTEMPTS+=1 )) msg_log "Reconnecting: Attempt ${ATTEMPTS} of ${MAXRETRIES}" if [ "${ATTEMPTS}" -ge "${MAXRETRIES}" ]; then @@ -83,16 +101,16 @@ case "$1" in fi /etc/rc.d/init.d/network start red >/dev/tty12 2>&1 </dev/tty12 & ;; - + reconnect) while ( ps ax | grep -q [p]ppd ); do msg_log "There is a pppd still running. Waiting 2 seconds for exit." sleep 2 done - + /etc/rc.d/init.d/network restart red ;; - + *) echo "Usage: $0 {start|reconnect}" exit 1 diff --git a/src/initscripts/system/conntrackd b/src/initscripts/system/conntrackd index 2e7a2678b..c5387a6d0 100755 --- a/src/initscripts/system/conntrackd +++ b/src/initscripts/system/conntrackd @@ -1,7 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/conntrackd -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -37,5 +53,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/conntrackd diff --git a/src/initscripts/system/console b/src/initscripts/system/console index 8757b4d26..0626b91ed 100644 --- a/src/initscripts/system/console +++ b/src/initscripts/system/console @@ -1,17 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/console -# -# Description : Sets keymap and screen font -# -# Authors : Gerard Beekmans - gerard(a)linuxfromscratch.org -# Alexander E. Patrakov -# -# Version : 00.03 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -33,19 +39,19 @@ case "${1}" in start) boot_mesg "Setting up Linux console..." # There should be no bogus failures below this line! - + # Figure out if a framebuffer console is used [ -d /sys/class/graphics/fb0 ] && USE_FB=1 || USE_FB=0 - + # Figure out the command to set the console into the # desired mode is_true "${UNICODE}" && MODE_COMMAND="echo -en '\033%G' && kbd_mode -u" || MODE_COMMAND="echo -en '\033%@\033(K' && kbd_mode -a" - + # On framebuffer consoles, font has to be set for each vt in # UTF-8 mode. This doesn't hurt in non-UTF-8 mode also. - + ! is_true "${USE_FB}" || [ -z "${FONT}" ] || MODE_COMMAND="${MODE_COMMAND} && setfont ${FONT}" @@ -56,7 +62,7 @@ case "${1}" in # used. # FIXME: Fedora Core also initializes two spare consoles # - do we want that? - + for TTY in `grep '^[^#].*respawn:/sbin/agetty' /etc/inittab | grep -o '\btty[[:digit:]]*\b'` do @@ -81,7 +87,7 @@ case "${1}" in [ -n "$BROKEN_COMPOSE" ] || BROKEN_COMPOSE="$UNICODE" ! is_true "$BROKEN_COMPOSE" || echo "" | loadkeys -c &>/dev/null - + # Convert the keymap from $LEGACY_CHARSET to UTF-8 [ -z "$LEGACY_CHARSET" ] || dumpkeys -c "$LEGACY_CHARSET" | loadkeys -u &>/dev/null @@ -96,5 +102,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/console diff --git a/src/initscripts/system/dhcp b/src/initscripts/system/dhcp index d98229564..61b951658 100644 --- a/src/initscripts/system/dhcp +++ b/src/initscripts/system/dhcp @@ -1,9 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/dhcp - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org -# Modified for IPFire by Michael Tremer - mitch(a)ipfire.org +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -87,5 +101,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/dhcp diff --git a/src/initscripts/system/dhcrelay b/src/initscripts/system/dhcrelay index 327a08465..c0e97d8ca 100644 --- a/src/initscripts/system/dhcrelay +++ b/src/initscripts/system/dhcrelay @@ -1,10 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/dhcrelay -# -# Description : The DHCP Relay Daemon -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -49,5 +62,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/dhcrelay diff --git a/src/initscripts/system/fcron b/src/initscripts/system/fcron index 00a70bd4a..e93c6f040 100644 --- a/src/initscripts/system/fcron +++ b/src/initscripts/system/fcron @@ -1,11 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/fcron - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org - -#$LastChangedBy: bdubbs $ -#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -37,5 +49,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/fcron diff --git a/src/initscripts/system/fireinfo b/src/initscripts/system/fireinfo index 47565b3e1..d36ebe253 100644 --- a/src/initscripts/system/fireinfo +++ b/src/initscripts/system/fireinfo @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/fireinfo -# -# Description : Fireinfo profile generator -# -# Authors : IPFire Team -# -# Notes : This script saves the fireinfo profile to a file which -# is needed to show that information on the webinterface. -# No data is sent to the server. -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -33,5 +40,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/fireinfo diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall index 14f93d9c7..22e3fae59 100644 --- a/src/initscripts/system/firewall +++ b/src/initscripts/system/firewall @@ -1,4 +1,23 @@ #!/bin/sh +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} diff --git a/src/initscripts/system/firstsetup b/src/initscripts/system/firstsetup index 6930979e2..944a4f51a 100644 --- a/src/initscripts/system/firstsetup +++ b/src/initscripts/system/firstsetup @@ -1,4 +1,23 @@ #!/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### # Exit if firstsetup was already done... if [ -e /var/ipfire/main/firstsetup_ok ]; then diff --git a/src/initscripts/system/fsresize b/src/initscripts/system/fsresize index 79aeb36fc..b1c82c827 100644 --- a/src/initscripts/system/fsresize +++ b/src/initscripts/system/fsresize @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/fsresize -# -# Description : Resize the root filesystem in the background -# -# Authors : Arne Fitzenreiter - arne_f(a)ipfire.org -# -# Version : 1.01 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -42,5 +49,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/26fsresize diff --git a/src/initscripts/system/functions b/src/initscripts/system/functions index e44a2b4a1..6f53a941b 100644 --- a/src/initscripts/system/functions +++ b/src/initscripts/system/functions @@ -1,17 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/functions -# -# Description : Run Level Control Functions -# -# Authors : Gerard Beekmans - gerard(a)linuxfromscratch.org -# -# Version : 00.00 -# -# Notes : With code based on Matthias Benkmann's simpleinit-msb -# http://winterdrache.de/linux/newboot/index.html -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### ## Environmental setup # Setup default values for environment @@ -869,5 +875,3 @@ running_on_oci() { # We are not running on OCI return 1 } - -# End $rc_base/init.d/functions diff --git a/src/initscripts/system/halt b/src/initscripts/system/halt index a3005c990..91c89455c 100644 --- a/src/initscripts/system/halt +++ b/src/initscripts/system/halt @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/halt -# -# Description : Halt Script -# -# Authors : Gerard Beekmans - gerard(a)linuxfromscratch.org -# -# Version : 00.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -38,5 +45,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/halt diff --git a/src/initscripts/system/leds b/src/initscripts/system/leds index d68426acf..7522ce94d 100644 --- a/src/initscripts/system/leds +++ b/src/initscripts/system/leds @@ -1,10 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/leds -# -# Description : Script to setup leds at boot. -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -185,5 +198,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/leds diff --git a/src/initscripts/system/localnet b/src/initscripts/system/localnet index 0d01bd300..f260a1f29 100644 --- a/src/initscripts/system/localnet +++ b/src/initscripts/system/localnet @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/localnet -# -# Description : Loopback device -# -# Authors : Gerard Beekmans - gerard(a)linuxfromscratch.org -# -# Version : 00.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -71,5 +78,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/localnet diff --git a/src/initscripts/system/lvmetad b/src/initscripts/system/lvmetad index fdae39fd9..87cf87d33 100755 --- a/src/initscripts/system/lvmetad +++ b/src/initscripts/system/lvmetad @@ -1,9 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/lvmeta2 -# -# Description : LVM2 Metadata Daemon -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -37,5 +51,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/lvmetad diff --git a/src/initscripts/system/modules b/src/initscripts/system/modules index a51694aa4..e9b146afb 100644 --- a/src/initscripts/system/modules +++ b/src/initscripts/system/modules @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/modules -# -# Description : Module auto-loading script -# -# Authors : Zack Winkles -# -# Version : 00.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -79,5 +86,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/modules diff --git a/src/initscripts/system/mountfs b/src/initscripts/system/mountfs index 284b51dc8..b1533d6a2 100644 --- a/src/initscripts/system/mountfs +++ b/src/initscripts/system/mountfs @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/mountfs -# -# Description : File System Mount Script -# -# Authors : Gerard Beekmans - gerard(a)linuxfromscratch.org -# -# Version : 00.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -53,5 +60,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/mountfs diff --git a/src/initscripts/system/mountkernfs b/src/initscripts/system/mountkernfs index 905d2f874..d97b745be 100644 --- a/src/initscripts/system/mountkernfs +++ b/src/initscripts/system/mountkernfs @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/mountkernfs -# -# Description : Mount proc and sysfs -# -# Authors : Gerard Beekmans - gerard(a)linuxfromscratch.org -# -# Version : 00.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -60,5 +67,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/mountkernfs diff --git a/src/initscripts/system/mounttmpfs b/src/initscripts/system/mounttmpfs index 9ec8c3ad6..2b86e5345 100644 --- a/src/initscripts/system/mounttmpfs +++ b/src/initscripts/system/mounttmpfs @@ -1,10 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/mounttmpfs -# -# Description : Mount tmpfses -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -29,5 +42,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/mounttmpfs diff --git a/src/initscripts/system/network b/src/initscripts/system/network index 32b34343e..9ef3fb0d8 100644 --- a/src/initscripts/system/network +++ b/src/initscripts/system/network @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/network -# -# Description : Network Control Script -# -# Authors : Michael Tremer - mitch(a)ipfire.org -# -# Version : 01.00 -# -# Notes : Written for IPFire by its team -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -116,5 +123,3 @@ case "${DO}" in exit 1 ;; esac - -# End /etc/rc.d/init.d/network diff --git a/src/initscripts/system/ntp b/src/initscripts/system/ntp index d411ba18d..74b8bc86a 100644 --- a/src/initscripts/system/ntp +++ b/src/initscripts/system/ntp @@ -1,5 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/ntp +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -58,5 +76,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/ntp diff --git a/src/initscripts/system/pakfire b/src/initscripts/system/pakfire index d59daabce..4fe399403 100644 --- a/src/initscripts/system/pakfire +++ b/src/initscripts/system/pakfire @@ -1,10 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/pakfire -# -# Description : Imports the keyring to make Pakfire operational -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -26,5 +39,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/pakfire diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize index 307cc5927..7605b9e2b 100644 --- a/src/initscripts/system/partresize +++ b/src/initscripts/system/partresize @@ -1,18 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/partresize -# -# Description : Resize the root partition to the drivesize -# and setup some platform or hardware options in -# flashimage -# -# Authors : Arne Fitzenreiter - arne_f(a)ipfire.org -# -# Version : 1.04 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -131,5 +136,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/partresize diff --git a/src/initscripts/system/random b/src/initscripts/system/random index 489c7dac9..60b508738 100644 --- a/src/initscripts/system/random +++ b/src/initscripts/system/random @@ -1,4 +1,24 @@ #!/bin/sh +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + . /etc/sysconfig/rc . $rc_functions @@ -29,5 +49,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/random diff --git a/src/initscripts/system/rc b/src/initscripts/system/rc index 7990a88f3..b91862463 100644 --- a/src/initscripts/system/rc +++ b/src/initscripts/system/rc @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/rc -# -# Description : Main Run Level Control Script -# -# Authors : Gerard Beekmans - gerard(a)linuxfromscratch.org -# -# Version : 00.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -99,5 +106,3 @@ do print_error_msg fi done - -# End $rc_base/init.d/rc diff --git a/src/initscripts/system/reboot b/src/initscripts/system/reboot index 0602ac4e3..30c504025 100644 --- a/src/initscripts/system/reboot +++ b/src/initscripts/system/reboot @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/reboot -# -# Description : Reboot Scripts -# -# Authors : Gerard Beekmans - gerard(a)linuxfromscratch.org -# -# Version : 00.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -32,5 +39,3 @@ case "${1}" in ;; esac - -# End $rc_base/init.d/reboot diff --git a/src/initscripts/system/rngd b/src/initscripts/system/rngd index 0f95fde80..ba3e72d3a 100644 --- a/src/initscripts/system/rngd +++ b/src/initscripts/system/rngd @@ -1,12 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/rngd -# -# Description : Random Number Generator Daemon -# -# Authors : Michael Tremer <michael.tremer(a)ipfire.org> -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -51,5 +62,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/rngd diff --git a/src/initscripts/system/sendsignals b/src/initscripts/system/sendsignals index 58c16c3b4..962a3a88c 100644 --- a/src/initscripts/system/sendsignals +++ b/src/initscripts/system/sendsignals @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/sendsignals -# -# Description : Sendsignals Script -# -# Authors : Gerard Beekmans - gerard(a)linuxfromscratch.org -# -# Version : 00.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -48,5 +55,3 @@ case "${1}" in ;; esac - -# End $rc_base/init.d/sendsignals diff --git a/src/initscripts/system/setclock b/src/initscripts/system/setclock index cc977ddbc..b566eb716 100644 --- a/src/initscripts/system/setclock +++ b/src/initscripts/system/setclock @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/setclock -# -# Description : Setting Linux Clock -# -# Authors : Gerard Beekmans - gerard(a)linuxfromscratch.org -# -# Version : 00.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} diff --git a/src/initscripts/system/smartenabler b/src/initscripts/system/smartenabler index 4df693656..d8fdfde95 100644 --- a/src/initscripts/system/smartenabler +++ b/src/initscripts/system/smartenabler @@ -1,5 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/smartenabler +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -24,5 +42,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/smartenabler diff --git a/src/initscripts/system/smt b/src/initscripts/system/smt index 274ec4bba..821bb5178 100644 --- a/src/initscripts/system/smt +++ b/src/initscripts/system/smt @@ -1,7 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/smt -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -45,5 +61,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/smt diff --git a/src/initscripts/system/squid b/src/initscripts/system/squid index 09e7a0443..b7cb30b7c 100644 --- a/src/initscripts/system/squid +++ b/src/initscripts/system/squid @@ -1,5 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/squid +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -175,5 +193,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/squid diff --git a/src/initscripts/system/sshd b/src/initscripts/system/sshd index d0d859118..fa40bc11d 100644 --- a/src/initscripts/system/sshd +++ b/src/initscripts/system/sshd @@ -1,11 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/sshd - -# Based on sysklogd script from LFS-3.1 and earlier. -# Rewritten by Gerard Beekmans - gerard(a)linuxfromscratch.org - -#$LastChangedBy: bdubbs $ -#$Date: 2006-04-15 17:34:16 -0500 (Sat, 15 Apr 2006) $ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -60,5 +72,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/sshd diff --git a/src/initscripts/system/static-routes b/src/initscripts/system/static-routes index 84e3e3d29..85785e9af 100644 --- a/src/initscripts/system/static-routes +++ b/src/initscripts/system/static-routes @@ -1,4 +1,23 @@ #!/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} diff --git a/src/initscripts/system/suricata b/src/initscripts/system/suricata index 13fcc7f34..938ea66de 100644 --- a/src/initscripts/system/suricata +++ b/src/initscripts/system/suricata @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/suricata -# -# Description : Suricata Initscript -# -# Author : Stefan Schantl <stefan.schantl(a)ipfire.org> -# -# Version : 01.03 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -193,11 +200,11 @@ case "$1" in # Don't report returncode of rm if suricata was not started exit 0 ;; - + status) statusproc /usr/bin/suricata ;; - + restart) $0 stop $0 start @@ -213,7 +220,7 @@ case "$1" in # Generate firewall rules. generate_fw_rules ;; - + *) echo "Usage: $0 {start|stop|restart|reload|status}" exit 1 @@ -221,5 +228,3 @@ case "$1" in esac chmod 644 /var/log/suricata/* 2>/dev/null - -# End $rc_base/init.d/suricata diff --git a/src/initscripts/system/swap b/src/initscripts/system/swap index edc63f3b0..c50d818c2 100644 --- a/src/initscripts/system/swap +++ b/src/initscripts/system/swap @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/swap -# -# Description : Swap Control Script -# -# Authors : Gerard Beekmans - gerard(a)linuxfromscratch.org -# -# Version : 00.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -46,5 +53,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/swap diff --git a/src/initscripts/system/swconfig b/src/initscripts/system/swconfig index 30a5bd57e..73c606ad1 100644 --- a/src/initscripts/system/swconfig +++ b/src/initscripts/system/swconfig @@ -1,11 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/swconfig -# -# Description : Script to setup lan switch. -# don't edit this script! If you want change the functions -# create an own script called swconfig.user -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -62,6 +74,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/swconfig - diff --git a/src/initscripts/system/sysctl b/src/initscripts/system/sysctl index 311649e88..8897c1faa 100644 --- a/src/initscripts/system/sysctl +++ b/src/initscripts/system/sysctl @@ -1,18 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/sysctl -# -# Description : File uses /etc/sysctl.conf to set kernel runtime -# parameters -# -# Authors : Nathan Coulson (nathan(a)linuxfromscratch.org) -# Matthew Burgress (matthew(a)linuxfromscratch.org) -# -# Version : 00.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -38,7 +43,7 @@ case "${1}" in ;; status) - sysctl -a + sysctl -a ;; *) @@ -46,5 +51,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/sysctl diff --git a/src/initscripts/system/sysklogd b/src/initscripts/system/sysklogd index 90fe851de..5618ae3c8 100644 --- a/src/initscripts/system/sysklogd +++ b/src/initscripts/system/sysklogd @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/sysklogd -# -# Description : Sysklogd loader -# -# Authors : Gerard Beekmans - gerard(a)linuxfromscratch.org -# -# Version : 00.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -59,5 +66,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/sysklogd diff --git a/src/initscripts/system/template b/src/initscripts/system/template index 69dc2a6a2..049ecc530 100644 --- a/src/initscripts/system/template +++ b/src/initscripts/system/template @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/ -# -# Description : -# -# Authors : -# -# Version : 00.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -46,5 +53,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/ diff --git a/src/initscripts/system/udev b/src/initscripts/system/udev index e85775f8c..2f6146e5d 100644 --- a/src/initscripts/system/udev +++ b/src/initscripts/system/udev @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/udev -# -# Description : Udev cold-plugging script -# -# Authors : Zack Winkles, Alexander E. Patrakov -# -# Version : 00.02 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -78,5 +85,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/udev diff --git a/src/initscripts/system/udev_retry b/src/initscripts/system/udev_retry index 25e6967c8..3b116a8d2 100644 --- a/src/initscripts/system/udev_retry +++ b/src/initscripts/system/udev_retry @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/udev_retry -# -# Description : Udev cold-plugging script (retry) -# -# Authors : Alexander E. Patrakov -# -# Version : 00.02 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -24,7 +31,7 @@ case "${1}" in for file in /dev/.udev/failed/*/uevent ; do echo "add" >"${file}" done 2>/dev/null - + # Now wait for udevd to process the uevents we triggered /bin/udevadm settle evaluate_retval @@ -35,5 +42,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/udev_retry diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound index 1b42ac720..1005c14d1 100644 --- a/src/initscripts/system/unbound +++ b/src/initscripts/system/unbound @@ -1,8 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/unbound - -# Description : Unbound DNS resolver boot script for IPfire -# Author : Marcel Lorenz <marcel.lorenz(a)ipfire.org> +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -611,5 +626,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/unbound diff --git a/src/initscripts/system/vnstat b/src/initscripts/system/vnstat index 0cef59a60..511cd79f5 100755 --- a/src/initscripts/system/vnstat +++ b/src/initscripts/system/vnstat @@ -1,5 +1,23 @@ #!/bin/sh -# Begin $rc_base/init.d/vnstat +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . $rc_functions @@ -52,5 +70,3 @@ case "$1" in exit 1 ;; esac - -# End $rc_base/init.d/vnstat diff --git a/src/initscripts/system/waitdrives b/src/initscripts/system/waitdrives index d7df93b94..d4507f104 100644 --- a/src/initscripts/system/waitdrives +++ b/src/initscripts/system/waitdrives @@ -1,16 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/waitdrives -# -# Description : Wait for drives before fscheck/mount -# -# Authors : Arne Fitzenreiter - arne_f(a)ipfire.org -# -# Version : 00.00 -# -# Notes : -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -47,5 +54,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/waitdrives diff --git a/src/initscripts/system/wlanclient b/src/initscripts/system/wlanclient index 338a743ab..a6b74cfdf 100644 --- a/src/initscripts/system/wlanclient +++ b/src/initscripts/system/wlanclient @@ -1,10 +1,23 @@ #!/bin/sh -######################################################################## -# Begin $rc_base/init.d/wlan_client -# -# Description : Wireless client initscript -# -######################################################################## +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### . /etc/sysconfig/rc . ${rc_functions} @@ -298,7 +311,7 @@ function wpa_supplicant_stop() { boot_mesg "Stopping wireless client on ${RED_DEV}..." killproc wpa_supplicant - + # Tidy up /tmp directory. rm -f /tmp/wpa_ctrl_* } @@ -331,5 +344,3 @@ case "${1}" in exit 1 ;; esac - -# End $rc_base/init.d/wlan_client diff --git a/src/libsmooth/libsmooth.h b/src/libsmooth/libsmooth.h index 6003bc065..fd4e37a8a 100644 --- a/src/libsmooth/libsmooth.h +++ b/src/libsmooth/libsmooth.h @@ -5,7 +5,7 @@ * * (c) Lawrence Manning, 2001 * Contains prototypes for library functions. - * + * */ #ifndef ___LIBSMOOTH_H @@ -53,7 +53,7 @@ int runcommandwithprogress(int width, int height, const char *title, const char int runcommandwithstatus(const char *command, const char* title, const char *message, const char* output); int runhiddencommandwithstatus(const char *command, const char* title, const char *message, const char* output); int splashWindow(const char* title, const char* message, unsigned int timeout); -int checkformodule(const char *module); +int checkformodule(const char *module); int replace(char filename1[], char *from, char *to); char* get_version(void); diff --git a/src/libsmooth/main.c b/src/libsmooth/main.c index fedff109d..6695a48b2 100644 --- a/src/libsmooth/main.c +++ b/src/libsmooth/main.c @@ -6,7 +6,7 @@ * (c) Lawrence Manning, 2001 * Contains library functions. */ - + #include "libsmooth.h" #include <libintl.h> @@ -134,10 +134,10 @@ int runcommandwithprogress(int width, int height, const char *title, const char free(buf); newtFormAddComponent(f, t); - + s = newtScale(1, 3, width - 2, lines); newtScaleSet(s, progress); - + newtFormAddComponent(f, s); newtDrawForm(f); @@ -149,18 +149,18 @@ int runcommandwithprogress(int width, int height, const char *title, const char goto EXIT; } setvbuf(p, NULL, _IOLBF, 255); - + while (fgets(buffer, STRING_SIZE, p)) { newtScaleSet(s, ++progress); - newtRefresh(); + newtRefresh(); } rc = pclose(p); - + EXIT: newtFormDestroy(f); newtPopWindow(); - + return rc; } @@ -174,7 +174,7 @@ int checkformodule(const char *module) { fprintf(stderr, "Unable to open /proc/modules in checkformodule()\n"); return 0; } - + while (fgets(buffer, STRING_SIZE, file)) { if (strncmp(buffer, module, strlen(module)) == 0) @@ -186,13 +186,13 @@ int checkformodule(const char *module) { } } } - + EXIT: fclose(file); - + return result; -} - +} + int _replace_string(char string[], char *from, char *to) { int fromlen = strlen(from); @@ -244,12 +244,12 @@ int replace(char filename1[], char *from, char *to) { if (strlen(to) > 0) { /* Replace string */ ret = _replace_string (temp, from, to); - + /* Write string to new file */ fputs(temp, file2); } else { /* Remove string when to is NULL */ - if (!strstr(temp, from)) + if (!strstr(temp, from)) fputs(temp, file2); } } @@ -260,7 +260,7 @@ int replace(char filename1[], char *from, char *to) { /* Move the file */ rename (filename2, filename1); - + return (ret); } diff --git a/src/libsmooth/varval.c b/src/libsmooth/varval.c index 9a64365af..a4decd4d5 100644 --- a/src/libsmooth/varval.c +++ b/src/libsmooth/varval.c @@ -5,13 +5,13 @@ * * (c) Lawrence Manning, 2001 * Contains functions for manipulation files full of VAR=VAL pairs. - * + * * 2003-07-27 Robert Kerr - Added cooperative file locking to prevent any * clashes between setuid programs reading configuration and cgi scripts * trying to write it - * + * */ - + #include "libsmooth.h" /* Sets up the list. First entry is a dummy one to avoid having to special @@ -19,11 +19,11 @@ struct keyvalue *initkeyvalues(void) { struct keyvalue *head = malloc(sizeof(struct keyvalue)); - + strcpy(head->key, "KEY"); strcpy(head->value, "VALUE"); head->next = NULL; - + return head; } @@ -32,7 +32,7 @@ void freekeyvalues(struct keyvalue *head) { struct keyvalue *cur = head->next; struct keyvalue *next; - + while (cur) { next = cur->next; @@ -49,16 +49,16 @@ int readkeyvalues(struct keyvalue *head, char *filename) char buffer[STRING_SIZE]; char *temp; char *key, *value; - + if (!(file = fopen(filename, "r"))) return 0; - + if (flock(fileno(file), LOCK_SH)) { fclose(file); return 0; } - + while (fgets(buffer, STRING_SIZE, file)) { temp = buffer; @@ -94,7 +94,7 @@ int readkeyvalues(struct keyvalue *head, char *filename) if (strlen(key)) appendkeyvalue(head, key, value); } - + flock(fileno(file), LOCK_UN); fclose(file); @@ -106,17 +106,17 @@ int writekeyvalues(struct keyvalue *head, char *filename) { FILE *file; struct keyvalue *cur = head->next; - + if (!(file = fopen(filename, "w"))) return 0; - + if (flock(fileno(file), LOCK_EX)) { fclose(file); return 0; } - - + + while (cur) { /* No space in value? If there is, we need to quote the value @@ -129,7 +129,7 @@ int writekeyvalues(struct keyvalue *head, char *filename) } flock(fileno(file), LOCK_UN); fclose(file); - + return 1; } diff --git a/src/misc-progs/addonctrl.c b/src/misc-progs/addonctrl.c index 9645cee18..14b4b1325 100644 --- a/src/misc-progs/addonctrl.c +++ b/src/misc-progs/addonctrl.c @@ -27,7 +27,7 @@ int main(int argc, char *argv[]) { } const char* name = argv[1]; - + if (strlen(name) > 32) { fprintf(stderr, "\nString to large.\n\naddonctrl addon (start|stop|restart|reload|enable|disable)\n\n"); exit(1); diff --git a/src/misc-progs/fireinfoctrl.c b/src/misc-progs/fireinfoctrl.c index a026ba09d..bc93e7b81 100644 --- a/src/misc-progs/fireinfoctrl.c +++ b/src/misc-progs/fireinfoctrl.c @@ -6,9 +6,9 @@ * (c) IPFire Team, 2011 * * Simple program that calls "sendprofile" as the root user. - * + * */ - + #include <stdlib.h> #include "setuid.h" @@ -16,8 +16,8 @@ int main(void) { if (!(initsetuid())) exit(1); - + safe_system("/usr/bin/sendprofile"); - + return 0; } diff --git a/src/misc-progs/getipstat.c b/src/misc-progs/getipstat.c index 99d053bbf..37e01c81a 100644 --- a/src/misc-progs/getipstat.c +++ b/src/misc-progs/getipstat.c @@ -1,12 +1,12 @@ /* IPFire helper program - IPStat * * Get the list from IPTABLES -L - * + * * Optional commandline parameters: - * -x + * -x * instruct iptables to expand numbers - * -f - * display filter table + * -f + * display filter table * -n * display nat table * -m @@ -33,7 +33,7 @@ int main(int argc, char** argv) unsigned int table_set = 0; int opt; - + if (!(initsetuid())) exit(1); diff --git a/src/misc-progs/iowrap.c b/src/misc-progs/iowrap.c index 115ec2a06..10210d3e5 100644 --- a/src/misc-progs/iowrap.c +++ b/src/misc-progs/iowrap.c @@ -6,9 +6,9 @@ * (c) Lawrence Manning, 2001 * Installer helper for redirecting stdout/stderr to a file/terminal. * init calls ash through this program to shove it on a tty. - * + * * $Id: iowrap.c,v 1.2 2001/11/27 15:20:50 riddles Exp $ - * + * */ #include <stdio.h> @@ -23,7 +23,7 @@ int main(int argc, char *argv[]) if (argc >= 2) { int fd; - + if ((fd = open(argv[1], O_RDWR)) == -1) { printf("Couldn't open device\n"); @@ -34,8 +34,8 @@ int main(int argc, char *argv[]) dup2(fd, 2); /* Now its sending/reading on that device. */ } - - if (argc >= 3) + + if (argc >= 3) execvp(argv[2], &argv[2]); else printf("No command\n"); diff --git a/src/misc-progs/ipfirereboot.c b/src/misc-progs/ipfirereboot.c index 6f5ecf89a..3048c3753 100644 --- a/src/misc-progs/ipfirereboot.c +++ b/src/misc-progs/ipfirereboot.c @@ -40,7 +40,7 @@ int main(int argc, char**argv) // Check what command is asked if (argc==1) - { + { fprintf (stderr, "Missing reboot command!\n"); return 1; } diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index 001587fca..ed42f36db 100644 --- a/src/misc-progs/ipsecctrl.c +++ b/src/misc-progs/ipsecctrl.c @@ -19,13 +19,13 @@ /* This module is responsible for start stop of the vpn system. - + 1) it allows AH & ESP to get in from interface where a vpn is mounted The NAT traversal is used on the udp 4500 port. 2) it starts the ipsec daemon The RED interface is a problem because it can be up or down a startup. - Then, the state change and it must not affect other VPN mounted on + Then, the state change and it must not affect other VPN mounted on other interface. Unfortunatly, openswan 1 cannot do that correctly. It cannot use an interface without restarting everything. @@ -55,7 +55,7 @@ static void ipsec_reload() { /* return values from the vpn config file or false if not 'on' */ -int decode_line (char *s, +int decode_line (char *s, char **key, char **name, char **type @@ -85,7 +85,7 @@ int decode_line (char *s, // check other syntax if (! *name) return 0; - + if (strspn(*name, LETTERS_NUMBERS) != strlen(*name)) { fprintf(stderr, "Bad connection name: %s\n", *name); return 0; @@ -112,7 +112,7 @@ void turn_connection_on(char *name, char *type) { char command[STRING_SIZE]; // Bring down the connection (if established). - snprintf(command, STRING_SIZE - 1, + snprintf(command, STRING_SIZE - 1, "/usr/sbin/ipsec down %s >/dev/null", name); safe_system(command); @@ -145,7 +145,7 @@ void turn_connection_off (char *name) { ipsec_reload(); // Bring down the connection. - snprintf(command, STRING_SIZE - 1, + snprintf(command, STRING_SIZE - 1, "/usr/sbin/ipsec down %s >/dev/null", name); safe_system(command); @@ -158,7 +158,7 @@ void turn_connection_off (char *name) { int main(int argc, char *argv[]) { struct keyvalue *kv = NULL; - + if (argc < 2) { usage(); exit(1); diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c index 20967e471..db23e9f00 100644 --- a/src/misc-progs/openvpnctrl.c +++ b/src/misc-progs/openvpnctrl.c @@ -254,7 +254,7 @@ void ovpnInit(void) { fprintf(stderr, "Cannot read ethernet settings\n"); exit(1); } - + if (strcmp(enableblue, "on") == 0) { if (!findkey(kv, "BLUE_DEV", blueif)) { exit(1); @@ -394,7 +394,7 @@ void setFirewallRules(void) { exit(1); } - /* we got one device, so lets proceed further */ + /* we got one device, so lets proceed further */ if (!findkey(kv, "DDEST_PORT", dport)){ fprintf(stderr, "Cannot read DDEST_PORT\n"); exit(1); @@ -474,7 +474,7 @@ void stopDaemon(void) { void startDaemon(void) { char command[STRING_SIZE]; - + if (!((strcmp(enablered, "on") == 0) || (strcmp(enableblue, "on") == 0) || (strcmp(enableorange, "on") == 0))) { fprintf(stderr, "OpenVPN is not enabled on any interface\n"); exit(1); @@ -712,7 +712,7 @@ int main(int argc, char *argv[]) { } else { ovpnInit(); - + if( (strcmp(argv[1], "-s") == 0) || (strcmp(argv[1], "--start") == 0) ) { setFirewallRules(); startDaemon(); diff --git a/src/misc-progs/rebuildhosts.c b/src/misc-progs/rebuildhosts.c index 549c6533f..7c9eedbd0 100644 --- a/src/misc-progs/rebuildhosts.c +++ b/src/misc-progs/rebuildhosts.c @@ -4,7 +4,7 @@ * Licence. See the file COPYING for details. * * (c) Alan Hourihane, 2003 - * + * * * $Id: rebuildhosts.c,v 1.3.2.6 2005/07/11 10:56:47 franck78 Exp $ * @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "Couldn't read main settings\n"); exit(1); } - strcpy(hostname, SNAME ); + strcpy(hostname, SNAME ); findkey(kv, "HOSTNAME", hostname); findkey(kv, "DOMAINNAME", domainname); freekeyvalues(kv); diff --git a/src/misc-progs/sambactrl.c b/src/misc-progs/sambactrl.c index 9753492f6..501535799 100644 --- a/src/misc-progs/sambactrl.c +++ b/src/misc-progs/sambactrl.c @@ -8,7 +8,7 @@ #define BUFFER_SIZE 1024 -char command[BUFFER_SIZE]; +char command[BUFFER_SIZE]; int main(int argc, char *argv[]) { if (!(initsetuid())) diff --git a/src/misc-progs/setaliases.c b/src/misc-progs/setaliases.c index 10ffd438d..4ba6816af 100644 --- a/src/misc-progs/setaliases.c +++ b/src/misc-progs/setaliases.c @@ -87,9 +87,9 @@ int main(void) fprintf(stderr, "Cannot read RED_TYPE\n"); exit(1); } - + /* Make sure it's the right type */ - if (!(strcmp(s, "STATIC")==0)) + if (!(strcmp(s, "STATIC")==0)) exit(0); /* Get the RED interface details */ @@ -99,7 +99,7 @@ int main(void) fprintf(stderr, "Cannot read RED settings\n"); exit(1); } - + if (!VALID_DEVICE(red_dev)) { fprintf(stderr, "Bad red_dev: %s\n", red_dev); diff --git a/src/misc-progs/setuid.h b/src/misc-progs/setuid.h index 2936c4399..8c40fd6fd 100644 --- a/src/misc-progs/setuid.h +++ b/src/misc-progs/setuid.h @@ -3,7 +3,7 @@ * This program is distributed under the terms of the GNU General Public * Licence. See the file COPYING for details. * Simple header file for all setuid progs. - * + * */ #ifndef SETUID_H diff --git a/src/misc-progs/sshctrl.c b/src/misc-progs/sshctrl.c index 0d458a865..f1d0338c2 100644 --- a/src/misc-progs/sshctrl.c +++ b/src/misc-progs/sshctrl.c @@ -5,10 +5,10 @@ * * (c) Mark Wormgoor, 2001 * Simple program intended to be installed setuid(0) that can be used for - * restarting SSHd. - * + * restarting SSHd. + * * $Id: sshctrl.c,v 1.3 2003/12/11 10:57:34 riddles Exp $ - * + * */ #include <stdio.h> @@ -24,7 +24,7 @@ #define BUFFER_SIZE 1024 -char command[BUFFER_SIZE]; +char command[BUFFER_SIZE]; int main(int argc, char *argv[]) { diff --git a/src/misc-progs/syslogdctrl.c b/src/misc-progs/syslogdctrl.c index d73c42265..3ae6bf888 100644 --- a/src/misc-progs/syslogdctrl.c +++ b/src/misc-progs/syslogdctrl.c @@ -7,7 +7,7 @@ * * $Id$ * - * Edited by the IPFire Team to change var log messages + * Edited by the IPFire Team to change var log messages */ #include <stdio.h> @@ -141,7 +141,7 @@ int main(void) exit(ERR_CONFIG); } close(config_fd); - + if (rename("/etc/syslog.conf.new", "/etc/syslog.conf") == -1) { perror("Unable to replace old config file"); diff --git a/src/misc-progs/updxlratorctrl.c b/src/misc-progs/updxlratorctrl.c index cf58b5e34..c1a7adbdf 100644 --- a/src/misc-progs/updxlratorctrl.c +++ b/src/misc-progs/updxlratorctrl.c @@ -17,7 +17,7 @@ int main(int argc, char *argv[]){ if (strcmp(argv[1], "cron") == 0){ safe_system("rm /etc/fcron.*/updxlrator 2&>/dev/null"); - + if (strcmp(argv[2], "daily") == 0){ safe_system("ln -s /var/ipfire/updatexlrator/bin/checkup /etc/fcron.daily/updxlrator"); } else if (strcmp(argv[2], "weekly") == 0){ diff --git a/src/misc-progs/urlfilterctrl.c b/src/misc-progs/urlfilterctrl.c index 6e2b306db..28dc03075 100644 --- a/src/misc-progs/urlfilterctrl.c +++ b/src/misc-progs/urlfilterctrl.c @@ -17,7 +17,7 @@ int main(int argc, char *argv[]){ if (strcmp(argv[1], "cron") == 0){ safe_system("rm /etc/fcron.*/urlfilter 2&>/dev/null"); - + if (strcmp(argv[2], "daily") == 0){ safe_system("ln -s /var/ipfire/urlfilter/bin/autoupdate.pl /etc/fcron.daily/urlfilter"); } else if (strcmp(argv[2], "weekly") == 0){ diff --git a/src/misc-progs/wiohelper.c b/src/misc-progs/wiohelper.c index a1e0168b3..92e644751 100644 --- a/src/misc-progs/wiohelper.c +++ b/src/misc-progs/wiohelper.c @@ -6,7 +6,7 @@ * Licence. See the file COPYING for details. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * + * * IPFire.org - A linux based firewall * Copyright (C) 2017-2018 Stephan Feddersen <sfeddersen(a)ipfire.org> * diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 8d0923d65..d4e338f23 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -45,7 +45,7 @@ my @VALID_KEY_FINGERPRINTS = ( # A small color-hash :D my %color; - $color{'normal'} = "\033[0m"; + $color{'normal'} = "\033[0m"; $color{'black'} = "\033[0;30m"; $color{'darkgrey'} = "\033[1;30m"; $color{'blue'} = "\033[0;34m"; @@ -79,7 +79,7 @@ our $lockfile = "/tmp/pakfire_lock"; sub message { my $message = shift; - + logger("$message"); if ( $enable_colors == 1 ) { if ("$message" =~ /ERROR/) { @@ -99,7 +99,7 @@ sub message { } } print "$message\n"; - + } sub logger { @@ -131,16 +131,16 @@ sub fetchfile { my $gethost = shift; my (@server, $host, $proto, $file, $i); my $allok = 0; - + use File::Basename; $bfile = basename("$getfile"); - + logger("DOWNLOAD STARTED: $getfile"); - $i = 0; + $i = 0; while (($allok == 0) && $i < 5) { $i++; - + if ("$gethost" eq "") { @server = selectmirror(); $proto = $server[0]; @@ -150,9 +150,9 @@ sub fetchfile { $host = $gethost; $file = $getfile; } - + $proto = "HTTPS" unless $proto; - + logger("DOWNLOAD INFO: Host: $host ($proto) - File: $file"); # Init LWP::UserAgent, request SSL hostname verification @@ -165,7 +165,7 @@ sub fetchfile { ); $ua->agent("Pakfire/$Conf::version"); $ua->timeout(20); - + my %proxysettings=(); &General::readhash("${General::swroot}/proxy/advanced/settings", \%proxysettings); @@ -196,19 +196,19 @@ sub fetchfile { my $remote_headers = $result->headers; $total_size = $remote_headers->content_length; logger("DOWNLOAD INFO: $file has size of $total_size bytes"); - + my $response = $ua->get($url, ':content_cb' => \&callback ); message(""); - + my $code = $response->code(); my $log = $response->status_line; logger("DOWNLOAD INFO: HTTP-Status-Code: $code - $log"); - + if ( $code eq "500" ) { message("Giving up: There was no chance to get the file \"$getfile\" from any available server.\nThere was an error on the way. Please fix it."); return 1; } - + if ($response->is_success) { if (open(FILE, ">$Conf::tmpdir/$bfile")) { print FILE $final_data; @@ -241,9 +241,9 @@ sub fetchfile { sub getmirrors { my $force = shift; my $age; - + use File::Copy; - + if ( -e "$Conf::dbdir/lists/server-list.db" ) { my @stat = stat("$Conf::dbdir/lists/server-list.db"); my $time = time(); @@ -254,7 +254,7 @@ sub getmirrors { # Force an update. $force = "force"; } - + if ("$force" eq "force") { fetchfile("$Conf::version/lists/server-list.db", "$Conf::mainserver"); move("$Conf::cachedir/server-list.db", "$Conf::dbdir/lists/server-list.db"); @@ -264,9 +264,9 @@ sub getmirrors { sub getcoredb { my $force = shift; my $age; - + use File::Copy; - + if ( -e "$Conf::dbdir/lists/core-list.db" ) { my @stat = stat("$Conf::dbdir/lists/core-list.db"); my $time = time(); @@ -277,7 +277,7 @@ sub getcoredb { # Force an update. $force = "force"; } - + if ("$force" eq "force") { fetchfile("lists/core-list.db", ""); move("$Conf::cachedir/core-list.db", "$Conf::dbdir/lists/core-list.db"); @@ -375,9 +375,9 @@ sub dbgetlist { # Usage is always with an argument. my $force = shift; my $age; - + use File::Copy; - + if ( -e "$Conf::dbdir/lists/packages_list.db" ) { my @stat = stat("$Conf::dbdir/lists/packages_list.db"); my $time = time(); @@ -388,7 +388,7 @@ sub dbgetlist { # Force an update. $force = "force"; } - + if ("$force" eq "force") { fetchfile("lists/packages_list.db", ""); move("$Conf::cachedir/packages_list.db", "$Conf::dbdir/lists/packages_list.db"); @@ -428,7 +428,7 @@ sub dbgetlist { sub dblist { ### This subroutine lists the packages. - # You may also pass a filter: &Pakfire::dblist(filter) + # You may also pass a filter: &Pakfire::dblist(filter) # Usage is always with two arguments. # filter may be: all, notinstalled, installed my $filter = shift; @@ -439,8 +439,8 @@ sub dblist { my $prog; my %metadata; my @templine; - - ### Make sure that the list is not outdated. + + ### Make sure that the list is not outdated. #dbgetlist("noforce"); open(FILE, "<$Conf::dbdir/lists/packages_list.db"); @@ -465,7 +465,7 @@ sub dblist { } } } - + opendir(DIR,"$Conf::dbdir/installed"); my @files = readdir(DIR); closedir(DIR); @@ -518,7 +518,7 @@ sub dblist { } else { if ("$Pakfire::enable_colors" eq "1") { if (&isinstalled("$templine[0]")) { - $use_color = "$color{'red'}" + $use_color = "$color{'red'}" } else { $use_color = "$color{'green'}" } @@ -532,11 +532,11 @@ sub dblist { sub resolvedeps_one { my $pak = shift; - + getmetafile("$pak"); - + message("PAKFIRE RESV: $pak: Resolving dependencies..."); - + my %metadata = parsemetafile("$Conf::dbdir/meta/meta-$pak"); my @all; my @deps = split(/ /, $metadata{'Dependencies'}); @@ -549,7 +549,7 @@ sub resolvedeps_one { } else { message("PAKFIRE RESV: $pak: Need to install dependency: $_"); push(@all,$_); - } + } } } @@ -608,9 +608,9 @@ sub resolvedeps_recursive { sub cleanup { my $dir = shift; my $path; - + logger("CLEANUP: $dir"); - + if ( "$dir" eq "meta" ) { $path = "$Conf::dbdir/meta"; } elsif ( "$dir" eq "tmp" ) { @@ -629,21 +629,21 @@ sub cleanup { sub getmetafile { my $pak = shift; - + unless ( -e "$Conf::dbdir/meta/meta-$pak" ) { fetchfile("meta/meta-$pak", ""); move("$Conf::cachedir/meta-$pak", "$Conf::dbdir/meta/meta-$pak"); } - + if ( -z "$Conf::dbdir/meta/meta-$pak" ) { fetchfile("meta/meta-$pak", ""); move("$Conf::cachedir/meta-$pak", "$Conf::dbdir/meta/meta-$pak"); } - + open(FILE, "<$Conf::dbdir/meta/meta-$pak"); my @line = <FILE>; close(FILE); - + open(FILE, ">$Conf::dbdir/meta/meta-$pak"); foreach (@line) { my $string = $_; @@ -656,9 +656,9 @@ sub getmetafile { sub getsize { my $pak = shift; - + getmetafile("$pak"); - + if (my %metadata = parsemetafile("$Conf::dbdir/meta/meta-$pak")) { return $metadata{'Size'}; } @@ -683,7 +683,7 @@ sub parsemetafile { open(FILE, "<$metafile"); @file = <FILE>; close(FILE); - + foreach (@file) { @templine = split(/\: /,$_); if ($templine[1]) { @@ -697,11 +697,11 @@ sub parsemetafile { sub decryptpak { my $pak = shift; - + cleanup("tmp"); - + my $file = getpak("$pak", "noforce"); - + logger("DECRYPT STARTED: $pak"); my $return = system("cd $Conf::tmpdir/ && gpg -d --batch --quiet --no-verbose --status-fd 2 --output - < $Conf::cachedir/$file 2>/dev/null | tar x"); $return %= 255; @@ -714,31 +714,31 @@ sub getpak { my $force = shift; getmetafile("$pak"); - + my %metadata = parsemetafile("$Conf::dbdir/meta/meta-$pak"); my $file = $metadata{'File'}; - + unless ($file) { message("No filename given in meta-file."); exit 1; } - + unless ( "$force" eq "force" ) { if ( -e "$Conf::cachedir/$file" ) { return $file; } } - + fetchfile("paks/$file", ""); return $file; } sub setuppak { my $pak = shift; - + message("PAKFIRE INST: $pak: Decrypting..."); decryptpak("$pak"); - + message("PAKFIRE INST: $pak: Copying files and running post-installation scripts..."); my $return = system("cd $Conf::tmpdir && NAME=$pak ./install.sh >> $Conf::logdir/install-$pak.log 2>&1"); $return %= 255; @@ -766,7 +766,7 @@ sub upgradecore { $Conf::core_mine-- if ($tree eq "testing" || $tree eq "unstable"); message("CORE UPGR: Upgrading from release $Conf::core_mine to $core_release"); - + my @seq = `seq $Conf::core_mine $core_release`; shift @seq; my $release; @@ -774,14 +774,14 @@ sub upgradecore { chomp($release); getpak("core-upgrade-$release"); } - + foreach $release (@seq) { chomp($release); upgradepak("core-upgrade-$release"); } - + system("echo $core_release > $Conf::coredir/mine"); - + } else { message("CORE ERROR: No new upgrades available. You are on release $Conf::core_mine."); } @@ -845,7 +845,7 @@ sub beautifysize { my $size = shift; #$size = $size / 1024; my $unit; - + if ($size > 1023*1024) { $size = ($size / (1024*1024)); $unit = "MB"; @@ -865,7 +865,7 @@ sub makeuuid { open(FILE, "</proc/sys/kernel/random/uuid"); my @line = <FILE>; close(FILE); - + open(FILE, ">$Conf::dbdir/uuid"); foreach (@line) { print FILE $_; @@ -889,7 +889,7 @@ sub progress_bar { $show_bfile = substr($bfile,0,17)."..."; } else { $show_bfile = $bfile; - } + } $progress = sprintf("%.2f%%", 100*$got/+$total); sprintf "$color{'lightgreen'}%-20s %7s |%-${width}s| %10s$color{'normal'}\r",$show_bfile, $progress, $char x (($width-1)*$got/$total). '>', beautifysize($got); } diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire index 4139d106b..6c77695c8 100644 --- a/src/pakfire/pakfire +++ b/src/pakfire/pakfire @@ -28,11 +28,11 @@ $ENV{"GNUPGHOME"} = "/opt/pakfire/etc/.gnupg"; require "/opt/pakfire/lib/functions.pl"; - + my $interactive = 1; my $force = "noforce"; my $locked; - + &Pakfire::logger("PAKFIRE INFO: IPFire Pakfire $Conf::version started!"); ### Check if we are running as root @@ -43,7 +43,7 @@ &Pakfire::message("PAKFIRE ERROR: You must run pakfire as user root!"); exit 1; } - + unless ( -e "/var/ipfire/red/active" ) { &Pakfire::message("PAKFIRE ERROR: You need to be online to run pakfire!"); exit 2; @@ -63,7 +63,7 @@ # Close filehandle. close(LOCK); - + ### Check if we are started by another name # if ( $0 =~ /pakfire-update$/ ) { @@ -81,20 +81,20 @@ $ARGV[0] = "upgrade"; $interactive = 0; } - + unless (@ARGV) { &Pakfire::usage; } - + foreach (@ARGV) { if ("$_" =~ "^-") { # Turn off interactive mode $interactive = 0 if ("$_" eq "--non-interactive"); $interactive = 0 if ("$_" eq "-y"); - + # Turn off shell colors - Bad for displaying in webinterface $Pakfire::enable_colors = 0 if ("$_" eq "--no-colors"); - + # Turn on force mode $force = "force" if ("$_" eq "-f" ); $force = "force" if ("$_" eq "--force" ); @@ -103,14 +103,14 @@ if ("$ARGV[0]" eq "install") { shift; - - ### Make sure that the list is not outdated. + + ### Make sure that the list is not outdated. &Pakfire::dbgetlist("noforce"); open(FILE, "<$Conf::dbdir/lists/packages_list.db"); my @db = <FILE>; close(FILE); - + my $dep; my @deps; my $pak; @@ -125,7 +125,7 @@ $return = &Pakfire::isinstalled($pak); if ($return eq 0) { &Pakfire::message("PAKFIRE INFO: $pak is already installed"); - next; + next; } $found = 0; foreach (@db) { @@ -148,7 +148,7 @@ } } } - + unless (@paks) { &Pakfire::message("PAKFIRE ERROR: No packages to install. Exiting..."); exit 1; @@ -174,7 +174,7 @@ $size = &Pakfire::beautifysize($size); &Pakfire::message("PAKFIRE INFO: $pak \t - $size"); } - + my $totalsize; foreach $pak (@all) { $totalsize = ($totalsize + &Pakfire::getsize("$pak")); @@ -183,7 +183,7 @@ &Pakfire::message(""); &Pakfire::message("PAKFIRE INFO: Total size: \t ~ $totalsize"); &Pakfire::message(""); - + if ($interactive) { &Pakfire::message("PAKFIRE INFO: Is this okay? [y/N]"); my $ret = <STDIN>; @@ -196,7 +196,7 @@ } else { &Pakfire::logger("PAKFIRE INFO: Interaction skipped."); } - + # my %sort = map{ $_, 1 } @all; # @all = sort keys %sort; @@ -210,16 +210,16 @@ foreach $pak (@deps) { &Pakfire::setuppak("$pak") if ($pak ne ""); } - + foreach $pak (@paks) { &Pakfire::setuppak("$pak") if ($pak ne ""); } - + } elsif ("$ARGV[0]" eq "remove") { shift; - + my @paks; my $pak; foreach $pak (@ARGV) { @@ -232,12 +232,12 @@ push(@paks, $pak); } } - + unless (@paks) { &Pakfire::message("PAKFIRE ERROR: No packages to remove. Exiting..."); exit 1; } - + &Pakfire::message(""); &Pakfire::message(""); &Pakfire::message("PAKFIRE INFO: Packages to remove:"); @@ -246,7 +246,7 @@ $size = &Pakfire::beautifysize($size); &Pakfire::message("PAKFIRE INFO: $pak \t - $size"); } - + if ($interactive) { &Pakfire::message("PAKFIRE INFO: Is this okay? [y/N]"); my $ret = <STDIN>; @@ -257,12 +257,12 @@ exit 1; } } - + foreach $pak (@paks) { &Pakfire::removepak("$pak"); } - - + + } elsif ("$ARGV[0]" eq "update") { &Pakfire::makeuuid(); &Pakfire::getmirrors("$force"); @@ -291,7 +291,7 @@ } } } - + # Download packages foreach $pak (@upgradepaks) { &Pakfire::getpak("$pak", ""); @@ -311,15 +311,15 @@ foreach $pak (@upgradepaks) { &Pakfire::upgradepak("$pak"); } - + } elsif ("$ARGV[0]" eq "list") { if ("$ARGV[1]" =~ /installed|notinstalled/) { &Pakfire::dblist("$ARGV[1]", "noweb"); } else { - &Pakfire::message("PAKFIRE WARN: Not a known option $ARGV[1]") if ($ARGV[1]); + &Pakfire::message("PAKFIRE WARN: Not a known option $ARGV[1]") if ($ARGV[1]); &Pakfire::dblist("all", "noweb"); } - + } elsif ("$ARGV[0]" eq "resolvedeps") { foreach (@ARGV) { next if ("$_" eq "resolvedeps"); diff --git a/src/scripts/archive.files b/src/scripts/archive.files index 009567009..0645791d5 100755 --- a/src/scripts/archive.files +++ b/src/scripts/archive.files @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2022 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 # diff --git a/src/scripts/backupiso b/src/scripts/backupiso index cfe478daf..fe5376741 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -1,4 +1,23 @@ #!/bin/sh +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### # FIXME: edit this lines before release IPFVER=2.27 diff --git a/src/scripts/captive-cleanup b/src/scripts/captive-cleanup index b576df4fe..afa3efd25 100755 --- a/src/scripts/captive-cleanup +++ b/src/scripts/captive-cleanup @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <alexander.marx(a)ipfire.org> # +# Copyright (C) 2007-2022 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 # diff --git a/src/scripts/connscheduler b/src/scripts/connscheduler index bc4d4eb65..a6de9cf72 100644 --- a/src/scripts/connscheduler +++ b/src/scripts/connscheduler @@ -1,11 +1,23 @@ #!/usr/bin/perl -# -# IPFire Connection Scheduler (F)Cron Job -# -# This code is distributed under the terms of the GPL -# The original code is taken from weizen_42. -# See /home/httpd/cgi-bin/connscheduler.cgi -# +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### use strict; @@ -79,11 +91,11 @@ sub hangup return; } - # now wait for active triggerfile and ppp daemon to disappear + # now wait for active triggerfile and ppp daemon to disappear # wait maximum 60 seconds my $counter = 60; sleep 1; - while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 ) + while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 ) { sleep 1; $counter--; @@ -123,7 +135,7 @@ sub reconnect # wait maximum 60 seconds my $counter = 60; sleep 1; - while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 ) + while ( -e "${General::swroot}/red/active" || -e '/var/run/ppp-ipfire.pid' || $counter == 0 ) { sleep 1; $counter--; @@ -168,7 +180,7 @@ sub profile ## FIXME: do we need to do this ? sleep($sleep_after_profile); &dial(); - } + } } @@ -200,7 +212,7 @@ sub timer } - if ( $CONNSCHED::config[$i]{'ACTION'} eq 'reconnect' ) + if ( $CONNSCHED::config[$i]{'ACTION'} eq 'reconnect' ) { &reconnect() } diff --git a/src/scripts/consort.sh b/src/scripts/consort.sh index ba6631f74..fa905e539 100644 --- a/src/scripts/consort.sh +++ b/src/scripts/consort.sh @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 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 # @@ -20,7 +20,7 @@ ############################################################################### # sort conntrack table entries based on ip addresses -# @parm sort field +# @parm sort field do_ip_sort() { sed \ -r \ @@ -34,7 +34,7 @@ do_ip_sort() { } # sort conntrack table entries based on port addresses -# @parm sort field +# @parm sort field do_port_sort() { sed \ -r \ @@ -140,7 +140,7 @@ if [ $# == 3 ]; then fi if [[ '1 2' =~ $1 ]]; then - do_ip_sort $1 + do_ip_sort $1 elif [[ '3 4' =~ $1 ]]; then do_port_sort $(($1-2)) elif [[ '5' =~ $1 ]]; then diff --git a/src/scripts/convert-dns-settings b/src/scripts/convert-dns-settings index 945a15ef0..66c8f78ec 100755 --- a/src/scripts/convert-dns-settings +++ b/src/scripts/convert-dns-settings @@ -1,8 +1,8 @@ #!/bin/bash ############################################################################### # # -# IPFire.org - A Linux-based firewall # -# Copyright (C) 2020 IPFire Team <info(a)ipfire.org> # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 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 # @@ -68,7 +68,7 @@ main() { # Remove all old settings from files local file - for file in "${FILES[@]}"; do + for file in "${FILES[@]}"; do # Remove DNS, DNS0, DNS1 and DNS2 sed -Ei "/^DNS[012]?=/d" "${file}" done @@ -95,7 +95,7 @@ main() { if [ "${FORCE_TCP}" = "on" ]; then echo "PROTO=TCP" >> /var/ipfire/dns/settings fi - + # Run in recursor mode if [ "${USE_FORWARDERS}" = "0" ]; then # Remove all servers diff --git a/src/scripts/convert-ovpn b/src/scripts/convert-ovpn index 58921a587..30e754326 100755 --- a/src/scripts/convert-ovpn +++ b/src/scripts/convert-ovpn @@ -3,7 +3,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> # +# Copyright (C) 2007-2022 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 # diff --git a/src/scripts/convert-to-location b/src/scripts/convert-to-location index 428a91d34..dba9f55e4 100755 --- a/src/scripts/convert-to-location +++ b/src/scripts/convert-to-location @@ -1,9 +1,8 @@ #!/bin/bash - ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2020 IPFire Development Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 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 # diff --git a/src/scripts/filesystem-cleanup b/src/scripts/filesystem-cleanup index e0eb0d361..a1b5e8891 100644 --- a/src/scripts/filesystem-cleanup +++ b/src/scripts/filesystem-cleanup @@ -1,25 +1,23 @@ #!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2020 IPFire Team <info(a)ipfire.org>. # -# # -############################################################################ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### PATHS=( /usr/lib diff --git a/src/scripts/hddshutdown b/src/scripts/hddshutdown index ce345e374..e7ab55cae 100644 --- a/src/scripts/hddshutdown +++ b/src/scripts/hddshutdown @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 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 # @@ -45,7 +45,7 @@ foreach (@devices){ if (-e "/var/run/hddshutdown-$array[$#array]" && $status !~/standby/) { if ($debug){print "Remove wrong standby marking\n";} - if ( -e "/var/run/hddshutdown-$array[$#array]" ) { system("unlink /var/run/hddshutdown-$array[$#array]"); } + if ( -e "/var/run/hddshutdown-$array[$#array]" ) { system("unlink /var/run/hddshutdown-$array[$#array]"); } } if ($debug){print "Device ".$_." has ".$newdiskstats." write and read Requests, was ".$diskstats." at last run.\n";} @@ -54,8 +54,8 @@ foreach (@devices){ if ($debug){print "Setting Device ".$_." to standby ... ";} $status = `hdparm -y /dev/$_ 2>&1`; chomp $status; - if ($status !~/Invalid/) - { + if ($status !~/Invalid/) + { if ($debug){print "OK\n";} system("touch /var/run/hddshutdown-$array[$#array]"); } diff --git a/src/scripts/ipsec-interfaces b/src/scripts/ipsec-interfaces index f0983dbdc..23512b9bd 100644 --- a/src/scripts/ipsec-interfaces +++ b/src/scripts/ipsec-interfaces @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 IPFire Team # +# Copyright (C) 2007-2022 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 # diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs index cbfc83c77..f69d41c18 100644 --- a/src/scripts/makegraphs +++ b/src/scripts/makegraphs @@ -1,9 +1,8 @@ #!/usr/bin/perl - ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2008-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 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 # diff --git a/src/scripts/openvpn-metrics b/src/scripts/openvpn-metrics index ac0cab909..0f77d2238 100755 --- a/src/scripts/openvpn-metrics +++ b/src/scripts/openvpn-metrics @@ -1,25 +1,23 @@ #!/usr/bin/python3 -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org>. # -# # -############################################################################ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### import argparse import logging diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert index f49670656..05339af78 100644 --- a/src/scripts/ovpn-ccd-convert +++ b/src/scripts/ovpn-ccd-convert @@ -1,5 +1,24 @@ #!/usr/bin/perl -# Converter script for old openvpn clients +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + my %net=(); my %ovpnconfig=(); my @serverconf=(); diff --git a/src/scripts/ovpn-collectd-convert b/src/scripts/ovpn-collectd-convert index 59d67b9b0..559985777 100644 --- a/src/scripts/ovpn-collectd-convert +++ b/src/scripts/ovpn-collectd-convert @@ -1,6 +1,23 @@ #!/usr/bin/perl -# Converter script for adding existing OpenVPN N2N connections to collectd -# Used for core update 89 +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### my %ovpnconfig=(); diff --git a/src/scripts/qosd b/src/scripts/qosd index 21498824f..64a341322 100644 --- a/src/scripts/qosd +++ b/src/scripts/qosd @@ -1,48 +1,25 @@ #!/usr/bin/perl -w -use strict; +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### -########################################## -## -## DESCRIPTION -## -## The tc-graph daemon script: "tc-collector" -## Which is part of the ADSL-optimizer. -## -## The script will become a daemon and periodically collect data -## from the Linux traffic control system. The collected data is -## stored in some RRD-data files, which is created automatically by -## the script if they don't exist. -## -## GRAPHs -## -## How the RRD-data is displayed as graphs is not part of the -## tc-collector tool. But we recommend using the RRD-frontend 'ddraw'. -## We have included some 'ddraw' examples (which is hardcoded to use -## files from '/var/spool/rrdqueues'). -## -## drraw: http://web.taranis.org/drraw/ -## -## -## REQUIRES -## -## RRDtools Perl interface RRDs -## The "tc" command. -## -## -## AUTHOR -## Jesper Dangaard Brouer <hawk(a)diku.dk>, d.16/4-2004 -## -## CHANGELOG -## 2004-04-16: Initial version. -## 2004-05-27: Daemon version. -## -## $Id: tc-collector.pl,v 1.12 2005/03/19 19:31:08 hawk Exp $ -########################################## - -# TODO: -# * Calc time used to parse, use to make time steps more precise -# * Device list support -# * Detecting the correct devices +use strict; # Configuration options: # diff --git a/src/scripts/rebuild-initrd b/src/scripts/rebuild-initrd index 3dd08dc21..51265650a 100644 --- a/src/scripts/rebuild-initrd +++ b/src/scripts/rebuild-initrd @@ -1,27 +1,24 @@ #!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 3 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2018 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -# +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + KVER=`uname -r` dracut --force --early-microcode --xz /boot/initramfs-$KVER.img $KVER diff --git a/src/scripts/scanhd b/src/scripts/scanhd index b208bbb1d..3623829a5 100644 --- a/src/scripts/scanhd +++ b/src/scripts/scanhd @@ -1,4 +1,24 @@ #!/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + case "$1" in ide) rm -f /var/ipfire/extrahd/scan diff --git a/src/scripts/settime b/src/scripts/settime index 0bfcf3edf..2d181659b 100644 --- a/src/scripts/settime +++ b/src/scripts/settime @@ -1,15 +1,23 @@ #!/bin/sh -# -# IPCop CGIs -# -# This file is part of the IPCop Project -# -# This code is distributed under the terms of the GPL -# -# (c) Eric Oberlander June 2002 -# (c) Eric Oberlander December 2002 - internationalisation added -# -# /usr/local/bin/settime +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### ongreen=1 green=$(cat /var/ipfire/ethernet/settings | grep GREEN_NETADDRESS) @@ -62,7 +70,7 @@ if [ -n "$1" ]; then * ) logger -t ipfire "ntpdate error" ;; esac fi - fi + fi else echo Missing parameter fi diff --git a/src/scripts/timecheck b/src/scripts/timecheck index 9f581985a..16123cf0a 100644 --- a/src/scripts/timecheck +++ b/src/scripts/timecheck @@ -1,14 +1,23 @@ #!/bin/sh -# -# IPCop CGIs -# -# This file is part of the IPCop Project -# -# This code is distributed under the terms of the GPL -# -# (c) Eric Oberlander June 2002 -# -# /usr/local/bin/timecheck +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### if [ -e /var/ipfire/time/enable ]; then if [ $(cat /var/ipfire/time/settings | grep period) ] && [ -e /var/lock/time/counter ]; then @@ -32,4 +41,4 @@ if [ -e /var/ipfire/time/enable ]; then /usr/local/bin/settime $(cat /var/ipfire/time/settime.conf) fi fi -fi +fi diff --git a/src/scripts/timezone-transition b/src/scripts/timezone-transition index a8e436f1b..0be5e9bba 100644 --- a/src/scripts/timezone-transition +++ b/src/scripts/timezone-transition @@ -1,26 +1,24 @@ #!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2014 IPFire Team <info(a)ipfire.org> # -# # -############################################################################ - +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### +# # This script checks if a daylight saving time transition # has just happened and will run the given command. diff --git a/src/scripts/update-ids-ruleset b/src/scripts/update-ids-ruleset index 10a270907..b3974528d 100644 --- a/src/scripts/update-ids-ruleset +++ b/src/scripts/update-ids-ruleset @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2018-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 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 # diff --git a/src/scripts/update-lang-cache b/src/scripts/update-lang-cache index 971664ee2..d490f1d8d 100644 --- a/src/scripts/update-lang-cache +++ b/src/scripts/update-lang-cache @@ -1,3 +1,23 @@ #!/bin/sh +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + perl -e "require '//var/ipfire/lang.pl'; &Lang::BuildCacheLang" diff --git a/src/scripts/update-location-database b/src/scripts/update-location-database index d41a0a947..24970dc08 100644 --- a/src/scripts/update-location-database +++ b/src/scripts/update-location-database @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2019 IPFire Development Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 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 # diff --git a/tools/check_manualpages.pl b/tools/check_manualpages.pl index 8eefc63e2..75a560560 100644 --- a/tools/check_manualpages.pl +++ b/tools/check_manualpages.pl @@ -56,9 +56,9 @@ if ($baseurl =~ /\/\s*$/) { # Loop trough configured manual pages foreach my $page (keys %manualpages) { # Build absolute path and URL - my $cgifile = "${basedir}/html/cgi-bin/${page}.cgi"; + my $cgifile = "${basedir}/html/cgi-bin/${page}.cgi"; my $url = "${baseurl}/$manualpages{$page}"; - + print "${page}.cgi -> '$url'\n"; # Check CGI file exists @@ -76,7 +76,7 @@ foreach my $page (keys %manualpages) { if($status != 200) { die("ERROR: Received unexpected HTTP '$status'!\n"); } - + print "SUCCESS: Received HTTP '$status'.\n"; } diff --git a/tools/sort_strings.pl b/tools/sort_strings.pl index 494f1f626..ed3c45b0d 100755 --- a/tools/sort_strings.pl +++ b/tools/sort_strings.pl @@ -33,7 +33,7 @@ require "${basedir}/langs/$lang/cgi-bin/$lang.pl"; open(FILE,">${basedir}/langs/$lang/cgi-bin/$lang.pl"); print FILE <<EOF; -\%tr = ( +\%tr = ( \%tr, EOF hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b5aec71462d90bec69621d76b960d0c11aab2a01
by Peter Müller 18 Feb '22

18 Feb '22

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 b5aec71462d90bec69621d76b960d0c11aab2a01 (commit) via 8269c8319ccb9e78c8c48a4218396621d5a156e3 (commit) via 5ca74566b3404539b46c904aaec0ac7e4033657f (commit) via 53378856a87eabf3e5dff2a8bbc7331ebed694a2 (commit) via d0167455738dd1f50a84a667db1cc6f8730ec95a (commit) via 10148970eb431e8a1a99aaca67c531dc3b6f1492 (commit) via 1217807d09933ed3760132498360d13d17b98155 (commit) via 4b94860d07b5124e90711c802e87cce8547c3043 (commit) from bff444621e224663b5906671602fef17ac1756d8 (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 b5aec71462d90bec69621d76b960d0c11aab2a01 Merge: d01674557 8269c8319 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Feb 18 22:47:07 2022 +0000 Merge branch 'temp-c165-development' into next commit 8269c8319ccb9e78c8c48a4218396621d5a156e3 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Feb 18 22:40:55 2022 +0000 firewall: Make logging of conntrack INVALIDs configureable In theory, logging of dropped packets classified by conntrack as being INVALID should never be disabled, since one wants to have a paper trail of what his/her firewall is doing. However, conntrack seems to drop a lot of (at the first glance legitimate) packets, hence bloating the logs, making spotting the important firewall hits more difficult. This patch therefore adds the option to disable logging of packets being dropped by conntrack due to INVALID state. Please note: - This patch does not add this category to the firewall hits graph. - The variables in this patch ("LOGDROPCTINVALID") should make it clear that it is about toggling _logging_, not the actual _dropping_. Other variables are still in need of being renamed to clarify this, which will be done in a dedicated patch. - Also, the changes made to update.sh need to take place in config/rootfiles/core/164/update.sh for "master", since this patch has been developed against "next". Kindly cherry-pick the necessary changes. Partially fixes: #12778 Reported-by: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 5ca74566b3404539b46c904aaec0ac7e4033657f Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu Feb 17 20:16:02 2022 +0000 firewall: Add proper logging prefix for conntrack INVALID hits Fixes: #12778 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 53378856a87eabf3e5dff2a8bbc7331ebed694a2 Merge: bff444621 10148970e Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Feb 18 22:28:55 2022 +0000 Merge branch 'master' into temp-c165-development commit d0167455738dd1f50a84a667db1cc6f8730ec95a Merge: bff444621 10148970e Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Feb 18 22:28:35 2022 +0000 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/oldcore/164/update.sh | 13 ++++++++++--- html/cgi-bin/optionsfw.cgi | 12 +++++++++++- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + lfs/configroot | 1 + src/initscripts/system/firewall | 8 +++++++- 6 files changed, 31 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/rootfiles/oldcore/164/update.sh b/config/rootfiles/oldcore/164/update.sh index a0650dbda..05f2a03e4 100644 --- a/config/rootfiles/oldcore/164/update.sh +++ b/config/rootfiles/oldcore/164/update.sh @@ -100,9 +100,16 @@ ldconfig # Run convert script for IDS multiple providers /usr/sbin/convert-ids-multiple-providers -# Add missing configuration settings to optionsfw configuration -echo "DROPHOSTILE=off" > /var/ipfire/optionsfw/settings -echo "DROPSPOOFEDMARTIAN=on" > /var/ipfire/optionsfw/settings +# Add configuration settings to optionsfw if they are missing +if [ "$(grep "^DROPHOSTILE" /var/ipfire/optionsfw/settings)" == "" ]; then + echo "DROPHOSTILE=off" >> /var/ipfire/optionsfw/settings +fi +if [ "$(grep "^DROPSPOOFEDMARTIAN" /var/ipfire/optionsfw/settings)" == "" ]; then + echo "DROPSPOOFEDMARTIAN=on" >> /var/ipfire/optionsfw/settings +fi +if [ "$(grep "^LOGDROPCTINVALID" /var/ipfire/optionsfw/settings)" == "" ]; then + echo "LOGDROPCTINVALID=on" >> /var/ipfire/optionsfw/settings +fi # Apply sysctl changes /etc/init.d/sysctl start diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi index 481d5bdbd..5611b71b7 100644 --- a/html/cgi-bin/optionsfw.cgi +++ b/html/cgi-bin/optionsfw.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 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 # @@ -116,6 +116,9 @@ $checked{'DROPSPOOFEDMARTIAN'}{$settings{'DROPSPOOFEDMARTIAN'}} = "checked='chec $checked{'DROPHOSTILE'}{'off'} = ''; $checked{'DROPHOSTILE'}{'on'} = ''; $checked{'DROPHOSTILE'}{$settings{'DROPHOSTILE'}} = "checked='checked'"; +$checked{'LOGDROPCTINVALID'}{'off'} = ''; +$checked{'LOGDROPCTINVALID'}{'on'} = ''; +$checked{'LOGDROPCTINVALID'}{$settings{'LOGDROPCTINVALID'}} = "checked='checked'"; $checked{'DROPPROXY'}{'off'} = ''; $checked{'DROPPROXY'}{'on'} = ''; $checked{'DROPPROXY'}{$settings{'DROPPROXY'}} = "checked='checked'"; @@ -211,6 +214,13 @@ END <input type='radio' name='DROPNEWNOTSYN' value='off' $checked{'DROPNEWNOTSYN'}{'off'} /> $Lang::tr{'off'} </td> </tr> + <tr> + <td align='left' width='60%'>$Lang::tr{'log dropped conntrack invalids'}</td> + <td align='left'> + $Lang::tr{'on'} <input type='radio' name='LOGDROPCTINVALID' value='on' $checked{'LOGDROPCTINVALID'}{'on'} />/ + <input type='radio' name='LOGDROPCTINVALID' value='off' $checked{'LOGDROPCTINVALID'}{'off'} /> $Lang::tr{'off'} + </td> + </tr> <tr> <td align='left' width='60%'>$Lang::tr{'drop input'}</td> <td align='left'> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 7a4b30ad5..a9b4dadd8 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1603,6 +1603,7 @@ 'locationblock enable feature' => 'Location-basierte Filterung aktivieren:', 'locationblock flag' => 'Flagge', 'log' => 'Protokoll', +'log dropped conntrack invalids' => 'Verworfene, von der Verbindungsverfolgung als INVALID eingestufte Pakete protokollieren', 'log enabled' => 'Protokoll aktiviert', 'log level' => 'Protokollierungsniveau', 'log lines per page' => 'Zeilen pro Seite', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 644eb0574..ed0d756f5 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1651,6 +1651,7 @@ 'locationblock enable feature' => 'Enable Location based blocking:', 'locationblock flag' => 'Flag', 'log' => 'Log', +'log dropped conntrack invalids' => 'Log dropped packets classified as INVALID by connection tracking', 'log enabled' => 'Log Enabled', 'log level' => 'Log Level', 'log lines per page' => 'Lines per page', diff --git a/lfs/configroot b/lfs/configroot index b836767c1..111ab6787 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -131,6 +131,7 @@ $(TARGET) : echo "DROPWIRELESSFORWARD=on" >> $(CONFIG_ROOT)/optionsfw/settings echo "DROPSPOOFEDMARTIAN=on" >> $(CONFIG_ROOT)/optionsfw/settings echo "DROPHOSTILE=on" >> $(CONFIG_ROOT)/optionsfw/settings + echo "LOGDROPCTINVALID=on" >> $(CONFIG_ROOT)/optionsfw/settings echo "POLICY=MODE2" >> $(CONFIG_ROOT)/firewall/settings echo "POLICY1=MODE2" >> $(CONFIG_ROOT)/firewall/settings echo "USE_ISP_NAMESERVERS=on" >> $(CONFIG_ROOT)/dns/settings diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall index 2ae6157aa..14f93d9c7 100644 --- a/src/initscripts/system/firewall +++ b/src/initscripts/system/firewall @@ -121,9 +121,15 @@ iptables_init() { iptables -A FORWARD -p tcp -j BADTCP # Connection tracking chains + iptables -N CTINVALID + if [ "$LOGDROPCTINVALID" == "on" ]; then + iptables -A CTINVALID -m limit --limit 10/second -j LOG --log-prefix "DROP_CTINVALID " + fi + iptables -A CTINVALID -j DROP -m comment --comment "DROP_CTINVALID" + iptables -N CONNTRACK iptables -A CONNTRACK -m conntrack --ctstate ESTABLISHED -j ACCEPT - iptables -A CONNTRACK -m conntrack --ctstate INVALID -j LOG_DROP + iptables -A CONNTRACK -m conntrack --ctstate INVALID -j CTINVALID iptables -A CONNTRACK -p icmp -m conntrack --ctstate RELATED -j ACCEPT # Restore any connection marks hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bff444621e224663b5906671602fef17ac1756d8
by Peter Müller 18 Feb '22

18 Feb '22

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 bff444621e224663b5906671602fef17ac1756d8 (commit) via 796a6e526cb3eca6a047a48ad1bdcf273f74b38a (commit) via adb4174fa459d8102c674e8b6b7c9aeac17c8da2 (commit) via ab50bf41fec93cf480e66140d2161580f4d72926 (commit) from 772d3dbd6091b75fa10317c88c25c53ce466f825 (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 bff444621e224663b5906671602fef17ac1756d8 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Fri Feb 18 15:32:39 2022 +0100 acct.en.pl: Update to use proxy accounting - Bug#12772 -Replace the variable names used for the accounting page with proxy accounting in a consistent manner - Tested on a vm system and confirmed to have a consistent naming approach now Fixes: Bug#12772 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 796a6e526cb3eca6a047a48ad1bdcf273f74b38a Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Fri Feb 18 15:32:38 2022 +0100 acct.pl: Change name of package in Error message - Bug#12772 - Change package name from squid accounting to proxy accounting in mail Subject line Fixes: Bug#12772 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit adb4174fa459d8102c674e8b6b7c9aeac17c8da2 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Fri Feb 18 15:32:37 2022 +0100 squid-accounting: Rename to proxy-accounting - bug#12772 - Rename lfs, rootfile and paks directory - Change name in make.sh - Tested out in a vm system and worked Fixes: Bug#12772 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit ab50bf41fec93cf480e66140d2161580f4d72926 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Fri Feb 18 15:33:52 2022 +0100 accounting.cgi: Change some variables to alphanumeric - Bug#12777 - The Postcode in the address only allowed numeric postcodes. The Netherlands and Great Britain are at lease two countries that use alphanumeric postcodes with spaces. Changed the postcode check from numeric to alphanumeric. - The Bank Code in the Providers details only allowed numeric Bank Codes. In Great Britain the Bank Code, also known as the Sort Code is made up of three groups of digits separated by a - . - Adjusted the regex for the alphanumeric check to include a space and a - . The original comment indicated that a - was allowed but it was not included in the regex. - Tested on a vm system and confirmed that a postcode from The Netherlands and Great Britain and a Sort Code from Breat Britain are now accepted. Fixes: Bug#12777 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../rootfiles/packages/{squid-accounting => proxy-accounting} | 2 +- lfs/{squid-accounting => proxy-accounting} | 8 ++++---- make.sh | 2 +- src/paks/{squid-accounting => proxy-accounting}/install.sh | 0 src/paks/{squid-accounting => proxy-accounting}/uninstall.sh | 0 src/paks/{squid-accounting => proxy-accounting}/update.sh | 0 src/squid-accounting/accounting.cgi | 10 +++++----- src/squid-accounting/acct.en.pl | 4 ++-- src/squid-accounting/acct.pl | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) rename config/rootfiles/packages/{squid-accounting => proxy-accounting} (90%) rename lfs/{squid-accounting => proxy-accounting} (94%) rename src/paks/{squid-accounting => proxy-accounting}/install.sh (100%) rename src/paks/{squid-accounting => proxy-accounting}/uninstall.sh (100%) rename src/paks/{squid-accounting => proxy-accounting}/update.sh (100%) Difference in files: diff --git a/config/rootfiles/packages/squid-accounting b/config/rootfiles/packages/proxy-accounting similarity index 90% rename from config/rootfiles/packages/squid-accounting rename to config/rootfiles/packages/proxy-accounting index 82b171e33..0c142ea5c 100644 --- a/config/rootfiles/packages/squid-accounting +++ b/config/rootfiles/packages/proxy-accounting @@ -11,6 +11,6 @@ var/ipfire/addon-lang/acct.de.pl var/ipfire/addon-lang/acct.en.pl var/ipfire/addon-lang/acct.fr.pl var/ipfire/addon-lang/acct.tr.pl -var/ipfire/backup/addons/includes/squid-accounting +var/ipfire/backup/addons/includes/proxy-accounting var/ipfire/menu.d/EX-squid-accounting.menu var/log/accounting.log diff --git a/lfs/squid-accounting b/lfs/proxy-accounting similarity index 94% rename from lfs/squid-accounting rename to lfs/proxy-accounting index 9476382b3..024f249be 100644 --- a/lfs/squid-accounting +++ b/lfs/proxy-accounting @@ -13,11 +13,11 @@ SUMMARY = SQUID Accounting IPFire extension VER = 1.0.4 -THISAPP = squid-accounting-$(VER) +THISAPP = proxy-accounting-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = squid-accounting -PAK_VER = 13 +PROG = proxy-accounting +PAK_VER = 14 DEPS = perl-File-ReadBackwards @@ -65,7 +65,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -v -m 644 $(DIR_APP)/squid-accounting/EX-squid-accounting.menu /var/ipfire/menu.d/ install -v -m 755 $(DIR_APP)/squid-accounting/dbinstall.pl /var/ipfire/accounting/ install -v -m 644 $(DIR_APP)/squid-accounting/config/backup/includes/squid-accounting \ - /var/ipfire/backup/addons/includes/squid-accounting + /var/ipfire/backup/addons/includes/proxy-accounting #activate hourly logging of proxy logfile ln -sf /usr/local/bin/acct.pl /etc/fcron.hourly/squid-accounting diff --git a/make.sh b/make.sh index a6f44030c..ea3e0f9a1 100755 --- a/make.sh +++ b/make.sh @@ -1655,7 +1655,7 @@ buildipfire() { lfsmake2 perl-Font-TTF lfsmake2 perl-IO-String lfsmake2 perl-PDF-API2 - lfsmake2 squid-accounting + lfsmake2 proxy-accounting lfsmake2 pigz lfsmake2 tmux lfsmake2 perl-Text-CSV_XS diff --git a/src/paks/squid-accounting/install.sh b/src/paks/proxy-accounting/install.sh similarity index 100% rename from src/paks/squid-accounting/install.sh rename to src/paks/proxy-accounting/install.sh diff --git a/src/paks/squid-accounting/uninstall.sh b/src/paks/proxy-accounting/uninstall.sh similarity index 100% rename from src/paks/squid-accounting/uninstall.sh rename to src/paks/proxy-accounting/uninstall.sh diff --git a/src/paks/squid-accounting/update.sh b/src/paks/proxy-accounting/update.sh similarity index 100% rename from src/paks/squid-accounting/update.sh rename to src/paks/proxy-accounting/update.sh diff --git a/src/squid-accounting/accounting.cgi b/src/squid-accounting/accounting.cgi index 751b6e8a5..e1e2346da 100755 --- a/src/squid-accounting/accounting.cgi +++ b/src/squid-accounting/accounting.cgi @@ -1488,7 +1488,7 @@ sub checkaddress{ if (! $cgiparams{'txt_plz'}){ $errormessage.="$Lang::tr{'acct empty field'} $Lang::tr{'acct plz'}<br>"; }else{ - if(! &validnumfield($cgiparams{'txt_plz'})){ + if(! &validalphanumfield($cgiparams{'txt_plz'})){ $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct plz'}<br>"; } } @@ -1523,7 +1523,7 @@ sub checkaddress{ } if(($cgiparams{'txt_iban'} && $cgiparams{'txt_blz'})||(!$cgiparams{'txt_iban'} && $cgiparams{'txt_blz'})){ #Check BLZ - if(! &validnumfield($cgiparams{'txt_blz'})){ + if(! &validalphanumfield($cgiparams{'txt_blz'})){ $errormessage.="$Lang::tr{'acct invalid'} $Lang::tr{'acct blz'}<br>"; } #Check BANKACCOUNT @@ -1653,7 +1653,7 @@ sub validphonefield{ } sub validalphanumfield{ - #GET: Input from a numeric field + #GET: Input from an alphanumeric field #GIVES: True if valid, false if not valid my $remark = $_[0]; @@ -1661,8 +1661,8 @@ sub validalphanumfield{ # but no more than 63 characters if (length ($remark) < 1 || length ($remark) > 255) { return 0;} - # Only valid characters are a-z, A-Z, 0-9 and - - if ($remark !~ /^[0-9a-zA-Z]*$/) { + # Only valid characters are a-z, A-Z, 0-9 - and space + if ($remark !~ /^[0-9a-zA-Z- ]*$/) { return 0;} # First character can only be a letter or a digit if (substr ($remark, 0, 1) !~ /^[0-9A-Za-z]*$/) { diff --git a/src/squid-accounting/acct.en.pl b/src/squid-accounting/acct.en.pl index 913f2a79f..21aeab69c 100644 --- a/src/squid-accounting/acct.en.pl +++ b/src/squid-accounting/acct.en.pl @@ -110,7 +110,7 @@ 'acct name' => 'Description', 'acct no data' => 'No Data available', 'acct rrdsize' => 'Size of Bill directory', -'acct settings' => 'Accounting settings', +'acct settings' => 'Proxy Accounting settings', 'acct skipurl' => 'Skip these URLs (Intranet)', 'acct status' => 'Status', 'acct str' => 'Street', @@ -122,7 +122,7 @@ 'acct tel' => 'Telephone', 'acct tls' => 'Use TLS', 'acct traffic monthly' => 'Monthly data volume', -'acct title' => 'Webproxy Accounting', +'acct title' => 'Proxy Accounting', 'acct usemail' => 'Send bills via Mail', 'acct usermulti' => 'is already in group', 'acct ustid' => 'USt-ID', diff --git a/src/squid-accounting/acct.pl b/src/squid-accounting/acct.pl index e90d06ed3..681c81764 100755 --- a/src/squid-accounting/acct.pl +++ b/src/squid-accounting/acct.pl @@ -289,7 +289,7 @@ sub sendbill { my $msg = MIME::Lite->new( From => $mail{'SENDER'}, To => $mail{'RECIPIENT'}, - Subject => "ERROR Squid Accounting", + Subject => "ERROR Proxy Accounting", Type => 'multipart/mixed' ); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 772d3dbd6091b75fa10317c88c25c53ce466f825
by Peter Müller 18 Feb '22

18 Feb '22

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 772d3dbd6091b75fa10317c88c25c53ce466f825 (commit) via f51f8b130350b738747115ec9fccc9b50d7ec5e4 (commit) via 6491a92335a15fa0e3a4df1fed24b40490eaf3cb (commit) from 1bd6e152c40018054c9cad81000fcb7580153d90 (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 772d3dbd6091b75fa10317c88c25c53ce466f825 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri Feb 18 21:57:28 2022 +0000 Core Update 165: Ship wpa_supplicant Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit f51f8b130350b738747115ec9fccc9b50d7ec5e4 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Feb 18 18:13:35 2022 +0100 wpa_supplicant: Update to 2.10 For details see: https://w1.fi/cgit/hostap/plain/wpa_supplicant/ChangeLog "2022-01-16 - v2.10 * SAE changes - improved protection against side channel attacks [https://w1.fi/security/2022-1/] - added support for the hash-to-element mechanism (sae_pwe=1 or sae_pwe=2); this is currently disabled by default, but will likely get enabled by default in the future - fixed PMKSA caching with OKC - added support for SAE-PK * EAP-pwd changes - improved protection against side channel attacks [https://w1.fi/security/2022-1/] * fixed P2P provision discovery processing of a specially constructed invalid frame [https://w1.fi/security/2021-1/] * fixed P2P group information processing of a specially constructed invalid frame [https://w1.fi/security/2020-2/] * fixed PMF disconnection protection bypass in AP mode [https://w1.fi/security/2019-7/] * added support for using OpenSSL 3.0 * increased the maximum number of EAP message exchanges (mainly to support cases with very large certificates) * fixed various issues in experimental support for EAP-TEAP peer * added support for DPP release 2 (Wi-Fi Device Provisioning Protocol) * a number of MKA/MACsec fixes and extensions * added support for SAE (WPA3-Personal) AP mode configuration * added P2P support for EDMG (IEEE 802.11ay) channels * fixed EAP-FAST peer with TLS GCM/CCM ciphers * improved throughput estimation and BSS selection * dropped support for libnl 1.1 * added support for nl80211 control port for EAPOL frame TX/RX * fixed OWE key derivation with groups 20 and 21; this breaks backwards compatibility for these groups while the default group 19 remains backwards compatible * added support for Beacon protection * added support for Extended Key ID for pairwise keys * removed WEP support from the default build (CONFIG_WEP=y can be used to enable it, if really needed) * added a build option to remove TKIP support (CONFIG_NO_TKIP=y) * added support for Transition Disable mechanism to allow the AP to automatically disable transition mode to improve security * extended D-Bus interface * added support for PASN * added a file-based backend for external password storage to allow secret information to be moved away from the main configuration file without requiring external tools * added EAP-TLS peer support for TLS 1.3 (disabled by default for now) * added support for SCS, MSCS, DSCP policy * changed driver interface selection to default to automatic fallback to other compiled in options * a large number of other fixes, cleanup, and extensions" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> commit 6491a92335a15fa0e3a4df1fed24b40490eaf3cb Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Feb 18 18:13:34 2022 +0100 hostapd: Update to 2.10 For details see: https://w1.fi/cgit/hostap/plain/hostapd/ChangeLog "2022-01-16 - v2.10 * SAE changes - improved protection against side channel attacks [https://w1.fi/security/2022-1/] - added option send SAE Confirm immediately (sae_config_immediate=1) after SAE Commit - added support for the hash-to-element mechanism (sae_pwe=1 or sae_pwe=2) - fixed PMKSA caching with OKC - added support for SAE-PK * EAP-pwd changes - improved protection against side channel attacks [https://w1.fi/security/2022-1/] * fixed WPS UPnP SUBSCRIBE handling of invalid operations [https://w1.fi/security/2020-1/] * fixed PMF disconnection protection bypass [https://w1.fi/security/2019-7/] * added support for using OpenSSL 3.0 * fixed various issues in experimental support for EAP-TEAP server * added configuration (max_auth_rounds, max_auth_rounds_short) to increase the maximum number of EAP message exchanges (mainly to support cases with very large certificates) for the EAP server * added support for DPP release 2 (Wi-Fi Device Provisioning Protocol) * extended HE (IEEE 802.11ax) support, including 6 GHz support * removed obsolete IAPP functionality * fixed EAP-FAST server with TLS GCM/CCM ciphers * dropped support for libnl 1.1 * added support for nl80211 control port for EAPOL frame TX/RX * fixed OWE key derivation with groups 20 and 21; this breaks backwards compatibility for these groups while the default group 19 remains backwards compatible; owe_ptk_workaround=1 can be used to enabled a a workaround for the group 20/21 backwards compatibility * added support for Beacon protection * added support for Extended Key ID for pairwise keys * removed WEP support from the default build (CONFIG_WEP=y can be used to enable it, if really needed) * added a build option to remove TKIP support (CONFIG_NO_TKIP=y) * added support for Transition Disable mechanism to allow the AP to automatically disable transition mode to improve security * added support for PASN * added EAP-TLS server support for TLS 1.3 (disabled by default for now) * a large number of other fixes, cleanup, and extensions" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../103 => core/165}/filelists/wpa_supplicant | 0 lfs/hostapd | 24 +++++++++------------- lfs/wpa_supplicant | 15 +++++++------- .../hostapd-2.9-increase_EAPOL-timeouts.patch | 4 ++-- src/patches/hostapd/hostapd-2.9-noscan.patch | 6 +++--- 5 files changed, 23 insertions(+), 26 deletions(-) copy config/rootfiles/{oldcore/103 => core/165}/filelists/wpa_supplicant (100%) Difference in files: diff --git a/config/rootfiles/core/165/filelists/wpa_supplicant b/config/rootfiles/core/165/filelists/wpa_supplicant new file mode 120000 index 000000000..1d04c03c0 --- /dev/null +++ b/config/rootfiles/core/165/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/lfs/hostapd b/lfs/hostapd index cb2626bf3..f07d378be 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 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,22 +24,18 @@ include Config -SUMMARY = Daemon for running a WPA capable Access Point +VER = 2_10 -VER = 581dfcc - -THISAPP = hostapd-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = hostap_$(VER) +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/hostap-$(VER) +DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 58 +PAK_VER = 59 DEPS = -SERVICES = hostapd - ############################################################################### # Top-level Rules ############################################################################### @@ -48,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = eed922f2daabe16d74adf2b23455d8bd +$(DL_FILE)_MD5 = 973639d02c9f6712b3b3da6d6c70ab37 install : $(TARGET) @@ -80,18 +76,18 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd/hostapd-2.9-increase_EAPOL-timeouts.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd/hostapd-2.9-noscan.patch cd $(DIR_APP)/hostapd && cp $(DIR_SRC)/config/hostapd/config ./.config cd $(DIR_APP)/hostapd && sed -e "s@/usr/local@/usr@g" -i Makefile - cd $(DIR_APP)/hostapd && make $(MAKETUNING) + cd $(DIR_APP)/hostapd && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP)/hostapd && make install install -v -m 644 $(DIR_SRC)/config/backup/includes/hostapd /var/ipfire/backup/addons/includes/hostapd # install initscript - $(call INSTALL_INITSCRIPTS,$(SERVICES)) + $(call INSTALL_INITSCRIPT,hostapd) mkdir -p /var/ipfire/wlanap touch /var/ipfire/wlanap/settings cp -vrf $(DIR_SRC)/config/hostapd/hostapd.conf /var/ipfire/wlanap/hostapd.conf diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant index c64b6aab4..ad9150611 100644 --- a/lfs/wpa_supplicant +++ b/lfs/wpa_supplicant @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 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,13 +24,14 @@ include Config -VER = 581dfcc +VER = 2.10 THISAPP = wpa_supplicant-$(VER) -DL_FILE = hostapd-$(VER).tar.gz +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/hostap-$(VER) +DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +PROG = wpa_supplicant ############################################################################### # Top-level Rules @@ -40,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = eed922f2daabe16d74adf2b23455d8bd +$(DL_FILE)_MD5 = d26797fcb002898d4ee989179346e1cc install : $(TARGET) @@ -73,10 +74,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP)/wpa_supplicant && cp $(DIR_SRC)/config/wpa_supplicant/config ./.config cd $(DIR_APP)/wpa_supplicant && sed -e "s/wpa_cli\ dynamic_eap_methods/wpa_cli\ #dynamic_eap_methods/" -i Makefile cd $(DIR_APP)/wpa_supplicant && sed -e "s@/usr/local@/usr@g" -i Makefile - cd $(DIR_APP)/wpa_supplicant && make $(MAKETUNING) - cd $(DIR_APP)/wpa_supplicant && make install + cd $(DIR_APP)/wpa_supplicant && make && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/hostapd/hostapd-2.9-increase_EAPOL-timeouts.patch b/src/patches/hostapd/hostapd-2.9-increase_EAPOL-timeouts.patch index 87aec005b..67d9d4f22 100644 --- a/src/patches/hostapd/hostapd-2.9-increase_EAPOL-timeouts.patch +++ b/src/patches/hostapd/hostapd-2.9-increase_EAPOL-timeouts.patch @@ -1,8 +1,8 @@ diff U3 src/ap/wpa_auth.c src/ap/wpa_auth.c --- a/src/ap/wpa_auth.c Wed Aug 7 15:25:25 2019 +++ b/src/ap/wpa_auth.c Fri Sep 20 17:35:23 2019 -@@ -65,9 +65,9 @@ - struct wpa_group *group); +@@ -68,9 +68,9 @@ + static int ieee80211w_kde_len(struct wpa_state_machine *sm); static u8 * ieee80211w_kde_add(struct wpa_state_machine *sm, u8 *pos); -static const u32 eapol_key_timeout_first = 100; /* ms */ diff --git a/src/patches/hostapd/hostapd-2.9-noscan.patch b/src/patches/hostapd/hostapd-2.9-noscan.patch index 638b76f84..01a33d0d0 100644 --- a/src/patches/hostapd/hostapd-2.9-noscan.patch +++ b/src/patches/hostapd/hostapd-2.9-noscan.patch @@ -1,6 +1,6 @@ --- a/hostapd/config_file.c +++ b/hostapd/config_file.c -@@ -3493,6 +3493,10 @@ static int hostapd_config_fill(struct ho +@@ -3474,6 +3474,10 @@ static int hostapd_config_fill(struct ho if (bss->ocv && !bss->ieee80211w) bss->ieee80211w = 1; #endif /* CONFIG_OCV */ @@ -13,7 +13,7 @@ } else if (os_strcmp(buf, "ht_capab") == 0) { --- a/src/ap/ap_config.h +++ b/src/ap/ap_config.h -@@ -984,6 +984,8 @@ struct hostapd_config { +@@ -1014,6 +1014,8 @@ struct hostapd_config { int ht_op_mode_fixed; u16 ht_capab; @@ -24,7 +24,7 @@ int no_pri_sec_switch; --- a/src/ap/hw_features.c +++ b/src/ap/hw_features.c -@@ -500,7 +500,8 @@ static int ieee80211n_check_40mhz(struct +@@ -517,7 +517,8 @@ static int ieee80211n_check_40mhz(struct int ret; /* Check that HT40 is used and PRI / SEC switch is allowed */ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1bd6e152c40018054c9cad81000fcb7580153d90
by Peter Müller 18 Feb '22

18 Feb '22

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 1bd6e152c40018054c9cad81000fcb7580153d90 (commit) via 83085ae97c0576b1d038c1c5d52ec7707b543b99 (commit) from bae9b5dcca5aacabab861d4584288cb4ba7fd0c1 (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 1bd6e152c40018054c9cad81000fcb7580153d90 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Feb 18 06:07:42 2022 +0100 Core 165: Export location DB in new format. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 83085ae97c0576b1d038c1c5d52ec7707b543b99 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Feb 18 06:03:51 2022 +0100 firewall: Load ipset list before creating rules for DROP_HOSTILE. Otherwise there is no ipset list use-able and the feature will not work. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/165/update.sh | 6 ++++++ src/initscripts/system/firewall | 5 +++++ 2 files changed, 11 insertions(+) Difference in files: diff --git a/config/rootfiles/core/165/update.sh b/config/rootfiles/core/165/update.sh index 7371d047a..564f58606 100644 --- a/config/rootfiles/core/165/update.sh +++ b/config/rootfiles/core/165/update.sh @@ -109,6 +109,12 @@ ldconfig # Filesytem cleanup /usr/local/bin/filesystem-cleanup +# Export location DB in new format. +/usr/bin/location export \ + --directory=/var/lib/location/ipset \ + --family=ipv4 \ + --format=ipset + # Start services telinit u /etc/rc.d/init.d/firewall restart diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall index adb2240bb..2ae6157aa 100644 --- a/src/initscripts/system/firewall +++ b/src/initscripts/system/firewall @@ -22,6 +22,8 @@ IPS_REPEAT_MASK="0x80000000" IPS_BYPASS_MARK="0x40000000" IPS_BYPASS_MASK="0x40000000" +IPSET_DB_DIR="/var/lib/location/ipset" + function iptables() { /sbin/iptables --wait "$@" } @@ -146,6 +148,9 @@ iptables_init() { # a technical threat to our users (i. e. listed at Spamhaus DROP et al.) iptables -N HOSTILE if [ "$DROPHOSTILE" == "on" ]; then + # Call ipset and load the list which contains the hostile networks. + ipset restore < $IPSET_DB_DIR/CC_XD.ipset4 + iptables -A HOSTILE -m limit --limit 10/second -j LOG --log-prefix "DROP_HOSTILE " iptables -A INPUT -i $IFACE -m set --match-set CC_XD src -j HOSTILE iptables -A FORWARD -i $IFACE -m set --match-set CC_XD src -j HOSTILE hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bae9b5dcca5aacabab861d4584288cb4ba7fd0c1
by Peter Müller 17 Feb '22

17 Feb '22

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 bae9b5dcca5aacabab861d4584288cb4ba7fd0c1 (commit) via b67cf71b2de584df24faf4765f2c0647b713003f (commit) via 26674f2d5cb72699c5594c19cb6eb44de0ed3b2c (commit) via b84666930e0d3a21fd982ae9203f97bc13b7760a (commit) via c8ddb9ef1fe7a0f1771be8bec01f43a981a25138 (commit) from cf5356763f57b9070d2f84200f614af91c3beee2 (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 bae9b5dcca5aacabab861d4584288cb4ba7fd0c1 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Feb 17 06:40:03 2022 +0100 rules.pl: Adjust check against loading the same lists multiple times. This check now has been moved to the ipset_restore() function, which will help to keep the code clean and maintain-able. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> commit b67cf71b2de584df24faf4765f2c0647b713003f Author: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Date: Thu Feb 17 13:40:43 2022 +0100 manualpages: Drop p2p-block entry The p2p-block CGI has been removed. Therefore the link to its manual page can be removed as well. Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> commit 26674f2d5cb72699c5594c19cb6eb44de0ed3b2c Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu Feb 17 19:23:15 2022 +0000 Core Update 165: Fixed symlink after renaming Perl packages Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit b84666930e0d3a21fd982ae9203f97bc13b7760a Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu Feb 17 19:22:49 2022 +0000 Core Update 165: Ship bind Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit c8ddb9ef1fe7a0f1771be8bec01f43a981a25138 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Feb 17 17:46:26 2022 +0100 bind: Update to 9.16.26 For details see: https://downloads.isc.org/isc/bind9/9.16.26/doc/arm/html/notes.html#notes-f… "Notes for BIND 9.16.26 Feature Changes The DLZ API has been updated: EDNS Client-Subnet (ECS) options sent by a client are now included in the client information sent to DLZ modules when processing queries. [GL #3082] Bug Fixes Previously, recvmmsg support was enabled in libuv 1.35.0 and 1.36.0, but not in libuv versions 1.37.0 or greater, reducing the maximum query-response performance. This has been fixed. [GL #3095] A failed view configuration during a named reconfiguration procedure could cause inconsistencies in BIND internal structures, causing a crash or other unexpected errors. This has been fixed. [GL #3060] Previously, named logged a “quota reached” message when it hit its hard quota on the number of connections. That message was accidentally removed but has now been restored. [GL #3125] Build errors were introduced in some DLZ modules due to an incomplete change in the previous release. This has been fixed. [GL #3111]" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cfgroot/manualpages | 1 - config/firewall/rules.pl | 43 +++++++++------------- config/rootfiles/common/bind | 14 +++---- .../{oldcore/100 => core/165}/filelists/bind | 0 config/rootfiles/core/165/filelists/libwww-perl | 1 - config/rootfiles/core/165/filelists/perl-libwww | 1 + lfs/bind | 4 +- 7 files changed, 27 insertions(+), 37 deletions(-) copy config/rootfiles/{oldcore/100 => core/165}/filelists/bind (100%) delete mode 120000 config/rootfiles/core/165/filelists/libwww-perl create mode 120000 config/rootfiles/core/165/filelists/perl-libwww Difference in files: diff --git a/config/cfgroot/manualpages b/config/cfgroot/manualpages index 4bfec8ab7..6c2e54b55 100644 --- a/config/cfgroot/manualpages +++ b/config/cfgroot/manualpages @@ -61,7 +61,6 @@ firewall=configuration/firewall fwhosts=configuration/firewall/fwgroups optionsfw=configuration/firewall/options ids=configuration/firewall/ips -p2p-block=configuration/firewall/p2p-block location-block=configuration/firewall/geoip-block wireless=configuration/firewall/accesstoblue iptables=configuration/firewall/iptables diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 25d01e0e3..927c1f2ba 100644 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -404,14 +404,8 @@ sub buildrules { # Grab location code from hash. my $loc_src = $$hash{$key}[4]; - # Check if the network list for this country already has been loaded. - unless($loaded_ipset_lists{$loc_src}) { - # Call function to load the networks list for this country. - &ipset_restore($loc_src); - - # Store to the hash that this list has been loaded. - $loaded_ipset_lists{$loc_src} = "1"; - } + # Call function to load the networks list for this country. + &ipset_restore($loc_src); push(@source_options, $source); } elsif($source) { @@ -424,14 +418,8 @@ sub buildrules { # Grab location code from hash. my $loc_dst = $$hash{$key}[6]; - # Check if the network list for this country already has been loaded. - unless($loaded_ipset_lists{$loc_dst}) { - # Call function to load the networks list for this country. - &ipset_restore($loc_dst); - - # Store to the hash that this list has been loaded. - $loaded_ipset_lists{$loc_dst} = "1"; - } + # Call function to load the networks list for this country. + &ipset_restore($loc_dst); push(@destination_options, $destination); } elsif ($destination) { @@ -677,14 +665,8 @@ sub locationblock { # is enabled. foreach my $location (@locations) { if(exists $locationsettings{$location} && $locationsettings{$location} eq "on") { - # Check if the network list for this country already has been loaded. - unless($loaded_ipset_lists{$location}) { - # Call function to load the networks list for this country. - &ipset_restore($location); - - # Store to the hash that this list has been loaded. - $loaded_ipset_lists{$location} = "1"; - } + # Call function to load the networks list for this country. + &ipset_restore($location); # Call iptables and create rule to use the loaded ipset list. run("$IPTABLES -A LOCATIONBLOCK -m set --match-set CC_$location src -j DROP"); @@ -906,14 +888,23 @@ sub firewall_is_in_subnet { } sub ipset_restore ($) { - my ($ccode) = @_; + my ($list) = @_; my $file_prefix = "ipset4"; - my $db_file = "$Location::Functions::ipset_db_directory/$ccode.$file_prefix"; + my $db_file = "$Location::Functions::ipset_db_directory/$list.$file_prefix"; + + # Check if the network list already has been loaded. + if($loaded_ipset_lists{$list}) { + # It already has been loaded - so there is nothing to do. + return; + } # Check if the generated file exists. if (-f $db_file) { # Run ipset and restore the list of the given country code. run("$IPSET restore < $db_file"); + + # Store the restored list name to the hash to prevent from loading it again. + $loaded_ipset_lists{$list} = "1"; } } diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index 4ea64dc0c..c0e56854a 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -274,24 +274,24 @@ usr/bin/nsupdate #usr/include/pk11/site.h #usr/include/pkcs11 #usr/include/pkcs11/pkcs11.h -usr/lib/libbind9-9.16.25.so +usr/lib/libbind9-9.16.26.so #usr/lib/libbind9.la #usr/lib/libbind9.so -usr/lib/libdns-9.16.25.so +usr/lib/libdns-9.16.26.so #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libirs-9.16.25.so +usr/lib/libirs-9.16.26.so #usr/lib/libirs.la #usr/lib/libirs.so -usr/lib/libisc-9.16.25.so +usr/lib/libisc-9.16.26.so #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisccc-9.16.25.so +usr/lib/libisccc-9.16.26.so #usr/lib/libisccc.la #usr/lib/libisccc.so -usr/lib/libisccfg-9.16.25.so +usr/lib/libisccfg-9.16.26.so #usr/lib/libisccfg.la #usr/lib/libisccfg.so -usr/lib/libns-9.16.25.so +usr/lib/libns-9.16.26.so #usr/lib/libns.la #usr/lib/libns.so diff --git a/config/rootfiles/core/165/filelists/bind b/config/rootfiles/core/165/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/core/165/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/165/filelists/libwww-perl b/config/rootfiles/core/165/filelists/libwww-perl deleted file mode 120000 index ad77c8c4a..000000000 --- a/config/rootfiles/core/165/filelists/libwww-perl +++ /dev/null @@ -1 +0,0 @@ -../../../common/libwww-perl \ No newline at end of file diff --git a/config/rootfiles/core/165/filelists/perl-libwww b/config/rootfiles/core/165/filelists/perl-libwww new file mode 120000 index 000000000..6b8bff6e1 --- /dev/null +++ b/config/rootfiles/core/165/filelists/perl-libwww @@ -0,0 +1 @@ +../../../common/perl-libwww \ No newline at end of file diff --git a/lfs/bind b/lfs/bind index fc6e7654e..72c85f5f5 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.16.25 +VER = 9.16.26 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 361a54fc5ebeb3a1af77abec08b33661 +$(DL_FILE)_MD5 = 799696f44e0d61659fa0efaa3c5fe5d8 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 10148970eb431e8a1a99aaca67c531dc3b6f1492
by Arne Fitzenreiter 17 Feb '22

17 Feb '22

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cf5356763f57b9070d2f84200f614af91c3beee2
by Peter Müller 16 Feb '22

16 Feb '22

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 cf5356763f57b9070d2f84200f614af91c3beee2 (commit) via db9ba592ca4b6d3fe2ae7e1c9a9057aacb25fe22 (commit) via f28ca0c17524f086af0e83d08cafb5053e4138d4 (commit) via 220ca16fbe855fd807209419bb2a213e9e8a3b46 (commit) via 9b68834a313374609a0421889262289816e345d5 (commit) via 2567ad4d2230f4f6484274f238b08d9be388debd (commit) via 73260d326fff34c0ed2aef7e2f42fcdaced38843 (commit) via b001452d308e316aaec9e647a7022b7c880ab412 (commit) via e01f7df1782970c1eaed21c77d616d01eedb220c (commit) via 35bd25d382e13a6028a2eeceb124c2c045e1cb6c (commit) via d7f179df012eead012a89abea0cd1e248bfe3fd3 (commit) via 2c2f393953d6819250fb97ac6846c279727a7cbb (commit) via 5987badae01c4ed97eefaa3026b92f8120d30952 (commit) via 313899b0158531e443aa7c842b49e6e7ea91cff2 (commit) via b4c74c9fd375401c5a62c2f94c0f943732db56a8 (commit) via 747440a5735e9295d13cb9440333f44fda923581 (commit) via 46b8d1914d1a833ea715832ae5a58f96ad1bf585 (commit) via 61320ea2ca9a2b1ca85effa8aaf3964df2c456d6 (commit) via 79e1d40e33ad215e89049134f09faf66e17b9bc6 (commit) via 5ebc703e02643414ae79bb541eb916e82acd5d30 (commit) via ea1744d4210234ade171d63db9f466c0a9d26a57 (commit) via b8c4670070407d2fbfd73aaf6b05c76fd25831a4 (commit) via cbd39ddae0675c05f5fbc093cb2adf7af4d04666 (commit) via ddf87f1ae5942b88e36823cb569def88f51d0a81 (commit) via d45bba3b6ae2106e04f28da8847e15e49a994aca (commit) via e2c711c6d62ca8af3ac5f6053d92060e7ffbe3aa (commit) via 741fa99f3b4c7afb20cb0837d390eb58abf8674f (commit) via 225cad2bf2dcd3d5d3e128f919706b97284d9203 (commit) via 30fbc67ea98fc83bd4902b49a2c2bbaed81ae2ff (commit) via a47fc3aa12c515cdba1424cb4ba6044e86db859e (commit) via 14cf575741754c023acafb94dc08736e8daca22c (commit) via 8b08a903264e3550db9073229547bd1748117ff1 (commit) via e1f8b41f009c26d74ae062c7920fd49d16696612 (commit) via 3ad4e756972c20ecba1060c939d0afa899e9946c (commit) via 2f8ae1c282dfc363cc8ea91b8caf520e412eea43 (commit) from d0353b73c7a4cb6ec569d36e7f07d44fd20b0680 (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 cf5356763f57b9070d2f84200f614af91c3beee2 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Wed Feb 16 17:35:12 2022 +0000 libloc: Update to 0.9.10 Please refer to https://lists.ipfire.org/pipermail/location/2022-February/000530.html for this version's changelog. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit db9ba592ca4b6d3fe2ae7e1c9a9057aacb25fe22 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Wed Feb 16 17:24:41 2022 +0000 make.sh: SIGKILL and SIGSTOP cannot be trapped There is no sense in instructing "trap" to catch signals it cannot trap whatsoever. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f28ca0c17524f086af0e83d08cafb5053e4138d4 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:39 2022 +0100 perl-XML-Parser: Renamed from XML-Parser Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 220ca16fbe855fd807209419bb2a213e9e8a3b46 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:38 2022 +0100 perl-URI: Renamed from URI Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 9b68834a313374609a0421889262289816e345d5 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:37 2022 +0100 perl-Unix-Syslog: Renamed from Unix-Syslog Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 2567ad4d2230f4f6484274f238b08d9be388debd Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:36 2022 +0100 perl-Text-Tabs+Wrap: Renamed from Text-Tabs+Wrap Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 73260d326fff34c0ed2aef7e2f42fcdaced38843 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:35 2022 +0100 perl-Net-Telnet: Renamed from Net-Telnet Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit b001452d308e316aaec9e647a7022b7c880ab412 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:34 2022 +0100 perl-Net_SSLeay: Renamed from Net_SSLeay Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit e01f7df1782970c1eaed21c77d616d01eedb220c Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:33 2022 +0100 perl-Net-Server: Renamed from Net-Server Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 35bd25d382e13a6028a2eeceb124c2c045e1cb6c Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:32 2022 +0100 perl-Net-IPv4Addr: Renamed from Net-IPv4Addr Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit d7f179df012eead012a89abea0cd1e248bfe3fd3 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:31 2022 +0100 perl-Net-DNS: Renamed from Net-DNS Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 2c2f393953d6819250fb97ac6846c279727a7cbb Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:30 2022 +0100 perl-MIME-Tools: Renamed from MIME-Tools Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 5987badae01c4ed97eefaa3026b92f8120d30952 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:29 2022 +0100 perl-Mail-Tools: Renamed from Mail-Tools Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 313899b0158531e443aa7c842b49e6e7ea91cff2 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:28 2022 +0100 perl-libwww: Renamed from libwww-perl Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit b4c74c9fd375401c5a62c2f94c0f943732db56a8 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:27 2022 +0100 perl-IO-Stringy: Renamed from IO-Stringy Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 747440a5735e9295d13cb9440333f44fda923581 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:26 2022 +0100 perl-IO-Socket-SSL: Renamed from IO-Socket-SSL Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 46b8d1914d1a833ea715832ae5a58f96ad1bf585 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:25 2022 +0100 perl-HTML-Template: Renamed from HTML-Template Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 61320ea2ca9a2b1ca85effa8aaf3964df2c456d6 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:24 2022 +0100 perl-HTML-Tagset: Renamed from HTML-Tagset Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 79e1d40e33ad215e89049134f09faf66e17b9bc6 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:23 2022 +0100 perl-HTML-Parser: Renamed from HTML-Parser Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 5ebc703e02643414ae79bb541eb916e82acd5d30 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:22 2022 +0100 perl-GD-TextUtil: Renamed from GD-TextUtil Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit ea1744d4210234ade171d63db9f466c0a9d26a57 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:21 2022 +0100 perl-GD-Graph: Renamed from GD-Graph Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit b8c4670070407d2fbfd73aaf6b05c76fd25831a4 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:20 2022 +0100 perl-ExtUtils-PkgConfig: Renamed from ExtUtils-PkgConfig Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit cbd39ddae0675c05f5fbc093cb2adf7af4d04666 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:19 2022 +0100 perl-Digest-SHA1: Renamed from Digest-SHA1 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit ddf87f1ae5942b88e36823cb569def88f51d0a81 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:18 2022 +0100 perl-Digest: Renamed from Digest Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit d45bba3b6ae2106e04f28da8847e15e49a994aca Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:17 2022 +0100 perl-Digest-HMAC: Renamed from Digest-HMAC Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit e2c711c6d62ca8af3ac5f6053d92060e7ffbe3aa Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:16 2022 +0100 perl-Convert-UUlib: Renamed from Convert-UUlib Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 741fa99f3b4c7afb20cb0837d390eb58abf8674f Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:15 2022 +0100 perl-Convert-UUlib: Renamed from Convert-UUlib Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 225cad2bf2dcd3d5d3e128f919706b97284d9203 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:14 2022 +0100 perl-Convert-TNEF: Renamed from Convert-TNEF Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 30fbc67ea98fc83bd4902b49a2c2bbaed81ae2ff Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:13 2022 +0100 perl-Compress-Zlib: Renamed from Compress-Zlib Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit a47fc3aa12c515cdba1424cb4ba6044e86db859e Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:12 2022 +0100 perl-Canary-Stability: Renamed from Canary-Stability Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 14cf575741754c023acafb94dc08736e8daca22c Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:11 2022 +0100 perl-BerkeleyDB: Renamed from BerkeleyDB Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 8b08a903264e3550db9073229547bd1748117ff1 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:10 2022 +0100 perl-Archive-Zip: Renamed from Archive-Zip Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit e1f8b41f009c26d74ae062c7920fd49d16696612 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:09 2022 +0100 perl-Archive-Tar: Renamed from Archive-Tar Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 3ad4e756972c20ecba1060c939d0afa899e9946c Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 6 22:46:08 2022 +0100 make.sh: name all perl packages to start with perl - Currently some perl packages start with perl, others don't have perl in the name at all and one has perl at the end of the IPFire name. - This patch series places perl at the start of all lfs and rootfile files for perl packages in a similar way as is done for python3. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 2f8ae1c282dfc363cc8ea91b8caf520e412eea43 Author: smooky(a)v16.de <smooky(a)v16.de> Date: Sun Jan 9 13:09:20 2022 +0100 New Addon: gptfdisk 1.0.8 >>> https://www.rodsbooks.com/gdisk/ <<< source = https://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.8/gptfdisk-1.0… Hi @ all I have a new add-on here which I use e.g. to bring partitions from mbr to gpt without data loss. It is also well suited for rescuing broken partitions. GPT fdisk (consisting of the gdisk, cgdisk, sgdisk, and fixparts programs) is a set of text-mode partitioning tools for Linux, FreeBSD, Mac OS X, and Windows. The gdisk, cgdisk, and sgdisk programs work on Globally Unique Identifier (GUID) Partition Table (GPT) disks, rather than on the older (and once more common) Master Boot Record (MBR) partition tables. The fixparts program repairs certain types of damage to MBR disks and enables changing partition types from primary to logical and vice-versa. Signed-off-by: Marcel Follert (Smooky) <smooky(a)v16.de> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../common/{Archive-Tar => perl-Archive-Tar} | 0 .../common/{Archive-Zip => perl-Archive-Zip} | 0 .../common/{BerkeleyDB => perl-BerkeleyDB} | 0 .../{Canary-Stability => perl-Canary-Stability} | 0 .../common/{Compress-Zlib => perl-Compress-Zlib} | 0 .../common/{Convert-TNEF => perl-Convert-TNEF} | 0 .../common/{Convert-UUlib => perl-Convert-UUlib} | 0 .../{Crypt-PasswdMD5 => perl-Crypt-PasswdMD5} | 0 config/rootfiles/common/{Digest => perl-Digest} | 0 .../common/{Digest-HMAC => perl-Digest-HMAC} | 0 .../common/{Digest-SHA1 => perl-Digest-SHA1} | 0 ...{ExtUtils-PkgConfig => perl-ExtUtils-PkgConfig} | 0 .../rootfiles/common/{GD-Graph => perl-GD-Graph} | 0 .../common/{GD-TextUtil => perl-GD-TextUtil} | 0 .../common/{HTML-Parser => perl-HTML-Parser} | 0 .../common/{HTML-Tagset => perl-HTML-Tagset} | 0 .../common/{HTML-Template => perl-HTML-Template} | 0 .../common/{IO-Socket-SSL => perl-IO-Socket-SSL} | 0 .../common/{IO-Stringy => perl-IO-Stringy} | 0 .../common/{MIME-Tools => perl-MIME-Tools} | 0 .../common/{Mail-Tools => perl-Mail-Tools} | 0 config/rootfiles/common/{Net-DNS => perl-Net-DNS} | 0 .../common/{Net-IPv4Addr => perl-Net-IPv4Addr} | 0 .../common/{Net-Server => perl-Net-Server} | 0 .../common/{Net-Telnet => perl-Net-Telnet} | 0 .../common/{Net_SSLeay => perl-Net_SSLeay} | 0 .../common/{Text-Tabs+Wrap => perl-Text-Tabs+Wrap} | 0 config/rootfiles/common/{URI => perl-URI} | 0 .../common/{Unix-Syslog => perl-Unix-Syslog} | 0 .../common/{XML-Parser => perl-XML-Parser} | 0 .../rootfiles/common/{libwww-perl => perl-libwww} | 0 config/rootfiles/packages/gptfdisk | 4 ++ lfs/{linux-firmware => gptfdisk} | 27 ++++---- lfs/libloc | 10 +-- lfs/{Archive-Tar => perl-Archive-Tar} | 0 lfs/{Archive-Zip => perl-Archive-Zip} | 0 lfs/{BerkeleyDB => perl-BerkeleyDB} | 0 lfs/{Canary-Stability => perl-Canary-Stability} | 0 lfs/{Compress-Zlib => perl-Compress-Zlib} | 0 lfs/{Convert-TNEF => perl-Convert-TNEF} | 0 lfs/{Convert-UUlib => perl-Convert-UUlib} | 0 lfs/{Crypt-PasswdMD5 => perl-Crypt-PasswdMD5} | 0 lfs/{Digest => perl-Digest} | 0 lfs/{Digest-HMAC => perl-Digest-HMAC} | 0 lfs/{Digest-SHA1 => perl-Digest-SHA1} | 0 ...{ExtUtils-PkgConfig => perl-ExtUtils-PkgConfig} | 0 lfs/{GD-Graph => perl-GD-Graph} | 0 lfs/{GD-TextUtil => perl-GD-TextUtil} | 0 lfs/{HTML-Parser => perl-HTML-Parser} | 0 lfs/{HTML-Tagset => perl-HTML-Tagset} | 0 lfs/{HTML-Template => perl-HTML-Template} | 0 lfs/{IO-Socket-SSL => perl-IO-Socket-SSL} | 0 lfs/{IO-Stringy => perl-IO-Stringy} | 0 lfs/{MIME-Tools => perl-MIME-Tools} | 0 lfs/{Mail-Tools => perl-Mail-Tools} | 0 lfs/{Net-DNS => perl-Net-DNS} | 0 lfs/{Net-IPv4Addr => perl-Net-IPv4Addr} | 0 lfs/{Net-Server => perl-Net-Server} | 0 lfs/{Net-Telnet => perl-Net-Telnet} | 0 lfs/{Net_SSLeay => perl-Net_SSLeay} | 0 lfs/{Text-Tabs+Wrap => perl-Text-Tabs+Wrap} | 0 lfs/{URI => perl-URI} | 0 lfs/{Unix-Syslog => perl-Unix-Syslog} | 0 lfs/{XML-Parser => perl-XML-Parser} | 0 lfs/{libwww-perl => perl-libwww} | 0 make.sh | 80 +++++++++++----------- 66 files changed, 64 insertions(+), 57 deletions(-) rename config/rootfiles/common/{Archive-Tar => perl-Archive-Tar} (100%) rename config/rootfiles/common/{Archive-Zip => perl-Archive-Zip} (100%) rename config/rootfiles/common/{BerkeleyDB => perl-BerkeleyDB} (100%) rename config/rootfiles/common/{Canary-Stability => perl-Canary-Stability} (100%) rename config/rootfiles/common/{Compress-Zlib => perl-Compress-Zlib} (100%) rename config/rootfiles/common/{Convert-TNEF => perl-Convert-TNEF} (100%) rename config/rootfiles/common/{Convert-UUlib => perl-Convert-UUlib} (100%) rename config/rootfiles/common/{Crypt-PasswdMD5 => perl-Crypt-PasswdMD5} (100%) rename config/rootfiles/common/{Digest => perl-Digest} (100%) rename config/rootfiles/common/{Digest-HMAC => perl-Digest-HMAC} (100%) rename config/rootfiles/common/{Digest-SHA1 => perl-Digest-SHA1} (100%) rename config/rootfiles/common/{ExtUtils-PkgConfig => perl-ExtUtils-PkgConfig} (100%) rename config/rootfiles/common/{GD-Graph => perl-GD-Graph} (100%) rename config/rootfiles/common/{GD-TextUtil => perl-GD-TextUtil} (100%) rename config/rootfiles/common/{HTML-Parser => perl-HTML-Parser} (100%) rename config/rootfiles/common/{HTML-Tagset => perl-HTML-Tagset} (100%) rename config/rootfiles/common/{HTML-Template => perl-HTML-Template} (100%) rename config/rootfiles/common/{IO-Socket-SSL => perl-IO-Socket-SSL} (100%) rename config/rootfiles/common/{IO-Stringy => perl-IO-Stringy} (100%) rename config/rootfiles/common/{MIME-Tools => perl-MIME-Tools} (100%) rename config/rootfiles/common/{Mail-Tools => perl-Mail-Tools} (100%) rename config/rootfiles/common/{Net-DNS => perl-Net-DNS} (100%) rename config/rootfiles/common/{Net-IPv4Addr => perl-Net-IPv4Addr} (100%) rename config/rootfiles/common/{Net-Server => perl-Net-Server} (100%) rename config/rootfiles/common/{Net-Telnet => perl-Net-Telnet} (100%) rename config/rootfiles/common/{Net_SSLeay => perl-Net_SSLeay} (100%) rename config/rootfiles/common/{Text-Tabs+Wrap => perl-Text-Tabs+Wrap} (100%) rename config/rootfiles/common/{URI => perl-URI} (100%) rename config/rootfiles/common/{Unix-Syslog => perl-Unix-Syslog} (100%) rename config/rootfiles/common/{XML-Parser => perl-XML-Parser} (100%) rename config/rootfiles/common/{libwww-perl => perl-libwww} (100%) create mode 100644 config/rootfiles/packages/gptfdisk copy lfs/{linux-firmware => gptfdisk} (87%) rename lfs/{Archive-Tar => perl-Archive-Tar} (100%) rename lfs/{Archive-Zip => perl-Archive-Zip} (100%) rename lfs/{BerkeleyDB => perl-BerkeleyDB} (100%) rename lfs/{Canary-Stability => perl-Canary-Stability} (100%) rename lfs/{Compress-Zlib => perl-Compress-Zlib} (100%) rename lfs/{Convert-TNEF => perl-Convert-TNEF} (100%) rename lfs/{Convert-UUlib => perl-Convert-UUlib} (100%) rename lfs/{Crypt-PasswdMD5 => perl-Crypt-PasswdMD5} (100%) rename lfs/{Digest => perl-Digest} (100%) rename lfs/{Digest-HMAC => perl-Digest-HMAC} (100%) rename lfs/{Digest-SHA1 => perl-Digest-SHA1} (100%) rename lfs/{ExtUtils-PkgConfig => perl-ExtUtils-PkgConfig} (100%) rename lfs/{GD-Graph => perl-GD-Graph} (100%) rename lfs/{GD-TextUtil => perl-GD-TextUtil} (100%) rename lfs/{HTML-Parser => perl-HTML-Parser} (100%) rename lfs/{HTML-Tagset => perl-HTML-Tagset} (100%) rename lfs/{HTML-Template => perl-HTML-Template} (100%) rename lfs/{IO-Socket-SSL => perl-IO-Socket-SSL} (100%) rename lfs/{IO-Stringy => perl-IO-Stringy} (100%) rename lfs/{MIME-Tools => perl-MIME-Tools} (100%) rename lfs/{Mail-Tools => perl-Mail-Tools} (100%) rename lfs/{Net-DNS => perl-Net-DNS} (100%) rename lfs/{Net-IPv4Addr => perl-Net-IPv4Addr} (100%) rename lfs/{Net-Server => perl-Net-Server} (100%) rename lfs/{Net-Telnet => perl-Net-Telnet} (100%) rename lfs/{Net_SSLeay => perl-Net_SSLeay} (100%) rename lfs/{Text-Tabs+Wrap => perl-Text-Tabs+Wrap} (100%) rename lfs/{URI => perl-URI} (100%) rename lfs/{Unix-Syslog => perl-Unix-Syslog} (100%) rename lfs/{XML-Parser => perl-XML-Parser} (100%) rename lfs/{libwww-perl => perl-libwww} (100%) Difference in files: diff --git a/config/rootfiles/common/Archive-Tar b/config/rootfiles/common/perl-Archive-Tar similarity index 100% rename from config/rootfiles/common/Archive-Tar rename to config/rootfiles/common/perl-Archive-Tar diff --git a/config/rootfiles/common/Archive-Zip b/config/rootfiles/common/perl-Archive-Zip similarity index 100% rename from config/rootfiles/common/Archive-Zip rename to config/rootfiles/common/perl-Archive-Zip diff --git a/config/rootfiles/common/BerkeleyDB b/config/rootfiles/common/perl-BerkeleyDB similarity index 100% rename from config/rootfiles/common/BerkeleyDB rename to config/rootfiles/common/perl-BerkeleyDB diff --git a/config/rootfiles/common/Canary-Stability b/config/rootfiles/common/perl-Canary-Stability similarity index 100% rename from config/rootfiles/common/Canary-Stability rename to config/rootfiles/common/perl-Canary-Stability diff --git a/config/rootfiles/common/Compress-Zlib b/config/rootfiles/common/perl-Compress-Zlib similarity index 100% rename from config/rootfiles/common/Compress-Zlib rename to config/rootfiles/common/perl-Compress-Zlib diff --git a/config/rootfiles/common/Convert-TNEF b/config/rootfiles/common/perl-Convert-TNEF similarity index 100% rename from config/rootfiles/common/Convert-TNEF rename to config/rootfiles/common/perl-Convert-TNEF diff --git a/config/rootfiles/common/Convert-UUlib b/config/rootfiles/common/perl-Convert-UUlib similarity index 100% rename from config/rootfiles/common/Convert-UUlib rename to config/rootfiles/common/perl-Convert-UUlib diff --git a/config/rootfiles/common/Crypt-PasswdMD5 b/config/rootfiles/common/perl-Crypt-PasswdMD5 similarity index 100% rename from config/rootfiles/common/Crypt-PasswdMD5 rename to config/rootfiles/common/perl-Crypt-PasswdMD5 diff --git a/config/rootfiles/common/Digest b/config/rootfiles/common/perl-Digest similarity index 100% rename from config/rootfiles/common/Digest rename to config/rootfiles/common/perl-Digest diff --git a/config/rootfiles/common/Digest-HMAC b/config/rootfiles/common/perl-Digest-HMAC similarity index 100% rename from config/rootfiles/common/Digest-HMAC rename to config/rootfiles/common/perl-Digest-HMAC diff --git a/config/rootfiles/common/Digest-SHA1 b/config/rootfiles/common/perl-Digest-SHA1 similarity index 100% rename from config/rootfiles/common/Digest-SHA1 rename to config/rootfiles/common/perl-Digest-SHA1 diff --git a/config/rootfiles/common/ExtUtils-PkgConfig b/config/rootfiles/common/perl-ExtUtils-PkgConfig similarity index 100% rename from config/rootfiles/common/ExtUtils-PkgConfig rename to config/rootfiles/common/perl-ExtUtils-PkgConfig diff --git a/config/rootfiles/common/GD-Graph b/config/rootfiles/common/perl-GD-Graph similarity index 100% rename from config/rootfiles/common/GD-Graph rename to config/rootfiles/common/perl-GD-Graph diff --git a/config/rootfiles/common/GD-TextUtil b/config/rootfiles/common/perl-GD-TextUtil similarity index 100% rename from config/rootfiles/common/GD-TextUtil rename to config/rootfiles/common/perl-GD-TextUtil diff --git a/config/rootfiles/common/HTML-Parser b/config/rootfiles/common/perl-HTML-Parser similarity index 100% rename from config/rootfiles/common/HTML-Parser rename to config/rootfiles/common/perl-HTML-Parser diff --git a/config/rootfiles/common/HTML-Tagset b/config/rootfiles/common/perl-HTML-Tagset similarity index 100% rename from config/rootfiles/common/HTML-Tagset rename to config/rootfiles/common/perl-HTML-Tagset diff --git a/config/rootfiles/common/HTML-Template b/config/rootfiles/common/perl-HTML-Template similarity index 100% rename from config/rootfiles/common/HTML-Template rename to config/rootfiles/common/perl-HTML-Template diff --git a/config/rootfiles/common/IO-Socket-SSL b/config/rootfiles/common/perl-IO-Socket-SSL similarity index 100% rename from config/rootfiles/common/IO-Socket-SSL rename to config/rootfiles/common/perl-IO-Socket-SSL diff --git a/config/rootfiles/common/IO-Stringy b/config/rootfiles/common/perl-IO-Stringy similarity index 100% rename from config/rootfiles/common/IO-Stringy rename to config/rootfiles/common/perl-IO-Stringy diff --git a/config/rootfiles/common/MIME-Tools b/config/rootfiles/common/perl-MIME-Tools similarity index 100% rename from config/rootfiles/common/MIME-Tools rename to config/rootfiles/common/perl-MIME-Tools diff --git a/config/rootfiles/common/Mail-Tools b/config/rootfiles/common/perl-Mail-Tools similarity index 100% rename from config/rootfiles/common/Mail-Tools rename to config/rootfiles/common/perl-Mail-Tools diff --git a/config/rootfiles/common/Net-DNS b/config/rootfiles/common/perl-Net-DNS similarity index 100% rename from config/rootfiles/common/Net-DNS rename to config/rootfiles/common/perl-Net-DNS diff --git a/config/rootfiles/common/Net-IPv4Addr b/config/rootfiles/common/perl-Net-IPv4Addr similarity index 100% rename from config/rootfiles/common/Net-IPv4Addr rename to config/rootfiles/common/perl-Net-IPv4Addr diff --git a/config/rootfiles/common/Net-Server b/config/rootfiles/common/perl-Net-Server similarity index 100% rename from config/rootfiles/common/Net-Server rename to config/rootfiles/common/perl-Net-Server diff --git a/config/rootfiles/common/Net-Telnet b/config/rootfiles/common/perl-Net-Telnet similarity index 100% rename from config/rootfiles/common/Net-Telnet rename to config/rootfiles/common/perl-Net-Telnet diff --git a/config/rootfiles/common/Net_SSLeay b/config/rootfiles/common/perl-Net_SSLeay similarity index 100% rename from config/rootfiles/common/Net_SSLeay rename to config/rootfiles/common/perl-Net_SSLeay diff --git a/config/rootfiles/common/Text-Tabs+Wrap b/config/rootfiles/common/perl-Text-Tabs+Wrap similarity index 100% rename from config/rootfiles/common/Text-Tabs+Wrap rename to config/rootfiles/common/perl-Text-Tabs+Wrap diff --git a/config/rootfiles/common/URI b/config/rootfiles/common/perl-URI similarity index 100% rename from config/rootfiles/common/URI rename to config/rootfiles/common/perl-URI diff --git a/config/rootfiles/common/Unix-Syslog b/config/rootfiles/common/perl-Unix-Syslog similarity index 100% rename from config/rootfiles/common/Unix-Syslog rename to config/rootfiles/common/perl-Unix-Syslog diff --git a/config/rootfiles/common/XML-Parser b/config/rootfiles/common/perl-XML-Parser similarity index 100% rename from config/rootfiles/common/XML-Parser rename to config/rootfiles/common/perl-XML-Parser diff --git a/config/rootfiles/common/libwww-perl b/config/rootfiles/common/perl-libwww similarity index 100% rename from config/rootfiles/common/libwww-perl rename to config/rootfiles/common/perl-libwww diff --git a/config/rootfiles/packages/gptfdisk b/config/rootfiles/packages/gptfdisk new file mode 100644 index 000000000..a1a854021 --- /dev/null +++ b/config/rootfiles/packages/gptfdisk @@ -0,0 +1,4 @@ +usr/sbin/cgdisk +usr/sbin/fixparts +usr/sbin/gdisk +usr/sbin/sgdisk diff --git a/lfs/gptfdisk b/lfs/gptfdisk new file mode 100644 index 000000000..073d57c7e --- /dev/null +++ b/lfs/gptfdisk @@ -0,0 +1,85 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.8 + +THISAPP = gptfdisk-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = gptfdisk +PAK_VER = 1 + +DEPS = + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 74684c4eb0e6d5a1839e4bb0bba36fa2 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvfz $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && sed -i '29s#<ncursesw/ncurses.h>#<ncurses.h>#g' gptcurses.cc + cd $(DIR_APP) && make + cd $(DIR_APP) && cp cgdisk fixparts gdisk sgdisk /usr/sbin + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libloc b/lfs/libloc index 1de135b52..29008191a 100644 --- a/lfs/libloc +++ b/lfs/libloc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 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,8 +24,8 @@ include Config -VER = 0.9.9 -DB_DATE = 2021-12-13 +VER = 0.9.10 +DB_DATE = 2022-02-16 THISAPP = libloc-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,8 +43,8 @@ objects = $(DL_FILE) \ $(DL_FILE) = https://source.ipfire.org/releases/libloc/$(DL_FILE) location-$(DB_DATE).db.xz = https://location.ipfire.org/databases/1/archive/location-$(DB_DATE).db.xz -$(DL_FILE)_MD5 = 0d14fcad39b19accc001ed5f17a09471 -location-$(DB_DATE).db.xz_MD5 = 7239646f05ac92e76ae2700e7aa14ab8 +$(DL_FILE)_MD5 = 3f67e15022c142c0731cbb3746351330 +location-$(DB_DATE).db.xz_MD5 = c1ad9c544bab917035eb0cd13b66c453 install : $(TARGET) diff --git a/lfs/Archive-Tar b/lfs/perl-Archive-Tar similarity index 100% rename from lfs/Archive-Tar rename to lfs/perl-Archive-Tar diff --git a/lfs/Archive-Zip b/lfs/perl-Archive-Zip similarity index 100% rename from lfs/Archive-Zip rename to lfs/perl-Archive-Zip diff --git a/lfs/BerkeleyDB b/lfs/perl-BerkeleyDB similarity index 100% rename from lfs/BerkeleyDB rename to lfs/perl-BerkeleyDB diff --git a/lfs/Canary-Stability b/lfs/perl-Canary-Stability similarity index 100% rename from lfs/Canary-Stability rename to lfs/perl-Canary-Stability diff --git a/lfs/Compress-Zlib b/lfs/perl-Compress-Zlib similarity index 100% rename from lfs/Compress-Zlib rename to lfs/perl-Compress-Zlib diff --git a/lfs/Convert-TNEF b/lfs/perl-Convert-TNEF similarity index 100% rename from lfs/Convert-TNEF rename to lfs/perl-Convert-TNEF diff --git a/lfs/Convert-UUlib b/lfs/perl-Convert-UUlib similarity index 100% rename from lfs/Convert-UUlib rename to lfs/perl-Convert-UUlib diff --git a/lfs/Crypt-PasswdMD5 b/lfs/perl-Crypt-PasswdMD5 similarity index 100% rename from lfs/Crypt-PasswdMD5 rename to lfs/perl-Crypt-PasswdMD5 diff --git a/lfs/Digest b/lfs/perl-Digest similarity index 100% rename from lfs/Digest rename to lfs/perl-Digest diff --git a/lfs/Digest-HMAC b/lfs/perl-Digest-HMAC similarity index 100% rename from lfs/Digest-HMAC rename to lfs/perl-Digest-HMAC diff --git a/lfs/Digest-SHA1 b/lfs/perl-Digest-SHA1 similarity index 100% rename from lfs/Digest-SHA1 rename to lfs/perl-Digest-SHA1 diff --git a/lfs/ExtUtils-PkgConfig b/lfs/perl-ExtUtils-PkgConfig similarity index 100% rename from lfs/ExtUtils-PkgConfig rename to lfs/perl-ExtUtils-PkgConfig diff --git a/lfs/GD-Graph b/lfs/perl-GD-Graph similarity index 100% rename from lfs/GD-Graph rename to lfs/perl-GD-Graph diff --git a/lfs/GD-TextUtil b/lfs/perl-GD-TextUtil similarity index 100% rename from lfs/GD-TextUtil rename to lfs/perl-GD-TextUtil diff --git a/lfs/HTML-Parser b/lfs/perl-HTML-Parser similarity index 100% rename from lfs/HTML-Parser rename to lfs/perl-HTML-Parser diff --git a/lfs/HTML-Tagset b/lfs/perl-HTML-Tagset similarity index 100% rename from lfs/HTML-Tagset rename to lfs/perl-HTML-Tagset diff --git a/lfs/HTML-Template b/lfs/perl-HTML-Template similarity index 100% rename from lfs/HTML-Template rename to lfs/perl-HTML-Template diff --git a/lfs/IO-Socket-SSL b/lfs/perl-IO-Socket-SSL similarity index 100% rename from lfs/IO-Socket-SSL rename to lfs/perl-IO-Socket-SSL diff --git a/lfs/IO-Stringy b/lfs/perl-IO-Stringy similarity index 100% rename from lfs/IO-Stringy rename to lfs/perl-IO-Stringy diff --git a/lfs/MIME-Tools b/lfs/perl-MIME-Tools similarity index 100% rename from lfs/MIME-Tools rename to lfs/perl-MIME-Tools diff --git a/lfs/Mail-Tools b/lfs/perl-Mail-Tools similarity index 100% rename from lfs/Mail-Tools rename to lfs/perl-Mail-Tools diff --git a/lfs/Net-DNS b/lfs/perl-Net-DNS similarity index 100% rename from lfs/Net-DNS rename to lfs/perl-Net-DNS diff --git a/lfs/Net-IPv4Addr b/lfs/perl-Net-IPv4Addr similarity index 100% rename from lfs/Net-IPv4Addr rename to lfs/perl-Net-IPv4Addr diff --git a/lfs/Net-Server b/lfs/perl-Net-Server similarity index 100% rename from lfs/Net-Server rename to lfs/perl-Net-Server diff --git a/lfs/Net-Telnet b/lfs/perl-Net-Telnet similarity index 100% rename from lfs/Net-Telnet rename to lfs/perl-Net-Telnet diff --git a/lfs/Net_SSLeay b/lfs/perl-Net_SSLeay similarity index 100% rename from lfs/Net_SSLeay rename to lfs/perl-Net_SSLeay diff --git a/lfs/Text-Tabs+Wrap b/lfs/perl-Text-Tabs+Wrap similarity index 100% rename from lfs/Text-Tabs+Wrap rename to lfs/perl-Text-Tabs+Wrap diff --git a/lfs/URI b/lfs/perl-URI similarity index 100% rename from lfs/URI rename to lfs/perl-URI diff --git a/lfs/Unix-Syslog b/lfs/perl-Unix-Syslog similarity index 100% rename from lfs/Unix-Syslog rename to lfs/perl-Unix-Syslog diff --git a/lfs/XML-Parser b/lfs/perl-XML-Parser similarity index 100% rename from lfs/XML-Parser rename to lfs/perl-XML-Parser diff --git a/lfs/libwww-perl b/lfs/perl-libwww similarity index 100% rename from lfs/libwww-perl rename to lfs/perl-libwww diff --git a/make.sh b/make.sh index 4dd068e4b..a6f44030c 100755 --- a/make.sh +++ b/make.sh @@ -437,7 +437,7 @@ prepareenv() { fi # Trap on emergency exit - trap "exiterror 'Build process interrupted'" SIGINT SIGTERM SIGKILL SIGSTOP SIGQUIT + trap "exiterror 'Build process interrupted'" SIGINT SIGTERM SIGQUIT # Checking if running as root user if [ $(id -u) -ne 0 ]; then @@ -1342,7 +1342,7 @@ buildipfire() { lfsmake2 usbutils lfsmake2 libxml2 lfsmake2 libxslt - lfsmake2 BerkeleyDB + lfsmake2 perl-BerkeleyDB lfsmake2 cyrus-sasl lfsmake2 openldap lfsmake2 apache2 @@ -1365,10 +1365,10 @@ buildipfire() { lfsmake2 ntfs-3g lfsmake2 ethtool lfsmake2 fcron - lfsmake2 ExtUtils-PkgConfig + lfsmake2 perl-ExtUtils-PkgConfig lfsmake2 perl-GD - lfsmake2 GD-Graph - lfsmake2 GD-TextUtil + lfsmake2 perl-GD-Graph + lfsmake2 perl-GD-TextUtil lfsmake2 perl-Device-SerialPort lfsmake2 perl-Device-Modem lfsmake2 perl-Apache-Htpasswd @@ -1390,37 +1390,37 @@ buildipfire() { lfsmake2 logwatch lfsmake2 misc-progs lfsmake2 nano - lfsmake2 URI + lfsmake2 perl-URI lfsmake2 perl-CGI lfsmake2 perl-Switch - lfsmake2 HTML-Tagset - lfsmake2 HTML-Parser - lfsmake2 HTML-Template - lfsmake2 Compress-Zlib - lfsmake2 Digest - lfsmake2 Digest-SHA1 - lfsmake2 Digest-HMAC - lfsmake2 libwww-perl - lfsmake2 perl-LWP-Protocol-https + lfsmake2 perl-HTML-Tagset + lfsmake2 perl-HTML-Parser + lfsmake2 perl-HTML-Template + lfsmake2 perl-Compress-Zlib + lfsmake2 perl-Digest + lfsmake2 perl-Digest-SHA1 + lfsmake2 perl-Digest-HMAC + lfsmake2 perl-libwww + lfsmake2 perl-LWP-Protocol-https lfsmake2 perl-Net-HTTP - lfsmake2 Net-DNS - lfsmake2 Net-IPv4Addr - lfsmake2 Net_SSLeay - lfsmake2 IO-Stringy - lfsmake2 IO-Socket-SSL - lfsmake2 Unix-Syslog - lfsmake2 Mail-Tools - lfsmake2 MIME-Tools - lfsmake2 Net-Server - lfsmake2 Canary-Stability - lfsmake2 Convert-TNEF - lfsmake2 Convert-UUlib - lfsmake2 Archive-Tar - lfsmake2 Archive-Zip - lfsmake2 Text-Tabs+Wrap - lfsmake2 XML-Parser - lfsmake2 Crypt-PasswdMD5 - lfsmake2 Net-Telnet + lfsmake2 perl-Net-DNS + lfsmake2 perl-Net-IPv4Addr + lfsmake2 perl-Net_SSLeay + lfsmake2 perl-IO-Stringy + lfsmake2 perl-IO-Socket-SSL + lfsmake2 perl-Unix-Syslog + lfsmake2 perl-Mail-Tools + lfsmake2 perl-MIME-Tools + lfsmake2 perl-Net-Server + lfsmake2 perl-Canary-Stability + lfsmake2 perl-Convert-TNEF + lfsmake2 perl-Convert-UUlib + lfsmake2 perl-Archive-Tar + lfsmake2 perl-Archive-Zip + lfsmake2 perl-Text-Tabs+Wrap + lfsmake2 perl-XML-Parser + lfsmake2 perl-Crypt-PasswdMD5 + lfsmake2 perl-Net-Telnet lfsmake2 python3-setuptools lfsmake2 python3-inotify lfsmake2 python3-docutils @@ -1702,6 +1702,7 @@ buildipfire() { lfsmake2 pmacct lfsmake2 squid-asnbl lfsmake2 qemu-ga + lfsmake2 gptfdisk } buildinstaller() { @@ -1719,7 +1720,7 @@ buildpackages() { export LOGFILE echo "... see detailed log in _build.*.log files" >> $LOGFILE - + # Generating list of packages used print_line "Generating packages list from logs" rm -f $BASEDIR/doc/packages-list @@ -1734,7 +1735,7 @@ buildpackages() { rm -f $BASEDIR/doc/packages-list # packages-list.txt is ready to be displayed for wiki page print_status DONE - + # Update changelog cd $BASEDIR [ -z $GIT_TAG ] || LAST_TAG=$GIT_TAG @@ -1806,7 +1807,7 @@ while [ $# -gt 0 ]; do done # See what we're supposed to do -case "$1" in +case "$1" in build) START_TIME=$(now) @@ -1845,7 +1846,7 @@ build) print_build_stage "Building packages" buildpackages - + print_build_stage "Checking Logfiles for new Files" cd $BASEDIR @@ -1910,7 +1911,7 @@ downloadsrc) FINISHED=0 cd $BASEDIR/lfs for c in `seq $MAX_RETRIES`; do - if (( FINISHED==1 )); then + if (( FINISHED==1 )); then break fi FINISHED=1 @@ -2051,7 +2052,7 @@ find-dependencies) ;; check-manualpages) echo "Checking the manual pages for broken links..." - + chmod 755 $BASEDIR/tools/check_manualpages.pl if $BASEDIR/tools/check_manualpages.pl; then print_status DONE @@ -2064,4 +2065,3 @@ check-manualpages) cat doc/make.sh-usage ;; esac - hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2022