| 1 |
wired 13/05/28 14:27:49 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: znc-1.0-r2.ebuild |
| 5 |
Log: |
| 6 |
added fix for a NULL pointer dereference in webadmin. removed old patches. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key EB9B4AFA) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.66 net-irc/znc/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/znc/ChangeLog?rev=1.66&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/znc/ChangeLog?rev=1.66&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/znc/ChangeLog?r1=1.65&r2=1.66 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v |
| 20 |
retrieving revision 1.65 |
| 21 |
retrieving revision 1.66 |
| 22 |
diff -u -r1.65 -r1.66 |
| 23 |
--- ChangeLog 3 May 2013 04:15:05 -0000 1.65 |
| 24 |
+++ ChangeLog 28 May 2013 14:27:49 -0000 1.66 |
| 25 |
@@ -1,6 +1,16 @@ |
| 26 |
# ChangeLog for net-irc/znc |
| 27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v 1.65 2013/05/03 04:15:05 wired Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/ChangeLog,v 1.66 2013/05/28 14:27:49 wired Exp $ |
| 30 |
+ |
| 31 |
+*znc-1.0-r2 (28 May 2013) |
| 32 |
+ |
| 33 |
+ 28 May 2013; Alex Alexander <wired@g.o> +znc-1.0-r2.ebuild, |
| 34 |
+ -files/znc-0.096-clearbuffersonmsg-fix.patch, |
| 35 |
+ -files/znc-0.098-modpython-as-needed.patch, |
| 36 |
+ -files/znc-0.200-segfault-fix.patch, |
| 37 |
+ -files/znc-0.202-bouncedcc-dos-fix.patch, |
| 38 |
+ +files/znc-1.0-webadmin-null-pointer-dereference-fix.patch: |
| 39 |
+ added fix for a NULL pointer dereference in webadmin. removed old patches. |
| 40 |
|
| 41 |
03 May 2013; Alex Alexander <wired@g.o> -znc-0.094.ebuild, |
| 42 |
-znc-0.202-r1.ebuild, -znc-0.204.ebuild, -znc-0.206.ebuild, metadata.xml: |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.1 net-irc/znc/znc-1.0-r2.ebuild |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/znc/znc-1.0-r2.ebuild?rev=1.1&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/znc/znc-1.0-r2.ebuild?rev=1.1&content-type=text/plain |
| 50 |
|
| 51 |
Index: znc-1.0-r2.ebuild |
| 52 |
=================================================================== |
| 53 |
# Copyright 1999-2013 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
# $Header: /var/cvsroot/gentoo-x86/net-irc/znc/znc-1.0-r2.ebuild,v 1.1 2013/05/28 14:27:49 wired Exp $ |
| 56 |
|
| 57 |
EAPI=5 |
| 58 |
|
| 59 |
PYTHON_DEPEND="python? 3" |
| 60 |
inherit base python user |
| 61 |
|
| 62 |
MY_PV=${PV/_/-} |
| 63 |
DESCRIPTION="An advanced IRC Bouncer" |
| 64 |
HOMEPAGE="http://znc.in" |
| 65 |
SRC_URI="http://znc.in/releases/${PN}-${MY_PV}.tar.gz" |
| 66 |
|
| 67 |
LICENSE="GPL-2" |
| 68 |
SLOT="0" |
| 69 |
KEYWORDS="~amd64 ~arm ~x86" |
| 70 |
IUSE="daemon debug ipv6 perl python ssl sasl tcl" |
| 71 |
|
| 72 |
RDEPEND=" |
| 73 |
perl? ( >=dev-lang/perl-5.10 ) |
| 74 |
sasl? ( >=dev-libs/cyrus-sasl-2 ) |
| 75 |
ssl? ( >=dev-libs/openssl-0.9.7d ) |
| 76 |
tcl? ( dev-lang/tcl ) |
| 77 |
" |
| 78 |
DEPEND=" |
| 79 |
virtual/pkgconfig |
| 80 |
perl? ( dev-lang/swig ) |
| 81 |
python? ( |
| 82 |
>=dev-lang/swig-2.0.2 |
| 83 |
>=dev-lang/perl-5.10 |
| 84 |
) |
| 85 |
${RDEPEND} |
| 86 |
" |
| 87 |
|
| 88 |
S=${WORKDIR}/${PN}-${MY_PV} |
| 89 |
|
| 90 |
PATCHES=( |
| 91 |
"${FILESDIR}/${P}-systemwideconfig.patch" |
| 92 |
"${FILESDIR}/${P}-webadmin-null-pointer-dereference-fix.patch" |
| 93 |
) |
| 94 |
|
| 95 |
CONFDIR="/var/lib/znc" |
| 96 |
|
| 97 |
pkg_setup() { |
| 98 |
if use python; then |
| 99 |
python_set_active_version 3 |
| 100 |
python_pkg_setup |
| 101 |
fi |
| 102 |
if use daemon; then |
| 103 |
enewgroup ${PN} |
| 104 |
enewuser ${PN} -1 -1 /dev/null ${PN} |
| 105 |
fi |
| 106 |
} |
| 107 |
|
| 108 |
src_configure() { |
| 109 |
econf \ |
| 110 |
$(use_enable debug) \ |
| 111 |
$(use_enable ipv6) \ |
| 112 |
$(use_enable perl) \ |
| 113 |
$(use python && echo "--enable-python=python-$(python_get_version)") \ |
| 114 |
$(use_enable sasl cyrus) \ |
| 115 |
$(use_enable ssl openssl) \ |
| 116 |
$(use_enable tcl tcl) |
| 117 |
} |
| 118 |
|
| 119 |
src_install() { |
| 120 |
emake install DESTDIR="${D}" |
| 121 |
dodoc AUTHORS README.md |
| 122 |
if use daemon; then |
| 123 |
newinitd "${FILESDIR}"/znc.initd znc |
| 124 |
newconfd "${FILESDIR}"/znc.confd znc |
| 125 |
fi |
| 126 |
} |
| 127 |
|
| 128 |
pkg_postinst() { |
| 129 |
if use !daemon; then |
| 130 |
elog |
| 131 |
elog "Run 'znc --makeconf' as the user you want to run ZNC as" |
| 132 |
elog "to make a configuration file" |
| 133 |
elog "If you are using SSL you should also run 'znc --makepem'" |
| 134 |
elog |
| 135 |
else |
| 136 |
elog |
| 137 |
elog "An init-script was installed in /etc/init.d" |
| 138 |
elog "A config file was installed in /etc/conf.d" |
| 139 |
if [[ ! -d "${EROOT}${CONFDIR}" ]]; then |
| 140 |
elog |
| 141 |
elog "Run 'emerge --config znc' to configure ZNC" |
| 142 |
elog "as a system-wide daemon." |
| 143 |
elog |
| 144 |
elog "If you are using SSL you should also run:" |
| 145 |
elog " znc --system-wide-config-as znc --makepem -d ${CONFDIR}" |
| 146 |
elog "as root" |
| 147 |
elog |
| 148 |
elog "If migrating from a user-based install" |
| 149 |
elog "you can use your existing config files:" |
| 150 |
elog " mkdir ${CONFDIR}" |
| 151 |
elog " mv /home/\$USER/.znc/* ${CONFDIR}" |
| 152 |
elog " rm -rf /home/\$USER/.znc" |
| 153 |
elog " chown -R znc:znc ${CONFDIR}" |
| 154 |
elog |
| 155 |
elog "If you already have znc set up and want take advantage of the" |
| 156 |
elog "init script but skip of all the above, you can also edit" |
| 157 |
elog " /etc/conf.d/znc" |
| 158 |
elog "and adjust the variables to your current znc user and config" |
| 159 |
elog "location." |
| 160 |
if [[ -d "${EROOT}"/etc/znc ]]; then |
| 161 |
elog |
| 162 |
ewarn "/etc/znc exists on your system." |
| 163 |
ewarn "Due to the nature of the contents of that folder," |
| 164 |
ewarn "we have changed the default configuration to use" |
| 165 |
ewarn " /var/lib/znc" |
| 166 |
ewarn "please move /etc/znc to /var/lib/znc" |
| 167 |
ewarn "or adjust /etc/conf.d/znc" |
| 168 |
fi |
| 169 |
else |
| 170 |
elog "Existing config detected in ${CONFDIR}" |
| 171 |
elog "You're good to go :)" |
| 172 |
fi |
| 173 |
elog |
| 174 |
fi |
| 175 |
} |
| 176 |
|
| 177 |
pkg_config() { |
| 178 |
if use daemon && ! [[ -d "${EROOT}${CONFDIR}" ]]; then |
| 179 |
einfo "Press ENTER to interactively create a new configuration file for znc." |
| 180 |
einfo "To abort, press Control-C" |
| 181 |
read |
| 182 |
mkdir -p "${EROOT}${CONFDIR}" || die |
| 183 |
chown -R ${PN}:${PN} "${EROOT}${CONFDIR}" || |
| 184 |
die "Setting permissions failed" |
| 185 |
"${EROOT}"/usr/bin/znc --system-wide-config-as znc -c -r -d "${EROOT}${CONFDIR}" || |
| 186 |
die "Config failed" |
| 187 |
echo |
| 188 |
einfo "To start znc, run '/etc/init.d/znc start'" |
| 189 |
einfo "or add znc to a runlevel:" |
| 190 |
einfo " rc-update add znc default" |
| 191 |
else |
| 192 |
if use daemon; then |
| 193 |
ewarn "${CONFDIR} already exists, aborting to avoid damaging" |
| 194 |
ewarn "any existing configuration. If you are sure you want" |
| 195 |
ewarn "to generate a new configuration, remove the folder" |
| 196 |
ewarn "and try again." |
| 197 |
else |
| 198 |
ewarn "To configure znc as a system-wide daemon you have to" |
| 199 |
ewarn "enable the 'daemon' use flag." |
| 200 |
fi |
| 201 |
fi |
| 202 |
} |
Archives