Development February 2022

development@lists.ipfire.org

16 participants
114 discussions

[PATCH] ntfs-3g: Update to version 2021.8.22
by Adolf Belka 03 Mar '22

03 Mar '22

- Update from 2017.3.23 to 2021.8.22 - Update of rootfile - Added link to mkfs.ntfs in lfs to provide the binary in sbin as the new package places it in usr/sbin - Ran find-dependencies and no problems flagged up. - Changelog Stable Version 2021.8.22 (August 30, 2021) Fixed compile error when building with libfuse < 2.8.0 Fixed obsolete macros in configure.ac Signalled support of UTIME_OMIT to external libfuse2 Fixed an improper macro usage in ntfscp.c Updated the repository change in the README Fixed vulnerability threats caused by maliciously tampered NTFS partitions Stable Version 2017.3.23AR.6 (February 1, 2021) Used kernel cacheing on read-only mounts or with lowntfs-3g Avoided information leak when processing garbled compressed data Defined option posix_nlink to compute a Posix compliant st_nlink Recovered space when an index root is shortened Replaced ENODATA with ENOATTR in xattrs functions for macOS Added support for 'position' argument in macOS xattr functions Changed default xattr access method to 'openxattr' for macOS builds Allowed redefining the target location of the ntfsprogs tools Fixed updating the allocated size when attribute lies in an extent Enabled actions on directories in reparse plugins Inserted the reparse tag in the bad reparse symlink Supported use of WSL special files Dropped rejecting having both EA and reparse data Enabled Creating special files the same way as WSL Checked the locations of MFT and MFTMirr at startup Stable Version 2017.3.23AR.5 (April 1, 2020) Processed the request argument of ioctl() as unsigned Accepted alternative recording of cluster size Fixed a poorly sized string in ntfsinfo Fixed ntfsfallocate on a void file Decoded execlink reparse points Fixed object type returned in readdir() for reparse points Exported the translations of Windows paths to current ones Stable Version 2017.3.23AR.4 (March 1, 2019) Fixed reporting an error when failed to build the mountpoint Reverted accessing reparse directory through internal plugins Cleaned object ids beyond the updated part Fixed reacting to missing plugin Returned a low level error when an ioctl fails Truncated SSD trimming zones to granularity supported by the device Stable Version 2017.3.23AR.3 (September 1, 2018) Made sure log file buffers are properly aligned Made reparse directories visible through internal plugins Added an option to ntfscp to copy the modification time Renamed undeleted files to avoid overwriting existing ones Extended the allowed cluster size to 2MB Allocated full clusters for reading and rescuing in ntfsclone Prevented locally defined headers from interfering with ntfs-3g ones Attempted mounting read-only after failed permission to read-write Fixed collecting the label argument in mkntfs Stable Version 2017.3.23AR.2 (March 1, 2018) Made sure log file buffers are properly aligned Checked log file blocks more recent than temporary ones Processed redo log actions associated to undoing a CompensationlogRecord Allowed setting a file object id without defining its birth ids Documented read-only mount when Windows is hibernated Stopped checking matches of MFTMirr against MFT at record 16 Filtered out reparse flags for selecting plugins Delayed updating the MFT runlist when resizing in read-only mode Double-checked whether record 15 is an extent of MFT Checked whether the device to mount was forced read-only Stable Version 2017.3.23AR.1 (October 1, 2017) Bypassed cluster allocation errors using --ignore-fs-check in ntfsclone Upgraded ntfsrecover to support log files for Windows 10 Fixed the computation of highest_vcn when applying a runlist fixup Fixed updating the vcn of subtree in ntfsrecover Relaxed checks on security descriptors Enabled directory operations in plugins Decoded more reparse tags in ntfsinfo Logged falling back to mounting read-only Fixed compiling on MacOSX (Erik Larsson) Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/ntfs-3g | 6 +++--- lfs/ntfs-3g | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/config/rootfiles/common/ntfs-3g b/config/rootfiles/common/ntfs-3g index 9e46d2731..e187cbfaa 100644 --- a/config/rootfiles/common/ntfs-3g +++ b/config/rootfiles/common/ntfs-3g @@ -1,8 +1,8 @@ bin/lowntfs-3g bin/ntfs-3g #lib/libntfs-3g.so -lib/libntfs-3g.so.88 -lib/libntfs-3g.so.88.0.0 +lib/libntfs-3g.so.89 +lib/libntfs-3g.so.89.0.0 sbin/mkfs.ntfs sbin/mount.lowntfs-3g sbin/mount.ntfs-3g @@ -53,11 +53,11 @@ usr/bin/ntfsls #usr/include/ntfs-3g/unistr.h #usr/include/ntfs-3g/volume.h #usr/include/ntfs-3g/xattrs.h -#usr/lib/libntfs-3g.a #usr/lib/libntfs-3g.la #usr/lib/libntfs-3g.so #usr/lib/ntfs-3g #usr/lib/pkgconfig/libntfs-3g.pc +usr/sbin/mkfs.ntfs usr/sbin/mkntfs usr/sbin/ntfsclone usr/sbin/ntfscp diff --git a/lfs/ntfs-3g b/lfs/ntfs-3g index 0ee7dab93..3183dd84c 100644 --- a/lfs/ntfs-3g +++ b/lfs/ntfs-3g @@ -24,7 +24,7 @@ include Config -VER = 2017.3.23 +VER = 2021.8.22 THISAPP = ntfs-3g_ntfsprogs-$(VER) DL_FILE = $(THISAPP).tgz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d97474ae1954f772c6d2fa386a6f462c +$(DL_FILE)_MD5 = 90da343e78877d388eb34cefae6799ae install : $(TARGET) @@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: @$(PAK) ############################################################################### @@ -74,8 +74,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --disable-static cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + # make mkfs.ntfs link in sbin to mkntfs to match previous situation for this binary + ln -s /usr/sbin/mkntfs /sbin/mkfs.ntfs @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.35.1

