Compare commits

...

10 Commits

Author SHA1 Message Date
Daniel Berteaud
8d48df91bb Automatic commit of package [smeserver-dovecot-extras] release [0.1.5-1].
Created by command:

/usr/bin/tito tag
2018-03-27 16:31:26 +02:00
Daniel Berteaud
6947b77468 Don't set default ACL for authenticated users 2018-03-27 16:31:12 +02:00
Daniel Berteaud
36a2a0f9bd Automatic commit of package [smeserver-dovecot-extras] release [0.1.4-1].
Created by command:

/usr/bin/tito tag
2017-11-19 11:20:19 +01:00
Daniel Berteaud
5697b6555e Configure tito 2017-11-19 11:20:07 +01:00
Daniel Berteaud
e263b9b265 Initialized to use tito. 2017-11-19 11:19:39 +01:00
Daniel Berteaud
ba19b57285 Prepare spec file for tito 2017-11-19 11:19:31 +01:00
Daniel Berteaud
668bbff912 Spec file update 2017-09-07 14:02:37 +02:00
Daniel Berteaud
d5600f7d35 Ignore moves from junkmail to Éléments supprimés
Which is the trash for outlooks in french
2017-09-07 14:01:31 +02:00
Daniel Berteaud
ed65450e4b Syntax error in acl template 2017-06-08 15:38:40 +02:00
Daniel Berteaud
be344cb7ae Move public folder creation to the spec file 2017-06-08 15:12:16 +02:00
9 changed files with 32 additions and 19 deletions

3
.tito/packages/.readme Normal file
View File

@ -0,0 +1,3 @@
the .tito/packages directory contains metadata files
named after their packages. Each file has the latest tagged
version and the project's relative directory.

View File

@ -0,0 +1 @@
0.1.5-1 ./

1
.tito/releasers.conf Symbolic link
View File

@ -0,0 +1 @@
../../tito_libs/releasers.conf

6
.tito/tito.props Normal file
View File

@ -0,0 +1,6 @@
[buildconfig]
builder = tito.builder.Builder
tagger = tito.tagger.VersionTagger
changelog_do_not_remove_cherrypick = 0
changelog_format = %s (%ae)
lib_dir = ../tito_libs

View File

@ -14,14 +14,6 @@ die "couldn't find dovecot service\n" unless ($dovecot);
my $event = $ARGV[0];
# If PublicMailbox is enabled
if (($dovecot->prop('PublicMailbox') || 'disabled') eq 'enabled'){
system('/bin/mkdir' ,'-p', "/home/e-smith/files/public") unless (-d '/home/e-smith/files/public');
system('/bin/chmod', "770", "/home/e-smith/files/public");
system('/bin/chmod', 'g+s', "/home/e-smith/files/public");
system('/bin/chown', 'root.sharedmailbox', "/home/e-smith/files/public");
}
# SharedMailboxes disabled ?
if (($dovecot->prop('SharedMailbox') || 'disabled') eq 'disabled'){
if (($dovecot->prop('SharedMailboxAcl') || 'yes') ne 'no'){

View File

@ -42,7 +42,6 @@ namespace {
}
_EOF
{
my $shared_mb = "\n# SharedMailbox is disabled\n";
my $public_mb = "\n# PublicMailbox is disabled\n";
if (($dovecot{'SharedMailbox'} || 'disabled') eq 'enabled'){

View File

@ -2,7 +2,6 @@
if (($dovecot{'PublicMailbox'} || 'disabled') eq 'enabled'){
my @PublicMailboxAdmins = split /[,:]/, ($dovecot{PublicMailboxAdmins} || '');
$OUT .= "authenticated lrwsie" . "\n";
$OUT .= "user=admin lrswtipekxa" . "\n";
foreach my $PublicMailboxAdmins (sort @PublicMailboxAdmins){
$OUT .= 'user=' . "$PublicMailboxAdmins " . 'lrswtipekxa' . "\n";

View File

@ -4,7 +4,8 @@ if environment :matches "imap.mailbox" "*" {
}
if anyof (string "${mailbox}" "Trash",
string "${mailbox}" "junkmail",
string "${mailbox}" "Junk") {
string "${mailbox}" "Junk",
string "${mailbox}" "Éléments supprimés") {
stop;
}
pipe :copy "learn-ham.sh";

View File

@ -1,12 +1,7 @@
%define version 0.1.2
%define release 1
%define name smeserver-dovecot-extras
Summary: Additional features for dovecot on SME Server
Name: %{name}
Version: %{version}
Release: %{release}%{?dist}
Name: smeserver-dovecot-extras
Version: 0.1.5
Release: 1%{?dist}
License: GPL
Group: Networking/Daemons
Source: %{name}-%{version}.tar.gz
@ -24,6 +19,17 @@ Requires: acl
Add IMAP acl (sharedmailbox) and sieve capabilities to the IMAP server
%changelog
* Tue Mar 27 2018 Daniel Berteaud <daniel@firewall-services.com> 0.1.5-1
- Don't set default ACL for authenticated users (daniel@firewall-services.com)
* Sun Nov 19 2017 Daniel Berteaud <daniel@firewall-services.com> 0.1.4-1
- new package built with tito
* Thu Jun 8 2017 Daniel Berteaud <daniel@firewall-services.com> - 0.1.3-1
- Add support for public mailboxes (patch from John H. Bennett III
<bennettj@thebennetthome.com>)
- Ignore moves from junkmail to Éléments supprimés
* Mon Mar 6 2017 Daniel Berteaud <daniel@firewall-services.com> - 0.1.2-1
- Support spam learning by moving to/from junkmail or Junk
@ -43,6 +49,7 @@ Add IMAP acl (sharedmailbox) and sieve capabilities to the IMAP server
%build
perl createlinks
mkdir -p root/home/e-smith/db/dovecot
mkdir -p root/home/e-smith/files/public/{cur,new,tmp}
%install
/bin/rm -rf $RPM_BUILD_ROOT
@ -50,6 +57,10 @@ mkdir -p root/home/e-smith/db/dovecot
/bin/rm -f %{name}-%{version}-filelist
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
--dir /home/e-smith/db/dovecot 'attr(2770,root,sharedmailbox)' \
--dir /home/e-smith/files/public 'attr(2770,root,sharedmailbox)' \
--dir /home/e-smith/files/public/cur 'attr(2770,root,sharedmailbox)' \
--dir /home/e-smith/files/public/new 'attr(2770,root,sharedmailbox)' \
--dir /home/e-smith/files/public/tmp 'attr(2770,root,sharedmailbox)' \
--file /home/e-smith/db/dovecot/sharedmailbox.db 'attr(0660,root,sharedmailbox) %config(noreplace)' \
--file /usr/bin/imap-postlogin 'attr(0755,root,root)' \
--file /usr/libexec/dovecot/learn-spam.sh 'attr(0755,root,root)' \