Hello community, here is the log from the commit of package otrs checked in at Thu Oct 16 14:30:02 CEST 2008. -------- --- otrs/otrs.changes 2008-08-29 00:08:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/otrs/otrs.changes 2008-10-16 12:33:20.045524000 +0200 @@ -1,0 +2,5 @@ +Thu Oct 16 12:33:13 CEST 2008 - ro@suse.de + +- drop needsrootforbuild + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- otrs-nochown.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ otrs.spec ++++++ --- /var/tmp/diff_new_pack.K14724/_old 2008-10-16 14:29:39.000000000 +0200 +++ /var/tmp/diff_new_pack.K14724/_new 2008-10-16 14:29:39.000000000 +0200 @@ -15,12 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# needsrootforbuild Name: otrs Version: 2.2.6 -Release: 36 +Release: 45 License: GPL v2 or later Group: Productivity/Networking/Email/Utilities Url: http://otrs.org/ @@ -32,6 +31,7 @@ Source2: otrs.README.en Source3: otrs.README.de Patch: otrs-init.diff +Patch1: otrs-nochown.diff Summary: Open Ticket Request System BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pwdutils @@ -178,6 +178,7 @@ %prep %setup %patch -p1 +%patch1 find -name ".cvsignore" -type f | xargs rm -fv %build @@ -225,9 +226,9 @@ install -m 755 scripts/suse-rcotrs ${RPM_BUILD_ROOT}/etc/init.d/otrs ln -fs ../../etc/init.d/otrs ${RPM_BUILD_ROOT}/%{_sbindir}/rcotrs # set permission -${RPM_BUILD_ROOT}/opt/otrs/bin/SetPermissions.sh ${RPM_BUILD_ROOT}/opt/otrs otrs wwwrun nogroup www -chgrp -R root ${RPM_BUILD_ROOT}/opt/otrs -chgrp -R www ${RPM_BUILD_ROOT}/opt/otrs/var/log +${RPM_BUILD_ROOT}/opt/otrs/bin/SetPermissions.sh ${RPM_BUILD_ROOT}/opt/otrs otrs wwwrun nogroup www echo +#chgrp -R root ${RPM_BUILD_ROOT}/opt/otrs +#chgrp -R www ${RPM_BUILD_ROOT}/opt/otrs/var/log %if %suse_version > 930 otrs_apache_conf="scripts/apache2-httpd-new.include.conf" %else @@ -333,31 +334,35 @@ %insserv_cleanup %clean -[ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} +rm -rf ${RPM_BUILD_ROOT} %files +%defattr(-,root,root) %dir /etc/apache2 %dir /etc/apache2/conf.d %config /etc/apache2/conf.d/otrs.conf +/etc/init.d/otrs +/usr/sbin/rcotrs +%doc %{otrsdoc_dir_files} +%{_var}/adm/fillup-templates/sysconfig.otrs +%defattr(-,wwwrun,root) %config(noreplace) /opt/otrs/Kernel/Config.pm /opt/otrs/Kernel/Config.pm.dist /opt/otrs/Kernel/Config/Files %config(noreplace) /opt/otrs/Kernel/Config/GenericAgent.pm /opt/otrs/Kernel/Config/GenericAgent.pm.* %config(noreplace) %attr(660,otrs,www) /opt/otrs/var/log/TicketCounter.log -%ghost %config(noreplace) /opt/otrs/.procmailrc -%ghost %config(noreplace) /opt/otrs/.fetchmailrc -%ghost %config(noreplace) /opt/otrs/.mailfilter -/opt/otrs/.fetchmailrc.dist -/opt/otrs/.mailfilter.dist -/opt/otrs/.procmailrc.dist +%ghost %config(noreplace) %attr(-,otrs,root) /opt/otrs/.procmailrc +%ghost %config(noreplace) %attr(-,otrs,root) /opt/otrs/.fetchmailrc +%ghost %config(noreplace) %attr(-,otrs,root) /opt/otrs/.mailfilter +%attr(-,wwwrun,root) /opt/otrs/.fetchmailrc.dist +%attr(-,wwwrun,root) /opt/otrs/.mailfilter.dist +%attr(-,wwwrun,root) /opt/otrs/.procmailrc.dist %config(noreplace) /opt/otrs/Kernel/Output/HTML/Standard/*.dtl %config(noreplace) /opt/otrs/Kernel/Output/HTML/Lite/*.dtl %config(noreplace) /opt/otrs/Kernel/Language/*.pm -%config(noreplace) /opt/otrs/var/cron/* -/etc/init.d/otrs -/usr/sbin/rcotrs -%dir /opt/otrs +%config(noreplace) %attr(-,otrs,root) /opt/otrs/var/cron/* +%dir %attr(-,otrs,root) /opt/otrs %dir /opt/otrs/Kernel %dir /opt/otrs/Kernel/Config %dir /opt/otrs/Kernel/Output @@ -365,10 +370,10 @@ %dir /opt/otrs/Kernel/Output/HTML/Lite %dir /opt/otrs/Kernel/Output/HTML/Standard %dir /opt/otrs/Kernel/Language -%dir /opt/otrs/var -%dir /opt/otrs/var/cron +%dir %attr(-,otrs,root) /opt/otrs/var +%dir %attr(-,otrs,root) /opt/otrs/var/cron %dir %attr(770,otrs,www) /opt/otrs/var/log -%dir /opt/otrs/var/pics +%dir %attr(-,otrs,root) /opt/otrs/var/pics /opt/otrs/ARCHIVE /opt/otrs/RELEASE /opt/otrs/Kernel/Config/Defaults.pm @@ -377,19 +382,22 @@ /opt/otrs/Kernel/Output/HTML/*.pm /opt/otrs/Kernel/System/ /opt/otrs/bin/ +%attr(-,otrs,root) /opt/otrs/bin/DeleteSessionIDs.pl +%attr(-,otrs,root) /opt/otrs/bin/UnlockTickets.pl +%attr(-,otrs,root) /opt/otrs/bin/otrs.getConfig /opt/otrs/scripts/ -/opt/otrs/var/logo-otrs.png -/opt/otrs/var/article/ -/opt/otrs/var/httpd/ -/opt/otrs/var/sessions/ -/opt/otrs/var/spool/ -/opt/otrs/var/tmp/ -/opt/otrs/var/pics/stats/ +%attr(-,otrs,root) /opt/otrs/var/logo-otrs.png +%attr(-,otrs,root) /opt/otrs/var/article/ +%attr(-,otrs,root) /opt/otrs/var/httpd/ +%attr(-,wwwrun,root) /opt/otrs/var/sessions/ +%attr(-,otrs,root) /opt/otrs/var/spool/ +%attr(-,otrs,root) /opt/otrs/var/tmp/ +%attr(-,otrs,root) /opt/otrs/var/pics/stats/ /opt/otrs/Kernel/cpan-lib* -%doc %{otrsdoc_dir_files} -%{_var}/adm/fillup-templates/sysconfig.otrs %changelog +* Thu Oct 16 2008 ro@suse.de +- drop needsrootforbuild * Fri Aug 29 2008 cthiel@suse.de - fix init script * Mon Mar 31 2008 lmuelle@suse.de ++++++ otrs-nochown.diff ++++++ --- bin/SetPermissions.sh +++ bin/SetPermissions.sh @@ -23,6 +23,7 @@ echo "SetPermissions.sh <\$Revision: 1.31 $> - set OTRS file permissions" echo "Copyright (C) 2001-2006 OTRS GmbH, http://otrs.org/" +CHOWN="chown" if ! test $1 || ! test $2 || ! test $3; then # check required options echo "" @@ -40,26 +41,27 @@ WEBGROUP=nogroup [ "$4" != "" ]&& OTRSGROUP=$4 [ "$5" != "" ]&& WEBGROUP=$5 + [ "$6" != "" ]&& CHOWN=$6 fi # set permission echo "Setting file permissions... " # set all files writeabel for webserver user (needed for package manager) echo "chown -R $WEBUSER:$OTRSGROUP $OTRSDEST" -chown $WEBUSER:$OTRSGROUP $OTRSDEST -chown -R $WEBUSER:$OTRSGROUP $OTRSDEST +$CHOWN $WEBUSER:$OTRSGROUP $OTRSDEST +$CHOWN -R $WEBUSER:$OTRSGROUP $OTRSDEST echo "chmod -R og+rw $OTRSDEST" chmod 755 $OTRSDEST chmod -R ug+wr $OTRSDEST/* # set the $HOME to the OTRS user echo "chown $OTRSUSER:$OTRSGROUP $OTRSDEST" -chown $OTRSUSER:$OTRSGROUP $OTRSDEST +$CHOWN $OTRSUSER:$OTRSGROUP $OTRSDEST # set the fetchmail rc to OTRS user if test -e $OTRSDEST/.fetchmailrc; then echo "chown $OTRSUSER:$OTRSGROUP $OTRSDEST/.fetchmailrc" - chown $OTRSUSER:$OTRSGROUP $OTRSDEST/.fetchmailrc + $CHOWN $OTRSUSER:$OTRSGROUP $OTRSDEST/.fetchmailrc echo "chmod 0600 $OTRSDEST/.fetchmailrc" chmod 0600 $OTRSDEST/.fetchmailrc fi @@ -67,7 +69,7 @@ # set procmailrc if test -e $OTRSDEST/.procmailrc; then echo "chown $OTRSUSER:$OTRSGROUP $OTRSDEST/.procmailrc" - chown $OTRSUSER:$OTRSGROUP $OTRSDEST/.procmailrc + $CHOWN $OTRSUSER:$OTRSGROUP $OTRSDEST/.procmailrc echo "chmod 0644 $OTRSDEST/.procmailrc" chmod 0644 $OTRSDEST/.procmailrc fi @@ -75,7 +77,7 @@ # set mailfilter if test -e $OTRSDEST/.mailfilter; then echo "chown $OTRSUSER:$OTRSGROUP $OTRSDEST/.mailfilter" - chown $OTRSUSER:$OTRSGROUP $OTRSDEST/.mailfilter + $CHOWN $OTRSUSER:$OTRSGROUP $OTRSDEST/.mailfilter echo "chmod 0600 $OTRSDEST/.mailfilter" chmod 0600 $OTRSDEST/.mailfilter fi @@ -83,26 +85,26 @@ # set forward (just for Exim) if test -e $OTRSDEST/.forward; then echo "chown $OTRSUSER:$OTRSGROUP $OTRSDEST/.forward" - chown $OTRSUSER:$OTRSGROUP $OTRSDEST/.forward + $CHOWN $OTRSUSER:$OTRSGROUP $OTRSDEST/.forward fi # var/* # set the var directory to OTRS and webserver user echo "chown -R $OTRSUSER:$WEBGROUP $OTRSDEST/var/" -chown -R $OTRSUSER:$WEBGROUP $OTRSDEST/var/ +$CHOWN -R $OTRSUSER:$WEBGROUP $OTRSDEST/var/ chmod -R 2775 $OTRSDEST/var/article/ chmod -R 2775 $OTRSDEST/var/log/ chmod -R 2775 $OTRSDEST/var/tmp/ # set the var/sessions directory to OTRS and webserver user echo "chown -R $WEBUSER:$WEBGROUP $OTRSDEST/var/sessions/" -chown -R $WEBUSER:$WEBGROUP $OTRSDEST/var/sessions/ +$CHOWN -R $WEBUSER:$WEBGROUP $OTRSDEST/var/sessions/ # set the var/log/TicketCounter.log file to OTRS and webserver user echo "touch && chown $OTRSUSER:$WEBGROUP $OTRSDEST/var/log/TicketCounter.log" touch $OTRSDEST/var/log/TicketCounter.log -chown $OTRSUSER:$WEBGROUP $OTRSDEST/var/log/TicketCounter.log +$CHOWN $OTRSUSER:$WEBGROUP $OTRSDEST/var/log/TicketCounter.log chmod 664 $OTRSDEST/var/log/TicketCounter.log @@ -115,19 +117,19 @@ # set the DeleteSessionIDs.pl just to OTRS user echo "(chown && chmod 700) $OTRSUSER:0 $OTRSDEST/bin/DeleteSessionIDs.pl" chmod 700 $OTRSDEST/bin/DeleteSessionIDs.pl -chown $OTRSUSER:0 $OTRSDEST/bin/DeleteSessionIDs.pl +$CHOWN $OTRSUSER:0 $OTRSDEST/bin/DeleteSessionIDs.pl # set the UnlockTickets.pl just to OTRS user echo "(chown && chmod 700) $OTRSUSER:0 $OTRSDEST/bin/UnlockTickets.pl" chmod 700 $OTRSDEST/bin/UnlockTickets.pl -chown $OTRSUSER:0 $OTRSDEST/bin/UnlockTickets.pl +$CHOWN $OTRSUSER:0 $OTRSDEST/bin/UnlockTickets.pl # set the bin/otrs.getConfig just to OTRS user echo "(chown && chmod 700) $OTRSUSER:0 $OTRSDEST/bin/otrs.getConfig" chmod 700 $OTRSDEST/bin/otrs.getConfig -chown $OTRSUSER:0 $OTRSDEST/bin/otrs.getConfig +$CHOWN $OTRSUSER:0 $OTRSDEST/bin/otrs.getConfig # set write permission for web installer -chown $WEBUSER $OTRSDEST/Kernel/Config.pm +$CHOWN $WEBUSER $OTRSDEST/Kernel/Config.pm exit; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de