Development March 2019

development@lists.ipfire.org

17 participants
64 discussions

[PATCH] Postfix: update to 3.4.3
by Peter Müller 11 Mar '19

11 Mar '19

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- lfs/postfix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/postfix b/lfs/postfix index acadacbeb..c34162d41 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -24,7 +24,7 @@ include Config -VER = 3.4.1 +VER = 3.4.3 THISAPP = postfix-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = postfix -PAK_VER = 18 +PAK_VER = 19 DEPS = "" @@ -66,7 +66,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d292bb49a1c79ff6d2eb9c5e88c51425 +$(DL_FILE)_MD5 = 7f539d5497f4cb0c3f5b66227aaeb561 install : $(TARGET) -- 2.16.4

1 0

RE: [PATCH 0/1] Parallelized build for several packages
by Wolfgang Apolinarski 11 Mar '19

11 Mar '19

Hi! > From: Michael Tremer > Yes, probably. > > It uses a lot of memory when compiling because it is C++. > > I will adjust the number of concurrent processes just like we did for boost. That is probably a good idea. I tested a build with 12 cores and 1 GB of RAM (CentOS) and it actually compiled fine (x86_64), but it is a good idea to play it safe here (dnsdist). I also performed other tests at the weekend and all my builds have been successful, so far, I hope it stays that way... Best regards, Wolfgang > > Best, > -Michael > > > On 10 Mar 2019, at 19:17, ummeegge <ummeegge(a)ipfire.org> wrote: > > > > Hi all, > > > > On So, 2019-03-10 at 18:24 +0000, Michael Tremer wrote: > >> Hi, > >> > >> I merged the patch. And I am surprised it is only the one… > > dnsdist do have problems to build here in next currently: > > > > checking for boost/foreach.hpp... yes > > checking for the toolset name used by Boost for g++... configure: > > WARNING: could not figure out which toolset name to use for g++ .... > > > > g++: internal compiler error: Killed (program cc1plus) > > Please submit a full bug report, > > with preprocessed source if appropriate. > > See <http://bugtracker.ipfire.org> for instructions. > > make[3]: *** [Makefile:743: dnsdist-lua2.o] Error 4 > > make[3]: *** Waiting for unfinished jobs.... > > > > > > May this is possibly related to this topic ? > > > > Best, > > > > Erik > > > >> > >> -Michael > >> > >>> On 9 Mar 2019, at 20:36, Matthias Fischer < > >>> matthias.fischer(a)ipfire.org> wrote: > >>> > >>> On 09.03.2019 21:24, Wolfgang Apolinarski wrote: > >>>> Hi, > >>>> > >>>> sorry, that I did not respond in time. I also had issues with > >>>> "slang" during one of my latest test builds, especially when using > >>>> something like "-j3" (it always worked fine when using higher > >>>> values). > >>>> The lfs manual also stated that the build of "slang" cannot be > >>>> parallelized. > >>>> Sorry, I apparently overlooked that (I have now checked all other > >>>> packages and did not find incompabilities). > >>> > >>> No problem, current 'next' - with commented $(MAKETUNING) for > >>> 'slang' - built without problems. > >>> > >>> For the records: > >>> Last clean "Build finished in 7:02:45". Hardware: i7/2600, 8 GB RAM, > >>> 500GB SATA HDD, Ubuntu 18.04.2 LTS / 32bit (yes, I know... ;-) ). > >>> > >>> Best, > >>> Matthias > >>> > >>>> Today, I started again some more builds (with parallel build > >>>> disabled for slang), the test continues tomorrow. > >>>> > >>>> Best regards, > >>>> Wolfgang > >>>> PS.: The builds always use the branch that Michael created. > >>>> > >>>> -----Ursprüngliche Nachricht----- > >>>> Von: Matthias Fischer <matthias.fischer(a)ipfire.org> > >>>> Gesendet: Freitag, 8. März 2019 19:16 > >>>> An: Michael Tremer <michael.tremer(a)ipfire.org>; Wolfgang > >>>> Apolinarski <wolfgang.apolinarski(a)ipfire.org> > >>>> Cc: development(a)lists.ipfire.org > >>>> Betreff: Re: [PATCH 0/1] Parallelized build for several packages > >>>> > >>>> Hi, > >>>> > >>>> third try, now building current 'next', identical error: > >>>> > >>>> 'slang 2.3.0' doesn't like "cd $(DIR_APP) && make $(MAKETUNING)" > >>>> here. > >>>> > >>>> After reverting > >>>> > > https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=lfs/slang;h=217e74c7 > > 7317d4 > >>>> > c829913f934458779fd278bf29;hb=23164efba5f57b3d8ccb07a166b613f2f95 > >>>> 1e1b6, > >>>> build continues... > >>>> > >>>> Best, > >>>> Matthias > >>>> > >>>> On 08.03.2019 16:58, Matthias Fischer wrote: > >>>>> Hi, > >>>>> > >>>>> On 08.03.2019 11:17, Michael Tremer wrote: > >>>>>> Hi, > >>>>>> > >>>>>> Are you guys still there? > >>>>> > >>>>> Yep. ;-) > >>>>> > >>>>> Your branch 'faster-build' refuses to build here - I get 'slang' > >>>>> errors: > >>>>> > >>>>> ***SNIP*** > >>>>> cd /usr/src/slang-2.3.0 && make -j9 > >>>>> make[1]: Entering directory '/usr/src/slang-2.3.0' > >>>>> cd src; make elf > >>>>> make[2]: Entering directory '/usr/src/slang-2.3.0/src' > >>>>> /usr/src/slang-2.3.0/autoconf/mkinsdir.sh > >>>>> /usr/src/slang-2.3.0/src/elfobjs cp sysconf.h config.h cp > >>>>> terminfo/default.inc terminfo.inc cd /usr/src/slang- > >>>>> 2.3.0/src/elfobjs && gcc -c -O2 -pipe -Wall -fexceptions -fPIC > >>>>> -march=i586 -mindirect-branch=thunk -mfunction-return=thunk > >>>>> -mtune=generic -fomit-frame-pointer -Wp,-D_FORTIFY_SOURCE=2 - > Wp,- > >>>>> D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fPIC -Dunix > >>>>> -DSLANG /usr/src/slang-2.3.0/src/sldisply.c > >>>>> cd /usr/src/slang-2.3.0/src/elfobjs && gcc -c -O2 -pipe -Wall > >>>>> -fexceptions -fPIC -march=i586 -mindirect-branch=thunk > >>>>> -mfunction-return=thunk -mtune=generic -fomit-frame-pointer > >>>>> -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS > >>>>> -fstack-protector-strong -fPIC -Dunix -DSLANG > >>>>> /usr/src/slang-2.3.0/src/slutty.c cd /usr/src/slang- > >>>>> 2.3.0/src/elfobjs && gcc -c -O2 -pipe -Wall -fexceptions -fPIC > >>>>> -march=i586 -mindirect-branch=thunk -mfunction-return=thunk > >>>>> -mtune=generic -fomit-frame-pointer -Wp,-D_FORTIFY_SOURCE=2 - > Wp,- > >>>>> D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fPIC -Dunix > >>>>> -DSLANG /usr/src/slang-2.3.0/src/slang.c > >>>>> /bin/sh: line 0: cd: /usr/src/slang-2.3.0/src/elfobjs: No such > >>>>> file or directory mkdir -p -- /usr/src/slang-2.3.0/src/elfobjs > >>>>> make[2]: *** [Makefile:472: > >>>>> /usr/src/slang-2.3.0/src/elfobjs/sldisply.o] Error 1 > >>>>> make[2]: *** Waiting for unfinished jobs.... > >>>>> /usr/src/slang-2.3.0/src/slang.c: In function 'inner_interp': > >>>>> /usr/src/slang-2.3.0/src/slang.c:5733:9: warning: 'test' may be > >>>>> used > >>>> > >>>> uninitialized in this function [-Wmaybe-uninitialized] > >>>>> if ((0 == pop_int (&test)) > >>>>> ~~~~~~~~~~~~~~~~~~~~~~ > >>>>> && (test == 0)) > >>>>> ^~~~~~~~~~~~~~ > >>>>> /usr/src/slang-2.3.0/src/slang.c: In function 'lang_do_loops': > >>>>> /usr/src/slang-2.3.0/src/slang.c:3725:10: warning: 'blks[0]' > >>>>> may be used > >>>> > >>>> uninitialized in this function [-Wmaybe-uninitialized] > >>>>> block = blks[0]; > >>>>> ~~~~~~^~~~~~~~~ > >>>>> /usr/src/slang-2.3.0/src/slang.c:3924:7: warning: 'first' may be > >>>>> used > >>>> > >>>> uninitialized in this function [-Wmaybe-uninitialized] > >>>>> i += ctrl; > >>>>> ~~^~~~~~~ > >>>>> /usr/src/slang-2.3.0/src/slang.c:3900:13: warning: 'last' may be > >>>>> used > >>>> > >>>> uninitialized in this function [-Wmaybe-uninitialized] > >>>>> if (i > last) break; > >>>>> ^ > >>>>> make[2]: Leaving directory '/usr/src/slang-2.3.0/src' > >>>>> make[1]: *** [Makefile:55: elf] Error 2 > >>>>> make[1]: Leaving directory '/usr/src/slang-2.3.0' > >>>>> make: *** [slang:74: /usr/src/log/slang-2.3.0] Error 2 > >>>>> ***SNAP*** > >>>>> > >>>>> Don't know why. I tried two builds, same error. > >>>>> > >>>>> Best, > >>>>> Matthias > >>>>> > >>>>>> I think that we are saving about 30 min to an hour on the nightly > >>>>>> builds > >>>> > >>>> now… Did anybody else run some benchmarks? > >>>>>> > >>>>>> -Michael > >>>>>> > >>>>>>> On 6 Mar 2019, at 16:36, Michael Tremer < > >>>>>>> michael.tremer(a)ipfire.org> > >>>> > >>>> wrote: > >>>>>>> > >>>>>>> Hi, > >>>>>>> > >>>>>>> Sorry for not being able to get around to this earlier, but I > >>>>>>> have > >>>> > >>>> invested some time on this: > >>>>>>> > >>>>>>> First of all, I merged Wolfgang’s patch. He is right, the build > >>>>>>> is too > >>>> > >>>> slow. It sometimes looks a bit like it is not taking enough > >>>> advantage of fast systems. On the other hand with have small > >>>> systems, which are (in their own right) quite fast. Those are the > >>>> ARM systems. They usually have 1G of RAM. 2GB when you are lucky. > >>>>>>> > >>>>>>> So I adjusted make.sh a little bit and removed composing the > >>>>>>> MAKETUNING > >>>> > >>>> variable from it. > >>>>>>> > >>>>>>> Now, make.sh only figures out the value that usually comes after > >>>>>>> the -j. > >>>> > >>>> It is set in DEFAULT_PARALLELISM. > >>>>>>> > >>>>>>> In the individual LFS files, we can now set a new variable > >>>>>>> called > >>>> > >>>> MAX_PARALLELISM which is optional. In boost, I now calculate this > >>>> from the amount of memory that is available. That will make sure > >>>> that we have a cap on this that will be high on systems that have > >>>> the memory and low on those that don’t. Before, we hardcoded -j2 > >>>> which of course runs very slow on large systems. > >>>>>>> > >>>>>>> The code is here: > >>>>>>> > >>>>>>> > >>>>>>> > > https://git.ipfire.org/?p=people/ms/ipfire-2.x.git;a=shortlog;h=refs > >>>>>>> /heads/faster-build > >>>>>>> > >>>>>>> Please review. I am now running this on a couple of builders and > >>>>>>> will > >>>> > >>>> see what comes out. Please do the same and send me feedback. > >>>>>>> > >>>>>>> Best, > >>>>>>> -Michael > >>>>>>> > >>>>>>>> On 21 Feb 2019, at 17:28, Wolfgang Apolinarski > >>>> > >>>> <wolfgang.apolinarski(a)ipfire.org> wrote: > >>>>>>>> > >>>>>>>> Hi Arne, > >>>>>>>> > >>>>>>>> of course I did delete the ccache between my multiple builds to > >>>>>>>> verify > >>>> > >>>> the commit. To play it safe, I hard reset using git, checked that > >>>> all folders (build, ccache, etc.) are gone and restarted the build > >>>> after gettoolchain and downloadsrc. > >>>>>>>> > >>>>>>>> Sorry, I did not know that there are still a lot of machines > >>>>>>>> with low > >>>> > >>>> ram that we are using to build ipfire. My hope was that these > >>>> machines have disappeared over the last years. > >>>>>>>> Additionally, I do not have the ability to test all ipfire > >>>>>>>> arches, as > >>>> > >>>> mentioned, the patch needs testing by others. > >>>>>>>> > >>>>>>>> I also thought of adding a manual parameter for developers that > >>>>>>>> somehow > >>>> > >>>> manually sets the parameters for parallel build, but since the > >>>> MAKETUNING parameter already exists and is used with other > packages > >>>> this would just somehow mess everything up. > >>>>>>>> > >>>>>>>> For my builds, I can just manually apply the patch to speed up > >>>>>>>> the full > >>>> > >>>> build. My thought was that sharing the patch would make sense for > >>>> others. > >>>>>>>> > >>>>>>>>> -----Ursprüngliche Nachricht----- > >>>>>>>>> Von: Arne Fitzenreiter <Arne.Fitzenreiter(a)ipfire.org> > >>>>>>>>> Gesendet: Donnerstag, 21. Februar 2019 09:44 > >>>>>>>>> An: Wolfgang Apolinarski < > >>>>>>>>> wolfgang.apolinarski(a)ipfire.org> > >>>>>>>>> Cc: development(a)lists.ipfire.org > >>>>>>>>> Betreff: Re: [PATCH 0/1] Parallelized build for several > >>>>>>>>> packages > >>>>>>>>> > >>>>>>>>> On the most of this packages (eg. boot and cmake) i have > >>>>>>>>> disabled parallel build because it fails on machines with low > >>>>>>>>> ram (less than 2GB) or on arm. > >>>>>>>>> So such changes need tested on an 1GB machine, on all > >>>>>>>>> architectures and build two times after deleting ccache. > >>>>>>>>> Because the build need much lower resources if it has the file > >>>>>>>>> already > >>>> > >>>> prebuilt in cache. > >> > >> > >

1 0

Re: [PATCH 0/1] Parallelized build for several packages
by Wolfgang Apolinarski 11 Mar '19

11 Mar '19

Hi, sorry, that I did not respond in time. I also had issues with "slang" during one of my latest test builds, especially when using something like "-j3" (it always worked fine when using higher values). The lfs manual also stated that the build of "slang" cannot be parallelized. Sorry, I apparently overlooked that (I have now checked all other packages and did not find incompabilities). Today, I started again some more builds (with parallel build disabled for slang), the test continues tomorrow. Best regards, Wolfgang PS.: The builds always use the branch that Michael created. -----Ursprüngliche Nachricht----- Von: Matthias Fischer <matthias.fischer(a)ipfire.org> Gesendet: Freitag, 8. März 2019 19:16 An: Michael Tremer <michael.tremer(a)ipfire.org>; Wolfgang Apolinarski <wolfgang.apolinarski(a)ipfire.org> Cc: development(a)lists.ipfire.org Betreff: Re: [PATCH 0/1] Parallelized build for several packages Hi, third try, now building current 'next', identical error: 'slang 2.3.0' doesn't like "cd $(DIR_APP) && make $(MAKETUNING)" here. After reverting https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=lfs/slang;h=217e74c77317d4 c829913f934458779fd278bf29;hb=23164efba5f57b3d8ccb07a166b613f2f951e1b6, build continues... Best, Matthias On 08.03.2019 16:58, Matthias Fischer wrote: > Hi, > > On 08.03.2019 11:17, Michael Tremer wrote: >> Hi, >> >> Are you guys still there? > > Yep. ;-) > > Your branch 'faster-build' refuses to build here - I get 'slang' errors: > > ***SNIP*** > cd /usr/src/slang-2.3.0 && make -j9 > make[1]: Entering directory '/usr/src/slang-2.3.0' > cd src; make elf > make[2]: Entering directory '/usr/src/slang-2.3.0/src' > /usr/src/slang-2.3.0/autoconf/mkinsdir.sh > /usr/src/slang-2.3.0/src/elfobjs cp sysconf.h config.h cp > terminfo/default.inc terminfo.inc cd /usr/src/slang-2.3.0/src/elfobjs > && gcc -c -O2 -pipe -Wall -fexceptions -fPIC -march=i586 > -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic > -fomit-frame-pointer -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS > -fstack-protector-strong -fPIC -Dunix -DSLANG > /usr/src/slang-2.3.0/src/sldisply.c > cd /usr/src/slang-2.3.0/src/elfobjs && gcc -c -O2 -pipe -Wall > -fexceptions -fPIC -march=i586 -mindirect-branch=thunk > -mfunction-return=thunk -mtune=generic -fomit-frame-pointer > -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS > -fstack-protector-strong -fPIC -Dunix -DSLANG > /usr/src/slang-2.3.0/src/slutty.c cd /usr/src/slang-2.3.0/src/elfobjs > && gcc -c -O2 -pipe -Wall -fexceptions -fPIC -march=i586 > -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic > -fomit-frame-pointer -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS > -fstack-protector-strong -fPIC -Dunix -DSLANG > /usr/src/slang-2.3.0/src/slang.c > /bin/sh: line 0: cd: /usr/src/slang-2.3.0/src/elfobjs: No such file or > directory mkdir -p -- /usr/src/slang-2.3.0/src/elfobjs > make[2]: *** [Makefile:472: > /usr/src/slang-2.3.0/src/elfobjs/sldisply.o] Error 1 > make[2]: *** Waiting for unfinished jobs.... > /usr/src/slang-2.3.0/src/slang.c: In function 'inner_interp': > /usr/src/slang-2.3.0/src/slang.c:5733:9: warning: 'test' may be used uninitialized in this function [-Wmaybe-uninitialized] > if ((0 == pop_int (&test)) > ~~~~~~~~~~~~~~~~~~~~~~ > && (test == 0)) > ^~~~~~~~~~~~~~ > /usr/src/slang-2.3.0/src/slang.c: In function 'lang_do_loops': > /usr/src/slang-2.3.0/src/slang.c:3725:10: warning: 'blks[0]' may be used uninitialized in this function [-Wmaybe-uninitialized] > block = blks[0]; > ~~~~~~^~~~~~~~~ > /usr/src/slang-2.3.0/src/slang.c:3924:7: warning: 'first' may be used uninitialized in this function [-Wmaybe-uninitialized] > i += ctrl; > ~~^~~~~~~ > /usr/src/slang-2.3.0/src/slang.c:3900:13: warning: 'last' may be used uninitialized in this function [-Wmaybe-uninitialized] > if (i > last) break; > ^ > make[2]: Leaving directory '/usr/src/slang-2.3.0/src' > make[1]: *** [Makefile:55: elf] Error 2 > make[1]: Leaving directory '/usr/src/slang-2.3.0' > make: *** [slang:74: /usr/src/log/slang-2.3.0] Error 2 > ***SNAP*** > > Don't know why. I tried two builds, same error. > > Best, > Matthias > >> I think that we are saving about 30 min to an hour on the nightly builds now Did anybody else run some benchmarks? >> >> -Michael >> >>> On 6 Mar 2019, at 16:36, Michael Tremer <michael.tremer(a)ipfire.org> wrote: >>> >>> Hi, >>> >>> Sorry for not being able to get around to this earlier, but I have invested some time on this: >>> >>> First of all, I merged Wolfgangs patch. He is right, the build is too slow. It sometimes looks a bit like it is not taking enough advantage of fast systems. On the other hand with have small systems, which are (in their own right) quite fast. Those are the ARM systems. They usually have 1G of RAM. 2GB when you are lucky. >>> >>> So I adjusted make.sh a little bit and removed composing the MAKETUNING variable from it. >>> >>> Now, make.sh only figures out the value that usually comes after the -j. It is set in DEFAULT_PARALLELISM. >>> >>> In the individual LFS files, we can now set a new variable called MAX_PARALLELISM which is optional. In boost, I now calculate this from the amount of memory that is available. That will make sure that we have a cap on this that will be high on systems that have the memory and low on those that dont. Before, we hardcoded -j2 which of course runs very slow on large systems. >>> >>> The code is here: >>> >>> >>> https://git.ipfire.org/?p=people/ms/ipfire-2.x.git;a=shortlog;h=refs >>> /heads/faster-build >>> >>> Please review. I am now running this on a couple of builders and will see what comes out. Please do the same and send me feedback. >>> >>> Best, >>> -Michael >>> >>>> On 21 Feb 2019, at 17:28, Wolfgang Apolinarski <wolfgang.apolinarski(a)ipfire.org> wrote: >>>> >>>> Hi Arne, >>>> >>>> of course I did delete the ccache between my multiple builds to verify the commit. To play it safe, I hard reset using git, checked that all folders (build, ccache, etc.) are gone and restarted the build after gettoolchain and downloadsrc. >>>> >>>> Sorry, I did not know that there are still a lot of machines with low ram that we are using to build ipfire. My hope was that these machines have disappeared over the last years. >>>> Additionally, I do not have the ability to test all ipfire arches, as mentioned, the patch needs testing by others. >>>> >>>> I also thought of adding a manual parameter for developers that somehow manually sets the parameters for parallel build, but since the MAKETUNING parameter already exists and is used with other packages this would just somehow mess everything up. >>>> >>>> For my builds, I can just manually apply the patch to speed up the full build. My thought was that sharing the patch would make sense for others. >>>> >>>>> -----Ursprüngliche Nachricht----- >>>>> Von: Arne Fitzenreiter <Arne.Fitzenreiter(a)ipfire.org> >>>>> Gesendet: Donnerstag, 21. Februar 2019 09:44 >>>>> An: Wolfgang Apolinarski <wolfgang.apolinarski(a)ipfire.org> >>>>> Cc: development(a)lists.ipfire.org >>>>> Betreff: Re: [PATCH 0/1] Parallelized build for several packages >>>>> >>>>> On the most of this packages (eg. boot and cmake) i have disabled >>>>> parallel build because it fails on machines with low ram (less >>>>> than 2GB) or on arm. >>>>> So such changes need tested on an 1GB machine, on all >>>>> architectures and build two times after deleting ccache. Because >>>>> the build need much lower resources if it has the file already prebuilt in cache. >>>> >>> >> >> > >

