* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a0d3956686f64744d06a5d2f9911a4987d9129ec
@ 2022-06-17 16:31 Peter Müller
0 siblings, 0 replies; only message in thread
From: Peter Müller @ 2022-06-17 16:31 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 9811 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 a0d3956686f64744d06a5d2f9911a4987d9129ec (commit)
via 3356af4e5c87886388384d703f4b59a8df78aaec (commit)
via 9aa2c4cc2969bcd32d49399098091fcd05befda3 (commit)
via 4fdd3558802b971bad882eea3abea3de90052d9c (commit)
via 02882db3022fe56c3b55fa0e1c5592f8ab31b26d (commit)
from 99763943424cdd2e6d5855c8c9dcaf2d70f763ba (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 a0d3956686f64744d06a5d2f9911a4987d9129ec
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Jun 17 16:30:51 2022 +0000
Core Update 169: Ship libtiff and krb5
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 3356af4e5c87886388384d703f4b59a8df78aaec
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Jun 17 16:29:55 2022 +0000
Core Update 169: Remove pakfire metadata for krb5 and libtiff
Both packages have become part of the core system, so these files
are not longer needed.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 9aa2c4cc2969bcd32d49399098091fcd05befda3
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun May 15 18:02:20 2022 +0200
libtiff: Move into core system.
pango and the PDF tools as core parts are linked against
libtiff, therefore this library has to become a part of the
core distribution too.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit 4fdd3558802b971bad882eea3abea3de90052d9c
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun May 15 18:02:19 2022 +0200
krb5: Move package into core system.
On one hand, the key.dns_resolver binary is linked against libkrb5, so this
library at least is required by the base system.
On the other hand this easily allows different services on the firewall
to use kerberos for authentication (ssh etc).
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
commit 02882db3022fe56c3b55fa0e1c5592f8ab31b26d
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Fri Jun 17 16:27:42 2022 +0000
kernel: Align x86_64 rootfile for kernel update
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.x86_64-ipfire | 2 +-
config/rootfiles/{packages => common}/krb5 | 0
config/rootfiles/{packages => common}/libtiff | 0
config/rootfiles/core/169/filelists/krb5 | 1 +
config/rootfiles/core/169/filelists/libtiff | 1 +
config/rootfiles/core/169/update.sh | 16 ++++++++++++++++
lfs/cups | 4 ++--
lfs/foomatic | 4 ++--
lfs/ghostscript | 4 ++--
lfs/krb5 | 4 ----
lfs/libtiff | 4 ----
lfs/netatalk | 2 +-
lfs/samba | 2 +-
lfs/spandsp | 4 ++--
lfs/tshark | 4 ++--
15 files changed, 31 insertions(+), 21 deletions(-)
rename config/rootfiles/{packages => common}/krb5 (100%)
rename config/rootfiles/{packages => common}/libtiff (100%)
create mode 120000 config/rootfiles/core/169/filelists/krb5
create mode 120000 config/rootfiles/core/169/filelists/libtiff
Difference in files:
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index a358ac91c..27ae709b1 100644
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.46-ipfire Kernel Configuration
+# Linux/x86 5.15.48-ipfire Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0"
CONFIG_CC_IS_GCC=y
diff --git a/config/rootfiles/packages/krb5 b/config/rootfiles/common/krb5
similarity index 100%
rename from config/rootfiles/packages/krb5
rename to config/rootfiles/common/krb5
diff --git a/config/rootfiles/packages/libtiff b/config/rootfiles/common/libtiff
similarity index 100%
rename from config/rootfiles/packages/libtiff
rename to config/rootfiles/common/libtiff
diff --git a/config/rootfiles/core/169/filelists/krb5 b/config/rootfiles/core/169/filelists/krb5
new file mode 120000
index 000000000..082c3cbcd
--- /dev/null
+++ b/config/rootfiles/core/169/filelists/krb5
@@ -0,0 +1 @@
+../../../common/krb5
\ No newline at end of file
diff --git a/config/rootfiles/core/169/filelists/libtiff b/config/rootfiles/core/169/filelists/libtiff
new file mode 120000
index 000000000..dd89e3cda
--- /dev/null
+++ b/config/rootfiles/core/169/filelists/libtiff
@@ -0,0 +1 @@
+../../../common/libtiff
\ No newline at end of file
diff --git a/config/rootfiles/core/169/update.sh b/config/rootfiles/core/169/update.sh
index 966e23cdf..a27f20a30 100644
--- a/config/rootfiles/core/169/update.sh
+++ b/config/rootfiles/core/169/update.sh
@@ -154,6 +154,22 @@ telinit u
/etc/init.d/unbound start
/etc/init.d/squid start
+# krb5 is now part of the core system, remove Pakfire metadata for it
+if [ -e "/opt/pakfire/db/installed/meta-krb5" ] && [ -e "/opt/pakfire/db/meta/meta-krb5" ]; then
+ rm -vf \
+ /opt/pakfire/db/installed/meta-krb5 \
+ /opt/pakfire/db/meta/meta-krb5 \
+ /opt/pakfire/db/rootfiles/krb5
+fi
+
+# libtiff is now part of the core system, remove Pakfire metadata for it
+if [ -e "/opt/pakfire/db/installed/meta-libtiff" ] && [ -e "/opt/pakfire/db/meta/meta-libtiff" ]; then
+ rm -vf \
+ /opt/pakfire/db/installed/meta-libtiff \
+ /opt/pakfire/db/meta/meta-libtiff \
+ /opt/pakfire/db/rootfiles/libtiff
+fi
+
# This update needs a reboot...
touch /var/run/need_reboot
diff --git a/lfs/cups b/lfs/cups
index cd4519b63..d333532e3 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -33,9 +33,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/cups-$(VER)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = cups
-PAK_VER = 25
+PAK_VER = 27
-DEPS = avahi cups-filters dbus ghostscript krb5 libtiff
+DEPS = avahi cups-filters dbus ghostscript
SERVICES = cups
diff --git a/lfs/foomatic b/lfs/foomatic
index 50f5c2377..73dc16842 100644
--- a/lfs/foomatic
+++ b/lfs/foomatic
@@ -37,9 +37,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/foomatic-filters-$(VER_FILTERS)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = foomatic
-PAK_VER = 6
+PAK_VER = 7
-DEPS = cups ghostscript libtiff hplip
+DEPS = cups ghostscript hplip
SERVICES =
diff --git a/lfs/ghostscript b/lfs/ghostscript
index 7df96bdd5..ce318a572 100644
--- a/lfs/ghostscript
+++ b/lfs/ghostscript
@@ -34,9 +34,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ghostscript
-PAK_VER = 10
+PAK_VER = 11
-DEPS = cups dbus libtiff
+DEPS = cups dbus
SERVICES =
diff --git a/lfs/krb5 b/lfs/krb5
index 399f9338e..e08948005 100644
--- a/lfs/krb5
+++ b/lfs/krb5
@@ -33,10 +33,6 @@ DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)/src
TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = krb5
-PAK_VER = 7
-
-DEPS =
SERVICES =
diff --git a/lfs/libtiff b/lfs/libtiff
index ef8991e31..23cb19b68 100644
--- a/lfs/libtiff
+++ b/lfs/libtiff
@@ -33,10 +33,6 @@ DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = libtiff
-PAK_VER = 5
-
-DEPS =
SERVICES =
diff --git a/lfs/netatalk b/lfs/netatalk
index 9e8ce454b..ef75c89fe 100644
--- a/lfs/netatalk
+++ b/lfs/netatalk
@@ -36,7 +36,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)
PROG = netatalk
PAK_VER = 3
-DEPS = avahi dbus krb5
+DEPS = avahi dbus
SERVICES = netatalk
diff --git a/lfs/samba b/lfs/samba
index 896e7e71e..a48a0ecb1 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -35,7 +35,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
PAK_VER = 85
-DEPS = avahi cups libtirpc krb5 perl-Parse-Yapp perl-JSON
+DEPS = avahi cups libtirpc perl-Parse-Yapp perl-JSON
SERVICES = samba
diff --git a/lfs/spandsp b/lfs/spandsp
index 19b606117..5d609cb06 100644
--- a/lfs/spandsp
+++ b/lfs/spandsp
@@ -34,9 +34,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = spandsp
-PAK_VER = 5
+PAK_VER = 6
-DEPS = libtiff
+DEPS =
SERVICES =
diff --git a/lfs/tshark b/lfs/tshark
index eb89f7474..ee9c06dc4 100644
--- a/lfs/tshark
+++ b/lfs/tshark
@@ -34,8 +34,8 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tshark
-DEPS = krb5 c-ares
-PAK_VER = 12
+DEPS = c-ares
+PAK_VER = 13
SERVICES =
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-17 16:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-17 16:31 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a0d3956686f64744d06a5d2f9911a4987d9129ec Peter Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox