]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Merge branch 'ipsec' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 25 Feb 2019 00:48:08 +0000 (00:48 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 25 Feb 2019 00:48:08 +0000 (00:48 +0000)
60 files changed:
config/kernel/kernel.config.armv5tel-ipfire-multi
config/kernel/kernel.config.i586-ipfire
config/kernel/kernel.config.i586-ipfire-pae
config/kernel/kernel.config.x86_64-ipfire
config/rootfiles/common/curl
config/rootfiles/common/knot [new file with mode: 0644]
config/rootfiles/common/libedit [new file with mode: 0644]
config/rootfiles/core/129/exclude [new file with mode: 0644]
config/rootfiles/core/129/filelists/files [new file with mode: 0644]
config/rootfiles/core/129/update.sh [moved from config/rootfiles/core/128/update.sh with 84% similarity]
config/rootfiles/oldcore/128/exclude [moved from config/rootfiles/core/128/exclude with 100% similarity]
config/rootfiles/oldcore/128/filelists/aarch64/linux [new symlink]
config/rootfiles/oldcore/128/filelists/aarch64/linux-initrd [new symlink]
config/rootfiles/oldcore/128/filelists/apache2 [moved from config/rootfiles/core/128/filelists/apache2 with 100% similarity]
config/rootfiles/oldcore/128/filelists/apr [moved from config/rootfiles/core/128/filelists/apr with 100% similarity]
config/rootfiles/oldcore/128/filelists/armv5tel/linux-initrd-kirkwood [new symlink]
config/rootfiles/oldcore/128/filelists/armv5tel/linux-initrd-multi [new symlink]
config/rootfiles/oldcore/128/filelists/armv5tel/linux-kirkwood [new symlink]
config/rootfiles/oldcore/128/filelists/armv5tel/linux-multi [new symlink]
config/rootfiles/oldcore/128/filelists/ca-certificates [moved from config/rootfiles/core/128/filelists/ca-certificates with 100% similarity]
config/rootfiles/oldcore/128/filelists/curl [moved from config/rootfiles/core/128/filelists/curl with 100% similarity]
config/rootfiles/oldcore/128/filelists/dhcpcd [moved from config/rootfiles/core/128/filelists/dhcpcd with 100% similarity]
config/rootfiles/oldcore/128/filelists/files [moved from config/rootfiles/core/128/filelists/files with 71% similarity]
config/rootfiles/oldcore/128/filelists/i586/linux [new symlink]
config/rootfiles/oldcore/128/filelists/i586/linux-initrd [new symlink]
config/rootfiles/oldcore/128/filelists/i586/openssl-sse2 [new symlink]
config/rootfiles/oldcore/128/filelists/knot [new symlink]
config/rootfiles/oldcore/128/filelists/libedit [new symlink]
config/rootfiles/oldcore/128/filelists/logrotate [moved from config/rootfiles/core/128/filelists/logrotate with 100% similarity]
config/rootfiles/oldcore/128/filelists/openldap [new symlink]
config/rootfiles/oldcore/128/filelists/openssh [moved from config/rootfiles/core/128/filelists/openssh with 100% similarity]
config/rootfiles/oldcore/128/filelists/openssl [moved from config/rootfiles/core/128/filelists/openssl with 100% similarity]
config/rootfiles/oldcore/128/filelists/strongswan [moved from config/rootfiles/core/128/filelists/strongswan with 100% similarity]
config/rootfiles/oldcore/128/filelists/tzdata [moved from config/rootfiles/core/128/filelists/tzdata with 100% similarity]
config/rootfiles/oldcore/128/filelists/x86_64/linux [new symlink]
config/rootfiles/oldcore/128/filelists/x86_64/linux-initrd [new symlink]
config/rootfiles/oldcore/128/update.sh [new file with mode: 0644]
config/rootfiles/packages/armv5tel/borgbackup [new file with mode: 0644]
config/rootfiles/packages/armv5tel/python3-llfuse [new file with mode: 0644]
config/rootfiles/packages/armv5tel/python3-msgpack [new file with mode: 0644]
config/rootfiles/packages/i586/borgbackup [new file with mode: 0644]
config/rootfiles/packages/i586/python3-llfuse [new file with mode: 0644]
config/rootfiles/packages/tor
config/unbound/unbound.conf
lfs/cups
lfs/curl
lfs/dhcpcd
lfs/knot [new file with mode: 0644]
lfs/libedit [new file with mode: 0644]
lfs/linux
lfs/powertop
lfs/sendEmail
lfs/tor
make.sh
src/initscripts/system/firewall
src/initscripts/system/partresize
src/initscripts/system/unbound
src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch [deleted file]
src/patches/linux/linux-4.14-apu_leds.patch [moved from src/patches/linux/linux-4.9.8-apu_leds.patch with 81% similarity]
tools/find-missing-libs.sh [new file with mode: 0644]

index 3c3ee68d2a40bdf8d2099a1a00cca8b4d96db60c..9d63891967c029173fc5ff1ef81da713b2cd456a 100644 (file)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.97-ipfire-multi Kernel Configuration
+# Linux/arm 4.14.101-ipfire-multi Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -3426,7 +3426,8 @@ CONFIG_GPIO_PL061=y
 CONFIG_GPIO_ADNP=m
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
+CONFIG_GPIO_PCA953X=y
+CONFIG_GPIO_PCA953X_IRQ=y
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_TPIC2810 is not set
index aa7b0ed34d56af2f7f210be1055f9f7a5eef0d7a..d54e8b8b624bf65f2bea81c53fdbca093f07b88b 100644 (file)
@@ -529,7 +529,7 @@ CONFIG_MICROCODE=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
-# CONFIG_X86_MSR is not set
+CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
 # CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y
index 781bb87e5e02164afd59cecec669a68bee4bcd8e..d86520155f4f889512f81b7fe8b439d0dd0116da 100644 (file)
@@ -542,7 +542,7 @@ CONFIG_MICROCODE=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
-# CONFIG_X86_MSR is not set
+CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
 # CONFIG_NOHIGHMEM is not set
 # CONFIG_HIGHMEM4G is not set
index ed0f31c241d844ca41b880b6476dd2416ed2a6aa..e6598c8d8faff8eefcb3f37f18f3fa4d8195905f 100644 (file)
@@ -532,7 +532,7 @@ CONFIG_MICROCODE=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
-# CONFIG_X86_MSR is not set
+CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
 # CONFIG_X86_5LEVEL is not set
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
index 5c616f8da311b5c35a0f1bc2dc3eff34bd0343d3..1eb9f6f37d5a0e868acb86ad488b46591781b404 100644 (file)
@@ -170,6 +170,7 @@ usr/lib/libcurl.so.4.5.0
 #usr/share/man/man3/CURLOPT_HEADERDATA.3
 #usr/share/man/man3/CURLOPT_HEADERFUNCTION.3
 #usr/share/man/man3/CURLOPT_HEADEROPT.3
+#usr/share/man/man3/CURLOPT_HTTP09_ALLOWED.3
 #usr/share/man/man3/CURLOPT_HTTP200ALIASES.3
 #usr/share/man/man3/CURLOPT_HTTPAUTH.3
 #usr/share/man/man3/CURLOPT_HTTPGET.3
@@ -340,6 +341,8 @@ usr/lib/libcurl.so.4.5.0
 #usr/share/man/man3/CURLOPT_TLSAUTH_PASSWORD.3
 #usr/share/man/man3/CURLOPT_TLSAUTH_TYPE.3
 #usr/share/man/man3/CURLOPT_TLSAUTH_USERNAME.3
+#usr/share/man/man3/CURLOPT_TRAILERDATA.3
+#usr/share/man/man3/CURLOPT_TRAILERFUNCTION.3
 #usr/share/man/man3/CURLOPT_TRANSFERTEXT.3
 #usr/share/man/man3/CURLOPT_TRANSFER_ENCODING.3
 #usr/share/man/man3/CURLOPT_UNIX_SOCKET_PATH.3
diff --git a/config/rootfiles/common/knot b/config/rootfiles/common/knot
new file mode 100644 (file)
index 0000000..68d1e70
--- /dev/null
@@ -0,0 +1,93 @@
+usr/bin/kdig
+#usr/bin/khost
+#usr/bin/knsec3hash
+#usr/bin/knsupdate
+#usr/include/knot
+#usr/include/knot/module.h
+#usr/include/libdnssec
+#usr/include/libdnssec/binary.h
+#usr/include/libdnssec/crypto.h
+#usr/include/libdnssec/dnssec.h
+#usr/include/libdnssec/error.h
+#usr/include/libdnssec/key.h
+#usr/include/libdnssec/keyid.h
+#usr/include/libdnssec/keystore.h
+#usr/include/libdnssec/keytag.h
+#usr/include/libdnssec/list.h
+#usr/include/libdnssec/nsec.h
+#usr/include/libdnssec/random.h
+#usr/include/libdnssec/sign.h
+#usr/include/libdnssec/tsig.h
+#usr/include/libdnssec/version.h
+#usr/include/libknot
+#usr/include/libknot/attribute.h
+#usr/include/libknot/codes.h
+#usr/include/libknot/consts.h
+#usr/include/libknot/control
+#usr/include/libknot/control/control.h
+#usr/include/libknot/cookies.h
+#usr/include/libknot/db
+#usr/include/libknot/db/db.h
+#usr/include/libknot/db/db_lmdb.h
+#usr/include/libknot/db/db_trie.h
+#usr/include/libknot/descriptor.h
+#usr/include/libknot/dname.h
+#usr/include/libknot/endian.h
+#usr/include/libknot/errcode.h
+#usr/include/libknot/error.h
+#usr/include/libknot/libknot.h
+#usr/include/libknot/lookup.h
+#usr/include/libknot/mm_ctx.h
+#usr/include/libknot/packet
+#usr/include/libknot/packet/compr.h
+#usr/include/libknot/packet/pkt.h
+#usr/include/libknot/packet/rrset-wire.h
+#usr/include/libknot/packet/wire.h
+#usr/include/libknot/rdata.h
+#usr/include/libknot/rdataset.h
+#usr/include/libknot/rrset-dump.h
+#usr/include/libknot/rrset.h
+#usr/include/libknot/rrtype
+#usr/include/libknot/rrtype/dnskey.h
+#usr/include/libknot/rrtype/ds.h
+#usr/include/libknot/rrtype/naptr.h
+#usr/include/libknot/rrtype/nsec.h
+#usr/include/libknot/rrtype/nsec3.h
+#usr/include/libknot/rrtype/nsec3param.h
+#usr/include/libknot/rrtype/opt.h
+#usr/include/libknot/rrtype/rdname.h
+#usr/include/libknot/rrtype/rrsig.h
+#usr/include/libknot/rrtype/soa.h
+#usr/include/libknot/rrtype/tsig.h
+#usr/include/libknot/tsig-op.h
+#usr/include/libknot/tsig.h
+#usr/include/libknot/version.h
+#usr/include/libknot/wire.h
+#usr/include/libknot/yparser
+#usr/include/libknot/yparser/yparser.h
+#usr/include/libknot/yparser/ypformat.h
+#usr/include/libknot/yparser/ypschema.h
+#usr/include/libknot/yparser/yptrafo.h
+#usr/include/libzscanner
+#usr/include/libzscanner/error.h
+#usr/include/libzscanner/scanner.h
+#usr/include/libzscanner/version.h
+#usr/lib/libdnssec.la
+#usr/lib/libdnssec.so
+usr/lib/libdnssec.so.6
+usr/lib/libdnssec.so.6.0.0
+#usr/lib/libknot.la
+#usr/lib/libknot.so
+usr/lib/libknot.so.8
+usr/lib/libknot.so.8.0.0
+#usr/lib/libzscanner.la
+#usr/lib/libzscanner.so
+usr/lib/libzscanner.so.2
+usr/lib/libzscanner.so.2.0.0
+#usr/lib/pkgconfig/libdnssec.pc
+#usr/lib/pkgconfig/libknot.pc
+#usr/lib/pkgconfig/libzscanner.pc
+#usr/share/man/man1/kdig.1
+#usr/share/man/man1/khost.1
+#usr/share/man/man1/knsec3hash.1
+#usr/share/man/man1/knsupdate.1
diff --git a/config/rootfiles/common/libedit b/config/rootfiles/common/libedit
new file mode 100644 (file)
index 0000000..65b3b86
--- /dev/null
@@ -0,0 +1,50 @@
+#usr/include/editline
+#usr/include/editline/readline.h
+#usr/include/histedit.h
+#usr/lib/libedit.la
+#usr/lib/libedit.so
+usr/lib/libedit.so.0
+usr/lib/libedit.so.0.0.59
+#usr/lib/pkgconfig/libedit.pc
+#usr/share/man/man3/editline.3
+#usr/share/man/man3/el_deletestr.3
+#usr/share/man/man3/el_end.3
+#usr/share/man/man3/el_get.3
+#usr/share/man/man3/el_getc.3
+#usr/share/man/man3/el_gets.3
+#usr/share/man/man3/el_init.3
+#usr/share/man/man3/el_init_fd.3
+#usr/share/man/man3/el_insertstr.3
+#usr/share/man/man3/el_line.3
+#usr/share/man/man3/el_parse.3
+#usr/share/man/man3/el_push.3
+#usr/share/man/man3/el_reset.3
+#usr/share/man/man3/el_resize.3
+#usr/share/man/man3/el_set.3
+#usr/share/man/man3/el_source.3
+#usr/share/man/man3/el_wdeletestr.3
+#usr/share/man/man3/el_wget.3
+#usr/share/man/man3/el_wgetc.3
+#usr/share/man/man3/el_wgets.3
+#usr/share/man/man3/el_winsertstr.3
+#usr/share/man/man3/el_wline.3
+#usr/share/man/man3/el_wparse.3
+#usr/share/man/man3/el_wpush.3
+#usr/share/man/man3/el_wset.3
+#usr/share/man/man3/history_end.3
+#usr/share/man/man3/history_init.3
+#usr/share/man/man3/history_w.3
+#usr/share/man/man3/history_wend.3
+#usr/share/man/man3/history_winit.3
+#usr/share/man/man3/tok_end.3
+#usr/share/man/man3/tok_init.3
+#usr/share/man/man3/tok_line.3
+#usr/share/man/man3/tok_reset.3
+#usr/share/man/man3/tok_str.3
+#usr/share/man/man3/tok_wend.3
+#usr/share/man/man3/tok_winit.3
+#usr/share/man/man3/tok_wline.3
+#usr/share/man/man3/tok_wreset.3
+#usr/share/man/man3/tok_wstr.3
+#usr/share/man/man5/editrc.5
+#usr/share/man/man7/editline.7
diff --git a/config/rootfiles/core/129/exclude b/config/rootfiles/core/129/exclude
new file mode 100644 (file)
index 0000000..b221598
--- /dev/null
@@ -0,0 +1,28 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/129/filelists/files b/config/rootfiles/core/129/filelists/files
new file mode 100644 (file)
index 0000000..168c7d1
--- /dev/null
@@ -0,0 +1,3 @@
+etc/system-release
+etc/issue
+var/ipfire/langs
similarity index 84%
rename from config/rootfiles/core/128/update.sh
rename to config/rootfiles/core/129/update.sh
index 71824266bbd775b3134c3d70b86df36b2cbccb22..5ce0cff05d60394ff0e9cadda325278c57b3910c 100644 (file)
 # 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@ipfire.org>.                        #
+# Copyright (C) 2019 IPFire-Team <info@ipfire.org>.                        #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 
-core=128
+core=129
 
 # Remove old core updates from pakfire cache to save space...
 for (( i=1; i<=$core; i++ )); do
@@ -34,15 +34,6 @@ done
 # Stop services
 
 # Remove files
-rm -vf \
-       /usr/lib{,/sse2}/libcrypto.so.10 \
-       /usr/lib{,/sse2}/libssl.so.10 \
-       /home/nobody/.rnd \
-       /var/ipfire/ovpn/ca/.rnd \
-       /var/tmp/.rnd \
-       /.rnd \
-       /root/.rnd
-
 
 # Extract files
 extract_files
@@ -53,15 +44,10 @@ ldconfig
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
-# Reload sysctl.conf
-sysctl -p
-
 # Start services
-if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
-       /etc/init.d/ipsec restart
-fi
-/etc/init.d/sshd restart
-/etc/init.d/apache restart
+
+# This update needs a reboot...
+#touch /var/run/need_reboot
 
 # Finish
 /etc/init.d/fireinfo start
diff --git a/config/rootfiles/oldcore/128/filelists/aarch64/linux b/config/rootfiles/oldcore/128/filelists/aarch64/linux
new file mode 120000 (symlink)
index 0000000..3a2532b
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/aarch64/linux
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/128/filelists/aarch64/linux-initrd b/config/rootfiles/oldcore/128/filelists/aarch64/linux-initrd
new file mode 120000 (symlink)
index 0000000..8acdb0f
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/aarch64/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/128/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/oldcore/128/filelists/armv5tel/linux-initrd-kirkwood
new file mode 120000 (symlink)
index 0000000..39c5591
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-initrd-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/128/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/oldcore/128/filelists/armv5tel/linux-initrd-multi
new file mode 120000 (symlink)
index 0000000..0b1b453
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-initrd-multi
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/128/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/128/filelists/armv5tel/linux-kirkwood
new file mode 120000 (symlink)
index 0000000..7217107
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/128/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/128/filelists/armv5tel/linux-multi
new file mode 120000 (symlink)
index 0000000..204eb4c
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-multi
\ No newline at end of file
similarity index 71%
rename from config/rootfiles/core/128/filelists/files
rename to config/rootfiles/oldcore/128/filelists/files
index 4684d98d0a611d9a1234fc4cebea9b8f94cb8453..568413342908e95e09116c9c521ac3f25eb91934 100644 (file)
@@ -4,8 +4,12 @@ srv/web/ipfire/cgi-bin/credits.cgi
 var/ipfire/langs
 etc/rc.d/helper/aws-setup
 etc/rc.d/init.d/aws
+etc/rc.d/init.d/firewall
+etc/rc.d/init.d/partresize
+etc/rc.d/init.d/unbound
 etc/ssl/openssl.cnf
 etc/sysctl.conf
+etc/unbound/unbound.conf
 srv/web/ipfire/cgi-bin/proxy.cgi
 usr/local/bin/xt_geoip_update
 var/ipfire/ovpn/openssl/ovpn.cnf
diff --git a/config/rootfiles/oldcore/128/filelists/i586/linux b/config/rootfiles/oldcore/128/filelists/i586/linux
new file mode 120000 (symlink)
index 0000000..693ec4b
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/128/filelists/i586/linux-initrd b/config/rootfiles/oldcore/128/filelists/i586/linux-initrd
new file mode 120000 (symlink)
index 0000000..32a03e6
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/i586/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/128/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/128/filelists/i586/openssl-sse2
new file mode 120000 (symlink)
index 0000000..f424713
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/i586/openssl-sse2
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/128/filelists/knot b/config/rootfiles/oldcore/128/filelists/knot
new file mode 120000 (symlink)
index 0000000..28e96f8
--- /dev/null
@@ -0,0 +1 @@
+../../../common/knot
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/128/filelists/libedit b/config/rootfiles/oldcore/128/filelists/libedit
new file mode 120000 (symlink)
index 0000000..03fc483
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libedit
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/128/filelists/openldap b/config/rootfiles/oldcore/128/filelists/openldap
new file mode 120000 (symlink)
index 0000000..80c324f
--- /dev/null
@@ -0,0 +1 @@
+../../../common/openldap
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/128/filelists/x86_64/linux b/config/rootfiles/oldcore/128/filelists/x86_64/linux
new file mode 120000 (symlink)
index 0000000..0615b5b
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/128/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/128/filelists/x86_64/linux-initrd
new file mode 120000 (symlink)
index 0000000..1b9fff7
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/x86_64/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/128/update.sh b/config/rootfiles/oldcore/128/update.sh
new file mode 100644 (file)
index 0000000..142f3de
--- /dev/null
@@ -0,0 +1,168 @@
+#!/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@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=128
+
+exit_with_error() {
+       # Set last succesfull installed core.
+       echo $(($core-1)) > /opt/pakfire/db/core/mine
+       # don't start pakfire again at error
+       killall -KILL pak_update
+       /usr/bin/logger -p syslog.emerg -t ipfire \
+               "core-update-${core}: $1"
+       exit $2
+}
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ )); do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+KVER="xxxKVERxxx"
+
+# Backup uEnv.txt if exist
+if [ -e /boot/uEnv.txt ]; then
+       cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+fi
+
+# Do some sanity checks.
+case $(uname -r) in
+       *-ipfire*)
+               # Ok.
+               ;;
+       *)
+               exit_with_error "ERROR cannot update. No IPFire Kernel." 1
+               ;;
+esac
+
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 80000 ]; then
+       exit_with_error "ERROR cannot update because not enough free space on root." 2
+       exit 2
+fi
+
+# Remove the old kernel
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/initramfs-*
+rm -rf /boot/vmlinuz-*
+rm -rf /boot/uImage-*-ipfire-*
+rm -rf /boot/zImage-*-ipfire-*
+rm -rf /boot/uInit-*-ipfire-*
+rm -rf /boot/dtb-*-ipfire-*
+rm -rf /lib/modules
+rm -f  /etc/sysconfig/lm_sensors
+
+# Stop services
+/etc/init.d/apache stop
+
+# Remove files
+rm -rvf \
+       /usr/lib{,/sse2}/libcrypto.so.10 \
+       /usr/lib{,/sse2}/libssl.so.10 \
+       /usr/lib/openssl/engines \
+       /home/nobody/.rnd \
+       /var/ipfire/ovpn/ca/.rnd \
+       /var/tmp/.rnd \
+       /.rnd \
+       /root/.rnd
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Reload sysctl.conf
+sysctl -p
+
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
+# Start services
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+       /etc/init.d/ipsec restart
+fi
+/etc/init.d/sshd restart
+/etc/init.d/apache start
+/etc/init.d/unbound restart
+
+# Upadate Kernel version uEnv.txt
+if [ -e /boot/uEnv.txt ]; then
+       sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
+fi
+
+# call user update script (needed for some arm boards)
+if [ -e /boot/pakfire-kernel-update ]; then
+       /boot/pakfire-kernel-update ${KVER}
+fi
+
+case "$(uname -m)" in
+       i?86)
+               # Force (re)install pae kernel if pae is supported
+               rm -rf /opt/pakfire/db/installed/meta-linux-pae
+               rm -rf /opt/pakfire/db/rootfiles/linux-pae
+               if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
+                       ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+                       BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+                       if [ $BOOTSPACE -lt 22000 -o $ROOTSPACE -lt 120000 ]; then
+                               /usr/bin/logger -p syslog.emerg -t ipfire \
+                               "core-update-${core}: WARNING not enough space for pae kernel."
+                               touch /var/run/need_reboot
+                       else
+                               echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
+                               echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+                               echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
+                       fi
+               else
+                       touch /var/run/need_reboot
+               fi
+               ;;
+       *)
+               # This update needs a reboot...
+               touch /var/run/need_reboot
+               ;;
+esac
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+       grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/packages/armv5tel/borgbackup b/config/rootfiles/packages/armv5tel/borgbackup
new file mode 100644 (file)
index 0000000..ca9ce09
--- /dev/null
@@ -0,0 +1,109 @@
+usr/bin/borg
+usr/lib/python3.6/site-packages/borg
+usr/lib/python3.6/site-packages/borg/__init__.py
+usr/lib/python3.6/site-packages/borg/__main__.py
+usr/lib/python3.6/site-packages/borg/__pycache__
+usr/lib/python3.6/site-packages/borg/__pycache__/__init__.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/__main__.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/_version.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/archive.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/archiver.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/cache.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/fuse.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/helpers.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/key.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/keymanager.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/locking.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/logger.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/lrucache.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/platform.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/remote.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/repository.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/shellpattern.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/upgrader.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/xattr.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/_chunker.c
+usr/lib/python3.6/site-packages/borg/_hashindex.c
+usr/lib/python3.6/site-packages/borg/_version.py
+usr/lib/python3.6/site-packages/borg/archive.py
+usr/lib/python3.6/site-packages/borg/archiver.py
+usr/lib/python3.6/site-packages/borg/cache.py
+usr/lib/python3.6/site-packages/borg/chunker.c
+usr/lib/python3.6/site-packages/borg/chunker.cpython-36m-arm-linux-gnueabi.so
+usr/lib/python3.6/site-packages/borg/chunker.pyx
+usr/lib/python3.6/site-packages/borg/compress.c
+usr/lib/python3.6/site-packages/borg/compress.cpython-36m-arm-linux-gnueabi.so
+usr/lib/python3.6/site-packages/borg/compress.pyx
+usr/lib/python3.6/site-packages/borg/crypto.c
+usr/lib/python3.6/site-packages/borg/crypto.cpython-36m-arm-linux-gnueabi.so
+usr/lib/python3.6/site-packages/borg/crypto.pyx
+usr/lib/python3.6/site-packages/borg/fuse.py
+usr/lib/python3.6/site-packages/borg/hashindex.c
+usr/lib/python3.6/site-packages/borg/hashindex.cpython-36m-arm-linux-gnueabi.so
+usr/lib/python3.6/site-packages/borg/hashindex.pyx
+usr/lib/python3.6/site-packages/borg/helpers.py
+usr/lib/python3.6/site-packages/borg/key.py
+usr/lib/python3.6/site-packages/borg/keymanager.py
+usr/lib/python3.6/site-packages/borg/locking.py
+usr/lib/python3.6/site-packages/borg/logger.py
+usr/lib/python3.6/site-packages/borg/lrucache.py
+usr/lib/python3.6/site-packages/borg/paperkey.html
+usr/lib/python3.6/site-packages/borg/platform.py
+usr/lib/python3.6/site-packages/borg/platform_darwin.c
+usr/lib/python3.6/site-packages/borg/platform_darwin.pyx
+usr/lib/python3.6/site-packages/borg/platform_freebsd.c
+usr/lib/python3.6/site-packages/borg/platform_freebsd.pyx
+usr/lib/python3.6/site-packages/borg/platform_linux.c
+usr/lib/python3.6/site-packages/borg/platform_linux.cpython-36m-arm-linux-gnueabi.so
+usr/lib/python3.6/site-packages/borg/platform_linux.pyx
+usr/lib/python3.6/site-packages/borg/remote.py
+usr/lib/python3.6/site-packages/borg/repository.py
+usr/lib/python3.6/site-packages/borg/shellpattern.py
+#usr/lib/python3.6/site-packages/borg/testsuite
+#usr/lib/python3.6/site-packages/borg/testsuite/__init__.py
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/__init__.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/archive.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/archiver.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/benchmark.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/chunker.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/compress.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/crypto.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/hashindex.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/helpers.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/key.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/locking.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/logger.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/lrucache.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/platform.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/repository.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/shellpattern.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/upgrader.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/xattr.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/archive.py
+#usr/lib/python3.6/site-packages/borg/testsuite/archiver.py
+#usr/lib/python3.6/site-packages/borg/testsuite/attic.tar.gz
+#usr/lib/python3.6/site-packages/borg/testsuite/benchmark.py
+#usr/lib/python3.6/site-packages/borg/testsuite/chunker.py
+#usr/lib/python3.6/site-packages/borg/testsuite/compress.py
+#usr/lib/python3.6/site-packages/borg/testsuite/crypto.py
+#usr/lib/python3.6/site-packages/borg/testsuite/hashindex.py
+#usr/lib/python3.6/site-packages/borg/testsuite/helpers.py
+#usr/lib/python3.6/site-packages/borg/testsuite/key.py
+#usr/lib/python3.6/site-packages/borg/testsuite/locking.py
+#usr/lib/python3.6/site-packages/borg/testsuite/logger.py
+#usr/lib/python3.6/site-packages/borg/testsuite/lrucache.py
+#usr/lib/python3.6/site-packages/borg/testsuite/platform.py
+#usr/lib/python3.6/site-packages/borg/testsuite/repository.py
+#usr/lib/python3.6/site-packages/borg/testsuite/shellpattern.py
+#usr/lib/python3.6/site-packages/borg/testsuite/upgrader.py
+#usr/lib/python3.6/site-packages/borg/testsuite/xattr.py
+usr/lib/python3.6/site-packages/borg/upgrader.py
+usr/lib/python3.6/site-packages/borg/xattr.py
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/PKG-INFO
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/SOURCES.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/dependency_links.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/entry_points.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/requires.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/top_level.txt
diff --git a/config/rootfiles/packages/armv5tel/python3-llfuse b/config/rootfiles/packages/armv5tel/python3-llfuse
new file mode 100644 (file)
index 0000000..d3d7202
--- /dev/null
@@ -0,0 +1,7 @@
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/PKG-INFO
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/SOURCES.txt
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/dependency_links.txt
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/top_level.txt
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/zip-safe
+usr/lib/python3.6/site-packages/llfuse.cpython-36m-arm-linux-gnueabi.so
diff --git a/config/rootfiles/packages/armv5tel/python3-msgpack b/config/rootfiles/packages/armv5tel/python3-msgpack
new file mode 100644 (file)
index 0000000..2961b80
--- /dev/null
@@ -0,0 +1,17 @@
+#usr/lib/python3.6/site-packages/msgpack
+usr/lib/python3.6/site-packages/msgpack/__init__.py
+usr/lib/python3.6/site-packages/msgpack/__pycache__
+usr/lib/python3.6/site-packages/msgpack/__pycache__/__init__.cpython-36.pyc
+usr/lib/python3.6/site-packages/msgpack/__pycache__/_version.cpython-36.pyc
+usr/lib/python3.6/site-packages/msgpack/__pycache__/exceptions.cpython-36.pyc
+usr/lib/python3.6/site-packages/msgpack/__pycache__/fallback.cpython-36.pyc
+usr/lib/python3.6/site-packages/msgpack/_packer.cpython-36m-arm-linux-gnueabi.so
+usr/lib/python3.6/site-packages/msgpack/_unpacker.cpython-36m-arm-linux-gnueabi.so
+usr/lib/python3.6/site-packages/msgpack/_version.py
+usr/lib/python3.6/site-packages/msgpack/exceptions.py
+usr/lib/python3.6/site-packages/msgpack/fallback.py
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/PKG-INFO
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/SOURCES.txt
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/dependency_links.txt
+usr/lib/python3.6/site-packages/msgpack_python-0.5.6-py3.6.egg-info/top_level.txt
diff --git a/config/rootfiles/packages/i586/borgbackup b/config/rootfiles/packages/i586/borgbackup
new file mode 100644 (file)
index 0000000..7655c01
--- /dev/null
@@ -0,0 +1,109 @@
+usr/bin/borg
+usr/lib/python3.6/site-packages/borg
+usr/lib/python3.6/site-packages/borg/__init__.py
+usr/lib/python3.6/site-packages/borg/__main__.py
+usr/lib/python3.6/site-packages/borg/__pycache__
+usr/lib/python3.6/site-packages/borg/__pycache__/__init__.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/__main__.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/_version.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/archive.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/archiver.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/cache.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/fuse.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/helpers.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/key.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/keymanager.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/locking.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/logger.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/lrucache.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/platform.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/remote.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/repository.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/shellpattern.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/upgrader.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/__pycache__/xattr.cpython-36.pyc
+usr/lib/python3.6/site-packages/borg/_chunker.c
+usr/lib/python3.6/site-packages/borg/_hashindex.c
+usr/lib/python3.6/site-packages/borg/_version.py
+usr/lib/python3.6/site-packages/borg/archive.py
+usr/lib/python3.6/site-packages/borg/archiver.py
+usr/lib/python3.6/site-packages/borg/cache.py
+usr/lib/python3.6/site-packages/borg/chunker.c
+usr/lib/python3.6/site-packages/borg/chunker.cpython-36m-i386-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/chunker.pyx
+usr/lib/python3.6/site-packages/borg/compress.c
+usr/lib/python3.6/site-packages/borg/compress.cpython-36m-i386-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/compress.pyx
+usr/lib/python3.6/site-packages/borg/crypto.c
+usr/lib/python3.6/site-packages/borg/crypto.cpython-36m-i386-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/crypto.pyx
+usr/lib/python3.6/site-packages/borg/fuse.py
+usr/lib/python3.6/site-packages/borg/hashindex.c
+usr/lib/python3.6/site-packages/borg/hashindex.cpython-36m-i386-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/hashindex.pyx
+usr/lib/python3.6/site-packages/borg/helpers.py
+usr/lib/python3.6/site-packages/borg/key.py
+usr/lib/python3.6/site-packages/borg/keymanager.py
+usr/lib/python3.6/site-packages/borg/locking.py
+usr/lib/python3.6/site-packages/borg/logger.py
+usr/lib/python3.6/site-packages/borg/lrucache.py
+usr/lib/python3.6/site-packages/borg/paperkey.html
+usr/lib/python3.6/site-packages/borg/platform.py
+usr/lib/python3.6/site-packages/borg/platform_darwin.c
+usr/lib/python3.6/site-packages/borg/platform_darwin.pyx
+usr/lib/python3.6/site-packages/borg/platform_freebsd.c
+usr/lib/python3.6/site-packages/borg/platform_freebsd.pyx
+usr/lib/python3.6/site-packages/borg/platform_linux.c
+usr/lib/python3.6/site-packages/borg/platform_linux.cpython-36m-i386-linux-gnu.so
+usr/lib/python3.6/site-packages/borg/platform_linux.pyx
+usr/lib/python3.6/site-packages/borg/remote.py
+usr/lib/python3.6/site-packages/borg/repository.py
+usr/lib/python3.6/site-packages/borg/shellpattern.py
+#usr/lib/python3.6/site-packages/borg/testsuite
+#usr/lib/python3.6/site-packages/borg/testsuite/__init__.py
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/__init__.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/archive.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/archiver.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/benchmark.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/chunker.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/compress.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/crypto.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/hashindex.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/helpers.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/key.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/locking.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/logger.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/lrucache.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/platform.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/repository.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/shellpattern.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/upgrader.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/__pycache__/xattr.cpython-36.pyc
+#usr/lib/python3.6/site-packages/borg/testsuite/archive.py
+#usr/lib/python3.6/site-packages/borg/testsuite/archiver.py
+#usr/lib/python3.6/site-packages/borg/testsuite/attic.tar.gz
+#usr/lib/python3.6/site-packages/borg/testsuite/benchmark.py
+#usr/lib/python3.6/site-packages/borg/testsuite/chunker.py
+#usr/lib/python3.6/site-packages/borg/testsuite/compress.py
+#usr/lib/python3.6/site-packages/borg/testsuite/crypto.py
+#usr/lib/python3.6/site-packages/borg/testsuite/hashindex.py
+#usr/lib/python3.6/site-packages/borg/testsuite/helpers.py
+#usr/lib/python3.6/site-packages/borg/testsuite/key.py
+#usr/lib/python3.6/site-packages/borg/testsuite/locking.py
+#usr/lib/python3.6/site-packages/borg/testsuite/logger.py
+#usr/lib/python3.6/site-packages/borg/testsuite/lrucache.py
+#usr/lib/python3.6/site-packages/borg/testsuite/platform.py
+#usr/lib/python3.6/site-packages/borg/testsuite/repository.py
+#usr/lib/python3.6/site-packages/borg/testsuite/shellpattern.py
+#usr/lib/python3.6/site-packages/borg/testsuite/upgrader.py
+#usr/lib/python3.6/site-packages/borg/testsuite/xattr.py
+usr/lib/python3.6/site-packages/borg/upgrader.py
+usr/lib/python3.6/site-packages/borg/xattr.py
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/PKG-INFO
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/SOURCES.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/dependency_links.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/entry_points.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/requires.txt
+usr/lib/python3.6/site-packages/borgbackup-1.0.12-py3.6.egg-info/top_level.txt
diff --git a/config/rootfiles/packages/i586/python3-llfuse b/config/rootfiles/packages/i586/python3-llfuse
new file mode 100644 (file)
index 0000000..29c59e3
--- /dev/null
@@ -0,0 +1,7 @@
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/PKG-INFO
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/SOURCES.txt
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/dependency_links.txt
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/top_level.txt
+usr/lib/python3.6/site-packages/llfuse-1.3.5-py3.6.egg-info/zip-safe
+usr/lib/python3.6/site-packages/llfuse.cpython-36m-i386-linux-gnu.so
index 972b207758aa2e1146a63d3795db63d22c45ed82..c75e86f11895ba812af1b7fcfe9c0a6c6b7e50af 100644 (file)
@@ -8,15 +8,18 @@ etc/tor/torrc
 srv/web/ipfire/cgi-bin/tor.cgi
 usr/bin/tor
 usr/bin/tor-gencert
