root
12 years ago
parent
f71709b406
commit
ea7315799f
@ -0,0 +1,58 @@
|
||||
--- localepurge
|
||||
+++ localepurge
|
||||
@@ -1,14 +1,14 @@
|
||||
-#!/bin/bash
|
||||
+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
|
||||
|
||||
# Deleting all locale files on system
|
||||
# *not* listed in /etc/locale.nopurge
|
||||
|
||||
set -e
|
||||
|
||||
-LOCALEDIRS="/usr/share/locale /usr/local/share/locale /usr/kde/?.?/share/locale /opt/sun-jdk-*/jre/lib/locale /opt/sun-jre-bin-*/lib/locale /usr/lib/locale"
|
||||
-MANPAGEDIRS="/usr/share/man /usr/man /usr/local/share/man /usr/kde/?.?/share/man /usr/kde/?.?/man /opt/sun-jdk-*/man /opt/sun-jre-bin-*/man"
|
||||
-LOCALELIST="/var/cache/localepurge/localelist"
|
||||
-CONFIGFILE="/etc/locale.nopurge"
|
||||
+LOCALEDIRS="@GENTOO_PORTAGE_EPREFIX@/usr/share/locale @GENTOO_PORTAGE_EPREFIX@/usr/local/share/locale @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/share/locale @GENTOO_PORTAGE_EPREFIX@/opt/sun-jdk-*/jre/lib/locale @GENTOO_PORTAGE_EPREFIX@/opt/sun-jre-bin-*/lib/locale @GENTOO_PORTAGE_EPREFIX@/usr/lib/locale"
|
||||
+MANPAGEDIRS="@GENTOO_PORTAGE_EPREFIX@/usr/share/man @GENTOO_PORTAGE_EPREFIX@/usr/man @GENTOO_PORTAGE_EPREFIX@/usr/local/share/man @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/share/man @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/man @GENTOO_PORTAGE_EPREFIX@/opt/sun-jdk-*/man @GENTOO_PORTAGE_EPREFIX@/opt/sun-jre-bin-*/man"
|
||||
+LOCALELIST="@GENTOO_PORTAGE_EPREFIX@/var/cache/localepurge/localelist"
|
||||
+CONFIGFILE="@GENTOO_PORTAGE_EPREFIX@/etc/locale.nopurge"
|
||||
VERSION="0.5.3.2"
|
||||
|
||||
LOCALETOTAL=0
|
||||
@@ -22,7 +22,7 @@
|
||||
BRACKET=$'\e[34;01m'
|
||||
BOLD=$'\e[1m'
|
||||
|
||||
-ACTION="/bin/rm -vf"
|
||||
+ACTION="@GENTOO_PORTAGE_EPREFIX@/bin/rm -vf"
|
||||
|
||||
eerror () {
|
||||
echo -e " ${BAD}*${NORMAL} $*" 2> /dev/stderr
|
||||
@@ -42,7 +42,7 @@
|
||||
print() {
|
||||
for x in $@; do
|
||||
if [ "${x}" = "" ]; then return 0
|
||||
- else /bin/echo $x
|
||||
+ else @GENTOO_PORTAGE_EPREFIX@/bin/echo $x
|
||||
fi
|
||||
done
|
||||
}
|
||||
@@ -165,7 +165,7 @@
|
||||
einfo "localepurge: processing locale files in ${LOCALEDIR} ..."
|
||||
fi
|
||||
|
||||
- for LOCALE in `/bin/ls ${LOCALEDIR}`; do
|
||||
+ for LOCALE in `@GENTOO_PORTAGE_EPREFIX@/bin/ls ${LOCALEDIR}`; do
|
||||
if echo "${PURGELIST}" | grep -xq ${LOCALE}; then
|
||||
if [ -d ${LOCALEDIR}/${LOCALE}/LC_MESSAGES ]; then
|
||||
if [ "${LIST}" = "enabled" ]; then
|
||||
@@ -203,7 +203,7 @@
|
||||
einfo "localepurge: processing man pages in ${MANPAGEDIR} ..."
|
||||
fi
|
||||
|
||||
- for LOCALE in `/bin/ls ${MANPAGEDIR} | grep -v ^man[1-9]`; do
|
||||
+ for LOCALE in `@GENTOO_PORTAGE_EPREFIX@/bin/ls ${MANPAGEDIR} | grep -v ^man[1-9]`; do
|
||||
if echo "${PURGELIST}" | grep -xq ${LOCALE}; then
|
||||
if [ -d ${MANPAGEDIR}/${LOCALE} ]; then
|
||||
if [ "${LIST}" = "enabled" ]; then
|
||||
@ -1,3 +1,2 @@
|
||||
DIST system-config-printer-1.3.6.tar.xz 988332 SHA256 412f38c45d13763f69872b737f9b7885f0633704a4ef71eaae7b8c30e6dd7013 SHA512 22556b44ac56ef4100753c27d3c5e26ff772f305d54bb13753b7c7a965e31d155e8893a0c4688119fd575a17962f22154bb2e518830121498f98dfc1f95d4978 WHIRLPOOL 94b3bdb2ecf08091c2a0d7953136cff86d305c2ce08d990d61841d753f6a2b1d2308384a020789189acf1506f66e2c9f19285f0d4e69aa6ad85cd96950c27ac4
|
||||
DIST system-config-printer-1.3.7.tar.xz 990392 SHA256 bd2d16b1b00e94b05178697c566b4434288557df8faf56a65a71fc4994cd5e4a SHA512 396a1f7dd346c10bda7cfe509a66e69232b55913275fb6026c1c3120a5ce0f37360776ca54c614c14fec83fa4d7af02a1467bc3623ee059b109d09012095ae5d WHIRLPOOL ffeae0a0d61ab11369f959c3d1fd0e0658b90de12c4dbd773c6f7825cc55e1f4834f5cb75af6629baa416a02cf9d2bc55a14e7dc98958decf8bd7f117c91ebd6
|
||||
DIST system-config-printer-1.3.11.tar.xz 947488 SHA256 13816276895ca60c11ebc77b4209d30707b18c0489e247ea219474ee4a2f63c3 SHA512 4e50e973e404f959d8cb5b25dd6a38aa40f558408eb9818b3eb3b267b9a54f13aa97f05343cc0353ab36b32ac0a229d77109efd79b5e598fe43173072be02fac WHIRLPOOL d2372eb97263e84be9efd9bd6e190ddab2a75a327b0ece6f44ff8c9d1ee12484a82c3a2c5a2124195b0e45aa21fe3298de1025dce806ad195a7a1a84bdea80ec
|
||||
DIST system-config-printer-1.3.9.tar.xz 992152 SHA256 86a655d6599484cafe57f11694d9e2d9767ece03328a8fc8254aa92c8162dfe0 SHA512 98ffcbd36ee7c70fc349a945a75b5d2ed70cc1d08b2fe4eb2dc66d0ca887675956c6dc31728a2ba0e15b5742159dd6a9b11af204090a84d5b54f3237bcae62f1 WHIRLPOOL bd81593a7bc7082157ba9e9635aa3df9d0fe6c8fcd5886933781df3d93de9c889e51df5645d3bea6bd9b8448f57d65ef37ce88445cb695b734155772b794bb23
|
||||
|
||||
@ -1,168 +0,0 @@
|
||||
diff -ruN system-config-printer-1.3.5/Makefile.am my/Makefile.am
|
||||
--- system-config-printer-1.3.5/Makefile.am 2011-07-28 18:04:13.000000000 +0200
|
||||
+++ my/Makefile.am 2011-08-10 00:56:28.296077828 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-CFLAGS=-g -O2 -Wall
|
||||
+CFLAGS=-Wall
|
||||
|
||||
SUBDIRS=po
|
||||
|
||||
@@ -83,99 +83,21 @@
|
||||
rm -f .stamp-distutils-in-builddir
|
||||
|
||||
nobase_pkgdata_SCRIPTS= \
|
||||
- check-device-ids.py \
|
||||
- pysmb.py \
|
||||
- scp-dbus-service.py \
|
||||
- system-config-printer.py \
|
||||
- troubleshoot/__init__.py \
|
||||
- applet.py
|
||||
+ pysmb.py
|
||||
|
||||
nobase_pkgdata_DATA= \
|
||||
- asyncconn.py \
|
||||
- asyncipp.py \
|
||||
- asyncpk1.py \
|
||||
- authconn.py \
|
||||
config.py \
|
||||
- cupspk.py \
|
||||
debug.py \
|
||||
dnssdresolve.py \
|
||||
- errordialogs.py \
|
||||
- HIG.py \
|
||||
firewall.py \
|
||||
- gui.py \
|
||||
- gtkinklevel.py \
|
||||
- gtkspinner.py \
|
||||
installpackage.py \
|
||||
- jobviewer.py \
|
||||
monitor.py \
|
||||
- newprinter.py \
|
||||
- options.py \
|
||||
- optionwidgets.py \
|
||||
PhysicalDevice.py \
|
||||
- ppdcache.py \
|
||||
ppdippstr.py \
|
||||
- ppdsloader.py \
|
||||
- printerproperties.py \
|
||||
probe_printer.py \
|
||||
- gtk_label_autowrap.py \
|
||||
SearchCriterion.py \
|
||||
- serversettings.py \
|
||||
smburi.py \
|
||||
- statereason.py \
|
||||
- timedops.py \
|
||||
- ToolbarSearchEntry.py \
|
||||
- userdefault.py \
|
||||
- ui/AboutDialog.ui \
|
||||
- ui/ConnectDialog.ui \
|
||||
- ui/ConnectingDialog.ui \
|
||||
- ui/InstallDialog.ui \
|
||||
- ui/JobsWindow.ui \
|
||||
- ui/NewPrinterName.ui \
|
||||
- ui/NewPrinterWindow.ui \
|
||||
- ui/PrinterPropertiesDialog.ui \
|
||||
- ui/PrintersWindow.ui \
|
||||
- ui/ServerSettingsDialog.ui \
|
||||
- ui/SMBBrowseDialog.ui \
|
||||
- ui/statusicon_popupmenu.ui \
|
||||
- ui/WaitWindow.ui \
|
||||
- icons/i-network-printer.png \
|
||||
- troubleshoot/base.py \
|
||||
- troubleshoot/CheckLocalServerPublishing.py \
|
||||
- troubleshoot/CheckNetworkServerSanity.py \
|
||||
- troubleshoot/CheckPPDSanity.py \
|
||||
- troubleshoot/CheckPrinterSanity.py \
|
||||
- troubleshoot/CheckSELinux.py \
|
||||
- troubleshoot/CheckUSBPermissions.py \
|
||||
- troubleshoot/ChooseNetworkPrinter.py \
|
||||
- troubleshoot/ChoosePrinter.py \
|
||||
- troubleshoot/DeviceListed.py \
|
||||
- troubleshoot/ErrorLogCheckpoint.py \
|
||||
- troubleshoot/ErrorLogFetch.py \
|
||||
- troubleshoot/ErrorLogParse.py \
|
||||
- troubleshoot/Locale.py \
|
||||
- troubleshoot/LocalOrRemote.py \
|
||||
- troubleshoot/NetworkCUPSPrinterShared.py \
|
||||
- troubleshoot/PrinterStateReasons.py \
|
||||
- troubleshoot/PrintTestPage.py \
|
||||
- troubleshoot/QueueNotEnabled.py \
|
||||
- troubleshoot/QueueRejectingJobs.py \
|
||||
- troubleshoot/RemoteAddress.py \
|
||||
- troubleshoot/SchedulerNotRunning.py \
|
||||
- troubleshoot/ServerFirewalled.py \
|
||||
- troubleshoot/Shrug.py \
|
||||
- troubleshoot/VerifyPackages.py \
|
||||
- troubleshoot/Welcome.py \
|
||||
- xml/preferreddrivers.rng \
|
||||
- xml/validate.py
|
||||
-
|
||||
-cupshelpersdir=$(sysconfdir)/cupshelpers
|
||||
-cupshelpers_DATA=\
|
||||
- xml/preferreddrivers.xml
|
||||
-
|
||||
-bin_SCRIPTS= \
|
||||
- system-config-printer \
|
||||
- system-config-printer-applet \
|
||||
- dbus/scp-dbus-service
|
||||
+ statereason.py
|
||||
|
||||
if UDEV_RULES
|
||||
udevrulesdir=$(sysconfdir)/udev/rules.d
|
||||
@@ -201,56 +123,17 @@
|
||||
|
||||
endif
|
||||
|
||||
-man_MANS= \
|
||||
- man/system-config-printer.1 \
|
||||
- man/system-config-printer-applet.1
|
||||
-
|
||||
dbus_DATA = \
|
||||
dbus/com.redhat.NewPrinterNotification.conf \
|
||||
dbus/com.redhat.PrinterDriversInstaller.conf
|
||||
dbusdir = $(sysconfdir)/dbus-1/system.d/
|
||||
|
||||
-dbusinterfaces_DATA = \
|
||||
- dbus/org.fedoraproject.Config.Printing.xml
|
||||
-dbusinterfacesdir = $(datadir)/dbus-1/interfaces/
|
||||
-
|
||||
-dbusservices_DATA = \
|
||||
- dbus/org.fedoraproject.Config.Printing.service
|
||||
-dbusservicesdir = $(datadir)/dbus-1/services/
|
||||
-
|
||||
-desktop_DATA =\
|
||||
- system-config-printer.desktop \
|
||||
- print-applet.desktop
|
||||
desktopdir = $(datadir)/applications/
|
||||
autostartdir = $(sysconfdir)/xdg/autostart/
|
||||
|
||||
DESKTOP_VENDOR=@DESKTOPVENDOR@
|
||||
DESKTOP_PREFIX=@DESKTOPPREFIX@
|
||||
|
||||
-install-desktopDATA: $(desktop_DATA)
|
||||
- mkdir -p $(DESTDIR)$(desktopdir)
|
||||
- mkdir -p $(DESTDIR)$(desktopdir)
|
||||
- desktop-file-install $(DESKTOP_VENDOR) \
|
||||
- --dir $(DESTDIR)$(desktopdir) \
|
||||
- --add-category System \
|
||||
- --add-category Settings \
|
||||
- --add-category HardwareSettings \
|
||||
- --add-category Printing \
|
||||
- --add-category GTK \
|
||||
- system-config-printer.desktop
|
||||
- desktop-file-install $(DESKTOP_VENDOR) \
|
||||
- --dir $(DESTDIR)$(autostartdir) \
|
||||
- --add-category System \
|
||||
- --add-category Monitor \
|
||||
- --add-category GTK \
|
||||
- print-applet.desktop
|
||||
-
|
||||
-uninstall-desktopDATA:
|
||||
- rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)system-config-printer.desktop
|
||||
- rm -f $(DESTDIR)$(autostartdir)/$(DESKTOP_PREFIX)print-applet.desktop
|
||||
-
|
||||
-desktop_in_files = $(desktop_DATA:.desktop=.desktop.in)
|
||||
-
|
||||
EXTRA_DIST=\
|
||||
$(nobase_pkgdata_SCRIPTS) \
|
||||
$(nobase_pkgdata_DATA) \
|
||||
@ -1,297 +0,0 @@
|
||||
From a5d0ea6141d6317a5cafe5ee0398b4eb23041076 Mon Sep 17 00:00:00 2001
|
||||
From: Jiri Popelka <jpopelka@redhat.com>
|
||||
Date: Wed, 11 Jul 2012 14:04:47 +0200
|
||||
Subject: [PATCH] Use IPP API accessors. (trac #226)
|
||||
|
||||
CUPS 1.6 makes various structures private and
|
||||
introduces these ippGet and ippSet functions
|
||||
for all of the fields in these structures.
|
||||
http://www.cups.org/str.php?L3928
|
||||
|
||||
We define (same signatures) our own accessors when CUPS < 1.6.
|
||||
---
|
||||
udev/udev-configure-printer.c | 157 ++++++++++++++++++++++++++++++-----------
|
||||
1 file changed, 116 insertions(+), 41 deletions(-)
|
||||
|
||||
diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c
|
||||
index 8d349e4..90b1cc5 100644
|
||||
--- a/udev/udev-configure-printer.c
|
||||
+++ b/udev/udev-configure-printer.c
|
||||
@@ -52,6 +52,81 @@
|
||||
#define MATCH_ONLY_DISABLED 1
|
||||
#define USB_URI_MAP "/var/run/udev-configure-printer/usb-uris"
|
||||
|
||||
+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
|
||||
+#define HAVE_CUPS_1_6 1
|
||||
+#endif
|
||||
+
|
||||
+/*
|
||||
+ * CUPS 1.6 makes various structures private and
|
||||
+ * introduces these ippGet and ippSet functions
|
||||
+ * for all of the fields in these structures.
|
||||
+ * http://www.cups.org/str.php?L3928
|
||||
+ * We define (same signatures) our own accessors when CUPS < 1.6.
|
||||
+ */
|
||||
+#ifndef HAVE_CUPS_1_6
|
||||
+const char *
|
||||
+ippGetName(ipp_attribute_t *attr)
|
||||
+{
|
||||
+ return (attr->name);
|
||||
+}
|
||||
+
|
||||
+ipp_op_t
|
||||
+ippGetOperation(ipp_t *ipp)
|
||||
+{
|
||||
+ return (ipp->request.op.operation_id);
|
||||
+}
|
||||
+
|
||||
+ipp_status_t
|
||||
+ippGetStatusCode(ipp_t *ipp)
|
||||
+{
|
||||
+ return (ipp->request.status.status_code);
|
||||
+}
|
||||
+
|
||||
+ipp_tag_t
|
||||
+ippGetGroupTag(ipp_attribute_t *attr)
|
||||
+{
|
||||
+ return (attr->group_tag);
|
||||
+}
|
||||
+
|
||||
+ipp_tag_t
|
||||
+ippGetValueTag(ipp_attribute_t *attr)
|
||||
+{
|
||||
+ return (attr->value_tag);
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+ippGetInteger(ipp_attribute_t *attr,
|
||||
+ int element)
|
||||
+{
|
||||
+ return (attr->values[element].integer);
|
||||
+}
|
||||
+
|
||||
+const char *
|
||||
+ippGetString(ipp_attribute_t *attr,
|
||||
+ int element,
|
||||
+ const char **language)
|
||||
+{
|
||||
+ return (attr->values[element].string.text);
|
||||
+}
|
||||
+
|
||||
+ipp_attribute_t *
|
||||
+ippFirstAttribute(ipp_t *ipp)
|
||||
+{
|
||||
+ if (!ipp)
|
||||
+ return (NULL);
|
||||
+ return (ipp->current = ipp->attrs);
|
||||
+}
|
||||
+
|
||||
+ipp_attribute_t *
|
||||
+ippNextAttribute(ipp_t *ipp)
|
||||
+{
|
||||
+ if (!ipp || !ipp->current)
|
||||
+ return (NULL);
|
||||
+ return (ipp->current = ipp->current->next);
|
||||
+}
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
struct device_uris
|
||||
{
|
||||
size_t n_uris;
|
||||
@@ -475,7 +550,7 @@ device_id_from_devpath (const char *devpath,
|
||||
}
|
||||
|
||||
/* For devices discovered via the usblp kernel module we read out the number
|
||||
- * of the /dev/usb/lp* device file, as there can be queues set up with
|
||||
+ * of the /dev/usb/lp* device file, as there can be queues set up with
|
||||
* non-standard CUPS backends based on the /dev/usb/lp* device file and
|
||||
* we want to avoid that an additional queue with a standard CUPS backend
|
||||
* gets set up.
|
||||
@@ -767,15 +842,15 @@ cupsDoRequestOrDie (http_t *http,
|
||||
if (answer == NULL)
|
||||
{
|
||||
syslog (LOG_ERR, "failed to send IPP request %d",
|
||||
- request->request.op.operation_id);
|
||||
+ ippGetOperation (request));
|
||||
exit (1);
|
||||
}
|
||||
|
||||
- if (answer->request.status.status_code > IPP_OK_CONFLICT)
|
||||
+ if (ippGetStatusCode (answer) > IPP_OK_CONFLICT)
|
||||
{
|
||||
syslog (LOG_ERR, "IPP request %d failed (%d)",
|
||||
- request->request.op.operation_id,
|
||||
- answer->request.status.status_code);
|
||||
+ ippGetOperation (request),
|
||||
+ ippGetStatusCode (answer));
|
||||
exit (1);
|
||||
}
|
||||
|
||||
@@ -843,26 +918,26 @@ find_matching_device_uris (struct device_id *id,
|
||||
answer = cupsDoRequestOrDie (cups, request, "/");
|
||||
httpClose (cups);
|
||||
|
||||
- for (attr = answer->attrs; attr; attr = attr->next)
|
||||
+ for (attr = ippFirstAttribute (answer); attr; attr = ippNextAttribute (answer))
|
||||
{
|
||||
const char *device_uri = NULL;
|
||||
struct device_id this_id;
|
||||
this_id.full_device_id = this_id.mfg = this_id.mdl = this_id.sern = NULL;
|
||||
|
||||
- while (attr && attr->group_tag != IPP_TAG_PRINTER)
|
||||
- attr = attr->next;
|
||||
+ while (attr && ippGetGroupTag (attr) != IPP_TAG_PRINTER)
|
||||
+ attr = ippNextAttribute (answer);
|
||||
|
||||
if (!attr)
|
||||
break;
|
||||
|
||||
- for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next)
|
||||
+ for (; attr && ippGetGroupTag (attr) == IPP_TAG_PRINTER; attr = ippNextAttribute (answer))
|
||||
{
|
||||
- if (attr->value_tag == IPP_TAG_URI &&
|
||||
- !strcmp (attr->name, "device-uri"))
|
||||
- device_uri = attr->values[0].string.text;
|
||||
- else if (attr->value_tag == IPP_TAG_TEXT &&
|
||||
- !strcmp (attr->name, "device-id"))
|
||||
- parse_device_id (attr->values[0].string.text, &this_id);
|
||||
+ if (ippGetValueTag (attr) == IPP_TAG_URI &&
|
||||
+ !strcmp (ippGetName (attr), "device-uri"))
|
||||
+ device_uri = ippGetString (attr, 0, NULL);
|
||||
+ else if (ippGetValueTag (attr) == IPP_TAG_TEXT &&
|
||||
+ !strcmp (ippGetName (attr), "device-id"))
|
||||
+ parse_device_id (ippGetString (attr, 0, NULL), &this_id);
|
||||
}
|
||||
|
||||
/* Only use device schemes in our preference order for matching
|
||||
@@ -1173,9 +1248,9 @@ for_each_matching_queue (struct device_uris *device_uris,
|
||||
exit (1);
|
||||
}
|
||||
|
||||
- if (answer->request.status.status_code > IPP_OK_CONFLICT)
|
||||
+ if (ippGetStatusCode (answer) > IPP_OK_CONFLICT)
|
||||
{
|
||||
- if (answer->request.status.status_code == IPP_NOT_FOUND)
|
||||
+ if (ippGetStatusCode (answer) == IPP_NOT_FOUND)
|
||||
{
|
||||
/* No printer queues configured. */
|
||||
ippDelete (answer);
|
||||
@@ -1183,7 +1258,7 @@ for_each_matching_queue (struct device_uris *device_uris,
|
||||
}
|
||||
|
||||
syslog (LOG_ERR, "CUPS-Get-Printers request failed (%d)",
|
||||
- answer->request.status.status_code);
|
||||
+ ippGetStatusCode (answer));
|
||||
exit (1);
|
||||
}
|
||||
|
||||
@@ -1203,7 +1278,7 @@ for_each_matching_queue (struct device_uris *device_uris,
|
||||
usblpdevstr1, usblpdevstr2);
|
||||
}
|
||||
|
||||
- for (attr = answer->attrs; attr; attr = attr->next)
|
||||
+ for (attr = ippFirstAttribute (answer); attr; attr = ippNextAttribute (answer))
|
||||
{
|
||||
const char *this_printer_uri = NULL;
|
||||
const char *this_device_uri = NULL;
|
||||
@@ -1213,27 +1288,27 @@ for_each_matching_queue (struct device_uris *device_uris,
|
||||
char *this_device_uri_n, *device_uri_n;
|
||||
const char *ps1, *ps2, *pi1, *pi2;
|
||||
|
||||
- while (attr && attr->group_tag != IPP_TAG_PRINTER)
|
||||
- attr = attr->next;
|
||||
+ while (attr && ippGetGroupTag (attr) != IPP_TAG_PRINTER)
|
||||
+ attr = ippNextAttribute (answer);
|
||||
|
||||
if (!attr)
|
||||
break;
|
||||
|
||||
- for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next)
|
||||
+ for (; attr && ippGetGroupTag (attr) == IPP_TAG_PRINTER; attr = ippNextAttribute (answer))
|
||||
{
|
||||
- if (attr->value_tag == IPP_TAG_URI)
|
||||
+ if (ippGetValueTag (attr) == IPP_TAG_URI)
|
||||
{
|
||||
- if (!strcmp (attr->name, "device-uri"))
|
||||
- this_device_uri = attr->values[0].string.text;
|
||||
- else if (!strcmp (attr->name, "printer-uri-supported"))
|
||||
- this_printer_uri = attr->values[0].string.text;
|
||||
+ if (!strcmp (ippGetName (attr), "device-uri"))
|
||||
+ this_device_uri = ippGetString (attr, 0, NULL);
|
||||
+ else if (!strcmp (ippGetName (attr), "printer-uri-supported"))
|
||||
+ this_printer_uri = ippGetString (attr, 0, NULL);
|
||||
}
|
||||
- else if (attr->value_tag == IPP_TAG_TEXT &&
|
||||
- !strcmp (attr->name, "printer-state-message"))
|
||||
- printer_state_message = attr->values[0].string.text;
|
||||
- else if (attr->value_tag == IPP_TAG_ENUM &&
|
||||
- !strcmp (attr->name, "printer-state"))
|
||||
- state = attr->values[0].integer;
|
||||
+ else if (ippGetValueTag (attr) == IPP_TAG_TEXT &&
|
||||
+ !strcmp (ippGetName (attr), "printer-state-message"))
|
||||
+ printer_state_message = ippGetString (attr, 0, NULL);
|
||||
+ else if (ippGetValueTag (attr) == IPP_TAG_ENUM &&
|
||||
+ !strcmp (ippGetName (attr), "printer-state"))
|
||||
+ state = ippGetInteger (attr, 0);
|
||||
}
|
||||
|
||||
if (!this_device_uri)
|
||||
@@ -1254,8 +1329,8 @@ for_each_matching_queue (struct device_uris *device_uris,
|
||||
level USB (libusb) we cannot simply compare URIs, must
|
||||
consider also URIs as equal if one has an "interface"
|
||||
or "serial" attribute and the other not. If both have
|
||||
- the attribute it must naturally match. We check which attributes
|
||||
- are there and this way determine up to which length the two URIs
|
||||
+ the attribute it must naturally match. We check which attributes
|
||||
+ are there and this way determine up to which length the two URIs
|
||||
must match. Here we can assume that if a URI has an "interface"
|
||||
attribute it has also a "serial" attribute, as this URI is
|
||||
an URI obtained via libusb and these always have a "serial"
|
||||
@@ -1278,13 +1353,13 @@ for_each_matching_queue (struct device_uris *device_uris,
|
||||
syslog (LOG_DEBUG, "URI of detected printer: %s, normalized: %s",
|
||||
device_uris->uri[i], device_uri_n);
|
||||
if ((!strncmp (device_uris->uri[i], this_device_uri, l)) ||
|
||||
- (strstr (device_uri_n, this_device_uri_n) ==
|
||||
+ (strstr (device_uri_n, this_device_uri_n) ==
|
||||
device_uri_n) ||
|
||||
- (strstr (this_device_uri_n, device_uri_n) ==
|
||||
+ (strstr (this_device_uri_n, device_uri_n) ==
|
||||
this_device_uri_n) ||
|
||||
((strlen(usblpdev) > 0) &&
|
||||
((strstr (this_device_uri, usblpdevstr1) != NULL) ||
|
||||
- (strstr (this_device_uri, usblpdevstr2) != NULL))))
|
||||
+ (strstr (this_device_uri, usblpdevstr2) != NULL))))
|
||||
{
|
||||
matched++;
|
||||
syslog (LOG_DEBUG, "Queue %s has matching device URI",
|
||||
@@ -1330,7 +1405,7 @@ enable_queue (const char *printer_uri, void *context)
|
||||
return;
|
||||
}
|
||||
|
||||
- if (answer->request.status.status_code > IPP_OK_CONFLICT)
|
||||
+ if (ippGetStatusCode (answer) > IPP_OK_CONFLICT)
|
||||
syslog (LOG_ERR, "IPP-Resume-Printer request failed");
|
||||
else
|
||||
syslog (LOG_INFO, "Re-enabled printer %s", printer_uri);
|
||||
@@ -1517,7 +1592,7 @@ remove_queue (const char *printer_uri)
|
||||
return;
|
||||
}
|
||||
|
||||
- if (answer->request.status.status_code > IPP_OK_CONFLICT)
|
||||
+ if (ippGetStatusCode (answer) > IPP_OK_CONFLICT)
|
||||
syslog (LOG_ERR, "IPP-Delete-Printer request failed");
|
||||
else
|
||||
syslog (LOG_INFO, "Deleted printer %s as the corresponding device "
|
||||
@@ -1551,7 +1626,7 @@ disable_queue (const char *printer_uri, void *context)
|
||||
return;
|
||||
}
|
||||
|
||||
- if (answer->request.status.status_code > IPP_OK_CONFLICT)
|
||||
+ if (ippGetStatusCode (answer) > IPP_OK_CONFLICT)
|
||||
syslog (LOG_ERR, "IPP-Pause-Printer request failed");
|
||||
else
|
||||
syslog (LOG_INFO, "Disabled printer %s as the corresponding device "
|
||||
--
|
||||
1.7.9.2
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
From cbacff0c9f7e3e6549c9b33a42e805a935db36e6 Mon Sep 17 00:00:00 2001
|
||||
From: Jiri Popelka <jpopelka@redhat.com>
|
||||
Date: Tue, 5 Jun 2012 14:28:36 +0200
|
||||
Subject: [PATCH] udev: replace udev_get_sys_path() with hard-coded "/sys"
|
||||
(trac #223)
|
||||
|
||||
udev_get_sys_path() is no longer provided by libudev
|
||||
---
|
||||
udev/udev-configure-printer.c | 6 ++----
|
||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c
|
||||
index 1d89f9a..8d349e4 100644
|
||||
--- a/udev/udev-configure-printer.c
|
||||
+++ b/udev/udev-configure-printer.c
|
||||
@@ -451,7 +451,6 @@ device_id_from_devpath (const char *devpath,
|
||||
struct usb_uri_map_entry *entry;
|
||||
struct udev *udev;
|
||||
struct udev_device *dev, *parent_dev = NULL;
|
||||
- const char *sys;
|
||||
const char *idVendorStr, *idProductStr, *serial;
|
||||
char *end;
|
||||
unsigned long idVendor, idProduct;
|
||||
@@ -500,8 +499,7 @@ device_id_from_devpath (const char *devpath,
|
||||
*dest = '\0';
|
||||
}
|
||||
|
||||
- sys = udev_get_sys_path (udev);
|
||||
- syslen = strlen (sys);
|
||||
+ syslen = strlen ("/sys");
|
||||
devpathlen = strlen (devpath);
|
||||
syspath = malloc (syslen + devpathlen + 1);
|
||||
if (syspath == NULL)
|
||||
@@ -511,7 +509,7 @@ device_id_from_devpath (const char *devpath,
|
||||
exit (1);
|
||||
}
|
||||
|
||||
- memcpy (syspath, sys, syslen);
|
||||
+ memcpy (syspath, "/sys", syslen);
|
||||
memcpy (syspath + syslen, devpath, devpathlen);
|
||||
syspath[syslen + devpathlen] = '\0';
|
||||
|
||||
--
|
||||
1.7.10.2
|
||||
|
||||
@ -1,92 +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/system-config-printer-common/system-config-printer-common-1.3.6.ebuild,v 1.13 2012/07/18 21:11:29 dilfridge Exp $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
PYTHON_DEPEND="2"
|
||||
WANT_AUTOMAKE="1.11"
|
||||
inherit eutils python autotools
|
||||
|
||||
MY_P="${PN%-common}-${PV}"
|
||||
|
||||
DESCRIPTION="Common modules of Red Hat's printer administration tool"
|
||||
HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
|
||||
SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.3/${MY_P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sh sparc x86"
|
||||
SLOT="0"
|
||||
IUSE="doc policykit"
|
||||
|
||||
# Needs cups running, bug 284005
|
||||
RESTRICT="test"
|
||||
|
||||
# system-config-printer split since 1.1.3
|
||||
COMMON_DEPEND="
|
||||
dev-libs/glib:2
|
||||
dev-libs/libxml2[python]
|
||||
dev-python/dbus-python
|
||||
>=dev-python/pycups-1.9.53
|
||||
>=dev-python/pygobject-2.21.5:2
|
||||
<net-print/cups-1.6.0[dbus]
|
||||
sys-fs/udev
|
||||
virtual/libusb:0
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-util/intltool
|
||||
virtual/pkgconfig
|
||||
doc? ( dev-python/epydoc )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!app-admin/system-config-printer:0
|
||||
!<app-admin/system-config-printer-gnome-${PV}
|
||||
policykit? ( sys-auth/polkit )
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${PN}-1.3.5-split.patch"
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--disable-nls \
|
||||
--with-udev-rules
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "emake failed"
|
||||
if use doc; then
|
||||
emake html || die "emake html failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodoc AUTHORS ChangeLog README || die "dodoc failed"
|
||||
|
||||
if use doc; then
|
||||
dohtml -r html/ || die "installing html docs failed"
|
||||
fi
|
||||
|
||||
emake DESTDIR="${ED}" install \
|
||||
udevrulesdir=/lib/udev/rules.d \
|
||||
udevhelperdir=/lib/udev \
|
||||
|| die "emake install failed"
|
||||
|
||||
python_convert_shebangs -q -r $(python_get_version) "${ED}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
python_mod_optimize cupshelpers
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
python_mod_cleanup cupshelpers /usr/share/system-config-printer
|
||||
}
|
||||
@ -1,92 +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/system-config-printer-common/system-config-printer-common-1.3.7.ebuild,v 1.13 2012/07/18 21:11:29 dilfridge Exp $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
PYTHON_DEPEND="2"
|
||||
WANT_AUTOMAKE="1.11"
|
||||
inherit eutils python autotools
|
||||
|
||||
MY_P="${PN%-common}-${PV}"
|
||||
|
||||
DESCRIPTION="Common modules of Red Hat's printer administration tool"
|
||||
HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
|
||||
SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.3/${MY_P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sh sparc x86"
|
||||
SLOT="0"
|
||||
IUSE="doc policykit"
|
||||
|
||||
# Needs cups running, bug 284005
|
||||
RESTRICT="test"
|
||||
|
||||
# system-config-printer split since 1.1.3
|
||||
COMMON_DEPEND="
|
||||
dev-libs/glib:2
|
||||
dev-libs/libxml2[python]
|
||||
dev-python/dbus-python
|
||||
>=dev-python/pycups-1.9.53
|
||||
>=dev-python/pygobject-2.21.5:2
|
||||
<net-print/cups-1.6.0[dbus]
|
||||
>=sys-fs/udev-164-r2
|
||||
virtual/libusb:0
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-util/intltool
|
||||
virtual/pkgconfig
|
||||
doc? ( dev-python/epydoc )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!app-admin/system-config-printer:0
|
||||
!<app-admin/system-config-printer-gnome-${PV}
|
||||
policykit? ( sys-auth/polkit )
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${PN}-1.3.5-split.patch"
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--disable-nls \
|
||||
--with-udev-rules
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "emake failed"
|
||||
if use doc; then
|
||||
emake html || die "emake html failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodoc AUTHORS ChangeLog README || die "dodoc failed"
|
||||
|
||||
if use doc; then
|
||||
dohtml -r html/ || die "installing html docs failed"
|
||||
fi
|
||||
|
||||
emake DESTDIR="${ED}" install \
|
||||
udevrulesdir=/lib/udev/rules.d \
|
||||
udevhelperdir=/lib/udev \
|
||||
|| die "emake install failed"
|
||||
|
||||
python_convert_shebangs -q -r $(python_get_version) "${ED}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
python_mod_optimize cupshelpers
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
python_mod_cleanup cupshelpers /usr/share/system-config-printer
|
||||
}
|
||||
@ -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/system-config-printer-common/system-config-printer-common-1.3.9-r4.ebuild,v 1.1 2012/07/18 21:11:29 dilfridge Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
PYTHON_DEPEND="2:2.6"
|
||||
WANT_AUTOMAKE="1.11"
|
||||
|
||||
inherit autotools eutils python
|
||||
|
||||
MY_P=${PN%-common}-${PV}
|
||||
|
||||
DESCRIPTION="Common modules of Red Hat's printer administration tool"
|
||||
HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
|
||||
SRC_URI="http://cyberelk.net/tim/data/${PN/-common}/${PV%.*}/${MY_P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
|
||||
SLOT="0"
|
||||
IUSE="doc policykit"
|
||||
|
||||
# Needs cups running, bug 284005
|
||||
RESTRICT="test"
|
||||
|
||||
# system-config-printer split since 1.1.3
|
||||
COMMON_DEPEND="
|
||||
>=dev-libs/glib-2
|
||||
dev-libs/libxml2[python]
|
||||
dev-python/dbus-python
|
||||
>=dev-python/pycups-1.9.60
|
||||
dev-python/pycurl
|
||||
>=dev-python/pygobject-2.21.5:2
|
||||
net-print/cups[dbus]
|
||||
>=sys-fs/udev-164-r2
|
||||
virtual/libusb:0
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-util/intltool
|
||||
virtual/pkgconfig
|
||||
doc? ( dev-python/epydoc )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!<app-admin/system-config-printer-gnome-${PV}
|
||||
policykit? ( >=sys-auth/polkit-0.104-r1 )
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${PN}-1.3.9-split.patch \
|
||||
"${FILESDIR}"/${PN}-1.3.9-cups_filters_path.patch \
|
||||
"${FILESDIR}"/${PN}-1.3.9-udev185.patch \
|
||||
"${FILESDIR}"/${PN}-1.3.9-cups16.patch
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--disable-nls \
|
||||
--with-udev-rules
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
use doc && emake html
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
udevhelperdir=/lib/udev \
|
||||
udevrulesdir=/lib/udev/rules.d \
|
||||
install
|
||||
|
||||
dodoc AUTHORS ChangeLog README
|
||||
use doc && dohtml -r html/
|
||||
|
||||
python_convert_shebangs -q -r $(python_get_version) "${ED}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
python_mod_optimize cupshelpers
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
python_mod_cleanup cupshelpers /usr/share/system-config-printer
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST system-config-printer-1.3.6.tar.xz 988332 SHA256 412f38c45d13763f69872b737f9b7885f0633704a4ef71eaae7b8c30e6dd7013 SHA512 22556b44ac56ef4100753c27d3c5e26ff772f305d54bb13753b7c7a965e31d155e8893a0c4688119fd575a17962f22154bb2e518830121498f98dfc1f95d4978 WHIRLPOOL 94b3bdb2ecf08091c2a0d7953136cff86d305c2ce08d990d61841d753f6a2b1d2308384a020789189acf1506f66e2c9f19285f0d4e69aa6ad85cd96950c27ac4
|
||||
DIST system-config-printer-1.3.7.tar.xz 990392 SHA256 bd2d16b1b00e94b05178697c566b4434288557df8faf56a65a71fc4994cd5e4a SHA512 396a1f7dd346c10bda7cfe509a66e69232b55913275fb6026c1c3120a5ce0f37360776ca54c614c14fec83fa4d7af02a1467bc3623ee059b109d09012095ae5d WHIRLPOOL ffeae0a0d61ab11369f959c3d1fd0e0658b90de12c4dbd773c6f7825cc55e1f4834f5cb75af6629baa416a02cf9d2bc55a14e7dc98958decf8bd7f117c91ebd6
|
||||
DIST system-config-printer-1.3.11.tar.xz 947488 SHA256 13816276895ca60c11ebc77b4209d30707b18c0489e247ea219474ee4a2f63c3 SHA512 4e50e973e404f959d8cb5b25dd6a38aa40f558408eb9818b3eb3b267b9a54f13aa97f05343cc0353ab36b32ac0a229d77109efd79b5e598fe43173072be02fac WHIRLPOOL d2372eb97263e84be9efd9bd6e190ddab2a75a327b0ece6f44ff8c9d1ee12484a82c3a2c5a2124195b0e45aa21fe3298de1025dce806ad195a7a1a84bdea80ec
|
||||
DIST system-config-printer-1.3.9.tar.xz 992152 SHA256 86a655d6599484cafe57f11694d9e2d9767ece03328a8fc8254aa92c8162dfe0 SHA512 98ffcbd36ee7c70fc349a945a75b5d2ed70cc1d08b2fe4eb2dc66d0ca887675956c6dc31728a2ba0e15b5742159dd6a9b11af204090a84d5b54f3237bcae62f1 WHIRLPOOL bd81593a7bc7082157ba9e9635aa3df9d0fe6c8fcd5886933781df3d93de9c889e51df5645d3bea6bd9b8448f57d65ef37ce88445cb695b734155772b794bb23
|
||||
|
||||
@ -1,164 +0,0 @@
|
||||
diff -ruN system-config-printer-1.3.3/Makefile.am my/Makefile.am
|
||||
--- system-config-printer-1.3.3/Makefile.am 2011-03-16 17:44:41.000000000 +0100
|
||||
+++ my/Makefile.am 2011-03-19 01:03:54.708000002 +0100
|
||||
@@ -1,90 +1,9 @@
|
||||
-AM_CFLAGS=-g -O2 -Wall $(GLIB_CFLAGS)
|
||||
+AM_CFLAGS=-Wall $(GLIB_CFLAGS)
|
||||
|
||||
SUBDIRS=po
|
||||
|
||||
-EXPORT_MODULES= \
|
||||
- cupshelpers/__init__.py \
|
||||
- cupshelpers/cupshelpers.py \
|
||||
- cupshelpers/installdriver.py \
|
||||
- cupshelpers/ppds.py \
|
||||
- cupshelpers/openprinting.py \
|
||||
- cupshelpers/xmldriverprefs.py
|
||||
-
|
||||
-EXPORT_MODULES_GEN= \
|
||||
- cupshelpers/config.py
|
||||
-
|
||||
-### Automake hooks for Distutils.
|
||||
-# The distutils module doesn't understand srcdir != builddir,
|
||||
-# so we copy in, along with the cupshelpers modules, into
|
||||
-# the builddir for 'all', 'install-exec', and 'clean' hooks.
|
||||
-.stamp-distutils-in-builddir: setup.py $(EXPORT_MODULES)
|
||||
- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \
|
||||
- cp $(top_srcdir)/setup.py .; \
|
||||
- $(mkdir_p) cupshelpers; \
|
||||
- for file in $(EXPORT_MODULES); do \
|
||||
- cp $(top_srcdir)/$$file $$file; \
|
||||
- done; \
|
||||
- fi
|
||||
- touch .stamp-distutils-in-builddir
|
||||
-
|
||||
-dist-hook: mk-ChangeLog
|
||||
-.PHONE: mk-ChangeLog
|
||||
-mk-ChangeLog:
|
||||
- if test -d .git; then \
|
||||
- $(top_srcdir)/gitlog-to-changelog \
|
||||
- --since=2009-05-01 -- --no-merges \
|
||||
- > $(distdir)/cl ; \
|
||||
- mv -f $(distdir)/cl $(distdir)/ChangeLog ; \
|
||||
- fi
|
||||
-
|
||||
-config.py: config.py.in Makefile
|
||||
- sed \
|
||||
- -e "s|\@prefix\@|$(prefix)|" \
|
||||
- -e "s|\@datadir\@|$(datadir)|" \
|
||||
- -e "s|\@localedir\@|$(localedir)|" \
|
||||
- -e "s|\@VERSION\@|$(VERSION)|" \
|
||||
- -e "s|\@PACKAGE\@|$(PACKAGE)|" \
|
||||
- $< > $@
|
||||
-
|
||||
-cupshelpers/config.py: cupshelpers/config.py.in Makefile
|
||||
- $(mkdir_p) cupshelpers
|
||||
- sed \
|
||||
- -e "s|\@prefix\@|$(prefix)|" \
|
||||
- -e "s|\@sysconfdir\@|$(sysconfdir)|" \
|
||||
- $< > $@
|
||||
-
|
||||
-# Use distutils to build the module.
|
||||
-all-local: .stamp-distutils-in-builddir config.py cupshelpers/config.py
|
||||
- $(PYTHON) setup.py build
|
||||
-
|
||||
-# Use distutils to install the module.
|
||||
-install-exec-local: .stamp-distutils-in-builddir
|
||||
- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
|
||||
-
|
||||
-# Uninstall the module, crossing our fingers that we know enough
|
||||
-# about how distutils works to do this. Unfortunately, distutils
|
||||
-# doesn't provide a way to do this itself.
|
||||
-uninstall-local:
|
||||
- rm -f $(DESTDIR)/$(pythondir)/cupshelpers*.egg-info
|
||||
- for file in $(EXPORT_MODULES) $(EXPORT_MODULES_GEN); do \
|
||||
- rm -f $(DESTDIR)/$(pythondir)/$$file*; \
|
||||
- done
|
||||
-
|
||||
-# Tell distutils to clean up.
|
||||
-clean-local:
|
||||
- -$(PYTHON) setup.py clean --all
|
||||
- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \
|
||||
- rm -f setup.py; \
|
||||
- for file in $(EXPORT_MODULES) \
|
||||
- $(EXPORT_MODULES_GEN); do \
|
||||
- rm -f $$file*; \
|
||||
- done; \
|
||||
- fi
|
||||
- rm -f .stamp-distutils-in-builddir
|
||||
-
|
||||
nobase_pkgdata_SCRIPTS= \
|
||||
check-device-ids.py \
|
||||
- pysmb.py \
|
||||
scp-dbus-service.py \
|
||||
system-config-printer.py \
|
||||
troubleshoot/__init__.py \
|
||||
@@ -95,39 +14,26 @@
|
||||
asyncipp.py \
|
||||
asyncpk1.py \
|
||||
authconn.py \
|
||||
- config.py \
|
||||
cupspk.py \
|
||||
- debug.py \
|
||||
- dnssdresolve.py \
|
||||
errordialogs.py \
|
||||
HIG.py \
|
||||
- firewall.py \
|
||||
gui.py \
|
||||
GroupsPane.py \
|
||||
GroupsPaneModel.py \
|
||||
gtkinklevel.py \
|
||||
gtkspinner.py \
|
||||
- installpackage.py \
|
||||
jobviewer.py \
|
||||
- monitor.py \
|
||||
newprinter.py \
|
||||
options.py \
|
||||
optionwidgets.py \
|
||||
- PhysicalDevice.py \
|
||||
ppdcache.py \
|
||||
- ppdippstr.py \
|
||||
ppdsloader.py \
|
||||
printerproperties.py \
|
||||
- probe_printer.py \
|
||||
gtk_label_autowrap.py \
|
||||
- SearchCriterion.py \
|
||||
serversettings.py \
|
||||
- smburi.py \
|
||||
- statereason.py \
|
||||
timedops.py \
|
||||
ToolbarSearchEntry.py \
|
||||
userdefault.py \
|
||||
- XmlHelper.py \
|
||||
ui/AboutDialog.ui \
|
||||
ui/ConnectDialog.ui \
|
||||
ui/ConnectingDialog.ui \
|
||||
@@ -180,28 +86,10 @@
|
||||
system-config-printer-applet \
|
||||
dbus/scp-dbus-service
|
||||
|
||||
-if UDEV_RULES
|
||||
-udevrulesdir=$(sysconfdir)/udev/rules.d
|
||||
-udevrules_DATA=udev/70-printers.rules
|
||||
-udev_udev_configure_printer_SOURCES=\
|
||||
- udev/udev-configure-printer.c
|
||||
-udev_udev_configure_printer_LDADD=-lcups -ludev -lusb $(GLIB_LIBS)
|
||||
-udevhelperdir=$(sysconfdir)/udev
|
||||
-udevhelper_PROGRAMS=\
|
||||
- udev/udev-configure-printer
|
||||
-udevhelper_SCRIPTS=\
|
||||
- udev/udev-add-printer
|
||||
-endif
|
||||
-
|
||||
man_MANS= \
|
||||
man/system-config-printer.1 \
|
||||
man/system-config-printer-applet.1
|
||||
|
||||
-dbus_DATA = \
|
||||
- dbus/com.redhat.NewPrinterNotification.conf \
|
||||
- dbus/com.redhat.PrinterDriversInstaller.conf
|
||||
-dbusdir = $(sysconfdir)/dbus-1/system.d/
|
||||
-
|
||||
dbusinterfaces_DATA = \
|
||||
dbus/org.fedoraproject.Config.Printing.xml
|
||||
dbusinterfacesdir = $(datadir)/dbus-1/interfaces/
|
||||
@ -1,86 +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/system-config-printer-gnome/system-config-printer-gnome-1.3.7.ebuild,v 1.11 2012/05/21 18:41:17 tetromino Exp $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
PYTHON_DEPEND="2"
|
||||
PYTHON_USE_WITH="xml"
|
||||
WANT_AUTOMAKE="1.11"
|
||||
inherit eutils python autotools
|
||||
|
||||
MY_P="${PN%-gnome}-${PV}"
|
||||
|
||||
DESCRIPTION="GNOME frontend for a Red Hat's printer administration tool"
|
||||
HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
|
||||
SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.3/${MY_P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86"
|
||||
SLOT="0"
|
||||
IUSE="gnome-keyring"
|
||||
|
||||
# Needs cups running, bug 284005
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="
|
||||
~app-admin/system-config-printer-common-${PV}
|
||||
dev-python/notify-python
|
||||
>=dev-python/pycups-1.9.47
|
||||
>=dev-python/pygtk-2.4
|
||||
gnome-keyring? ( dev-python/gnome-keyring-python )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
>=app-text/xmlto-0.0.22
|
||||
dev-util/desktop-file-utils
|
||||
dev-util/intltool
|
||||
virtual/pkgconfig
|
||||
sys-devel/gettext
|
||||
"
|
||||
|
||||
APP_LINGUAS="ar as bg bn_IN bn br bs ca cs cy da de el en_GB es et fa fi fr gu
|
||||
he hi hr hu hy id is it ja ka kn ko lo lv mai mk ml mr ms nb nl nn or pa pl
|
||||
pt_BR pt ro ru si sk sl sr@latin sr sv ta te th tr uk vi zh_CN zh_TW"
|
||||
for X in ${APP_LINGUAS}; do
|
||||
IUSE="${IUSE} linguas_${X}"
|
||||
done
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${PN}-1.3.5-split.patch"
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
# Disable installation of translations when LINGUAS not chosen
|
||||
if [[ -z "${LINGUAS}" ]]; then
|
||||
myconf="${myconf} --disable-nls"
|
||||
else
|
||||
myconf="${myconf} --enable-nls"
|
||||
fi
|
||||
|
||||
econf \
|
||||
--with-desktop-vendor=Gentoo \
|
||||
--without-udev-rules \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodoc AUTHORS ChangeLog README || die "dodoc failed"
|
||||
|
||||
emake DESTDIR="${ED}" install || die "emake install failed"
|
||||
|
||||
python_convert_shebangs -q -r $(python_get_version) "${ED}"
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
python_mod_cleanup /usr/share/system-config-printer
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST lbzip2-0.23.tar.gz 77720 SHA256 2838cc2be818b8107ab1311208e6344baf9969168199be84287a32fef4733411 SHA512 0a7f27459c042cf84306b448b77df6605fde9c0d10a943478091774d572c5c039a69eb1ca8e8e90d279d5054dd99ac05e0f6887505cd67dc7caf5d3475ca786f WHIRLPOOL 9a3108903f31e7dae8215d1a455902f2ff9e1833b2724677342434692ce96ff290e6c366374512a41537907dffffaa229ec8953fdfa20f43e5daacf82d0355fb
|
||||
DIST lbzip2-2.1.tar.gz 616985 SHA256 c2551c219e0eff9d1bf17a13db2b6902ba5b02ca66c53e6d734bbfb5add29edc SHA512 b958d5aeea838d5a5587d380eaa1e61b44666cdc364882b0b2b7a57896f3499e1b42ccfe2548332ab7f0fe39225d9ad590110129dc32087ca5d7ef35c3da7bb1 WHIRLPOOL bfc7137d755d43fd1f71e7ff4e2c0d8fd157c0b383170af7ee3ae81355570b1880342efc2eb6a5a36f88b2f21e4ecea048bd931edaad8b06541e63424867df5e
|
||||
DIST lbzip2-2.2.tar.gz 622154 SHA256 b905f763a5859670e36b15d016fb6bb73d6718905fc0e2a9fa1dbc11f30b0d80 SHA512 9b194eee262e44d4665d97307f73f20075c301c2a8fbc0f989805359645387bb3ad0a6b7507edc5463a017eaf7002ee177e9fc00cf808c02c7a9c16e7b58b918 WHIRLPOOL 241c6cf473171be56b94efdc152eecb15482977ed47cb46ed47dad641bca9f73d7ec52f13947677aa619387707d5d17f7fa3421f9bc83fc28ced9e7c49b607d1
|
||||
|
||||
@ -0,0 +1,16 @@
|
||||
src/main.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index f030fd5..5f8290e 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -702,7 +702,7 @@ input_init(const struct arg *operand, struct stat *sbuf)
|
||||
return -1;
|
||||
}
|
||||
|
||||
- if (!S_ISREG(sbuf->st_mode)) {
|
||||
+ if (!decompress && !S_ISREG(sbuf->st_mode)) {
|
||||
warn("skipping \"%s\": not a regular file", operand->val);
|
||||
return -1;
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.2.ebuild,v 1.1 2012/08/06 06:39:25 jlec Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit autotools-utils
|
||||
|
||||
DESCRIPTION="Parallel bzip2 utility"
|
||||
HOMEPAGE="https://github.com/kjn/lbzip2/"
|
||||
SRC_URI="mirror://github/kjn/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
|
||||
IUSE="debug symlink"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${P}-s_isreg.patch )
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
--disable-silent-rules
|
||||
$(use_enable debug tracing)
|
||||
)
|
||||
autotools-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
autotools-utils_src_install
|
||||
|
||||
use symlink && dosym ${PN} /usr/bin/bzip2
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST hashcat-0.39.7z 716387 SHA256 9d86cb175030de5b5872077028456f944c18e94749fc79cb63fb2f74106bed4e SHA512 bc7058bc13cfab52d9e3ec842180bfcf3bc17628d74c79806ae0f741169960dbac97c57339ff06ada1bc898dcd1adbf3a7efd8bfbc8a83ed614d50d3d4b97e17 WHIRLPOOL dae6f8421ddf617baa17122e20a4840d67fb913b8b3fe5caf635606e37c6d3e33dc37044ad90df641fd97853d579cbaa3cf7fd6cf6f67e61efe3f7f4acedd95b
|
||||
DIST hashcat-0.40.7z 785935 SHA256 3b587185a3957f7f3e5dfe58a340d0b65bd1ee9d71a6ae5d97009b5bc21150ae SHA512 0c68877111cc3633eea332a992ee4d897fdf7875821668faaf2149d91ce15d0c973d8db83ae407051f530a97a8835338b7acda1c9577e762cef7e6e51c519751 WHIRLPOOL 9f0fed3e1e7b06338ba1a73b19fd54fe53fc9a75aad05d4909d3a2a80de941d6910d30215bb52ae6b6c52f9c3c71a07c523655512b7d7dc5aa5b8076c2131919
|
||||
|
||||
@ -0,0 +1,79 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/hashcat-bin/hashcat-bin-0.40.ebuild,v 1.1 2012/08/06 03:20:47 zerochaos Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
MY_P="hashcat-${PV}"
|
||||
|
||||
inherit eutils pax-utils
|
||||
DESCRIPTION="An multi-threaded multihash cracker"
|
||||
HOMEPAGE="http://hashcat.net/hashcat/"
|
||||
|
||||
SRC_URI="http://hashcat.net/files/${MY_P}.7z"
|
||||
|
||||
#license applies to this version per http://hashcat.net/forum/thread-1348.html
|
||||
LICENSE="hashcat"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~amd64-linux ~x64-macos ~x86 ~x86-linux"
|
||||
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/p7zip"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
RESTRICT="strip"
|
||||
QA_PREBUILT="opt/${PN}/hashcat-cli*.bin
|
||||
opt/${PN}/hashcat-cli64.app"
|
||||
|
||||
src_install() {
|
||||
dodoc docs/*
|
||||
rm -r *.exe docs || die
|
||||
use x86 || { rm hashcat-cli32.bin || die; }
|
||||
use amd64 || { rm hashcat-cli64.bin || die; }
|
||||
use x64-macos || { rm hashcat-cli64.app || die; }
|
||||
|
||||
#I assume this is needed but I didn't check
|
||||
pax-mark m hashcat-cli*.bin
|
||||
|
||||
insinto /opt/${PN}
|
||||
doins -r "${S}"/*
|
||||
|
||||
dodir /opt/bin
|
||||
if [ -f "${ED}"/opt/${PN}/hashcat-cli32.bin ]
|
||||
then
|
||||
fperms +x /opt/${PN}/hashcat-cli32.bin
|
||||
cat <<-EOF > "${ED}"/opt/bin/hashcat-cli32.bin
|
||||
#! /bin/sh
|
||||
cd "${EPREFIX}"/opt/${PN}
|
||||
echo "Warning: hashcat-cli32.bin is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
|
||||
exec ./hashcat-cli32.bin $@
|
||||
EOF
|
||||
fperms +x /opt/bin/hashcat-cli32.bin
|
||||
fi
|
||||
if [ -f "${ED}"/opt/${PN}/hashcat-cli64.bin ]
|
||||
then
|
||||
fperms +x /opt/${PN}/hashcat-cli64.bin
|
||||
cat <<-EOF > "${ED}"/opt/bin/hashcat-cli64.bin
|
||||
#! /bin/sh
|
||||
cd "${EPREFIX}"/opt/${PN}
|
||||
echo "Warning: hashcat-cli64.bin is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
|
||||
exec ./hashcat-cli64.bin $@
|
||||
EOF
|
||||
fperms +x /opt/bin/hashcat-cli64.bin
|
||||
fi
|
||||
if [ -f "${ED}"/opt/${PN}/hashcat-cli64.app ]
|
||||
then
|
||||
fperms +x /opt/${PN}/hashcat-cli64.app
|
||||
cat <<-EOF > "${ED}"/opt/bin/hashcat-cli64.app
|
||||
#! /bin/sh
|
||||
cd "${EPREFIX}"/opt/${PN}
|
||||
echo "Warning: hashcat-cli64.app is running from ${EPREFIX}/opt/${PN} so be careful of relative paths."
|
||||
exec ./hashcat-cli64.app $@
|
||||
EOF
|
||||
fperms +x /opt/bin/hashcat-cli64.app
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
https://sourceforge.net/tracker/?func=detail&aid=3554646&group_id=943&atid=100943
|
||||
|
||||
diff -ru fte.orig/src/g_unix_pipe.cpp fte/src/g_unix_pipe.cpp
|
||||
--- fte.orig/src/g_unix_pipe.cpp 2008-04-03 13:33:49 +0200
|
||||
+++ fte/src/g_unix_pipe.cpp 2008-04-03 13:34:20 +0200
|
||||
@@ -4,6 +4,10 @@
|
||||
#include <signal.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
+#ifdef __INTERIX
|
||||
+# include <sys/time.h>
|
||||
+#endif
|
||||
+
|
||||
#include "sysdep.h"
|
||||
#include "c_config.h"
|
||||
#include "console.h"
|
||||
diff -ru fte.orig/src/sysdep.h fte/src/sysdep.h
|
||||
--- fte.orig/src/sysdep.h 2008-04-03 13:33:58 +0200
|
||||
+++ fte/src/sysdep.h 2008-04-03 13:30:43 +0200
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
#include <string.h>
|
||||
-#if defined(AIX) || defined(SCO) || defined(NCR)
|
||||
+#if defined(AIX) || defined(SCO) || defined(NCR) || defined(__INTERIX)
|
||||
#include <strings.h>
|
||||
#endif
|
||||
#include <stdio.h>
|
||||
@@ -38,7 +38,8 @@
|
||||
!defined(IRIX) && \
|
||||
!defined(SCO) && \
|
||||
!defined(SUNOS) && \
|
||||
- !defined(NCR)
|
||||
+ !defined(NCR) && \
|
||||
+ !defined(__INTERIX)
|
||||
# error Target not supported.
|
||||
#endif
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
From 041efca59326baf7c2ec08dd505e06ae86dd6954 Mon Sep 17 00:00:00 2001
|
||||
From: Lance Albertson <lance@osuosl.org>
|
||||
Date: Wed, 25 Jul 2012 16:21:21 -0700
|
||||
Subject: [PATCH] Check if process is already running and skip if so
|
||||
|
||||
Gentoo uses a modified version of start-stop-daemon which returns an error if it
|
||||
sees another process running with the same name. This happens during cluster
|
||||
initialization since ganeti-noded gets fired off first.
|
||||
---
|
||||
daemons/daemon-util.in | 12 +++++++-----
|
||||
1 file changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
|
||||
index 00fe1b6..8e4ce97 100644
|
||||
--- a/daemons/daemon-util.in
|
||||
+++ b/daemons/daemon-util.in
|
||||
@@ -172,11 +172,13 @@ start() {
|
||||
|
||||
@PKGLIBDIR@/ensure-dirs
|
||||
|
||||
- start-stop-daemon --start --quiet \
|
||||
- --pidfile $(_daemon_pidfile $name) \
|
||||
- --exec $(_daemon_executable $name) \
|
||||
- --user $(_daemon_usergroup $plain_name) \
|
||||
- -- $args "$@"
|
||||
+ if ! ret=$(/usr/bin/pgrep $name) ; then
|
||||
+ start-stop-daemon --start --quiet \
|
||||
+ --pidfile $(_daemon_pidfile $name) \
|
||||
+ --exec $(_daemon_executable $name) \
|
||||
+ --user $(_daemon_usergroup $plain_name) \
|
||||
+ -- $args "$@"
|
||||
+ fi
|
||||
}
|
||||
|
||||
# Stops a daemon
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
From 49767a66e27a1cb61abb8f812b2e61eba03a9594 Mon Sep 17 00:00:00 2001
|
||||
From: Lance Albertson <lance@osuosl.org>
|
||||
Date: Wed, 25 Jul 2012 16:21:21 -0700
|
||||
Subject: [PATCH 2/2] Check if process is already running and skip if so
|
||||
|
||||
Gentoo uses a modified version of start-stop-daemon which returns an error if it
|
||||
sees another process running with the same name. This happens during cluster
|
||||
initialization since ganeti-noded gets fired off first.
|
||||
---
|
||||
daemons/daemon-util.in | 12 +++++++-----
|
||||
1 file changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
|
||||
index c19daa7..7be9d8b 100644
|
||||
--- a/daemons/daemon-util.in
|
||||
+++ b/daemons/daemon-util.in
|
||||
@@ -222,11 +222,13 @@ start() {
|
||||
@PKGLIBDIR@/ensure-dirs
|
||||
|
||||
if type -p start-stop-daemon >/dev/null; then
|
||||
- start-stop-daemon --start --quiet \
|
||||
- --pidfile $pidfile \
|
||||
- --exec $daemonexec \
|
||||
- --user $usergroup \
|
||||
- -- $args "$@"
|
||||
+ if ! ret=$(/usr/bin/pgrep $name) ; then
|
||||
+ start-stop-daemon --start --quiet \
|
||||
+ --pidfile $pidfile \
|
||||
+ --exec $daemonexec \
|
||||
+ --user $usergroup \
|
||||
+ -- $args "$@"
|
||||
+ fi
|
||||
else
|
||||
# TODO: Find a way to start daemon with a group, until then the group must
|
||||
# be removed
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
From 0491397d7648fd70ad0a6cef9e8626b9c2a968e9 Mon Sep 17 00:00:00 2001
|
||||
From: Lance Albertson <ramereth@gmail.com>
|
||||
Date: Mon, 8 Aug 2011 23:34:33 -0700
|
||||
Subject: [PATCH 1/2] Remove/fix deprecated start-stop-daemon functions
|
||||
|
||||
daemon-util uses the deprecated functions --startas, --chuid and, most
|
||||
importantly, --oknodo. The last one causes start-stop-daemon to exit with a
|
||||
non-zero status, which makes openrc think it crashed (when in reality it just
|
||||
shut down properly) [1].
|
||||
|
||||
[1] https://bugs.gentoo.org/show_bug.cgi?id=377905
|
||||
---
|
||||
daemons/daemon-util.in | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
|
||||
index b754e7f..c19daa7 100644
|
||||
--- a/daemons/daemon-util.in
|
||||
+++ b/daemons/daemon-util.in
|
||||
@@ -222,10 +222,10 @@ start() {
|
||||
@PKGLIBDIR@/ensure-dirs
|
||||
|
||||
if type -p start-stop-daemon >/dev/null; then
|
||||
- start-stop-daemon --start --quiet --oknodo \
|
||||
+ start-stop-daemon --start --quiet \
|
||||
--pidfile $pidfile \
|
||||
- --startas $daemonexec \
|
||||
- --chuid $usergroup \
|
||||
+ --exec $daemonexec \
|
||||
+ --user $usergroup \
|
||||
-- $args "$@"
|
||||
else
|
||||
# TODO: Find a way to start daemon with a group, until then the group must
|
||||
@@ -248,7 +248,7 @@ stop() {
|
||||
local pidfile=$(_daemon_pidfile $name)
|
||||
|
||||
if type -p start-stop-daemon >/dev/null; then
|
||||
- start-stop-daemon --stop --quiet --oknodo --retry 30 \
|
||||
+ start-stop-daemon --stop --quiet --retry 30 \
|
||||
--pidfile $pidfile
|
||||
else
|
||||
_ignore_error killproc -p $pidfile $name
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@ -0,0 +1,125 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.5.2-r1.ebuild,v 1.1 2012/08/05 21:33:42 ramereth Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit eutils confutils bash-completion-r1
|
||||
|
||||
MY_PV="${PV/_rc/~rc}"
|
||||
#MY_PV="${PV/_beta/~beta}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
|
||||
inherit git-2
|
||||
KEYWORDS=""
|
||||
# you will need to pull in the haskell overlay for pandoc
|
||||
GIT_DEPEND="app-text/pandoc
|
||||
dev-python/docutils
|
||||
dev-python/sphinx
|
||||
media-libs/gd[fontconfig,jpeg,png,truetype]
|
||||
media-gfx/graphviz
|
||||
media-fonts/urw-fonts"
|
||||
else
|
||||
SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Ganeti is a virtual server management software tool"
|
||||
HOMEPAGE="http://code.google.com/p/ganeti/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="kvm xen lxc drbd +filestorage sharedstorage htools syslog ipv6"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
DEPEND="xen? ( >=app-emulation/xen-3.0 )
|
||||
kvm? ( app-emulation/qemu-kvm )
|
||||
lxc? ( app-emulation/lxc )
|
||||
drbd? ( >=sys-cluster/drbd-8.3 )
|
||||
ipv6? ( net-misc/ndisc6 )
|
||||
htools? (
|
||||
>=dev-lang/ghc-6.10
|
||||
dev-haskell/json
|
||||
dev-haskell/curl
|
||||
dev-haskell/network
|
||||
dev-haskell/parallel )
|
||||
dev-libs/openssl
|
||||
dev-python/paramiko
|
||||
dev-python/pyopenssl
|
||||
>=dev-python/pyparsing-1.4.6
|
||||
dev-python/pycurl
|
||||
dev-python/pyinotify
|
||||
dev-python/simplejson
|
||||
net-analyzer/arping
|
||||
net-misc/bridge-utils
|
||||
net-misc/curl[ssl]
|
||||
net-misc/openssh
|
||||
net-misc/socat
|
||||
sys-apps/iproute2
|
||||
sys-fs/lvm2
|
||||
>=sys-apps/baselayout-2.0
|
||||
>=dev-lang/python-2.6
|
||||
${GIT_DEPEND}"
|
||||
RDEPEND="${DEPEND}
|
||||
!app-emulation/ganeti-htools"
|
||||
|
||||
pkg_setup () {
|
||||
confutils_require_any kvm xen lxc
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
./autogen.sh
|
||||
fi
|
||||
epatch "${FILESDIR}/${PN}-fix-start-stop.patch"
|
||||
epatch "${FILESDIR}/${PN}-2.5-gentoo-start-stop-daemon.patch"
|
||||
}
|
||||
|
||||
src_configure () {
|
||||
local myconf
|
||||
if use filestorage ; then
|
||||
myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file"
|
||||
else
|
||||
myconf="--with-file-storage-dir=no"
|
||||
fi
|
||||
if use sharedstorage ; then
|
||||
myconf="--with-shared-file-storage-dir=/var/lib/ganeti-storage/shared"
|
||||
else
|
||||
myconf="--with-shared-file-storage-dir=no"
|
||||
fi
|
||||
if use kvm && [ -f /usr/bin/qemu-kvm ] ; then
|
||||
myconf="--with-kvm-path=/usr/bin/qemu-kvm"
|
||||
fi
|
||||
econf --localstatedir=/var \
|
||||
--docdir=/usr/share/doc/${P} \
|
||||
--with-ssh-initscript=/etc/init.d/sshd \
|
||||
--with-export-dir=/var/lib/ganeti-storage/export \
|
||||
--with-os-search-path=/usr/share/ganeti/os \
|
||||
$(use_enable syslog) \
|
||||
$(use_enable htools) \
|
||||
$(use_enable htools htools-rapi) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_install () {
|
||||
emake DESTDIR="${D}" install || die "emake install failed"
|
||||
newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti
|
||||
newconfd "${FILESDIR}"/ganeti.confd ganeti
|
||||
use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
|
||||
use kvm && newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
|
||||
newbashcomp doc/examples/bash_completion ganeti
|
||||
dodoc INSTALL UPGRADE NEWS README doc/*.rst
|
||||
rm -rf "${D}"/usr/share/doc/ganeti
|
||||
docinto examples
|
||||
#dodoc doc/examples/{basic-oob,ganeti.cron,gnt-config-backup}
|
||||
dodoc doc/examples/{ganeti.cron,gnt-config-backup}
|
||||
docinto examples/hooks
|
||||
dodoc doc/examples/hooks/{ipsec,ethers}
|
||||
|
||||
keepdir /var/{lib,log,run}/ganeti/
|
||||
keepdir /usr/share/ganeti/os/
|
||||
keepdir /var/lib/ganeti-storage/{export,file,shared}/
|
||||
}
|
||||
@ -0,0 +1,139 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.6.0.ebuild,v 1.1 2012/08/05 21:33:42 ramereth Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit eutils confutils bash-completion-r1
|
||||
|
||||
MY_PV="${PV/_rc/~rc}"
|
||||
#MY_PV="${PV/_beta/~beta}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
|
||||
inherit git-2
|
||||
KEYWORDS=""
|
||||
# you will need to pull in the haskell overlay for pandoc
|
||||
GIT_DEPEND="app-text/pandoc
|
||||
dev-python/docutils
|
||||
dev-python/sphinx
|
||||
media-libs/gd[fontconfig,jpeg,png,truetype]
|
||||
media-gfx/graphviz
|
||||
media-fonts/urw-fonts"
|
||||
else
|
||||
SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Ganeti is a virtual server management software tool"
|
||||
HOMEPAGE="http://code.google.com/p/ganeti/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="kvm xen lxc drbd +filestorage sharedstorage htools syslog ipv6
|
||||
haskell-daemons rbd"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
DEPEND="xen? ( >=app-emulation/xen-3.0 )
|
||||
kvm? ( app-emulation/qemu-kvm )
|
||||
lxc? ( app-emulation/lxc )
|
||||
drbd? ( >=sys-cluster/drbd-8.3 )
|
||||
rbd? ( sys-cluster/ceph )
|
||||
ipv6? ( net-misc/ndisc6 )
|
||||
htools? (
|
||||
>=dev-lang/ghc-6.10
|
||||
dev-haskell/json
|
||||
dev-haskell/curl
|
||||
dev-haskell/network
|
||||
dev-haskell/parallel )
|
||||
haskell-daemons? (
|
||||
dev-haskell/hslogger
|
||||
dev-haskell/crypto
|
||||
dev-haskell/text
|
||||
dev-haskell/hinotify )
|
||||
dev-libs/openssl
|
||||
dev-python/elementtree
|
||||
dev-python/paramiko
|
||||
dev-python/pyopenssl
|
||||
>=dev-python/pyparsing-1.4.6
|
||||
dev-python/pycurl
|
||||
dev-python/pyinotify
|
||||
dev-python/simplejson
|
||||
net-analyzer/arping
|
||||
net-analyzer/fping
|
||||
net-misc/bridge-utils
|
||||
net-misc/curl[ssl]
|
||||
net-misc/openssh
|
||||
net-misc/socat
|
||||
sys-apps/iproute2
|
||||
sys-fs/lvm2
|
||||
>=sys-apps/baselayout-2.0
|
||||
>=dev-lang/python-2.6
|
||||
${GIT_DEPEND}"
|
||||
RDEPEND="${DEPEND}
|
||||
!app-emulation/ganeti-htools"
|
||||
|
||||
pkg_setup () {
|
||||
confutils_require_any kvm xen lxc
|
||||
confutils_use_depend_all haskell-daemons htools
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
./autogen.sh
|
||||
fi
|
||||
epatch "${FILESDIR}/${PN}-2.6-fix-args.patch"
|
||||
epatch "${FILESDIR}/${PN}-2.6-add-pgrep.patch"
|
||||
}
|
||||
|
||||
src_configure () {
|
||||
local myconf
|
||||
if use filestorage ; then
|
||||
myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file"
|
||||
else
|
||||
myconf="--with-file-storage-dir=no"
|
||||
fi
|
||||
if use sharedstorage ; then
|
||||
myconf="--with-shared-file-storage-dir=/var/lib/ganeti-storage/shared"
|
||||
else
|
||||
myconf="--with-shared-file-storage-dir=no"
|
||||
fi
|
||||
if use kvm && [ -f /usr/bin/qemu-kvm ] ; then
|
||||
myconf="--with-kvm-path=/usr/bin/qemu-kvm"
|
||||
fi
|
||||
if use haskell-daemons ; then
|
||||
myconf="--enable-confd=haskell"
|
||||
fi
|
||||
econf --localstatedir=/var \
|
||||
--docdir=/usr/share/doc/${P} \
|
||||
--with-ssh-initscript=/etc/init.d/sshd \
|
||||
--with-export-dir=/var/lib/ganeti-storage/export \
|
||||
--with-os-search-path=/usr/share/ganeti/os \
|
||||
$(use_enable syslog) \
|
||||
$(use_enable htools) \
|
||||
$(use_enable htools htools-rapi) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_install () {
|
||||
emake DESTDIR="${D}" install || die "emake install failed"
|
||||
newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti
|
||||
newconfd "${FILESDIR}"/ganeti.confd ganeti
|
||||
use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
|
||||
use kvm && newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
|
||||
newbashcomp doc/examples/bash_completion ganeti
|
||||
dodoc INSTALL UPGRADE NEWS README doc/*.rst doc/*.png
|
||||
dohtml -r doc/html/*
|
||||
rm -rf "${D}"/usr/share/doc/ganeti
|
||||
docinto examples
|
||||
#dodoc doc/examples/{basic-oob,ganeti.cron,gnt-config-backup}
|
||||
dodoc doc/examples/{ganeti.cron,gnt-config-backup}
|
||||
docinto examples/hooks
|
||||
dodoc doc/examples/hooks/{ipsec,ethers}
|
||||
|
||||
keepdir /var/{lib,log,run}/ganeti/
|
||||
keepdir /usr/share/ganeti/os/
|
||||
keepdir /var/lib/ganeti-storage/{export,file,shared}/
|
||||
}
|
||||
@ -1,6 +1,4 @@
|
||||
DIST qemu-kvm-0.15.1.tar.gz 5915998 SHA256 aed6a3faa76c1e9601b4b5b8adbe5867a70c64567175f44944d88e16bd49733e SHA512 d0f1a10c18157bfaed159f63dc954781c7051eda118652295dbb4203c7f2b8abf1b4b137d8c69d85f7662f145dad0a6a0243fc8029d15648439431b55e07fe8a WHIRLPOOL 42346ae1825d9f25925e179147c21625d1eca6cc35ecf4a2913e39ab72e938bc0497bf06fe749a094cf15ea81e21feb8c17da04cc7e94f39cd0f81fe62deb654
|
||||
DIST qemu-kvm-1.0.1.tar.gz 6214796 SHA256 57bcd26342af2303663028db9e9956a8b487babfcf2a432ac3351c88b8e2bf4f SHA512 31f0a8fc2d03a15b7a382a77b67183d792fb765b25241a6b80c14f64fbcd52064392f47bc21da48fc54bdc5b8da70542ddeb47394348304d9bfcf3421eb11b2f WHIRLPOOL febf169830f9c2631f5fcb5d97a9fdd6c138c3455e97243d086fd827776ece16cc70d8a1c787e55dd43ac0c01c2b07c01fc2ec2f74d09ca4efc3be52f7e804b0
|
||||
DIST qemu-kvm-1.1.0-bp-1.tar.xz 3428 SHA256 5cfc39b126f0b804ca469e9e45d5207db1cb949eaf784a960b68fd05858a98d2 SHA512 75665dad1b4a048a071fc036a64cbccaa399974c6faa5d0541806b1af2439cc47d26c6ec901205a5fcd2e0f9680393889f6ed926065c53107410070e53d096a9 WHIRLPOOL 7b1712f3c21df279f3939b81b59042160132cd617de54adcf66b394c78598ebeec8137d26587cf1a4d02944ea56075434778285b84b47c265972b76e258a1dfe
|
||||
DIST qemu-kvm-1.1.0.tar.gz 6598841 SHA256 c32445f4610e324f0f5c34d00d055dd8b4154705968d59588efe60a8fd80ecbf SHA512 ae18901de93652e026d01de1af923b1cd6abbc623934944a7e8bcd151f731deba4ef66a32f7940b6d7ac8c8a0fbc8a6435fbf416ef423be5908b170d3f4b82d2 WHIRLPOOL dad81e28b046225384f081fba5dc61a3a00c288a5925993045936203720b0e288eaba61038713a959d65d5701c3d90405d46c361546f6edd55ac6c1adc8a31cb
|
||||
DIST qemu-kvm-1.1.1-bp-1.tar.xz 2908 SHA256 16b7cd2e10b3a05d20006898bcfdb26eb596f7c7d3c0e18fb216cb2b2026af40 SHA512 781eae1fdc1cb7482d3d6fd1cf81e0d565588e3987fc4cab92abc06741b1b57d999b0de1fffce7270f50033b53c5707e4ef477ca3b7ddfca3dc1a432c1e15cc7 WHIRLPOOL 3f80b4cc9902021686bea823a41af136d21dd5a6b8aa59913aeb8697c3a38acc02d92ee59b9d052b6d161830a72d709fe684beb95f756a92216fe79cce4c5d9a
|
||||
DIST qemu-kvm-1.1.1.tar.gz 6599376 SHA256 c6fab57ccadcad5deb34728623840a0141a0f3c8f29d0c253db577f059c796df SHA512 1106a35212cdac1fe5b043af6754595d03232f22bf74cdab86973759adb3cff2d3d7b42290883d2d99d97d163fe274de0108a05eed906ffdc3349c0631f52492 WHIRLPOOL 4d9b2b788a7f87104032635b3b6e2cd96275b92683e3003510b0951536ed6bcb959959bc7529e3f912a7a2055b5c1710b9310d591a8b443a17a231e5b86f6105
|
||||
|
||||
@ -1 +0,0 @@
|
||||
KERNEL=="kvm", GROUP="kvm", MODE="0660"
|
||||
@ -1,145 +0,0 @@
|
||||
From ff5414990645653bf43bf64adfc1ca77ffb9edcb Mon Sep 17 00:00:00 2001
|
||||
From: malc <av1474@comtv.ru>
|
||||
Date: Sun, 17 Jan 2010 00:25:29 +0300
|
||||
Subject: [PATCH] Revert "sdlaudio: make it suck less"
|
||||
|
||||
This reverts commit 4839abe78fd466a3cf06faa7c362154afd5404f1.
|
||||
|
||||
The commit was badly broken, Gentoo has sdl as the default driver,
|
||||
consequently 5 gentoo users have hit the breakage and were kind enough
|
||||
to report, so thank you:
|
||||
|
||||
Claes Gyllenswrd
|
||||
vekin
|
||||
Chris
|
||||
|
||||
But above all thanks to Toralf Foerster who actually provied enough
|
||||
information to pinpoint the breakage to sdlaudio.
|
||||
|
||||
http://bugs.gentoo.org/show_bug.cgi?id=294269
|
||||
---
|
||||
audio/sdlaudio.c | 80 +++++++++++++++++++++++++++++++++--------------------
|
||||
1 files changed, 50 insertions(+), 30 deletions(-)
|
||||
|
||||
diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
|
||||
index aa39c33..8e7e5cb 100644
|
||||
--- a/audio/sdlaudio.c
|
||||
+++ b/audio/sdlaudio.c
|
||||
@@ -41,8 +41,8 @@
|
||||
typedef struct SDLVoiceOut {
|
||||
HWVoiceOut hw;
|
||||
int live;
|
||||
+ int rpos;
|
||||
int decr;
|
||||
- int pending;
|
||||
} SDLVoiceOut;
|
||||
|
||||
static struct {
|
||||
@@ -225,10 +225,6 @@ static void sdl_callback (void *opaque, Uint8 *buf, int len)
|
||||
HWVoiceOut *hw = &sdl->hw;
|
||||
int samples = len >> hw->info.shift;
|
||||
|
||||
- if (sdl_lock (s, "sdl_callback")) {
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
if (s->exit) {
|
||||
return;
|
||||
}
|
||||
@@ -236,34 +232,49 @@ static void sdl_callback (void *opaque, Uint8 *buf, int len)
|
||||
while (samples) {
|
||||
int to_mix, decr;
|
||||
|
||||
- while (!sdl->pending) {
|
||||
- if (sdl_unlock (s, "sdl_callback")) {
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- sdl_wait (s, "sdl_callback");
|
||||
- if (s->exit) {
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- if (sdl_lock (s, "sdl_callback")) {
|
||||
- return;
|
||||
- }
|
||||
- sdl->pending += sdl->live;
|
||||
- sdl->live = 0;
|
||||
+ /* dolog ("in callback samples=%d\n", samples); */
|
||||
+ sdl_wait (s, "sdl_callback");
|
||||
+ if (s->exit) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (sdl_lock (s, "sdl_callback")) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (audio_bug (AUDIO_FUNC, sdl->live < 0 || sdl->live > hw->samples)) {
|
||||
+ dolog ("sdl->live=%d hw->samples=%d\n",
|
||||
+ sdl->live, hw->samples);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (!sdl->live) {
|
||||
+ goto again;
|
||||
}
|
||||
|
||||
- to_mix = audio_MIN (samples, sdl->pending);
|
||||
- decr = audio_pcm_hw_clip_out (hw, buf, to_mix, 0);
|
||||
- buf += decr << hw->info.shift;
|
||||
+ /* dolog ("in callback live=%d\n", live); */
|
||||
+ to_mix = audio_MIN (samples, sdl->live);
|
||||
+ decr = to_mix;
|
||||
+ while (to_mix) {
|
||||
+ int chunk = audio_MIN (to_mix, hw->samples - hw->rpos);
|
||||
+ struct st_sample *src = hw->mix_buf + hw->rpos;
|
||||
+
|
||||
+ /* dolog ("in callback to_mix %d, chunk %d\n", to_mix, chunk); */
|
||||
+ hw->clip (buf, src, chunk);
|
||||
+ sdl->rpos = (sdl->rpos + chunk) % hw->samples;
|
||||
+ to_mix -= chunk;
|
||||
+ buf += chunk << hw->info.shift;
|
||||
+ }
|
||||
samples -= decr;
|
||||
+ sdl->live -= decr;
|
||||
sdl->decr += decr;
|
||||
- sdl->pending -= decr;
|
||||
- }
|
||||
|
||||
- if (sdl_unlock (s, "sdl_callback")) {
|
||||
- return;
|
||||
+ again:
|
||||
+ if (sdl_unlock (s, "sdl_callback")) {
|
||||
+ return;
|
||||
+ }
|
||||
}
|
||||
+ /* dolog ("done len=%d\n", len); */
|
||||
}
|
||||
|
||||
static int sdl_write_out (SWVoiceOut *sw, void *buf, int len)
|
||||
@@ -281,9 +292,18 @@ static int sdl_run_out (HWVoiceOut *hw, int live)
|
||||
return 0;
|
||||
}
|
||||
|
||||
- sdl->live = live;
|
||||
- decr = sdl->decr;
|
||||
- sdl->decr = 0;
|
||||
+ if (sdl->decr > live) {
|
||||
+ ldebug ("sdl->decr %d live %d sdl->live %d\n",
|
||||
+ sdl->decr,
|
||||
+ live,
|
||||
+ sdl->live);
|
||||
+ }
|
||||
+
|
||||
+ decr = audio_MIN (sdl->decr, live);
|
||||
+ sdl->decr -= decr;
|
||||
+
|
||||
+ sdl->live = live - decr;
|
||||
+ hw->rpos = sdl->rpos;
|
||||
|
||||
if (sdl->live > 0) {
|
||||
sdl_unlock_and_post (s, "sdl_run_out");
|
||||
--
|
||||
1.7.0.4
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
--- exec.c 2010-02-26 03:34:00.000000000 +0100
|
||||
+++ exec.c.new 2010-04-03 15:31:53.000000000 +0200
|
||||
@@ -22,6 +22,9 @@
|
||||
#else
|
||||
#include <sys/types.h>
|
||||
#include <sys/mman.h>
|
||||
+#ifndef MADV_MERGEABLE
|
||||
+#include <asm/mman.h>
|
||||
+#endif
|
||||
#endif
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
@ -1,100 +0,0 @@
|
||||
From 485b75728884a052b74d5458199ad45f0acbf190 Mon Sep 17 00:00:00 2001
|
||||
From: Timothy Jones <one.timothy.jones@gmail.com>
|
||||
Date: Mon, 28 Jun 2010 10:38:18 -0400
|
||||
Subject: [PATCH v2] Guest OS hangs on usb_add
|
||||
|
||||
This is a small patch to sligtly "intelligentify" usb device and
|
||||
config descriptor parsing and to handle bug with certain usb
|
||||
device (URC MX-950) reporting device desriptor length as 0x18
|
||||
instead of 18 with added vendor_id/product_id check
|
||||
---
|
||||
hw/usb.h | 5 +++++
|
||||
usb-linux.c | 37 ++++++++++++++++++++++---------------
|
||||
2 files changed, 27 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/hw/usb.h b/hw/usb.h
|
||||
index 00d2802..5c3528f 100644
|
||||
--- a/hw/usb.h
|
||||
+++ b/hw/usb.h
|
||||
@@ -117,6 +117,11 @@
|
||||
#define USB_DT_INTERFACE 0x04
|
||||
#define USB_DT_ENDPOINT 0x05
|
||||
|
||||
+#define USB_DT_DEVICE_LEN 18
|
||||
+#define USB_DT_CONFIG_LEN 9
|
||||
+#define USB_DT_INTERFACE_LEN 9
|
||||
+#define USB_DT_ENDPOINT_LEN 7
|
||||
+
|
||||
#define USB_ENDPOINT_XFER_CONTROL 0
|
||||
#define USB_ENDPOINT_XFER_ISOC 1
|
||||
#define USB_ENDPOINT_XFER_BULK 2
|
||||
diff --git a/usb-linux.c b/usb-linux.c
|
||||
index 88273ff..2ac6562 100644
|
||||
--- a/usb-linux.c
|
||||
+++ b/usb-linux.c
|
||||
@@ -288,7 +288,7 @@ static void async_cancel(USBPacket *unused, void *opaque)
|
||||
|
||||
static int usb_host_claim_interfaces(USBHostDevice *dev, int configuration)
|
||||
{
|
||||
- int dev_descr_len, config_descr_len;
|
||||
+ int dev_descr_len, config_descr_total_len;
|
||||
int interface, nb_interfaces;
|
||||
int ret, i;
|
||||
|
||||
@@ -297,32 +297,39 @@ static int usb_host_claim_interfaces(USBHostDevice *dev, int configuration)
|
||||
|
||||
DPRINTF("husb: claiming interfaces. config %d\n", configuration);
|
||||
|
||||
- i = 0;
|
||||
dev_descr_len = dev->descr[0];
|
||||
- if (dev_descr_len > dev->descr_len) {
|
||||
+ if (dev_descr_len == 0x18 && dev->descr[ 8] == 0x47 && dev->descr[ 9] == 0x46
|
||||
+ && dev->descr[10] == 0x00 && dev->descr[11] == 0x30)
|
||||
+ dev_descr_len = USB_DT_DEVICE_LEN; /* for buggy MX-950 remote reporting len in hex */
|
||||
+
|
||||
+ if (dev_descr_len > dev->descr_len || dev_descr_len < USB_DT_DEVICE_LEN || dev->descr[1] != USB_DT_DEVICE) {
|
||||
+ fprintf(stderr, "husb: invalid device descriptor\n");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
- i += dev_descr_len;
|
||||
- while (i < dev->descr_len) {
|
||||
+ for (i = dev_descr_len; i < dev->descr_len; ) {
|
||||
DPRINTF("husb: i is %d, descr_len is %d, dl %d, dt %d\n",
|
||||
i, dev->descr_len,
|
||||
dev->descr[i], dev->descr[i+1]);
|
||||
|
||||
- if (dev->descr[i+1] != USB_DT_CONFIG) {
|
||||
- i += dev->descr[i];
|
||||
- continue;
|
||||
+ if (dev->descr[i] < 2) {
|
||||
+ fprintf(stderr, "husb: invalid descriptor\n");
|
||||
+ goto fail;
|
||||
}
|
||||
- config_descr_len = dev->descr[i];
|
||||
+ if (dev->descr[i+1] == USB_DT_CONFIG) {
|
||||
+ config_descr_total_len = dev->descr[i+2] + (dev->descr[i+3] << 8);
|
||||
|
||||
- printf("husb: config #%d need %d\n", dev->descr[i + 5], configuration);
|
||||
+ printf("husb: config #%d need %d\n", dev->descr[i + 5], configuration);
|
||||
|
||||
- if (configuration < 0 || configuration == dev->descr[i + 5]) {
|
||||
- configuration = dev->descr[i + 5];
|
||||
- break;
|
||||
- }
|
||||
+ if (configuration < 0 || configuration == dev->descr[i + 5]) {
|
||||
+ configuration = dev->descr[i + 5];
|
||||
+ break;
|
||||
+ }
|
||||
|
||||
- i += config_descr_len;
|
||||
+ i += config_descr_total_len;
|
||||
+ }
|
||||
+ else
|
||||
+ i += dev->descr[i];
|
||||
}
|
||||
|
||||
if (i >= dev->descr_len) {
|
||||
--
|
||||
1.7.1
|
||||
|
||||
@ -1,369 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild,v 1.14 2012/07/28 22:20:23 cardoe Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
PYTHON_DEPEND="2"
|
||||
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user
|
||||
BACKPORTS=1
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
|
||||
inherit git-2
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz
|
||||
${BACKPORTS:+
|
||||
http://dev.gentoo.org/~cardoe/distfiles/${P}-bp-${BACKPORTS}.tar.xz}"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
|
||||
fi
|
||||
|
||||
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
|
||||
HOMEPAGE="http://www.linux-kvm.org"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt kernel_linux \
|
||||
kernel_FreeBSD ncurses opengl pulseaudio python rbd sasl sdl \
|
||||
smartcard spice static tci tls usbredir vde +vhost-net virtfs xattr xen xfs"
|
||||
|
||||
COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
|
||||
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb xtensa xtensaeb"
|
||||
IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
|
||||
|
||||
# Setup the default SoftMMU targets, while using the loops
|
||||
# below to setup the other targets. x86_64 should be the only
|
||||
# defaults on for qemu-kvm
|
||||
IUSE="${IUSE} +qemu_softmmu_targets_x86_64"
|
||||
|
||||
for target in ${IUSE_SOFTMMU_TARGETS}; do
|
||||
if [ "x${target}" = "xx86_64" ]; then
|
||||
continue
|
||||
fi
|
||||
IUSE="${IUSE} qemu_softmmu_targets_${target}"
|
||||
done
|
||||
|
||||
for target in ${IUSE_USER_TARGETS}; do
|
||||
IUSE="${IUSE} qemu_user_targets_${target}"
|
||||
done
|
||||
|
||||
REQUIRED_USE="static? ( !alsa !pulseaudio )
|
||||
amd64? ( qemu_softmmu_targets_x86_64 )
|
||||
x86? ( qemu_softmmu_targets_x86_64 )
|
||||
virtfs? ( xattr )"
|
||||
|
||||
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
|
||||
RDEPEND="
|
||||
!app-emulation/kqemu
|
||||
!app-emulation/qemu
|
||||
!<app-emulation/qemu-1.0
|
||||
>=dev-libs/glib-2.0
|
||||
media-libs/libpng
|
||||
sys-apps/pciutils
|
||||
virtual/jpeg
|
||||
amd64? ( >=sys-firmware/seabios-1.7.0
|
||||
sys-firmware/vgabios )
|
||||
x86? ( >=sys-firmware/seabios-1.7.0
|
||||
sys-firmware/vgabios )
|
||||
aio? ( dev-libs/libaio )
|
||||
alsa? ( >=media-libs/alsa-lib-1.0.13 )
|
||||
bluetooth? ( net-wireless/bluez )
|
||||
brltty? ( app-accessibility/brltty )
|
||||
caps? ( sys-libs/libcap-ng )
|
||||
curl? ( >=net-misc/curl-7.15.4 )
|
||||
fdt? ( >=sys-apps/dtc-1.2.0 )
|
||||
kernel_linux? ( >=sys-apps/util-linux-2.16.0 )
|
||||
ncurses? ( sys-libs/ncurses )
|
||||
opengl? ( virtual/opengl )
|
||||
pulseaudio? ( media-sound/pulseaudio )
|
||||
python? ( =dev-lang/python-2*[ncurses] )
|
||||
rbd? ( sys-cluster/ceph )
|
||||
sasl? ( dev-libs/cyrus-sasl )
|
||||
sdl? ( static? ( >=media-libs/libsdl-1.2.11[static-libs,X] )
|
||||
!static? ( >=media-libs/libsdl-1.2.11[X] ) )
|
||||
static? ( sys-libs/zlib[static-libs(+)] )
|
||||
!static? ( sys-libs/zlib )
|
||||
smartcard? ( dev-libs/nss )
|
||||
spice? ( >=app-emulation/spice-protocol-0.8.1
|
||||
static? ( >=app-emulation/spice-0.9.0[static-libs] )
|
||||
!static? ( >=app-emulation/spice-0.9.0 )
|
||||
)
|
||||
tls? ( net-libs/gnutls )
|
||||
usbredir? ( sys-apps/usbredir )
|
||||
vde? ( net-misc/vde )
|
||||
virtfs? ( sys-libs/libcap )
|
||||
xattr? ( sys-apps/attr )
|
||||
xen? ( app-emulation/xen-tools )
|
||||
xfs? ( sys-fs/xfsprogs )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
app-text/texi2html
|
||||
virtual/pkgconfig
|
||||
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )"
|
||||
|
||||
STRIP_MASK="/usr/share/qemu/palcode-clipper"
|
||||
|
||||
QA_PRESTRIPPED="
|
||||
usr/share/qemu/openbios-ppc
|
||||
usr/share/qemu/openbios-sparc64
|
||||
usr/share/qemu/openbios-sparc32
|
||||
usr/share/qemu/palcode-clipper"
|
||||
|
||||
QA_WX_LOAD="${QA_PRESTRIPPED}
|
||||
usr/bin/qemu-i386
|
||||
usr/bin/qemu-x86_64
|
||||
usr/bin/qemu-alpha
|
||||
usr/bin/qemu-arm
|
||||
usr/bin/qemu-cris
|
||||
usr/bin/qemu-m68k
|
||||
usr/bin/qemu-microblaze
|
||||
usr/bin/qemu-mips
|
||||
usr/bin/qemu-mipsel
|
||||
usr/bin/qemu-ppc
|
||||
usr/bin/qemu-ppc64
|
||||
usr/bin/qemu-ppc64abi32
|
||||
usr/bin/qemu-sh4
|
||||
usr/bin/qemu-sh4eb
|
||||
usr/bin/qemu-sparc
|
||||
usr/bin/qemu-sparc64
|
||||
usr/bin/qemu-armeb
|
||||
usr/bin/qemu-sparc32plus"
|
||||
|
||||
pkg_pretend() {
|
||||
if use kernel_linux && kernel_is lt 2 6 25; then
|
||||
eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
|
||||
elif use kernel_linux; then
|
||||
if ! linux_config_exists; then
|
||||
eerror "Unable to check your kernel for KVM support"
|
||||
else
|
||||
CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
|
||||
ERROR_KVM="You must enable KVM in your kernel to continue"
|
||||
ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
|
||||
ERROR_KVM_AMD+=" your kernel configuration."
|
||||
ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
|
||||
ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
|
||||
ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
|
||||
ERROR_TUN+=" into your kernel or loaded as a module to use the"
|
||||
ERROR_TUN+=" virtual network device if using -net tap."
|
||||
ERROR_BRIDGE="You will also need support for 802.1d"
|
||||
ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
|
||||
use vhost-net && CHECK_CHECK+=" ~VHOST_NET"
|
||||
ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
|
||||
ERROR_VHOST_NET+=" support"
|
||||
|
||||
if use amd64 || use x86 || use amd64-linux || use x86-linux; then
|
||||
CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
|
||||
fi
|
||||
|
||||
use python && CONFIG_CHECK+=" ~DEBUG_FS"
|
||||
ERROR_DEBUG_FS="debugFS support required for kvm_stat"
|
||||
|
||||
# Now do the actual checks setup above
|
||||
check_extra_config
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
|
||||
enewgroup kvm 78
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Alter target makefiles to accept CFLAGS set via flag-o
|
||||
sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
|
||||
Makefile Makefile.target || die
|
||||
|
||||
# remove part to make udev happy
|
||||
#sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
|
||||
|
||||
python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
|
||||
|
||||
[[ -n ${BACKPORTS} ]] && \
|
||||
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
|
||||
epatch
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local conf_opts audio_opts user_targets
|
||||
|
||||
for target in ${IUSE_SOFTMMU_TARGETS} ; do
|
||||
use "qemu_softmmu_targets_${target}" && \
|
||||
softmmu_targets="${softmmu_targets} ${target}-softmmu"
|
||||
done
|
||||
|
||||
for target in ${IUSE_USER_TARGETS} ; do
|
||||
use "qemu_user_targets_${target}" && \
|
||||
user_targets="${user_targets} ${target}-linux-user"
|
||||
done
|
||||
|
||||
if [[ -z ${softmmu_targets} ]]; then
|
||||
eerror "All SoftMMU targets are disabled. This is invalid for qemu-kvm"
|
||||
die "At least 1 SoftMMU target must be enabled"
|
||||
else
|
||||
einfo "Building the following softmmu targets: ${softmmu_targets}"
|
||||
fi
|
||||
|
||||
if [[ -n ${user_targets} ]]; then
|
||||
einfo "Building the following user targets: ${user_targets}"
|
||||
conf_opts="${conf_opts} --enable-linux-user"
|
||||
else
|
||||
conf_opts="${conf_opts} --disable-linux-user"
|
||||
fi
|
||||
|
||||
# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
|
||||
conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
|
||||
|
||||
# Add support for static builds
|
||||
use static && conf_opts="${conf_opts} --static --disable-pie"
|
||||
|
||||
# We always want to attempt to build with PIE support as it results
|
||||
# in a more secure binary. But it doesn't work with static or if
|
||||
# the current GCC doesn't have PIE support.
|
||||
if ! use static && gcc-specs-pie; then
|
||||
conf_opts="${conf_opts} --enable-pie"
|
||||
fi
|
||||
|
||||
# audio options
|
||||
audio_opts="oss"
|
||||
use alsa && audio_opts="alsa ${audio_opts}"
|
||||
use pulseaudio && audio_opts="pa ${audio_opts}"
|
||||
use sdl && audio_opts="sdl ${audio_opts}"
|
||||
|
||||
# conditionally making UUID work on Linux only is wrong
|
||||
# but the Gentoo/FreeBSD guys need to figure out what
|
||||
# provides libuuid on their platform
|
||||
# --enable-vnc-thread will go away in 1.2
|
||||
# $(use_enable xen xen-pci-passthrough) for 1.2
|
||||
./configure --prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--disable-bsd-user \
|
||||
--disable-libiscsi \
|
||||
--disable-strip \
|
||||
--disable-werror \
|
||||
--enable-guest-agent \
|
||||
--enable-vnc-jpeg \
|
||||
--enable-vnc-png \
|
||||
--enable-vnc-thread \
|
||||
--python=python2 \
|
||||
$(use_enable aio linux-aio) \
|
||||
$(use_enable bluetooth bluez) \
|
||||
$(use_enable brltty brlapi) \
|
||||
$(use_enable caps cap-ng) \
|
||||
$(use_enable curl) \
|
||||
$(use_enable debug debug-info) \
|
||||
$(use_enable debug debug-mon) \
|
||||
$(use_enable debug debug-tcg) \
|
||||
$(use_enable doc docs) \
|
||||
$(use_enable fdt) \
|
||||
$(use_enable kernel_linux kvm) \
|
||||
$(use_enable kernel_linux kvm-device-assignment) \
|
||||
$(use_enable kernel_linux nptl) \
|
||||
$(use_enable kernel_linux uuid) \
|
||||
$(use_enable ncurses curses) \
|
||||
$(use_enable opengl) \
|
||||
$(use_enable rbd) \
|
||||
$(use_enable sasl vnc-sasl) \
|
||||
$(use_enable sdl) \
|
||||
$(use_enable smartcard smartcard) \
|
||||
$(use_enable smartcard smartcard-nss) \
|
||||
$(use_enable spice) \
|
||||
$(use_enable tci tcg-interpreter) \
|
||||
$(use_enable tls vnc-tls) \
|
||||
$(use_enable usbredir usb-redir) \
|
||||
$(use_enable vde) \
|
||||
$(use_enable vhost-net) \
|
||||
$(use_enable virtfs) \
|
||||
$(use_enable xattr attr) \
|
||||
$(use_enable xen) \
|
||||
$(use_enable xfs xfsctl) \
|
||||
--audio-drv-list="${audio_opts}" \
|
||||
--target-list="${softmmu_targets} ${user_targets}" \
|
||||
--cc="$(tc-getCC)" \
|
||||
--host-cc="$(tc-getBUILD_CC)" \
|
||||
${conf_opts} \
|
||||
|| die "configure failed"
|
||||
|
||||
# this is for qemu upstream's threaded support which is
|
||||
# in development and broken
|
||||
# the kvm project has its own support for threaded IO
|
||||
# which is always on and works
|
||||
# --enable-io-thread \
|
||||
|
||||
# FreeBSD's kernel does not support QEMU assigning/grabbing
|
||||
# host USB devices yet
|
||||
use kernel_FreeBSD && \
|
||||
sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${ED}" install
|
||||
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
if use kernel_linux; then
|
||||
insinto /lib/udev/rules.d/
|
||||
doins "${FILESDIR}"/65-kvm.rules
|
||||
fi
|
||||
|
||||
if use qemu_softmmu_targets_x86_64 ; then
|
||||
dobin "${FILESDIR}"/qemu-kvm
|
||||
ewarn "The depreciated '/usr/bin/kvm' symlink is no longer installed"
|
||||
ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
|
||||
ewarn "your libvirt configs or other wrappers for ${PN}"
|
||||
else
|
||||
elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
|
||||
elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
|
||||
fi
|
||||
fi
|
||||
|
||||
dodoc Changelog MAINTAINERS TODO pci-ids.txt
|
||||
newdoc pc-bios/README README.pc-bios
|
||||
|
||||
if use doc; then
|
||||
dohtml qemu-doc.html qemu-tech.html || die
|
||||
fi
|
||||
|
||||
use python & dobin scripts/kvm/kvm_stat
|
||||
|
||||
# FIXME: Need to come up with a solution for non-x86 based systems
|
||||
if use x86 || use amd64; then
|
||||
# Remove SeaBIOS since we're using the SeaBIOS packaged one
|
||||
rm "${ED}/usr/share/qemu/bios.bin"
|
||||
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
|
||||
|
||||
# Remove vgabios since we're using the vgabios packaged one
|
||||
rm "${ED}/usr/share/qemu/vgabios.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
|
||||
dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
|
||||
dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
|
||||
dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
|
||||
dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
|
||||
dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
elog "If you don't have kvm compiled into the kernel, make sure you have"
|
||||
elog "the kernel module loaded before running kvm. The easiest way to"
|
||||
elog "ensure that the kernel module is loaded is to load it on boot."
|
||||
elog "For AMD CPUs the module is called 'kvm-amd'"
|
||||
elog "For Intel CPUs the module is called 'kvm-intel'"
|
||||
elog "Please review /etc/conf.d/modules for how to load these"
|
||||
elog
|
||||
elog "Make sure your user is in the 'kvm' group"
|
||||
elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
|
||||
elog
|
||||
elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
|
||||
elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
Reported-by: Lars Wendler (Polynomial-C)
|
||||
Gentoo-bug: https://bugs.gentoo.org/429794
|
||||
Upstream bug: https://www.midnight-commander.org/ticket/2856
|
||||
|
||||
From 105ac777e17859cad4f3e9cf44663a3f98cfe829 Mon Sep 17 00:00:00 2001
|
||||
From: Slava Zanko <slavazanko@gmail.com>
|
||||
Date: Wed, 25 Jul 2012 16:30:00 +0300
|
||||
Subject: [PATCH] Ticket #2856: Fixed mceditor 4.8.4 segfaults when aspell
|
||||
dictionaries aren't installed
|
||||
|
||||
Steps to reproduce:
|
||||
* compile mc with aspell support
|
||||
* remove all aspell's dictionaries
|
||||
* run mc and try to open any file in the internal editor
|
||||
* close the error dialog
|
||||
* try to exit from editor
|
||||
|
||||
Expected behaviour: a file panels should be shown
|
||||
Actual behaviour: the segfault here.
|
||||
|
||||
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
|
||||
---
|
||||
src/editor/spell.c | 15 +++++++++------
|
||||
1 files changed, 9 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/editor/spell.c b/src/editor/spell.c
|
||||
index 73aa9d5..5b4ac6f 100644
|
||||
--- a/src/editor/spell.c
|
||||
+++ b/src/editor/spell.c
|
||||
@@ -71,9 +71,7 @@ static struct AspellStringEnumeration *(*mc_aspell_word_list_elements) (const st
|
||||
* ths);
|
||||
static const char *(*mc_aspell_config_retrieve) (struct AspellConfig * ths, const char *key);
|
||||
static void (*mc_delete_aspell_speller) (struct AspellSpeller * ths);
|
||||
-/*
|
||||
- static void (*mc_delete_aspell_config) (struct AspellConfig * ths);
|
||||
- */
|
||||
+static void (*mc_delete_aspell_config) (struct AspellConfig * ths);
|
||||
static void (*mc_delete_aspell_can_have_error) (struct AspellCanHaveError * ths);
|
||||
static const char *(*mc_aspell_error_message) (const struct AspellCanHaveError * ths);
|
||||
static void (*mc_delete_aspell_string_enumeration) (struct AspellStringEnumeration * ths);
|
||||
@@ -228,7 +226,7 @@ spell_available (void)
|
||||
(spell_module, "delete_aspell_speller", (void *) &mc_delete_aspell_speller))
|
||||
goto error_ret;
|
||||
|
||||
- if (!g_module_symbol (spell_module, "delete_aspell_config", (void *) &mc_delete_aspell_speller))
|
||||
+ if (!g_module_symbol (spell_module, "delete_aspell_config", (void *) &mc_delete_aspell_config))
|
||||
goto error_ret;
|
||||
|
||||
if (!g_module_symbol (spell_module, "delete_aspell_string_enumeration",
|
||||
@@ -311,7 +309,7 @@ aspell_init (void)
|
||||
{
|
||||
edit_error_dialog (_("Error"), mc_aspell_error_message (error));
|
||||
mc_delete_aspell_can_have_error (error);
|
||||
- g_free (global_speller);
|
||||
+ aspell_clean ();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -326,7 +324,12 @@ aspell_clean (void)
|
||||
if (global_speller == NULL)
|
||||
return;
|
||||
|
||||
- mc_delete_aspell_speller (global_speller->speller);
|
||||
+ if (global_speller->speller != NULL)
|
||||
+ mc_delete_aspell_speller (global_speller->speller);
|
||||
+
|
||||
+ if (global_speller->config != NULL)
|
||||
+ mc_delete_aspell_config (global_speller->config);
|
||||
+
|
||||
g_free (global_speller);
|
||||
global_speller = NULL;
|
||||
|
||||
--
|
||||
1.7.8.6
|
||||
|
||||
@ -0,0 +1,44 @@
|
||||
--- Makefile.defs~ 2007-10-12 04:11:32 +0200
|
||||
+++ Makefile.defs 2007-10-12 04:11:59 +0200
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
# directory to install to. Depending on your distribution, you might
|
||||
# want to change this to /usr/local
|
||||
-prefix = /usr
|
||||
+prefix = @GENTOO_PORTAGE_EPREFIX@/usr
|
||||
CC = gcc
|
||||
|
||||
PAL_VERSION = 0.3.5_pre1
|
||||
--- input.c~ 2007-10-12 04:08:59 +0200
|
||||
+++ input.c 2007-10-12 04:17:45 +0200
|
||||
@@ -567,7 +567,7 @@
|
||||
}
|
||||
|
||||
/* attempt to copy /etc/pal.conf to ~/.pal/pal.conf */
|
||||
- file = fopen("/etc/pal.conf", "r");
|
||||
+ file = fopen("@GENTOO_PORTAGE_EPREFIX@/etc/pal.conf", "r");
|
||||
|
||||
/* if not found, try PREFIX/share/pal/pal.conf instead */
|
||||
/* NOTE: This is will be removed in the future */
|
||||
@@ -577,7 +577,7 @@
|
||||
|
||||
if(file == NULL)
|
||||
{
|
||||
- pal_output_error(_("ERROR: Can't open file: /etc/pal.conf\n"));
|
||||
+ pal_output_error(_("ERROR: Can't open file: @GENTOO_PORTAGE_EPREFIX@/etc/pal.conf\n"));
|
||||
pal_output_error(_("ERROR: Can't open file: " PREFIX "/share/pal/pal.conf\n"));
|
||||
pal_output_error(_("ERROR: This indicates an improper installation.\n"));
|
||||
return ht;
|
||||
--- Makefile~ 2007-10-12 04:23:38 +0200
|
||||
+++ Makefile 2007-10-12 04:24:23 +0200
|
||||
@@ -51,8 +51,8 @@
|
||||
@echo " --- Installing global data --- "
|
||||
@mkdir -p ${DESTDIR}${prefix}/share/pal;
|
||||
install -m 0644 -o root ../share/*.pal ${DESTDIR}${prefix}/share/pal
|
||||
- @mkdir -p ${DESTDIR}/etc;
|
||||
- install -m 0644 -o root ../pal.conf ${DESTDIR}/etc/
|
||||
+ @mkdir -p ${DESTDIR}@GENTOO_PORTAGE_EPREFIX@/etc;
|
||||
+ install -m 0644 -o root ../pal.conf ${DESTDIR}@GENTOO_PORTAGE_EPREFIX@/etc/
|
||||
@echo
|
||||
|
||||
# "install" will install the files needed by pal and also check to see
|
||||
@ -0,0 +1,51 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/pal/pal-0.4.3-r1.ebuild,v 1.1 2012/08/05 23:57:54 ottxor Exp $
|
||||
|
||||
EAPI=4
|
||||
inherit toolchain-funcs eutils prefix
|
||||
|
||||
DESCRIPTION="pal command-line calendar program"
|
||||
HOMEPAGE="http://palcal.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/palcal/${P}.tgz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos"
|
||||
IUSE="nls unicode"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.0
|
||||
sys-libs/readline
|
||||
sys-libs/ncurses[unicode?]
|
||||
nls? ( virtual/libintl )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
nls? ( sys-devel/gettext )"
|
||||
|
||||
S=${WORKDIR}/${P}/src
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PV}-strip.patch
|
||||
epatch "${FILESDIR}"/${PV}-ldflags.patch
|
||||
if use unicode; then
|
||||
sed -i "/^LIBS/s/-lncurses/&w/" "${S}"/Makefile || die
|
||||
fi
|
||||
|
||||
epatch "${FILESDIR}"/${P}-prefix.patch
|
||||
eprefixify Makefile.defs input.c Makefile
|
||||
sed -i -e 's/ -o root//g' {.,convert}/Makefile || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake CC="$(tc-getCC)" OPT="${CFLAGS}" LDOPT="${LDFLAGS}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install-man install-bin install-share
|
||||
|
||||
if use nls; then
|
||||
emake DESTDIR="${D}" install-mo
|
||||
fi
|
||||
|
||||
dodoc "${WORKDIR}"/${P}/{ChangeLog,doc/example.css}
|
||||
}
|
||||
@ -1,62 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-pda/libimobiledevice/libimobiledevice-1.1.4-r1.ebuild,v 1.1 2012/05/19 08:18:40 ssuominen Exp $
|
||||
|
||||
EAPI=4
|
||||
PYTHON_DEPEND="python? 2:2.7"
|
||||
inherit autotools eutils python
|
||||
|
||||
DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
|
||||
HOMEPAGE="http://www.libimobiledevice.org/"
|
||||
SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc64 ~x86"
|
||||
IUSE="gnutls python"
|
||||
|
||||
RDEPEND=">=app-pda/libplist-1.8-r1[python?]
|
||||
>=app-pda/usbmuxd-1.0.8
|
||||
gnutls? (
|
||||
dev-libs/libgcrypt
|
||||
>=dev-libs/libtasn1-1.1
|
||||
>=net-libs/gnutls-2.2.0
|
||||
)
|
||||
!gnutls? ( dev-libs/openssl:0 )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
python? ( >=dev-python/cython-0.14.1-r1 )"
|
||||
|
||||
DOCS="AUTHORS NEWS README"
|
||||
|
||||
pkg_setup() {
|
||||
if use python; then
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${P}-cython.patch \
|
||||
"${FILESDIR}"/${P}-openssl.patch
|
||||
|
||||
eautoreconf
|
||||
|
||||
>py-compile
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf='--disable-static'
|
||||
use python || myconf+=' --without-cython'
|
||||
use gnutls && myconf+=' --disable-openssl'
|
||||
|
||||
econf ${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dohtml docs/html/*
|
||||
|
||||
find "${ED}" -name '*.la' -exec rm -f {} +
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
--- a/rfc-3.2.3/rfc-3.2.3
|
||||
+++ b/rfc-3.2.3/rfc-3.2.3
|
||||
@@ -36,8 +36,8 @@
|
||||
|
||||
# These make it avail for all users if you can't
|
||||
# run it as root. (full path, not ~/ )
|
||||
-$indexpath="/usr/local/etc/rfc-index";
|
||||
-$servpath="/usr/local/etc/nmap-services";
|
||||
+$indexpath="@GENTOO_PORTAGE_EPREFIX@/var/cache/rfc/rfc-index";
|
||||
+$servpath="@GENTOO_PORTAGE_EPREFIX@/etc/nmap-services";
|
||||
|
||||
####################################
|
||||
## add as many urls as you please ##
|
||||
@@ -46,7 +46,7 @@
|
||||
!http://www.faqs.org/rfcs/
|
||||
http://www.isi.edu/in-notes/
|
||||
http://www.cis.ohio-state.edu/htbin/rfc/
|
||||
- /local/path/to/rfcs/); #MAKE SURE you have the trailing slashes
|
||||
+ @GENTOO_PORTAGE_EPREFIX@/var/cache/rfc/rfcs/); #MAKE SURE you have the trailing slashes
|
||||
# URLs beginning with an ! are treated as HTML and not text
|
||||
|
||||
#######################
|
||||
@ -0,0 +1,46 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/rfcutil/rfcutil-3.2.3-r2.ebuild,v 1.1 2012/08/06 00:11:45 ottxor Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit eutils prefix
|
||||
|
||||
MY_PN="rfc"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
DESCRIPTION="return all related RFCs based upon a number or a search string"
|
||||
HOMEPAGE="http://www.dewn.com/rfc/"
|
||||
SRC_URI="http://www.dewn.com/rfc/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="as-is"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-lang/perl
|
||||
|| ( www-client/lynx virtual/w3m )"
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${MY_P}-paths.patch \
|
||||
"${FILESDIR}"/${MY_P}-index.patch
|
||||
eprefixify ${MY_P}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
newbin ${MY_P} ${MY_PN}
|
||||
doman ${MY_PN}.1
|
||||
dodoc CHANGELOG KNOWN_BUGS README
|
||||
keepdir /var/cache/rfc
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Gaarde suggests you make a cron.monthly to run the following:"
|
||||
elog " ${EPREFIX}/usr/bin/rfc -i"
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
rm -f "${EROOT}"/var/cache/rfc/*
|
||||
}
|
||||
@ -1,2 +1,2 @@
|
||||
DIST c-support-5.13.zip 132730 SHA256 7d11605d1ca44698df517225f199f7dbb0b1d5a345bf29bf1565a32e9bf2d936 SHA512 a740de65b94e78f6cbf0104797a625f7ee56ad7150794cc1cdc30cc59ce23ed33691c3f840328df80bbbfabf5903c5ddf849c15bf7a479f305f01aac04ad821a WHIRLPOOL 95b745b2626b8433243e6954ffaed55dc840c251be3251a851c55201b4ba9cfc011cf79cfc296eef9d2ce0d841382895bf0fdb25ab1a1b75c5e8ab542b5049d4
|
||||
DIST c-support-5.16.1.tar.gz 126671 SHA256 b0c6e3d58c163358c5f4956847c7a86947e5d030c15f6127f305d5617e508d13 SHA512 e1d5d6df9d543ce9ffbdecc1582503e22d56009a2384699f168df86faf7dcd00d96de92132a74f0a584f902ad0fd6ad329bfb437a4ed84a497225cd5b1795398 WHIRLPOOL ba73c91f50380aef9363e6caf3aa24ae75579a3a2fe54590fd06987a21095a2a2a580f600c82776f3149d16cf8d156ca8270140af4149ba5601dfbf6e3adbd03
|
||||
DIST c-support-5.19.tar.bz2 113324 SHA256 843bdb7b3802eb3dc6ad94607e31f3045b4a6a8fb791752c7654534994b8741c SHA512 2a23dc84591c8d3c9777a285940402c8daccd7b6eaecb04b281713ef444738169d7f0130cce27dae6dd3f1f2a27cb56ab6c21eb6b007d7e0f82cd2f64801c77a WHIRLPOOL 87e08c0e11c5302290cb2df1693e9304a1050a5f802ca300b037082d1289927be7ab24fd4d13b6270c20348c50dcd1bbe9696f5bd53d1ea65f28d57cf715c084
|
||||
|
||||
@ -1,28 +1,22 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-vim/c-support/c-support-5.13.ebuild,v 1.1 2011/04/29 04:28:46 radhermit Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-vim/c-support/c-support-5.19.ebuild,v 1.1 2012/08/05 23:40:00 radhermit Exp $
|
||||
|
||||
EAPI="4"
|
||||
VIM_PLUGIN_VIM_VERSION="7.0"
|
||||
|
||||
inherit vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys"
|
||||
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=213"
|
||||
SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=14859 -> ${P}.zip"
|
||||
LICENSE="public-domain"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
VIM_PLUGIN_HELPFILES="csupport.txt"
|
||||
|
||||
DEPEND="app-arch/unzip"
|
||||
|
||||
S=${WORKDIR}
|
||||
|
||||
src_install() {
|
||||
dodoc ${PN}/doc/{ChangeLog,c-hotkeys.pdf}
|
||||
rm -rf ${PN}/doc README.csupport
|
||||
rm -r ${PN}/doc || die
|
||||
|
||||
vim-plugin_src_install
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST lustyexplorer-4.1.tar.bz2 17098 SHA256 7030fa17b5f51afda72184382eb9a211dd5de16d4c5541d0a1b6a8e588e39f38 SHA512 2f9af8c40f93333a4a734722a6ac6532fc05719165d730ac10bb0b3096a769a7a5fc2bb02fe0f457563b9ada69474265b1de6d5b3e2d9ca30503a704be496a86 WHIRLPOOL b558dd70212ad3dec6b49f7a80fecf3b24bff39ad983e527fe217f61c1a47f292ded8155856e751b0726d3815e8e7950371686a173a89b87e94426cb48884183
|
||||
DIST lustyexplorer-4.3.tar.bz2 17373 SHA256 acfd2e16778e653d75ff6d5823d799f27de1a7af2045eb09788798659b1024a0 SHA512 24ffa1fe5c1698dfa6093c7cfed2f08540ce130258df5e8ec135356ecea4c1f607f11e643ab859f551e63ecbbf6fc8a615a9514e1d4798b752cc97146c29c661 WHIRLPOOL ab55b1450c2cfb1ef434fa51f9959691b4ffaf3414dae1f0ba43a4eba720054886414bce3bd9136334b79c932f10529dce9c7cb9dadf6fc08f523394530f029c
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-vim/lustyexplorer/lustyexplorer-4.3.ebuild,v 1.1 2012/08/06 00:01:38 radhermit Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: dynamic filesystem and buffer explorer"
|
||||
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1890"
|
||||
LICENSE="as-is"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
VIM_PLUGIN_HELPFILES="lusty-explorer.txt"
|
||||
|
||||
RDEPEND="|| ( app-editors/vim[ruby] app-editors/gvim[ruby] )"
|
||||
|
||||
src_prepare() {
|
||||
# There's good documentation included with the script, but it's not
|
||||
# in a helpfile. Since there's rather too much information to include
|
||||
# in a VIM_PLUGIN_HELPTEXT, we'll sed ourselves a help doc.
|
||||
mkdir "${S}"/doc
|
||||
sed -e '0,/"$/d' -e '/" GetLatest.\+$/,9999d' -e 's/^" \?//' \
|
||||
-e "s/\(Name Of File: \)\([^.]\+\)\.vim/\1*\2.txt*/" \
|
||||
plugin/lusty-explorer.vim > doc/lusty-explorer.txt
|
||||
}
|
||||
@ -1,4 +1,3 @@
|
||||
DIST perl-support-4.12.tar.gz 153729 SHA256 611ef54111eebb824362828586c6a72b7aed846e9b3547fabb59ef6c562c130f SHA512 55875a24b1c007428f7558fd4a940c55f1288eb11683e1a08cd0417fac625498faefea634fcc84d5a27dab181170c735389edf32f6df5b9a1139ddefd8fcfca0 WHIRLPOOL f384f1556bbb1d775c340e4e1c7c9ef129d1e59dc720f7702ff4003b85a7b074d059131810f920a10e867c30e353eaa9ca59fc8f400734d985b015c6eb111c3a
|
||||
DIST perl-support-4.13.tar.gz 155548 SHA256 1d69a898ded80c0ef6a7ea2ce83ae5c4a7d023733d9767ae34aa1ef5c2918818 SHA512 5f4a7a82172b1649070f2d5405b316f039cfa40643ef0be7273f9ae30a89fa84c61e14f241c2bc3f68fb7f12dbc2f4d2914f5ee886c002aca29abb2fa4b4b8c0 WHIRLPOOL 614b93c858566f5cbc651077bdd40a4327e77c8d84279600d398be3d17b12acf3bc79c69efdab826e7e478c9c7b8a873faeab52e6690214819b1bb14163bbc2c
|
||||
DIST perl-support-4.14.tar.gz 155754 SHA256 844726c7bcb669fb7d0dc949087905ac45fb8cee4d02b63739d50fc064053ca4 SHA512 b33b582f92a9a7bc9115b5b032b6c99888bedf9cde95e04e09b7a97b38b71f679c7fffb587a5afbfc450430abbfe659e16ce183902b7c4f36cdc93c5487e3194 WHIRLPOOL 077a2e32791743ddecf0970e65d5ace47ea49619de6c3d256ccadb0ead679ee302579890888fba59a918a9fdb90973970202744dd5cb4ae902cc26a6165afe0a
|
||||
DIST perl-support-4.8.zip 159646 SHA256 170e2013490d3a80f5c71f57d14a7abe09f428ca9107838ff3a0896e4b6d9650 SHA512 658daa78da8aa6feec34e85dae385dcd1e00f974f27af35d7cfb7df4350841ab726409b0bf08352e6f24e302f8767d8dd71759e8c08fa8a3aba972bdee177871 WHIRLPOOL 44846208f2b87bc7fbfb746aede4144eb104097751ab90848f9dbdf0b5cd00fc716e231a0f5f0fd9c60364e43285ab70eed0d04475121c315f9eccc572481ebc
|
||||
DIST perl-support-5.1.tar.bz2 155313 SHA256 b1757b3c0e148edd721c1f2938a0c801dc9e4ea7fe09ffc30d489be13bffb249 SHA512 eeb000aacbe96bff91491d78898cc6139f7fe5a2fdfc4fd3a0f783bb3fc0d753304b47342a3f3f94a2723d57ce05d2128dfba726db2446cb2ad2f4d1997055d1 WHIRLPOOL e7c8a39337bdfae2042aa0dddc7a7530550999dfc85153f32e6e230d216c26b0b53253462f2f3022848ef4362944c84335e61641ccf232bf1b0cd255fdd88a3d
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-vim/perl-support/perl-support-4.12-r1.ebuild,v 1.2 2011/08/09 19:23:14 xarthisius Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit vim-plugin eutils
|
||||
|
||||
DESCRIPTION="vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys"
|
||||
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=556"
|
||||
SRC_URI="https://github.com/vim-scripts/${PN}.vim/tarball/${PV} -> ${P}.tar.gz"
|
||||
LICENSE="as-is"
|
||||
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
|
||||
IUSE=""
|
||||
|
||||
VIM_PLUGIN_HELPFILES="perlsupport"
|
||||
|
||||
RDEPEND="dev-perl/Perl-Tags
|
||||
dev-perl/Perl-Critic"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
mv *-${PN}.vim-* "${S}"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Don't set tabstop and shiftwidth
|
||||
sed -i -e '/=4/s/^/"/' ftplugin/perl.vim
|
||||
|
||||
epatch "${FILESDIR}"/${P}-local-templates.patch
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodoc doc/{ChangeLog,perl-hot-keys.pdf}
|
||||
rm doc/{ChangeLog,perl-hot-keys.*,pmdesc3.text}
|
||||
vim-plugin_src_install
|
||||
}
|
||||
@ -1,37 +1,30 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-vim/perl-support/perl-support-4.13.ebuild,v 1.1 2011/09/19 06:17:46 radhermit Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-vim/perl-support/perl-support-5.1.ebuild,v 1.1 2012/08/05 23:56:04 radhermit Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit vim-plugin eutils
|
||||
inherit vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys"
|
||||
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=556"
|
||||
SRC_URI="https://github.com/vim-scripts/${PN}.vim/tarball/${PV} -> ${P}.tar.gz"
|
||||
LICENSE="as-is"
|
||||
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
|
||||
IUSE=""
|
||||
|
||||
VIM_PLUGIN_HELPFILES="${PN}.txt"
|
||||
VIM_PLUGIN_HELPFILES="perlsupport.txt"
|
||||
|
||||
RDEPEND="dev-perl/Perl-Tags
|
||||
dev-perl/Perl-Critic"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
mv *-${PN}.vim-* "${S}"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Don't set tabstop and shiftwidth
|
||||
sed -i -e '/=4/s/^/"/' ftplugin/perl.vim
|
||||
|
||||
epatch "${FILESDIR}"/${PN}-4.12-local-templates.patch
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodoc doc/{ChangeLog,perl-hot-keys.pdf}
|
||||
rm doc/{ChangeLog,perl-hot-keys.*,pmdesc3.text}
|
||||
dodoc ${PN}/doc/{ChangeLog,perl-hot-keys.pdf}
|
||||
rm -r ${PN}/doc/ || die
|
||||
|
||||
vim-plugin_src_install
|
||||
}
|
||||
@ -1,4 +1,2 @@
|
||||
DIST vcscommand-1.99.42.zip 48954 SHA256 edd396b2225d4f454de65be6ecfabad6faf8719e8ff41cb333776a6f45b03099 SHA512 d43721c5f3af19db44fed4ebfd6f2264f0e51872f34fbdf99537d51dcb7276ccfd6ba198ddbabcab7e57a2d97359a1b6aba00ffddd4fac304b841778a95b9e8d WHIRLPOOL aff66a22871534742eebbdcffdaf8afd853bded0557c77c6f75948151606da83a76d10680e73f433e9d9e46acabc61917e5b8417828c43fd174fd1a6a43ab21e
|
||||
DIST vcscommand-1.99.43.zip 49075 SHA256 c8c37f088aeeb229647aa0596e334a019826291ef337c0fefd95a183eb1d848e SHA512 6a22d0fe384995c814eea96971c13cb3e3c627fccfc3f2986fa5471b56c73f269792b395f02f10c079ed336d1ab99a40270f07c89ef66362b23a0953d29e5e5c WHIRLPOOL 7c57c53646823421feb7dcc62c1133d182df4a7f846c0c1813819a3eb703b059c63fe5a853a060fd621262e7163cb6a50515783be1914699435f6fe217b9091e
|
||||
DIST vcscommand-1.99.44.tar.gz 33519 SHA256 5383328480df67992cc5d46ff785ce53f62d2b80f0c3dc071edcda28aa6ef95a SHA512 a0753672e0073687bcf1a866c289039302c272425ad218ba43042d1b924ce9d573ba41bb7f823899440f380b82251879af4e867588db853a3c89ed5452f5de0c WHIRLPOOL 4b295c475aa47bbde4a060e3b4afd39d8cc7d27a6fb1c96c7825a6c4bb28c6f175a81de06c7440d3cdc77ce2c23c92d3c22bf12d3291dcbf4d34228eb2fa7fc0
|
||||
DIST vcscommand-1.99.45.tar.gz 33729 SHA256 9795f33ed1642cde107d5c825e04fc37d5c94161e71328f08cd5978db729daac SHA512 70361db670cdf37d7fdf8e12a2b46964157fc853aee4422540b6563b9353bfd28a74f256d048cf2880dcee1c396df1964e3d40e431466ed89ba466477a016089 WHIRLPOOL 524af20a1ac7c5c3898ab2fbdd2b0b1de7c7606a704cc6ec2b717f22f6adf0e212e5054dcef9a3fc270dc104c001e7b6c5bf53db03a02066a67c769ae69af3ef
|
||||
DIST vcscommand-1.99.46.tar.bz2 27316 SHA256 bb8d208b060a2bd30541ba45924b3c4f07a1faacdadcf7728f3ab43c9eaf947d SHA512 3ca212408d46bc80bb744122add95893aef66ae4d8eebf02a8f9297570f63348cbafbb383b889260ad10b410e6fa2ae217e0a7ff398ac1590851b7ddf32fe267 WHIRLPOOL 67a045ccd725a17cbcc3c26de10afc7fae9287c9a8feae571b1a8b3f8deb0ed92ab55ec238543370cfaeef86a1ad767cbacc38c7c2666f08d04af26b0be7dd37
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-vim/vcscommand/vcscommand-1.99.42.ebuild,v 1.10 2011/12/11 15:34:41 armin76 Exp $
|
||||
|
||||
EAPI=3
|
||||
|
||||
VIM_PLUGIN_VIM_VERSION="7.0"
|
||||
inherit vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: CVS/SVN/SVK/git/bzr/hg integration plugin"
|
||||
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=90"
|
||||
SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=13751 -> ${P}.zip"
|
||||
|
||||
LICENSE="public-domain"
|
||||
KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="!app-vim/cvscommand"
|
||||
DEPEND="app-arch/unzip"
|
||||
|
||||
VIM_PLUGIN_HELPFILES="vcscommand"
|
||||
|
||||
S="${WORKDIR}"
|
||||
@ -1,28 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-vim/vcscommand/vcscommand-1.99.44.ebuild,v 1.2 2011/12/11 15:34:41 armin76 Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit vim-plugin
|
||||
|
||||
MY_PN="${PN}.vim"
|
||||
DESCRIPTION="vim plugin: CVS/SVN/SVK/git/bzr/hg integration plugin"
|
||||
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=90"
|
||||
SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
|
||||
LICENSE="MIT"
|
||||
KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="!app-vim/cvscommand"
|
||||
|
||||
VIM_PLUGIN_HELPFILES="${PN}.txt"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
mv *-${MY_PN}-* "${S}"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
rm README || die
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST flatzebra-0.1.5.tar.gz 340636 SHA256 d663aa222fb8ba3974ccbe82778ecd38e64a2d7524b12e54b3cf0dbb9f017c07 SHA512 5c7dcc50d60189a64d6f291cb6e198078a3a4bdfe96f0b8d5767b94be89c5f5b43857a5f010b250fb5bcc6356c3144547d9c0e5bf252ca0fb111a6488ae293b6 WHIRLPOOL 053108152d79d714ca6c330e27dfc7892e257c0666f1743f896fa711904cac36741bd09cfa687fe092ba80d7d68a5dbf396438ddafd3df2f312646031176f2bc
|
||||
DIST flatzebra-0.1.6.tar.gz 359098 SHA256 4e7bb0a77136ec3b81e0f73c1d08e828d38ef011095d5ce7068a94f3bb21d67a SHA512 500df95ee23bd2decf1e11be76725733d9219ef06a844f2de337fc11494eeea57e5ab6298cb4235c394216dd75bfb64a4e9f732362ca5ee95c43086b2ca38f75 WHIRLPOOL 96d058b434c08e69a05d9ee1576629361134e9edda32e15ffa80c640aa03675360a03838f1f339b77f50b3c2e423a28bbe7fa19925568da377dd42016f4c4e62
|
||||
|
||||
@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-games/flatzebra/flatzebra-0.1.6.ebuild,v 1.1 2012/08/06 00:50:08 mr_bones_ Exp $
|
||||
|
||||
EAPI=2
|
||||
|
||||
DESCRIPTION="A generic game engine for 2D double-buffering animation"
|
||||
HOMEPAGE="http://perso.b2b2c.ca/sarrazip/dev"
|
||||
SRC_URI="http://perso.b2b2c.ca/sarrazip/dev/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
|
||||
IUSE="static-libs"
|
||||
|
||||
RDEPEND="media-libs/libsdl[video]
|
||||
media-libs/sdl-image
|
||||
media-libs/sdl-mixer"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_prepare() {
|
||||
sed -i \
|
||||
-e '/^doc_DATA =/s/^/NOTHANKS/' \
|
||||
Makefile.in \
|
||||
|| die "sed failed"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--disable-dependency-tracking \
|
||||
$(use_enable static-libs static)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "emake install failed"
|
||||
dodoc AUTHORS NEWS README THANKS TODO
|
||||
if ! use static-libs ; then
|
||||
find "${D}" -type f -name '*.la' -exec rm {} + \
|
||||
|| die "la removal failed"
|
||||
fi
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
DIST attica-0.3.0.tar.bz2 54981 SHA256 a0bd218ac598afed5a5605c015035236ddb298e90336f9ef3dc74ebdeb19cdf1 SHA512 116f19a266869b96f6689bea848bc5844f7ebb3e25f1837136cf55fd9b9efe1219575cd6966e3255515d117d407c27b41a0d1285e4b149d5ea73cd93c1861890 WHIRLPOOL e437e7f7e7ef9a66debcc45f162a860117fb769c2cdb37d08679b511ae6618fbddd37a5de0fd80fcb33bce57a3c034866934d6a624e78d8c51193640c01f5cab
|
||||
DIST attica-0.4.0.tar.bz2 55598 SHA256 18fa5f99846063175f27b38e0c6b3df841a2c38843406e30d3317175d20f4d9c SHA512 6a57eefbabc583fbe88c5136bdfd2e3ba50fe02aa5e164db18cead44035625f9b60664b75b87eda022722f33455c79870856777f7820212a01143c2d447cbf91 WHIRLPOOL 884638130f510886157b55a6717715174d91e37442ceb2156910fb82ce48d5172034f341bdca77c5e3cb5d8979dc3ed9cb80edfa5e8e244efb39813e09df3ad7
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libattica/libattica-0.3.0.ebuild,v 1.6 2012/06/07 21:15:05 ranger Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
MY_P="${P#lib}"
|
||||
MY_PN="${PN#lib}"
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="A library providing access to Open Collaboration Services"
|
||||
HOMEPAGE="http://www.kde.org/"
|
||||
SRC_URI="mirror://kde/stable/${MY_PN}/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2"
|
||||
KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
|
||||
SLOT="0"
|
||||
IUSE="debug"
|
||||
|
||||
DEPEND="x11-libs/qt-core:4"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
DOCS=(AUTHORS ChangeLog README)
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
@ -1,2 +1,2 @@
|
||||
DIST Lab-Measurement-2.96.tar.gz 130920 SHA256 bb36888bba4f20c22d108d0d42803f6b6197a523198c824ad3279fc5e05c52ae SHA512 5f8293546f29f59dfb87b05d187d815fbba0d45ae9ff95ee30a646e676f917265e80c6681a3abd877f144f67b0565215b33b74080aa2655e562c37eae8ab1175 WHIRLPOOL 85eb1738860c6bc554ab250de78dced01cfbbff276778813d6963cd281326be960a838bbad784be3b5ff10d1f25e3fed253df5b7f6b45b57a6a9e5d2115dc020
|
||||
DIST Lab-Measurement-3.00.tar.gz 134759 SHA256 676c15430eff6ea893505146d9b1d3af51ef0dc8fff9a28f49aaabb9a2e8e7d1 SHA512 0dfba6aa6737be6631fd1082eded2773344833a94da430a2694f152efb13f3561226f8065d629699a20ecd7754dbe3f1d5d4794cab5b78bbb60dd6de3cb6cc29 WHIRLPOOL 1bbbcde56b5290aaa8b6dc9783112ae36c3c2da1866cd37ba8757aa4247054447ca25da1cbda2cec940286ac840d54daf8ff97d5c0cbfbdbe473ad0d6ed4f493
|
||||
DIST Lab-Measurement-3.10.tar.gz 154046 SHA256 5b0b74d7d5c798a145d0f631ad269f554dca0206ca502cb26865bf85699b2cba SHA512 4acee1ba5860c819e45f1b365a67292ac9be794bc6f233314e8c08cc314bc326782b38cdc03575f37a7e0e271598f29e636b4291cd462a62676e80d2e66dfd29 WHIRLPOOL af683ae97ac6d72209b840d9dd537d430e780166049038335e9884460db8054a71b2bb4dac0706c352fcaedcf14f3e3406b66e45075cfc9982ee9cd1a882d1cf
|
||||
|
||||
@ -1 +1,2 @@
|
||||
DIST Spiffy-0.30.tar.gz 27631 SHA256 ce9374b6ba271efdc65d199298b04bd3a0c7e6e6504965ed86222dc5c80845b9 SHA512 fdd7fa1b24bb051f9af9c1a790c77cb23fef7dcc61b4811f2a2ea8d43113fca03418f96a6b6ee787565ad27b19f78f84453bb32f510ef9be047f0ff20e6dbc9d WHIRLPOOL 2b6a3201ab3d07ce448ad8250b6c80da88f722908c44437d2fdfa6a581f49b63f178a143e1dc00579c12e8b1c8ea8e49ce7fe24cf85733bccfa44451c96e3f23
|
||||
DIST Spiffy-0.31.tar.gz 53320 SHA256 922e02aa62a8a618f91dc185d34fde65ef652dfa35d7a335f2e8de2ffdd2f686 SHA512 8d08a04823c98b34a9c4114b6d60f572e33a716969af65cb6818f75d4be9887ba723a70c268b77f2642e707c80875e31a3fa931d6f0c328cffdad8354cc400ca WHIRLPOOL 6d4d540af547f70feeaac5e44b2f8fe989094e2867b40b14e40e090d673015d97a0be98848878d5d3d02d42ee062dcac1e8a31f9458fa57ac7a85ed2ff9a0ed5
|
||||
|
||||
@ -0,0 +1,17 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Spiffy/Spiffy-0.310.0.ebuild,v 1.1 2012/08/05 18:42:56 tove Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
MODULE_AUTHOR=INGY
|
||||
MODULE_VERSION=0.31
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Spiffy Perl Interface Framework For You"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||
IUSE=""
|
||||
|
||||
SRC_TEST="do"
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue