Index: branches/2019Q3/irc/inspircd/files/patch-make_template_main.mk =================================================================== --- branches/2019Q3/irc/inspircd/files/patch-make_template_main.mk (revision 510385) +++ branches/2019Q3/irc/inspircd/files/patch-make_template_main.mk (revision 510386) @@ -1,55 +1,57 @@ ---- make/template/main.mk.orig 2019-05-10 08:54:28 UTC +--- make/template/main.mk.orig 2019-07-06 12:03:50 UTC +++ make/template/main.mk -@@ -203,32 +203,32 @@ finishmessage: target +@@ -206,33 +206,33 @@ finishmessage: target @echo "*************************************" install: target - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BASE) +- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH) +- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH) - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH) +- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services +- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH) -- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH) -- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/services -- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/sql - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH) - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH) - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(SCRPATH) - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH) - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) "$(BUILDPATH)/modules/"*.so $(MODPATH) - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(SCRPATH) 2>/dev/null - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) .gdbargs $(SCRPATH)/.gdbargs 2>/dev/null + @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BASE) ++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH) ++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH) + @-$(INSTALL) -d -m $(INSTMODE_DIR) $(DATPATH) ++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(EXAPATH)/services ++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(EXAPATH)/sql + @-$(INSTALL) -d -m $(INSTMODE_DIR) $(LOGPATH) -+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH) -+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/services -+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/sql + @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MANPATH) + @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH) + @-$(INSTALL) -d -m $(INSTMODE_DIR) $(SCRPATH) + -$(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH) + -$(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/modules/"*.so $(MODPATH) + -$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(SCRPATH) 2>/dev/null + -$(INSTALL) -m $(INSTMODE_TXT) .gdbargs $(SCRPATH)/.gdbargs 2>/dev/null ifeq ($(SYSTEM), darwin) -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/org.inspircd.plist $(SCRPATH) 2>/dev/null endif ifeq ($(SYSTEM), linux) -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.service $(SCRPATH) 2>/dev/null endif - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null -- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(CONPATH)/examples -- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(CONPATH)/examples/services -- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/examples/sql +- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH) +- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services +- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null + -$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null + -$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null + -$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null -+ -$(INSTALL) -m $(INSTMODE_TXT) docs/conf/*.example $(CONPATH)/examples -+ -$(INSTALL) -m $(INSTMODE_TXT) docs/conf/services/*.example $(CONPATH)/examples/services -+ -$(INSTALL) -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/examples/sql ++ -$(INSTALL) -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH) ++ -$(INSTALL) -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services ++ -$(INSTALL) -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql + -$(INSTALL) -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null @echo "" @echo "*************************************" @echo "* INSTALL COMPLETE! *" Index: branches/2019Q3/irc/inspircd/pkg-plist =================================================================== --- branches/2019Q3/irc/inspircd/pkg-plist (revision 510385) +++ branches/2019Q3/irc/inspircd/pkg-plist (revision 510386) @@ -1,223 +1,222 @@ bin/inspircd bin/inspircd-genssl @sample %%ETCDIR%%/examples/filter.conf.example %%ETCDIR%%/filter.conf @sample %%ETCDIR%%/examples/helpop.conf.example %%ETCDIR%%/helpop.conf @sample %%ETCDIR%%/examples/inspircd.conf.example %%ETCDIR%%/inspircd.conf @sample %%ETCDIR%%/examples/links.conf.example %%ETCDIR%%/links.conf @sample %%ETCDIR%%/examples/modules.conf.example %%ETCDIR%%/modules.conf @sample %%ETCDIR%%/examples/motd.txt.example %%ETCDIR%%/motd.txt @sample %%ETCDIR%%/examples/opermotd.txt.example %%ETCDIR%%/opermotd.txt @sample %%ETCDIR%%/examples/opers.conf.example %%ETCDIR%%/opers.conf @sample %%ETCDIR%%/examples/quotes.txt.example %%ETCDIR%%/quotes.txt %%ETCDIR%%/examples/services/anope.conf.example %%ETCDIR%%/examples/services/atheme.conf.example %%ETCDIR%%/examples/services/generic.conf.example %%ETCDIR%%/examples/sql/sqloper.mysql.sql %%ETCDIR%%/examples/sql/sqloper.pgsql.sql %%ETCDIR%%/examples/sql/sqloper.sqlite3.sql libexec/inspircd/.gdbargs libexec/inspircd/inspircd libexec/inspircd/modules/core_channel.so libexec/inspircd/modules/core_dns.so libexec/inspircd/modules/core_hostname_lookup.so libexec/inspircd/modules/core_info.so libexec/inspircd/modules/core_list.so libexec/inspircd/modules/core_loadmodule.so libexec/inspircd/modules/core_lusers.so libexec/inspircd/modules/core_message.so libexec/inspircd/modules/core_mode.so libexec/inspircd/modules/core_oper.so libexec/inspircd/modules/core_reloadmodule.so libexec/inspircd/modules/core_serialize_rfc.so libexec/inspircd/modules/core_stats.so libexec/inspircd/modules/core_stub.so libexec/inspircd/modules/core_user.so libexec/inspircd/modules/core_wallops.so libexec/inspircd/modules/core_who.so libexec/inspircd/modules/core_whois.so libexec/inspircd/modules/core_whowas.so libexec/inspircd/modules/core_xline.so libexec/inspircd/modules/m_abbreviation.so libexec/inspircd/modules/m_alias.so libexec/inspircd/modules/m_allowinvite.so libexec/inspircd/modules/m_alltime.so libexec/inspircd/modules/m_anticaps.so libexec/inspircd/modules/m_auditorium.so libexec/inspircd/modules/m_autoop.so libexec/inspircd/modules/m_banexception.so libexec/inspircd/modules/m_banredirect.so libexec/inspircd/modules/m_bcrypt.so libexec/inspircd/modules/m_blockamsg.so libexec/inspircd/modules/m_blockcaps.so libexec/inspircd/modules/m_blockcolor.so libexec/inspircd/modules/m_botmode.so libexec/inspircd/modules/m_callerid.so libexec/inspircd/modules/m_cap.so libexec/inspircd/modules/m_cban.so libexec/inspircd/modules/m_censor.so libexec/inspircd/modules/m_cgiirc.so libexec/inspircd/modules/m_chancreate.so libexec/inspircd/modules/m_chanfilter.so libexec/inspircd/modules/m_chanhistory.so libexec/inspircd/modules/m_chanlog.so libexec/inspircd/modules/m_channames.so libexec/inspircd/modules/m_channelban.so libexec/inspircd/modules/m_check.so libexec/inspircd/modules/m_chghost.so libexec/inspircd/modules/m_chgident.so libexec/inspircd/modules/m_chgname.so libexec/inspircd/modules/m_classban.so libexec/inspircd/modules/m_clearchan.so libexec/inspircd/modules/m_cloaking.so libexec/inspircd/modules/m_clones.so libexec/inspircd/modules/m_commonchans.so libexec/inspircd/modules/m_conn_join.so libexec/inspircd/modules/m_conn_umodes.so libexec/inspircd/modules/m_conn_waitpong.so libexec/inspircd/modules/m_connectban.so libexec/inspircd/modules/m_connflood.so libexec/inspircd/modules/m_customprefix.so libexec/inspircd/modules/m_customtitle.so libexec/inspircd/modules/m_cycle.so libexec/inspircd/modules/m_dccallow.so libexec/inspircd/modules/m_deaf.so libexec/inspircd/modules/m_delayjoin.so libexec/inspircd/modules/m_delaymsg.so libexec/inspircd/modules/m_denychans.so libexec/inspircd/modules/m_disable.so libexec/inspircd/modules/m_dnsbl.so libexec/inspircd/modules/m_exemptchanops.so libexec/inspircd/modules/m_filter.so libexec/inspircd/modules/m_flashpolicyd.so libexec/inspircd/modules/m_gecosban.so libexec/inspircd/modules/m_geoban.so libexec/inspircd/modules/m_geoclass.so libexec/inspircd/modules/m_globalload.so libexec/inspircd/modules/m_globops.so libexec/inspircd/modules/m_haproxy.so libexec/inspircd/modules/m_helpop.so libexec/inspircd/modules/m_hidechans.so libexec/inspircd/modules/m_hidelist.so libexec/inspircd/modules/m_hidemode.so libexec/inspircd/modules/m_hideoper.so libexec/inspircd/modules/m_hostchange.so libexec/inspircd/modules/m_hostcycle.so libexec/inspircd/modules/m_httpd.so libexec/inspircd/modules/m_httpd_acl.so libexec/inspircd/modules/m_httpd_config.so libexec/inspircd/modules/m_httpd_stats.so libexec/inspircd/modules/m_ident.so libexec/inspircd/modules/m_inviteexception.so libexec/inspircd/modules/m_ircv3.so libexec/inspircd/modules/m_ircv3_accounttag.so libexec/inspircd/modules/m_ircv3_batch.so libexec/inspircd/modules/m_ircv3_capnotify.so libexec/inspircd/modules/m_ircv3_chghost.so libexec/inspircd/modules/m_ircv3_ctctags.so libexec/inspircd/modules/m_ircv3_echomessage.so libexec/inspircd/modules/m_ircv3_invitenotify.so libexec/inspircd/modules/m_ircv3_msgid.so libexec/inspircd/modules/m_ircv3_servertime.so libexec/inspircd/modules/m_ircv3_sts.so libexec/inspircd/modules/m_joinflood.so libexec/inspircd/modules/m_kicknorejoin.so libexec/inspircd/modules/m_knock.so libexec/inspircd/modules/m_lockserv.so libexec/inspircd/modules/m_maphide.so libexec/inspircd/modules/m_md5.so libexec/inspircd/modules/m_messageflood.so libexec/inspircd/modules/m_mlock.so libexec/inspircd/modules/m_modenotice.so libexec/inspircd/modules/m_monitor.so libexec/inspircd/modules/m_muteban.so libexec/inspircd/modules/m_namedmodes.so libexec/inspircd/modules/m_namesx.so libexec/inspircd/modules/m_nationalchars.so libexec/inspircd/modules/m_nickflood.so libexec/inspircd/modules/m_nicklock.so libexec/inspircd/modules/m_noctcp.so libexec/inspircd/modules/m_nokicks.so libexec/inspircd/modules/m_nonicks.so libexec/inspircd/modules/m_nonotice.so libexec/inspircd/modules/m_nopartmsg.so libexec/inspircd/modules/m_ojoin.so libexec/inspircd/modules/m_operchans.so libexec/inspircd/modules/m_operjoin.so libexec/inspircd/modules/m_operlevels.so libexec/inspircd/modules/m_operlog.so libexec/inspircd/modules/m_opermodes.so libexec/inspircd/modules/m_opermotd.so libexec/inspircd/modules/m_operprefix.so libexec/inspircd/modules/m_override.so libexec/inspircd/modules/m_passforward.so libexec/inspircd/modules/m_password_hash.so libexec/inspircd/modules/m_pbkdf2.so libexec/inspircd/modules/m_permchannels.so libexec/inspircd/modules/m_randquote.so libexec/inspircd/modules/m_redirect.so libexec/inspircd/modules/m_regex_glob.so libexec/inspircd/modules/m_remove.so libexec/inspircd/modules/m_repeat.so libexec/inspircd/modules/m_restrictchans.so libexec/inspircd/modules/m_restrictmsg.so libexec/inspircd/modules/m_rline.so libexec/inspircd/modules/m_rmode.so libexec/inspircd/modules/m_sajoin.so libexec/inspircd/modules/m_sakick.so libexec/inspircd/modules/m_samode.so libexec/inspircd/modules/m_sanick.so libexec/inspircd/modules/m_sapart.so libexec/inspircd/modules/m_saquit.so libexec/inspircd/modules/m_sasl.so libexec/inspircd/modules/m_satopic.so libexec/inspircd/modules/m_securelist.so libexec/inspircd/modules/m_seenicks.so libexec/inspircd/modules/m_serverban.so libexec/inspircd/modules/m_services_account.so libexec/inspircd/modules/m_servprotect.so libexec/inspircd/modules/m_sethost.so libexec/inspircd/modules/m_setident.so libexec/inspircd/modules/m_setidle.so libexec/inspircd/modules/m_setname.so libexec/inspircd/modules/m_sha1.so libexec/inspircd/modules/m_sha256.so libexec/inspircd/modules/m_showfile.so libexec/inspircd/modules/m_showwhois.so libexec/inspircd/modules/m_shun.so libexec/inspircd/modules/m_silence.so libexec/inspircd/modules/m_spanningtree.so libexec/inspircd/modules/m_sqlauth.so libexec/inspircd/modules/m_sqloper.so libexec/inspircd/modules/m_sslinfo.so libexec/inspircd/modules/m_sslmodes.so -libexec/inspircd/modules/m_sslrehashsignal.so libexec/inspircd/modules/m_starttls.so libexec/inspircd/modules/m_stripcolor.so libexec/inspircd/modules/m_svshold.so libexec/inspircd/modules/m_swhois.so libexec/inspircd/modules/m_timedbans.so libexec/inspircd/modules/m_tline.so libexec/inspircd/modules/m_topiclock.so libexec/inspircd/modules/m_uhnames.so libexec/inspircd/modules/m_uninvite.so libexec/inspircd/modules/m_userip.so libexec/inspircd/modules/m_vhost.so libexec/inspircd/modules/m_watch.so libexec/inspircd/modules/m_websocket.so libexec/inspircd/modules/m_xline_db.so %%GNUTLS%%libexec/inspircd/modules/m_ssl_gnutls.so %%LDAP%%libexec/inspircd/modules/m_ldap.so %%LDAP%%libexec/inspircd/modules/m_ldapauth.so %%LDAP%%libexec/inspircd/modules/m_ldapoper.so %%MBEDTLS%%libexec/inspircd/modules/m_ssl_mbedtls.so %%MYSQL%%libexec/inspircd/modules/m_mysql.so %%OPENSSL%%libexec/inspircd/modules/m_ssl_openssl.so %%PCRE%%libexec/inspircd/modules/m_regex_pcre.so %%PGSQL%%libexec/inspircd/modules/m_pgsql.so %%POSIX%%libexec/inspircd/modules/m_regex_posix.so %%SQLITE%%libexec/inspircd/modules/m_sqlite3.so man/man1/inspircd-genssl.1.gz man/man1/inspircd.1.gz @dir(%%INSPIRCD_USER%%,%%INSPIRCD_GROUP%%,750) %%INSPIRCD_DBDIR%% @dir(%%INSPIRCD_USER%%,%%INSPIRCD_GROUP%%,755) %%INSPIRCD_LOGDIR%% @dir(%%INSPIRCD_USER%%,%%INSPIRCD_GROUP%%,755) %%INSPIRCD_RUNDIR%%