Development March 2021

development@lists.ipfire.org

14 participants
107 discussions

[PATCH] strace: Update to 5.11
by Adolf Belka 22 Mar '21

22 Mar '21

- Update from 5.10 to 5.11 - No update of rootfile required - Changelog is too long to put in here (several thousand lines) Full change log can be reviewed in the tarball. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/strace | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/strace b/lfs/strace index c6ea35876..cfce835ec 100644 --- a/lfs/strace +++ b/lfs/strace @@ -24,7 +24,7 @@ include Config -VER = 5.10 +VER = 5.11 SUP_ARCHES = x86_64 i586 armv5tel THISAPP = strace-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = strace -PAK_VER = 4 +PAK_VER = 5 DEPS = elfutils @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5f9f87f9afa282e7512f67a129287d6c +$(DL_FILE)_MD5 = f5a317fd535465cf9130d0547661f5c4 install : $(TARGET) -- 2.31.0

1 0

[PATCH 5/5] perl-File-Tail: Update to 1.3
by Adolf Belka 22 Mar '21

22 Mar '21

- Update from 0.99.3 to 1.3 - No update required to rootfile - perl-File-Tail is a dependency of the swatch addon - Changelog 1.0 Actually just two minor bug fixes (one of them in a test), but I no longer see a point in not having a 1.0 version. 1.1 Lee Duncan drew my attention to Stephan Muller's fixes for Windows compatibility Changed the use of the system's mv command to using File::Copy in the tests. (Steffen Mueller) Added machine-readable license statement to Makefile.PL and thus META.yml (Steffen Mueller) The sixth test in 10/open.t is skipped on win32 because you can't just move files around that are opened. (Steffen Mueller) Due to using sysread and friends, there were newline problems on win32. That should be fixed now. (Steffen Mueller) 1.2 Break the infinite loop that can result when the average length of lines causes the attempt to fill the tail buffer to fill with the exact same or even smaller number of lines. 1.3 Fix for a stupid bug in 1.2 (GFILATOV, Slaven_Rezic) Added a warning for use of debug in a non-debug version of File::Tail Shows a warning when maxbuf is set to a too-small value Invoking name_changes callback changes the value of input attribute (sottile(a)ix.netcom.com) When deciding to reopen the file, check if the inode matches (that would mean it has not been ranamed) Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/perl-File-Tail | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/perl-File-Tail b/lfs/perl-File-Tail index c9b4cbde4..fb82d4e78 100644 --- a/lfs/perl-File-Tail +++ b/lfs/perl-File-Tail @@ -24,7 +24,7 @@ ############################################################################### include Config -VER = 0.99.3 +VER = 1.3 THISAPP = File-Tail-$(VER) DL_FILE = ${THISAPP}.tar.gz @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = perl-File-Tail DEPS = -PAK_VER = 4 +PAK_VER = 5 ############################################################################### # Top-level Rules @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ef0fb7bcb4181ba593f4a09940f61d1c +$(DL_FILE)_MD5 = 252635f89ec18cb871c0b45ed64b3f63 install : $(TARGET) -- 2.31.0

1 0

[PATCH 4/5] perl-Date-Manip: Update to 6.85
by Adolf Belka 22 Mar '21

22 Mar '21

- Update from 6.40 to 6.85 - Updated rootfile - perl-Date-Manip is a dependency of the swatch addon - Changelog is too long to include here Full changelog can be viewed in tarball Approximately 31 bug fixes in the 36 releases between 6.40 and 6.85 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/perl-Date-Manip | 132 ++++------------------ lfs/perl-Date-Manip | 6 +- 2 files changed, 24 insertions(+), 114 deletions(-) diff --git a/config/rootfiles/packages/perl-Date-Manip b/config/rootfiles/packages/perl-Date-Manip index aa9970106..cd4bd6a9f 100644 --- a/config/rootfiles/packages/perl-Date-Manip +++ b/config/rootfiles/packages/perl-Date-Manip @@ -21,7 +21,9 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/Date.pod usr/lib/perl5/site_perl/5.30.0/Date/Manip/Delta.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/Delta.pod usr/lib/perl5/site_perl/5.30.0/Date/Manip/Examples.pod +usr/lib/perl5/site_perl/5.30.0/Date/Manip/History.pod usr/lib/perl5/site_perl/5.30.0/Date/Manip/Holidays.pod +usr/lib/perl5/site_perl/5.30.0/Date/Manip/Interfaces.pod #usr/lib/perl5/site_perl/5.30.0/Date/Manip/Lang usr/lib/perl5/site_perl/5.30.0/Date/Manip/Lang.pod usr/lib/perl5/site_perl/5.30.0/Date/Manip/Lang/catalan.pm @@ -509,50 +511,6 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off442.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off443.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off444.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off445.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off446.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off447.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off448.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off449.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off450.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off451.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off452.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off453.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off454.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off455.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off456.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off457.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off458.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off459.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off460.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off461.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off462.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off463.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off464.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off465.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off466.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off467.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off468.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off469.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off470.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off471.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off472.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off473.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off474.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off475.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off476.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off477.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off478.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off479.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off480.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off481.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off482.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off483.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off484.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off485.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off486.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off487.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off488.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/Offset/off489.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/Problems.pod usr/lib/perl5/site_perl/5.30.0/Date/Manip/Recur.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/Recur.pod @@ -562,62 +520,27 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ.pod usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/a00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afabid00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afaccr00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afaddi00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afalgi00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afasma00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afbama00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afbang00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afbanj00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afbiss00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afblan00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afbraz00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afbuju00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afcair00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afcasa00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afceut00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afcona00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afdaka00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afdar_00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afdjib00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afdoua00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afel_a00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/affree00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afgabo00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afhara00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afjoha00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afjuba00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afkamp00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afkhar00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afkiga00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afkins00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/aflago00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/aflibr00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/aflome00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afluan00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/aflubu00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/aflusa00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afmala00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afmapu00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afmase00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afmbab00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afmoga00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afmonr00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afnair00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afndja00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afniam00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afnoua00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afouag00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afport00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afsao_00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/aftrip00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/aftuni00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/afwind00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amadak00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amanch00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amangu00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amanti00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amarag00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amarub00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amasun00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amatik00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/ambahi00.pm @@ -637,7 +560,6 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amcanc00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amcara00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amcata00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amcaye00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amcaym00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amcent00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amchic00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amchih00.pm @@ -651,17 +573,14 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amdaws00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amdaws01.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amdenv00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amdetr00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amdomi00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amedmo00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/ameiru00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amel_s00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amfort00.pm +usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amfort01.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amglac00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amgodt00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amgoos00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amgran00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amgren00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amguad00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amguat00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amguay00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amguya00.pm @@ -697,14 +616,13 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/ammonc00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/ammont00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/ammont01.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/ammont02.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/ammont03.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/ammont04.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amnass00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amnew_00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amnew_01.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amnipi00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amnome00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amnoro00.pm +usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amnuuk00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amojin00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/ampana00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/ampang00.pm @@ -715,6 +633,7 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amport00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amport01.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amport02.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/ampuer00.pm +usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/ampunt00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amrain00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amrank00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amreci00.pm @@ -728,15 +647,10 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amsan_01.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amsant00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amsant01.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amsant02.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amsant03.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amsao_00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amscor00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amsitk00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amst_j00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amst_k00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amst_l00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amst_t00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amst_v00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amswif00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amtegu00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amtell00.pm @@ -744,7 +658,6 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amthul00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amthun00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amtiju00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amtoro00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amtort00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amtucu00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amushu00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/amvanc00.pm @@ -760,35 +673,35 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/andavi00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/andumo00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/anmacq00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/anmaws00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/anmcmu00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/anpalm00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/anroth00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/ansyow00.pm +usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/antrol00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/anvost00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asaden00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asalma00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asamma00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asanad00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asaqta00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asaqto00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asashg00.pm +usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asatyr00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asbagh00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asbahr00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asbaku00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asbang00.pm +usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asbarn00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asbeir00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asbish00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asbrun00.pm +usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/aschit00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/aschoi00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/aschon00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/ascolo00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asdama00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asdhak00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asdili00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asduba00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asdush00.pm +usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asfama00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asgaza00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asharb00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/ashebr00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asho_c00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/ashong00.pm @@ -800,48 +713,46 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asjeru00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/askabu00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/askamc00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/askara00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/askash00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/askath00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/askhan00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/askolk00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/askras00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/askual00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/askuch00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/askuwa00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asmaca00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asmaga00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asmaka00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asmani00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asmusc00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asnico00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asnovo00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asnovo01.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asomsk00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asoral00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asphno00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/aspont00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/aspyon00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asqata00.pm +usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asqost00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asqyzy00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asrang00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asriya00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/assakh00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/assama00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asseou00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asshan00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/assing00.pm +usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/assred00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/astaip00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/astash00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/astbil00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/astehr00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asthim00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/astoky00.pm +usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/astoms00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asulaa00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asurum00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asustm00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asvien00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asvlad00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asyaku00.pm +usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asyang00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asyeka00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/asyere00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/atazor00.pm @@ -852,12 +763,10 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/atfaro00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/atmade00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/atreyk00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/atsout00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/atst_h00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/atstan00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/auadel00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/aubris00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/aubrok00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/aucurr00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/audarw00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/aueucl00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/auhoba00.pm @@ -901,6 +810,7 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/etgmtp10.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/etgmtp11.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/euamst00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/euando00.pm +usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/euastr00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/euathe00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/eubelg00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/euberl00.pm @@ -915,6 +825,7 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/euhels00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/euista00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/eukali00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/eukiev00.pm +usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/eukiro00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/eulisb00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/eulond00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/euluxe00.pm @@ -929,13 +840,14 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/euprag00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/euriga00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/eurome00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/eusama00.pm +usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/eusara00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/eusimf00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/eusofi00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/eustoc00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/eutall00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/eutira00.pm +usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/euulya00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/euuzhg00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/euvadu00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/euvien00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/euviln00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/euvolg00.pm @@ -946,16 +858,13 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/f00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/g00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/h00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/i00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/inanta00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/inchag00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/inchri00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/incoco00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/incomo00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/inkerg00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/inmahe00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/inmald00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/inmaur00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/inmayo00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/inreun00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/k00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/l00.pm @@ -966,6 +875,7 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/o00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/p00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/paapia00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/paauck00.pm +usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/paboug00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/pachat00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/pachuu00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/paeast00.pm @@ -984,7 +894,6 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/pakosr00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/pakwaj00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/pamaju00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/pamarq00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/pamidw00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/panaur00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/paniue00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/panorf00.pm @@ -995,7 +904,6 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/papitc00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/papohn00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/paport00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/pararo00.pm -usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/pasaip00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/patahi00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/patara00.pm usr/lib/perl5/site_perl/5.30.0/Date/Manip/TZ/patong00.pm @@ -1038,7 +946,9 @@ usr/lib/perl5/site_perl/5.30.0/Date/Manip/Zones.pod #usr/share/man/man3/Date::Manip::Date.3 #usr/share/man/man3/Date::Manip::Delta.3 #usr/share/man/man3/Date::Manip::Examples.3 +#usr/share/man/man3/Date::Manip::History.3 #usr/share/man/man3/Date::Manip::Holidays.3 +#usr/share/man/man3/Date::Manip::Interfaces.3 #usr/share/man/man3/Date::Manip::Lang.3 #usr/share/man/man3/Date::Manip::Lang::catalan.3 #usr/share/man/man3/Date::Manip::Lang::danish.3 diff --git a/lfs/perl-Date-Manip b/lfs/perl-Date-Manip index 5802e46ee..80c3d7b9e 100644 --- a/lfs/perl-Date-Manip +++ b/lfs/perl-Date-Manip @@ -23,7 +23,7 @@ # Definitions ############################################################################### include Config -VER = 6.40 +VER = 6.85 THISAPP = Date-Manip-$(VER) DL_FILE = ${THISAPP}.tar.gz @@ -32,7 +32,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = perl-Date-Manip DEPS = -PAK_VER = 5 +PAK_VER = 6 ############################################################################### # Top-level Rules @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ae57b05e8ec689de2f23c99639e0109d +$(DL_FILE)_MD5 = ce3447409d83d16e6dd7bea0a18f24b4 install : $(TARGET) -- 2.31.0

