aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog35
-rw-r--r--initscripts.spec7
2 files changed, 40 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e76c1cf3..f587ce7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2002-07-17 Bill Nottingham <notting@redhat.com>
+
+ * Changelog, initscripts.spec: 6.87-1
+
+ * sysconfig/network-scripts/ifup, sysconfig/network-scripts/ifup-post:
+ use iptables & our lokkit chain
+
+2002-07-17 James Hashida <khashida@redhat.com>
+
+ * po/ja.po: update
+
+2002-07-16 Florian La Roche <laroche@redhat.com>
+
+ * initscripts.spec, service:
+ * Tue Jul 16 2002 Florian La Roche <Florian.LaRoche@redhat.com>
+ - /sbin/service: set PATH before calling startup scripts
+ HOME and TERM are also set during bootup, but they should not make
+ a difference for well-written daemons.
+
+2002-07-15 Hung-Pin Wu <hpwu@redhat.com>
+
+ * po/zh_TW.po: Updated translation.
+
+2002-07-15 Michelle Kim <mkim@redhat.com>
+
+ * po/ko.po: Updated translation.
+
+2002-07-15 Sarah Smith <sarahs@redhat.com>
+
+ * po/zh_CN.po: fixed.
+
+2002-07-16 Christian Rose <menthos@menthos.com>
+
+ * sv.po: Updated Swedish translation.
+
2002-07-15 Bill Nottingham <notting@redhat.com>
* initscripts.spec, Changelog: 6.86-1
diff --git a/initscripts.spec b/initscripts.spec
index 2ab7ab71..24adc11b 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/init.d scripts.
Name: initscripts
-Version: 6.86
+Version: 6.87
License: GPL
Group: System Environment/Base
Release: 1
@@ -17,7 +17,7 @@ Requires: bash >= 2.0, SysVinit
Requires: /sbin/ip, /sbin/arping, net-tools
Requires: /sbin/update
Conflicts: kernel <= 2.2, timeconfig < 3.0, pppd < 2.3.9, wvdial < 1.40-3
-Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19
+Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
Obsoletes: rhsound sapinit
Prereq: /sbin/chkconfig, /usr/sbin/groupadd, gawk, fileutils, sh-utils
BuildPrereq: glib-devel popt
@@ -244,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT
%dir /etc/locale/*/LC_MESSAGES
%changelog
+* Tue Jul 16 2002 Bill Nottingham <notting@redhat.com>
+- use iptables, not ipchains
+
* Tue Jul 16 2002 Florian La Roche <Florian.LaRoche@redhat.de>
- /sbin/service: set PATH before calling startup scripts
HOME and TERM are also set during bootup, but they should not make