[inn] defuzz

Ondrej Vasik ovasik at fedoraproject.org
Thu Sep 6 08:32:10 UTC 2012


commit 25108192f3784fe9ac538b7c9831c55acb3127ad
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Thu Sep 6 10:32:04 2012 +0200

    defuzz

 inn-2.5.1-nologinshell.patch |   25 ++-----------------------
 inn.spec                     |    1 +
 2 files changed, 3 insertions(+), 23 deletions(-)
---
diff --git a/inn-2.5.1-nologinshell.patch b/inn-2.5.1-nologinshell.patch
index d79a0c6..cf3d55e 100644
--- a/inn-2.5.1-nologinshell.patch
+++ b/inn-2.5.1-nologinshell.patch
@@ -44,8 +44,8 @@ diff -up inn-2.5.1/doc/pod/install.pod.nologin inn-2.5.1/doc/pod/install.pod
 -    su news -c '<pathbin in inn.conf>/rc.news stop'
 +    su -m news -c '/etc/rc.news stop'
  
- In the F<contrib> directory of this source tree is a sample init script
- for people using System V-style init.d directories.
+ In the F<contrib> directory of this source tree, two sample init scripts are provided:  one
+ for people using System V-style init.d directories, and another for people
 diff -up inn-2.5.1/doc/pod/rc.news.pod.nologin inn-2.5.1/doc/pod/rc.news.pod
 --- inn-2.5.1/doc/pod/rc.news.pod.nologin	2009-10-12 20:24:04.000000000 +0200
 +++ inn-2.5.1/doc/pod/rc.news.pod	2009-10-13 21:53:35.000000000 +0200
@@ -69,24 +69,3 @@ diff -up inn-2.5.1/doc/pod/rc.news.pod.nologin inn-2.5.1/doc/pod/rc.news.pod
  
  =head1 BUGS
  
-diff -up inn-2.5.1/INSTALL.nologin inn-2.5.1/INSTALL
---- inn-2.5.1/INSTALL.nologin	2009-10-12 20:24:04.000000000 +0200
-+++ inn-2.5.1/INSTALL	2009-10-13 21:53:35.000000000 +0200
-@@ -1511,7 +1511,7 @@ Starting and Stopping the System
-     news user and not as root.  To start INN on system boot, you therefore
-     want to put something like:
- 
--        su news -c <pathbin in inn.conf>/rc.news
-+        su -m news -c /etc/rc.news
- 
-     in the system boot scripts.  If innd is stopped or killed, you can
-     restart it by running rc.news by hand as the news user.
-@@ -1519,7 +1519,7 @@ Starting and Stopping the System
-     The rc.news script may also be used to shut down INN, with the "stop"
-     option:
- 
--        su news -c '<pathbin in inn.conf>/rc.news stop'
-+        su -m news -c '/etc/rc.news stop'
- 
-     In the contrib directory of this source tree is a sample init script for
-     people using System V-style init.d directories.
diff --git a/inn.spec b/inn.spec
index d2da6da..79614cd 100644
--- a/inn.spec
+++ b/inn.spec
@@ -111,6 +111,7 @@ exit 0
 %patch18 -p1 -b .smp
 %patch19 -p1 -b .docrun
 
+perl -pi -e 's/su news/su -m news/' ./INSTALL
 perl -pi -e 's/LOCK_READ/LLOCK_READ/' `find . -type f`
 perl -pi -e 's/LOCK_WRITE/LLOCK_WRITE/' `find . -type f`
 


More information about the scm-commits mailing list