Hello community, here is the log from the commit of package otrs for openSUSE:Factory checked in at Thu May 26 14:39:14 CEST 2011.
-------- --- otrs/otrs.changes 2011-05-07 12:46:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/otrs/otrs.changes 2011-05-22 18:48:33.000000000 +0200 @@ -1,0 +2,28 @@ +Sun May 22 16:47:15 UTC 2011 - [email protected] + +- update to 3.0.7 + o several OTRS bug fixes (http://bugs.otrs.org/) + for more info please see CHANGES file +- update OTRS::ITSM to 3.0.3 + o for more info please see + http://lists.otrs.org/pipermail/itsm-announce/2011/subject.html +- reworked init patch + o removed 2.4.7-init + o added 3.0.7-init +- move /opt to /srv + o add 3.0.7-httpd_conf patch + o updated + - ZZZAuto.pm + - sysconfig.otrs + - itsm.README.{de,en} +- spec mods + o add macro {otrs_root} + o macro usage + o wrong-file-end-of-line-encoding + INSTALL-3.0.ITSM +- do not overwrite Kernel/Config.pm* on update +- rework dir/file permissions + o remove sbits from var/{article,log} + o add 3.0.7-perm patch (no check_permission on /bin/) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- itsm-2.1.3.tar.bz2 otrs-2.4.10.tar.bz2 otrs-2.4.7-init.patch rpmlintrc New: ---- itsm-3.0.3.tar.bz2 otrs-3.0.7-httpd_conf.patch otrs-3.0.7-init.patch otrs-3.0.7-perm.patch otrs-3.0.7.tar.bz2 otrs.rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ otrs.spec ++++++ --- /var/tmp/diff_new_pack.hnTQwG/_old 2011-05-26 12:50:35.000000000 +0200 +++ /var/tmp/diff_new_pack.hnTQwG/_new 2011-05-26 12:50:35.000000000 +0200 @@ -16,10 +16,11 @@ # +%define otrs_ver 3.0.7 +%define itsm_ver 3.0.3 +%define itsm_min 3.0 +%define otrs_root /srv %define otrsdoc_dir_files CHANGES COPYING* CREDITS INSTALL README* TODO UPGRADING doc -%define otrs_ver 2.4.10 -%define itsm_ver 2.1.3 -%define itsm_min 2.1 Name: otrs Summary: The Open Ticket Request System @@ -31,21 +32,23 @@ AutoReqProv: off Source: ftp://ftp.otrs.org/pub/otrs/%{name}-%{otrs_ver}.tar.bz2 Source1: itsm-%{itsm_ver}.tar.bz2 -Source2: rpmlintrc +Source2: %{name}.rpmlintrc Source11: sysconfig.%{name} Source12: %{name}.README.en Source13: %{name}.README.de Source14: itsm.README.en Source15: itsm.README.de Source16: ZZZAuto.pm -Patch0: %{name}-2.4.7-init.patch +Patch0: %{name}-3.0.7-init.patch +Patch1: %{name}-3.0.7-httpd_conf.patch +Patch2: %{name}-3.0.7-perm.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq PreReq: coreutils mktemp net-tools pwdutils # /usr/bin/getent PreReq: glibc -PreReq: apache2 grep sed +PreReq: apache2 grep permissions sed BuildRequires: pwdutils %if 0%{?suse_version} > 1020 BuildRequires: fdupes @@ -91,7 +94,7 @@ Version: %{itsm_ver} Release: 1 Group: Productivity/Networking/Email/Utilities -Requires: %{name} >= 2.4.0 +Requires: %{name} >= 3.0.6 Provides: itsm OTRS::ITSM %description itsm @@ -107,87 +110,109 @@ for INSTALL see INSTALL-%{itsm_min}.ITSM please see README.itsm for further details, which comes with otrs package -Required OTRS::ITSM modules can be found under /opt/%{name}/itsm +Required OTRS::ITSM modules can be found under %{otrs_root}/%{name}/itsm Authors list: see CREDITS %prep %setup -q -n %{name}-%{otrs_ver} -a 1 %patch0 -p1 +%patch1 -p1 +%patch2 -p1 find -name ".cvsignore" -type f | xargs rm -fv +find -name ".htaccess" -type f | xargs rm -fv pushd Kernel/Config/Files -%{__cp} %{S:16} . +%__cp %{S:16} . +%__sed -i -e "s,@OTRS_ROOT@,%{otrs_root},g"\ + ZZZAuto.pm ../../../scripts/apache2-httpd.include.conf popd +# fix old otrs_root (/opt) +%__sed -i -e "s,/opt/%{name},%{otrs_root}/%{name},g" \ + bin/otrs.SetPermissions.pl \ + Kernel/Config/Files/Framework.xml \ + Kernel/Config/Defaults.pm \ + Kernel/Config.pm.dist \ + README \ + scripts/apache2-perl-startup.pl \ + scripts/restore.pl + +## rpmlint: +# wrong-file-end-of-line-encoding +%{__perl} -p -i -e "s|\r\n|\n|" itsm-%{itsm_ver}/INSTALL-%{itsm_min}.ITSM + %build %{_sbindir}/groupadd -g 88 -r %{name} 2>/dev/null || : -%{_sbindir}/useradd -c "OTRS User" -d /opt/%{name} -G %{name},www -g %{name} \ +%{_sbindir}/useradd -c "OTRS User" -d %{otrs_root}/%{name} -G %{name},www -g %{name} \ -u 88 -r -s /bin/false %{name} 2>/dev/null || : # copy config file -cp -a Kernel/Config.pm.dist Kernel/Config.pm +%__cp -a Kernel/Config.pm.dist Kernel/Config.pm cd Kernel/Config/ for file in *.dist do - cp -a $file `basename $file .dist` + %__cp -a $file `basename $file .dist` done cd ../../ # copy all crontab dist files for file in var/cron/*.dist do -mv $file var/cron/`basename $file .dist` +%__mv $file var/cron/`basename $file .dist` done -rm INSTALL.RedHat -mv INSTALL.SuSE INSTALL +%__rm INSTALL.RedHat +%__mv INSTALL.SuSE INSTALL %install -export DESTROOT="/opt/%{name}/" -%{__install} -d ${RPM_BUILD_ROOT}/etc/init.d -%{__install} -d ${RPM_BUILD_ROOT}/etc/apache2/conf.d -%{__install} -d ${RPM_BUILD_ROOT}/etc/sysconfig -%{__install} -d ${RPM_BUILD_ROOT}${DESTROOT} -%{__install} -d ${RPM_BUILD_ROOT}%{_sbindir} -%{__install} -d ${RPM_BUILD_ROOT}/var/adm/fillup-templates -cp -a . ${RPM_BUILD_ROOT}/${DESTROOT} +export DESTROOT="%{otrs_root}/%{name}/" +%__install -d ${RPM_BUILD_ROOT}${DESTROOT} +%__install -d ${RPM_BUILD_ROOT}%{_sbindir} +%__cp -a . ${RPM_BUILD_ROOT}/${DESTROOT} for configFile in .fetchmailrc .mailfilter .procmailrc; do touch ${RPM_BUILD_ROOT}/${DESTROOT}/${configFile} done touch $RPM_BUILD_ROOT${DESTROOT}var/log/TicketCounter.log + # install README for lang in en de; do - cp -p "${RPM_SOURCE_DIR}/%{name}.README.${lang}" "README.%{VENDOR}.${lang}" - cp -p "${RPM_SOURCE_DIR}/itsm.README.${lang}" "README.itsm.%{VENDOR}.${lang}" + %__cp -p "${RPM_SOURCE_DIR}/%{name}.README.${lang}" "README.%{VENDOR}.${lang}" + %__cp -p "${RPM_SOURCE_DIR}/itsm.README.${lang}" "README.itsm.%{VENDOR}.${lang}" +done + +# fix @OTRS_ROOT@ in itsm.README.* +for r in $(ls -1 README.itsm.*); do + %__sed -i -e "s,@OTRS_ROOT@,%{otrs_root},g" $r done + # remove files that are part of the docdir pushd ${RPM_BUILD_ROOT}/${DESTROOT} -rm -rf %{otrsdoc_dir_files} -%{__mkdir} doc +%__rm -rf %{otrsdoc_dir_files} +%__install -d doc popd + # remove unneeded files from scripts pushd ${RPM_BUILD_ROOT}/${DESTROOT}/scripts -rm -rf apache{,2}*.conf auto_build* auto_docbuild.sh redhat-* suse-* +%__rm -rf apache{,2}*.conf auto_build* auto_docbuild.sh redhat-* suse-* *.spec test/* tool popd # install sysconfig file and init script -%{__install} -m 644 ${RPM_SOURCE_DIR}/sysconfig.%{name} $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/ -%{__install} -m 755 scripts/suse-rc%{name} ${RPM_BUILD_ROOT}/etc/init.d/%{name} -ln -fs ../../etc/init.d/%{name} ${RPM_BUILD_ROOT}/%{_sbindir}/rc%{name} -# set permission +%__install -D -m0644 ${RPM_SOURCE_DIR}/sysconfig.%{name} $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/sysconfig.%{name} +%__install -D -m0755 scripts/suse-rc%{name} ${RPM_BUILD_ROOT}/etc/init.d/%{name} +%__ln_s -f ../../etc/init.d/%{name} ${RPM_BUILD_ROOT}/%{_sbindir}/rc%{name} ## FIXME - nochown patch obsolete, cause script complete changed -#${RPM_BUILD_ROOT}/opt/%{name}/bin/SetPermissions.sh ${RPM_BUILD_ROOT}/opt/%{name} %{name} wwwrun %{name} www echo +#${RPM_BUILD_ROOT}%{otrs_root}/%{name}/bin/SetPermissions.sh ${RPM_BUILD_ROOT}%{otrs_root}/%{name} %{name} wwwrun %{name} www echo -otrs_apache_conf="scripts/apache2-httpd-new.include.conf" -cp -p ${otrs_apache_conf} ${RPM_BUILD_ROOT}/etc/apache2/conf.d/%{name}.conf +otrs_apache_conf="scripts/apache2-httpd.include.conf" +%__install -D -m0644 ${otrs_apache_conf} ${RPM_BUILD_ROOT}/etc/apache2/conf.d/%{name}.conf # OTRS::ITSM # rename itsm-%{itsm_ver} to itsm pushd ${RPM_BUILD_ROOT}/${DESTROOT} -mv itsm-%{itsm_ver} itsm +%__mv itsm-%{itsm_ver} itsm popd -%if 0%{?suse_version} > 1020 -%fdupes -s ${RPM_BUILD_ROOT} -%endif +#%if 0%{?suse_version} > 1020 +#%fdupes -s ${RPM_BUILD_ROOT} +#%endif %preun %stop_on_removal otrs @@ -204,7 +229,7 @@ fi fi if [ -z "`%{_bindir}/getent passwd %{name} 2>/dev/null`" ]; then - %{_sbindir}/useradd -c "OTRS User" -d /opt/%{name} -G %{name},www -g %{name} -u 88 -r -s /bin/false %{name} 2>/dev/null + %{_sbindir}/useradd -c "OTRS User" -d %{otrs_root}/%{name} -G %{name},www -g %{name} -u 88 -r -s /bin/false %{name} 2>/dev/null else if [ `%{_bindir}/id -u %{name}` != 88 ]; then %{_sbindir}/usermod -G %{name},www -g %{name} -u 88 %{name} 2>/dev/null @@ -216,6 +241,16 @@ %{fillup_and_insserv otrs} /usr/sbin/a2enmod perl >/dev/null # if rpm is not in update mode +# Update ? +if [ ${1:-0} -gt 1 ]; then + # OTRS_ROOT changed from /opt to /srv + if [ -f /opt/%{name}/Kernel/Config.pm.rpmsave ]; then + %__mv /opt/%{name}/Kernel/Config.pm.rpmsave %{otrs_root}/%{name}/Kernel/ + fi + %{_sbindir}/usermod -d %{otrs_root}/%{name} %{name} + #update sysconfig + %__sed -i -e "s,/opt/%{name},%{otrs_root}/%{name},g" /etc/sysconfig/%{name} +fi if ! [ ${FIRST_ARG:-0} -gt 1 ]; then if [ -z "${YAST_IS_RUNNING}" ]; then for lang in LC_ALL LC_MESSAGE LANG; do @@ -254,92 +289,136 @@ /usr/sbin/rc%{name} %{_var}/adm/fillup-templates/sysconfig.%{name} +############### +## {otrs,otrs} +############### + # otrs HOME %defattr(-,%{name},%{name}) -%dir /opt/%{name} -%ghost %config(noreplace) /opt/%{name}/.fetchmailrc -%ghost %config(noreplace) /opt/%{name}/.mailfilter -%ghost %config(noreplace) /opt/%{name}/.procmailrc -/opt/%{name}/.fetchmailrc.dist -/opt/%{name}/.mailfilter.dist -/opt/%{name}/.procmailrc.dist -/opt/%{name}/ARCHIVE -/opt/%{name}/RELEASE - -# doc and scripts -%defattr(-,wwwrun,%{name}) -%dir /opt/%{name}/doc -/opt/%{name}/scripts/ - -# Kernel DIR -%defattr(0644,wwwrun,www,0755) -%dir /opt/%{name}/Kernel -%config(noreplace) /opt/%{name}/Kernel/Config.pm -/opt/%{name}/Kernel/Config.pm.dist -%dir /opt/%{name}/Kernel/Config -/opt/%{name}/Kernel/Config/Defaults.pm -%config(noreplace) /opt/%{name}/Kernel/Config/GenericAgent.pm -/opt/%{name}/Kernel/Config/GenericAgent.pm.* -%dir /opt/%{name}/Kernel/Config/Files -/opt/%{name}/Kernel/Config/Files/Framework.xml -/opt/%{name}/Kernel/Config/Files/Ticket.xml -/opt/%{name}/Kernel/cpan-lib -/opt/%{name}/Kernel/Language.pm -%dir /opt/%{name}/Kernel/Language -%config(noreplace) /opt/%{name}/Kernel/Language/*.pm -/opt/%{name}/Kernel/Modules/ -%config(noreplace) /opt/%{name}/Kernel/Output/HTML/Standard/*.dtl -%config(noreplace) /opt/%{name}/Kernel/Output/HTML/Lite/*.dtl -%dir /opt/%{name}/Kernel/Output -%dir /opt/%{name}/Kernel/Output/HTML -%dir /opt/%{name}/Kernel/Output/HTML/Lite -%dir /opt/%{name}/Kernel/Output/HTML/Standard -/opt/%{name}/Kernel/Output/HTML/*.pm -/opt/%{name}/Kernel/System/ +%dir %{otrs_root}/%{name} +%ghost %config(noreplace) %{otrs_root}/%{name}/.fetchmailrc +%ghost %config(noreplace) %{otrs_root}/%{name}/.mailfilter +%ghost %config(noreplace) %{otrs_root}/%{name}/.procmailrc +%{otrs_root}/%{name}/.fetchmailrc.dist +%{otrs_root}/%{name}/.mailfilter.dist +%{otrs_root}/%{name}/.procmailrc.dist +%{otrs_root}/%{name}/ARCHIVE +%{otrs_root}/%{name}/RELEASE + +# scripts +%{otrs_root}/%{name}/scripts/*.php +%{otrs_root}/%{name}/scripts/*.pl +%{otrs_root}/%{name}/scripts/*.pm +%{otrs_root}/%{name}/scripts/*.sql +%{otrs_root}/%{name}/scripts/database +%{otrs_root}/%{name}/scripts/tools + +#%defattr(0755,wwwrun,%{name},0755) +# var/httpd +%{otrs_root}/%{name}/var/httpd/ + +############### +## {otrs,www} +############### +%defattr(0644,%{name},www,0775) # bin -%defattr(0755,wwwrun,%{name},0755) -/opt/%{name}/bin -%attr(0700,%{name},root) /opt/%{name}/bin/DeleteSessionIDs.pl -%attr(0700,%{name},root) /opt/%{name}/bin/UnlockTickets.pl -%attr(0700,%{name},root) /opt/%{name}/bin/%{name}.getConfig +%{otrs_root}/%{name}/bin +%exclude %{otrs_root}/%{name}/bin/%{name}.DeleteSessionIDs.pl +%exclude %{otrs_root}/%{name}/bin/%{name}.UnlockTickets.pl +%exclude %{otrs_root}/%{name}/bin/%{name}.GetConfig.pl +#%attr(0700,%{name},%{name}) %{otrs_root}/%{name}/bin/%{name}.DeleteSessionIDs.pl +#%attr(0700,%{name},%{name}) %{otrs_root}/%{name}/bin/%{name}.UnlockTickets.pl +#%attr(0700,%{name},%{name}) %{otrs_root}/%{name}/bin/%{name}.GetConfig.pl + +# doc and scripts +%dir %{otrs_root}/%{name}/doc +%dir %{otrs_root}/%{name}/scripts +%dir %{otrs_root}/%{name}/scripts/test # var -%defattr(0644,%{name},www,0775) -%dir /opt/%{name}/var -/opt/%{name}/var/logo-%{name}.png -%dir /opt/%{name}/var/cron -%config(noreplace) /opt/%{name}/var/cron/* -#%dir /opt/%{name}/var/packages -/opt/%{name}/var/packages -#%dir /opt/%{name}/var/pics -/opt/%{name}/var/pics -%dir /opt/%{name}/var/spool +%dir %{otrs_root}/%{name}/var +%{otrs_root}/%{name}/var/logo-%{name}.png + +# var/cron +%dir %{otrs_root}/%{name}/var/cron +%config(noreplace) %{otrs_root}/%{name}/var/cron/* + +# var/{packages,spool} +%{otrs_root}/%{name}/var/packages +%dir %{otrs_root}/%{name}/var/spool + +# var/{article,log,tmp} +#defattr(0644,%{name},www,2775) +%dir %{otrs_root}/%{name}/var/article +%dir %{otrs_root}/%{name}/var/log +%ghost %config(noreplace) %attr(660,%{name},www) %{otrs_root}/%{name}/var/log/TicketCounter.log -# change defattr %defattr(0644,%{name},www,2775) -%dir /opt/%{name}/var/article -%dir /opt/%{name}/var/log -%ghost %config(noreplace) %attr(660,%{name},www) /opt/%{name}/var/log/TicketCounter.log -%dir /opt/%{name}/var/tmp +%dir %{otrs_root}/%{name}/var/tmp -# change defattr +#%dir %{otrs_root}/%{name}/var/httpd/htdocs/js +#%dir %{otrs_root}/%{name}/var/httpd/htdocs/js/js-cache + +#%{otrs_root}/%{name}/var/httpd/htdocs/skins/Agent/default +#%{otrs_root}/%{name}/var/httpd/htdocs/skins/Customer/default + +############### +## {wwwrun,www} +############### + +# var/tmp/Cache %defattr(0644,wwwrun,www,0755) -#%dir /opt/%{name}/var/httpd -/opt/%{name}/var/httpd/ -%dir /opt/%{name}/var/sessions -%dir /opt/%{name}/var/stats -/opt/%{name}/var/stats/* +%dir %{otrs_root}/%{name}/var/tmp/Cache + +# var/httpd/htdocs +%{otrs_root}/%{name}/var/httpd/htdocs + +# var/{session,stats} +%dir %{otrs_root}/%{name}/var/sessions +%dir %{otrs_root}/%{name}/var/stats +%{otrs_root}/%{name}/var/stats/* + +# Custom DIR +#defattr(0644,wwwrun,www,0755) +%dir %{otrs_root}/%{name}/Custom +%{otrs_root}/%{name}/Custom/README + +# Kernel DIR +#defattr(0644,wwwrun,www,0755) +%dir %{otrs_root}/%{name}/Kernel +%config(noreplace) %attr(0640,wwwrun,www) %{otrs_root}/%{name}/Kernel/Config.pm +%{otrs_root}/%{name}/Kernel/Config.pm.dist +%dir %{otrs_root}/%{name}/Kernel/Config +%{otrs_root}/%{name}/Kernel/Config/Defaults.pm +%config(noreplace) %{otrs_root}/%{name}/Kernel/Config/GenericAgent.pm +%{otrs_root}/%{name}/Kernel/Config/GenericAgent.pm.* +%dir %{otrs_root}/%{name}/Kernel/Config/Files +%{otrs_root}/%{name}/Kernel/Config/Files/Framework.xml +%{otrs_root}/%{name}/Kernel/Config/Files/Ticket.xml +%{otrs_root}/%{name}/Kernel/cpan-lib +%{otrs_root}/%{name}/Kernel/Language.pm +%dir %{otrs_root}/%{name}/Kernel/Language +%config(noreplace) %{otrs_root}/%{name}/Kernel/Language/*.pm +%{otrs_root}/%{name}/Kernel/Modules/ +%config(noreplace) %{otrs_root}/%{name}/Kernel/Output/HTML/Standard/*.dtl +#config(noreplace) %{otrs_root}/%{name}/Kernel/Output/HTML/Lite/*.dtl +%dir %{otrs_root}/%{name}/Kernel/Output +%dir %{otrs_root}/%{name}/Kernel/Output/HTML +#dir %{otrs_root}/%{name}/Kernel/Output/HTML/Lite +%dir %{otrs_root}/%{name}/Kernel/Output/HTML/Standard +%{otrs_root}/%{name}/Kernel/Output/HTML/*.pm +%{otrs_root}/%{name}/Kernel/System/ %files doc %defattr(-,root,root) -%doc %{otrsdoc_dir_files} scripts/apache2-httpd-new.include.conf +%doc %{otrsdoc_dir_files} scripts/apache2-httpd.include.conf %files itsm %defattr(-,root,root) %doc itsm-%{itsm_ver}/INSTALL-%{itsm_min}.ITSM -#/opt/%{name}/itsm-%{itsm_ver} -/opt/%{name}/itsm -%config %attr(-,wwwrun,www) /opt/%{name}/Kernel/Config/Files/ZZZAuto.pm +#%{otrs_root}/%{name}/itsm-%{itsm_ver} +%{otrs_root}/%{name}/itsm +%config %attr(0644,wwwrun,www) %{otrs_root}/%{name}/Kernel/Config/Files/ZZZAuto.pm %changelog ++++++ ZZZAuto.pm ++++++ --- /var/tmp/diff_new_pack.hnTQwG/_old 2011-05-26 12:50:35.000000000 +0200 +++ /var/tmp/diff_new_pack.hnTQwG/_new 2011-05-26 12:50:35.000000000 +0200 @@ -9,9 +9,9 @@ $Self->{'DefaultLanguage'} = 'de'; $Self->{'LogModule'} = 'Kernel::System::Log::File'; $Self->{'Package::RepositoryList'} = { - 'file:///opt/otrs/itsm/packages21/' => '[--OTRS::ITSM local repo]', - 'http://ftp.otrs.org/pub/otrs/itsm/packages20/' => '[--OTRS::ITSM 2.0 Master--] http://ftp.otrs.org/', - 'http://ftp.otrs.org/pub/otrs/itsm/packages21/' => '[--OTRS::ITSM 2.1 Master--] http://ftp.otrs.org/' + 'file://@OTRS_ROOT@/otrs/itsm/packages30/' => '[--OTRS::ITSM local repo]', + 'http://ftp.otrs.org/pub/otrs/itsm/packages21/' => '[--OTRS::ITSM 2.1 Master--] http://ftp.otrs.org/', + 'http://ftp.otrs.org/pub/otrs/itsm/packages30/' => '[--OTRS::ITSM 3.0 Master--] http://ftp.otrs.org/' }; $Self->{'Package::RepositoryAccessRegExp'} = '127\\.0\\.0\\.1'; } ++++++ itsm-2.1.3.tar.bz2 -> itsm-3.0.3.tar.bz2 ++++++ ++++ 17283 lines of diff (skipped) ++++++ itsm.README.de ++++++ --- /var/tmp/diff_new_pack.hnTQwG/_old 2011-05-26 12:50:36.000000000 +0200 +++ /var/tmp/diff_new_pack.hnTQwG/_new 2011-05-26 12:50:36.000000000 +0200 @@ -6,7 +6,7 @@ Hierbei sollten sie folgendes beachten: - mit der Installation dieses Pakets wird die Datei - /opt/otrs/Kernel/Config/Files/ZZZAuto.pm hinzugefügt, welches ein lokales + @OTRS_ROOT@/otrs/Kernel/Config/Files/ZZZAuto.pm hinzugefügt, welches ein lokales Repository zur Installation von OTRS::ITSM Modulen zur Verfügung stellt. Somit muß das OTRS System nicht zwingend eine Verbindung zum Internet haben. @@ -21,7 +21,7 @@ o aktivieren Sie "Package::RepositoryAccessRegExp:" und belassen Sie den (Default: 127\.0\.0\.1) Wert o fügen Sie bei "Package::RepositoryList:" ein neues Repository hinzu - Schlüssel: file:///opt/otrs/itsm/packages21/ + Schlüssel: file://@OTRS_ROOT@/otrs/itsm/packages21/ Inhalt: [--OTRS::ITSM local repo] -> klicken Sie auf Aktualisieren ++++++ itsm.README.en ++++++ --- /var/tmp/diff_new_pack.hnTQwG/_old 2011-05-26 12:50:36.000000000 +0200 +++ /var/tmp/diff_new_pack.hnTQwG/_new 2011-05-26 12:50:36.000000000 +0200 @@ -5,7 +5,7 @@ You should take care of the following info - with installing this package, there will be - /opt/otrs/Kernel/Config/Files/ZZZAuto.pm added, which provides a local repo + @OTRS_ROOT/otrs/Kernel/Config/Files/ZZZAuto.pm added, which provides a local repo for installing all needed ITSM modules. So your OTRS System does not need to have internet access. @@ -19,7 +19,7 @@ o activate "Package::RepositoryAccessRegExp:" and leave (Default: 127\.0\.0\.1) value as is. o on "Package::RepositoryList:" add a new repo - Key: file:///opt/otrs/itsm/packages21/ + Key: file://@OTRS_ROOT/otrs/itsm/packages21/ Value: [--OTRS::ITSM local repo] -> click refresh ++++++ otrs-3.0.7-httpd_conf.patch ++++++ diff -ruN otrs-3.0.7-orig/scripts/apache2-httpd.include.conf otrs-3.0.7/scripts/apache2-httpd.include.conf --- otrs-3.0.7-orig/scripts/apache2-httpd.include.conf 2011-03-20 09:37:54.000000000 +0100 +++ otrs-3.0.7/scripts/apache2-httpd.include.conf 2011-05-07 13:09:54.000000000 +0200 @@ -4,8 +4,8 @@ # -- # agent, admin and customer frontend -ScriptAlias /otrs/ "/opt/otrs/bin/cgi-bin/" -Alias /otrs-web/ "/opt/otrs/var/httpd/htdocs/" +ScriptAlias /otrs/ "@OTRS_ROOT@/otrs/bin/cgi-bin/" +Alias /otrs-web/ "@OTRS_ROOT@/otrs/var/httpd/htdocs/" # activate this if you are using an Oracle database #SetEnv ORACLE_HOME /path/to/your/oracle/ @@ -17,7 +17,7 @@ <IfModule mod_perl.c> # load all otrs modules - Perlrequire /opt/otrs/scripts/apache2-perl-startup.pl + Perlrequire @OTRS_ROOT@/otrs/scripts/apache2-perl-startup.pl # Apache::Reload - Reload Perl Modules when Changed on Disk PerlModule Apache2::Reload @@ -40,26 +40,53 @@ </IfModule> # directory settings -<Directory "/opt/otrs/bin/cgi-bin/"> +<Directory "@OTRS_ROOT@/otrs/bin/cgi-bin/"> AllowOverride None Options +ExecCGI -Includes Order allow,deny Allow from all </Directory> -<Directory "/opt/otrs/var/httpd/htdocs/"> +<Directory "@OTRS_ROOT@/otrs/var/httpd/htdocs/"> + Options +FollowSymlinks AllowOverride None Order allow,deny Allow from all </Directory> +<Directory "@OTRS_ROOT@/otrs/var/httpd/htdocs/js/thirdparty/ckeditor-3.4.2/"> + # + # Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. + # For licensing, see LICENSE.html or http://ckeditor.com/license + # + + # + # On some specific Linux installations you could face problems with Firefox. + # It could give you errors when loading the editor saying that some illegal + # characters were found (three strange chars in the beginning of the file). + # This could happen if you map the .js or .css files to PHP, for example. + # + # Those characters are the Byte Order Mask (BOM) of the Unicode encoded files. + # All FCKeditor files are Unicode encoded. + # + + AddType application/x-javascript .js + AddType text/css .css + + # + # If PHP is mapped to handle XML files, you could have some issues. The + # following will disable it. + # + + AddType text/xml .xml +</Directory> <IfModule mod_headers.c> - <Directory "/opt/otrs/var/httpd/htdocs/skins/*/*/css-cache"> + <Directory "@OTRS_ROOT@/otrs/var/httpd/htdocs/skins/*/*/css-cache"> <FilesMatch "\.(css|CSS)$"> Header set Cache-Control "max-age=2592000 must-revalidate" </FilesMatch> </Directory> - <Directory "/opt/otrs/var/httpd/htdocs/js_new/js-cache"> + <Directory "@OTRS_ROOT@/otrs/var/httpd/htdocs/js_new/js-cache"> <FilesMatch "\.(js|JS)$"> Header set Cache-Control "max-age=2592000 must-revalidate" </FilesMatch> ++++++ otrs-2.4.7-init.patch -> otrs-3.0.7-init.patch ++++++ --- otrs/otrs-2.4.7-init.patch 2010-04-06 23:16:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/otrs/otrs-3.0.7-init.patch 2011-05-07 13:31:16.000000000 +0200 @@ -1,7 +1,7 @@ -diff -ruN otrs-2.4.7-orig/scripts/suse-rcotrs otrs-2.4.7/scripts/suse-rcotrs ---- otrs-2.4.7-orig/scripts/suse-rcotrs 2009-02-26 11:10:53.000000000 +0000 -+++ otrs-2.4.7/scripts/suse-rcotrs 2010-04-06 20:01:18.497176680 +0000 -@@ -12,11 +12,14 @@ +diff -ruN otrs-3.0.7-orig/scripts/suse-rcotrs otrs-3.0.7/scripts/suse-rcotrs +--- otrs-3.0.7-orig/scripts/suse-rcotrs 2010-10-11 19:21:09.000000000 +0200 ++++ otrs-3.0.7/scripts/suse-rcotrs 2011-05-07 13:12:38.000000000 +0200 +@@ -12,25 +12,39 @@ ### BEGIN INIT INFO # Provides: otrs @@ -19,7 +19,119 @@ ### END INIT INFO export LANG=POSIX -@@ -394,6 +397,16 @@ + PATH="/bin:/usr/bin:/sbin:/usr/sbin" + +-# +-# load the configuration +-# +-CONFIGFILE="rcconfig file not found!" +-test -r /etc/rc.config && . /etc/rc.config +- +-test -r /etc/rc.config.d/otrs && . /etc/rc.config.d/otrs && CONFIGFILE=/etc/rc.config.d/otrs +- +-test -r /etc/sysconfig/otrs && . /etc/sysconfig/otrs && CONFIGFILE=/etc/sysconfig/otrs ++# Check for existence of needed config file and read it ++OTRS_SYSCONFIG=/etc/sysconfig/otrs ++test -r $OTRS_SYSCONFIG || { echo "$OTRS_SYSCONFIG not existing"; ++ if [ "$1" = "stop" ]; then exit 0; ++ else exit 6; fi; } ++ ++# Read config ++. $OTRS_SYSCONFIG ++ ++test -z $OTRS_ROOT || { echo "OTRS_ROOT not set"; ++ echo "check config: $OTRS_SYSCONFIG"; ++ exit 6; } ++ ++test -z $OTRS_POSTMASTER || { echo "OTRS_POSTMASTER not set"; ++ echo "check config: $OTRS_SYSCONFIG"; ++ exit 6; } ++ ++test -z $OTRS_SPOOLDIR || { echo "OTRS_SPOOLDIR not set"; ++ echo "check config: $OTRS_SYSCONFIG"; ++ exit 6; } + + # Shell functions sourced from /etc/rc.status: + # rc_check check and set local and overall rc status +@@ -41,64 +55,22 @@ + # rc_failed <num> set local and overall rc status to <num> + # rc_reset clear local rc status (overall remains) + # rc_exit exit appropriate to overall rc status +-test -s /etc/rc.status && . /etc/rc.status +- +-# +-# check needed variable +-# +-if ! test $OTRS_ROOT; then +- echo "Error: Corrupt config file ($CONFIGFILE)! OTRS_ROOT not found! Please check your /etc/sysconfig/otrs - maybe it wasn't changed by rpm!" +- exit 5 +-fi +-if ! test $OTRS_POSTMASTER; then +- echo "Error: Corrupt config file ($CONFIGFILE)! OTRS_POSTMASTER not found! Please check your /etc/sysconfig/otrs - maybe it wasn't changed by rpm!" +- exit 5 +-fi +-if ! test $OTRS_SPOOLDIR; then +- echo "Error: Corrupt config file ($CONFIGFILE)! OTRS_SPOOLDIR not found! Please check your /etc/sysconfig/otrs - maybe it wasn't changed by rpm!" +- exit 5 +-fi +-# +-# check needed files +-# +-if ! test -r $OTRS_ROOT; then +- echo "Error: $OTRS_ROOT not found!" +- exit 5 +-fi +- +-if ! test -r $OTRS_POSTMASTER; then +- echo "Error: $OTRS_POSTMASTER not found!" +- exit 5 +-fi +- +-if ! test -d $OTRS_SPOOLDIR; then +- echo "Error: $OTRS_SPOOLDIR not found!" +- exit 5 +-fi +- +-if ! test -r $OTRS_CHECKDB; then +- echo "Error: $OTRS_CHECKDB not found!" +- exit 5 +-fi +- +-if test $OTRS_CLEANUP; then +- if ! test -r $OTRS_CLEANUP; then +- echo "Error: $OTRS_CLEANUP not found!" +- exit 5 +- fi +-fi ++. /etc/rc.status + +-# reset status of this service ++# Reset status of this service + rc_reset + +-# +-# The echo return value for success (defined in /etc/rc.config). +-# +-return=$rc_done +- +-# +-# main part +-# ++# Return values acc. to LSB for all commands but status: ++# 0 - success ++# 1 - generic or unspecified error ++# 2 - invalid or excess argument(s) ++# 3 - unimplemented feature (e.g. "reload") ++# 4 - user had insufficient privileges ++# 5 - program is not installed ++# 6 - program is not configured ++# 7 - program is not running ++# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) ++ + case "$1" in + # ------------------------------------------------------ + # start +@@ -394,6 +366,16 @@ rc_status ;; # ------------------------------------------------------ @@ -36,15 +148,3 @@ # cleanup # ------------------------------------------------------ cleanup) -diff -ruN otrs-2.4.7-orig/scripts/suse-rcotrs-config otrs-2.4.7/scripts/suse-rcotrs-config ---- otrs-2.4.7-orig/scripts/suse-rcotrs-config 2003-10-29 20:57:11.000000000 +0000 -+++ otrs-2.4.7/scripts/suse-rcotrs-config 2010-04-06 19:52:08.992051015 +0000 -@@ -35,7 +35,7 @@ - # Used webserver [apache] - # - OTRS_USED_WEBSERVER=Apache --OTRS_USED_WEBSERVER_RCSCRIPT=rcapache -+OTRS_USED_WEBSERVER_RCSCRIPT=rcapache2 - - # - # cron stuff ++++++ otrs-3.0.7-perm.patch ++++++ diff -ruN otrs-3.0.7-orig/Kernel/System/Package.pm otrs-3.0.7/Kernel/System/Package.pm --- otrs-3.0.7-orig/Kernel/System/Package.pm 2010-09-23 10:44:35.000000000 +0200 +++ otrs-3.0.7/Kernel/System/Package.pm 2011-05-07 13:13:24.000000000 +0200 @@ -2436,7 +2436,7 @@ } # create test files in following directories - for (qw(/bin/ /Kernel/ /Kernel/System/ /Kernel/Output/ /Kernel/Output/HTML/ /Kernel/Modules/)) { + for (qw(/Kernel/ /Kernel/System/ /Kernel/Output/ /Kernel/Output/HTML/ /Kernel/Modules/)) { my $Location = "$Home/$_/check_permissons.$$"; my $Content = 'test'; ++++++ otrs-2.4.10.tar.bz2 -> otrs-3.0.7.tar.bz2 ++++++ otrs/otrs-2.4.10.tar.bz2 /mounts/work_src_done/STABLE/otrs/otrs-3.0.7.tar.bz2 differ: char 11, line 1 ++++++ otrs.rpmlintrc ++++++ addFilter('hidden-file-or-dir') addFilter('macro-in-comment') addFilter('non-etc-or-var-file-marked-as-conffile') addFilter('non-executable-script') addFilter('zero-length') ++++++ sysconfig.otrs ++++++ --- /var/tmp/diff_new_pack.hnTQwG/_old 2011-05-26 12:50:36.000000000 +0200 +++ /var/tmp/diff_new_pack.hnTQwG/_new 2011-05-26 12:50:36.000000000 +0200 @@ -8,11 +8,11 @@ OTRS_PROG="OTRS" ## Type: string -## Default: /opt/otrs +## Default: /srv/otrs # # OTRS home (root) directory # -OTRS_ROOT="/opt/otrs" +OTRS_ROOT="/srv/otrs" ## Type: string(0,1) ## Default: 1 @@ -118,6 +118,13 @@ OTRS_CHECKDB="$OTRS_ROOT/bin/CheckDB.pl" ## Type: string +## Default: $OTRS_ROOT/bin/CleanUp.pl +# +# Location of the CleanUp.pl script. +# +OTRS_CHECKDB="$OTRS_ROOT/bin/CleanUp.pl" + +## Type: string ## Default: $OTRS_ROOT/var/spool # # Location of the OTRS spool directory. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
