Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 558754 - net-firewall/fwknop-2.6.7 version bump
Summary: net-firewall/fwknop-2.6.7 version bump
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Coacher
URL: https://github.com/mrash/fwknop/relea...
Whiteboard:
Keywords: EBUILD, PATCH
Depends on:
Blocks:
 
Reported: 2015-08-25 18:42 UTC by Coacher
Modified: 2015-09-05 15:44 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
fwknop-2.6.7.ebuild (fwknop-2.6.7-r9999.ebuild,3.49 KB, text/plain)
2015-08-25 18:42 UTC, Coacher
Details
2.6.6-r1..2.6.7.patch (2.6.6-r1..2.6.7.patch,3.27 KB, patch)
2015-08-25 18:44 UTC, Coacher
Details | Diff
metadata.xml (metadata.xml,983 bytes, text/plain)
2015-08-25 18:48 UTC, Coacher
Details
metadata.xml.patch (metadata.xml.patch,1.14 KB, patch)
2015-08-25 18:48 UTC, Coacher
Details | Diff
fwknop-2.6.7.ebuild (fwknop-2.6.7-r9999.ebuild,3.51 KB, text/plain)
2015-08-25 19:16 UTC, Coacher
Details
2.6.6-r1..2.6.7.patch (2.6.6-r1..2.6.7.patch,3.45 KB, patch)
2015-08-25 19:17 UTC, Coacher
Details | Diff
fwknop-2.6.7.ebuild (fwknop-2.6.7-r9999.ebuild,3.41 KB, text/plain)
2015-09-05 10:57 UTC, Coacher
Details
2.6.6-r1..2.6.7.patch (2.6.6-r1..2.6.7.patch,3.53 KB, patch)
2015-09-05 10:59 UTC, Coacher
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Coacher 2015-08-25 18:42:50 UTC
Created attachment 410272 [details]
fwknop-2.6.7.ebuild

Hello.

fwknop-2.6.7 was released today. Here's the proposed ebuild for it.

Changes since 2.6.6:
- add iptables/firewalld USEs to choose the default server backend
  (needed to avoid automagic)
- add check for required kernel options
- notify server users about example configuration and supported backends
- use upstream systemd configs (they are Gentoo configs merged upstream)

@proxy-maint please review and add to the tree.
Comment 1 Coacher 2015-08-25 18:44:38 UTC
Created attachment 410274 [details, diff]
2.6.6-r1..2.6.7.patch
Comment 2 Coacher 2015-08-25 18:48:00 UTC
Created attachment 410280 [details]
metadata.xml

Updated metadata.xml with new USEs and updated descriptions for old ones.
Comment 3 Coacher 2015-08-25 18:48:53 UTC
Created attachment 410282 [details, diff]
metadata.xml.patch
Comment 4 Coacher 2015-08-25 18:50:42 UTC
@proxy-maint please preserve USE flag ordering from my submitted metadata.xml.
Though it makes no functional difference, it really helps to review diffs between releases as I prefer to keep USEs sorted alphabetically in my overlay.
Comment 5 Coacher 2015-08-25 18:51:03 UTC
CC'ing @proxy-maint
Comment 6 Coacher 2015-08-25 19:16:24 UTC
Created attachment 410284 [details]
fwknop-2.6.7.ebuild

