renamed cronlist.i to indimail.cron

indimail · Dec 22, 2023 · adbe63d · adbe63d
1 parent 1eb1c95
commit adbe63d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 18 deletions.
diff --git a/indimail-x/.gitignore b/indimail-x/.gitignore
@@ -14,7 +14,7 @@ cputime
 crc
 crcdiff
 create_services
-cronlist.i
+indimail.cron
 incrypt
 dbinfo
 dbinfo.8

diff --git a/indimail-x/Makefile.am b/indimail-x/Makefile.am
@@ -33,7 +33,7 @@ indimailauthlibdir=@libexecdir@/imapmodules
 
 SYSCONFDIR = @sysconfdir@
 sysconf_DATA = indimail.settings controlfiles.i headerlist osh.table \
- cronlist.i indimail.perms indimail.mrtg.cfg indimail-release indimail.schema
+ indimail.cron indimail.perms indimail.mrtg.cfg indimail-release indimail.schema
 
 pkgconfigdir=@pkgconfigdir@
 pkgconfig_DATA = libindimail.pc
@@ -211,7 +211,7 @@ doc_list= ChangeLog FAQ.md README-indimail.md README-ldap.md \
  README-vlimits.md COPYING-indimail
 
 MOSTLYCLEANFILES=vcaliasrev myslave controlsync bogofilter-qfe \
- cronlist.i incrypt vdeluser_handle vrenameuser_handle \
+ indimail.cron incrypt vdeluser_handle vrenameuser_handle \
  cscope.* *.dSYM mailzipper mytcplookup.c tcplookup.8 vaddaliasdomain.1 \
  indimail.perms dbinfo.8 inlookup.8 vadddomain.1 vdeldomain.1 vadduser.1 \
  vdeluser.1 vdelivermail.8 vrenamedomain.1 vrenameuser.1 vpasswd.1 vmoveuserdir.1 \
@@ -564,8 +564,8 @@ authgeneric: authgeneric.in
  $(edit) $@.in > $@
 bogofilter-qfe: bogofilter-qfe.in
  $(edit) $@.in > $@
-cronlist.i: cronlist.in
- (echo "# DO NOT EDIT THIS FILE - edit the master and reinstall."; $(edit) cronlist.in) > $@
+indimail.cron: indimail.cron.in
+ (echo "# DO NOT EDIT THIS FILE - edit the master and reinstall."; $(edit) indimail.cron.in) > $@
 indimail-permissions.easy: indimail-permissions.easy.in
  $(edit) $@.in > $@
 indimail-permissions.secure: indimail-permissions.secure.in

diff --git a/indimail-x/doc/ChangeLog b/indimail-x/doc/ChangeLog
@@ -35,6 +35,8 @@ Release @version@-@release@ Start XX/XX/XXXX End --/--/----
 - 13/12/2023
 18. add_domain_assign.c: fixed dir, uid, gid for autoturn entry in assign file
 19. iadddomain.c: call add_domain_assign for etrn/atrn domains
+- 23/12/2023
+20. renamed cronlist.i to indimail.cron
 
 * Fri Sep 08 2023 12:47:55 +0000 Manvendra Bhangui <[email protected]> 3.4.5-1.1%{?dist}
 Release 3.4.5-1.1 Start 25/04/2023 End 08/09/2023

diff --git a/indimail-x/ilocal_upgrade.in b/indimail-x/ilocal_upgrade.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: ilocal_upgrade.in,v 2.42 2023-09-22 23:58:24+05:30 Cprogrammer Exp mbhangui $
+# $Id: ilocal_upgrade.in,v 2.43 2023-12-23 00:08:42+05:30 Cprogrammer Exp mbhangui $
 #
 PATH=/bin:/usr/bin:/usr/sbin:/sbin
 chgrp=$(which chgrp)
