From fbac9ba1c624174a27f2c32d44318978d129eb8e Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 14 Sep 2015 07:04:43 +0000 Subject: [PATCH] - misc fixes, cleanup --- misc_fixes.patch | 13 +++++++++++++ rc-scripts.spec | 7 +++---- 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 misc_fixes.patch diff --git a/misc_fixes.patch b/misc_fixes.patch new file mode 100644 index 0000000..66e3a27 --- /dev/null +++ b/misc_fixes.patch @@ -0,0 +1,13 @@ +diff --git a/lib/functions b/lib/functions +index ced6e97..fac4c46 100644 +--- a/lib/functions ++++ b/lib/functions +@@ -607,7 +607,7 @@ _daemon_set_ulimits() { + + # A function to start a program (now it's useful on read-only filesystem too) + daemon() { +- local errors="" prog="" end="" waitname="" waittime="" ++ local errors="" prog="" end="" waitname="" waittime=0 + local exit_code=0 + local nice=$SERVICE_RUN_NICE_LEVEL + local fork user closefds redirfds pidfile makepid chdir=/ diff --git a/rc-scripts.spec b/rc-scripts.spec index dfa70e4..7ca36c0 100644 --- a/rc-scripts.spec +++ b/rc-scripts.spec @@ -8,11 +8,12 @@ Summary(pl.UTF-8): inittab i skrypty startowe z katalogu /etc/rc.d Summary(tr.UTF-8): inittab ve /etc/rc.d dosyaları Name: rc-scripts Version: 0.5.0 -Release: 1 +Release: 2 License: GPL v2 Group: Base Source0: %{name}-%{version}.tar.gz # Source0-md5: bb0901b490dc9c6b47d2ae6a5fd3cd5c +Patch0: misc_fixes.patch URL: http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts BuildRequires: autoconf BuildRequires: automake @@ -26,9 +27,6 @@ BuildRequires: pkgconfig BuildRequires: popt-devel BuildRequires: rpm >= 4.4.9-56 Requires(post): fileutils -%ifarch sparc sparcv9 sparc64 -Requires: agetty -%endif Requires: /bin/awk Requires: /bin/basename Requires: /bin/gettext @@ -104,6 +102,7 @@ programcıklar içerir. %prep %setup -q +%patch0 -p1 # hack, currently this results in errno@@GLIBC_PRIVATE symbol in ppp-watch: #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic" -- 2.46.0