Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=827825192676ce9dc79a4027c1458499e430695c

commit 827825192676ce9dc79a4027c1458499e430695c
Author: Michel Hermier <herm...@frugalware.org>
Date:   Wed Dec 1 14:34:15 2010 +0100

net-tools-1.60-27-i686

* Remove rc.interfaces. netconfig provides systemd configuration.

diff --git a/source/base/net-tools/FrugalBuild 
b/source/base/net-tools/FrugalBuild
index 95f9b1a..621a59e 100644
--- a/source/base/net-tools/FrugalBuild
+++ b/source/base/net-tools/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=net-tools
pkgver=1.60
-pkgrel=26
+pkgrel=27
pkgdesc="Important tools for controlling the network subsystem"
url="http://www.tazenda.demon.co.uk/phil/net-tools/";
depends=('mktemp>=1.5-3' 'chkconfig>=1.3.30c-2')
@@ -14,7 +14,7 @@ up2date="lynx -dump $url |tail -n 1|tr '-' '\n'|sed 
's/.tar.bz2//'|tail -n 1"
source=($url/$pkgname-$pkgver.tar.bz2 \
$pkgname-$pkgver-configure.diff $pkgname-$pkgver-gcc34.diff \
$pkgname-$pkgver-i18n.diff rc.hostname \
-       rc.interfaces rc.interfaces-hu.po \
+       net-tools.install \
$pkgname-$pkgver-kernel26.diff \
net-tools-1.60-mii-tool-obsolete.patch)
sha1sums=('944fb70641505d5d1139dba3aeb81ba124574b83' \
@@ -22,8 +22,7 @@ sha1sums=('944fb70641505d5d1139dba3aeb81ba124574b83' \
'ff8daa4d48f867679d9feab2123cea4838684f79' \
'8dd9e07f99356870104dc4c168746055e78b03f1' \
'168330ad740abdeaf79dac58e682f73110454969' \
-          '79dcaa924189b5863b28eee0d76ecdde715a11cd' \
-          'e4830a27efaab43d5c98888e2070e2d1f3c26972' \
+          'e81bb1970d4b6c1c1b51ae0eba13a37a18a96d88' \
'448f5da06b9936c0c0e7ccf38cc36aa3ca5bd9f8' \
'fe9c2e8248920f0c8c6fb0214f19eef1f8e6e77a')

@@ -41,7 +40,6 @@ build()

Fln ../../bin/hostname /usr/bin/hostname
Frcd hostname
-       Frcd2 interfaces
}

# optimization OK
diff --git a/source/base/net-tools/net-tools.install 
b/source/base/net-tools/net-tools.install
index eeeb2b3..db27ca7 100644
--- a/source/base/net-tools/net-tools.install
+++ b/source/base/net-tools/net-tools.install
@@ -4,15 +4,11 @@ is_wireless_device()
return 0
}

-# arg 1:  the new package version
post_install()
{
chkconfig --add rc.hostname
-       chkconfig --add rc.interfaces
}

-# arg 1:  the new package version
-# arg 2:  the old package version
post_upgrade()
{
post_install
@@ -55,7 +51,6 @@ post_upgrade()
fi
}

-# arg 1:  the old package version
pre_remove()
{
chkconfig --del rc.hostname
diff --git a/source/base/net-tools/rc.interfaces 
b/source/base/net-tools/rc.interfaces
deleted file mode 100644
index 927d930..0000000
--- a/source/base/net-tools/rc.interfaces
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-
-# (c) 2006 Miklos Vajna <vmik...@frugalware.org>
-# rc.interfaces for Frugalware
-# distributed under GPL License
-
-# chkconfig: 2345 07 98
-# description: Bring up the various network interfaces.
-
-source /lib/initscripts/functions
-TEXTDOMAIN=interfaces
-TEXTDOMAINDIR=/lib/initscripts/messages
-net=`grep network /proc/cmdline|sed 's/.*network=\([^ ]*\)\( .*\|$\)/\1/'`
-
-actions=(restart start stop status list profilename)
-
-rc_start()
-{
-       msg $"Bringing up network interfaces"
-       netconfig --loup
-       if [ -z "$net" ]; then
-               netconfig start
-       else
-               netconfig $net
-       fi
-       if [ "$?" == "127" ]; then
-               ok 999
-       else
-               ok 0
-       fi
-}
-
-rc_stop()
-{
-       msg $"Shutting down network interfaces"
-       netconfig stop
-       if [ "$?" == "127" ]; then
-               ok 999
-       else
-               ok 0
-       fi
-       netconfig --lodown
-}
-
-rc_restart()
-{
-       msg $"Restarting network interfaces"
-       if [ -z "$net" ]; then
-               netconfig restart
-       else
-               netconfig $net
-       fi
-       if [ "$?" == "127" ]; then
-               ok 999
-       else
-               ok 0
-       fi
-}
-
-if [ -z "$1" ]; then
-       rc_help
-       exit 0
-fi
-
-case "$1" in
-       start)  rc_start ;;
-       stop) rc_stop ;;
-       restart) rc_restart ;;
-       *) netconfig $1 ;;
-esac
-
-# vim: ft=sh
diff --git a/source/base/net-tools/rc.interfaces-hu.po 
b/source/base/net-tools/rc.interfaces-hu.po
deleted file mode 100644
index 150d957..0000000
--- a/source/base/net-tools/rc.interfaces-hu.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# Hungarian translations for rc.interfaces package.
-# Copyright (C) 2006 THE rc.interfaces'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the rc.interfaces package.
-#  <vmik...@frugalware.org>, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: rc.interfaces\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-20 01:43+0100\n"
-"PO-Revision-Date: 2006-01-20 01:44+0100\n"
-"Last-Translator:  <vmik...@frugalware.org>\n"
-"Language-Team: Hungarian <translation-team...@lists.sourceforge.net>\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.interfaces:18
-msgid "Bringing up network interfaces"
-msgstr "A hálózati interfészek inicializálása"
-
-#: rc.interfaces:29
-msgid "Shutting down network interfaces"
-msgstr "A hálózati interfészek leállítása"
-
-#: rc.interfaces:40
-msgid "Restarting network interfaces"
-msgstr "A hálózati interfészek újraindítása"
diff --git a/source/base/net-tools/rc.interfaces.pot 
b/source/base/net-tools/rc.interfaces.pot
deleted file mode 100644
index 81c0623..0000000
--- a/source/base/net-tools/rc.interfaces.pot
+++ /dev/null
@@ -1,29 +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 <em...@address>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-20 01:43+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <em...@address>\n"
-"Language-Team: LANGUAGE <l...@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: rc.interfaces:18
-msgid "Bringing up network interfaces"
-msgstr ""
-
-#: rc.interfaces:29
-msgid "Shutting down network interfaces"
-msgstr ""
-
-#: rc.interfaces:40
-msgid "Restarting network interfaces"
-msgstr ""
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to