Commit b54e79d3 authored by Adrian Schollmeyer's avatar Adrian Schollmeyer
Browse files

Merge branch 'fix/remove-custom-icecast' into 'master'

drop custom net-misc/icecast ebuilds

See merge request gentoo/fem-overlay!4
parents c0efc361 4aacba83
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
AUX icecast-2.3.3-fix-xiph_openssl.patch 648 BLAKE2B 714d84af931238b867d384cf15082cf267208e8bbb762d2e7e6626b10bee0478d32a6ae64fb6c5648f156a702d10aa84e4dc43a04ea327bb759fbac533205abc SHA512 fa4014a3aad9886b14f6551cf72c8ae8d97b6879302fc11e8a7b120464540c077786a3209e5f87316393362a9e00d759686c9a3448dd00ec0503e025d28301f2
AUX icecast-2.3.3-libkate.patch 1175 BLAKE2B ad4873af95ac1fe80fcde167773916450eadd0d639516739dda566eb0c5b07bd5a77d54e20911a1b21da4cb3987308595c5aaa0e79f54d410d5e051c78585828 SHA512 4ecacacb422ceb71bb6f8857228b2c00e2564d6926124aa8e9430b0f1466df934146fcbbc67194a6e644f6c4c16421474016909c385ec2271967730f80f5b8b3
AUX icecast.initd 428 BLAKE2B 888fccde7a5f2ed9682b574922e69360f253cbc900f852167d9e10b9aed0ab2bcb39580501fb4d5fa7ce10c835bb3fc5dbadcc4486738e937eb1669d2f17f6c6 SHA512 adb55342c95ef27ebe0e46f8ad7e201f9e044433e9c655af98e27229c61f62b0a31f50ed87d931836cdddca6a1dad2235e0d4c877a5bcb59a4a4893c06176723
AUX icecast.logrotate 140 BLAKE2B e42003ef1902b876df9c90fbbe15ebfd41fe6b38d989d22b9878097de3bb7634bd713a8704074f3b065fb57d20827da7c022c1591512fd03822284d49572726c SHA512 8aead6208b97b1d1cbd5d17a61dd3dd2493bdf68bfefc3ab6f9ae3e1acc856435942de7a129ef701c5379450428b9718e50701636e16d9e1ddccc8c752c2ccac
AUX icecast.service 185 BLAKE2B 342bfd8bb1c906ae6184ae56469c7fd484b09d55da9d552cd1e8ec32865bc8756608f2962fc63810fe3fbd1936819d36207926c80e5eb1796ec7dc742f56d075 SHA512 a1e662f9b39ecbd35f28e849c5ae9db314d12e8fcefb152660180e9b51fe538197522c5ddda4908a4012ebe73ac4f9a6c12543a01548e9c41f17b5a17b942f51
AUX icecast.xml 6775 BLAKE2B 2e63a21250cc0e3e580ee1bda7a188d295e3ce81de9ebb442bcd17c4ca5ed6edc0384bf03128e9b680b399feabb4272b7d56940f8732f3ca8da9a5fd68c6c11e SHA512 72620980b9213aa3570b9e4e803cb901f0a3770b081721f0f4e01ad9a0af0cc8a7f6242940b1ac9941f51320ab8c3e97245cf8e0249c5bf504b8f3a01c250a96
DIST icecast-2.4.4.tar.gz 2360592 BLAKE2B fd4034749feb4bf38c684ac6d8de572fdebce875843dc1be286264c8fe8d38feb24ea889b07ec79aada34cf16dae46eb21a8c5470f67c08f2dd56dc04c12130f SHA512 e9ffb478cac2570891787455591d881a59185e067bb36f51706a7070cd9d82d80425ec8cf151f5ebb17d1b75654449fc760f8b82a1bb05f020b47ec09e46b4d0
DIST icecast-2.5-beta2.tar.gz 2412741 BLAKE2B c6a0b6d02972f7a525f5526685eb686b54ec072e1f8d60b0c8b61d5acbbe805c9666f485a26bb4b7f9bfbaab096a919e34ac93e38eb53580901a5803250f84a8 SHA512 b8dc04c76232cf5b4db49cc1bb3700fc4468ec26bc18c146b889095a33ce1aed6b0d550b840cbca2fc36a9b5f69b88bbacee19583a7c744276c71c5ebbc77875
EBUILD icecast-2.4.4.ebuild 2172 BLAKE2B 5e3c26ea842c1ec6a683acadd9a04a415d5ed01b1817bfad2ca9e6a8739bebc49a21cef85beac4de03394c9194111b794d8b6646ac509ebe64ed10c86ba28f1b SHA512 f14658e794605a179642688267f4e5c8662eb74e7196c72131977365ae63d674fa7812d881992bb3c57a6b1c25e5c4002c7bb65d0b7d331d2b5bd3c7a28bae67
EBUILD icecast-2.4.99.2.ebuild 2033 BLAKE2B e4e8ce62f9e0220c6bf32110a1e7c590f651c32d004e26ace510a47dd82ca97ba01f1cd3a1501251d6e5f485f902195b5121a86adfff6e627e59d0ceaa7388ea SHA512 2a768229df0c8269bfe3b034ec37cf01f989bf91bcf04f636514dc1f532a19122c5adebd32cbe57e600f88100a5f8d9e0726836fc5082110e098c5c06bfc51f0
MISC metadata.xml 511 BLAKE2B 88b53105945ff6dce5bc326029e37752c64b36f9ed78fa09b383093e4097acffc9b5998b0b0e3bd3cc0eefec6ba28154435f8ad050de3d6b497409a4ef5d852d SHA512 eba7687b6e4bd9246af7392e661ba86ec701181094c413e2fc6b74715386d10a9d667a63288dbaaaaaa60222c9b8e82022f14ba7cb55e6a8f89a377502a6dff6
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEtZozbkn6wML1Sbpxb0vn8xmaW8EFAl7Q84wACgkQb0vn8xma
W8Hi2w//X3PZyGeInCNyXMmd+UfmLfkSdm3/Wt/58yGFvYCK4t25T6QRP6KV9045
uYSu4np1CAnw0LvscF9WLa0TOFtskiHCydjojhpQhdOKT8HxnVfX8WTG/j+4NP+3
j7DlXEGjCZu5Sll1j1+VJaVzFX9xwyI2a+HWPoWiIDdT3E1icGKYLwWxQ5Ao9Pxa
ZPWszfQHExmv5huEr7Y6krd77nzgd8Q4sUZXoSPlP9nUcHmNCCFsr2eKkOjJYi9z
+ZuenK85jxpHdrre4gVTGI9wfRLPGiIwVMU+0XTV1SoZGYxrWSserOt6t9BKgeRZ
57gzSEXyQ5DUMLyHTXvlsPNjYFx78hdMcsI1YYaWi4qmiEnC1677JLGRJ7bBGW1/
HWstC88olL5sidkkUtTAFWuAQPnEyY8ycpm+le00kcnpLvA7jyoYBl0UxCzD3tXR
vZOCovqLmihGU1Y0v5+OmpYpxG1wLig8S/QrnAjpAm0yiXbXV8fb/Q8XNCJMF/Bn
piLJZGZRxhVXpSUWzLpQAUmKDm+3VnK1nnxhFkYYkqwDcFQQmAXtXIeUVDDOiGK/
lUt62li8nfGsUZAM+6tZ2B+YSPbEAVMRTeQ/eXtOOXDyJhQLymFW4Yw8XOcbkvGb
FufblSTiGdSDfG687plvYvbPwKbWayEeBJXywbrnVwEwgDKDt1k=
=RLq5
-----END PGP SIGNATURE-----
Index: icecast-2.3.3/m4/xiph_openssl.m4
===================================================================
--- icecast-2.3.3.orig/m4/xiph_openssl.m4
+++ icecast-2.3.3/m4/xiph_openssl.m4
@@ -10,7 +10,7 @@ AC_ARG_WITH(openssl,
AC_HELP_STRING([--with-openssl=PFX],[Prefix where openssl is installed (optional)]),
openssl_prefix="$withval", openssl_prefix="")
-if test "x$openssl_prefix" != "x" -a "x$openssl_prefix" != "xyes"; then
+if test "x$openssl_prefix" != "x" -a "x$openssl_prefix" != "xyes" -a "x$openssl_prefix" != "xno"; then
OPENSSL_LIBS="-L$openssl_prefix/lib -lssl"
OPENSSL_CFLAGS="-I$openssl_prefix/include"
else
Index: icecast-2.3.3/configure.in
===================================================================
--- icecast-2.3.3.orig/configure.in
+++ icecast-2.3.3/configure.in
@@ -81,14 +81,18 @@ XIPH_PATH_SPEEX(
[ AC_MSG_WARN([Speex support disabled!])
])
-AC_CHECK_LIB(kate, kate_decode_init,[have_kate=yes],[have_kate=no], -logg)
-if test "x$have_kate" == "xyes"
+AC_ARG_ENABLE([kate], AS_HELP_STRING([--disable-kate], [Disable karaoke and text encapsulation support for ogg]))
+if test "x$enable_kate" != "xno"
then
- AC_CHECK_LIB(oggkate, kate_ogg_decode_headerin,[have_kate=yes],[have_kate=no],-lkate -logg)
+ AC_CHECK_LIB(kate, kate_decode_init,[have_kate=yes],[have_kate=no], -logg)
if test "x$have_kate" == "xyes"
then
- KATE_LIBS="-loggkate -lkate -logg"
- AC_DEFINE([HAVE_KATE],[1],[Define if you have libkate])
+ AC_CHECK_LIB(oggkate, kate_ogg_decode_headerin,[have_kate=yes],[have_kate=no],-lkate -logg)
+ if test "x$have_kate" == "xyes"
+ then
+ KATE_LIBS="-loggkate -lkate -logg"
+ AC_DEFINE([HAVE_KATE],[1],[Define if you have libkate])
+ fi
fi
fi
dnl we still use format_kate as it doesn't need libkate to work
#!/sbin/openrc-run
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
extra_started_commands="reload"
pidfile="/var/run/icecast.pid"
command="/usr/bin/icecast"
command_args="-c /etc/icecast2/icecast.xml"
command_background="true"
depend() {
need net
}
reload() {
ebegin "Reloading Icecast2 configuration"
start-stop-daemon --signal HUP --pidfile ${pidfile}
eend $?
}
/var/log/icecast/*log {
missingok
notifempty
sharedscripts
postrotate
/etc/init.d/icecast reload > /dev/null 2>&1 || true
endscript
}
[Unit]
Description=An opensource alternative to shoutcast
After=network.target
[Service]
ExecStart=/usr/bin/icecast -c /etc/icecast2/icecast.xml
[Install]
WantedBy=multi-user.target
<icecast>
<limits>
<clients>100</clients>
<sources>2</sources>
<queue-size>524288</queue-size>
<client-timeout>30</client-timeout>
<header-timeout>15</header-timeout>
<source-timeout>10</source-timeout>
<!-- If enabled, this will provide a burst of data when a client
first connects, thereby significantly reducing the startup
time for listeners that do substantial buffering. However,
it also significantly increases latency between the source
client and listening client. For low-latency setups, you
might want to disable this. -->
<burst-on-connect>1</burst-on-connect>
<!-- same as burst-on-connect, but this allows for being more
specific on how much to burst. Most people won't need to
change from the default 64k. Applies to all mountpoints -->
<burst-size>65535</burst-size>
</limits>
<authentication>
<!-- Sources log in with username 'source' -->
<source-password>hackme</source-password>
<!-- Relays log in username 'relay' -->
<relay-password>hackme</relay-password>
<!-- Admin logs in with the username given below -->
<admin-user>admin</admin-user>
<admin-password>hackme</admin-password>
</authentication>
<!-- Uncomment this if you want directory listings -->
<!--
<directory>
<yp-url-timeout>15</yp-url-timeout>
<yp-url>http://dir.xiph.org/cgi-bin/yp-cgi</yp-url>
</directory>
<directory>
<yp-url-timeout>15</yp-url-timeout>
<yp-url>http://www.oddsock.org/cgi-bin/yp-cgi</yp-url>
</directory>
-->
<!-- This is the hostname other people will use to connect to your server.
It affects mainly the urls generated by Icecast for playlists and yp
listings. -->
<hostname>localhost</hostname>
<!-- You can use these two if you only want a single listener -->
<!--<port>8000</port> -->
<!--<bind-address>127.0.0.1</bind-address>-->
<!-- You may have multiple <listener> elements -->
<listen-socket>
<port>8000</port>
<!-- <bind-address>127.0.0.1</bind-address> -->
</listen-socket>
<!--
<listen-socket>
<port>8001</port>
</listen-socket>
-->
<!--<master-server>127.0.0.1</master-server>-->
<!--<master-server-port>8001</master-server-port>-->
<!--<master-update-interval>120</master-update-interval>-->
<!--<master-password>hackme</master-password>-->
<!-- setting this makes all relays on-demand unless overridden, this is
useful for master relays which do not have <relay> definitions here.
The default is 0 -->
<!--<relays-on-demand>1</relays-on-demand>-->
<!--
<relay>
<server>127.0.0.1</server>
<port>8001</port>
<mount>/example.ogg</mount>
<local-mount>/different.ogg</local-mount>
<on-demand>0</on-demand>
<relay-shoutcast-metadata>0</relay-shoutcast-metadata>
</relay>
-->
<!-- Only define a <mount> section if you want to use advanced options,
like alternative usernames or passwords -->
<!--
<mount>
<mount-name>/example-complex.ogg</mount-name>
<username>othersource</username>
<password>hackmemore</password>
<max-listeners>1</max-listeners>
<dump-file>/tmp/dump-example1.ogg</dump-file>
<burst-size>65536</burst-size>
<fallback-mount>/example2.ogg</fallback-mount>
<fallback-override>1</fallback-override>
<fallback-when-full>1</fallback-when-full>
<intro>/example_intro.ogg</intro>
<hidden>1</hidden>
<no-yp>1</no-yp>
<authentication type="htpasswd">
<option name="filename" value="myauth"/>
<option name="allow_duplicate_users" value="0"/>
</authentication>
<on-connect>/home/icecast/bin/stream-start</on-connect>
<on-disconnect>/home/icecast/bin/stream-stop</on-disconnect>
</mount>
<mount>
<mount-name>/auth_example.ogg</mount-name>
<authentication type="url">
<option name="mount_add" value="http://myauthserver.net/notify_mount.php"/>
<option name="mount_remove" value="http://myauthserver.net/notify_mount.php"/>
<option name="listener_add" value="http://myauthserver.net/notify_listener.php"/>
<option name="listener_remove" value="http://myauthserver.net/notify_listener.php"/>
</authentication>
</mount>
-->
<fileserve>1</fileserve>
<!-- set the mountpoint for a shoutcast source to use, the default if not
specified is /stream but you can change it here if an alternative is
wanted or an extension is required -->
<!--
<shoutcast-mount>/live.nsv</shoutcast-mount>
-->
<paths>
<!-- basedir is only used if chroot is enabled -->
<basedir>/usr/share/icecast</basedir>
<!-- Note that if <chroot> is turned on below, these paths must both
be relative to the new root, not the original root -->
<logdir>/var/log/icecast</logdir>
<webroot>/usr/share/icecast/web</webroot>
<adminroot>/usr/share/icecast/admin</adminroot>
<!-- <pidfile>/usr/share/icecast/icecast.pid</pidfile> -->
<!-- Aliases: treat requests for 'source' path as being for 'dest' path
May be made specific to a port or bound address using the "port"
and "bind-address" attributes.
-->
<!--
<alias source="/foo" dest="/bar"/>
-->
<!-- Aliases: can also be used for simple redirections as well,
this example will redirect all requests for http://server:port/ to
the status page
-->
<alias source="/" dest="/status.xsl"/>
</paths>
<logging>
<accesslog>access.log</accesslog>
<errorlog>error.log</errorlog>
<!-- <playlistlog>playlist.log</playlistlog> -->
<loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
<logsize>10000</logsize> <!-- Max size of a logfile -->
<!-- If logarchive is enabled (1), then when logsize is reached
the logfile will be moved to [error|access|playlist].log.DATESTAMP,
otherwise it will be moved to [error|access|playlist].log.old.
Default is non-archive mode (i.e. overwrite)
-->
<!-- <logarchive>1</logarchive> -->
</logging>
<security>
<chroot>0</chroot>
<changeowner>
<user>icecast</user>
<group>nogroup</group>
</changeowner>
</security>
</icecast>
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools systemd user
DESCRIPTION="Opensource alternative to shoutcast that supports mp3, ogg and aac streaming"
HOMEPAGE="http://www.icecast.org/"
SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="kate libressl logrotate +speex +ssl +theora +yp"
#Although there is a --with-ogg and --with-orbis configure option, they're
#only useful for specifying paths, not for disabling.
DEPEND="dev-libs/libxslt
dev-libs/libxml2
media-libs/libogg
media-libs/libvorbis
kate? ( media-libs/libkate )
logrotate? ( app-admin/logrotate )
speex? ( media-libs/speex )
theora? ( media-libs/libtheora )
yp? ( net-misc/curl )
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)"
RDEPEND="${DEPEND}"
pkg_setup() {
enewuser icecast -1 -1 -1 nogroup
}
PATCHES=(
# bug #368539
"${FILESDIR}"/${PN}-2.3.3-libkate.patch
# bug #430434
"${FILESDIR}"/${PN}-2.3.3-fix-xiph_openssl.patch
)
src_prepare() {
default
mv configure.{in,ac} || die
eautoreconf
}
src_configure() {
econf \
--disable-dependency-tracking \
--docdir=/usr/share/doc/${PF} \
--sysconfdir=/etc/icecast2 \
$(use_enable kate) \
$(use_with theora) \
$(use_with speex) \
$(use_with yp curl) \
$(use_with ssl openssl) \
$(use_enable yp)
}
src_install() {
emake DESTDIR="${D}" install
dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
docinto html
dodoc doc/*.html
newinitd "${FILESDIR}"/${PN}.initd ${PN}
systemd_dounit "${FILESDIR}"/${PN}.service
insinto /etc/icecast2
doins "${FILESDIR}"/icecast.xml
fperms 600 /etc/icecast2/icecast.xml
if use logrotate; then
dodir /etc/logrotate.d
insopts -m0644
insinto /etc/logrotate.d
newins "${FILESDIR}"/${PN}.logrotate ${PN}
fi
diropts -m0764 -o icecast -g nogroup
dodir /var/log/icecast
keepdir /var/log/icecast
rm -r "${D}"/usr/share/doc/icecast || die
}
pkg_postinst() {
touch "${ROOT}"var/log/icecast/{access,error}.log
chown icecast:nogroup "${ROOT}"var/log/icecast/{access,error}.log
}
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools systemd user
DESCRIPTION="Opensource alternative to shoutcast that supports mp3, ogg and aac streaming"
HOMEPAGE="http://www.icecast.org/"
SRC_URI="http://downloads.xiph.org/releases/icecast/${PN}-2.5-beta2.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
IUSE="libressl logrotate +speex +ssl +theora +yp"
#Although there is a --with-ogg and --with-orbis configure option, they're
#only useful for specifying paths, not for disabling.
DEPEND="dev-libs/libxslt
dev-libs/libxml2
media-libs/libogg
media-libs/libvorbis
logrotate? ( app-admin/logrotate )
speex? ( media-libs/speex )
theora? ( media-libs/libtheora )
yp? ( net-misc/curl )
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)"
RDEPEND="${DEPEND}"
pkg_setup() {
enewuser icecast -1 -1 -1 nogroup
}
PATCHES=(
# bug #430434
"${FILESDIR}"/${PN}-2.3.3-fix-xiph_openssl.patch
)
src_prepare() {
default
eautoreconf
}
src_configure() {
econf \
--disable-dependency-tracking \
--docdir=/usr/share/doc/${PF} \
--sysconfdir=/etc/icecast2 \
$(use_with theora) \
$(use_with speex) \
$(use_with yp curl) \
$(use_with ssl openssl) \
$(use_enable yp)
}
src_install() {
emake DESTDIR="${D}" install
dodoc AUTHORS README.md HACKING NEWS conf/icecast.xml.dist
docinto html
dodoc doc/*.html
newinitd "${FILESDIR}"/${PN}.initd ${PN}
systemd_dounit "${FILESDIR}"/${PN}.service
insinto /etc/icecast2
doins "${FILESDIR}"/icecast.xml
fperms 600 /etc/icecast2/icecast.xml
if use logrotate; then
dodir /etc/logrotate.d
insopts -m0644
insinto /etc/logrotate.d
newins "${FILESDIR}"/${PN}.logrotate ${PN}
fi
diropts -m0764 -o icecast -g nogroup
dodir /var/log/icecast
keepdir /var/log/icecast
rm -r "${D}"/usr/share/doc/icecast || die
}
pkg_postinst() {
touch "${ROOT}"var/log/icecast/{access,error}.log
chown icecast:nogroup "${ROOT}"var/log/icecast/{access,error}.log
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ischluff@mailbox.org</email>
<name>Anton Schubert</name>
</maintainer>
<use>
<flag name="kate">Add karaoke and text encapsulation support for Ogg files</flag>
<flag name="logrotate">Install support files for <pkg>app-admin/logrotate</pkg>?</flag>
<flag name="yp">Build support for yp public directory listings</flag>
</use>
</pkgmetadata>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment