[otrs-cvs] otrs/scripts suse-otrs-10.0.spec, 1.6, 1.7 redhat-otrs-8.0.spec, 1.14, 1.15 fedora-otrs-4.spec, 1.3, 1.4 suse-otrs-9.1.spec, 1.13, 1.14 suse-otrs-9.0.spec, 1.9, 1.10 redhat-otrs-7.3.spec, 1.14, 1.15

cvs-log at otrs.org cvs-log at otrs.org
Mon Feb 4 09:55:09 GMT 2008


Comments:
Update of /home/cvs/otrs/scripts
In directory lancelot:/tmp/cvs-serv31850/scripts

Modified Files:
	suse-otrs-10.0.spec redhat-otrs-8.0.spec fedora-otrs-4.spec 
	suse-otrs-9.1.spec suse-otrs-9.0.spec redhat-otrs-7.3.spec 
Log Message:
Fix for bug #2657:
* Instead of trying to parse /etc/passwd with an incorrect regex, we now use the
  'id' utility to find out if the user 'otrs' exists.
  NB: explicity left out SuSE specs < 9.0, since they are expected to be removed, soon.

Author: ot

Index: suse-otrs-10.0.spec
===================================================================
RCS file: /home/cvs/otrs/scripts/suse-otrs-10.0.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** suse-otrs-10.0.spec	9 Aug 2007 21:43:57 -0000	1.6
--- suse-otrs-10.0.spec	4 Feb 2008 09:55:04 -0000	1.7
***************
*** 1,5 ****
  # --
  # RPM spec file for SUSE Linux 9.1 of the OTRS package
! # Copyright (C) 2001-2007 OTRS GmbH, http://otrs.org/
  # --
  # $Id$
--- 1,5 ----
  # --
  # RPM spec file for SUSE Linux 9.1 of the OTRS package
! # Copyright (C) 2001-2008 OTRS AG, http://otrs.org/
  # --
  # $Id$
***************
*** 7,11 ****
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl.txt.
  # --
  #
--- 7,11 ----
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl-2.0.txt.
  # --
  #
***************
*** 85,90 ****
  # useradd
  export OTRSUSER=otrs
! echo -n "Check OTRS user (/etc/passwd)... "
! if cat /etc/passwd | grep $OTRSUSER > /dev/null ; then
      echo "$OTRSUSER exists."
      # update groups
--- 85,90 ----
  # useradd
  export OTRSUSER=otrs
! echo -n "Check OTRS user ... "
! if id $OTRSUSER >/dev/null 2>&1; then
      echo "$OTRSUSER exists."
      # update groups

Author: ot

Index: redhat-otrs-8.0.spec
===================================================================
RCS file: /home/cvs/otrs/scripts/redhat-otrs-8.0.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** redhat-otrs-8.0.spec	9 Aug 2007 21:43:57 -0000	1.14
--- redhat-otrs-8.0.spec	4 Feb 2008 09:55:04 -0000	1.15
***************
*** 1,5 ****
  # --
  # RPM spec file for RedHat Linux of the OTRS package
! # Copyright (C) 2001-2007 OTRS GmbH, http://otrs.org/
  # --
  # $Id$
--- 1,5 ----
  # --
  # RPM spec file for RedHat Linux of the OTRS package
! # Copyright (C) 2001-2008 OTRS AG, http://otrs.org/
  # --
  # $Id$
***************
*** 7,11 ****
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl.txt.
  # --
  #
--- 7,11 ----
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl-2.0.txt.
  # --
  #
***************
*** 76,81 ****
  # useradd
  export OTRSUSER=otrs
! echo -n "Check OTRS user (/etc/passwd)... "
! if cat /etc/passwd | grep $OTRSUSER > /dev/null ; then
      echo "$OTRSUSER exists."
      # update home dir
--- 76,81 ----
  # useradd
  export OTRSUSER=otrs
! echo -n "Check OTRS user ... "
! if id $OTRSUSER >/dev/null 2>&1; then
      echo "$OTRSUSER exists."
      # update home dir

Author: ot

Index: fedora-otrs-4.spec
===================================================================
RCS file: /home/cvs/otrs/scripts/fedora-otrs-4.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fedora-otrs-4.spec	9 Aug 2007 21:43:57 -0000	1.3
--- fedora-otrs-4.spec	4 Feb 2008 09:55:04 -0000	1.4
***************
*** 1,5 ****
  # --
  # RPM spec file for Fedora of the OTRS package
! # Copyright (C) 2001-2007 OTRS GmbH, http://otrs.org/
  # --
  # $Id$
--- 1,5 ----
  # --
  # RPM spec file for Fedora of the OTRS package
! # Copyright (C) 2001-2008 OTRS AG, http://otrs.org/
  # --
  # $Id$
***************
*** 7,11 ****
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl.txt.
  # --
  #
--- 7,11 ----
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl-2.0.txt.
  # --
  #
***************
*** 76,81 ****
  # useradd
  export OTRSUSER=otrs