@@ -22,7 +22,7 @@ check_update_if_diff()
 do_install()
 {
 date
-echo "Running $1 $Id: ilocal_upgrade.in,v 2.42 2023-09-22 23:58:24+05:30 Cprogrammer Exp mbhangui $"
+echo "Running $1 $Id: ilocal_upgrade.in,v 2.43 2023-12-23 00:08:42+05:30 Cprogrammer Exp mbhangui $"
 if [ -d @indimaildir@/mysqldb/data/indimail ] ; then
  if [ ! -f @servicedir@/mysql.3306/down ] ; then
  for i in mysqld mariadb mysql
@@ -80,7 +80,7 @@ fi
 do_post_upgrade()
 {
 date
-echo "Running $1 $Id: ilocal_upgrade.in,v 2.42 2023-09-22 23:58:24+05:30 Cprogrammer Exp mbhangui $"
+echo "Running $1 $Id: ilocal_upgrade.in,v 2.43 2023-12-23 00:08:42+05:30 Cprogrammer Exp mbhangui $"
 # Fix CERT locations
 for i in $(ls -d @servicedir@/qmail-imapd* @servicedir@/qmail-pop3d* @servicedir@/proxy-imapd* @servicedir@/proxy-pop3d* 2>/dev/null)
 do
@@ -229,11 +229,11 @@ if [ -f @sysconfdir@/control/spamignore ] ; then
 fi
 
 # copy updated cron entries
-if [ -f @sysconfdir@/cronlist.i -a -d /etc/cron.d ] ; then
- diff @sysconfdir@/cronlist.i /etc/cron.d/cronlist.i >/dev/null 2>&1
- if [ $? -ne 0 ] ; then
- $cp @sysconfdir@/cronlist.i /etc/cron.d/cronlist.i
- fi
+if [ -f /etc/cron.d/cronlist.i ] ; then
+ mv /etc/cron.d/cronlist.i /etc/cron.d/indimail.cron
+fi
+if [ ! -f @sysconfdir@/indimail.cron -a -d /etc/cron.d ] ; then
+ $cp @sysconfdir@/indimail.cron /etc/cron.d/indimail.cron
 fi
 
 if [ -d @indimaildir@/mysqld/ssl ] ; then
@@ -278,6 +278,9 @@ case $1 in
 esac
 #
 # $Log: ilocal_upgrade.in,v $
+# Revision 2.43 2023-12-23 00:08:42+05:30 Cprogrammer
+# renamed cronlist.i to indimail.cron
+#
 # Revision 2.42 2023-09-22 23:58:24+05:30 Cprogrammer
 # remove MYSQL_OPT_RECONNECT for mysql version > 8.0.34
 #

diff --git a/indimail-x/cronlist.in → indimail-x/indimail.cron.in b/indimail-x/cronlist.in → indimail-x/indimail.cron.in
diff --git a/indimail-x/indimail.spec.in b/indimail-x/indimail.spec.in
@@ -1,6 +1,6 @@
 #
 #
-# $Id: indimail.spec.in,v 1.143 2023-12-13 08:41:56+05:30 Cprogrammer Exp mbhangui $
+# $Id: indimail.spec.in,v 1.144 2023-12-23 00:12:33+05:30 Cprogrammer Exp mbhangui $
 %undefine _missing_build_ids_terminate_build
 %global _unpackaged_files_terminate_build 1
 
@@ -464,7 +464,7 @@ done
 
 %attr(444,root,root) %{sysconfdir}/%{name}-release
 %attr(444,root,root) %{sysconfdir}/%{name}-rpm.info
-%attr(444,root,root) %config(noreplace) %{sysconfdir}/cronlist.i
+%attr(444,root,root) %config(noreplace) %{sysconfdir}/indimail.cron
 %attr(444,root,root) %config(noreplace) %{sysconfdir}/indimail.mrtg.cfg
 %attr(444,root,root) %config(noreplace) %{sysconfdir}/headerlist
 %attr(444,root,root) %config(noreplace) %{sysconfdir}/indimail.settings
@@ -1427,9 +1427,9 @@ fi
 # selinux
 %{_prefix}/sbin/svctool --servicedir=%{servicedir} --config=iselinux | tai64n | tai64nlocal
 
-if [ -f %{sysconfdir}/cronlist.i -a -d %{_sysconfdir}/cron.d ] ; then
+if [ -f %{sysconfdir}/indimail.cron -a -d %{_sysconfdir}/cron.d ] ; then
  log_it "adding cron entries"
- %{__cp} %{sysconfdir}/cronlist.i %{_sysconfdir}/cron.d
+ %{__cp} %{sysconfdir}/indimail.cron %{_sysconfdir}/cron.d
 fi
 
 if [ -f %{libexecdir}/iupgrade.sh ] ; then
@@ -1600,7 +1600,7 @@ fi
 
 if [ -d %{_sysconfdir}/cron.d ] ; then
  log_it "removing cron entries"
- %{__rm} -f %{_sysconfdir}/cron.d/cronlist.i
+ %{__rm} -f %{_sysconfdir}/cron.d/indimail.cron
 fi
 
 log_it "removing logs"