From ce1bca1b79486534122583c4ecf16e81051e82bc Mon Sep 17 00:00:00 2001 From: Georgy Kovtunov Date: Sat, 4 Feb 2012 12:12:03 +0400 Subject: [PATCH] vuurmuur and appropriate library --- net-firewall/vuurmuur/Manifest | 4 + net-firewall/vuurmuur/files/vuurmuur.conf | 11 ++ net-firewall/vuurmuur/files/vuurmuur.init | 57 ++++++++++ .../vuurmuur/vuurmuur-0.8_beta2.ebuild | 101 ++++++++++++++++++ net-libs/libvuurmuur/Manifest | 3 + .../files/libvuurmuur-plugin-0.7.patch | 50 +++++++++ .../libvuurmuur/libvuurmuur-0.8_beta2.ebuild | 48 +++++++++ 7 files changed, 274 insertions(+) create mode 100644 net-firewall/vuurmuur/Manifest create mode 100644 net-firewall/vuurmuur/files/vuurmuur.conf create mode 100644 net-firewall/vuurmuur/files/vuurmuur.init create mode 100644 net-firewall/vuurmuur/vuurmuur-0.8_beta2.ebuild create mode 100644 net-libs/libvuurmuur/Manifest create mode 100644 net-libs/libvuurmuur/files/libvuurmuur-plugin-0.7.patch create mode 100644 net-libs/libvuurmuur/libvuurmuur-0.8_beta2.ebuild diff --git a/net-firewall/vuurmuur/Manifest b/net-firewall/vuurmuur/Manifest new file mode 100644 index 0000000..80b4d81 --- /dev/null +++ b/net-firewall/vuurmuur/Manifest @@ -0,0 +1,4 @@ +AUX vuurmuur.conf 312 RMD160 d28da3c2abe1c6ec3fc5060576670e871965899c SHA1 b2e66191901fbae74dade2842a01cb6765fd5732 SHA256 9aeb5a2e3a7ebce5d240a2c1986cc700ce4a21d4cb50fac7f3851e965ab7862d +AUX vuurmuur.init 1257 RMD160 66087fa191a5a344d6671ff4aec2fb2f0315fc2d SHA1 7883be040d44ab925425c5eb2994dc85dbf5c7d4 SHA256 3179f7092f180a5287a6d0ed4519313df762f25a4de50acc376c5905729e0cae +DIST Vuurmuur-0.8beta2.tar.gz 1877270 RMD160 d1f202adb5ab076ea7763c215faec2558100d5b6 SHA1 549cc3b7d8c86cac0cbccbb963a3b3d041e8ea70 SHA256 4c74de94698a0a4bca758322b5e4198afc27fb25401309a7ecff445742f28d0e +EBUILD vuurmuur-0.8_beta2.ebuild 2657 RMD160 80b00fef3e213eafe0a608b4ec98f15eef2c7b53 SHA1 6c49cf1bac909d40e7cc9e2414bcde48d617ce27 SHA256 300afcc8db1c1e12ea9fa9e8ea408e52388636b94b19a6fe5e86e6e9c90a1298 diff --git a/net-firewall/vuurmuur/files/vuurmuur.conf b/net-firewall/vuurmuur/files/vuurmuur.conf new file mode 100644 index 0000000..924f3de --- /dev/null +++ b/net-firewall/vuurmuur/files/vuurmuur.conf @@ -0,0 +1,11 @@ +# Space separated list of kernel modules to load on start or 'none'. +MODULES="none" + +# Configuration file to read. +CONFIG=/etc/vuurmuur/config.conf + +# Options to be passed to the Vuurmuur daemon. +OPTIONS="-l" + +# Comment the following line if you want more output when starting/stopping the daemons. +QUIET="true" diff --git a/net-firewall/vuurmuur/files/vuurmuur.init b/net-firewall/vuurmuur/files/vuurmuur.init new file mode 100644 index 0000000..a2e30a9 --- /dev/null +++ b/net-firewall/vuurmuur/files/vuurmuur.init @@ -0,0 +1,57 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +opts="${opts}" + +# this next comment is important, don't remove it - it has to be somewhere in +# the init script to kill off a warning that doesn't apply to us +# svc_start svc_stop + +depend() { + need net iptables + use modules +} + +load_modules() { + if [ "${MODULES}" != "none" ]; then + ebegin "Loading modules for Vuurmuur" + local module + echo -n " " + for module in `echo ${MODULES}`; do + modprobe ${module} + echo -n "${module} " + done + echo + eend $? + fi +} + +start() { + if load_modules ; then + ebegin "Starting Vuurmuur" + if test ! -f ${CONFIG}; then + eerror "Configuration file, ${CONFIG} does not exist." + eend 2 + return 2 + fi + start-stop-daemon --start ${QUIET+--quiet} --exec /usr/bin/vuurmuur -- ${OPTIONS} + eend $? + ebegin "Starting Vuurmuur Log" + start-stop-daemon --start ${QUIET+--quiet} --exec /usr/bin/vuurmuur_log + eend $? + else + eend 1 + return 1 + fi +} + +stop() { + ebegin "Stopping Vuurmuur" + start-stop-daemon --stop ${QUIET+--quiet} --pidfile /var/run/vuurmuur.pid + eend $? + ebegin "Stopping Vuurmuur Log" + start-stop-daemon --stop ${QUIET+--quiet} --exec /usr/bin/vuurmuur_log + eend $? +} + diff --git a/net-firewall/vuurmuur/vuurmuur-0.8_beta2.ebuild b/net-firewall/vuurmuur/vuurmuur-0.8_beta2.ebuild new file mode 100644 index 0000000..1fb08c6 --- /dev/null +++ b/net-firewall/vuurmuur/vuurmuur-0.8_beta2.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit multilib + +MY_PV=${PV/_beta/beta} +MY_P="Vuurmuur-${MY_PV}" + +DESCRIPTION="Frontend for iptables featuring easy to use command line utils, rule- and logdaemons" +HOMEPAGE="http://www.vuurmuur.org" +SRC_URI="ftp://ftp.vuurmuur.org/releases/${MY_PV}/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="logrotate" + +DEPEND="=net-libs/libvuurmuur-${PV} + >=sys-libs/ncurses-5" +RDEPEND="${DEPEND} + logrotate? ( app-admin/logrotate )" + +S="${WORKDIR}/${MY_P}/${PN}-${MY_PV}" + +src_unpack() { + default + cd ${MY_P} + for component in vuurmuur vuurmuur_conf; do + unpack "./${component}-${MY_PV}.tar.gz" # upstream supplies tarball inside tarball + done +} + +src_configure() { + econf \ + --with-libvuurmuur-includes=/usr/include \ + --with-libvuurmuur-libraries=/usr/$(get_libdir) + cd "../vuurmuur_conf-${MY_PV}" + econf \ + --with-libvuurmuur-includes=/usr/include \ + --with-libvuurmuur-libraries=/usr/$(get_libdir) \ + --with-localedir=/usr/share/locale \ + --with-widec=yes +} + +src_compile() { + +# einfo "Running autoreconf" +# autoreconf -f -i || die "autoreconf failed" +##from old ebuild + + #einfo "pwd: ${PWD}" +## cd ${WORKDIR}/${MY_PKG_NAME}-${PV/_/}/${PN/-/_}-${PV/_/} || die + libtoolize -f + aclocal + autoheader + automake + autoconf + econf --with-libvuurmuur-includes=/usr/include \ + --with-libvuurmuur-libraries=/usr/lib --with-localedir=/usr/share/locale \ + --with-widec=yes \ + || die "The configure script failed" + + +# default + emake -C "../vuurmuur_conf-${MY_PV}" || die "compiling vuurmuur_conf failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "installing vuurmuur failed" + + newinitd "${FILESDIR}"/vuurmuur.init vuurmuur || die "installing init failed" + newconfd "${FILESDIR}"/vuurmuur.conf vuurmuur || die "installing conf failed" + + if use logrotate; then + insinto /etc/logrotate.d + newins scripts/vuurmuur-logrotate vuurmuur || die "installing logrotate config failed" + fi + + insopts -m0600 + insinto /etc/vuurmuur + newins config/config.conf.sample config.conf || die "installing config.conf failed" + + cd "../vuurmuur_conf-${MY_PV}" + + emake DESTDIR="${D}" install || die "installing vuurmuur_conf failed" +} + +pkg_postinst() { + elog "Please read the manual on www.vuurmuur.org now - you have" + elog "been warned!" + elog + elog "If this is a new install, make sure you define some rules" + elog "BEFORE you start the daemon in order not to lock yourself" + elog "out. The necessary steps are:" + elog "1) vuurmuur_conf" + elog "2) /etc/init.d/vuurmuur start" + elog "3) rc-update add vuurmuur default" +} diff --git a/net-libs/libvuurmuur/Manifest b/net-libs/libvuurmuur/Manifest new file mode 100644 index 0000000..d9b28e5 --- /dev/null +++ b/net-libs/libvuurmuur/Manifest @@ -0,0 +1,3 @@ +AUX libvuurmuur-plugin-0.7.patch 2157 RMD160 cfd57c5ba0585cb8b4b4400df50766cbf5cdb697 SHA1 4121b1dd535c354f6b9844460d22fdcf0c5c9b11 SHA256 648e9ad862cb4751e05a9311f3f19033d549f72ad7287b39cbc5a514b4f6dde0 +DIST Vuurmuur-0.8beta2.tar.gz 1877270 RMD160 d1f202adb5ab076ea7763c215faec2558100d5b6 SHA1 549cc3b7d8c86cac0cbccbb963a3b3d041e8ea70 SHA256 4c74de94698a0a4bca758322b5e4198afc27fb25401309a7ecff445742f28d0e +EBUILD libvuurmuur-0.8_beta2.ebuild 1084 RMD160 c69f121bfcd7dd8ee2cb8453847e6db7fb87b0df SHA1 6bb88fd65d373add42f0b8cc54f7170c8a7dba7a SHA256 61ff6818cf4d370d8a05d5d4bdc5c7c5e8dc0a9862a28ada08dc9bb7980ee715 diff --git a/net-libs/libvuurmuur/files/libvuurmuur-plugin-0.7.patch b/net-libs/libvuurmuur/files/libvuurmuur-plugin-0.7.patch new file mode 100644 index 0000000..837b1ec --- /dev/null +++ b/net-libs/libvuurmuur/files/libvuurmuur-plugin-0.7.patch @@ -0,0 +1,50 @@ +--- libvuurmuur-0.7/src/backendapi.c 2009-03-22 14:22:18.000000000 +0100 ++++ libvuurmuur-0.7/src/backendapi.c.modified 2009-11-02 17:07:15.000000000 +0100 +@@ -134,7 +134,7 @@ + return(-1); + } + +- if(snprintf(plugin_location, sizeof(plugin_location), "%s/plugins/lib%s.so", conf.plugdir, plugin_name) >= (int)sizeof(plugin_location)) ++ if(snprintf(plugin_location, sizeof(plugin_location), "%s/lib%s.so", conf.plugdir, plugin_name) >= (int)sizeof(plugin_location)) + { + (void)vrprint.error(-1, "Internal Error", "pluginpath " + "overflow (in: %s:%d).", __FUNC__, __LINE__); +diff -urN libvuurmuur-0.7/configure.in libvuurmuur-0.7.modified/configure.in +--- libvuurmuur-0.7/configure.in 2007-05-08 19:48:12.000000000 +0200 ++++ libvuurmuur-0.7.modified/configure.in 2009-09-04 08:37:41.000000000 +0200 +@@ -17,10 +19,12 @@ + [plugindir="$withval"],[plugindir=no]) + + if test "$plugindir" != "no"; then +- CPPFLAGS="${CPPFLAGS} -DPLUGINDIR=\"${plugindir}\"" ++ VUURMUUR_PLUGIN_DIR="${plugindir}" + else +- CPPFLAGS="${CPPFLAGS} -DPLUGINDIR=\"${libdir}/vuurmuur\"" ++ VUURMUUR_PLUGIN_DIR="${libdir}/vuurmuur" + fi ++CPPFLAGS="${CPPFLAGS} -DPLUGINDIR=\"$VUURMUUR_PLUGIN_DIR\"" ++AC_SUBST(VUURMUUR_PLUGIN_DIR) + + # shared dir option for rpm building + AC_ARG_WITH(shareddir, +diff -urN libvuurmuur-0.7/Makefile.am libvuurmuur-0.7.modified/Makefile.am +--- libvuurmuur-0.7/Makefile.am 2007-05-08 19:48:12.000000000 +0200 ++++ libvuurmuur-0.7.modified/Makefile.am 2009-09-03 13:04:03.000000000 +0200 +@@ -2,4 +2,6 @@ + # have all needed files, that a GNU package needs + AUTOMAKE_OPTIONS = foreign 1.4 + ++ACLOCAL_AMFLAGS = -I m4 ++ + SUBDIRS = src plugins doc +diff -urN libvuurmuur-0.7/plugins/textdir/Makefile.am libvuurmuur-0.7.modified/plugins/textdir/Makefile.am +--- libvuurmuur-0.7/plugins/textdir/Makefile.am 2009-03-22 14:53:21.000000000 +0100 ++++ libvuurmuur-0.7.modified/plugins/textdir/Makefile.am 2009-09-04 08:38:05.000000000 +0200 +@@ -1,6 +1,6 @@ + # textdir plugin + +-libdir = "${exec_prefix}/lib/vuurmuur/plugins" ++libdir = @VUURMUUR_PLUGIN_DIR@ + + lib_LTLIBRARIES = libtextdir.la + diff --git a/net-libs/libvuurmuur/libvuurmuur-0.8_beta2.ebuild b/net-libs/libvuurmuur/libvuurmuur-0.8_beta2.ebuild new file mode 100644 index 0000000..f1f3617 --- /dev/null +++ b/net-libs/libvuurmuur/libvuurmuur-0.8_beta2.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit autotools multilib + +MY_PV=${PV/_beta/beta} +MY_P="Vuurmuur-${MY_PV}" + +DESCRIPTION="Libraries and plugins required by Vuurmuur" +HOMEPAGE="http://www.vuurmuur.org" +SRC_URI="ftp://ftp.vuurmuur.org/releases/${MY_PV}/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="net-firewall/iptables" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}/${PN}-${MY_PV}" + +src_unpack() { + default + cd "${MY_P}" + unpack "./libvuurmuur-${MY_PV}.tar.gz" +} + +src_prepare() { + epatch "${FILESDIR}"/libvuurmuur-plugin-0.7.patch # no longer needed for >0.8_beta2 + eautoreconf +} + +src_configure() { + econf --with-plugindir=/usr/$(get_libdir) +} + +src_install() { + emake DESTDIR="${D}" install || die "installing libvuurmuur failed" + + # files needed but not yet installed by make + dodir /etc/vuurmuur/textdir || die "installing textdir failed" + insinto /etc/vuurmuur/plugins + doins plugins/textdir/textdir.conf || die "installing textdir.conf failed" +}