brong
commented
7 years ago Don't agree - we should rename our programs to not clash.
On Sat, 16 Sep 2017, at 23:24, Дилян Палаузов wrote:
Cyrus installs now its main process as libexec/master . Postgresql and postfix also have their main process called master. Imagine they decide to install their binaries the same way cyrus does under libexec...> git, gcc, emacs install their service programs under libexec/git-core, libexec/gcc/{platform}/{version} and libexec/emacs/{version}/{platform}.> Install the service programs for cyrus by default under libexec/cyrus.> diff --git a/Makefile.am b/Makefile.am --- a/Makefile.am +++ b/Makefile.am @@ -51,7 +51,7 @@ AM_CPPFLAGS = \ -I${top_builddir}/lib \ -I${top_srcdir} \ -I${top_srcdir}/lib \
- -DLIBEXEC_DIR=\"$(libexecdir)\" \
- -DSERVICE_DIR=\"$(servicedir)\" \ -DSBIN_DIR=\"$(sbindir)\" \ -DSYSCONF_DIR=\"$(sysconfdir)\" \ ${DEFS} \ @@ -113,7 +113,7 @@ DIST_SUBDIRS = . perl/annotator perl/imap perl/sieve/managesieve dist_sysconf_DATA = lib_LTLIBRARIES = lib/libcyrus_min.la lib/libcyrus.la check_PROGRAMS = - libexec_PROGRAMS = +service_PROGRAMS = sbin_PROGRAMS = noinst_HEADERS = noinst_LTLIBRARIES = @@ -143,7 +143,7 @@ BUILT_SOURCES += \ lib_LTLIBRARIES += imap/libcyrus_imap.la -libexec_PROGRAMS += \ +service_PROGRAMS += \ master/master \ imap/imapd \ imap/lmtpd \ @@ -192,22 +192,22 @@ sbin_PROGRAMS += imap/squatter endif if NNTPD -libexec_PROGRAMS += imap/nntpd +service_PROGRAMS += imap/nntpd sbin_PROGRAMS += imap/fetchnews endif # NNTPD -libexec_PROGRAMS += imap/fud +service_PROGRAMS += imap/fud if IDLED -libexec_PROGRAMS += imap/idled +service_PROGRAMS += imap/idled endif # IDLED if MURDER -libexec_PROGRAMS += imap/mupdate +service_PROGRAMS += imap/mupdate endif # MURDER if CALALARMD -libexec_PROGRAMS += imap/calalarmd +service_PROGRAMS += imap/calalarmd endif if HTTPD @@ -222,7 +222,7 @@ BUILT_SOURCES += \ imap/tz_err.c \ imap/tz_err.h -libexec_PROGRAMS += imap/httpd +service_PROGRAMS += imap/httpd sbin_PROGRAMS += \ imap/ctl_jmapauth \ imap/ctl_zoneinfo \ @@ -231,14 +231,14 @@ sbin_PROGRAMS += \ endif # HTTPD if REPLICATION - libexec_PROGRAMS += imap/sync_server +service_PROGRAMS += imap/sync_server sbin_PROGRAMS += imap/sync_client imap/sync_reset endif # REPLICATION if BACKUP noinst_LTLIBRARIES += backup/libcyrus_backup.la noinst_HEADERS += backup/backup.h -libexec_PROGRAMS += backup/backupd +service_PROGRAMS += backup/backupd sbin_PROGRAMS += backup/ctl_backups backup/cyr_backup backup/restore endif # BACKUP @@ -250,7 +250,7 @@ sbin_PROGRAMS += imap/unexpunge if SIEVE check_PROGRAMS += notifyd/notifytest -libexec_PROGRAMS += notifyd/notifyd +service_PROGRAMS += notifyd/notifyd endif
SIEVE endif # SERVER @@ -261,8 +261,7 @@ endif # CMULOCAL
if PTCLIENT sbin_PROGRAMS += ptclient/ptdump ptclient/ptexpire -libexec_PROGRAMS += \- ptclient/ptloader +service_PROGRAMS += ptclient/ptloader endif
PTCLIENT if PERL @@ -283,7 +283,7 @@ check_PROGRAMS +=
sieve/test sbin_PROGRAMS += sieve/sievec sieve/sieved if SERVER -libexec_PROGRAMS += timsieved/timsieved +service_PROGRAMS += timsieved/timsieved endif # SERVER endif # SIEVE @@ -1875,9 +1875,9 @@ if PERL endif ## The @$(MKDIR_P) line is added due to a bug in Automake 1.10 and can be removed if using Automake 1.12.- @$(MKDIR_P) $(DESTDIR)$(libexecdir)
- @$(MKDIR_P) $(DESTDIR)$(servicedir) if SERVER
- cd $(DESTDIR)$(libexecdir) && \
- cd $(DESTDIR)$(servicedir) && \ $(LN_S) -f pop3d pop3proxyd && \ $(LN_S) -f imapd proxyd && \ $(LN_S) -f lmtpd lmtpproxyd @@ -1919,7 +1919,7 @@ endif install-binsymlinks: ## Let's symlink everything else for prog in $(sbin_PROGRAMS); do $(LN_S) -f $(sbindir)/
basename $$prog$(DESTDIR)$(bindir)/; done- for prog in $(libexec_PROGRAMS); do $(LN_S) -f $(libexecdir)/
basename $$prog$(DESTDIR)$(bindir)/; done- for prog in $(service_PROGRAMS); do $(LN_S) -f $(servicedir)/
basename $$prog$(DESTDIR)$(bindir)/; done SUFFIXES = .fig.png diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -81,6 +81,11 @@ AM_INIT_AUTOMAKE([- Wall -Werror -Wno-portability foreign dist-bzip2 no- installinfo subdir-objects silent-rules tar-ustar]) AC_CONFIG_LIBOBJ_DIR([lib]) +AC_ARG_WITH(servicedir,- [AS_HELP_STRING([--with-service-dir=DIR], [use DIR as service install directory [LIBEXEC/cyrus]])],,
- servicedir="$libexecdir/cyrus") +AC_SUBST(servicedir)
- dnl Useful hook for distributions AC_ARG_WITH(extraident, [AS_HELP_STRING([--with- extraident=STRING],[use STRING as extra version information])], diff --git a/master/master.c b/master/master.c --- a/master/master.c +++ b/master/master.c @@ -236,7 +236,7 @@ static void get_daemon(char path, size_t size, const strarray_t cmd) / master lacks strlcpy, due to no libcyrus / strncpy(path, cmd->data[0], size - 1); }
- else snprintf(path, size, "%s/%s", LIBEXEC_DIR, cmd->data[0]);
- else snprintf(path, size, SERVICE_DIR "/%s", cmd->data[0]); path[size- 1] = '\0'; } diff --git a/master/service.c b/master/service.c --- a/master/service.c +++ b/master/service.c @@ -466,7 +466,7 @@ int main(int argc, char argv, char envp) if (service_argv.data[0][0] == '/') strlcpy(path, service_argv.data[0], sizeof(path)); else
- snprintf(path, sizeof(path), "%s/%s", LIBEXEC_DIR, service_argv.data[0]);
- snprintf(path, sizeof(path), SERVICE_DIR "/%s", service_argv.data[0]); stat(path, &sbuf); start_ino= sbuf.st_ino;
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub[1], or mute the thread[2].>
-- Bron Gondwana, CEO, FastMail Pty Ltd brong@fastmailteam.com
Links:
dilyanpalauzov
jasontibbitts
Cyrus installs now its main process as
libexec/master. Postgresql and postfix also have their main process calledmaster. Imagine they decide to install their binaries the same way cyrus does under libexec...git, gcc, emacs install their service programs under
libexec/git-core,libexec/gcc/{platform}/{version}andlibexec/emacs/{version}/{platform}without letting the user ./configure the destination exactly, only letting her set libexecdir.Install the service programs for cyrus by default under
libexec/cyrus.