+usr/bin/tor-print-ed-signing-cert
 usr/bin/tor-resolve
 #usr/bin/torify
 usr/local/bin/torctrl
 #usr/share/doc/tor
 #usr/share/doc/tor/tor-gencert.html
+#usr/share/doc/tor/tor-print-ed-signing-cert.html
 #usr/share/doc/tor/tor-resolve.html
 #usr/share/doc/tor/tor.html
 #usr/share/doc/tor/torify.html
 #usr/share/man/man1/tor-gencert.1
+#usr/share/man/man1/tor-print-ed-signing-cert.1
 #usr/share/man/man1/tor-resolve.1
 #usr/share/man/man1/tor.1
 #usr/share/man/man1/torify.1
index 2cc5bab8a23eab251f1256787b515c01f3139f27..e20c3330d7045ac93856ee1eb2e01d7d41b62d83 100644 (file)
@@ -83,12 +83,8 @@ server:
 
 remote-control:
        control-enable: yes
-       control-use-cert: yes
+       control-use-cert: no
        control-interface: 127.0.0.1
-       server-key-file: "/etc/unbound/unbound_server.key"
-       server-cert-file: "/etc/unbound/unbound_server.pem"
-       control-key-file: "/etc/unbound/unbound_control.key"
-       control-cert-file: "/etc/unbound/unbound_control.pem"
 
 # Import any local configurations
 include: "/etc/unbound/local.d/*.conf"
