Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 376631 - net-misc/miniupnpd: version bump to 1.6
Summary: net-misc/miniupnpd: version bump to 1.6
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Server (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Bjarke Istrup Pedersen (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on: 376873
Blocks:
  Show dependency tree
 
Reported: 2011-07-27 16:26 UTC by Anthony Basile
Modified: 2011-07-29 19:38 UTC (History)
0 users

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


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Anthony Basile gentoo-dev 2011-07-27 16:26:51 UTC
miniupnpd-1.6 was released yesterday.  Bumping it is as easy as:

    mv miniupnpd-1.6_pre20110623.ebuild miniupnpd-1.6.ebuild

and changing MY_PV to 1.6.

FYI, compile fails with linux-3.0, but its okay for < linux-3.0.  Its looking for asm/bitops.h which is gone in 3.0 --- but I'll produce a patch when we cross this bridge.
Comment 1 Bjarke Istrup Pedersen (RETIRED) gentoo-dev 2011-07-27 21:20:36 UTC
Cool, I'll take a look at it tomorrow hopefully.

Interresting regarding linux 3.0 - if/when you have a patch, please attach it to this bug. (I plan on blocking anything above 2.6.39 until we get it fixed)
Comment 2 Bjarke Istrup Pedersen (RETIRED) gentoo-dev 2011-07-29 09:16:02 UTC
Until bug #376873 has been fixed, we are unable to compile miniupnpd, so we will have to wait.
Comment 3 Anthony Basile gentoo-dev 2011-07-29 09:44:08 UTC
With reference to bug #376873, the other alternative would be to expand linux-headers and have the needed .h files there.  This is in line what what miniupnpd tries to do with CPPFLAGS := -I/usr/src/linux/include (as well as other packages) and also more in line with what other distros do with their linux-headers.  It leads to a more consistent interface for other packages needing kernel netfilter support.
Comment 4 Bjarke Istrup Pedersen (RETIRED) gentoo-dev 2011-07-29 12:40:23 UTC
(In reply to comment #3)
> With reference to bug #376873, the other alternative would be to expand
> linux-headers and have the needed .h files there.  This is in line what what
> miniupnpd tries to do with CPPFLAGS := -I/usr/src/linux/include (as well as
> other packages) and also more in line with what other distros do with their
> linux-headers.  It leads to a more consistent interface for other packages
> needing kernel netfilter support.

Having the files as part of linux-headers would be the best option, I agree.
I tried copying the two header files from the linux-3.0 kernel, but then it fails to build - so it seems like the header files from iptables are different than the ones from the kernel.

If I try and build with those files, I get this error:

In file included from /usr/include/net/netfilter/nf_nat.h:4:0,
                 from netfilter/iptcrdr.c:32:
/usr/include/net/netfilter/nf_conntrack_tuple.h:15:30: fatal error: linux/list_nulls.h: No such file or directory
compilation terminated.
make: *** [netfilter/iptcrdr.o] Error 1
make: *** Waiting for unfinished jobs....

So using the files from iptables would be the best solution.
Comment 5 Anthony Basile gentoo-dev 2011-07-29 12:54:30 UTC
(In reply to comment #4)
> (In reply to comment #3)
> > With reference to bug #376873, the other alternative would be to expand
> > linux-headers and have the needed .h files there.  This is in line what what
> > miniupnpd tries to do with CPPFLAGS := -I/usr/src/linux/include (as well as
> > other packages) and also more in line with what other distros do with their
> > linux-headers.  It leads to a more consistent interface for other packages
> > needing kernel netfilter support.
> 
> Having the files as part of linux-headers would be the best option, I agree.
> I tried copying the two header files from the linux-3.0 kernel, but then it
> fails to build - so it seems like the header files from iptables are different
> than the ones from the kernel.
> 
> If I try and build with those files, I get this error:
> 
> In file included from /usr/include/net/netfilter/nf_nat.h:4:0,
>                  from netfilter/iptcrdr.c:32:
> /usr/include/net/netfilter/nf_conntrack_tuple.h:15:30: fatal error:
> linux/list_nulls.h: No such file or directory
> compilation terminated.
> make: *** [netfilter/iptcrdr.o] Error 1
> make: *** Waiting for unfinished jobs....
> 
> So using the files from iptables would be the best solution.

As I posted in the other bug, you need to include linux/list.h and friends for a consistent set of headers.  You can see them all in the linux-3.0 source tree.
Comment 6 Bjarke Istrup Pedersen (RETIRED) gentoo-dev 2011-07-29 13:00:47 UTC
Normally it builds with -I:/usr/src/linux/include , so it have been doing that up until now, which has been the cause of all the problems.

And until there is a linux-headers-3.0 , I have no idea on how to get a complete set of 3.0 headers installed into /usr/include
Comment 7 SpanKY gentoo-dev 2011-07-29 19:07:22 UTC
no userspace code should ever compile against files in /usr/src/linux.  any proposal to use or allow packages to build with -I paths to that is broken.
Comment 8 Bjarke Istrup Pedersen (RETIRED) gentoo-dev 2011-07-29 19:38:28 UTC
I've fixed it by using this header file, and including the rest of the headers from /usr/include - https://raw.github.com/ion1/miniupnpd-ubuntu/master/debian/tiny_nf_nat.h

1.6 has been added to the tree, and builds no matter which kernel version you have :)