- fix up string comparison in init script (#427047)

This commit is contained in:
Martin Nagy 2008-02-25 11:00:07 +00:00
parent dc83a550e6
commit 75b0755c88
2 changed files with 28 additions and 1 deletions

View File

@ -0,0 +1,21 @@
diff -up radvd-1.1/redhat/radvd.init.string_cmp radvd-1.1/redhat/radvd.init
--- radvd-1.1/redhat/radvd.init.string_cmp 2008-02-25 11:27:36.000000000 +0100
+++ radvd-1.1/redhat/radvd.init 2008-02-25 11:30:30.000000000 +0100
@@ -28,7 +28,7 @@
[ -f /etc/sysconfig/radvd ] && . /etc/sysconfig/radvd
-if [ $1 == 'status' ]; then
+if [ "$1" == "status" ]; then
[ -f /usr/sbin/radvd ] || exit 4
else
[ -f /usr/sbin/radvd ] || exit 1
@@ -43,7 +43,7 @@ case "$1" in
start)
# Check that networking is up.
- [ x${NETWORKING_IPV6} = "xyes" ] || exit 1
+ [ "${NETWORKING_IPV6}" = "yes" ] || exit 1
echo -n $"Starting $PROG: "
daemon radvd $OPTIONS

View File

@ -5,7 +5,7 @@
Summary: A Router Advertisement daemon Summary: A Router Advertisement daemon
Name: radvd Name: radvd
Version: 1.1 Version: 1.1
Release: 1%{?dist} Release: 2%{?dist}
# The code includes the advertising clause, so it's GPL-incompatible # The code includes the advertising clause, so it's GPL-incompatible
License: BSD-style License: BSD-style
Group: System Environment/Daemons Group: System Environment/Daemons
@ -18,6 +18,8 @@ Requires(pre): /usr/sbin/useradd
BuildRequires: flex, byacc BuildRequires: flex, byacc
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: radvd-1.1-string_cmp.patch
%description %description
radvd is the router advertisement daemon for IPv6. It listens to router radvd is the router advertisement daemon for IPv6. It listens to router
solicitations and sends router advertisements as described in "Neighbor solicitations and sends router advertisements as described in "Neighbor
@ -31,6 +33,7 @@ services.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b string_cmp
%build %build
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIE" export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIE"
@ -92,6 +95,9 @@ fi
%{_sbindir}/radvdump %{_sbindir}/radvdump
%changelog %changelog
* Mon Feb 25 2008 Martin Nagy <mnagy@redhat.com> - 1.1-2
- fix up string comparison in init script (#427047)
* Mon Feb 25 2008 Martin Nagy <mnagy@redhat.com> - 1.1-1 * Mon Feb 25 2008 Martin Nagy <mnagy@redhat.com> - 1.1-1
- update to new upstream version - update to new upstream version
- remove patch fixed in upstream: initscript - remove patch fixed in upstream: initscript