* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2cb220fd3cbff4382656b30d02facdd9df81775e
@ 2020-11-23 15:13 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2020-11-23 15:13 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 6984 bytes --]
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 2cb220fd3cbff4382656b30d02facdd9df81775e (commit)
via d0d63bbbee087e8865be40739aec6395e065b9f4 (commit)
via 17a8437e82c5a9aceb058ae49b6e3ae94b84263e (commit)
from 9e245967d21883c6b921c0f1d9101a526ef9b084 (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 2cb220fd3cbff4382656b30d02facdd9df81775e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Nov 23 15:11:43 2020 +0000
freeradius: Depend on samba again
The package requires more libraries than libtalloc from
the samba package and therefore we need this dependency
again.
Fixes: #12538
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d0d63bbbee087e8865be40739aec6395e065b9f4
Author: Adolf Belka <ahb.ipfire(a)gmail.com>
Date: Mon Nov 23 13:08:48 2020 +0100
apcupsd: addition of backup/includes definition
Added a backup/includes file for apcupsd to backup the
/etc/apcupsd/ directory where all the configuration files
are stored. Currently there is no backup available to
save the state of any changes carried out to the configuration
or action files.
Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 17a8437e82c5a9aceb058ae49b6e3ae94b84263e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Nov 23 15:24:37 2020 +0100
pcengines-firmware: update to 4.12.0.6
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/includes/apcupsd | 1 +
config/rootfiles/packages/apcupsd | 1 +
config/rootfiles/packages/pcengines-apu-firmware | 11 ++++++-----
lfs/apcupsd | 4 +++-
lfs/freeradius | 4 ++--
lfs/pcengines-apu-firmware | 21 ++++++++++++---------
6 files changed, 25 insertions(+), 17 deletions(-)
create mode 100644 config/backup/includes/apcupsd
Difference in files:
diff --git a/config/backup/includes/apcupsd b/config/backup/includes/apcupsd
new file mode 100644
index 000000000..82dcd84ed
--- /dev/null
+++ b/config/backup/includes/apcupsd
@@ -0,0 +1 @@
+/etc/apcupsd/
diff --git a/config/rootfiles/packages/apcupsd b/config/rootfiles/packages/apcupsd
index b58ed2b47..a28c961eb 100644
--- a/config/rootfiles/packages/apcupsd
+++ b/config/rootfiles/packages/apcupsd
@@ -33,3 +33,4 @@ srv/web/ipfire/cgi-bin/upsstats.cgi
#usr/share/man/man8/apcupsd.8
etc/rc.d/init.d/apcupsd
var/ipfire/menu.d/EX-apcupsd.menu
+var/ipfire/backup/addons/includes/apcupsd
diff --git a/config/rootfiles/packages/pcengines-apu-firmware b/config/rootfiles/packages/pcengines-apu-firmware
index 21b20ab03..ec6c5b287 100644
--- a/config/rootfiles/packages/pcengines-apu-firmware
+++ b/config/rootfiles/packages/pcengines-apu-firmware
@@ -1,7 +1,8 @@
#lib/firmware/pcengines
#lib/firmware/pcengines/apu
-lib/firmware/pcengines/apu/apu1_v4.11.0.6.rom
-lib/firmware/pcengines/apu/apu2_v4.11.0.6.rom
-lib/firmware/pcengines/apu/apu3_v4.11.0.6.rom
-lib/firmware/pcengines/apu/apu4_v4.11.0.6.rom
-lib/firmware/pcengines/apu/apu5_v4.11.0.6.rom
+lib/firmware/pcengines/apu/apu1_v4.12.0.6.rom
+lib/firmware/pcengines/apu/apu2_v4.12.0.6.rom
+lib/firmware/pcengines/apu/apu3_v4.12.0.6.rom
+lib/firmware/pcengines/apu/apu4_v4.12.0.6.rom
+lib/firmware/pcengines/apu/apu5_v4.12.0.6.rom
+lib/firmware/pcengines/apu/apu6_v4.12.0.6.rom
diff --git a/lfs/apcupsd b/lfs/apcupsd
index 22818eda5..6240015d1 100644
--- a/lfs/apcupsd
+++ b/lfs/apcupsd
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = apcupsd
-PAK_VER = 6
+PAK_VER = 7
DEPS =
@@ -88,5 +88,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ln -sf ../init.d/apcupsd /etc/rc.d/rc3.d/S65apcupsd
ln -sf ../init.d/apcupsd /etc/rc.d/rc0.d/K35apcupsd
ln -sf ../init.d/apcupsd /etc/rc.d/rc6.d/K35apcupsd
+ install -v -m 644 ${DIR_SRC}/config/backup/includes/apcupsd \
+ /var/ipfire/backup/addons/includes/apcupsd
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/freeradius b/lfs/freeradius
index 7f39ad8e1..c50b3219f 100644
--- a/lfs/freeradius
+++ b/lfs/freeradius
@@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = freeradius
-PAK_VER = 12
+PAK_VER = 13
-DEPS = libtalloc
+DEPS = libtalloc samba
ifeq "$(BUILD_ARCH)" "armv5tel"
LDFLAGS += -latomic
diff --git a/lfs/pcengines-apu-firmware b/lfs/pcengines-apu-firmware
index 421aa11d5..42f1bcbea 100644
--- a/lfs/pcengines-apu-firmware
+++ b/lfs/pcengines-apu-firmware
@@ -24,14 +24,14 @@
include Config
-VER = 4.11.0.6
+VER = 4.12.0.6
THISAPP = pcengines-apu-firmware-$(VER)
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = pcengines-apu-firmware
-PAK_VER = 6
+PAK_VER = 7
SUP_ARCH = i586 x86_64
DEPS = firmware-update
@@ -45,19 +45,22 @@ objects = \
apu2_v$(VER).rom \
apu3_v$(VER).rom \
apu4_v$(VER).rom \
- apu5_v$(VER).rom
+ apu5_v$(VER).rom \
+ apu6_v$(VER).rom
apu1_v$(VER).rom = $(DL_FROM)/apu1_v$(VER).rom
apu2_v$(VER).rom = $(DL_FROM)/apu2_v$(VER).rom
apu3_v$(VER).rom = $(DL_FROM)/apu3_v$(VER).rom
apu4_v$(VER).rom = $(DL_FROM)/apu4_v$(VER).rom
apu5_v$(VER).rom = $(DL_FROM)/apu5_v$(VER).rom
-
-apu1_v$(VER).rom_MD5 = aa135df1cdbdf488a2c623020c9c94b3
-apu2_v$(VER).rom_MD5 = ba861d29bb90491612e92de8d7db3065
-apu3_v$(VER).rom_MD5 = 52d51b4c0ea1d4a7e05f8b48ec57c0d8
-apu4_v$(VER).rom_MD5 = 22eba7cd14d2be3ddfaa4159f5c169af
-apu5_v$(VER).rom_MD5 = de4da830a5424028b7492876edb41c86
+apu6_v$(VER).rom = $(DL_FROM)/apu6_v$(VER).rom
+
+apu1_v$(VER).rom_MD5 = d2e08bc117683fec306d2f980665a1eb
+apu2_v$(VER).rom_MD5 = d9512a52159d546a34e8d630bfdb383b
+apu3_v$(VER).rom_MD5 = 8cf5bd87f47cfaf7fdcda4bb0fa295fb
+apu4_v$(VER).rom_MD5 = 405bd25c59efda4cf3e94c6e0b153890
+apu5_v$(VER).rom_MD5 = a6ce900704cfecd254be6f4bbd7f1e3b
+apu6_v$(VER).rom_MD5 = 30a1fb088b60b96bb8e17f2eb048b228
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-11-23 15:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-23 15:13 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2cb220fd3cbff4382656b30d02facdd9df81775e Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox