update to 2.91 [release 2.91-1mamba;Sat Jun 21 2014]

postfixadmin-2.91-fetchmail-fix-extra-ssl-options.patch

@@ -0,0 +1,12 @@
+diff -Nru postfixadmin-2.91.orig/ADDITIONS/fetchmail.pl postfixadmin-2.91/ADDITIONS/fetchmail.pl
+--- postfixadmin-2.91.orig/ADDITIONS/fetchmail.pl	2013-08-18 20:40:57.000000000 +0200
++++ postfixadmin-2.91/ADDITIONS/fetchmail.pl	2014-06-21 18:47:36.724487350 +0200
+@@ -94,7 +94,7 @@
+ 
+ my (%config);
+ map{
+-	my ($id,$mailbox,$src_server,$src_auth,$src_user,$src_password,$src_folder,$fetchall,$keep,$protocol,$mda,$extra_options,$usessl)=@$_;
++	my ($id,$mailbox,$src_server,$src_auth,$src_user,$src_password,$src_folder,$fetchall,$keep,$protocol,$mda,$extra_options,$usessl,$sslcertck,$sslcertpath,$sslfingerprint)=@$_;
+ 
+ 	syslog("info","fetch ${src_user}@${src_server} for ${mailbox}");
+ 

postfixadmin.spec

@@ -3,8 +3,8 @@
 %define vacationuserid 65423
 
 Name:          postfixadmin
-Version:       2.3.7
+Version:       2.91
-Release:       3mamba
+Release:       1mamba
 Summary:       A Web Based Management tool for Postfix
 Group:         Applications/Web
 Vendor:        openmamba
@@ -16,6 +16,7 @@ Source1:       %{name}-httpd.d.conf
 Source2:       %{name}-vacation.conf
 Patch0:        %{name}-2.2.1.1-css_menu_width.patch
 Patch1:        %{name}-2.3-fix_php_path.patch
+Patch2:        postfixadmin-2.91-fetchmail-fix-extra-ssl-options.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: perl-Imap
@@ -54,8 +55,9 @@ Postfixadmin support files for cyrus-imap.
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
-%patch1 -p1
+#%patch1 -p1
+%patch2 -p1
 
 %build
 
@@ -122,44 +124,11 @@ exit 0
 #%config %attr(0640,root,nobody) %{htmldir}/admin/.htaccess
 #%config(noreplace) %attr(0640,root,nobody) %{htmldir}/admin/.htpasswd
 %attr(0755,root,root) %dir %{htmldir}
-%attr(0640,root,nobody) %{htmldir}/css/*
+%attr(-,apache,nobody) %{htmldir}/css/*
-%config %attr(0640,root,nobody) %{htmldir}/config.inc.php
+%config(noreplace) %attr(0640,apache,nobody) %{htmldir}/config.inc.php
-%attr(0640,root,nobody) %{htmldir}/backup.php
+%attr(-,apache,nobody) %{htmldir}/*.php
-%attr(0640,root,nobody) %{htmldir}/broadcast-message.php
+%attr(-,apache,nobody) %{htmldir}/build-stamp
-%attr(0640,root,nobody) %{htmldir}/common.php
+%attr(-,apache,nobody) %{htmldir}/calendar.js
-%attr(0640,root,nobody) %{htmldir}/create-admin.php
-%attr(0640,root,nobody) %{htmldir}/create-alias.php
-%attr(0640,root,nobody) %{htmldir}/create-alias-domain.php
-%attr(0640,root,nobody) %{htmldir}/create-domain.php
-%attr(0640,root,nobody) %{htmldir}/create-mailbox.php
-%attr(0640,root,nobody) %{htmldir}/delete.php
-%attr(0640,root,nobody) %{htmldir}/edit-active.php
-%attr(0640,root,nobody) %{htmldir}/edit-active-admin.php
-%attr(0640,root,nobody) %{htmldir}/edit-active-domain.php
-%attr(0640,root,nobody) %{htmldir}/edit-admin.php
-%attr(0640,root,nobody) %{htmldir}/edit-alias.php
-%attr(0640,root,nobody) %{htmldir}/edit-domain.php
-%attr(0640,root,nobody) %{htmldir}/edit-mailbox.php
-%attr(0640,root,nobody) %{htmldir}/edit-vacation.php
-%attr(0640,root,nobody) %{htmldir}/fetchmail.php
-%attr(0640,root,nobody) %{htmldir}/functions.inc.php
-%attr(0640,root,nobody) %{htmldir}/index.php
-%attr(0640,root,nobody) %{htmldir}/list-admin.php
-%attr(0640,root,nobody) %{htmldir}/list-domain.php
-%attr(0640,root,nobody) %{htmldir}/list-virtual.php
-%attr(0640,root,nobody) %{htmldir}/login.php
-%attr(0640,root,nobody) %{htmldir}/logout.php
-%attr(0640,root,nobody) %{htmldir}/main.php
-%attr(0640,root,nobody) %{htmldir}/password.php
-%attr(0640,root,nobody) %{htmldir}/search.php
-%attr(0640,root,nobody) %{htmldir}/sendmail.php
-%attr(0640,root,nobody) %{htmldir}/setup.php
-%attr(0640,root,nobody) %{htmldir}/upgrade.php
-%attr(0640,root,nobody) %{htmldir}/variables.inc.php
-%attr(0640,root,nobody) %{htmldir}/viewlog.php
-%attr(0640,root,nobody) %{htmldir}/xmlrpc.php
-%attr(0640,root,nobody) %{htmldir}/motd*.txt
-%attr(0640,root,nobody) %{htmldir}/admin/*.php
 %dir %{htmldir}/DOCUMENTS
 %{htmldir}/DOCUMENTS/*
 %dir %{htmldir}/ADDITIONS
@@ -173,16 +142,31 @@ exit 0
 %{htmldir}/ADDITIONS/postfixadmin-mailbox-postcreation.sh
 %{htmldir}/ADDITIONS/postfixadmin-mailbox-postdeletion.sh
 %{htmldir}/ADDITIONS/virtualmaildel.php
-%attr(0640,root,nobody) %{htmldir}/images/*.png
+%dir %attr(-,apache,nobody) %{htmldir}/configs
-%attr(0640,root,nobody) %{htmldir}/images/postfixadmin2.xcf
+%attr(-,apache,nobody) %{htmldir}/configs/menu.conf
-%attr(0640,root,nobody) %{htmldir}/images/index.php
+%dir %attr(-,apache,nobody) %{htmldir}/images
-%attr(0640,root,nobody) %{htmldir}/languages/*
+%attr(-,apache,nobody) %{htmldir}/images/*.png
-%attr(0640,root,nobody) %{htmldir}/model/*
+%attr(-,apache,nobody) %{htmldir}/images/*.gif
-%attr(0640,root,nobody) %{htmldir}/templates/*.php
+%dir %attr(-,apache,nobody) %{htmldir}/images/calendar
-%attr(0640,root,nobody) %{htmldir}/users/*.php
+%attr(-,apache,nobody) %{htmldir}/images/calendar/*
-%attr(0640,root,nobody) %dir %{htmldir}/VIRTUAL_VACATION
+%attr(-,apache,nobody) %{htmldir}/images/postfixadmin2.xcf
-%attr(0640,root,nobody) %{htmldir}/VIRTUAL_VACATION/*
+%attr(-,apache,nobody) %{htmldir}/images/index.php
-%attr(-,root,nobody)%{htmldir}/tests
+%dir %attr(-,apache,nobody) %{htmldir}/languages
+%attr(-,apache,nobody) %{htmldir}/languages/*
+%dir %attr(-,apache,nobody) %{htmldir}/model
+%attr(-,apache,nobody) %{htmldir}/model/*
+%dir %attr(-,apache,nobody) %{htmldir}/scripts
+%attr(-,apache,nobody) %{htmldir}/scripts/*
+%dir %attr(-,apache,nobody) %{htmldir}/smarty
+%attr(-,apache,nobody) %{htmldir}/smarty/*
+%dir %attr(-,apache,nobody) %{htmldir}/templates
+%attr(-,apache,nobody) %{htmldir}/templates/*
+%dir %attr(-,apache,nobody) %{htmldir}/templates_c
+%dir %attr(-,apache,nobody) %{htmldir}/users
+%attr(-,apache,nobody) %{htmldir}/users/*
+%attr(-,apache,nobody) %dir %{htmldir}/VIRTUAL_VACATION
+%attr(-,apache,nobody) %{htmldir}/VIRTUAL_VACATION/*
+%attr(-,apache,nobody)%{htmldir}/tests
 %attr(0700,vacation,vacation) %dir /var/spool/vacation
 %attr(0700,vacation,vacation) /var/spool/vacation/vacation.pl
 %{htmldir}/CHANGELOG.TXT
@@ -197,6 +181,9 @@ exit 0
 %dir %{htmldir}/ADDITIONS/cyrus/*
 
 %changelog
+* Sat Jun 21 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.91-1mamba
+- update to 2.91
+
 * Sat Jun 21 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.3.7-3mamba
 - require fetchmail, perl-LockFile-Simple and other perl requirements for fetchmail.pl
 - provide /var/run/fetchmail required by fetchmail.pl