Attachment 207041 Details for Bug 240129 – Unbreak 2019Q3

[patch] Unbreak 2019Q3

inspircd-3.3.0.patch (text/plain), 4.60 KB, created by Dmitri Goutnik on 2019-08-31 12:13:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitri Goutnik

Created: 2019-08-31 12:13:04 UTC

Size: 4.60 KB

patch

obsolete

>Index: irc/inspircd/files/patch-make_template_main.mk
>===================================================================
>--- irc/inspircd/files/patch-make_template_main.mk	(revision 510311)
>+++ irc/inspircd/files/patch-make_template_main.mk	(working copy)
>@@ -1,15 +1,16 @@
>---- 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)
>@@ -18,11 +19,12 @@
> -	-$(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)
>@@ -39,16 +41,16 @@
> -	-$(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 "*************************************"
>Index: irc/inspircd/pkg-plist
>===================================================================
>--- irc/inspircd/pkg-plist	(revision 510311)
>+++ irc/inspircd/pkg-plist	(working copy)
>@@ -190,7 +190,6 @@
> 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

Actions: View | Diff

Attachments on bug 240129: 206928 | 206953 | 206969 | 207041 | 207054