pool/exim
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Install fitting eximstats.conf depending on SUSE version; (bsc#926861).

Browse Source 
- Add attribute dir to /etc/apache2 and /etc/apache2/conf.d in the file list.

OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=164
This commit is contained in:
Lars Müller 2015-04-17 16:29:46 +00:00 committed by Git OBS Bridge
parent 719cba142c
commit 645ea49799
4 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
exim.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 17 15:53:24 UTC 2015 - lmuelle@suse.com
- Install fitting eximstats.conf depending on SUSE version; (bsc#926861).
- Add attribute dir to /etc/apache2 and /etc/apache2/conf.d in the file list.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 13 12:26:23 UTC 2015 - lmuelle@suse.com Fri Mar 13 12:26:23 UTC 2015 - lmuelle@suse.com

15
exim.spec
View File

@ -77,7 +77,8 @@ Source13: apparmor.usr.sbin.exim
Source20: http://www.logic.univie.ac.at/~ametzler/debian/exim4manpages/exim4-manpages.tar.bz2 Source20: http://www.logic.univie.ac.at/~ametzler/debian/exim4manpages/exim4-manpages.tar.bz2
Source30: eximstats-html-update.py Source30: eximstats-html-update.py
Source31: eximstats.conf Source31: eximstats.conf
Source32: exim.service Source32: eximstats.conf-2.2
Source40: exim.service
Patch: exim-tail.patch Patch: exim-tail.patch
Patch1: exim-enable_ecdh_openssl.patch Patch1: exim-enable_ecdh_openssl.patch
@ -273,7 +274,7 @@ make inst_dest=$RPM_BUILD_ROOT/usr/sbin \
mv $RPM_BUILD_ROOT/usr/sbin/exim-%{version}* $RPM_BUILD_ROOT/usr/sbin/exim mv $RPM_BUILD_ROOT/usr/sbin/exim-%{version}* $RPM_BUILD_ROOT/usr/sbin/exim
mv $RPM_BUILD_ROOT/etc/exim/exim.conf src/configure.default # with all substitutions done mv $RPM_BUILD_ROOT/etc/exim/exim.conf src/configure.default # with all substitutions done
%if 0%{?suse_version} > 1220 %if 0%{?suse_version} > 1220
install -m 0644 %{S:32} $RPM_BUILD_ROOT/%{_unitdir}/exim.service install -m 0644 %{S:40} $RPM_BUILD_ROOT/%{_unitdir}/exim.service
%else %else
install -m 0755 %{S:11} $RPM_BUILD_ROOT/etc/init.d/exim install -m 0755 %{S:11} $RPM_BUILD_ROOT/etc/init.d/exim
%endif %endif
@ -326,7 +327,11 @@ chmod 644 util/*.{pl,sh} src/convert4r*
# eximstats-html files # eximstats-html files
mkdir -p $RPM_BUILD_ROOT/srv/www/eximstats mkdir -p $RPM_BUILD_ROOT/srv/www/eximstats
mkdir -p $RPM_BUILD_ROOT/etc/apache2/conf.d/ mkdir -p $RPM_BUILD_ROOT/etc/apache2/conf.d/
cp -p $RPM_SOURCE_DIR/eximstats.conf $RPM_BUILD_ROOT/etc/apache2/conf.d/ %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1310
cp -p %{S:31} $RPM_BUILD_ROOT/etc/apache2/conf.d/
%else
cp -p %{S:32} $RPM_BUILD_ROOT/etc/apache2/conf.d/eximstats.conf
%endif
install -m 0755 $RPM_SOURCE_DIR/eximstats-html-update.py $RPM_BUILD_ROOT/%{_sbindir} install -m 0755 $RPM_SOURCE_DIR/eximstats-html-update.py $RPM_BUILD_ROOT/%{_sbindir}
# apparmor profile # apparmor profile
install -D -m 0644 $RPM_SOURCE_DIR/apparmor.usr.sbin.exim $RPM_BUILD_ROOT/etc/apparmor/profiles/extras/usr.sbin.exim install -D -m 0644 $RPM_SOURCE_DIR/apparmor.usr.sbin.exim $RPM_BUILD_ROOT/etc/apparmor/profiles/extras/usr.sbin.exim
@ -435,8 +440,8 @@ exit 0
%files -n eximstats-html %files -n eximstats-html
%defattr(-,root,root) %defattr(-,root,root)
%attr(0750,root,www) /srv/www/eximstats %attr(0750,root,www) /srv/www/eximstats
/etc/apache2 %dir /etc/apache2
/etc/apache2/conf.d %dir /etc/apache2/conf.d
/etc/apache2/conf.d/eximstats.conf /etc/apache2/conf.d/eximstats.conf
%{_sbindir}/eximstats-html-update.py %{_sbindir}/eximstats-html-update.py

4
eximstats.conf
View File

@ -1,6 +1,6 @@
Alias /eximstats /srv/www/eximstats Alias /eximstats /srv/www/eximstats
<Directory /srv/www/eximstats> <Directory /srv/www/eximstats>
Order allow,deny Require all granted
Allow from all
Options +Indexes Options +Indexes
AllowOverride None
</Directory> </Directory>

6
eximstats.conf-2.2 Normal file
View File

@ -0,0 +1,6 @@
Alias /eximstats /srv/www/eximstats
<Directory /srv/www/eximstats>
Order allow,deny
Allow from all
Options +Indexes
</Directory>