2 1

[PATCH] harfbuzz: Update to version 3.4.0
by Adolf Belka 03 Mar '22

03 Mar '22

- Update from 3.1.2 to 3.4.0 - Update of rootfile - Changelog 3.4.0 Perform sanity checks on shaping results is now part of “harfbuzz” library and can be enabled by setting the buffer flag HB_BUFFER_FLAG_VERIFY. (Behdad Esfahbod) Arabic Mark Transient Reordering Algorithm have been updated to revision 6. (Khaled Hosny) ISO 15924 code for mathematical notation, ‘Zmth’, now maps to the OpenType ‘math’ tag. (Alexis King) It is now possible to get at once all math kerning values for a given glyph at a given corner. (Alexis King) Fix locale_t portability issues on systems the typedef’s it to a void pointer. (Behdad Esfahbod) New API: +HB_BUFFER_FLAG_VERIFY +HB_OT_TAG_MATH_SCRIPT +HB_SCRIPT_MATH +hb_ot_math_kern_entry_t +hb_ot_math_get_glyph_kernings Deprecated API +HB_OT_MATH_SCRIPT 3.3.2 Revert splitting of pair positioning values introduced in 3.3.0 as it proved problematic. (Behdad Esfahbod) 3.3.1 Fix heap-use-after-free in harfbuzz-subset introduced in previous release. (Garret Rieger) 3.3.0 Improved documentation. (Matthias Clasen) Internal code cleanup, using C++ standard library more. (Behdad Esfahbod) The low 16-bits of face index will be used by hb_face_create() to select a face inside a font collection file format, while the high 16-bits will be used by hb_font_create() to load the named instance. (Behdad Esfahbod) Glyph positions and other font metrics now apply synthetic slant set by hb_font_set_synthetic_slant(), for improved positioning for synthetically slanted fonts. (Behdad Esfahbod) Fixed unintentional locale dependency in hb_variation_to_string() for decimal point representation. (Matthias Clasen) When applying pair positioning (kerning) the positioning value is split between the two sides of the pair for improved cursor positioning between such pairs. (Behdad Esfahbod) Introduced new HB_GLYPH_FLAG_UNSAFE_TO_CONCAT, to be used in conjunction with HB_GLYPH_FLAG_UNSAFE_TO_BREAK for optimizing re-shaping during line breaking. Check the documentation for further details. (Behdad Esfahbod) Improved handling of macrolanguages when mapping BCP 47 codes to OpenType tags. (David Corbett) New API: +HB_GLYPH_FLAG_UNSAFE_TO_CONCAT +hb_segment_properties_overlay() +hb_buffer_create_similar() +hb_font_set_synthetic_slant() +hb_font_get_synthetic_slant() +hb_font_get_var_coords_design() 3.2.0 harfbuzz library improvements: Fixed shaping of Apple Color Emoji flags in right-to-left context. (Behdad Esfahbod) Fixed positioning of CFF fonts in HB_TINY profile. (Behdad Esfahbod) OpenType 1.9 language tags update. (David Corbett) Add HB_NO_VERTICAL config option. (Behdad Esfahbod) Add HB_CONFIG_OVERRIDE_H for easier configuration. (Behdad Esfahbod) harfbuzz-subset library improvements: Improved packing of cmap, loca, and Ligature tables. (Garret Rieger) Significantly improved overflow-resolution strategy in the repacker. (Garret Rieger) Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/harfbuzz | 5 +++-- lfs/harfbuzz | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/harfbuzz b/config/rootfiles/common/harfbuzz index d45cba44b..0bf04184c 100644 --- a/config/rootfiles/common/harfbuzz +++ b/config/rootfiles/common/harfbuzz @@ -39,11 +39,11 @@ #usr/lib/libharfbuzz-subset.la #usr/lib/libharfbuzz-subset.so usr/lib/libharfbuzz-subset.so.0 -usr/lib/libharfbuzz-subset.so.0.30302.0 +usr/lib/libharfbuzz-subset.so.0.30400.0 #usr/lib/libharfbuzz.la #usr/lib/libharfbuzz.so usr/lib/libharfbuzz.so.0 -usr/lib/libharfbuzz.so.0.30302.0 +usr/lib/libharfbuzz.so.0.30400.0 #usr/lib/pkgconfig/harfbuzz-subset.pc #usr/lib/pkgconfig/harfbuzz.pc #usr/share/gtk-doc/html/harfbuzz @@ -108,6 +108,7 @@ usr/lib/libharfbuzz.so.0.30302.0 #usr/share/gtk-doc/html/harfbuzz/api-index-3-0-0.html #usr/share/gtk-doc/html/harfbuzz/api-index-3-1-0.html #usr/share/gtk-doc/html/harfbuzz/api-index-3-3-0.html +#usr/share/gtk-doc/html/harfbuzz/api-index-3-4-0.html #usr/share/gtk-doc/html/harfbuzz/api-index-full.html #usr/share/gtk-doc/html/harfbuzz/apple-advanced-typography-api.html #usr/share/gtk-doc/html/harfbuzz/buffers-language-script-and-direction.html diff --git a/lfs/harfbuzz b/lfs/harfbuzz index b9f700fdb..a87a4f393 100644 --- a/lfs/harfbuzz +++ b/lfs/harfbuzz @@ -24,7 +24,7 @@ include Config -VER = 3.3.2 +VER = 3.4.0 THISAPP = harfbuzz-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1574bb4cabb49c71eb1260a6ef310599 +$(DL_FILE)_MD5 = 40a7243ef08d5490a3a09d5d94ce6d40 install : $(TARGET) -- 2.35.1