! echo -n "Check OTRS user (/etc/passwd)... "
! if cat /etc/passwd | grep $OTRSUSER > /dev/null ; then
      echo "$OTRSUSER exists."
      # update home dir
--- 76,81 ----
  # useradd
  export OTRSUSER=otrs
! echo -n "Check OTRS user ... "
! if id $OTRSUSER >/dev/null 2>&1; then
      echo "$OTRSUSER exists."
      # update home dir

Author: ot

Index: suse-otrs-9.1.spec
===================================================================
RCS file: /home/cvs/otrs/scripts/suse-otrs-9.1.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** suse-otrs-9.1.spec	9 Aug 2007 21:43:57 -0000	1.13
--- suse-otrs-9.1.spec	4 Feb 2008 09:55:04 -0000	1.14
***************
*** 1,5 ****
  # --
  # RPM spec file for SUSE Linux 9.1 of the OTRS package
! # Copyright (C) 2001-2007 OTRS GmbH, http://otrs.org/
  # --
  # $Id$
--- 1,5 ----
  # --
  # RPM spec file for SUSE Linux 9.1 of the OTRS package
! # Copyright (C) 2001-2008 OTRS AG, http://otrs.org/
  # --
  # $Id$
***************
*** 7,11 ****
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl.txt.
  # --
  #
--- 7,11 ----
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl-2.0.txt.
  # --
  #
***************
*** 85,90 ****
  # useradd
  export OTRSUSER=otrs
! echo -n "Check OTRS user (/etc/passwd)... "
! if cat /etc/passwd | grep $OTRSUSER > /dev/null ; then
      echo "$OTRSUSER exists."
      # update groups
--- 85,90 ----
  # useradd
  export OTRSUSER=otrs
! echo -n "Check OTRS user ... "
! if id $OTRSUSER >/dev/null 2>&1; then
      echo "$OTRSUSER exists."
      # update groups

Author: ot

Index: suse-otrs-9.0.spec
===================================================================
RCS file: /home/cvs/otrs/scripts/suse-otrs-9.0.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** suse-otrs-9.0.spec	9 Aug 2007 21:43:57 -0000	1.9
--- suse-otrs-9.0.spec	4 Feb 2008 09:55:04 -0000	1.10
***************
*** 1,5 ****
  # --
  # RPM spec file for SUSE Linux 9.0 of the OTRS package
! # Copyright (C) 2001-2007 OTRS GmbH, http://otrs.org/
  # --
  # $Id$
--- 1,5 ----
  # --
  # RPM spec file for SUSE Linux 9.0 of the OTRS package
! # Copyright (C) 2001-2008 OTRS AG, http://otrs.org/
  # --
  # $Id$
***************
*** 7,11 ****
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl.txt.
  # --
  #
--- 7,11 ----
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl-2.0.txt.
  # --
  #
***************
*** 82,87 ****
  # useradd
  export OTRSUSER=otrs
! echo -n "Check OTRS user (/etc/passwd)... "
! if cat /etc/passwd | grep $OTRSUSER > /dev/null ; then
      echo "$OTRSUSER exists."
      # update groups
--- 82,87 ----
  # useradd
  export OTRSUSER=otrs
! echo -n "Check OTRS user ... "
! if id $OTRSUSER >/dev/null 2>&1; then
      echo "$OTRSUSER exists."
      # update groups

Author: ot

Index: redhat-otrs-7.3.spec
===================================================================
RCS file: /home/cvs/otrs/scripts/redhat-otrs-7.3.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** redhat-otrs-7.3.spec	9 Aug 2007 21:43:57 -0000	1.14
--- redhat-otrs-7.3.spec	4 Feb 2008 09:55:04 -0000	1.15
***************
*** 1,5 ****
  # --
  # RPM spec file for RedHat Linux of the OTRS package
! # Copyright (C) 2001-2007 OTRS GmbH, http://otrs.org/
  # --
  # $Id$
--- 1,5 ----
  # --
  # RPM spec file for RedHat Linux of the OTRS package
! # Copyright (C) 2001-2008 OTRS AG, http://otrs.org/
  # --
  # $Id$
***************
*** 7,11 ****
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl.txt.
  # --
  #
--- 7,11 ----
  # This software comes with ABSOLUTELY NO WARRANTY. For details, see
  # the enclosed file COPYING for license information (GPL). If you
! # did not receive this file, see http://www.gnu.org/licenses/gpl-2.0.txt.
  # --
  #
***************
*** 72,77 ****
  # useradd
  export OTRSUSER=otrs
! echo -n "Check OTRS user (/etc/passwd)... "
! if cat /etc/passwd | grep $OTRSUSER > /dev/null ; then
      echo "$OTRSUSER exists."
      # update home dir
--- 72,77 ----
  # useradd
  export OTRSUSER=otrs
! echo -n "Check OTRS user ... "
! if id $OTRSUSER >/dev/null 2>&1 ; then
      echo "$OTRSUSER exists."
      # update home dir


More information about the cvs-log mailing list