| 1 |
commit: a6a693598258bfd203fda3274c388263ac8bb24c |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 9 15:55:01 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 9 15:55:01 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6a69359 |
| 7 |
|
| 8 |
net-im/bitlbee: security cleanup |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/631072 |
| 11 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
net-im/bitlbee/Manifest | 1 - |
| 15 |
net-im/bitlbee/bitlbee-3.5.1.ebuild | 160 ----------------- |
| 16 |
.../bitlbee/files/bitlbee-3.5-verbose-build.patch | 200 --------------------- |
| 17 |
net-im/bitlbee/files/bitlbee.confd-r1 | 8 - |
| 18 |
net-im/bitlbee/files/bitlbee.initd-r1 | 30 ---- |
| 19 |
5 files changed, 399 deletions(-) |
| 20 |
|
| 21 |
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest |
| 22 |
index 89d1716f8e6..062d56d7000 100644 |
| 23 |
--- a/net-im/bitlbee/Manifest |
| 24 |
+++ b/net-im/bitlbee/Manifest |
| 25 |
@@ -1,2 +1 @@ |
| 26 |
-DIST bitlbee-3.5.1.tar.gz 680351 BLAKE2B 952a12975d4f95020a5b577603aea791fca754006dc96af3c500d3885b6f2c50cabe51ab698625acb717524a729ef03d18a29aa25bd4815bae2f18fa6298aeea SHA512 4eb3b0d3a92910c8dd789cd23338cc6296bf40212c5244fcb27a88ede10e86424ea59c78e719841863701a7fdd8c61819f2775f7b58833e287d9110e49d036f3 |
| 27 |
DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d |
| 28 |
|
| 29 |
diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild |
| 30 |
deleted file mode 100644 |
| 31 |
index 5bae1f674e2..00000000000 |
| 32 |
--- a/net-im/bitlbee/bitlbee-3.5.1.ebuild |
| 33 |
+++ /dev/null |
| 34 |
@@ -1,160 +0,0 @@ |
| 35 |
-# Copyright 1999-2020 Gentoo Authors |
| 36 |
-# Distributed under the terms of the GNU General Public License v2 |
| 37 |
- |
| 38 |
-EAPI=6 |
| 39 |
- |
| 40 |
-inherit systemd toolchain-funcs |
| 41 |
- |
| 42 |
-if [[ ${PV} == "9999" ]]; then |
| 43 |
- EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git" |
| 44 |
- inherit git-r3 |
| 45 |
-else |
| 46 |
- SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz" |
| 47 |
- KEYWORDS="amd64 ppc ~ppc64 x86" |
| 48 |
-fi |
| 49 |
- |
| 50 |
-DESCRIPTION="irc to IM gateway that support multiple IM protocols" |
| 51 |
-HOMEPAGE="https://www.bitlbee.org/" |
| 52 |
- |
| 53 |
-LICENSE="GPL-2" |
| 54 |
-SLOT="0" |
| 55 |
-IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" |
| 56 |
-IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd |
| 57 |
- ${IUSE_PROTOCOLS}" |
| 58 |
-RESTRICT="!test? ( test )" |
| 59 |
- |
| 60 |
-REQUIRED_USE=" |
| 61 |
- || ( purple xmpp msn oscar ) |
| 62 |
- xmpp? ( !nss ) |
| 63 |
- test? ( plugins ) |
| 64 |
-" |
| 65 |
- |
| 66 |
-COMMON_DEPEND=" |
| 67 |
- acct-group/bitlbee |
| 68 |
- acct-user/bitlbee |
| 69 |
- >=dev-libs/glib-2.16 |
| 70 |
- purple? ( net-im/pidgin ) |
| 71 |
- libevent? ( dev-libs/libevent:= ) |
| 72 |
- otr? ( >=net-libs/libotr-4 ) |
| 73 |
- gnutls? ( net-libs/gnutls:= ) |
| 74 |
- !gnutls? ( |
| 75 |
- nss? ( dev-libs/nss ) |
| 76 |
- !nss? ( |
| 77 |
- libressl? ( dev-libs/libressl:= ) |
| 78 |
- !libressl? ( dev-libs/openssl:0= ) |
| 79 |
- ) |
| 80 |
- ) |
| 81 |
-" |
| 82 |
-DEPEND="${COMMON_DEPEND} |
| 83 |
- virtual/pkgconfig |
| 84 |
- selinux? ( sec-policy/selinux-bitlbee ) |
| 85 |
- test? ( dev-libs/check )" |
| 86 |
- |
| 87 |
-RDEPEND="${COMMON_DEPEND} |
| 88 |
- virtual/logger |
| 89 |
- xinetd? ( sys-apps/xinetd )" |
| 90 |
- |
| 91 |
-PATCHES=( |
| 92 |
- "${FILESDIR}"/${PN}-3.5-systemd-user.patch |
| 93 |
- "${FILESDIR}"/${PN}-3.5-verbose-build.patch |
| 94 |
- "${FILESDIR}"/${PN}-3.5-libcheck.patch |
| 95 |
- "${FILESDIR}"/${PN}-3.5-libevent.patch |
| 96 |
-) |
| 97 |
- |
| 98 |
-src_configure() { |
| 99 |
- local myconf |
| 100 |
- |
| 101 |
- # setup plugins, protocol, ipv6 and debug |
| 102 |
- myconf+=( --jabber=$(usex xmpp 1 0) ) |
| 103 |
- for flag in debug ipv6 plugins ${IUSE_PROTOCOLS/+xmpp/} ; do |
| 104 |
- myconf+=( --${flag}=$(usex ${flag} 1 0) ) |
| 105 |
- done |
| 106 |
- |
| 107 |
- # set otr |
| 108 |
- if use otr && use plugins ; then |
| 109 |
- myconf+=( --otr=plugin ) |
| 110 |
- else |
| 111 |
- if use otr ; then |
| 112 |
- ewarn "OTR support has been disabled automatically because it" |
| 113 |
- ewarn "requires the plugins USE flag." |
| 114 |
- fi |
| 115 |
- myconf+=( --otr=0 ) |
| 116 |
- fi |
| 117 |
- |
| 118 |
- # setup ssl use flags |
| 119 |
- if use gnutls ; then |
| 120 |
- myconf+=( --ssl=gnutls ) |
| 121 |
- einfo "Using gnutls for SSL support" |
| 122 |
- else |
| 123 |
- ewarn "Only gnutls is officially supported by upstream." |
| 124 |
- if use nss ; then |
| 125 |
- myconf+=( --ssl=nss ) |
| 126 |
- einfo "Using nss for SSL support" |
| 127 |
- else |
| 128 |
- myconf+=( --ssl=openssl ) |
| 129 |
- einfo "Using openssl for SSL support" |
| 130 |
- fi |
| 131 |
- fi |
| 132 |
- |
| 133 |
- # set event handler |
| 134 |
- if use libevent ; then |
| 135 |
- myconf+=( --events=libevent ) |
| 136 |
- else |
| 137 |
- myconf+=( --events=glib ) |
| 138 |
- fi |
| 139 |
- |
| 140 |
- # not autotools-based |
| 141 |
- ./configure \ |
| 142 |
- --prefix=/usr \ |
| 143 |
- --datadir=/usr/share/bitlbee \ |
| 144 |
- --etcdir=/etc/bitlbee \ |
| 145 |
- --plugindir=/usr/$(get_libdir)/bitlbee \ |
| 146 |
- --pcdir=/usr/$(get_libdir)/pkgconfig \ |
| 147 |
- --systemdsystemunitdir=$(systemd_get_systemunitdir) \ |
| 148 |
- --doc=1 \ |
| 149 |
- --strip=0 \ |
| 150 |
- --verbose=1 \ |
| 151 |
- "${myconf[@]}" || die |
| 152 |
- |
| 153 |
- sed -i \ |
| 154 |
- -e "/^EFLAGS/s:=:&${LDFLAGS} :" \ |
| 155 |
- Makefile.settings || die |
| 156 |
-} |
| 157 |
- |
| 158 |
-src_compile() { |
| 159 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" |
| 160 |
-} |
| 161 |
- |
| 162 |
-src_install() { |
| 163 |
- emake DESTDIR="${D}" install install-etc install-doc install-dev install-systemd |
| 164 |
- |
| 165 |
- keepdir /var/lib/bitlbee |
| 166 |
- fperms 700 /var/lib/bitlbee |
| 167 |
- fowners bitlbee:bitlbee /var/lib/bitlbee |
| 168 |
- |
| 169 |
- dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README} |
| 170 |
- |
| 171 |
- if use xinetd ; then |
| 172 |
- insinto /etc/xinetd.d |
| 173 |
- newins doc/bitlbee.xinetd bitlbee |
| 174 |
- fi |
| 175 |
- |
| 176 |
- newinitd "${FILESDIR}"/bitlbee.initd-r1 bitlbee |
| 177 |
- newconfd "${FILESDIR}"/bitlbee.confd-r1 bitlbee |
| 178 |
- |
| 179 |
- exeinto /usr/share/bitlbee |
| 180 |
- doexe utils/{convert_purple.py,bitlbee-ctl.pl} |
| 181 |
-} |
| 182 |
- |
| 183 |
-pkg_postinst() { |
| 184 |
- if [[ -z ${REPLACING_VERSIONS} ]]; then |
| 185 |
- einfo |
| 186 |
- elog "The bitlbee init script will now attempt to stop all processes owned by the" |
| 187 |
- elog "bitlbee user, including per-client forks." |
| 188 |
- elog |
| 189 |
- elog "Tell the init script not to touch anything besides the main bitlbee process" |
| 190 |
- elog "by changing the BITLBEE_STOP_ALL variable in" |
| 191 |
- elog " /etc/conf.d/bitlbee" |
| 192 |
- einfo |
| 193 |
- fi |
| 194 |
-} |
| 195 |
|
| 196 |
diff --git a/net-im/bitlbee/files/bitlbee-3.5-verbose-build.patch b/net-im/bitlbee/files/bitlbee-3.5-verbose-build.patch |
| 197 |
deleted file mode 100644 |
| 198 |
index 7501963cb5d..00000000000 |
| 199 |
--- a/net-im/bitlbee/files/bitlbee-3.5-verbose-build.patch |
| 200 |
+++ /dev/null |
| 201 |
@@ -1,200 +0,0 @@ |
| 202 |
-Add a --verbose configure flag to enable verbose build output. |
| 203 |
- |
| 204 |
---- bitlbee-3.5/configure |
| 205 |
-+++ bitlbee-3.5/configure |
| 206 |
-@@ -38,6 +38,7 @@ |
| 207 |
- twitter=1 |
| 208 |
- purple=0 |
| 209 |
- |
| 210 |
-+verbose=0 |
| 211 |
- doc=1 |
| 212 |
- debug=0 |
| 213 |
- strip=0 |
| 214 |
-@@ -125,6 +126,8 @@ |
| 215 |
- --pidfile=... $pidfile |
| 216 |
- --config=... $config |
| 217 |
- |
| 218 |
-+--verbose=0/1 Disable/enable verbose build $verbose |
| 219 |
-+ |
| 220 |
- --msn=0/1 Disable/enable MSN part $msn |
| 221 |
- --jabber=0/1 Disable/enable Jabber part $jabber |
| 222 |
- --oscar=0/1 Disable/enable Oscar part (ICQ, AIM) $oscar |
| 223 |
-@@ -282,6 +285,12 @@ |
| 224 |
- debug=1 |
| 225 |
- fi |
| 226 |
- |
| 227 |
-+if [ "$verbose" = "0" ]; then |
| 228 |
-+ echo 'VERBOSE=@' >> Makefile.settings |
| 229 |
-+else |
| 230 |
-+ echo 'VERBOSE=' >> Makefile.settings |
| 231 |
-+fi |
| 232 |
-+ |
| 233 |
- if [ "$debug" = "1" ]; then |
| 234 |
- echo 'DEBUG=1' >> Makefile.settings |
| 235 |
- CFLAGS="$CFLAGS -g3 -DDEBUG -O0" |
| 236 |
---- bitlbee-3.5/lib/Makefile |
| 237 |
-+++ bitlbee-3.5/lib/Makefile |
| 238 |
-@@ -35,12 +35,12 @@ |
| 239 |
- |
| 240 |
- lib.o: $(objects) $(subdirs) |
| 241 |
- @echo '*' Linking lib.o |
| 242 |
-- @$(LD) $(LFLAGS) $(objects) -o lib.o |
| 243 |
-+ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o lib.o |
| 244 |
- |
| 245 |
- $(objects): ../Makefile.settings Makefile |
| 246 |
- |
| 247 |
- $(objects): %.o: $(_SRCDIR_)%.c |
| 248 |
- @echo '*' Compiling $< |
| 249 |
-- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ |
| 250 |
-+ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ |
| 251 |
- |
| 252 |
- -include .depend/*.d |
| 253 |
---- bitlbee-3.5/Makefile |
| 254 |
-+++ bitlbee-3.5/Makefile |
| 255 |
-@@ -162,28 +162,28 @@ |
| 256 |
- tar czf $$x.tar.gz --exclude=debian --exclude=.git* --exclude=.depend $$x |
| 257 |
- |
| 258 |
- $(subdirs): |
| 259 |
-- @$(MAKE) -C $@ $(MAKECMDGOALS) |
| 260 |
-+ $(MAKE) -C $@ $(MAKECMDGOALS) |
| 261 |
- |
| 262 |
- $(OTR_PI): %.so: $(_SRCDIR_)%.c |
| 263 |
- @echo '*' Building plugin $@ |
| 264 |
-- @$(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS) |
| 265 |
-+ $(VERBOSE) $(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS) |
| 266 |
- |
| 267 |
- $(SKYPE_PI): $(_SRCDIR_)protocols/skype/skype.c |
| 268 |
- @echo '*' Building plugin skype |
| 269 |
-- @$(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@ |
| 270 |
-+ $(VERBOSE) $(CC) $(CFLAGS) $(LDFLAGS) $(SKYPEFLAGS) $< -o $@ |
| 271 |
- |
| 272 |
- $(objects): %.o: $(_SRCDIR_)%.c |
| 273 |
- @echo '*' Compiling $< |
| 274 |
-- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ |
| 275 |
-+ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ |
| 276 |
- |
| 277 |
- $(objects): Makefile Makefile.settings config.h |
| 278 |
- |
| 279 |
- $(OUTFILE): $(objects) $(subdirs) |
| 280 |
- @echo '*' Linking $(OUTFILE) |
| 281 |
-- @$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS) |
| 282 |
-+ $(VERBOSE) $(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS_BITLBEE) $(LDFLAGS) $(EFLAGS) |
| 283 |
- ifneq ($(firstword $(STRIP)), \#) |
| 284 |
- @echo '*' Stripping $(OUTFILE) |
| 285 |
-- @-$(STRIP) $(OUTFILE) |
| 286 |
-+ $(VERBOSE) -$(STRIP) $(OUTFILE) |
| 287 |
- endif |
| 288 |
- |
| 289 |
- ctags: |
| 290 |
---- bitlbee-3.5/protocols/jabber/Makefile |
| 291 |
-+++ bitlbee-3.5/protocols/jabber/Makefile |
| 292 |
-@@ -37,10 +37,10 @@ |
| 293 |
- |
| 294 |
- $(objects): %.o: $(_SRCDIR_)%.c |
| 295 |
- @echo '*' Compiling $< |
| 296 |
-- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ |
| 297 |
-+ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ |
| 298 |
- |
| 299 |
- jabber_mod.o: $(objects) |
| 300 |
- @echo '*' Linking jabber_mod.o |
| 301 |
-- @$(LD) $(LFLAGS) $(objects) -o jabber_mod.o |
| 302 |
-+ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o jabber_mod.o |
| 303 |
- |
| 304 |
- -include .depend/*.d |
| 305 |
---- bitlbee-3.5/protocols/Makefile |
| 306 |
-+++ bitlbee-3.5/protocols/Makefile |
| 307 |
-@@ -42,18 +42,18 @@ |
| 308 |
- rm -rf .depend |
| 309 |
- |
| 310 |
- $(subdirs): |
| 311 |
-- @$(MAKE) -C $@ $(MAKECMDGOALS) |
| 312 |
-+ $(MAKE) -C $@ $(MAKECMDGOALS) |
| 313 |
- |
| 314 |
- ### MAIN PROGRAM |
| 315 |
- |
| 316 |
- protocols.o: $(objects) $(subdirs) |
| 317 |
- @echo '*' Linking protocols.o |
| 318 |
-- @$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o |
| 319 |
-+ $(VERBOSE) $(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o |
| 320 |
- |
| 321 |
- $(objects): ../Makefile.settings Makefile |
| 322 |
- |
| 323 |
- $(objects): %.o: $(_SRCDIR_)%.c |
| 324 |
- @echo '*' Compiling $< |
| 325 |
-- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ |
| 326 |
-+ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ |
| 327 |
- |
| 328 |
- -include .depend/*.d |
| 329 |
---- bitlbee-3.5/protocols/msn/Makefile |
| 330 |
-+++ bitlbee-3.5/protocols/msn/Makefile |
| 331 |
-@@ -37,10 +37,10 @@ |
| 332 |
- |
| 333 |
- $(objects): %.o: $(_SRCDIR_)%.c |
| 334 |
- @echo '*' Compiling $< |
| 335 |
-- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ |
| 336 |
-+ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ |
| 337 |
- |
| 338 |
- msn_mod.o: $(objects) |
| 339 |
- @echo '*' Linking msn_mod.o |
| 340 |
-- @$(LD) $(LFLAGS) $(objects) -o msn_mod.o |
| 341 |
-+ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o msn_mod.o |
| 342 |
- |
| 343 |
- -include .depend/*.d |
| 344 |
---- bitlbee-3.5/protocols/oscar/Makefile |
| 345 |
-+++ bitlbee-3.5/protocols/oscar/Makefile |
| 346 |
-@@ -38,10 +38,10 @@ |
| 347 |
- |
| 348 |
- $(objects): %.o: $(_SRCDIR_)%.c |
| 349 |
- @echo '*' Compiling $< |
| 350 |
-- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ |
| 351 |
-+ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ |
| 352 |
- |
| 353 |
- oscar_mod.o: $(objects) |
| 354 |
- @echo '*' Linking oscar_mod.o |
| 355 |
-- @$(LD) $(LFLAGS) $(objects) -o oscar_mod.o |
| 356 |
-+ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o oscar_mod.o |
| 357 |
- |
| 358 |
- -include .depend/*.d |
| 359 |
---- bitlbee-3.5/protocols/purple/Makefile |
| 360 |
-+++ bitlbee-3.5/protocols/purple/Makefile |
| 361 |
-@@ -38,10 +38,10 @@ |
| 362 |
- |
| 363 |
- $(objects): %.o: $(_SRCDIR_)%.c |
| 364 |
- @echo '*' Compiling $< |
| 365 |
-- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ |
| 366 |
-+ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ |
| 367 |
- |
| 368 |
- purple_mod.o: $(objects) |
| 369 |
- @echo '*' Linking purple_mod.o |
| 370 |
-- @$(LD) $(LFLAGS) $(objects) -o purple_mod.o |
| 371 |
-+ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o purple_mod.o |
| 372 |
- |
| 373 |
- -include .depend/*.d |
| 374 |
---- bitlbee-3.5/protocols/twitter/Makefile |
| 375 |
-+++ bitlbee-3.5/protocols/twitter/Makefile |
| 376 |
-@@ -37,10 +37,10 @@ |
| 377 |
- |
| 378 |
- $(objects): %.o: $(_SRCDIR_)%.c |
| 379 |
- @echo '*' Compiling $< |
| 380 |
-- @$(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ |
| 381 |
-+ $(VERBOSE) $(CC) -c $(CFLAGS) $(CFLAGS_BITLBEE) $< -o $@ |
| 382 |
- |
| 383 |
- twitter_mod.o: $(objects) |
| 384 |
- @echo '*' Linking twitter_mod.o |
| 385 |
-- @$(LD) $(LFLAGS) $(objects) -o twitter_mod.o |
| 386 |
-+ $(VERBOSE) $(LD) $(LFLAGS) $(objects) -o twitter_mod.o |
| 387 |
- |
| 388 |
- -include .depend/*.d |
| 389 |
---- bitlbee-3.5/tests/Makefile |
| 390 |
-+++ bitlbee-3.5/tests/Makefile |
| 391 |
-@@ -20,8 +20,8 @@ |
| 392 |
- |
| 393 |
- check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o |
| 394 |
- @echo '*' Linking $@ |
| 395 |
-- @$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS) |
| 396 |
-+ $(VERBOSE) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS) |
| 397 |
- |
| 398 |
- %.o: $(_SRCDIR_)%.c |
| 399 |
- @echo '*' Compiling $< |
| 400 |
-- @$(CC) -c $(CFLAGS) $< -o $@ |
| 401 |
-+ $(VERBOSE) $(CC) -c $(CFLAGS) $< -o $@ |
| 402 |
|
| 403 |
diff --git a/net-im/bitlbee/files/bitlbee.confd-r1 b/net-im/bitlbee/files/bitlbee.confd-r1 |
| 404 |
deleted file mode 100644 |
| 405 |
index d581222f9fb..00000000000 |
| 406 |
--- a/net-im/bitlbee/files/bitlbee.confd-r1 |
| 407 |
+++ /dev/null |
| 408 |
@@ -1,8 +0,0 @@ |
| 409 |
-# Bitlbee options (see /usr/sbin/bitlbee -h) |
| 410 |
-BITLBEE_OPTS="-F" |
| 411 |
- |
| 412 |
-# By default, the bitlbee init script will attempt to stop |
| 413 |
-# all bitlbee-owned processes, including per-client forks. |
| 414 |
-# Setting this to "no" tells the init script to only |
| 415 |
-# stop the main bitlbee process. |
| 416 |
-BITLBEE_STOP_ALL="yes" |
| 417 |
|
| 418 |
diff --git a/net-im/bitlbee/files/bitlbee.initd-r1 b/net-im/bitlbee/files/bitlbee.initd-r1 |
| 419 |
deleted file mode 100644 |
| 420 |
index 413bd45735e..00000000000 |
| 421 |
--- a/net-im/bitlbee/files/bitlbee.initd-r1 |
| 422 |
+++ /dev/null |
| 423 |
@@ -1,30 +0,0 @@ |
| 424 |
-#!/sbin/openrc-run |
| 425 |
-# Copyright 1999-2014 Gentoo Foundation |
| 426 |
-# Distributed under the terms of the GNU General Public License, v2 or |
| 427 |
-# later |
| 428 |
- |
| 429 |
-DAEMON=/usr/sbin/bitlbee |
| 430 |
-PIDFILE=/var/run/bitlbee/bitlbee.pid |
| 431 |
- |
| 432 |
-depend() { |
| 433 |
- need logger net |
| 434 |
-} |
| 435 |
- |
| 436 |
-start () { |
| 437 |
- ebegin "Starting bitlbee" |
| 438 |
- checkpath -d -m 0755 -o bitlbee:bitlbee $(dirname ${PIDFILE}) |
| 439 |
- start-stop-daemon --start --quiet \ |
| 440 |
- -u bitlbee:bitlbee --exec ${DAEMON} --pidfile ${PIDFILE} \ |
| 441 |
- -- -P ${PIDFILE} ${BITLBEE_OPTS} |
| 442 |
- eend $? |
| 443 |
-} |
| 444 |
- |
| 445 |
-stop() { |
| 446 |
- ebegin "Stopping bitlbee" |
| 447 |
- local pidfile= |
| 448 |
- yesno ${BITLBEE_STOP_ALL:-YES} || |
| 449 |
- pidfile="--pidfile ${PIDFILE}" |
| 450 |
- start-stop-daemon --stop --quiet ${pidfile} -u bitlbee:bitlbee |
| 451 |
- eend $? |
| 452 |
-} |
| 453 |
- |
Archives