2 1

trailing whitespace in some patches I just submitted
by Adolf Belka 01 Mar '22

01 Mar '22

Hi All, Peter just flagged up that I had a trailing whitespace on the Dist: line of my cifs-utils patch. Just before seeing that email I had just submitted 4 patches for harfbuzz, hplip, libdnet and ntfs-3g hplip, which is an addon, also has the trailing whitespace on the Dist: line. I don't know definitely why this is happening but I think I copied the lfs files on a laptop via an ssh connection and normally I do the work on my desktop machine. I use the same text editing program on both systems, but it may be that they are not configured the same. I will try and find out and fix the cause for the problem and in the short term I will do everything on my desktop machine. Sorry for the problems. Should I re-issue the hplip patch or can that be adjusted on the fly? Regards, Adolf.

2 2

[PATCH v3 0/5] zabbix_agentd: Update to v5.0.20 (LTS) and more
by Robin Roevens 01 Mar '22

01 Mar '22

Hi all A new take on updating current zabbix_agentd 4.2.6 to latest LTS version. This set updates the agent version, fixes a few problems with the original addon and adds a few ipfire-specific metrics for the user to monitor out of the box (which I will document on the wiki when the patch-set is accepted). The differences with the previous patch submission are: - patch 1: update to v5.0.20 - patch 2: - In the previous version the correct modules dir was commented out in the rootfile and was manually removed in the uninstall script if it was not empty. But since it is also included in the backup I figured it can be removed always by remove_files so I kept it in the rootfile now. - Checks before creating dirs are added in install script to see if dir is not already existing (like most other addons seem to do) - Function extract_backup_includes was not called in update.sh script causing possible scenarios where those includes are not present when backup needs to be taken or restored. - patch 3: Made sure to remove all configfiles upon uninstall as everything is in the backup. Also made sure that the ipfire supplied userparameter_pakfire.conf file is not added in addon-backup hence correctly updated on pak update. - patch 4: Is a small new patch to default the zabbix agent to listen only on GREEN as that is probably where the user's Zabbix server is and is a safer default than listening on all interfaces. - patch 5: was formerly patch4. - Grouped all ipfire (non-pakfire) related metrics in a single config file for simplicity. - Replaced the previous problematic iptables related metric and sudo rights with the renewed and safer getipstats binary. - Removed the services related metrics and perl script for now as we first need to have the new services metadata in the pak's and related pakfire functions so that I don't need to copy the bad code from services.cgi as I did before. - Added 2 new metrics: number of active dhcp leases and number of captive portal users. Those where contributed by StackKorora on my Zabbix template for IPFire on github. As it was almost a year ago, previous patch submission and discussion can be found here: https://lists.ipfire.org/pipermail/development/2021-April/009872.html I hope I addressed all concerns there where on the previous submission. Regards Robin -- Dit bericht is gescanned op virussen en andere gevaarlijke inhoud door MailScanner en lijkt schoon te zijn.

2 12

[PATCH 1/2] rules.pl: Allow dynamic destory of loaded but unused ipset sets.
by Stefan Schantl 01 Mar '22

01 Mar '22

