IPFire-SCM February 2020

ipfire-scm@lists.ipfire.org

1 participants
46 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1eef496d47de2136929254b491f9b60fe6f8d5fc
by Arne Fitzenreiter 20 Feb '20

20 Feb '20

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 1eef496d47de2136929254b491f9b60fe6f8d5fc (commit) from c7dd86b323fa3cdc030b0278bba233b69562d072 (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 1eef496d47de2136929254b491f9b60fe6f8d5fc Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Feb 1 21:38:00 2020 +0000 Tor: update to 0.4.2.6 Please refer to https://blog.torproject.org/new-releases-tor-0426-0418 for release notes. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/tor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/tor b/lfs/tor index b2a8d5ce0..cbe1a431b 100644 --- a/lfs/tor +++ b/lfs/tor @@ -24,7 +24,7 @@ include Config -VER = 0.4.2.5 +VER = 0.4.2.6 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 = 45 +PAK_VER = 46 DEPS = "libseccomp" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ea9e9078ff2e175332f0095c60284458 +$(DL_FILE)_MD5 = 33383c897640e6ea55ab82c80d772ee0 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c7dd86b323fa3cdc030b0278bba233b69562d072
by Arne Fitzenreiter 20 Feb '20

20 Feb '20

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 c7dd86b323fa3cdc030b0278bba233b69562d072 (commit) from a62be8a2d9fecc59a7592f1a8347b0087148a896 (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 c7dd86b323fa3cdc030b0278bba233b69562d072 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Feb 20 11:32:43 2020 +0000 core142: add changed u-boot files to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/129 => core/142}/filelists/aarch64/u-boot | 0 .../{oldcore/129/filelists/aarch64 => core/142/filelists/armv5tel}/u-boot | 0 2 files changed, 0 insertions(+), 0 deletions(-) copy config/rootfiles/{oldcore/129 => core/142}/filelists/aarch64/u-boot (100%) copy config/rootfiles/{oldcore/129/filelists/aarch64 => core/142/filelists/armv5tel}/u-boot (100%) Difference in files: diff --git a/config/rootfiles/core/142/filelists/aarch64/u-boot b/config/rootfiles/core/142/filelists/aarch64/u-boot new file mode 100644 index 000000000..6a00446f4 --- /dev/null +++ b/config/rootfiles/core/142/filelists/aarch64/u-boot @@ -0,0 +1,2 @@ +boot/boot.cmd +boot/boot.scr diff --git a/config/rootfiles/core/142/filelists/armv5tel/u-boot b/config/rootfiles/core/142/filelists/armv5tel/u-boot new file mode 100644 index 000000000..6a00446f4 --- /dev/null +++ b/config/rootfiles/core/142/filelists/armv5tel/u-boot @@ -0,0 +1,2 @@ +boot/boot.cmd +boot/boot.scr hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a62be8a2d9fecc59a7592f1a8347b0087148a896
by Arne Fitzenreiter 20 Feb '20

20 Feb '20

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 a62be8a2d9fecc59a7592f1a8347b0087148a896 (commit) via 777ba8192ccda88d0fb66cb42b28ec2fd209db87 (commit) from 8569b3e11be974db7d11da779ce8c66b4dadfa81 (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 a62be8a2d9fecc59a7592f1a8347b0087148a896 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Feb 20 12:24:36 2020 +0100 u-boot: add quirk for rpi on aarch64 the current rpi u-boot will not load the ramdisk correctly so the kernel will crash with loaded ramdisk. Remove ramdisk and replace root UUID by /dev/mmcblk0p3 if boot was on armv8 and rpi. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 777ba8192ccda88d0fb66cb42b28ec2fd209db87 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Feb 20 12:21:28 2020 +0100 u-boot: remove kirkwood kernel detection from bootscript Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/u-boot/boot.cmd | 22 ++++++++++++++-------- config/u-boot/boot.scr | Bin 2607 -> 2736 bytes 2 files changed, 14 insertions(+), 8 deletions(-) Difference in files: diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd index b86b6809a..b2fe0684f 100644 --- a/config/u-boot/boot.cmd +++ b/config/u-boot/boot.cmd @@ -11,15 +11,11 @@ if test ${boot_part} = ""; then setenv boot_part ${dev_num}:1; fi; -if test ${soc} = "kirkwood"; then - setenv kernel_type -kirkwood; +if test ${cpu} = "armv8"; then + echo ; else - if test ${cpu} = "armv8"; then - echo ; - else - setenv kernel_type -multi; + setenv kernel_type -multi; fi; -fi; # Import uEnv txt... if fatload ${boot_dev} ${boot_part} ${kernel_addr_r} uEnv.txt; then @@ -91,7 +87,17 @@ if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${kernel else echo Ramdisk not loaded...; setenv ramdisk_addr -; -fi ; +fi; + +# Quirk for RPi on aarch64 becuase u-boot cannot use the +# initrd on aarch64 +if test ${cpu} = "armv8"; then + if test ${board} = "rpi"; then + setenv ramdisk_addr -; + setenv root_dev /dev/mmcblk0p3; + fi; +fi; + bootz ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r}; booti ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r}; diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr index b3c6bc2c8..d7b604849 100644 Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8569b3e11be974db7d11da779ce8c66b4dadfa81
by Arne Fitzenreiter 19 Feb '20

19 Feb '20

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 8569b3e11be974db7d11da779ce8c66b4dadfa81 (commit) from 2b6b6df32af111e54ec71678e4424bc729c85efc (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 8569b3e11be974db7d11da779ce8c66b4dadfa81 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Feb 19 14:51:48 2020 +0000 red.up: move update-dns-forwareders behind the firewall Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/aarch64/initscripts | 2 +- config/rootfiles/common/armv5tel/initscripts | 2 +- config/rootfiles/common/i586/initscripts | 2 +- config/rootfiles/common/x86_64/initscripts | 2 +- config/rootfiles/core/142/update.sh | 4 ++++ .../red.up/{05-update-dns-forwarders => 22-update-dns-forwarders} | 0 6 files changed, 8 insertions(+), 4 deletions(-) rename src/initscripts/networking/red.up/{05-update-dns-forwarders => 22-update-dns-forwarders} (100%) Difference in files: diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index ddf098ed4..34ea1433f 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -51,11 +51,11 @@ etc/rc.d/init.d/networking/red.down/20-firewall etc/rc.d/init.d/networking/red.down/99-beep #etc/rc.d/init.d/networking/red.up etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup -etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders etc/rc.d/init.d/networking/red.up/10-miniupnpd etc/rc.d/init.d/networking/red.up/10-multicast etc/rc.d/init.d/networking/red.up/10-static-routes etc/rc.d/init.d/networking/red.up/20-firewall +etc/rc.d/init.d/networking/red.up/22-update-dns-forwarders etc/rc.d/init.d/networking/red.up/23-suricata etc/rc.d/init.d/networking/red.up/24-RS-qos etc/rc.d/init.d/networking/red.up/27-RS-squid diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index ddf098ed4..34ea1433f 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -51,11 +51,11 @@ etc/rc.d/init.d/networking/red.down/20-firewall etc/rc.d/init.d/networking/red.down/99-beep #etc/rc.d/init.d/networking/red.up etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup -etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders etc/rc.d/init.d/networking/red.up/10-miniupnpd etc/rc.d/init.d/networking/red.up/10-multicast etc/rc.d/init.d/networking/red.up/10-static-routes etc/rc.d/init.d/networking/red.up/20-firewall +etc/rc.d/init.d/networking/red.up/22-update-dns-forwarders etc/rc.d/init.d/networking/red.up/23-suricata etc/rc.d/init.d/networking/red.up/24-RS-qos etc/rc.d/init.d/networking/red.up/27-RS-squid diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index e666ed84e..9350b0e90 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -51,11 +51,11 @@ etc/rc.d/init.d/networking/red.down/20-firewall etc/rc.d/init.d/networking/red.down/99-beep #etc/rc.d/init.d/networking/red.up etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup -etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders etc/rc.d/init.d/networking/red.up/10-miniupnpd etc/rc.d/init.d/networking/red.up/10-multicast etc/rc.d/init.d/networking/red.up/10-static-routes etc/rc.d/init.d/networking/red.up/20-firewall +etc/rc.d/init.d/networking/red.up/22-update-dns-forwarders etc/rc.d/init.d/networking/red.up/23-suricata etc/rc.d/init.d/networking/red.up/24-RS-qos etc/rc.d/init.d/networking/red.up/27-RS-squid diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index e666ed84e..9350b0e90 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -51,11 +51,11 @@ etc/rc.d/init.d/networking/red.down/20-firewall etc/rc.d/init.d/networking/red.down/99-beep #etc/rc.d/init.d/networking/red.up etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup -etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders etc/rc.d/init.d/networking/red.up/10-miniupnpd etc/rc.d/init.d/networking/red.up/10-multicast etc/rc.d/init.d/networking/red.up/10-static-routes etc/rc.d/init.d/networking/red.up/20-firewall +etc/rc.d/init.d/networking/red.up/22-update-dns-forwarders etc/rc.d/init.d/networking/red.up/23-suricata etc/rc.d/init.d/networking/red.up/24-RS-qos etc/rc.d/init.d/networking/red.up/27-RS-squid diff --git a/config/rootfiles/core/142/update.sh b/config/rootfiles/core/142/update.sh index 91d89c5b8..7f23ff1cc 100644 --- a/config/rootfiles/core/142/update.sh +++ b/config/rootfiles/core/142/update.sh @@ -92,6 +92,10 @@ rm -rf /usr/lib/pppd/2.4.7 # Extract files extract_files +# move update forwarders below firewall +mv -f /etc/rc.d/init.d/netowrking/red.up/05-update-dns-forwarders \ + /etc/rc.d/init.d/netowrking/red.up/22-update-dns-forwarders + # update linker config ldconfig diff --git a/src/initscripts/networking/red.up/05-update-dns-forwarders b/src/initscripts/networking/red.up/22-update-dns-forwarders similarity index 100% rename from src/initscripts/networking/red.up/05-update-dns-forwarders rename to src/initscripts/networking/red.up/22-update-dns-forwarders hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2b6b6df32af111e54ec71678e4424bc729c85efc
by Arne Fitzenreiter 19 Feb '20

19 Feb '20

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 2b6b6df32af111e54ec71678e4424bc729c85efc (commit) from 068747163af47bffc8d34e312a90d2472d5f2367 (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 2b6b6df32af111e54ec71678e4424bc729c85efc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Feb 19 08:49:21 2020 +0000 flash-images: update the uENV root UUID also on arch64 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/flash-images | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/lfs/flash-images b/lfs/flash-images index 332bd1fdf..e4af896f1 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -215,7 +215,7 @@ endif rm -f $(MNThdd)/etc/grub.d/11_linux_scon endif -ifeq "$(BUILD_ARCH)" "armv5tel" +ifeq "$(BUILD_PLATFORM)" "arm" # Insert the UUID to uENV.txt sed -i $(MNThdd)/boot/uENV.txt \ -e "s/^root_dev=.*/root_dev=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 068747163af47bffc8d34e312a90d2472d5f2367
by Arne Fitzenreiter 18 Feb '20

18 Feb '20

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 068747163af47bffc8d34e312a90d2472d5f2367 (commit) via 8f60b4ff30a70a50d859cc5b486b53ab7ca6e07d (commit) from c2b6c29a0d77b7d55494b8ab9f1d0cf9b7cfdd2e (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 068747163af47bffc8d34e312a90d2472d5f2367 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 18 17:13:48 2020 +0000 core142: add ppp to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 8f60b4ff30a70a50d859cc5b486b53ab7ca6e07d Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 18 11:18:13 2020 +0100 ppp: Update to 2.4.8 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/ppp | 24 ++--- .../{oldcore/125 => core/142}/filelists/ppp | 0 config/rootfiles/core/142/update.sh | 3 +- lfs/ppp | 7 +- src/patches/ppp-2.4.7-openssl.patch | 110 --------------------- .../ppp/0013-everywhere-O_CLOEXEC-harder.patch | 11 ++- 6 files changed, 23 insertions(+), 132 deletions(-) copy config/rootfiles/{oldcore/125 => core/142}/filelists/ppp (100%) delete mode 100644 src/patches/ppp-2.4.7-openssl.patch Difference in files: diff --git a/config/rootfiles/common/ppp b/config/rootfiles/common/ppp index 46c2f83b3..f1f4f88f2 100644 --- a/config/rootfiles/common/ppp +++ b/config/rootfiles/common/ppp @@ -33,18 +33,18 @@ etc/ppp/standardloginscript #usr/include/pppd/tdb.h #usr/include/pppd/upap.h usr/lib/pppd -usr/lib/pppd/2.4.7 -#usr/lib/pppd/2.4.7/minconn.so -#usr/lib/pppd/2.4.7/openl2tp.so -#usr/lib/pppd/2.4.7/passprompt.so -#usr/lib/pppd/2.4.7/passwordfd.so -#usr/lib/pppd/2.4.7/pppoatm.so -#usr/lib/pppd/2.4.7/pppol2tp.so -#usr/lib/pppd/2.4.7/radattr.so -#usr/lib/pppd/2.4.7/radius.so -#usr/lib/pppd/2.4.7/radrealms.so -#usr/lib/pppd/2.4.7/rp-pppoe.so -#usr/lib/pppd/2.4.7/winbind.so +usr/lib/pppd/2.4.8 +#usr/lib/pppd/2.4.8/minconn.so +#usr/lib/pppd/2.4.8/openl2tp.so +#usr/lib/pppd/2.4.8/passprompt.so +#usr/lib/pppd/2.4.8/passwordfd.so +#usr/lib/pppd/2.4.8/pppoatm.so +#usr/lib/pppd/2.4.8/pppol2tp.so +#usr/lib/pppd/2.4.8/radattr.so +#usr/lib/pppd/2.4.8/radius.so +#usr/lib/pppd/2.4.8/radrealms.so +#usr/lib/pppd/2.4.8/rp-pppoe.so +#usr/lib/pppd/2.4.8/winbind.so usr/sbin/chat usr/sbin/pppd usr/sbin/pppdump diff --git a/config/rootfiles/core/142/filelists/ppp b/config/rootfiles/core/142/filelists/ppp new file mode 120000 index 000000000..4844a9b58 --- /dev/null +++ b/config/rootfiles/core/142/filelists/ppp @@ -0,0 +1 @@ +../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/core/142/update.sh b/config/rootfiles/core/142/update.sh index e1877881a..91d89c5b8 100644 --- a/config/rootfiles/core/142/update.sh +++ b/config/rootfiles/core/142/update.sh @@ -85,6 +85,7 @@ rm -rf /lib/modules # Remove files rm -rf /usr/lib/python2.7/site-packages/ddns +rm -rf /usr/lib/pppd/2.4.7 # Stop services @@ -95,7 +96,7 @@ extract_files ldconfig # Update Language cache -# /usr/local/bin/update-lang-cache +/usr/local/bin/update-lang-cache # Filesytem cleanup /usr/local/bin/filesystem-cleanup diff --git a/lfs/ppp b/lfs/ppp index f02864cc0..607765bd0 100644 --- a/lfs/ppp +++ b/lfs/ppp @@ -24,12 +24,12 @@ include Config -VER = 2.4.7 +VER = 2.4.8 THISAPP = ppp-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) +DIR_APP = $(DIR_SRC)/ppp-$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) CFLAGS += -fno-strict-aliasing @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 78818f40e6d33a1d1de68a1551f6595a +$(DL_FILE)_MD5 = fa325e90e43975a1bd7e1012c8676123 install : $(TARGET) @@ -79,7 +79,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.7-headers_4.9.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp-2.4.7-openssl.patch cd $(DIR_APP) && sed -i -e "s+/etc/ppp/connect-errors+/var/log/connect-errors+" pppd/pathnames.h cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls cd $(DIR_APP) && make $(MAKETUNING) CC="gcc" RPM_OPT_FLAGS="$(CFLAGS)" diff --git a/src/patches/ppp-2.4.7-openssl.patch b/src/patches/ppp-2.4.7-openssl.patch deleted file mode 100644 index cbb5857a7..000000000 --- a/src/patches/ppp-2.4.7-openssl.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 3c7b86229f7bd2600d74db14b1fe5b3896be3875 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad(a)redhat.com> -Date: Fri, 6 Apr 2018 14:27:18 +0200 -Subject: [PATCH] pppd: Use openssl for the DES instead of the libcrypt / glibc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It seems the latest glibc (in Fedora glibc-2.27.9000-12.fc29) dropped -libcrypt. The libxcrypt standalone package can be used instead, but -it dropped the old setkey/encrypt API which ppp uses for DES. There -is support for using openssl in pppcrypt.c, but it contains typos -preventing it from compiling and seems to be written for an ancient -openssl version. - -This updates the code to use current openssl. - -[paulus(a)ozlabs.org - wrote the commit description, fixed comment in - Makefile.linux.] - -Signed-off-by: Jaroslav Škarvada <jskarvad(a)redhat.com> -Signed-off-by: Paul Mackerras <paulus(a)ozlabs.org> ---- - pppd/Makefile.linux | 7 ++++--- - pppd/pppcrypt.c | 18 +++++++++--------- - 2 files changed, 13 insertions(+), 12 deletions(-) - -diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 36d2b036..8d5ce99d 100644 ---- a/pppd/Makefile.linux -+++ b/pppd/Makefile.linux -@@ -35,10 +35,10 @@ endif - COPTS = -O2 -pipe -Wall -g - LIBS = - --# Uncomment the next 2 lines to include support for Microsoft's -+# Uncomment the next line to include support for Microsoft's - # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux. - CHAPMS=y --USE_CRYPT=y -+#USE_CRYPT=y - # Don't use MSLANMAN unless you really know what you're doing. - #MSLANMAN=y - # Uncomment the next line to include support for MPPE. CHAPMS (above) must -@@ -137,7 +137,8 @@ endif - - ifdef NEEDDES - ifndef USE_CRYPT --LIBS += -ldes $(LIBS) -+CFLAGS += -I/usr/include/openssl -+LIBS += -lcrypto - else - CFLAGS += -DUSE_CRYPT=1 - endif -diff --git a/pppd/pppcrypt.c b/pppd/pppcrypt.c -index 8b85b132..6b35375e 100644 ---- a/pppd/pppcrypt.c -+++ b/pppd/pppcrypt.c -@@ -64,7 +64,7 @@ u_char *des_key; /* OUT 64 bit DES key with parity bits added */ - des_key[7] = Get7Bits(key, 49); - - #ifndef USE_CRYPT -- des_set_odd_parity((des_cblock *)des_key); -+ DES_set_odd_parity((DES_cblock *)des_key); - #endif - } - -@@ -158,25 +158,25 @@ u_char *clear; /* OUT 8 octets */ - } - - #else /* USE_CRYPT */ --static des_key_schedule key_schedule; -+static DES_key_schedule key_schedule; - - bool - DesSetkey(key) - u_char *key; - { -- des_cblock des_key; -+ DES_cblock des_key; - MakeKey(key, des_key); -- des_set_key(&des_key, key_schedule); -+ DES_set_key(&des_key, &key_schedule); - return (1); - } - - bool --DesEncrypt(clear, key, cipher) -+DesEncrypt(clear, cipher) - u_char *clear; /* IN 8 octets */ - u_char *cipher; /* OUT 8 octets */ - { -- des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher, -- key_schedule, 1); -+ DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher, -+ &key_schedule, 1); - return (1); - } - -@@ -185,8 +185,8 @@ DesDecrypt(cipher, clear) - u_char *cipher; /* IN 8 octets */ - u_char *clear; /* OUT 8 octets */ - { -- des_ecb_encrypt((des_cblock *)cipher, (des_cblock *)clear, -- key_schedule, 0); -+ DES_ecb_encrypt((DES_cblock *)cipher, (DES_cblock *)clear, -+ &key_schedule, 0); - return (1); - } - diff --git a/src/patches/ppp/0013-everywhere-O_CLOEXEC-harder.patch b/src/patches/ppp/0013-everywhere-O_CLOEXEC-harder.patch index e3608a0d6..2513021b2 100644 --- a/src/patches/ppp/0013-everywhere-O_CLOEXEC-harder.patch +++ b/src/patches/ppp/0013-everywhere-O_CLOEXEC-harder.patch @@ -140,16 +140,17 @@ index 8a12fa0..00a2cf5 100644 if (mfd >= 0) { int ptn; if (ioctl(mfd, TIOCGPTN, &ptn) >= 0) { -@@ -2581,7 +2581,7 @@ get_pty(master_fdp, slave_fdp, slave_name, uid) +@@ -2851,7 +2851,8 @@ if (ioctl(mfd, TIOCSPTLCK, &ptn) < 0) warn("Couldn't unlock pty slave %s: %m", pty_name); #endif - if ((sfd = open(pty_name, O_RDWR | O_NOCTTY)) < 0) -+ if ((sfd = open(pty_name, O_RDWR | O_NOCTTY | O_CLOEXEC)) < 0) ++ ++ if ((sfd = open(pty_name, O_RDWR | O_NOCTTY | O_CLOEXEC)) < 0) + { warn("Couldn't open pty slave %s: %m", pty_name); - } - } -@@ -2592,10 +2592,10 @@ get_pty(master_fdp, slave_fdp, slave_name, uid) + close(mfd); +@@ -2865,10 +2866,10 @@ for (i = 0; i < 64; ++i) { slprintf(pty_name, sizeof(pty_name), "/dev/pty%c%x", 'p' + i / 16, i % 16); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c2b6c29a0d77b7d55494b8ab9f1d0cf9b7cfdd2e
by Arne Fitzenreiter 18 Feb '20

18 Feb '20

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 c2b6c29a0d77b7d55494b8ab9f1d0cf9b7cfdd2e (commit) from 31ba6f6fc99bd124bcc87e04d6087fdc2c401ddb (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 c2b6c29a0d77b7d55494b8ab9f1d0cf9b7cfdd2e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Feb 17 21:47:25 2020 +0000 elinks: suppress welcome dialog Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/elinks | 3 +++ lfs/elinks | 6 ++++++ 2 files changed, 9 insertions(+) Difference in files: diff --git a/config/rootfiles/common/elinks b/config/rootfiles/common/elinks index 45c83b176..a29fe8e33 100644 --- a/config/rootfiles/common/elinks +++ b/config/rootfiles/common/elinks @@ -1,3 +1,6 @@ +#root/.elinks +root/.elinks/bookmarks +root/.elinks/globhist usr/local/bin/elinks #usr/local/etc #usr/local/etc/elinks diff --git a/lfs/elinks b/lfs/elinks index 7c7f09cba..d6ec0875c 100644 --- a/lfs/elinks +++ b/lfs/elinks @@ -87,5 +87,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mkdir -p /usr/local/etc/elinks cp -vf $(DIR_SRC)/config/elinks/elinks.conf /usr/local/etc/elinks/elinks.conf + # Suppress first welcome dialog by creating bookmark + # and history files for root + mkdir -p /root/.elinks + touch /root/.elinks/bookmarks + touch /root/.elinks/globhist + @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 31ba6f6fc99bd124bcc87e04d6087fdc2c401ddb
by Arne Fitzenreiter 17 Feb '20

17 Feb '20

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 31ba6f6fc99bd124bcc87e04d6087fdc2c401ddb (commit) via d875a2b157987307180ef0e578c4912ca5c388de (commit) via 4105d223d759e421a9277e1532534c438cda5aba (commit) from 4979531dac5c7d929dfc7f4ac8ff0281c195a526 (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 31ba6f6fc99bd124bcc87e04d6087fdc2c401ddb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 17 11:59:32 2020 +0000 dehydrated: Fix various syntax errors * The backup include file was missing a leading slash which caused no files to be backed up. * The shell escaping was broken so a new configuration file was useless. Fixes: #12297 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit d875a2b157987307180ef0e578c4912ca5c388de Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Feb 17 21:38:42 2020 +0000 paks: remove scripts for elinks and phpSANE phpSANE is dropped long ago and elinks in core now. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 4105d223d759e421a9277e1532534c438cda5aba Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Feb 17 21:34:14 2020 +0000 paks: add/move extract_backup_includes to pak update scripts this function allow to update the backup filelist before the backup was done in uninstall.sh at packet updates. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/includes/dehydrated | 2 +- lfs/dehydrated | 6 +++--- src/paks/alsa/update.sh | 3 ++- src/paks/amazon-ssm-agent/uninstall.sh | 2 -- src/paks/amazon-ssm-agent/update.sh | 3 ++- src/paks/apcupsd/update.sh | 1 + src/paks/asterisk/update.sh | 3 ++- src/paks/avahi/update.sh | 3 ++- src/paks/bird/uninstall.sh | 1 - src/paks/bird/update.sh | 1 + src/paks/cups/update.sh | 3 ++- src/paks/dbus/update.sh | 1 + src/paks/default/update.sh | 3 ++- src/paks/dnsdist/uninstall.sh | 4 +--- src/paks/dnsdist/update.sh | 1 + src/paks/elinks/install.sh | 34 ---------------------------------- src/paks/elinks/uninstall.sh | 27 --------------------------- src/paks/elinks/update.sh | 26 -------------------------- src/paks/freeradius/update.sh | 3 ++- src/paks/frr/uninstall.sh | 3 +-- src/paks/frr/update.sh | 3 ++- src/paks/git/update.sh | 1 + src/paks/gnump3d/update.sh | 3 ++- src/paks/guardian/update.sh | 3 ++- src/paks/haproxy/update.sh | 3 ++- src/paks/hostapd/update.sh | 3 ++- src/paks/igmpproxy/uninstall.sh | 3 +-- src/paks/igmpproxy/update.sh | 3 ++- src/paks/keepalived/update.sh | 3 ++- src/paks/libdaemon/update.sh | 3 ++- src/paks/libvirt/uninstall.sh | 3 +-- src/paks/mdns-repeater/update.sh | 4 ++-- src/paks/minidlna/update.sh | 4 +++- src/paks/motion/update.sh | 3 ++- src/paks/mpfire/update.sh | 3 ++- src/paks/netsnmpd/uninstall.sh | 1 - src/paks/netsnmpd/update.sh | 3 ++- src/paks/nfs/update.sh | 3 ++- src/paks/nginx/uninstall.sh | 1 - src/paks/nginx/update.sh | 3 ++- src/paks/nut/update.sh | 3 ++- src/paks/phpSANE/install.sh | 26 -------------------------- src/paks/phpSANE/uninstall.sh | 25 ------------------------- src/paks/phpSANE/update.sh | 26 -------------------------- src/paks/postfix/uninstall.sh | 1 - src/paks/postfix/update.sh | 3 ++- src/paks/qemu/update.sh | 3 ++- src/paks/rpcbind/update.sh | 3 ++- src/paks/sarg/update.sh | 3 ++- src/paks/shairport-sync/update.sh | 4 ++-- src/paks/squid-accounting/update.sh | 3 ++- src/paks/sslh/update.sh | 3 ++- src/paks/stunnel/update.sh | 3 ++- src/paks/tftpd/update.sh | 3 ++- src/paks/transmission/update.sh | 4 ++-- src/paks/watchdog/update.sh | 3 ++- src/paks/wio/update.sh | 3 ++- src/paks/xinetd/update.sh | 3 ++- 58 files changed, 86 insertions(+), 222 deletions(-) delete mode 100644 src/paks/elinks/install.sh delete mode 100644 src/paks/elinks/uninstall.sh delete mode 100644 src/paks/elinks/update.sh delete mode 100644 src/paks/phpSANE/install.sh delete mode 100644 src/paks/phpSANE/uninstall.sh delete mode 100644 src/paks/phpSANE/update.sh Difference in files: diff --git a/config/backup/includes/dehydrated b/config/backup/includes/dehydrated index b5c64f5ef..86fdb9b42 100644 --- a/config/backup/includes/dehydrated +++ b/config/backup/includes/dehydrated @@ -1 +1 @@ -etc/dehydrated +/etc/dehydrated diff --git a/lfs/dehydrated b/lfs/dehydrated index 232588461..fc82f270d 100644 --- a/lfs/dehydrated +++ b/lfs/dehydrated @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = dehydrated -PAK_VER = 2 +PAK_VER = 3 DEPS = "" @@ -92,8 +92,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Install example configuration cd $(DIR_APP) && sed \ - -e 's|^#CONFIG_D=|CONFIG_D="\${BASEDIR}/conf.d"|' \ - -e 's|^#HOOK=|HOOK="\${BASEDIR}/hook.sh"|' \ + -e 's|^#CONFIG_D=|CONFIG_D="\$${BASEDIR}/conf.d"|' \ + -e 's|^#HOOK=|HOOK="\$${BASEDIR}/hook.sh"|' \ docs/examples/config > /etc/dehydrated/config # Install example hook diff --git a/src/paks/alsa/update.sh b/src/paks/alsa/update.sh index 79af981e8..14cf836b2 100644 --- a/src/paks/alsa/update.sh +++ b/src/paks/alsa/update.sh @@ -17,12 +17,13 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh mv /etc/asound.state /tmp +extract_backup_includes ./uninstall.sh ./install.sh mv /tmp/asound.state /etc diff --git a/src/paks/amazon-ssm-agent/uninstall.sh b/src/paks/amazon-ssm-agent/uninstall.sh index 48f160762..126160805 100644 --- a/src/paks/amazon-ssm-agent/uninstall.sh +++ b/src/paks/amazon-ssm-agent/uninstall.sh @@ -23,8 +23,6 @@ # . /opt/pakfire/lib/functions.sh -extract_backup_includes - stop_service ${NAME} make_backup ${NAME} diff --git a/src/paks/amazon-ssm-agent/update.sh b/src/paks/amazon-ssm-agent/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/amazon-ssm-agent/update.sh +++ b/src/paks/amazon-ssm-agent/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/apcupsd/update.sh b/src/paks/apcupsd/update.sh index 89c40d0d7..8df996766 100644 --- a/src/paks/apcupsd/update.sh +++ b/src/paks/apcupsd/update.sh @@ -22,5 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/asterisk/update.sh b/src/paks/asterisk/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/asterisk/update.sh +++ b/src/paks/asterisk/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/avahi/update.sh b/src/paks/avahi/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/avahi/update.sh +++ b/src/paks/avahi/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/bird/uninstall.sh b/src/paks/bird/uninstall.sh index 4ba09c858..28792eaf0 100644 --- a/src/paks/bird/uninstall.sh +++ b/src/paks/bird/uninstall.sh @@ -27,7 +27,6 @@ stop_service "${NAME}" # Create backup -extract_backup_includes make_backup "${NAME}" # Remove all files diff --git a/src/paks/bird/update.sh b/src/paks/bird/update.sh index 89c40d0d7..8df996766 100644 --- a/src/paks/bird/update.sh +++ b/src/paks/bird/update.sh @@ -22,5 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/cups/update.sh b/src/paks/cups/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/cups/update.sh +++ b/src/paks/cups/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/dbus/update.sh b/src/paks/dbus/update.sh index 9f2f69331..5082e497e 100644 --- a/src/paks/dbus/update.sh +++ b/src/paks/dbus/update.sh @@ -22,5 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/default/update.sh b/src/paks/default/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/default/update.sh +++ b/src/paks/default/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/dnsdist/uninstall.sh b/src/paks/dnsdist/uninstall.sh index 966c525c4..41c600e77 100644 --- a/src/paks/dnsdist/uninstall.sh +++ b/src/paks/dnsdist/uninstall.sh @@ -17,14 +17,12 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh -extract_backup_includes - stop_service ${NAME} make_backup ${NAME} diff --git a/src/paks/dnsdist/update.sh b/src/paks/dnsdist/update.sh index 89c40d0d7..8df996766 100644 --- a/src/paks/dnsdist/update.sh +++ b/src/paks/dnsdist/update.sh @@ -22,5 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/elinks/install.sh b/src/paks/elinks/install.sh deleted file mode 100644 index cd5a6cea5..000000000 --- a/src/paks/elinks/install.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/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) 2007-2013 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -restore_backup ${NAME} - -# Suppress first welcome dialog by creating bookmark -# and history files for root -mkdir -p /root/.elinks -touch /root/.elinks/bookmarks -touch /root/.elinks/globhist - -start_service --background ${NAME} diff --git a/src/paks/elinks/uninstall.sh b/src/paks/elinks/uninstall.sh deleted file mode 100644 index e296ccb19..000000000 --- a/src/paks/elinks/uninstall.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/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) 2007-2013 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -stop_service ${NAME} -make_backup ${NAME} -remove_files diff --git a/src/paks/elinks/update.sh b/src/paks/elinks/update.sh deleted file mode 100644 index 1ad1831a7..000000000 --- a/src/paks/elinks/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/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) 2007-2013 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh diff --git a/src/paks/freeradius/update.sh b/src/paks/freeradius/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/freeradius/update.sh +++ b/src/paks/freeradius/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/frr/uninstall.sh b/src/paks/frr/uninstall.sh index 49e3fdd7d..835558ac4 100644 --- a/src/paks/frr/uninstall.sh +++ b/src/paks/frr/uninstall.sh @@ -17,7 +17,7 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # @@ -27,7 +27,6 @@ stop_service "${NAME}" # Create backup -extract_backup_includes make_backup "${NAME}" # Remove all files diff --git a/src/paks/frr/update.sh b/src/paks/frr/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/frr/update.sh +++ b/src/paks/frr/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/git/update.sh b/src/paks/git/update.sh index 89c40d0d7..8df996766 100644 --- a/src/paks/git/update.sh +++ b/src/paks/git/update.sh @@ -22,5 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/gnump3d/update.sh b/src/paks/gnump3d/update.sh index 6e387001f..2031a9613 100644 --- a/src/paks/gnump3d/update.sh +++ b/src/paks/gnump3d/update.sh @@ -17,11 +17,12 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes #Remove userdate from rootfile cat /opt/pakfire/db/rootfiles/gnump3d | \ grep -v "var/mp3" > /opt/pakfire/db/rootfiles/gnump3d.tmp diff --git a/src/paks/guardian/update.sh b/src/paks/guardian/update.sh index 4bec42b53..99776659c 100644 --- a/src/paks/guardian/update.sh +++ b/src/paks/guardian/update.sh @@ -17,10 +17,11 @@ # 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-2016 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/haproxy/update.sh b/src/paks/haproxy/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/haproxy/update.sh +++ b/src/paks/haproxy/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/hostapd/update.sh b/src/paks/hostapd/update.sh index f81b04116..46deb04d1 100644 --- a/src/paks/hostapd/update.sh +++ b/src/paks/hostapd/update.sh @@ -17,10 +17,11 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2008 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +exctract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/igmpproxy/uninstall.sh b/src/paks/igmpproxy/uninstall.sh index eb6ff5f9b..7685264c5 100644 --- a/src/paks/igmpproxy/uninstall.sh +++ b/src/paks/igmpproxy/uninstall.sh @@ -17,12 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh stop_service ${NAME} -extract_backup_includes make_backup ${NAME} remove_files diff --git a/src/paks/igmpproxy/update.sh b/src/paks/igmpproxy/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/igmpproxy/update.sh +++ b/src/paks/igmpproxy/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/keepalived/update.sh b/src/paks/keepalived/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/keepalived/update.sh +++ b/src/paks/keepalived/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/libdaemon/update.sh b/src/paks/libdaemon/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/libdaemon/update.sh +++ b/src/paks/libdaemon/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/libvirt/uninstall.sh b/src/paks/libvirt/uninstall.sh index 0d96e360d..ba1770553 100644 --- a/src/paks/libvirt/uninstall.sh +++ b/src/paks/libvirt/uninstall.sh @@ -17,14 +17,13 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh stop_service libvirtd stop_service virtlogd -extract_backup_includes make_backup ${NAME} remove_files diff --git a/src/paks/mdns-repeater/update.sh b/src/paks/mdns-repeater/update.sh index c6485bf0a..99776659c 100644 --- a/src/paks/mdns-repeater/update.sh +++ b/src/paks/mdns-repeater/update.sh @@ -17,11 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh - +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/minidlna/update.sh b/src/paks/minidlna/update.sh index d5e61164c..99776659c 100644 --- a/src/paks/minidlna/update.sh +++ b/src/paks/minidlna/update.sh @@ -17,9 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # +. /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/motion/update.sh b/src/paks/motion/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/motion/update.sh +++ b/src/paks/motion/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/mpfire/update.sh b/src/paks/mpfire/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/mpfire/update.sh +++ b/src/paks/mpfire/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/netsnmpd/uninstall.sh b/src/paks/netsnmpd/uninstall.sh index 278218b26..a7b8a5370 100644 --- a/src/paks/netsnmpd/uninstall.sh +++ b/src/paks/netsnmpd/uninstall.sh @@ -22,7 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh -extract_backup_includes stop_service ${NAME} make_backup ${NAME} remove_files diff --git a/src/paks/netsnmpd/update.sh b/src/paks/netsnmpd/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/netsnmpd/update.sh +++ b/src/paks/netsnmpd/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/nfs/update.sh b/src/paks/nfs/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/nfs/update.sh +++ b/src/paks/nfs/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/nginx/uninstall.sh b/src/paks/nginx/uninstall.sh index 7c7bfe8b8..ded53f042 100644 --- a/src/paks/nginx/uninstall.sh +++ b/src/paks/nginx/uninstall.sh @@ -23,7 +23,6 @@ # . /opt/pakfire/lib/functions.sh stop_service ${NAME} -extract_backup_includes make_backup ${NAME} remove_files diff --git a/src/paks/nginx/update.sh b/src/paks/nginx/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/nginx/update.sh +++ b/src/paks/nginx/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/nut/update.sh b/src/paks/nut/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/nut/update.sh +++ b/src/paks/nut/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/phpSANE/install.sh b/src/paks/phpSANE/install.sh deleted file mode 100644 index 6368c6e50..000000000 --- a/src/paks/phpSANE/install.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/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) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -/etc/init.d/apache reload diff --git a/src/paks/phpSANE/uninstall.sh b/src/paks/phpSANE/uninstall.sh deleted file mode 100644 index e5b5d7fe4..000000000 --- a/src/paks/phpSANE/uninstall.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/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) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -remove_files diff --git a/src/paks/phpSANE/update.sh b/src/paks/phpSANE/update.sh deleted file mode 100644 index 89c40d0d7..000000000 --- a/src/paks/phpSANE/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/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) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh diff --git a/src/paks/postfix/uninstall.sh b/src/paks/postfix/uninstall.sh index bff411a91..ecf6b5b78 100644 --- a/src/paks/postfix/uninstall.sh +++ b/src/paks/postfix/uninstall.sh @@ -22,7 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh -extract_backup_includes stop_service ${NAME} make_backup ${NAME} /usr/sbin/alternatives --remove sendmail /usr/sbin/sendmail.postfix diff --git a/src/paks/postfix/update.sh b/src/paks/postfix/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/postfix/update.sh +++ b/src/paks/postfix/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/qemu/update.sh b/src/paks/qemu/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/qemu/update.sh +++ b/src/paks/qemu/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/rpcbind/update.sh b/src/paks/rpcbind/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/rpcbind/update.sh +++ b/src/paks/rpcbind/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/sarg/update.sh b/src/paks/sarg/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/sarg/update.sh +++ b/src/paks/sarg/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/shairport-sync/update.sh b/src/paks/shairport-sync/update.sh index c6485bf0a..99776659c 100644 --- a/src/paks/shairport-sync/update.sh +++ b/src/paks/shairport-sync/update.sh @@ -17,11 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh - +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/squid-accounting/update.sh b/src/paks/squid-accounting/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/squid-accounting/update.sh +++ b/src/paks/squid-accounting/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/sslh/update.sh b/src/paks/sslh/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/sslh/update.sh +++ b/src/paks/sslh/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/stunnel/update.sh b/src/paks/stunnel/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/stunnel/update.sh +++ b/src/paks/stunnel/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/tftpd/update.sh b/src/paks/tftpd/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/tftpd/update.sh +++ b/src/paks/tftpd/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/transmission/update.sh b/src/paks/transmission/update.sh index c6485bf0a..99776659c 100644 --- a/src/paks/transmission/update.sh +++ b/src/paks/transmission/update.sh @@ -17,11 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh - +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/watchdog/update.sh b/src/paks/watchdog/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/watchdog/update.sh +++ b/src/paks/watchdog/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/wio/update.sh b/src/paks/wio/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/wio/update.sh +++ b/src/paks/wio/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/xinetd/update.sh b/src/paks/xinetd/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/xinetd/update.sh +++ b/src/paks/xinetd/update.sh @@ -17,10 +17,11 @@ # 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 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4979531dac5c7d929dfc7f4ac8ff0281c195a526
by Arne Fitzenreiter 17 Feb '20

17 Feb '20

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 4979531dac5c7d929dfc7f4ac8ff0281c195a526 (commit) from 24fd2e0b900fdbc1d9c8ba173c936c2b374842ee (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 4979531dac5c7d929dfc7f4ac8ff0281c195a526 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Feb 17 08:53:31 2020 +0000 core142: remove old ddns python-2.7 version Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/142/update.sh | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/config/rootfiles/core/142/update.sh b/config/rootfiles/core/142/update.sh index daf0082c6..e1877881a 100644 --- a/config/rootfiles/core/142/update.sh +++ b/config/rootfiles/core/142/update.sh @@ -84,6 +84,7 @@ rm -rf /boot/dtb-*-ipfire-* rm -rf /lib/modules # Remove files +rm -rf /usr/lib/python2.7/site-packages/ddns # Stop services hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 24fd2e0b900fdbc1d9c8ba173c936c2b374842ee
by Arne Fitzenreiter 17 Feb '20

17 Feb '20

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 24fd2e0b900fdbc1d9c8ba173c936c2b374842ee (commit) from aef3c56c6536474dc861e256f4816d54f9776833 (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 24fd2e0b900fdbc1d9c8ba173c936c2b374842ee Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Feb 17 08:50:46 2020 +0000 ddns: rootfile update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/ddns | 44 ++++++++------------------------------------ 1 file changed, 8 insertions(+), 36 deletions(-) Difference in files: diff --git a/config/rootfiles/common/ddns b/config/rootfiles/common/ddns index 446656e8d..899c0ba98 100644 --- a/config/rootfiles/common/ddns +++ b/config/rootfiles/common/ddns @@ -1,37 +1,19 @@ usr/bin/ddns -usr/lib/python2.7/site-packages/ddns -usr/lib/python2.7/site-packages/ddns/__init__.py -usr/lib/python2.7/site-packages/ddns/__init__.pyc -usr/lib/python2.7/site-packages/ddns/__init__.pyo -usr/lib/python2.7/site-packages/ddns/__version__.py -usr/lib/python2.7/site-packages/ddns/__version__.pyc -usr/lib/python2.7/site-packages/ddns/__version__.pyo -usr/lib/python2.7/site-packages/ddns/database.py -usr/lib/python2.7/site-packages/ddns/database.pyc -usr/lib/python2.7/site-packages/ddns/database.pyo -usr/lib/python2.7/site-packages/ddns/errors.py -usr/lib/python2.7/site-packages/ddns/errors.pyc -usr/lib/python2.7/site-packages/ddns/errors.pyo -usr/lib/python2.7/site-packages/ddns/i18n.py -usr/lib/python2.7/site-packages/ddns/i18n.pyc -usr/lib/python2.7/site-packages/ddns/i18n.pyo -usr/lib/python2.7/site-packages/ddns/providers.py -usr/lib/python2.7/site-packages/ddns/providers.pyc -usr/lib/python2.7/site-packages/ddns/providers.pyo -usr/lib/python2.7/site-packages/ddns/system.py -usr/lib/python2.7/site-packages/ddns/system.pyc -usr/lib/python2.7/site-packages/ddns/system.pyo +#usr/lib/python3.8/site-packages/ddns +usr/lib/python3.8/site-packages/ddns/__init__.py +usr/lib/python3.8/site-packages/ddns/__version__.py +usr/lib/python3.8/site-packages/ddns/database.py +usr/lib/python3.8/site-packages/ddns/errors.py +usr/lib/python3.8/site-packages/ddns/i18n.py +usr/lib/python3.8/site-packages/ddns/providers.py +usr/lib/python3.8/site-packages/ddns/system.py #usr/share/doc/ddns #usr/share/doc/ddns/COPYING #usr/share/locale/ar/LC_MESSAGES/ddns.mo #usr/share/locale/ca/LC_MESSAGES/ddns.mo -#usr/share/locale/cs_CZ -#usr/share/locale/cs_CZ/LC_MESSAGES #usr/share/locale/cs_CZ/LC_MESSAGES/ddns.mo #usr/share/locale/da/LC_MESSAGES/ddns.mo #usr/share/locale/de/LC_MESSAGES/ddns.mo -#usr/share/locale/el_GR -#usr/share/locale/el_GR/LC_MESSAGES #usr/share/locale/el_GR/LC_MESSAGES/ddns.mo #usr/share/locale/es/LC_MESSAGES/ddns.mo #usr/share/locale/fa/LC_MESSAGES/ddns.mo @@ -40,30 +22,20 @@ usr/lib/python2.7/site-packages/ddns/system.pyo #usr/share/locale/id/LC_MESSAGES/ddns.mo #usr/share/locale/it/LC_MESSAGES/ddns.mo #usr/share/locale/ja/LC_MESSAGES/ddns.mo -#usr/share/locale/km_KH -#usr/share/locale/km_KH/LC_MESSAGES #usr/share/locale/km_KH/LC_MESSAGES/ddns.mo #usr/share/locale/nl/LC_MESSAGES/ddns.mo #usr/share/locale/pl/LC_MESSAGES/ddns.mo #usr/share/locale/pt_BR/LC_MESSAGES/ddns.mo #usr/share/locale/pt_PT/LC_MESSAGES/ddns.mo -#usr/share/locale/ro_RO -#usr/share/locale/ro_RO/LC_MESSAGES #usr/share/locale/ro_RO/LC_MESSAGES/ddns.mo #usr/share/locale/ru/LC_MESSAGES/ddns.mo #usr/share/locale/sq/LC_MESSAGES/ddns.mo #usr/share/locale/sv/LC_MESSAGES/ddns.mo #usr/share/locale/th/LC_MESSAGES/ddns.mo -#usr/share/locale/tk -#usr/share/locale/tk/LC_MESSAGES #usr/share/locale/tk/LC_MESSAGES/ddns.mo #usr/share/locale/tr/LC_MESSAGES/ddns.mo #usr/share/locale/uk/LC_MESSAGES/ddns.mo -#usr/share/locale/uz@Latn -#usr/share/locale/uz@Latn/LC_MESSAGES #usr/share/locale/uz(a)Latn/LC_MESSAGES/ddns.mo #usr/share/locale/vi/LC_MESSAGES/ddns.mo -#usr/share/locale/zh -#usr/share/locale/zh/LC_MESSAGES #usr/share/locale/zh/LC_MESSAGES/ddns.mo #var/ipfire/ddns/ddns.conf.sample 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 2020