1 0

[PATCH 3/5] perl-Date-Calc: Update to 6.4
by Adolf Belka 22 Mar '21

22 Mar '21

- Update from 6.3 to 6.4 - Update of rootfile not required - perl-Date-Calc is a dependency of the swatch addon - Changelog Version 6.4 07.03.2015 + Fixed t/f016.t, t/f027.t and t/f028.t which started failing on 01/01/2015 + Fixed t/f035.t which gave a warning "Unescaped left brace in regex is deprecated" with Perl 5.21.x Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/perl-Date-Calc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/perl-Date-Calc b/lfs/perl-Date-Calc index 21cd9fd77..f50646462 100644 --- a/lfs/perl-Date-Calc +++ b/lfs/perl-Date-Calc @@ -23,7 +23,7 @@ # Definitions ############################################################################### include Config -VER = 6.3 +VER = 6.4 THISAPP = Date-Calc-$(VER) DL_FILE = ${THISAPP}.tar.gz @@ -32,7 +32,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = perl-Date-Calc DEPS = perl-Carp-Clan -PAK_VER = 4 +PAK_VER = 5 ############################################################################### # Top-level Rules @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9b64555b7051c1beb6b61daead2d01b3 +$(DL_FILE)_MD5 = 69c635070d38c884682bfd4657031a8d install : $(TARGET) -- 2.31.0

1 0

[PATCH 2/5] perl-Carp-Clan: Update to 6.08
by Adolf Belka 22 Mar '21

22 Mar '21

- Update from 6.04 to 6.08 - Updated rootfile - perl-Carp-Clan is a dependency of the swatch addon - Changelog 6.08 2019-09-14 17:09:41Z - fix warning in bad test (thanks, Todd Rinaldo - RT#130494) - speed up code that was accomodating ancient perl versions that are no longer supported 6.07 2018-12-02 21:44:55Z - declared test prerequisites in the proper phase (RT#125288) - modernized distribution tooling 6.06 2016-05-29 - Avoid failure due to version self-check in 20pre560.t This test seems like a footgun for release management reasons, but apprently I wasn't quite as careful as I tried to be in keeping the last release minimal. 6.05 2016-05-29 - Patch tests failing due to 5.25.1+'s deprecated unquoted { } in regex. (RT #114537) Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/perl-Carp-Clan | 1 - lfs/perl-Carp-Clan | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/packages/perl-Carp-Clan b/config/rootfiles/packages/perl-Carp-Clan index 502bdf62e..10e2a5543 100644 --- a/config/rootfiles/packages/perl-Carp-Clan +++ b/config/rootfiles/packages/perl-Carp-Clan @@ -1,6 +1,5 @@ #usr/lib/perl5/site_perl/5.30.0/Carp usr/lib/perl5/site_perl/5.30.0/Carp/Clan.pm -usr/lib/perl5/site_perl/5.30.0/Carp/Clan.pod #usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Carp #usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Carp/Clan #usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Carp/Clan/.packlist diff --git a/lfs/perl-Carp-Clan b/lfs/perl-Carp-Clan index 3d9f85ff3..e0c057829 100644 --- a/lfs/perl-Carp-Clan +++ b/lfs/perl-Carp-Clan @@ -24,7 +24,7 @@ ############################################################################### include Config -VER = 6.04 +VER = 6.08 THISAPP = Carp-Clan-$(VER) DL_FILE = ${THISAPP}.tar.gz @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = perl-Carp-Clan DEPS = -PAK_VER = 4 +PAK_VER = 5 ############################################################################### # Top-level Rules @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b6316bc51bb530d994f2784615939fb2 +$(DL_FILE)_MD5 = 34fe04102374516ef7a105375b95ffde install : $(TARGET) -- 2.31.0

1 0

[PATCH 1/5] swatch: Update to 3.2.4
by Adolf Belka 22 Mar '21

22 Mar '21

- Update from 3.2.3 to 3.2.4 - Updated rootfile - Changelog There is no changelog in sourceforge for this package The changelog in the tarball has the last entry for 2008 Found this url https://fossies.org/diffs/swatchdog/3.2.3_vs_3.2.4/lib/Swatch/Actions.pm-di… which indicates that all changes are only related to change of name from swatch to swatchdog Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/swatch | 28 ++++++++++++++-------------- lfs/swatch | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/config/rootfiles/packages/swatch b/config/rootfiles/packages/swatch index 783929779..d266f63d2 100644 --- a/config/rootfiles/packages/swatch +++ b/config/rootfiles/packages/swatch @@ -1,14 +1,14 @@ -usr/bin/swatch -#usr/lib/perl5/site_perl/5.30.0/Swatch -usr/lib/perl5/site_perl/5.30.0/Swatch/Actions.pm -usr/lib/perl5/site_perl/5.30.0/Swatch/Threshold.pm -usr/lib/perl5/site_perl/5.30.0/Swatch/Throttle.pm -#usr/lib/perl5/site_perl/5.30.0/auto/Swatch -#usr/lib/perl5/site_perl/5.30.0/auto/Swatch/Actions -usr/lib/perl5/site_perl/5.30.0/auto/Swatch/Actions/autosplit.ix -#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/swatch -#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/swatch/.packlist -#usr/share/man/man1/swatch.1 -#usr/share/man/man3/Swatch::Actions.3 -#usr/share/man/man3/Swatch::Threshold.3 -#usr/share/man/man3/Swatch::Throttle.3 +usr/bin/swatchdog +#usr/lib/perl5/site_perl/5.30.0/Swatchdog +usr/lib/perl5/site_perl/5.30.0/Swatchdog/Actions.pm +usr/lib/perl5/site_perl/5.30.0/Swatchdog/Threshold.pm +usr/lib/perl5/site_perl/5.30.0/Swatchdog/Throttle.pm +#usr/lib/perl5/site_perl/5.30.0/auto/Swatchdog +#usr/lib/perl5/site_perl/5.30.0/auto/Swatchdog/Actions +#usr/lib/perl5/site_perl/5.30.0/auto/Swatchdog/Actions/autosplit.ix +#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/swatchdog +#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/swatchdog/.packlist +#usr/share/man/man1/swatchdog.1 +#usr/share/man/man3/Swatchdog::Actions.3 +#usr/share/man/man3/Swatchdog::Threshold.3 +#usr/share/man/man3/Swatchdog::Throttle.3 diff --git a/lfs/swatch b/lfs/swatch index 6977137b0..22a98287a 100644 --- a/lfs/swatch +++ b/lfs/swatch @@ -24,15 +24,15 @@ include Config -VER = 3.2.3 +VER = 3.2.4 -THISAPP = swatch-$(VER) +THISAPP = swatchdog-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = swatch -PAK_VER = 3 +PAK_VER = 4 DEPS = perl-File-Tail perl-Date-Calc perl-TimeDate perl-Date-Manip @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1162f1024cf07fc750ed4960d61ac4e8 +$(DL_FILE)_MD5 = df4c20ff7d3f6a46a2efd72a42078011 install : $(TARGET) -- 2.31.0

1 0

[PATCH 1/2] pmacct: New addon
by Adolf Belka (ipfire) 19 Mar '21

19 Mar '21

From: Adolf Belka <adolf.belka(a)ipfire.org> - What is it? pmacct is a monitoring tool for network management tasks. Data collected can be used for analysis and troubleshooting purposes to maintain the health of the network. pmacct can collect, replicate and export network information. It can cache in memory tables, store persistently to SQLite3 and output to flat-files like CSV, formatted, and JSON. - Why is it needed? To monitor data usage (IP-based or MAC-based data accounting) down to the client level. Net-Traffic will monitor traffic for the entire RED, GREEN, etc. networks, but it cannot pinpoint which client is using lots of data. Connections will take a snapshot but not show day by day sums. pmacct can help admins keep tabs on users that use too much data. - What are the use cases? An ISP may implement data caps and if the limit is over-run then you have to pay for every additional xxGB of data used. Typical charges can be around $10 per 50GB. With pmacct you can identify the high users and take action, hopefully before the limit is breached. - This is being introduced as a command line only tool. However, at a later date, if it is useful to enough additional users a WUI page could be developed as discussed in the development mailing list https://lists.ipfire.org/pipermail/development/2021-January/009174.html Co-authored-by: Jon Murphy Co-authored-by: Erik Kapfer <ummeegge(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/backup/includes/pmacct | 2 + config/pmacct/pmacct.conf | 24 +++++ config/pmacct/pmacct.init | 57 +++++++++++ config/pmacct/pmacct_memory_example.conf | 24 +++++ config/pmacct/pmacct_sqlite3_example.conf | 25 +++++ config/rootfiles/packages/pmacct | 111 ++++++++++++++++++++++ lfs/pmacct | 107 +++++++++++++++++++++ make.sh | 2 + src/paks/pmacct/install.sh | 36 +++++++ src/paks/pmacct/uninstall.sh | 33 +++++++ src/paks/pmacct/update.sh | 26 +++++ 11 files changed, 447 insertions(+) create mode 100644 config/backup/includes/pmacct create mode 100644 config/pmacct/pmacct.conf create mode 100644 config/pmacct/pmacct.init create mode 100644 config/pmacct/pmacct_memory_example.conf create mode 100644 config/pmacct/pmacct_sqlite3_example.conf create mode 100644 config/rootfiles/packages/pmacct create mode 100644 lfs/pmacct create mode 100644 src/paks/pmacct/install.sh create mode 100644 src/paks/pmacct/uninstall.sh create mode 100644 src/paks/pmacct/update.sh diff --git a/config/backup/includes/pmacct b/config/backup/includes/pmacct new file mode 100644 index 000000000..4359067ad --- /dev/null +++ b/config/backup/includes/pmacct @@ -0,0 +1,2 @@ +/etc/pmacct/ +/var/spool/pmacct/ diff --git a/config/pmacct/pmacct.conf b/config/pmacct/pmacct.conf new file mode 100644 index 000000000..3c1d47efa --- /dev/null +++ b/config/pmacct/pmacct.conf @@ -0,0 +1,24 @@ +! +! Pmacctd configuration file for IPFire environment +! + +syslog: daemon +daemonize: true +debug: false +promisc: true +interface: green0 + + +! +! "plugin1" plugin configuration +! +plugins: memory[plugin1] + +plugin_buffer_size[plugin1]: 102400 +plugin_pipe_size[plugin1]: 10240000 + +imt_mem_pools_number: 256 +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe + +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto +aggregate_filter[plugin1]: ip \ No newline at end of file diff --git a/config/pmacct/pmacct.init b/config/pmacct/pmacct.init new file mode 100644 index 000000000..31f9ce49b --- /dev/null +++ b/config/pmacct/pmacct.init @@ -0,0 +1,57 @@ +#!/bin/bash + +# Begin $rc_base/init.d/pmacct + +# Starts and stops pmacct daemon +# Date: 2021-02-25 12:25:30 (Thu, 25 Feb 2021) + +# Locations +CONF="/etc/pmacct/pmacct.conf" +CONTENT="/var/pmacct" +# Pmacctd binary +PMACCT="/usr/sbin/pmacctd" +# Pmacctd start options '-f' for the configuration file +OPT="-f ${CONF}" +DESC="pmacct daemon" +# Pmacctd syslog facilitiy +#SYSLOG="local1" + + +. /etc/sysconfig/rc +. $rc_functions + +case "$1" in + start) + boot_mesg "Starting the ${DESC}... " + loadproc ${PMACCT} ${OPT} + sleep 2 + if P=$(pgrep -fl pmacctd); then + echo -e "\n${P}" + else + echo -e "\n${PMACCT} is not running... " + fi + ;; + + stop) + boot_mesg "Stopping the ${DESC}... " + killproc ${PMACCT} + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + status) + statusproc ${PMACCT} + ;; + + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/pmacct + diff --git a/config/pmacct/pmacct_memory_example.conf b/config/pmacct/pmacct_memory_example.conf new file mode 100644 index 000000000..0babdaaf7 --- /dev/null +++ b/config/pmacct/pmacct_memory_example.conf @@ -0,0 +1,24 @@ +! +! Pmacctd configuration file for IPFire environment +! + +syslog: daemon +daemonize: true +debug: false +promisc: true +interface: green0 + + +! +! "plugin1" plugin configuration +! +plugins: memory[plugin1] + +plugin_buffer_size[plugin1]: 102400 +plugin_pipe_size[plugin1]: 10240000 + +imt_mem_pools_number: 256 +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe + +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto +aggregate_filter[plugin1]: ip diff --git a/config/pmacct/pmacct_sqlite3_example.conf b/config/pmacct/pmacct_sqlite3_example.conf new file mode 100644 index 000000000..7fb996408 --- /dev/null +++ b/config/pmacct/pmacct_sqlite3_example.conf @@ -0,0 +1,25 @@ +! +! Pmacctd configuration file for IPFire environment +! + +syslog: daemon +daemonize: true +debug: false +promisc: true +interface: green0 + + +! +! "plugin2" plugin configuration +! +plugins: sqlite3[plugin2] + +sql_db[plugin2]: /var/spool/pmacct/pmacct_sqlitev1.db +sql_table_version[plugin2]: 1 +sql_history[plugin2]: 5m +sql_refresh_time[plugin2]: 300 +sql_history_roundoff[plugin2]: m +sql_dont_try_update: true + +aggregate[plugin2]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto +aggregate_filter[plugin2]: ip diff --git a/config/rootfiles/packages/pmacct b/config/rootfiles/packages/pmacct new file mode 100644 index 000000000..fed83ee67 --- /dev/null +++ b/config/rootfiles/packages/pmacct @@ -0,0 +1,111 @@ +etc/pmacct +etc/pmacct/pmacct.conf +etc/pmacct/pmacct_memory_example.conf +etc/pmacct/pmacct_sqlite3_example.conf +etc/rc.d/init.d/pmacct +usr/bin/pmacct +#usr/lib/pmacct +#usr/lib/pmacct/examples +#usr/lib/pmacct/examples/custom +#usr/lib/pmacct/examples/custom/libcustom.la +#usr/lib/pmacct/examples/lg +#usr/lib/pmacct/examples/lg/pmbgp +usr/sbin/nfacctd +usr/sbin/pmacctd +usr/sbin/pmbgpd +usr/sbin/pmbmpd +usr/sbin/pmtelemetryd +usr/sbin/sfacctd +usr/share/pmacct +#usr/share/pmacct/CONFIG-KEYS +#usr/share/pmacct/FAQS +#usr/share/pmacct/QUICKSTART +#usr/share/pmacct/UPGRADE +#usr/share/pmacct/docs +#usr/share/pmacct/docs/IPFIX +#usr/share/pmacct/docs/LOOKING_GLASS_FORMAT +#usr/share/pmacct/docs/MSGLOG_DUMP_FORMATS +#usr/share/pmacct/docs/SIGNALS +#usr/share/pmacct/docs/TRIGGER_VARS +#usr/share/pmacct/examples +usr/share/pmacct/examples/allow.lst.example +#usr/share/pmacct/examples/amqp +usr/share/pmacct/examples/amqp/amqp_receiver.py +#usr/share/pmacct/examples/avro +usr/share/pmacct/examples/avro/avro_file_decoder.py +usr/share/pmacct/examples/bgp_agent.map.example +usr/share/pmacct/examples/bgp_md5.lst.example +usr/share/pmacct/examples/bgp_xconnects.map.example +usr/share/pmacct/examples/flow_to_rd.map.example +#usr/share/pmacct/examples/kafka +usr/share/pmacct/examples/kafka/kafka_consumer.py +#usr/share/pmacct/examples/lg +usr/share/pmacct/examples/lg/pmbgp.py +usr/share/pmacct/examples/networks.lst.example +usr/share/pmacct/examples/nfacctd-sql.conf.example +usr/share/pmacct/examples/pcap_interfaces.map.example +usr/share/pmacct/examples/peers.map.example +usr/share/pmacct/examples/pmacctd-imt.conf.example +usr/share/pmacct/examples/pmacctd-multiple-plugins.conf.example +usr/share/pmacct/examples/pmacctd-sql.conf.example +usr/share/pmacct/examples/pmacctd-sqlite3.conf.example +usr/share/pmacct/examples/ports.lst.example +usr/share/pmacct/examples/pretag.map.example +usr/share/pmacct/examples/primitives.lst.example +usr/share/pmacct/examples/probe_netflow.conf.example +usr/share/pmacct/examples/probe_sflow.conf.example +usr/share/pmacct/examples/sampling.map.example +usr/share/pmacct/examples/tee_receivers.lst.example +#usr/share/pmacct/sql +#usr/share/pmacct/sql/README.64bit +#usr/share/pmacct/sql/README.GeoIP +#usr/share/pmacct/sql/README.IPv6 +#usr/share/pmacct/sql/README.cos +#usr/share/pmacct/sql/README.custom_primitives +#usr/share/pmacct/sql/README.etype +#usr/share/pmacct/sql/README.export_proto +#usr/share/pmacct/sql/README.iface +#usr/share/pmacct/sql/README.label +#usr/share/pmacct/sql/README.mask +#usr/share/pmacct/sql/README.mpls +#usr/share/pmacct/sql/README.mysql +#usr/share/pmacct/sql/README.nat +#usr/share/pmacct/sql/README.pgsql +#usr/share/pmacct/sql/README.sampling +usr/share/pmacct/sql/README.sqlite3 +#usr/share/pmacct/sql/README.tag2 +#usr/share/pmacct/sql/README.timestamp +#usr/share/pmacct/sql/README.tunnel +#usr/share/pmacct/sql/pmacct-create-db.pgsql +#usr/share/pmacct/sql/pmacct-create-db_bgp_v1.mysql +#usr/share/pmacct/sql/pmacct-create-db_v1.mysql +#usr/share/pmacct/sql/pmacct-create-db_v2.mysql +#usr/share/pmacct/sql/pmacct-create-db_v3.mysql +#usr/share/pmacct/sql/pmacct-create-db_v4.mysql +#usr/share/pmacct/sql/pmacct-create-db_v5.mysql +#usr/share/pmacct/sql/pmacct-create-db_v6.mysql +#usr/share/pmacct/sql/pmacct-create-db_v7.mysql +#usr/share/pmacct/sql/pmacct-create-db_v8.mysql +#usr/share/pmacct/sql/pmacct-create-db_v9.mysql +#usr/share/pmacct/sql/pmacct-create-table_bgp_v1.pgsql +usr/share/pmacct/sql/pmacct-create-table_bgp_v1.sqlite3 +#usr/share/pmacct/sql/pmacct-create-table_v1.pgsql +usr/share/pmacct/sql/pmacct-create-table_v1.sqlite3 +#usr/share/pmacct/sql/pmacct-create-table_v2.pgsql +usr/share/pmacct/sql/pmacct-create-table_v2.sqlite3 +#usr/share/pmacct/sql/pmacct-create-table_v3.pgsql +usr/share/pmacct/sql/pmacct-create-table_v3.sqlite3 +#usr/share/pmacct/sql/pmacct-create-table_v4.pgsql +usr/share/pmacct/sql/pmacct-create-table_v4.sqlite3 +#usr/share/pmacct/sql/pmacct-create-table_v5.pgsql +usr/share/pmacct/sql/pmacct-create-table_v5.sqlite3 +#usr/share/pmacct/sql/pmacct-create-table_v6.pgsql +usr/share/pmacct/sql/pmacct-create-table_v6.sqlite3 +usr/share/pmacct/sql/pmacct-create-table_v7.sqlite3 +#usr/share/pmacct/sql/pmacct-create-table_v7_v8.pgsql +usr/share/pmacct/sql/pmacct-create-table_v8.sqlite3 +#usr/share/pmacct/sql/pmacct-create-table_v9.pgsql +usr/share/pmacct/sql/pmacct-create-table_v9.sqlite3 +#usr/share/pmacct/sql/pmacct-grant-db.mysql +var/ipfire/backup/addons/includes/pmacct +var/spool/pmacct diff --git a/lfs/pmacct b/lfs/pmacct new file mode 100644 index 000000000..c6cc5270e --- /dev/null +++ b/lfs/pmacct @@ -0,0 +1,107 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2019 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.7.6 + +THISAPP = pmacct-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = pmacct +PAK_VER = 1 + +DEPS = libcdada + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = b829cfdc394d5acd6d32fb23de181a6b + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./autogen.sh + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/pmacct \ + --enable-sqlite3 \ + --enable-l2 \ + --enable-jansson + + # Add directory for plugins and pipes + -mkdir -v /var/spool/pmacct + + # Add configuration folder and copy conf files to it + -mkdir -v /etc/pmacct + cp -vf $(DIR_CONF)/pmacct/*.conf /etc/pmacct + + # Copy initscript to dir + cp -vf $(DIR_CONF)/pmacct/pmacct.init /etc/rc.d/init.d/pmacct + chmod 754 /etc/rc.d/init.d/pmacct + chown root:root /etc/rc.d/init.d/pmacct + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + # Install backup definition + install -v -m 644 ${DIR_SRC}/config/backup/includes/pmacct \ + /var/ipfire/backup/addons/includes/pmacct + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 43cccaca0..d42c9b1e2 100755 --- a/make.sh +++ b/make.sh @@ -1646,6 +1646,8 @@ buildipfire() { lfsmake2 ncdu lfsmake2 lshw lfsmake2 socat + lfsmake2 libcdada + lfsmake2 pmacct } buildinstaller() { diff --git a/src/paks/pmacct/install.sh b/src/paks/pmacct/install.sh new file mode 100644 index 000000000..8178cc7bc --- /dev/null +++ b/src/paks/pmacct/install.sh @@ -0,0 +1,36 @@ +#!/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 +restore_backup ${NAME} + +# Add symlinks for runlevels +ln -s ../init.d/${NAME} /etc/rc.d/rc0.d/K85${NAME} +ln -s ../init.d/${NAME} /etc/rc.d/rc3.d/S50${NAME} +ln -s ../init.d/${NAME} /etc/rc.d/rc6.d/K85${NAME} +start_service --background ${NAME} + + +# EOF diff --git a/src/paks/pmacct/uninstall.sh b/src/paks/pmacct/uninstall.sh new file mode 100644 index 000000000..51631e8c1 --- /dev/null +++ b/src/paks/pmacct/uninstall.sh @@ -0,0 +1,33 @@ +#!/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 + +stop_service ${NAME} +make_backup ${NAME} +remove_files + +# Delete symlinks +rm -rfv /etc/rc.d/rc?.d/???${NAME} + +# EOF diff --git a/src/paks/pmacct/update.sh b/src/paks/pmacct/update.sh new file mode 100644 index 000000000..89c40d0d7 --- /dev/null +++ b/src/paks/pmacct/update.sh @@ -0,0 +1,26 @@ +#!/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 -- 2.30.1

4 6

[PATCH 2/2] libcdada: New addon - dependency for pmacct
by Adolf Belka (ipfire) 19 Mar '21

19 Mar '21

From: Adolf Belka <adolf.belka(a)ipfire.org> - This package is required for its library which is a dependency for pmacct - url for developer is https://msune.github.io/libcdada/ - patch is required to allow disabling of staic library Makefiles for tests and examples explicitly uses static library The patch changes all .a to .so Co-authored-by: Jon Murphy Co-authored-by: Erik Kapfer <ummeegge(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/libcdada | 28 ++++++ lfs/libcdada | 87 +++++++++++++++++++ ...library-for-tests-and-examples-build.patch | 56 ++++++++++++ 3 files changed, 171 insertions(+) create mode 100644 config/rootfiles/packages/libcdada create mode 100644 lfs/libcdada create mode 100644 src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch diff --git a/config/rootfiles/packages/libcdada b/config/rootfiles/packages/libcdada new file mode 100644 index 000000000..b3b1b99b1 --- /dev/null +++ b/config/rootfiles/packages/libcdada @@ -0,0 +1,28 @@ +#usr/bin/cdada-gen +#usr/include/cdada +#usr/include/cdada.h +#usr/include/cdada/__common_internal.h +#usr/include/cdada/__list_internal.h +#usr/include/cdada/__map_internal.h +#usr/include/cdada/__queue_internal.h +#usr/include/cdada/__set_internal.h +#usr/include/cdada/__stack_internal.h +#usr/include/cdada/bbitmap.h +#usr/include/cdada/list.h +#usr/include/cdada/list_custom_cc.h +#usr/include/cdada/map.h +#usr/include/cdada/map_custom_cc.h +#usr/include/cdada/queue.h +#usr/include/cdada/queue_custom_cc.h +#usr/include/cdada/set.h +#usr/include/cdada/set_custom_cc.h +#usr/include/cdada/stack.h +#usr/include/cdada/stack_custom_cc.h +#usr/include/cdada/str.h +#usr/include/cdada/utils.h +#usr/include/cdada/version.h +#usr/lib/libcdada.a +#usr/lib/libcdada.la +#usr/lib/libcdada.so +usr/lib/libcdada.so.0 +usr/lib/libcdada.so.0.0.0 diff --git a/lfs/libcdada b/lfs/libcdada new file mode 100644 index 000000000..a30b03333 --- /dev/null +++ b/lfs/libcdada @@ -0,0 +1,87 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2019 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.3.4 + +THISAPP = libcdada-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libcdada +PAK_VER = 1 + +DEPS = + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = f5067835014e02d221af9754df8b140b + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch + cd $(DIR_APP) && ./autogen.sh + cd $(DIR_APP)/build && ../configure \ + --prefix=/usr \ + --disable-static + cd $(DIR_APP)/build && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch b/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch new file mode 100644 index 000000000..adb06ad9d --- /dev/null +++ b/src/patches/libcdada-0.3.4-use-shared-library-for-tests-and-examples-build.patch @@ -0,0 +1,56 @@ +diff -ruN libcdada-0.3.4.orig/examples/Makefile.am libcdada-0.3.4/examples/Makefile.am +--- libcdada-0.3.4.orig/examples/Makefile.am 2021-01-15 00:01:59.000000000 +0100 ++++ libcdada-0.3.4/examples/Makefile.am 2021-02-28 15:41:13.940082099 +0100 +@@ -11,32 +11,32 @@ + + list_u32_SOURCES = list_u32.c + list_u32_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/ +-list_u32_LDADD = ../src/.libs/libcdada.a -lstdc++ ++list_u32_LDADD = ../src/.libs/libcdada.so -lstdc++ + + map_struct_SOURCES = map_struct.c + map_struct_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/ +-map_struct_LDADD = ../src/.libs/libcdada.a -lstdc++ ++map_struct_LDADD = ../src/.libs/libcdada.so -lstdc++ + + custom_gen_SOURCES = custom-gen/my_program_gen.c custom-gen/cdada.cc + custom_gen_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/ +-custom_gen_LDADD = ../src/.libs/libcdada.a -lstdc++ ++custom_gen_LDADD = ../src/.libs/libcdada.so -lstdc++ + + custom_macro_SOURCES = custom-macro/my_program.c custom-macro/cdada.cc + custom_macro_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/ +-custom_macro_LDADD = ../src/.libs/libcdada.a -lstdc++ ++custom_macro_LDADD = ../src/.libs/libcdada.so -lstdc++ + + str_SOURCES = str.c + str_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/ +-str_LDADD = ../src/.libs/libcdada.a -lstdc++ ++str_LDADD = ../src/.libs/libcdada.so -lstdc++ + + bbitmap_SOURCES = bbitmap.c + bbitmap_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/ +-bbitmap_LDADD = ../src/.libs/libcdada.a -lstdc++ ++bbitmap_LDADD = ../src/.libs/libcdada.so -lstdc++ + + queue_u32_SOURCES = queue_u32.c + queue_u32_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/ +-queue_u32_LDADD = ../src/.libs/libcdada.a -lstdc++ ++queue_u32_LDADD = ../src/.libs/libcdada.so -lstdc++ + + stack_u32_SOURCES = stack_u32.c + stack_u32_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_srcdir)/include/ +-stack_u32_LDADD = ../src/.libs/libcdada.a -lstdc++ ++stack_u32_LDADD = ../src/.libs/libcdada.so -lstdc++ +diff -ruN libcdada-0.3.4.orig/test/Makefile.am libcdada-0.3.4/test/Makefile.am +--- libcdada-0.3.4.orig/test/Makefile.am 2021-01-15 00:01:59.000000000 +0100 ++++ libcdada-0.3.4/test/Makefile.am 2021-02-28 15:40:37.458117227 +0100 +@@ -63,7 +63,7 @@ + benchmark_SOURCES= benchmark.cc + benchmark_CXXFLAGS= -O3 + benchmark_CPPFLAGS= -I$(top_builddir)/include/ -I$(top_srcdir)/include/ +-benchmark_LDADD= -lpthread ../src/.libs/libcdada.a ++benchmark_LDADD= -lpthread ../src/.libs/libcdada.so + + #Valgrind + if VALGRIND_ENABLED -- 2.30.1

3 4

[PATCH] jquery: Update to 3.6.0
by Adolf Belka 19 Mar '21

19 Mar '21

- Update from 1.10.2 to 3.6.0 - No update required for rootfile - Changelog covers 8 years and 3 branches of code version - The 1.x and 2.x branches no longer receive patches Summary of Important Changes for move to 3.0 Attributes Breaking change: .removeAttr() no longer sets properties to false Breaking change: select-multiple with nothing selected returns an empty array Feature: SVG documents support class operations Deprecated: .toggleClass() with no arguments and .toggleClass( Boolean ) Callbacks Feature: Locking a Callback prevents only future list execution Core Breaking change: jQuery 3.0 runs in Strict Mode Breaking change: document-ready handlers are now asynchronous Breaking change: jQuery.isNumeric() and custom .toString() Breaking change: Deprecated .context and .selector properties removed Breaking change: Deprecated .size() removed Breaking change: Undocumented internal methods no longer exposed Breaking change: Return values on empty sets are undefined Feature: for...of loops can be used on jQuery collections Feature: jQuery.ready promise is formally supported Deprecated: jQuery.unique(), renamed to jQuery.uniqueSort() Deprecated: jQuery.parseJSON() Deprecated: document-ready handlers other than jQuery(function) Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/jquery | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/jquery b/lfs/jquery index 6b054cbd4..1d35bbedd 100644 --- a/lfs/jquery +++ b/lfs/jquery @@ -24,7 +24,7 @@ include Config -VER = 1.10.2 +VER = 3.6.0 THISAPP = jquery-$(VER) DL_FILE = $(THISAPP).min.js @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 628072e7212db1e8cdacb22b21752cda +$(DL_FILE)_MD5 = 8fb8fee4fcc3cc86ff6c724154c49c42 install : $(TARGET) -- 2.30.2

3 4

Re: [PATCH 1/2] pmacct: New addon
by Jon Murphy 19 Mar '21

19 Mar '21

Try this agin... > On Mar 18, 2021, at 7:47 PM, murphy.jon(a)me.com wrote: > > > >> On Mar 18, 2021, at 1:43 PM, Adolf Belka <adolf.belka(a)ipfire.org <mailto:adolf.belka@ipfire.org>> wrote: >> >> Hi Michael, >> >> On 18/03/2021 19:25, Michael Tremer wrote: >>> Hey, >>>> On 18 Mar 2021, at 13:34, Adolf Belka <adolf.belka(a)ipfire.org <mailto:adolf.belka@ipfire.org>> wrote: >>>> >>>> Hi Michael, >>>> >>>> On 18/03/2021 14:07, Michael Tremer wrote: >>>>> Hello, >>>>> I will split this email into two parts: >>>>> The technical part: >>>>> * The initscript isn’t based on our template and uses sleep to check if starting a daemon has been successful. That should not be necessary and will potentially slow down the boot process. >>>> I will have another look at the initscript and see if it can use the standard IPFire template. >>> Yes, it is not too different from your version: >>> https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=src/initscripts/system/te… <https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=src/initscripts/system/te…> >>> There isn’t much documentation around it but there are loads of other scripts that will be helpful to figure out any convention or boilerplate code to copy. >>>>> * I am not very sure if the example configuration files are helpful. Maybe someone can clear this up a little bit for me what is the rationale is behind them. >>>> The idea was that the two simplest config example scripts were provided that give a user the ability to get data into memory or into a sqlite file. The actual conf file provided is a copy of the memory version. These give a basic starting point that people can then add additional info to be recorded etc. >>> Does anybody want to use anything else than SQLite in the context of IPFire? >> I think we weren't sure and the memory and sqlite options were the easiest to get going and give real data. There are also mysql and postgresql options but I think we need to see what the interest is. >>>>> * There are loads of daemons being shipped and only one is being used. >>>> I think Jon or Erik need to comment on this question. >>>>> * How much load does this generate? How large is the captured data? >>>> Jon needs to provide this feedback. > It depends (sorry for that!) > If someone runs the memory mode, then ~10,000 lines per day? (I’ll run more test to give you better info) > If someone runs in SQLite3 mode, AND runs at 1 min refresh, then ~230,000 lines per day. THIS IS NOT RECOMMENDED but is possible. > If someone runs in SQLite3 mode, AND runs at 60 min refresh, then ~100,000 lines per day. (I’m currently tracking too many items) > >>>>> Then there is the other part: >>>>>> On 8 Mar 2021, at 11:57, Adolf Belka (ipfire) <adolf.belka(a)ipfire.org <mailto:adolf.belka@ipfire.org>> wrote: >>>>>> >>>>>> From: Adolf Belka <adolf.belka(a)ipfire.org <mailto:adolf.belka@ipfire.org>> >>>>>> >>>>>> - What is it? >>>>>> pmacct is a monitoring tool for network management tasks. Data collected >>>>>> can be used for analysis and troubleshooting purposes to maintain the >>>>>> health of the network. pmacct can collect, replicate and export network >>>>>> information. It can cache in memory tables, store persistently to SQLite3 >>>>>> and output to flat-files like CSV, formatted, and JSON. >>>>> Okay. >>>>>> - Why is it needed? >>>>>> To monitor data usage (IP-based or MAC-based data accounting) down to the >>>>>> client level. Net-Traffic will monitor traffic for the entire RED, GREEN, >>>>>> etc. networks, but it cannot pinpoint which client is using lots of data. >>>>>> Connections will take a snapshot but not show day by day sums. pmacct can >>>>>> help admins keep tabs on users that use too much data. >>>>> I agree with the goal of it. But how does this add-on achieve that? >>>> Jon should comment on this as he had this use case and can give feedback how the data has helped him in his investigations. > Allows the admin to see which user (IP address or MAC address) is using too much of the data. Currently this is via a query. In the future it should be via a CGI. > >>>>> The data is being written to a (usually binary) file which cannot be visualised in the web UI. Does this not want a CGI script that allows people to see what is happening? >>>> We all thought that this would ultimately need a CGI script to set up and visualise the data. We believed it was worth getting this running in actual use as a CLI tool to start with and then get more feedback on the best items that would need to be captured in the CGI script. The tool has a lot of capabilities and I think it will not be possible to do everything that it can do in a WUI page. So some form of file or db offload will need to be available anyway but the items identified as being commonly required would be the ones to be developed into a CGI WUI page. >>>>> Sending manual SQL queries probably isn’t much fun :) >>>>>> - What are the use cases? >>>>>> An ISP may implement data caps and if the limit is over-run then you have >>>>>> to pay for every additional xxGB of data used. Typical charges can be >>>>>> around $10 per 50GB. With pmacct you can identify the high users and take >>>>>> action, hopefully before the limit is breached. >>>>>> - This is being introduced as a command line only tool. However, at a later >>>>>> date, if it is useful to enough additional users a WUI page could be >>>>>> developed as discussed in the development mailing list >>>>>> https://lists.ipfire.org/pipermail/development/2021-January/009174.html <https://lists.ipfire.org/pipermail/development/2021-January/009174.html> >>>>> I have been thinking about this for a while now and would say that I can approve merging this as a CLI tool. But it would not really enhance IPFire’s functionality because it is only usable for people who spend a lot of time writing their own scripts or SQL queries to get information that can be used to make decisions. >>>> We recognise that and had discussed the CGI WUI page as mentioned above. >>> Was this here on the list or elsewhere? >> This was in a private conversation on the IPFire Community forum. We thought it best to have all our back and forth discussions between ourselves to start with. We were all finding our feet with it as well and we thought it best not to swamp the development list with our musings and questions to each other. If you want to see all the discussion history, then we can add you to the members of that conversation. >> If the addon gets accepted then any future discussions would be done on the Development mailing list to get everyones input. >>>>> Adding another alternative to vnstat will result in us having to maintain two things that roughly do the same - or where one’s features are a subset of the other one. >>>> I think Jon or Erik need to comment on any comparison with vnstat. > I looked at Vnstat today. It doesn’t look like it gets down to the client level (specifically which IP / MAC address is the troublemaker). Does it output per IP address? > >>>>> I would like to avoid merging this and then see it abandoned because it is too complicated to use. We already have a lot of virtually unmaintained stuff around and I would really like to drop a lot of it, although I know that there are a few people actually using it. >>>> Jon and Erik should comment on the complication of use or not. Jon especially has done quite a bit of work with it, installing the .ipfire package versions that I have created. >>>> I intend to also have a play around with it but for me it is more some playful fun as I just have a home network with only myself as the user and admin. > > Hopefully we can get to the point of creating a CGI that will have IP address on the left side and Months across the top and bytes in the middle. > > Very rough draft (image enclosed). > > <PastedGraphic-1.tiff> > > Hopefully I answered all of the questions... > Jon > >>>>> Thoughts? >>>>> Best, >>>>> -Michael >>>>>> Co-authored-by: Jon Murphy >>>>>> Co-authored-by: Erik Kapfer <ummeegge(a)ipfire.org <mailto:ummeegge@ipfire.org>> >>>>>> >>>>>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org <mailto:adolf.belka@ipfire.org>> >>>>>> --- >>>>>> config/backup/includes/pmacct | 2 + >>>>>> config/pmacct/pmacct.conf | 24 +++++ >>>>>> config/pmacct/pmacct.init | 57 +++++++++++ >>>>>> config/pmacct/pmacct_memory_example.conf | 24 +++++ >>>>>> config/pmacct/pmacct_sqlite3_example.conf | 25 +++++ >>>>>> config/rootfiles/packages/pmacct | 111 ++++++++++++++++++++++ >>>>>> lfs/pmacct | 107 +++++++++++++++++++++ >>>>>> make.sh | 2 + >>>>>> src/paks/pmacct/install.sh | 36 +++++++ >>>>>> src/paks/pmacct/uninstall.sh | 33 +++++++ >>>>>> src/paks/pmacct/update.sh | 26 +++++ >>>>>> 11 files changed, 447 insertions(+) >>>>>> create mode 100644 config/backup/includes/pmacct >>>>>> create mode 100644 config/pmacct/pmacct.conf >>>>>> create mode 100644 config/pmacct/pmacct.init >>>>>> create mode 100644 config/pmacct/pmacct_memory_example.conf >>>>>> create mode 100644 config/pmacct/pmacct_sqlite3_example.conf >>>>>> create mode 100644 config/rootfiles/packages/pmacct >>>>>> create mode 100644 lfs/pmacct >>>>>> create mode 100644 src/paks/pmacct/install.sh >>>>>> create mode 100644 src/paks/pmacct/uninstall.sh >>>>>> create mode 100644 src/paks/pmacct/update.sh >>>>>> >>>>>> diff --git a/config/backup/includes/pmacct b/config/backup/includes/pmacct >>>>>> new file mode 100644 >>>>>> index 000000000..4359067ad >>>>>> --- /dev/null >>>>>> +++ b/config/backup/includes/pmacct >>>>>> @@ -0,0 +1,2 @@ >>>>>> +/etc/pmacct/ >>>>>> +/var/spool/pmacct/ >>>>>> diff --git a/config/pmacct/pmacct.conf b/config/pmacct/pmacct.conf >>>>>> new file mode 100644 >>>>>> index 000000000..3c1d47efa >>>>>> --- /dev/null >>>>>> +++ b/config/pmacct/pmacct.conf >>>>>> @@ -0,0 +1,24 @@ >>>>>> +! >>>>>> +! Pmacctd configuration file for IPFire environment >>>>>> +! >>>>>> + >>>>>> +syslog: daemon >>>>>> +daemonize: true >>>>>> +debug: false >>>>>> +promisc: true >>>>>> +interface: green0 >>>>>> + >>>>>> + >>>>>> +! >>>>>> +! "plugin1" plugin configuration >>>>>> +! >>>>>> +plugins: memory[plugin1] >>>>>> + >>>>>> +plugin_buffer_size[plugin1]: 102400 >>>>>> +plugin_pipe_size[plugin1]: 10240000 >>>>>> + >>>>>> +imt_mem_pools_number: 256 >>>>>> +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe >>>>>> + >>>>>> +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto >>>>>> +aggregate_filter[plugin1]: ip >>>>>> \ No newline at end of file >>>>>> diff --git a/config/pmacct/pmacct.init b/config/pmacct/pmacct.init >>>>>> new file mode 100644 >>>>>> index 000000000..31f9ce49b >>>>>> --- /dev/null >>>>>> +++ b/config/pmacct/pmacct.init >>>>>> @@ -0,0 +1,57 @@ >>>>>> +#!/bin/bash >>>>>> + >>>>>> +# Begin $rc_base/init.d/pmacct >>>>>> + >>>>>> +# Starts and stops pmacct daemon >>>>>> +# Date: 2021-02-25 12:25:30 (Thu, 25 Feb 2021) >>>>>> + >>>>>> +# Locations >>>>>> +CONF="/etc/pmacct/pmacct.conf" >>>>>> +CONTENT="/var/pmacct" >>>>>> +# Pmacctd binary >>>>>> +PMACCT="/usr/sbin/pmacctd" >>>>>> +# Pmacctd start options '-f' for the configuration file >>>>>> +OPT="-f ${CONF}" >>>>>> +DESC="pmacct daemon" >>>>>> +# Pmacctd syslog facilitiy >>>>>> +#SYSLOG="local1" >>>>>> + >>>>>> + >>>>>> +. /etc/sysconfig/rc >>>>>> +. $rc_functions >>>>>> + >>>>>> +case "$1" in >>>>>> + start) >>>>>> + boot_mesg "Starting the ${DESC}... " >>>>>> + loadproc ${PMACCT} ${OPT} >>>>>> + sleep 2 >>>>>> + if P=$(pgrep -fl pmacctd); then >>>>>> + echo -e "\n${P}" >>>>>> + else >>>>>> + echo -e "\n${PMACCT} is not running... " >>>>>> + fi >>>>>> + ;; >>>>>> + >>>>>> + stop) >>>>>> + boot_mesg "Stopping the ${DESC}... " >>>>>> + killproc ${PMACCT} >>>>>> + ;; >>>>>> + >>>>>> + restart) >>>>>> + $0 stop >>>>>> + sleep 1 >>>>>> + $0 start >>>>>> + ;; >>>>>> + >>>>>> + status) >>>>>> + statusproc ${PMACCT} >>>>>> + ;; >>>>>> + >>>>>> + *) >>>>>> + echo "Usage: $0 {start|stop|restart|status}" >>>>>> + exit 1 >>>>>> + ;; >>>>>> +esac >>>>>> + >>>>>> +# End $rc_base/init.d/pmacct >>>>>> + >>>>>> diff --git a/config/pmacct/pmacct_memory_example.conf b/config/pmacct/pmacct_memory_example.conf >>>>>> new file mode 100644 >>>>>> index 000000000..0babdaaf7 >>>>>> --- /dev/null >>>>>> +++ b/config/pmacct/pmacct_memory_example.conf >>>>>> @@ -0,0 +1,24 @@ >>>>>> +! >>>>>> +! Pmacctd configuration file for IPFire environment >>>>>> +! >>>>>> + >>>>>> +syslog: daemon >>>>>> +daemonize: true >>>>>> +debug: false >>>>>> +promisc: true >>>>>> +interface: green0 >>>>>> + >>>>>> + >>>>>> +! >>>>>> +! "plugin1" plugin configuration >>>>>> +! >>>>>> +plugins: memory[plugin1] >>>>>> + >>>>>> +plugin_buffer_size[plugin1]: 102400 >>>>>> +plugin_pipe_size[plugin1]: 10240000 >>>>>> + >>>>>> +imt_mem_pools_number: 256 >>>>>> +imt_path[plugin1]: /var/spool/pmacct/plugin1.pipe >>>>>> + >>>>>> +aggregate[plugin1]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto >>>>>> +aggregate_filter[plugin1]: ip >>>>>> diff --git a/config/pmacct/pmacct_sqlite3_example.conf b/config/pmacct/pmacct_sqlite3_example.conf >>>>>> new file mode 100644 >>>>>> index 000000000..7fb996408 >>>>>> --- /dev/null >>>>>> +++ b/config/pmacct/pmacct_sqlite3_example.conf >>>>>> @@ -0,0 +1,25 @@ >>>>>> +! >>>>>> +! Pmacctd configuration file for IPFire environment >>>>>> +! >>>>>> + >>>>>> +syslog: daemon >>>>>> +daemonize: true >>>>>> +debug: false >>>>>> +promisc: true >>>>>> +interface: green0 >>>>>> + >>>>>> + >>>>>> +! >>>>>> +! "plugin2" plugin configuration >>>>>> +! >>>>>> +plugins: sqlite3[plugin2] >>>>>> + >>>>>> +sql_db[plugin2]: /var/spool/pmacct/pmacct_sqlitev1.db >>>>>> +sql_table_version[plugin2]: 1 >>>>>> +sql_history[plugin2]: 5m >>>>>> +sql_refresh_time[plugin2]: 300 >>>>>> +sql_history_roundoff[plugin2]: m >>>>>> +sql_dont_try_update: true >>>>>> + >>>>>> +aggregate[plugin2]: src_host, src_port, src_mac, dst_host, dst_port, dst_mac, proto >>>>>> +aggregate_filter[plugin2]: ip >>>>>> diff --git a/config/rootfiles/packages/pmacct b/config/rootfiles/packages/pmacct >>>>>> new file mode 100644 >>>>>> index 000000000..fed83ee67 >>>>>> --- /dev/null >>>>>> +++ b/config/rootfiles/packages/pmacct >>>>>> @@ -0,0 +1,111 @@ >>>>>> +etc/pmacct >>>>>> +etc/pmacct/pmacct.conf >>>>>> +etc/pmacct/pmacct_memory_example.conf >>>>>> +etc/pmacct/pmacct_sqlite3_example.conf >>>>>> +etc/rc.d/init.d/pmacct >>>>>> +usr/bin/pmacct >>>>>> +#usr/lib/pmacct >>>>>> +#usr/lib/pmacct/examples >>>>>> +#usr/lib/pmacct/examples/custom >>>>>> +#usr/lib/pmacct/examples/custom/libcustom.la <http://libcustom.la/> >>>>>> +#usr/lib/pmacct/examples/lg >>>>>> +#usr/lib/pmacct/examples/lg/pmbgp >>>>>> +usr/sbin/nfacctd >>>>>> +usr/sbin/pmacctd >>>>>> +usr/sbin/pmbgpd >>>>>> +usr/sbin/pmbmpd >>>>>> +usr/sbin/pmtelemetryd >>>>>> +usr/sbin/sfacctd >>>>>> +usr/share/pmacct >>>>>> +#usr/share/pmacct/CONFIG-KEYS >>>>>> +#usr/share/pmacct/FAQS >>>>>> +#usr/share/pmacct/QUICKSTART >>>>>> +#usr/share/pmacct/UPGRADE >>>>>> +#usr/share/pmacct/docs >>>>>> +#usr/share/pmacct/docs/IPFIX >>>>>> +#usr/share/pmacct/docs/LOOKING_GLASS_FORMAT >>>>>> +#usr/share/pmacct/docs/MSGLOG_DUMP_FORMATS >>>>>> +#usr/share/pmacct/docs/SIGNALS >>>>>> +#usr/share/pmacct/docs/TRIGGER_VARS >>>>>> +#usr/share/pmacct/examples >>>>>> +usr/share/pmacct/examples/allow.lst.example >>>>>> +#usr/share/pmacct/examples/amqp >>>>>> +usr/share/pmacct/examples/amqp/amqp_receiver.py >>>>>> +#usr/share/pmacct/examples/avro >>>>>> +usr/share/pmacct/examples/avro/avro_file_decoder.py >>>>>> +usr/share/pmacct/examples/bgp_agent.map.example >>>>>> +usr/share/pmacct/examples/bgp_md5.lst.example >>>>>> +usr/share/pmacct/examples/bgp_xconnects.map.example >>>>>> +usr/share/pmacct/examples/flow_to_rd.map.example >>>>>> +#usr/share/pmacct/examples/kafka >>>>>> +usr/share/pmacct/examples/kafka/kafka_consumer.py >>>>>> +#usr/share/pmacct/examples/lg >>>>>> +usr/share/pmacct/examples/lg/pmbgp.py >>>>>> +usr/share/pmacct/examples/networks.lst.example >>>>>> +usr/share/pmacct/examples/nfacctd-sql.conf.example >>>>>> +usr/share/pmacct/examples/pcap_interfaces.map.example >>>>>> +usr/share/pmacct/examples/peers.map.example >>>>>> +usr/share/pmacct/examples/pmacctd-imt.conf.example >>>>>> +usr/share/pmacct/examples/pmacctd-multiple-plugins.conf.example >>>>>> +usr/share/pmacct/examples/pmacctd-sql.conf.example >>>>>> +usr/share/pmacct/examples/pmacctd-sqlite3.conf.example >>>>>> +usr/share/pmacct/examples/ports.lst.example >>>>>> +usr/share/pmacct/examples/pretag.map.example >>>>>> +usr/share/pmacct/examples/primitives.lst.example >>>>>> +usr/share/pmacct/examples/probe_netflow.conf.example >>>>>> +usr/share/pmacct/examples/probe_sflow.conf.example >>>>>> +usr/share/pmacct/examples/sampling.map.example >>>>>> +usr/share/pmacct/examples/tee_receivers.lst.example >>>>>> +#usr/share/pmacct/sql >>>>>> +#usr/share/pmacct/sql/README.64bit >>>>>> +#usr/share/pmacct/sql/README.GeoIP >>>>>> +#usr/share/pmacct/sql/README.IPv6 >>>>>> +#usr/share/pmacct/sql/README.cos >>>>>> +#usr/share/pmacct/sql/README.custom_primitives >>>>>> +#usr/share/pmacct/sql/README.etype >>>>>> +#usr/share/pmacct/sql/README.export_proto >>>>>> +#usr/share/pmacct/sql/README.iface >>>>>> +#usr/share/pmacct/sql/README.label >>>>>> +#usr/share/pmacct/sql/README.mask >>>>>> +#usr/share/pmacct/sql/README.mpls >>>>>> +#usr/share/pmacct/sql/README.mysql >>>>>> +#usr/share/pmacct/sql/README.nat >>>>>> +#usr/share/pmacct/sql/README.pgsql >>>>>> +#usr/share/pmacct/sql/README.sampling >>>>>> +usr/share/pmacct/sql/README.sqlite3 >>>>>> +#usr/share/pmacct/sql/README.tag2 >>>>>> +#usr/share/pmacct/sql/README.timestamp >>>>>> +#usr/share/pmacct/sql/README.tunnel >>>>>> +#usr/share/pmacct/sql/pmacct-create-db.pgsql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_bgp_v1.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v1.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v2.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v3.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v4.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v5.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v6.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v7.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v8.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-db_v9.mysql >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_bgp_v1.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_bgp_v1.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_v1.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v1.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_v2.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v2.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_v3.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v3.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_v4.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v4.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_v5.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v5.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_v6.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v6.sqlite3 >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v7.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_v7_v8.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v8.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-create-table_v9.pgsql >>>>>> +usr/share/pmacct/sql/pmacct-create-table_v9.sqlite3 >>>>>> +#usr/share/pmacct/sql/pmacct-grant-db.mysql >>>>>> +var/ipfire/backup/addons/includes/pmacct >>>>>> +var/spool/pmacct >>>>>> diff --git a/lfs/pmacct b/lfs/pmacct >>>>>> new file mode 100644 >>>>>> index 000000000..c6cc5270e >>>>>> --- /dev/null >>>>>> +++ b/lfs/pmacct >>>>>> @@ -0,0 +1,107 @@ >>>>>> +############################################################################### >>>>>> +# # >>>>>> +# IPFire.org <http://ipfire.org/> - A linux based firewall # >>>>>> +# Copyright (C) 2019 IPFire Team <info(a)ipfire.org <mailto:info@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 # >>>>>> +# the Free Software Foundation, either version 3 of the License, or # >>>>>> +# (at your option) any later version. # >>>>>> +# # >>>>>> +# This program 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 this program. If not, see <http://www.gnu.org/licenses/ <http://www.gnu.org/licenses/>>. # >>>>>> +# # >>>>>> +############################################################################### >>>>>> + >>>>>> +############################################################################### >>>>>> +# Definitions >>>>>> +############################################################################### >>>>>> + >>>>>> +include Config >>>>>> + >>>>>> +VER = 1.7.6 >>>>>> + >>>>>> +THISAPP = pmacct-$(VER) >>>>>> +DL_FILE = $(THISAPP).tar.gz >>>>>> +DL_FROM = $(URL_IPFIRE) >>>>>> +DIR_APP = $(DIR_SRC)/$(THISAPP) >>>>>> +TARGET = $(DIR_INFO)/$(THISAPP) >>>>>> +PROG = pmacct >>>>>> +PAK_VER = 1 >>>>>> + >>>>>> +DEPS = libcdada >>>>>> + >>>>>> +############################################################################### >>>>>> +# Top-level Rules >>>>>> +############################################################################### >>>>>> + >>>>>> +objects = $(DL_FILE) >>>>>> + >>>>>> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) >>>>>> + >>>>>> +$(DL_FILE)_MD5 = b829cfdc394d5acd6d32fb23de181a6b >>>>>> + >>>>>> +install : $(TARGET) >>>>>> + >>>>>> +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) >>>>>> + >>>>>> +download :$(patsubst %,$(DIR_DL)/%,$(objects)) >>>>>> + >>>>>> +md5 : $(subst %,%_MD5,$(objects)) >>>>>> + >>>>>> +dist: >>>>>> + @$(PAK) >>>>>> + >>>>>> +############################################################################### >>>>>> +# Downloading, checking, md5sum >>>>>> +############################################################################### >>>>>> + >>>>>> +$(patsubst %,$(DIR_CHK)/%,$(objects)) : >>>>>> + @$(CHECK) >>>>>> + >>>>>> +$(patsubst %,$(DIR_DL)/%,$(objects)) : >>>>>> + @$(LOAD) >>>>>> + >>>>>> +$(subst %,%_MD5,$(objects)) : >>>>>> + @$(MD5) >>>>>> + >>>>>> +############################################################################### >>>>>> +# Installation Details >>>>>> +############################################################################### >>>>>> + >>>>>> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >>>>>> + @$(PREBUILD) >>>>>> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) >>>>>> + cd $(DIR_APP) && ./autogen.sh >>>>>> + cd $(DIR_APP) && ./configure \ >>>>>> + --prefix=/usr \ >>>>>> + --sysconfdir=/etc/pmacct \ >>>>>> + --enable-sqlite3 \ >>>>>> + --enable-l2 \ >>>>>> + --enable-jansson >>>>>> + >>>>>> + # Add directory for plugins and pipes >>>>>> + -mkdir -v /var/spool/pmacct >>>>>> + >>>>>> + # Add configuration folder and copy conf files to it >>>>>> + -mkdir -v /etc/pmacct >>>>>> + cp -vf $(DIR_CONF)/pmacct/*.conf /etc/pmacct >>>>>> + >>>>>> + # Copy initscript to dir >>>>>> + cp -vf $(DIR_CONF)/pmacct/pmacct.init /etc/rc.d/init.d/pmacct >>>>>> + chmod 754 /etc/rc.d/init.d/pmacct >>>>>> + chown root:root /etc/rc.d/init.d/pmacct >>>>>> + >>>>>> + cd $(DIR_APP) && make $(MAKETUNING) >>>>>> + cd $(DIR_APP) && make install >>>>>> + >>>>>> + # Install backup definition >>>>>> + install -v -m 644 ${DIR_SRC}/config/backup/includes/pmacct \ >>>>>> + /var/ipfire/backup/addons/includes/pmacct >>>>>> + @rm -rf $(DIR_APP) >>>>>> + @$(POSTBUILD) >>>>>> diff --git a/make.sh b/make.sh >>>>>> index 43cccaca0..d42c9b1e2 100755 >>>>>> --- a/make.sh >>>>>> +++ b/make.sh >>>>>> @@ -1646,6 +1646,8 @@ buildipfire() { >>>>>> lfsmake2 ncdu >>>>>> lfsmake2 lshw >>>>>> lfsmake2 socat >>>>>> + lfsmake2 libcdada >>>>>> + lfsmake2 pmacct >>>>>> } >>>>>> >>>>>> buildinstaller() { >>>>>> diff --git a/src/paks/pmacct/install.sh b/src/paks/pmacct/install.sh >>>>>> new file mode 100644 >>>>>> index 000000000..8178cc7bc >>>>>> --- /dev/null >>>>>> +++ b/src/paks/pmacct/install.sh >>>>>> @@ -0,0 +1,36 @@ >>>>>> +#!/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 <mailto:info@ipfire.org>>. # >>>>>> +# # >>>>>> +############################################################################ >>>>>> +# >>>>>> +. /opt/pakfire/lib/functions.sh >>>>>> + >>>>>> +extract_files >>>>>> +restore_backup ${NAME} >>>>>> + >>>>>> +# Add symlinks for runlevels >>>>>> +ln -s ../init.d/${NAME} /etc/rc.d/rc0.d/K85${NAME} >>>>>> +ln -s ../init.d/${NAME} /etc/rc.d/rc3.d/S50${NAME} >>>>>> +ln -s ../init.d/${NAME} /etc/rc.d/rc6.d/K85${NAME} >>>>>> +start_service --background ${NAME} >>>>>> + >>>>>> + >>>>>> +# EOF >>>>>> diff --git a/src/paks/pmacct/uninstall.sh b/src/paks/pmacct/uninstall.sh >>>>>> new file mode 100644 >>>>>> index 000000000..51631e8c1 >>>>>> --- /dev/null >>>>>> +++ b/src/paks/pmacct/uninstall.sh >>>>>> @@ -0,0 +1,33 @@ >>>>>> +#!/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 <mailto:info@ipfire.org>>. # >>>>>> +# # >>>>>> +############################################################################ >>>>>> +# >>>>>> +. /opt/pakfire/lib/functions.sh >>>>>> + >>>>>> +stop_service ${NAME} >>>>>> +make_backup ${NAME} >>>>>> +remove_files >>>>>> + >>>>>> +# Delete symlinks >>>>>> +rm -rfv /etc/rc.d/rc?.d/???${NAME} >>>>>> + >>>>>> +# EOF >>>>>> diff --git a/src/paks/pmacct/update.sh b/src/paks/pmacct/update.sh >>>>>> new file mode 100644 >>>>>> index 000000000..89c40d0d7 >>>>>> --- /dev/null >>>>>> +++ b/src/paks/pmacct/update.sh >>>>>> @@ -0,0 +1,26 @@ >>>>>> +#!/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 <mailto:info@ipfire.org>>. # >>>>>> +# # >>>>>> +############################################################################ >>>>>> +# >>>>>> +. /opt/pakfire/lib/functions.sh >>>>>> +./uninstall.sh >>>>>> +./install.sh >>>>>> -- >>>>>> 2.30.1 >

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development March 2021