From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 03462138334 for ; Sun, 1 Sep 2019 11:50:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9ECD0E0918; Sun, 1 Sep 2019 11:50:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 72879E0918 for ; Sun, 1 Sep 2019 11:50:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AEABF34A7FA for ; Sun, 1 Sep 2019 11:50:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15E8477E for ; Sun, 1 Sep 2019 11:50:16 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1567338607.a68d056da9b8ce8e9b57ef1c29d34dc58b53fa32.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/inspircd/Manifest net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch net-irc/inspircd/inspircd-2.0.28.ebuild X-VCS-Directories: net-irc/inspircd/files/ net-irc/inspircd/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: a68d056da9b8ce8e9b57ef1c29d34dc58b53fa32 X-VCS-Branch: master Date: Sun, 1 Sep 2019 11:50:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 38e90384-a9b3-4565-b4ea-ad9e91b93005 X-Archives-Hash: 5ab88b71d757ccddf6e31f67aefc1ade commit: a68d056da9b8ce8e9b57ef1c29d34dc58b53fa32 Author: Wade Cline hotmail com> AuthorDate: Mon Aug 26 02:24:15 2019 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sun Sep 1 11:50:07 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68d056d net-irc/inspircd: Add 2.0.28 Signed-off-by: Wade Cline hotmail.com> Signed-off-by: Joonas Niilola gentoo.org> net-irc/inspircd/Manifest | 1 + .../files/inspircd-2.0.28-fix-path-builds.patch | 257 +++++++++++++++++++++ net-irc/inspircd/inspircd-2.0.28.ebuild | 115 +++++++++ 3 files changed, 373 insertions(+) diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest index 345c2aeed3f..d884e77a92b 100644 --- a/net-irc/inspircd/Manifest +++ b/net-irc/inspircd/Manifest @@ -1,4 +1,5 @@ DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8 DIST inspircd-2.0.27.tar.gz 735970 BLAKE2B 74a262ddd5f7d2fd61a1a01cddb0d61bf58e9fcdb3a69ebda15d711f3439b7b8e4387ee9ef3b55309e213e1e8bdc2978ca5b319720b0fcf71d9645f13102c2a2 SHA512 56f03c3259fad54365e97fd82f4e309edc60b641ccadd7916d04156fd157858f79930c8b9df99aa98c5505f76ab19e6bcd150ae5ed04d2bddfff572e18226cdd +DIST inspircd-2.0.28.tar.gz 735981 BLAKE2B d467b4d31db4cbafeba655a4e129766ec780b2244f1945da6e25e9d70a8c7f946ea6258cc4e1189029a9f3be4d93b3d943f0bd20ccb85951f001268c2e460805 SHA512 0e8082a03e65f350ac423cc0781506c0eb40151d6e8d250067288b2a1d42087f10c159472ad76028aa986f6764180fdc493893984cadc0064715853472fa3e2a DIST inspircd-3.2.0.tar.gz 799842 BLAKE2B 87f8465479f01587b669c926c9097e14e441d40d6f37be2971863b40c2cef3d962acaf2cc84879d1d813819bcb512adfc58723b6adac5dfc35b240d4068b40f6 SHA512 8792614785d7f0415a38d49cc1786204d838917df54792ee6755b9ad8fd895020539364fdfc6daae60a911b8f39af1326e172ac40335b700241ca832410a4498 DIST inspircd-3.3.0.tar.gz 803449 BLAKE2B 2b396db9d4bc84af33367715acb7f82299211ab31975310de0da4e3fe74385085b801c3bce6fe835b0f9e9857b1b457e037eb72e91d4455dc5918ad8d5bc844d SHA512 067904d877803c370873b5e79860fe0ac68529e740283e7e78dcd4dbbea30e19841a1f2e7e57e3e0b701704224369dbd484562e7edbbcd775bf85c18a4d340c3 diff --git a/net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch new file mode 100644 index 00000000000..da00a8491d1 --- /dev/null +++ b/net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch @@ -0,0 +1,257 @@ +diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example +index d54cdc916..ee21be7f3 100644 +--- a/docs/conf/inspircd.conf.example ++++ b/docs/conf/inspircd.conf.example +@@ -425,11 +425,11 @@ + + # This file has all the information about oper classes, types and o:lines. + # You *MUST* edit it. +- ++ + + # This file has all the information about server links and ulined servers. + # You *MUST* edit it if you intend to link servers. +- ++ + + #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# + # # +@@ -439,7 +439,8 @@ + # motd - displayed on connect and when a user executes /MOTD + # rules - displayed when the user executes /RULES + # Modules can also define their own files +- ++ + + # Example of an executable file include. Note this will be read on rehash, + # not when the command is run. +@@ -485,7 +486,7 @@ + # the default of 'inspircd.pid' is used. # + # # + +-# ++ + + #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # # +@@ -994,7 +995,7 @@ + # provide almost all the features of InspIRCd. :) # + # # + # The default does nothing -- we include it for simplicity for you. # +- ++ + + # Here are some pre-built modules.conf files that closely match the + # default configurations of some popular IRCd's. You still may want to +@@ -1006,10 +1007,10 @@ + # recommended that you make your own modules file based on modules.conf.example. + + # Settings similar to UnrealIRCd defaults. +-# ++# + + # Settings similar to Charybdis IRCd defaults. +-# ++# + + + ######################################################################### +diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example +index c3f074b94..4b0a584bb 100644 +--- a/docs/conf/modules.conf.example ++++ b/docs/conf/modules.conf.example +@@ -315,7 +315,7 @@ + # specify some censor tags. See also: # + # https://wiki.inspircd.org/Modules/2.0/censor # + # +-# ++# + + #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # CGI:IRC module: Adds support for automatic host changing in CGI:IRC +@@ -790,7 +790,7 @@ + # specify below the path to the filter.conf file, or define some # + # tags. # + # # +-# ++# + + #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # Gecos ban: Implements extended ban 'r', which stops anyone matching +@@ -849,7 +849,7 @@ + # # + # If you specify to use the m_helpop.so module, then specify below # + # the path to the helpop.conf file. # +-# ++# + + #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # Hide chans module: Allows users to hide their channels list from non- +@@ -1304,7 +1304,7 @@ + # Read the comment above in # + # inspircd.conf.example for details. # + # # +-# ++# + + #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # Override module: Adds support for oper override. +diff --git a/make/template/main.mk b/make/template/main.mk +index 23daa7efc..386e0138a 100644 +--- a/make/template/main.mk ++++ b/make/template/main.mk +@@ -34,7 +34,7 @@ CC = @CC@ + SYSTEM = @SYSTEM@ + BUILDPATH = @BUILD_DIR@ + SOCKETENGINE = @SOCKETENGINE@ +-CXXFLAGS = -pipe -fPIC -DPIC ++MYCXXFLAGS = -pipe -fPIC -DPIC + LDLIBS = -pthread -lstdc++ + LDFLAGS = + CORELDFLAGS = -rdynamic -L. $(LDFLAGS) +@@ -52,9 +52,9 @@ INSTMODE_BIN = 0755 + INSTMODE_LIB = 0644 + + @IFEQ $(CC) icpc +- CXXFLAGS += -Wshadow ++ MYCXXFLAGS += -Wshadow + @ELSE +- CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall ++ MYCXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall + @ENDIF + + +@@ -76,46 +76,46 @@ INSTMODE_LIB = 0644 + INSTALL = ginstall + @ENDIF + @IFEQ $(SYSTEM) darwin +- CXXFLAGS += -DDARWIN -frtti ++ MYCXXFLAGS += -DDARWIN -frtti + LDLIBS += -ldl + CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS) + PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS) + @ENDIF + @IFEQ $(SYSTEM) interix +- CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include ++ MYCXXFLAGS += -D_ALL_SOURCE -I/usr/local/include + @ENDIF + +-@IFNDEF D +- D=0 ++@IFNDEF DEBUGLEVEL ++ DEBUGLEVEL=0 + @ENDIF + + GCC6=@GCC6@ + @IFEQ $(GCC6) true +- CXXFLAGS += -fno-delete-null-pointer-checks ++ MYCXXFLAGS += -fno-delete-null-pointer-checks + @ENDIF + + DBGOK=0 +-@IFEQ $(D) 0 +- CXXFLAGS += -O2 ++@IFEQ $(DEBUGLEVEL) 0 ++ MYCXXFLAGS += -O2 + @IFEQ $(CC) g++ +- CXXFLAGS += -g1 ++ MYCXXFLAGS += -g1 + @ENDIF + HEADER = std-header + DBGOK=1 + @ENDIF +-@IFEQ $(D) 1 +- CXXFLAGS += -O0 -g3 -Werror ++@IFEQ $(DEBUGLEVEL) 1 ++ MYCXXFLAGS += -O0 -g3 -Werror + HEADER = debug-header + DBGOK=1 + @ENDIF +-@IFEQ $(D) 2 +- CXXFLAGS += -O2 -g3 ++@IFEQ $(DEBUGLEVEL) 2 ++ MYCXXFLAGS += -O2 -g3 + HEADER = debug-header + DBGOK=1 + @ENDIF + FOOTER = finishmessage + +-CXXFLAGS += -Iinclude ++MYCXXFLAGS += -Iinclude + + @GNU_ONLY MAKEFLAGS += --no-print-directory + +@@ -135,10 +135,11 @@ CXXFLAGS += -Iinclude + @ENDIF + + @IFDEF PURE_STATIC +- CXXFLAGS += -DPURE_STATIC ++ MYCXXFLAGS += -DPURE_STATIC + @ENDIF + +-@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS ++MYCXXFLAGS += $(CXXFLAGS) ++@DO_EXPORT RUNCC RUNLD MYCXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS + @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC + + # Default target +@@ -151,10 +152,10 @@ TARGET = all + @GNU_ONLY TARGET = modules/$(M:.so=).so + @ENDIF + +-@IFDEF T ++@IFDEF TGT + HEADER = + FOOTER = target +- TARGET = $(T) ++ TARGET = $(TGT) + @ENDIF + + @IFEQ $(DBGOK) 0 +@@ -229,8 +230,8 @@ install: target + @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(DATPATH) + @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(LOGPATH) + @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH) +- @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases +- @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules ++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/aliases ++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/modules + @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH) + [ "$(BUILDPATH)/bin/" -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH) + @IFNDEF PURE_STATIC +@@ -238,9 +239,9 @@ install: target + @ENDIF + -$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null + -$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null +- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples +- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases +- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules ++ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH) ++ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/aliases ++ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/modules + @echo "" + @echo "*************************************" + @echo "* INSTALL COMPLETE! *" +@@ -253,7 +254,7 @@ install: target + @echo ' Data:' $(DATPATH) + @echo 'To start the ircd, run:' $(BASE)/inspircd start + @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf +- @echo 'Examples are available at:' $(CONPATH)/examples/ ++ @echo 'Examples are available at:' $(CONPATH) + + @GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh) + @BSD_ONLY RCS_FILES = src/version.sh +diff --git a/make/unit-cc.pl b/make/unit-cc.pl +index a494fb74b..2a570ec91 100755 +--- a/make/unit-cc.pl ++++ b/make/unit-cc.pl +@@ -113,7 +113,7 @@ sub do_compile { + my $libs = ''; + my $binary = $ENV{RUNCC}; + if ($do_compile) { +- $flags = $ENV{CXXFLAGS}; ++ $flags = $ENV{MYCXXFLAGS}; + $flags =~ s/ -pedantic// if nopedantic($file); + $flags .= ' ' . getcompilerflags($file); + diff --git a/net-irc/inspircd/inspircd-2.0.28.ebuild b/net-irc/inspircd/inspircd-2.0.28.ebuild new file mode 100644 index 00000000000..41581c0c6c1 --- /dev/null +++ b/net-irc/inspircd/inspircd-2.0.28.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit toolchain-funcs + +DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd" +HOMEPAGE="https://inspircd.github.com/" +SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre" + +RDEPEND=" + acct-group/inspircd + acct-user/inspircd + dev-lang/perl + ssl? ( dev-libs/openssl:= ) + geoip? ( dev-libs/geoip ) + gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) + ldap? ( net-nds/openldap ) + mysql? ( dev-db/mysql-connector-c:= ) + postgres? ( dev-db/postgresql:= ) + pcre? ( dev-libs/libpcre ) + sqlite? ( >=dev-db/sqlite-3.0 ) + tre? ( dev-libs/tre )" +DEPEND="${RDEPEND}" + +DOCS=( docs/. ) +PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch ) + +src_prepare() { + default + + # Patch the inspircd launcher with the inspircd user + sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die +} + +src_configure() { + local extras="" + + use geoip && extras+="m_geoip.cpp," + use gnutls && extras+="m_ssl_gnutls.cpp," + use ldap && extras+="m_ldapauth.cpp,m_ldapoper.cpp," + use mysql && extras+="m_mysql.cpp," + use pcre && extras+="m_regex_pcre.cpp," + use posix && extras+="m_regex_posix.cpp," + use postgres && extras+="m_pgsql.cpp," + use sqlite && extras+="m_sqlite3.cpp," + use ssl && extras+="m_ssl_openssl.cpp," + use tre && extras+="m_regex_tre.cpp," + + # The first configuration run enables certain "extra" InspIRCd + # modules, the second run generates the actual makefile. + if [[ -n "${extras}" ]]; then + ./configure --disable-interactive --enable-extras=${extras%,} + fi + + local myconf=( + --with-cc="$(tc-getCXX)" + --disable-interactive + --prefix="/usr/$(get_libdir)/${PN}" + --config-dir="/etc/${PN}" + --data-dir="/var/lib/${PN}/data" + --log-dir="/var/log/${PN}" + --binary-dir="/usr/bin" + --module-dir="/usr/$(get_libdir)/${PN}/modules" + $(usex ipv6 '' '--disable-ipv6') + $(usex gnutls '--enable-gnutls' '') + $(usex ssl '--enable-openssl' '')) + ./configure "${myconf[@]}" +} + +src_compile() { + emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" +} + +src_install() { + emake INSTUID=${PN} DESTDIR="${D%/}" install + + insinto "/usr/include/${PN}" + doins -r include/. + + einstalldocs + + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + + keepdir "/var/log/${PN}" + + diropts -o"${PN}" -g"${PN}" -m0700 + keepdir "/var/lib/${PN}/data" +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + elog "You will find example configuration files under " + elog "/usr/share/doc/${PN}" + elog "Read the ${PN}.conf.example file carefully before " + elog "starting the service." + fi + local pv + for pv in ${REPLACING_VERSIONS}; do + if ver_test "${pv}" -lt "2.0.24-r1"; then + elog "Starting with 2.0.24-r1 the daemon is no longer started" + elog "with the --logfile option and you are thus expected to define" + elog "logging in the InspIRCd configuration file if you want it." + break + fi + done +}