Hello community, here is the log from the commit of package postfixadmin for openSUSE:Factory checked in at 2018-05-03 12:34:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postfixadmin (Old) and /work/SRC/openSUSE:Factory/.postfixadmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "postfixadmin" Thu May 3 12:34:30 2018 rev:28 rq:603334 version:3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/postfixadmin/postfixadmin.changes 2017-06-27 10:21:41.355659496 +0200 +++ /work/SRC/openSUSE:Factory/.postfixadmin.new/postfixadmin.changes 2018-05-03 12:34:30.831724634 +0200 @@ -1,0 +2,24 @@ +Wed May 2 21:36:42 UTC 2018 - [email protected] + +- update to PostfixAdmin 3.2: + - new directory layout (see below) + - enable users to reset their passwords by mail or SMS + ($CONF['forgotten_user_password_reset'], + $CONF['forgotten_admin_password_reset'], $CONF['sms_send_function']) + - allow local alias targets (without @domain) + - add $CONF['edit_alias'] to disable "edit alias" function for users + - add php_crypt $CONF["encrypt"] option + - add support for MySQL connections over SSL + - and more - see CHANGELOG.TXT for the full list +- move out of /srv/www/htdocs/postfixadmin - PHP code moved to + /usr/share/postfixadmin/, smarty cache to /var/cache/postfixadmin/ and + the config files to /etc/postfixadmin/ (no automated migration!) +- add apache config file to glue everything together. Note that the + /postfixadmin alias is *not* enabled by default to avoid that it is + active on all vhosts. Run "a2enflag POSTFIXADMIN" if you want that. +- adjust perl requirements for latest vacation.pl +- drop apache2-devel / httpd-devel BuildRequires - no longer needed with + the new directory layout +- package /usr/bin/postfixadmin-cli symlink + +------------------------------------------------------------------- Old: ---- postfixadmin-3.1.tar.gz New: ---- apache-postfixadmin.conf config.local.php postfixadmin-3.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfixadmin.spec ++++++ --- /var/tmp/diff_new_pack.gMOset/_old 2018-05-03 12:34:31.647695564 +0200 +++ /var/tmp/diff_new_pack.gMOset/_new 2018-05-03 12:34:31.647695564 +0200 @@ -1,7 +1,8 @@ # # spec file for package postfixadmin # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2007-2018 Christian Boltz # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,10 +18,12 @@ Name: postfixadmin -Version: 3.1 +Version: 3.2 Release: 0 Url: http://postfixadmin.sourceforge.net/ Source0: http://sourceforge.net/projects/postfixadmin/files/postfixadmin/%{name}-%{version}/%{name}-%{version}.tar.gz +Source1: config.local.php +Source2: apache-postfixadmin.conf BuildArch: noarch @@ -46,13 +49,17 @@ # vacation.pl Requires: perl(DBI) +Requires: perl(Email::Sender::Simple) +Requires: perl(Email::Sender::Transport::SMTP) +Requires: perl(Email::Simple) +Requires: perl(Email::Simple::Creator) Requires: perl(Email::Valid) Requires: perl(Encode) +Requires: perl(File::Basename) Requires: perl(Getopt::Std) Requires: perl(Log::Log4perl) -Requires: perl(MIME::Base64) Requires: perl(MIME::EncWords) -Requires: perl(Mail::Sender) +Requires: perl(Try::Tiny) Requires: perl(strict) # cleanupdirs.pl @@ -72,15 +79,10 @@ %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_ver} # create vacation user/group PreReq: shadow-utils -BuildRequires: httpd-devel -#define serverroot %(/usr/sbin/apxs -q datadir 2>/dev/null || /usr/sbin/apxs -q PREFIX)/htdocs/ -%define serverroot /var/www/html/ %define apache_group apache %else # create vacation user/group PreReq: pwdutils -BuildRequires: apache2-devel -%define serverroot %(/usr/sbin/apxs2 -q datadir 2>/dev/null || /usr/sbin/apxs2 -q PREFIX)/htdocs/ %define apache_group www Recommends: postfix Suggests: php-pgsql @@ -113,43 +115,46 @@ %setup -q %build -echo "*** serverroot: %{serverroot} ***" %install mkdir -p -m0755 %{buildroot}%{_sysconfdir}/%{name} #mkdir -p -m0755 %{buildroot}%{_datadir}/%{name} -mkdir -p -m0755 %{buildroot}%{serverroot}/%{name} mkdir -p -m0755 %{buildroot}%{_localstatedir}/spool/vacation mkdir -p -m0755 %{buildroot}/%{_prefix}/lib/%{name} -# install the config files -#install -m 0640 config.inc.php.sample %{buildroot}%{_sysconfdir}/%{name}/config.inc.php -#ln -s ../../../..%{_sysconfdir}/%{name}/config.inc.php \ -# %{buildroot}%{_datadir}/%{name}/config.inc.php - -install -m 0644 *.php *.js favicon.ico %{buildroot}%{serverroot}/%{name}/ - mv VIRTUAL_VACATION/vacation.pl %{buildroot}%{_prefix}/lib/%{name}/ # compatibility symlink to match documentation ( cd %{buildroot}%{_localstatedir}/spool/vacation/ && ln -s ../../../usr/lib/%{name}/vacation.pl ) -# copy over the rest -for d in configs css images languages model scripts smarty templates users ; do - cp -rp $d %{buildroot}%{serverroot}/%{name}/ +# copy over the code +mkdir -p -m0755 %{buildroot}/usr/share/%{name}/ +install -m 0644 *.php composer.* %{buildroot}/usr/share/%{name}/ +mv %{buildroot}/usr/share/%{name}/config.inc.php %{buildroot}/etc/%{name}/ +install -m 0644 %{S:1} %{buildroot}/etc/%{name}/config.local.php +for d in configs languages lib model public scripts templates ; do # not copied here: ADDITIONS/ debian/ DOCUMENTS/ tests/ VIRTUAL_VACATION/ + cp -rp $d %{buildroot}/usr/share/%{name}/ done -chmod 755 %{buildroot}%{serverroot}/%{name}/scripts/postfixadmin-cli -install -d %{buildroot}%{serverroot}/%{name}/templates_c +chmod 755 %{buildroot}/usr/share/%{name}/scripts/postfixadmin-cli +install -d %{buildroot}/usr/bin +( cd %{buildroot}/usr/bin && ln -s /usr/share/%{name}/scripts/postfixadmin-cli . ) + +install -d %{buildroot}/var/cache/%{name}/templates_c +install -d %{buildroot}/var/cache/%{name}/sessions + +# create config.local.php and templates_c symlinks +( cd %{buildroot}/usr/share/%{name} && ln -s /etc/postfixadmin/config.inc.php . ) +( cd %{buildroot}/usr/share/%{name} && ln -s /etc/postfixadmin/config.local.php . ) +( cd %{buildroot}/usr/share/%{name} && ln -s /var/cache/%{name}/templates_c . ) # remove files related to debian packaging (to avoid it's copied as %doc) rm -r ADDITIONS/squirrelmail-plugin/debian/ cp -rp ADDITIONS %{buildroot}%{_prefix}/lib//%{name}/ chmod 755 %{buildroot}%{_prefix}/lib/%{name}/ADDITIONS/*.{pl,sh,py} %{buildroot}%{_prefix}/lib/%{name}/ADDITIONS/squirrelmail-plugin/locale/build.sh -# install the config file -#mkdir -p %{buildroot}%{_sysconfdir}/apache2/conf.d -#install -m 644 $RPM_SOURCE_DIR/%{name}.conf \ -# %{buildroot}%{_sysconfdir}/apache2/conf.d/ +# install the apache config file +mkdir -p %{buildroot}%{_sysconfdir}/apache2/conf.d +install -m 0644 %{S:2} %{buildroot}/etc/apache2/conf.d/%{name}.conf %pre %{_sbindir}/groupadd -r vacation 2> /dev/null || : @@ -165,14 +170,32 @@ #EOF #fi +%post +# PostfixAdmin 3.2 comes with a new directory layout - warn if config files are found at the old location +# (no automated migration) +if test -f /srv/www/htdocs/postfixadmin/config.inc.php ; then + echo 'WARNING: /srv/www/htdocs/postfixadmin/config.inc.php found, please migrate your changes to /etc/postfixadmin/config.local.php' >&2 + echo 'WARNING: /srv/www/htdocs/postfixadmin/config.inc.php will be ignored!' >&2 +fi +if test -f /srv/www/htdocs/postfixadmin/config.local.php ; then + echo 'WARNING: /srv/www/htdocs/postfixadmin/config.local.php found, please migrate it to /etc/postfixadmin/config.local.php' >&2 + echo 'WARNING: /srv/www/htdocs/postfixadmin/config.local.php will be ignored!' >&2 +fi + %files %defattr(-,root,root) -#%config %dir %{_sysconfdir}/%{name} -#%attr(640,root,www) %config(noreplace) %{_sysconfdir}/%{name}/*.php -#%config(noreplace) %{_sysconfdir}/apache2/conf.d/*.conf -%doc DOCUMENTS/* *.TXT VIRTUAL_VACATION -%{serverroot}/%{name}/ -%attr(770,root,%{apache_group}) %dir %{serverroot}/%{name}/templates_c/ +%config %dir %{_sysconfdir}/%{name} +%attr(640,root,www) %config %{_sysconfdir}/%{name}/config.inc.php +%attr(640,root,www) %config(noreplace) %{_sysconfdir}/%{name}/config.local.php +%config %dir %{_sysconfdir}/apache2 +%config %dir %{_sysconfdir}/apache2/conf.d +%config(noreplace) %{_sysconfdir}/apache2/conf.d/%{name}.conf +%doc DOCUMENTS/* *.TXT README.md VIRTUAL_VACATION +/usr/bin/postfixadmin-cli +/usr/share/%{name}/ +%attr(770,root,%{apache_group}) %dir /var/cache/%{name}/ +%attr(770,root,%{apache_group}) %dir /var/cache/%{name}/templates_c/ +%attr(770,root,%{apache_group}) %dir /var/cache/%{name}/sessions/ %dir %{_prefix}/lib/%{name}/ %{_prefix}/lib/%{name}/ADDITIONS/ %attr( 750,root,vacation) %{_prefix}/lib/%{name}/vacation.pl ++++++ apache-postfixadmin.conf ++++++ # To enable the /postfixadmin alias, run # a2enflag POSTFIXADMIN && rcapache2 restart # This will make /postfixadmin available on all virtual hosts. # # If you want to have the /postfixadmin alias only on a specific # virtual host, add the alias to the config of that vhost. <IfDefine POSTFIXADMIN> Alias /postfixadmin /usr/share/postfixadmin/public </IfDefine> <Directory /usr/share/postfixadmin> Options FollowSymLinks <IfModule mod_php7.c> php_admin_flag allow_url_include off php_admin_flag allow_url_fopen off php_admin_value open_basedir "/usr/share/postfixadmin:/etc/postfixadmin:/var/cache/postfixadmin:/usr/bin/doveadm" php_admin_value session.save_path /var/cache/postfixadmin/sessions </IfModule> </Directory> <Directory /usr/share/postfixadmin/public> <IfModule !mod_access_compat.c> require all granted </IfModule> <IfModule mod_access_compat.c> order allow,deny allow from all </IfModule> </Directory> # vim:ts=4 expandtab ft=apache ++++++ config.local.php ++++++ <?php ################################################################################ # # # PostfixAdmin local configuration # # # # Use this file for your own configuration settings. # # # # See config.inc.php for all available config options, but please do not # # change that file. Instead, add the options you want to change/override # # to config.local.php (= this file). # # # ################################################################################ # You have to set $CONF['configured'] = true; before the application will run! # Doing this implies you have changed your config as required. # i.e. configuring database etc; specifying setup.php password etc. $CONF['configured'] = false; # In order to setup Postfixadmin, you MUST specify a hashed password here. # To create the hash, visit setup.php in a browser and type a password into the field, # on submission it will be echoed out to you as a hashed value. $CONF['setup_password'] = 'changeme'; # Database Config # mysqli = MySQL 4.1+ or MariaDB # pgsql = PostgreSQL # sqlite = SQLite 3 $CONF['database_type'] = 'mysqli'; $CONF['database_host'] = 'localhost'; $CONF['database_user'] = 'postfix'; $CONF['database_password'] = 'postfixadmin'; $CONF['database_name'] = 'postfix'; ++++++ postfixadmin-3.1.tar.gz -> postfixadmin-3.2.tar.gz ++++++ ++++ 94920 lines of diff (skipped)
