From: hal9 <hal9@users.sourceforge.net>
Date: Sun, 3 Mar 2002 19:21:22 +0000 (+0000)
Subject: Init script fails if shell is /bin/false.
X-Git-Tag: v_2_9_12~223
X-Git-Url: http://www.privoxy.org/gitweb/%22https:/static/gitweb.js?a=commitdiff_plain;h=6d8583b5d10c93804fca9490ca58c2c1f534c647;p=privoxy.git

Init script fails if shell is /bin/false.
---

diff --git a/junkbuster-rh.spec b/junkbuster-rh.spec
index cd18f291..b05d8db7 100644
--- a/junkbuster-rh.spec
+++ b/junkbuster-rh.spec
@@ -1,4 +1,4 @@
-# $Id: junkbuster-rh.spec,v 1.27 2002/01/09 18:32:02 hal9 Exp $
+# $Id: junkbuster-rh.spec,v 1.28 2002/01/09 18:34:03 hal9 Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # IJBSWA team.  http://ijbswa.sourceforge.net
@@ -26,6 +26,9 @@
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # $Log: junkbuster-rh.spec,v $
+# Revision 1.28  2002/01/09 18:34:03  hal9
+# nit.
+#
 # Revision 1.27  2002/01/09 18:32:02  hal9
 # Removed RPM_OPT_FLAGS kludge.
 #
@@ -113,8 +116,8 @@
 Summary: The Internet Junkbuster
 Vendor: http://ijbswa.sourceforge.net
 Name: junkbuster
-Version: 2.9.10
-Release: 2
+Version: 2.9.11
+Release: 1
 Source0: http://www.waldherr.org/junkbuster/ijbswa-%{version}.tar.gz
 Copyright: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -145,7 +148,7 @@ make
 strip junkbuster
 
 %pre
-/usr/sbin/useradd -d /etc/junkbuster -r junkbuster -s "/bin/false" > /dev/null 2>&1 || /bin/true
+/usr/sbin/useradd -d /etc/junkbuster -r junkbuster -s "" > /dev/null 2>&1 || /bin/true
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -182,6 +185,8 @@ cat config | \
 perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' ijb.action >\
     $RPM_BUILD_ROOT%{ijbconf}/ijb.action
 
+#%makeinstall
+
 %post
 # for upgrade from 2.0.x
 [ -f /var/log/junkbuster/junkbuster ] &&\
@@ -225,6 +230,9 @@ fi
 
 
 %changelog
+* Sun Mar 03 2002 Hal Burgiss <hal@foobox.net>
+- /bin/false for shell causes init script to fail. Reverting.
+
 * Wed Jan 09 2002 Hal Burgiss <hal@foobox.net>
 - Removed UID 73. Included user-manual and developer-manual in docs.
   Include other actions files. Default shell is now /bin/false.