4 5

[PATCH] Postfix: update to 3.4.1
by Peter Müller 11 Mar '19

11 Mar '19

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/rootfiles/packages/postfix | 2 ++ lfs/postfix | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/packages/postfix b/config/rootfiles/packages/postfix index 138c1dd7f..23e1efb25 100644 --- a/config/rootfiles/packages/postfix +++ b/config/rootfiles/packages/postfix @@ -39,6 +39,7 @@ usr/lib/postfix/post-install usr/lib/postfix/postfix-script usr/lib/postfix/postfix-tls-script usr/lib/postfix/postfix-wrapper +usr/lib/postfix/postlogd usr/lib/postfix/postmulti-script usr/lib/postfix/postscreen usr/lib/postfix/proxymap @@ -122,6 +123,7 @@ usr/sbin/sendmail.postfix #usr/share/man/man8/oqmgr.8 #usr/share/man/man8/pickup.8 #usr/share/man/man8/pipe.8 +#usr/share/man/man8/postlogd.8 #usr/share/man/man8/postscreen.8 #usr/share/man/man8/proxymap.8 #usr/share/man/man8/qmgr.8 diff --git a/lfs/postfix b/lfs/postfix index b22eca138..acadacbeb 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -24,7 +24,7 @@ include Config -VER = 3.3.2 +VER = 3.4.1 THISAPP = postfix-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = postfix -PAK_VER = 17 +PAK_VER = 18 DEPS = "" @@ -66,7 +66,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4e6ed7056576e0c54cfce6040a0bb0ad +$(DL_FILE)_MD5 = d292bb49a1c79ff6d2eb9c5e88c51425 install : $(TARGET) -- 2.16.4

2 2

New addon: zabbix_agentd
by Alexander Koch 11 Mar '19

11 Mar '19

Hello, I would like to contribute a new addon for monitoring hosts running IPFire by Zabbix Monitoring (https://www.zabbix.com/features) to IPFire. Topic in the forum: https://forum.ipfire.org/viewtopic.php?f=52&t=22039 I'm not a professional software developer and this is going to be my first patch for IPFire. I hope I did not make any stupid mistakes and I'm not wasting you're time. I've built and tested (only for/on x86_64) this package for/with core126, core127 (testing) and core128 (Development Build: zabbix_agentd/b72540bc) so far. Before I finally submit this as a Patch, I've got two questions I could not figure out reading the wiki/forum: 1: How are logfiles (/var/log/zabbix) supposed to be treated by the backup- and uninstall-scripts of an addon? Are logs supposed to be included in the addon-backup? Is the log-directory supposed to be deleted by the uninstall.sh of the addon? If I do not include them in the backup, but delete the log-directory in uninstall.sh, the logs will be flushed on every update of the addon. This is probably not what the users expects to happen. 2: How is the original source-code of zabbix (https://www.zabbix.com/download_sources) supposed to be shipped with the patch? A patch only includes the lfs, config etc. and I did not find a place to provide a download URL for it. Did I miss something? Best, Alex P.S. Just in case you want to check what I achieved so far, I attached my current patchfile below: Subject: [PATCH] zabbix_agentd: New addon for monitoring IPFire Hosts by Zabbix Monitoring (https://www.zabbix.com/features). See https://forum.ipfire.org/viewtopic.php?f=52&t=22039 for further details. Signed-off-by: Alexander Koch <ipfire(a)starkstromkonsument.de> --- config/backup/includes/zabbix_agentd | 3 + config/rootfiles/packages/zabbix_agentd | 21 ++ config/zabbix_agentd/logrotate | 9 + config/zabbix_agentd/pakfire_updates.pl | 100 ++++++ config/zabbix_agentd/sudoers | 17 + config/zabbix_agentd/userparameter_pakfire.conf | 4 + config/zabbix_agentd/zabbix_agentd.conf | 394 ++++++++++++++++++++++++ lfs/zabbix_agentd | 128 ++++++++ make.sh | 1 + src/initscripts/packages/zabbix_agentd | 61 ++++ src/paks/zabbix_agentd/install.sh | 45 +++ src/paks/zabbix_agentd/uninstall.sh | 38 +++ src/paks/zabbix_agentd/update.sh | 26 ++ 13 files changed, 847 insertions(+) create mode 100644 config/backup/includes/zabbix_agentd create mode 100644 config/rootfiles/packages/zabbix_agentd create mode 100644 config/zabbix_agentd/logrotate create mode 100644 config/zabbix_agentd/pakfire_updates.pl create mode 100644 config/zabbix_agentd/sudoers create mode 100644 config/zabbix_agentd/userparameter_pakfire.conf create mode 100644 config/zabbix_agentd/zabbix_agentd.conf create mode 100755 lfs/zabbix_agentd create mode 100755 src/initscripts/packages/zabbix_agentd create mode 100644 src/paks/zabbix_agentd/install.sh create mode 100644 src/paks/zabbix_agentd/uninstall.sh create mode 100644 src/paks/zabbix_agentd/update.sh diff --git a/config/backup/includes/zabbix_agentd b/config/backup/includes/zabbix_agentd new file mode 100644 index 0000000..d6a2b49 --- /dev/null +++ b/config/backup/includes/zabbix_agentd @@ -0,0 +1,3 @@ +/etc/sudoers.d/zabbix +/etc/zabbix/zabbix_agentd.* +/etc/zabbix/scripts diff --git a/config/rootfiles/packages/zabbix_agentd b/config/rootfiles/packages/zabbix_agentd new file mode 100644 index 0000000..f12c46d --- /dev/null +++ b/config/rootfiles/packages/zabbix_agentd @@ -0,0 +1,21 @@ +#etc/group- +etc/logrotate.d/zabbix_agentd +etc/rc.d/init.d/zabbix_agentd +etc/sudoers.d/zabbix +#etc/zabbix +#etc/zabbix/scripts +etc/zabbix/scripts/pakfire_updates.pl +etc/zabbix/zabbix_agentd.conf +#etc/zabbix/zabbix_agentd.conf.d +#etc/zabbix/zabbix_agentd.d +etc/zabbix/zabbix_agentd.d/userparameter_pakfire.conf +etc/zabbix/zabbix_agentd.psk +usr/bin/zabbix_get +usr/bin/zabbix_sender +#usr/lib/modules +usr/sbin/zabbix_agentd +#usr/share/man/man1/zabbix_get.1 +#usr/share/man/man1/zabbix_sender.1 +#usr/share/man/man8/zabbix_agentd.8 +var/ipfire/backup/addons/includes/zabbix_agentd +#var/log/zabbix diff --git a/config/zabbix_agentd/logrotate b/config/zabbix_agentd/logrotate new file mode 100644 index 0000000..83bbca9 --- /dev/null +++ b/config/zabbix_agentd/logrotate @@ -0,0 +1,9 @@ +/var/log/zabbix/zabbix_agentd.log { + monthly + rotate 12 + compress + delaycompress + missingok + notifempty + create 0640 zabbix zabbix +} diff --git a/config/zabbix_agentd/pakfire_updates.pl b/config/zabbix_agentd/pakfire_updates.pl new file mode 100644 index 0000000..875df40 --- /dev/null +++ b/config/zabbix_agentd/pakfire_updates.pl @@ -0,0 +1,100 @@ +#!/usr/bin/perl +# +# Script for fetching available updates and "need reboot"-status for userparameter of zabbix_agentd +# +# This script is based on /opt/pakfire/lib/functions.pl +# +# Created on 09.07.2017 by Alexander Koch (ipfire(a)starkstromkonsument.de) +# Last modified on 24.01.19 by Alexander Koch (ipfire(a)starkstromkonsument.de) +# + +# Inculde Pakfire-Functions +require "/opt/pakfire/lib/functions.pl"; + +# Check for passed options +unless (@ARGV) { + print "No options given!\n"; + print "Possible options: updatescount, coreupdate_avail, need_reboot\n"; + exit 2; +} + +# Count packets +if ("$ARGV[0]" eq "updatescount") { + + # The following lines have been copied from /opt/pakfire/lib/functions.pl with minor modifications. + my @meta; + my $file; + my $line; + my $prog; + my ($name, $version, $release); + my @templine; + my $updatecount = 0; + + # Get list of packets + open(FILE, "<$Conf::dbdir/lists/packages_list.db"); + my @db = <FILE>; + close(FILE); + + # Get installed addons + opendir(DIR,"$Conf::dbdir/installed"); + my @files = readdir(DIR); + closedir(DIR); + foreach $file (@files) { + next if ( $file eq "." ); + next if ( $file eq ".." ); + next if ( $file =~ /^old/ ); + open(FILE, "<$Conf::dbdir/installed/$file"); + @meta = <FILE>; + close(FILE); + foreach $line (@meta) { + @templine = split(/\: /,$line); + if ("$templine[0]" eq "Name") { + $name = $templine[1]; + chomp($name); + } elsif ("$templine[0]" eq "ProgVersion") { + $version = $templine[1]; + chomp($version); + } elsif ("$templine[0]" eq "Release") { + $release = $templine[1]; + chomp($release); + } + } + foreach $prog (@db) { + @templine = split(/\;/,$prog); + if (("$name" eq "$templine[0]") && ("$release" < "$templine[2]")) { + $updatecount++; + } + } + } + print $updatecount; + exit 0; +} + +elsif ("$ARGV[0]" eq "coreupdate_avail") { + eval(`grep "core_" $Conf::dbdir/lists/core-list.db`); + if ("$core_release" > "$Conf::core_mine") { + print 1; + exit 0; + } + else { + print 0; + exit 0; + } +} + +elsif ("$ARGV[0]" eq "need_reboot") { + if ( -e "/var/run/need_reboot" ) { + print 1; + exit 0; + } + else { + print 0; + exit 0; + } +} + +else { + print "Wrong options!\n"; + print "Possible options: updatescount, coreupdate_avail, need_reboot\n"; + exit 2; +} diff --git a/config/zabbix_agentd/sudoers b/config/zabbix_agentd/sudoers new file mode 100644 index 0000000..d6049f3 --- /dev/null +++ b/config/zabbix_agentd/sudoers @@ -0,0 +1,17 @@ +# Include file for sudoers file +# +# This is needed for some userparameters to be able to execute commands that only run as root (using sudo) +# e.g. /usr/bin/openssl or /usr/sbin/smartctl +# +# USE AT YOU'RE OWN RISK. USING THIS WRONG CAN RESULT IN A SECURITY BREACH! +# +# Some hints: +# - It is strongly recommended to edit this file only using the visudo -f <filename> command. If you mess up this file, +# you might end up locking yourself out of your system! +# - Append the full path to each command, using "," as separator. +# - Only add commands you really need. Zabbix should not have more rights than it has to. +# +# Uncomment the following two lines and edit the example of commands to fit your needs: +# +#Defaults:zabbix !requiretty +#zabbix ALL=(ALL) NOPASSWD: /usr/bin/openssl, /usr/sbin/smartctl diff --git a/config/zabbix_agentd/userparameter_pakfire.conf b/config/zabbix_agentd/userparameter_pakfire.conf new file mode 100644 index 0000000..4fc4265 --- /dev/null +++ b/config/zabbix_agentd/userparameter_pakfire.conf @@ -0,0 +1,4 @@ +# Provide additional items for Pakfire-Updates +UserParameter=pakfire.updatescount,/etc/zabbix/scripts/pakfire_updates.pl updatescount +UserParameter=pakfire.coreupdate_avail,/etc/zabbix/scripts/pakfire_updates.pl coreupdate_avail +UserParameter=pakfire.need_reboot,/etc/zabbix/scripts/pakfire_updates.pl need_reboot diff --git a/config/zabbix_agentd/zabbix_agentd.conf b/config/zabbix_agentd/zabbix_agentd.conf new file mode 100644 index 0000000..e60af19 --- /dev/null +++ b/config/zabbix_agentd/zabbix_agentd.conf @@ -0,0 +1,394 @@ +# This is a configuration file for Zabbix agent daemon (Unix) +# To get more information about Zabbix, visit http://www.zabbix.com + +############ GENERAL PARAMETERS ################# + +### Option: PidFile +# Name of PID file. +# +# Mandatory: no +# Default: +# PidFile=/tmp/zabbix_agentd.pid + +PidFile=/var/run/zabbix/zabbix_agentd.pid + +### Option: LogType +# Specifies where log messages are written to: +# system - syslog +# file - file specified with LogFile parameter +# console - standard output +# +# Mandatory: no +# Default: +# LogType=file + +### Option: LogFile +# Log file name for LogType 'file' parameter. +# +# Mandatory: yes, if LogType is set to file, otherwise no +# Default: +# LogFile= + +LogFile=/var/log/zabbix/zabbix_agentd.log + +### Option: LogFileSize +# Maximum size of log file in MB. +# 0 - disable automatic log rotation. +# +# Mandatory: no +# Range: 0-1024 +# Default: +# LogFileSize=1 + +### Option: DebugLevel +# Specifies debug level: +# 0 - basic information about starting and stopping of Zabbix processes +# 1 - critical information +# 2 - error information +# 3 - warnings +# 4 - for debugging (produces lots of information) +# 5 - extended debugging (produces even more information) +# +# Mandatory: no +# Range: 0-5 +# Default: +# DebugLevel=3 + +### Option: SourceIP +# Source IP address for outgoing connections. +# +# Mandatory: no +# Default: +# SourceIP= + +### Option: EnableRemoteCommands +# Whether remote commands from Zabbix server are allowed. +# 0 - not allowed +# 1 - allowed +# +# Mandatory: no +# Default: +# EnableRemoteCommands=0 + +### Option: LogRemoteCommands +# Enable logging of executed shell commands as warnings. +# 0 - disabled +# 1 - enabled +# +# Mandatory: no +# Default: +# LogRemoteCommands=0 + +##### Passive checks related + +### Option: Server +# List of comma delimited IP addresses, optionally in CIDR notation, or DNS names of Zabbix servers and Zabbix proxies. +# Incoming connections will be accepted only from the hosts listed here. +# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally +# and '::/0' will allow any IPv4 or IPv6 address. +# '0.0.0.0/0' can be used to allow any IPv4 address. +# Example: Server=127.0.0.1,192.168.1.0/24,::1,2001:db8::/32,zabbix.example.com +# +# Mandatory: yes, if StartAgents is not explicitly set to 0 +# Default: +# Server= + +Server=127.0.0.1 + +### Option: ListenPort +# Agent will listen on this port for connections from the server. +# +# Mandatory: no +# Range: 1024-32767 +# Default: +# ListenPort=10050 + +### Option: ListenIP +# List of comma delimited IP addresses that the agent should listen on. +# First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks. +# +# Mandatory: no +# Default: +# ListenIP=0.0.0.0 + +### Option: StartAgents +# Number of pre-forked instances of zabbix_agentd that process passive checks. +# If set to 0, disables passive checks and the agent will not listen on any TCP port. +# +# Mandatory: no +# Range: 0-100 +# Default: +# StartAgents=3 + +##### Active checks related + +### Option: ServerActive +# List of comma delimited IP:port (or DNS name:port) pairs of Zabbix servers and Zabbix proxies for active checks. +# If port is not specified, default port is used. +# IPv6 addresses must be enclosed in square brackets if port for that host is specified. +# If port is not specified, square brackets for IPv6 addresses are optional. +# If this parameter is not specified, active checks are disabled. +# Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1] +# +# Mandatory: no +# Default: +# ServerActive= + +ServerActive=127.0.0.1 + +### Option: Hostname +# Unique, case sensitive hostname. +# Required for active checks and must match hostname as configured on the server. +# Value is acquired from HostnameItem if undefined. +# +# Mandatory: no +# Default: +# Hostname= + +### Option: HostnameItem +# Item used for generating Hostname if it is undefined. Ignored if Hostname is defined. +# Does not support UserParameters or aliases. +# +# Mandatory: no +# Default: +# HostnameItem=system.hostname + +### Option: HostMetadata +# Optional parameter that defines host metadata. +# Host metadata is used at host auto-registration process. +# An agent will issue an error and not start if the value is over limit of 255 characters. +# If not defined, value will be acquired from HostMetadataItem. +# +# Mandatory: no +# Range: 0-255 characters +# Default: +# HostMetadata= + +### Option: HostMetadataItem +# Optional parameter that defines an item used for getting host metadata. +# Host metadata is used at host auto-registration process. +# During an auto-registration request an agent will log a warning message if +# the value returned by specified item is over limit of 255 characters. +# This option is only used when HostMetadata is not defined. +# +# Mandatory: no +# Default: +# HostMetadataItem= + +### Option: RefreshActiveChecks +# How often list of active checks is refreshed, in seconds. +# +# Mandatory: no +# Range: 60-3600 +# Default: +# RefreshActiveChecks=120 + +### Option: BufferSend +# Do not keep data longer than N seconds in buffer. +# +# Mandatory: no +# Range: 1-3600 +# Default: +# BufferSend=5 + +### Option: BufferSize +# Maximum number of values in a memory buffer. The agent will send +# all collected data to Zabbix Server or Proxy if the buffer is full. +# +# Mandatory: no +# Range: 2-65535 +# Default: +# BufferSize=100 + +### Option: MaxLinesPerSecond +# Maximum number of new lines the agent will send per second to Zabbix Server +# or Proxy processing 'log' and 'logrt' active checks. +# The provided value will be overridden by the parameter 'maxlines', +# provided in 'log' or 'logrt' item keys. +# +# Mandatory: no +# Range: 1-1000 +# Default: +# MaxLinesPerSecond=20 + +############ ADVANCED PARAMETERS ################# + +### Option: Alias +# Sets an alias for an item key. It can be used to substitute long and complex item key with a smaller and simpler one. +# Multiple Alias parameters may be present. Multiple parameters with the same Alias key are not allowed. +# Different Alias keys may reference the same item key. +# For example, to retrieve the ID of user 'zabbix': +# Alias=zabbix.userid:vfs.file.regexp[/etc/passwd,^zabbix:.:([0-9]+),,,,\1] +# Now shorthand key zabbix.userid may be used to retrieve data. +# Aliases can be used in HostMetadataItem but not in HostnameItem parameters. +# +# Mandatory: no +# Range: +# Default: + +### Option: Timeout +# Spend no more than Timeout seconds on processing +# +# Mandatory: no +# Range: 1-30 +# Default: +# Timeout=3 + +### Option: AllowRoot +# Allow the agent to run as 'root'. If disabled and the agent is started by 'root', the agent +# will try to switch to the user specified by the User configuration option instead. +# Has no effect if started under a regular user. +# 0 - do not allow +# 1 - allow +# +# Mandatory: no +# Default: +# AllowRoot=0 + +### Option: User +# Drop privileges to a specific, existing user on the system. +# Only has effect if run as 'root' and AllowRoot is disabled. +# +# Mandatory: no +# Default: +# User=zabbix + +### Option: Include +# You may include individual files or all files in a directory in the configuration file. +# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. +# +# Mandatory: no +# Default: +# Include= + +Include=/etc/zabbix/zabbix_agentd.d/*.conf + + +####### USER-DEFINED MONITORED PARAMETERS ####### + +### Option: UnsafeUserParameters +# Allow all characters to be passed in arguments to user-defined parameters. +# The following characters are not allowed: +# \ ' " ` * ? [ ] { } ~ $ ! & ; ( ) < > | # @ +# Additionally, newline characters are not allowed. +# 0 - do not allow +# 1 - allow +# +# Mandatory: no +# Range: 0-1 +# Default: +# UnsafeUserParameters=0 + +### Option: UserParameter +# User-defined parameter to monitor. There can be several user-defined parameters. +# Format: UserParameter=<key>,<shell command> +# See 'zabbix_agentd' directory for examples. +# +# Mandatory: no +# Default: +# UserParameter= + +####### LOADABLE MODULES ####### + +### Option: LoadModulePath +# Full path to location of agent modules. +# Default depends on compilation options. +# To see the default path run command "zabbix_agentd --help". +# +# Mandatory: no +# Default: +# LoadModulePath=/usr/lib/modules + +### Option: LoadModule +# Module to load at agent startup. Modules are used to extend functionality of the agent. +# Format: LoadModule=<module.so> +# The modules must be located in directory specified by LoadModulePath. +# It is allowed to include multiple LoadModule parameters. +# +# Mandatory: no +# Default: +# LoadModule= + +####### TLS-RELATED PARAMETERS ####### + +### Option: TLSConnect +# How the agent should connect to server or proxy. Used for active checks. +# Only one value can be specified: +# unencrypted - connect without encryption +# psk - connect using TLS and a pre-shared key +# cert - connect using TLS and a certificate +# +# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection) +# Default: +# TLSConnect=unencrypted + +### Option: TLSAccept +# What incoming connections to accept. +# Multiple values can be specified, separated by comma: +# unencrypted - accept connections without encryption +# psk - accept connections secured with TLS and a pre-shared key +# cert - accept connections secured with TLS and a certificate +# +# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection) +# Default: +# TLSAccept=unencrypted + +### Option: TLSCAFile +# Full pathname of a file containing the top-level CA(s) certificates for +# peer certificate verification. +# +# Mandatory: no +# Default: +# TLSCAFile= + +### Option: TLSCRLFile +# Full pathname of a file containing revoked certificates. +# +# Mandatory: no +# Default: +# TLSCRLFile= + +### Option: TLSServerCertIssuer +# Allowed server certificate issuer. +# +# Mandatory: no +# Default: +# TLSServerCertIssuer= + +### Option: TLSServerCertSubject +# Allowed server certificate subject. +# +# Mandatory: no +# Default: +# TLSServerCertSubject= + +### Option: TLSCertFile +# Full pathname of a file containing the agent certificate or certificate chain. +# +# Mandatory: no +# Default: +# TLSCertFile= + +### Option: TLSKeyFile +# Full pathname of a file containing the agent private key. +# +# Mandatory: no +# Default: +# TLSKeyFile= + +### Option: TLSPSKIdentity +# Unique, case sensitive string used to identify the pre-shared key. +# +# Mandatory: no +# Default: +# TLSPSKIdentity= + +### Option: TLSPSKFile +# Full pathname of a file containing the pre-shared key. +# +# Mandatory: no +# Default: +# TLSPSKFile= + +#TLSPSKFile=/etc/zabbix/zabbix_agentd.psk + diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd new file mode 100755 index 0000000..fba24f1 --- /dev/null +++ b/lfs/zabbix_agentd @@ -0,0 +1,128 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-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 = 4.0.3 + +THISAPP = zabbix-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = zabbix_agentd +PAK_VER = 0.4 +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 917d7303c248a9d1c49b8883c01ab2d9 + +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 axvf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-agent \ + --sysconfdir="/etc/zabbix" \ + --with-openssl + + cd $(DIR_APP) && make + cd $(DIR_APP) && make install + + # Add User Zabbix if it does not exist + id -u zabbix &>/dev/null || useradd -r -U -s /bin/false -M -d /var/empty -c "Zabbix Monitoring" zabbix + + # Create config directory and create files. + -rmdir zabbix_agentd.conf.d + -mkdir -pv /etc/zabbix/zabbix_agentd.d + -mkdir -pv /etc/zabbix/scripts + install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/zabbix_agentd.conf \ + /etc/zabbix/zabbix_agentd.conf + install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/userparameter_pakfire.conf \ + /etc/zabbix/zabbix_agentd.d/userparameter_pakfire.conf + install -v -m 754 -g zabbix $(DIR_SRC)/config/zabbix_agentd/pakfire_updates.pl \ + /etc/zabbix/scripts/pakfire_updates.pl + touch /etc/zabbix/zabbix_agentd.psk + + # Create directory and file for logging. + -mkdir -pv /var/log/zabbix + chown zabbix.zabbix /var/log/zabbix -R + + # Create directory for pid. + -mkdir -pv /var/run/zabbix + chown zabbix.zabbix /var/run/zabbix + + # Install initscripts + $(call INSTALL_INITSCRIPT,zabbix_agentd) + + # Install sudoers include file + install -v -m 440 $(DIR_SRC)/config/zabbix_agentd/sudoers \ + /etc/sudoers.d/zabbix + + # Install include file for backup + install -v -m 644 $(DIR_SRC)/config/backup/includes/zabbix_agentd \ + /var/ipfire/backup/addons/includes/zabbix_agentd + + # Install include file for Logrotate + -mkdir -pv /etc/logrotate.d + install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/logrotate \ + /etc/logrotate.d/zabbix_agentd + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index f96b74b..dadae3c 100755 --- a/make.sh +++ b/make.sh @@ -1588,6 +1588,7 @@ buildipfire() { lfsmake2 dehydrated lfsmake2 shairport-sync lfsmake2 borgbackup + lfsmake2 zabbix_agentd } buildinstaller() { diff --git a/src/initscripts/packages/zabbix_agentd b/src/initscripts/packages/zabbix_agentd new file mode 100755 index 0000000..e50b56c --- /dev/null +++ b/src/initscripts/packages/zabbix_agentd @@ -0,0 +1,61 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/zabbix_agentd +# +# Description : This is a script that starts zabbix_agent as deamon +# +# Authors : Alexander Koch (ipfire(a)starkstromkonsument.de) +# +# Version : 01.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +NAME=zabbix_agentd +DAEMON=/usr/sbin/$NAME +DESC="Zabbix agent" +RUNDIR=/var/run/zabbix +CONF=/etc/zabbix/zabbix_agentd.conf + +test -x $DAEMON || exit 0 + +case "${1}" in + start) + # Make sure RUNDIR exists + if [ ! -d $RUNDIR ]; then + boot_mesg "Creating Directory $RUNDIR ..." + mkdir $RUNDIR + chown zabbix.zabbix $RUNDIR + fi + + boot_mesg "Starting $NAME ..." + loadproc $DAEMON -c $CONF > /dev/null + evaluate_retval + ;; + + stop) + boot_mesg "Stopping $NAME ..." + killproc $DAEMON + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc $DAEMON + ;; + + *) + echo "Usage: ${0} {start|stop|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/zabbix_agentd diff --git a/src/paks/zabbix_agentd/install.sh b/src/paks/zabbix_agentd/install.sh new file mode 100644 index 0000000..7264a08 --- /dev/null +++ b/src/paks/zabbix_agentd/install.sh @@ -0,0 +1,45 @@ +#!/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 + +# Add User Zabbix if it does not exist +id -u zabbix &>/dev/null || useradd -r -U -s /bin/false -M -d /var/empty -c "Zabbix Monitoring" zabbix + +extract_files + +# Create additonal Directories and set permissions +mkdir -pv /etc/zabbix/zabbix_agentd.d +mkdir -pv /etc/zabbix/scripts +mkdir -pv /var/run/zabbix +chown zabbix.zabbix /var/run/zabbix +mkdir -pv /var/log/zabbix +chown zabbix.zabbix /var/log/zabbix -R + +# Create symlinks for runlevel interaction. +ln -sf ../init.d/zabbix_agentd /etc/rc.d/rc3.d/S14zabbix_agentd +ln -sf ../init.d/zabbix_agentd /etc/rc.d/rc0.d/K71zabbix_agentd +ln -sf ../init.d/zabbix_agentd /etc/rc.d/rc6.d/K71zabbix_agentd + +restore_backup ${NAME} +start_service --background ${NAME} diff --git a/src/paks/zabbix_agentd/uninstall.sh b/src/paks/zabbix_agentd/uninstall.sh new file mode 100644 index 0000000..ae8f815 --- /dev/null +++ b/src/paks/zabbix_agentd/uninstall.sh @@ -0,0 +1,38 @@ +#!/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 + +# Remove init-scripts and symlinks +rm -rfv /etc/rc.d/rc*.d/*zabbix_agentd + +# Remove directorys +rm -rfv /etc/zabbix +rm -rfv /var/log/zabbix +rm -rfv /var/run/zabbix + +# Remove user and group +userdel zabbix diff --git a/src/paks/zabbix_agentd/update.sh b/src/paks/zabbix_agentd/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/zabbix_agentd/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.7.4

2 9

[PATCH] slang: revert parallelized build
by Matthias Fischer 10 Mar '19

10 Mar '19

This reverts https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=lfs/slang;h=217e74c77317d… 'slang 2.3.0' doesn't like "$(MAKETUNING)" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/slang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/slang b/lfs/slang index 217e74c77..d6e685855 100644 --- a/lfs/slang +++ b/lfs/slang @@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc - cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make #$(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.18.0

1 0

[PATCH] guile: Update to 2.2.4
by Stefan Schantl 10 Mar '19

10 Mar '19

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- guile/guile.nm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guile/guile.nm b/guile/guile.nm index 0219cfb48..75b3ae2e0 100644 --- a/guile/guile.nm +++ b/guile/guile.nm @@ -4,7 +4,7 @@ ############################################################################### name = guile -version = 2.0.14 +version = 2.2.4 release = 1 groups = Development/Tools @@ -19,7 +19,7 @@ description as a library during the building of extensible programs. end -source_dl = ftp://ftp.gnu.org/gnu/guile/ +source_dl = https://ftp.gnu.org/gnu/%{name}/ build requires -- 2.20.1

1 0

GUI for WLanAP doesn't reflect current settings for 'noscan' option
by Matthias Fischer 09 Mar '19

09 Mar '19

Hi, could someone please take a look at: https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=d823d5f07211e984489027d… Especially (line 423): https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=html/cgi-bin/wlanap.cgi;h… The WLanAP-GUI always shows the radio button as checked to ON, no matter what I choose. Can anyone confirm? Best, Matthias -- tails, linux, USB, CD, secure desktop, IRC, truecrypt, tor, onion

2 5

[PATCH] less: update to 530
by Peter Müller 08 Mar '19

08 Mar '19

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- lfs/less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/less b/lfs/less index 531293a8a..2b4534214 100644 --- a/lfs/less +++ b/lfs/less @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-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 # @@ -24,7 +24,7 @@ include Config -VER = 481 +VER = 530 THISAPP = less-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 50ef46065c65257141a7340123527767 +$(DL_FILE)_MD5 = 6a39bccf420c946b0fd7ffc64961315b install : $(TARGET) -- 2.16.4

1 0

[PATCH] Tor WebUI: drop relay bandwith options < 1 MBit/s
by Peter Müller 08 Mar '19

08 Mar '19

Tor requires at least 1 MBit/s in order to participate. Fixes #12001 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- html/cgi-bin/tor.cgi | 11 ++++------- lfs/tor | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index b17db01a2..71da66666 100644 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2013-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 # @@ -36,10 +36,10 @@ my @dummy = ( ${Header::colouryellow} ); undef (@dummy); my @bandwidth_limits = ( - 1000 * 1024, # 1G + 1000 * 1024, # 1 GBit/s 500 * 1024, 200 * 1024, - 100 * 1024, # 100M + 100 * 1024, # 100 MBit/s 64 * 1024, 50 * 1024, 25 * 1024, @@ -49,10 +49,7 @@ my @bandwidth_limits = ( 8 * 1024, 4 * 1024, 2 * 1024, - 1024, # 1M - 512, - 256, - 160 + 1024 # 1 MBit/s ); my @accounting_periods = ('daily', 'weekly', 'monthly'); diff --git a/lfs/tor b/lfs/tor index 4e38a3e7c..384b1b213 100644 --- a/lfs/tor +++ b/lfs/tor @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 33 +PAK_VER = 34 DEPS = "" -- 2.16.4

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development March 2019