Hi Rob,

In your communication below about the various patches, it sounded to me like you are suggesting that some of the patches could be taken from the earlier patchset because they have not changed. My apologies if I have misread it.

I believe that it would be better to submit a complete patchset now, where you include all patches, even if they haven't changed from earlier.
This would make it much easier for tracking the status of the patches within patchwork and knowing what was included at a later date if looking back. So Tim's old patchset would be marked as superseded in patchwork and yours would take over and would be named as a v3 version.

Information on submitting the patches is in the wiki and if needed I can provide the appropriate links. If you have any questions on or problems with the patch submission process then just let me know.

Regards,

Adolf.

On 07/02/2022 13:58, Rob Brewer wrote:
> Hi Michael,
>
>
> Michael Tremer wrote:
>
>> Hello Rob,
>>
>> Thank you for your interest in working on this.
>>
>> Yes, I always thought that there was great interest in moving this over
>> the line. However, I could not find where we left off here.
>>
>> There were a couple of outstanding issues that had to be resolved. I just
>> couldn’t find my last emails. Are you aware of these?
>>
> You expect have seen the topic :
>
> https://community.ipfire.org/t/can-i-help-progress-version2-of-ipblacklist-addon/6998/18
>
>   where Adolf has been encouraging me to look at this feature and I now have
> a working copy on my firewall.
>
> I believe the patches on patchwork are mostly complete and with a few
> additions/corrections can be incorporated into the latest build.
>
> Here is my understanding of where we are:
>
> https://patchwork.ipfire.org/project/ipfire/patch/20200427143123.6378-9-ipfr(a)tfitzgeorge.me.uk/
>
> [v2,0/8] ipblacklist: IP Address Blacklists
>
> This patch was applied to convert V1 into V2 and used to make the the
> remaining patches
> It can safely be ignored.
>
> [v2,1/8] ipblacklist: Main script
> This is the ipblacklist main perl program. It can be incorporated without
> problems.
>
>
> [v2,2/8] ipblacklist: WUI Settings page
> ipblacklist.cgi Patch can be applied without any changes.
>
>
> [v2,3/8] ipblacklist: WUI Log page
> ipblacklists.dat  - Needs to be modified with an additional patch to:
>
> 1)    remove - require “${General::swroot}/geoip-functions.pl”; - This isn’t
> included in core 161 and not used in this program.
>
> 2)  change
>          &General::readhash( “/srv/web/ipfire/html/themes/”.
> $mainsettings{‘THEME’}."/include/colors.txt", %color );
>      to
>          &General::readhash(
> “/srv/web/ipfire/html/themes/ipfire/include/colors.txt”, %color );
>
>
> [v2,4/8] ipblacklist: WUI Log details page
>
> showrequestfromblacklist.dat - Patch can be applied without any changes
>
>
> [v2,5/8] ipblacklist: WUI menus, language file etc
>
> 50-firewall.menu
> 70-log.menu
> log.dat
> en.pl
>
> Requires additional lang files for de, es, fr, it, nl, pl, ru, tr.
> All others are OK
>
> [v2,6/8] ipblacklist: Ancillary files
>
> sources
> getipsetstat.c
> ipblacklistctrl.c
>
>   Can be applied without any changes
>   
>
> [v2,8/8] ipblacklist: Build infrastructure
>
> aarch64/stage2
> configroot
> ipblacklist-sources
> logwatch
> misc-progs
> common/stage2
> web-user-interface
> x86_64/stage2
> lfs/configroot
> lfs/ipblacklist-sources
> lfs/logwatch
> make.sh
> misc-progs/Makefile
>
> Missing Files and links:
>
> ipblacklist.conf (for logwatch)
> ipblacklist (for logwatch)
> /etc/rc.d/init.d/ipblacklist (Start -up)
> /etc/rc.d/rcsysinit.d/S87ipblacklist -> ../init.d/ipblacklist
>
> I have written code for the missing files which are working on my firewall
> and I could submit as patches if required.
>
>   /usr/share/logwatch/default.conf/services/ipblacklist.conf
>   /usr/share/logwatch/scripts/services/ipblacklist
>   /etc/rc.d/init.d/ipblacklist
>
> I haven't tried incorporating the patches as I extracted the files from
> Patchwork and manually inserted them into my firewall for testing. I would
> be very surprised if there were any problems  with Tim's code however.
>
> Hope this will help to progress this very useful addition to IPFire.
>
>
> Rob
>