diff --git a/net-irc/unrealircd/ChangeLog b/net-irc/unrealircd/ChangeLog --- a/net-irc/unrealircd/ChangeLog +++ b/net-irc/unrealircd/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/ChangeLog,v 1.70 2008/08/23 01:20:34 cardoe Exp $ + 17 Dec 2010; Nathan Phillip Brink (binki) + +unrealircd-3.2.9_rc1.ebuild, +files/unrealircd-3.2.9_rc1-destdir.patch, + +files/unrealircd-3.2.9_rc1-libstrl.patch, files/unrealircd.rc, + metadata.xml: + Add unrealircd-3.2.9_rc1, reflecting upstream buildsystem changes. Fix + initscript's suicides. + 15 Dec 2010; Nathan Phillip Brink (binki) unrealircd-3.2.8.1-r2.ebuild: Revert the download URI. diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest --- a/net-irc/unrealircd/Manifest +++ b/net-irc/unrealircd/Manifest @@ -2,31 +2,35 @@ Hash: SHA256 AUX unrealircd-3.2.8.1-libstrl.patch 1248 RMD160 5cf26fb8bb2580e12b4326f4ebc33ba1839fd7d4 SHA1 ddb88988f4e61d90353a85aed3194c4ff1d87900 SHA256 9d36e48f952a035f1d97d2c756c9c463ac7b736781e62472eb93ef14ad0db459 +AUX unrealircd-3.2.9_rc1-destdir.patch 3166 RMD160 01242fc8c35a9ddb89031dd37c7a3fe01f7b60a5 SHA1 4d33da8a0154054441d17282cb22e73251b77042 SHA256 0146d0904c803fd211ec4b9b0f658bf7ab19c6ccc43e00ee4905e85aa3362671 +AUX unrealircd-3.2.9_rc1-libstrl.patch 1371 RMD160 ef0bd8bd3a977b8e61d6f7674977ce92b4d8e7ee SHA1 85fc429a6ea57c4b5d44c8f6ceecce170aeb1fd3 SHA256 4327dabc98dbb0759063e4cff698bdfb087b9da1bce29f79a520c809f04e42cf AUX unrealircd-system-cares-3.2.7.patch 5472 RMD160 d6e817e98b029c6a03e3e49fbcf636eddf6e8c64 SHA1 5b02b22ce79d8c1aa5622e967b974af274c26e3b SHA256 5ad9062bd3b2820476151f84fca810981f094f305d5eb43ca048d3f9de0d7dfe AUX unrealircd-system-cares-3.2.8.patch 4850 RMD160 6bd9456bda2b1dc233cf7ad97c60c0ee11c1f99b SHA1 e9086146a7031b874e514eb2a22c06b5decb8adf SHA256 e3be39af381c12349355ed44c1bfac1a205a84728d006fd3de3cff0a564ee0d9 AUX unrealircd-system-cares.patch 4850 RMD160 6bd9456bda2b1dc233cf7ad97c60c0ee11c1f99b SHA1 e9086146a7031b874e514eb2a22c06b5decb8adf SHA256 e3be39af381c12349355ed44c1bfac1a205a84728d006fd3de3cff0a564ee0d9 AUX unrealircd-system-tre.patch 2238 RMD160 bfac0ded81b84eed017c8fac8ee6bffaa0a6c73a SHA1 d61c537e780016dd1bf78cfac15025cfea3569a3 SHA256 91a11df3fa1db0924311cd02ba7d0cb1a0b26066e9c65bad5756226baf08e9c9 AUX unrealircd.confd 499 RMD160 666439c6e992d3314f8694ba58e8f3e018421f1c SHA1 5cb49d7e9a79c7f8e0b2182dff47811a2f3fb885 SHA256 ae6ce779fae68c1380a7d37950c5ef3b695e434bb435dcdc0f6d3d2282f72582 -AUX unrealircd.rc 640 RMD160 186125558866976380eddae397aba4534a088732 SHA1 815d6950ddb79ca86fa8c887a4386ae9ddd58abe SHA256 a1ac6330e573dc5429153de98c9a8619a92d7ae3502a06e47f392dcaf90f2b07 +AUX unrealircd.rc 792 RMD160 c9d0e1fd9b1d3ef885f05235288e72eabe48c5a0 SHA1 ba65f5ea6174373a3486d6ac231e409e2e25b00b SHA256 53d12d7180b543966795bc37645127ab2315637c4574b2db160861009fdda85e DIST Unreal3.2.8.1.tar.gz 2866456 RMD160 c8e76239e33ba170743f2ddae6bc24782064f105 SHA1 363c3c995bb38cf601f409610ce1937a0002c419 SHA256 009add8da68b6fb66608d06302e59fa9fb994f901cbd92e6f4f10963f2077741 +DIST Unreal3.2.9-rc1.tar.gz 3031711 RMD160 912490814c677abbebc949b1acb003f4f8036285 SHA1 5eb8fe77108ef1e7b4f26ddd8be3824bda47abfe SHA256 7c4754c8c1331754f671b5db9e866d46aa7fcb2942ece055e1250f256052f9a9 EBUILD unrealircd-3.2.8.1-r1.ebuild 4830 RMD160 56403bfd13dd56aae5666722396acfbc9aa92b82 SHA1 054baab5e0975c4b92c3bd0ce63795e99a6651ff SHA256 89e2bfda5b13c76543cb4ebb7db0e956317e6a8e70956af186ce4fed38b88fd5 EBUILD unrealircd-3.2.8.1-r2.ebuild 4736 RMD160 f2ca76b9403a78f3ac9788231f66e7ba8bae68bc SHA1 e1ac8521f1662d0d0a5c56df5f2ba261625382d3 SHA256 80b93e017fefac27587241a1cd83f9fb8d4dc2001453653a11b5f554acaa8934 -MISC ChangeLog 10932 RMD160 92ddf6081fe1bd1ce7558985a3736f2fe210b950 SHA1 7722202b320bf9d74f5b3779f2ec0aab903b5e61 SHA256 df15fc4a3ffd4e9abc6ecaef69e8834c3d9b3a8cffbc7187fe2a4319edda6539 -MISC metadata.xml 819 RMD160 4bc4922a0c4f88c0643d018afcdb34679042b100 SHA1 a0bed439fe30b577b0ee95c2c03f45e4f29f70fc SHA256 4f925bcc1a92f89073c936ae9b22ed8749a683fd80f0d40c15ac722f0936e934 +EBUILD unrealircd-3.2.9_rc1.ebuild 4276 RMD160 edeb3aafdb7412af79132e8e96c6ec86affc1a36 SHA1 b48b52165dcd24bd306071b84d91af19232b8d42 SHA256 0694c3d6c103906f60c1216d2f5647646380ced993ce029e3c15c3e55027e8ce +MISC ChangeLog 11263 RMD160 04ffc796968314d1c1b86d896ad07417e1150de8 SHA1 30ee09e901abd1c8214d8d83f4deb0b0b294b9bc SHA256 7d63538e4c708a3065b5c6f916c4b0e263fd3b971a34f1e9a5d7971a8e831952 +MISC metadata.xml 947 RMD160 6add2b4036d26dc7bea4095d7f49350a6864ec69 SHA1 507bbd9ed2f0a62eaf266c264314b93fbc3bef02 SHA256 3b74e2fcf13d489a201fad08d1b6cb3981753a9218d0a245ca91dc39017dbb42 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iQIcBAEBCAAGBQJNCQJRAAoJEHQ6UuhrqBBQnGYQAJ54vEittmABRJVmsbf1Dr2l -P+b97/AMPIjcepD4VpYL+Qeekzc8WyEvZpFyoFPKrRui/NyqFJ3riDv1alQPA4ij -E0Bo3mPw5uA+vzslc3KCOQX0Wxs023jeyukqiqAk31DVi4Fx83nBf8SkXE/g1DcQ -D1DQv671u0xRHK1VdxC0LPHTqNoNCGXr20ImctmKi/L0coIHRQlumX5hrgeezDDT -iQi5DEuZAOWTNc1xZrgY0Qh4QyrotAYdw54KYxfGVR0t2a/PJ7In7d17JNOxs8Dw -FUCbEAY1gqDihMoPhf+/SPrUq9mKkahIy0VAR65Tr590dyA2xZpUdE+t7TRXPr8W -EympzyyL23rKLf+qK40ZyiZ4xMWNbWaaLZEZenRs0+vUaQ63uEgLcT7c/jFNitcP -lzSBA7aOfpOEn04EnmZUkCmhELg6ek+sA2jzd7H0TbzfGwt+mQOtaX+jqWmyQdPX -JQAH+Tl/IxGk/JcqE6ghUJuLsdSlevwOmF9NNHE3gbrgIdFjYSwzb8atncQ96/Ey -GTvnXs8aR8dsCEtA6XswfOG76Vt7o525fAOWnZY/EN0k9ozKA/rLWYtq4Gjgpgda -Mk0ZPvSHaWQjerWbc8QuPfivdS0pohHbEQWSLcTRLyXa3iuIlTb6MsskPea3MlSr -uIrbez1+m3a2Y/eWTeMa -=ZeJb +iQIcBAEBCAAGBQJNCrmMAAoJEHQ6UuhrqBBQOf8QAIKCqf662hnfuwhoouGXJUsu +0ici4Pj1Tkcu471Qgn18itZOzsojYiba1Qf9qm8ATLxe7fn1847NX7wo/l5sQA0j +F1i7bVNaNDLRkfRGx3W5OHckl8jWvdIDt9sgAQnstyxbKInMoM4IJlMFJSc+uyAj +OoJDd7pU1c25sJU3eiyapR8mOSCL+cWcRcu6eDF0LmhTZTo/FV1rP8/Rmy4y5zZ0 +VPk92+TQlDCwiOhmt4RRoh683kUABeX/4vlNCRyelTXRS1qT4D67ImOVITGx81JS +2GLZfoOoCwrGp5AGtTibyHYOfmCOmzyb+VGQ2GgK/n3KIZApRbK39zpMdHAAJnZS +lHf0xElpNBObO/ZfkdO2ky/SUHX/+YQIzeCqCtfrUTzX30Q4XsH48ykulKm05vwS +Gy/qOtso29sRxvkmSOjIcneYWGmim5J2k58/tSfMwep67AUo/gRkP2BBXd5Wz8Is +XizpNNO8yxgY/PjeiVWM2ilDCCPRugFh/YjH4Vk36EY72TCKmijQaGDMb7MfwqX4 +B3A1F6xGSecnEkiUjG/Ubrw0oxxUwXCgvcqeWzcwhqjLgd1/RVwCN4Sp9VsB9QvV +jlmmM0Rs0b7djAH5sruYIAt1039uEabpdlFvEJ+agrKk5npyuwu/gSrfdfJSlMiV +9dUPVvkjikFuPfZu/rVB +=sEaF -----END PGP SIGNATURE----- diff --git a/net-irc/unrealircd/files/unrealircd-3.2.9_rc1-destdir.patch b/net-irc/unrealircd/files/unrealircd-3.2.9_rc1-destdir.patch new file mode 100644 --- /dev/null +++ b/net-irc/unrealircd/files/unrealircd-3.2.9_rc1-destdir.patch @@ -0,0 +1,65 @@ +Author: Nathan Phillip Brink +Date: 2010/12/15 + +Support DESTDIR for installing files so that paths which are hardcoded +into the binaries are distinguished from the staging-area-time paths. + + +Index: Makefile.in +=================================================================== +RCS file: /cvs/unreal/Attic/Makefile.in,v +retrieving revision 1.1.2.23.2.12 +diff -u -B -r1.1.2.23.2.12 Makefile.in +--- Makefile.in 15 Dec 2010 01:31:16 -0000 1.1.2.23.2.12 ++++ Makefile.in 16 Dec 2010 00:29:23 -0000 +@@ -205,29 +205,27 @@ + done + + install: all +- $(INSTALL) -m 0700 -d $(IRCDDIR) +- $(INSTALL) -m 0700 src/ircd $(BINDIR) +- $(INSTALL) -m 0700 -d $(IRCDDIR)/networks +- $(INSTALL) -m 0600 networks/*.network $(IRCDDIR)/networks +- $(INSTALL) -m 0700 networks/makenet $(IRCDDIR)/networks +- $(INSTALL) -m 0600 networks/networks.ndx $(IRCDDIR)/networks +- $(INSTALL) -m 0700 -d $(IRCDDIR)/doc +- $(INSTALL) -m 0600 doc/Authors doc/example.conf doc/coding-guidelines doc/tao.of.irc doc/unreal32docs.html $(IRCDDIR)/doc +- $(INSTALL) -m 0700 -d $(IRCDDIR)/aliases +- $(INSTALL) -m 0600 aliases/*.conf $(IRCDDIR)/aliases +- $(TOUCH) $(IRCDDIR)/unrealircd.conf +- chmod 0600 $(IRCDDIR)/unrealircd.conf +- $(INSTALL) -m 0600 spamfilter.conf dccallow.conf $(IRCDDIR) +- $(INSTALL) -m 0600 badwords.*.conf help.conf LICENSE Donation $(IRCDDIR) +- $(INSTALL) -m 0700 unreal $(IRCDDIR) +- $(INSTALL) -m 0700 -d $(IRCDDIR)/modules +- $(INSTALL) -m 0700 src/modules/*.so $(IRCDDIR)/modules +- $(INSTALL) -m 0700 -d $(IRCDDIR)/ircdcron +- $(INSTALL) -m 0600 ircdcron/ircd.cron $(IRCDDIR)/ircdcron +- $(INSTALL) -m 0700 ircdcron/ircdchk $(IRCDDIR)/ircdcron +- -@if [ ! -f "$(IRCDDIR)/curl-ca-bundle.crt" ] ; then \ +- $(INSTALL) -m 0700 curl-ca-bundle.crt $(IRCDDIR) ; \ +- fi ++ $(INSTALL) -m 0700 -d $(DESTDIR)$(IRCDDIR) ++ $(INSTALL) -m 0700 src/ircd $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 0700 -d $(DESTDIR)$(IRCDDIR)/networks ++ $(INSTALL) -m 0600 networks/*.network $(DESTDIR)$(IRCDDIR)/networks ++ $(INSTALL) -m 0700 networks/makenet $(DESTDIR)$(IRCDDIR)/networks ++ $(INSTALL) -m 0600 networks/networks.ndx $(DESTDIR)$(IRCDDIR)/networks ++ $(INSTALL) -m 0700 -d $(DESTDIR)$(IRCDDIR)/doc ++ $(INSTALL) -m 0600 doc/Authors doc/example.conf doc/coding-guidelines doc/tao.of.irc doc/unreal32docs.html $(DESTDIR)$(IRCDDIR)/doc ++ $(INSTALL) -m 0700 -d $(DESTDIR)$(IRCDDIR)/aliases ++ $(INSTALL) -m 0600 aliases/*.conf $(DESTDIR)$(IRCDDIR)/aliases ++ $(TOUCH) $(DESTDIR)$(IRCDDIR)/unrealircd.conf ++ chmod 0600 $(DESTDIR)$(IRCDDIR)/unrealircd.conf ++ $(INSTALL) -m 0600 spamfilter.conf dccallow.conf $(DESTDIR)$(IRCDDIR) ++ $(INSTALL) -m 0600 badwords.*.conf help.conf LICENSE Donation $(DESTDIR)$(IRCDDIR) ++ $(INSTALL) -m 0700 unreal $(DESTDIR)$(IRCDDIR) ++ $(INSTALL) -m 0700 -d $(DESTDIR)$(IRCDDIR)/modules ++ $(INSTALL) -m 0700 src/modules/*.so $(DESTDIR)$(IRCDDIR)/modules ++ $(INSTALL) -m 0700 -d $(DESTDIR)$(IRCDDIR)/ircdcron ++ $(INSTALL) -m 0600 ircdcron/ircd.cron $(DESTDIR)$(IRCDDIR)/ircdcron ++ $(INSTALL) -m 0700 ircdcron/ircdchk $(DESTDIR)$(IRCDDIR)/ircdcron ++ $(INSTALL) -m 0700 curl-ca-bundle.crt $(DESTDIR)$(IRCDDIR) + + pem: src/ssl.cnf + @echo "Generating certificate request .. " diff --git a/net-irc/unrealircd/files/unrealircd-3.2.8.1-libstrl.patch b/net-irc/unrealircd/files/unrealircd-3.2.9_rc1-libstrl.patch copy from net-irc/unrealircd/files/unrealircd-3.2.8.1-libstrl.patch copy to net-irc/unrealircd/files/unrealircd-3.2.9_rc1-libstrl.patch --- a/net-irc/unrealircd/files/unrealircd-3.2.8.1-libstrl.patch +++ b/net-irc/unrealircd/files/unrealircd-3.2.9_rc1-libstrl.patch @@ -14,23 +14,23 @@ Use libstrl for the strlcat(), strlcpy() CRYPTOLIB=@CRYPTOLIB@ OPENSSLINCLUDES= -diff -r 4e2567f3035d -r d3c0a7a3b171 autoconf/configure.in ---- a/autoconf/configure.in Sat Nov 27 09:44:06 2010 -0500 -+++ b/autoconf/configure.in Sat Nov 27 10:40:23 2010 -0500 -@@ -261,9 +261,14 @@ - AC_FUNC_ALLOCA - AC_CHECK_FUNCS(snprintf,AC_DEFINE(HAVE_SNPRINTF)) - AC_CHECK_FUNCS(vsnprintf,AC_DEFINE(HAVE_VSNPRINTF)) --AC_CHECK_FUNCS(strlcpy, AC_DEFINE(HAVE_STRLCPY)) --AC_CHECK_FUNCS(strlcat, AC_DEFINE(HAVE_STRLCAT)) - AC_CHECK_FUNCS(strlncat, AC_DEFINE(HAVE_STRLNCAT)) +--- a/configure.ac Sat Nov 27 09:44:06 2010 -0500 ++++ b/configure.ac Sat Nov 27 10:40:23 2010 -0500 +@@ -300,10 +300,13 @@ + AC_CHECK_FUNCS(vsnprintf, + AC_DEFINE([HAVE_VSNPRINTF], [], [Define if you have vsnprintf])) +-AC_CHECK_FUNCS(strlcpy, +- AC_DEFINE([HAVE_STRLCPY], [], [Define if you have strlcpy. Otherwise, an internal implementation will be used!])) +-AC_CHECK_FUNCS(strlcat, +- AC_DEFINE([HAVE_STRLCAT], [], [Define if you have strlcat])) + AC_CHECK_FUNCS(strlncat, + AC_DEFINE([HAVE_STRLNCAT], [], [Define if you have strlncat])) + +PKG_CHECK_MODULES([LIBSTRL], [libstrl >= 0.2]) +LIBS="$LIBS $LIBSTRL_LIBS" +CFLAGS="$CFLAGS $LIBSTRL_CFLAGS" -+AC_DEFINE(HAVE_STRLCPY) -+AC_DEFINE(HAVE_STRLCAT) ++AC_DEFINE([HAVE_STRLCPY], [], [Define if you have strlcpy(). Otherwise, an internal implementation will be used!]) ++AC_DEFINE([HAVE_STRLCAT], [], [Define if you have strlcat().]) + - AC_CHECK_FUNCS(inet_pton, AC_DEFINE(HAVE_INET_PTON)) - AC_CHECK_FUNCS(inet_ntop, AC_DEFINE(HAVE_INET_NTOP)) - dnl Check if it supports C99 style variable length arrays + AC_CHECK_FUNCS(inet_pton, + AC_DEFINE([HAVE_INET_PTON], [], [Define if you have inet_pton])) diff --git a/net-irc/unrealircd/files/unrealircd.rc b/net-irc/unrealircd/files/unrealircd.rc old mode 100755 new mode 100644 --- a/net-irc/unrealircd/files/unrealircd.rc +++ b/net-irc/unrealircd/files/unrealircd.rc @@ -1,5 +1,5 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/files/unrealircd.rc,v 1.7 2004/10/09 20:36:31 swegener Exp $ @@ -13,18 +13,19 @@ depend() { start() { ebegin "Starting unrealircd" start-stop-daemon --start --quiet --exec /usr/bin/unrealircd \ - --chuid ${UNREALIRCD_USER} -- ${UNREALIRCD_OPTS} &>/dev/null + --chuid ${UNREALIRCD_USER} --pidfile /var/run/unrealircd/ircd.pid \ + -- ${UNREALIRCD_OPTS} &>/dev/null eend $? } stop() { ebegin "Shutting down unrealircd" - killall unrealircd + start-stop-daemon --stop --quiet --pidfile /var/run/unrealircd/ircd.pid eend $? } reload() { ebegin "Re-Loading unrealircd" - killall -1 unrealircd + start-stop-daemon --signal HUP --quiet --pidfile /var/run/unrealircd/ircd.pid eend $? } diff --git a/net-irc/unrealircd/metadata.xml b/net-irc/unrealircd/metadata.xml --- a/net-irc/unrealircd/metadata.xml +++ b/net-irc/unrealircd/metadata.xml @@ -3,6 +3,7 @@ net-irc + Enable extbans (such as ~c: and ~n:) to contain other extbans instead of just hostmasks Enable /set* and /chg* Enable hub support Enable spoofing protection diff --git a/net-irc/unrealircd/unrealircd-3.2.8.1-r2.ebuild b/net-irc/unrealircd/unrealircd-3.2.9_rc1.ebuild copy from net-irc/unrealircd/unrealircd-3.2.8.1-r2.ebuild copy to net-irc/unrealircd/unrealircd-3.2.9_rc1.ebuild --- a/net-irc/unrealircd/unrealircd-3.2.8.1-r2.ebuild +++ b/net-irc/unrealircd/unrealircd-3.2.9_rc1.ebuild @@ -6,36 +6,38 @@ EAPI=2 inherit eutils autotools ssl-cert versionator multilib -MY_P=Unreal${PV} +MY_P=Unreal$(replace_version_separator 3 -) -DESCRIPTION="aimed to be an advanced (not easy) IRCd" +DESCRIPTION="An advanced Internet Relay Chat daemon" HOMEPAGE="http://www.unrealircd.com/" SRC_URI="http://www.unrealircd.com/downloads/${MY_P}.tar.gz" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" -IUSE="curl +hub ipv6 +operoverride +nospoof operoverride-verify +prefixaq +KEYWORDS="~amd64 ~x86" +IUSE="curl ipv6 +extban-stacking +operoverride +nospoof operoverride-verify +prefixaq showlistmodes shunnotices ssl topicisnuhost +usermod zlib" RDEPEND="ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl ) + dev-libs/libstrl dev-libs/tre - >=net-dns/c-ares-1.5.3" + >=net-dns/c-ares-1.6.0" DEPEND="${RDEPEND} - >=sys-apps/sed-4 dev-util/pkgconfig" S=${WORKDIR}/Unreal$(get_version_component_range 1-2) +AT_M4DIR=autoconf/m4 + pkg_setup() { - enewuser unrealircd + enewuser unrealircd || die } src_prepare() { - #QA check against bundled pkgs - rm extras/*.gz + # QA check against bundled pkgs + rm extras/*.gz || die sed -i \ -e "s:ircd\.pid:/var/run/unrealircd/ircd.pid:" \ @@ -45,60 +47,51 @@ src_prepare() { include/config.h \ || die "sed failed" - # http://bugs.unrealircd.org/view.php?id=3842 - epatch "${FILESDIR}"/unrealircd-system-tre.patch - epatch "${FILESDIR}"/unrealircd-system-cares.patch - + # My own anti-replication of strlcpy()/strlcat(). --binki epatch "${FILESDIR}"/${P}-libstrl.patch - mv autoconf/configure.in ./ || die - mv autoconf/aclocal.m4 ./acinclude.m4 || die - #can't call eautoreconf because aclocal's source files aren't even in unearlircd's svn! - eaclocal - eautoconf + # Support DESTDIR= for emake install + epatch "${FILESDIR}"/${P}-destdir.patch + + eautoreconf } src_configure() { local myconf="" + + # Many unrealircd options don't support the --disable/--without + # variation. use curl && myconf="${myconf} --enable-libcurl=/usr" - use ipv6 && myconf="${myconf} --enable-inet6" use zlib && myconf="${myconf} --enable-ziplinks" - use hub && myconf="${myconf} --enable-hub" use ssl && myconf="${myconf} --enable-ssl" - use prefixaq && myconf="${myconf} --enable-prefixaq" - use nospoof && myconf="${myconf} --enable-nospoof" - use showlistmodes && myconf="${myconf} --with-showlistmodes" - use topicisnuhost && myconf="${myconf} --with-topicisnuhost" - use shunnotices && myconf="${myconf} --with-shunnotices" - use operoverride || myconf="${myconf} --with-no-operoverride" - use operoverride-verify && myconf="${myconf} --with-operoverride-verify" - use usermod || myconf="${myconf} --with-disableusermod" econf \ --with-listen=5 \ - --with-dpath="${D}"/etc/unrealircd \ + --with-dpath=/etc/unrealircd \ --with-spath=/usr/bin/unrealircd \ --with-nick-history=2000 \ --with-sendq=3000000 \ --with-bufferpool=18 \ - --with-hostname=$(hostname -f) \ --with-permissions=0600 \ --with-fd-setsize=1024 \ --with-system-cares \ --with-system-tre \ --enable-dynamic-linking \ + $(use_enable ipv6 inet6) \ + $(use_enable prefixaq) \ + $(use_enable nospoof) \ + $(use_with showlistmodes) \ + $(use_with topicisnuhost) \ + $(use_with shunnotices) \ + $(use_with \!operoverride no-operoverride) \ + $(use_with operoverride-verify) \ + $(use_with \!usermod disableusermod) \ + $(use_with \!extban-stacking disable-extendedban-stacking) \ ${myconf} - - # Fix upstream poor autofoo - sed -i \ - -e "s:${D}::g" \ - include/setup.h \ - ircdcron/ircdchk \ - || die } src_compile() { - emake MAKE=make IRCDDIR=/etc/unrealircd || die "emake failed" + emake DESTDIR="${D}" || die } src_install() { @@ -134,7 +127,7 @@ src_install() { dohtml doc/*.html || die newinitd "${FILESDIR}"/unrealircd.rc unrealircd || die - newconfd "${FILESDIR}"/unrealircd.confd unrealircd + newconfd "${FILESDIR}"/unrealircd.confd unrealircd || die fperms 700 /etc/unrealircd || die chown -R unrealircd "${D}"/{etc,var/{lib,log,run}}/unrealircd ||die