I think we should ship pretty much everything these days.

Storage is cheap and we would risk breaking anything and then having to spend time to sort it out for saving 2 KiB worth of space on the ISO image and 10 KiB on disk.

So, just ship it all :)

-Michael

> On 9 Aug 2024, at 16:14, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
> 
> Hi Michael,
> 
> On 09/08/2024 16:23, Michael Tremer wrote:
>> Hello,
>> I don’t think we have an SO bump here…
> When I look at it now, it doesn't look like an sobump but clearly for some reason I thought it was.
> 
> Oh well, then all those additional patches for the addons can be thrown away.
> 
> Looking below in the rootfile I do see that libpsx.so.2 is commented out. Should that be uncommented?
> 
> Apologies for the mistake.
> 
> Regards,
> Adolf.
> 
>> Binaries should be linked against libcap.2 and that has not changed.
>> Are they not working with the new version any more?
>> Best,
>> -Michael
>>> On 9 Aug 2024, at 12:23, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>> 
>>> - Update from version 2.69 to 2.70
>>> - Update of rootfile
>>> - sobump means following core packages need to be shipped
>>>   arping
>>>   cdrkit
>>>   iproute2
>>>   iputils
>>>   ntp
>>>   squid
>>>   udev
>>>  and the following addons will be shipped with the pak_ver increments in the other
>>>   patches that are part ofg this set
>>>   avahi
>>>   bacula
>>>   cifs-utils
>>>   dnsdist
>>>   freeradius
>>>   frr
>>>   htop
>>>   nfs
>>>   rng-tools
>>>   samba
>>>   tor
>>>   tshark
>>>   vdr
>>>   wavemon
>>> - Changelog
>>>   2.70
>>> setcap changes to make it harder to set invalid file capabilities (Bug 217592\
>>> reported by parke.nexus)
>>> Lots of documentation fixes (contributions from Jakub Wilk and
>>> Carlos Rodriguez-Fernandez)
>>> Fix c89 compilation syntax for the C code in the libraries.
>>> libpam has deprecated providing the _pam_overwrite() function, so use memset()
>>> instead
>>> 
>>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>> ---
>>> config/rootfiles/common/libcap | 8 +++++---
>>> lfs/libcap                     | 6 +++---
>>> 2 files changed, 8 insertions(+), 6 deletions(-)
>>> 
>>> diff --git a/config/rootfiles/common/libcap b/config/rootfiles/common/libcap
>>> index f331e2a43..ea90c7564 100644
>>> --- a/config/rootfiles/common/libcap
>>> +++ b/config/rootfiles/common/libcap
>>> @@ -4,12 +4,12 @@ sbin/getpcaps
>>> sbin/setcap
>>> #usr/include/sys/capability.h
>>> #usr/include/sys/psx_syscall.h
>>> -usr/lib/libcap.so
>>> +#usr/lib/libcap.so
>>> usr/lib/libcap.so.2
>>> -usr/lib/libcap.so.2.69
>>> +usr/lib/libcap.so.2.70
>>> #usr/lib/libpsx.so
>>> #usr/lib/libpsx.so.2
>>> -usr/lib/libpsx.so.2.69
>>> +usr/lib/libpsx.so.2.70
>>> #usr/lib/pkgconfig/libcap.pc
>>> #usr/lib/pkgconfig/libpsx.pc
>>> #usr/lib/security
>>> @@ -88,7 +88,9 @@ usr/lib/security/pam_cap.so
>>> #usr/share/man/man3/psx_syscall.3
>>> #usr/share/man/man3/psx_syscall3.3
>>> #usr/share/man/man3/psx_syscall6.3
>>> +#usr/share/man/man5/capability.conf.5
>>> #usr/share/man/man8/captree.8
>>> #usr/share/man/man8/getcap.8
>>> #usr/share/man/man8/getpcaps.8
>>> +#usr/share/man/man8/pam_cap.8
>>> #usr/share/man/man8/setcap.8
>>> diff --git a/lfs/libcap b/lfs/libcap
>>> index 951ed80dc..51e32f9c6 100644
>>> --- a/lfs/libcap
>>> +++ b/lfs/libcap
>>> @@ -1,7 +1,7 @@
>>> ###############################################################################
>>> #                                                                             #
>>> # IPFire.org - A linux based firewall                                         #
>>> -# Copyright (C) 2007-2023  IPFire Team  <info(a)ipfire.org>                     #
>>> +# Copyright (C) 2007-2024  IPFire Team  <info(a)ipfire.org>                     #
>>> #                                                                             #
>>> # This program is free software: you can redistribute it and/or modify        #
>>> # it under the terms of the GNU General Public License as published by        #
>>> @@ -24,7 +24,7 @@
>>> 
>>> include Config
>>> 
>>> -VER        = 2.69
>>> +VER        = 2.70
>>> 
>>> THISAPP    = libcap-$(VER)
>>> DL_FILE    = $(THISAPP).tar.xz
>>> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>>> 
>>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>> 
>>> -$(DL_FILE)_BLAKE2 = 94d1fef7666a1c383a8b96f1f6092bd242164631532868b628d2f5de71b42a371d041a978ef7fbadfee3eeb433165444995d1078cd790275bc0433a7875a697e
>>> +$(DL_FILE)_BLAKE2 = 77b72acee53032117ea481e3380d1b497f9264b6193b9523542508c7c3e46070248ca4ed910d35809ce6e52caa60cbb31edb125c47221627eeda35c61bd0914b
>>> 
>>> install : $(TARGET)
>>> 
>>> -- 
>>> 2.45.2
>>>