Instead of stupidly destroying all ipsets, we now grab the already loaded sets and compare them with the loaded sets during runtime of the script. So we are now able to determine which sets are not longer required and safely can destroy (unload) at a later time. This saves us from taking care about dropping/flushing rules which are based on ipset before we can destroy them - because only unused sets are affected. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Inspired-by: Tim FitzGeorge <ipfr(a)tfitzgeorge.me.uk> --- config/firewall/rules.pl | 68 ++++++++++++++++++++++++++++++---------- 1 file changed, 52 insertions(+), 16 deletions(-) diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 927c1f2ba..7a7c8ed31 100644 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -70,7 +70,8 @@ my %confignatfw=(); my %locationsettings = ( "LOCATIONBLOCK_ENABLED" => "off" ); -my %loaded_ipset_lists=(); +my %ipset_loaded_sets = (); +my @ipset_used_sets = (); my $configfwdfw = "${General::swroot}/firewall/config"; my $configinput = "${General::swroot}/firewall/input"; @@ -114,12 +115,12 @@ undef (@dummy); &main(); sub main { + # Get currently used ipset sets. + &ipset_get_sets(); + # Flush all chains. &flush(); - # Destroy all existing ipsets. - run("$IPSET destroy"); - # Prepare firewall rules. if (! -z "${General::swroot}/firewall/input"){ &buildrules(\%configinputfw); @@ -137,6 +138,9 @@ sub main { # Reload firewall policy. run("/usr/sbin/firewall-policy"); + # Cleanup not longer needed ipset sets. + &ipset_cleanup(); + #Reload firewall.local if present if ( -f '/etc/sysconfig/firewall.local'){ run("/etc/sysconfig/firewall.local reload"); @@ -189,9 +193,6 @@ sub flush { run("$IPTABLES -t nat -F $CHAIN_NAT_SOURCE"); run("$IPTABLES -t nat -F $CHAIN_NAT_DESTINATION"); run("$IPTABLES -t mangle -F $CHAIN_MANGLE_NAT_DESTINATION_FIX"); - - # Flush LOCATIONBLOCK chain. - run("$IPTABLES -F LOCATIONBLOCK"); } sub buildrules { @@ -639,7 +640,8 @@ sub time_convert_to_minutes { } sub locationblock { - # The LOCATIONBLOCK chain now gets flushed by the flush() function. + # Flush LOCATIONBLOCK chain. + run("$IPTABLES -F LOCATIONBLOCK"); # If location blocking is not enabled, we are finished here. if ($locationsettings{'LOCATIONBLOCK_ENABLED'} ne "on") { @@ -669,7 +671,7 @@ sub locationblock { &ipset_restore($location); # Call iptables and create rule to use the loaded ipset list. - run("$IPTABLES -A LOCATIONBLOCK -m set --match-set CC_$location src -j DROP"); + run("$IPTABLES -A LOCATIONBLOCK -m set --match-set $location src -j DROP"); } } } @@ -887,24 +889,58 @@ sub firewall_is_in_subnet { return 0; } +sub ipset_get_sets () { + # Get all currently used ipset lists and store them in an array. + my @output = `$IPSET -n list`; + + # Loop through the temporary array. + foreach my $set (@output) { + # Remove any newlines. + chomp($set); + + # Add the set the array of used sets. + push(@ipset_used_sets, $set); + } + + # Display used sets in debug mode. + if($DEBUG) { + print "Used ipset sets:\n"; + print "@ipset_used_sets\n\n"; + } +} + sub ipset_restore ($) { - my ($list) = @_; + my ($set) = @_; my $file_prefix = "ipset4"; - my $db_file = "$Location::Functions::ipset_db_directory/$list.$file_prefix"; + my $db_file = "$Location::Functions::ipset_db_directory/$set.$file_prefix"; - # Check if the network list already has been loaded. - if($loaded_ipset_lists{$list}) { + # Check if the set already has been loaded. + if($ipset_loaded_sets{$set}) { # It already has been loaded - so there is nothing to do. return; } # Check if the generated file exists. if (-f $db_file) { - # Run ipset and restore the list of the given country code. + # Run ipset and restore the given set. run("$IPSET restore < $db_file"); - # Store the restored list name to the hash to prevent from loading it again. - $loaded_ipset_lists{$list} = "1"; + # Store the restored set to the hash to prevent from loading it again. + $ipset_loaded_sets{$set} = "1"; + } +} + +sub ipset_cleanup () { + # Loop through the array of used sets. + foreach my $set (@ipset_used_sets) { + # Check if this set is still in use. + # + # In this case an entry in the loaded sets hash exists. + unless($ipset_loaded_sets{$set}) { + # Entry does not exist, so this set is not longer + # used and can be destroyed. + run("$IPSET destroy $set"); + } } } -- 2.30.2

2 3

[PATCH] cleanfs: Clear /var/tmp on boot as well
by Peter Müller 01 Mar '22

01 Mar '22

Similar to /tmp/, there is no reason to keep any leftovers in /var/tmp, nor can any application expect content placed there to be persistent. On several IPFire installations I have access to, this would remove quite some clutter accumulated in /var/tmp over the years. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- src/initscripts/system/cleanfs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/initscripts/system/cleanfs b/src/initscripts/system/cleanfs index d1cbb2547..f315682ce 100644 --- a/src/initscripts/system/cleanfs +++ b/src/initscripts/system/cleanfs @@ -117,6 +117,11 @@ case "${1}" in find . -xdev -mindepth 1 ! -name lost+found \ -delete || failed=1 + boot_mesg -n " /var/tmp" ${NORMAL} + cd /var/tmp && + find . -xdev -mindepth 1 ! -name lost+found \ + -delete || failed=1 + boot_mesg -n " /var/ipfire/dhcp" ${NORMAL} cd /var/ipfire/dhcpc/ && find . -name "*.pid" -exec rm -f {} \; || failed=1 cd /var/ipfire/dhcpc/ && find . -name "*.cache" -exec rm -f {} \; || failed=1 -- 2.34.1

4 3

[PATCH 1/3] squid-accounting: Rename to proxy-accounting - bug#12772
by Adolf Belka 01 Mar '22

01 Mar '22

- Rename lfs, rootfile and paks directory - Change name in make.sh - Tested out in a vm system and worked Fixes: Bug#12772 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- .../packages/{squid-accounting => proxy-accounting} | 2 +- lfs/{squid-accounting => proxy-accounting} | 8 ++++---- make.sh | 2 +- .../{squid-accounting => proxy-accounting}/install.sh | 0 .../{squid-accounting => proxy-accounting}/uninstall.sh | 0 src/paks/{squid-accounting => proxy-accounting}/update.sh | 0 6 files changed, 6 insertions(+), 6 deletions(-) rename config/rootfiles/packages/{squid-accounting => proxy-accounting} (90%) rename lfs/{squid-accounting => proxy-accounting} (94%) rename src/paks/{squid-accounting => proxy-accounting}/install.sh (100%) rename src/paks/{squid-accounting => proxy-accounting}/uninstall.sh (100%) rename src/paks/{squid-accounting => proxy-accounting}/update.sh (100%) diff --git a/config/rootfiles/packages/squid-accounting b/config/rootfiles/packages/proxy-accounting similarity index 90% rename from config/rootfiles/packages/squid-accounting rename to config/rootfiles/packages/proxy-accounting index 82b171e33..0c142ea5c 100644 --- a/config/rootfiles/packages/squid-accounting +++ b/config/rootfiles/packages/proxy-accounting @@ -11,6 +11,6 @@ var/ipfire/addon-lang/acct.de.pl var/ipfire/addon-lang/acct.en.pl var/ipfire/addon-lang/acct.fr.pl var/ipfire/addon-lang/acct.tr.pl -var/ipfire/backup/addons/includes/squid-accounting +var/ipfire/backup/addons/includes/proxy-accounting var/ipfire/menu.d/EX-squid-accounting.menu var/log/accounting.log diff --git a/lfs/squid-accounting b/lfs/proxy-accounting similarity index 94% rename from lfs/squid-accounting rename to lfs/proxy-accounting index 77742554e..82e39ae76 100644 --- a/lfs/squid-accounting +++ b/lfs/proxy-accounting @@ -11,11 +11,11 @@ include Config VER = 1.0.4 -THISAPP = squid-accounting-$(VER) +THISAPP = proxy-accounting-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = squid-accounting -PAK_VER = 13 +PROG = proxy-accounting +PAK_VER = 14 DEPS = perl-File-ReadBackwards @@ -61,7 +61,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -v -m 644 $(DIR_APP)/squid-accounting/EX-squid-accounting.menu /var/ipfire/menu.d/ install -v -m 755 $(DIR_APP)/squid-accounting/dbinstall.pl /var/ipfire/accounting/ install -v -m 644 $(DIR_APP)/squid-accounting/config/backup/includes/squid-accounting \ - /var/ipfire/backup/addons/includes/squid-accounting + /var/ipfire/backup/addons/includes/proxy-accounting #activate hourly logging of proxy logfile ln -sf /usr/local/bin/acct.pl /etc/fcron.hourly/squid-accounting diff --git a/make.sh b/make.sh index 79798834a..e35fed398 100755 --- a/make.sh +++ b/make.sh @@ -1638,7 +1638,7 @@ buildipfire() { lfsmake2 perl-Font-TTF lfsmake2 perl-IO-String lfsmake2 perl-PDF-API2 - lfsmake2 squid-accounting + lfsmake2 proxy-accounting lfsmake2 pigz lfsmake2 tmux lfsmake2 perl-Text-CSV_XS diff --git a/src/paks/squid-accounting/install.sh b/src/paks/proxy-accounting/install.sh similarity index 100% rename from src/paks/squid-accounting/install.sh rename to src/paks/proxy-accounting/install.sh diff --git a/src/paks/squid-accounting/uninstall.sh b/src/paks/proxy-accounting/uninstall.sh similarity index 100% rename from src/paks/squid-accounting/uninstall.sh rename to src/paks/proxy-accounting/uninstall.sh diff --git a/src/paks/squid-accounting/update.sh b/src/paks/proxy-accounting/update.sh similarity index 100% rename from src/paks/squid-accounting/update.sh rename to src/paks/proxy-accounting/update.sh -- 2.35.1

3 9

[PATCH] libdnet: Update to version 1.14
by Adolf Belka 28 Feb '22

28 Feb '22

- Update from 1.11 (2005) to 1.14 (2020) - Update of rootfile - find-dependencies run and no problems flagged - Package was originally provided by Dug Song in source forge and with a github repository No response was received from Dug Song to requests for updates and fixes so Oliver Falk forked the repository and has been working on it and now the Dug Song repository is no longer present and the old repoistory url redirects to the new ofalk repository https://github.com/ofalk/libdnet - Issues raised in this new repository are being actively responded to - Changelog comment is Finally release 1.14 with latest fixes included. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/libdnet | 8 ++++---- lfs/libdnet | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/config/rootfiles/common/libdnet b/config/rootfiles/common/libdnet index 07917ed3d..26288de23 100644 --- a/config/rootfiles/common/libdnet +++ b/config/rootfiles/common/libdnet @@ -13,14 +13,14 @@ usr/bin/dnet-config #usr/include/dnet/os.h #usr/include/dnet/rand.h #usr/include/dnet/route.h +#usr/include/dnet/sctp.h #usr/include/dnet/tcp.h #usr/include/dnet/tun.h #usr/include/dnet/udp.h -usr/lib/libdnet -usr/lib/libdnet.1 -usr/lib/libdnet.1.0.1 -usr/lib/libdnet.a usr/lib/libdnet.la +#usr/lib/libdnet.so +usr/lib/libdnet.so.1 +usr/lib/libdnet.so.1.0.1 #usr/man/man3/dnet.3 #usr/man/man8/dnet.8 usr/sbin/dnet diff --git a/lfs/libdnet b/lfs/libdnet index 285701368..abee9a136 100644 --- a/lfs/libdnet +++ b/lfs/libdnet @@ -24,9 +24,9 @@ include Config -VER = 1.11 +VER = 1.14 -THISAPP = libdnet-$(VER) +THISAPP = libdnet-libdnet-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 04c394ed8e1e7fc455456e79e908916d +$(DL_FILE)_MD5 = 704126bfcf9f81c631455b28d2773103 install : $(TARGET) @@ -71,7 +71,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --disable-static cd $(DIR_APP) && make cd $(DIR_APP) && make install @rm -rf $(DIR_APP) -- 2.35.1

1 0

[PATCH] hplip: Update to version 3.22.2
by Adolf Belka 28 Feb '22

28 Feb '22

- Update from 3.21.6 to 3.22.2 - Update of rootfile - Changelog HPLIP 3.22.2 - This release has the following changes: Added support for following new Distro's: Elementary OS 6.1 RHEL 8.5 Linux Mint 20.3 Added support for the following new Printers: HP LaserJet Tank MFP 1602a HP LaserJet Tank MFP 1602w HP LaserJet Tank MFP 1604w HP LaserJet Tank MFP 2602dn HP LaserJet Tank MFP 2602sdn HP LaserJet Tank MFP 2602sdw HP LaserJet Tank MFP 2602dw HP LaserJet Tank MFP 2604dw HP LaserJet Tank MFP 2604sdw HP LaserJet Tank MFP 2603dw HP LaserJet Tank MFP 2603sdw HP LaserJet Tank MFP 2605sdw HP LaserJet Tank MFP 2606dn HP LaserJet Tank MFP 2606sdn HP LaserJet Tank MFP 2606sdw HP LaserJet Tank MFP 2606dw HP LaserJet Tank MFP 2606dc HP LaserJet Tank MFP 1005 HP LaserJet Tank MFP 1005w HP LaserJet Tank MFP 1005nw HP LaserJet Tank 1502a HP LaserJet Tank 1502w HP LaserJet Tank 1504w HP LaserJet Tank 2502dw HP LaserJet Tank 2502dn HP LaserJet Tank 2504dw HP LaserJet Tank 2503dw HP LaserJet Tank 2506dw HP LaserJet Tank 2506d HP LaserJet Tank 2506dn HP LaserJet Tank 1020 HP LaserJet Tank 1020w HP LaserJet Tank 1020nw HPLIP 3.21.12- This release has the following changes: Added support for following new Distro's: MX Linux 21 Elementary OS 6 Fedora 35 HPLIP 3.21.10 - This release has the following changes: Added support for following new Distro's: Ubuntu 21.10 Debian 11 Zorin 15 Zorin 16 Added support for the following new Printers: HP ENVY Inspire 7200e series HP ENVY Inspire 7900e series HP LaserJet MFP M140a HP LaserJet MFP M139a HP LaserJet MFP M141a HP LaserJet MFP M142a HP LaserJet MFP M140w HP LaserJet MFP M140we HP LaserJet MFP M139w HP LaserJet MFP M139we HP LaserJet MFP M141w HP LaserJet MFP M141we HP LaserJet MFP M142we HP LaserJet MFP M142w HP LaserJet M109a HP LaserJet M110a HP LaserJet M111a HP LaserJet M112a HP LaserJet M109w HP LaserJet M109we HP LaserJet M110w HP LaserJet M110we HP LaserJet M111w HP LaserJet M111we HP LaserJet M112we HP LaserJet M112w HP DesignJet Z6 Pro 64in HP DesignJet Z9 Pro 64in HP PageWide XL Pro 5200 PS MFP series HP PageWide XL Pro 8200 PS MFP series HP PageWide XL 3920 MFP HP PageWide XL 4200 Printer HP PageWide XL 4200 Multifunction Printer HP PageWide XL 4700 Printer HP PageWide XL 4700 Multifunction Printer HP PageWide XL 5200 Printer HP PageWide XL 5200 Multifunction Printer HP PageWide XL 8200 Printer HPLIP 3.21.8 - This release has the following changes: Added support for following new Distro's: Linux Mint 20.2 RHEL 8.4 Manjaro 21.0.7 Added support for the following new Printers: HP Smart Tank 500 series HP Smart Tank 530 series HP Smart Tank Plus 570 series HP Smart Tank 7600 HP Smart Tank 750 HP Smart Tank 790 HP Smart Tank Plus 710-720 HP Smart Tank Plus 7000 HP Smart Tank Plus 660-670 HP Smart Tank Plus 6000 HP DeskJet Ink Advantage Ultra 4800 All-in-One Printer series Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/hplip | 113 +++++++++++++++++++------------- lfs/hplip | 12 ++-- 2 files changed, 72 insertions(+), 53 deletions(-) diff --git a/config/rootfiles/packages/hplip b/config/rootfiles/packages/hplip index 2fde7ac65..4aa5803b9 100644 --- a/config/rootfiles/packages/hplip +++ b/config/rootfiles/packages/hplip @@ -1,40 +1,40 @@ -#usr/share/doc/hplip-3.21.6 -#usr/share/doc/hplip-3.21.6/COPYING -#usr/share/doc/hplip-3.21.6/README_LIBJPG -#usr/share/doc/hplip-3.21.6/commandline.html -#usr/share/doc/hplip-3.21.6/copying.html -#usr/share/doc/hplip-3.21.6/copyright -#usr/share/doc/hplip-3.21.6/devicemanager.html -#usr/share/doc/hplip-3.21.6/faxtrouble.html -#usr/share/doc/hplip-3.21.6/gettinghelp.html -#usr/share/doc/hplip-3.21.6/hpscan.html -#usr/share/doc/hplip-3.21.6/images -#usr/share/doc/hplip-3.21.6/images/favicon.ico -#usr/share/doc/hplip-3.21.6/images/print.png -#usr/share/doc/hplip-3.21.6/images/toolbox_actions.png -#usr/share/doc/hplip-3.21.6/images/toolbox_fax.png -#usr/share/doc/hplip-3.21.6/images/toolbox_print_control.png -#usr/share/doc/hplip-3.21.6/images/toolbox_print_settings.png -#usr/share/doc/hplip-3.21.6/images/toolbox_status.png -#usr/share/doc/hplip-3.21.6/images/toolbox_supplies.png -#usr/share/doc/hplip-3.21.6/images/xsane.png -#usr/share/doc/hplip-3.21.6/index.html -#usr/share/doc/hplip-3.21.6/mainttask.html -#usr/share/doc/hplip-3.21.6/plugins.html -#usr/share/doc/hplip-3.21.6/print.html -#usr/share/doc/hplip-3.21.6/printing.html -#usr/share/doc/hplip-3.21.6/printoptions.html -#usr/share/doc/hplip-3.21.6/printtroubleshooting.html -#usr/share/doc/hplip-3.21.6/scanning.html -#usr/share/doc/hplip-3.21.6/scantrouble.html -#usr/share/doc/hplip-3.21.6/sendfax.html -#usr/share/doc/hplip-3.21.6/setup.html -#usr/share/doc/hplip-3.21.6/styles -#usr/share/doc/hplip-3.21.6/styles/css.css -#usr/share/doc/hplip-3.21.6/systray.html -#usr/share/doc/hplip-3.21.6/troubleshooting.html -#usr/share/doc/hplip-3.21.6/uninstalling.html -#usr/share/doc/hplip-3.21.6/upgrading.html +#usr/share/doc/hplip-3.22.2 +#usr/share/doc/hplip-3.22.2/COPYING +#usr/share/doc/hplip-3.22.2/README_LIBJPG +#usr/share/doc/hplip-3.22.2/commandline.html +#usr/share/doc/hplip-3.22.2/copying.html +#usr/share/doc/hplip-3.22.2/copyright +#usr/share/doc/hplip-3.22.2/devicemanager.html +#usr/share/doc/hplip-3.22.2/faxtrouble.html +#usr/share/doc/hplip-3.22.2/gettinghelp.html +#usr/share/doc/hplip-3.22.2/hpscan.html +#usr/share/doc/hplip-3.22.2/images +#usr/share/doc/hplip-3.22.2/images/favicon.ico +#usr/share/doc/hplip-3.22.2/images/print.png +#usr/share/doc/hplip-3.22.2/images/toolbox_actions.png +#usr/share/doc/hplip-3.22.2/images/toolbox_fax.png +#usr/share/doc/hplip-3.22.2/images/toolbox_print_control.png +#usr/share/doc/hplip-3.22.2/images/toolbox_print_settings.png +#usr/share/doc/hplip-3.22.2/images/toolbox_status.png +#usr/share/doc/hplip-3.22.2/images/toolbox_supplies.png +#usr/share/doc/hplip-3.22.2/images/xsane.png +#usr/share/doc/hplip-3.22.2/index.html +#usr/share/doc/hplip-3.22.2/mainttask.html +#usr/share/doc/hplip-3.22.2/plugins.html +#usr/share/doc/hplip-3.22.2/print.html +#usr/share/doc/hplip-3.22.2/printing.html +#usr/share/doc/hplip-3.22.2/printoptions.html +#usr/share/doc/hplip-3.22.2/printtroubleshooting.html +#usr/share/doc/hplip-3.22.2/scanning.html +#usr/share/doc/hplip-3.22.2/scantrouble.html +#usr/share/doc/hplip-3.22.2/sendfax.html +#usr/share/doc/hplip-3.22.2/setup.html +#usr/share/doc/hplip-3.22.2/styles +#usr/share/doc/hplip-3.22.2/styles/css.css +#usr/share/doc/hplip-3.22.2/systray.html +#usr/share/doc/hplip-3.22.2/troubleshooting.html +#usr/share/doc/hplip-3.22.2/uninstalling.html +#usr/share/doc/hplip-3.22.2/upgrading.html #usr/share/hplip usr/share/hplip/dat2drv usr/share/hplip/locatedriver @@ -309,6 +309,8 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-designjet_z6800_photo-postscript.ppd.gz #usr/share/ppd/HP/hp-designjet_z6810ps_42in-ps.ppd.gz #usr/share/ppd/HP/hp-designjet_z6810ps_60in-ps.ppd.gz +#usr/share/ppd/HP/hp-designjet_z6_pro_64in_ps-ps.ppd.gz +#usr/share/ppd/HP/hp-designjet_z9_pro_64in_ps-ps.ppd.gz #usr/share/ppd/HP/hp-deskjet_1000_j110_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_1010_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_1050_j410_series.ppd.gz @@ -380,6 +382,7 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-deskjet_4640_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_4670_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_4720_series.ppd.gz +#usr/share/ppd/HP/hp-deskjet_4800_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_500.ppd.gz #usr/share/ppd/HP/hp-deskjet_5000_series.ppd.gz #usr/share/ppd/HP/hp-deskjet_500c.ppd.gz @@ -524,6 +527,8 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-envy_6400_series.ppd.gz #usr/share/ppd/HP/hp-envy_7640_series.ppd.gz #usr/share/ppd/HP/hp-envy_8000_series.ppd.gz +#usr/share/ppd/HP/hp-envy_inspire_7200_series.ppd.gz +#usr/share/ppd/HP/hp-envy_inspire_7900_series.ppd.gz #usr/share/ppd/HP/hp-envy_photo_6200_series.ppd.gz #usr/share/ppd/HP/hp-envy_photo_7100_series.ppd.gz #usr/share/ppd/HP/hp-envy_photo_7800_series.ppd.gz @@ -737,6 +742,7 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-laserjet_flow_mfp_m830-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_m1005.ppd.gz #usr/share/ppd/HP/hp-laserjet_m101-m106.ppd.gz +#usr/share/ppd/HP/hp-laserjet_m109-m112.ppd.gz #usr/share/ppd/HP/hp-laserjet_m1120_mfp.ppd.gz #usr/share/ppd/HP/hp-laserjet_m1120n_mfp.ppd.gz #usr/share/ppd/HP/hp-laserjet_m1319f_mfp.ppd.gz @@ -787,6 +793,7 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-laserjet_mfp_e82540-50-60-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_mfp_e87640-50-60-ps.ppd.gz #usr/share/ppd/HP/hp-laserjet_mfp_m129-m134.ppd.gz +#usr/share/ppd/HP/hp-laserjet_mfp_m139-m142.ppd.gz #usr/share/ppd/HP/hp-laserjet_mfp_m232-m237.ppd.gz #usr/share/ppd/HP/hp-laserjet_mfp_m28-m31.ppd.gz #usr/share/ppd/HP/hp-laserjet_mfp_m426_m427-ps.ppd.gz @@ -913,6 +920,12 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-laserjet_professional_p1608dn.ppd.gz #usr/share/ppd/HP/hp-laserjet_professional_p1609dn.ppd.gz #usr/share/ppd/HP/hp-laserjet_professional_p_1102w.ppd.gz +#usr/share/ppd/HP/hp-laserjet_tank_1020.ppd.gz +#usr/share/ppd/HP/hp-laserjet_tank_150x.ppd.gz +#usr/share/ppd/HP/hp-laserjet_tank_250x.ppd.gz +#usr/share/ppd/HP/hp-laserjet_tank_mfp_1005.ppd.gz +#usr/share/ppd/HP/hp-laserjet_tank_mfp_160x.ppd.gz +#usr/share/ppd/HP/hp-laserjet_tank_mfp_260x.ppd.gz #usr/share/ppd/HP/hp-lj_300_400_color_m351_m451-ps.ppd.gz #usr/share/ppd/HP/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz #usr/share/ppd/HP/hp-mopier_240-pcl3.ppd.gz @@ -1106,24 +1119,34 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-pagewide_pro_750-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_pro_mfp_772-777-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz +#usr/share/ppd/HP/hp-pagewide_xl_3920_ps_mfp-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_4000ps-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_4100ps-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz +#usr/share/ppd/HP/hp-pagewide_xl_4200_ps_mfp_series-ps.ppd.gz +#usr/share/ppd/HP/hp-pagewide_xl_4200_ps_series-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_4500ps-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_4600ps-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz +#usr/share/ppd/HP/hp-pagewide_xl_4700_ps_mfp_series-ps.ppd.gz +#usr/share/ppd/HP/hp-pagewide_xl_4700_ps_series-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_5000ps-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_5100ps-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz +#usr/share/ppd/HP/hp-pagewide_xl_5200_ps_mfp_series-ps.ppd.gz +#usr/share/ppd/HP/hp-pagewide_xl_5200_ps_series-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_6000ps-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_6000ps_mfp-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_8000ps-ps.ppd.gz #usr/share/ppd/HP/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz +#usr/share/ppd/HP/hp-pagewide_xl_8200_ps_series-ps.ppd.gz +#usr/share/ppd/HP/hp-pagewide_xl_pro_5200_ps_mfp_series-ps.ppd.gz +#usr/share/ppd/HP/hp-pagewide_xl_pro_8200_ps_mfp_series-ps.ppd.gz #usr/share/ppd/HP/hp-photosmart_100.ppd.gz #usr/share/ppd/HP/hp-photosmart_1115.ppd.gz #usr/share/ppd/HP/hp-photosmart_1215.ppd.gz @@ -1264,17 +1287,17 @@ usr/share/ppd/HP #usr/share/ppd/HP/hp-smart_tank_500_series.ppd.gz #usr/share/ppd/HP/hp-smart_tank_510_series.ppd.gz #usr/share/ppd/HP/hp-smart_tank_530_series.ppd.gz +#usr/share/ppd/HP/hp-smart_tank_6000_series.ppd.gz #usr/share/ppd/HP/hp-smart_tank_610_series.ppd.gz +#usr/share/ppd/HP/hp-smart_tank_660-670_series.ppd.gz +#usr/share/ppd/HP/hp-smart_tank_7000_series.ppd.gz +#usr/share/ppd/HP/hp-smart_tank_710-720_series.ppd.gz +#usr/share/ppd/HP/hp-smart_tank_7300_series.ppd.gz +#usr/share/ppd/HP/hp-smart_tank_750_series.ppd.gz +#usr/share/ppd/HP/hp-smart_tank_7600_series.ppd.gz +#usr/share/ppd/HP/hp-smart_tank_790_series.ppd.gz #usr/share/ppd/HP/hp-smart_tank_plus_550_series.ppd.gz #usr/share/ppd/HP/hp-smart_tank_plus_570_series.ppd.gz #usr/share/ppd/HP/hp-smart_tank_plus_650_series.ppd.gz #usr/share/ppd/HP/hp-smart_tank_wireless_450_series.ppd.gz #usr/share/ppd/HP/hp-tango.ppd.gz -#usr/share/ppd/HP/hp_pagewide_xl_3920ps_mfp-ps.ppd.gz -#usr/share/ppd/HP/hp_pagewide_xl_4200ps-ps.ppd.gz -#usr/share/ppd/HP/hp_pagewide_xl_4200ps_mfp-ps.ppd.gz -#usr/share/ppd/HP/hp_pagewide_xl_4700ps-ps.ppd.gz -#usr/share/ppd/HP/hp_pagewide_xl_4700ps_mfp-ps.ppd.gz -#usr/share/ppd/HP/hp_pagewide_xl_5200ps-ps.ppd.gz -#usr/share/ppd/HP/hp_pagewide_xl_5200ps_mfp-ps.ppd.gz -#usr/share/ppd/HP/hp_pagewide_xl_8200ps-ps.ppd.gz diff --git a/lfs/hplip b/lfs/hplip index 63d9cf383..8a9bfcffe 100644 --- a/lfs/hplip +++ b/lfs/hplip @@ -24,9 +24,7 @@ include Config -SUMMARY = HP's Printing, Scanning, and Faxing Software - -VER = 3.21.6 +VER = 3.22.2 THISAPP = hplip-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,12 +32,10 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hplip -PAK_VER = 6 +PAK_VER = 7 DEPS = -SERVICES = - ############################################################################### # Top-level Rules ############################################################################### @@ -48,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 090f47d47c0d487ccfd2abdd5102ce1e +$(DL_FILE)_MD5 = 4e5a89813334778d9e16835f773b2e80 install : $(TARGET) @@ -58,7 +54,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: +dist: $(PAK) ############################################################################### -- 2.35.1

1 0

[PATCH] wireless-regdb: Update to version 2022.02.18
by Adolf Belka 28 Feb '22

28 Feb '22

- Update from 2020.11.20 to 2022.02.18 - Update of rootfile not required - Changelog There is no changelog provided for this file. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/wireless-regdb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/wireless-regdb b/lfs/wireless-regdb index 8b89795ae..2482524cf 100644 --- a/lfs/wireless-regdb +++ b/lfs/wireless-regdb @@ -24,7 +24,7 @@ include Config -VER = 2020.11.20 +VER = 2022.02.18 THISAPP = wireless-regdb-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6d29837f3a1ed671e37d5139de25c5b8 +$(DL_FILE)_MD5 = 3cf08660e5946f3628232b5c1ba57e4f install : $(TARGET) -- 2.35.1

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development February 2022