From: Michael Tremer Date: Mon, 17 Aug 2020 10:19:47 +0000 (+0000) Subject: core149: Ship everything that was recently updated X-Git-Tag: v2.25-core149~6^2~36 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=8d25e59811706818350b2084b8e610f9e1447a68 core149: Ship everything that was recently updated Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/149/filelists/aarch64/gcc b/config/rootfiles/core/149/filelists/aarch64/gcc new file mode 120000 index 0000000000..97678cc16b --- /dev/null +++ b/config/rootfiles/core/149/filelists/aarch64/gcc @@ -0,0 +1 @@ +../../../../common/aarch64/gcc \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/aarch64/glibc b/config/rootfiles/core/149/filelists/aarch64/glibc new file mode 120000 index 0000000000..d13849ff91 --- /dev/null +++ b/config/rootfiles/core/149/filelists/aarch64/glibc @@ -0,0 +1 @@ +../../../../common/aarch64/glibc \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/aarch64/gmp b/config/rootfiles/core/149/filelists/aarch64/gmp new file mode 120000 index 0000000000..418f2f98b9 --- /dev/null +++ b/config/rootfiles/core/149/filelists/aarch64/gmp @@ -0,0 +1 @@ +../../../../common/aarch64/gmp \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/apache2 b/config/rootfiles/core/149/filelists/apache2 new file mode 120000 index 0000000000..eef95efa72 --- /dev/null +++ b/config/rootfiles/core/149/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/armv5tel/gcc b/config/rootfiles/core/149/filelists/armv5tel/gcc new file mode 120000 index 0000000000..84f7b9344e --- /dev/null +++ b/config/rootfiles/core/149/filelists/armv5tel/gcc @@ -0,0 +1 @@ +../../../../common/armv5tel/gcc \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/armv5tel/glibc b/config/rootfiles/core/149/filelists/armv5tel/glibc new file mode 120000 index 0000000000..4c70d724b4 --- /dev/null +++ b/config/rootfiles/core/149/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/armv5tel/gmp b/config/rootfiles/core/149/filelists/armv5tel/gmp new file mode 120000 index 0000000000..2bdf30dacf --- /dev/null +++ b/config/rootfiles/core/149/filelists/armv5tel/gmp @@ -0,0 +1 @@ +../../../../common/armv5tel/gmp \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/curl b/config/rootfiles/core/149/filelists/curl new file mode 120000 index 0000000000..4b84bef53a --- /dev/null +++ b/config/rootfiles/core/149/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/files b/config/rootfiles/core/149/filelists/files index 95a56178bd..7348df2b60 100644 --- a/config/rootfiles/core/149/filelists/files +++ b/config/rootfiles/core/149/filelists/files @@ -1,6 +1,8 @@ etc/system-release etc/issue srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi var/ipfire/langs etc/rc.d/helper/oci-setup etc/rc.d/init.d/cloud-init diff --git a/config/rootfiles/core/149/filelists/gnutls b/config/rootfiles/core/149/filelists/gnutls new file mode 120000 index 0000000000..8dbe60bc32 --- /dev/null +++ b/config/rootfiles/core/149/filelists/gnutls @@ -0,0 +1 @@ +../../../common/gnutls \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/gzip b/config/rootfiles/core/149/filelists/gzip new file mode 120000 index 0000000000..aebcccd874 --- /dev/null +++ b/config/rootfiles/core/149/filelists/gzip @@ -0,0 +1 @@ +../../../common/gzip \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/i586/gcc b/config/rootfiles/core/149/filelists/i586/gcc new file mode 120000 index 0000000000..ba328e3b68 --- /dev/null +++ b/config/rootfiles/core/149/filelists/i586/gcc @@ -0,0 +1 @@ +../../../../common/i586/gcc \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/i586/glibc b/config/rootfiles/core/149/filelists/i586/glibc new file mode 120000 index 0000000000..943021f19a --- /dev/null +++ b/config/rootfiles/core/149/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/i586/gmp b/config/rootfiles/core/149/filelists/i586/gmp new file mode 120000 index 0000000000..52a09cd0ba --- /dev/null +++ b/config/rootfiles/core/149/filelists/i586/gmp @@ -0,0 +1 @@ +../../../../common/i586/gmp \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/i586/hyperscan b/config/rootfiles/core/149/filelists/i586/hyperscan new file mode 120000 index 0000000000..85730b04f7 --- /dev/null +++ b/config/rootfiles/core/149/filelists/i586/hyperscan @@ -0,0 +1 @@ +../../../../common/i586/hyperscan \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/i586/openssl-sse2 b/config/rootfiles/core/149/filelists/i586/openssl-sse2 new file mode 120000 index 0000000000..f424713d6c --- /dev/null +++ b/config/rootfiles/core/149/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/iproute2 b/config/rootfiles/core/149/filelists/iproute2 new file mode 120000 index 0000000000..05f0f71fb5 --- /dev/null +++ b/config/rootfiles/core/149/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/kbd b/config/rootfiles/core/149/filelists/kbd new file mode 120000 index 0000000000..9b85839b1f --- /dev/null +++ b/config/rootfiles/core/149/filelists/kbd @@ -0,0 +1 @@ +../../../common/kbd \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/libloc b/config/rootfiles/core/149/filelists/libloc new file mode 120000 index 0000000000..ff4a92429c --- /dev/null +++ b/config/rootfiles/core/149/filelists/libloc @@ -0,0 +1 @@ +../../../common/libloc \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/logrotate b/config/rootfiles/core/149/filelists/logrotate new file mode 120000 index 0000000000..bc192c05db --- /dev/null +++ b/config/rootfiles/core/149/filelists/logrotate @@ -0,0 +1 @@ +../../../common/logrotate \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/mpfr b/config/rootfiles/core/149/filelists/mpfr new file mode 120000 index 0000000000..c8468bf42f --- /dev/null +++ b/config/rootfiles/core/149/filelists/mpfr @@ -0,0 +1 @@ +../../../common/mpfr \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/openssl b/config/rootfiles/core/149/filelists/openssl new file mode 120000 index 0000000000..e011a9266c --- /dev/null +++ b/config/rootfiles/core/149/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/perl b/config/rootfiles/core/149/filelists/perl new file mode 120000 index 0000000000..478292aa52 --- /dev/null +++ b/config/rootfiles/core/149/filelists/perl @@ -0,0 +1 @@ +../../../common/perl \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/squid b/config/rootfiles/core/149/filelists/squid new file mode 120000 index 0000000000..2dc8372a0e --- /dev/null +++ b/config/rootfiles/core/149/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/strongswan b/config/rootfiles/core/149/filelists/strongswan new file mode 120000 index 0000000000..90c727e265 --- /dev/null +++ b/config/rootfiles/core/149/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/suricata b/config/rootfiles/core/149/filelists/suricata new file mode 120000 index 0000000000..f671f69933 --- /dev/null +++ b/config/rootfiles/core/149/filelists/suricata @@ -0,0 +1 @@ +../../../common/suricata \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/x86_64/gcc b/config/rootfiles/core/149/filelists/x86_64/gcc new file mode 120000 index 0000000000..d1616d377c --- /dev/null +++ b/config/rootfiles/core/149/filelists/x86_64/gcc @@ -0,0 +1 @@ +../../../../common/x86_64/gcc \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/x86_64/glibc b/config/rootfiles/core/149/filelists/x86_64/glibc new file mode 120000 index 0000000000..1119099669 --- /dev/null +++ b/config/rootfiles/core/149/filelists/x86_64/glibc @@ -0,0 +1 @@ +../../../../common/x86_64/glibc \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/x86_64/gmp b/config/rootfiles/core/149/filelists/x86_64/gmp new file mode 120000 index 0000000000..7c59c60c68 --- /dev/null +++ b/config/rootfiles/core/149/filelists/x86_64/gmp @@ -0,0 +1 @@ +../../../../common/x86_64/gmp \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/x86_64/hyperscan b/config/rootfiles/core/149/filelists/x86_64/hyperscan new file mode 120000 index 0000000000..ee1858dca2 --- /dev/null +++ b/config/rootfiles/core/149/filelists/x86_64/hyperscan @@ -0,0 +1 @@ +../../../../common/x86_64/hyperscan \ No newline at end of file diff --git a/config/rootfiles/core/149/filelists/xz b/config/rootfiles/core/149/filelists/xz new file mode 120000 index 0000000000..734e926c7e --- /dev/null +++ b/config/rootfiles/core/149/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/core/149/update.sh b/config/rootfiles/core/149/update.sh index d7067a4cc9..6db2e9a020 100644 --- a/config/rootfiles/core/149/update.sh +++ b/config/rootfiles/core/149/update.sh @@ -49,6 +49,7 @@ ldconfig /usr/local/bin/filesystem-cleanup # Start services +/etc/init.d/apache2 restart # Update crontab sed -i /var/spool/cron/root.orig \ @@ -63,7 +64,7 @@ if [ -e /boot/grub/grub.cfg ]; then fi # This update needs a reboot... -#touch /var/run/need_reboot +touch /var/run/need_reboot # Finish /etc/init.d/fireinfo start