root
11 years ago
parent
379944d6da
commit
21f6238b85
@ -1,3 +1,2 @@
|
||||
DIST glance-2012.2.4.tar.gz 643408 SHA256 d50fa522e890258eff32aad1947684abdf0cf0c67a8a487f60a7179a84edd3f2 SHA512 fc91d799fa5fd2c66aef228d622c852623e70fa83e5babdeb10e041f77571e5a08c90c6fca16943dc98ca1cd50a09314fc5bd282e5530e7e1e44a623eee28198 WHIRLPOOL 34fdfab54444845ed4a3c0e849066f01ef88cf4317d952a0fedf562f331a41c87572d80234296651a722770929472de9263f7ded37deaaf6d65f35723e41031c
|
||||
DIST glance-2013.1.4.tar.gz 724110 SHA256 dfb8070a12bbf5761db1c55d21db4772fe81ed903d57cf991618e5224cbdcd67 SHA512 31c6c4ba0e777fcd345fe24d32eab548f8e9756764051d8b3c50d4d54404c902473760a0dc1158e8b6b42a0b81e14ae6a31d03bb07d4254fcb4960b05dd747a9 WHIRLPOOL 770f782f539b0ac465c00e726552f4b7fc8824c4a9da1a94ef4103ef56ce17ff1c2ccc75140b71c9f4d3d875885f169d3c1c6d761fed7ff691c83484b86de74f
|
||||
DIST glance-2013.2.tar.gz 1614843 SHA256 135fb1b6fe8410894b9d070071e1b7d7ddd37fb7c7267e2644e91e2b5448d6e5 SHA512 38f9f38a79c18b8ea32c36052434c48b6558cbc0a92e3855d4e6f6961b160e22b78d7c89ff52f877ce93f312c6e3f87573e4545c44d1ce20dddb626f7a747017 WHIRLPOOL 6254cee35ac9b36c7a0894332d5222fbc31240360c90a75b22d944bd499a480533fd9248a95c245575dbc79354dd2cb835e194832ea035e9cbfbb7fb4132f7c2
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
diff -ur glance-2013.2.orig/doc/source/conf.py glance-2013.2/doc/source/conf.py
|
||||
--- doc/source/conf.py 2013-10-17 21:39:46.000000000 +0800
|
||||
+++ doc/source/conf.py 2013-11-13 18:51:29.099839976 +0800
|
||||
@@ -250,8 +250,3 @@
|
||||
|
||||
# If false, no module index is generated.
|
||||
#latex_use_modindex = True
|
||||
-
|
||||
-# Example configuration for intersphinx: refer to the Python standard library.
|
||||
-intersphinx_mapping = {'python': ('http://docs.python.org/', None),
|
||||
- 'nova': ('http://nova.openstack.org', None),
|
||||
- 'swift': ('http://swift.openstack.org', None)}
|
||||
@ -1,86 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2012.2.4-r4.ebuild,v 1.1 2013/09/12 04:47:49 prometheanfire Exp $
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Provides services for discovering, registering, and retrieving
|
||||
virtual machine images with Openstack"
|
||||
HOMEPAGE="https://launchpad.net/glance"
|
||||
SRC_URI="http://launchpad.net/${PN}/folsom/${PV}/+download/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="ldap mysql postgres +sqlite +swift"
|
||||
REQUIRED_USE="|| ( ldap mysql postgres sqlite )"
|
||||
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
RDEPEND="${DEPEND}
|
||||
>=dev-python/boto-2.1.1[${PYTHON_USEDEP}]
|
||||
dev-python/anyjson[${PYTHON_USEDEP}]
|
||||
>=dev-python/eventlet-0.9.12[${PYTHON_USEDEP}]
|
||||
>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
|
||||
dev-python/httplib2[${PYTHON_USEDEP}]
|
||||
dev-python/iso8601[${PYTHON_USEDEP}]
|
||||
dev-python/jsonschema[${PYTHON_USEDEP}]
|
||||
dev-python/kombu[${PYTHON_USEDEP}]
|
||||
dev-python/lxml[${PYTHON_USEDEP}]
|
||||
dev-python/passlib[${PYTHON_USEDEP}]
|
||||
dev-python/paste[${PYTHON_USEDEP}]
|
||||
dev-python/pastedeploy[${PYTHON_USEDEP}]
|
||||
dev-python/pycrypto[${PYTHON_USEDEP}]
|
||||
dev-python/python-glanceclient[${PYTHON_USEDEP}]
|
||||
dev-python/routes[${PYTHON_USEDEP}]
|
||||
>=dev-python/sqlalchemy-migrate-0.7[${PYTHON_USEDEP}]
|
||||
=dev-python/webob-1.0.8-r1[${PYTHON_USEDEP}]
|
||||
virtual/python-argparse[${PYTHON_USEDEP}]
|
||||
swift? (
|
||||
>=dev-python/python-swiftclient-1.2[${PYTHON_USEDEP}]
|
||||
<dev-python/python-swiftclient-2[${PYTHON_USEDEP}]
|
||||
)
|
||||
sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
|
||||
<dev-python/sqlalchemy-0.7.10[sqlite,${PYTHON_USEDEP}] )
|
||||
mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
|
||||
<dev-python/sqlalchemy-0.7.10[mysql,${PYTHON_USEDEP}] )
|
||||
postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
|
||||
<dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] )
|
||||
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/glance-gbug-474064-folsom.patch"
|
||||
)
|
||||
|
||||
python_install() {
|
||||
distutils-r1_python_install
|
||||
newconfd "${FILESDIR}/glance.confd" glance
|
||||
newinitd "${FILESDIR}/glance.initd" glance
|
||||
|
||||
for function in api registry scrubber; do
|
||||
dosym /etc/init.d/glance /etc/init.d/glance-${function}
|
||||
done
|
||||
|
||||
diropts -m 0750
|
||||
dodir /var/run/glance /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
|
||||
#removed because it conflicts with glanceclient, which we install in rdepend
|
||||
rm ${D}"/usr/bin/glance" ${D}"/usr/bin/glance-python2.7"
|
||||
|
||||
keepdir /etc/glance
|
||||
keepdir /var/log/glance
|
||||
keepdir /var/lib/glance/images
|
||||
keepdir /var/lib/glance/scrubber
|
||||
insinto /etc/glance
|
||||
|
||||
doins "etc/glance-api-paste.ini"
|
||||
doins "etc/glance-api.conf"
|
||||
doins "etc/glance-cache.conf"
|
||||
doins "etc/glance-registry-paste.ini"
|
||||
doins "etc/glance-registry.conf"
|
||||
doins "etc/glance-scrubber.conf"
|
||||
doins "etc/logging.cnf.sample"
|
||||
doins "etc/policy.json"
|
||||
doins "etc/schema-image.json"
|
||||
}
|
||||
@ -0,0 +1,128 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.2-r1.ebuild,v 1.1 2013/11/13 12:30:45 idella4 Exp $
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Provides services for discovering, registering, and retrieving
|
||||
virtual machine images with Openstack"
|
||||
HOMEPAGE="https://launchpad.net/glance"
|
||||
SRC_URI="http://launchpad.net/${PN}/havana/${PV}/+download/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc mysql postgres +sqlite +swift test"
|
||||
REQUIRED_USE="|| ( mysql postgres sqlite )"
|
||||
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
|
||||
<dev-python/pbr-1.0[${PYTHON_USEDEP}]
|
||||
test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
|
||||
>=dev-python/fixtures-0.3.12[${PYTHON_USEDEP}]
|
||||
dev-python/nose[${PYTHON_USEDEP}]
|
||||
dev-python/nose-exclude[${PYTHON_USEDEP}]
|
||||
>=dev-python/openstack-nose-plugin-0.7[${PYTHON_USEDEP}]
|
||||
>=dev-python/mock-1.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/nosehtmloutput-0.0.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/requests-1.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/testtools-0.9.24-r1[${PYTHON_USEDEP}]
|
||||
>=dev-python/psutil-0.6.1[${PYTHON_USEDEP}]
|
||||
dev-python/mysql-python[${PYTHON_USEDEP}]
|
||||
dev-python/psycopg[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
|
||||
=dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
|
||||
=dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
|
||||
=dev-python/flake8-2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
|
||||
<dev-python/hacking-0.7[${PYTHON_USEDEP}]
|
||||
>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
|
||||
)
|
||||
doc? ( dev-python/oslo-sphinx )"
|
||||
#=dev-python/pysendfile-2.0.0 & dev-python/qpid-python need making and adding to portage under test?
|
||||
#note to self, wsgiref is a python builtin, no need to package it
|
||||
#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
|
||||
|
||||
RDEPEND=">=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
|
||||
<dev-python/pbr-1.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
|
||||
sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
|
||||
<dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] )
|
||||
mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
|
||||
<dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] )
|
||||
postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
|
||||
<dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] )
|
||||
>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
|
||||
<dev-python/webob-1.3[${PYTHON_USEDEP}]
|
||||
virtual/python-argparse[${PYTHON_USEDEP}]
|
||||
>=dev-python/boto-2.4.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
|
||||
dev-python/httplib2[${PYTHON_USEDEP}]
|
||||
>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
|
||||
>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
|
||||
>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
|
||||
>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
|
||||
swift? (
|
||||
>=dev-python/python-swiftclient-1.5[${PYTHON_USEDEP}]
|
||||
<dev-python/python-swiftclient-2[${PYTHON_USEDEP}]
|
||||
)
|
||||
>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
|
||||
dev-python/paste[${PYTHON_USEDEP}]
|
||||
dev-python/passlib[${PYTHON_USEDEP}]
|
||||
>=dev-python/jsonschema-1.3.0[${PYTHON_USEDEP}]
|
||||
!~dev-python/jsonschema-1.4.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/python-cinderclient-1.0.4[${PYTHON_USEDEP}]
|
||||
>=dev-python/python-keystoneclient-0.3.0[${PYTHON_USEDEP}]
|
||||
dev-python/pyopenssl[${PYTHON_USEDEP}]
|
||||
dev-python/six[${PYTHON_USEDEP}]"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${P}-sphinx_mapping.patch )
|
||||
|
||||
python_compile_all() {
|
||||
use doc && "${PYTHON}" setup.py build_sphinx
|
||||
}
|
||||
|
||||
python_test() {
|
||||
nosetests glance/ -I test_notifier.py || die "tests failed under python2.7"
|
||||
}
|
||||
|
||||
python_install() {
|
||||
distutils-r1_python_install
|
||||
newconfd "${FILESDIR}/glance.confd" glance
|
||||
newinitd "${FILESDIR}/glance-2.initd" glance
|
||||
|
||||
for function in api registry scrubber; do
|
||||
dosym /etc/init.d/glance /etc/init.d/glance-${function}
|
||||
done
|
||||
|
||||
diropts -m 0750
|
||||
dodir /var/run/glance /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
|
||||
keepdir /etc/glance
|
||||
keepdir /var/log/glance
|
||||
keepdir /var/lib/glance/images
|
||||
keepdir /var/lib/glance/scrubber
|
||||
insinto /etc/glance
|
||||
|
||||
doins "etc/glance-api-paste.ini"
|
||||
doins "etc/glance-api.conf"
|
||||
doins "etc/glance-cache.conf"
|
||||
doins "etc/glance-registry-paste.ini"
|
||||
doins "etc/glance-registry.conf"
|
||||
doins "etc/glance-scrubber.conf"
|
||||
doins "etc/logging.cnf.sample"
|
||||
doins "etc/policy.json"
|
||||
doins "etc/schema-image.json"
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
use doc && local HTML_DOCS=( doc/build/html/. )
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@ -1,6 +1,2 @@
|
||||
DIST syslog-ng_3.2.5.tar.gz 1448844 SHA256 ffc9f3a0ebea836c1c737b1ff49efe731d885af1d8aacf9eca79d9144eeefa89 SHA512 f155a56b77c2a8e0e7809a98644394c9d4132e356c3190cda8b8d23a4cf28814bee02c53a1f2e8991c97302a8f1fe7410f8b2fa80f52bc1b7db2f09e26fa9dc8 WHIRLPOOL 0157a1f7611a0637acc54802b2ddb0e796e441dc304c702fece85e39e4ef31f5c5a95198ed264317fbebd805368955df63c6fe38580b74eaaa6e614a4b2e83ef
|
||||
DIST syslog-ng_3.3.5.tar.gz 2495235 SHA256 dcca69869ab3cf2afda6db0dad549b6be717f6cf6aa6d7f27ca10f9c4c6aaa75 SHA512 eaac6376c527bbf6730943670a2dfac1c8765837335ca509cbebf120279a31d13f7b813fe1dde72761bcf185320619b84b650b1e037ccf0fe94966e93c3415c3 WHIRLPOOL a2d32798219897c86b43f3dbf6e2be5bf6c704d896a664afe3a0f13f8b98c6e9839fcfc3bf2fb89f1e4764ad13878329e1c33ea2c85f17921505030f8eda9b1a
|
||||
DIST syslog-ng_3.4.2.tar.gz 3354842 SHA256 f2585b42e7341bc53490aa59c5f405df506536bf0672bf71f9567ea78590f381 SHA512 94d1c8008c72a7fb82c86eb4ff666cacee26e2b1d7100f58a0ea5293e4efc74ad9608a7b1e72b217f9e6ead4b6ad82f5cf9e00dfcb230a03d3243f5c51fd5305 WHIRLPOOL ddb721e940e674a74079fb150213e7595f2a52eb8709f1a032bf6def93906b6f93c9a5131991946b1e19a026ca8162c40d7c7e537498f29a3d33b401c678611a
|
||||
DIST syslog-ng_3.4.3.tar.gz 3074800 SHA256 8a00c342036109e6cc1d441aaed12438134bc884ca3492c36902ff9120a107ee SHA512 c225db659ed188104d14a03fd05bdf56a215bce240d6c2d6191c9a43e71f5bcf7abd5a05cf14aa05336506c8d60017100bb0779f5ae88ebc66223e9b0e2eea83 WHIRLPOOL e0ebbef83994179df9d098bd23f28d2bf2b15618816861e959b5bd09fe387b8c03a3c75904326bfa995cb18f0f78b5b082209a724bcb355e3ee2037ab54ced6d
|
||||
DIST syslog-ng_3.4.4.tar.gz 3200073 SHA256 6e7b7c53777ebda040f6167ad223cc958ea6472e4b4265b3eb7adef61f571caf SHA512 e479a0fde8300f5f3ede3482e89ab3da9896cfd8f18777d2ec46fa9b80667b3e699e482afd17efb0bc0ab73d580d0efc0caf5237a8f830c14963fdbe4790d82c WHIRLPOOL 7aa01b03852a4703b319d103435b4b45fff8162a7743617d872b13d84f5eb14d92f6d420e78af9f2d9e78305beff75b982441736a927e3f2dbf18bb486b8fa01
|
||||
DIST syslog-ng_3.4.5.tar.gz 3202771 SHA256 b8a69d8131efc2378d9149ff54e99f91ea1c47c69e0f4629395d910c7ff71bfb SHA512 41662ba0726a78fb55ffd08532c80b43cf8c06c6c207d9e2bc4558d5772531b602e20a6d8c0d2f0c453e757589b80d1942c533c6a5c6249092cfcb209fc94e4b WHIRLPOOL f52a95eaa9346fd383db2c7ca256a1226ceac0d59354f872ac5c047e234e4b3a379e13e18dc36bb91dbc1b6c43f1f916345c2ccde7cd421348bf21922d1767f6
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
--- syslog-ng-3.4.1.orig/modules/afmongodb/libmongo-client/configure.ac
|
||||
+++ syslog-ng-3.4.1/modules/afmongodb/libmongo-client/configure.ac
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
-AM_CONFIG_HEADER(config.h)
|
||||
+AC_CONFIG_HEADERS(config.h)
|
||||
|
||||
AC_ARG_WITH([versioned-symbols], AC_HELP_STRING([--with-versioned-symbols],[Use versioned symbols]),[dnl
|
||||
vsymldflags="-Wl,--version-script,\${srcdir}/libmongo-client.ver -Wl,-O1"
|
||||
@@ -24,7 +24,6 @@
|
||||
dnl ***************************************************************************
|
||||
dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
-AM_PROG_CC_STDC
|
||||
AC_PROG_MAKE_SET
|
||||
PKG_PROG_PKG_CONFIG
|
||||
LT_INIT([shared])
|
||||
@ -1,19 +0,0 @@
|
||||
--- syslog-ng-3.4.1.orig/modules/afmongodb/libmongo-client/configure.ac
|
||||
+++ syslog-ng-3.4.1/modules/afmongodb/libmongo-client/configure.ac
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
-AM_CONFIG_HEADER(config.h)
|
||||
+AC_CONFIG_HEADERS(config.h)
|
||||
|
||||
AC_ARG_WITH([versioned-symbols], AC_HELP_STRING([--with-versioned-symbols],[Use versioned symbols]),[dnl
|
||||
vsymldflags="-Wl,--version-script,\${srcdir}/libmongo-client.ver -Wl,-O1"
|
||||
@@ -24,7 +24,6 @@
|
||||
dnl ***************************************************************************
|
||||
dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
-AM_PROG_CC_STDC
|
||||
AC_PROG_MAKE_SET
|
||||
PKG_PROG_PKG_CONFIG
|
||||
LT_INIT([shared])
|
||||
@ -1,38 +0,0 @@
|
||||
From algernon@balabit.hu Fri Apr 20 12:06:44 2012
|
||||
Date: Fri, 20 Apr 2012 18:06:31 +0200
|
||||
From: Gergely Nagy <algernon@balabit.hu>
|
||||
Reply-To: Syslog-ng users' and developers' mailing list <syslog-ng@lists.balabit.hu>
|
||||
To: syslog-ng@lists.balabit.hu
|
||||
Subject: [syslog-ng] [PATCH] afsocket: Fix unix-dgram initialisation
|
||||
|
||||
When initializing an unix-dgram socket, set self->fd to the acquired
|
||||
socket FD, so that fds inherited from systemd actually get used and
|
||||
polled on.
|
||||
|
||||
Signed-off-by: Gergely Nagy <algernon@balabit.hu>
|
||||
---
|
||||
modules/afsocket/afsocket.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/modules/afsocket/afsocket.c b/modules/afsocket/afsocket.c
|
||||
index 5b192f4..c1bee5c 100644
|
||||
--- a/modules/afsocket/afsocket.c
|
||||
+++ b/modules/afsocket/afsocket.c
|
||||
@@ -679,7 +679,7 @@ afsocket_sd_init(LogPipe *s)
|
||||
if (sock == -1 && !afsocket_open_socket(self->bind_addr, !!(self->flags & AFSOCKET_STREAM), &sock))
|
||||
return self->super.super.optional;
|
||||
}
|
||||
- self->fd = -1;
|
||||
+ self->fd = sock;
|
||||
|
||||
if (!self->setup_socket(self, sock))
|
||||
{
|
||||
--
|
||||
1.7.9.1
|
||||
|
||||
|
||||
______________________________________________________________________________
|
||||
Member info: https://lists.balabit.hu/mailman/listinfo/syslog-ng
|
||||
Documentation: http://www.balabit.com/support/documentation/?product=syslog-ng
|
||||
FAQ: http://www.balabit.com/wiki/syslog-ng-faq
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- ./lib/scratch-buffers.c.orig 2012-01-20 17:44:43.871103296 -0500
|
||||
+++ ./lib/scratch-buffers.c 2012-01-20 17:44:56.313552034 -0500
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
#include "tls-support.h"
|
||||
#include "scratch-buffers.h"
|
||||
+#include "misc.h"
|
||||
|
||||
TLS_BLOCK_START
|
||||
{
|
||||
@ -1,44 +0,0 @@
|
||||
From algernon@balabit.hu Fri Apr 20 10:34:44 2012
|
||||
Date: Fri, 20 Apr 2012 16:34:05 +0200
|
||||
From: Gergely Nagy <algernon@balabit.hu>
|
||||
Reply-To: Syslog-ng users' and developers' mailing list <syslog-ng@lists.balabit.hu>
|
||||
To: syslog-ng@lists.balabit.hu
|
||||
Subject: [syslog-ng] [PATCH] lib/gprocess.c: Ignore SIGHUP inside the supervisor.
|
||||
|
||||
Reloading syslog-ng's config is often done via a killall -HUP
|
||||
syslog-ng command, which also sends a signal to the
|
||||
supervisor. However, the supervisor did not handle said signal, thus
|
||||
it exited as is the default for it.
|
||||
|
||||
To work around this issue, lets ignore SIGHUP inside the supervisor.
|
||||
|
||||
Reported-by: Patrick Hemmer
|
||||
Signed-off-by: Gergely Nagy <algernon@balabit.hu>
|
||||
---
|
||||
lib/gprocess.c | 4 +++-
|
||||
1 files changed, 3 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/lib/gprocess.c b/lib/gprocess.c
|
||||
index aaefbab..9246d88 100644
|
||||
--- a/lib/gprocess.c
|
||||
+++ b/lib/gprocess.c
|
||||
@@ -1110,7 +1110,9 @@ g_process_perform_supervise(void)
|
||||
g_process_message("Initialization failed but the daemon did not exit, even when forced to, trying to recover; pid='%d'", pid);
|
||||
continue;
|
||||
}
|
||||
-
|
||||
+
|
||||
+ sigignore(SIGHUP);
|
||||
+
|
||||
if (process_opts.check_fn && (process_opts.check_period >= 0))
|
||||
{
|
||||
gint i = 1;
|
||||
--
|
||||
1.7.9.1
|
||||
|
||||
|
||||
______________________________________________________________________________
|
||||
Member info: https://lists.balabit.hu/mailman/listinfo/syslog-ng
|
||||
Documentation: http://www.balabit.com/support/documentation/?product=syslog-ng
|
||||
FAQ: http://www.balabit.com/wiki/syslog-ng-faq
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
--- a/lib/ivykis/modules/iv_event_raw.c 2012-01-29 13:15:33.000000000 +0100
|
||||
+++ b/lib/ivykis/modules/iv_event_raw.c 2012-04-30 16:01:17.480317290 +0200
|
||||
@@ -37,6 +37,8 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#include <sys/eventfd.h>
|
||||
+
|
||||
#ifndef EFD_NONBLOCK
|
||||
#define EFD_NONBLOCK 04000
|
||||
#endif
|
||||
|
||||
@ -1,61 +0,0 @@
|
||||
From c0afec5b46eb3508fd3b1449e37b7e550f7d35e2 Mon Sep 17 00:00:00 2001
|
||||
From: Gergely Nagy <algernon@balabit.hu>
|
||||
Date: Fri, 08 Jun 2012 15:28:33 +0200
|
||||
Subject: dnscache: Fix a memory corruption when destroying the DNS cache
|
||||
|
||||
The DNS cache gets destroyed every time a worker thread quits, which
|
||||
is fine, as most of the dns cache variables are thread local.
|
||||
|
||||
However, dns_cache_hosts is not, it's a global static, and
|
||||
dns_cache_destroy() was freeing that aswell.
|
||||
|
||||
The solution is to not free dns_cache_hosts when a worker stops, but
|
||||
do so when syslog-ng stops. This patch introduces dns_cache_deinit()
|
||||
which does just that, and removes the same thing from
|
||||
dns_cache_destroy(), which now only touches thread-local variables.
|
||||
|
||||
Reported-by: EgonB <egon@local.ee>
|
||||
Signed-off-by: Gergely Nagy <algernon@balabit.hu>
|
||||
---
|
||||
diff --git a/lib/dnscache.c b/lib/dnscache.c
|
||||
index 49102b7..9cdc2c0 100644
|
||||
--- a/lib/dnscache.c
|
||||
+++ b/lib/dnscache.c
|
||||
@@ -361,6 +361,12 @@ dns_cache_destroy(void)
|
||||
cache_last.prev = NULL;
|
||||
persist_first.next = NULL;
|
||||
persist_last.prev = NULL;
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+dns_cache_deinit(void)
|
||||
+{
|
||||
if (dns_cache_hosts)
|
||||
g_free(dns_cache_hosts);
|
||||
+ dns_cache_hosts = NULL;
|
||||
}
|
||||
diff --git a/lib/dnscache.h b/lib/dnscache.h
|
||||
index 8bae5f1..647ba19 100644
|
||||
--- a/lib/dnscache.h
|
||||
+++ b/lib/dnscache.h
|
||||
@@ -34,5 +34,6 @@ void dns_cache_store(gboolean persistent, gint family, void *addr, const gchar *
|
||||
void dns_cache_set_params(gint cache_size, gint expire, gint expire_failed, const gchar *hosts);
|
||||
void dns_cache_init(void);
|
||||
void dns_cache_destroy(void);
|
||||
+void dns_cache_deinit(void);
|
||||
|
||||
#endif
|
||||
diff --git a/lib/mainloop.c b/lib/mainloop.c
|
||||
index 1203098..e294fa3 100644
|
||||
--- a/lib/mainloop.c
|
||||
+++ b/lib/mainloop.c
|
||||
@@ -585,6 +585,7 @@ main_loop_exit_finish(void)
|
||||
/* deinit the current configuration, as at this point we _know_ that no
|
||||
* threads are running. This will unregister ivykis tasks and timers
|
||||
* that could fire while the configuration is being destructed */
|
||||
+ dns_cache_deinit();
|
||||
cfg_deinit(current_configuration);
|
||||
iv_quit();
|
||||
}
|
||||
--
|
||||
cgit v0.8.3.4-1-gaabc
|
||||
@ -1,139 +0,0 @@
|
||||
From 4b450a09da83bc8e27bd7c8adccea3f125387fa7 Mon Sep 17 00:00:00 2001
|
||||
From: Gergely Nagy <algernon@balabit.hu>
|
||||
Date: Tue, 5 Jun 2012 14:40:08 +0200
|
||||
Subject: [PATCH] afuser: Use utmpx when available, instead of utmp
|
||||
|
||||
FreeBSD 9 removed support for utmp, and one must use the
|
||||
POSIX-specified utmpx instead. The same utmpx is available on Linux
|
||||
too (and it is the same as utmp there).
|
||||
|
||||
The patch below converts afuser to use utmpx when available, utmp
|
||||
otherwise. It is based on the post-build sed magic applied to
|
||||
syslog-ng within the FreeBSD ports collection, with other bits based
|
||||
on a patch from Alex Zimnitsky.
|
||||
|
||||
Signed-off-by: Gergely Nagy <algernon@balabit.hu>
|
||||
---
|
||||
configure.in | 4 ++--
|
||||
lib/utils.c | 2 +-
|
||||
lib/utils.h | 7 ++++++-
|
||||
modules/afuser/afuser.c | 20 +++++++++++++++++++-
|
||||
4 files changed, 28 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index aafb980..c76d7d9 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -383,7 +383,7 @@ dnl ***************************************************************************
|
||||
|
||||
AC_HEADER_STDC
|
||||
AC_CHECK_HEADER(dmalloc.h)
|
||||
-AC_CHECK_HEADERS(strings.h getopt.h stropts.h sys/strlog.h door.h sys/capability.h sys/prctl.h)
|
||||
+AC_CHECK_HEADERS(strings.h getopt.h stropts.h sys/strlog.h door.h sys/capability.h sys/prctl.h utmpx.h)
|
||||
AC_CHECK_HEADERS(tcpd.h)
|
||||
|
||||
|
||||
@@ -479,7 +479,7 @@ if test "x$enable_linux_caps" = "xyes" -o "x$enable_linux_caps" = "xauto"; then
|
||||
AC_CHECK_LIB(cap, cap_set_proc, LIBCAP_LIBS="-lcap")
|
||||
fi
|
||||
|
||||
-AC_CHECK_FUNCS(strdup strtol strtoll strtoimax inet_aton inet_ntoa getopt_long getaddrinfo getutent pread pwrite strcasestr memrchr localtime_r gmtime_r)
|
||||
+AC_CHECK_FUNCS(strdup strtol strtoll strtoimax inet_aton inet_ntoa getopt_long getaddrinfo getutent getutxent pread pwrite strcasestr memrchr localtime_r gmtime_r)
|
||||
old_LIBS=$LIBS
|
||||
LIBS=$BASE_LIBS
|
||||
AC_CHECK_FUNCS(clock_gettime)
|
||||
diff --git a/lib/utils.c b/lib/utils.c
|
||||
index 2b5c525..3c05426 100644
|
||||
--- a/lib/utils.c
|
||||
+++ b/lib/utils.c
|
||||
@@ -47,7 +47,7 @@ int inet_aton(const char *cp, struct in_addr *addr)
|
||||
}
|
||||
#endif
|
||||
|
||||
-#ifndef HAVE_GETUTENT
|
||||
+#if !defined(HAVE_GETUTENT) && !defined(HAVE_GETUTXENT)
|
||||
|
||||
static int utent_fd = -1;
|
||||
|
||||
diff --git a/lib/utils.h b/lib/utils.h
|
||||
index 86e3a7f..a0f3dcc 100644
|
||||
--- a/lib/utils.h
|
||||
+++ b/lib/utils.h
|
||||
@@ -28,13 +28,18 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
+
|
||||
+#ifdef HAVE_UTMPX_H
|
||||
+#include <utmpx.h>
|
||||
+#else
|
||||
#include <utmp.h>
|
||||
+#endif
|
||||
|
||||
#ifndef HAVE_INET_ATON
|
||||
int inet_aton(const char *cp, struct in_addr *addr);
|
||||
#endif
|
||||
|
||||
-#ifndef HAVE_GETUTENT
|
||||
+#if !defined(HAVE_GETUTENT) && !defined(HAVE_GETUTXENT)
|
||||
struct utmp *getutent(void);
|
||||
void endutent(void);
|
||||
#endif
|
||||
diff --git a/modules/afuser/afuser.c b/modules/afuser/afuser.c
|
||||
index 8f170e5..7d082b2 100644
|
||||
--- a/modules/afuser/afuser.c
|
||||
+++ b/modules/afuser/afuser.c
|
||||
@@ -25,7 +25,13 @@
|
||||
#include "alarms.h"
|
||||
#include "messages.h"
|
||||
|
||||
+#ifdef HAVE_UTMPX_H
|
||||
+#include <utmpx.h>
|
||||
+#define ut_name ut_user
|
||||
+#else
|
||||
#include <utmp.h>
|
||||
+#endif
|
||||
+
|
||||
#include <string.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
@@ -46,7 +52,11 @@
|
||||
{
|
||||
AFUserDestDriver *self = (AFUserDestDriver *) s;
|
||||
gchar buf[8192];
|
||||
+#ifdef HAVE_UTMPX_H
|
||||
+ struct utmpx *ut;
|
||||
+#else
|
||||
struct utmp *ut;
|
||||
+#endif
|
||||
GString *timestamp;
|
||||
time_t now;
|
||||
|
||||
@@ -63,7 +73,11 @@
|
||||
g_string_free(timestamp, TRUE);
|
||||
|
||||
/* NOTE: there's a private implementations of getutent in utils.c on Systems which do not provide one. */
|
||||
- while ((ut = getutent()))
|
||||
+#ifdef HAVE_GETUTXENT
|
||||
+ while ((ut = getutxent()))
|
||||
+#else
|
||||
+ while ((ut = getutent()))
|
||||
+#endif
|
||||
{
|
||||
#if HAVE_MODERN_UTMP
|
||||
if (ut->ut_type == USER_PROCESS &&
|
||||
@@ -106,7 +120,11 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
+#if HAVE_UTMPX_H
|
||||
+ endutxent();
|
||||
+#else
|
||||
endutent();
|
||||
+#endif
|
||||
finish:
|
||||
log_msg_ack(msg, path_options);
|
||||
log_msg_unref(msg);
|
||||
--
|
||||
1.7.10
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
@version: 3.2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.2,v 1.1 2011/01/18 17:44:14 mr_bones_ Exp $
|
||||
#
|
||||
# Syslog-ng default configuration file for Gentoo Linux
|
||||
|
||||
options {
|
||||
chain_hostnames(no);
|
||||
|
||||
# The default action of syslog-ng is to log a STATS line
|
||||
# to the file every 10 minutes. That's pretty ugly after a while.
|
||||
# Change it to every 12 hours so you get a nice daily update of
|
||||
# how many messages syslog-ng missed (0).
|
||||
stats_freq(43200);
|
||||
# The default action of syslog-ng is to log a MARK line
|
||||
# to the file every 20 minutes. That's seems high for most
|
||||
# people so turn it down to once an hour. Set it to zero
|
||||
# if you don't want the functionality at all.
|
||||
mark_freq(3600);
|
||||
};
|
||||
|
||||
source src {
|
||||
unix-stream("/dev/log" max-connections(256));
|
||||
internal();
|
||||
file("/proc/kmsg");
|
||||
};
|
||||
|
||||
destination messages { file("/var/log/messages"); };
|
||||
|
||||
# By default messages are logged to tty12...
|
||||
destination console_all { file("/dev/tty12"); };
|
||||
# ...if you intend to use /dev/console for programs like xconsole
|
||||
# you can comment out the destination line above that references /dev/tty12
|
||||
# and uncomment the line below.
|
||||
#destination console_all { file("/dev/console"); };
|
||||
|
||||
log { source(src); destination(messages); };
|
||||
log { source(src); destination(console_all); };
|
||||
@ -1,38 +0,0 @@
|
||||
@version: 3.3
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.3,v 1.2 2011/10/04 23:15:44 mr_bones_ Exp $
|
||||
#
|
||||
# Syslog-ng default configuration file for Gentoo Linux
|
||||
|
||||
options {
|
||||
threaded(yes);
|
||||
chain_hostnames(no);
|
||||
|
||||
# The default action of syslog-ng is to log a STATS line
|
||||
# to the file every 10 minutes. That's pretty ugly after a while.
|
||||
# Change it to every 12 hours so you get a nice daily update of
|
||||
# how many messages syslog-ng missed (0).
|
||||
stats_freq(43200);
|
||||
# The default action of syslog-ng is to log a MARK line
|
||||
# to the file every 20 minutes. That's seems high for most
|
||||
# people so turn it down to once an hour. Set it to zero
|
||||
# if you don't want the functionality at all.
|
||||
mark_freq(3600);
|
||||
};
|
||||
|
||||
source src {
|
||||
unix-stream("/dev/log" max-connections(256));
|
||||
internal();
|
||||
file("/proc/kmsg");
|
||||
};
|
||||
|
||||
destination messages { file("/var/log/messages"); };
|
||||
|
||||
# By default messages are logged to tty12...
|
||||
destination console_all { file("/dev/tty12"); };
|
||||
# ...if you intend to use /dev/console for programs like xconsole
|
||||
# you can comment out the destination line above that references /dev/tty12
|
||||
# and uncomment the line below.
|
||||
#destination console_all { file("/dev/console"); };
|
||||
|
||||
log { source(src); destination(messages); };
|
||||
log { source(src); destination(console_all); };
|
||||
@ -1,24 +0,0 @@
|
||||
@version: 3.2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.3.2,v 1.1 2011/01/18 17:44:14 mr_bones_ Exp $
|
||||
#
|
||||
# Syslog-ng default configuration file for Gentoo FreeBSD
|
||||
#
|
||||
options {
|
||||
chain_hostnames(no);
|
||||
|
||||
# The default action of syslog-ng is to log a STATS line
|
||||
# to the file every 10 minutes. That's pretty ugly after a while.
|
||||
# Change it to every 12 hours so you get a nice daily update of
|
||||
# how many messages syslog-ng missed (0).
|
||||
stats_freq(43200);
|
||||
};
|
||||
|
||||
source src {
|
||||
unix-dgram("/var/run/log");
|
||||
internal();
|
||||
file("/dev/klog");
|
||||
};
|
||||
|
||||
destination messages { file("/var/log/messages"); };
|
||||
|
||||
log { source(src); destination(messages); };
|
||||
@ -1,25 +0,0 @@
|
||||
@version: 3.3
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.3.3,v 1.2 2011/10/04 23:15:44 mr_bones_ Exp $
|
||||
#
|
||||
# Syslog-ng default configuration file for Gentoo FreeBSD
|
||||
#
|
||||
options {
|
||||
threaded(yes);
|
||||
chain_hostnames(no);
|
||||
|
||||
# The default action of syslog-ng is to log a STATS line
|
||||
# to the file every 10 minutes. That's pretty ugly after a while.
|
||||
# Change it to every 12 hours so you get a nice daily update of
|
||||
# how many messages syslog-ng missed (0).
|
||||
stats_freq(43200);
|
||||
};
|
||||
|
||||
source src {
|
||||
unix-dgram("/var/run/log");
|
||||
internal();
|
||||
file("/dev/klog");
|
||||
};
|
||||
|
||||
destination messages { file("/var/log/messages"); };
|
||||
|
||||
log { source(src); destination(messages); };
|
||||
@ -1,111 +0,0 @@
|
||||
@version: 3.2
|
||||
# Copyright 2005-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.2,v 1.1 2011/01/18 17:44:14 mr_bones_ Exp $
|
||||
|
||||
#
|
||||
# Syslog-ng configuration file, compatible with default hardened installations.
|
||||
#
|
||||
|
||||
options {
|
||||
chain_hostnames(no);
|
||||
stats_freq(43200);
|
||||
};
|
||||
|
||||
source src {
|
||||
unix-stream("/dev/log");
|
||||
internal();
|
||||
};
|
||||
source kernsrc {
|
||||
file("/proc/kmsg");
|
||||
};
|
||||
|
||||
#source net { udp(); };
|
||||
#log { source(net); destination(net_logs); };
|
||||
#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
|
||||
|
||||
destination authlog { file("/var/log/auth.log"); };
|
||||
destination _syslog { file("/var/log/syslog"); };
|
||||
destination cron { file("/var/log/cron.log"); };
|
||||
destination daemon { file("/var/log/daemon.log"); };
|
||||
destination kern { file("/var/log/kern.log"); file("/dev/tty12"); };
|
||||
destination lpr { file("/var/log/lpr.log"); };
|
||||
destination user { file("/var/log/user.log"); };
|
||||
destination uucp { file("/var/log/uucp.log"); };
|
||||
#destination ppp { file("/var/log/ppp.log"); };
|
||||
destination mail { file("/var/log/mail.log"); };
|
||||
|
||||
destination avc { file("/var/log/avc.log"); };
|
||||
destination audit { file("/var/log/audit.log"); };
|
||||
destination pax { file("/var/log/pax.log"); };
|
||||
destination grsec { file("/var/log/grsec.log"); };
|
||||
|
||||
destination mailinfo { file("/var/log/mail.info"); };
|
||||
destination mailwarn { file("/var/log/mail.warn"); };
|
||||
destination mailerr { file("/var/log/mail.err"); };
|
||||
|
||||
destination newscrit { file("/var/log/news/news.crit"); };
|
||||
destination newserr { file("/var/log/news/news.err"); };
|
||||
destination newsnotice { file("/var/log/news/news.notice"); };
|
||||
|
||||
destination debug { file("/var/log/debug"); };
|
||||
destination messages { file("/var/log/messages"); };
|
||||
destination console { usertty("root"); };
|
||||
destination console_all { file("/dev/tty12"); };
|
||||
#destination loghost { udp("loghost" port(999)); };
|
||||
|
||||
destination xconsole { pipe("/dev/xconsole"); };
|
||||
|
||||
filter f_auth { facility(auth); };
|
||||
filter f_authpriv { facility(auth, authpriv); };
|
||||
filter f_syslog { not facility(authpriv, mail); };
|
||||
filter f_cron { facility(cron); };
|
||||
filter f_daemon { facility(daemon); };
|
||||
filter f_kern { facility(kern); };
|
||||
filter f_lpr { facility(lpr); };
|
||||
filter f_mail { facility(mail); };
|
||||
filter f_user { facility(user); };
|
||||
filter f_uucp { facility(uucp); };
|
||||
#filter f_ppp { facility(ppp); };
|
||||
filter f_news { facility(news); };
|
||||
filter f_debug { not facility(auth, authpriv, news, mail); };
|
||||
filter f_messages { level(info..warn)
|
||||
and not facility(auth, authpriv, mail, news); };
|
||||
filter f_emergency { level(emerg); };
|
||||
|
||||
filter f_info { level(info); };
|
||||
|
||||
filter f_notice { level(notice); };
|
||||
filter f_warn { level(warn); };
|
||||
filter f_crit { level(crit); };
|
||||
filter f_err { level(err); };
|
||||
|
||||
filter f_avc { message(".*avc: .*"); };
|
||||
filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
|
||||
filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
|
||||
filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
|
||||
|
||||
log { source(src); filter(f_authpriv); destination(authlog); };
|
||||
log { source(src); filter(f_syslog); destination(_syslog); };
|
||||
log { source(src); filter(f_cron); destination(cron); };
|
||||
log { source(src); filter(f_daemon); destination(daemon); };
|
||||
log { source(kernsrc); filter(f_kern); destination(kern); };
|
||||
log { source(src); filter(f_lpr); destination(lpr); };
|
||||
log { source(src); filter(f_mail); destination(mail); };
|
||||
log { source(src); filter(f_user); destination(user); };
|
||||
log { source(src); filter(f_uucp); destination(uucp); };
|
||||
log { source(kernsrc); filter(f_pax); destination(pax); };
|
||||
log { source(kernsrc); filter(f_grsec); destination(grsec); };
|
||||
log { source(kernsrc); filter(f_audit); destination(audit); };
|
||||
log { source(kernsrc); filter(f_avc); destination(avc); };
|
||||
log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
|
||||
log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
|
||||
log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
|
||||
log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
|
||||
log { source(src); filter(f_news); filter(f_err); destination(newserr); };
|
||||
log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
|
||||
log { source(src); filter(f_debug); destination(debug); };
|
||||
log { source(src); filter(f_messages); destination(messages); };
|
||||
log { source(src); filter(f_emergency); destination(console); };
|
||||
#log { source(src); filter(f_ppp); destination(ppp); };
|
||||
log { source(src); destination(console_all); };
|
||||
@ -1,112 +0,0 @@
|
||||
@version: 3.3
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.3,v 1.2 2011/10/04 23:15:44 mr_bones_ Exp $
|
||||
|
||||
#
|
||||
# Syslog-ng configuration file, compatible with default hardened installations.
|
||||
#
|
||||
|
||||
options {
|
||||
threaded(yes);
|
||||
chain_hostnames(no);
|
||||
stats_freq(43200);
|
||||
};
|
||||
|
||||
source src {
|
||||
unix-stream("/dev/log");
|
||||
internal();
|
||||
};
|
||||
source kernsrc {
|
||||
file("/proc/kmsg");
|
||||
};
|
||||
|
||||
#source net { udp(); };
|
||||
#log { source(net); destination(net_logs); };
|
||||
#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
|
||||
|
||||
destination authlog { file("/var/log/auth.log"); };
|
||||
destination _syslog { file("/var/log/syslog"); };
|
||||
destination cron { file("/var/log/cron.log"); };
|
||||
destination daemon { file("/var/log/daemon.log"); };
|
||||
destination kern { file("/var/log/kern.log"); file("/dev/tty12"); };
|
||||
destination lpr { file("/var/log/lpr.log"); };
|
||||
destination user { file("/var/log/user.log"); };
|
||||
destination uucp { file("/var/log/uucp.log"); };
|
||||
#destination ppp { file("/var/log/ppp.log"); };
|
||||
destination mail { file("/var/log/mail.log"); };
|
||||
|
||||
destination avc { file("/var/log/avc.log"); };
|
||||
destination audit { file("/var/log/audit.log"); };
|
||||
destination pax { file("/var/log/pax.log"); };
|
||||
destination grsec { file("/var/log/grsec.log"); };
|
||||
|
||||
destination mailinfo { file("/var/log/mail.info"); };
|
||||
destination mailwarn { file("/var/log/mail.warn"); };
|
||||
destination mailerr { file("/var/log/mail.err"); };
|
||||
|
||||
destination newscrit { file("/var/log/news/news.crit"); };
|
||||
destination newserr { file("/var/log/news/news.err"); };
|
||||
destination newsnotice { file("/var/log/news/news.notice"); };
|
||||
|
||||
destination debug { file("/var/log/debug"); };
|
||||
destination messages { file("/var/log/messages"); };
|
||||
destination console { usertty("root"); };
|
||||
destination console_all { file("/dev/tty12"); };
|
||||
#destination loghost { udp("loghost" port(999)); };
|
||||
|
||||
destination xconsole { pipe("/dev/xconsole"); };
|
||||
|
||||
filter f_auth { facility(auth); };
|
||||
filter f_authpriv { facility(auth, authpriv); };
|
||||
filter f_syslog { not facility(authpriv, mail); };
|
||||
filter f_cron { facility(cron); };
|
||||
filter f_daemon { facility(daemon); };
|
||||
filter f_kern { facility(kern); };
|
||||
filter f_lpr { facility(lpr); };
|
||||
filter f_mail { facility(mail); };
|
||||
filter f_user { facility(user); };
|
||||
filter f_uucp { facility(uucp); };
|
||||
#filter f_ppp { facility(ppp); };
|
||||
filter f_news { facility(news); };
|
||||
filter f_debug { not facility(auth, authpriv, news, mail); };
|
||||
filter f_messages { level(info..warn)
|
||||
and not facility(auth, authpriv, mail, news); };
|
||||
filter f_emergency { level(emerg); };
|
||||
|
||||
filter f_info { level(info); };
|
||||
|
||||
filter f_notice { level(notice); };
|
||||
filter f_warn { level(warn); };
|
||||
filter f_crit { level(crit); };
|
||||
filter f_err { level(err); };
|
||||
|
||||
filter f_avc { message(".*avc: .*"); };
|
||||
filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
|
||||
filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
|
||||
filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
|
||||
|
||||
log { source(src); filter(f_authpriv); destination(authlog); };
|
||||
log { source(src); filter(f_syslog); destination(_syslog); };
|
||||
log { source(src); filter(f_cron); destination(cron); };
|
||||
log { source(src); filter(f_daemon); destination(daemon); };
|
||||
log { source(kernsrc); filter(f_kern); destination(kern); };
|
||||
log { source(src); filter(f_lpr); destination(lpr); };
|
||||
log { source(src); filter(f_mail); destination(mail); };
|
||||
log { source(src); filter(f_user); destination(user); };
|
||||
log { source(src); filter(f_uucp); destination(uucp); };
|
||||
log { source(kernsrc); filter(f_pax); destination(pax); };
|
||||
log { source(kernsrc); filter(f_grsec); destination(grsec); };
|
||||
log { source(kernsrc); filter(f_audit); destination(audit); };
|
||||
log { source(kernsrc); filter(f_avc); destination(avc); };
|
||||
log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
|
||||
log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
|
||||
log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
|
||||
log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
|
||||
log { source(src); filter(f_news); filter(f_err); destination(newserr); };
|
||||
log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
|
||||
log { source(src); filter(f_debug); destination(debug); };
|
||||
log { source(src); filter(f_messages); destination(messages); };
|
||||
log { source(src); filter(f_emergency); destination(console); };
|
||||
#log { source(src); filter(f_ppp); destination(ppp); };
|
||||
log { source(src); destination(console_all); };
|
||||
@ -1,62 +0,0 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6.3,v 1.6 2013/04/28 05:24:13 mr_bones_ Exp $
|
||||
|
||||
extra_commands="checkconfig"
|
||||
extra_started_commands="reload"
|
||||
|
||||
depend() {
|
||||
# Make networking dependency conditional on configuration
|
||||
case $(sed 's/#.*//' /etc/syslog-ng/syslog-ng.conf) in
|
||||
*source*tcp*|*source*udp*|*destination*tcp*|*destination*udp*)
|
||||
need net
|
||||
use stunnel ;;
|
||||
esac
|
||||
|
||||
config /etc/syslog-ng/syslog-ng.conf
|
||||
use clock
|
||||
need hostname localmount
|
||||
after bootmisc
|
||||
provide logger
|
||||
}
|
||||
|
||||
checkconfig() {
|
||||
if [ ! -e /etc/syslog-ng/syslog-ng.conf ] ; then
|
||||
eerror "You need to create /etc/syslog-ng/syslog-ng.conf first."
|
||||
eerror "An example can be found in /etc/syslog-ng/syslog-ng.conf.sample"
|
||||
return 1
|
||||
fi
|
||||
syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf
|
||||
|
||||
# the start and reload functions have their own eends so
|
||||
# avoid calling this twice when there are no problems
|
||||
[ $? -eq 0 ] || eend $? "Configuration error. Please fix your configfile (/etc/syslog-ng/syslog-ng.conf)"
|
||||
}
|
||||
|
||||
start() {
|
||||
checkconfig || return 1
|
||||
ebegin "Starting syslog-ng"
|
||||
[ -n "${SYSLOG_NG_OPTS}" ] && SYSLOG_NG_OPTS="-- ${SYSLOG_NG_OPTS}"
|
||||
start-stop-daemon --start --pidfile /var/run/syslog-ng.pid --exec /usr/sbin/syslog-ng ${SYSLOG_NG_OPTS}
|
||||
eend $? "Failed to start syslog-ng"
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping syslog-ng"
|
||||
start-stop-daemon --stop --pidfile /var/run/syslog-ng.pid
|
||||
eend $? "Failed to stop syslog-ng"
|
||||
sleep 1 # needed for syslog-ng to stop in case we're restarting
|
||||
}
|
||||
|
||||
reload() {
|
||||
if [ ! -f /var/run/syslog-ng.pid ]; then
|
||||
eerror "syslog-ng isn't running"
|
||||
return 1
|
||||
fi
|
||||
checkconfig || return 1
|
||||
ebegin "Reloading configuration and re-opening log files"
|
||||
start-stop-daemon --signal HUP \
|
||||
--pidfile /var/run/syslog-ng.pid
|
||||
eend $?
|
||||
}
|
||||
@ -1,74 +0,0 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6.3.3,v 1.3 2013/04/28 04:50:34 mr_bones_ Exp $
|
||||
|
||||
extra_commands="checkconfig"
|
||||
extra_started_commands="reload"
|
||||
|
||||
description_checkconfig="Check the configuration file that will be used by \"start\""
|
||||
description_reload="Reload the configuration without exiting"
|
||||
|
||||
SYSLOG_NG_SERVICE=${SVCNAME#*.}
|
||||
SYSLOG_NG_SERVICE=${SYSLOG_NG_SERVICE:-syslog-ng}
|
||||
|
||||
SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${SYSLOG_NG_SERVICE}.conf}
|
||||
SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-/var/run/${SVCNAME}.pid}
|
||||
SYSLOG_NG_OPTS="--cfgfile ${SYSLOG_NG_CONFIGFILE} --pidfile ${SYSLOG_NG_PIDFILE} ${SYSLOG_NG_OPTS}"
|
||||
|
||||
depend() {
|
||||
# Make networking dependency conditional on configuration
|
||||
if [ -f "${SYSLOG_NG_CONFIGFILE}" ]; then
|
||||
case `sed 's/#.*//' "${SYSLOG_NG_CONFIGFILE}"` in
|
||||
*source*tcp*|*source*udp*|*destination*tcp*|*destination*udp*)
|
||||
need net
|
||||
use stunnel ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
config "${SYSLOG_NG_CONFIGFILE}"
|
||||
use clock
|
||||
need hostname localmount
|
||||
after bootmisc
|
||||
provide logger
|
||||
}
|
||||
|
||||
checkconfig() {
|
||||
if [ ! -e "${SYSLOG_NG_CONFIGFILE}" ] ; then
|
||||
eerror "You need to create ${SYSLOG_NG_CONFIGFILE} first."
|
||||
eerror "An example can be found in /usr/share/doc/syslog"
|
||||
|
||||
return 1
|
||||
fi
|
||||
syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
|
||||
|
||||
# the start and reload functions have their own eends so
|
||||
# avoid calling this twice when there are no problems
|
||||
[ $? -eq 0 ] || eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
|
||||
}
|
||||
|
||||
start() {
|
||||
checkconfig || return 1
|
||||
ebegin "Starting ${SVCNAME}"
|
||||
[ -n "${SYSLOG_NG_OPTS}" ] && SYSLOG_NG_OPTS="-- ${SYSLOG_NG_OPTS}"
|
||||
start-stop-daemon --start --pidfile "${SYSLOG_NG_PIDFILE}" --exec /usr/sbin/syslog-ng ${SYSLOG_NG_OPTS}
|
||||
eend $? "Failed to start ${SVCNAME}"
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ${SVCNAME}"
|
||||
start-stop-daemon --stop --pidfile "${SYSLOG_NG_PIDFILE}"
|
||||
eend $? "Failed to stop ${SVCNAME}"
|
||||
sleep 1 # needed for syslog-ng to stop in case we're restarting
|
||||
}
|
||||
|
||||
reload() {
|
||||
if [ ! -f "${SYSLOG_NG_PIDFILE}" ]; then
|
||||
eerror "${SVCNAME} isn't running"
|
||||
return 1
|
||||
fi
|
||||
checkconfig || return 1
|
||||
ebegin "Reloading configuration and re-opening log files"
|
||||
start-stop-daemon --signal HUP --pidfile "${SYSLOG_NG_PIDFILE}"
|
||||
eend $?
|
||||
}
|
||||
@ -1,94 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.2.5.ebuild,v 1.8 2012/05/03 18:02:22 jdhore Exp $
|
||||
|
||||
EAPI=2
|
||||
inherit autotools fixheadtails eutils multilib
|
||||
|
||||
MY_PV=${PV/_/}
|
||||
DESCRIPTION="syslog replacement with advanced filtering features"
|
||||
HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
|
||||
SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/syslog-ng_${PV}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
IUSE="caps hardened ipv6 +pcre selinux spoof-source sql ssl tcpd"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="
|
||||
pcre? ( dev-libs/libpcre )
|
||||
spoof-source? ( net-libs/libnet )
|
||||
ssl? ( dev-libs/openssl )
|
||||
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
|
||||
>=dev-libs/eventlog-0.2.12
|
||||
>=dev-libs/glib-2.10.1:2
|
||||
caps? ( sys-libs/libcap )
|
||||
sql? ( >=dev-db/libdbi-0.8.3 )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
sys-devel/flex"
|
||||
|
||||
src_prepare() {
|
||||
ht_fix_file configure.in
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--disable-dependency-tracking \
|
||||
--enable-dynamic-linking \
|
||||
--sysconfdir=/etc/syslog-ng \
|
||||
--localstatedir=/var/lib/misc \
|
||||
--with-pidfile-dir=/var/run \
|
||||
--with-module-dir=/usr/$(get_libdir)/syslog-ng \
|
||||
$(use_enable caps linux-caps) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable pcre) \
|
||||
$(use_enable spoof-source) \
|
||||
$(use_enable sql) \
|
||||
$(use_enable ssl) \
|
||||
$(use_enable tcpd tcp-wrapper)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "emake install failed"
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS README \
|
||||
contrib/syslog-ng.conf* \
|
||||
contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."*
|
||||
|
||||
# Install default configuration
|
||||
insinto /etc/syslog-ng
|
||||
if use hardened || use selinux ; then
|
||||
newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened.${PV%.*}" syslog-ng.conf || die
|
||||
elif use userland_BSD ; then
|
||||
newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%.*}" syslog-ng.conf || die
|
||||
else
|
||||
newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%.*}" syslog-ng.conf || die
|
||||
fi
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
# Install snippet for logrotate, which may or may not be installed
|
||||
if use hardened || use selinux ; then
|
||||
newins "${FILESDIR}/syslog-ng.logrotate.hardened" syslog-ng || die
|
||||
else
|
||||
newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng || die
|
||||
fi
|
||||
|
||||
newinitd "${FILESDIR}/syslog-ng.rc6.${PV%%.*}" syslog-ng || die
|
||||
newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng || die
|
||||
keepdir /etc/syslog-ng/patterndb.d
|
||||
find "${D}" -type f -name '*.la' -exec rm {} + || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# bug #355257
|
||||
if ! has_version app-admin/logrotate ; then
|
||||
echo
|
||||
elog "It is highly recommended that app-admin/logrotate be emerged to"
|
||||
elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
|
||||
elog "for logrotate to use."
|
||||
echo
|
||||
fi
|
||||
}
|
||||
@ -1,139 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.3.5-r1.ebuild,v 1.3 2013/05/08 20:47:41 mr_bones_ Exp $
|
||||
|
||||
EAPI=2
|
||||
inherit autotools eutils multilib
|
||||
|
||||
MY_PV=${PV/_/}
|
||||
DESCRIPTION="syslog replacement with advanced filtering features"
|
||||
HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
|
||||
SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
|
||||
IUSE="caps hardened ipv6 json mongodb +pcre selinux spoof-source sql ssl static tcpd"
|
||||
RESTRICT="test"
|
||||
|
||||
LIBS_DEPEND="
|
||||
spoof-source? ( net-libs/libnet )
|
||||
ssl? ( dev-libs/openssl )
|
||||
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
|
||||
!static? (
|
||||
>=dev-libs/eventlog-0.2.12
|
||||
>=dev-libs/glib-2.10.1:2 )
|
||||
json? ( >=dev-libs/json-glib-0.12 )
|
||||
caps? ( sys-libs/libcap )
|
||||
sql? ( >=dev-db/libdbi-0.8.3 )"
|
||||
RDEPEND="
|
||||
!static? (
|
||||
pcre? ( dev-libs/libpcre )
|
||||
${LIBS_DEPEND}
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
${LIBS_DEPEND}
|
||||
static? (
|
||||
>=dev-libs/eventlog-0.2.12[static-libs]
|
||||
>=dev-libs/glib-2.10.1:2[static-libs] )
|
||||
virtual/pkgconfig
|
||||
sys-devel/flex"
|
||||
|
||||
S=${WORKDIR}/${PN}-${MY_PV}
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${P}-compile.patch \
|
||||
"${FILESDIR}"/${P}-afsocket.patch \
|
||||
"${FILESDIR}"/${P}-gprocess.patch \
|
||||
"${FILESDIR}"/${P}-include.patch \
|
||||
"${FILESDIR}"/${P}-threading.patch \
|
||||
"${FILESDIR}"/${P}-utmpx.patch
|
||||
sed -i \
|
||||
-e '/libsyslog_ng_crypto_la_LIBADD/s/$/ -lssl -lcrypto/' \
|
||||
lib/Makefile.am || die
|
||||
sed -i \
|
||||
-e 's/AM_PROG_CC_STDC/AC_PROG_CC/' \
|
||||
-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
|
||||
configure.in || die
|
||||
sed -i \
|
||||
-e 's/AM_PROG_CC_STDC/AC_PROG_CC/' \
|
||||
-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
|
||||
modules/afmongodb/libmongo-client/configure.ac || die
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
if use static ; then
|
||||
myconf="${myconf} --enable-static-linking"
|
||||
else
|
||||
myconf="${myconf} --enable-dynamic-linking"
|
||||
fi
|
||||
econf \
|
||||
--disable-dependency-tracking \
|
||||
--disable-systemd \
|
||||
--with-ivykis=internal \
|
||||
--sysconfdir=/etc/syslog-ng \
|
||||
--localstatedir=/var/lib/misc \
|
||||
--with-pidfile-dir=/var/run \
|
||||
--with-module-dir=/usr/$(get_libdir)/syslog-ng \
|
||||
$(use_enable caps linux-caps) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable json) \
|
||||
$(use_with json json-glib) \
|
||||
$(use_enable mongodb) \
|
||||
$(use_enable pcre) \
|
||||
$(use_enable spoof-source) \
|
||||
$(use_enable sql) \
|
||||
$(use_enable ssl) \
|
||||
$(use_enable tcpd tcp-wrapper) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "emake install failed"
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS \
|
||||
contrib/syslog-ng.conf* \
|
||||
contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."*
|
||||
|
||||
# Install default configuration
|
||||
insinto /etc/syslog-ng
|
||||
if use hardened || use selinux ; then
|
||||
newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened.${PV%.*}" syslog-ng.conf || die
|
||||
elif use userland_BSD ; then
|
||||
newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%.*}" syslog-ng.conf || die
|
||||
else
|
||||
newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%.*}" syslog-ng.conf || die
|
||||
fi
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
# Install snippet for logrotate, which may or may not be installed
|
||||
if use hardened || use selinux ; then
|
||||
newins "${FILESDIR}/syslog-ng.logrotate.hardened" syslog-ng || die
|
||||
else
|
||||
newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng || die
|
||||
fi
|
||||
|
||||
newinitd "${FILESDIR}/syslog-ng.rc6.${PV%.*}" syslog-ng || die
|
||||
newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng || die
|
||||
keepdir /etc/syslog-ng/patterndb.d
|
||||
find "${D}" -type f -name '*.la' -exec rm {} + || die
|
||||
rmdir "${D}"/usr/libexec
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "For detailed documentation please see the upstream website:"
|
||||
elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.3-guides/syslog-ng-ose-v3.3-guide-admin-en.html/index.html"
|
||||
|
||||
# bug #355257
|
||||
if ! has_version app-admin/logrotate ; then
|
||||
echo
|
||||
elog "It is highly recommended that app-admin/logrotate be emerged to"
|
||||
elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
|
||||
elog "for logrotate to use."
|
||||
echo
|
||||
fi
|
||||
}
|
||||
@ -1,104 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.3.ebuild,v 1.2 2013/10/14 16:21:55 mr_bones_ Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit autotools eutils multilib systemd
|
||||
|
||||
MY_PV=${PV/_/}
|
||||
DESCRIPTION="syslog replacement with advanced filtering features"
|
||||
HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
|
||||
SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2+ LGPL-2.1+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
|
||||
IUSE="caps dbi geoip ipv6 json mongodb +pcre smtp spoof-source ssl systemd tcpd"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="
|
||||
pcre? ( dev-libs/libpcre )
|
||||
spoof-source? ( net-libs/libnet:1.1 )
|
||||
ssl? ( dev-libs/openssl:= )
|
||||
smtp? ( net-libs/libesmtp )
|
||||
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
|
||||
>=dev-libs/eventlog-0.2.12
|
||||
>=dev-libs/glib-2.10.1:2
|
||||
json? ( >=dev-libs/json-c-0.9 )
|
||||
caps? ( sys-libs/libcap )
|
||||
geoip? ( >=dev-libs/geoip-1.5.0 )
|
||||
dbi? ( >=dev-db/libdbi-0.8.3 )
|
||||
systemd? ( sys-apps/systemd )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
sys-devel/flex"
|
||||
|
||||
S=${WORKDIR}/${PN}-${MY_PV}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PV%.*}/${P}-autotools.patch
|
||||
mv configure.in configure.ac || die
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--with-ivykis=internal \
|
||||
--with-libmongo-client=internal \
|
||||
--sysconfdir=/etc/syslog-ng \
|
||||
--localstatedir=/var/lib/syslog-ng \
|
||||
--with-pidfile-dir=/var/run \
|
||||
--with-module-dir=/usr/$(get_libdir)/syslog-ng \
|
||||
$(systemd_with_unitdir) \
|
||||
$(use_enable systemd) \
|
||||
$(use_enable caps linux-caps) \
|
||||
$(use_enable geoip) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable json) \
|
||||
$(use_enable mongodb) \
|
||||
$(use_enable pcre) \
|
||||
$(use_enable smtp) \
|
||||
$(use_enable spoof-source) \
|
||||
$(use_enable dbi sql) \
|
||||
$(use_enable ssl) \
|
||||
$(use_enable tcpd tcp-wrapper)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
dodoc AUTHORS NEWS contrib/syslog-ng.conf* contrib/syslog2ng \
|
||||
"${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.hardened" \
|
||||
"${FILESDIR}/syslog-ng.logrotate.hardened" \
|
||||
"${FILESDIR}/README.hardened"
|
||||
|
||||
# Install default configuration
|
||||
insinto /etc/syslog-ng
|
||||
if use userland_BSD ; then
|
||||
newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
|
||||
else
|
||||
newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo" syslog-ng.conf
|
||||
fi
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
|
||||
|
||||
newinitd "${FILESDIR}/${PV%.*}/syslog-ng.rc6" syslog-ng
|
||||
newconfd "${FILESDIR}/${PV%.*}/syslog-ng.confd" syslog-ng
|
||||
keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
|
||||
prune_libtool_files --modules
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "For detailed documentation please see the upstream website:"
|
||||
elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.4-guides/en/syslog-ng-ose-v3.4-guide-admin/html/index.html"
|
||||
|
||||
# bug #355257
|
||||
if ! has_version app-admin/logrotate ; then
|
||||
echo
|
||||
elog "It is highly recommended that app-admin/logrotate be emerged to"
|
||||
elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
|
||||
elog "for logrotate to use."
|
||||
echo
|
||||
fi
|
||||
}
|
||||
@ -1,105 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.4.4.ebuild,v 1.1 2013/10/17 16:08:09 mr_bones_ Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit autotools eutils multilib systemd
|
||||
|
||||
MY_PV=${PV/_/}
|
||||
DESCRIPTION="syslog replacement with advanced filtering features"
|
||||
HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
|
||||
SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2+ LGPL-2.1+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
|
||||
IUSE="caps dbi geoip ipv6 json mongodb +pcre smtp spoof-source ssl systemd tcpd"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="
|
||||
pcre? ( dev-libs/libpcre )
|
||||
spoof-source? ( net-libs/libnet:1.1 )
|
||||
ssl? ( dev-libs/openssl:= )
|
||||
smtp? ( net-libs/libesmtp )
|
||||
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
|
||||
>=dev-libs/eventlog-0.2.12
|
||||
>=dev-libs/glib-2.10.1:2
|
||||
json? ( >=dev-libs/json-c-0.9 )
|
||||
caps? ( sys-libs/libcap )
|
||||
geoip? ( >=dev-libs/geoip-1.5.0 )
|
||||
dbi? ( >=dev-db/libdbi-0.8.3 )
|
||||
systemd? ( sys-apps/systemd )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
sys-devel/flex"
|
||||
|
||||
S=${WORKDIR}/${PN}-${MY_PV}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PV%.*}/${P}-autotools.patch
|
||||
mv configure.in configure.ac || die
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--with-ivykis=internal \
|
||||
--with-libmongo-client=internal \
|
||||
--sysconfdir=/etc/syslog-ng \
|
||||
--localstatedir=/var/lib/syslog-ng \
|
||||
--with-pidfile-dir=/var/run \
|
||||
--with-module-dir=/usr/$(get_libdir)/syslog-ng \
|
||||
$(systemd_with_unitdir) \
|
||||
$(use_enable systemd) \
|
||||
$(use_enable caps linux-caps) \
|
||||
$(use_enable geoip) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable json) \
|
||||
$(use_enable mongodb) \
|
||||
$(use_enable pcre) \
|
||||
$(use_enable smtp) \
|
||||
$(use_enable spoof-source) \
|
||||
$(use_enable dbi sql) \
|
||||
$(use_enable ssl) \
|
||||
$(use_enable tcpd tcp-wrapper)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# -j1 for bug #484470
|
||||
emake -j1 DESTDIR="${D}" install
|
||||
|
||||
dodoc AUTHORS NEWS contrib/syslog-ng.conf* contrib/syslog2ng \
|
||||
"${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.hardened" \
|
||||
"${FILESDIR}/syslog-ng.logrotate.hardened" \
|
||||
"${FILESDIR}/README.hardened"
|
||||
|
||||
# Install default configuration
|
||||
insinto /etc/syslog-ng
|
||||
if use userland_BSD ; then
|
||||
newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
|
||||
else
|
||||
newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo" syslog-ng.conf
|
||||
fi
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
|
||||
|
||||
newinitd "${FILESDIR}/${PV%.*}/syslog-ng.rc6" syslog-ng
|
||||
newconfd "${FILESDIR}/${PV%.*}/syslog-ng.confd" syslog-ng
|
||||
keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
|
||||
prune_libtool_files --modules
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "For detailed documentation please see the upstream website:"
|
||||
elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.4-guides/en/syslog-ng-ose-v3.4-guide-admin/html/index.html"
|
||||
|
||||
# bug #355257
|
||||
if ! has_version app-admin/logrotate ; then
|
||||
echo
|
||||
elog "It is highly recommended that app-admin/logrotate be emerged to"
|
||||
elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
|
||||
elog "for logrotate to use."
|
||||
echo
|
||||
fi
|
||||
}
|
||||
@ -1,3 +1,3 @@
|
||||
DIST fox-1.6.36.tar.gz 4344694 SHA256 cf8f4d09e104d6b3c425df3ce5b3bd54ed4c8095389f742f81370aba16169dff SHA512 2985404d6b2122159e9859d3490a154b75429bb1cf9d9920155f454012ef88fbd005548db0e68d55826d7b9d68ec745bccd14e27a8ff13bdbf5c8357f47ccdc0 WHIRLPOOL 74af19f2d041b785e88799b1fc8aad5c94efa30e53b9fecd0e8bfb6abff58c3930ef28e91d3199d79acacb100d2281ad7497bc1656556ef0d78daa109f90c860
|
||||
DIST fox-1.7.41.tar.gz 5053794 SHA256 1c23d9d7f2f9f4b2a51db6acdd447315ae8352563453edf223f4a51b6a0e52f4 SHA512 f6567d1381e8224cf9bd1e6373280e85de8497514ab1ae4f9650ecae371935a8698a4a03e0d28d7432f64cb1ef3809cba51cdfbe1a226200a45d0a1bca18e2fe WHIRLPOOL bb505bb689aba7cd9b18b83c05779fc1efd4ed4ab41a0fdef4905b45003fbffb48265c6096be57ccde8e831098573bb94ea7448f7d79172fe2d4710b3139eb99
|
||||
DIST fox-1.7.42.tar.gz 5062065 SHA256 5e7a69c64ecfc704c130ea890385256c568fadbb472f91d8256f576b6d87ecf4 SHA512 7ae7cbfd120dbb9edcb723e9ac34f5d04ea9e961936bd8fcbe84cb371913e877d87886c8c3a286a467357f40924321e7591e17778f6e5fa7e010a762627d694d WHIRLPOOL 3062d7ba7b02115d3d0a6cafac09c0569a2f398223dc10a60ba14e63ef788f101c9c8d5a3fb5cf8deb666d2fb29f35129995b1f2d229c597b05ce90735deea03
|
||||
DIST fox-1.7.43.tar.gz 5077930 SHA256 6d3c41c431d01179866b114f24cd749a9aef8ef8dab1dec4f657895107eb70ee SHA512 34a7fae1ad7072df4179a5e55c2e82420d2ffbcd3a8cf3de9b2020b30f3d15c22dcd471ec3ff120b73071a6de91956c0ce6ea62696eb80b880f784f2b642d970 WHIRLPOOL b5ebf3345dde5abe05a9175c01f9d3dc3ad690494ba800a1f57bfab3b145cc002e8cd88a6a1fb4ade42b615453fe2213dff564c0a11958e6f21ce84707338c1e
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-editors/adie/adie-1.7.41.ebuild,v 1.1 2013/09/13 20:47:41 mabi Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-editors/adie/adie-1.7.43.ebuild,v 1.1 2013/11/13 21:51:23 mabi Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.9.0.ebuild,v 1.1 2013/11/13 03:39:15 chutzpah Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.9.1.ebuild,v 1.1 2013/11/13 19:17:00 chutzpah Exp $
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=(python2_{6,7})
|
||||
@ -1 +1,2 @@
|
||||
DIST pyside-tools-0.2.14.tar.bz2 76575 SHA256 cbd5d2ecf872434442f095766d5abf29733e3cc474da3e2e679e93b6bc0bb600 SHA512 8da71d0ddf03d5bd974d944a9282fced4602458f4d31dcd119f085ae7555e80518b30def97c73545d5ce3df475567a14ba14b12687b24e822747711bc69c9d59 WHIRLPOOL 33eccfdb8ad582973e80fb98b91b1af818b0eeb6de832c168e9293cf36db41bd08aca8dca1a1e674253b0e57bdc0cce800da5c39cbe8dcad2341b38d23746435
|
||||
DIST pyside-tools-0.2.15.tar.gz 78989 SHA256 8a7fe786b19c5b2b4380aff0a9590b3129fad4a0f6f3df1f39593d79b01a9f74 SHA512 7cee288b733e5f83a01683d7fc8f1017c044e46dbb02489c5e763e37db4e24f319ffd593e001ee6ca5a21a34cf1a6009ab1d4c9e4102c60693992b6f2f7c8991 WHIRLPOOL 23d7a325f548cd1d95b91c40d5c2ccbdd70a25328948f93b5232bf8d1177674899bfdd51161873c34be5245d20c4d202a3eed29ce7fa10399cabad9e84b2e698
|
||||
|
||||
@ -0,0 +1,98 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/pyside-tools-0.2.15.ebuild,v 1.1 2013/11/14 01:02:29 pesa Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
CMAKE_IN_SOURCE_BUILD="1"
|
||||
|
||||
PYTHON_DEPEND="2:2.6 3:3.2"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 3.1 3.3 *-jython 2.7-pypy-*"
|
||||
PYTHON_TESTS_RESTRICTED_ABIS="3.*"
|
||||
|
||||
VIRTUALX_COMMAND="cmake-utils_src_test"
|
||||
|
||||
inherit eutils cmake-utils python vcs-snapshot virtualx
|
||||
|
||||
DESCRIPTION="PySide development tools (lupdate, rcc, uic)"
|
||||
HOMEPAGE="http://qt-project.org/wiki/PySide"
|
||||
SRC_URI="https://github.com/PySide/Tools/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-python/pyside-1.2.0[X]
|
||||
>=dev-python/shiboken-1.2.0
|
||||
>=dev-qt/qtcore-4.7.0:4
|
||||
>=dev-qt/qtgui-4.7.0:4
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( virtual/pkgconfig )
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/0.2.13-fix-pysideuic-test-and-install.patch
|
||||
|
||||
python_copy_sources
|
||||
|
||||
preparation() {
|
||||
if [[ $(python_get_version -l --major) == 3 ]]; then
|
||||
rm -fr pysideuic/port_v2
|
||||
else
|
||||
rm -fr pysideuic/port_v3
|
||||
fi
|
||||
|
||||
sed -i -e "/pkg-config/ s:shiboken:&-python${PYTHON_ABI}:" \
|
||||
tests/rcc/run_test.sh || die
|
||||
}
|
||||
python_execute_function -s preparation
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
configuration() {
|
||||
local mycmakeargs=(
|
||||
-DPYTHON_BASENAME="-python${PYTHON_ABI}"
|
||||
-DPYTHON_SUFFIX="-python${PYTHON_ABI}"
|
||||
-DSITE_PACKAGE="$(python_get_sitedir)"
|
||||
$(cmake-utils_use_build test TESTS)
|
||||
)
|
||||
CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_configure
|
||||
}
|
||||
python_execute_function -s configuration
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
compilation() {
|
||||
CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_make
|
||||
}
|
||||
python_execute_function -s compilation
|
||||
}
|
||||
|
||||
src_test() {
|
||||
testing() {
|
||||
CMAKE_USE_DIR="${BUILDDIR}" virtualmake
|
||||
}
|
||||
python_execute_function -s testing
|
||||
}
|
||||
|
||||
src_install() {
|
||||
installation() {
|
||||
CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_install DESTDIR="${T}/images/${PYTHON_ABI}"
|
||||
}
|
||||
python_execute_function -s installation
|
||||
python_merge_intermediate_installation_images "${T}/images"
|
||||
|
||||
dodoc AUTHORS ChangeLog
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
python_mod_optimize pysideuic
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
python_mod_cleanup pysideuic
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST pyside-qt4.8+1.1.2.tar.bz2 3758918 SHA256 e15efc67feeda6cfdd9574673fd30f769d9b6529dfd64d53efc80224aecb107a SHA512 16651b13f5ab096313fe4fc1ff9580f241c61ff98167018459720eca6faeed7af3dc6918c85913ee07c4cd27f0070c7c1c204d81a5538754ce7b9dc2b79c41b1 WHIRLPOOL a086b4dc09c1b1a376363c0f3858d8bccd39d083bbdd484ec8b833ddd21fc6502174c2382bd10cbfe99ec4cadee740e3e16ff745ccad30ed0b611275e54049b9
|
||||
DIST pyside-qt4.8+1.2.0.tar.bz2 3763751 SHA256 5de3976f9623b1d1b7f3906a27b5c4bff26179c427aefe80f56f5cf43618d1c1 SHA512 a7006c4da0856412a8aac6877e5b827214a171c20688fa6527daf45838a0e7167b1a8d144cadbafeb220be0eeb7aee83c009e355dfb1b7ef59e5d215fa486bc8 WHIRLPOOL 9fa3fea64340e2900052a76a5bbfc66d2bad086276696ce25947eaa198f9cc4c507355a602746e098107d82b43988ed3434e3369d313acb4970c6d011c61c1aa
|
||||
DIST pyside-qt4.8+1.2.1.tar.bz2 3764773 SHA256 f54c4350c662ecc59a2e0c95b06286a9ab1baa30b22c2b0194ceda59307e687b SHA512 674a0d86be311650b22a9915a91f25e70b0a739d9c2ad92688ec4c624182ecf5184cbc761ea014ca6955b4bc9338acda2371eeffa302afc3873b95b88dea4b2b WHIRLPOOL ba40b8d81bac8719cab40656cda62add20d19f396a371cc282a80bc1923e0ee94669c9dccaf12b51c3305e9ecc8bbf280369ea52808b5dd6a4eebd3c5490aa1c
|
||||
|
||||
@ -0,0 +1,131 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.2.1.ebuild,v 1.1 2013/11/14 00:46:04 pesa Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7,3_2} )
|
||||
|
||||
inherit multilib cmake-utils python-r1 virtualx
|
||||
|
||||
MY_P="${PN}-qt4.8+${PV}"
|
||||
|
||||
DESCRIPTION="Python bindings for the Qt framework"
|
||||
HOMEPAGE="http://qt-project.org/wiki/PySide"
|
||||
SRC_URI="http://download.qt-project.org/official_releases/${PN}/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="X declarative designer help kde multimedia opengl phonon script scripttools sql svg test webkit xmlpatterns"
|
||||
|
||||
REQUIRED_USE="
|
||||
declarative? ( X )
|
||||
designer? ( X )
|
||||
help? ( X )
|
||||
multimedia? ( X )
|
||||
opengl? ( X )
|
||||
phonon? ( X )
|
||||
scripttools? ( X script )
|
||||
sql? ( X )
|
||||
svg? ( X )
|
||||
test? ( X )
|
||||
webkit? ( X )
|
||||
"
|
||||
|
||||
# Minimal supported version of Qt.
|
||||
QT_PV="4.7.0:4"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-python/shiboken-${PV}[${PYTHON_USEDEP}]
|
||||
>=dev-qt/qtcore-${QT_PV}
|
||||
X? (
|
||||
>=dev-qt/qtgui-${QT_PV}[accessibility]
|
||||
>=dev-qt/qttest-${QT_PV}
|
||||
)
|
||||
declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
|
||||
designer? ( || ( dev-qt/designer:4 <dev-qt/qtgui-4.8.5:4 ) )
|
||||
help? ( >=dev-qt/qthelp-${QT_PV} )
|
||||
multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
|
||||
opengl? ( >=dev-qt/qtopengl-${QT_PV} )
|
||||
phonon? (
|
||||
kde? ( media-libs/phonon )
|
||||
!kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon ) )
|
||||
)
|
||||
script? ( >=dev-qt/qtscript-${QT_PV} )
|
||||
sql? ( >=dev-qt/qtsql-${QT_PV} )
|
||||
svg? ( >=dev-qt/qtsvg-${QT_PV}[accessibility] )
|
||||
webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
|
||||
xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-qt/qtgui-${QT_PV}
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
DOCS=( ChangeLog )
|
||||
|
||||
src_prepare() {
|
||||
# Fix generated pkgconfig file to require the shiboken
|
||||
# library suffixed with the correct python version.
|
||||
sed -i -e '/^Requires:/ s/shiboken$/&@SHIBOKEN_PYTHON_SUFFIX@/' \
|
||||
libpyside/pyside.pc.in || die
|
||||
|
||||
if use prefix; then
|
||||
cp "${FILESDIR}"/rpath.cmake .
|
||||
sed \
|
||||
-i '1iinclude(rpath.cmake)' \
|
||||
CMakeLists.txt || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake-utils_use_build test TESTS)
|
||||
$(cmake-utils_use_disable X QtGui)
|
||||
$(cmake-utils_use_disable X QtTest)
|
||||
$(cmake-utils_use_disable declarative QtDeclarative)
|
||||
$(cmake-utils_use_disable designer QtDesigner)
|
||||
$(cmake-utils_use_disable designer QtUiTools)
|
||||
$(cmake-utils_use_disable help QtHelp)
|
||||
$(cmake-utils_use_disable multimedia QtMultimedia)
|
||||
$(cmake-utils_use_disable opengl QtOpenGL)
|
||||
$(cmake-utils_use_disable phonon)
|
||||
$(cmake-utils_use_disable script QtScript)
|
||||
$(cmake-utils_use_disable scripttools QtScriptTools)
|
||||
$(cmake-utils_use_disable sql QtSql)
|
||||
$(cmake-utils_use_disable svg QtSvg)
|
||||
$(cmake-utils_use_disable webkit QtWebKit)
|
||||
$(cmake-utils_use_disable xmlpatterns QtXmlPatterns)
|
||||
)
|
||||
|
||||
configuration() {
|
||||
local mycmakeargs=(
|
||||
-DPYTHON_SUFFIX="-${EPYTHON}"
|
||||
"${mycmakeargs[@]}"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
python_foreach_impl configuration
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
python_foreach_impl cmake-utils_src_make
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local PYTHONDONTWRITEBYTECODE
|
||||
export PYTHONDONTWRITEBYTECODE
|
||||
|
||||
local VIRTUALX_COMMAND="cmake-utils_src_test"
|
||||
python_foreach_impl virtualmake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
installation() {
|
||||
cmake-utils_src_install
|
||||
mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
|
||||
}
|
||||
python_foreach_impl installation
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST python-uinput-0.10.1.tar.gz 21549 SHA256 bf11ba44850f56142de1f4ac883322ad4f5b14d8c149c01f90e9d96f8ada9c9f SHA512 ec1767fc40071d299ca5955163a0ee1ad9ff896d462037c305f4fdfb6b05be4b360699b1a966a40571c742ac5699c0468c2537787483fa6fe1a0cc19e533ee5a WHIRLPOOL 6c083b28e48093df85e0648e3756abf7a02f55daa89dee9dd7bd629b9d6a81c9bd4e8129e682a856a7bc7fae8ea0f05ed8ebfa279e0d843d44e9e6729f4a64f2
|
||||
DIST python-uinput-0.9.tar.gz 18260 SHA256 2cd5ea90bf83bc3ce56e3d2897de9133080e940f1396551d21305aac43611295 SHA512 bd31b963ce1134670d2b49d243f0613d32355c41c511a13b9963ecca531806d9fa41c8b6cc10717bda16328cdd6b8ab175202dfa774b55372d81f21aba692e65 WHIRLPOOL 25f99d22a8f47217878f28a9357cd3e679c050e165cd8a1c965181559114567df6e8a1059098d0141a3328dd03fe078368b74fe632257512c77f1765853f581e
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>python</herd>
|
||||
<upstream>
|
||||
<remote-id type="pypi">python-uinput</remote-id>
|
||||
</upstream>
|
||||
<herd>python</herd>
|
||||
<upstream>
|
||||
<remote-id type="pypi">python-uinput</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-uinput/python-uinput-0.10.1.ebuild,v 1.1 2013/11/13 10:30:16 jlec Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=(python{2_{6,7},3_{2,3}})
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Pythonic API to the Linux uinput kernel module"
|
||||
HOMEPAGE="http://tjjr.fi/sw/python-uinput/"
|
||||
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="virtual/udev"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
python_prepare_all() {
|
||||
sed \
|
||||
-e "s:libudev.so.0:libudev.so:g" \
|
||||
-i setup.py || die
|
||||
rm libsuinput/src/libudev.h || die
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
DIST qpid-python-0.20.tar.gz 226543 SHA256 0344ffd3af3c03d77e90b0700111b00c18a65770b826a63dfe75806ec8ff22f8 SHA512 c3cc466c3b1e13443c9ac1e04d8dfab8fbdb4460fcc828b91e9d520cacdfa69589ccd1928d8d0cb4012c4d0a22ae9e6dc2803488863ccc53bb568e97f8251b44 WHIRLPOOL 1e7061e9005bf787e8a04ac078a2ff6927e69f101e99507f93a4c283cd18c561523ca910186f1d14c161468e35ef738f2a1ac8f5da04b329c7cc8cd75309f490
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>openstack</herd>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,44 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/qpid-python/qpid-python-0.20.ebuild,v 1.1 2013/11/14 00:44:19 idella4 Exp $
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="A high-speed platform independent enterprise messaging system for Apache"
|
||||
HOMEPAGE="http://qpid.apache.org/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc examples"
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
|
||||
python_compile_all() {
|
||||
use doc && "${PYTHON}" setup.py doc_option
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# For now rm failing tests requiring making a connection, ? via a running broker
|
||||
# Seems 'we' need figure how to start a broker
|
||||
sed -e 's:def testReconnect:def _testReconnect:' \
|
||||
-e 's:testEstablish:_&:' \
|
||||
-e 's:testOpen:_&:' \
|
||||
-e 's:testReconnectURLs:_&:' \
|
||||
-e 's:testTcpNodelay:_&:' \
|
||||
-e 's:testOpenCloseResourceLeaks:_&:' \
|
||||
-e 's:testReconnect:_&:' \
|
||||
-i qpid/tests/messaging/endpoints.py
|
||||
./qpid-python-test
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
local HTML_DOCS=( ../"${P}"-python2_7/doc/. )
|
||||
use examples && local EXAMPLES=( examples/. )
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@ -1,3 +1,3 @@
|
||||
DIST QScintilla-gpl-2.6.2.tar.gz 2662469 SHA256 fac245ecfa11676b0003ef605489f87332c2efe039a4111821aec61bb936c264 SHA512 5d92c70182817f34141c4166a41807a3ef506c38cc2cd3c83d140eeca329e4aa6f1fa379bb9422da95d65a3385eefc27b0948b342af89c93eeca49f233a63a81 WHIRLPOOL 9c2676e61c2706cc0d57fe7ba0fc00cd45f5a12646c8ffe9fbcd197b204cbbadbdc42a93781d07dbd7b198bbbb45584d74b6752173d150096ce900ef0de222cd
|
||||
DIST QScintilla-gpl-2.7.1.tar.gz 2841363 SHA256 490e9679868704e02840f21c4892b3b939088060c17782d938895513988bfb92 SHA512 7e1c003ac210f27e60666385fa4b0b42b20371b48ac4a05b0a5740c963beaa5403df42e2d516bbe6e9eb3d2ad1e5acb5825fcb3d0b4aabfbe971ecae3c86296b WHIRLPOOL e1be53bf00122dffcba5704fb66f105f420386a7357088d8d92c01297769a24dffd0d5ffdb38a2949b0300427c72e6713094940abe2c5b95314801bb0d7cf235
|
||||
DIST QScintilla-gpl-2.7.2.tar.gz 2842625 SHA256 14b47d686dc1586321f84fcf3c9a911ddaace37a1cb0b1e6a6195e252e5bb69c SHA512 d3ca9d75687687210ca6ae3599fd44bfbbad8c99d6d38aaf1c92c83250dc0c5af1c713bdd74d077d0fb9ba1eccbd5e2910eef855d3656392c33c4832d46ff7fb WHIRLPOOL 1ea4a189a5998755afaa0fad111a7f2153e5ecbe13290d62930cce992b0159040de9cb304e848705abc3d0f1909a82fde908d8179ddd9de05970323cee5ffebe
|
||||
DIST QScintilla-gpl-2.8.tar.gz 2917864 SHA256 41d32af71501bdfdfc0668f304ba7d7c15019462795e9441d3b23fc054fdfb71 SHA512 531cec5fb89037f79b71bfd07bc94f2744b8b43c7cf8376d102bd4c85d91af1213ac39cce0cb19e8b90d2fbcda47a8617d1b787dbbadaf6270b66660d7d72cd4 WHIRLPOOL 39eb0231fb6c557f49de1abf8c851dd22dd6416841acecf2350a0dcb23f500f571c1bab67a7e5c28d0c31c142781feb32c8475e5a9840dfbfe6decaa6909df80
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.7.1.ebuild,v 1.3 2013/09/05 18:46:48 mgorny Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.8.ebuild,v 1.1 2013/11/14 01:33:47 pesa Exp $
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
|
||||
@ -1,2 +1,3 @@
|
||||
DIST shiboken-1.1.2.tar.bz2 1067457 SHA256 8f9e8fbe7b3667aafdf6bc88663d28f43999d7ccbfdc3e63aa791db1a554a9dd SHA512 520818743497d82ca2e111a617176068d9daf47b96e8a545949ca644f000d2281dac4d0bd1c12af7822a4895b4019a6e1a76eca47121e792669be0f5ba6f6bd6 WHIRLPOOL b85747663a969c8bac711d55ca4b20de03715777289ef453d6c88354e1ede39f1a3f9c1286ddbcb130570cd49bbfd4f299b46aca822b6f6edcf23e039db9c126
|
||||
DIST shiboken-1.2.0.tar.bz2 1065040 SHA256 057756eb22c4aa047adc74e99cc30a4afcca6ee36d3d61e9247fa3cc4f84c86c SHA512 0bc54a55db028bb32bb66ea1bda1be9c5fdb46eeaa73b834881bb0770c52870340a02172e3830eeb97cceba9a6a01c2ea6b46591e63ce81cb8e31f56babd1457 WHIRLPOOL 9996a73308c5291d6b7e154b882d46b3678c345d734fb8eb4604336b31b6ed9dc598a01571c931782788d47055f06718ab7a48afe295baf0c6ad2cf46ccf7650
|
||||
DIST shiboken-1.2.1.tar.bz2 1067587 SHA256 0ddc6326e36b9782e373b307ca668eb22dfb4418d308c717809e0a13440dabee SHA512 485431b3d768ded859909342598fc42cccf6fb2901a3adefb0b2de0f01713eb420e14169957389d9c1c0c6c686b334b97826d875f9d8a330d308c280bcd10f7b WHIRLPOOL 7d059f5b3cebf61ecb9a6fc4cba9b4a59b91c57ad933e29fa8b3d975a24b8758c0b5c387fd99a1f616364c386bcc85f67e286d4e75b49aa8ce7496da338bca77
|
||||
|
||||
@ -0,0 +1,87 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-1.2.1.ebuild,v 1.1 2013/11/14 00:27:21 pesa Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7,3_2} )
|
||||
|
||||
inherit multilib cmake-utils python-r1
|
||||
|
||||
DESCRIPTION="A tool for creating Python bindings for C++ libraries"
|
||||
HOMEPAGE="http://qt-project.org/wiki/PySide"
|
||||
SRC_URI="http://download.qt-project.org/official_releases/pyside/${P}.tar.bz2"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/libxml2-2.6.32
|
||||
>=dev-libs/libxslt-1.1.19
|
||||
>=dev-qt/qtcore-4.7.0:4
|
||||
>=dev-qt/qtxmlpatterns-4.7.0:4
|
||||
!dev-python/apiextractor
|
||||
!dev-python/generatorrunner
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
dev-python/numpy[${PYTHON_USEDEP}]
|
||||
>=dev-qt/qtgui-4.7.0:4
|
||||
>=dev-qt/qttest-4.7.0:4
|
||||
)"
|
||||
|
||||
DOCS=( AUTHORS ChangeLog )
|
||||
|
||||
src_prepare() {
|
||||
# Fix inconsistent naming of libshiboken.so and ShibokenConfig.cmake,
|
||||
# caused by the usage of a different version suffix with python >= 3.2
|
||||
sed -i -e "/get_config_var('SOABI')/d" \
|
||||
cmake/Modules/FindPython3InterpWithDebug.cmake || die
|
||||
|
||||
if use prefix; then
|
||||
cp "${FILESDIR}"/rpath.cmake .
|
||||
sed \
|
||||
-i '1iinclude(rpath.cmake)' \
|
||||
CMakeLists.txt || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
configuration() {
|
||||
local mycmakeargs=(
|
||||
-DPYTHON_EXECUTABLE="${PYTHON}"
|
||||
-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
|
||||
-DPYTHON_SUFFIX="-${EPYTHON}"
|
||||
$(cmake-utils_use_build test TESTS)
|
||||
)
|
||||
|
||||
if [[ ${EPYTHON} == python3* ]]; then
|
||||
mycmakeargs+=(
|
||||
-DUSE_PYTHON3=ON
|
||||
-DPYTHON3_INCLUDE_DIR="$(python_get_includedir)"
|
||||
-DPYTHON3_LIBRARY="$(python_get_library_path)"
|
||||
)
|
||||
fi
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
python_foreach_impl configuration
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
python_foreach_impl cmake-utils_src_make
|
||||
}
|
||||
|
||||
src_test() {
|
||||
python_foreach_impl cmake-utils_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
installation() {
|
||||
cmake-utils_src_install
|
||||
mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
|
||||
}
|
||||
python_foreach_impl installation
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
DIST afm-0.2.0_p20130408.tar.gz 14070 SHA256 13ffc3b148bddf6caf3840657151b8d9dacd7142ef62d160a5135d9f0be9a31b SHA512 f6d7733705425b2db2f7bf429f9cfa99910e6e319e519c3878a877076c80bdc2ff2eaa6d53d7e42781f96671f38fed6d62ea1a6756c373c3b27b10a7496720ae WHIRLPOOL aaf1b4c892c6aa4e545c06361163c53d84d9d3b0f3561dbc99e4bd64ce8948b3b93c71edff04faabe527aa6152818e07da5f0a7da139f26d3bdee74e5c32875d
|
||||
@ -0,0 +1,33 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/afm/afm-0.2.0_p20130408.ebuild,v 1.1 2013/11/14 02:14:09 mrueg Exp $
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby18 ruby19 ruby20"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC="rdoc"
|
||||
RUBY_FAKEGEM_EXTRADOC="README.rdoc"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="A very simple library to read Adobe Font Metrics files"
|
||||
HOMEPAGE="https://github.com/halfbyte/afm"
|
||||
COMMIT_ID="6765e6e7002efbdc92bc5eb6c7fee4bd25729081"
|
||||
SRC_URI="https://github.com/halfbyte/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
|
||||
RUBY_S=${PN}-${COMMIT_ID}
|
||||
|
||||
ruby_add_bdepend "test? ( dev-ruby/shoulda )"
|
||||
|
||||
all_ruby_prepare() {
|
||||
rm Gemfile || die
|
||||
}
|
||||
|
||||
each_ruby_test() {
|
||||
${RUBY} -Ilib -Itest test/test_afm.rb || die
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>ruby</herd>
|
||||
</pkgmetadata>
|
||||
@ -1 +1,2 @@
|
||||
DIST ruby-termios-0.9.6.tar.gz 14077 SHA256 c838419d4265ce78be0efdfda6d525d81c231450805ec61c861394929f90181c SHA512 66033dcb2cbe2e76bd114607234c105595a9ab7fe567834ae052aa69c70fa83f95724273efc2d32db48fa853276e0015bde4b4ebebae323858b3ee6dc553e6d8 WHIRLPOOL 665f630eb07ae3cbcc480d195ec4c5ac531c0e2e5ad993157793e34c6294236e04d25f7ca3fb7c1fbbd9d77ca3f445dcf78db5a571112034724aec7e0abc9cd2
|
||||
DIST ruby-termios-1.0.0.tar.gz 14738 SHA256 0b6c41fb554acf17d257db8e8a10b283be6a9b45807ef1562151aadfc008ce5f SHA512 16d71a8cf84391da2dc8b138ff381751f5a72d61ce37d2215960d389285dee14862b50cf770d4648b298df093a85005df460ba951c5d7e6fb38e69d8d686599a WHIRLPOOL 34c9ad7fdfb7f72d8311a04345f5aa94050ea5d0fd66d362cd7c9eca55b19b91dd022bf2b3e60714a78c4e80bfc28952d722e8538372a3ed7faed8443baa85e3
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-termios/ruby-termios-1.0.0.ebuild,v 1.2 2013/11/13 19:03:06 mrueg Exp $
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby18 ruby19 ruby20"
|
||||
|
||||
inherit multilib ruby-ng
|
||||
|
||||
DESCRIPTION="A Ruby interface to termios"
|
||||
HOMEPAGE="http://arika.org/ruby/termios"
|
||||
SRC_URI="https://github.com/arika/ruby-termios/archive/version_${PV//./_}.tar.gz -> ${P}.tar.gz"
|
||||
LICENSE="Ruby"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86 ~x86-macos"
|
||||
IUSE=""
|
||||
|
||||
RUBY_S="${PN}-version_${PV//./_}"
|
||||
|
||||
# Tests require a normal TTY, bug 340575. They should all pass when run
|
||||
# manually.
|
||||
RESTRICT=test
|
||||
|
||||
each_ruby_configure() {
|
||||
${RUBY} -Cext extconf.rb || die
|
||||
}
|
||||
|
||||
each_ruby_compile() {
|
||||
emake -Cext V=1
|
||||
cp ext/termios$(get_modname) lib/ || die
|
||||
}
|
||||
|
||||
each_ruby_test() {
|
||||
${RUBY} -Ilib test/test0.rb || die "tests failed"
|
||||
}
|
||||
|
||||
each_ruby_install() {
|
||||
emake V=1 -Cext DESTDIR="${D}" install
|
||||
}
|
||||
|
||||
all_ruby_install() {
|
||||
dodoc ChangeLog README termios.rd
|
||||
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins examples/*
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
DIST tins-0.11.0.gem 34304 SHA256 cd24a2489655eb5eb4bedacece100eb0ff748cd4ec469eb4309e13a48df2fbd0 SHA512 a25d9626f0fa80ad8ac0b9ac27d880c5e2edf2b9f18f828072f822593e872154708f9dae358bc5a9b784c897269a482af0a3c882e3100da14cf5397375ec00db WHIRLPOOL f4935db1e188983dc044ffcff14bc172095806ce68a370895577f942fd8cab9f9f9d4e4306c02f845bc5956cd3b4a92fe19bf59ee6dea654d2957d83056e361f
|
||||
DIST tins-0.12.0.gem 34304 SHA256 7b7bc9943605f700d8b0a0abc5055d9c9e893ff54de38afb58acf46a6b4bae5c SHA512 a79ccf06585267c27fea326003e2571f91a15288998cddc3412fa6cfa9f75b828d18ec1f865fa5265ea4c01864729e46cdb279b5ec8c3aa35314baa76712b8b5 WHIRLPOOL 8d9846dfd6a3fbe5de81d4a3ca2502f67876ce7646ffe2224d192f0f30c97a6ef1969d886f95ba31f12a4ec4e731d20452c82807395d0d0a7e5c0dd56d469410
|
||||
DIST tins-0.13.0.gem 35328 SHA256 9a123ddb27a8ced14ca46bea4c78ad058b832e92e42a3f73a1f2346acfd0f359 SHA512 b946b1d018a001ff5af7c2e84da70fa4f9e3f29c43a70d587310d7369d000126d3dae5503e20df105ff84cc6aebb0c5c9345ccd186d51aa29ba3958443f868e6 WHIRLPOOL 8fbb16703c41c962c13453fe3e8b11bfd08f2794f3c8f1766adcfc4ad6223e5c0b5f558e7c303388482681bd3a3f4f8add0faa6909342cd0dd95a7ec34d96072
|
||||
DIST tins-0.13.1.gem 35328 SHA256 c53bf237462be8d61cfa2a5f4b48f372d010825b0dc594c952d9857fe4c3ef30 SHA512 257ba33ec3802355ed74dcbb29aebe05879c541aa032bb2df268ae645f6630cbb7b3f121911389ad78aaf26a5e5f34e87a53033505c0dded78dbd6d8b27982d6 WHIRLPOOL e901e3b6720ab39670ec6fd1f519d2d93eefe1247f72589ff31d8a00796a1b3bd20a23979a50156e3541bd35b287e648ac516d686eec1e57ffc852e112085046
|
||||
DIST tins-0.6.0.gem 29696 SHA256 dc8ac56d37ec8a71786361fa8b2840ca032856b91cb279f06c542fdc3b4cb479 SHA512 79318f7b08b4478d1aa8f7d8dd86be377ec9655e5a6e62d0d193b7f1db6925c578cfb3fbc54efd76e7be54eaec22986bf79612bd2f4b6eb59934ecfddddcc4be WHIRLPOOL 1b8031c7342c6ea6e93b627c975dfef2d0941dd05118c21f3c97d7924f29d9913b33e7fe95fcd2d6c8e5165f88183d480acd23fa2179efe66d753c36997728e3
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tins/tins-0.13.1.ebuild,v 1.1 2013/11/13 14:43:16 mrueg Exp $
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby18 ruby19 ruby20 jruby"
|
||||
|
||||
RUBY_FAKEGEM_RECIPE_TEST="none"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
RUBY_FAKEGEM_EXTRADOC="README.rdoc"
|
||||
|
||||
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="All the stuff that isn't good enough for a real library."
|
||||
HOMEPAGE="http://github.com/flori/tins"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 ) "
|
||||
|
||||
each_ruby_test() {
|
||||
ruby-ng_testrb-2 -Ilib tests/*_test.rb
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST catalyst-2.0.12.2.tar.bz2 907893 SHA256 411d531b6de8c8c1bc9fa9502af3a4882e94e9db8b911bb48e4a0fcfc1efe7e8 SHA512 12349f6249363a94a72a71d05b2fe6ee13593b5ea67e1cb9a054c5ece896ff68f89d1af6341b98238ba6a6510e2737f81dcc2606649c10681235315663ab04ae WHIRLPOOL 1769a78f615c8e0eec2167dd9d6ab873e24801ecb5e4634037898933c6f5a1dbb189d967a628be6f8811f6769eadc91c5003ddbb6bd58eb05efbbd5110f740c7
|
||||
DIST catalyst-2.0.14.tar.bz2 873415 SHA256 5a2f506026bde6df5d7ad5d94c3dbea0c151422b2201c347eafbaee135915586 SHA512 75e09be72e124ed4af1489af0688ed3858b36d25d76f331d8bfd1d45256fe068b9eb21c783541863f41786d9c91565695387582fc759bea5ef046ad2fa51eb1a WHIRLPOOL fd8c4660ccf11d6a6d89ebbdf20f69467e32984cd5a721c6d34ad3a0a94bb149e020ceefb7a21863aa30ebbdc27e3b5875b3d22fcb2381f6834ac56112335001
|
||||
DIST catalyst-2.0.15.tar.bz2 873335 SHA256 80fc39e6f6b7c32fb84f51333d8bf62a56a1ee068eb83cf2b03cb21c1f163e51 SHA512 9e61ba61eaa806424041f7edd1680b55dfd69bdea5b292aff305b4b3ef03349d82a47d8ab876baf7bf888e03810d79c6a00d74dc748082a1ed180ec1ed7043bd WHIRLPOOL 03c0f1137f59c57d106df4210104000c498a4c7ff2ae5bcc6e6c7a23d3d0c4c35ed125c036a0468859706da82af799641c1abe1b18c716c230c6ab657b4b765c
|
||||
|
||||
@ -0,0 +1,100 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.15.ebuild,v 1.1 2013/11/14 00:46:40 mattst88 Exp $
|
||||
|
||||
EAPI=3
|
||||
PYTHON_DEPEND="2"
|
||||
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
|
||||
inherit git-2
|
||||
SRC_URI=""
|
||||
S="${WORKDIR}/${PN}"
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="mirror://gentoo/${P}.tar.bz2
|
||||
http://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
fi
|
||||
inherit eutils multilib python
|
||||
|
||||
DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
|
||||
HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
RESTRICT=""
|
||||
IUSE="ccache kernel_linux"
|
||||
|
||||
DEPEND="app-text/asciidoc"
|
||||
RDEPEND="app-arch/lbzip2
|
||||
app-crypt/shash
|
||||
virtual/cdrtools
|
||||
x86? ( >=sys-boot/syslinux-3.72 )
|
||||
amd64? ( >=sys-boot/syslinux-3.72 )
|
||||
ccache? ( dev-util/ccache )
|
||||
ia64? ( sys-fs/dosfstools )
|
||||
kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
|
||||
|
||||
pkg_setup() {
|
||||
if use ccache ; then
|
||||
einfo "Enabling ccache support for catalyst."
|
||||
else
|
||||
ewarn "By default, ccache support for catalyst is disabled."
|
||||
ewarn "If this is not what you intended,"
|
||||
ewarn "then you should add ccache to your USE."
|
||||
fi
|
||||
echo
|
||||
einfo "The template spec files are now installed by default. You can find"
|
||||
einfo "them under /usr/share/doc/${PF}/examples"
|
||||
einfo "and they are considered to be the authorative source of information"
|
||||
einfo "on catalyst."
|
||||
echo
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
ewarn "The ${EGIT_BRANCH:-master} branch (what you get with this ${PV} ebuild) contains"
|
||||
ewarn "work-in-progress code. Be aware that it's likely that it will not"
|
||||
ewarn "be in a working state at any given point. Please do not file bugs"
|
||||
ewarn "until you have posted on the gentoo-catalyst mailing list and we"
|
||||
ewarn "have asked you to do so."
|
||||
fi
|
||||
python_set_active_version 2
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
python_convert_shebangs 2 catalyst modules/catalyst_lock.py
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr/$(get_libdir)/${PN}
|
||||
exeinto /usr/$(get_libdir)/${PN}
|
||||
doexe catalyst || die "copying catalyst"
|
||||
if [[ ${PV} == 3.9999* ]]; then
|
||||
doins -r modules files || die "copying files"
|
||||
else
|
||||
doins -r arch modules livecd || die "copying files"
|
||||
fi
|
||||
for x in targets/*; do
|
||||
exeinto /usr/$(get_libdir)/${PN}/$x
|
||||
doexe $x/* || die "copying ${x}"
|
||||
done
|
||||
make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
|
||||
insinto /etc/catalyst
|
||||
doins files/catalyst.conf files/catalystrc || die "copying configuration"
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins examples/* || die
|
||||
dodoc README AUTHORS
|
||||
doman files/catalyst.1 files/catalyst-spec.5
|
||||
# Here is where we actually enable ccache
|
||||
use ccache && \
|
||||
dosed 's:options="autoresume kern:options="autoresume ccache kern:' \
|
||||
/etc/catalyst/catalyst.conf
|
||||
dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
|
||||
/etc/catalyst/catalyst.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "You can find more information about catalyst by checking out the"
|
||||
einfo "catalyst project page at:"
|
||||
einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
|
||||
echo
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
--- Modules/FindImageMagick.cmake
|
||||
+++ Modules/FindImageMagick.cmake
|
||||
@@ -147,17 +147,17 @@
|
||||
)
|
||||
if(component STREQUAL "Magick++")
|
||||
FIND_IMAGEMAGICK_API(Magick++ Magick++.h
|
||||
- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
|
||||
+ Magick++ CORE_RL_Magick++_ Magick++-6.Q64 Magick++-6.Q64HDRI Magick++-6.Q32 Magick++-6.Q32HDRI Magick++-6.Q16 Magick++-6.Q16HDRI Magick++-6.Q8 Magick++-6.Q8HDRI
|
||||
)
|
||||
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
|
||||
elseif(component STREQUAL "MagickWand")
|
||||
FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
|
||||
- Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI
|
||||
+ Wand MagickWand CORE_RL_wand_ MagickWand-6.Q64 MagickWand-6.Q64HDRI MagickWand-6.Q32 MagickWand-6.Q32HDRI MagickWand-6.Q16 MagickWand-6.Q16HDRI MagickWand-6.Q8 MagickWand-6.Q8HDRI
|
||||
)
|
||||
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
|
||||
elseif(component STREQUAL "MagickCore")
|
||||
FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
|
||||
- Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI
|
||||
+ Magick MagickCore CORE_RL_magick_ MagickCore-6.Q64 MagickCore-6.Q64HDRI MagickCore-6.Q32 MagickCore-6.Q32HDRI MagickCore-6.Q16 MagickCore-6.Q16HDRI MagickCore-6.Q8 MagickCore-6.Q8HDRI
|
||||
)
|
||||
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
|
||||
else()
|
||||
@ -1,22 +1,24 @@
|
||||
diff -burN gnome-control-center-3.10.1/panels/background/Makefile.am gnome-control-center-3.10.1.new/panels/background/Makefile.am
|
||||
--- gnome-control-center-3.10.1/panels/background/Makefile.am 2013-10-11 06:19:22.000000000 -0500
|
||||
+++ gnome-control-center-3.10.1.new/panels/background/Makefile.am 2013-10-24 13:38:07.801957723 -0500
|
||||
@@ -38,7 +38,9 @@
|
||||
bg-wallpapers-source.c \
|
||||
bg-wallpapers-source.h \
|
||||
From acd7785692109a8ad2590e19302ce34170e610f2 Mon Sep 17 00:00:00 2001
|
||||
From: Kalev Lember <kalevlember@gmail.com>
|
||||
Date: Wed, 16 Oct 2013 10:01:36 +0000
|
||||
Subject: background: Fix test-chooser-dialog build with some linkers
|
||||
|
||||
List missing libs for the libbackground-chooser.la convenience library.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=709302
|
||||
---
|
||||
diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
|
||||
index f24f8b3..2766207 100644
|
||||
--- a/panels/background/Makefile.am
|
||||
+++ b/panels/background/Makefile.am
|
||||
@@ -40,6 +40,8 @@ libbackground_chooser_la_SOURCES = \
|
||||
bg-colors-source.c \
|
||||
- bg-colors-source.h
|
||||
+ bg-colors-source.h \
|
||||
+ bg-flickr-source.c \
|
||||
+ bg-flickr-source.h
|
||||
bg-colors-source.h
|
||||
|
||||
+libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
|
||||
+
|
||||
libbackground_la_SOURCES = \
|
||||
cc-background-panel.c \
|
||||
@@ -47,6 +49,7 @@
|
||||
libbackground_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) libbackground-chooser.la
|
||||
|
||||
if WITH_LIBSOCIALWEB
|
||||
+libbackground_chooser_la_LIBADD = $(SOCIALWEB_LIBS)
|
||||
libbackground_la_SOURCES += bg-flickr-source.c bg-flickr-source.h
|
||||
INCLUDES += $(SOCIALWEB_CFLAGS)
|
||||
libbackground_la_LIBADD += $(SOCIALWEB_LIBS)
|
||||
cc-background-panel.h
|
||||
--
|
||||
cgit v0.9.2
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
From 97af796dd588d4cce7ef5b927fd3d956f8baa16c Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Tue, 12 Nov 2013 07:45:43 +0000
|
||||
Subject: background: Fix compilation with libsocialweb support
|
||||
|
||||
The flickr source files were added to the wrong internal shared
|
||||
library, so that the panel could be linked, but not the test
|
||||
application.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=710829
|
||||
---
|
||||
diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
|
||||
index 2766207..58e39aa 100644
|
||||
--- a/panels/background/Makefile.am
|
||||
+++ b/panels/background/Makefile.am
|
||||
@@ -49,9 +49,9 @@ libbackground_la_SOURCES = \
|
||||
libbackground_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) libbackground-chooser.la
|
||||
|
||||
if WITH_LIBSOCIALWEB
|
||||
-libbackground_la_SOURCES += bg-flickr-source.c bg-flickr-source.h
|
||||
+libbackground_chooser_la_SOURCES += bg-flickr-source.c bg-flickr-source.h
|
||||
INCLUDES += $(SOCIALWEB_CFLAGS)
|
||||
-libbackground_la_LIBADD += $(SOCIALWEB_LIBS)
|
||||
+libbackground_chooser_la_LIBADD += $(SOCIALWEB_LIBS)
|
||||
endif
|
||||
|
||||
noinst_PROGRAMS = test-chooser-dialog
|
||||
--
|
||||
cgit v0.9.2
|
||||
@ -1,4 +1,2 @@
|
||||
DIST gnome-session-2.32.1.tar.bz2 774842 SHA256 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a SHA512 5d688e971ff440d33c7fff86db7b11d06aa39e9f6b4654a54ef6f4b608fe39c24b13be04726c69dbca4600fa91dc21b2f12415499367ec6045212828674bed99 WHIRLPOOL e03c121c5c644975deae06590828ce84a66e583838fc7de28752026e6c798b6fa4eaa4d6cdfa4975930c7ead730568e051c4dc280e5c7c80ab2bd4e64ffe9ca0
|
||||
DIST gnome-session-3.6.2.tar.xz 729676 SHA256 2e3a3466eed4136826e150b639c63beb5c93710346dea2e538adfe5e18d701b4 SHA512 3ae043a241695e26bbcfe70cb58263e74bfb62c1859d46828118740e3580df516f17c73d5a348d381ead7886333c71eb9bca2bed6e494f234b8d733a9fd37083 WHIRLPOOL 833cff921461759510fd31cb3d2bf2959d486ccd51971d401f30d85bf93878264e9ebbdba866bb9c3a05aff3a00d0f6d043958407a783dc6f7d9d5d78f62f7ac
|
||||
DIST gnome-session-3.8.2.1.tar.xz 772008 SHA256 96324f85d15d40e416f14c68283a7fab36e65bef58f1c5124b18c333874ed78f SHA512 9d580432faf256e53da30c8fff3d3b1e16cb18869cd2d70542f56bf6fbf41893abd24003413c2a9364eaaa1c9760874683bf7255607918a79a05ab61e292caca WHIRLPOOL ed1203172f5a338b0e8851ae4568d281d25b93ff58b91ccb20f951ada578db63ebf40ce1e5b1eb03542078b3ba7c25dbbd19e42fb21e4b30273288872341f25c
|
||||
DIST gnome-session-3.8.4.tar.xz 781124 SHA256 e6ccc71563d9e36d166ebb8a1e9fc962ff31605d5800af411d3b8df494f03ec1 SHA512 b9b52918d709fd02dfbd8212bf5f1fb3e1f8942bd0d9acf2bb776a52af162e6c92f72d3a4dcf4ff5df0a950eef11a5e5316372d41c46f93223cabbb811a3aa12 WHIRLPOOL d8269d6c9eb23e5c1be17eb4f1655cd054263145ecc63cb1173b163824ebab359ceda5b30cf01b9dd5fa2565056c298b971ccb99f959ccba8e830b286139829d
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
From b27f8c8b062e42aa89a7383fefba1833a6f63c4c Mon Sep 17 00:00:00 2001
|
||||
From: Martin Pitt <martinpitt@gnome.org>
|
||||
Date: Tue, 13 Nov 2012 11:02:35 +0100
|
||||
Subject: [PATCH] GsmConsoleKit: Properly initialize upower client
|
||||
|
||||
Move UPower client initialization from gsm_consolekit_on_name_owner_changed()
|
||||
(which is not actually called for UPower usually) into
|
||||
gsm_consolekit_ensure_ck_connection().
|
||||
|
||||
This makes the UPower calls actually work, otherwise they fail on trying to
|
||||
pass a NULL client.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=688229
|
||||
---
|
||||
gnome-session/gsm-consolekit.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gnome-session/gsm-consolekit.c b/gnome-session/gsm-consolekit.c
|
||||
index 4c0eca5..0c58f37 100644
|
||||
--- a/gnome-session/gsm-consolekit.c
|
||||
+++ b/gnome-session/gsm-consolekit.c
|
||||
@@ -182,6 +182,9 @@ gsm_consolekit_ensure_ck_connection (GsmConsolekit *manager,
|
||||
}
|
||||
}
|
||||
|
||||
+ g_clear_object (&manager->priv->up_client);
|
||||
+ manager->priv->up_client = up_client_new ();
|
||||
+
|
||||
is_connected = TRUE;
|
||||
|
||||
out:
|
||||
@@ -219,10 +222,8 @@ gsm_consolekit_on_name_owner_changed (DBusGProxy *bus_proxy,
|
||||
}
|
||||
|
||||
g_clear_object (&manager->priv->ck_proxy);
|
||||
- g_clear_object (&manager->priv->up_client);
|
||||
|
||||
gsm_consolekit_ensure_ck_connection (manager, NULL);
|
||||
- manager->priv->up_client = up_client_new ();
|
||||
|
||||
}
|
||||
|
||||
--
|
||||
1.8.1.1
|
||||
|
||||
@ -1,155 +0,0 @@
|
||||
From 55fab9dc066875641cffbab966ca20e35821afdf Mon Sep 17 00:00:00 2001
|
||||
From: Michael Terry <michael.terry@canonical.com>
|
||||
Date: Wed, 29 May 2013 14:31:30 +0000
|
||||
Subject: capplet: Don't show desktop files with NoDisplay=true
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=556459
|
||||
---
|
||||
diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
|
||||
index 712b861..24bf907 100644
|
||||
--- a/capplet/gsm-properties-dialog.c
|
||||
+++ b/capplet/gsm-properties-dialog.c
|
||||
@@ -112,6 +112,7 @@ _fill_iter_from_app (GtkListStore *list_store,
|
||||
GspApp *app)
|
||||
{
|
||||
gboolean hidden;
|
||||
+ gboolean display;
|
||||
gboolean enabled;
|
||||
gboolean shown;
|
||||
GIcon *icon;
|
||||
@@ -119,6 +120,7 @@ _fill_iter_from_app (GtkListStore *list_store,
|
||||
const char *app_name;
|
||||
|
||||
hidden = gsp_app_get_hidden (app);
|
||||
+ display = gsp_app_get_display (app);
|
||||
enabled = gsp_app_get_enabled (app);
|
||||
shown = gsp_app_get_shown (app);
|
||||
icon = gsp_app_get_icon (app);
|
||||
@@ -151,7 +153,7 @@ _fill_iter_from_app (GtkListStore *list_store,
|
||||
}
|
||||
|
||||
gtk_list_store_set (list_store, iter,
|
||||
- STORE_COL_VISIBLE, !hidden && shown,
|
||||
+ STORE_COL_VISIBLE, !hidden && shown && display,
|
||||
STORE_COL_ENABLED, enabled,
|
||||
STORE_COL_GICON, icon,
|
||||
STORE_COL_DESCRIPTION, description,
|
||||
diff --git a/capplet/gsp-app.c b/capplet/gsp-app.c
|
||||
index eeda466..c92b8da 100644
|
||||
--- a/capplet/gsp-app.c
|
||||
+++ b/capplet/gsp-app.c
|
||||
@@ -41,18 +41,20 @@
|
||||
|
||||
#define GSP_APP_SAVE_DELAY 2
|
||||
|
||||
-#define GSP_ASP_SAVE_MASK_HIDDEN 0x0001
|
||||
-#define GSP_ASP_SAVE_MASK_ENABLED 0x0002
|
||||
-#define GSP_ASP_SAVE_MASK_NAME 0x0004
|
||||
-#define GSP_ASP_SAVE_MASK_EXEC 0x0008
|
||||
-#define GSP_ASP_SAVE_MASK_COMMENT 0x0010
|
||||
-#define GSP_ASP_SAVE_MASK_ALL 0xffff
|
||||
+#define GSP_ASP_SAVE_MASK_HIDDEN 0x0001
|
||||
+#define GSP_ASP_SAVE_MASK_ENABLED 0x0002
|
||||
+#define GSP_ASP_SAVE_MASK_NAME 0x0004
|
||||
+#define GSP_ASP_SAVE_MASK_EXEC 0x0008
|
||||
+#define GSP_ASP_SAVE_MASK_COMMENT 0x0010
|
||||
+#define GSP_ASP_SAVE_MASK_NO_DISPLAY 0x0020
|
||||
+#define GSP_ASP_SAVE_MASK_ALL 0xffff
|
||||
|
||||
struct _GspAppPrivate {
|
||||
char *basename;
|
||||
char *path;
|
||||
|
||||
gboolean hidden;
|
||||
+ gboolean no_display;
|
||||
gboolean enabled;
|
||||
gboolean shown;
|
||||
|
||||
@@ -341,6 +343,14 @@ _gsp_app_user_equal_system (GspApp *app,
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
+ if (gsp_key_file_get_boolean (keyfile,
|
||||
+ G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY,
|
||||
+ FALSE) != app->priv->no_display) {
|
||||
+ g_free (path);
|
||||
+ g_key_file_free (keyfile);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
str = gsp_key_file_get_locale_string (keyfile,
|
||||
G_KEY_FILE_DESKTOP_KEY_NAME);
|
||||
if (!_gsp_str_equal (str, app->priv->name)) {
|
||||
@@ -449,6 +459,12 @@ _gsp_app_save (gpointer data)
|
||||
app->priv->hidden);
|
||||
}
|
||||
|
||||
+ if (app->priv->save_mask & GSP_ASP_SAVE_MASK_NO_DISPLAY) {
|
||||
+ gsp_key_file_set_boolean (keyfile,
|
||||
+ G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY,
|
||||
+ app->priv->no_display);
|
||||
+ }
|
||||
+
|
||||
if (app->priv->save_mask & GSP_ASP_SAVE_MASK_ENABLED) {
|
||||
gsp_key_file_set_boolean (keyfile,
|
||||
GSP_KEY_FILE_DESKTOP_KEY_AUTOSTART_ENABLED,
|
||||
@@ -548,6 +564,14 @@ gsp_app_get_hidden (GspApp *app)
|
||||
}
|
||||
|
||||
gboolean
|
||||
+gsp_app_get_display (GspApp *app)
|
||||
+{
|
||||
+ g_return_val_if_fail (GSP_IS_APP (app), FALSE);
|
||||
+
|
||||
+ return !app->priv->no_display;
|
||||
+}
|
||||
+
|
||||
+gboolean
|
||||
gsp_app_get_enabled (GspApp *app)
|
||||
{
|
||||
g_return_val_if_fail (GSP_IS_APP (app), FALSE);
|
||||
@@ -805,6 +829,9 @@ gsp_app_new (const char *path,
|
||||
app->priv->hidden = gsp_key_file_get_boolean (keyfile,
|
||||
G_KEY_FILE_DESKTOP_KEY_HIDDEN,
|
||||
FALSE);
|
||||
+ app->priv->no_display = gsp_key_file_get_boolean (keyfile,
|
||||
+ G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY,
|
||||
+ FALSE);
|
||||
app->priv->enabled = gsp_key_file_get_boolean (keyfile,
|
||||
GSP_KEY_FILE_DESKTOP_KEY_AUTOSTART_ENABLED,
|
||||
TRUE);
|
||||
@@ -952,6 +979,7 @@ gsp_app_create (const char *name,
|
||||
app->priv->basename, NULL);
|
||||
|
||||
app->priv->hidden = FALSE;
|
||||
+ app->priv->no_display = FALSE;
|
||||
app->priv->enabled = TRUE;
|
||||
app->priv->shown = TRUE;
|
||||
|
||||
@@ -1049,6 +1077,12 @@ gsp_app_copy_desktop_file (const char *uri)
|
||||
app->priv->save_mask |= GSP_ASP_SAVE_MASK_HIDDEN;
|
||||
}
|
||||
|
||||
+ if (app->priv->no_display) {
|
||||
+ changed = TRUE;
|
||||
+ app->priv->no_display = FALSE;
|
||||
+ app->priv->save_mask |= GSP_ASP_SAVE_MASK_NO_DISPLAY;
|
||||
+ }
|
||||
+
|
||||
if (!app->priv->enabled) {
|
||||
changed = TRUE;
|
||||
app->priv->enabled = TRUE;
|
||||
diff --git a/capplet/gsp-app.h b/capplet/gsp-app.h
|
||||
index 6a2e3be..a199795 100644
|
||||
--- a/capplet/gsp-app.h
|
||||
+++ b/capplet/gsp-app.h
|
||||
@@ -74,6 +74,7 @@ const char *gsp_app_get_basename (GspApp *app);
|
||||
const char *gsp_app_get_path (GspApp *app);
|
||||
|
||||
gboolean gsp_app_get_hidden (GspApp *app);
|
||||
+gboolean gsp_app_get_display (GspApp *app);
|
||||
|
||||
gboolean gsp_app_get_enabled (GspApp *app);
|
||||
void gsp_app_set_enabled (GspApp *app,
|
||||
--
|
||||
cgit v0.9.2
|
||||
@ -0,0 +1,22 @@
|
||||
From f11f157d507495589b0f4930f4fcc431c87bc121 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Tue, 12 Nov 2013 13:32:45 +0000
|
||||
Subject: data: blacklist nv25
|
||||
|
||||
It doesn't work very well.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=711347
|
||||
---
|
||||
diff --git a/data/hardware-compatibility b/data/hardware-compatibility
|
||||
index 927ba8b..48b7946 100644
|
||||
--- a/data/hardware-compatibility
|
||||
+++ b/data/hardware-compatibility
|
||||
@@ -27,3 +27,6 @@
|
||||
|
||||
# Gallium has softpipe; we explicitly enable llvmpipe
|
||||
-softpipe
|
||||
+
|
||||
+# nouveau vieux NV25 doesn't work too well
|
||||
+-Mesa DRI nv25
|
||||
--
|
||||
cgit v0.9.2
|
||||
@ -0,0 +1,48 @@
|
||||
From 90714db611d6ced5202421ef3ba99334f1e9e6ec Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Fri, 01 Nov 2013 20:30:06 +0000
|
||||
Subject: Fix a possible crash in the presence interface
|
||||
|
||||
Improper error handling in gsm_presence_set_status_text() would
|
||||
lead to a double free on the next call to that function.
|
||||
Found using the dfuzzer tool,
|
||||
https://github.com/matusmarhefka/dfuzzer
|
||||
---
|
||||
diff --git a/gnome-session/gsm-presence.c b/gnome-session/gsm-presence.c
|
||||
index f6a022f..93ca1a0 100644
|
||||
--- a/gnome-session/gsm-presence.c
|
||||
+++ b/gnome-session/gsm-presence.c
|
||||
@@ -365,6 +365,7 @@ gsm_presence_set_status_text (GsmPresence *presence,
|
||||
g_return_val_if_fail (GSM_IS_PRESENCE (presence), FALSE);
|
||||
|
||||
g_free (presence->priv->status_text);
|
||||
+ presence->priv->status_text = NULL;
|
||||
|
||||
/* check length */
|
||||
if (status_text != NULL && strlen (status_text) > MAX_STATUS_TEXT) {
|
||||
@@ -377,11 +378,11 @@ gsm_presence_set_status_text (GsmPresence *presence,
|
||||
|
||||
if (status_text != NULL) {
|
||||
presence->priv->status_text = g_strdup (status_text);
|
||||
- } else {
|
||||
- presence->priv->status_text = g_strdup ("");
|
||||
}
|
||||
+
|
||||
g_object_notify (G_OBJECT (presence), "status-text");
|
||||
- g_signal_emit (presence, signals[STATUS_TEXT_CHANGED], 0, presence->priv->status_text);
|
||||
+ g_signal_emit (presence, signals[STATUS_TEXT_CHANGED], 0,
|
||||
+ presence->priv->status_text ? presence->priv->status_text : "");
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -457,7 +458,7 @@ gsm_presence_get_property (GObject *object,
|
||||
g_value_set_uint (value, self->priv->status);
|
||||
break;
|
||||
case PROP_STATUS_TEXT:
|
||||
- g_value_set_string (value, self->priv->status_text);
|
||||
+ g_value_set_string (value, self->priv->status_text ? self->priv->status_text : "");
|
||||
break;
|
||||
case PROP_IDLE_ENABLED:
|
||||
g_value_set_boolean (value, self->priv->idle_enabled);
|
||||
--
|
||||
cgit v0.9.2
|
||||
@ -1,117 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.6.2-r2.ebuild,v 1.1 2013/02/03 00:39:14 tetromino Exp $
|
||||
|
||||
EAPI="5"
|
||||
GCONF_DEBUG="yes"
|
||||
|
||||
inherit gnome2
|
||||
|
||||
DESCRIPTION="Gnome session manager"
|
||||
HOMEPAGE="http://www.gnome.org/"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2 FDL-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
|
||||
IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
|
||||
|
||||
# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
|
||||
# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
|
||||
# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
|
||||
# gdk-pixbuf used in the inhibit dialog
|
||||
COMMON_DEPEND="
|
||||
>=dev-libs/glib-2.33.4:2
|
||||
x11-libs/gdk-pixbuf:2
|
||||
>=x11-libs/gtk+-2.90.7:3
|
||||
>=dev-libs/json-glib-0.10
|
||||
>=dev-libs/dbus-glib-0.76
|
||||
>=sys-power/upower-0.9.0
|
||||
elibc_FreeBSD? ( dev-libs/libexecinfo )
|
||||
|
||||
virtual/opengl
|
||||
x11-libs/libSM
|
||||
x11-libs/libICE
|
||||
x11-libs/libXau
|
||||
x11-libs/libX11
|
||||
x11-libs/libXcomposite
|
||||
x11-libs/libXext
|
||||
x11-libs/libXrender
|
||||
x11-libs/libXtst
|
||||
x11-misc/xdg-user-dirs
|
||||
x11-misc/xdg-user-dirs-gtk
|
||||
x11-apps/xdpyinfo
|
||||
|
||||
gconf? ( >=gnome-base/gconf-2:2 )
|
||||
"
|
||||
# Pure-runtime deps from the session files should *NOT* be added here
|
||||
# Otherwise, things like gdm pull in gnome-shell
|
||||
# gnome-themes-standard is needed for the failwhale dialog themeing
|
||||
# sys-apps/dbus[X] is needed for session management
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
gnome-base/gnome-settings-daemon
|
||||
>=gnome-base/gsettings-desktop-schemas-0.1.7
|
||||
>=x11-themes/gnome-themes-standard-2.91.92
|
||||
sys-apps/dbus[X]
|
||||
systemd? ( >=sys-apps/systemd-183 )
|
||||
!systemd? ( sys-auth/consolekit )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-lang/perl-5
|
||||
>=sys-devel/gettext-0.10.40
|
||||
>=dev-util/intltool-0.40.6
|
||||
x11-libs/pango[X]
|
||||
virtual/pkgconfig
|
||||
!<gnome-base/gdm-2.20.4
|
||||
doc? (
|
||||
app-text/xmlto
|
||||
dev-libs/libxslt )
|
||||
"
|
||||
# gnome-common needed for eautoreconf
|
||||
# gnome-base/gdm does not provide gnome.desktop anymore
|
||||
|
||||
src_prepare() {
|
||||
# upower-client problems, bug #450150; fixed in 3.6.3
|
||||
epatch "${FILESDIR}/${P}-upower.patch"
|
||||
|
||||
# Silence errors due to weird checks for libX11
|
||||
sed -e 's/\(PANGO_PACKAGES="\)pangox/\1/' -i configure.ac configure || die
|
||||
gnome2_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
gnome2_src_configure \
|
||||
--disable-deprecation-flags \
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
|
||||
$(use_enable doc docbook-docs) \
|
||||
$(use_enable gconf) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable systemd)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
gnome2_src_install
|
||||
|
||||
dodir /etc/X11/Sessions
|
||||
exeinto /etc/X11/Sessions
|
||||
doexe "${FILESDIR}/Gnome"
|
||||
|
||||
dodir /usr/share/gnome/applications/
|
||||
insinto /usr/share/gnome/applications/
|
||||
newins "${FILESDIR}/defaults.list-r1" defaults.list
|
||||
|
||||
dodir /etc/X11/xinit/xinitrc.d/
|
||||
exeinto /etc/X11/xinit/xinitrc.d/
|
||||
newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
|
||||
|
||||
# This should be done here as discussed in bug #270852
|
||||
newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_pkg_postinst
|
||||
|
||||
if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
|
||||
ewarn "If you use a custom .xinitrc for your X session,"
|
||||
ewarn "make sure that the commands in the xinitrc.d scripts are run."
|
||||
fi
|
||||
}
|
||||
@ -1,6 +1,4 @@
|
||||
DIST gnome-settings-daemon-2.32.1-gst-vol-control-support.patch 26788 SHA256 689f6152d6e27ddc0b8080d5c8c1644b6116075ff505951631af9b7289d2f933 SHA512 a4ee10135e7339fa25412e7b790c0c56b3def826d81a89ca399cfb6f2236da14ec78a729ec5d27d3528cdde3eff8fb70cf3f297ddee756665c1d83fb73d2ca15 WHIRLPOOL f3cc8d7ec7065018b69ee78a9f1cc278c8e37910e9dc5a061d8a57d52def0316fb4bbeb4891b742f54e32e06a8d31617241300e3aa82f5a0c39a79aa829225eb
|
||||
DIST gnome-settings-daemon-2.32.1.tar.bz2 1331850 SHA256 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86 SHA512 69bceb01e1dd15a75dc3db1e78aebee8c7c4004f217856391a64bc527c6b46146f893e90292441d3c7650df8a1b3aee2078d7cbef33c76e47a8f1904dd8e447a WHIRLPOOL 6608a9470666d943e0f39a4cadb36a1ccffbe8b40bcdae97d93b3d9b676da0c3efb33d5be1accaf2066760de6a4a36db16c94a093965f2f8da29511464ec2071
|
||||
DIST gnome-settings-daemon-3.6.4.tar.xz 1518708 SHA256 3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15 SHA512 f8d263f9a22934e015ff642f9ac93c09764b89151260887242d6b946250d50a2400404f61376a34ec903606bf4061c9733ddb42f0ed92ecc42f873fafb766af7 WHIRLPOOL fba7fb4ec0c236584534b75fda3ebab651f67227c4fcc1183c085cba5cf315418f9a178a2c2ac9c96190a3b7b997a166a13172d48d8f068723bd5a0427cdf703
|
||||
DIST gnome-settings-daemon-3.8.3.tar.xz 1576376 SHA256 00e7f46c9a6fb8b148255adfcdd26bc5f2c1d393b8dfbac69da100c8dcfa1b6c SHA512 e8b02a820f3785dc42b5f82b94804bf7ec761c2d2c797d7eba0f590ed1b8107094d5cb395cdd00c1a7ef7e294cdfb7d54b1e9c14e9584b5bcc03bb8cd61b3515 WHIRLPOOL d692216c13d38bc5cc57a9af6cecfc393460394c20efa97edf609416e03dffe3c55c35d69ad42ad43ac18fd0ad495d52bce57fb4707753ef65cc3016f947defc
|
||||
DIST gnome-settings-daemon-3.8.5.tar.xz 1582664 SHA256 19420c97296802162fd4e0e0a08e797f5038ec8bd98cffe222362e24c7405784 SHA512 3692097ae6666804ce10ef2839b204e6cd5f4e2ef646e058fe8af50c30cc89731f206b86fd6a0ba51e697b6a090e019d0265bb01516087e9e773f2b79f4300f5 WHIRLPOOL 1ee1825d9b97b3962307cd98144ca1660025b27488869bcb73e84745fa2332392b26cc175e2bd11604749e1111405a01ed7a2de48525118858ac06d5bde57a04
|
||||
DIST gnome-settings-daemon-3.8.6.1.tar.xz 1579684 SHA256 24ced08254208e31f2819f4695e8c5e0699ac54f3cf70e05f43347703f5877e6 SHA512 fd49091623bf5a2865fda99a0e9920a948ce930212a587746dcb8e98336a9362d17c39f0c60ab399e1ff78381422875b236c1ce41f29a0ae6a6dac31bd23e4a7 WHIRLPOOL 1a241e3d927f4b3469342b3c6f2ff1543eeec462c527fb3f73fc31c6fc91b5c34da7b7983a9735e745a1f245785b08b24827aaed53b90b9439f0643e12ea430f
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
|
||||
index 80f664a..c9a29fb 100644
|
||||
--- a/plugins/mouse/gsd-mouse-manager.c
|
||||
+++ b/plugins/mouse/gsd-mouse-manager.c
|
||||
@@ -533,7 +533,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state)
|
||||
|
||||
args[0] = "syndaemon";
|
||||
args[1] = "-i";
|
||||
- args[2] = "2.0";
|
||||
+ args[2] = "0.5";
|
||||
args[3] = "-K";
|
||||
args[4] = "-R";
|
||||
args[5] = NULL;
|
||||
@ -1,41 +0,0 @@
|
||||
From e46d34f5bd9b0260a204d5f8a9d23c747b61923f Mon Sep 17 00:00:00 2001
|
||||
From: Cosimo Cecchi <cosimoc@gnome.org>
|
||||
Date: Mon, 3 Oct 2011 10:02:34 -0400
|
||||
Subject: [PATCH] color: unbreak loading profiles at startup
|
||||
|
||||
A recent commit broke color profile loading at startup if the profile
|
||||
directory exists already. Fix this.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=660790
|
||||
|
||||
Signed-off-by: Richard Hughes <richard@hughsie.com>
|
||||
|
||||
[Alexandre Rostovtsev <tetromino@gmail.com>: backported to 3.2]
|
||||
---
|
||||
plugins/color/gcm-profile-store.c | 5 +++--
|
||||
1 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c
|
||||
index 3dde406..f8b0889 100644
|
||||
--- a/plugins/color/gcm-profile-store.c
|
||||
+++ b/plugins/color/gcm-profile-store.c
|
||||
@@ -445,13 +445,14 @@ gcm_profile_store_search (GcmProfileStore *profile_store)
|
||||
/* get Linux per-user profiles */
|
||||
path = g_build_filename (g_get_user_data_dir (), "icc", NULL);
|
||||
ret = gcm_profile_store_mkdir_with_parents (path, &error);
|
||||
- if (!ret) {
|
||||
+ if (!ret &&
|
||||
+ !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS)) {
|
||||
g_warning ("failed to create directory on startup: %s", error->message);
|
||||
- g_error_free (error);
|
||||
} else {
|
||||
gcm_profile_store_search_path (profile_store, path, 0);
|
||||
}
|
||||
g_free (path);
|
||||
+ g_clear_error (&error);
|
||||
|
||||
/* get per-user profiles from obsolete location */
|
||||
path = g_build_filename (g_get_home_dir (), ".color", "icc", NULL);
|
||||
--
|
||||
1.7.7
|
||||
|
||||
@ -1,95 +0,0 @@
|
||||
From e1e0584cec966dc58a51efaf534f129b4830399f Mon Sep 17 00:00:00 2001
|
||||
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
Date: Thu, 27 Oct 2011 23:30:41 -0400
|
||||
Subject: [PATCH] Make colord optional
|
||||
|
||||
---
|
||||
configure.ac | 20 +++++++++++++++++++-
|
||||
data/Makefile.am | 7 ++++++-
|
||||
plugins/Makefile.am | 7 ++++++-
|
||||
3 files changed, 31 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index fe74674..f1a8547 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -107,7 +107,25 @@ PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VE
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl - Check for colord
|
||||
dnl ---------------------------------------------------------------------------
|
||||
-PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
|
||||
+build_color=false
|
||||
+AC_ARG_ENABLE(color,
|
||||
+ AC_HELP_STRING([--disable-color],
|
||||
+ [turn off color plugin]),
|
||||
+ [case "${enableval}" in
|
||||
+ yes) WANT_COLOR=yes ;;
|
||||
+ no) WANT_COLOR=no ;;
|
||||
+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
|
||||
+ esac],
|
||||
+ [WANT_COLOR=yes]) dnl Default value
|
||||
+
|
||||
+if test x$WANT_COLOR = xyes; then
|
||||
+ PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
|
||||
+ build_color=true
|
||||
+fi
|
||||
+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
|
||||
+
|
||||
+AC_SUBST(COLORD_CFLAGS)
|
||||
+AC_SUBST(COLORD_LIBS)
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl - Check for libcanberra
|
||||
diff --git a/data/Makefile.am b/data/Makefile.am
|
||||
index 43ba27c..1f3bbef 100644
|
||||
--- a/data/Makefile.am
|
||||
+++ b/data/Makefile.am
|
||||
@@ -11,7 +11,6 @@ gsettings_SCHEMAS = \
|
||||
org.gnome.settings-daemon.plugins.gschema.xml \
|
||||
org.gnome.settings-daemon.plugins.keyboard.gschema.xml \
|
||||
org.gnome.settings-daemon.plugins.power.gschema.xml \
|
||||
- org.gnome.settings-daemon.plugins.color.gschema.xml \
|
||||
org.gnome.settings-daemon.plugins.media-keys.gschema.xml \
|
||||
org.gnome.settings-daemon.plugins.xsettings.gschema.xml \
|
||||
org.gnome.settings-daemon.plugins.housekeeping.gschema.xml \
|
||||
@@ -21,6 +20,12 @@ gsettings_SCHEMAS = \
|
||||
|
||||
all_schemas = $(gsettings_SCHEMAS)
|
||||
|
||||
+if BUILD_COLOR
|
||||
+gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.color.gschema.xml
|
||||
+else
|
||||
+all_schemas += org.gnome.settings-daemon.plugins.color.gschema.xml
|
||||
+endif
|
||||
+
|
||||
if HAVE_PACKAGEKIT
|
||||
gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.updates.gschema.xml
|
||||
else
|
||||
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
|
||||
index 5e26811..d2404ab 100644
|
||||
--- a/plugins/Makefile.am
|
||||
+++ b/plugins/Makefile.am
|
||||
@@ -6,7 +6,6 @@ enabled_plugins = \
|
||||
automount \
|
||||
background \
|
||||
clipboard \
|
||||
- color \
|
||||
cursor \
|
||||
datetime \
|
||||
dummy \
|
||||
@@ -24,6 +23,12 @@ enabled_plugins = \
|
||||
|
||||
disabled_plugins = $(NULL)
|
||||
|
||||
+if BUILD_COLOR
|
||||
+enabled_plugins += color
|
||||
+else
|
||||
+disabled_plugins += color
|
||||
+endif
|
||||
+
|
||||
if BUILD_GCONF_BRIDGE
|
||||
enabled_plugins += gconf
|
||||
else
|
||||
--
|
||||
1.7.7.1
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
From 8cd361027c86a37c73eb8f787a88eda701d0fa4d Mon Sep 17 00:00:00 2001
|
||||
From: Richard Hughes <richard@hughsie.com>
|
||||
Date: Wed, 2 Nov 2011 16:49:07 +0000
|
||||
Subject: [PATCH] color: Set model and vendor to 'unknown' if not specified or
|
||||
unavailable
|
||||
|
||||
If the user has connected a device without the ability to get the EDID (e.g.
|
||||
composite TV connection) then don't show a critical warning and fail to add
|
||||
the device.
|
||||
|
||||
Resolves https://bugzilla.redhat.com/show_bug.cgi?id=749504
|
||||
---
|
||||
plugins/color/gsd-color-manager.c | 6 ++++++
|
||||
1 files changed, 6 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/plugins/color/gsd-color-manager.c b/plugins/color/gsd-color-manager.c
|
||||
index 01b20c0..2474040 100644
|
||||
--- a/plugins/color/gsd-color-manager.c
|
||||
+++ b/plugins/color/gsd-color-manager.c
|
||||
@@ -1263,6 +1263,12 @@ gcm_session_add_x11_output (GsdColorManager *manager, GnomeRROutput *output)
|
||||
if (serial == NULL)
|
||||
serial = "unknown";
|
||||
|
||||
+ /* ensure mandatory fields are set */
|
||||
+ if (model == NULL)
|
||||
+ model = "unknown";
|
||||
+ if (vendor == NULL)
|
||||
+ vendor = "unknown";
|
||||
+
|
||||
device_id = gcm_session_get_output_id (manager, output);
|
||||
g_debug ("output %s added", device_id);
|
||||
device_props = g_hash_table_new_full (g_str_hash, g_str_equal,
|
||||
--
|
||||
1.7.8
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue