Gentoo Archives: gentoo-commits

From: Louis Sautier <sbraz@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
Date: Sun, 28 Jul 2019 23:05:45
Message-Id: 1564355119.b1df133a9e287eccda10b2d280a6aaeb28ea0c0b.sbraz@gentoo
1 commit: b1df133a9e287eccda10b2d280a6aaeb28ea0c0b
2 Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 28 23:04:46 2019 +0000
4 Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 28 23:05:19 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1df133a
7
8 net-irc/znc: remove vulnerable version 1.7.3
9
10 Bug: https://bugs.gentoo.org/688152
11 Package-Manager: Portage-2.3.69, Repoman-2.3.16
12 Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
13
14 net-irc/znc/Manifest | 1 -
15 net-irc/znc/znc-1.7.3.ebuild | 182 -------------------------------------------
16 2 files changed, 183 deletions(-)
17
18 diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
19 index beff2345859..4a2dbc1e157 100644
20 --- a/net-irc/znc/Manifest
21 +++ b/net-irc/znc/Manifest
22 @@ -1,3 +1,2 @@
23 DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
24 -DIST znc-1.7.3.tar.gz 2084575 BLAKE2B 4d8f76abef8bf2c5f96d9bd04716cd2debae2b2fcd3b8688aa715af6ef09e60c2aac203c5c7b32d2f4d56730f30dbbe9abd5eeec4f07e7580900dcb1cd164530 SHA512 4cd63be2cb3bc1e3950f38984b128c6511bd1b9fc01a00d51cfcdc46826c2dedad120d6ed8e30d9c400909e33d39b2b14579fb40ee1e3508b7f3a07eff3a15d8
25 DIST znc-1.7.4.tar.gz 2084756 BLAKE2B 3b389a13d7c1c59b8ac485b6996b5a56a03689e8191a65c99692ea849a99ed0a013065a47ea3d213faf883e1d3e595375a665090b4173e97261c3afe21a120e7 SHA512 ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae
26
27 diff --git a/net-irc/znc/znc-1.7.3.ebuild b/net-irc/znc/znc-1.7.3.ebuild
28 deleted file mode 100644
29 index 3bd414de002..00000000000
30 --- a/net-irc/znc/znc-1.7.3.ebuild
31 +++ /dev/null
32 @@ -1,182 +0,0 @@
33 -# Copyright 1999-2019 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -PYTHON_COMPAT=( python3_{5,6,7} )
39 -
40 -inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
41 -
42 -GTEST_VER="1.8.1"
43 -GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
44 -DESCRIPTION="An advanced IRC Bouncer"
45 -
46 -if [[ ${PV} == *9999* ]]; then
47 - inherit git-r3
48 - EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
49 - SRC_URI=""
50 -else
51 - MY_PV=${PV/_/-}
52 - MY_P=${PN}-${MY_PV}
53 - SRC_URI="
54 - https://znc.in/releases/archive/${MY_P}.tar.gz
55 - test? ( ${GTEST_URL} )
56 - "
57 - KEYWORDS="amd64 arm x86"
58 - S=${WORKDIR}/${MY_P}
59 -fi
60 -
61 -HOMEPAGE="https://znc.in"
62 -LICENSE="Apache-2.0"
63 -SLOT="0"
64 -IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
65 -
66 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
67 -
68 -RDEPEND="
69 - icu? ( dev-libs/icu:= )
70 - nls? ( dev-libs/boost:=[nls] )
71 - perl? ( >=dev-lang/perl-5.10:= )
72 - python? ( ${PYTHON_DEPS} )
73 - sasl? ( >=dev-libs/cyrus-sasl-2 )
74 - ssl? (
75 - !libressl? ( dev-libs/openssl:0= )
76 - libressl? ( dev-libs/libressl:0= )
77 - )
78 - tcl? ( dev-lang/tcl:0= )
79 - zlib? ( sys-libs/zlib:0= )
80 -"
81 -DEPEND="
82 - ${RDEPEND}
83 - virtual/pkgconfig
84 - nls? ( sys-devel/gettext )
85 - perl? ( >=dev-lang/swig-3.0.0 )
86 - python? ( >=dev-lang/swig-3.0.0 )
87 - test? ( dev-qt/qtnetwork:5 )
88 -"
89 -
90 -PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
91 -
92 -pkg_setup() {
93 - if use python; then
94 - python-single-r1_pkg_setup
95 - fi
96 -
97 - enewgroup ${PN}
98 - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
99 - # The home directory was previously set to /dev/null
100 - # This caused a bug with the systemd unit
101 - # https://bugs.gentoo.org/521916
102 - esethome ${PN} /var/lib/${PN}
103 -}
104 -
105 -src_prepare() {
106 - # Let SWIG rebuild modperl/modpython to make user patching easier.
107 - if [[ ${PV} != *9999* ]]; then
108 - rm modules/modperl/generated.tar.gz || die
109 - rm modules/modpython/generated.tar.gz || die
110 - fi
111 -
112 - sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \
113 - test/CMakeLists.txt || die
114 -
115 - cmake-utils_src_prepare
116 -}
117 -
118 -src_configure() {
119 - local mycmakeargs=(
120 - -DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used.
121 - -DSYSTEMD_DIR="$(systemd_get_systemunitdir)"
122 - -DWANT_ICU="$(usex icu)"
123 - -DWANT_IPV6="$(usex ipv6)"
124 - -DWANT_I18N="$(usex nls)"
125 - -DWANT_PERL="$(usex perl)"
126 - -DWANT_PYTHON="$(usex python)"
127 - -DWANT_CYRUS="$(usex sasl)"
128 - -DWANT_OPENSSL="$(usex ssl)"
129 - -DWANT_TCL="$(usex tcl)"
130 - -DWANT_ZLIB="$(usex zlib)"
131 - )
132 -
133 - if [[ ${PV} != *9999* ]] && use test; then
134 - export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest"
135 - export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
136 - fi
137 -
138 - cmake-utils_src_configure
139 -}
140 -
141 -src_test() {
142 - cmake-utils_src_make unittest
143 - if has network-sandbox ${FEATURES}; then
144 - DESTDIR="${T}/inttest" cmake-utils_src_make install
145 - local filter='-'
146 - if ! use perl; then
147 - filter="${filter}:ZNCTest.Modperl*"
148 - fi
149 - if ! use python; then
150 - filter="${filter}:ZNCTest.Modpython*"
151 - fi
152 - # CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod
153 - # invocations from inside the test
154 - GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \
155 - CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \
156 - CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \
157 - cmake-utils_src_make inttest
158 - else
159 - # TODO: don't require sandbox after
160 - # https://github.com/znc/znc/pull/1363 is implemented
161 - ewarn "FEATURES=-network-sandbox; skipping integration tests which"
162 - ewarn "temporary open local ports."
163 - fi
164 -}
165 -
166 -src_install() {
167 - cmake-utils_src_install
168 -
169 - dodoc NOTICE
170 - newinitd "${FILESDIR}"/znc.initd-r2 znc
171 - newconfd "${FILESDIR}"/znc.confd-r1 znc
172 -
173 - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die
174 - DISABLE_AUTOFORMATTING=1
175 - readme.gentoo_create_doc
176 -}
177 -
178 -pkg_postinst() {
179 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
180 - # This is a new installation
181 - readme.gentoo_print_elog
182 - fi
183 -
184 - if [[ -d "${EROOT}"/etc/znc ]]; then
185 - ewarn "${EROOT}/etc/znc exists on your system."
186 - ewarn "Due to the nature of the contents of that folder,"
187 - ewarn "we have changed the default configuration to use"
188 - ewarn " ${EROOT}/var/lib/znc"
189 - ewarn "please move ${EROOT}/etc/znc to ${EROOT}/var/lib/znc"
190 - ewarn "or adjust your service configuration."
191 - fi
192 -}
193 -
194 -pkg_config() {
195 - if [[ -e "${EROOT}/var/lib/znc" ]]; then
196 - ewarn "${EROOT}/var/lib/znc already exists, aborting to avoid damaging"
197 - ewarn "any existing configuration. If you are sure you want"
198 - ewarn "to generate a new configuration, remove the folder"
199 - ewarn "and try again."
200 - else
201 - einfo "Press enter to interactively create a new configuration file for znc."
202 - einfo "To abort, press Control-C"
203 - read
204 - mkdir -p "${EROOT}/var/lib/znc" || die
205 - chown -R ${PN}:${PN} "${EROOT}/var/lib/znc" ||
206 - die "Setting permissions failed"
207 - start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \
208 - "${EROOT}"/usr/bin/znc -- --makeconf --datadir "${EROOT}/var/lib/znc" ||
209 - die "Config failed"
210 - einfo
211 - einfo "You can now start the znc service using the init system of your choice."
212 - einfo "Don't forget to enable it if you want to use znc at boot."
213 - fi
214 -}