root
10 years ago
parent
692180d1c8
commit
b1f114667d
@ -1,71 +0,0 @@
|
||||
From: Romain Perier <mrpouet@gentoo.org>
|
||||
Date: Fri, 15 Jan 2010 13:06:08 +0100
|
||||
Subject: Fix ugly warnings
|
||||
|
||||
1)° g_object_get_data(GObject *, const gchar *) : needs a GObject * in first argument,
|
||||
so because GdkPixbuf inherits from GObject, we've just to call G_OBJECT() macro.
|
||||
2)° Invalid function prototype, so invalid function pointer.
|
||||
Note: this callback just returns a value, so it's inlinable.
|
||||
3)° Implicit declaration of 'gdk_pixbuf_set_option' due to missing GDK_PIXBUF_ENABLE_BACKEND
|
||||
(see gdk-pixbuf/gdk-pixbuf-io.h for more details)
|
||||
4)° event was useless (unused)
|
||||
|
||||
---
|
||||
magnifier/magnifier.c | 9 +++++----
|
||||
magnifier/x11/gmag-graphical-server.c | 5 ++---
|
||||
2 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
--- a/magnifier/magnifier.c
|
||||
+++ b/magnifier/magnifier.c
|
||||
@@ -304,8 +304,8 @@ magnifier_set_cursor_from_pixbuf (Magnifier *magnifier,
|
||||
magnifier->priv->cursor = pixmap;
|
||||
magnifier->priv->cursor_mask = mask;
|
||||
|
||||
- xhot_string = g_object_get_data (cursor_pixbuf, "x_hot");
|
||||
- yhot_string = g_object_get_data (cursor_pixbuf, "y_hot");
|
||||
+ xhot_string = g_object_get_data (G_OBJECT(cursor_pixbuf), "x_hot");
|
||||
+ yhot_string = g_object_get_data (G_OBJECT(cursor_pixbuf), "y_hot");
|
||||
|
||||
if (xhot_string)
|
||||
magnifier->cursor_hotspot.x = atoi (xhot_string);
|
||||
@@ -1214,9 +1214,10 @@ magnifier_gobject_dispose (GObject *object)
|
||||
BONOBO_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
|
||||
}
|
||||
|
||||
-static
|
||||
+static inline
|
||||
CORBA_boolean
|
||||
-impl_magnifier_support_colorblind_filters (Magnifier *magnifier)
|
||||
+impl_magnifier_support_colorblind_filters (PortableServer_Servant _servant G_GNUC_UNUSED,
|
||||
+ CORBA_Environment *ev G_GNUC_UNUSED)
|
||||
{
|
||||
#ifdef HAVE_COLORBLIND
|
||||
return CORBA_TRUE;
|
||||
--- a/magnifier/x11/gmag-graphical-server.c
|
||||
+++ b/magnifier/x11/gmag-graphical-server.c
|
||||
@@ -20,7 +20,7 @@
|
||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
-
|
||||
+#define GDK_PIXBUF_ENABLE_BACKEND
|
||||
#include "config.h"
|
||||
#include "magnifier.h"
|
||||
#include "magnifier-private.h"
|
||||
@@ -48,7 +48,6 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <glib.h>
|
||||
-
|
||||
#include <gdk/gdkx.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
@@ -439,7 +438,7 @@ gmag_gs_events_handler (GIOChannel *source, GIOCondition condition,
|
||||
static gboolean
|
||||
gmag_gs_use_damage ()
|
||||
{
|
||||
- gint major, event, error;
|
||||
+ gint major, error;
|
||||
if (XQueryExtension (
|
||||
dpy, "DAMAGE", &major, &damage_event_base, &error) &&
|
||||
!g_getenv ("MAGNIFIER_IGNORE_DAMAGE")) {
|
||||
@ -1,39 +0,0 @@
|
||||
--- a/support/Makefile.in
|
||||
+++ b/support/Makefile.in
|
||||
@@ -1,9 +1,10 @@
|
||||
DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
|
||||
- logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
|
||||
+ logresolve.pl phf_abuse_log.cgi split-logfile
|
||||
|
||||
CLEAN_TARGETS = suexec
|
||||
|
||||
-PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm htcacheclean httxt2dbm
|
||||
+PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm \
|
||||
+ htcacheclean httxt2dbm log_server_status split-logfile dbmmanage
|
||||
TARGETS = $(PROGRAMS)
|
||||
|
||||
PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
|
||||
@@ -12,22 +13,13 @@ PROGRAM_DEPENDENCIES =
|
||||
include $(top_builddir)/build/rules.mk
|
||||
|
||||
install:
|
||||
- @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
|
||||
@test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
|
||||
- @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
|
||||
- @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
|
||||
- @for i in apxs apachectl dbmmanage; do \
|
||||
+ @for i in $(PROGRAMS) ; do \
|
||||
if test -f "$(builddir)/$$i"; then \
|
||||
cp -p $$i $(DESTDIR)$(sbindir); \
|
||||
chmod 755 $(DESTDIR)$(sbindir)/$$i; \
|
||||
fi ; \
|
||||
done
|
||||
- @if test -f "$(builddir)/envvars-std"; then \
|
||||
- cp -p envvars-std $(DESTDIR)$(sbindir); \
|
||||
- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
|
||||
- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
|
||||
- fi ; \
|
||||
- fi
|
||||
|
||||
htpasswd_OBJECTS = htpasswd.lo
|
||||
htpasswd: $(htpasswd_OBJECTS)
|
||||
@ -1,63 +0,0 @@
|
||||
Downloaded from http://trac.mcs.anl.gov/projects/bcfg2/changeset/a524967e8d5c4c22e49cd619aed20c87a316c0be/
|
||||
|
||||
Index: src/lib/Server/Plugins/Trigger.py
|
||||
===================================================================
|
||||
--- src/lib/Server/Plugins/Trigger.py (revision bf5040f75e71e25af0b9b5c2a9c098c5933d4acc)
|
||||
+++ src/lib/Server/Plugins/Trigger.py (revision a524967e8d5c4c22e49cd619aed20c87a316c0be)
|
||||
@@ -1,16 +1,6 @@
|
||||
import os
|
||||
+import pipes
|
||||
import Bcfg2.Server.Plugin
|
||||
-
|
||||
-
|
||||
-def async_run(prog, args):
|
||||
- pid = os.fork()
|
||||
- if pid:
|
||||
- os.waitpid(pid, 0)
|
||||
- else:
|
||||
- dpid = os.fork()
|
||||
- if not dpid:
|
||||
- os.system(" ".join([prog] + args))
|
||||
- os._exit(0)
|
||||
-
|
||||
+from subprocess import Popen, PIPE
|
||||
|
||||
class Trigger(Bcfg2.Server.Plugin.Plugin,
|
||||
@@ -31,8 +21,29 @@
|
||||
raise Bcfg2.Server.Plugin.PluginInitError
|
||||
|
||||
+ def async_run(self, args):
|
||||
+ pid = os.fork()
|
||||
+ if pid:
|
||||
+ os.waitpid(pid, 0)
|
||||
+ else:
|
||||
+ dpid = os.fork()
|
||||
+ if not dpid:
|
||||
+ self.debug_log("Running %s" % " ".join(pipes.quote(a)
|
||||
+ for a in args))
|
||||
+ proc = Popen(args, stdin=PIPE, stdout=PIPE, stderr=PIPE)
|
||||
+ (out, err) = proc.communicate()
|
||||
+ rv = proc.wait()
|
||||
+ if rv != 0:
|
||||
+ self.logger.error("Trigger: Error running %s (%s): %s" %
|
||||
+ (args[0], rv, err))
|
||||
+ elif err:
|
||||
+ self.debug_log("Trigger: Error: %s" % err)
|
||||
+ os._exit(0)
|
||||
+
|
||||
def process_statistics(self, metadata, _):
|
||||
args = [metadata.hostname, '-p', metadata.profile, '-g',
|
||||
':'.join([g for g in metadata.groups])]
|
||||
+ self.debug_log("running triggers")
|
||||
for notifier in os.listdir(self.data):
|
||||
+ self.debug_log("running %s" % notifier)
|
||||
if ((notifier[-1] == '~') or
|
||||
(notifier[:2] == '.#') or
|
||||
@@ -40,5 +51,4 @@
|
||||
(notifier in ['SCCS', '.svn', '4913'])):
|
||||
continue
|
||||
- npath = self.data + '/' + notifier
|
||||
- self.logger.debug("Running %s %s" % (npath, " ".join(args)))
|
||||
- async_run(npath, args)
|
||||
+ npath = os.path.join(self.data, notifier)
|
||||
+ self.async_run([npath] + args)
|
||||
@ -1,12 +0,0 @@
|
||||
diff -r -u collectd-4.10.1.orig/configure.in collectd-4.10.1/configure.in
|
||||
--- collectd-4.10.1.orig/configure.in 2010-07-09 12:01:59.000000000 +0200
|
||||
+++ collectd-4.10.1/configure.in 2010-08-27 22:27:57.010271693 +0200
|
||||
@@ -1626,7 +1626,7 @@
|
||||
# Check for the iptc_init symbol in the library.
|
||||
if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
|
||||
then
|
||||
- AC_CHECK_LIB(iptc, iptc_init,
|
||||
+ AC_SEARCH_LIBS(iptc_init, [iptc ip4tc],
|
||||
[
|
||||
AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-liptc).])
|
||||
],
|
||||
@ -1,26 +0,0 @@
|
||||
diff -r -u collectd-4.10.1.orig/src/Makefile.am collectd-4.10.1/src/Makefile.am
|
||||
--- collectd-4.10.1.orig/src/Makefile.am 2010-07-09 12:01:59.000000000 +0200
|
||||
+++ collectd-4.10.1/src/Makefile.am 2010-10-11 00:10:59.000000000 +0200
|
||||
@@ -1,7 +1,4 @@
|
||||
SUBDIRS = libcollectdclient
|
||||
-if BUILD_WITH_OWN_LIBIPTC
|
||||
-SUBDIRS += owniptc
|
||||
-endif
|
||||
if BUILD_WITH_OWN_LIBOCONFIG
|
||||
SUBDIRS += liboconfig
|
||||
endif
|
||||
@@ -415,12 +412,9 @@
|
||||
iptables_la_SOURCES = iptables.c
|
||||
iptables_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBIPTC_CPPFLAGS)
|
||||
iptables_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBIPTC_LDFLAGS)
|
||||
-if BUILD_WITH_OWN_LIBIPTC
|
||||
-iptables_la_LIBADD = owniptc/libiptc.la
|
||||
-iptables_la_DEPENDENCIES = owniptc/libiptc.la
|
||||
-else
|
||||
+
|
||||
iptables_la_LIBADD = -liptc
|
||||
-endif
|
||||
+
|
||||
collectd_LDADD += "-dlopen" iptables.la
|
||||
collectd_DEPENDENCIES += iptables.la
|
||||
endif
|
||||
@ -1,27 +0,0 @@
|
||||
--- src/notify_desktop.c
|
||||
+++ src/notify_desktop.c
|
||||
@@ -31,6 +31,10 @@
|
||||
#include <glib.h>
|
||||
#include <libnotify/notify.h>
|
||||
|
||||
+#ifndef NOTIFY_CHECK_VERSION
|
||||
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
|
||||
+#endif
|
||||
+
|
||||
#define log_info(...) INFO ("notify_desktop: " __VA_ARGS__)
|
||||
#define log_warn(...) WARNING ("notify_desktop: " __VA_ARGS__)
|
||||
#define log_err(...) ERROR ("notify_desktop: " __VA_ARGS__)
|
||||
@@ -95,7 +99,12 @@
|
||||
: (NOTIF_WARNING == n->severity) ? "WARNING"
|
||||
: (NOTIF_OKAY == n->severity) ? "OKAY" : "UNKNOWN");
|
||||
|
||||
- notification = notify_notification_new (summary, n->message, NULL, NULL);
|
||||
+ notification = notify_notification_new (summary, n->message, NULL
|
||||
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
|
||||
+ );
|
||||
+#else
|
||||
+ , NULL);
|
||||
+#endif
|
||||
if (NULL == notification) {
|
||||
log_err ("Failed to create a new notification.");
|
||||
return -1;
|
||||
@ -1,29 +0,0 @@
|
||||
--- src/client.c.org 2008-10-04 04:33:37.000000000 +0400
|
||||
+++ src/client.c 2009-05-21 12:54:22.000000000 +0400
|
||||
@@ -1620,7 +1620,7 @@
|
||||
|
||||
|
||||
static gint
|
||||
-getline(gint fd, gchar *buf, gint len)
|
||||
+getline_(gint fd, gchar *buf, gint len)
|
||||
{
|
||||
fd_set read_fds;
|
||||
struct timeval tv;
|
||||
@@ -1714,7 +1714,7 @@
|
||||
|
||||
while (1)
|
||||
{
|
||||
- rs=getline(fd, buf, sizeof(buf));
|
||||
+ rs=getline_(fd, buf, sizeof(buf));
|
||||
if(rs<0)
|
||||
return FALSE;
|
||||
if (!strcmp(buf, "</gkrellmd_setup>"))
|
||||
@@ -1732,7 +1732,7 @@
|
||||
table_size = sizeof(update_table) / sizeof(KeyTable);
|
||||
while (1)
|
||||
{
|
||||
- rs=getline(fd, buf, sizeof(buf));
|
||||
+ rs=getline_(fd, buf, sizeof(buf));
|
||||
if(rs<0)
|
||||
return FALSE;
|
||||
if (!strcmp(buf, "</initial_update>"))
|
||||
@ -1,3 +1,4 @@
|
||||
DIST haskell-updater-1.2.0.10.tar.gz 23893 SHA256 2e2ec89d8b02c74aa539c7aae39ac18ac30e737615deca32742fb2568f49e72f SHA512 0f588740bd0f62198c70f8974e40a8942f19a9d93d63ee7f846beacba9ca56d5bfc0c2716d1ba9ad2da499e25d17d4dc80b78153d8dcc705840779ce2b78b8f9 WHIRLPOOL 8e18cca44c624243abf2b2eb6fbfe9c52aa215d022af55a5baf7d41809a3766f1e36f044fb13f79e9c25cd778305c1d95ca23db8c4fc66e93f765afc27c97684
|
||||
DIST haskell-updater-1.2.0.11.tar.gz 23793 SHA256 3130b8b636a2a2b8b689e951299f537c924348c4460b3c69e36c3800a0b2374f SHA512 4d21914e9cf84494cd743e61b6e22502c1d3c91bd31a7d7ade0dae478e402e2c82af916482fb45b4afea56e53635c09fe57a666ffec0599d9da9baed75f003ab WHIRLPOOL f098b4b1d66aa24d4919cd52ad008e57bbd9d53eb547160048f760fa440844014e8c025010e69885d92a2b1b7668501797325d24235ecfb28324cd522bef790d
|
||||
DIST haskell-updater-1.2.0.12.tar.gz 23805 SHA256 5d142540cb6575680efef68d9bfb7dcf576faaef33b1b4d8c13bdb39695aa3ed SHA512 3d375ed9d6c9b03c8bf51687f4c5d90861e2b0da8767f079b2fe32838d683c330b4a62de49811073bbb32bd0983877ca11a56edbeb864c23cd91c6c6e50ad41b WHIRLPOOL 86b5a9a051f2d4614b5d8228a648aab3bfe236d1555e029d6ed13e682cbc8b3b8182a32ff070109c97a4a1484596469ac1b80b10b51fc32e8bc952db71440ddd
|
||||
DIST haskell-updater-1.2.0.9.tar.gz 23522 SHA256 f5aeea6034222a4c4387bede5510aa6d6aad782d0a5be0bd03f65d474f5a8245 SHA512 600a05d468dc74ce3a1282ac1b991267602bd7715e7d13aaa2558c9241d167894209790c34fe330d86b24814e959046a22ffff79a197e644da2f18284a785eea WHIRLPOOL 22e060ccd076d66a5425592a49568e52015ccb5e5116894a2ccdb54da4b2b6e2288952cd6c257bdefaa401d06f2fc5c10eda9289c11654166b4ac8119584ae0f
|
||||
|
||||
@ -0,0 +1,51 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.0.12.ebuild,v 1.1 2013/12/22 18:50:08 slyfox Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
CABAL_FEATURES="bin nocabaldep"
|
||||
inherit eutils haskell-cabal
|
||||
|
||||
DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
|
||||
HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
|
||||
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=dev-lang/ghc-6.12.1"
|
||||
|
||||
# Need a lower version for portage to get --keep-going
|
||||
RDEPEND="|| ( >=sys-apps/portage-2.1.6
|
||||
sys-apps/pkgcore
|
||||
sys-apps/paludis )"
|
||||
|
||||
src_prepare() {
|
||||
if use prefix; then
|
||||
sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
|
||||
"${S}/Distribution/Gentoo/Packages.hs" || die
|
||||
|
||||
sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
|
||||
"${S}/Distribution/Gentoo/GHC.hs" || die
|
||||
fi
|
||||
|
||||
# for ghc snapshots (usually come with unstable Cabal API)
|
||||
cabal_chdeps \
|
||||
'Cabal >= 1.8 && < 1.19' 'Cabal >= 1.8 && < 1.20' \
|
||||
'process < 1.2' 'process < 1.3'
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
cabal_src_configure \
|
||||
--bindir="${EPREFIX}/usr/sbin" \
|
||||
--constraint="Cabal == $(cabal-version)"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cabal_src_install
|
||||
|
||||
dodoc TODO
|
||||
}
|
||||
@ -1,3 +0,0 @@
|
||||
#! /bin/sh
|
||||
|
||||
/usr/sbin/logrotate /etc/logrotate.conf
|
||||
@ -1,31 +0,0 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2006 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/logsurfer+/files/logsurfer.initd,v 1.1 2006/12/30 01:06:27 matsuu Exp $
|
||||
|
||||
depend() {
|
||||
use logger
|
||||
}
|
||||
|
||||
checkconfig() {
|
||||
if [ ! -f /etc/logsurfer.conf ] ; then
|
||||
eerror "Please create /etc/logsurfer.conf"
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
start() {
|
||||
checkconfig || return $?
|
||||
|
||||
ebegin "Starting logsurfer"
|
||||
start-stop-daemon --start --background --exec /usr/bin/logsurfer \
|
||||
-- -p /var/run/logsurfer.pid ${LOGSURFER_OPTS}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping logsurfer"
|
||||
start-stop-daemon --stop --pidfile /var/run/logsurfer.pid
|
||||
eend $?
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
diff -Naur lsat-0.9.5.orig/checkpkgs.c lsat-0.9.5/checkpkgs.c
|
||||
--- lsat-0.9.5.orig/checkpkgs.c 2007-04-27 00:48:31.000000000 +0900
|
||||
+++ lsat-0.9.5/checkpkgs.c 2007-04-28 10:11:17.000000000 +0900
|
||||
@@ -113,14 +113,14 @@
|
||||
}
|
||||
|
||||
|
||||
- /* if distro = gentoo, use pkglist */
|
||||
+ /* if distro = gentoo, use qpkg */
|
||||
if (distribution == 4)
|
||||
{
|
||||
if (verbose > 0)
|
||||
{
|
||||
printf(" Generating list of pkgs on system.\n");
|
||||
}
|
||||
- shellcode = "/usr/lib/portage/bin/pkglist 2>/dev/null >>/tmp/lsat1.lsat";
|
||||
+ shellcode = "/usr/bin/qpkg -I -nc 2>/dev/null >>/tmp/lsat1.lsat";
|
||||
if ((dostuff(tempfile, 0, shellcode, 0, html)) < 0)
|
||||
{
|
||||
/* rhut-rho...something bad happened */
|
||||
@ -1,42 +0,0 @@
|
||||
diff -Naur lsat-0.9.6.orig/Makefile.in lsat-0.9.6/Makefile.in
|
||||
--- lsat-0.9.6.orig/Makefile.in 2007-05-22 11:38:28.000000000 +0900
|
||||
+++ lsat-0.9.6/Makefile.in 2007-05-25 18:55:25.000000000 +0900
|
||||
@@ -12,6 +12,7 @@
|
||||
PROGRAM= lsat
|
||||
INSTALL = /usr/bin/install -c
|
||||
prefix = @prefix@
|
||||
+exec_prefix = @exec_prefix@
|
||||
BINDIR = @bindir@
|
||||
DATADIR = @datadir@
|
||||
MANDIR = @mandir@
|
||||
@@ -38,9 +39,7 @@
|
||||
rm -f $(PROGRAM) $(OBJECTS) Makefile config.* lsat.old lsatmd5.out lsatmd5.old
|
||||
|
||||
manpage:
|
||||
- pod2man $(PROGRAM).pod > $(PROGRAM).tmp
|
||||
- sed 's/perl v5.6.1/LSAT/g' $(PROGRAM).tmp| \
|
||||
-sed 's/Perl/LSAT/g'\
|
||||
+ pod2man $(PROGRAM).pod -r LSAT -c 'User Contributed LSAT Documentation' \
|
||||
> $(PROGRAM).1
|
||||
rm -f $(PROGRAM).tmp
|
||||
# cp -vf $(PROGRAM).1 debian/manpage.1.ex
|
||||
diff -Naur lsat-0.9.6.orig/checkpkgs.c lsat-0.9.6/checkpkgs.c
|
||||
--- lsat-0.9.6.orig/checkpkgs.c 2007-04-27 00:48:31.000000000 +0900
|
||||
+++ lsat-0.9.6/checkpkgs.c 2007-05-25 18:46:00.000000000 +0900
|
||||
@@ -113,14 +113,14 @@
|
||||
}
|
||||
|
||||
|
||||
- /* if distro = gentoo, use pkglist */
|
||||
+ /* if distro = gentoo, use qpkg */
|
||||
if (distribution == 4)
|
||||
{
|
||||
if (verbose > 0)
|
||||
{
|
||||
printf(" Generating list of pkgs on system.\n");
|
||||
}
|
||||
- shellcode = "/usr/lib/portage/bin/pkglist 2>/dev/null >>/tmp/lsat1.lsat";
|
||||
+ shellcode = "/usr/bin/qpkg -I -nc 2>/dev/null >>/tmp/lsat1.lsat";
|
||||
if ((dostuff(tempfile, 0, shellcode, 0, html)) < 0)
|
||||
{
|
||||
/* rhut-rho...something bad happened */
|
||||
@ -1,68 +0,0 @@
|
||||
From 1e5d8178d56742e5a4a418f56c3a76f84a9fa2eb Mon Sep 17 00:00:00 2001
|
||||
From: axkibe <axkibe@400ab1ff-c753-0410-929a-795a28144dcc>
|
||||
Date: Tue, 19 Jul 2011 13:29:19 +0000
|
||||
Subject: [PATCH] some header changes to work with older systems. expose readdir to user scripts. write examples into doc dir
|
||||
|
||||
git-svn-id: http://lsyncd.googlecode.com/svn/trunk@574 400ab1ff-c753-0410-929a-795a28144dcc
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
lsyncd.c | 1 +
|
||||
lsyncd.h | 4 ++++
|
||||
lsyncd.lua | 1 +
|
||||
4 files changed, 7 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 77bfe12..025a6ed 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -11,7 +11,7 @@ endif
|
||||
#endif
|
||||
|
||||
lsyncd_LDADD = $(LUA_LIBS)
|
||||
-exampledir = $(datarootdir)/doc/@PACKAGE@
|
||||
+exampledir = $(docdir)/
|
||||
dist_example_DATA = \
|
||||
examples/lbash.lua \
|
||||
examples/lecho.lua \
|
||||
diff --git a/lsyncd.c b/lsyncd.c
|
||||
index 5132804..a591eb2 100644
|
||||
--- a/lsyncd.c
|
||||
+++ b/lsyncd.c
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
+#include <strings.h>
|
||||
#include <syslog.h>
|
||||
#include <math.h>
|
||||
#include <time.h>
|
||||
diff --git a/lsyncd.h b/lsyncd.h
|
||||
index 841a1a8..a9ab31c 100644
|
||||
--- a/lsyncd.h
|
||||
+++ b/lsyncd.h
|
||||
@@ -11,6 +11,10 @@
|
||||
#ifndef LSYNCD_H
|
||||
#define LSYNCD_H
|
||||
|
||||
+/* some older machines need this to see pselect */
|
||||
+#define _BSD_SOURCE 1
|
||||
+#define _XOPEN_SOURCE 600
|
||||
+
|
||||
/* includes needed for headerfile */
|
||||
#include "config.h"
|
||||
|
||||
diff --git a/lsyncd.lua b/lsyncd.lua
|
||||
index b28a743..b1cc586 100644
|
||||
--- a/lsyncd.lua
|
||||
+++ b/lsyncd.lua
|
||||
@@ -38,6 +38,7 @@ _l = nil
|
||||
log = lsyncd.log
|
||||
terminate = lsyncd.terminate
|
||||
now = lsyncd.now
|
||||
+readdir = lsyncd.readdir
|
||||
-- just to safe from userscripts changing this.
|
||||
local log = log
|
||||
local terminate = terminate
|
||||
--
|
||||
1.7.3.4
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
DIST puppet-2.7.23.tar.gz 2025639 SHA256 73bc0d5a2334dc484148141a32274703b65b78bf87ca41f7e2da1c38518ba490 SHA512 d6173b596744b438a132a3772ed39195670d509481b5fbd30b098e8df3fceb31097369e6670587303b490f35842a39955d77ad500ab88535d43f08cc8d9dc86c WHIRLPOOL 65164214bc421b78359858258fa1e4242161ec406a20d73e5f44a5b14e74a6ed5973fcd4cd752a8817698aee8840ce67b92b12dfe487f964a736a68ae158ae80
|
||||
DIST puppet-3.2.4.tar.gz 1786216 SHA256 8b38f4adee6237b8dd7b1956d90af97f2d0091245d6e30b708bbc8e333001358 SHA512 31a22cf926c6fe866e7ed1ca294dd78228bfb34b0465d44cc985dc6f737879710b5c27e1519f53c9fd9622320386950f290d774d709559b66be79e43dac1dd5e WHIRLPOOL 86bb44bd6ee5a4c31892e909a95fcea52ced289b891281bae5535dac891006d9c1a5d4613210a0ba550ab6428f206dcf9ab3fafb3c90297a64e8bad3c06509be
|
||||
DIST puppet-3.3.0.tar.gz 1894901 SHA256 72a8579332b379f8dfe03d39ac961891db9d1e41919be98ac64caa0e3e2d31a0 SHA512 806bfd76d58a3abb7d717e1a4f46f0569e61aa92bc9961c7e2b314669849865c74907c93b4455d4ed0f0eb9ec88ec02f8f2c83a6821549b590c86797c99cac7a WHIRLPOOL 4b10f7c6054cf547496165b24589f15b13fc0bd8db8b4f710725605fbf1a50f7b8b77453e0a16e5f0e290fc04727997de6bbd5d94dc495175d999508099edf43
|
||||
DIST puppet-3.3.1.tar.gz 1896023 SHA256 152f9eaa6767c5f6cbd52befff891bd54e074d2f6487a649373da0113c09e284 SHA512 323dcd31a7029439edb3663501bce11fe7aa75b80efbd133abb82ea2c1584ce395a70ad2203f52d4fda8cadf18db7d6f6f2d4a3b285fa69b19b930d46e85a2d4 WHIRLPOOL a6d4b97efd5859b89d5fc81a857ecf837da540f140f33a252e552306843164e94cd94e0ca10b6bcfa3310fc0c03db9d2908100ed8f6c58d0c49ab5970202d01c
|
||||
DIST puppet-3.3.2.tar.gz 1897677 SHA256 8e8019617bc00a583a1062e125d3ce76bc40968ebf1fdd9fff67ac5321952637 SHA512 afdc06f0d3a6edbf44a313e6c4937bcc9e3cf84b3500e9df9484901becb902e9f96ba438cfdd9938e98a4a896720e1e88dd0f499815b27209e4693d9af7b0bb9 WHIRLPOOL 889584028738573d32b73a220f80dbf6aa1ac77dae3c943dfb13f396b745702abca24ede233d0b0b55f1b5506df356b55e4771f17e685f19b6974f242fb982f3
|
||||
|
||||
@ -0,0 +1 @@
|
||||
D /var/run/puppet 0755 puppet puppet -
|
||||
@ -1,160 +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/puppet/puppet-3.3.0.ebuild,v 1.2 2013/09/17 15:00:49 prometheanfire Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
USE_RUBY="ruby18 ruby19"
|
||||
|
||||
inherit elisp-common xemacs-elisp-common eutils user ruby-ng versionator
|
||||
|
||||
DESCRIPTION="A system automation and configuration management software"
|
||||
HOMEPAGE="http://puppetlabs.com/"
|
||||
SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0 GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
|
||||
IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
|
||||
|
||||
ruby_add_rdepend "
|
||||
dev-ruby/hiera
|
||||
>=dev-ruby/facter-1.6.2
|
||||
augeas? ( dev-ruby/ruby-augeas )
|
||||
diff? ( dev-ruby/diff-lcs )
|
||||
doc? ( dev-ruby/rdoc )
|
||||
ldap? ( dev-ruby/ruby-ldap )
|
||||
shadow? ( dev-ruby/ruby-shadow )
|
||||
sqlite3? ( dev-ruby/sqlite3 )
|
||||
virtual/ruby-ssl"
|
||||
|
||||
DEPEND="${DEPEND}
|
||||
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
|
||||
emacs? ( virtual/emacs )
|
||||
xemacs? ( app-editors/xemacs )"
|
||||
RDEPEND="${RDEPEND}
|
||||
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
|
||||
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
|
||||
selinux? (
|
||||
sys-libs/libselinux[ruby]
|
||||
sec-policy/selinux-puppet
|
||||
)
|
||||
vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
|
||||
>=app-portage/eix-0.18.0"
|
||||
|
||||
SITEFILE="50${PN}-mode-gentoo.el"
|
||||
|
||||
#RUBY_PATCHES=( "${FILESDIR}/puppet-openrc-status-fix.patch" )
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup puppet
|
||||
enewuser puppet -1 -1 /var/lib/puppet puppet
|
||||
}
|
||||
|
||||
all_ruby_compile() {
|
||||
if use emacs ; then
|
||||
elisp-compile ext/emacs/puppet-mode.el
|
||||
fi
|
||||
|
||||
if use xemacs ; then
|
||||
# Create a separate version for xemacs to be able to install
|
||||
# emacs and xemacs in parallel.
|
||||
mkdir ext/xemacs
|
||||
cp ext/emacs/* ext/xemacs/
|
||||
xemacs-elisp-compile ext/xemacs/puppet-mode.el
|
||||
fi
|
||||
}
|
||||
|
||||
each_ruby_install() {
|
||||
${RUBY} install.rb --destdir="${D}" install || die
|
||||
}
|
||||
|
||||
all_ruby_install() {
|
||||
newinitd "${FILESDIR}"/puppet.init-r1 puppet
|
||||
|
||||
# Initial configuration files
|
||||
insinto /etc/puppet
|
||||
|
||||
# Location of log and data files
|
||||
keepdir /var/log/puppet
|
||||
fowners -R puppet:puppet /var/log/puppet
|
||||
|
||||
if use minimal ; then
|
||||
rm "${ED}/etc/puppet/auth.conf"
|
||||
else
|
||||
newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
|
||||
newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
|
||||
|
||||
insinto /etc/puppet
|
||||
|
||||
keepdir /etc/puppet/manifests
|
||||
keepdir /etc/puppet/modules
|
||||
|
||||
keepdir /var/lib/puppet/ssl
|
||||
keepdir /var/lib/puppet/facts
|
||||
keepdir /var/lib/puppet/files
|
||||
fowners -R puppet:puppet /var/lib/puppet
|
||||
fi
|
||||
|
||||
if use emacs ; then
|
||||
elisp-install ${PN} ext/emacs/puppet-mode.el*
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
|
||||
fi
|
||||
|
||||
if use xemacs ; then
|
||||
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
|
||||
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
|
||||
fi
|
||||
|
||||
if use ldap ; then
|
||||
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
|
||||
fi
|
||||
|
||||
# ext and examples files
|
||||
for f in $(find ext examples -type f) ; do
|
||||
docinto "$(dirname ${f})"; dodoc "${f}"
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog
|
||||
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
|
||||
elog "cause puppet to hang while installing packages."
|
||||
elog
|
||||
elog "Puppet uses eix to get information about currently installed packages,"
|
||||
elog "so please keep the eix metadata cache updated so puppet is able to properly"
|
||||
elog "handle package installations."
|
||||
elog
|
||||
elog "Currently puppet only supports adding and removing services to the default"
|
||||
elog "runlevel, if you want to add/remove a service from another runlevel you may"
|
||||
elog "do so using symlinking."
|
||||
elog
|
||||
|
||||
if [ \
|
||||
-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
|
||||
-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
|
||||
-f "${EPREFIX}/etc/puppet/puppetca.conf" \
|
||||
] ; then
|
||||
elog
|
||||
elog "Please remove deprecated config files."
|
||||
elog " /etc/puppet/puppetca.conf"
|
||||
elog " /etc/puppet/puppetd.conf"
|
||||
elog " /etc/puppet/puppetmasterd.conf"
|
||||
elog
|
||||
fi
|
||||
|
||||
if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
|
||||
elog
|
||||
elog "If you're upgrading from 2.x then we strongly suggest you to read:"
|
||||
elog "http://docs.puppetlabs.com/guides/upgrading.html"
|
||||
elog
|
||||
fi
|
||||
|
||||
use emacs && elisp-site-regen
|
||||
use xemacs && xemacs-elisp-site-regen
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
use xemacs && xemacs-elisp-site-regen
|
||||
}
|
||||
@ -1,50 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/rudy/rudy-0.9.8.016.ebuild,v 1.2 2011/08/07 12:30:17 flameeyes Exp $
|
||||
|
||||
EAPI=2
|
||||
|
||||
USE_RUBY="ruby18"
|
||||
|
||||
RESTRICT=test
|
||||
RUBY_FAKEGEM_TASK_TEST=""
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC="rdoc"
|
||||
RUBY_FAKEGEM_DOCDIR="doc"
|
||||
RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc examples/authorize.rb examples/gem-test.rb
|
||||
examples/solaris.rb examples/windows.rb"
|
||||
|
||||
RUBY_FAKEGEM_EXTRAINSTALL="Rudyfile"
|
||||
|
||||
inherit ruby-fakegem eutils versionator
|
||||
|
||||
DESCRIPTION="Not your grandparents' EC2 deployment tool"
|
||||
HOMEPAGE="http://solutious.com/"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
if [[ "$(get_version_component_range 4)" == "001" ]]; then
|
||||
MY_PV="$(get_version_component_range 1-3)"
|
||||
else
|
||||
MY_PV="${PV}"
|
||||
fi
|
||||
|
||||
SRC_URI="http://github.com/solutious/${PN}/tarball/v${MY_PV} -> ${PN}-git-${PV}.tgz"
|
||||
S="${WORKDIR}/solutious-${PN}-*"
|
||||
|
||||
ruby_add_rdepend '
|
||||
>=dev-ruby/amazon-ec2-0.9.10
|
||||
>=dev-ruby/highline-1.5.1
|
||||
>=dev-ruby/aws-s3-0.6.1
|
||||
>=dev-ruby/storable-0.7.1
|
||||
>=dev-ruby/gibbler-0.7.7
|
||||
>=dev-ruby/sysinfo-0.7.3
|
||||
>=dev-ruby/caesars-0.7.4
|
||||
>=dev-ruby/drydock-0.6.9
|
||||
>=dev-ruby/annoy-0.5.6
|
||||
>=dev-ruby/attic-0.5.2
|
||||
>=dev-ruby/rye-0.9.2
|
||||
virtual/ruby-ssl'
|
||||
@ -1,6 +0,0 @@
|
||||
# Config file for /etc/init.d/syslog-ng
|
||||
|
||||
# Put any additional options for syslog-ng here.
|
||||
# See syslog-ng(8) for more information.
|
||||
|
||||
SYSLOG_NG_OPTS=""
|
||||
@ -1,23 +0,0 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2006 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslogread/files/0.92/syslogread.init,v 1.1 2006/06/11 11:52:56 bangert Exp $
|
||||
|
||||
opts="depend start stop"
|
||||
|
||||
depend() {
|
||||
need svscan
|
||||
provide logger
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting logger"
|
||||
true
|
||||
eend $? "Failed to start logger"
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping logger"
|
||||
true
|
||||
eend $? "Failed to stop logger"
|
||||
}
|
||||
@ -1,46 +0,0 @@
|
||||
Submitted by: Heath Caldwell <hncaldwell@gentoo.org>
|
||||
Date: 2008-10-21
|
||||
Initial Package Version: 0.10
|
||||
Upstream Status: Accepted to be included in next release
|
||||
Description: Allows the leftmost queue to have an escalation number if it is the only queue mentioned.
|
||||
|
||||
--- a/tenshi
|
||||
+++ b/tenshi
|
||||
@@ -522,7 +522,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
- if ($queue[0] =~ /:/) {
|
||||
+ if (@queue > 1 and $queue[0] =~ /:/) {
|
||||
die RED "[ERROR] Left most queue in a multiple queue declaration can not have an escalation number\n";
|
||||
}
|
||||
|
||||
--- a/tenshi.8
|
||||
+++ b/tenshi.8
|
||||
@@ -337,16 +337,16 @@
|
||||
regexp. The queue will receive the message that matched the regexp at the time
|
||||
of escalation, with a count equal to the escalation number. The count of
|
||||
messages matching the regexp will be reset when the left most queue mentioned
|
||||
-in the queue list is mailed.The left most queue cannot have an escalation
|
||||
-number. When the number of messages that match the regexp reaches the greatest
|
||||
-escalation number mentioned, escalation will begin again into the escalation
|
||||
-queues, modulus the greatest escalation number. For example, using the queues
|
||||
-`a,b:10,c:50', when 10 messages match the regexp, a message will go into b,
|
||||
-when 50 match, one will go into c. At 60, another will go into b, and at 100,
|
||||
-another into c, 110 to b, 150 to c, and so on. Escalation numbers must be
|
||||
-positive integers greater than zero and must be listed in increasing order from
|
||||
-left to right. All queues without escalation numbers must be listed more left
|
||||
-than the queues with escalation numbers.
|
||||
+in the queue list is mailed. The left most queue cannot have an escalation
|
||||
+number unless it is the only queue listed. When the number of messages that
|
||||
+match the regexp reaches the greatest escalation number mentioned, escalation
|
||||
+will begin again into the escalation queues, modulus the greatest escalation
|
||||
+number. For example, using the queues `a,b:10,c:50', when 10 messages match the
|
||||
+regexp, a message will go into b, when 50 match, one will go into c. At 60,
|
||||
+another will go into b, and at 100, another into c, 110 to b, 150 to c, and so
|
||||
+on. Escalation numbers must be positive integers greater than zero and must be
|
||||
+listed in increasing order from left to right. All queues without escalation
|
||||
+numbers must be listed more left than the queues with escalation numbers.
|
||||
|
||||
.br
|
||||
The standard grouping operators
|
||||
@ -1,34 +0,0 @@
|
||||
Submitted by: Heath Caldwell <hncaldwell@gentoo.org>
|
||||
Date: 2008-12-17
|
||||
Initial Package Version: 0.10
|
||||
Upstream Status: No response
|
||||
Description: Warns on log files that tenshi can't open and continues monitoring the ones that it can, instead of just exiting.
|
||||
|
||||
--- a/tenshi
|
||||
+++ b/tenshi
|
||||
@@ -141,10 +141,23 @@
|
||||
die RED "[ERROR] $main{'csv'}{'path'}: not executable";
|
||||
}
|
||||
|
||||
+ my @good_log_files;
|
||||
foreach my $log (@log_files) {
|
||||
- die RED "[ERROR] $log: no such file" if (! -f $log);
|
||||
- die RED "[ERROR] $log: file not readable" if (! -r $log);
|
||||
+ unless (-f $log) {
|
||||
+ print STDERR RED "[WARNING] $log: no such file\n";
|
||||
+ next;
|
||||
+ }
|
||||
+
|
||||
+ unless (-r $log) {
|
||||
+ print STDERR RED "[WARNING] $log: file not readable\n";
|
||||
+ next;
|
||||
+ }
|
||||
+
|
||||
+ push @good_log_files, $log;
|
||||
}
|
||||
+ @good_log_files > 0 || @fifo_files > 0
|
||||
+ or die RED "[ERROR] no readable log files";
|
||||
+ @log_files = @good_log_files;
|
||||
}
|
||||
|
||||
#
|
||||
@ -1,18 +0,0 @@
|
||||
--- a/tenshi
|
||||
+++ b/tenshi
|
||||
@@ -45,7 +45,6 @@
|
||||
|
||||
my $our_hostname = hostname();
|
||||
my @startup_time = localtime();
|
||||
-my $timezone = get_timezone();
|
||||
|
||||
my ($uid, $gid);
|
||||
|
||||
@@ -818,6 +817,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
+ my $timezone = get_timezone();
|
||||
my $subject = $main{$queue}{'subject'} || $subject;
|
||||
|
||||
$smtp->datasend("From: $main{$queue}{'mailfrom'}\n");
|
||||
@ -1,3 +1,4 @@
|
||||
DIST manpages-de-0.12.tar.bz2 530398 SHA256 81ee3cb852ba3dfb9b16a926c1d24a0aafea699a42a02b3a0ac2386f971417ed SHA512 72b938e3f593c77fcfcc2cede7a638909778316c228d377ce20439d35bbd8364cf1a3491905ab6b75ac7e56681c83f0ef64832b8a492d4282331e0564cb563eb WHIRLPOOL 96b1529abc83c7dc3f5a8ff075bd63b26e2c40fa8a1a323cb5a9f46c4dee6d78ce7b2baa2d4ef8a1de50a83644e1e526f34d81dc22cfe581264edcb2715815c4
|
||||
DIST manpages-de-0.8.tar.bz2 475407 SHA256 c40468b87ac1029af0df8e37d36dff6da38e5d823db932c4cd774f1a1bb9f15e SHA512 526b8498e7825f14cf35bd2d3517ee19df0fd9b698582e0e99c6778d58b022e8f2dc1136c04597bf216b424e2f77c70eaad42dcb933450f75a3d595737e79868 WHIRLPOOL ff62cd7aa9c50ae2a8ef980e58531f7ff4c580c06e24a21262ffa6b57a403e41352ef5a6b235cecfb44da7b7c53f0acd2090c88c7e97c5aa5b948c1f37fa85e3
|
||||
DIST manpages-de-1.3.tar.bz2 1252057 SHA256 4f5b22e9442b5be283159e42fecb1109c0d44a4d58d0468d7ccc0c99ac96fe52 SHA512 53f144136533bfb06232083ae76c5ed1610f7985ac39a7b99c40ad99fa3e25a15227913de28b5d7160e56e055f80f40dd202535c06b95092481db7887ce1b4ab WHIRLPOOL 78fe077d75e3b55b60bf7f5b17e15e0fd5cd936efc7018ec25c68dcbb26d3d9fe6377cc4ca0e58a7f691e2716f8252a0491e3936602ca8406b6a808f007224a6
|
||||
DIST manpages-de-1.4.tar.bz2 1268124 SHA256 1c76f1e7e299c0ef813d30c36540affd6b886f1d810c69d0679b0005756d9ff7 SHA512 f6470732dfe29752daf9c254376a60ab595672f67bf7ebc7e6d53a61330191ecd7143b2fe08c7a0ad156f02227455c92f98c765925e1c847d8913c7ef400116c WHIRLPOOL b7d23c6e4bcfabfdef26dbd73f375c23f2bedce8b9eef7d0ae88144720428e5c71638d6ef939702d4305cd54153412bce3f5cc0c3dd5109c9f7bb7a1c412cf29
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-de/man-pages-de-1.4.ebuild,v 1.1 2013/12/22 13:21:09 mrueg Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils autotools
|
||||
|
||||
MY_P="${PN/-/}-${PV}"
|
||||
|
||||
DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
|
||||
HOMEPAGE="http://alioth.debian.org/projects/manpages-de/"
|
||||
SRC_URI="http://manpages-de.alioth.debian.org/downloads/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="virtual/man"
|
||||
DEPEND="${RDEPEND}
|
||||
app-text/po4a"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-1.3-bzip2.patch
|
||||
|
||||
# Use the same compression as every other manpage
|
||||
local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
|
||||
if [[ ${PORTAGE_COMPRESS+set} == "set" ]] ; then
|
||||
PORTAGE_COMPRESS_LOCAL="#"
|
||||
fi
|
||||
if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
|
||||
case ${PORTAGE_COMPRESS_LOCAL} in
|
||||
bzip2|gzip) local PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
sed -i -e "s/gzip --best/${PORTAGE_COMPRESS_LOCAL} ${PORTAGE_COMPRESS_FLAGS_LOCAL}/"\
|
||||
po/man{1,2,3,4,5,6,7,8}/Makefile.in po/common.mk || die
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
emake mandir="${ED}"/usr/share/man install
|
||||
dodoc CHANGES README
|
||||
}
|
||||
@ -0,0 +1,95 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-2.1.4.ebuild,v 1.1 2013/12/22 16:55:06 graaff Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils autotools toolchain-funcs
|
||||
|
||||
#MY_P=${P/_/-}
|
||||
MY_P=${P}-release
|
||||
|
||||
# This has been added by Gentoo, to explicitly version libstemmer.
|
||||
# It is the date that http://snowball.tartarus.org/dist/libstemmer_c.tgz was
|
||||
# fetched.
|
||||
#STEMMER_PV="20091122"
|
||||
DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
|
||||
HOMEPAGE="http://www.sphinxsearch.com/"
|
||||
SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"
|
||||
# stemmer? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
|
||||
IUSE="debug id64 mysql odbc postgres stemmer syslog test xml"
|
||||
|
||||
RDEPEND="mysql? ( virtual/mysql )
|
||||
postgres? ( dev-db/postgresql-base )
|
||||
odbc? ( dev-db/unixODBC )
|
||||
stemmer? ( dev-libs/snowball-stemmer )
|
||||
xml? ( dev-libs/expat )
|
||||
virtual/libiconv"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
|
||||
|
||||
# drop nasty hardcoded search path breaking Prefix
|
||||
# We patch configure directly since otherwise we need to run
|
||||
# eautoreconf twice and that causes problems, bug 425380
|
||||
sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure || die
|
||||
|
||||
# Fix QA compilation warnings.
|
||||
sed -i -e '19i#include <string.h>' api/libsphinxclient/test.c || die
|
||||
|
||||
pushd api/libsphinxclient || die
|
||||
eautoreconf
|
||||
popd || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# fix libiconv detection
|
||||
use !elibc_glibc && export ac_cv_search_iconv=-liconv
|
||||
|
||||
econf \
|
||||
--sysconfdir="${EPREFIX}/etc/${PN}" \
|
||||
$(use_enable id64) \
|
||||
$(use_with debug) \
|
||||
$(use_with mysql) \
|
||||
$(use_with odbc unixodbc) \
|
||||
$(use_with postgres pgsql) \
|
||||
$(use_with stemmer libstemmer) \
|
||||
$(use_with syslog syslog) \
|
||||
$(use_with xml libexpat )
|
||||
|
||||
cd api/libsphinxclient || die
|
||||
econf STRIP=:
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake AR="$(tc-getAR)" || die "emake failed"
|
||||
|
||||
emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
elog "Tests require access to a live MySQL database and may require configuration."
|
||||
elog "You will find them in /usr/share/${PN}/test and they require dev-lang/php"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "install failed"
|
||||
emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
|
||||
|
||||
dodoc doc/*
|
||||
|
||||
dodir /var/lib/sphinx
|
||||
dodir /var/log/sphinx
|
||||
|
||||
newinitd "${FILESDIR}"/searchd.rc searchd
|
||||
|
||||
if use test; then
|
||||
insinto /usr/share/${PN}
|
||||
doins -r test
|
||||
fi
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
DIST strigi-0.7.7.tar.xz 698312 SHA256 de35cb6c4e909f88fa39649fdf3b5ebc2908e0c7311c305cdd93b42b4801d817 SHA512 00498e5248cbaf676054e40dba877a326b4da322b6624bd5f06b48d0b8567a45c8efadf1d7522bbd8ca6e50d4d9d7c4b4beccb25ccd84feb894be0e206818c78 WHIRLPOOL 404961425f99986956871978906a6defa447060a90bbdb9d755a8322e3616741cb6e4c922865857d5c9227d45aaca5cd30972dd8abcd34d43475178352b1403f
|
||||
DIST strigi-0.7.8.tar.bz2 810574 SHA256 43e461a625acdefa59bf58cc9d10aebda9eba920dfbe800fc77e6dcbf1eff989 SHA512 536f5bd5ed13d87d30c2fa31b6dcb2a883df173e5d60deefe0fdeb843f40f29f7edd0041029dc013bb31a205572087ed95ca661bcdf6d989d9806931716b1043 WHIRLPOOL 6853025cee89811dadb6e7f6309a6a8dfec1863cb75ab8af04a9a21b228b74723de06c4f787342ce7a0d6087303ecc0c4f599c2a3978838675678343d0b84ae4
|
||||
|
||||
@ -1,155 +0,0 @@
|
||||
Source: Mandriva patch
|
||||
Upstream: No bug report on bugs.kde.org
|
||||
Reason: libstreamanalyzer uses deprecated symbols from ffmpeg removed in 0.11
|
||||
--- strigi-0.7.7/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp.bero 2012-06-08 16:49:40.846877030 +0200
|
||||
+++ strigi-0.7.7/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2012-06-08 17:27:40.416888115 +0200
|
||||
@@ -305,13 +305,6 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
|
||||
uint8_t pDataBuffer[32768];//65536];
|
||||
long lSize = 32768;
|
||||
|
||||
- ByteIOContext ByteIOCtx;
|
||||
- if(init_put_byte(&ByteIOCtx, pDataBuffer, lSize, 0, in, read_data, NULL, seek_data) < 0)
|
||||
- return -1;
|
||||
-
|
||||
- //pAVInputFormat->flags |= AVFMT_NOFILE;
|
||||
- ByteIOCtx.is_streamed = 0;
|
||||
-
|
||||
AVProbeData pd;
|
||||
const char *buf;
|
||||
pd.filename ="";
|
||||
@@ -324,14 +317,27 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
|
||||
if(fmt == NULL)
|
||||
return 1;
|
||||
|
||||
- AVFormatContext *fc = NULL;
|
||||
- if(av_open_input_stream(&fc, &ByteIOCtx, "", fmt, NULL) < 0)
|
||||
+ AVFormatContext *fc = avformat_alloc_context();
|
||||
+ if(!fc)
|
||||
+ return -1;
|
||||
+
|
||||
+ AVIOContext *pb = avio_alloc_context(pDataBuffer, lSize, 0, in, read_data, NULL, seek_data);
|
||||
+ if(!fc->pb) {
|
||||
+ av_free(fc);
|
||||
return -1;
|
||||
+ }
|
||||
+
|
||||
+ fc->pb = pb;
|
||||
+
|
||||
+ if(avformat_open_input(&fc, "", fmt, NULL) < 0) {
|
||||
+ av_free(fc);
|
||||
+ return -1;
|
||||
+ }
|
||||
|
||||
- av_find_stream_info(fc);
|
||||
+ avformat_find_stream_info(fc, NULL);
|
||||
|
||||
// Dump information about file onto standard error
|
||||
- dump_format(fc, 0, ar.path().c_str(), false);
|
||||
+ av_dump_format(fc, 0, ar.path().c_str(), false);
|
||||
|
||||
if(fc->bit_rate)
|
||||
ar.addValue(factory->bitrateProperty, fc->bit_rate);
|
||||
@@ -372,10 +378,10 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
|
||||
ar.addTriplet(streamuri, durationPropertyName,outs.str());
|
||||
}
|
||||
|
||||
- //FIXME we must stop using the deprecated fuction av_metadata_get and use
|
||||
+ //FIXME we must stop using the deprecated fuction av_dict_get and use
|
||||
// av_dict_get once we are able to detect the version of FFMpeg being used
|
||||
// using version macros. same goes for all occurences of this function.
|
||||
- AVMetadataTag *entry = av_metadata_get(stream.metadata, "language", NULL, 0);
|
||||
+ AVDictionaryEntry *entry = av_dict_get(stream.metadata, "language", NULL, 0);
|
||||
if (entry != NULL) {
|
||||
const char *languageValue = entry->value;
|
||||
if (size_t len = strlen(languageValue)) {
|
||||
@@ -430,7 +436,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
|
||||
outs << codec.sample_rate;
|
||||
ar.addTriplet(streamuri, sampleratePropertyName, outs.str());
|
||||
}
|
||||
- if (codec.sample_fmt != SAMPLE_FMT_NONE) {}//FIXME sample format
|
||||
+ if (codec.sample_fmt != AV_SAMPLE_FMT_NONE) {}//FIXME sample format
|
||||
|
||||
} else { // video stream
|
||||
|
||||
@@ -469,7 +475,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
|
||||
|
||||
// Tags
|
||||
|
||||
- AVMetadataTag *entry = av_metadata_get(fc->metadata, "title", NULL, 0);
|
||||
+ AVDictionaryEntry *entry = av_dict_get(fc->metadata, "title", NULL, 0);
|
||||
if (entry != NULL)
|
||||
{
|
||||
const char *titleValue = entry->value;
|
||||
@@ -478,7 +484,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
|
||||
}
|
||||
}
|
||||
|
||||
- entry = av_metadata_get(fc->metadata, "author", NULL, 0);
|
||||
+ entry = av_dict_get(fc->metadata, "author", NULL, 0);
|
||||
if (entry != NULL)
|
||||
{
|
||||
const char *authorValue = entry->value;
|
||||
@@ -490,7 +496,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
|
||||
}
|
||||
}
|
||||
|
||||
- entry = av_metadata_get(fc->metadata, "copyright", NULL, 0);
|
||||
+ entry = av_dict_get(fc->metadata, "copyright", NULL, 0);
|
||||
if (entry != NULL)
|
||||
{
|
||||
const char *copyrightValue = entry->value;
|
||||
@@ -499,7 +505,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
|
||||
}
|
||||
}
|
||||
|
||||
- entry = av_metadata_get(fc->metadata, "comment", NULL, 0);
|
||||
+ entry = av_dict_get(fc->metadata, "comment", NULL, 0);
|
||||
if (entry != NULL)
|
||||
{
|
||||
const char *commentValue = entry->value;
|
||||
@@ -508,7 +514,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
|
||||
}
|
||||
}
|
||||
|
||||
- entry = av_metadata_get(fc->metadata, "album", NULL, 0);
|
||||
+ entry = av_dict_get(fc->metadata, "album", NULL, 0);
|
||||
if (entry != NULL)
|
||||
{
|
||||
const char *albumValue = entry->value;
|
||||
@@ -520,7 +526,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
|
||||
}
|
||||
}
|
||||
|
||||
- entry = av_metadata_get(fc->metadata, "genre", NULL, 0);
|
||||
+ entry = av_dict_get(fc->metadata, "genre", NULL, 0);
|
||||
if (entry != NULL)
|
||||
{
|
||||
const char *genreValue = entry->value;
|
||||
@@ -529,7 +535,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
|
||||
}
|
||||
}
|
||||
|
||||
- entry = av_metadata_get(fc->metadata, "track", NULL, 0);
|
||||
+ entry = av_dict_get(fc->metadata, "track", NULL, 0);
|
||||
if (entry != NULL)
|
||||
{
|
||||
const char *trackValue = entry->value;
|
||||
@@ -538,7 +544,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
|
||||
}
|
||||
}
|
||||
|
||||
- entry = av_metadata_get(fc->metadata, "year", NULL, 0);
|
||||
+ entry = av_dict_get(fc->metadata, "year", NULL, 0);
|
||||
if (entry != NULL)
|
||||
{
|
||||
const char *yearValue = entry->value;
|
||||
@@ -547,7 +553,8 @@ FFMPEGEndAnalyzer::analyze(AnalysisResul
|
||||
}
|
||||
}
|
||||
|
||||
- av_close_input_stream(fc);
|
||||
+ avformat_close_input(&fc);
|
||||
+ av_free(pb);
|
||||
//url_fclose(&ByteIOCtx);
|
||||
|
||||
return 0;
|
||||
@ -1,20 +0,0 @@
|
||||
commit a8e97f672325557b3fbc84b987299350ec5ac10b
|
||||
Author: Rex Dieter <rdieter@fedoraproject.org>
|
||||
Date: Mon Jan 9 11:13:25 2012 -0600
|
||||
|
||||
gcc47 fix, unistd.h header required unconditionally for 'sleep'
|
||||
|
||||
diff --git a/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp b/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
|
||||
index 9fcdcb1..1e97599 100644
|
||||
--- a/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
|
||||
+++ b/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
|
||||
@@ -27,9 +27,7 @@
|
||||
#include <iostream>
|
||||
#include <stdio.h>
|
||||
|
||||
-#if defined(__SUNPRO_CC)
|
||||
#include <unistd.h>
|
||||
-#endif
|
||||
|
||||
using namespace std;
|
||||
|
||||
@ -1,95 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/strigi/strigi-0.7.7-r2.ebuild,v 1.11 2013/04/02 20:55:47 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
if [[ "${PV}" != "9999" ]]; then
|
||||
SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
|
||||
KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
|
||||
else
|
||||
EGIT_REPO_URI="git://anongit.kde.org/strigi"
|
||||
GIT_ECLASS="git-2"
|
||||
EGIT_HAS_SUBMODULES="true"
|
||||
KEYWORDS=""
|
||||
fi
|
||||
|
||||
inherit cmake-utils ${GIT_ECLASS}
|
||||
|
||||
DESCRIPTION="Fast crawling desktop search engine with Qt4 GUI"
|
||||
HOMEPAGE="https://projects.kde.org/projects/kdesupport/strigi/strigi"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="clucene +dbus debug exif fam ffmpeg hyperestraier inotify log +qt4 test"
|
||||
|
||||
COMMONDEPEND="
|
||||
app-arch/bzip2:0
|
||||
dev-libs/libxml2:2
|
||||
sys-libs/zlib:0
|
||||
virtual/libiconv
|
||||
clucene? ( >=dev-cpp/clucene-0.9.21[-debug] )
|
||||
dbus? (
|
||||
sys-apps/dbus
|
||||
qt4? ( dev-qt/qtdbus:4 )
|
||||
)
|
||||
exif? ( >=media-gfx/exiv2-0.17 )
|
||||
fam? ( virtual/fam )
|
||||
ffmpeg? ( virtual/ffmpeg )
|
||||
hyperestraier? ( app-text/hyperestraier )
|
||||
log? ( >=dev-libs/log4cxx-0.10.0 )
|
||||
qt4? (
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtgui:4
|
||||
)
|
||||
"
|
||||
DEPEND="${COMMONDEPEND}
|
||||
dev-libs/boost
|
||||
test? ( dev-util/cppunit )"
|
||||
RDEPEND=${COMMONDEPEND}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-gcc47.patch"
|
||||
"${FILESDIR}/${P}-ffmpeg-0.11.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
# Enabled: POLLING (only reliable way to check for files changed.)
|
||||
# Disabled: xine - recommended upstream to keep it this way
|
||||
mycmakeargs=(
|
||||
-DENABLE_POLLING=ON
|
||||
-DFORCE_DEPS=ON
|
||||
-DENABLE_CPPUNIT=OFF
|
||||
-DENABLE_REGENERATEXSD=OFF
|
||||
-DENABLE_XINE=OFF
|
||||
$(cmake-utils_use_enable clucene CLUCENE)
|
||||
$(cmake-utils_use_enable clucene CLUCENE_NG)
|
||||
$(cmake-utils_use_enable dbus)
|
||||
$(cmake-utils_use_enable exif EXIV2)
|
||||
$(cmake-utils_use_enable fam)
|
||||
$(cmake-utils_use_enable ffmpeg)
|
||||
$(cmake-utils_use_enable hyperestraier)
|
||||
$(cmake-utils_use_enable inotify)
|
||||
$(cmake-utils_use_enable log LOG4CXX)
|
||||
$(cmake-utils_use_enable qt4)
|
||||
$(cmake-utils_use_enable test CPPUNIT)
|
||||
)
|
||||
|
||||
if use qt4; then
|
||||
mycmakeargs+=(-DENABLE_DBUS=ON)
|
||||
fi
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if ! use clucene && ! use hyperestraier; then
|
||||
echo
|
||||
elog "Because you didn't enable either of the available backends:"
|
||||
elog "clucene or hyperestraier, strigi may not be functional."
|
||||
elog "If you intend to use standalone strigi indexer (not needed for KDE),"
|
||||
elog "be sure to reinstall app-misc/strigi with either clucene (recommended)"
|
||||
elog "or hyperestraier (unreliable) USE flag enabled."
|
||||
echo
|
||||
fi
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST akonadi-1.9.2.tar.bz2 220599 SHA256 e712f3ee59731d613935df78df1cd65f80680d86d1f6642ff118061cd461bfd9 SHA512 9c281315cbb4801490acb0c6afa8bde6e42a73cfd0ba4ab0cb2b0b50a63ae55d350efcf8535b7f3251d93da0ba63c51e7920c250496fedcb3d90e1d8644c1b7f WHIRLPOOL 3415b70bc03ba451ae4e8216de0eeeb0f0c7f53c4f6433cc21f4725167f24493bee3f6dfe188f7d3633b4f5e4471d3a02ffc5407b90def86c439db6e711a1cce
|
||||
DIST akonadi-server-1.10.3.tar.bz2 228633 SHA256 a8f66eec479c235ec67e77befac50c42743f627663fe2bb49238e82e6fbfffb0 SHA512 836917f3fb8ec5388d7145402fb1b55ca00d14d78f92d0105fecc6c052e99d497e17a2484f581b9d2f20433220a9343e6b4bff8ad34e48767e6a42d309572c66 WHIRLPOOL 468908b64e66a826e17dc8f5dca3f907bfcd09669810f9f1aca96b7f812ebc2c0138a6f840a5e5f8d0734cc05eecddeebafe8affe32994c2ed7bb76c2c309b38
|
||||
DIST akonadi-server-1.11.0.tar.bz2 235101 SHA256 0cb257509d53927241b71d85c42efb0b5776efc37fc8dc732e75f6813b8a264d SHA512 366f0e4a86038af5eb6603653e599076c66e84f59db57f4c56a89ec265be7e335f3f5d14444030a6f398e2361969ad85bc73357359da7ab8c307ec3c5d80ea40 WHIRLPOOL b050f5e1d5220ec512ab6e57cd083b652f03ef1e391fb336a51888aede7b0faf2f2ab58db6f6e67ee3fd7ceea8efcb54d5c3b1a6c224adf3deb41cb10b3c91d2
|
||||
|
||||
@ -1,107 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.9.2.ebuild,v 1.7 2013/09/08 13:54:37 kensington Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
if [[ $PV = *9999* ]]; then
|
||||
scm_eclass=git-2
|
||||
EGIT_REPO_URI="git://anongit.kde.org/akonadi"
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
|
||||
KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
|
||||
S="${WORKDIR}/${P/-server/}"
|
||||
fi
|
||||
|
||||
inherit cmake-utils ${scm_eclass}
|
||||
|
||||
DESCRIPTION="The server part of Akonadi"
|
||||
HOMEPAGE="http://pim.kde.org/akonadi"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
IUSE="+mysql postgres sqlite test"
|
||||
|
||||
CDEPEND="
|
||||
dev-libs/boost:=
|
||||
>=dev-libs/soprano-2.6.51
|
||||
>=dev-qt/qtdbus-4.5.0:4
|
||||
>=dev-qt/qtgui-4.5.0:4
|
||||
>=dev-qt/qtsql-4.5.0:4[mysql?,postgres?]
|
||||
>=dev-qt/qttest-4.5.0:4
|
||||
x11-misc/shared-mime-info
|
||||
"
|
||||
DEPEND="${CDEPEND}
|
||||
dev-libs/libxslt
|
||||
>=dev-util/automoc-0.9.88
|
||||
"
|
||||
RDEPEND="${CDEPEND}
|
||||
postgres? ( dev-db/postgresql-server )
|
||||
"
|
||||
|
||||
REQUIRED_USE="|| ( sqlite mysql postgres )"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
pkg_setup() {
|
||||
# Set default storage backend in order: MySQL, SQLite PostgreSQL
|
||||
# reverse driver check to keep the order
|
||||
if use postgres; then
|
||||
DRIVER="QPSQL"
|
||||
AVAILABLE+=" ${DRIVER}"
|
||||
fi
|
||||
|
||||
if use sqlite; then
|
||||
DRIVER="QSQLITE3"
|
||||
AVAILABLE+=" ${DRIVER}"
|
||||
fi
|
||||
|
||||
if use mysql; then
|
||||
DRIVER="QMYSQL"
|
||||
AVAILABLE+=" ${DRIVER}"
|
||||
fi
|
||||
|
||||
# Notify about MySQL is recommend by upstream
|
||||
if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
|
||||
ewarn
|
||||
ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
|
||||
ewarn "user configuration. This is the backend recommended by KDE upstream."
|
||||
ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
|
||||
ewarn "backend anymore."
|
||||
ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
|
||||
ewarn "Available drivers are:${AVAILABLE}"
|
||||
ewarn
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DAKONADI_USE_STRIGI_SEARCH=OFF
|
||||
-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
|
||||
-DWITH_QT5=OFF
|
||||
$(cmake-utils_use test AKONADI_BUILD_TESTS)
|
||||
$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Who knows, maybe it accidentally fixes our permission issues
|
||||
cat <<-EOF > "${T}"/akonadiserverrc
|
||||
[%General]
|
||||
Driver=${DRIVER}
|
||||
EOF
|
||||
insinto /usr/share/config/akonadi
|
||||
doins "${T}"/akonadiserverrc
|
||||
|
||||
cmake-utils_src_install
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "${DRIVER} has been set as your default akonadi storage backend."
|
||||
elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
|
||||
elog "Available drivers are: ${AVAILABLE}"
|
||||
}
|
||||
@ -0,0 +1,199 @@
|
||||
https://bugs.gentoo.org/220040
|
||||
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -12393,22 +12393,25 @@ else
|
||||
#line $LINENO "configure"
|
||||
#include "confdefs.h"
|
||||
/* Test program from Paul Eggert and Tony Leneis. */
|
||||
-#if TIME_WITH_SYS_TIME
|
||||
+#ifdef TIME_WITH_SYS_TIME
|
||||
# include <sys/time.h>
|
||||
# include <time.h>
|
||||
#else
|
||||
-# if HAVE_SYS_TIME_H
|
||||
+# ifdef HAVE_SYS_TIME_H
|
||||
# include <sys/time.h>
|
||||
# else
|
||||
# include <time.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-#if HAVE_UNISTD_H
|
||||
+#include <limits.h>
|
||||
+#include <stdlib.h>
|
||||
+
|
||||
+#ifdef HAVE_UNISTD_H
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
-#if !HAVE_ALARM
|
||||
+#ifndef HAVE_ALARM
|
||||
# define alarm(X) /* empty */
|
||||
#endif
|
||||
|
||||
@@ -12416,6 +12419,7 @@ else
|
||||
#undef putenv
|
||||
|
||||
static time_t time_t_max;
|
||||
+static time_t time_t_min;
|
||||
|
||||
/* Values we'll use to set the TZ environment variable. */
|
||||
static const char *const tz_strings[] = {
|
||||
@@ -12424,9 +12428,9 @@ static const char *const tz_strings[] = {
|
||||
};
|
||||
#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
|
||||
|
||||
-/* Fail if mktime fails to convert a date in the spring-forward gap.
|
||||
+/* Return 0 if mktime fails to convert a date in the spring-forward gap.
|
||||
Based on a problem report from Andreas Jaeger. */
|
||||
-static void
|
||||
+static int
|
||||
spring_forward_gap ()
|
||||
{
|
||||
/* glibc (up to about 1998-10-07) failed this test. */
|
||||
@@ -12445,23 +12449,27 @@ spring_forward_gap ()
|
||||
tm.tm_min = 0;
|
||||
tm.tm_sec = 0;
|
||||
tm.tm_isdst = -1;
|
||||
- if (mktime (&tm) == (time_t)-1)
|
||||
- exit (1);
|
||||
+ return mktime (&tm) != (time_t) -1;
|
||||
}
|
||||
|
||||
-static void
|
||||
-mktime_test (now)
|
||||
+static int
|
||||
+mktime_test1 (now)
|
||||
time_t now;
|
||||
{
|
||||
struct tm *lt;
|
||||
- if ((lt = localtime (&now)) && mktime (lt) != now)
|
||||
- exit (1);
|
||||
- now = time_t_max - now;
|
||||
- if ((lt = localtime (&now)) && mktime (lt) != now)
|
||||
- exit (1);
|
||||
+ return ! (lt = localtime (&now)) || mktime (lt) == now;
|
||||
}
|
||||
|
||||
-static void
|
||||
+static int
|
||||
+mktime_test (now)
|
||||
+ time_t now;
|
||||
+{
|
||||
+ return (mktime_test1 (now)
|
||||
+ && mktime_test1 ((time_t) (time_t_max - now))
|
||||
+ && mktime_test1 ((time_t) (time_t_min + now)));
|
||||
+}
|
||||
+
|
||||
+static int
|
||||
irix_6_4_bug ()
|
||||
{
|
||||
/* Based on code from Ariel Faigon. */
|
||||
@@ -12474,11 +12482,10 @@ irix_6_4_bug ()
|
||||
tm.tm_sec = 0;
|
||||
tm.tm_isdst = -1;
|
||||
mktime (&tm);
|
||||
- if (tm.tm_mon != 2 || tm.tm_mday != 31)
|
||||
- exit (1);
|
||||
+ return tm.tm_mon == 2 && tm.tm_mday == 31;
|
||||
}
|
||||
|
||||
-static void
|
||||
+static int
|
||||
bigtime_test (j)
|
||||
int j;
|
||||
{
|
||||
@@ -12500,8 +12507,39 @@ bigtime_test (j)
|
||||
&& lt->tm_wday == tm.tm_wday
|
||||
&& ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
|
||||
== (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
|
||||
- exit (1);
|
||||
+ return 0;
|
||||
}
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
+static int
|
||||
+year_2050_test ()
|
||||
+{
|
||||
+ /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
|
||||
+ ignoring leap seconds. */
|
||||
+ unsigned long int answer = 2527315200UL;
|
||||
+
|
||||
+ struct tm tm;
|
||||
+ time_t t;
|
||||
+ tm.tm_year = 2050 - 1900;
|
||||
+ tm.tm_mon = 2 - 1;
|
||||
+ tm.tm_mday = 1;
|
||||
+ tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
|
||||
+ tm.tm_isdst = -1;
|
||||
+
|
||||
+ /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
|
||||
+ instead of "TZ=America/Vancouver" in order to detect the bug even
|
||||
+ on systems that don't support the Olson extension, or don't have the
|
||||
+ full zoneinfo tables installed. */
|
||||
+ putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
|
||||
+
|
||||
+ t = mktime (&tm);
|
||||
+
|
||||
+ /* Check that the result is either a failure, or close enough
|
||||
+ to the correct answer that we can assume the discrepancy is
|
||||
+ due to leap seconds. */
|
||||
+ return (t == (time_t) -1
|
||||
+ || (0 < t && answer - 120 <= t && t <= answer + 120));
|
||||
}
|
||||
|
||||
int
|
||||
@@ -12515,9 +12553,15 @@ main ()
|
||||
isn't worth using anyway. */
|
||||
alarm (60);
|
||||
|
||||
- for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
|
||||
- continue;
|
||||
- time_t_max--;
|
||||
+ for (;;)
|
||||
+ {
|
||||
+ t = (time_t_max << 1) + 1;
|
||||
+ if (t <= time_t_max)
|
||||
+ break;
|
||||
+ time_t_max = t;
|
||||
+ }
|
||||
+ time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
|
||||
+
|
||||
delta = time_t_max / 997; /* a suitable prime number */
|
||||
for (i = 0; i < N_STRINGS; i++)
|
||||
{
|
||||
@@ -12525,17 +12569,22 @@ main ()
|
||||
putenv (tz_strings[i]);
|
||||
|
||||
for (t = 0; t <= time_t_max - delta; t += delta)
|
||||
- mktime_test (t);
|
||||
- mktime_test ((time_t) 60 * 60);
|
||||
- mktime_test ((time_t) 60 * 60 * 24);
|
||||
-
|
||||
- for (j = 1; 0 < j; j *= 2)
|
||||
- bigtime_test (j);
|
||||
- bigtime_test (j - 1);
|
||||
+ if (! mktime_test (t))
|
||||
+ return 1;
|
||||
+ if (! (mktime_test ((time_t) 1)
|
||||
+ && mktime_test ((time_t) (60 * 60))
|
||||
+ && mktime_test ((time_t) (60 * 60 * 24))))
|
||||
+ return 1;
|
||||
+
|
||||
+ for (j = 1; ; j <<= 1)
|
||||
+ if (! bigtime_test (j))
|
||||
+ return 1;
|
||||
+ else if (INT_MAX / 2 < j)
|
||||
+ break;
|
||||
+ if (! bigtime_test (INT_MAX))
|
||||
+ return 1;
|
||||
}
|
||||
- irix_6_4_bug ();
|
||||
- spring_forward_gap ();
|
||||
- exit (0);
|
||||
+ return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest$ac_exeext
|
||||
@ -1,71 +0,0 @@
|
||||
--- bash-3.0/config.h.in
|
||||
+++ bash-3.0/config.h.in
|
||||
@@ -197,7 +197,7 @@
|
||||
|
||||
/* System paths */
|
||||
|
||||
-#define DEFAULT_MAIL_DIRECTORY "/usr/spool/mail"
|
||||
+#define DEFAULT_MAIL_DIRECTORY "/var/spool/mail"
|
||||
|
||||
/* Characteristics of the system's header files and libraries that affect
|
||||
the compilation environment. */
|
||||
--- bash-3.0/config-bot.h
|
||||
+++ bash-3.0/config-bot.h
|
||||
@@ -178,4 +178,18 @@
|
||||
/******************************************************************/
|
||||
|
||||
/* If you don't want bash to provide a default mail file to check. */
|
||||
-/* #undef DEFAULT_MAIL_DIRECTORY */
|
||||
+/* DP: - don't define a default DEFAULT_MAIL_DIRECTORY, because it
|
||||
+ * DP: can cause a timeout on NFS mounts.
|
||||
+ */
|
||||
+#undef DEFAULT_MAIL_DIRECTORY
|
||||
+
|
||||
+/* Force pgrp synchronization
|
||||
+ * (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653)
|
||||
+ *
|
||||
+ * The session will hang cases where you 'su' (not 'su -') and
|
||||
+ * then run a piped command in emacs.
|
||||
+ * This problem seem to happen due to scheduler changes kernel
|
||||
+ * side - although reproduceble with later 2.4 kernels, it is
|
||||
+ * especially easy with 2.6 kernels.
|
||||
+ */
|
||||
+#define PGRP_PIPE 1
|
||||
--- bash-3.0/config-top.h
|
||||
+++ bash-3.0/config-top.h
|
||||
@@ -52,14 +52,14 @@
|
||||
/* The default value of the PATH variable. */
|
||||
#ifndef DEFAULT_PATH_VALUE
|
||||
#define DEFAULT_PATH_VALUE \
|
||||
- "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:."
|
||||
+ "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
||||
#endif
|
||||
|
||||
/* The value for PATH when invoking `command -p'. This is only used when
|
||||
the Posix.2 confstr () function, or CS_PATH define are not present. */
|
||||
#ifndef STANDARD_UTILS_PATH
|
||||
#define STANDARD_UTILS_PATH \
|
||||
- "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
|
||||
+ "/bin:/usr/bin:/sbin:/usr/sbin"
|
||||
#endif
|
||||
|
||||
/* Default primary and secondary prompt strings. */
|
||||
@@ -74,14 +74,16 @@
|
||||
|
||||
/* System-wide .bashrc file for interactive shells. */
|
||||
/* #define SYS_BASHRC "/etc/bash.bashrc" */
|
||||
+#define SYS_BASHRC "/etc/bash/bashrc" /* #26952 */
|
||||
|
||||
/* System-wide .bash_logout for login shells. */
|
||||
/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
|
||||
+#define SYS_BASH_LOGOUT "/etc/bash/bash_logout" /* #90488 */
|
||||
|
||||
/* Define this to make non-interactive shells begun with argv[0][0] == '-'
|
||||
run the startup files when not in posix mode. */
|
||||
-/* #define NON_INTERACTIVE_LOGIN_SHELLS */
|
||||
+#define NON_INTERACTIVE_LOGIN_SHELLS
|
||||
|
||||
/* Define this if you want bash to try to check whether it's being run by
|
||||
sshd and source the .bashrc if so (like the rshd behavior). */
|
||||
-/* #define SSH_SOURCE_BASHRC */
|
||||
+#define SSH_SOURCE_BASHRC /* #24762 */
|
||||
@ -1,44 +0,0 @@
|
||||
Patch readline's bind.c so that /etc/inputrc is read as a last resort
|
||||
following ~/.inputrc. This is better than putting INPUTRC in
|
||||
the environment because INPUTRC will override even after the
|
||||
user creates a ~/.inputrc
|
||||
|
||||
--- bash-3.0/lib/readline/bind.c.agriffis 2004-03-03 22:39:32.000000000 -0500
|
||||
+++ bash-3.0/lib/readline/bind.c 2004-08-02 13:53:02.365731918 -0400
|
||||
@@ -781,6 +781,7 @@
|
||||
1. the filename used for the previous call
|
||||
2. the value of the shell variable `INPUTRC'
|
||||
3. ~/.inputrc
|
||||
+ 4. /etc/inputrc
|
||||
If the file existed and could be opened and read, 0 is returned,
|
||||
otherwise errno is returned. */
|
||||
int
|
||||
@@ -789,17 +790,20 @@
|
||||
{
|
||||
/* Default the filename. */
|
||||
if (filename == 0)
|
||||
+ filename = last_readline_init_file;
|
||||
+ if (filename == 0)
|
||||
+ filename = sh_get_env_value ("INPUTRC");
|
||||
+ if (filename == 0 || *filename == 0)
|
||||
{
|
||||
- filename = last_readline_init_file;
|
||||
- if (filename == 0)
|
||||
- filename = sh_get_env_value ("INPUTRC");
|
||||
- if (filename == 0)
|
||||
- filename = DEFAULT_INPUTRC;
|
||||
+ /* If there's trouble reading DEFAULT_INPUTRC then fall back to
|
||||
+ * the system inputrc
|
||||
+ */
|
||||
+ filename = DEFAULT_INPUTRC;
|
||||
+ if (_rl_read_init_file (filename, 0) == 0)
|
||||
+ return 0;
|
||||
+ filename = "/etc/inputrc";
|
||||
}
|
||||
|
||||
- if (*filename == 0)
|
||||
- filename = DEFAULT_INPUTRC;
|
||||
-
|
||||
#if defined (__MSDOS__)
|
||||
if (_rl_read_init_file (filename, 0) == 0)
|
||||
return 0;
|
||||
@ -1,89 +0,0 @@
|
||||
Add support for logging bash commands via syslog().
|
||||
Useful for deploying in honeypot environments.
|
||||
|
||||
http://bugs.gentoo.org/91327
|
||||
http://www.nardware.co.uk/Security/html/bashlogger.htm
|
||||
|
||||
--- bashhist.c
|
||||
+++ bashhist.c
|
||||
@@ -705,7 +705,7 @@
|
||||
{
|
||||
hist_last_line_added = 1;
|
||||
hist_last_line_pushed = 0;
|
||||
- add_history (line);
|
||||
+ add_history (line, 1);
|
||||
history_lines_this_session++;
|
||||
}
|
||||
|
||||
--- lib/readline/histexpand.c
|
||||
+++ lib/readline/histexpand.c
|
||||
@@ -1222,9 +1222,7 @@
|
||||
|
||||
if (only_printing)
|
||||
{
|
||||
-#if 0
|
||||
- add_history (result);
|
||||
-#endif
|
||||
+ add_history (result, 1);
|
||||
return (2);
|
||||
}
|
||||
|
||||
--- lib/readline/histfile.c
|
||||
+++ lib/readline/histfile.c
|
||||
@@ -262,7 +262,7 @@
|
||||
{
|
||||
if (HIST_TIMESTAMP_START(line_start) == 0)
|
||||
{
|
||||
- add_history (line_start);
|
||||
+ add_history (line_start, 0);
|
||||
if (last_ts)
|
||||
{
|
||||
add_history_time (last_ts);
|
||||
--- lib/readline/history.c
|
||||
+++ lib/readline/history.c
|
||||
@@ -31,6 +31,8 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
+#include <syslog.h>
|
||||
+
|
||||
#if defined (HAVE_STDLIB_H)
|
||||
# include <stdlib.h>
|
||||
#else
|
||||
@@ -246,10 +250,23 @@
|
||||
/* Place STRING at the end of the history list. The data field
|
||||
is set to NULL. */
|
||||
void
|
||||
-add_history (string)
|
||||
- const char *string;
|
||||
+add_history (string, logme)
|
||||
+ const char *string;
|
||||
+ int logme; /* 0 means no sending history to syslog */
|
||||
{
|
||||
HIST_ENTRY *temp;
|
||||
+ if (logme) {
|
||||
+ char trunc[600]; /* arbitrary max size of 600 bytes */
|
||||
+ if (strlen(string) < sizeof(trunc)) {
|
||||
+ syslog(LOG_LOCAL5 | LOG_INFO, "HISTORY: PID=%d UID=%d %s",
|
||||
+ getpid(), getuid(), string);
|
||||
+ } else {
|
||||
+ memcpy(trunc, string, sizeof(trunc));
|
||||
+ trunc[sizeof(trunc) - 1] = '\0';
|
||||
+ syslog(LOG_LOCAL5 | LOG_INFO, "HISTORY: PID=%d UID=%d %s(++TRUNC)",
|
||||
+ getpid(), getuid(), trunc);
|
||||
+ }
|
||||
+ }
|
||||
|
||||
if (history_stifled && (history_length == history_max_entries))
|
||||
{
|
||||
--- lib/readline/history.h
|
||||
+++ lib/readline/history.h
|
||||
@@ -80,7 +80,7 @@
|
||||
|
||||
/* Place STRING at the end of the history list.
|
||||
The associated data field (if any) is set to NULL. */
|
||||
-extern void add_history PARAMS((const char *));
|
||||
+extern void add_history PARAMS((const char *, int ));
|
||||
|
||||
/* Change the timestamp associated with the most recent history entry to
|
||||
STRING. */
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue