.tito/packages/.readme

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

.tito/packages/ipasserelle-base

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

.tito/releasers.conf

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

.tito/tito.props

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

ipasserelle-base.spec

@@ -4,9 +4,9 @@
 
 
 Summary: Meta-Package to turn a SME Server into an iPasserelle
-Name: ipasserelle-base
-Version: 0.2.70
-Release: 1%{?dist}
+Name: %{name}
+Version: %{version}
+Release: %{release}%{?dist}
 Epoch: 9
 License: GPL
 Group: Networking/Daemons
@@ -49,26 +49,6 @@ Based on SMEServer, iPasserelle is a specially configured
 SME Server, with some additionnal modules
 
 %changelog
-* Thu Dec 19 2019 Daniel Berteaud <daniel@firewall-services.com> 0.2.70-1
-- Hide warning if year maildir already exists (daniel@firewall-services.com)
-
-* Thu Mar 14 2019 Daniel Berteaud <daniel@firewall-services.com> 0.2.69-1
-- Don't try to create or delete scan dir if no user has been passed
-  (daniel@firewall-services.com)
-
-* Tue Feb 06 2018 Daniel Berteaud <daniel@firewall-services.com> 0.2.68-1
-- Handle Bcc being a fully qualified address in rotate script GLPI #30996
-  (daniel@firewall-services.com)
-
-* Wed Dec 06 2017 Daniel Berteaud <daniel@firewall-services.com> 0.2.67-1
-- Typo in Category CGI param id (daniel@firewall-services.com)
-
-* Wed Dec 06 2017 Daniel Berteaud <daniel@firewall-services.com> 0.2.66-1
-- Remove GIT Changelog (daniel@firewall-services.com)
-
-* Wed Dec 06 2017 Daniel Berteaud <daniel@firewall-services.com> 0.2.65-1
-- new package built with tito
-- Add Support for buisnessCategory LDAP field
 * Wed Jul 19 2017 Daniel Berteaud <daniel@firewall-services.com> 0.2.64-1
 - Reduce spamassassin's BL score to 1.0 each
 
@@ -403,7 +383,7 @@ perl createlinks
    --file /usr/bin/make-srv 'attr(0755,root,root)' \
    --dir /var/clamav 'attr(0755,clamav,clamav)' \
   > %{name}-%{version}-filelist
-echo "%doc" >> %{name}-%{version}-filelist
+echo "%doc CHANGELOG.git" >> %{name}-%{version}-filelist
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)

root/etc/cron.monthly/maillog-rotate

@@ -11,22 +11,15 @@ if [ "$BCC" != "enabled" -o "$ARCHIVE" != "enabled" ]; then
 fi
 
 USER=$(db configuration getprop qpsmtpd BccUser || echo 'maillog')
-# Truncate if it's a mail address
-USER=${USER%@*}
 HOME="/home/e-smith/files/users/$USER"
 
-# Stop here if the home dir doesn't exist
-if [ \! -d $HOME ]; then
-  echo "$HOME doesn't exist"
-  exit 1
-fi
-
 MONTH=$(date +%m)
 YEAR=$(date +%Y)
 
-su - -s /bin/bash $USER -c "maildirmake -f $YEAR $HOME/Maildir" 2>&1 > /dev/null
+su - -s /bin/bash $USER -c "maildirmake -f $YEAR $HOME/Maildir"
 su - -s /bin/bash $USER -c "maildirmake -f $YEAR.$MONTH $HOME/Maildir"
 
+
 # Lock mail delivery
 chmod +t $HOME
 cd $HOME

root/etc/e-smith/events/actions/ldap-update-info

@@ -69,16 +69,14 @@ foreach my $acc (@accounts){
     my $initials = $acc->prop('Initials') || '';
     my $dshell = $acc->prop('DesktopShell') || '';
     my $preferredemail = $acc->prop('PreferredEmail') || '';
-    my $category = $acc->prop('Category') || '';
     $preferredemail = "$user\@$domain" if ($preferredemail eq '');
     my $web = $acc->prop('Url') || '';
 
-    my (@postalcode,@mobile,@extension,@fax,@titles,@initials,@dshell,@preferredemail,@category,@web) = ();
+    my (@postalcode,@mobile,@extension,@fax,@titles,@initials,@dshell,@preferredemail,@web) = ();
     @postalcode = ($postalcode) unless ($postalcode eq '');
     @mobile = ($mobile) unless ($mobile eq '');
     @extension = ($extension) unless ($extension eq '');
     @fax = ($fax) unless ($fax eq '');
-    @category = ($category) unless ($category eq '');
     foreach ($function1, $function2, $function3, $function4){
         push @titles, $_ if ($_ ne '');
     }
@@ -96,7 +94,6 @@ foreach my $acc (@accounts){
                             initials => \@initials,
                             desktopLoginShell => \@dshell,
                             preferredMail => \@preferredemail,
-                            businessCategory => \@category,
                             labeledURI => \@web
                          }
               );

root/etc/e-smith/events/actions/share-modify-scan

@@ -14,7 +14,7 @@ my $name = $ARGV [1];
 
 die "Event name missing\n" unless (defined $event);
 
-if ($event eq 'user-create' and defined $name){
+if ($event eq 'user-create'){
     mkpath "/home/e-smith/files/scan/$name";
     system ("$setfacl",
             '-m',
@@ -22,7 +22,7 @@ if ($event eq 'user-create' and defined $name){
             '--',
             "/home/e-smith/files/scan/$name");
 }
-elsif ($event eq 'user-delete' and defined $name){
+elsif ($event eq 'user-delete'){
     rmtree "/home/e-smith/files/scan/$name";
 }
 else {

root/etc/e-smith/locale/fr/etc/e-smith/web/functions/userinfo

@@ -64,10 +64,6 @@
         <trans>Société</trans>
     </entry>
     <entry>
-        <base>CATEGORY</base>
-        <trans>Catégorie</trans>
-    </entry>
-    <entry>
         <base>STREET_ADDRESS</base>
         <trans>Adresse</trans>
     </entry>

root/etc/e-smith/web/functions/userinfo

@@ -78,10 +78,6 @@ __DATA__
             value="get_ldap_value('Company')">
             <label>COMPANY</label>
         </field>
-        <field type="text" size="30" id="Category"
-            value="get_ldap_value('Category')">
-            <label>CATEGORY</label>
-        </field>
         <field type="text" size="30" id="Street"
             value="get_ldap_value('Street')">
             <label>STREET_ADDRESS</label>

root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/userinfo.pm

@@ -213,7 +213,6 @@ sub modify_user {
             'AltEmail3'      => $self->{cgi}->param('AltEmail3'),
             'AltEmail4'      => $self->{cgi}->param('AltEmail4'),
             'PreferredEmail' => $self->{cgi}->param('PreferredEmail'),
-            'Category'       => $self->{cgi}->param('Category'),
             'Url'            => $self->{cgi}->param('Url'),
             'Shell'          => $self->{cgi}->param('Shell'),
             'DesktopShell'   => $self->{cgi}->param('DesktopShell'),