index 16da970ea09f86d858cc4b902f7ff9528e05ddb8..dfa41188c32e4fc753efa8786609a03252997c82 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 17
+PAK_VER    = 18
 
-DEPS       = "avahi cups-filters dbus ghostscript krb5 libtiff"
+DEPS       = "avahi bluetooth cups-filters dbus ghostscript krb5 libtiff"
 
 ###############################################################################
 # Top-level Rules
index f00677b5e7c7f55e6d6e0c57c5c668c0408764a1..e57bbbf4594fc07fdca9746b23f4977217a6df3c 100644 (file)
--- a/lfs/curl
+++ b/lfs/curl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 7.63.0
+VER        = 7.64.0
 
 THISAPP    = curl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6121427a7199cd6094fc48c9e31e8992
+$(DL_FILE)_MD5 = a026740d599a32bcbbe6e70679397899
 
 install : $(TARGET)
 
index cd940ae8b45795b61db05ae716116a760bab4b21..d7372ea8273c61b9ee1ddf02c452587a37788c2a 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 7.1.0
+VER        = 7.1.1
 
 THISAPP    = dhcpcd-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 918520b171f32f0da97316f3bcf3edc1
+$(DL_FILE)_MD5 = adc0a949cb718b455d81deea9ba2875f
 
 install : $(TARGET)
 