Oops, last minute changes: disable autoformatting by readme.gentoo eclass to make DOC_CONTENTS more readable.
Comment 7 Coacher 2015-08-25 19:17:16 UTC
Created attachment 410286 [details, diff]
2.6.6-r1..2.6.7.patch
Comment 8 Coacher 2015-08-25 19:17:40 UTC
Now everything should be fine.
Comment 9 Ian Delaney (RETIRED) gentoo-dev 2015-09-05 02:25:11 UTC
(I didn't import emails for several days)

This ebuild had some flaws. You have included
DISTUTILS_OPTIONAL=1 DISTUTILS_SINGLE_IMPL=1
inherit autotools-utils distutils-r1
       python? ( ${PYTHON_DEPS} )"
and within REQUIRED_USE
       python? ( ${PYTHON_REQUIRED_USE} ).

This combo interfere with one another. DISTUTILS_OPTIONAL=1 is fine.
Once you use DISTUTILS_SINGLE_IMPL=1, it is required to add the pkg_setup phase and call python_single-r1_pkg_setup. Otherwise, with USE=python, you get;

make[1]: Leaving directory '/mnt/gen2/TmpDir/portage/net-firewall/fwknop-2.6.7/work/fwknop-2.6.7'
 * ERROR: net-firewall/fwknop-2.6.7::gentoo failed (compile phase):
 *   EPYTHON unset, python-single-r1_pkg_setup not called?!
 * 
 * Call stack:
 *     ebuild.sh, line   93:  Called src_compile
 *   environment, line 4919:  Called distutils-r1_src_compile
 *   environment, line 1571:  Called _distutils-r1_run_foreach_impl 'distutils-r1_python_compile'

Solution is either delete DISTUTILS_SINGLE_IMPL=1 or add the required phase.
In either case, python? ( ${PYTHON_DEPS} )" and python? ( ${PYTHON_REQUIRED_USE} ) are not required with inheriting distutils-r1 eclass.
They ARE required inheriting a python-r1 eclass.  These are all outlined in the docs for python project.
Yes the setup.py is quite minimal but still might work with py3. I hold off at this point on testing py3.
The sad news is I skim read it and never runtested on adding fwknop-2.6.6 and fwknop-2.6.6-r1, and all devs prior to me. I presumed it was all tested.
(Better late than never)
In a package like this with a folder specially for python and the setup.py in that subfolder, it's valid to use either python-r1 or python-single-r1. Both are right. The form in this current is not.
Comment 10 Coacher 2015-09-05 10:01:53 UTC
After discussion with Ian on #gentoo-proxy-maint IRC channel we both agreed that using distutils-r1 eclass and removing DISTUTILS_SINLGE_IMPL is a valid solution to the python compilation problem mentioned above. The updated ebuild will be attached shortly.
Comment 11 Coacher 2015-09-05 10:57:41 UTC
Created attachment 411048 [details]
fwknop-2.6.7.ebuild

Updated ebuild. Also firewalld dep was adjusted, but it results in some strange errors from repoman now. Actual bump is postponed until this is resolved.
Comment 12 Coacher 2015-09-05 10:59:25 UTC
Created attachment 411050 [details, diff]
2.6.6-r1..2.6.7.patch
Comment 13 Coacher 2015-09-05 11:53:25 UTC
(In reply to Coacher from comment #11)
> Created attachment 411048 [details]
> fwknop-2.6.7.ebuild
> 
> Updated ebuild. Also firewalld dep was adjusted, but it results in some
> strange errors from repoman now. Actual bump is postponed until this is
> resolved.

The problem with firewalld dep is narrowed down to package mask on selinux-aware profiles. The proper resolution is to mask firewalld USE on these profiles as well and this should be done by hardened team. So, waiting for them to proceed.
Comment 14 Ian Delaney (RETIRED) gentoo-dev 2015-09-05 14:45:32 UTC
commit 048d03cc31f4f5c326384bbb6920b1491a179539
Author: Ian Delaney <idella4@gentoo.org>
Date:   Sat Sep 5 22:42:38 2015 +0800

    net-firewall/fwknop: bump: new optional deps with use flags
    
    dep net-firewall/firewalld is masked under profiles for SElinux,
    the use flag firewalld has been masked accordingly under profiles,
    patches and ebuild supplied by maintainer via bug #558754,
    prior version dropped, closes said bug
Comment 15 Jason Zaman gentoo-dev 2015-09-05 15:21:28 UTC
commit 107ac003e905c757fc8ce12802c36c18d59a52f5
Author: Jason Zaman <perfinion@gentoo.org>
Date:   Sat Sep 5 21:52:30 2015 +0800

    SELinux profile: add net-firewall/fwknop to mask
    
    version 2.6.7 will have a dep on firewalld. Mask the USE-flag so it can
    be added to the tree.
    
    https://bugs.gentoo.org/558754
Comment 16 Coacher 2015-09-05 15:44:17 UTC
Ian and Jason, thank you.