Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=eb81d9deda14da5f2d3d33feaf8235c334ab220a
commit eb81d9deda14da5f2d3d33feaf8235c334ab220a Author: Miklos Vajna <[email protected]> Date: Tue Jun 12 10:45:34 2012 +0200 iptables-1.4.14-1-x86_64 - version bump - drop sysv support diff --git a/source/network/iptables/FrugalBuild b/source/network/iptables/FrugalBuild index b0f0e88..b45499f 100644 --- a/source/network/iptables/FrugalBuild +++ b/source/network/iptables/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: Zsolt Szalai <[email protected]> pkgname=iptables -pkgver=1.4.13 +pkgver=1.4.14 pkgrel=1 pkgdesc="IP packet filter administration" url="http://www.iptables.org/"; @@ -13,8 +13,8 @@ archs=('i686' 'x86_64' 'arm') backup=(etc/sysconfig/{firewall,iptables}) up2date="lynx -dump http://www.iptables.org/projects/iptables/downloads.html|grep bz2$|sed 's/.*-\(.*\)\.t.*/\1/;q'" source=(ftp://ftp.netfilter.org/pub/iptables/iptables-$pkgver.tar.bz2 \ - rc.firewall rc.firewall-hu.po iptables firewall firewall.libexec firewall.service) -signatures=($source.sig '' '' '' '' '' '') + iptables firewall firewall.libexec firewall.service) +signatures=($source.sig '' '' '' '') # As you can see, the /etc/sysconfig/firewall file was generated by # iptables-save. I used the following commands before using iptables-save: @@ -29,7 +29,6 @@ build() Fbuild --with-kernel=/usr --enable-devel --enable-libipq Ffile /etc/sysconfig/iptables Finstall 600 /etc/sysconfig/firewall - Frcd2 firewall Fexe firewall.libexec /usr/libexec/firewall Ffile /lib/systemd/system/firewall.service } diff --git a/source/network/iptables/iptables.install b/source/network/iptables/iptables.install index 9687e55..516f4a8 100644 --- a/source/network/iptables/iptables.install +++ b/source/network/iptables/iptables.install @@ -1,7 +1,6 @@ # arg 1: the new package version post_install() { - chkconfig --add rc.firewall mkdir -p /etc/systemd/system/multi-user.target.wants ln -s /lib/systemd/system/firewall.service /etc/systemd/system/multi-user.target.wants/ } @@ -9,19 +8,12 @@ post_install() post_upgrade() { systemctl daemon-reload >/dev/null 2>&1 - # this can be removed after Frugalware-1.6 - if [ `vercmp $2 1.4.12.1-2` -lt 0 ] ; then - if chkconfig rc.firewall; then - post_install - fi - fi } # arg 1: the old package version post_remove() { rm -f /etc/systemd/system/multi-user.target.wants/firewall.service - chkconfig --del rc.firewall } op=$1 diff --git a/source/network/iptables/rc.firewall b/source/network/iptables/rc.firewall deleted file mode 100644 index 3c408bd..0000000 --- a/source/network/iptables/rc.firewall +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl <[email protected]> -# (c) 2003, 2010 Vajna Miklos <[email protected]> -# rc.firewall for FrugalWare -# distributed under GPL License - -# chkconfig: 2345 21 92 -# description: iptables firewall - -source /lib/initscripts/functions -TEXTDOMAIN=firewall - -actions=(restart start stop status) -daemon=$"iptables firewall" - -pid="test -f /var/lock/subsys/firewall && echo running" - -rc_start() -{ - start_msg - if [ -z "$(eval $pid)" -a -e /etc/sysconfig/iptables ]; then - source /etc/sysconfig/iptables - if (( $forward == 1 )) ; then - echo 1 > /proc/sys/net/ipv4/ip_forward - fi - /usr/sbin/iptables-restore < /etc/sysconfig/firewall - [ -d /var/lock/subsys ] || mkdir -p /var/lock/subsys - touch /var/lock/subsys/firewall - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [ -n "$(eval $pid)" ]; then - echo 0 > /proc/sys/net/ipv4/ip_forward - iptables -F && \ - iptables -P INPUT ACCEPT && \ - iptables -P FORWARD ACCEPT && \ - iptables -P OUTPUT ACCEPT - ok $? - rm -f /var/lock/subsys/firewall - else - ok 999 - fi -} - -rc_exec $1 diff --git a/source/network/iptables/rc.firewall-hu.po b/source/network/iptables/rc.firewall-hu.po deleted file mode 100644 index b266a21..0000000 --- a/source/network/iptables/rc.firewall-hu.po +++ /dev/null @@ -1,21 +0,0 @@ -# Hungarian translations for rc.firewall package. -# Copyright (C) 2006 THE rc.firewall'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.firewall package. -# <[email protected]>, 2006. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.firewall\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-27 17:59+0100\n" -"PO-Revision-Date: 2006-01-27 18:00+0100\n" -"Last-Translator: <[email protected]>\n" -"Language-Team: Hungarian <[email protected]>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.firewall:15 -msgid "iptables firewall" -msgstr "iptables tûzfal" diff --git a/source/network/iptables/rc.firewall.pot b/source/network/iptables/rc.firewall.pot deleted file mode 100644 index b5ce683..0000000 --- a/source/network/iptables/rc.firewall.pot +++ /dev/null @@ -1,21 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-27 17:59+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <[email protected]>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.firewall:15 -msgid "iptables firewall" -msgstr ""
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
