Attachment 222853 Details for Bug 253878 – inspircd.diff

[patch] inspircd.diff

inspircd.diff (text/plain), 10.36 KB, created by Dries Michiels on 2021-02-26 19:24:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dries Michiels

Created: 2021-02-26 19:24:34 UTC

Size: 10.36 KB

patch

obsolete

>Index: irc/inspircd/Makefile
>===================================================================
>--- irc/inspircd/Makefile	(revision 566623)
>+++ irc/inspircd/Makefile	(working copy)
>@@ -3,16 +3,15 @@
> 
> PORTNAME=	inspircd
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	3.8.1
>+DISTVERSION=	3.9.0
> CATEGORIES=	irc
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	driesm.michiels@gmail.com
> COMMENT=	Modular C++ IRC daemon
> 
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/docs/LICENSE.txt
> 
>-# Configure script is written in perl
> USES=		compiler:c++11-lang cpe gmake localbase:ldflags perl5
> CPE_VENDOR=	inspire_ircd
> CPE_PRODUCT=	inspircd
>@@ -26,12 +25,13 @@
> 		--data-dir=${_INSPIRCD_DBDIR} \
> 		--disable-auto-extras \
> 		--distribution-label=${OPSYS}-${PORTVERSION} \
>+		--gid=nobody \
> 		--log-dir=${_INSPIRCD_LOGDIR} \
> 		--manual-dir=${MANPREFIX}/man/man1 \
> 		--module-dir=${PREFIX}/libexec/${PORTNAME}/modules \
> 		--prefix=${PREFIX}/libexec/${PORTNAME} \
>-		--gid=0 \
>-		--uid=0
>+		--runtime-dir=${_INSPIRCD_RUNDIR} \
>+		--uid=nobody
> 
> MAKEFILE=	GNUmakefile
> 
>@@ -52,7 +52,7 @@
> 		INSPIRCD_RUNDIR=${_INSPIRCD_RUNDIR} \
> 		INSPIRCD_USER=${USERS}
> 
>-OPTIONS_DEFINE=		GNUTLS IPV6 LDAP MBEDTLS MYSQL OPENSSL PCRE PGSQL POSIX \
>+OPTIONS_DEFINE=		GNUTLS LDAP MBEDTLS MYSQL OPENSSL PCRE PGSQL POSIX \
> 			SQLITE SSLREHASH
> OPTIONS_DEFAULT=	OPENSSL POSIX
> OPTIONS_SUB=		yes
>Index: irc/inspircd/distinfo
>===================================================================
>--- irc/inspircd/distinfo	(revision 566623)
>+++ irc/inspircd/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1609467703
>-SHA256 (inspircd-inspircd-v3.8.1_GH0.tar.gz) = 2068ca42f39b382e1f74b650230e02690ffbca58c4f3aed075a6dd72e381b44b
>-SIZE (inspircd-inspircd-v3.8.1_GH0.tar.gz) = 850997
>+TIMESTAMP = 1614362910
>+SHA256 (inspircd-inspircd-v3.9.0_GH0.tar.gz) = 5bda0fc3d41908cda4580de39d62e8be4840da45f31e072cfca337b838add567
>+SIZE (inspircd-inspircd-v3.9.0_GH0.tar.gz) = 853862
>Index: irc/inspircd/files/patch-make_template_inspircd
>===================================================================
>--- irc/inspircd/files/patch-make_template_inspircd	(revision 566623)
>+++ irc/inspircd/files/patch-make_template_inspircd	(nonexistent)
>@@ -1,11 +0,0 @@
>---- make/template/inspircd.orig	2021-01-01 03:25:25 UTC
>-+++ make/template/inspircd
>-@@ -426,7 +426,7 @@ sub getpidfile
>- 	}
>- 
>- 	# End of includes / No includes found. Using default.
>--	$pidfile = $datadir . "/inspircd.pid";
>-+	$pidfile = "/var/run/inspircd.pid";
>- }
>- 
>- sub getstatus {
>
>Property changes on: irc/inspircd/files/patch-make_template_inspircd
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: irc/inspircd/files/patch-make_template_main.mk
>===================================================================
>--- irc/inspircd/files/patch-make_template_main.mk	(revision 566623)
>+++ irc/inspircd/files/patch-make_template_main.mk	(nonexistent)
>@@ -1,73 +0,0 @@
>---- make/template/main.mk.orig	2020-11-20 12:10:47 UTC
>-+++ make/template/main.mk
>-@@ -212,41 +212,41 @@ 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)/codepages
>--	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/providers
>--	@-$(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) $(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) @CONFIGURE_DIRECTORY@/apparmor $(SCRPATH) 2>/dev/null
>--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/logrotate $(SCRPATH) 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)/codepages
>-+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(EXAPATH)/providers
>-+	@-$(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) $(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) @CONFIGURE_DIRECTORY@/apparmor $(SCRPATH) 2>/dev/null
>-+	-$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/logrotate $(SCRPATH) 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_TXT) @CONFIGURE_DIRECTORY@/inspircd-testssl.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_BIN) tools/testssl $(BINPATH)/inspircd-testssl 2>/dev/null
>--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
>--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/*.example $(EXAPATH)/codepages
>--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers
>--	-$(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_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH)
>--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) @CONFIGURE_DIRECTORY@/*.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_TXT) @CONFIGURE_DIRECTORY@/inspircd-testssl.1 $(MANPATH) 2>/dev/null
>-+	-$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
>-+	-$(INSTALL) -m $(INSTMODE_BIN) tools/testssl $(BINPATH)/inspircd-testssl 2>/dev/null
>-+	-$(INSTALL) -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
>-+	-$(INSTALL) -m $(INSTMODE_TXT) docs/conf/codepages/*.example $(EXAPATH)/codepages
>-+	-$(INSTALL) -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers
>-+	-$(INSTALL) -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
>-+	-$(INSTALL) -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
>-+	-$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH)
>-+	-$(INSTALL) -m $(INSTMODE_PRV) @CONFIGURE_DIRECTORY@/*.pem $(CONPATH) 2>/dev/null
>- 	@echo ""
>- 	@echo "*************************************"
>- 	@echo "*        INSTALL COMPLETE!          *"
>
>Property changes on: irc/inspircd/files/patch-make_template_main.mk
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: irc/inspircd/files/patch-src_modules_extra_m__ssl__openssl.cpp
>===================================================================
>--- irc/inspircd/files/patch-src_modules_extra_m__ssl__openssl.cpp	(revision 566623)
>+++ irc/inspircd/files/patch-src_modules_extra_m__ssl__openssl.cpp	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/modules/extra/m_ssl_openssl.cpp.orig	2019-05-08 13:19:20 UTC
>-+++ src/modules/extra/m_ssl_openssl.cpp
>-@@ -21,7 +21,7 @@
>-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
>-  */
>- 
>--/// $CompilerFlags: find_compiler_flags("openssl")
>-+/// $CompilerFlags: find_compiler_flags("openssl" "")
>- /// $LinkerFlags: find_linker_flags("openssl" "-lssl -lcrypto")
>- 
>- /// $PackageInfo: require_system("centos") openssl-devel pkgconfig
>
>Property changes on: irc/inspircd/files/patch-src_modules_extra_m__ssl__openssl.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: irc/inspircd/pkg-plist
>===================================================================
>--- irc/inspircd/pkg-plist	(revision 566623)
>+++ irc/inspircd/pkg-plist	(working copy)
>@@ -14,7 +14,10 @@
> %%ETCDIR%%/examples/codepages/latin1.conf.example
> %%ETCDIR%%/examples/codepages/rfc1459.conf.example
> %%ETCDIR%%/examples/codepages/strict-rfc1459.conf.example
>+%%ETCDIR%%/examples/providers/dronebl.conf.example
>+%%ETCDIR%%/examples/providers/efnet-rbl.conf.example
> %%ETCDIR%%/examples/providers/irccloud.conf.example
>+%%ETCDIR%%/examples/providers/torexit.conf.example
> %%ETCDIR%%/examples/services/anope.conf.example
> %%ETCDIR%%/examples/services/atheme.conf.example
> %%ETCDIR%%/examples/services/generic.conf.example

Actions: View | Diff

Attachments on bug 253878: 222853