diff --git a/lfs/knot b/lfs/knot
new file mode 100644 (file)
index 0000000..729db91
--- /dev/null
+++ b/lfs/knot
@@ -0,0 +1,89 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2019  IPFire Team  <info@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        = 2.7.6
+
+THISAPP    = knot-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 6afbbaff4e9d93de8d6311958d86b323
+
+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 Jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure    \
+               --prefix=/usr           \
+               --enable-static=no      \
+               --disable-daemon        \
+               --disable-modules       \
+               --enable-maxminddb=no   \
+               --disable-documentation
+
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
+
diff --git a/lfs/libedit b/lfs/libedit
new file mode 100644 (file)
index 0000000..f3a831b
--- /dev/null
@@ -0,0 +1,85 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2019  IPFire Team  <info@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        = 20181209-3.1
+
+THISAPP    = libedit-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 22e945a0476e388e6f78bfc8d6e1192c
+
+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 zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure    \
+               --prefix=/usr           \
+               --enable-static=no
+
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
+
index c031f1e80961cba0cbf05e39441fa137837823e8..8b309c0f7c1bdf7a5123cc3c7f0b5ddde067c674 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 4.14.97
-ARM_PATCHES = 4.14.97-ipfire0
+VER         = 4.14.103
+ARM_PATCHES = 4.14.103-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -82,8 +82,8 @@ objects =$(DL_FILE) \
 $(DL_FILE)                                     = $(URL_IPFIRE)/$(DL_FILE)
 arm-multi-patches-$(ARM_PATCHES).patch.xz      = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                                 = 14dc56d3933045782caca454d32e8874
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = b2f6559b08f764c0d974e860660d416a
+$(DL_FILE)_MD5                                 = 7092950433828a3dbe62a981decfd4f8
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = 1cda52264dad96fcba65bd335fbbfa95
 
 install : $(TARGET)
 
@@ -128,11 +128,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch
 
        # Wlan Patches
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/backports-4.2.6-1_ath10k_remove_logspam.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-ath_ignore_eeprom_regd.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-iwlwifi-noibss_only_on_radar_chan.patch
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-rt2x00usb_suppress_queue_warnings.patch
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.39-add_libertas_uap.patch
 
        # Add LED trigger
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.16-ledtrig_netdev.patch
@@ -144,26 +141,23 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8_cs5535audio_fix_logspam_on_geos.patch
 
        # Add PC Engines APU led support
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-apu_leds.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-apu_leds.patch
 
        # Fix uevent PHYSDEVDRIVER
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-2.6.32.27_mcs7830-fix-driver-name.patch
 
 ifeq "$(KCFG)" "-kirkwood"
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.10-mv_cesa_disable_failing_hmac_sha1.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch
 endif
 
 ifeq "$(KCFG)" "-multi"
        # Apply Arm-multiarch kernel patches.
        cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
-
 endif
+
 ifeq "$(BUILD_ARCH)" "aarch64"
        # Apply Arm-multiarch kernel patches.
        cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
 endif
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch
 
index de92af56ac0c4f3e1da6fbe4e2442ea3c55bc64c..f8a12abca784c0104b792917fae127f4cfe2d90b 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = v2.9
+VER        = v2.10
 
 THISAPP    = powertop-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = powertop
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 583518c5c4434c6e9b9c58c3920950b6
+$(DL_FILE)_MD5 = a69bd55901cf919cc564187402ea2c9c
 
 install : $(TARGET)
 
index 28646ef93f06a876a9610e1cbe2bce9502e7690e..171f7ab9116246328b8a0805f2dd7a09979e31d6 100644 (file)
@@ -17,7 +17,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sendEmail
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -63,6 +63,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && cp -pvf sendEmail /usr/local/bin
+       chown root.root /usr/local/bin/sendEmail
        chmod 755 /usr/local/bin/sendEmail
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/lfs/tor b/lfs/tor
index 2c3940638cebd425162afcf917cb820ec2c0f21c..e1027c131671f155817e91491ce7bbb38edd63da 100644 (file)
--- a/lfs/tor
+++ b/lfs/tor
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.3.4.9
+VER        = 0.3.5.7
 
 THISAPP    = tor-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 31
+PAK_VER    = 32
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8a303c7c2491cd27b1646f6efdc4a5d0
+$(DL_FILE)_MD5 = 8076f11045b5a94fd4ef0a0114b845f6
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index f96b74b10e78ebfc439d4813693435c39d62c0f8..8bafd86f97ca3310c432ffedd6773c8adcbaaf4f 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.21"                                                 # Version number
-CORE="128"                                                     # Core Level (Filename)
-PAKFIRE_CORE="127"                                             # Core Level (PAKFIRE)
+CORE="129"                                                     # Core Level (Filename)
+PAKFIRE_CORE="128"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
@@ -1588,6 +1588,8 @@ buildipfire() {
   lfsmake2 dehydrated
   lfsmake2 shairport-sync
   lfsmake2 borgbackup
+  lfsmake2 libedit
+  lfsmake2 knot
 }
 
 buildinstaller() {
index 1ffeda993bbd3ee82235c599ddef3bc7089dbe45..2739a683432b12803b180367070019d83204a2f9 100644 (file)
@@ -294,7 +294,7 @@ iptables_init() {
        iptables -N OVPNINPUT
        iptables -A INPUT -j OVPNINPUT
 
-       # TOR
+       # Tor
        iptables -N TOR_INPUT
        iptables -A INPUT -j TOR_INPUT
        
@@ -414,15 +414,6 @@ iptables_red_up() {
                iptables -A REDINPUT -p udp --source-port 67 --destination-port 68 -i $DEVICE -j ACCEPT
        fi
 
-       # Orange pinholes
-       if [ "$ORANGE_DEV" != "" ]; then
-               # This rule enables a host on ORANGE network to connect to the outside
-               # (only if we have a red connection)
-               if [ "$IFACE" != "" ]; then
-                       iptables -A REDFORWARD -i $ORANGE_DEV -o $IFACE -j ACCEPT
-               fi
-       fi
-
        if [ "$IFACE" != "" -a -f /var/ipfire/red/active ]; then
                # DHCP
                if [ "$RED_DEV" != "" -a "$RED_TYPE" == "DHCP" ]; then
@@ -470,7 +461,7 @@ iptables_red_up() {
 
 iptables_red_down() {
        # Prohibit packets to reach the masquerading rule
-       # while the wan interface is down - this is required to
+       # while the WAN interface is down - this is required to
        # circumvent udp related NAT issues
        # http://forum.ipfire.org/index.php?topic=11127.0
        if [ -n "${IFACE}" ]; then
index 2fad11251e31cf3defab89d082736ff674355b61..e2df11ee01798dc41a755ce96d5452e0bc6efcdd 100644 (file)
@@ -29,10 +29,22 @@ case "${1}" in
                        (exit ${failed})
                        evaluate_retval
 
+                       # check if serial console enabled
+                       scon="off";
+                       if [ ! "$(grep "console=ttyS0" /proc/cmdline)" == "" ]; then
+                               scon="on";
+                       fi
+                       IFS= read -r DMI_PRODUCT_NAME < /sys/class/dmi/id/product_name;
+                       case ${DMI_PRODUCT_NAME} in
+                               APU|apu[1-4]|PC\ Engines\ apu[1-4] )
+                                               scon="on";
+                                       ;;
+                       esac
+
                        mount /boot > /dev/null
                        if [ -e /boot/grub/grub.cfg ]; then
                                # swtich permanent to serial console if it was selected on first boot
-                               if [ ! "$(grep "console=ttyS0" /proc/cmdline)" == "" ]; then
+                               if [ "${scon}" = "on" ]; then
                                        # Enable also serial console on GRUB
                                        echo "GRUB_TERMINAL=\"serial console\"" >> /etc/default/grub
                                        echo "GRUB_SERIAL_COMMAND=\"serial --unit=0 --speed=115200\"" >> /etc/default/grub
index 08007f50a31a0ae51875e9cc9319f9f21f13c1d2..2ef994e963cc1629f5d4ece415f80c036277b2d7 100644 (file)
@@ -507,11 +507,6 @@ case "$1" in
 
                eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 
-               # Create control keys at first run
-               if [ ! -r "/etc/unbound/unbound_control.key" ]; then
-                       unbound-control-setup -d /etc/unbound &>/dev/null
-               fi
-
                # Update configuration files
                write_tuning_conf
                write_forward_conf
diff --git a/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch b/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
deleted file mode 100644 (file)
index e4c8b99..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-From a44147a09baf8c46cc0b02332df3a4656e0659d5 Mon Sep 17 00:00:00 2001
-From: Arne Fitzenreiter <arne_f@ipfire.org>
-Date: Mon, 10 Dec 2018 13:12:00 +0100
-Subject: [PATCH] Revert "usb: dwc2: Fix DMA alignment to start at allocated
- boundary"
-
-This reverts commit 68fc92a0f3913d539d1ac68a861f895e34099e46.
----
- drivers/usb/dwc2/hcd.c | 44 +++++++++++++++++++++-----------------------
- 1 file changed, 21 insertions(+), 23 deletions(-)
-
-diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
-index fa20ec4..4b81d08 100644
---- a/drivers/usb/dwc2/hcd.c
-+++ b/drivers/usb/dwc2/hcd.c
-@@ -2644,29 +2644,34 @@ static int dwc2_alloc_split_dma_aligned_buf(struct dwc2_hsotg *hsotg,
- #define DWC2_USB_DMA_ALIGN 4
-+struct dma_aligned_buffer {
-+      void *kmalloc_ptr;
-+      void *old_xfer_buffer;
-+      u8 data[0];
-+};
-+
- static void dwc2_free_dma_aligned_buffer(struct urb *urb)
- {
--      void *stored_xfer_buffer;
-+      struct dma_aligned_buffer *temp;
-       if (!(urb->transfer_flags & URB_ALIGNED_TEMP_BUFFER))
-               return;
--      /* Restore urb->transfer_buffer from the end of the allocated area */
--      memcpy(&stored_xfer_buffer, urb->transfer_buffer +
--             urb->transfer_buffer_length, sizeof(urb->transfer_buffer));
-+      temp = container_of(urb->transfer_buffer,
-+                          struct dma_aligned_buffer, data);
-       if (usb_urb_dir_in(urb))
--              memcpy(stored_xfer_buffer, urb->transfer_buffer,
-+              memcpy(temp->old_xfer_buffer, temp->data,
-                      urb->transfer_buffer_length);
--      kfree(urb->transfer_buffer);
--      urb->transfer_buffer = stored_xfer_buffer;
-+      urb->transfer_buffer = temp->old_xfer_buffer;
-+      kfree(temp->kmalloc_ptr);
-       urb->transfer_flags &= ~URB_ALIGNED_TEMP_BUFFER;
- }
- static int dwc2_alloc_dma_aligned_buffer(struct urb *urb, gfp_t mem_flags)
- {
--      void *kmalloc_ptr;
-+      struct dma_aligned_buffer *temp, *kmalloc_ptr;
-       size_t kmalloc_size;
-       if (urb->num_sgs || urb->sg ||
-@@ -2674,29 +2679,22 @@ static int dwc2_alloc_dma_aligned_buffer(struct urb *urb, gfp_t mem_flags)
-           !((uintptr_t)urb->transfer_buffer & (DWC2_USB_DMA_ALIGN - 1)))
-               return 0;
--      /*
--       * Allocate a buffer with enough padding for original transfer_buffer
--       * pointer. This allocation is guaranteed to be aligned properly for
--       * DMA
--       */
-+      /* Allocate a buffer with enough padding for alignment */
-       kmalloc_size = urb->transfer_buffer_length +
--              sizeof(urb->transfer_buffer);
-+              sizeof(struct dma_aligned_buffer) + DWC2_USB_DMA_ALIGN - 1;
-       kmalloc_ptr = kmalloc(kmalloc_size, mem_flags);
-       if (!kmalloc_ptr)
-               return -ENOMEM;
--      /*
--       * Position value of original urb->transfer_buffer pointer to the end
--       * of allocation for later referencing
--       */
--      memcpy(kmalloc_ptr + urb->transfer_buffer_length,
--             &urb->transfer_buffer, sizeof(urb->transfer_buffer));
--
-+      /* Position our struct dma_aligned_buffer such that data is aligned */
-+      temp = PTR_ALIGN(kmalloc_ptr + 1, DWC2_USB_DMA_ALIGN) - 1;
-+      temp->kmalloc_ptr = kmalloc_ptr;
-+      temp->old_xfer_buffer = urb->transfer_buffer;
-       if (usb_urb_dir_out(urb))
--              memcpy(kmalloc_ptr, urb->transfer_buffer,
-+              memcpy(temp->data, urb->transfer_buffer,
-                      urb->transfer_buffer_length);
--      urb->transfer_buffer = kmalloc_ptr;
-+      urb->transfer_buffer = temp->data;
-       urb->transfer_flags |= URB_ALIGNED_TEMP_BUFFER;
--- 
-2.7.4
-
similarity index 81%
rename from src/patches/linux/linux-4.9.8-apu_leds.patch
rename to src/patches/linux/linux-4.14-apu_leds.patch
index 27da2f1661c280cb43f2b79cc2987f137b3d65ba..7013f6e6a273bb07e8f0eb64e278e8ac32263899 100644 (file)
@@ -1,7 +1,7 @@
-diff -Naur linux-4.9.8.org/arch/x86/Kconfig linux-4.9.8/arch/x86/Kconfig
---- linux-4.9.8.org/arch/x86/Kconfig   2017-02-04 09:47:29.000000000 +0100
-+++ linux-4.9.8/arch/x86/Kconfig       2017-02-09 19:29:59.244945360 +0100
-@@ -2604,6 +2604,7 @@
+diff -Naur linux-4.14.102.org/arch/x86/Kconfig linux-4.14.102/arch/x86/Kconfig
+--- linux-4.14.102.org/arch/x86/Kconfig        2019-02-20 10:20:56.000000000 +0100
++++ linux-4.14.102/arch/x86/Kconfig    2019-02-22 17:56:37.185202293 +0100
+@@ -2715,6 +2715,7 @@
           - AC adapter status updates
           - Battery status updates
  
@@ -9,7 +9,7 @@ diff -Naur linux-4.9.8.org/arch/x86/Kconfig linux-4.9.8/arch/x86/Kconfig
  config ALIX
        bool "PCEngines ALIX System Support (LED setup)"
        select GPIOLIB
-@@ -2642,6 +2643,18 @@
+@@ -2753,6 +2754,18 @@
  
  endif # X86_32
  
@@ -20,20 +20,20 @@ diff -Naur linux-4.9.8.org/arch/x86/Kconfig linux-4.9.8/arch/x86/Kconfig
 +        This option enables system support for the PCEngines APU1.
 +
 +config APU2LED
-+      bool "PCEngines APU2 Led Support"
++      bool "PCEngines APU2/3/4 Led Support"
 +      depends on DMI
 +      ---help---
-+        This option enables system support for the PCEngines APU2.
++        This option enables system support for the PCEngines APU2/3/4.
 +
  config AMD_NB
        def_bool y
        depends on CPU_SUP_AMD && PCI
-diff -Naur linux-4.9.8.org/arch/x86/platform/apu/apu2-led.c linux-4.9.8/arch/x86/platform/apu/apu2-led.c
---- linux-4.9.8.org/arch/x86/platform/apu/apu2-led.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.8/arch/x86/platform/apu/apu2-led.c       2017-02-09 19:29:59.244945360 +0100
-@@ -0,0 +1,180 @@
+diff -Naur linux-4.14.102.org/arch/x86/platform/apu/apu2-led.c linux-4.14.102/arch/x86/platform/apu/apu2-led.c
+--- linux-4.14.102.org/arch/x86/platform/apu/apu2-led.c        1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14.102/arch/x86/platform/apu/apu2-led.c    2019-02-22 17:58:52.795665744 +0100
+@@ -0,0 +1,185 @@
 +/*
-+ * LEDs driver for PCEngines apu2
++ * LEDs driver for PCEngines apu2/3/4
 + *
 + * this basic driver only set the output, configuration 
 + * has already done by bios/coreboot.
@@ -175,7 +175,12 @@ diff -Naur linux-4.9.8.org/arch/x86/platform/apu/apu2-led.c linux-4.9.8/arch/x86
 +              goto out;
 +
 +      product = dmi_get_system_info(DMI_PRODUCT_NAME);
-+      if (!product || (strcmp(product, "PC Engines apu2") && strcmp(product, "apu2")) )
++      if (!product || ( strcmp(product, "PC Engines apu2") &&
++                        strcmp(product, "PC Engines apu3") &&
++                        strcmp(product, "PC Engines apu4") &&
++                        strcmp(product, "apu2") &&
++                        strcmp(product, "apu3") &&
++                        strcmp(product, "apu4") ) )
 +                      goto out;
 +
 +      printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n",
@@ -210,12 +215,12 @@ diff -Naur linux-4.9.8.org/arch/x86/platform/apu/apu2-led.c linux-4.9.8/arch/x86
 +module_exit(apu2_led_exit);
 +
 +MODULE_AUTHOR("Arne Fitzenreiter");
-+MODULE_DESCRIPTION("PCEngines apu2 LED driver");
++MODULE_DESCRIPTION("PCEngines apu2/3/4 LED driver");
 +MODULE_LICENSE("GPL");
-diff -Naur linux-4.9.8.org/arch/x86/platform/apu/apu-led.c linux-4.9.8/arch/x86/platform/apu/apu-led.c
---- linux-4.9.8.org/arch/x86/platform/apu/apu-led.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.8/arch/x86/platform/apu/apu-led.c        2017-02-09 19:29:59.244945360 +0100
-@@ -0,0 +1,181 @@
+diff -Naur linux-4.14.102.org/arch/x86/platform/apu/apu-led.c linux-4.14.102/arch/x86/platform/apu/apu-led.c
+--- linux-4.14.102.org/arch/x86/platform/apu/apu-led.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14.102/arch/x86/platform/apu/apu-led.c     2019-02-22 17:57:45.062504777 +0100
+@@ -0,0 +1,183 @@
 +/*
 + * LEDs driver for PCEngines apu
 + *
@@ -360,7 +365,9 @@ diff -Naur linux-4.9.8.org/arch/x86/platform/apu/apu-led.c linux-4.9.8/arch/x86/
 +              goto out;
 +
 +      product = dmi_get_system_info(DMI_PRODUCT_NAME);
-+      if (!product || strcmp(product, "APU"))
++      if (!product || ( strcmp(product, "APU") &&
++                        strcmp(product, "apu1") && 
++                        strcmp(product, "PC Engines apu1") ))
 +              goto out;
 +
 +      printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n",
@@ -397,16 +404,17 @@ diff -Naur linux-4.9.8.org/arch/x86/platform/apu/apu-led.c linux-4.9.8/arch/x86/
 +MODULE_AUTHOR("Christian Herzog");
 +MODULE_DESCRIPTION("PCEngines apu LED driver");
 +MODULE_LICENSE("GPL");
-diff -Naur linux-4.9.8.org/arch/x86/platform/apu/Makefile linux-4.9.8/arch/x86/platform/apu/Makefile
---- linux-4.9.8.org/arch/x86/platform/apu/Makefile     1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.8/arch/x86/platform/apu/Makefile 2017-02-09 19:29:59.244945360 +0100
+diff -Naur linux-4.14.102.org/arch/x86/platform/apu/Makefile linux-4.14.102/arch/x86/platform/apu/Makefile
+--- linux-4.14.102.org/arch/x86/platform/apu/Makefile  1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14.102/arch/x86/platform/apu/Makefile      2019-02-22 17:56:37.185202293 +0100
 @@ -0,0 +1,2 @@
 +obj-$(CONFIG_APULED)          += apu-led.o
 +obj-$(CONFIG_APU2LED)         += apu2-led.o
-diff -Naur linux-4.9.8.org/arch/x86/platform/Makefile linux-4.9.8/arch/x86/platform/Makefile
---- linux-4.9.8.org/arch/x86/platform/Makefile 2017-02-04 09:47:29.000000000 +0100
-+++ linux-4.9.8/arch/x86/platform/Makefile     2017-02-09 19:32:31.768269470 +0100
-@@ -1,4 +1,5 @@
+diff -Naur linux-4.14.102.org/arch/x86/platform/Makefile linux-4.14.102/arch/x86/platform/Makefile
+--- linux-4.14.102.org/arch/x86/platform/Makefile      2019-02-20 10:20:56.000000000 +0100
++++ linux-4.14.102/arch/x86/platform/Makefile  2019-02-22 17:56:37.185202293 +0100
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
  # Platform specific code goes here
 +obj-y += apu/
  obj-y += atom/
diff --git a/tools/find-missing-libs.sh b/tools/find-missing-libs.sh
new file mode 100644 (file)
index 0000000..624ee00
--- /dev/null
@@ -0,0 +1,18 @@
+#!/bin/bash
+# This scripts lists binaries that have missing libraries.
+# Arguments are paths to search in
+
+main() {
+       local path
+       for path in $@; do
+               local file
+               for file in $(find "${path}" -type f); do
+                       if ldd "${file}" 2>/dev/null | grep -q "not found"; then
+                               echo "${file}"
+                               ldd "${file}"
+                       fi
+               done
+       done
+}
+
+main "$@" || exit $?