From e4f3e52a297698edf6c93507876b1b850759ea51 Mon Sep 17 00:00:00 2001 From: Timo Gurr Date: Sun, 17 Nov 2013 23:59:11 +0000 Subject: Remove old. (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 5270BA51) --- media-sound/mumble/ChangeLog | 7 +- .../files/mumble-1.2.3-fix-cert-validation.patch | 20 ---- .../files/mumble-1.2.3-set-file-permissions.patch | 51 --------- media-sound/mumble/mumble-1.2.3-r2.ebuild | 114 --------------------- 4 files changed, 6 insertions(+), 186 deletions(-) delete mode 100644 media-sound/mumble/files/mumble-1.2.3-fix-cert-validation.patch delete mode 100644 media-sound/mumble/files/mumble-1.2.3-set-file-permissions.patch delete mode 100644 media-sound/mumble/mumble-1.2.3-r2.ebuild (limited to 'media-sound') diff --git a/media-sound/mumble/ChangeLog b/media-sound/mumble/ChangeLog index ab726110ca5b..5975e1c913a3 100644 --- a/media-sound/mumble/ChangeLog +++ b/media-sound/mumble/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/mumble # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.43 2013/10/27 09:34:16 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.44 2013/11/17 23:59:11 tgurr Exp $ + + 17 Nov 2013; Timo Gurr -mumble-1.2.3-r2.ebuild, + -files/mumble-1.2.3-fix-cert-validation.patch, + -files/mumble-1.2.3-set-file-permissions.patch: + Remove old. 27 Oct 2013; Pacho Ramos metadata.xml: Voip herd is removed: http://article.gmane.org/gmane.linux.gentoo.devel/88434 diff --git a/media-sound/mumble/files/mumble-1.2.3-fix-cert-validation.patch b/media-sound/mumble/files/mumble-1.2.3-fix-cert-validation.patch deleted file mode 100644 index 14174172e40b..000000000000 --- a/media-sound/mumble/files/mumble-1.2.3-fix-cert-validation.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Fix certificate validation with QT 4.8. For some reason, the - new on-demand root cert loading is not working with mumble. -Author: Marc Deslauriers -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mumble/+bug/928296 - -diff -Naur mumble-1.2.3/src/SSL.cpp mumble-1.2.3.new/src/SSL.cpp ---- mumble-1.2.3/src/SSL.cpp 2011-02-19 22:35:16.000000000 +0100 -+++ mumble-1.2.3.new/src/SSL.cpp 2012-02-16 02:45:20.353665502 +0100 -@@ -252,6 +252,11 @@ - QSslSocket::setDefaultCaCertificates(ql); - #endif // NO_SYSTEM_CA_OVERRIDE - -+#if QT_VERSION >= 0x040800 -+ // Don't perform on-demand loading of root certificates -+ QSslSocket::setDefaultCaCertificates(QSslSocket::systemCaCertificates()); -+#endif -+ - for (unsigned int i=0;i -Date: Fri, 27 May 2011 16:59:15 -0700 -Subject: [PATCH] Explicitly remove file permissions for settings and DB - ---- - src/mumble/Database.cpp | 5 +++++ - src/mumble/Settings.cpp | 11 +++++++++++ - 2 files changed, 16 insertions(+), 0 deletions(-) - -diff --git a/src/mumble/Database.cpp b/src/mumble/Database.cpp -index 5449fbe..8c3854f 100644 ---- a/src/mumble/Database.cpp -+++ b/src/mumble/Database.cpp -@@ -94,6 +94,11 @@ - qWarning("Database: Database is read-only"); - } - -+ { -+ QFile f(db.databaseName()); -+ f.setPermissions(f.permissions() & ~(QFile::ReadGroup | QFile::WriteGroup | QFile::ExeGroup | QFile::ReadOther | QFile::WriteOther | QFile::ExeOther)); -+ } -+ - QSqlQuery query; - - query.exec(QLatin1String("CREATE TABLE IF NOT EXISTS `servers` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `hostname` TEXT, `port` INTEGER DEFAULT " MUMTEXT(DEFAULT_MUMBLE_PORT) ", `username` TEXT, `password` TEXT)")); -diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp -index 404692b..b5e9202 100644 ---- a/src/mumble/Settings.cpp -+++ b/src/mumble/Settings.cpp -@@ -716,6 +716,17 @@ void OverlaySettings::save() { - void OverlaySettings::save(QSettings* settings_ptr) { - OverlaySettings def; - -+ settings_ptr->setValue(QLatin1String("version"), QLatin1String(MUMTEXT(MUMBLE_VERSION_STRING))); -+ settings_ptr->sync(); -+ -+#if defined(Q_OS_WIN) || defined(Q_OS_MAC) -+ if (settings_ptr->format() == QSettings::IniFormat) -+#endif -+ { -+ QFile f(settings_ptr->fileName()); -+ f.setPermissions(f.permissions() & ~(QFile::ReadGroup | QFile::WriteGroup | QFile::ExeGroup | QFile::ReadOther | QFile::WriteOther | QFile::ExeOther)); -+ } -+ - SAVELOAD(bEnable, "enable"); - - SAVELOAD(osShow, "show"); --- -1.7.5.4 - diff --git a/media-sound/mumble/mumble-1.2.3-r2.ebuild b/media-sound/mumble/mumble-1.2.3-r2.ebuild deleted file mode 100644 index caa6cd817e37..000000000000 --- a/media-sound/mumble/mumble-1.2.3-r2.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/mumble-1.2.3-r2.ebuild,v 1.5 2013/03/02 21:58:06 hwoarang Exp $ - -EAPI="4" - -inherit eutils multilib qt4-r2 - -DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software" -HOMEPAGE="http://mumble.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+alsa +dbus debug g15 oss pch portaudio pulseaudio speech zeroconf" - -RDEPEND=">=dev-libs/boost-1.41.0 - >=dev-libs/openssl-1.0.0b - >=dev-libs/protobuf-2.2.0 - >=media-libs/libsndfile-1.0.20[-minimal] - >=media-libs/speex-1.2_rc1 - sys-apps/lsb-release - dev-qt/qtcore:4[ssl] - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - dev-qt/qtsql:4[sqlite] - dev-qt/qtsvg:4 - dev-qt/qtxmlpatterns:4 - x11-proto/inputproto - alsa? ( media-libs/alsa-lib ) - dbus? ( dev-qt/qtdbus:4 ) - g15? ( app-misc/g15daemon ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-sound/pulseaudio ) - speech? ( app-accessibility/speech-dispatcher ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.2.3-fix-cert-validation.patch - "${FILESDIR}"/${PN}-1.2.3-set-file-permissions.patch -) - -src_configure() { - local conf_add - - if has_version '<=sys-devel/gcc-4.2'; then - conf_add="${conf_add} no-pch" - else - use pch || conf_add="${conf_add} no-pch" - fi - - use alsa || conf_add="${conf_add} no-alsa" - use dbus || conf_add="${conf_add} no-dbus" - use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release" - use g15 || conf_add="${conf_add} no-g15" - use oss || conf_add="${conf_add} no-oss" - use portaudio || conf_add="${conf_add} no-portaudio" - use pulseaudio || conf_add="${conf_add} no-pulseaudio" - use speech || conf_add="${conf_add} no-speechd" - use zeroconf || conf_add="${conf_add} no-bonjour" - - eqmake4 "${S}/main.pro" -recursive \ - CONFIG+="${conf_add} \ - bundled-celt \ - no-11x \ - no-bundled-speex \ - no-embed-qt-translations \ - no-server \ - no-update" \ - DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble" -} - -src_install() { - newdoc README.Linux README - dodoc CHANGES - - local dir - if use debug; then - dir=debug - else - dir=release - fi - - dobin "${dir}"/mumble - dobin scripts/mumble-overlay - - insinto /usr/share/services - doins scripts/mumble.protocol - - domenu scripts/mumble.desktop - - insinto /usr/share/icons/hicolor/scalable/apps - doins icons/mumble.svg - - doman man/mumble-overlay.1 - doman man/mumble.1 - - insopts -o root -g root -m 0755 - insinto "/usr/$(get_libdir)/mumble" - doins "${dir}"/libmumble.so.${PV} - dosym libmumble.so.${PV} /usr/$(get_libdir)/mumble/libmumble.so.1 - doins "${dir}"/libcelt0.so.0.{7,11}.0 - doins "${dir}"/plugins/lib*.so* -} - -pkg_postinst() { - echo - elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions." - elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)." - echo -} -- cgit v1.2.3-65-gdbad