------------------------------------------------------------ revno: 5182 committer: Diego Biurrun <diego@xxxxxxxxxx> branch nick: trunk timestamp: Tue 2010-11-23 20:48:35 +0100 message: Clean up build and runtime dependency descriptions in INSTALL and spec files. HIPL does not depend on libcap or on a C++ compiler. Doxygen is not necessary to build Debian packages, but dpkg-dev is. Add libconfig and libcheck to list of (optional) build dependencies in INSTALL. modified: INSTALL packaging/hipl-deb.spec packaging/hipl-rpm.spec -- lp:hipl https://code.launchpad.net/~hipl-core/hipl/trunk Your team HIPL core team is subscribed to branch lp:hipl. To unsubscribe from this branch go to https://code.launchpad.net/~hipl-core/hipl/trunk/+edit-subscription
=== modified file 'INSTALL' --- INSTALL 2010-10-29 11:30:05 +0000 +++ INSTALL 2010-11-23 19:48:35 +0000 @@ -24,8 +24,8 @@ anyway. In order to compile HIPL you need autotools (autoconf, automake, libtool), GNU -Make and gcc. openssl, iptables, libcap and libconfig are required complete -with development headers. For Perl, Socket6, IO::Socket::INET6, Net::IP and +Make and gcc. openssl, iptables and libconfig are required complete with +development headers. For Perl, Socket6, IO::Socket::INET6, Net::IP and Net::DNS modules are required. You can optionally install xmlto to build the HOWTO and doxygen to build the code documentation. Installing the optional check library (http://check.sourceforge.net/) enables unit tests. @@ -35,7 +35,7 @@ On Ubuntu, the following command(s) should solve the dependencies: aptitude install automake autoconf libtool gcc libssl-dev \ - iptables-dev libcap-dev libnet-ip-perl libnet-dns-perl \ + iptables-dev libconfig8-dev libnet-ip-perl libnet-dns-perl \ libsocket6-perl libio-socket-inet6-perl Optionally: aptitude install pax miredo bzr xmlto doxygen check fakeroot @@ -44,10 +44,10 @@ On Fedora, the following command(s) should solve the dependencies: yum install gcc openssl-devel autoconf automake libtool \ - iptables-devel libcap-devel rpm-build \ + iptables-devel libconfig-devel rpm-build \ perl-Net-IP perl-Net-DNS perl-Socket6 perl-IO-Socket-INET6 - Optionally: yum install miredo bzr xmlto doxygen + Optionally: yum install miredo bzr xmlto doxygen check-devel How to build HIPL === modified file 'packaging/hipl-deb.spec' --- packaging/hipl-deb.spec 2010-11-23 19:43:41 +0000 +++ packaging/hipl-deb.spec 2010-11-23 19:48:35 +0000 @@ -10,7 +10,7 @@ Vendor: InfraHIP License: GPLv2 and MIT/Expat Group: System Environment/Kernel -BuildRequires: automake, autoconf, libtool, gcc, libssl-dev, xmlto, doxygen, iptables-dev, libcap-dev +BuildRequires: automake, autoconf, libtool, gcc, libssl-dev, xmlto, iptables-dev, dpkg-dev ExclusiveOS: linux BuildRoot: %{_tmppath}/%{name}-%{version}-root Prefix: /usr @@ -72,14 +72,14 @@ %description all %package daemon -Requires: openssl, iptables, libcap2, libnet-ip-perl, libnet-dns-perl, libsocket6-perl, libio-socket-inet6-perl +Requires: openssl, iptables, libnet-ip-perl, libnet-dns-perl, libsocket6-perl, libio-socket-inet6-perl Obsoletes: tools Summary: HIP for Linux IPsec key management and mobility daemon Group: System Environment/Kernel %description daemon %package firewall -Requires: openssl, iptables, libcap2 +Requires: openssl, iptables Summary: HIPL multi-purpose firewall daemon. Public-key/HIT-based access control, Local Scope Identifier support, userspace BEET-mode IPsec (for kernels below < 2.6.27) and system-based opportunistic mode for HIP. Group: System Environment/Kernel %description firewall === modified file 'packaging/hipl-rpm.spec' --- packaging/hipl-rpm.spec 2010-11-23 19:43:41 +0000 +++ packaging/hipl-rpm.spec 2010-11-23 19:48:35 +0000 @@ -8,7 +8,7 @@ Vendor: InfraHIP License: GPLv2 and MIT/Expat Group: System Environment/Kernel -BuildRequires: gcc gcc-c++ openssl-devel iptables-devel xmlto libtool libcap-devel autoconf automake rpm-build +BuildRequires: gcc openssl-devel iptables-devel xmlto libtool autoconf automake rpm-build ExclusiveOS: linux BuildRoot: %{_tmppath}/%{name}-%{version}-root Prefix: /usr @@ -54,14 +54,14 @@ %description all %package daemon -Requires: perl-Net-IP perl-Net-DNS perl-Socket6 perl-IO-Socket-INET6 openssl iptables libcap +Requires: perl-Net-IP perl-Net-DNS perl-Socket6 perl-IO-Socket-INET6 openssl iptables Obsoletes: tools Summary: HIP for Linux IPsec key management and mobility daemon Group: System Environment/Kernel %description daemon %package firewall -Requires: openssl iptables libcap +Requires: openssl iptables Summary: HIPL multi-purpose firewall daemon. Public-key/HIT-based access control, Local Scope Identifier support, userspace BEET-mode IPsec (for kernels below < 2.6.27) and system-based opportunistic mode for HIP. Group: System Environment/Kernel %description firewall