mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-22 10:57:07 -08:00
Merge updates from master
This commit is contained in:
@@ -1,2 +1,3 @@
|
||||
DIST neovim-0.0.0_pre20150627.tar.xz 4715400 SHA256 5e5769c81a60637b731dc13e7584b6f91c7a4f2fa9116c7d688b938aa000ab69 SHA512 44f527e82dc8d70735110b7da687b87fb622127078dd32b9d8b284d8f3c3bce2c9978640234583f130e71378190c29e9c37cc19be8fd994eb338d1d9a5a98701 WHIRLPOOL 08125b0a0d96d2f5202b314e85b26e32e7aaf2170dfa69df660b2d36ad3218b24a9313c6f7a7c0e0ed8677a717e5d478851d1dc6bc8c020dc6798e3dd4462a2d
|
||||
DIST neovim-0.0.0_pre20150727.tar.xz 4703336 SHA256 da9bd3070ac60691be4e033947548c13b0ede86b2422d66bd207ac2310b735c1 SHA512 db225fff860d730d4514a33c363ed7748949aaeb3a5fb31c0775120d31219a9fad154ff6f457c4ea25aff666e34dc0e7c8ab1acbc3bbe73bed17d01c67d13627 WHIRLPOOL 23b553f6be136f42c7279d332e1c917083d48aa0ae27df949972ce4eae93d07ea301f9b5853d3d320cc4a6366a483f3f9d43e016607d500646c71ea33e5ffdb8
|
||||
DIST neovim-0.0.0_pre20150814.tar.xz 4718836 SHA256 e7abdb0b3a44ec3c312b06aa825caca4520f1b857045c45c925e8005e2bf3ada SHA512 638e6807929880c2648bd2d0efde509842423488272926bb3ae89a6681144b86fe5137ef313ae102fe8c2fa82819fe96e0dcc0a8d45e3ccaf18b207cf9c1aad1 WHIRLPOOL f1ca40e0bef46da63c466e0fcc51bcf37c57f64009a680f6e51cb1cf3b0d481011dff33957b5da38dfe8d55978c368efe9d905d4f26a272e915470fab239dcff
|
||||
|
||||
@@ -6,37 +6,10 @@
|
||||
" "/etc/vim/nvimrc.local" file, and on a per-user basis via "~/.nvimrc".
|
||||
" You may need to create these.
|
||||
|
||||
" {{{ General settings
|
||||
" The following are some sensible defaults for Vim for most users.
|
||||
set bs=2 " Allow backspacing over everything in insert mode
|
||||
set ai " Always set auto-indenting on
|
||||
set history=50 " keep 50 lines of command history
|
||||
set ruler " Show the cursor position all the time
|
||||
set formatoptions+=j " Delete comment character when joining commented lines
|
||||
|
||||
" Don't use Ex mode, use Q for formatting
|
||||
map Q gq
|
||||
|
||||
" When doing tab completion, give the following files lower priority. You may
|
||||
" wish to set 'wildignore' to completely ignore files, and 'wildmenu' to enable
|
||||
" enhanced tab completion. These can be done in the user vimrc file.
|
||||
set suffixes+=.info,.aux,.log,.dvi,.bbl,.out,.o,.lo
|
||||
|
||||
" When displaying line numbers, don't use an annoyingly wide number column. This
|
||||
" doesn't enable line numbers -- :set number will do that. The value given is a
|
||||
" minimum width to use for the number column, not a fixed size.
|
||||
set numberwidth=3
|
||||
|
||||
" Use sensible whitespace indicators
|
||||
set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
|
||||
" }}}
|
||||
|
||||
" {{{ Modeline settings
|
||||
" We don't allow modelines by default. See bug #14088 and bug #73715.
|
||||
" If you're not concerned about these, you can enable them on a per-user
|
||||
" basis by adding "set modeline" to your ~/.vimrc file.
|
||||
set nomodeline
|
||||
" }}}
|
||||
" Neovim comes with sensible defaults, see:
|
||||
" https://github.com/neovim/neovim/issues/2676
|
||||
" Most of the general settings from Gentoo's vimrc have been dropped here.
|
||||
" We add only some necessary fixes and a few Gentoo specific settings.
|
||||
|
||||
" {{{ Locale settings
|
||||
" If we have a BOM, always honour that rather than trying to guess.
|
||||
@@ -52,44 +25,6 @@ if &fileencodings !~? "utf-8"
|
||||
endif
|
||||
" }}}
|
||||
|
||||
" {{{ Syntax highlighting settings
|
||||
" Switch syntax highlighting on, when the terminal has colors
|
||||
" Also switch on highlighting the last used search pattern.
|
||||
if &t_Co > 2 || has("gui_running")
|
||||
syntax on
|
||||
set hlsearch
|
||||
endif
|
||||
" }}}
|
||||
|
||||
" {{{ Terminal fixes
|
||||
if &term ==? "xterm"
|
||||
set t_Sb=^[4%dm
|
||||
set t_Sf=^[3%dm
|
||||
set ttymouse=xterm2
|
||||
endif
|
||||
|
||||
if &term ==? "gnome" && has("eval")
|
||||
" Set useful keys that vim doesn't discover via termcap but are in the
|
||||
" builtin xterm termcap. See bug #122562. We use exec to avoid having to
|
||||
" include raw escapes in the file.
|
||||
exec "set <C-Left>=\eO5D"
|
||||
exec "set <C-Right>=\eO5C"
|
||||
endif
|
||||
" }}}
|
||||
|
||||
" {{{ Filetype plugin settings
|
||||
" Enable plugin-provided filetype settings, but only if the ftplugin
|
||||
" directory exists (which it won't on livecds, for example).
|
||||
if isdirectory(expand("$VIMRUNTIME/ftplugin"))
|
||||
filetype plugin on
|
||||
|
||||
" Uncomment the next line (or copy to your ~/.vimrc) for plugin-provided
|
||||
" indent settings. Some people don't like these, so we won't turn them on by
|
||||
" default.
|
||||
" filetype indent on
|
||||
endif
|
||||
" }}}
|
||||
|
||||
" {{{ Fix &shell, see bug #101665.
|
||||
if "" == &shell
|
||||
if executable("/bin/bash")
|
||||
@@ -119,22 +54,21 @@ augroup gentoo
|
||||
" Note that the rules below are very minimal and don't cover everything.
|
||||
" Better to emerge app-vim/gentoo-syntax, which provides full syntax,
|
||||
" filetype and indent settings for all things Gentoo.
|
||||
au BufRead,BufNewFile *.e{build,class} let is_bash=1|setfiletype sh
|
||||
au BufRead,BufNewFile *.e{build,class} set ts=4 sw=4 noexpandtab
|
||||
|
||||
" In text files, limit the width of text to 78 characters, but be careful
|
||||
" that we don't override the user's setting.
|
||||
autocmd BufNewFile,BufRead *.txt
|
||||
\ if &tw == 0 && ! exists("g:leave_my_textwidth_alone") |
|
||||
\ setlocal textwidth=78 |
|
||||
\ setlocal textwidth=78 |
|
||||
\ endif
|
||||
|
||||
" When editing a file, always jump to the last cursor position
|
||||
autocmd BufReadPost *
|
||||
\ if ! exists("g:leave_my_cursor_position_alone") |
|
||||
\ if line("'\"") > 0 && line ("'\"") <= line("$") |
|
||||
\ exe "normal g'\"" |
|
||||
\ endif |
|
||||
\ if line("'\"") > 0 && line ("'\"") <= line("$") |
|
||||
\ exe "normal g'\"" |
|
||||
\ endif |
|
||||
\ endif
|
||||
|
||||
" When editing a crontab file, set backupcopy to yes rather than auto. See
|
||||
@@ -147,22 +81,25 @@ augroup gentoo
|
||||
" Except of course if a byte-order mark is in effect.
|
||||
autocmd BufReadPost *
|
||||
\ if exists("g:added_fenc_utf8") && &fileencoding == "utf-8" &&
|
||||
\ ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable |
|
||||
\ set fileencoding= |
|
||||
\ ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable |
|
||||
\ set fileencoding= |
|
||||
\ endif
|
||||
|
||||
" Strip trailing spaces on write
|
||||
autocmd BufWritePre *.e{build,class}
|
||||
\ if ! exists("g:leave_my_trailing_space_alone") |
|
||||
\ :%s/\s\+$//e |
|
||||
\ endif
|
||||
|
||||
augroup END
|
||||
|
||||
" Strip trailing spaces on write
|
||||
autocmd BufWritePre * :%s/\s\+$//e
|
||||
|
||||
endif " has("autocmd")
|
||||
" }}}
|
||||
|
||||
" {{{ vimrc.local
|
||||
" {{{ nvimrc.local
|
||||
if filereadable("/etc/vim/nvimrc.local")
|
||||
source /etc/vim/nvimrc.local
|
||||
endif
|
||||
" }}}
|
||||
|
||||
" vim: set fenc=utf-8 tw=80 sw=2 sts=2 et foldmethod=marker :
|
||||
" vim: set tw=80 sw=2 sts=2 et foldmethod=marker :
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>vim</herd>
|
||||
<use>
|
||||
<flag name='nvimpager'>Install nvimpager symlink to less.sh macro</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="github">neovim/neovim</remote-id>
|
||||
</upstream>
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
inherit cmake-utils flag-o-matic
|
||||
|
||||
DESCRIPTION="Ambitious vim fork focused on extensibility and agility"
|
||||
HOMEPAGE="https://github.com/neovim/neovim"
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://github.com/neovim/neovim.git"
|
||||
else
|
||||
SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0 vim"
|
||||
SLOT="0"
|
||||
IUSE="+nvimpager perl python"
|
||||
|
||||
CDEPEND="dev-lang/luajit:2
|
||||
>=dev-libs/libtermkey-0.17
|
||||
dev-libs/libvterm-neovim
|
||||
>=dev-libs/unibilium-1.1.1
|
||||
>=dev-libs/libuv-1.2.0
|
||||
>=dev-libs/msgpack-0.6.0_pre20150220
|
||||
dev-lua/lpeg
|
||||
dev-lua/messagepack"
|
||||
DEPEND="${CDEPEND}
|
||||
virtual/libiconv
|
||||
virtual/libintl"
|
||||
RDEPEND="${CDEPEND}
|
||||
perl? ( dev-lang/perl )
|
||||
python? ( dev-python/neovim-python-client )"
|
||||
|
||||
src_prepare() {
|
||||
# use our system vim dir
|
||||
sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
|
||||
-i src/nvim/os/unix_defs.h || die
|
||||
|
||||
# add eclass to bash filetypes
|
||||
sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
|
||||
|
||||
# make less.sh macro actually work with neovim
|
||||
sed -e 's|vim |nvim |g' -i runtime/macros/less.sh || die
|
||||
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
export USE_BUNDLED_DEPS=OFF
|
||||
append-cflags "-Wno-error"
|
||||
append-cppflags "-DNDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1"
|
||||
local mycmakeargs=(
|
||||
-DCMAKE_BUILD_TYPE=Release
|
||||
-DLIBUNIBILIUM_USE_STATIC=OFF
|
||||
-DLIBTERMKEY_USE_STATIC=OFF
|
||||
-DLIBVTERM_USE_STATIC=OFF
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
# install a default configuration file
|
||||
insinto /etc/vim
|
||||
doins "${FILESDIR}"/nvimrc
|
||||
|
||||
# conditionally install a symlink for nvimpager
|
||||
if use nvimpager; then
|
||||
dosym /usr/share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
|
||||
fi
|
||||
}
|
||||
@@ -1,15 +1 @@
|
||||
DIST iptables-1.4.10.tar.bz2 478007 SHA256 7544e437d2222078b15e6cd063b521c6f1ec4dac49e6af9ba3bfece2a6a93445 SHA512 264a974cc303cf9b352ccdf50d3aa1491167cdf1d7919074925645cc94d7f5e40d315cff048d0fab48e31853dcdad64bd65b83ef6fdd05f9e896be4e3317cd1e WHIRLPOOL 4ca6629ed2f43f1393be5a24284147272ff208d27e8bc073ccadb80f27887f2ef2c477e08ab2f8f22414cd11ab6a33dc42071f2ee3168e15026a76a3270cbc2e
|
||||
DIST iptables-1.4.11.1.tar.bz2 486926 SHA256 170c294698ca573477b1b2a3815e1563bf9929d182efef6cf0331a6e955c9ade SHA512 432dff8d1bc2b65cd636bb7a8d9ace5402db134df6e5e15c11c2bf1684d513a0f3cf70af099875fbddb25a1ef8868716b4a80791d7475848dd9d7917752d451a WHIRLPOOL ace3dc5ed59f98faea78cce2f1e673cb9b9726360cb1fcaa6ff73b9c36ba2ece8b415f191f1c6862a85829bb857202571bb851132a503ffb272c078d87889cbf
|
||||
DIST iptables-1.4.12.1.tar.bz2 473418 SHA256 77e6581f21f15946a814fa311236e5f3f7c6593180f9d695cea06aa95e464aba SHA512 ca8960d6d11faaba293e62169a32f8821d9240907d7ca11741dfca78ce92e32d5e2625f99786f55fb08d27ff7643e2531cc741aa0867f45df61248264b8ffe18 WHIRLPOOL b737fb2704511066d052227f7fe73a1ce64f427c614e56a1a681a7dcc37bac214448f9821b416a35cbe7efdf5436c49d0202f6da77aa0ec60de724137d28abda
|
||||
DIST iptables-1.4.12.tar.bz2 487036 SHA256 3e07a0beb746b580fbcfb04b3842ef0bd94a2f281786552f586415b26a7e971c SHA512 e61652cee5b3e691643769ac16dd9674ad7e2d5684f9e3146200be91a6db5674cead4525a97e232644f966692bea9143eb3b0c64a2dc01a32bf34834d3a0b4de WHIRLPOOL c5f5b29387322b36cce9c59fd548bb582b7b9b11da2616f5ff14c4ddc5eec8bc500da3756593406f5a5a4ab5b43d0f0b9d44b028b270479e10d1d8f716e1d0a0
|
||||
DIST iptables-1.4.13.tar.bz2 502942 SHA256 321e2600fc4541a958e44cafd85a42864b0035404097e0f2e082d474029b9ded SHA512 598b05aa1446172c65b5103bdd02e29f8c8253eb3395e8cabc33e664e7d7afb4a842deea4f0faaac4645acd29a4fbfc0c0675c55f67e38c822ae28b549eab73c WHIRLPOOL 44df42d7fd66349c6bdef8cfa6d80571e7ec7d58a7092b188ef41a8431cd02394835177bdc4d31255b8a115f088daba269f6ecb9230b8d04df6e01151a926017
|
||||
DIST iptables-1.4.14.tar.bz2 507123 SHA256 9be675696f41cd4f35cc332b667d285fe9489ca93c8e1f77804bd04b3315a522 SHA512 3bf6db564359acafa738068980793129982318317bea69f21282d80f40dcb1e16938f8e2928e6cdcc4e77d89b2bc3f6c45aad7eb11ff84063b78e5f8e1907f9e WHIRLPOOL 16f630e38272b76c3d7eefa83869902b0f111d9ffba2eca6fe885759619dc81f1c9fc1bfe2f946adc99edfdfc5f4002a331e412a8fef674f63bfb760aa44e868
|
||||
DIST iptables-1.4.15.tar.bz2 514830 SHA256 867c144e60075e7bebe6fcecf0b65169d5e2d1fa5ceec2ebd9780cd5026123ea SHA512 2ef559f1079838b2aa8348e66248aac7bc7549be93014ddbdaf730fbad168a657e20e031dcfd9ffa62ed45a52dbefc3683783a5d9b929d539d07ba6ad6adcfa0 WHIRLPOOL 8a56ed3cffd572f2202f172a3b903283452b4fd9647b6123530a1cc489a150bc88e7eb1f911f896b655d1de37f26c0a5eadd383c06103a0f395a82e1bc321b89
|
||||
DIST iptables-1.4.16.2.tar.bz2 536755 SHA256 4468ce7e1d68349a8e30f26110eb7969dbfdbf497d6c53758883123b3f2d6f6e SHA512 1ec9d12cc069a8acb1a443e7325c2bb98f0216e0a454413424b49c90bd6f4f94832ed1187a8fc75bdc7d80aa4ca9f3534e15799c46cb17344886d7b4ad34e4c0 WHIRLPOOL b0c782f41bb7d0df794064b1f57853ec664ddf0f899ab4b1f8cf51df0f98594065b7e7e3a77ee398cbb4fcc03fe360e67cf679bf6f9f730263ad29be394e76e0
|
||||
DIST iptables-1.4.16.3.tar.bz2 536872 SHA256 643ccf34099d53d5b839e1d889c05627745a51ec122648e76a9fcec3a8a9ec79 SHA512 c232a927fe63623cc0d336b4a09d7baad2d0c5a2a5e3b7ad083727e9f17cd0b668a826a4c5ff0bbb45233fee6c38c153710b13f458514516af7cf7df10d720e2 WHIRLPOOL 2dadcdb39f7741cb7b3c493bc36792a6edbdd9ddaa0c862d2ec0a6fbb89eb82c55f04ae407ab641f425208b15ef6e689af10ce6c03368e40652367c39dead75f
|
||||
DIST iptables-1.4.17.tar.bz2 541137 SHA256 51e7a769469383b6ad308a6a19cdd2bd813cf4593e21a156a543a1cd70554925 SHA512 022f89cbf56408842bdeb1adbe05076addaad007599fdb662f32a1c134d743dade28c26842acc7545d2474903164be5fe3ec7fd1e276cd2c37bd3b33b8a30de1 WHIRLPOOL f2cb85d5f4080fce2c6673a58737ace3d55130f74c66207bc515d0c7b4ecd75bd7ac8540a862e8af133e740d34eee40833d72c9c3236c7ef4dc75cd43816ec41
|
||||
DIST iptables-1.4.18.tar.bz2 542308 SHA256 14a99fb8b0ca22027a9ac6eb72fa32c834ceb3073820e0ba79bf251c6a7bcf3c SHA512 fc62916bd90863c0868f70d711fd6716cbcb54402c32bdeebfd0cee05137fa3ff1a137f0a4b5b31ee0bb6492e23e60e7025d51914b26c0e0b233181cbb1cb1b5 WHIRLPOOL 5d89e0f8d2dfad0f25a369f936f86386c799b2c475cef9fb13fb3c8cb9fcb201361c7d134a24f68099b2b5468c97476e1982bc116fa6448a07d776c724fddbd3
|
||||
DIST iptables-1.4.19.1.tar.bz2 543785 SHA256 dd51d3b942758a462afc7c8495930d25c93058e5319303247375183ad50164d2 SHA512 a3232ae92b997f67b5895c110f2cb8ec3aecbc383e804a870351c61e49cd83c1d7bf750818768f5560d615090157a17cc5c4ef101bc104905915de67fa022088 WHIRLPOOL 99ec72c45eb5a5721e4228b3ae79ffa2d1a67db362a9c67a09190c8bed54f023e6550b300b41d0d119c518d234559d7bc1182313b26460a2d224768d1f7955b3
|
||||
DIST iptables-1.4.20.tar.bz2 546864 SHA256 109b8c7ca90b4536bc5de869ae705f6d5efcc0c08ef3003755aad3ed6d2d49ad SHA512 6c8e1d89db66c0cfd76afd7fa7de8a7d451337f6f15f01d811585714f6d488275621ca9a1f4967a2ae99e90f3890cf0e3c7f7a9a3a98fda902b0a56717d7ffe0 WHIRLPOOL 8146d632ec00c663988d4e82e3adfa8b9fa2df269df2e6cc359dae65727e59f4ef614540eb4f970d020eac558d7423731a88246f9df1265718346ca62e59a8e7
|
||||
DIST iptables-1.4.21.tar.bz2 547439 SHA256 52004c68021da9a599feed27f65defcfb22128f7da2c0531c0f75de0f479d3e0 SHA512 dd4baccdb080284d8620e6ed59beafc2677813f3e099051764b07f8e394f6d94ca11861b181f3cce7c55c66de64c1e2add13dc1a0b64e24050cd9fb7aea0689b WHIRLPOOL 475541d1b2b7fe4ee8fa3b537274ef082aab8bfd262201ee14cd53577dfac6f591445cc6d64ed93b226a4b71d54ae1b9ab4cbb378b5440861a585f770f0db200
|
||||
DIST iptables-1.4.6.tar.bz2 463758 SHA256 6e732798cad62163d6e033aa52e22b771246556a230c0f66cd33fe69e96d72a4 SHA512 0ec1314462a154b5892093b17b997f130760b2ada4fb2b7cdc0f6cb7bb9da9ddaf77400c3fcbe57c4db1400adaec37d38f9debe37f7ed33dabbbe3b58c13e942 WHIRLPOOL 39e1f0f3f46350c81d2fe219b5d40174f4a390180f71ac8c896a634aa29abe98da665c8e93d373465dad351a9604d6c5e36c0f99f7256b85ffbc3615cefa28ae
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
# /etc/conf.d/ip6tables
|
||||
|
||||
# Location in which iptables initscript will save set rules on
|
||||
# service shutdown
|
||||
IP6TABLES_SAVE="/var/lib/ip6tables/rules-save"
|
||||
|
||||
# Options to pass to iptables-save and iptables-restore
|
||||
SAVE_RESTORE_OPTIONS="-c"
|
||||
|
||||
# Save state on stopping iptables
|
||||
SAVE_ON_STOP="yes"
|
||||
@@ -1,11 +0,0 @@
|
||||
# /etc/conf.d/iptables
|
||||
|
||||
# Location in which iptables initscript will save set rules on
|
||||
# service shutdown
|
||||
IPTABLES_SAVE="/var/lib/iptables/rules-save"
|
||||
|
||||
# Options to pass to iptables-save and iptables-restore
|
||||
SAVE_RESTORE_OPTIONS="-c"
|
||||
|
||||
# Save state on stopping iptables
|
||||
SAVE_ON_STOP="yes"
|
||||
@@ -1,115 +0,0 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
extra_commands="save panic"
|
||||
extra_started_commands="reload"
|
||||
|
||||
iptables_name=${SVCNAME}
|
||||
if [ "${iptables_name}" != "iptables" -a "${iptables_name}" != "ip6tables" ] ; then
|
||||
iptables_name="iptables"
|
||||
fi
|
||||
|
||||
iptables_bin="/sbin/${iptables_name}"
|
||||
case ${iptables_name} in
|
||||
iptables) iptables_proc="/proc/net/ip_tables_names"
|
||||
iptables_save=${IPTABLES_SAVE};;
|
||||
ip6tables) iptables_proc="/proc/net/ip6_tables_names"
|
||||
iptables_save=${IP6TABLES_SAVE};;
|
||||
esac
|
||||
|
||||
depend() {
|
||||
before net
|
||||
use logger
|
||||
}
|
||||
|
||||
set_table_policy() {
|
||||
local chains table=$1 policy=$2
|
||||
case ${table} in
|
||||
nat) chains="PREROUTING POSTROUTING OUTPUT";;
|
||||
mangle) chains="PREROUTING INPUT FORWARD OUTPUT POSTROUTING";;
|
||||
filter) chains="INPUT FORWARD OUTPUT";;
|
||||
*) chains="";;
|
||||
esac
|
||||
local chain
|
||||
for chain in ${chains} ; do
|
||||
${iptables_bin} -t ${table} -P ${chain} ${policy}
|
||||
done
|
||||
}
|
||||
|
||||
checkkernel() {
|
||||
if [ ! -e ${iptables_proc} ] ; then
|
||||
eerror "Your kernel lacks ${iptables_name} support, please load"
|
||||
eerror "appropriate modules and try again."
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
checkconfig() {
|
||||
if [ ! -f ${iptables_save} ] ; then
|
||||
eerror "Not starting ${iptables_name}. First create some rules then run:"
|
||||
eerror "/etc/init.d/${iptables_name} save"
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
start() {
|
||||
checkconfig || return 1
|
||||
ebegin "Loading ${iptables_name} state and starting firewall"
|
||||
${iptables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
if [ "${SAVE_ON_STOP}" = "yes" ] ; then
|
||||
save || return 1
|
||||
fi
|
||||
checkkernel || return 1
|
||||
ebegin "Stopping firewall"
|
||||
local a
|
||||
for a in $(cat ${iptables_proc}) ; do
|
||||
set_table_policy $a ACCEPT
|
||||
|
||||
${iptables_bin} -F -t $a
|
||||
${iptables_bin} -X -t $a
|
||||
done
|
||||
eend $?
|
||||
}
|
||||
|
||||
reload() {
|
||||
checkkernel || return 1
|
||||
ebegin "Flushing firewall"
|
||||
local a
|
||||
for a in $(cat ${iptables_proc}) ; do
|
||||
${iptables_bin} -F -t $a
|
||||
${iptables_bin} -X -t $a
|
||||
done
|
||||
eend $?
|
||||
|
||||
start
|
||||
}
|
||||
|
||||
save() {
|
||||
ebegin "Saving ${iptables_name} state"
|
||||
touch "${iptables_save}"
|
||||
chmod 0600 "${iptables_save}"
|
||||
${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}"
|
||||
eend $?
|
||||
}
|
||||
|
||||
panic() {
|
||||
checkkernel || return 1
|
||||
service_started ${iptables_name} && svc_stop
|
||||
|
||||
local a
|
||||
ebegin "Dropping all packets"
|
||||
for a in $(cat ${iptables_proc}) ; do
|
||||
${iptables_bin} -F -t $a
|
||||
${iptables_bin} -X -t $a
|
||||
|
||||
set_table_policy $a DROP
|
||||
done
|
||||
eend $?
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
diff --git a/iptables/Makefile.am b/iptables/Makefile.am
|
||||
index 13cca9c..a068278 100644
|
||||
--- a/iptables/Makefile.am
|
||||
+++ b/iptables/Makefile.am
|
||||
@@ -51,10 +51,10 @@ v6_sbin_links = ip6tables ip6tables-restore ip6tables-save
|
||||
endif
|
||||
|
||||
iptables.8: ${srcdir}/iptables.8.in ../extensions/matches4.man ../extensions/targets4.man
|
||||
- ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r extensions/matches4.man' -e '/@TARGET@/ r extensions/targets4.man' $< >$@;
|
||||
+ ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r ../extensions/matches4.man' -e '/@TARGET@/ r ../extensions/targets4.man' $< >$@;
|
||||
|
||||
ip6tables.8: ${srcdir}/ip6tables.8.in ../extensions/matches6.man ../extensions/targets6.man
|
||||
- ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r extensions/matches6.man' -e '/@TARGET@/ r extensions/targets6.man' $< >$@;
|
||||
+ ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r ../extensions/matches6.man' -e '/@TARGET@/ r ../extensions/targets6.man' $< >$@;
|
||||
|
||||
pkgconfig_DATA = xtables.pc
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
commit 3412bd0bfb8b8bac9834cbfd3392b3d5487133bf
|
||||
Author: Tom Eastep <teastep@shorewall.net>
|
||||
Date: Thu Aug 18 15:11:16 2011 -0700
|
||||
|
||||
libxt_conntrack: improve error message on parsing violation
|
||||
|
||||
Tom Eastep noted:
|
||||
|
||||
$ iptables -A foo -m conntrack --ctorigdstport 22
|
||||
iptables v1.4.12: conntrack rev 2 does not support port ranges
|
||||
Try `iptables -h' or 'iptables --help' for more information.
|
||||
|
||||
Commit v1.4.12-41-g1ad6407 takes care of the actual cause of the bug,
|
||||
but let's include Tom's patch nevertheless for the better error
|
||||
message in case one actually does specify a range with rev 2.
|
||||
|
||||
References: http://marc.info/?l=netfilter-devel&m=131370592105298&w=2
|
||||
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
||||
|
||||
diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c
|
||||
index 060b947..fff69f8 100644
|
||||
--- a/extensions/libxt_conntrack.c
|
||||
+++ b/extensions/libxt_conntrack.c
|
||||
@@ -129,13 +129,20 @@ static const struct xt_option_entry conntrack2_mt_opts[] = {
|
||||
.flags = XTOPT_INVERT},
|
||||
{.name = "ctexpire", .id = O_CTEXPIRE, .type = XTTYPE_UINT32RC,
|
||||
.flags = XTOPT_INVERT},
|
||||
- {.name = "ctorigsrcport", .id = O_CTORIGSRCPORT, .type = XTTYPE_PORT,
|
||||
+ /*
|
||||
+ * Rev 1 and 2 only store one port, and we would normally use
|
||||
+ * %XTTYPE_PORT (rather than %XTTYPE_PORTRC) for that. The resulting
|
||||
+ * error message - in case a user passed a range nevertheless -
|
||||
+ * "port 22:23 resolved to nothing" is not quite as useful as using
|
||||
+ * %XTTYPE_PORTC and libxt_conntrack's own range test.
|
||||
+ */
|
||||
+ {.name = "ctorigsrcport", .id = O_CTORIGSRCPORT, .type = XTTYPE_PORTRC,
|
||||
.flags = XTOPT_INVERT | XTOPT_NBO},
|
||||
- {.name = "ctorigdstport", .id = O_CTORIGDSTPORT, .type = XTTYPE_PORT,
|
||||
+ {.name = "ctorigdstport", .id = O_CTORIGDSTPORT, .type = XTTYPE_PORTRC,
|
||||
.flags = XTOPT_INVERT | XTOPT_NBO},
|
||||
- {.name = "ctreplsrcport", .id = O_CTREPLSRCPORT, .type = XTTYPE_PORT,
|
||||
+ {.name = "ctreplsrcport", .id = O_CTREPLSRCPORT, .type = XTTYPE_PORTRC,
|
||||
.flags = XTOPT_INVERT | XTOPT_NBO},
|
||||
- {.name = "ctrepldstport", .id = O_CTREPLDSTPORT, .type = XTTYPE_PORT,
|
||||
+ {.name = "ctrepldstport", .id = O_CTREPLDSTPORT, .type = XTTYPE_PORTRC,
|
||||
.flags = XTOPT_INVERT | XTOPT_NBO},
|
||||
{.name = "ctdir", .id = O_CTDIR, .type = XTTYPE_STRING},
|
||||
XTOPT_TABLEEND,
|
||||
@@ -1,61 +0,0 @@
|
||||
parent 2ca6273c73b42e8c74afd5f8b1fe10c5c93ce363 (v1.4.12-43-g2ca6273)
|
||||
commit d4e72dc1c684c2f8361d87e6bde2902cd2ee8efb
|
||||
Author: Jan Engelhardt <jengelh@medozas.de>
|
||||
Date: Sat Sep 3 13:34:40 2011 +0200
|
||||
|
||||
libxt_statistic: link with -lm
|
||||
|
||||
$ ldd -r libxt_statistic.so
|
||||
undefined symbol: lround (./libxt_statistic.so)
|
||||
|
||||
References: https://bugs.archlinux.org/task/25358
|
||||
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
||||
---
|
||||
extensions/GNUmakefile.in | 5 ++++-
|
||||
iptables/Makefile.am | 9 +++++++--
|
||||
2 files changed, 11 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
|
||||
index 2b48d84..dbf210c 100644
|
||||
--- a/extensions/GNUmakefile.in
|
||||
+++ b/extensions/GNUmakefile.in
|
||||
@@ -90,11 +90,14 @@ init%.o: init%.c
|
||||
# Shared libraries
|
||||
#
|
||||
lib%.so: lib%.oo
|
||||
- ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $<;
|
||||
+ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< ${$*_LIBADD};
|
||||
|
||||
lib%.oo: ${srcdir}/lib%.c
|
||||
${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
|
||||
|
||||
+# Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
|
||||
+xt_statistic_LIBADD = -lm
|
||||
+
|
||||
|
||||
#
|
||||
# Static bits
|
||||
diff --git a/iptables/Makefile.am b/iptables/Makefile.am
|
||||
index addb159..f6db32d 100644
|
||||
--- a/iptables/Makefile.am
|
||||
+++ b/iptables/Makefile.am
|
||||
@@ -6,12 +6,17 @@ AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}
|
||||
lib_LTLIBRARIES = libxtables.la
|
||||
libxtables_la_SOURCES = xtables.c xtoptions.c
|
||||
libxtables_la_LDFLAGS = -version-info ${libxtables_vcurrent}:0:${libxtables_vage}
|
||||
+libxtables_la_LIBADD =
|
||||
+if ENABLE_STATIC
|
||||
+# With --enable-static, shipped extensions are linked into the main executable,
|
||||
+# so we need all the LIBADDs here too
|
||||
+libxtables_la_LIBADD += -lm
|
||||
+endif
|
||||
if ENABLE_SHARED
|
||||
libxtables_la_CFLAGS = ${AM_CFLAGS}
|
||||
-libxtables_la_LIBADD = -ldl
|
||||
+libxtables_la_LIBADD += -ldl
|
||||
else
|
||||
libxtables_la_CFLAGS = ${AM_CFLAGS} -DNO_SHARED_LIBS=1
|
||||
-libxtables_la_LIBADD =
|
||||
endif
|
||||
|
||||
xtables_multi_SOURCES = xtables-multi.c iptables-xml.c
|
||||
@@ -1,116 +0,0 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
extra_commands="save panic"
|
||||
extra_started_commands="reload"
|
||||
|
||||
iptables_name=${SVCNAME}
|
||||
if [ "${iptables_name}" != "iptables" -a "${iptables_name}" != "ip6tables" ] ; then
|
||||
iptables_name="iptables"
|
||||
fi
|
||||
|
||||
iptables_bin="/sbin/${iptables_name}"
|
||||
case ${iptables_name} in
|
||||
iptables) iptables_proc="/proc/net/ip_tables_names"
|
||||
iptables_save=${IPTABLES_SAVE};;
|
||||
ip6tables) iptables_proc="/proc/net/ip6_tables_names"
|
||||
iptables_save=${IP6TABLES_SAVE};;
|
||||
esac
|
||||
|
||||
depend() {
|
||||
before net
|
||||
}
|
||||
|
||||
set_table_policy() {
|
||||
local chains table=$1 policy=$2
|
||||
case ${table} in
|
||||
nat) chains="PREROUTING POSTROUTING OUTPUT";;
|
||||
mangle) chains="PREROUTING INPUT FORWARD OUTPUT POSTROUTING";;
|
||||
filter) chains="INPUT FORWARD OUTPUT";;
|
||||
*) chains="";;
|
||||
esac
|
||||
local chain
|
||||
for chain in ${chains} ; do
|
||||
${iptables_bin} -t ${table} -P ${chain} ${policy}
|
||||
done
|
||||
}
|
||||
|
||||
checkkernel() {
|
||||
if [ ! -e ${iptables_proc} ] ; then
|
||||
eerror "Your kernel lacks ${iptables_name} support, please load"
|
||||
eerror "appropriate modules and try again."
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
checkconfig() {
|
||||
if [ ! -f ${iptables_save} ] ; then
|
||||
eerror "Not starting ${iptables_name}. First create some rules then run:"
|
||||
eerror "/etc/init.d/${iptables_name} save"
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
start() {
|
||||
checkconfig || return 1
|
||||
ebegin "Loading ${iptables_name} state and starting firewall"
|
||||
${iptables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
if [ "${SAVE_ON_STOP}" = "yes" ] ; then
|
||||
save || return 1
|
||||
fi
|
||||
checkkernel || return 1
|
||||
ebegin "Stopping firewall"
|
||||
local a
|
||||
for a in $(cat ${iptables_proc}) ; do
|
||||
set_table_policy $a ACCEPT
|
||||
|
||||
${iptables_bin} -F -t $a
|
||||
${iptables_bin} -X -t $a
|
||||
done
|
||||
eend $?
|
||||
}
|
||||
|
||||
reload() {
|
||||
checkkernel || return 1
|
||||
ebegin "Flushing firewall"
|
||||
local a
|
||||
for a in $(cat ${iptables_proc}) ; do
|
||||
${iptables_bin} -F -t $a
|
||||
${iptables_bin} -X -t $a
|
||||
done
|
||||
eend $?
|
||||
|
||||
start
|
||||
}
|
||||
|
||||
save() {
|
||||
ebegin "Saving ${iptables_name} state"
|
||||
touch "${iptables_save}"
|
||||
chmod 0600 "${iptables_save}"
|
||||
${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}"
|
||||
eend $?
|
||||
}
|
||||
|
||||
panic() {
|
||||
checkkernel || return 1
|
||||
if service_started ${iptables_name}; then
|
||||
rc-service ${iptables_name} stop
|
||||
fi
|
||||
|
||||
local a
|
||||
ebegin "Dropping all packets"
|
||||
for a in $(cat ${iptables_proc}) ; do
|
||||
${iptables_bin} -F -t $a
|
||||
${iptables_bin} -X -t $a
|
||||
|
||||
set_table_policy $a DROP
|
||||
done
|
||||
eend $?
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
https://bugs.gentoo.org/437712
|
||||
|
||||
From 269655d54e22f3a36250bb2c4639dddd102258c6 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Mon, 8 Oct 2012 12:04:56 +0000
|
||||
Subject: [PATCH] build: remove symlink-only extensions from static object
|
||||
list
|
||||
|
||||
$ ./configure --enable-static --disable-shared --enable-ipv4
|
||||
--enable-ipv6 && make
|
||||
[...]
|
||||
make[3]: *** No rule to make target "libxt_NOTRACK.o", needed by
|
||||
"libext.a". Stop.
|
||||
|
||||
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
|
||||
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
---
|
||||
extensions/GNUmakefile.in | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
|
||||
index 8b38df9..1cef239 100644
|
||||
--- a/extensions/GNUmakefile.in
|
||||
+++ b/extensions/GNUmakefile.in
|
||||
@@ -39,7 +39,7 @@ endif
|
||||
# Wildcard module list
|
||||
#
|
||||
pfx_build_mod := $(patsubst ${srcdir}/libxt_%.c,%,$(sort $(wildcard ${srcdir}/libxt_*.c)))
|
||||
-pfx_build_mod += NOTRACK state
|
||||
+pfx_symlinks := NOTRACK state
|
||||
@ENABLE_IPV4_TRUE@ pf4_build_mod := $(patsubst ${srcdir}/libipt_%.c,%,$(sort $(wildcard ${srcdir}/libipt_*.c)))
|
||||
@ENABLE_IPV6_TRUE@ pf6_build_mod := $(patsubst ${srcdir}/libip6t_%.c,%,$(sort $(wildcard ${srcdir}/libip6t_*.c)))
|
||||
pfx_build_mod := $(filter-out @blacklist_modules@,${pfx_build_mod})
|
||||
@@ -48,7 +48,7 @@ pf6_build_mod := $(filter-out @blacklist_modules@,${pf6_build_mod})
|
||||
pfx_objs := $(patsubst %,libxt_%.o,${pfx_build_mod})
|
||||
pf4_objs := $(patsubst %,libipt_%.o,${pf4_build_mod})
|
||||
pf6_objs := $(patsubst %,libip6t_%.o,${pf6_build_mod})
|
||||
-pfx_solibs := $(patsubst %,libxt_%.so,${pfx_build_mod})
|
||||
+pfx_solibs := $(patsubst %,libxt_%.so,${pfx_build_mod} ${pfx_symlinks})
|
||||
pf4_solibs := $(patsubst %,libipt_%.so,${pf4_build_mod})
|
||||
pf6_solibs := $(patsubst %,libip6t_%.so,${pf6_build_mod})
|
||||
|
||||
@@ -220,7 +220,7 @@ man_run = \
|
||||
done >$@;
|
||||
|
||||
matches.man: .initext.dd .initext4.dd .initext6.dd $(wildcard ${srcdir}/lib*.man)
|
||||
- $(call man_run,$(call ex_matches,${pfx_build_mod} ${pf4_build_mod} ${pf6_build_mod}))
|
||||
+ $(call man_run,$(call ex_matches,${pfx_build_mod} ${pf4_build_mod} ${pf6_build_mod} ${pfx_symlinks}))
|
||||
|
||||
targets.man: .initext.dd .initext4.dd .initext6.dd $(wildcard ${srcdir}/lib*.man)
|
||||
- $(call man_run,$(call ex_targets,${pfx_build_mod} ${pf4_build_mod} ${pf6_build_mod}))
|
||||
+ $(call man_run,$(call ex_targets,${pfx_build_mod} ${pf4_build_mod} ${pf6_build_mod} ${pfx_symlinks}))
|
||||
--
|
||||
1.7.12
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
From d42bc7c100de69396a527e90736198f8e4e3000b Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Sun, 30 Dec 2012 18:06:15 -0500
|
||||
Subject: [PATCH] extensions: fix linking against -lip6tc
|
||||
|
||||
The current build forgets to specify a path to find libip6tc which means
|
||||
it either fails (if there is no libip6tc in the system), or links against
|
||||
an old version (if there is one in the system).
|
||||
|
||||
References: https://bugs.gentoo.org/449262
|
||||
Reported-by: Mike Gilbert <floppym@gentoo.org>
|
||||
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||
---
|
||||
extensions/GNUmakefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
|
||||
index e71e3ff..a605474 100644
|
||||
--- a/extensions/GNUmakefile.in
|
||||
+++ b/extensions/GNUmakefile.in
|
||||
@@ -101,7 +101,7 @@ libxt_state.so: libxt_conntrack.so
|
||||
ln -fs $< $@
|
||||
|
||||
# Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
|
||||
-ip6t_NETMAP_LIBADD = -lip6tc
|
||||
+ip6t_NETMAP_LIBADD = -L../libiptc/.libs -lip6tc
|
||||
xt_RATEEST_LIBADD = -lm
|
||||
xt_statistic_LIBADD = -lm
|
||||
|
||||
--
|
||||
1.8.0
|
||||
|
||||
@@ -1,74 +0,0 @@
|
||||
From 37b19d08f3cbc83a653386d76261490e173a874b Mon Sep 17 00:00:00 2001
|
||||
From: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
Date: Sat, 16 Mar 2013 12:15:30 +0100
|
||||
Subject: [PATCH] Revert "build: resolve link failure for ip6t_NETMAP"
|
||||
|
||||
This reverts commit 68e77a26111ee6b8f10c735a76891a7de6d57ee6.
|
||||
|
||||
The use of libtool was introduced to resolve linking problems
|
||||
in NETMAP (IPv6 version), but that resulted in RPATH problems
|
||||
reported from distributors and warnings spotted by libtool at
|
||||
linking stage.
|
||||
|
||||
Since (0ca548b libip6t_NETMAP: Use xtables_ip6mask_to_cidr and
|
||||
get rid of libip6tc dependency) fixed the NETMAP issue, let's
|
||||
roll back to our previous stage.
|
||||
|
||||
A small conflicts in extensions/GNUmakefile.in has been resolved
|
||||
in this revert.
|
||||
|
||||
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
---
|
||||
extensions/GNUmakefile.in | 18 +++++++-----------
|
||||
1 file changed, 7 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
|
||||
index 3db6985..1ae7f74 100644
|
||||
--- a/extensions/GNUmakefile.in
|
||||
+++ b/extensions/GNUmakefile.in
|
||||
@@ -33,7 +33,6 @@ AM_VERBOSE_CXX = @echo " CXX " $@;
|
||||
AM_VERBOSE_CXXLD = @echo " CXXLD " $@;
|
||||
AM_VERBOSE_AR = @echo " AR " $@;
|
||||
AM_VERBOSE_GEN = @echo " GEN " $@;
|
||||
-AM_VERBOSE_NULL = @
|
||||
endif
|
||||
|
||||
#
|
||||
@@ -76,7 +75,7 @@ install: ${targets_install}
|
||||
if test -n "${targets_install}"; then install -pm0755 $^ "${DESTDIR}${xtlibdir}/"; fi;
|
||||
|
||||
clean:
|
||||
- rm -f *.la *.o *.lo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
|
||||
+ rm -f *.o *.oo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
|
||||
rm -f .*.d .*.dd;
|
||||
|
||||
distclean: clean
|
||||
@@ -90,19 +89,16 @@ init%.o: init%.c
|
||||
#
|
||||
# Shared libraries
|
||||
#
|
||||
-lib%.so: lib%.la
|
||||
- ${AM_VERBOSE_NULL} ln -fs .libs/$@ $@
|
||||
+lib%.so: lib%.oo
|
||||
+ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< -L../libxtables/.libs -lxtables ${$*_LIBADD};
|
||||
|
||||
-lib%.la: lib%.lo
|
||||
- ${AM_VERBOSE_CCLD} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
|
||||
-
|
||||
-lib%.lo: ${srcdir}/lib%.c
|
||||
- ${AM_VERBOSE_CC} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=compile ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $<
|
||||
+lib%.oo: ${srcdir}/lib%.c
|
||||
+ ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
|
||||
|
||||
libxt_NOTRACK.so: libxt_CT.so
|
||||
- ${AM_VERBOSE_GEN} ln -fs $< $@
|
||||
+ ln -fs $< $@
|
||||
libxt_state.so: libxt_conntrack.so
|
||||
- ${AM_VERBOSE_GEN} ln -fs $< $@
|
||||
+ ln -fs $< $@
|
||||
|
||||
# Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
|
||||
xt_RATEEST_LIBADD = -lm
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
@@ -1,88 +0,0 @@
|
||||
From cccfff9309743f173c504dd265fae173caa5b47f Mon Sep 17 00:00:00 2001
|
||||
From: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
Date: Sat, 16 Mar 2013 12:11:07 +0100
|
||||
Subject: [PATCH] libip6t_NETMAP: Use xtables_ip6mask_to_cidr and get rid of
|
||||
libip6tc dependency
|
||||
|
||||
This patch changes the NETMAP target extension (IPv6 side) to use
|
||||
the xtables_ip6mask_to_cidr available in libxtables.
|
||||
|
||||
As a side effect, we get rid of the libip6tc dependency.
|
||||
|
||||
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
---
|
||||
extensions/GNUmakefile.in | 1 -
|
||||
extensions/libip6t_NETMAP.c | 2 +-
|
||||
include/libiptc/libip6tc.h | 3 ---
|
||||
iptables/ip6tables.c | 2 +-
|
||||
libiptc/libip6tc.c | 2 +-
|
||||
5 files changed, 3 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
|
||||
index adad4d6..3db6985 100644
|
||||
--- a/extensions/GNUmakefile.in
|
||||
+++ b/extensions/GNUmakefile.in
|
||||
@@ -105,7 +105,6 @@ libxt_state.so: libxt_conntrack.so
|
||||
${AM_VERBOSE_GEN} ln -fs $< $@
|
||||
|
||||
# Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
|
||||
-ip6t_NETMAP_LIBADD = ../libiptc/libip6tc.la
|
||||
xt_RATEEST_LIBADD = -lm
|
||||
xt_statistic_LIBADD = -lm
|
||||
|
||||
diff --git a/extensions/libip6t_NETMAP.c b/extensions/libip6t_NETMAP.c
|
||||
index d14dece..a4df70e 100644
|
||||
--- a/extensions/libip6t_NETMAP.c
|
||||
+++ b/extensions/libip6t_NETMAP.c
|
||||
@@ -61,7 +61,7 @@ static void NETMAP_print(const void *ip, const struct xt_entry_target *target,
|
||||
printf("%s", xtables_ip6addr_to_numeric(&a));
|
||||
for (i = 0; i < 4; i++)
|
||||
a.s6_addr32[i] = ~(r->min_addr.ip6[i] ^ r->max_addr.ip6[i]);
|
||||
- bits = ipv6_prefix_length(&a);
|
||||
+ bits = xtables_ip6mask_to_cidr(&a);
|
||||
if (bits < 0)
|
||||
printf("/%s", xtables_ip6addr_to_numeric(&a));
|
||||
else
|
||||
diff --git a/include/libiptc/libip6tc.h b/include/libiptc/libip6tc.h
|
||||
index c656bc4..9aed80a 100644
|
||||
--- a/include/libiptc/libip6tc.h
|
||||
+++ b/include/libiptc/libip6tc.h
|
||||
@@ -154,9 +154,6 @@ int ip6tc_get_raw_socket(void);
|
||||
/* Translates errno numbers into more human-readable form than strerror. */
|
||||
const char *ip6tc_strerror(int err);
|
||||
|
||||
-/* Return prefix length, or -1 if not contiguous */
|
||||
-int ipv6_prefix_length(const struct in6_addr *a);
|
||||
-
|
||||
extern void dump_entries6(struct xtc_handle *const);
|
||||
|
||||
extern const struct xtc_ops ip6tc_ops;
|
||||
diff --git a/iptables/ip6tables.c b/iptables/ip6tables.c
|
||||
index 4cfbea3..7d02cc1 100644
|
||||
--- a/iptables/ip6tables.c
|
||||
+++ b/iptables/ip6tables.c
|
||||
@@ -1022,7 +1022,7 @@ static void print_ip(const char *prefix, const struct in6_addr *ip,
|
||||
const struct in6_addr *mask, int invert)
|
||||
{
|
||||
char buf[51];
|
||||
- int l = ipv6_prefix_length(mask);
|
||||
+ int l = xtables_ip6mask_to_cidr(mask);
|
||||
|
||||
if (l == 0 && !invert)
|
||||
return;
|
||||
diff --git a/libiptc/libip6tc.c b/libiptc/libip6tc.c
|
||||
index 7128e1c..ca01bcb 100644
|
||||
--- a/libiptc/libip6tc.c
|
||||
+++ b/libiptc/libip6tc.c
|
||||
@@ -113,7 +113,7 @@ typedef unsigned int socklen_t;
|
||||
#define BIT6(a, l) \
|
||||
((ntohl(a->s6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1)
|
||||
|
||||
-int
|
||||
+static int
|
||||
ipv6_prefix_length(const struct in6_addr *a)
|
||||
{
|
||||
int l, i;
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
Regular → Executable
+28
-15
@@ -1,15 +1,16 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
extra_commands="save panic"
|
||||
extra_commands="check save panic"
|
||||
extra_started_commands="reload"
|
||||
|
||||
iptables_name=${SVCNAME}
|
||||
if [ "${iptables_name}" != "iptables" -a "${iptables_name}" != "ip6tables" ] ; then
|
||||
iptables_name="iptables"
|
||||
fi
|
||||
case ${iptables_name} in
|
||||
iptables|ip6tables) ;;
|
||||
*) iptables_name="iptables" ;;
|
||||
esac
|
||||
|
||||
iptables_bin="/sbin/${iptables_name}"
|
||||
case ${iptables_name} in
|
||||
@@ -20,8 +21,8 @@ case ${iptables_name} in
|
||||
esac
|
||||
|
||||
depend() {
|
||||
need localmount #434774
|
||||
before net
|
||||
use logger
|
||||
}
|
||||
|
||||
set_table_policy() {
|
||||
@@ -34,7 +35,7 @@ set_table_policy() {
|
||||
esac
|
||||
local chain
|
||||
for chain in ${chains} ; do
|
||||
${iptables_bin} -t ${table} -P ${chain} ${policy}
|
||||
${iptables_bin} -w -t ${table} -P ${chain} ${policy}
|
||||
done
|
||||
}
|
||||
|
||||
@@ -72,29 +73,41 @@ stop() {
|
||||
for a in $(cat ${iptables_proc}) ; do
|
||||
set_table_policy $a ACCEPT
|
||||
|
||||
${iptables_bin} -F -t $a
|
||||
${iptables_bin} -X -t $a
|
||||
${iptables_bin} -w -F -t $a
|
||||
${iptables_bin} -w -X -t $a
|
||||
done
|
||||
eend $?
|
||||
}
|
||||
|
||||
reload() {
|
||||
checkkernel || return 1
|
||||
checkrules || return 1
|
||||
ebegin "Flushing firewall"
|
||||
local a
|
||||
for a in $(cat ${iptables_proc}) ; do
|
||||
${iptables_bin} -F -t $a
|
||||
${iptables_bin} -X -t $a
|
||||
${iptables_bin} -w -F -t $a
|
||||
${iptables_bin} -w -X -t $a
|
||||
done
|
||||
eend $?
|
||||
|
||||
start
|
||||
}
|
||||
|
||||
checkrules() {
|
||||
ebegin "Checking rules"
|
||||
${iptables_bin}-restore --test ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"
|
||||
eend $?
|
||||
}
|
||||
|
||||
check() {
|
||||
# Short name for users of init.d script.
|
||||
checkrules
|
||||
}
|
||||
|
||||
save() {
|
||||
ebegin "Saving ${iptables_name} state"
|
||||
touch "${iptables_save}"
|
||||
chmod 0600 "${iptables_save}"
|
||||
checkpath -q -d "$(dirname "${iptables_save}")"
|
||||
checkpath -q -m 0600 -f "${iptables_save}"
|
||||
${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}"
|
||||
eend $?
|
||||
}
|
||||
@@ -108,8 +121,8 @@ panic() {
|
||||
local a
|
||||
ebegin "Dropping all packets"
|
||||
for a in $(cat ${iptables_proc}) ; do
|
||||
${iptables_bin} -F -t $a
|
||||
${iptables_bin} -X -t $a
|
||||
${iptables_bin} -w -F -t $a
|
||||
${iptables_bin} -w -X -t $a
|
||||
|
||||
set_table_policy $a DROP
|
||||
done
|
||||
@@ -1,83 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="2"
|
||||
|
||||
# Force users doing their own patches to install their own tools
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
|
||||
inherit eutils multilib toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.iptables.org/"
|
||||
SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="ipv6 netlink"
|
||||
|
||||
COMMON_DEPEND="
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
"
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
virtual/os-headers
|
||||
"
|
||||
RDEPEND="
|
||||
${COMMON_DEPEND}
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# Only run autotools if user patched something
|
||||
epatch_user && eautoreconf || elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
sed -i \
|
||||
-e "/nfnetlink=[01]/s:=[01]:=$(use netlink && echo 1 || echo 0):" \
|
||||
configure
|
||||
econf \
|
||||
--sbindir=/sbin \
|
||||
--libexecdir=/$(get_libdir) \
|
||||
--enable-devel \
|
||||
--enable-libipq \
|
||||
--enable-shared \
|
||||
--enable-static \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1 || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}" || die
|
||||
doman iptables-apply.8 || die
|
||||
dodoc INCOMPATIBILITIES iptables.xslt || die
|
||||
|
||||
# all the iptables binaries are in /sbin, so might as well
|
||||
# put these small files in with them
|
||||
into /
|
||||
dosbin iptables-apply || die
|
||||
dosym iptables-apply /sbin/ip6tables-apply || die
|
||||
|
||||
insinto /usr/include
|
||||
doins include/iptables.h $(use ipv6 && echo include/ip6tables.h) || die
|
||||
insinto /usr/include/iptables
|
||||
doins include/iptables/internal.h || die
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables || die
|
||||
newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables || die
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables || die
|
||||
newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables || die
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
|
||||
find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
|
||||
}
|
||||
@@ -1,67 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="2"
|
||||
|
||||
# Force users doing their own patches to install their own tools
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
|
||||
inherit eutils multilib toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.iptables.org/"
|
||||
SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
|
||||
IUSE="ipv6"
|
||||
|
||||
DEPEND="virtual/os-headers"
|
||||
RDEPEND=""
|
||||
|
||||
src_prepare() {
|
||||
# Only run autotools if user patched something
|
||||
epatch_user && eautoreconf || elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--sbindir=/sbin \
|
||||
--libexecdir=/$(get_libdir) \
|
||||
--enable-devel \
|
||||
--enable-libipq \
|
||||
--enable-shared \
|
||||
--enable-static \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1 || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}" || die
|
||||
dosbin iptables-apply || die
|
||||
doman iptables-apply.8 || die
|
||||
dodoc INCOMPATIBILITIES iptables.xslt || die
|
||||
|
||||
insinto /usr/include
|
||||
doins include/iptables.h $(use ipv6 && echo include/ip6tables.h) || die
|
||||
insinto /usr/include/iptables
|
||||
doins include/iptables/internal.h || die
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables || die
|
||||
newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables || die
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables || die
|
||||
newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables || die
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
|
||||
find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
|
||||
}
|
||||
@@ -1,86 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
# Force users doing their own patches to install their own tools
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
|
||||
inherit eutils multilib toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.iptables.org/"
|
||||
SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
|
||||
IUSE="ipv6 netlink"
|
||||
|
||||
COMMON_DEPEND="
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
"
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
virtual/os-headers
|
||||
sys-devel/automake
|
||||
"
|
||||
RDEPEND="
|
||||
${COMMON_DEPEND}
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# Only run autotools if user patched something
|
||||
epatch "${FILESDIR}/${P}-man-fixes.patch"
|
||||
eautomake
|
||||
epatch_user && eautoreconf || elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
sed -i \
|
||||
-e "/nfnetlink=[01]/s:=[01]:=$(use netlink && echo 1 || echo 0):" \
|
||||
configure
|
||||
econf \
|
||||
--sbindir=/sbin \
|
||||
--libexecdir=/$(get_libdir) \
|
||||
--enable-devel \
|
||||
--enable-libipq \
|
||||
--enable-shared \
|
||||
--enable-static \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}"
|
||||
dodoc INCOMPATIBILITIES iptables/iptables.xslt
|
||||
|
||||
# all the iptables binaries are in /sbin, so might as well
|
||||
# put these small files in with them
|
||||
into /
|
||||
dosbin iptables/iptables-apply
|
||||
dosym iptables-apply /sbin/ip6tables-apply
|
||||
doman iptables/iptables-apply.8
|
||||
|
||||
insinto /usr/include
|
||||
doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
|
||||
insinto /usr/include/iptables
|
||||
doins include/iptables/internal.h
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.4.11.init iptables
|
||||
newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.4.11.init ip6tables
|
||||
newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
|
||||
find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
|
||||
}
|
||||
@@ -1,88 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
# Force users doing their own patches to install their own tools
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
|
||||
inherit eutils multilib toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.iptables.org/"
|
||||
SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="ipv6 netlink static-libs"
|
||||
|
||||
RDEPEND="
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/os-headers
|
||||
sys-devel/automake
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}/iptables-1.4.12.1-lm.patch" \
|
||||
"${FILESDIR}/iptables-1.4.12.1-conntrack-v2-ranges.patch"
|
||||
eautomake
|
||||
|
||||
# use the saner headers from the kernel
|
||||
rm -f include/linux/{kernel,types}.h
|
||||
|
||||
# Only run autotools if user patched something
|
||||
epatch_user && eautoreconf || elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
sed -i \
|
||||
-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
|
||||
configure || die
|
||||
econf \
|
||||
--sbindir=/sbin \
|
||||
--libexecdir=/$(get_libdir) \
|
||||
--enable-devel \
|
||||
--enable-libipq \
|
||||
--enable-shared \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dodoc INCOMPATIBILITIES iptables/iptables.xslt
|
||||
|
||||
# all the iptables binaries are in /sbin, so might as well
|
||||
# put these small files in with them
|
||||
into /
|
||||
dosbin iptables/iptables-apply
|
||||
dosym iptables-apply /sbin/ip6tables-apply
|
||||
doman iptables/iptables-apply.8
|
||||
|
||||
insinto /usr/include
|
||||
doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
|
||||
insinto /usr/include/iptables
|
||||
doins include/iptables/internal.h
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.4.11.init iptables
|
||||
newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.4.11.init ip6tables
|
||||
newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
|
||||
find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
|
||||
}
|
||||
@@ -1,87 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
# Force users doing their own patches to install their own tools
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
|
||||
inherit eutils multilib toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.iptables.org/"
|
||||
SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
|
||||
IUSE="ipv6 netlink"
|
||||
|
||||
COMMON_DEPEND="
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
"
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
virtual/os-headers
|
||||
sys-devel/automake
|
||||
"
|
||||
RDEPEND="
|
||||
${COMMON_DEPEND}
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/iptables-1.4.12.1-lm.patch"
|
||||
eautomake
|
||||
|
||||
# Only run autotools if user patched something
|
||||
epatch_user && eautoreconf || elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
sed -i \
|
||||
-e "/nfnetlink=[01]/s:=[01]:=$(use netlink && echo 1 || echo 0):" \
|
||||
configure || die
|
||||
econf \
|
||||
--sbindir=/sbin \
|
||||
--libexecdir=/$(get_libdir) \
|
||||
--enable-devel \
|
||||
--enable-libipq \
|
||||
--enable-shared \
|
||||
--enable-static \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}"
|
||||
dodoc INCOMPATIBILITIES iptables/iptables.xslt
|
||||
|
||||
# all the iptables binaries are in /sbin, so might as well
|
||||
# put these small files in with them
|
||||
into /
|
||||
dosbin iptables/iptables-apply
|
||||
dosym iptables-apply /sbin/ip6tables-apply
|
||||
doman iptables/iptables-apply.8
|
||||
|
||||
insinto /usr/include
|
||||
doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
|
||||
insinto /usr/include/iptables
|
||||
doins include/iptables/internal.h
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.4.11.init iptables
|
||||
newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.4.11.init ip6tables
|
||||
newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
|
||||
find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
|
||||
}
|
||||
@@ -1,84 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
# Force users doing their own patches to install their own tools
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
|
||||
inherit eutils multilib toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.iptables.org/"
|
||||
SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="ipv6 netlink"
|
||||
|
||||
COMMON_DEPEND="
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
"
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
virtual/os-headers
|
||||
sys-devel/automake
|
||||
"
|
||||
RDEPEND="
|
||||
${COMMON_DEPEND}
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# Only run autotools if user patched something
|
||||
epatch_user && eautoreconf || elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
sed -i \
|
||||
-e "/nfnetlink=[01]/s:=[01]:=$(use netlink && echo 1 || echo 0):" \
|
||||
configure || die
|
||||
econf \
|
||||
--sbindir=/sbin \
|
||||
--libexecdir=/$(get_libdir) \
|
||||
--enable-devel \
|
||||
--enable-libipq \
|
||||
--enable-shared \
|
||||
--enable-static \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}"
|
||||
dodoc INCOMPATIBILITIES iptables/iptables.xslt
|
||||
|
||||
# all the iptables binaries are in /sbin, so might as well
|
||||
# put these small files in with them
|
||||
into /
|
||||
dosbin iptables/iptables-apply
|
||||
dosym iptables-apply /sbin/ip6tables-apply
|
||||
doman iptables/iptables-apply.8
|
||||
|
||||
insinto /usr/include
|
||||
doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
|
||||
insinto /usr/include/iptables
|
||||
doins include/iptables/internal.h
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.4.11.init iptables
|
||||
newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.4.11.init ip6tables
|
||||
newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
|
||||
find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
|
||||
}
|
||||
@@ -1,83 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
# Force users doing their own patches to install their own tools
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
|
||||
inherit eutils multilib toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.iptables.org/"
|
||||
SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="ipv6 netlink static-libs"
|
||||
|
||||
RDEPEND="
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/os-headers
|
||||
!>=sys-kernel/linux-headers-3.5
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# use the saner headers from the kernel
|
||||
rm -f include/linux/{kernel,types}.h
|
||||
|
||||
# Only run autotools if user patched something
|
||||
epatch_user && eautoreconf || elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
sed -i \
|
||||
-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
|
||||
configure || die
|
||||
econf \
|
||||
--sbindir="${EPREFIX}/sbin" \
|
||||
--libexecdir="${EPREFIX}/$(get_libdir)" \
|
||||
--enable-devel \
|
||||
--enable-libipq \
|
||||
--enable-shared \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dodoc INCOMPATIBILITIES iptables/iptables.xslt
|
||||
|
||||
# all the iptables binaries are in /sbin, so might as well
|
||||
# put these small files in with them
|
||||
into /
|
||||
dosbin iptables/iptables-apply
|
||||
dosym iptables-apply /sbin/ip6tables-apply
|
||||
doman iptables/iptables-apply.8
|
||||
|
||||
insinto /usr/include
|
||||
doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
|
||||
insinto /usr/include/iptables
|
||||
doins include/iptables/internal.h
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
|
||||
newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
|
||||
newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
|
||||
find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
|
||||
}
|
||||
@@ -1,83 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
# Force users doing their own patches to install their own tools
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
|
||||
inherit eutils multilib toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.iptables.org/"
|
||||
SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
|
||||
IUSE="ipv6 netlink static-libs"
|
||||
|
||||
RDEPEND="
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/os-headers
|
||||
!>=sys-kernel/linux-headers-3.5
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# use the saner headers from the kernel
|
||||
rm -f include/linux/{kernel,types}.h
|
||||
|
||||
# Only run autotools if user patched something
|
||||
epatch_user && eautoreconf || elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
sed -i \
|
||||
-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
|
||||
configure || die
|
||||
econf \
|
||||
--sbindir="${EPREFIX}/sbin" \
|
||||
--libexecdir="${EPREFIX}/$(get_libdir)" \
|
||||
--enable-devel \
|
||||
--enable-libipq \
|
||||
--enable-shared \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dodoc INCOMPATIBILITIES iptables/iptables.xslt
|
||||
|
||||
# all the iptables binaries are in /sbin, so might as well
|
||||
# put these small files in with them
|
||||
into /
|
||||
dosbin iptables/iptables-apply
|
||||
dosym iptables-apply /sbin/ip6tables-apply
|
||||
doman iptables/iptables-apply.8
|
||||
|
||||
insinto /usr/include
|
||||
doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
|
||||
insinto /usr/include/iptables
|
||||
doins include/iptables/internal.h
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.4.11.init iptables
|
||||
newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.4.11.init ip6tables
|
||||
newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
|
||||
find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
|
||||
}
|
||||
@@ -1,82 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
# Force users doing their own patches to install their own tools
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
|
||||
inherit eutils multilib toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.iptables.org/"
|
||||
SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="ipv6 netlink static-libs"
|
||||
|
||||
RDEPEND="
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/os-headers
|
||||
!>=sys-kernel/linux-headers-3.5
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# use the saner headers from the kernel
|
||||
rm -f include/linux/{kernel,types}.h
|
||||
|
||||
# Only run autotools if user patched something
|
||||
epatch_user && eautoreconf || elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
sed -i \
|
||||
-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
|
||||
configure || die
|
||||
econf \
|
||||
--sbindir="${EPREFIX}/sbin" \
|
||||
--libexecdir="${EPREFIX}/$(get_libdir)" \
|
||||
--enable-devel \
|
||||
--enable-shared \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dodoc INCOMPATIBILITIES iptables/iptables.xslt
|
||||
|
||||
# all the iptables binaries are in /sbin, so might as well
|
||||
# put these small files in with them
|
||||
into /
|
||||
dosbin iptables/iptables-apply
|
||||
dosym iptables-apply /sbin/ip6tables-apply
|
||||
doman iptables/iptables-apply.8
|
||||
|
||||
insinto /usr/include
|
||||
doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
|
||||
insinto /usr/include/iptables
|
||||
doins include/iptables/internal.h
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
|
||||
newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
|
||||
newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
gen_usr_ldscript -a ip{4,6}tc iptc xtables
|
||||
find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
|
||||
}
|
||||
@@ -1,82 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
# Force users doing their own patches to install their own tools
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
|
||||
inherit eutils multilib toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.iptables.org/"
|
||||
SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="ipv6 netlink static-libs"
|
||||
|
||||
RDEPEND="
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/os-headers
|
||||
!>=sys-kernel/linux-headers-3.5
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# use the saner headers from the kernel
|
||||
rm -f include/linux/{kernel,types}.h
|
||||
|
||||
# Only run autotools if user patched something
|
||||
epatch_user && eautoreconf || elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
sed -i \
|
||||
-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
|
||||
configure || die
|
||||
econf \
|
||||
--sbindir="${EPREFIX}/sbin" \
|
||||
--libexecdir="${EPREFIX}/$(get_libdir)" \
|
||||
--enable-devel \
|
||||
--enable-shared \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dodoc INCOMPATIBILITIES iptables/iptables.xslt
|
||||
|
||||
# all the iptables binaries are in /sbin, so might as well
|
||||
# put these small files in with them
|
||||
into /
|
||||
dosbin iptables/iptables-apply
|
||||
dosym iptables-apply /sbin/ip6tables-apply
|
||||
doman iptables/iptables-apply.8
|
||||
|
||||
insinto /usr/include
|
||||
doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
|
||||
insinto /usr/include/iptables
|
||||
doins include/iptables/internal.h
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
|
||||
newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
|
||||
newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
gen_usr_ldscript -a ip{4,6}tc iptc xtables
|
||||
find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
|
||||
}
|
||||
@@ -1,85 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
# Force users doing their own patches to install their own tools
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
|
||||
inherit eutils multilib toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.iptables.org/"
|
||||
SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="ipv6 netlink static-libs"
|
||||
|
||||
RDEPEND="
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/os-headers
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# use the saner headers from the kernel
|
||||
rm -f include/linux/{kernel,types}.h
|
||||
|
||||
epatch "${FILESDIR}"/${P}-static.patch #437712
|
||||
|
||||
# Only run autotools if user patched something
|
||||
epatch_user && eautoreconf || elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
sed -i \
|
||||
-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
|
||||
configure || die
|
||||
|
||||
econf \
|
||||
--sbindir="${EPREFIX}/sbin" \
|
||||
--libexecdir="${EPREFIX}/$(get_libdir)" \
|
||||
--enable-devel \
|
||||
--enable-shared \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dodoc INCOMPATIBILITIES iptables/iptables.xslt
|
||||
|
||||
# all the iptables binaries are in /sbin, so might as well
|
||||
# put these small files in with them
|
||||
into /
|
||||
dosbin iptables/iptables-apply
|
||||
dosym iptables-apply /sbin/ip6tables-apply
|
||||
doman iptables/iptables-apply.8
|
||||
|
||||
insinto /usr/include
|
||||
doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
|
||||
insinto /usr/include/iptables
|
||||
doins include/iptables/internal.h
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
|
||||
newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
|
||||
newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
gen_usr_ldscript -a ip{4,6}tc iptc xtables
|
||||
find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
|
||||
}
|
||||
@@ -1,83 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
# Force users doing their own patches to install their own tools
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
|
||||
inherit eutils multilib toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.iptables.org/"
|
||||
SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
|
||||
IUSE="ipv6 netlink static-libs"
|
||||
|
||||
RDEPEND="
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/os-headers
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# use the saner headers from the kernel
|
||||
rm -f include/linux/{kernel,types}.h
|
||||
|
||||
# Only run autotools if user patched something
|
||||
epatch_user && eautoreconf || elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
sed -i \
|
||||
-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
|
||||
configure || die
|
||||
|
||||
econf \
|
||||
--sbindir="${EPREFIX}/sbin" \
|
||||
--libexecdir="${EPREFIX}/$(get_libdir)" \
|
||||
--enable-devel \
|
||||
--enable-shared \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dodoc INCOMPATIBILITIES iptables/iptables.xslt
|
||||
|
||||
# all the iptables binaries are in /sbin, so might as well
|
||||
# put these small files in with them
|
||||
into /
|
||||
dosbin iptables/iptables-apply
|
||||
dosym iptables-apply /sbin/ip6tables-apply
|
||||
doman iptables/iptables-apply.8
|
||||
|
||||
insinto /usr/include
|
||||
doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
|
||||
insinto /usr/include/iptables
|
||||
doins include/iptables/internal.h
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
|
||||
newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
|
||||
newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
gen_usr_ldscript -a ip{4,6}tc iptc xtables
|
||||
find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
|
||||
}
|
||||
@@ -1,87 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
# Force users doing their own patches to install their own tools
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
|
||||
inherit eutils multilib toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.iptables.org/"
|
||||
SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="ipv6 netlink static-libs"
|
||||
|
||||
RDEPEND="
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/os-headers
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# use the saner headers from the kernel
|
||||
rm -f include/linux/{kernel,types}.h
|
||||
epatch "${FILESDIR}"/${P}-libip6tc.patch #449262
|
||||
|
||||
# Only run autotools if user patched something
|
||||
epatch_user && eautoreconf || elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Some libs use $(AR) rather than libtool to build #444282
|
||||
tc-export AR
|
||||
|
||||
sed -i \
|
||||
-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
|
||||
configure || die
|
||||
|
||||
econf \
|
||||
--sbindir="${EPREFIX}/sbin" \
|
||||
--libexecdir="${EPREFIX}/$(get_libdir)" \
|
||||
--enable-devel \
|
||||
--enable-shared \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dodoc INCOMPATIBILITIES iptables/iptables.xslt
|
||||
|
||||
# all the iptables binaries are in /sbin, so might as well
|
||||
# put these small files in with them
|
||||
into /
|
||||
dosbin iptables/iptables-apply
|
||||
dosym iptables-apply /sbin/ip6tables-apply
|
||||
doman iptables/iptables-apply.8
|
||||
|
||||
insinto /usr/include
|
||||
doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
|
||||
insinto /usr/include/iptables
|
||||
doins include/iptables/internal.h
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
|
||||
newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
|
||||
newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
gen_usr_ldscript -a ip{4,6}tc iptc xtables
|
||||
find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
|
||||
}
|
||||
@@ -1,88 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
# Force users doing their own patches to install their own tools
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
|
||||
inherit eutils multilib toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.netfilter.org/projects/iptables/"
|
||||
SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="ipv6 netlink static-libs"
|
||||
|
||||
RDEPEND="
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/os-headers
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# use the saner headers from the kernel
|
||||
rm -f include/linux/{kernel,types}.h
|
||||
epatch "${FILESDIR}"/${P}-extensions-link.patch
|
||||
epatch "${FILESDIR}"/${P}-ipv6-linkage.patch
|
||||
|
||||
# Only run autotools if user patched something
|
||||
epatch_user && eautoreconf || elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Some libs use $(AR) rather than libtool to build #444282
|
||||
tc-export AR
|
||||
|
||||
sed -i \
|
||||
-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
|
||||
configure || die
|
||||
|
||||
econf \
|
||||
--sbindir="${EPREFIX}/sbin" \
|
||||
--libexecdir="${EPREFIX}/$(get_libdir)" \
|
||||
--enable-devel \
|
||||
--enable-shared \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dodoc INCOMPATIBILITIES iptables/iptables.xslt
|
||||
|
||||
# all the iptables binaries are in /sbin, so might as well
|
||||
# put these small files in with them
|
||||
into /
|
||||
dosbin iptables/iptables-apply
|
||||
dosym iptables-apply /sbin/ip6tables-apply
|
||||
doman iptables/iptables-apply.8
|
||||
|
||||
insinto /usr/include
|
||||
doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
|
||||
insinto /usr/include/iptables
|
||||
doins include/iptables/internal.h
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
|
||||
newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
|
||||
newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
gen_usr_ldscript -a ip{4,6}tc iptc xtables
|
||||
find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
|
||||
}
|
||||
@@ -1,87 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
# Force users doing their own patches to install their own tools
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
|
||||
inherit eutils multilib toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.netfilter.org/projects/iptables/"
|
||||
SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="ipv6 netlink static-libs"
|
||||
|
||||
RDEPEND="
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/os-headers
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# use the saner headers from the kernel
|
||||
rm -f include/linux/{kernel,types}.h
|
||||
|
||||
# Only run autotools if user patched something
|
||||
epatch_user && eautoreconf || elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Some libs use $(AR) rather than libtool to build #444282
|
||||
tc-export AR
|
||||
|
||||
sed -i \
|
||||
-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
|
||||
configure || die
|
||||
|
||||
econf \
|
||||
--sbindir="${EPREFIX}/sbin" \
|
||||
--libexecdir="${EPREFIX}/$(get_libdir)" \
|
||||
--enable-devel \
|
||||
--enable-shared \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dodoc INCOMPATIBILITIES iptables/iptables.xslt
|
||||
|
||||
# all the iptables binaries are in /sbin, so might as well
|
||||
# put these small files in with them
|
||||
into /
|
||||
dosbin iptables/iptables-apply
|
||||
dosym iptables-apply /sbin/ip6tables-apply
|
||||
doman iptables/iptables-apply.8
|
||||
|
||||
insinto /usr/include
|
||||
doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
|
||||
insinto /usr/include/iptables
|
||||
doins include/iptables/internal.h
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
|
||||
newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
|
||||
newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
gen_usr_ldscript -a ip{4,6}tc iptc xtables
|
||||
|
||||
prune_libtool_files
|
||||
}
|
||||
@@ -1,87 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="4"
|
||||
|
||||
# Force users doing their own patches to install their own tools
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
|
||||
inherit eutils multilib toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.netfilter.org/projects/iptables/"
|
||||
SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
|
||||
IUSE="ipv6 netlink static-libs"
|
||||
|
||||
RDEPEND="
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/os-headers
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# use the saner headers from the kernel
|
||||
rm -f include/linux/{kernel,types}.h
|
||||
|
||||
# Only run autotools if user patched something
|
||||
epatch_user && eautoreconf || elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Some libs use $(AR) rather than libtool to build #444282
|
||||
tc-export AR
|
||||
|
||||
sed -i \
|
||||
-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
|
||||
configure || die
|
||||
|
||||
econf \
|
||||
--sbindir="${EPREFIX}/sbin" \
|
||||
--libexecdir="${EPREFIX}/$(get_libdir)" \
|
||||
--enable-devel \
|
||||
--enable-shared \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dodoc INCOMPATIBILITIES iptables/iptables.xslt
|
||||
|
||||
# all the iptables binaries are in /sbin, so might as well
|
||||
# put these small files in with them
|
||||
into /
|
||||
dosbin iptables/iptables-apply
|
||||
dosym iptables-apply /sbin/ip6tables-apply
|
||||
doman iptables/iptables-apply.8
|
||||
|
||||
insinto /usr/include
|
||||
doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
|
||||
insinto /usr/include/iptables
|
||||
doins include/iptables/internal.h
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
|
||||
newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
|
||||
newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
gen_usr_ldscript -a ip{4,6}tc iptc xtables
|
||||
|
||||
prune_libtool_files
|
||||
}
|
||||
@@ -15,10 +15,11 @@ SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
|
||||
IUSE="ipv6 netlink static-libs"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
|
||||
IUSE="conntrack ipv6 netlink static-libs"
|
||||
|
||||
RDEPEND="
|
||||
conntrack? ( net-libs/libnetfilter_conntrack )
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
@@ -40,6 +41,7 @@ src_configure() {
|
||||
|
||||
sed -i \
|
||||
-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
|
||||
-e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \
|
||||
configure || die
|
||||
|
||||
econf \
|
||||
@@ -85,7 +87,7 @@ src_install() {
|
||||
systemd_dounit "${FILESDIR}"/systemd/ip6tables{,-{re,}store}.service
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
# Move important libs to /lib #332175
|
||||
gen_usr_ldscript -a ip{4,6}tc iptc xtables
|
||||
|
||||
prune_libtool_files
|
||||
|
||||
+17
-6
@@ -7,19 +7,23 @@ EAPI="5"
|
||||
# Force users doing their own patches to install their own tools
|
||||
AUTOTOOLS_AUTO_DEPEND=no
|
||||
|
||||
inherit eutils multilib toolchain-funcs autotools
|
||||
inherit eutils multilib systemd toolchain-funcs autotools
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.netfilter.org/projects/iptables/"
|
||||
SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
# Subslot tracks libxtables as that's the one other packages generally link
|
||||
# against and iptables changes. Will have to revisit if other sonames change.
|
||||
SLOT="0/10"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="ipv6 netlink static-libs"
|
||||
IUSE="conntrack ipv6 netlink pcap static-libs"
|
||||
|
||||
RDEPEND="
|
||||
conntrack? ( net-libs/libnetfilter_conntrack )
|
||||
netlink? ( net-libs/libnfnetlink )
|
||||
pcap? ( net-libs/libpcap )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/os-headers
|
||||
@@ -40,6 +44,7 @@ src_configure() {
|
||||
|
||||
sed -i \
|
||||
-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
|
||||
-e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \
|
||||
configure || die
|
||||
|
||||
econf \
|
||||
@@ -47,6 +52,7 @@ src_configure() {
|
||||
--libexecdir="${EPREFIX}/$(get_libdir)" \
|
||||
--enable-devel \
|
||||
--enable-shared \
|
||||
$(use_enable pcap bpf-compiler) \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable ipv6)
|
||||
}
|
||||
@@ -72,15 +78,20 @@ src_install() {
|
||||
doins include/iptables/internal.h
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
|
||||
newinitd "${FILESDIR}"/${PN}.init iptables
|
||||
newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
|
||||
newinitd "${FILESDIR}"/iptables.init ip6tables
|
||||
newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
|
||||
fi
|
||||
|
||||
# Move important libs to /lib
|
||||
systemd_dounit "${FILESDIR}"/systemd/iptables{,-{re,}store}.service
|
||||
if use ipv6 ; then
|
||||
systemd_dounit "${FILESDIR}"/systemd/ip6tables{,-{re,}store}.service
|
||||
fi
|
||||
|
||||
# Move important libs to /lib #332175
|
||||
gen_usr_ldscript -a ip{4,6}tc iptc xtables
|
||||
|
||||
prune_libtool_files
|
||||
@@ -1,54 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
inherit eutils multilib toolchain-funcs
|
||||
|
||||
DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
|
||||
HOMEPAGE="http://www.iptables.org/"
|
||||
SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
|
||||
IUSE="ipv6"
|
||||
|
||||
DEPEND="virtual/os-headers
|
||||
!>=sys-kernel/linux-headers-2.6.33"
|
||||
RDEPEND=""
|
||||
|
||||
src_unpack() {
|
||||
unpack ${P}.tar.bz2
|
||||
cd "${S}"
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
econf \
|
||||
--sbindir=/sbin \
|
||||
--libexecdir=/$(get_libdir) \
|
||||
--enable-devel \
|
||||
--enable-libipq \
|
||||
--enable-shared \
|
||||
--enable-static \
|
||||
$(use_enable ipv6)
|
||||
emake V=1 || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}" || die
|
||||
|
||||
insinto /usr/include
|
||||
doins include/iptables.h $(use ipv6 && echo include/ip6tables.h) || die
|
||||
insinto /usr/include/iptables
|
||||
doins include/iptables/internal.h || die
|
||||
|
||||
keepdir /var/lib/iptables
|
||||
newinitd "${FILESDIR}"/${PN}-1.3.2.init iptables || die
|
||||
newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables || die
|
||||
if use ipv6 ; then
|
||||
keepdir /var/lib/ip6tables
|
||||
newinitd "${FILESDIR}"/iptables-1.3.2.init ip6tables || die
|
||||
newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables || die
|
||||
fi
|
||||
}
|
||||
@@ -3,7 +3,9 @@
|
||||
<pkgmetadata>
|
||||
<herd>base-system</herd>
|
||||
<use>
|
||||
<flag name='netlink'>Build against libnfnetlink which enables the nfnl_osf util</flag>
|
||||
<flag name='conntrack'>Build against <pkg>net-libs/libnetfilter_conntrack</pkg> when enables the connlabel matcher</flag>
|
||||
<flag name='netlink'>Build against libnfnetlink which enables the nfnl_osf util</flag>
|
||||
<flag name='pcap'>Build against <pkg>net-libs/libpcap</pkg> which enables the nfbpf_compile util</flag>
|
||||
</use>
|
||||
<longdescription>
|
||||
iptables is the userspace command line program used to set up, maintain, and
|
||||
|
||||
@@ -226,6 +226,9 @@ dev-libs/efl pixman
|
||||
|
||||
# Jeroen Roovers <jer@gentoo.org> (20 Jun 2014)
|
||||
# net-libs/adns is going away (bug #513982)
|
||||
app-admin/apachetop adns
|
||||
dev-libs/liboop adns
|
||||
net-analyzer/nepenthes adns
|
||||
net-analyzer/wireshark libadns
|
||||
|
||||
# Zac Medico <zmedico@gentoo.org> (06 Jun 2014)
|
||||
|
||||
@@ -30,6 +30,16 @@
|
||||
|
||||
#--- END OF EXAMPLES ---
|
||||
|
||||
# Michał Górny <mgorny@gentoo.org> (14 Aug 2015)
|
||||
# net-libs/adns never had any Gentoo maintainer. Mostly dead upstream
|
||||
# since 2006 (short activity in 2014). Does not respect nsswitch.conf or
|
||||
# /etc/hosts. The current version does not support IPv6. net-dns/c-ares
|
||||
# is a suggested replacement. Removal in 30 days.
|
||||
# net-libs/adns: bug #513238
|
||||
# dev-python/adns-python: bug #513994
|
||||
dev-python/adns-python
|
||||
net-libs/adns
|
||||
|
||||
# Patrice Clement <monsieurp@gentoo.org> (14 Aug 2015)
|
||||
# Unreachable HOMEPAGE (dead). Very very very old package:
|
||||
# last release came out in 2001.
|
||||
|
||||
Reference in New Issue
Block a user