Old ebuilds removed
This commit is contained in:
parent
30d7774e63
commit
797623e0e3
|
|
@ -1,4 +1,2 @@
|
|||
DIST nixnote-1.5_amd64.tar.gz 53973553 SHA256 7fa84e65aa915677ff286edbf5b55f28151532731e14001eaf1b696244be6a6a SHA512 baf5a9bdb185eb9e5964a7f43ba81e5c304c98b0250d048fc18f4e4e0630c1d817d7f617f499c5c50569a7591434aca3003f40ab30cdee71873119ca8d7d7841 WHIRLPOOL 2c1de165bed262286606c270e813522feab2bc55a58212be06142125ebd99f91992606d1e7edbe400c9d7f0f853dd24ede91d4ddb6aa28e4a8869224852d77cd
|
||||
DIST nixnote-1.5_i386.tar.gz 53511482 SHA256 6fe73731a3cac1138f45ae814fe39b98c5d56f98c30c0b8eaa110572f91356a9 SHA512 87c207bd4293e245f7f4b09374a70239832e2d571377188936c413be253041f00f0b78af0e5d8d3603bde57a8a0995b2cfcdd96c20161848b9c3f7017892f55b WHIRLPOOL 6e13836423d114c8460a5befeb33b7fc5611aaa77e3f09ad8bc88b6203ddefc11bec0781ccd6157eb450a0218e290ffecaacda040ccbb536436c4572af01c668
|
||||
DIST nixnote-1.6_amd64.tar.gz 53989217 SHA256 781f8b9cbe3e1137b62d4dbb76670b3e2d5a20403b04b3767e03a2e89dba860e SHA512 5c56bbc8b59be57437aa145c4414a2967ec6afe41372d399e2ca9934ab11d07559721ab860118f02e5b7ccc4c79232f7dc7761a9f5dfedd0c2ef44189b1fa57c WHIRLPOOL 0a230ba543ef0351a41b444cc64399ba00b6b0aea69f54f91bdc60f149693dee2872d961ac923faf621228bd4b6df2224db44aede3bc7c988f01f10b83b495b3
|
||||
DIST nixnote-1.6_i386.tar.gz 53529229 SHA256 50be711e33d37fd43590845718e5e5710cc48a5f7f745df8990b0f792da3a7da SHA512 d051df6ed2902c129e883243e30ce5496b5694fe1f41d89d24b0214425797309233c0d066fe251fb38ca64dc8ae5b13057ed4f887e1d365d842a5fd3a001515f WHIRLPOOL f522a5e2c97c94ee82dede5077f13d95016249563ba06b8145356a9aea99f1370a8f52dadabbd210cd96dee020c90fb959c01f7265157c973578a801c0a6761a
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
DIST dia-0.97.3_pre20140417.tar.xz 5393236 SHA256 d9afac3b2f7bb5fa35733e24f35afd69c7b3cd04af5f6b0a806400a35b5b43db SHA512 1dbd189ca3499a5adb3c6537ffdcfc776b56fb927a3daeb266685dd4a359aa18ea9b472d12865813e823c71652f49e5739ac9d98789629a39e0cd891fe2265a6 WHIRLPOOL 28d4fcd98f853ad0dec48296a0ada9d842eb32a7953a1e11fe59fe21170be4d14e693a53e0d85c392e1b7cf4f117a3206894e3326436c5e53d115c8efb06a842
|
||||
|
|
@ -1,107 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.3_pre20140417.ebuild,v 1.6 2014/06/12 18:00:38 pacho Exp $
|
||||
|
||||
EAPI=5
|
||||
GCONF_DEBUG=yes
|
||||
GNOME2_LA_PUNT=yes
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
|
||||
inherit autotools eutils gnome2 python-single-r1 multilib
|
||||
|
||||
DESCRIPTION="Diagram/flowchart creation program"
|
||||
HOMEPAGE="https://wiki.gnome.org/Apps/Dia"
|
||||
|
||||
SRC_URI="http://dev.gentoo.org/~pacho/gnome/${PN}-0.97.3_pre20140417.tar.xz"
|
||||
S="${WORKDIR}/${PN}-0.97.2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
|
||||
# the doc USE flag doesn't seem to do anything without docbook2html
|
||||
# cairo support is preferred as explained by upstream at:
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=729668#c6
|
||||
IUSE="+cairo doc python"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/glib-2:2
|
||||
dev-libs/libxml2
|
||||
dev-libs/libxslt
|
||||
dev-libs/popt
|
||||
>=media-libs/freetype-2
|
||||
>=media-libs/libart_lgpl-2
|
||||
media-libs/libpng:0
|
||||
sys-libs/zlib
|
||||
x11-libs/gtk+:2
|
||||
x11-libs/pango
|
||||
cairo? ( x11-libs/cairo )
|
||||
doc? (
|
||||
app-text/docbook-xml-dtd:4.5
|
||||
app-text/docbook-xsl-stylesheets )
|
||||
python? (
|
||||
>=dev-python/pygtk-2
|
||||
${PYTHON_DEPS} )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/intltool
|
||||
sys-apps/sed
|
||||
virtual/pkgconfig
|
||||
doc? ( dev-libs/libxslt )"
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
|
||||
|
||||
epatch "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812 #558690
|
||||
epatch "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685
|
||||
epatch "${FILESDIR}"/${PN}-0.97.2-disable-cairo.patch #509636
|
||||
epatch "${FILESDIR}"/${PN}-0.97.2-boundingbox-calc.patch #508566 , upstream #728921 #728405
|
||||
|
||||
if use python; then
|
||||
python_fix_shebang .
|
||||
sed -i -e "s/\.so/$(get_libname)/" acinclude.m4 || die #298232
|
||||
fi
|
||||
|
||||
if ! use doc; then
|
||||
# Skip man generation
|
||||
sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am || die
|
||||
fi
|
||||
|
||||
# Fix naming conflict on Darwin/OSX, upstream bug #????
|
||||
sed -i -e 's/isspecial/char_isspecial/' objects/GRAFCET/boolequation.c || die
|
||||
|
||||
sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
|
||||
|
||||
sed -i -e "/localedir/d" configure.in || die
|
||||
|
||||
eautoreconf
|
||||
gnome2_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# --exec-prefix makes Python look for modules in the Prefix
|
||||
# --enable-gnome only adds support for deprecated stuff, bug #442294
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=996759
|
||||
gnome2_src_configure \
|
||||
--exec-prefix="${EPREFIX}/usr" \
|
||||
--disable-gnome \
|
||||
--disable-libemf \
|
||||
$(use_enable doc db2html) \
|
||||
$(use_with cairo) \
|
||||
$(use_with python) \
|
||||
--without-swig \
|
||||
--without-hardbooks
|
||||
}
|
||||
|
||||
src_install() {
|
||||
gnome2_src_install
|
||||
|
||||
# Install second desktop file for integrated mode (bug #415495)
|
||||
sed -e 's|^Exec=dia|Exec=dia --integrated|' \
|
||||
-e '/^Name/ s|$| (integrated mode)|' \
|
||||
"${ED}"/usr/share/applications/dia.desktop \
|
||||
> "${ED}"/usr/share/applications/dia-integrated.desktop || die
|
||||
}
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
From 9d40692b695b30f80b263814bdd351c0dbe67733 Mon Sep 17 00:00:00 2001
|
||||
From: Gilles Dartiguelongue <eva@gentoo.org>
|
||||
Date: Mon, 18 May 2009 22:19:35 +0200
|
||||
Subject: [PATCH] Fix compilation in a gnome environment, gentoo bug #159831
|
||||
|
||||
---
|
||||
configure.in | 19 +++++++++++--------
|
||||
1 files changed, 11 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index d27ee6e..d9c0bf4 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -110,17 +110,19 @@ if test "$have_libart" = "yes" ; then
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([whether GNOME specific code should be used])
|
||||
-AC_ARG_ENABLE(gnome,[ --enable-gnome enable gnome code],
|
||||
- GNOME=$enableval, GNOME=no)
|
||||
-if test "$GNOME" = "yes" ; then
|
||||
+AC_ARG_ENABLE(gnome,
|
||||
+ AC_HELP_STRING([--enable-gnome],[enable gnome code]),,
|
||||
+ enable_gnome=no)
|
||||
+if test "x$enable_gnome" = "xyes" ; then
|
||||
GTK_MODULES="$GTK_MODULES libgnome-2.0 libgnomeui-2.0"
|
||||
AC_DEFINE(GNOME,1,[Define if building with GNOME support])
|
||||
+ AC_DEFINE(HAVE_GNOME,1,[Define if building with GNOME support])
|
||||
AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${prefix}/share/pixmaps", [GNOME icon directory])
|
||||
- have_gnome=true
|
||||
+ have_gnome=yes
|
||||
else
|
||||
- have_gnome=false
|
||||
+ have_gnome=no
|
||||
fi
|
||||
-AM_CONDITIONAL(HAVE_GNOME, $have_gnome)
|
||||
+AM_CONDITIONAL(HAVE_GNOME, [test "x$have_gnome" != "xno"])
|
||||
AC_MSG_RESULT($GNOME)
|
||||
|
||||
dnl GTK2: libgnomecanvas-2.0 ?
|
||||
@@ -129,7 +131,8 @@ PKG_CHECK_MODULES(GTK,$GTK_MODULES)
|
||||
AC_SUBST(GTK_CFLAGS)
|
||||
AC_SUBST(GTK_LIBS)
|
||||
|
||||
-AM_CONDITIONAL(HAVE_BONOBO,false)
|
||||
+#AM_CONDITIONAL(HAVE_BONOBO,false)
|
||||
+AM_CONDITIONAL(HAVE_BONOBO,[test "true" = "false"])
|
||||
|
||||
dnl Look for Cairo
|
||||
AC_ARG_WITH(cairo,
|
||||
@@ -627,7 +630,7 @@ Configuration:
|
||||
Source code location: ${srcdir}
|
||||
Compiler: ${CC}
|
||||
|
||||
- Gnome support: ${GNOME}
|
||||
+ Gnome support: ${have_gnome}
|
||||
Python support: ${with_python}
|
||||
Libart support (PNG export): ${have_libart}
|
||||
Cairo support (PNG, PDF, print): ${with_cairo}
|
||||
--
|
||||
1.6.3
|
||||
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
From 8b8ae09fcc16cc0522679099728f779e291d959c Mon Sep 17 00:00:00 2001
|
||||
From: Hans Breuer <hans@breuer.org>
|
||||
Date: Fri, 18 Apr 2014 13:28:45 +0200
|
||||
Subject: [PATCH 1/3] Bug 728405 - back-port some bounding box calculation
|
||||
fixes from master
|
||||
|
||||
... so that the unit test works without complaints.
|
||||
---
|
||||
lib/boundingbox.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/boundingbox.c b/lib/boundingbox.c
|
||||
index fd50da7..46adbfa 100644
|
||||
--- a/lib/boundingbox.c
|
||||
+++ b/lib/boundingbox.c
|
||||
@@ -494,7 +494,7 @@ polybezier_bbox(const BezPoint *pts, int numpoints,
|
||||
account with the "pointy corners" X (and PS) add when LINEJOIN_MITER mode is
|
||||
in force. */
|
||||
|
||||
- if ((!start) && (!end)) { /* We have a non-extremity vertex. */
|
||||
+ if (!end) { /* only the last segment might not produce overshoot. */
|
||||
Point vpx,vxn;
|
||||
real co,alpha;
|
||||
|
||||
@@ -515,7 +515,7 @@ polybezier_bbox(const BezPoint *pts, int numpoints,
|
||||
real overshoot;
|
||||
Point vovs,pto;
|
||||
|
||||
- if (finite(alpha))
|
||||
+ if (alpha > 0.0 && alpha < M_PI)
|
||||
overshoot = extra->middle_trans / sin(alpha/2.0);
|
||||
else /* prependicular? */
|
||||
overshoot = extra->middle_trans;
|
||||
--
|
||||
1.9.3
|
||||
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
--- plug-ins/cairo/Makefile.am.orig 2014-05-06 14:09:36.080876942 -0400
|
||||
+++ plug-ins/cairo/Makefile.am 2014-05-06 14:11:21.043041750 -0400
|
||||
@@ -1,11 +1,14 @@
|
||||
-
|
||||
+if WITH_CAIRO
|
||||
plugin_sources = \
|
||||
diacairo.c \
|
||||
diacairo.h \
|
||||
diacairo-interactive.c \
|
||||
diacairo-renderer.c \
|
||||
diacairo-print.c \
|
||||
- diacairo-print.h
|
||||
+ diacairo-print.h
|
||||
+else
|
||||
+plugin_sources =
|
||||
+endif
|
||||
|
||||
pkglib_LTLIBRARIES = libcairo_filter.la
|
||||
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
From 2f853bab67b087605a10f544a7df780ac98b8583 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl>
|
||||
Date: Sat, 7 Jul 2012 17:28:59 +0200
|
||||
Subject: [PATCH] Fix missing linkage with gmodule-2.0.
|
||||
|
||||
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=678761
|
||||
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=420685
|
||||
---
|
||||
dia-0.97.2/configure.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dia-0.97.2/configure.in b/dia-0.97.2/configure.in
|
||||
index 72830de..6b7394a 100644
|
||||
--- a/dia-0.97.2/configure.in
|
||||
+++ b/dia-0.97.2/configure.in
|
||||
@@ -55,7 +55,7 @@ AC_SUBST(GMODULE_CFLAGS)
|
||||
AC_SUBST(GMODULE_LIBS)
|
||||
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
|
||||
|
||||
-GTK_MODULES="gtk+-2.0 >= 2.6.0 glib-2.0 >= 2.6.0 libxml-2.0 gdk-pixbuf-2.0 gthread-2.0"
|
||||
+GTK_MODULES="gtk+-2.0 >= 2.6.0 glib-2.0 >= 2.6.0 libxml-2.0 gdk-pixbuf-2.0 gthread-2.0 gmodule-2.0"
|
||||
PKG_CHECK_MODULES(PANGOVERSION, pango >= 1.8.0, ,
|
||||
AC_MSG_ERROR([Need Pango version 1.8.0 or higher]))
|
||||
|
||||
--
|
||||
1.7.11.1
|
||||
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>gnome-office</herd>
|
||||
<longdescription>
|
||||
Dia is a gtk+ based diagram creation program. It can be used to
|
||||
draw many different kinds of diagrams. It currently has special
|
||||
objects to help draw entity relationship diagrams, UML diagrams,
|
||||
flowcharts, network diagrams, and simple circuits. It is also
|
||||
possible to add support for new shapes by writing simple XML
|
||||
files, using a subset of SVG to draw the shape.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX 50-libreoffice-bin 158 SHA256 6c6cebcce51b639545a42c0b9cc6268f0ce1e8bb9d7d22bb11e5ebd1448638e9 SHA512 2d1158f48ac80f9212578d020e5659e777ff494adc3abc94438cec6890b88741f92ea2ed3bb4585ffdabe531d55c6938ca9408e9ece5a438e67d480eb406ed50 WHIRLPOOL 47d4187edca8b343378a2f58e63b0c10cc11f11b21702064fe102003e2bb6eaf3de660128442238e1c040b97ccaa1ee45d8089713c3a62a1dacfe5a72f1c6ee2
|
||||
DIST amd64-bin-libreoffice-4.2.5.2.tar.xz 72147208 SHA256 71224e82b01ef5f0b9d62c6c799dc330b8d47690ccb39699f3b48768a71d6b39 SHA512 25aa83c9f8fd0f3882f604c9c311d2bedb44f6538db5d1e6d1ca8bf3475aa28e9a44d24d9c0673a24a47aba20bf787c469049b6f6920f457f6962bc893bb521b WHIRLPOOL eca2b9b4dc1209780a5e86a4c6428b78c4d56d23861ff6fd3f49061a05ea9b2b220be8dd1a761449ecedfb7bfd412d955169050ff9f57b945fa5e064c054965b
|
||||
DIST amd64-bin-libreoffice-gnome-4.2.5.2.xd3 419565 SHA256 7a200b748d3e6e09ea69c8d2f4b0b10a4759d96818e89fcc148776ae5c0b1639 SHA512 91ae3b9e9b00fb235c4da425bbebcc8bc77ecac6ad3f19c1f636cd675b46d28d55aac938e7878e0040da3e6fa3cca23b9b09c91339aaefd28c38995488dd87d8 WHIRLPOOL 1643cac6910296678a09022ed2eef26322360ee1617d7c94a4e89fcd759d0829a46224039aa8f74d7938fd41b8f07ea28979b4d4d9d306e2e7afe74cff63d226
|
||||
DIST amd64-bin-libreoffice-gnome-java-4.2.5.2.xd3 22719562 SHA256 3a5e6a486f1aaec9fcfedfdd9858526fd4b28f355162c0933d1245f2516f7a14 SHA512 e09f3dab572bf9972eff2ec9a5556e6ac945edbdad6f1afb7de8349949e1f42898ec154cec12dfb0cac3fefc3988e5cb911e146cb59a8b82f090c97708131094 WHIRLPOOL 88d5b8212a348f836bd0f7f8ea44b1a572156d4431dad33ed2d6d83af900ceecf1de4b32eeb347d9cbd1fc36069b387c0b780bd484c031f5b5e5ad258e6eadb7
|
||||
DIST amd64-bin-libreoffice-java-4.2.5.2.xd3 22359259 SHA256 1b2c461fb5201dfbc84dc9fffe701a0371ae8bed58050cf6dba780b946550758 SHA512 dbbcc80ed202a9f20e179d07ed1eadeaccbcc6570ecba17f2776d7d2021626bcfd37b74cdbf81dfef08c7ecfe38585d35679ba673e129b2597b4ed72c336b15e WHIRLPOOL e3bd883d8f328e224a10e94ae0c4a95ddb78719072193335ce1811863ea823e71b67b82869bdb4f085ea322e626b61691fb0acd50251c712fc095da85f5d933d
|
||||
DIST amd64-bin-libreoffice-kde-4.2.5.2.xd3 7094544 SHA256 7d2f4fae28e9dc782a34ea384ccccbd7f2a71ab954cc78dcddec9c4509230906 SHA512 084dbaf15a79d112868906f875e804ae58c632c57b5d178636666064bfc1a2e347b2b24062ec982a7b5f802aba36fd3f7da7dec6b07ee87ef90706e395a39caa WHIRLPOOL 80e8d013a16501697ad96af62725da8e4e4e8965e6ddf8fd33d86c8a0f7b65bd0b6b566f89aa7e1c44174f9f4f88df953e27edbc976eebc32abd2554518fafe3
|
||||
DIST amd64-bin-libreoffice-kde-java-4.2.5.2.xd3 22515791 SHA256 c9ac56cdeeb532b0a4f5bd3e09ccc02f1722702aecce10088d519c2ee9dddad2 SHA512 d062de707ee33227f670e86c8d20863f53430dc1d1e70f610d2a5b1b3cd373b0d8f987aea627829677064f85e1522b57ab2402950b6387058ef75a87d6113414 WHIRLPOOL d60bde1796cdd9b37081cf86c6f6b8ee8dc77005e32a150c550c45ad0c9c1f33a99d84d873fb741bde343265fc820aee24ab952f1acaa8825796c749c1e92961
|
||||
DIST x86-bin-libreoffice-4.2.5.2.tar.xz 71558168 SHA256 498c26a1c5408c510e26ffacca3d1cee2f9118d83ae8c16c81d224773ea4321e SHA512 a08929c35b9d105d9f60af0b3f2010bcc2a42c9f58117dd1e82b35f0fc18ffb57e55e31a5a904e77560f70243b44d33ca13266d51d3e813a78ec4fe655c3d569 WHIRLPOOL 8d3bead6af84142502b2e285daba8818b65809e8db1ef227871227e30ccb45f8cd08aa74fbcfe25c60b6c9ef77d0ba6d3072934337d44a468e1f73c47de9f8aa
|
||||
DIST x86-bin-libreoffice-gnome-4.2.5.2.xd3 395149 SHA256 86ba8ed9010b882c259e0764936b78bbec9b53e13716a6c5997948bf862ffcfc SHA512 e7dbee58db2d54c664547199b3c570c298bd6fd395903a6c743d00faed1d1de928e3b1aac9d59097ff5c94b4b9f2dab524377c8bdd6b53724086eb533eb1e9b4 WHIRLPOOL 655d3d1cddb4b4aef35c0d06a0bb69c32ac761ba0df7af3aec4cb4dea3f4cd240ebc5f4bc3a049878f5348968cbea81c7e28bfd71b41879be85d694a336ffc37
|
||||
DIST x86-bin-libreoffice-gnome-java-4.2.5.2.xd3 23016294 SHA256 14a1c383fd55f2fefd62f632cdc5cabfc4b9f025317b45e6e1d7036b1c927352 SHA512 149df4cde1ce0522e43e98e6f5f88d3913175495ca93a1d186ab62d00e760c747aa704ac05b02abb132909c36fb87683f1f5f0187f25491684c653ea9d7def5c WHIRLPOOL 413eb97e4728aa82e447410eeed7b494482b04c553d9772aac55ddea6b6068b74c00c166c297fdcd4174247c9f301f6c59438e978a0063f06b2696c5c4d04ac4
|
||||
DIST x86-bin-libreoffice-java-4.2.5.2.xd3 20719209 SHA256 30c99fc9661137a8dc8d02331c1b58329228d7760cd13953a18593b98c36dc72 SHA512 d064b01f9ed019225ddead894aa95a715a22550480b8636141af08f091b7d3f61220d89e54bff350b09ff5c5455c5ae0afaff784db796f2a4e875623e40952f5 WHIRLPOOL 5d3e0dcf11615cbc10b19dc3ef00de6cfa4fa8c3b32b089c850b5b1699cac882492bda571bef45e62d6a849e13935789b693c7fd49efbacfb83989d131d4ba77
|
||||
DIST x86-bin-libreoffice-kde-4.2.5.2.xd3 6422120 SHA256 735eb123bb31cff74451c133ab27815c1732152921addb14767e6f2d675b8133 SHA512 d1a7b5415e1c93244379bd5779062d8280ccde74c334bb08c8973923e449a0aaeaf316f112b05994e8c7dab5f5504fb6367a61812099555061a885dbab1270e8 WHIRLPOOL 55bc256b0dead49f0c8f1d2195186f3d981acd9e4b89a851df23fbaec48b00f882f05374aa7903660731d029bb9a1157e6bb08f4dd3bfe3e2b69978455ae3571
|
||||
DIST x86-bin-libreoffice-kde-java-4.2.5.2.xd3 20811408 SHA256 5600de965d2dbdf59e1554b00e3c551ec6b7ee821b42dec1272b699c8631496d SHA512 67ea9933df43ac62597f3cd921e488aed2bf1cd87178c9e3fc19466d50c5af23aa22300218b6acba4aec5a394056f9519517fdd5ce1edffda0d43df4800c7ae6 WHIRLPOOL 20bf4bdad93926ca126be227c77777105e0dc393e929acdfe92609d479b02ca5f0d2edca05e44ab06ee0f3ae7477741d9bcfd0f35205408c63da4c7fe7a6ae51
|
||||
EBUILD libreoffice-bin-4.2.5.2.ebuild 6221 SHA256 e5359a9d8273b022d7a4ea0c3e4c354e4252dafa4f6d551abc1662d061f33e0c SHA512 65ea2b27e12a1c934e637541a41c503ee80e50432e78748b301cc9074687bca6ff2083d531c46ce6ee692c8402cd5c6c1aad30b42cbcb1e74c63ff63974cf52a WHIRLPOOL 93b3d9ae8eb0967a9eea80983d1bfcad88a28e7ec02ee4e484c070e08679b64ed21a6fd7ad05be79efdc609730a0467843c26f5d68fd875c7df45c68e9bb22d2
|
||||
MISC ChangeLog 21801 SHA256 9cb3cc6329aa59bb5547bfc7ef05087fd3c402d7c68c971edf8ee5af72707024 SHA512 85e3244d517d98868242c4bf310363998d2996497b849a78f9a34e2bb0d6e9c63b5e56574c20f460c39b28355d7403c5bbbbcf482e03d2b73de327936705f40c WHIRLPOOL 8d9f9706705e6a7639ae7fe9ca72598b038fbd80dcf6f994ee41092be636cf59d337bfd282f053ebc55f9569fd680c34ebff99d3fa55de15f040ea24f65ffca8
|
||||
MISC metadata.xml 409 SHA256 92a42f3ef25ede1bee68ec939cd4e0d88bbada54d90dab225f06bfc02b8bd498 SHA512 5a383da805155e80920620854f04e1bb9fcfe0764d0258ec95267c3229dae50cdb5f2cd83fbdc4cb7a856e079c696bb6f73d9aefec2fabef9317e391fd5db9ab WHIRLPOOL 158b0614005477cb448240a8f36e35fc8768c9ba0b83e71b1502dd1725fabafd4031d7c40a33030c683a14a38dad318f47db90712aab6d7ed4150fd26000193b
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.22 (GNU/Linux)
|
||||
|
||||
iQJ8BAEBCABmBQJTsFmgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
|
||||
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
|
||||
QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcLhAP/3GNHWu3d+ia1SbTNsHUBD01
|
||||
v5NUA2SE50fXbERmCDCS4scvasQnqAJYh9hwICIcwNgrw7Tyg0LQvYHECmDgv01r
|
||||
VwsyZ7rkENl/iPUsDeAxIObhE2+PkhmizTuK934ioKFo1jKjtEiCAtklDNh+8oqg
|
||||
o/d0ty1RRRYl2uVzZKkJKz3hnfvMMsm07IzIgR4xv2MiEG+ltLU7+ManeUO97P2k
|
||||
eYY6GGdq7vxOj2oCavY7f+MVqfWxUCjOyR87qyEOt/F2Cdy8tgHpAFpsFHGtUmqx
|
||||
ikXHtZUavZGfR5Tg+8RTEZtBHWp4+iwt1LIELq4kYwyWQ1/3CHISLfbunJ4b/xwa
|
||||
Mm3pzpVFhXLlaEdcKSAuTbrTXArppy28TCy2Z2ebUEMZRx53BXLO/rtN36Jvbz7n
|
||||
AQMID7KwkVyQ/C2HBGl1qTxgHgqYKBH0lP4CnaCfzka0m2R7jNoYWssRGUtTIrKQ
|
||||
94yRayyBHUqszs3sFaiHGDJiDWAWzKH/o0n4jwIjRcM5WVQHjCKLr80B25ZvZDau
|
||||
JaCRsAZp2Stg5W/6uhD1NL6Sv+kPH/QN8AhjJTR9IPRrf7Gh2SYLOhtJFYgOm9C0
|
||||
hxDPUWGp9+96jSvGo2WKprsHWX07QMOBoSlotYEhoLmhlK/l5koodHg5BLapTGio
|
||||
PahNrG9+ZaX+f/K9XeT8
|
||||
=HA3d
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
SEARCH_DIRS_MASK="@GENTOO_PORTAGE_EPREFIX@/usr/lib/libreoffice
|
||||
@GENTOO_PORTAGE_EPREFIX@/usr/lib32/libreoffice
|
||||
@GENTOO_PORTAGE_EPREFIX@/usr/lib64/libreoffice"
|
||||
|
|
@ -1,230 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-4.2.5.2.ebuild,v 1.4 2014/06/29 16:43:12 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
KDE_REQUIRED="optional"
|
||||
CMAKE_REQUIRED="never"
|
||||
|
||||
BASE_PACKAGENAME="bin"
|
||||
BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
|
||||
BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
|
||||
PYTHON_REQ_USE="threads,xml"
|
||||
|
||||
inherit kde4-base java-pkg-opt-2 python-single-r1 pax-utils prefix versionator
|
||||
|
||||
DESCRIPTION="LibreOffice, a full office productivity suite. Binary package."
|
||||
HOMEPAGE="http://www.libreoffice.org"
|
||||
SRC_URI_AMD64="
|
||||
${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
|
||||
kde? (
|
||||
!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
|
||||
java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
|
||||
)
|
||||
gnome? (
|
||||
!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
|
||||
java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
|
||||
)
|
||||
!kde? ( !gnome? (
|
||||
java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
|
||||
) )
|
||||
"
|
||||
SRC_URI_X86="
|
||||
${BASE_X86_URI}libreoffice-${PVR}.tar.xz
|
||||
kde? (
|
||||
!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
|
||||
java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
|
||||
)
|
||||
gnome? (
|
||||
!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
|
||||
java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
|
||||
)
|
||||
!kde? ( !gnome? (
|
||||
java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
|
||||
) )
|
||||
"
|
||||
|
||||
SRC_URI="
|
||||
amd64? ( ${SRC_URI_AMD64} )
|
||||
x86? ( ${SRC_URI_X86} )
|
||||
"
|
||||
|
||||
IUSE="gnome java kde"
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* amd64 x86"
|
||||
|
||||
BIN_COMMON_DEPEND="
|
||||
=app-text/libexttextcat-3.4*
|
||||
=app-text/libmwaw-0.2*
|
||||
app-text/poppler:0/44
|
||||
dev-libs/boost:0/1.52
|
||||
dev-libs/icu:0/52
|
||||
=media-gfx/graphite2-1.2*
|
||||
media-libs/harfbuzz:0/0.9.18[icu]
|
||||
media-libs/libpng:0/16
|
||||
>=sys-libs/glibc-2.17
|
||||
virtual/jpeg:62
|
||||
kde? ( >=kde-base/kdelibs-4.12.5-r1:4 >=dev-qt/qtcore-4.8.5-r1:4 )
|
||||
"
|
||||
|
||||
# PLEASE place any restrictions that are specific to the binary builds
|
||||
# into the BIN_COMMON_DEPEND block above.
|
||||
# All dependencies below this point should remain identical to those in
|
||||
# the source ebuilds.
|
||||
|
||||
COMMON_DEPEND="
|
||||
${BIN_COMMON_DEPEND}
|
||||
${PYTHON_DEPS}
|
||||
app-arch/zip
|
||||
app-arch/unzip
|
||||
>=app-text/hunspell-1.3.2-r3
|
||||
app-text/mythes
|
||||
app-text/libabw
|
||||
>=app-text/libexttextcat-3.2
|
||||
app-text/libebook
|
||||
app-text/libetonyek
|
||||
app-text/liblangtag
|
||||
app-text/libmspub
|
||||
>=app-text/libmwaw-0.2
|
||||
>=app-text/libodfgen-0.0.3
|
||||
app-text/libwpd:0.9[tools]
|
||||
app-text/libwpg:0.2
|
||||
>=app-text/libwps-0.2.2
|
||||
>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
|
||||
>=dev-cpp/clucene-2.3.3.4-r2
|
||||
dev-cpp/libcmis:0.4
|
||||
dev-db/unixODBC
|
||||
>=dev-libs/boost-1.46:=
|
||||
dev-libs/expat
|
||||
>=dev-libs/hyphen-2.7.1
|
||||
>=dev-libs/icu-4.8.1.1:=
|
||||
>=dev-libs/libatomic_ops-7.2d
|
||||
=dev-libs/liborcus-0.5*:=
|
||||
>=dev-libs/nspr-4.8.8
|
||||
>=dev-libs/nss-3.12.9
|
||||
>=dev-lang/perl-5.0
|
||||
>=dev-libs/openssl-1.0.0d
|
||||
>=dev-libs/redland-1.0.16[ssl]
|
||||
media-gfx/graphite2
|
||||
>=media-libs/fontconfig-2.8.0
|
||||
media-libs/freetype:2
|
||||
>=media-libs/harfbuzz-0.9.18:=[icu(+)]
|
||||
media-libs/lcms:2
|
||||
>=media-libs/libpng-1.4
|
||||
>=media-libs/libcdr-0.0.5
|
||||
media-libs/libfreehand
|
||||
media-libs/libvisio
|
||||
>=net-misc/curl-7.21.4
|
||||
net-nds/openldap
|
||||
sci-mathematics/lpsolve
|
||||
virtual/jpeg:0
|
||||
>=x11-libs/cairo-1.10.0[X]
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
net-print/cups
|
||||
>=dev-libs/dbus-glib-0.92
|
||||
gnome? ( gnome-extra/evolution-data-server )
|
||||
gnome? ( gnome-base/gconf:2 )
|
||||
x11-libs/gdk-pixbuf[X]
|
||||
>=x11-libs/gtk+-2.24:2
|
||||
media-libs/gstreamer:1.0
|
||||
media-libs/gst-plugins-base:1.0
|
||||
virtual/glu
|
||||
virtual/opengl
|
||||
net-libs/neon
|
||||
"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!app-office/libreoffice
|
||||
!<app-office/openoffice-bin-3.4.0-r1
|
||||
!app-office/openoffice
|
||||
media-fonts/libertine-ttf
|
||||
media-fonts/liberation-fonts
|
||||
media-fonts/urw-fonts
|
||||
java? ( >=virtual/jre-1.6 )
|
||||
"
|
||||
|
||||
PDEPEND="
|
||||
=app-office/libreoffice-l10n-${PV}*
|
||||
"
|
||||
|
||||
DEPEND="dev-util/xdelta:3"
|
||||
|
||||
# only one flavor at a time
|
||||
REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde )"
|
||||
|
||||
RESTRICT="test strip"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
PYTHON_UPDATER_IGNORE="1"
|
||||
|
||||
pkg_pretend() {
|
||||
[[ $(gcc-major-version) -lt 4 ]] || \
|
||||
( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
|
||||
&& die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
kde4-base_pkg_setup
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
|
||||
xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
|
||||
|
||||
local patchname
|
||||
use kde && patchname="-kde"
|
||||
use gnome && patchname="-gnome"
|
||||
use java && patchname="${patchname}-java"
|
||||
|
||||
if [ -n "${patchname}" ]; then
|
||||
einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
|
||||
xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
|
||||
mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
|
||||
fi
|
||||
|
||||
einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
|
||||
unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cp "${FILESDIR}"/50-${PN} "${T}"
|
||||
eprefixify "${T}"/50-${PN}
|
||||
}
|
||||
|
||||
src_configure() { :; }
|
||||
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
dodir /usr
|
||||
cp -aR "${S}"/usr/* "${ED}"/usr/
|
||||
|
||||
# prevent revdep-rebuild from attempting to rebuild all the time
|
||||
insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# Cache updates - all handled by kde eclass for all environments
|
||||
kde4-base_pkg_preinst
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
kde4-base_pkg_postinst
|
||||
|
||||
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
|
||||
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
|
||||
|
||||
use java || \
|
||||
ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
kde4-base_pkg_postrm
|
||||
}
|
||||
|
|
@ -1,193 +0,0 @@
|
|||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX lo_gen_langs.sh 1469 SHA256 98dce71ae3d32ca9e248dd33411224395da1241453263cf313d79a6890de903d SHA512 d683506baad2ddab1375a006f237661736e78e2f81a93cbe2c168f6bc4f67125ca1fef152fa4f8adbd59fdaf2b00eb13c8697863b0ae601eacc97f7395ab2eb2 WHIRLPOOL c615cc1e9676ed165462270769de8562de99d3e5b3ee225b739a5c1166780ff8e862cf46883b02f9ab598fe303df807be3c46f136fb787310fc958d927ff7036
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_am.tar.gz 7068342 SHA256 2c0377d058504cd4de8a306654898211b92b09ab5d06b8ab6a8197ad649844b1 SHA512 bea2a48c9723d82ef10a1ed2d5d79dedac27deb3a560a8947375a0796fd1f8ee812950ef81053c578ffa4ec8af20e8557802367fdb0cf3d553f4fcf83c8869aa WHIRLPOOL c92ab50b91aa7d181239e414b8514b0167197ca118d4d48ddb16172ba6671f1564bc820f1089df7fa758e68e00dd20c42a1858892db9d7796fd3a207c5f721c0
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_ast.tar.gz 7987203 SHA256 4cc5cb6bc406c2b41b3ca6f9390b80cc48613e741f853a8be0ec03fb2a5f9c1d SHA512 4e42a6ff47215d2c5708ec3e85e455b373029c225e67b6eb958c7d87f15853acfd99b625379f483da163b10889a7465613f2ecbdbe1d5ae0bd12a2e128660f2f WHIRLPOOL 4e86c469d581dacc21bd394a0fa24ee16e4c075dbd4ae80a8f9e93169e6227f0e288f0c94ec5488feab48d435ec249f3582ca70207248a4ad77ef2f73314606f
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_bg.tar.gz 8233698 SHA256 691809394119698af67c78164d8d5c89c5d00bafab44f67114405e6695c9caab SHA512 f6414ed3601c58c67a662690c73725b5d935375f438886fa2899d5242949556716eb631ca47fcd10e5227463f5da09496afa96846588a6c285380b9fe71e4dc1 WHIRLPOOL f57d5a8ee477f58ff26006a8b1af129f786057f9ca53f59082dc9a155b5159497c2aadbfa96178dfcb5f3b11cc597a8fc1516b28c51c9e7f3c04cf7a4e5daaa0
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_bn-IN.tar.gz 9829496 SHA256 bb36f46415b30bb4d97731acdabce92955f17e4a43da252ec695af3f40fc3bc8 SHA512 633087ffa036b44c3f726441e285567fb6da549c5d92b4a587bd094b3973c851126d0ae715527c545ba92d11912511ce3b8fab04cf333c70616f99aa1103f4f6 WHIRLPOOL 4b707c7f79e420f0f1e18eec1d7645a5a53fb38089b5d05e317f0229f4a0e7a048200f8da532ec48d23cbe541ca9b1c3d80b6aaa0a465e728723b76b8e0dc5d7
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_bn.tar.gz 9829601 SHA256 93388dadd31fb559a4f23d06d5ae133d3e31b14bfa2f88157d8085a19e404d32 SHA512 17dd067b39c9e9a1c37516aa99286c77a8b1cd0d3f17304fa6158b31c4e397d5be7b22b809910cb1bb1121f06619c5a7b1f2419d03f2f6f131e60d8d9adc37f7 WHIRLPOOL 45c0fc84cc0eb7cf6cfcf63a612edd59f15265ef0ef0b091e9522c184df85286bf4509784e21e04870d8a40fefcff5dec327226d573598697496e2fb70830b83
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_bo.tar.gz 9492958 SHA256 ee7d96fbdb3d95520d9f2a830f1ec9d3d4e3fc8d2d798190a6e04c0e54006dd4 SHA512 ca88f9f4f0b5e48438042282273872a16adb765d3688ba54c4bd18f997ff2b3886c995fe1c1f2e92bc4a74e95d6562cdff165ac5cf76ee7346c2ef7ac979f0e9 WHIRLPOOL 6a902cf579a2fec96e6e8a01680e193338f9f11975bea7a70fe351ff9a7c279fe1397ddeef3f36cb481b6db3058147275e33ef1fe0c72b1a2e1da54a650d2680
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_bs.tar.gz 7082590 SHA256 654cfc2e8dbd3b216e6fd83e39ca55be7ac553555c03ba71411b0a7a080d9c2c SHA512 666fc82471dd4d8e0b1ac868f928704ae36336e0846bc5b9baecbd782345c1993dc8fba91e3ae261b5b4209655943f3ef6e46913b197085e659621d28c8e5db6 WHIRLPOOL ec03157e23581d5a5d96a84855177ecf8cfb24f4529e0fde29bf66991302e365acb036997a406cef756044a742519de631f35d1b412337831740fc852c8d3586
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_ca-valencia.tar.gz 7859046 SHA256 0c7f1e0772831be2c3b0085d298d93dddf6fca14b2fa26ab3103b8fe5efb0a85 SHA512 5fc4f90f87e13595d78635571ce538af1c35f7dd6b5930b2482dc6121c116e89dc6effe4b87101421dd33c0b7f50bfc670feeafd02525d977065f3a8b5b1e2f0 WHIRLPOOL 4aa06d6359e73a9b7a89a22c25d4535037aa0c329b45a963683663cc6a108ce017e7078a9601e3d357ee2b1084bba5f5a209f93f93fff3eff1ffd07c3a207c13
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_ca.tar.gz 7860876 SHA256 d1f23784ce1fcc72279d85aa22149900a813045218bc88e031ea88cce9f6bd41 SHA512 bacfdfeb968532d032624772f3d6282dfb0549d527342becb8411e07661ae4c8e0ff27731bf3f364b098850210a3cd84248d85bffce06bcd323e699fe5f58f9a WHIRLPOOL 1c69c6eca987736a4f9ac018cbd600cbf9b6aeb6b05fa9d18bce678422c6ce2db4fecd2e2d87aa0fb6b4c3038f9b446f5143db2c89f42f7b6ab4b44d6044deb3
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_cs.tar.gz 7493804 SHA256 950074edad5e0b97b17477c658d0c00bc053f10a307c56167bcc24b3b2006364 SHA512 6125e783cab60da51ea1550b26e0444c1bdad03e6f7fd765c83b2bd32d81590f252b006693cf6ff9f09d25bfef6aba75862d08104aaa90d3c963fa4177efc8dc WHIRLPOOL cf90faa5be8f3a1aae8815235fb8c3278a98fb6767eba4d4fd50208f66ad4117edcc399add3d513efec5028edf2e67f80b1a5bc04f1b5c14ea76a8002848bc9f
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_da.tar.gz 7496694 SHA256 18a6c0006134afa1b5304f4e9f3005ce021187cc2f4e9386a4f7c722def492fe SHA512 63e7dc8a57b97ebdc3dd1d0b157f0f71d7c090f10d4b163f223c5e50b94f98e4041d158e9112231a2912205ab28c837b3c21d625986c4184640f87ceb1e5b953 WHIRLPOOL b4b1c92c9e0bb9e8af15974b85c76040bb2eebf9c755b17a5bd45f13c4f34df5fea4fcfef9cffe581999b68c89178ce38161ffa1ae203c4a0cfa48cb62673359
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_de.tar.gz 8048594 SHA256 dd74491a6cf4d4b87665fa4c178ebc57df2add19347b6c514adecd79be494adb SHA512 a40ebab386255915a220f99def70b3203009aa9dd9c468f064a8c402fc1b917adaa64d5e2c7dc5bdb20f005166562c39cb999281a05f3c9e0df60af800497d6d WHIRLPOOL 67d97129255bd3a3f8b95ee67aebdab0094a237732b767241920748388d0f407126d012a7dc42c7da2332dfede4ea48460f63944f05909752269879ab9bbb3ff
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_dz.tar.gz 10417647 SHA256 ac275a7be527fdfe988e1f36e1c2414003ebbc4c7c8db2864b726da7f39ae6c1 SHA512 4c3327bb188b1a9c8246d8c6a1ab938dca8bfd7922093af76c92e2de38fd10126bb0bf974a8fe96f546800f423644a88bdac98c60e71372c2a69aa4bc153e3b1 WHIRLPOOL ea2dfa258673d4e4781245c9aac8dd30b7f8ae7454a0889424c4bbce5eb12b24e75f1827e924d5a4b6e9a1b85ea51aa87f2760f576fb98fb4e92e3a3c96fd660
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_el.tar.gz 8873602 SHA256 238b6a2f7c4f0f40996bc4e5f8e8b22d6331baadc94deb4ca22ab9dc4bf3ca84 SHA512 dbf5b46bd254909633cbc740a22e2382628fd50a1687f2ac5cf3af4a6039ba1adf141361e64a8638b82c77c67e29e09c3cd2903be2d4c8428a90fe7fd8c5873d WHIRLPOOL 67eb98b9ae1a8a45215c317f28e4ebc42c079ec821f0746d7a6ec527222c790ae94de9edef58851184af7773f1705754acd44828c151a177d7d6cce1de4871f5
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_en-GB.tar.gz 6383874 SHA256 659664136ddbfabca735491be7ec4147e3e20edfbbf7df21e8c1b5b9846f9d6a SHA512 9d26607e4fff012264ceb559aabc57ee7f1e48da238959cbf199a4008d4d07b02a39ea7a043aa1da5cb56160b62f285952842973785ae7d4e18a9aa787588fd8 WHIRLPOOL 35d5492abb4ddd9076af48ee2b1da888c6a780252546a1b6916edc06a2d5d983cdf0d72421097f0c5f48e755e567e9ccc036814baa47f0167ee8c82a9fd06c66
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_en-US.tar.gz 6422373 SHA256 55ad0510cabeff22865702abccbffde9de5c94ae3c69e986206434288d26432b SHA512 1a634fca218ab30ab8b840edad31902dcdd5d877a348c4140d4ba63c9174c9b1b71680acb2281a5b30d5c444451c417b8c44e72b95b7aeda7458da31f64b0398 WHIRLPOOL aac03c303bffffb7482e54feeee967df9be1e5280d6229a2e1ff2d0e339ecdd5ada5edd5d2cb8e474c0dbf8fc4aead00f8ec7967b0fb1c8f3cb8496c783f098f
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_en-ZA.tar.gz 6362705 SHA256 cc0d15b884eb8f6c07bb082d4856fe4df4afef88fc3c25adc466876d4d8dd89c SHA512 3f9bd899cf6ea5a949a820bd5a9e798ad47bb6d2a6862eb6423eaf3334c3703b698bf341b3e37c3eb31c8e84d5ebb74846d1411dd135d18fc21d3b220cc91867 WHIRLPOOL 6ba33995dc5120d6cbbea6307419b6f8e4819651546ac19795f152cc31759ba0bbee695e42f8f8605abf21357a7f7f0f7b2775c3d415c94f97d1ef296fc3113b
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_eo.tar.gz 6912939 SHA256 11f52eef3efcf0113b5ea8ffe2aab787c3b54464ab6992e4a13ec74c73245dd2 SHA512 3469a6cc0e601aeaaa9bc1a5753e50af3435abcc541bfbb566b07f296936849ed0c3f8fa7879d45d2e252b7f030a43502536d1714441993673f36cfdf13f1bb7 WHIRLPOOL 0566dfe085500d58c62ab7007e3a86cc54221748888958808822748bdac853d85b28e6b94264f75516c0d8b75421a37cf3da1b47123e68fe3c748f50affe9916
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_es.tar.gz 7934500 SHA256 4c857ecf3894ed3eb260f1f48d2fce8653ce58c02308f8fcdac0c6f1783085a0 SHA512 86304d58d77e497fba83324fb0a15ee029bf351963d8b78bf05cb9b49de82d92cafb1f306555a0a41787083fdcf751bf3c3200a070777f0152242939641ed301 WHIRLPOOL 52f078d5744dfaa0c26124f77cde7ae40f0cf6c8860a76474ca3842986011ec6dfb9153904b26c03db855b48ded29e592b299752e971e9af1c0ff992e03e4806
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_et.tar.gz 7425296 SHA256 1b4db9c2412214496b4717e87b1d93e90c1d92c8a279a7a975572cf6965453d5 SHA512 a845b6dbdc2f2342ad659f28492f0ea4a192c35059f0d07c572b17cdf00535595d0979366a643b0bf2857ba491e614a1f3723659116cd1dfa024681344b1111f WHIRLPOOL fa9964ac20d0af5373ff84bb3c0b73720bfc5ba40080b9edbfbacf8b1cc1a6d36f43f703dbc37a7d1a6180cca3a326a229e872dc0dc83b30e0544fe02c934b56
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_eu.tar.gz 7545974 SHA256 417b8b041c1847e7351081861b8ca3ee48f67f3a7d255c4e41de608a48946cfa SHA512 bc71a9a62fd6bad076dd796477acfbd8ae6d6fd35f73cf05666fa401d96d78d99f272e2ef9203bc9db141429db7871aee88f23c0e50f29d15d8a53f3398b2c63 WHIRLPOOL 0a0d8ecb99e69ca4e4386c1ea9bcb5f119ff5ebddee626515838726d7c025dde7e8983165f8cd6381aee20eeffbf14656cd51a56fafab4f4013086ebf322ae55
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_fi.tar.gz 7664104 SHA256 6ce4fe572c00a6278ca248c65e3f755caeaf28d964a6ef6074d8f44d24794457 SHA512 6b595eabf9c17d5fde453db7b1fa1d6970ff04726e32077bcb4e583fbddec54363d69bbc494e9e350a46293a9c2b052112368e6a86a8cc6d199a6fd3b2ed3b4a WHIRLPOOL a2782b5d0a67533feeff3c092539a0a5733bb6deae09a99a65f6f0ef1c861dacf647624e72e0dfcf21c382296e970feb2cab6c70b140c0414082119269e214c7
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_fr.tar.gz 8080770 SHA256 ecc84ff5b63535fad9de7dd34ed8d06f071c144898634ddf519be5f534f782fd SHA512 c8ac01f08133ae24d696d240c1d2769d7a8e88c5047dc00e5f2379cb73b072ed101b53091601c201c1ce2599b2a1b591c4783db1607c4468b38cfb015b1200b9 WHIRLPOOL f9bd699d8d81ae6f906296661fff71ac53274ad14bd58c3cbdc2b07eed4044aaa81cc5b62d90238afa0ad06693e53006c87456be6a7a22e8db74ce00bbc2c1b3
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_gl.tar.gz 7465348 SHA256 8d517100da9534d33c7c0de166d19f7f3184927e03336efd1e6113922c74ee66 SHA512 eb68d2b1bae9312cf76a54b6603c04314793bf56b8469e892494991c2256aea62f6c10a51f47a2b05705d6052f501fac3c58eb49b57571fd71c1b68b6d85d729 WHIRLPOOL 13dd472ce6269c2671cb70bb77f0dcbfeea6a89a817a8891536f09ce606a1012839b6c53275477eee673b49aaf118e668b1e1b695826b2995ee5b692f3da9b75
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_gu.tar.gz 6586482 SHA256 da6b93118a04c2a75c4c153aa656656d9b994a10391a047ad28f402893c38612 SHA512 b5165049a480d3ed9b537327068dce2afe86908351d9c94ad7d68573816f1ffff98160608ef953a9d9ae94109a69a70ea0245a3aa004cdbcc0afad27bd3b48b0 WHIRLPOOL 80f3ed00bbc0efa29c8853983f161dab67027709a4e432421deb1035d325c3f4370a745586858a211cc70c171e56e5f5247d8b5f6f6a562a995f161c5338e684
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_he.tar.gz 6202828 SHA256 0b08b9791acf0ea08c11063b496dc73f5b7e0ed777dc710246cae331032b55d0 SHA512 7b3207211d76ac30aa2bffa381262373a97354a7202bcc04a751588575cca5afe91319cae7ade0c5b3e79053c046c419ee9a82931d6859270271ccd3e6203205 WHIRLPOOL 65a7babc0c5492cc30a3c7c2269adddc26d1988aa219b8c163ac7a24a4fe0a83a25176cce35ae38a99d26fe90ae7979405cd0b8ac99bae1fe1840e1b565b5ea8
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_hi.tar.gz 7281108 SHA256 40c0a6d3e60f302c5a652a04caa520b6f4d65803ff1022b2e7f7c9a5fe63c4f0 SHA512 3d816bd849efa2d3bfc69f1ef80fd00bafd9211cbd2e64cc47aa92adf3986802312739eaaa9c3a8ce629be378e47ea0d4032555dc76a7213552676666daaa285 WHIRLPOOL 118608bd98caee1cf160ceacbaf504b9c93bf016c112730b8bb910ceafcb7806f60757f5f20206ed507b9b512e4b094a9fef67a7f948474e216ece6defb3624c
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_hr.tar.gz 6750976 SHA256 728af9ec89cead35c18cde3322dd183ec6fd753e86bb1d58e5bb0ecdb3ff5e26 SHA512 93acb3f01da86cd41d0c1157df0fe61e89ea33817dd905ec19619a727e746e2b71eda1b8f6d602fabcfd6a24c736972a3c4d8ac55c3575fda000fe6c7ee2667b WHIRLPOOL 3e295eaecabf2734bba124beeea5bdcdd4f68a8df6f60d25c65fe29b493c6241da19ae44113aac2d5360c19e02eeac6b90c99a6ad3d372f54edb334296f2c1cb
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_hu.tar.gz 7919565 SHA256 60d431c286d969249d2a50994a54bb363ad9d5722837ff6f40a7b66818c95322 SHA512 f5a30b038bdf7d97788c6e00ab070da57fce03f73dd5be3028056f8bd6d40b508c1f890bb6e60f7718cadf169c1dffb5666a7d4b8c8d5a6fc01e4147657d9e41 WHIRLPOOL 4a54bda38c4fe0c11f725d5901a135fe691ea3dae280f8dde077e5c97f5eed058801c9816d627db1e258bd3688a16ddc60f3820444cfc6d059d5f1d9ed7e7236
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_id.tar.gz 6697896 SHA256 6d96e04ce1db780cbdd02f539541df22e8531242fd23820a7c35425b41e98ecd SHA512 ff4463e33c3891d3453be57429609fe79ad21ec44fa8614ce63bd05b7c4f5ab2879e82a99d1bffbb5727e212bbf3ba88fb3eea8c0f69cef9f187cf4074959156 WHIRLPOOL c6d25f8047803564250dfbde3a5f1ebca83aa45e373a13addae4dfc07d3110418e36bf547594a0f57a3c027a911c0a4c60e417e79aab92c9ec71d259ff98e319
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_is.tar.gz 6798821 SHA256 503bba39770130af0a65a7d965681f0013914d10784886eacf1c443e56d07c34 SHA512 5db6bb799a76efd4e0bceeba112f1c878e5cf3b6b4ddd25daee6c124b55db679901f7aceb24e36e0f4b6f68e32a70a9874f20f5ac0993d2b9d3fdf690b341523 WHIRLPOOL 7bbd67cdbad82118997c7f4a4c1d573aa97088b1739f21190567c2d2c8197fd57d06d805165a2e0e715740258c423e78037ddd7921a0267205e8441d1143c764
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_it.tar.gz 7841935 SHA256 94cb3f06a2ef2ab7a196475ee69ca25fd50b4fbf5557fac69f98f77fc2437da8 SHA512 218052f80674d229fa126cc9a6c2385559272971c3f3a9cbbb5efe138ca46e0b48505954a57681504848e11cbe89a974ce578678cfd3ae694fa5e708b54e89fe WHIRLPOOL d30e4db6a2724ceb584fbc4efa5c512e23f28137be68cbf20a1c81977af358f3821da1313e2b2cd116f4ef295ffe8670208afacc5982dab5daa3cf11797b43f6
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_ja.tar.gz 13462529 SHA256 71cb2beca4ec9889218e1a5b22e7abf15c00a7b3b307ec1ae7509297c1c82be4 SHA512 12180b330d37d622bf64b26f3d1ef48aefc00f9de32c5221a2ea21da3246853b2d9c47f1718d2ece6c4ef49bceb8616723d0aa904bbf23b7d693cae9ec0b7f62 WHIRLPOOL 05771b3f62e58634f22ea50a8086271b78ef2687a5c3d15bdfd62fa5e4df0985d97f99571b27349de7a0a529b434eec3582df293ea0c1f9868bcac7aa273b3bf
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_ka.tar.gz 7061212 SHA256 0aad9f9426c9bf5da2b13ef975f5f01edc24c6c813813d202cce2e6f5c834979 SHA512 235a56dcbd889b35f744dd066976b8be650e354cd0e8888f7e7e26bb9302e8d193a98b2acf0746eea95322d66a277a2de3c0796f688a935d47ea66ab9c6487c2 WHIRLPOOL d7fd6c5700e6e003f0da854f2a22f0a5767774992aa3f7802c220ec98a14ebb203600126130d34f76242b13a255a90650c68d49a587cc024212b41b0c884654e
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_km.tar.gz 10299541 SHA256 486a07de768c9594f416b07303f09d6ccfcc6e3ebabc42d555e6c46b0aad217a SHA512 663a5fa182f3359971572f5c73a454c5da6bd06420b69ee147f4ec34e10ca913eeafc82aac051ce18a73fd75d07b9c3e01c10d99e866084c6dc085bf932e6f62 WHIRLPOOL a7c5ccc9d9386012b1baa117b367500ef75f04de17039ebdfaabfc9de435c018bf014d9986b84431e48c466c76c2b13bd00c08239bd9fcb9d3307d06743e9737
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_ko.tar.gz 9262173 SHA256 bb261c1821b3538ec7c407422f8a231cf35f5a29cf68a082e62c1058f932dd3b SHA512 446a547739debcc500a8b2ff4dd5ec40159991376d6dcc9d59d6b84e7263cefcb033842e2ac4a0a72590f8302ec96b834d796a7f6e115aec78c6ee235d492ad9 WHIRLPOOL 3afe72908867bbf8266a88fd331ef310d833b02811c56e0156d1dc21f44d4ab3b2468b299eae2326baca523850b15430961a366d23ae2f5ba74d2ff39fb8c224
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_mk.tar.gz 7304313 SHA256 cf43af5a52626c298ffe18eec9851a611f3e5ca60fa3aae319e9ebc7655327d2 SHA512 a4b0d6f528d5b0431a43531d8211e76f7f49e9e2a6a84eecde8f573157247869bc8565fd06f976ab56851a8d36e9e879e68c78fc1c93eec3b4c27276370f56a8 WHIRLPOOL a24597d8d5820b4fbef8740c0a2112693b560848cbb609fb6362fd06ded68f4dcece9094acf0934466b3e3a766db6614d4cfa085d10b8abab747449495f87cfe
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_nb.tar.gz 7588574 SHA256 188869cc9a5063e09cdd97d792e9dba8eb927cb15af3d90839a9120e92ccea4f SHA512 fe0c0201afef79f34802d22b2d28f2dc5f2c5be0da7f5b3ebea9b31218525f6b93451f559f0d4af38b73c30bc1265e074b07d9efc032e4b2e8806b6c1d8bfafa WHIRLPOOL e5f5773183546ebaefa64c73fe1522d52797f17a630d9466d696b1798bf861618a8a975d10088264fbcf8891b8d5a3baa9db0c133c7de32561767843ad5fe251
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_ne.tar.gz 9878529 SHA256 b1c5f365b6285866901a2fe49a7fc5141e695a3c4fd1cbd099c384e8436826d5 SHA512 379056b63ea25214bb9b64bebf4aaae5be278a0f1f5d809caa068ff829f985ece9afdcae19135a58ae5bbfba52ed18cf5e420e0b4c2b532d4cdd7c7bf771786b WHIRLPOOL 8dab1deee7faa27f394cddf85d84f1736d3d64897d0a2c37ca4dcdc8c1eec13b55e61aaf4e56d884d88c73e10f8190abac14db8a8e446d09815739740c27aacf
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_nl.tar.gz 7670744 SHA256 b7d742cef8cba759b03d8648618820e8f2117668bdd8b58152e147a5e418d6e7 SHA512 6437d8c7ec3588f729771e07a4765981dc7e439505cda6d84569868d26624ec3f21fb8539ccec43fbfbafbd041f492010ac1712d300b5cb71f2f243dae41c3ba WHIRLPOOL 75ffdeaccd908a2763693941511fb017ad46339b5a938045a2576e89a6e3e1dc5ad2e9a92c3314238fe683bcce48dcfead3aaa2c4067d46e3a113999cc534622
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_nn.tar.gz 7511342 SHA256 4ee4deaf5e2c223896c1b36de43cb410f4840167fdd3507ed5f235c9b69d9927 SHA512 dd0ae10059475653fbf6a90f7c0fc2daf5d5af268779dbdb0ca639da3b22b6c92762fcac73fb0a5d50d17955738b6084463d2f2156bf96ec289bb846055aeff0 WHIRLPOOL 6fc3cff187110c2ce6f5d5e037525eb37c39deeac09ebeb7b0b2c845a4351ac96a9c38ecd9992c10e0261bb78c0d12248d1530af45d1c551c3cccda7e87afe9a
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_om.tar.gz 7923847 SHA256 26ca73e0fa9db18b237c54043402d29f60b87e0d3ac03dee0dc20d1b0255c4fa SHA512 888231f370a6d1a9035026f0b70471f619dda4324c8494798a98223fcba7ce1986378f40aafc6b93ee14818b1a51e22f98a21b746116ea4957fd96c43e304cfb WHIRLPOOL e56a7d9588d397ef2903f99c90a63b915472585a91a38994d9c9d5d4b91e71e092fe396540b0d474a86e016baa3785a74c6bd463166b1bab7b3ae592ab7bcfec
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_pl.tar.gz 7927710 SHA256 ff2777ad294667be15da1a695c177ca6e75a07862270ff0548f82650b3b34dc9 SHA512 2e6a07a460cd891aa4c21da236258d8e51b55eb78a7cb69577c2aff3291f55601b6821de5c9d0c0b14f69627a17b7e964357a39cb8e62ac2efa0509a90408858 WHIRLPOOL d4cb4f93666be752290a479edff9e60d3c15932f92c1c5879220bdaba7e5c22e77815034ce2016dad6d2f22662b7c87894e4261570684a1d350d00b053f4ceb0
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_pt-BR.tar.gz 7679139 SHA256 cc6de2abb53ee01f2ffc3e618c5769691a5aeacc27ce060a5b760e96994e78a2 SHA512 bd168c3cc6c3bf6537667b63c9cbaa200ae53c1a12e298936f69c152ef702d1f645ade8192511ec04e4e894fd8c3302f68f016b923ebe25a7f8b878aeb81caf1 WHIRLPOOL 8003539694f1d094c894fdb1e9cc17c1a2e6fadb38606cc02384030bd5d6528f3038014dd39f71f40084419a3e0a8ce9a55d750a9f1d5719b1138b3142b42a00
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_pt.tar.gz 7618184 SHA256 99705f1aece88644f3f91aad73656024df011728c6ff6136cc16ff9813fc8b38 SHA512 fed4735135f9c5a1c759c281c47ba21f24d3bb6b36cb13d86f88eb072a48beed42055da38b21c5a71dca5da70b5686e2c6470d1548442827ed3f5e7dfc1ba2c3 WHIRLPOOL 464d79df175e38cc7b3495be47940b5415a8005a723755c6a76d09f90acb2935b2be304e591590a7dfcec8eddc97b92c824e9288690b1387216e3a0a84a3f23b
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_ru.tar.gz 8323360 SHA256 d3aa2705a270d40748fcacb74ab7258ded98f926fbb31ab54c383061c703db59 SHA512 53d58f1f42dcd2be95e05230203c1f38514b05fbbaff35d85f1627f7b64532820c8c621d4f01c3bc9305b9e62483a73fedd6ef36257cecb219cd4733f3bdf0d5 WHIRLPOOL e377f50c2490b47c6dfafc233c4a781f1fb06ca5cd166f1750beb45f491e350f670b849c48c7d790f035ab93d0ac97f7ba6f5c03cf8cb710ec0f289f07de9133
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_si.tar.gz 7170591 SHA256 d7d49a8cc45964b0889e7e0ac90b604a7565b11a0c8bc222dd5f723c2b1bbb12 SHA512 cfc2a77f47d2d1f41c6d5d65e40e04bf94d7531fd053728d6ccd2a9fb9a9b07bfda0cc3128f607805e5860d06d7594079c1c3ffbf83cc701c9261de181a5bd37 WHIRLPOOL 1966b268d2ecb9cc55c72e535d65b32da2540954c29fffab05f512c224ac64144550ab2adf938e8c74f7912902444d9850254b60b07b4863c99910e0852d9774
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_sk.tar.gz 7441844 SHA256 1a0dd31c81e27d84cdf1cc3f58813e8365b4c42ecad2f2c5b2a3f16e1446f126 SHA512 21cb39a8ba1fc82693ae563f1454be680e0c6b5c1496cf41a1b8cea5864a690daaf3cf2cf7c289574c890dfee4cbfd35accf66414689b3740cad4b37420d79f3 WHIRLPOOL b0029712775747b8315f9691ead1312bb5828b1afbe0ab3758d4f71a3541e11ba893f78c27f78ae1e855a352ab0971c74d2039bf29b5ee18f6501d37d70ab873
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_sl.tar.gz 7661904 SHA256 66a48df19c74b92b77f152254560653331e7a1decc241f3fdcf4a21385872f34 SHA512 de72f8d35303b3036328b09d4faa5a16c6713d890277a88a98d977baddde528aaf6495493b79b51e26cb56157b5c37817f2d41aacb8efdb5e2fab27ff967fb7b WHIRLPOOL 3f98a8f8f344d6fda9ded284a17d4921bfe8aa07d28c76681badc5d0acadd64fd724295a3e4831709fdd956e4c057687c1eeafba5c746cb01f3a0e1408b12838
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_sq.tar.gz 6812663 SHA256 54b4380d54f5dce0bb2c2177b4ff46d6c69f179b00d1da8032bac9d63b6a3633 SHA512 d19eac4ba20180315ba156279129c842de336e0f2b8004a6a918bb877e657aba1aecf8a36709ed3485ac8b1933bff562e839ca68e5fa3d19354a5d09c1a85df4 WHIRLPOOL 215eb3d0587506f0842112cd274767a68f6b83e3d6a62c7cb2ee1188e7c8a153c790160f028537125f6c516b04f3aa32ff25efea95435851a266738a482ffdf0
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_sv.tar.gz 7541316 SHA256 eaadd940c502c237e6df2de4dbc31a484b5884747488aa129ba06d743622622c SHA512 695fbc85acded2fdd8e58bf2b15185463e1d5c29c5e8902bb6a5da748d1341d6c1510dca477d54742ee679144dbbb3b1906f6e68c27db82a182c30861f55038c WHIRLPOOL 1ee9b0110af793227212657a47305b2cd54cc5b4dfe5bfcc05c3e3c1f9424a5f099a0aaf0e1785992de89d067fff2b2e97db42e706c7132510a604970203fd21
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_tg.tar.gz 7122286 SHA256 48cf7c57d852e29f7e0207bb519ede8cae364ccbd5d6bc5e2777f20375ed9cad SHA512 c8c9324a0be15c1a57862ed33670c4424f520c02e9d5c2919961bae190ba7075bb52cb1c4a4f147dd1c8f642011e8f1af43b92f1ac5769c6013ea6b333302de3 WHIRLPOOL f794ac10f051bf0431c4a08908514ec7f1c307c1ac50c75a90dba1df113e84c46872d4fb8adf9662cd2d1e72dcacd1d4f684d4178fac18a4602cf22f4aec46ad
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_tr.tar.gz 7865510 SHA256 e8b252bbe91a0cbb26bea87c2abd0d0a8b3aeb9bfc58639dbd5dd9115665554a SHA512 d61daab09acbf1fb563de953d475a780883180b9a2dd8306eb8a6fdf6ea253117a4d4d85cb79af5725dd4001d0013769eae382edb0eadf4d0c150413cf83bebe WHIRLPOOL 2349240850d22d4ef5cedef3c4619bb1c44ff3aae58f1d0ab5995257334d3d8f79e744b28bf39d9f87dc15a2a1b71d4ac9696f3df98650b786cb9a95d5eb2fd1
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_ug.tar.gz 6785675 SHA256 fb5cc763d9377e3dffa2cc70ea5f73ce5848d3b541c741ce0091dfefe2734e9b SHA512 192675233fcb71a9001558bc9a5daf93f1b5a5d89ca0e875310361bfc6122e00bde7799045d423cf0100aca51073fd0dfaf160b4a98a32e757bf6caaafba709d WHIRLPOOL 3ab88109446b33a530b5d57d71e087956da5ef7d9d71f3566d0b1e9f12857445f0b4e044a9c2c4d16924bffdef8947999119ba4c0302551683420ea143c275f3
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_uk.tar.gz 6932986 SHA256 e87272fe7518fcfd31b6df84d32f774ff639ca27b9c07a07ce7a968c17d9830d SHA512 52224a9528feb5ee432b5e75c2e784bdc9af0faa954f394ce1d858188a9b80f6348a0848cec1cddc8736fca99f82b9a0d3ca8af681fbfe6a65462ca492aeee40 WHIRLPOOL 74675d2d886adf9f920f1247b219cb69d0a8bf90a13aac8eee194d488414c24631297c9afcb90ade1ad05ed0eb6540fa8379ce1149deebb662fae8fd71ee4fbf
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_vi.tar.gz 8078873 SHA256 ca5302994a2e409fa7039085fff74aa4ae1033f6c2ab57ebe555dba1b1eed39d SHA512 5f6dac20eb3789c30a4865f72443e009d560fd913c743ee7a7ea089febe1238c4938c626469e50251630e8273480f55bdc9021189ee91c33b73b3d33ad0d0300 WHIRLPOOL 87b29aaeebaa4c2a2b45157ed8224b85fd81874c8eda0cdb0af7f7b1b6ae2c38a56d4b44cfda8925cb4b803c400bb4a4d9faf64c6b174c876fdecae220844cb6
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_zh-CN.tar.gz 10620532 SHA256 a586a1f04453bfb1eb9b07c21e77304e989c531847fe75334e03e0347131d7ba SHA512 d3fe9399705241af13928bec1c559f0d7f2bc98354c71bfb956e0835817b3f6c4c1ef7a4c5bebbaf8cc389bb366e7978930b1845df46a2f0410651ce8b8b02c3 WHIRLPOOL 6e5fc7418087a8e027a48d97ffef8bed7bc9ba7a12d912f4d2b5ed2dc6db9b1c8f6004f84dc4eda2d1e68a51d9ca7a087f0424a7a3e99e7b2ce2db841356f057
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_helppack_zh-TW.tar.gz 10701228 SHA256 ffde47f9fb67bc1c36cbe770953f6b3d62fc2a8630f6e06ec64afcd6bbd300e9 SHA512 6f539c0b821f4c5f29e8e0d8772d2b35f4a5b690f33acf25126363bf5ee466833fc5a972b84fbc51f94a58b82c404a30f3c8606d0eeeca20dda78dca9816431f WHIRLPOOL b27ccf3e0b184f5dd063eaf5b83d5a3139b65fb187a545fdc192c2906756beb6b19c8692c4623d9975f0fc8ed8347dd9aee3720ab044cd3f9316e43dfb02845c
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_af.tar.gz 1156020 SHA256 7ff467ce778ae8993377fc1fc1f2965fa819c3961ac021cd4c04f1a92bbf3744 SHA512 f6809482aff751041b74b7309272e06fb13f1cf40c8a3ac04946047c2585f7aa0c92ea860de87dbf4b05329e252d4473b477039d5498b8b805d171bdd1362077 WHIRLPOOL 450aa55c3c36c3b834e1df1a16a6c35abc1031e895ccdc5839cacd7a1fdcef0705b7d210aa921ff23fc8ff04fb6332173089288b4f33334bbab4fa634b48a654
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_am.tar.gz 558823 SHA256 a1970d9c754b9b586b5dd10370bd3e6662dff156b6d635a275927421fdc21315 SHA512 2014ad325d7e1fdc1b503850e4973eae40d86d6071818814ce514afd1dd509e51349eb3ac8ee0a3f629fdf62ef3b7032e6402988beaa586d84543ade281b0daf WHIRLPOOL 29529b174d00f779e3446e9f8b30c2957994e4de50df31cca12e16741239dddd70719f6a01084a205063d39b4a6e844535deccad7c646db3a3f760604c54bdc3
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ar.tar.gz 2295483 SHA256 28a010e65ecf6ddbdd7b167b31450cf995950078b8dee440acac3350d201d6f7 SHA512 54faafa3ed9fda29255691b40b56907fab0a3f6f7d1a91b5b498a76d44b0b722adfd44107a753ab9e25fcf73e9f04d124bc636d54dea36b6c497448a0991ee6a WHIRLPOOL 29ed8da161e9c047c7b3bd6a6c4534f266fe801734ad3e976b60a585098cad91dfb85645cf373063f0dbb1be748c35645b3c076a7f45ddb53b6f7850d369132c
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_as.tar.gz 593187 SHA256 8ebe17545fa56928cd920ddd190dca91e5e8114f5512da0202fdbf85f12717e9 SHA512 5c1df02f2d597f69a1ca4c52f29a23fd17fcd8035d0fcbd8be9beee937e30371dc768ad1c5817867c9f116dc748272730f0e04e575810695d74840017d990554 WHIRLPOOL b0d071adc41dd1884cde3e263523bcffa607c740e4942c4c222f2af1d399424ba098ed7f0e41beb69b7702dc0367cf4923832d12f44d6e8e5c8c908abbec3094
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ast.tar.gz 540529 SHA256 3ef20c25806c39447577967b98739284687afb8f5974d56c95d1ed0921b6745f SHA512 c80a09225d88bafe02d73f316bebcf05dd6ad1777e3c5619eadbcb6de572307c26817cfa38a3cf2aadef6e3cbfabe2a35ed333ea9df86483297d4cce3d641c0f WHIRLPOOL e73b71e5762f0ba6b4fdabcce06bd8db8064726d9ff5e47c90817971e696ee4cb3851cd9f5ea534786b3274b9112ce4853014842c9c1d896577e9c885ce93866
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_be.tar.gz 933293 SHA256 3e9a1a943fb1c1d79a0c39564adb2807662b027d8172420a8c0299262eaf05fc SHA512 6991f2ee087b93d25b5d53a9b429e2adfd2a3bf1f83fbdaed6b9e2896f0459a17183cd240f48bc7c57ece8b4f8602db2c3cd40d9240fab458b692ba6c571ceae WHIRLPOOL 32d6bdd72995969efa44b626b0f625a4a883aa60a3ebf05c4d15d2a4b894283ea4efa321a4c82cea8bb9928d52ea7b028c7db4254b1c86aeacd5c4cf99f6ddef
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_bg.tar.gz 2009976 SHA256 100b5e25df197fc3469c090bbf9fad4d9eba830a871c7bc4d62a5be655ff4f44 SHA512 fc20ab657c229d8e4f4563453a6b25725a186e9e44a00a2a934a4f8149f4df733135dec946f01b0b0b5dc98bc6d6033cac44013319dfd6b6e431c50d97b32e60 WHIRLPOOL 3dde3d77198d38ebe10cb3f5e50ccee95c9a051845f3ca32d894074e9fa7c37058191b71d31b607ed0f9844ac9d7de72761e6c0117b64fd6bf045ee89dcca6a2
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_bn-IN.tar.gz 585501 SHA256 5bee5424496477177fcd81a20fd05a31647826224ee6866c16ff4f8bd391ee18 SHA512 69fb0973c22fa5e15415b54da464e477daae5fd3321296d80cc8b2286550d10e419868684d89bf4671ee7c038d565fe9cc86816244589fd71556599085f59593 WHIRLPOOL 8f940dcf831a0fff79cf1d994b9cb0823370bf2faea7c7700c375b8d4c59fccf4590b989414cab9a23259797e8d5937bc604fefa7a719b3f6bfafffe58e82107
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_bn.tar.gz 951207 SHA256 24e923a31a4a151f9ea3fa6506ff629ac55ea1992710250f7a29954fd545ff86 SHA512 f6b9f2e7e34d867b0ae159c44139c83a15050f43f868fe41da50c9770daae344f5a527b8f74ff224865b9bfd13bd725f019b07d32d0484be99dbebda95496f7f WHIRLPOOL ee90454b1159888fc1d408896dd5b17a72f8349f6001a76c48d270c6eda45c78553289d48bef860c4bf02df5d91c4b01ed273a030dc8b6b2b6aa692ffb44fa76
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_bo.tar.gz 589511 SHA256 e3ab323ca835f3e7f30f5e0d5b98ffca19b96ff9917f180b096ff0760b08e016 SHA512 87daaa66de65a84d65f1d8540a974b49e24f6189e17100b136b38675460e35b79b4939b3773d7dc0bdd8c0a2fb5d4e193f5beae122a01c4e6569c40fd9495c1b WHIRLPOOL adfc67d92c327a65f2f4fe465d9582ea172ba464f70aa32e7c4b904f119f41c65462209cb526c8bb45168e6fa247abc3f5270d1c9c1b9779fc35ce793e75607e
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_br.tar.gz 1756100 SHA256 8aa93372415b079941c39809610d57c6a410634db5a1dd91b6a61a2950a42a2d SHA512 9e384676e7f744d9280bbfaee07cb965319beef6dd10ad3c4572e852772ebd58bfc5bbd24e3711757aeba66070595247f415b11bc210595d044f06c496b56df4 WHIRLPOOL 4510cf7064ef77d9d1ee375bd6c90d469ff2c0b0a280e8700a1a27998ad4b18ff007bf22c2ab5bd83695e6dee6282d210f8d5c7f439fedc97b62a71875e3b05c
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_brx.tar.gz 562926 SHA256 efe7c1c446a09b369519f8efba1abbda88e8b31f1b59c268794ba6aebe683e8c SHA512 52904b20614165e3eadb30af0ae2243b577dae848413f529fa184ee99cd79cc000afa554205d596d660d1be013e4b335270de2f187cb04bff049502461fe83f3 WHIRLPOOL 061114d60a7ff4508cdf0bbb322c7fdfd94a8442bf8e0a3840a05f9935fbc8d856b2ef5b04356be3369c6daebad2143b4352d7fb58337549b7234444f6ed6998
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_bs.tar.gz 654073 SHA256 551414603344dbfeea7a7723829bc6ddce65ad1454a21f87a90ce13bf4d34c93 SHA512 febb46a0f4fea9ff5845bdb6b2426786128c7d6cbf2fb107c4631f89af1d32d53421021fc60ecc9528eacfabb9f970d4154b84c8187daba8e8a997a651ee624b WHIRLPOOL f31317d37b3096809f18810b15e37ae944775f90f77b4405f9e9c2b92766f281618913b5fd1d3bc5b5777496e4552949061de7b607a0917e09746bcda83b28e6
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1569816 SHA256 023aac7bac5ea9950dd681936f9e1859850d2a583cb475a7b0f18bea5bc027cc SHA512 0a7583bcc45ad8bf3b0cbb9d7eaa2a190a7377ed2c9dfb062fd6b99d11fcd0b86b3d86f7c98e2266159332bbc099b3f7e8841c94ff3199e885142331e3aad8e5 WHIRLPOOL 5f2026b2e422d7f80df2481f9fee3b162df24b15bbda4491d5ac6a73db8bfe8a6f224396114032bd4fb425635eb9d28281047e0858d8cf5155f73a19b839e2b7
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ca.tar.gz 1569196 SHA256 a32731c7f0876adb2820304dcfcfd7f46ff1a6900b891b605046d5d6a8945ac1 SHA512 bcbb9e03bd2c33451cd33e0823c665ddb6e67482b652e079e73e47f9a8cbecf7a7a9955bb47a6ee4bdd8486b278a2795ceffd1bec6dc7cd4394f362dda5e1be9 WHIRLPOOL 94d496bc3dc5df48131ed1ab48e7f132e8ff5d6fbd35ec9134bd96d09ceb52ecc6a8861b6d0d647292137616d8f0ba5120aa910402b402c5648028718cf63775
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_cs.tar.gz 2475390 SHA256 41d2faf089bf30871c64a36d6a22ddc2d2e5fec549c705b1bf4d540cd042888c SHA512 c36993352447a13a7a11a8675920799d73ec7fc16f13a7be73501cb22412efa1131f32eaf2f883464aaffcc05b84ef965aa2eee678b064ea575cbec409f869b7 WHIRLPOOL e9f524547ce9a30b5a2ab6bed8dcb1d7231c76a12e9dc6b6e7c7fe60d01777cf1b24a095bd8573c0541a40e60dd7d17124c131d704dfc8c6bfb7cb0e84f83c4c
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_cy.tar.gz 520760 SHA256 1b924bd16b329147a36c6038ca883e217270a4b5476bda387fae8d47855ceabc SHA512 a4dba1ecdd3f0bd3bcfbccc1f35a836786fafa8ae29ee0ff179a80fe34b9d3dc7eb76989cf6139c10cc8ec5a56bf429b21c665a8440eaffeefb7c36a39c60029 WHIRLPOOL fe0fa5ac8c41a4f0171ef28da45ede3a27bcd0eb6b6f7c3589873ae71a00afafd894b52818d54cd7e4cc6eb4804ea2851ddd0ba54ca2799a492722f73331fbe4
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_da.tar.gz 2432887 SHA256 31f7723e78727b0d9d56049b4fb93067bd2afe630db61aefcfd0e42421478da9 SHA512 6001ae01cd295ba1a9a375cae6adf23e6dbc6ab265c29095d44e6ef5f4487a58712fb6d7b8d91d52af1226bb10795fc532224b327877993b0d0b2b0929eb3ff7 WHIRLPOOL a4a5b13a85421a97182a569e0d283fdbb558d40307666ab378ecde4c7d1c64f563f41516e15fbc0ce630f0951dc53d346ecc4365997cfe3c5ddf3385ac8e192d
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_de.tar.gz 14156613 SHA256 2f9401c9f41340bb0980e298c50e9405c40269e73468ed1f7d1db159bb6346c4 SHA512 0b234781cfed59c6b3d496062c0a645fbbf5bc830aa56fb68d4eaf038de053347935b673fd6d677c15b45d62419c7f6b1305bbbb2cd4c46de082489c00ff7a85 WHIRLPOOL e665b0d22ca1a4b69a855be251489240c7546cc266fb1a73d224829af2a597af7c4682def7e08eb79746cb453b837b763e106f0a6e8ee6f41b2a0ed90c8bafaa
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_dgo.tar.gz 568688 SHA256 7915d568bc69fd9eb95c08421904099eff699977391a79e9ad3b45656881d92f SHA512 022b404a4c4fe3a2f2a024423941007d0503c26b79709d0fb9a1a239c64745ee5edd02aad3c3ffc779e71599f6aac07f9207575d07c1fb952909c3e4d5761d4e WHIRLPOOL dc5e884fcb401c125c8e8817909ed2ffbd79fb2875d2b5048fa7cb005a991ae78caf22a6730c28f4dbacdf800ee90957663dda608dea44a052e0b2a032d035ed
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_dz.tar.gz 595948 SHA256 5c901d001a65650226cf28d4165fe955621f7ef1b1f5265c4ad365c011248615 SHA512 77cc5c385c870823f884fd923835f8e8aedd8172c550b0d5a74a8bb524cfecf192042d3f64b88528c083d402777bf006e1e45562cb047f7c00b367d4d80d01f9 WHIRLPOOL 942e54ffdcbbd8fd0296030aac58d04928a22c729cfd6a392365f72cad6f4aea9cc0e6a71bbbd625a358e7df3153572277e5fc4e4a7632bf2bf92b6736e216ae
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_el.tar.gz 2129807 SHA256 4eaa277b14aec16d21856cdac405f2ad5803da3538eb2be5793fdf6b6dfaee32 SHA512 b6e3241278e8d2784ea7c658fed988374a63b3ae2bb7d047639932effb49b23b3218e51fd09e067e4bbbdfbb599d02b371fc2d10f3524732400a09437a681f6e WHIRLPOOL a9665489ee97ba56ec6006894d1bbb9d09c454daa305e1bf0b189efbf25d4367ac3fc95f73855bcb87b605551701275926f2134ac22ed5ba7e3f2557e0634bf6
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_en-GB.tar.gz 7157880 SHA256 3234732763160effd3a607be4fd367e0b8aaf4d7802f3295eaf8c433fa27d06e SHA512 a977c209b9633b5eb8a3d3dfa330a487f27e87052cf9e5726557bb5025c4a82a611c47c3e0f2ab17052c72fc24fa4c0ea43f6eeb6336069a2138ab0d3fcd26ca WHIRLPOOL d5e58a2d72e2115d37ef6c47c1fcee983701a715ff213d0c9cb4cb32d06f6e091c5a20dfc15bb22d95a37f9b113494bafae89b0f52c5e1291e63fff26ddf5b5c
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_en-ZA.tar.gz 7068249 SHA256 c504894f2b77a67230dd339b039d2f889b435917b2709ebf1c9e852960b13a93 SHA512 c1bc1d290c1030196bbaa7473837db446fdbdbb453bcc8d27953a23d49573a4304b3b773420296a67ac70f28082ce3a3be03b8098b273a1e0b48e6bc023de6f5 WHIRLPOOL 26d87e6164c5ec9cb9562d25e9a3d19bd3d06e9c82d2fe7f13bca953e4fdb33ba41e176c37a90f8be6f7eeb7d1c8c4639a474772038276dd0be0274c0cad8ea9
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_eo.tar.gz 517996 SHA256 152241a0e99d0e3d379a514c79efb8ce5765219a66154124fbc08edef760a89e SHA512 244098c5eb21b08fb2675c9be4c841c01e6a580d2f5c87fb558d40130f535e989db92f41ab21b29b47ed85024ae33426c3a91e826a29502395cd726bf4723aa3 WHIRLPOOL 71d5620d225af102295baf6337dd701c0e7f0b41799f2075cd6c411f6cc617528ac23d49d5e0bd7f07abe84db7c5910805ec8a098ae9c15d8096a35173b4fb08
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_es.tar.gz 1994871 SHA256 a86009470b9f38e2c66e73a82e821a1703baf36e797e237b5519deda6585b4f5 SHA512 52fdd15817ebf3b64daf4ab5196b9aeb2eff3f8678de7ca206988fb1119b354f27f8935461cc2ee783858c526d91f1d48503514d21572a640624a786e6d37de1 WHIRLPOOL 8cfb9ad99b2823746f8cc061293b7d62ad4204bfcca5b0fd9727cc96c5cde090fe0658f0bb0402f7f268a7025bbdbff7ee60d321b0cc10f90f9338b35c8330bd
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_et.tar.gz 1429764 SHA256 f8b043bc5fe1dafbe22e50b0800a841c2bc766b8fe5f165d30bb83f0e965872a SHA512 4f21f512c4f7c11a0467efd9621b76500c7f678f39c48952dbd3636302897f3469df95244f740480d517a0edc66b44c556ef804fc33321b7a781a56136f8664c WHIRLPOOL 1dbc473a47ee78bffa4eade45a3a6a13691ae330ac4c26217f4cb6aa777526c3db72d41160622e61ab1f9b0248a31ba3fe0451dfaef78b0ada5ec2e4677d8a46
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_eu.tar.gz 524533 SHA256 2570cc160099386151405d5aa50a00d19b8e929c04e5802a0a80a5f6b6d11240 SHA512 ac98cbcc083451d4ad600cf4f4d05a5b482c921ef68ef0808a80027138101098d1f1e246ed0554103cf8e9a000d31d67f047d887d4f10dc06b3927e808734cdd WHIRLPOOL c343617e905ee844d3a04d6bb05188eb8e2e30e1ae2b70ad3fde44b317a5107e70b9635b79bc1bf6d68cab18dfd1aa1dffdd14a6672287be6dfb0da320204f71
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_fa.tar.gz 552660 SHA256 abb6452823a3592bd8dbc4c623d6b5c17b643b77fa157b68bb108d4c03c66722 SHA512 be2edda81b883e1e035feb8f3364b159bbad6d491338e7ca4e76d7d3db6fbfe317e11a5f9cdb49ea37261e9f7f09d8c036b33c8991b508be0da1d806b5bbd1c4 WHIRLPOOL cdb7cb004f3d886a9a79db86f64e66c4bfe6fee16df3875894d288195769bf0ac56bd3fa45a0667a7d2f330524c3af4e43c848bc2e131c891a3c6870912d5d6f
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_fi.tar.gz 528036 SHA256 5f26fb7956da4f87622cccda1d9ce556225d17a8c260d99085981083c78dfc5d SHA512 2d27f9c79122a98e1240057c51d620b99a65c011f3897db5fea4be582ef399ac50b94ae19fb670e4cecb61b413f349ee994d82f06a641435030794c4642bbc59 WHIRLPOOL b9615e3f1a5a1a718423920cc0255d0b0ce0b674e71c102fdc89e2f39f021fef265fede9c34fb46ab04464c1e8d92e9dea35d25f3beac6718e4d2ac979848371
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_fr.tar.gz 2842300 SHA256 91f6e64fabaaf6af769001148958334ed67c1c634dbb75d1bfbf5951f9a18b86 SHA512 24d2b191d40c2543fb0c9bf78e089f80900d06718cc43dea528fe39156fbf2a6f6d0fd645bcd201d26b66555f81579ad86f584aceaf393f23076ac6535b5cf20 WHIRLPOOL 8d5d7ea62790c72ab1fc9d055b07e87e15372dadd161df6a51437afc6ccf6ed9404e759192f726e8b5733c30d928e6371f369dbe6f3693626c6a60b3fa1b0b49
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ga.tar.gz 543830 SHA256 6d2e63cc6eba6b6390895c46ae9bf46a1917f5994c9938736ce0b07bb4e286a2 SHA512 d1a2f65115b1025a0f4d3ddcfc9ed7eb3834557c4c91dbb35d4a721a6e4d972bfd2888f2c8349c8933ac300bc4106bf70ae34939c116d614f71b93f6ddf62b56 WHIRLPOOL a71d80b4dfc3ac01ec1bc353216b4f0dcdefb031e9f960a8206247a39be19a3bcdb92bcc32fe73e057515042ecacf2fb69fcdd82cad3f081ea2f1f4e5c14aca3
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_gd.tar.gz 988723 SHA256 0de1c89384aeaa2dc29a7f61bd116f2c1c36bbba3fb29784f3431ed616349ee9 SHA512 fc92bc2fe04aed2492b187df818e2e18f3b2bf672b05fea7de2a7be4be6381cb0a0244b93265266c02458e6856bee30ab688c01a68a7eaf4fc569c24642bd4f4 WHIRLPOOL 9c3e64a5a1e8276ddb307555bb8a40d7423611f71a1213f9fab9e0f49e2d1fbd5892098c3ebb4a1fbf8921c9191100fd4da59c9ae4de7343f19ddac4ab488ac3
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_gl.tar.gz 1090967 SHA256 25f261cd0312ce882979b7df3288557d8058982535ba9614dd732985f4625658 SHA512 cb449f8d5ffdf26c9b7da5041a56ba6522195b13739bfe4c5f00eb4c2355a34d274da74647422d6b5f3e32078b57df5756a04a28ca1ec47ebdecb0e8683d6475 WHIRLPOOL 555f2de2047c777c66ef876110bb78bb7bd6c94726d9cb9108a0f73927672899b51727b87df37ea9691df914e747a137f2e8a8180d8fb3cceeb078690d7d5446
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_gu.tar.gz 1228914 SHA256 b8f2bc96c56104d14cbb54bf85ea05e8c1da7a67db7befb3c3a6798c7c3b65f6 SHA512 089abf11b4675b67279147ab38b7db5a2e62baa99ca1c8108f048ff43d8344eae2ddc0e910756bb5868a3eb4863becd869ae18508c9babe36c7a384f83c75c45 WHIRLPOOL 8f00dc400b8dffaa71f67e575ba34581ff50757995fa1a7a031ce059aa536576220e12f125b0a6e508d0d83ac0601c5cb0aa33f99e9350b9745ff447e7844323
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_he.tar.gz 1618695 SHA256 636b5cdc35dfaeafc36c35e7b41f031e6d08d0ddd2acfde1be441efa07dd6b80 SHA512 ce19246f835d891b0237e68dc6d757e74d8212fd60d80c5cba74c490751def4401e67243398747842822a29e89855fd30372a6bbabd9376caea268e5d2a2b9e7 WHIRLPOOL 781b21cbe0937ee428a657153970733994089fd2c76f294e498529521acedd02978b90553e4b948c072d010e6dd1e89295449ad7037d0c389b956b8d3f013522
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_hi.tar.gz 657594 SHA256 ec8c680dcb23c7b1c1cf29f6802c9825ff751b321df3c5882907653daf9f7247 SHA512 64b64f59d323d253f3b7428e740b65c68a77395fe124bec69526f9c4f13ad99f3821e0cce332cd5fa019b3c41b18221e3ca2d5dd211ed7a517442c86fcf11bb8 WHIRLPOOL faf72fcbf0bcc5c9a2e89f340405a8f6d09684c358b547784fcc9077c0b81d7649729a7fc5cfa3f28b48c7c97b3ff55f1f13b46385d513454e308ce0051b4819
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_hr.tar.gz 1291808 SHA256 88e8a083ab1633af3fb27904ff808e1031640776d36e5e8f017accc283f359da SHA512 1038f1f75e9b330aa8c19429461be25b864f48393e03106f379dc5cfaab6ac0adf11c1b21cefc8fbb04e9d58a9c5c6b9b257379412607e3d00e2bd8e472832ab WHIRLPOOL 102f316187a7ee12da2c04f26e2d8b062e7dec4023cead023c8ffbfdc71d487cd05b6002292b39b635da82aff9bac76283091cdf6faf07f36f8e1d8af5cfef3d
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_hu.tar.gz 2736542 SHA256 99391364d37a5c84a4cea227a17b9721bcbcf9098977194e1e4357b659cb1b1c SHA512 d38f264bdb0841e85b300a93d0b4dc9849cabe4cb87c1e2e49a540fe17f67ce74f6eaf50472eed6f10f41055a4c6c33d990b720aa760d3ad176769d1c27ee642 WHIRLPOOL adc89ccacab699e78b746a3ecfb8e83f4b15e7b39f6af038e9cb4948588d510b83528a00d781ff03b1abe13ff178f8c160c4d934d04dfcf4d139667668f61e97
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_id.tar.gz 516250 SHA256 2b6ff0a1d6cb9a1be63df32531f26ae173c08f9db37fe929adf8073b50d9df95 SHA512 96367f6f4c8aa584e41c4c0d57bfee76e64a508b353b397f834cd0ecbd0ea635d459edd049736b646b0a0a95059041f2dea4830aa0d5ba7a52b0a4278a42546a WHIRLPOOL 2ae43f4a7b18d632b11c03cbd72ff694693341567dcad2cd1184e33c8a1af52c6f76cad4de4279a0ed1fbbc225f1ca3b3930fdb6042640690db142f6643ed1b4
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_is.tar.gz 1227942 SHA256 df1ac73d643d5f368fb7b81e20caa63858c04362cba6b199530cd1c6d1028a85 SHA512 9644c35525945bfca15ce9000da72ca0f13ae9fd8e9c149111b4edddc1e6fb07a40a1c4b02ffd7e250e9ba5758dcbb9ff61b2fe33e7206938eb21ba385d52f96 WHIRLPOOL 86efe86af47e0c296206e6ca80cf402de96c0e90aeb5f1108d7e0da4f7c7a68eff40f1c93f6131da06e4faf5d59225b360b7deaee61fe0c0d8d710ec2974da97
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_it.tar.gz 1859655 SHA256 99dce25d0a503b6277b23281bb01f488894b967c2e34da7beeacd4eabb5a20de SHA512 e19b86d8a87687665c51d4534fa1904cbb5f3883c7b07fd598b167b598b053ed101a32321b0abf1c4c890b5cf591ddd7a57ead83c7bef39d7c4dd5c52473ecae WHIRLPOOL a9c3e9e8c5ff67e48d7d73e86f751abc795b2ce5f641083074e8ffa951ea1de87e7ac41ab4a1390f292a751d9338105512a693484264d946cc57d6e5984787b0
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ja.tar.gz 615979 SHA256 fd7ca488f9c6881c49fc4e24da26f340349dc434242500a8dba163efe56ead37 SHA512 80c5db18411ecfdc9ac30064cf8a475e61e9ddde455c7a86753f3317386886a1530f5d5a77378630dc7975aacdcef9cb1f1a8d6fd1594e90670310ff230de8d2 WHIRLPOOL bb3d5240ba5cfc66deb715e4429efca228f7c60850b2b4a99f27f7fcbb207f6effaffccfbf9429d309bbdb8733224bebf5176912d22e4cbf998216d040508874
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ka.tar.gz 573474 SHA256 ccab53c04d428a64e5a64f98deed2db2f8251dd77e58c2dd44720f2b127b0f20 SHA512 9eb25ae62ae50f600a5503681ccd5d7b6033aa8c800287854c936b119ca0569d4338d4510f40acf271a3e2ee4acace2e0e528db159b6cff399b11b19cf05898d WHIRLPOOL ea4e3fc2ebe469426d3e9b73eb7d0e3ad0343bb9aca76056aa8b7de8b7ad722bdf190fd8ba8bb0bdedc9de9f25a56005003c86f0d39d1967fda57def906ec81b
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_kk.tar.gz 575921 SHA256 bbec7a6ddb1dde4dabfca92d4ccf210ed5c502db7e53fdf00845ae31815997e9 SHA512 6fb95419303f6cff950d3723a0ca40e8022f3ed72d6c78ce9bec5017554d75f1745f7950b46b40fddececb9a34fd1acecfe8a6a03a32959f18fc345b920d620a WHIRLPOOL da116c5cebdacad1d1d152ae713398e68dcfaca09c846262f8d3732a7a95698ae77326631baf1a5bb83527a4989ae91eb1124d461309f918ff375232433c424e
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_km.tar.gz 680585 SHA256 d209527c49593c47d3f202bf4a90c62c55f9e052648b02c9c53e58a9d6c0a434 SHA512 695b60bfa109540a78eaed804f519ee8f5b68a81ca59de414ad318d33bea37a7603d968646804070c7a09b8554a42806012b777ed4bcf5eeb99948add72ae284 WHIRLPOOL 44aad14124b6e41d179af0f03bb556e56e4815ff2fb31d79a1725829cbeb48afbc0e3d80503970e813e325edc200bcbd20739a76c2c72f7bd995897a60ff5c26
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 542740 SHA256 77fb1af98a15bb0f5335496956abab50a91265581422c9e248ec155044f5892e SHA512 d64240603bdf191dd6e927d64b9e8c4be30cded7152081336c2e724350207f8811ec83642307719f48cf7f515270955cbc08014d124dc9f4b80ae6f2d78bab1a WHIRLPOOL b9d67b057e3c055dad612afe22ca01005cbad245a1ef7e384432e4921c3fccd64d90d55b53b2ce7d4474ac180173b9a488bc0a5b4d81b37170a0cb26fe472925
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_kn.tar.gz 598015 SHA256 9e83e14baaccd33444cc042121014520ef961f3c4b9a32556a239bfea3847917 SHA512 41753cf7c871f5eb1d56c94c5195a425c5be865a1a2fe4864a39c3a7cf6af460f044b30e61a3162d49ace2eb9a698b482daeb9d57789ece2915748fb8cef66c6 WHIRLPOOL ff1d7b7d82ddb5a24e95c4a724c95809ca557bcee70c8497bacf258aedae04a33b66f0cde09230271c725b79bca517437a144cbeb912a8c3667fbe2698701a35
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ko.tar.gz 611867 SHA256 c40eb71b7ecfb782b3711514763b783c5f674d731766eaf84e993259be2116c6 SHA512 0774c2b5e75f5381eba0e5c495e88452c0754691acdc056c485882259813dfb444f29a95af9bb153689dce4580920db86898bd7c2b7af3b5f8a78167f606f52a WHIRLPOOL d46f236c4d8850ad1a2c88c9683a8613dea1f9f5c1ecb4e0715422794a4a60fa000b95be1e13ed930de8494c70379b9c42652c2356c8c09fef73c142ddce6f48
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_kok.tar.gz 562513 SHA256 42fb9aec16ba8c2d1d0edd5a7b924ec6f67b014270008b002c74b9528324acb0 SHA512 494e791c97303042f6379c82db402917600b00e650bc07dcc7aa12fe0a71eb1cd553e71e679419186bf4899f0724d1ab51eccad74004980b56575e7c955b125f WHIRLPOOL aa45a8d90521fbefa2fee1aa471f1b61162a3d4d07d9bec3d38cddab625f27f0d3ab9437a42db5c0b4286bca950421c4a37436ccbdcba3189831367e6b11cbb9
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ks.tar.gz 565669 SHA256 4158eab3db74fefcb9634ddf82651dc5b66aaf77672300243523d17fff07499e SHA512 07081d4a31c807967e832d5cd90c6e1a3bdea3fb69da9e2e10e3ebf269b716a7be76dee18ec5d55d725686b64e18054c740c9518a0d73e04879b3c91fe314a74 WHIRLPOOL 9f988b32467ee65bf97b3cc775dc6170c9f30286135bf8fbf024e8abf0ba5c7d6083f77b903fcc4c82902387c988407159a2982d2a03d5a1e977d70d5c24e49e
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_lb.tar.gz 512174 SHA256 522f539f966ef177b8e0569c4e7feeec11c8cfcefd55fddf95ae08c7dfb205da SHA512 e29c6b70199c7debcbc3e26b8e0a6f513ac7cddf72c158f3480096c032825731dfde264ed446c8015712814490ce72ad5926b230a73c542e551b595ecc8ff419 WHIRLPOOL 0b2082041d3ca5285e4fc1cd6e4e37de8212193022a1a97092aa630ce044d3866478bfba8cb4965f928275d7490d656cfadf9c9b34eaf885f910dca9f12ca0f4
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_lo.tar.gz 605698 SHA256 b86b6836544d19608ab6bc6622b1848eb3bd9b08a81c2289d382518cd52733f1 SHA512 6ffc43618c5f0b0bee772a0409b5e6a89036513f75441e4905b6ef07109c3f0693182f1393008dbce87970981c446f06a7f003fa0d8fb9280899dcdaea45c638 WHIRLPOOL 0c416169007a4b2e22f81026df10c0d702ba0432bede6744e317d3e7cd4c64eee120287154a98ab3f8f5dad2600b120ee667205c2ed5a182a8b806f4bfb60660
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_lt.tar.gz 870837 SHA256 8257a59e8d4f78966b578c5ae1e0628cc0e508bbfb254c1ccaccc6597466148a SHA512 678776c81b8cdbbda57b65b1e579b773160ec0917ef6776b1006528c43a6cdce95d352d140a9d1f5090f5c3817002a66fcba19b1b03fdc0630201149d7b26a23 WHIRLPOOL 3357e2e9c197205d7005097c8871857e101354afdba97a39c108887e0cfd3631472e694cc146f247900167fb7f0675872f30433db011b357a973e59d2db3bcfc
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_lv.tar.gz 1289889 SHA256 fc143aafe4e995e8977dc1c2d2f2b67921352060bf740e2eb095bd29b01f5c9b SHA512 b67185ae51dc83962e23bf86381547a5ef4395aae2e8eb99a781bcb6b911b9ec4d67b9da87179800e4301e48dcec87455f5d07f83d3be2c2365a44de83c4e387 WHIRLPOOL 186237c89ec788086e6569cbad47c2ba789e6c2928649a63c5a706ec23b049811138c39af610c0a0a06cd3be697a9bb00e54e7d00b263464c4b02c2f26101285
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_mai.tar.gz 569031 SHA256 ffcb2ff6dfd523229b60481920cb15859a746a17c06278f09a489d992db31bcf SHA512 07dd08d0ab969c970dbd7e3fe7c373b6fdd00f8d8a084ef97c6de8915bf7e97b5002163e2e2b00ee2514031e59bbee1e35736bd9dc33165d1f1cd9922ba579e1 WHIRLPOOL 3569e3dd09fc1c5488de5ef9b2272ab1a79958ef5fb940851f7ade971adbca882247ecfa1b96ba691b761adee8b2c1a37ed47ca0cc3739e266145266bc3fbc8f
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_mk.tar.gz 569162 SHA256 8cb82aae92ac4d48efaa754168f0d7669c903a85b9ec62a4629c286de6179830 SHA512 d3d25ca87898feabdf11b98ddd89d1be82caec816d23eac8bc1f692a74c20be67540b2db8171d9b09c99b2565cf533e9832014c3e9dcb1aeeb5fb8c65cf09172 WHIRLPOOL c6411b379109f42e29489dba92d6ac2c7472be1a4d8f311802eca9c148773cd6cdbdaede67a70713368f0c2b2f1e077d5e3eb52415574a472ff56aa72949b343
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ml.tar.gz 608010 SHA256 cecea1bc3a7873efd34b73bdd151cdc2a7eed9aa8f67172842d77f4c0179ff4b SHA512 c1d9e3583c7f187d0dc83fdd31b7c23a8e5e39a9f406839d298505fe713e7c6eaf0ed7eca38ac28728f1d3882631dc5f024f4fdbc3a11d22200f05590789ae68 WHIRLPOOL 75f97ed93ded2096891e196380d09f2c711ceed676f78036a1843d61128b612692052355c72c5fdd016fa6519d52a8352560f2a864bad96679344f199bfbfecd
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_mn.tar.gz 657662 SHA256 00b4f7fab127f44c2ce09553edcf417167f8df25a7afd7724db064b419d5f84d SHA512 6c7423851bc8e444d0b121793fde102be27da6231ba7a6d332bbd51ce5635cde952ec1bc8d0a148448875e426143c7f8a756dd09cc4575ef02011523fcb84324 WHIRLPOOL 57fe719a5eb29c8226e61fb4b9393b081ec9fbf6abc2f90646d605a68b0e7acd6b5b0e5ce3655dd5dd5e44f47c91fd72627f0d407570447401771e6519f28234
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_mni.tar.gz 565926 SHA256 a977d6ac9ec780ed9036540ec49a01137cdb1e2c9a216c3be92b95835e3422be SHA512 661fa090e8c2f7be23042f8e223f8b72aed18712eb7afd256b240fdbc6869be939b4d7965885127c1a078d5bfa604c1679b1322bdffe2a03546baf21be53884c WHIRLPOOL 824bb0c02aa214ff04573e8fa63a52c053822f78083c8a10f2e487a43957cbe77af25986f4a50decaf373e081d54abd1a17a9e0f0d815e6031a7cbec1a4c3327
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_mr.tar.gz 593749 SHA256 c0a8f1b6dfb8e914ab0eeb70d6c8aa97f53e94f3605206e174fabc5a8f2c6856 SHA512 fc820c4282e77699c556b3b5521de47d70469897a69440312894a053b3908058a5db3d59309b065cdf3de940fadb606dfe4bc1b964152b972ff450dea5e4633d WHIRLPOOL 73ff110e820d7fd188cd11cd5faaafb1030d2c8135191b36f43f9851bd1fe3fd0539a64e1f49608fac05885170eeef24d4a449a707b2b6e72bab4ce284762b3d
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_my.tar.gz 606646 SHA256 ae90393fd980b4130f4ab2edb96c84948fcc711f9a207f1f061f906ec61672f8 SHA512 bf42a6aa8146aad2c7ddda15ce67e608010ca14fe2ee47b0f76ab0db8d7f5e24296e011fc78de35c6805d816a3ba0e508d5cc7a43f80c58b5217c9b5e07abce8 WHIRLPOOL 052c9c3db392a55cce2228a0fcda4fc6505fce952594042dcccaa4022483909443b0fee6ba2fcc3839fb9b84b6195ff8f1f357e75a4f730ee9e96369d6299bbe
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_nb.tar.gz 3521227 SHA256 b33f39748f63358750b19c62084954a0f84e46fcec3469824298cb86353dcf1e SHA512 4e4fac0551e7fe870aa5d3a34a47c253558cc431d5289ff2bcfdaeda950e6180b8f62e48b26fc243441491f5ccc7a1e95ffc877ffc302a2c57deb6b9bb282420 WHIRLPOOL 932c00f41c71841c49673b2e338b83329568cfaccfbd488a63c6fe6368fb5cb87bb40d759abe1e97e620d560c0ef995c6e8aa623159b97e7f77eeeac608261b2
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ne.tar.gz 968140 SHA256 ab2f97e7685b37c46b49dc9d23f97832b4704228b78a3fee196c89e805ec855b SHA512 d579c1323ed2519cdc79ff902e5631f886a2296dac0aa10aa4320ca1c0ce29c947595ed94de8085188c105a09a038fb4f8be437efea0dfae95d67f8f75844bee WHIRLPOOL 0b7d1368a6b05ee0bc131899d484830bdf6f7d994498bf5c85c2d84d9c891afafd71229424fe2cbbaf586b66a137beab6addff6b990e53255203e1eb8c30d1ab
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_nl.tar.gz 1313727 SHA256 2224f4f2a1b180325d8044c4849909cd87238d70481de2fade0941a1c286c1be SHA512 f59d7dd3f139a057a5318748f727f574c2d497eee5a08d6d66c9ff7c5bdf9cc01f2324ce8f4f61bb1ec3f064ff37f32be2d588f58c4f58dee440a84d22144921 WHIRLPOOL 9ee803a630de23d38818e4d6795681789de783409b3a603810d6152cb450b719d17a7e61d7926d2b6f5d89a05e36d6edb2227f4470fc7d4fb8c842d64d4e2cf0
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_nn.tar.gz 3521046 SHA256 5584337b18ec8c640fe5018ad74aecf4d60905455af73e923fe2f218e545b49f SHA512 f7a846e5aa1cf3f00402a75d120a45f6d6b556bbb5914b51ffcbc5da1d853bed5980f12c38173b5e66979150702f0c43e6b50efe6e1172f0937667314774c4bf WHIRLPOOL df6e845fc0be2e0f4834e3b9dc1353820493d5b34dc3816ea5d3bdb6318209302511a8a8cd58655eb762064861e8ea88961feb4a8f1f9bc5f2dbf2e0145b04d9
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_nr.tar.gz 540918 SHA256 32a62e608ce71d1491a03b1ace538c79de37c63fe0a9480792da0c28993475bf SHA512 343b84b5cb641959e747b6696757e12e871a8d3b03e88ac687e200f821fe58ab47820d525f3b50512eea7539605c4abbc4ac5f15e2cad556f6ff85e3a75c0a57 WHIRLPOOL 736922c5391cacc3cefb831e0d0b8d26867f1f937b9c80cf259b92e8c4bd302be02956ec3203df44fdd845ee9c6427648db4ebc462926bb16b0035a08013d2c0
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_nso.tar.gz 538390 SHA256 c0fd70de0e72260b05f3e04b60da12f80bf970b7d75d0d5eb4abd5f958f550e9 SHA512 5380cf6b03520a9b518cd56fb2cea258811ab415624142598a3ef1063625d6cbd703cdecb7fdc21780d64d9c294fbaef46494fd29901a8d381ca492fa0e22001 WHIRLPOOL 770ade711666ec2f966c7b5ab1e8ccb4ac555503ed1e5649c6bb73fefe365dc621284f18869a987920e07d63a9dcda4115d3087613a1f926acce1a5d7e786109
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_oc.tar.gz 733591 SHA256 ed76561897003c0d5a5a48d2badebf5732a99c883ac6503083520ea8778dc591 SHA512 47508f908de54454f80d13f3c3534da746bb376578d2c5f9c4295e6bd16283266dc5ff50dbc6f2d98ce066caeb4e92e34f8e2ce604b6b73955bd84b0664613a9 WHIRLPOOL ffcfb584006db72e3cd8b8442adff23a64222e02a343242c7cf4e0122cdfcd7665eef772d38f82e5b8e1d9ff98c266fc066b4185948c2812beb2307ad722758b
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_om.tar.gz 527232 SHA256 5917679198e6f6ad14fa7e2675cecebd34e27c88d6f477746b497d4eb0cb0ccb SHA512 a6fe85b41a6ae1fe8918f26c00d7456b607f7d5a70334841dd35268d57d44dc3c09031407cb5b020cd43240781eb28c488bc526a89f8e6ed1cdd2cca0f888c20 WHIRLPOOL fac361de40eaa34a014aa2dbcc080d250ef0778a3cacce25c7481579b3610ecb0cf3dd1d1e76186d2660277df232387f667168ed051ada27c64ca0fa1bd21d34
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_or.tar.gz 590087 SHA256 6f26e611021047f7ae008d295950871815c74e7ee363ca9117927cd6f645b679 SHA512 313715c50ffd7ece8bd0c0d3e86ce8e5a8a62ccdd138322f3080c7578085d35814b2ec266cdfb23771d6b350e718349aa532f05cab870b92f5a28b0b4981ba58 WHIRLPOOL bf77be1f88c679357d113597b411098fb7f50af2bc1216be3ca1d015f83b3593a6c43602d555127b481a89af80a2c96c81e9be087e102d2521fd267f8f3dafb7
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_pa-IN.tar.gz 570978 SHA256 602f652f9294690cd548a62c217d0ee4d224badd8c09f055c37b737ffe33c4e7 SHA512 a9731e7a4c20212f8d750642d51661c9b78ccb417028d9ff7bf1c701634fc82d9d21573f182be110d5527762c526bb1be8236f00b77f3cc78d0cf2208b257b51 WHIRLPOOL 45143cfdf9554ff83f522dedbaea91b7bdbbee40e847eb74dc22b8787dc6a4a43e21ed06238bc09d92c035f486181f773d85a3293e489cbefabcd8d2479c7f7e
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_pl.tar.gz 3319988 SHA256 9f00fb5c85aabdc045c3c60a2b9af6eceb7d464923c88b0218ce8c44f4238826 SHA512 95c25f8e1837e392ab47f969f6f7856cf1c6e1dd8a2e0798e6aede308679775d9e4b1b8f6ec3fa82f6b1ec3659a506fe277ab166896f452a6878fb1797601a7c WHIRLPOOL 8ced5eee2898a9da424919302b92151cb012df48f44ee5d5bd7a7a429cad7405b5619376b799531b904ff3e7a4a9c46ef876fa482ac6ea14eb96757844033fed
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_pt-BR.tar.gz 2601365 SHA256 ac85e72aee1a48602953566e7101dc8c49d83085e373749876a0979b2ce6d7ae SHA512 edb46d5530dc2218e904a28bbc3ffe6f14cd7eb541885fd17fe441100733a9233125bcf90b42abf29a9cbab6e370754aef87f99fc6ae4fe4f7004476f2d04ed2 WHIRLPOOL eec95ed59f5e8fea5be53e9ed5842a9abaa9d8d5cde4de49d0d442313bcad4e9c013bb4c46fdb6a6da87c0ec1497026535de848b663b25ee7bf246278fbb730a
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_pt.tar.gz 1170793 SHA256 e73ffbe3d17129f0ed77552134c9385bb7e0a00ae7120082232a871e66d9296f SHA512 4246f5cc36d0f81b565493add80da5fb4afab722903958867f9b915525558fdc6a95d67632c86e6c8dc4c4b5dfce21ec9f267264cd1ffa177a6e7a6c7e27eb2d WHIRLPOOL 9cb3230e6be149f10d27150e4caeefad3471b3cb041bee694bd58d2b7f22c2eae5a26c3bfd62747e75ce4f6733dd40a5ee617f1adcaae65b0455337657e86cb5
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ro.tar.gz 2397321 SHA256 00e3266a72527a6ec3fb3ff6d3f1f875f6573bf6407854e22790544e9c3dc1ee SHA512 cca0a147906e5488b90d9386931e5e6e4cb803c339365d1e75a9db5e55f82f724a5e680f834dc3ea38fd3684e95e37c10e7594ed47405f5daf8761dc17487cf0 WHIRLPOOL 0b7a3980aaae93e61ee4ac757242b496b4b7c0d76999ec318e16612e86015bdd2a043c479b742037c9a1b42cb9550cbaa0f9216e4c93b989cfcaaeedeb033da5
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ru.tar.gz 1688773 SHA256 d4bc59d8729b7317203433811893e0e55a6d4fe27046664f2adcae9e7a84efd5 SHA512 5062926cf7264d5c9f473e221cb75b1a601cc1a0dee150533fffd24979bfc6fedbd570bab9cc9e8047cd9a9466b9f9cdf6c5f783403651d476d30694784a0cda WHIRLPOOL 2aedfad5367b335d50fa4648d8e405962d45b9f7f608d64e33373ce9f1b2d7f830e08a2e2350522147c5f152eec1ce54c2b87c5b766fc6e10d96db8c6df32611
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_rw.tar.gz 533012 SHA256 da75a660e6dcdd3d1ff2c15e6c592d6e8b4a984780c7fb6a5f8e6c8443f161eb SHA512 a4e67d497c101ddabe5aceb8c9a20930c8a12a6362f78b1757cac905901aafbb61465597c03ba06670d0898792f085151cfd4833a526100fe3018bfd9231448e WHIRLPOOL 27041c56d29fc89a7db640b1ecbb8abec85f435f0e2375c6aadad8994ba3dda32bf9353e9399754626a73f22405178d1a9c550d73812dbf9c53fc734521365c2
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_sa-IN.tar.gz 570657 SHA256 b770b597272cbafcacc33f37c171c5291d8420c96757d5427431c664552a7a5c SHA512 ce18ee09f8d5491990604863591a04ecbd0f32d70bba38bab7e53ffd4eaddcb3b7991a13cbf0810ec4ebfa0e31d2c8b6582090cf8a407123ba2e76ded953fe46 WHIRLPOOL 80c7f8b430e33d2cd9a969c095fab5032c6544e2d50cfa1f9094e6fc6b74128eaff52048a74009f003ef42cb2aceced537e0597cb775a3ffbc335c61bdac71f4
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_sat.tar.gz 559131 SHA256 7646ae42961eca4b2957be83ea7396681dada13dd69ae2168fd222cf30856b36 SHA512 50165d0cc1153ea4353aa07f573002c4de126afb403fb5d95e68387f3347417e786ea750d60708fa2dd2595f44b8116394c99f7776f55c7846ee4b6845524228 WHIRLPOOL 0b864b7eb6c65de354b091c5c63edca07631866bb52ad1b56f11382eaac6fa039f9d4e8116a75bde743b006a8394fd7e673b418e15667bf2dda0d5dbf79cc891
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_sd.tar.gz 556406 SHA256 aa54b01bb77318e94207cb785a696b7cb0f6e72b5a929f27a41d9dd10c3a3c90 SHA512 1ef8f6c5148c79f0c46d430c578af4270521df0c4689a987afee3367d7450ec01b8a5773e6ce94767232befa92319842dbc556ca345d8118403d5f191d6b9a38 WHIRLPOOL e6144060b3a9c071fdfa583f16c40645abc3d340b775f08e2900f621f4a44f1610e2e8f145213c9655a3f8b7163e078f8cd7d561c945dd2a6f5f07cd525a58bf
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_si.tar.gz 872492 SHA256 060e7042e53aab225e16aa8dae75be2a7fd50de6c4fd5e963975d71ec7ffbcaa SHA512 c35f99c95ddc4d89a2e4299dd2b2d54f2bb14376c03c64558ed1542e24ad8212e179e7e9ae6339792a115db9de9134c19e19c1b0692952a95089b34f95d27f94 WHIRLPOOL 9cccc5ae647814173da11c40fada5906fc56ab206666ebae9d794699554127b4be1df58c487a1883b6ba91013fb49e6484d08a4a159cddaa18d69cd69eb755b7
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_sid.tar.gz 532770 SHA256 9595b2631be3f85e3bb05c15a7db0b54e209591030ef01b261f2f6e85ccd5e47 SHA512 47bf66c5ad052ce9307165284642fec4fe9b00fc6dea8a8a613a58efb19a1184b447743cfb7af915744aabcdc95887d47de32732272b7795218d469a201987df WHIRLPOOL 9580d6fa035635d0a967ca16d15b36b6bd56f821ed61ce7344543569df1e9b790502a90fcc925261493db4f8be1ee7d2d40a9490da99717ffc1a4ba8b76b474b
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_sk.tar.gz 1824897 SHA256 0ce6640f5ae8282b345d545fa8523a4a43da7ef7bf198d5df3da9969556217b7 SHA512 4b9843abbe6826b296f208e7dd7c8c55af03ff1b5fa61c6684d7db8e7804eb9404b77fe5a53a653123421daa4a1d3b8834df88cc8eb211c867a1a0a46582a42b WHIRLPOOL a87c6ce586ee38306b5ef2185e07868ffdf0c2cef99964e5fcff86a5ae04b78082f49dd671e77b9ef5806b8db043d498527dc3cb28fbb3e13f347fc9cec836d8
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_sl.tar.gz 2170448 SHA256 2327fb9dfc817de9e994cc5c5663b8a118cabd40790686d5e992bd55b2b4ddd3 SHA512 8ac927f698f31c9d4266614c60a00fd9b07d097c7aa68a0acb00ce4b5988eee800395f1d4e2b55de43f161a004ed6c49b4360d287ed127e8a65a07edf5cd08de WHIRLPOOL fb664f26c2638bd89c7e0e69a2bceafe954f37d8d62201a0ae5927c1d9fc75c023dad9b09f8fadbe9d31d735d1944c4d3ee3155209a370fa3a7b55d08cff3f3e
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_sq.tar.gz 537879 SHA256 784daca5ee5d4b5924bc7eb8e9074a6373513ec314a3af43c93d7959ad90c10e SHA512 c93a66d8fb416b929174d728f091b2094944aa2fd3b6625225d9d99644a30091b16fe8261316a7ccf011ccc6d3452c1d163cdad5e9f34ac4feda2939d7f8ef87 WHIRLPOOL c3b3b571015be4c9783715f2ab405955043d8ee4c0e95c9581c505f9fc50a1ebd1be5e87ea2aeceb718dce23b8f218ad1d7fee59c8d5824e65b36bd657e4dc98
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1733409 SHA256 cc850edb63f9de468af7aaad766a17c82279dc946e5f4308cc409a06bf32b16b SHA512 ce3fd526e97a5ec7657f8d5489251c34de2282b8826a18e6c3d2773f90aad5200912f012c50d6a0699681cbe9d98085a3b5132eb52e60dd04efb7125a7cb6a3d WHIRLPOOL f65b800ce68446ca2075d9145f13f732cb03e53ac5d7220069df4b5651b57de25a6a1762c68a0d5d2833ce2e5832447ff52cedbc5cde22340341c2c92ee59ef5
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_sr.tar.gz 1770814 SHA256 24df1096a45e40c629eae394492a5c2680d3bc8482e0bdb30a49f386607f7abe SHA512 5e859670b8b466922b4fdd1a12aa04d2ff8be03e0b556eeeccbc85c4858f6f2bc4b1e17c5c11193c9e6ff02ae281723f2d6eba1216755e1a25bfeb1ce5eacd5b WHIRLPOOL 0a2aa0ad1d5f2f835d84f04ac70e08c8c28d0f3eb9a07401babd9f80908cbe706e3ba09e3701a5325d8d2e3864ffeea195c3a828f0eaa78dfb9b09d9ab1897dd
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ss.tar.gz 539069 SHA256 3ed0890a1cba68378555296889b2ebf25c5713036a83ea7b04230bcd49835b6c SHA512 d4391201acde5e393d7b6f2769e2fbc36085ca4c9548d2f37935323d1dd4ea8827a1bb08734a3363d01f655081cd84dbfa5d2d2536dd5ec45c230bb48ddf6b4a WHIRLPOOL e45ebbd671d8187bc1932109816f790adfdc3b42931065a3844c6a9f7d0cfacf1e5972e05e3cc01d625cb1d1ea1c4c3fd6d958fe30305aff5129657df7a045bd
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_st.tar.gz 537855 SHA256 5a64a23e367834722388a5b925fa140617115dcada8e25b8ef530264662b8591 SHA512 de953077c818d205c63d53491dcca7c7a5152f36ce8d5e4c2aee44f161b44862baff80cc8302305890434b776fd0d9a43bf80ecd005bda45d45198c2ec30efdc WHIRLPOOL 07afd9e987196450b12f47a5c492ba0f9bc3f374f747513c506975efcf881b0d515f694a41613f333aca2ea80eb35fd0072d5f915d51688b099a06e6ea3483dc
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_sv.tar.gz 2265198 SHA256 227f2f0e8b719f39a3c14338180de1a426f105c9a8c6821772a9d791d7600ac1 SHA512 713b3838e5eb2bdbf3b39fcd9c46f96443a74d6f8ca2c4fc0c8de01da63520c555affea6c5c98b48dcc8ebba2d54918dcde6d5f2d5ffb76b7df6fcd5a674115c WHIRLPOOL 11bc430ab7104b3c3087bc4a99171ce3084112327181f8b3ca682eff175d062c99218a53698b8591d793babc6f784c4811da98973b49567cd5b1328d3e19e972
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_sw-TZ.tar.gz 522499 SHA256 273f4c31b43329787dd5c339fe1126c3f595750ce97538737014106d037f8ae8 SHA512 304b7759cf62f93c1ce3662a01840c0b6b515091c503abefbdf18b766c67b5a0ae0dd7134b40a1a792fd32d090258f11ab56abae0598c10f60a52187420e7da7 WHIRLPOOL 5dd4988905ec464b9ee60bf0494b29a76101e118756eca4c517c664051511c93d5793188cb8bc3b11915f7bf0b4c3f09236642740e3ad9aa53d9ae1005a79d79
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ta.tar.gz 592527 SHA256 c1180712e95cd9b9c657a4912f3c3cb12b629090c815ca745505382ef851cf90 SHA512 bd0bb0db1afdda501f74ae056261b87be2620d158d837e990d5ff5d25f828b3e1b88f571efa1dedef0f0a4dbeb2f4381479664d890c90a19d19ac3a9f40b45c2 WHIRLPOOL eb1be8b34c1713833e6725105a46c8a2c6f29435dca880464fe13bcaa38574c0c581e9fcbaa24b1306e37654c91cbb71810c9211ff3803c2bc4fc7de90a33948
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_te.tar.gz 1153577 SHA256 4c2608b27c7022de06afb03cb8e6c1f0edd5564918ae43a994d85bfeee658a86 SHA512 e5a42c6ec1ba8ea8751e7101786df3f3e6610cc1d2531dc4370b3a4cfa3f58e1b8f0720adb20ee01ac9e98b9b31a2eafe0d3448a561658ab4c4182dfa539ebfe WHIRLPOOL 3f450d1151f179995840b67ee5fba98bfe6cc9cafe72c1ebe59a1fadac3b1418ecb16571866eb6181705db7ae023b2aed1187559445474fe5632f85899d57357
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_tg.tar.gz 558190 SHA256 5ed1df563b931bd85bdbc2079707d6d5be69ead32afd2834bf767abf082fc799 SHA512 38d53f8f99ea7d82f8df987c95eed9a7c2c06bc2ff4f1bba3648ce0f690510793d56a283d402ef1cb4b3dca62e2f204c7a848b3ebcb432a7249464c7097d69e1 WHIRLPOOL 6cfca313128b6160bf7bbf07b4617c5460cb80012567078fa8cc90335c2e311d42c4ae03dacfcd14a5109db5ef17d0b7fdd993072b7de9e88a1497438eb6d321
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_th.tar.gz 733026 SHA256 1c92a296892b61b07efef0033e86ed84077cd7e5dbfaf4a7b966a09a885b6f64 SHA512 9772b5e2e004b42f3ad6e3d994a7f00e7a624a82055b34628c671c23335b13b015a025db26abf878ee20cddc6f66c867b3d203030b85957604beeb896a3aa7d9 WHIRLPOOL 975c9cd9b049ee1f21ccad4e5073fb93bb8ca959c833b1ad7a27c183e09d4ddc6a00e52b2abf07e8f404a710ef24fdbcd1cb75ece4d53412e6fb2095f1c33fa6
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_tn.tar.gz 527164 SHA256 35b1e8f22066bb8087b5270586c1868ddd39d6c1d4996aba5b5e664976972bb1 SHA512 3e10a043a671a92b9ba6c7fee54f044080846890f5ac79bc1dcadd3625cb2833f6572b02815873f1a7390f2119d3c53cc2bafa68c4621350ed56f5b89232ded3 WHIRLPOOL acfbd91c6fe1441476e8d1762d2090e3ca8e2aca46bca450b12fa7fc27429484c6f83fb8501ed99000511750d0e08ed3e085cc2fb4bc6d4f4f654d44f30c0e79
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_tr.tar.gz 560989 SHA256 216b67f77d42d5caf1deef4c6a8fb4ac087dff95038655d8e463644768e03300 SHA512 9e040e38de5e443452e1763ba4a5bb1e92f63d5bfe717f157c8aa75d8a0886b8d609e298f1475db06e5a1162c190ef209aa1654e36137ad942b256aa11e4398c WHIRLPOOL b24bfebcfcc8dc3b6adc8d532f43ab1b7f20a9cc1d004e2b1fb17d06ebb87a0a3c5ae746df01a11d6424fa68574cb6cf99be7b9f49c53db39f15f60fa6817ccf
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ts.tar.gz 539615 SHA256 9c839336a7177f3b33ee0d84d5b803bc951b29de0d725457583c2082e5746f9f SHA512 ace5aff360c41d940c50c83ddba0fe2fe8d1265209de3c76e98a93ee92c9eb049a70b0249461f3a91a777b59333db2835e9ce291b919f747e89dbde75b58b044 WHIRLPOOL 3ad5039e5e51ad6296ab95c9d3f8acbfa277395ce4b09ccdf6ec901af1262004e5f33b6eeac51587c35c36b3b256f2661a7836d449f440962a9715b7a8f2750c
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_tt.tar.gz 533621 SHA256 08cf819e718e0221e76e638278c3e7371a5bf3ca65e019134d44747a4002617d SHA512 faec9066185681693831e82f69f6e2a59291e363a86d469eea0489cd011351c88bccaaa54010685030cd08b51c37288d3feaa93688ae278b6bc9f44368bee2a3 WHIRLPOOL a273ec253d9fd95be24dca138d7f18bf4c6c5c9c8db36d458e972ef0e1eb1c330786a90b7f290787e05749094188c40122c452b67405381a4ac0937101fa63e0
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ug.tar.gz 566391 SHA256 19edafa4e2d3eb7e07922ac20def05ca81fd7c2dafbeb9baafb33babe406b374 SHA512 86c92764c18b8740235421e3f2aad7d4da9af6f9ac0895040d58ad77e31b2fa7db0f705f43289e7fe2d6d8402c8da4e2a068488f3ef567a5ec027792d098f631 WHIRLPOOL 5c0b3aee9a94ccfeb771c0b22c7a93797ce4378c9bc3d4d9ee617d63a318645860d2ffff183ad987999b52e399a65e4cfd5ce39bdf8110bebcd6944bfcbc548d
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_uk.tar.gz 1410128 SHA256 814aecfc3937d798024754ceb18f7b5c894b7339fd444f10fffe4e1d072fd4f9 SHA512 991ed3a2217483db0228117bb70dbb49b74b667b97517bbf5e0a57dd43fc0e395ff501cfc660a09f69a3f31184a32847ca4b1af4d78452d55ef2eadfde28a11e WHIRLPOOL 4e1e8d9ed403af3f415081f1a231989809db1a8880785a08c1193de6ef905e4684c911631c5b355bd87e52df90cdd10b7bb3487f0428e6f933dfb08f31b9f597
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_uz.tar.gz 528345 SHA256 f015dbd07127f463cbc31b71286f20cc026b2cf9db187e3bf4d38d1a6b810635 SHA512 2d88bf0da59ddc7d6b478e1da13e4c8528d4fd7f1fee7b105b89f92f40c26548423db1520010ac8962ddab622d8510c8f899d17bc856eaf47cc1fe57012b7608 WHIRLPOOL b431d2db0aa7d672fca78f9a6bd7e6bedabc9546fa17aae592fcee504268f1fe9c349a23369bda786c465d6b02706d183909579c4ff249ad0a94c8cee3be8d26
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_ve.tar.gz 541767 SHA256 1800f44d4f3817099beefef81152da3ea692e3c2cd5305f2b3cdc96d650d22db SHA512 121e835d9e074c13a46048265730fae7bd8b6ef7ac7ba431654b0d3c6c9e63b6dc5594fca1502dc114da6cc0beef04b1368c9f2edd66615b05a5293c5c08f5a6 WHIRLPOOL 89a8ce0115ede1138079bcb7f51282464191b6e03c252d1426626f8b508943d789f6d8f4f70c07b780fc6ef309209782e47681a3100cf7844b86afc84bd28b12
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_vi.tar.gz 561086 SHA256 44a89a3577289e3bf83a5633f996c29096c35e4a8c899785104f47f8b7e16be0 SHA512 3c6b4d8c65fc7d0a04db9c52e7ae53233af769fbd19c122d84cd8ea4237370cbea6b512a2f9dc6bc16311370ee92673b86bfd8995e21cff281b9289c68fe127d WHIRLPOOL 93a3f71807c844f2544dcc5db3cd5a3cd585e76a98fc6af53d5273cfdaea8f5fb1d6a7701c89c6a9b1998ca8fdd76ed2cefc5c1c920eed3b19dfe9103d4184fe
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_xh.tar.gz 550618 SHA256 08b38a94546f642e4812d685883a1a4f59cf029558e1d409c9cb1864de7d4b58 SHA512 5c84d0fe7f2b8078bdbfe1019def41672432a71d12e08d57c9af426596d70d9bf710e34aee6387551ffa53a6edc184d27786d7814eb9501c0a9647452d402629 WHIRLPOOL d8f87141bdc52c59658382bebd4977757f7b1c0b98defacbeb212d5c1f338f4f3454a6daa2c9f0d04e3fc0d8508aea02f7a9a5fda9a89576b0d03edc6913f157
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_zh-CN.tar.gz 597199 SHA256 c5cec4abb21569d4ff708962497d7c732551a70f3e6c246ac3825bbae9f21be7 SHA512 c6d85e965fe68c99645cd7031991d7233379c0db9e7cf0111f5460591e76c79e78f06fb9230cd4185abb0572da8caf908c7eb09c7ac0e6055426b588b525c1fe WHIRLPOOL 3d83d784ca66f3532bb50049d84d8a3c668c0191d899a26b1eea7797efcb77f56f1a8a14828bd88d6bc3ef810b6eb6287028581735e5d6823cb78bfd00a14de9
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_zh-TW.tar.gz 594788 SHA256 a50c4e324522fddbea30f7ecd47c51458e65d26916bc17acb88283e34608eacd SHA512 c15426484938bffd1eea7dc98b178d72729e88fdacf405c3daba5f718c39b28d4f2c414f72984bcc0b3fb56d03274fb507feb51b5a0a0eb5e4984eead06aa1fd WHIRLPOOL f3e9bd95b2fabeca53a6735fa4deb7a6325c2616ba637142f000e363ed7d4de98e011c28010d992216865a790780334c0a0f0f0d281f881e328481dd1b0c8182
|
||||
DIST LibreOffice_4.2.5_Linux_x86_rpm_langpack_zu.tar.gz 550068 SHA256 58d2468c15f3458740a661c449e51298ff0c13e74d5388d36be863379e138c95 SHA512 fa6962951b5b041754ba1f46b23c5c25dbcce9064bbc72c1c15c12a6c85c6087a370385cb04e961422b74f3cd09c329cb39ed3d5128974ee7c29c6831492e65f WHIRLPOOL 6c528c48bc0f2312e2f188a05d19008b3523a279e561fdf15887b37add0e96724efc5c3ae8cc1c9150388864afb7b57bb505057e70e9bd90dcc8be5e0eb1ee21
|
||||
EBUILD libreoffice-l10n-4.2.5.2.ebuild 3161 SHA256 d1646b66e139153909a4414ddf88f8c21f5f773d68ea3d1e83a402d12bf6b348 SHA512 6c8c43666f60e8daf6114bd5a53f0053bb09340abb058be613bc29f489aeeb182ea6601bd60ecc71c100523c96344fe35e231554058f7bbb92dcc119354e45f1 WHIRLPOOL 751f574140a59467b4b02dee9b042320a345bb5b6e5782216acbe6b766c06471f948cff45b1d42a8e85df99e3ada1ef6999c4403603bf80b32de9619bb1c45ce
|
||||
MISC ChangeLog 19396 SHA256 aabea9d46bfa71035bafa17b1eb119a47994bf20e8121720edd293be4263f548 SHA512 854bca41a059eea0fbae4b8677ac38a8ee9312b5cb1d0437d3218f9e18c0914a0a41d013b82b23105703db1d3218e39841d789ea054241e0f7abfbea20ab886f WHIRLPOOL 64de0e33b47477262dfe38f4f18084d6a8ed78501a45eb74a77afbe99252602bb2fffc0909bf1d499bf41faba69bc48644a6a8523284fe2045b1af4d4cf0ce68
|
||||
MISC metadata.xml 519 SHA256 c0a35616fbb63ce44fe5f42f5683d3303b48b8fe26aa2bf3c4e52210517e5dcd SHA512 e05d660044043261d2c348006293da04c7c9bddf3be637599f0e64d82db0b965f77414cd4b3678bb3dc00d4f4e29398f27f759f09df260583af78ef2eeb91107 WHIRLPOOL b68b799cfe7ce68ab8577c724b68842fb9818dea30deaa892435cd95c7f95994d729d416f5510a02b5257deb87a72152f645763209aaa188ee241627d15ceba7
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.22 (GNU/Linux)
|
||||
|
||||
iQJ8BAEBCABmBQJTsFmOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
|
||||
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
|
||||
QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcfGwQAOIvUCnl1ueG8OwE7DX8xTy4
|
||||
BxshQ0kxYXkICB1SQ2MlIEDyZykKA6/tZAurqJdgzbibmFPaouWcHrutCAVN9mM/
|
||||
auQjD9CD9+blBvmDv3YHR4XosW3NO+qsFxkNO3Ppb6+UkjxaUjmf5meocEFszzDX
|
||||
Lf5i5fFuc/JDc+aC+q+roPHcNARuGcCqi8DCrStdOvNJlfWMIx4wULPjDFpHQWs0
|
||||
3us9w1tgYwLhaefyNx8JzwGKaR/xT3autFDIh49dvd0xz29EO82rZfkgVH0GMl93
|
||||
Sh5eLQxpUbil527bQSFjU4iyi+KILaflK3lgz1Ng6kiY/Ln0CNeW6lVV6Jey2Axq
|
||||
xOOE63FpVXFB+qoeMvVB3otTN0xb4rcfYlPIKvdaKaMT2da2SFKZb5HhaqRAylYS
|
||||
T+FF4dLa+D/CzxaQ8Dtde42+z8I/vfdsBHG1ThMRFgtdNuhm7ottgzLuuWUz7noR
|
||||
BoOXOKT+s8TEQPwPq65usPO/IpzJXeWPDpfa9CWC5l3IC5HAvMbUEUlQL8uYObQq
|
||||
9Xbn/eHUFTEjM5sMxk/PUYmFCo1TPYKCMpgwsIQRQL6JV/gD4a1smSpYGkYObTg/
|
||||
d1vCAAIBxkV0h23v2wXLMitri2TWhY9empGA/dqq/epjMv5XBAcQOAyhdhVxmLqw
|
||||
JrKGbRzwVkXXdl98MRKt
|
||||
=wxW3
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-4.2.5.2.ebuild,v 1.3 2014/06/29 16:43:09 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit rpm eutils multilib versionator
|
||||
|
||||
MY_PV=$(get_version_component_range 1-3)
|
||||
|
||||
DESCRIPTION="Translations for the Libreoffice suite."
|
||||
HOMEPAGE="http://www.libreoffice.org"
|
||||
BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
|
||||
|
||||
LICENSE="|| ( LGPL-3 MPL-1.1 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="offlinehelp"
|
||||
|
||||
#
|
||||
# when changing the language lists, please be careful to preserve the spaces (bug 491728)
|
||||
#
|
||||
LANGUAGES_HELP=" am ast bg bn_IN bn bo bs ca_valencia ca cs da de dz el en_GB en en_ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW "
|
||||
LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd kk kmr_Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sid sr_Latn sr ss st sw_TZ ta te th tn ts tt uz ve xh zu "
|
||||
|
||||
for lang in ${LANGUAGES_HELP}; do
|
||||
helppack=""
|
||||
[[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
|
||||
helppack="offlinehelp? ( ${BASE_SRC_URI}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )"
|
||||
SRC_URI+=" linguas_${lang}? ( ${helppack} )"
|
||||
done
|
||||
for lang in ${LANGUAGES}; do
|
||||
langpack=""
|
||||
[[ ${lang} == en ]] \
|
||||
|| langpack="${BASE_SRC_URI}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz"
|
||||
[[ -z ${langpack} ]] || SRC_URI+=" linguas_${lang}? ( ${langpack} )"
|
||||
IUSE+=" linguas_${lang}"
|
||||
done
|
||||
unset lang helppack langpack lang2
|
||||
|
||||
RDEPEND+="app-text/hunspell"
|
||||
|
||||
RESTRICT="strip"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
|
||||
local lang dir rpmdir i
|
||||
local ooextused=()
|
||||
|
||||
for lang in ${LANGUAGES}; do
|
||||
# break away if not enabled; paludis support
|
||||
use_if_iuse linguas_${lang} || continue
|
||||
|
||||
dir=${lang/_/-}
|
||||
|
||||
# for english we provide just helppack, as translation is always there
|
||||
if [[ ${lang} != en ]]; then
|
||||
rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
|
||||
[[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
|
||||
# First remove dictionaries, we want to use system ones.
|
||||
rm -rf "${S}/${rpmdir}/"*dict*.rpm
|
||||
rpm_unpack "./${rpmdir}/"*.rpm
|
||||
fi
|
||||
if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
|
||||
[[ ${lang} == en ]] && dir="en-US"
|
||||
rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
|
||||
[[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
|
||||
rpm_unpack ./"${rpmdir}/"*.rpm
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
src_prepare() { :; }
|
||||
src_configure() { :; }
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/
|
||||
# Condition required for people that do not install anything eg no linguas
|
||||
# or just english with no offlinehelp.
|
||||
if [[ -d "${dir}" ]] ; then
|
||||
insinto /usr/$(get_libdir)/${PN/-l10n/}/
|
||||
doins -r "${dir}"/*
|
||||
fi
|
||||
# remove extensions that are in the l10n for some weird reason
|
||||
rm -rf "${ED}"/usr/$(get_libdir)/${PN/-l10n/}/share/extensions/
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
DIST icedtea-bin-core-6.1.13.3-amd64.tar.bz2 52302259 SHA256 71001e89b1ad4808108e533f3c089f6357569e7e9401b8588483a1cd71bf5a6f SHA512 5dbd92b6322bb8fe6131e01062ab9b0fa955093c11138a5107f89fd715e9010c41591893d0ba59f91b08e087644d54be40c893e29a47ccd7ea4b4c321821508f WHIRLPOOL c63085bd06047402268ed0a58f5df9ab382efb0eb0539734a18b18eb8acd9743514fd9d8bae68ab1444c2e94dca6ebffe226c55bbba82fde9527a815c11e88ea
|
||||
DIST icedtea-bin-core-6.1.13.3-x86.tar.bz2 53179290 SHA256 d76614481985dd35818bd269157e08d8eb1e2e7749048005b8cd3cbcb5f63474 SHA512 f93e63421f3d2e61629df4f15d0bc9dc972fa60d5607d764a1e9fa7ba2826dfbdd05e25b8ee04d49b21721fc7333c2a37270ffaba12417a94cbf14cc7fdbc73f WHIRLPOOL 92520d35af88f0f9ba1f758abf9f25893912e8982bfe2791b623b22a1037625ffb834ed637771dd642291ccc81b130fa02d21d5d101aecee0c4d971b3bdcb19d
|
||||
DIST icedtea-bin-doc-6.1.13.3.tar.bz2 11511333 SHA256 3d84a2e524844ff894d69c652e4a5514c001c8a2542c2bd54c7f26bc8bbedcd3 SHA512 f690220ab69938528df9dde37375a4ad86ba2cef01220137b6f146f2d19ad9490e08387c001738e2c371b0e09cea1f32f184fa59e6e230daf4edfe9883fb2181 WHIRLPOOL 674f6e9f575bddeb1a1a679e69f06cc593d467881e882ee0bae9403b51ef26ed0010a46c5e22f38246cf617b2c05e5b69c54efff6f532941edf8621ca9eb593d
|
||||
DIST icedtea-bin-examples-6.1.13.3-amd64.tar.bz2 2168205 SHA256 6756045cb018acf3af506b06a48934857daafcc1d01799bc25a6d9609eadf628 SHA512 a2f72a508946a0b8afbc11d6d06600a3548c0f1f6bf46b6e3518fae429b5b7f2dc8d3484af522057b1d2eb8841db97cbfb5123563fd7f930ff8a931849dea586 WHIRLPOOL 9ec5aa3a89529a6e4ed818370447a3993f5026e416c8313fa1203c4dd1472cf028d6206dcf4ba0420c6767fdccac722b29c538b4296ac04551e130d1270e5a5f
|
||||
DIST icedtea-bin-examples-6.1.13.3-x86.tar.bz2 2134637 SHA256 82ebbc95be9a5648682282d76ebac2dd16bf51812c42baf48ef162b2da091461 SHA512 09c507c9359e28e5fa9fa03ab5759d86fcae26f3516a27cefc391cbc28338bf5fb6270f4cbef06cb3c9225618bc9d5c8fcdef7302d7cca1ec29787767036c44c WHIRLPOOL fd50454ad4a0f9a2e453a34dc1871cc1cdbdc569d1044fe0187327379da7b0f7230442a74dbbb6505ad58970a56955ab53b839f96dbf1fd4aade737a2a5df797
|
||||
DIST icedtea-bin-src-6.1.13.3.tar.bz2 41192099 SHA256 801380a78185d0b2b4035d876e9e73f4d6c073732c8b369f191638a55df563bb SHA512 d368bdeace6cf364db6394bc5dfe5b0081f9209ad98c057a5fe2096d227b82baca2317b2b5cc885cd210b1d1b4ee8fe44aa25678ee875340a94e11de76643c71 WHIRLPOOL 71003e4f84311260da1c814ee07e7a531ae98c287c77936b3f35379b3e49fc50782d9f8c2f6ac57dd92bb66374d7f6b58ae4088d2cea570bd7ccacdb330feb38
|
||||
|
|
@ -1,388 +0,0 @@
|
|||
#
|
||||
#
|
||||
# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle in the LICENSE file that accompanied this code.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
# Based on Fedora's
|
||||
|
||||
|
||||
# Version
|
||||
|
||||
version=1
|
||||
|
||||
# Component Font Mappings
|
||||
|
||||
dialog.plain.latin-1=DejaVu Sans
|
||||
dialog.plain.japanese-x0208=Sazanami Gothic
|
||||
dialog.plain.korean=Baekmuk Gulim
|
||||
dialog.plain.chinese-big5=AR PL ShanHeiSun Uni
|
||||
dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni
|
||||
dialog.plain.bengali=Lohit Bengali
|
||||
dialog.plain.gujarati=Lohit Gujarati
|
||||
dialog.plain.hindi=Lohit Hindi
|
||||
dialog.plain.malayalam=Lohit Malayalam
|
||||
dialog.plain.oriya=Lohit Oriya
|
||||
dialog.plain.punjabi=Lohit Punjabi
|
||||
dialog.plain.tamil=Lohit Tamil
|
||||
dialog.plain.telugu=Lohit Telugu
|
||||
dialog.plain.sinhala=LKLUG
|
||||
|
||||
dialog.bold.latin-1=DejaVu Sans Bold
|
||||
dialog.bold.japanese-x0208=Sazanami Gothic
|
||||
dialog.bold.korean=Baekmuk Gulim
|
||||
dialog.bold.chinese-big5=AR PL ShanHeiSun Uni
|
||||
dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni
|
||||
dialog.bold.bengali=Lohit Bengali
|
||||
dialog.bold.gujarati=Lohit Gujarati
|
||||
dialog.bold.hindi=Lohit Hindi
|
||||
dialog.bold.malayalam=Lohit Malayalam
|
||||
dialog.bold.oriya=Lohit Oriya
|
||||
dialog.bold.punjabi=Lohit Punjabi
|
||||
dialog.bold.tamil=Lohit Tamil
|
||||
dialog.bold.telugu=Lohit Telugu
|
||||
dialog.bold.sinhala=LKLUG
|
||||
|
||||
dialog.italic.latin-1=DejaVu Sans Oblique
|
||||
dialog.italic.japanese-x0208=Sazanami Gothic
|
||||
dialog.italic.korean=Baekmuk Gulim
|
||||
dialog.italic.chinese-big5=AR PL ShanHeiSun Uni
|
||||
dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni
|
||||
dialog.italic.bengali=Lohit Bengali
|
||||
dialog.italic.gujarati=Lohit Gujarati
|
||||
dialog.italic.hindi=Lohit Hindi
|
||||
dialog.italic.malayalam=Lohit Malayalam
|
||||
dialog.italic.oriya=Lohit Oriya
|
||||
dialog.italic.punjabi=Lohit Punjabi
|
||||
dialog.italic.tamil=Lohit Tamil
|
||||
dialog.italic.telugu=Lohit Telugu
|
||||
dialog.italic.sinhala=LKLUG
|
||||
|
||||
dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique
|
||||
dialog.bolditalic.japanese-x0208=Sazanami Gothic
|
||||
dialog.bolditalic.korean=Baekmuk Gulim
|
||||
dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
|
||||
dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
|
||||
dialog.bolditalic.bengali=Lohit Bengali
|
||||
dialog.bolditalic.gujarati=Lohit Gujarati
|
||||
dialog.bolditalic.hindi=Lohit Hindi
|
||||
dialog.bolditalic.malayalam=Lohit Malayalam
|
||||
dialog.bolditalic.oriya=Lohit Oriya
|
||||
dialog.bolditalic.punjabi=Lohit Punjabi
|
||||
dialog.bolditalic.tamil=Lohit Tamil
|
||||
dialog.bolditalic.telugu=Lohit Telugu
|
||||
dialog.bolditalic.sinhala=LKLUG
|
||||
|
||||
sansserif.plain.latin-1=DejaVu Sans
|
||||
sansserif.plain.japanese-x0208=Sazanami Gothic
|
||||
sansserif.plain.korean=Baekmuk Gulim
|
||||
sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni
|
||||
sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni
|
||||
sansserif.plain.bengali=Lohit Bengali
|
||||
sansserif.plain.gujarati=Lohit Gujarati
|
||||
sansserif.plain.hindi=Lohit Hindi
|
||||
sansserif.plain.malayalam=Lohit Malayalam
|
||||
sansserif.plain.oriya=Lohit Oriya
|
||||
sansserif.plain.punjabi=Lohit Punjabi
|
||||
sansserif.plain.tamil=Lohit Tamil
|
||||
sansserif.plain.telugu=Lohit Telugu
|
||||
sansserif.plain.sinhala=LKLUG
|
||||
|
||||
sansserif.bold.latin-1=DejaVu Sans Bold
|
||||
sansserif.bold.japanese-x0208=Sazanami Gothic
|
||||
sansserif.bold.korean=Baekmuk Gulim
|
||||
sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni
|
||||
sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni
|
||||
sansserif.bold.bengali=Lohit Bengali
|
||||
sansserif.bold.gujarati=Lohit Gujarati
|
||||
sansserif.bold.hindi=Lohit Hindi
|
||||
sansserif.bold.malayalam=Lohit Malayalam
|
||||
sansserif.bold.oriya=Lohit Oriya
|
||||
sansserif.bold.punjabi=Lohit Punjabi
|
||||
sansserif.bold.tamil=Lohit Tamil
|
||||
sansserif.bold.telugu=Lohit Telugu
|
||||
sansserif.bold.sinhala=LKLUG
|
||||
|
||||
sansserif.italic.latin-1=DejaVu Sans Oblique
|
||||
sansserif.italic.japanese-x0208=Sazanami Gothic
|
||||
sansserif.italic.korean=Baekmuk Gulim
|
||||
sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni
|
||||
sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni
|
||||
sansserif.italic.bengali=Lohit Bengali
|
||||
sansserif.italic.gujarati=Lohit Gujarati
|
||||
sansserif.italic.hindi=Lohit Hindi
|
||||
sansserif.italic.malayalam=Lohit Malayalam
|
||||
sansserif.italic.oriya=Lohit Oriya
|
||||
sansserif.italic.punjabi=Lohit Punjabi
|
||||
sansserif.italic.tamil=Lohit Tamil
|
||||
sansserif.italic.telugu=Lohit Telugu
|
||||
sansserif.italic.sinhala=LKLUG
|
||||
|
||||
sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique
|
||||
sansserif.bolditalic.japanese-x0208=Sazanami Gothic
|
||||
sansserif.bolditalic.korean=Baekmuk Gulim
|
||||
sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
|
||||
sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
|
||||
sansserif.bolditalic.bengali=Lohit Bengali
|
||||
sansserif.bolditalic.gujarati=Lohit Gujarati
|
||||
sansserif.bolditalic.hindi=Lohit Hindi
|
||||
sansserif.bolditalic.malayalam=Lohit Malayalam
|
||||
sansserif.bolditalic.oriya=Lohit Oriya
|
||||
sansserif.bolditalic.punjabi=Lohit Punjabi
|
||||
sansserif.bolditalic.tamil=Lohit Tamil
|
||||
sansserif.bolditalic.telugu=Lohit Telugu
|
||||
sansserif.bolditalic.sinhala=LKLUG
|
||||
|
||||
serif.plain.latin-1=DejaVu Serif
|
||||
serif.plain.japanese-x0208=Sazanami Mincho
|
||||
serif.plain.korean=Baekmuk Batang
|
||||
serif.plain.chinese-big5=AR PL ZenKai Uni
|
||||
serif.plain.chinese-gb18030=AR PL ZenKai Uni
|
||||
serif.plain.bengali=Lohit Bengali
|
||||
serif.plain.gujarati=Lohit Gujarati
|
||||
serif.plain.hindi=Lohit Hindi
|
||||
serif.plain.malayalam=Lohit Malayalam
|
||||
serif.plain.oriya=Lohit Oriya
|
||||
serif.plain.punjabi=Lohit Punjabi
|
||||
serif.plain.tamil=Lohit Tamil
|
||||
serif.plain.telugu=Lohit Telugu
|
||||
serif.plain.sinhala=LKLUG
|
||||
|
||||
serif.bold.latin-1=DejaVu Serif Bold
|
||||
serif.bold.japanese-x0208=Sazanami Mincho
|
||||
serif.bold.korean=Baekmuk Batang
|
||||
serif.bold.chinese-big5=AR PL ZenKai Uni
|
||||
serif.bold.chinese-gb18030=AR PL ZenKai Uni
|
||||
serif.bold.bengali=Lohit Bengali
|
||||
serif.bold.gujarati=Lohit Gujarati
|
||||
serif.bold.hindi=Lohit Hindi
|
||||
serif.bold.malayalam=Lohit Malayalam
|
||||
serif.bold.oriya=Lohit Oriya
|
||||
serif.bold.punjabi=Lohit Punjabi
|
||||
serif.bold.tamil=Lohit Tamil
|
||||
serif.bold.telugu=Lohit Telugu
|
||||
serif.bold.sinhala=LKLUG
|
||||
|
||||
serif.italic.latin-1=DejaVu Serif Oblique
|
||||
serif.italic.japanese-x0208=Sazanami Mincho
|
||||
serif.italic.korean=Baekmuk Batang
|
||||
serif.italic.chinese-big5=AR PL ZenKai Uni
|
||||
serif.italic.chinese-gb18030=AR PL ZenKai Uni
|
||||
serif.italic.bengali=Lohit Bengali
|
||||
serif.italic.gujarati=Lohit Gujarati
|
||||
serif.italic.hindi=Lohit Hindi
|
||||
serif.italic.malayalam=Lohit Malayalam
|
||||
serif.italic.oriya=Lohit Oriya
|
||||
serif.italic.punjabi=Lohit Punjabi
|
||||
serif.italic.tamil=Lohit Tamil
|
||||
serif.italic.telugu=Lohit Telugu
|
||||
serif.italic.sinhala=LKLUG
|
||||
|
||||
serif.bolditalic.latin-1=DejaVu Serif Bold Oblique
|
||||
serif.bolditalic.japanese-x0208=Sazanami Mincho
|
||||
serif.bolditalic.korean=Baekmuk Batang
|
||||
serif.bolditalic.chinese-big5=AR PL ZenKai Uni
|
||||
serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni
|
||||
serif.bolditalic.bengali=Lohit Bengali
|
||||
serif.bolditalic.gujarati=Lohit Gujarati
|
||||
serif.bolditalic.hindi=Lohit Hindi
|
||||
serif.bolditalic.malayalam=Lohit Malayalam
|
||||
serif.bolditalic.oriya=Lohit Oriya
|
||||
serif.bolditalic.punjabi=Lohit Punjabi
|
||||
serif.bolditalic.tamil=Lohit Tamil
|
||||
serif.bolditalic.telugu=Lohit Telugu
|
||||
serif.bolditalic.sinhala=LKLUG
|
||||
|
||||
monospaced.plain.latin-1=DejaVu Sans Mono
|
||||
monospaced.plain.japanese-x0208=Sazanami Gothic
|
||||
monospaced.plain.korean=Baekmuk Gulim
|
||||
monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni
|
||||
monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni
|
||||
monospaced.plain.bengali=Lohit Bengali
|
||||
monospaced.plain.gujarati=Lohit Gujarati
|
||||
monospaced.plain.hindi=Lohit Hindi
|
||||
monospaced.plain.malayalam=Lohit Malayalam
|
||||
monospaced.plain.oriya=Lohit Oriya
|
||||
monospaced.plain.punjabi=Lohit Punjabi
|
||||
monospaced.plain.tamil=Lohit Tamil
|
||||
monospaced.plain.telugu=Lohit Telugu
|
||||
monospaced.plain.sinhala=LKLUG
|
||||
|
||||
monospaced.bold.latin-1=DejaVu Sans Mono Bold
|
||||
monospaced.bold.japanese-x0208=Sazanami Gothic
|
||||
monospaced.bold.korean=Baekmuk Gulim
|
||||
monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni
|
||||
monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni
|
||||
monospaced.bold.bengali=Lohit Bengali
|
||||
monospaced.bold.gujarati=Lohit Gujarati
|
||||
monospaced.bold.hindi=Lohit Hindi
|
||||
monospaced.bold.malayalam=Lohit Malayalam
|
||||
monospaced.bold.oriya=Lohit Oriya
|
||||
monospaced.bold.punjabi=Lohit Punjabi
|
||||
monospaced.bold.tamil=Lohit Tamil
|
||||
monospaced.bold.telugu=Lohit Telugu
|
||||
monospaced.bold.sinhala=LKLUG
|
||||
|
||||
monospaced.italic.latin-1=DejaVu Sans Mono Oblique
|
||||
monospaced.italic.japanese-x0208=Sazanami Gothic
|
||||
monospaced.italic.korean=Baekmuk Gulim
|
||||
monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni
|
||||
monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni
|
||||
monospaced.italic.bengali=Lohit Bengali
|
||||
monospaced.italic.gujarati=Lohit Gujarati
|
||||
monospaced.italic.hindi=Lohit Hindi
|
||||
monospaced.italic.malayalam=Lohit Malayalam
|
||||
monospaced.italic.oriya=Lohit Oriya
|
||||
monospaced.italic.punjabi=Lohit Punjabi
|
||||
monospaced.italic.tamil=Lohit Tamil
|
||||
monospaced.italic.telugu=Lohit Telugu
|
||||
monospaced.italic.sinhala=LKLUG
|
||||
|
||||
monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
|
||||
monospaced.bolditalic.japanese-x0208=Sazanami Gothic
|
||||
monospaced.bolditalic.korean=Baekmuk Gulim
|
||||
monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
|
||||
monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
|
||||
monospaced.bolditalic.bengali=Lohit Bengali
|
||||
monospaced.bolditalic.gujarati=Lohit Gujarati
|
||||
monospaced.bolditalic.hindi=Lohit Hindi
|
||||
monospaced.bolditalic.malayalam=Lohit Malayalam
|
||||
monospaced.bolditalic.oriya=Lohit Oriya
|
||||
monospaced.bolditalic.punjabi=Lohit Punjabi
|
||||
monospaced.bolditalic.tamil=Lohit Tamil
|
||||
monospaced.bolditalic.telugu=Lohit Telugu
|
||||
monospaced.bolditalic.sinhala=LKLUG
|
||||
|
||||
dialoginput.plain.latin-1=DejaVu Sans Mono
|
||||
dialoginput.plain.japanese-x0208=Sazanami Gothic
|
||||
dialoginput.plain.korean=Baekmuk Gulim
|
||||
dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni
|
||||
dialoginput.plain.chinese-gb18030=AR PL ShanHeiSun Uni
|
||||
dialoginput.plain.bengali=Lohit Bengali
|
||||
dialoginput.plain.gujarati=Lohit Gujarati
|
||||
dialoginput.plain.hindi=Lohit Hindi
|
||||
dialoginput.plain.malayalam=Lohit Malayalam
|
||||
dialoginput.plain.oriya=Lohit Oriya
|
||||
dialoginput.plain.punjabi=Lohit Punjabi
|
||||
dialoginput.plain.tamil=Lohit Tamil
|
||||
dialoginput.plain.telugu=Lohit Telugu
|
||||
dialoginput.plain.sinhala=LKLUG
|
||||
|
||||
dialoginput.bold.latin-1=DejaVu Sans Mono Bold
|
||||
dialoginput.bold.japanese-x0208=Sazanami Gothic
|
||||
dialoginput.bold.korean=Baekmuk Gulim
|
||||
dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni
|
||||
dialoginput.bold.chinese-gb18030=AR PL ShanHeiSun Uni
|
||||
dialoginput.bold.bengali=Lohit Bengali
|
||||
dialoginput.bold.gujarati=Lohit Gujarati
|
||||
dialoginput.bold.hindi=Lohit Hindi
|
||||
dialoginput.bold.malayalam=Lohit Malayalam
|
||||
dialoginput.bold.oriya=Lohit Oriya
|
||||
dialoginput.bold.punjabi=Lohit Punjabi
|
||||
dialoginput.bold.tamil=Lohit Tamil
|
||||
dialoginput.bold.telugu=Lohit Telugu
|
||||
dialoginput.bold.sinhala=LKLUG
|
||||
|
||||
dialoginput.italic.latin-1=DejaVu Sans Mono Oblique
|
||||
dialoginput.italic.japanese-x0208=Sazanami Gothic
|
||||
dialoginput.italic.korean=Baekmuk Gulim
|
||||
dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni
|
||||
dialoginput.italic.chinese-gb18030=AR PL ShanHeiSun Uni
|
||||
dialoginput.italic.bengali=Lohit Bengali
|
||||
dialoginput.italic.gujarati=Lohit Gujarati
|
||||
dialoginput.italic.hindi=Lohit Hindi
|
||||
dialoginput.italic.malayalam=Lohit Malayalam
|
||||
dialoginput.italic.oriya=Lohit Oriya
|
||||
dialoginput.italic.punjabi=Lohit Punjabi
|
||||
dialoginput.italic.tamil=Lohit Tamil
|
||||
dialoginput.italic.telugu=Lohit Telugu
|
||||
dialoginput.italic.sinhala=LKLUG
|
||||
|
||||
dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
|
||||
dialoginput.bolditalic.japanese-x0208=Sazanami Gothic
|
||||
dialoginput.bolditalic.korean=Baekmuk Gulim
|
||||
dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
|
||||
dialoginput.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
|
||||
dialoginput.bolditalic.bengali=Lohit Bengali
|
||||
dialoginput.bolditalic.gujarati=Lohit Gujarati
|
||||
dialoginput.bolditalic.hindi=Lohit Hindi
|
||||
dialoginput.bolditalic.malayalam=Lohit Malayalam
|
||||
dialoginput.bolditalic.oriya=Lohit Oriya
|
||||
dialoginput.bolditalic.punjabi=Lohit Punjabi
|
||||
dialoginput.bolditalic.tamil=Lohit Tamil
|
||||
dialoginput.bolditalic.telugu=Lohit Telugu
|
||||
dialoginput.bolditalic.sinhala=LKLUG
|
||||
|
||||
# Search Sequences
|
||||
|
||||
sequence.allfonts=latin-1
|
||||
sequence.allfonts.Big5=chinese-big5,latin-1
|
||||
sequence.allfonts.x-euc-jp-linux=japanese-x0208,latin-1
|
||||
sequence.allfonts.EUC-KR=korean,latin-1
|
||||
sequence.allfonts.GB18030=chinese-gb18030,latin-1
|
||||
sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala
|
||||
|
||||
# Font File Names
|
||||
|
||||
# media-fonts/dejavu
|
||||
filename.DejaVu_Sans=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSans.ttf
|
||||
filename.DejaVu_Sans_Bold=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf
|
||||
filename.DejaVu_Sans_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSans-Oblique.ttf
|
||||
filename.DejaVu_Sans_Bold_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf
|
||||
|
||||
filename.DejaVu_Sans_Mono=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSansMono.ttf
|
||||
filename.DejaVu_Sans_Mono_Bold=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf
|
||||
filename.DejaVu_Sans_Mono_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSansMono-Oblique.ttf
|
||||
filename.DejaVu_Sans_Mono_Bold_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf
|
||||
|
||||
filename.DejaVu_Serif=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSerif.ttf
|
||||
filename.DejaVu_Serif_Bold=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf
|
||||
filename.DejaVu_Serif_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf
|
||||
filename.DejaVu_Serif_Bold_Oblique=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf
|
||||
|
||||
# media-fonts/sazanami
|
||||
filename.Sazanami_Gothic=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/sazanami/sazanami-gothic.ttf
|
||||
filename.Sazanami_Mincho=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/sazanami/sazanami-mincho.ttf
|
||||
|
||||
# media-fonts/arphicfonts
|
||||
filename.AR_PL_ShanHeiSun_Uni=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/uming.ttc
|
||||
filename.AR_PL_ZenKai_Uni=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/ukai.ttc
|
||||
|
||||
# media-fonts/baekmuk-fonts
|
||||
filename.Baekmuk_Gulim=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/gulim.ttf
|
||||
filename.Baekmuk_Batang=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/batang.ttf
|
||||
|
||||
# media-fonts/lohit-fonts
|
||||
filename.Lohit_Bengali=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_bn.ttf
|
||||
filename.Lohit_Gujarati=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_gu.ttf
|
||||
filename.Lohit_Hindi=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_hi.ttf
|
||||
filename.Lohit_Kannda=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_kn.ttf
|
||||
filename.Lohit_Malayalam=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_ml.ttf
|
||||
filename.Lohit_Oriya=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_or.ttf
|
||||
filename.Lohit_Punjabi=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_pa.ttf
|
||||
filename.Lohit_Tamil=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_ta.ttf
|
||||
filename.Lohit_Telugu=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/indic/lohit_te.ttf
|
||||
|
||||
# media-fonts/lklug
|
||||
filename.LKLUG=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/lklug/lklug.ttf
|
||||
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/files/icedtea-bin-6.env,v 1.2 2011/11/28 14:01:54 sera Exp $
|
||||
|
||||
VERSION="IcedTea JDK @PV@"
|
||||
JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@"
|
||||
JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@"
|
||||
JAVAC="${JAVA_HOME}/bin/javac"
|
||||
PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
|
||||
ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
|
||||
LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
|
||||
MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@/man"
|
||||
PROVIDES_TYPE="JDK JRE"
|
||||
PROVIDES_VERSION="1.6"
|
||||
# Taken from sun.boot.class.path property
|
||||
BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
|
||||
GENERATION="2"
|
||||
ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
|
||||
|
|
@ -1,149 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r3.ebuild,v 1.1 2014/06/27 14:34:25 caster Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit java-vm-2 multilib prefix
|
||||
|
||||
dist="http://dev.gentoo.org/~caster/distfiles/"
|
||||
TARBALL_VERSION="${PV}"
|
||||
|
||||
DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
|
||||
HOMEPAGE="http://icedtea.classpath.org"
|
||||
SRC_URI="
|
||||
amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
|
||||
x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
|
||||
doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
|
||||
examples? (
|
||||
amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
|
||||
x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
|
||||
)
|
||||
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
|
||||
|
||||
LICENSE="GPL-2-with-linking-exception"
|
||||
SLOT="6"
|
||||
KEYWORDS="-* ~amd64 ~x86"
|
||||
|
||||
IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source webstart"
|
||||
REQUIRED_USE="nsplugin? ( X )"
|
||||
RESTRICT="strip"
|
||||
|
||||
# 423161
|
||||
QA_PREBUILT="opt/.*"
|
||||
|
||||
ALSA_COMMON_DEP="
|
||||
>=media-libs/alsa-lib-1.0.20"
|
||||
CUPS_COMMON_DEP="
|
||||
>=net-print/cups-1.4"
|
||||
X_COMMON_DEP="
|
||||
>=dev-libs/glib-2.32:2
|
||||
>=media-libs/freetype-2.4.9:2
|
||||
>=x11-libs/gtk+-2.24:2
|
||||
>=x11-libs/libX11-1.4
|
||||
>=x11-libs/libXext-1.3
|
||||
>=x11-libs/libXi-1.6
|
||||
>=x11-libs/libXtst-1.2"
|
||||
|
||||
COMMON_DEP="
|
||||
>=media-libs/giflib-4.1.6-r1
|
||||
>=media-libs/libpng-1.6:0=
|
||||
>=sys-devel/gcc-4.5.4
|
||||
>=sys-libs/glibc-2.15
|
||||
>=sys-libs/zlib-1.2.3-r1
|
||||
|| ( virtual/jpeg:62 media-libs/jpeg:62 )
|
||||
selinux? ( sec-policy/selinux-java )"
|
||||
|
||||
RDEPEND="${COMMON_DEP}
|
||||
X? (
|
||||
${X_COMMON_DEP}
|
||||
media-fonts/dejavu
|
||||
cjk? (
|
||||
media-fonts/arphicfonts
|
||||
media-fonts/baekmuk-fonts
|
||||
media-fonts/lklug
|
||||
media-fonts/lohit-fonts
|
||||
media-fonts/sazanami
|
||||
)
|
||||
)
|
||||
alsa? ( ${ALSA_COMMON_DEP} )
|
||||
cups? ( ${CUPS_COMMON_DEP} )"
|
||||
|
||||
PDEPEND="webstart? ( dev-java/icedtea-web:0 )
|
||||
nsplugin? ( dev-java/icedtea-web:0[icedtea7] )"
|
||||
|
||||
src_install() {
|
||||
local dest="/opt/${P}"
|
||||
local ddest="${ED}/${dest}"
|
||||
dodir "${dest}"
|
||||
|
||||
# Ensures HeadlessGraphicsEnvironment is used.
|
||||
if ! use X; then
|
||||
rm -r jre/lib/$(get_system_arch)/xawt || die
|
||||
fi
|
||||
|
||||
# doins can't handle symlinks.
|
||||
cp -pRP bin include jre lib man "${ddest}" || die
|
||||
|
||||
# Remove on next bump as the needed marks are already set by icedtea ebuild.
|
||||
java-vm_set-pax-markings "${ddest}"
|
||||
|
||||
dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
|
||||
|
||||
if use doc; then
|
||||
dohtml -r ../doc/html/*
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
cp -pRP share/{demo,sample} "${ddest}" || die
|
||||
fi
|
||||
|
||||
if use source; then
|
||||
cp src.zip "${ddest}" || die
|
||||
fi
|
||||
|
||||
# Remove after next bump, handled by icedtea ebuild. Bug 390663
|
||||
cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
|
||||
eprefixify "${T}"/fontconfig.Gentoo.properties
|
||||
insinto "${dest}"/jre/lib
|
||||
doins "${T}"/fontconfig.Gentoo.properties
|
||||
|
||||
if use webstart || use nsplugin; then
|
||||
dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/itweb-settings ${dest}/bin/itweb-settings
|
||||
dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/itweb-settings ${dest}/jre/bin/itweb-settings
|
||||
fi
|
||||
if use webstart; then
|
||||
dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/javaws ${dest}/bin/javaws
|
||||
dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/javaws ${dest}/jre/bin/javaws
|
||||
fi
|
||||
|
||||
set_java_env
|
||||
java-vm_revdep-mask "${dest}"
|
||||
java-vm_sandbox-predict /proc/self/coredump_filter
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
|
||||
# portage would preserve the symlink otherwise, related to bug #384397
|
||||
rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
|
||||
elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
|
||||
elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
|
||||
elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
|
||||
elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
|
||||
elog "and the same holds for any user VM settings. Sorry for the inconvenience."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use nsplugin; then
|
||||
if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 6.1.13.3-r1 ${REPLACING_VERSIONS} ]]; then
|
||||
elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
|
||||
elog "If you had icedtea-bin-6 nsplugin selected, you may see a related error below"
|
||||
elog "The switch should complete properly during the subsequent installation of icedtea-web"
|
||||
elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Set as default VM if none exists
|
||||
java-vm-2_pkg_postinst
|
||||
}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
DIST php-5.5.10.tar.bz2 13102742 SHA256 bb34e61f8e6f56c612867bfe85d144d5045cd5e44497539bc126a4e8c6795419 SHA512 75d4a5b72c6a467030fe670af9ce162916c3bbd527499c8af08de38fde5d8ea6132de3a4f4ff685e8e0bd38b74acc763efe5accb0a7af222d1e33a46974866a6 WHIRLPOOL 26a44a881bcb3887383e7006eaf41c9364e23ae4727a7ad764dd3ca765d5bcb286c61831dfd7c62ab01250844401cc078bb1270183bf6da9f74178b5c55cad64
|
||||
DIST php-5.5.11.tar.bz2 13207627 SHA256 60e14c255f2a461a7a26639b84a2fc448cc2f91c8dead0e9fd00cd8ba27a2e96 SHA512 4fd93b22bb3bdaa1b5f5d53fab33896720434cc15e786109dc5a7503da9409efeb810f63e89a21049b28df938b7592d57bdaae603ce5509fdd963f513781a35d WHIRLPOOL d4d8381f3443e55971ed16647370fa9b14ad6a0715579fcc627a43de85097ed3c4af0cfa7fb1b4d9324eb941f270962759b8e4b3c4f7abfe5819b9023e879c21
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
MANPATH="/usr/lib/php5/man/"
|
||||
CONFIG_PROTECT_MASK="/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache2-php5/ext-active/"
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
<IfDefine PHP5>
|
||||
# Load the module first
|
||||
<IfModule !mod_php5.c>
|
||||
LoadModule php5_module modules/libphp5.so
|
||||
</IfModule>
|
||||
|
||||
# Set it to handle the files
|
||||
<IfModule mod_mime.c>
|
||||
AddHandler application/x-httpd-php .php .php5 .phtml
|
||||
AddHandler application/x-httpd-php-source .phps
|
||||
</IfModule>
|
||||
|
||||
DirectoryIndex index.php index.phtml
|
||||
</IfDefine>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- ext/gd/gd.c 2014-03-05 14:18:00.000000000 +0400
|
||||
+++ ext/gd/gd.c 2014-04-04 18:19:26.244605684 +0400
|
||||
@@ -4879,7 +4879,7 @@
|
||||
if (zend_hash_index_find(Z_ARRVAL_PP(var), (j), (void **) &var2) == SUCCESS) {
|
||||
if (Z_TYPE_PP(var2) != IS_DOUBLE) {
|
||||
zval dval;
|
||||
- dval = **var;
|
||||
+ dval = **var2;
|
||||
zval_copy_ctor(&dval);
|
||||
convert_to_double(&dval);
|
||||
matrix[i][j] = (float)Z_DVAL(dval);
|
||||
|
|
@ -1,311 +0,0 @@
|
|||
;;;;;;;;;;;;;;;;;;;;;
|
||||
; FPM Configuration ;
|
||||
;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
; All relative paths in this configuration file are relative to PHP's install
|
||||
; prefix (/usr/lib/php5.3). This prefix can be dynamicaly changed by using the
|
||||
; '-p' argument from the command line.
|
||||
|
||||
; Include one or more files. If glob(3) exists, it is used to include a bunch of
|
||||
; files from a glob(3) pattern. This directive can be used everywhere in the
|
||||
; file.
|
||||
; Relative path can also be used. They will be prefixed by:
|
||||
; - the global prefix if it's been set (-p arguement)
|
||||
; - /usr/lib/php5.3 otherwise
|
||||
;include=/etc/php/fpm-php5.3/fpm.d/*.conf
|
||||
|
||||
;;;;;;;;;;;;;;;;;;
|
||||
; Global Options ;
|
||||
;;;;;;;;;;;;;;;;;;
|
||||
|
||||
[global]
|
||||
; Pid file
|
||||
; Note: the default prefix is /var/lib
|
||||
; Default Value: none
|
||||
; Warning: pid file is overriden by the Gentoo init script.
|
||||
; FPM will refuse to start if you uncomment this settingi and make use of the
|
||||
; init script.
|
||||
; pid = /var/run/php-fpm.pid
|
||||
|
||||
; Error log file
|
||||
; Note: the default prefix is /var/lib
|
||||
; Default Value: log/php-fpm.log
|
||||
error_log = /var/log/php-fpm.log
|
||||
|
||||
; Log level
|
||||
; Possible Values: alert, error, warning, notice, debug
|
||||
; Default Value: notice
|
||||
;log_level = notice
|
||||
|
||||
; If this number of child processes exit with SIGSEGV or SIGBUS within the time
|
||||
; interval set by emergency_restart_interval then FPM will restart. A value
|
||||
; of '0' means 'Off'.
|
||||
; Default Value: 0
|
||||
;emergency_restart_threshold = 0
|
||||
|
||||
; Interval of time used by emergency_restart_interval to determine when
|
||||
; a graceful restart will be initiated. This can be useful to work around
|
||||
; accidental corruptions in an accelerator's shared memory.
|
||||
; Available Units: s(econds), m(inutes), h(ours), or d(ays)
|
||||
; Default Unit: seconds
|
||||
; Default Value: 0
|
||||
;emergency_restart_interval = 0
|
||||
|
||||
; Time limit for child processes to wait for a reaction on signals from master.
|
||||
; Available units: s(econds), m(inutes), h(ours), or d(ays)
|
||||
; Default Unit: seconds
|
||||
; Default Value: 0
|
||||
;process_control_timeout = 0
|
||||
|
||||
; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
|
||||
; Default Value: yes
|
||||
;daemonize = yes
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;
|
||||
; Pool Definitions ;
|
||||
;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
; Multiple pools of child processes may be started with different listening
|
||||
; ports and different management options. The name of the pool will be
|
||||
; used in logs and stats. There is no limitation on the number of pools which
|
||||
; FPM can handle. Your system will tell you anyway :)
|
||||
|
||||
; Start a new pool named 'www'.
|
||||
; the variable $pool can we used in any directive and will be replaced by the
|
||||
; pool name ('www' here)
|
||||
[www]
|
||||
|
||||
; Per pool prefix
|
||||
; It only applies on the following directives:
|
||||
; - 'slowlog'
|
||||
; - 'listen' (unixsocket)
|
||||
; - 'chroot'
|
||||
; - 'chdir'
|
||||
; - 'php_values'
|
||||
; - 'php_admin_values'
|
||||
; When not set, the global prefix (or /usr/lib/php5.3) applies instead.
|
||||
; Note: This directive can also be relative to the global prefix.
|
||||
; Default Value: none
|
||||
;prefix = /path/to/pools/$pool
|
||||
|
||||
; The address on which to accept FastCGI requests.
|
||||
; Valid syntaxes are:
|
||||
; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on
|
||||
; a specific port;
|
||||
; 'port' - to listen on a TCP socket to all addresses on a
|
||||
; specific port;
|
||||
; '/path/to/unix/socket' - to listen on a unix socket.
|
||||
; Note: This value is mandatory.
|
||||
listen = 127.0.0.1:9000
|
||||
|
||||
; Set listen(2) backlog. A value of '-1' means unlimited.
|
||||
; Default Value: 128 (-1 on FreeBSD and OpenBSD)
|
||||
;listen.backlog = -1
|
||||
|
||||
; List of ipv4 addresses of FastCGI clients which are allowed to connect.
|
||||
; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
|
||||
; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
|
||||
; must be separated by a comma. If this value is left blank, connections will be
|
||||
; accepted from any ip address.
|
||||
; Default Value: any
|
||||
;listen.allowed_clients = 127.0.0.1
|
||||
|
||||
; Set permissions for unix socket, if one is used. In Linux, read/write
|
||||
; permissions must be set in order to allow connections from a web server. Many
|
||||
; BSD-derived systems allow connections regardless of permissions.
|
||||
; Default Values: user and group are set as the running user
|
||||
; mode is set to 0666
|
||||
;listen.owner = nobody
|
||||
;listen.group = nobody
|
||||
;listen.mode = 0666
|
||||
|
||||
; Unix user/group of processes
|
||||
; Note: The user is mandatory. If the group is not set, the default user's group
|
||||
; will be used.
|
||||
user = nobody
|
||||
group = nobody
|
||||
|
||||
; Choose how the process manager will control the number of child processes.
|
||||
; Possible Values:
|
||||
; static - a fixed number (pm.max_children) of child processes;
|
||||
; dynamic - the number of child processes are set dynamically based on the
|
||||
; following directives:
|
||||
; pm.max_children - the maximum number of children that can
|
||||
; be alive at the same time.
|
||||
; pm.start_servers - the number of children created on startup.
|
||||
; pm.min_spare_servers - the minimum number of children in 'idle'
|
||||
; state (waiting to process). If the number
|
||||
; of 'idle' processes is less than this
|
||||
; number then some children will be created.
|
||||
; pm.max_spare_servers - the maximum number of children in 'idle'
|
||||
; state (waiting to process). If the number
|
||||
; of 'idle' processes is greater than this
|
||||
; number then some children will be killed.
|
||||
; Note: This value is mandatory.
|
||||
pm = dynamic
|
||||
|
||||
; The number of child processes to be created when pm is set to 'static' and the
|
||||
; maximum number of child processes to be created when pm is set to 'dynamic'.
|
||||
; This value sets the limit on the number of simultaneous requests that will be
|
||||
; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
|
||||
; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
|
||||
; CGI.
|
||||
; Note: Used when pm is set to either 'static' or 'dynamic'
|
||||
; Note: This value is mandatory.
|
||||
pm.max_children = 50
|
||||
|
||||
; The number of child processes created on startup.
|
||||
; Note: Used only when pm is set to 'dynamic'
|
||||
; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
|
||||
;pm.start_servers = 20
|
||||
|
||||
; The desired minimum number of idle server processes.
|
||||
; Note: Used only when pm is set to 'dynamic'
|
||||
; Note: Mandatory when pm is set to 'dynamic'
|
||||
pm.min_spare_servers = 5
|
||||
|
||||
; The desired maximum number of idle server processes.
|
||||
; Note: Used only when pm is set to 'dynamic'
|
||||
; Note: Mandatory when pm is set to 'dynamic'
|
||||
pm.max_spare_servers = 35
|
||||
|
||||
; The number of requests each child process should execute before respawning.
|
||||
; This can be useful to work around memory leaks in 3rd party libraries. For
|
||||
; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
|
||||
; Default Value: 0
|
||||
;pm.max_requests = 500
|
||||
|
||||
; The URI to view the FPM status page. If this value is not set, no URI will be
|
||||
; recognized as a status page. By default, the status page shows the following
|
||||
; information:
|
||||
; accepted conn - the number of request accepted by the pool;
|
||||
; pool - the name of the pool;
|
||||
; process manager - static or dynamic;
|
||||
; idle processes - the number of idle processes;
|
||||
; active processes - the number of active processes;
|
||||
; total processes - the number of idle + active processes.
|
||||
; max children reached - number of times, the process limit has been reached,
|
||||
; when pm tries to start more children (works only for
|
||||
; pm 'dynamic')
|
||||
; The values of 'idle processes', 'active processes' and 'total processes' are
|
||||
; updated each second. The value of 'accepted conn' is updated in real time.
|
||||
; Example output:
|
||||
; accepted conn: 12073
|
||||
; pool: www
|
||||
; process manager: static
|
||||
; idle processes: 35
|
||||
; active processes: 65
|
||||
; total processes: 100
|
||||
; max children reached: 1
|
||||
; By default the status page output is formatted as text/plain. Passing either
|
||||
; 'html' or 'json' as a query string will return the corresponding output
|
||||
; syntax. Example:
|
||||
; http://www.foo.bar/status
|
||||
; http://www.foo.bar/status?json
|
||||
; http://www.foo.bar/status?html
|
||||
; Note: The value must start with a leading slash (/). The value can be
|
||||
; anything, but it may not be a good idea to use the .php extension or it
|
||||
; may conflict with a real PHP file.
|
||||
; Default Value: not set
|
||||
;pm.status_path = /status
|
||||
|
||||
; The ping URI to call the monitoring page of FPM. If this value is not set, no
|
||||
; URI will be recognized as a ping page. This could be used to test from outside
|
||||
; that FPM is alive and responding, or to
|
||||
; - create a graph of FPM availability (rrd or such);
|
||||
; - remove a server from a group if it is not responding (load balancing);
|
||||
; - trigger alerts for the operating team (24/7).
|
||||
; Note: The value must start with a leading slash (/). The value can be
|
||||
; anything, but it may not be a good idea to use the .php extension or it
|
||||
; may conflict with a real PHP file.
|
||||
; Default Value: not set
|
||||
;ping.path = /ping
|
||||
|
||||
; This directive may be used to customize the response of a ping request. The
|
||||
; response is formatted as text/plain with a 200 response code.
|
||||
; Default Value: pong
|
||||
;ping.response = pong
|
||||
|
||||
; The timeout for serving a single request after which the worker process will
|
||||
; be killed. This option should be used when the 'max_execution_time' ini option
|
||||
; does not stop script execution for some reason. A value of '0' means 'off'.
|
||||
; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
|
||||
; Default Value: 0
|
||||
;request_terminate_timeout = 0
|
||||
|
||||
; The timeout for serving a single request after which a PHP backtrace will be
|
||||
; dumped to the 'slowlog' file. A value of '0s' means 'off'.
|
||||
; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
|
||||
; Default Value: 0
|
||||
;request_slowlog_timeout = 0
|
||||
|
||||
; The log file for slow requests
|
||||
; Default Value: not set
|
||||
; Note: slowlog is mandatory if request_slowlog_timeout is set
|
||||
;slowlog = /var/log/php-fpm-$pool.log.slow
|
||||
|
||||
; Set open file descriptor rlimit.
|
||||
; Default Value: system defined value
|
||||
;rlimit_files = 1024
|
||||
|
||||
; Set max core size rlimit.
|
||||
; Possible Values: 'unlimited' or an integer greater or equal to 0
|
||||
; Default Value: system defined value
|
||||
;rlimit_core = 0
|
||||
|
||||
; Chroot to this directory at the start. This value must be defined as an
|
||||
; absolute path. When this value is not set, chroot is not used.
|
||||
; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
|
||||
; of its subdirectories. If the pool prefix is not set, the global prefix
|
||||
; will be used instead.
|
||||
; Note: chrooting is a great security feature and should be used whenever
|
||||
; possible. However, all PHP paths will be relative to the chroot
|
||||
; (error_log, sessions.save_path, ...).
|
||||
; Default Value: not set
|
||||
;chroot =
|
||||
|
||||
; Chdir to this directory at the start.
|
||||
; Note: relative path can be used.
|
||||
; Default Value: current directory or / when chroot
|
||||
;chdir = /var/www
|
||||
|
||||
; Redirect worker stdout and stderr into main error log. If not set, stdout and
|
||||
; stderr will be redirected to /dev/null according to FastCGI specs.
|
||||
; Note: on highloaded environement, this can cause some delay in the page
|
||||
; process time (several ms).
|
||||
; Default Value: no
|
||||
;catch_workers_output = yes
|
||||
|
||||
; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
|
||||
; the current environment.
|
||||
; Default Value: clean env
|
||||
;env[HOSTNAME] = $HOSTNAME
|
||||
;env[PATH] = /usr/local/bin:/usr/bin:/bin
|
||||
;env[TMP] = /tmp
|
||||
;env[TMPDIR] = /tmp
|
||||
;env[TEMP] = /tmp
|
||||
|
||||
; Additional php.ini defines, specific to this pool of workers. These settings
|
||||
; overwrite the values previously defined in the php.ini. The directives are the
|
||||
; same as the PHP SAPI:
|
||||
; php_value/php_flag - you can set classic ini defines which can
|
||||
; be overwritten from PHP call 'ini_set'.
|
||||
; php_admin_value/php_admin_flag - these directives won't be overwritten by
|
||||
; PHP call 'ini_set'
|
||||
; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
|
||||
|
||||
; Defining 'extension' will load the corresponding shared extension from
|
||||
; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
|
||||
; overwrite previously defined php.ini values, but will append the new value
|
||||
; instead.
|
||||
|
||||
; Note: path INI options can be relative and will be expanded with the prefix
|
||||
; (pool, global or /usr/lib/php5.3)
|
||||
|
||||
; Default Value: nothing is defined by default except the values in php.ini and
|
||||
; specified at startup with the -d argument
|
||||
;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
|
||||
;php_flag[display_errors] = off
|
||||
;php_admin_value[error_log] = /var/log/fpm-php.www.log
|
||||
;php_admin_flag[log_errors] = on
|
||||
;php_admin_value[memory_limit] = 32M
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
#!/sbin/runscript
|
||||
|
||||
set_phpvars() {
|
||||
PHPSLOT=${SVCNAME#php-fpm-}
|
||||
[ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)"
|
||||
|
||||
PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
|
||||
PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid"
|
||||
}
|
||||
|
||||
extra_commands="depend"
|
||||
extra_started_commands="reload"
|
||||
|
||||
depend() {
|
||||
need net
|
||||
use apache2 lighttpd nginx
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting PHP FastCGI Process Manager"
|
||||
set_phpvars
|
||||
start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \
|
||||
/usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}"
|
||||
local i=0
|
||||
local timeout=5
|
||||
while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do
|
||||
sleep 1
|
||||
i=$(($i + 1))
|
||||
done
|
||||
|
||||
[ $timeout -gt $i ]
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping PHP FastCGI Process Manager"
|
||||
set_phpvars
|
||||
start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID}
|
||||
eend $?
|
||||
}
|
||||
|
||||
reload() {
|
||||
ebegin "Reloading PHP FastCGI Process Manager"
|
||||
set_phpvars
|
||||
[ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID})
|
||||
eend $?
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
[Unit]
|
||||
Description=The PHP FastCGI Process Manager
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
PIDFile=/run/php-fpm/php-fpm-%I.pid
|
||||
ExecStart=/usr/libexec/php-fpm-launcher php%I -y /etc/php/fpm-php%I/php-fpm.conf --nodaemonize
|
||||
ExecReload=/bin/kill -USR2 $MAINPID
|
||||
PrivateTmp=true
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
[Unit]
|
||||
Description=The PHP FastCGI Process Manager
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
PIDFile=/run/php-fpm/php-fpm-%I.pid
|
||||
ExecStart=/usr/libexec/php-fpm-launcher php%I -y /etc/php/fpm-php%I/php-fpm.conf --nodaemonize
|
||||
ExecReload=/bin/kill -USR2 $MAINPID
|
||||
PrivateTmp=true
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
PHP_5 { global: *; };
|
||||
|
|
@ -1,783 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.10.ebuild,v 1.10 2014/03/24 14:34:22 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
|
||||
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
|
||||
function php_get_uri ()
|
||||
{
|
||||
case "${1}" in
|
||||
"php-pre")
|
||||
echo "http://downloads.php.net/dsp/${2}"
|
||||
;;
|
||||
"php")
|
||||
echo "http://www.php.net/distributions/${2}"
|
||||
;;
|
||||
"olemarkus")
|
||||
echo "http://dev.gentoo.org/~olemarkus/php/${2}"
|
||||
;;
|
||||
"gentoo")
|
||||
echo "mirror://gentoo/${2}"
|
||||
;;
|
||||
*)
|
||||
die "unhandled case in php_get_uri"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
PHP_MV="$(get_major_version)"
|
||||
SLOT="$(get_version_component_range 1-2)"
|
||||
|
||||
# alias, so we can handle different types of releases (finals, rcs, alphas,
|
||||
# betas, ...) w/o changing the whole ebuild
|
||||
PHP_PV="${PV/_rc/RC}"
|
||||
PHP_PV="${PHP_PV/_alpha/alpha}"
|
||||
PHP_PV="${PHP_PV/_beta/beta}"
|
||||
PHP_RELEASE="php"
|
||||
[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
|
||||
[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
|
||||
[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
|
||||
PHP_P="${PN}-${PHP_PV}"
|
||||
|
||||
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
|
||||
|
||||
PHP_FPM_CONF_VER="1"
|
||||
|
||||
SRC_URI="${PHP_SRC_URI}"
|
||||
|
||||
DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
|
||||
HOMEPAGE="http://php.net/"
|
||||
LICENSE="PHP-3"
|
||||
|
||||
S="${WORKDIR}/${PHP_P}"
|
||||
|
||||
# We can build the following SAPIs in the given order
|
||||
SAPIS="embed cli cgi fpm apache2"
|
||||
|
||||
# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
|
||||
IUSE="${IUSE}
|
||||
${SAPIS/cli/+cli}
|
||||
threads"
|
||||
|
||||
IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
|
||||
crypt +ctype curl debug
|
||||
enchant exif frontbase +fileinfo +filter firebird
|
||||
flatfile ftp gd gdbm gmp +hash +iconv imap inifile
|
||||
intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
|
||||
mssql mysql libmysqlclient mysqli nls
|
||||
oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
|
||||
readline recode selinux +session sharedmem
|
||||
+simplexml snmp soap sockets spell sqlite ssl
|
||||
sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx
|
||||
+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
|
||||
|
||||
DEPEND="
|
||||
>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?]
|
||||
>=dev-libs/libpcre-8.32[unicode]
|
||||
apache2? ( www-servers/apache[threads=] )
|
||||
berkdb? ( =sys-libs/db-4* )
|
||||
bzip2? ( app-arch/bzip2 )
|
||||
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
|
||||
cjk? ( !gd? (
|
||||
virtual/jpeg:0
|
||||
media-libs/libpng:0=
|
||||
sys-libs/zlib
|
||||
) )
|
||||
crypt? ( >=dev-libs/libmcrypt-2.4 )
|
||||
curl? ( >=net-misc/curl-7.10.5 )
|
||||
enchant? ( app-text/enchant )
|
||||
exif? ( !gd? (
|
||||
virtual/jpeg:0
|
||||
media-libs/libpng:0=
|
||||
sys-libs/zlib
|
||||
) )
|
||||
firebird? ( dev-db/firebird )
|
||||
gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
|
||||
gdbm? ( >=sys-libs/gdbm-1.8.0 )
|
||||
gmp? ( >=dev-libs/gmp-4.1.2 )
|
||||
iconv? ( virtual/libiconv )
|
||||
imap? ( virtual/imap-c-client[ssl=] )
|
||||
intl? ( dev-libs/icu:= )
|
||||
iodbc? ( dev-db/libiodbc )
|
||||
kerberos? ( virtual/krb5 )
|
||||
ldap? ( >=net-nds/openldap-1.2.11 )
|
||||
ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
|
||||
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
|
||||
mssql? ( dev-db/freetds[mssql] )
|
||||
libmysqlclient? (
|
||||
mysql? ( virtual/mysql )
|
||||
mysqli? ( >=virtual/mysql-4.1 )
|
||||
)
|
||||
nls? ( sys-devel/gettext )
|
||||
oci8-instant-client? ( dev-db/oracle-instantclient-basic )
|
||||
odbc? ( >=dev-db/unixODBC-1.8.13 )
|
||||
postgres? ( dev-db/postgresql-base )
|
||||
qdbm? ( dev-db/qdbm )
|
||||
readline? ( sys-libs/readline )
|
||||
recode? ( app-text/recode )
|
||||
sharedmem? ( dev-libs/mm )
|
||||
simplexml? ( >=dev-libs/libxml2-2.6.8 )
|
||||
snmp? ( >=net-analyzer/net-snmp-5.2 )
|
||||
soap? ( >=dev-libs/libxml2-2.6.8 )
|
||||
spell? ( >=app-text/aspell-0.50 )
|
||||
sqlite? ( >=dev-db/sqlite-3.7.6.3 )
|
||||
ssl? ( >=dev-libs/openssl-0.9.7 )
|
||||
sybase-ct? ( dev-db/freetds )
|
||||
tidy? ( app-text/htmltidy )
|
||||
truetype? (
|
||||
=media-libs/freetype-2*
|
||||
>=media-libs/t1lib-5.0.0
|
||||
!gd? (
|
||||
virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
|
||||
)
|
||||
unicode? ( dev-libs/oniguruma )
|
||||
wddx? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xml? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
|
||||
xmlreader? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xpm? (
|
||||
x11-libs/libXpm
|
||||
virtual/jpeg:0
|
||||
media-libs/libpng:0= sys-libs/zlib
|
||||
)
|
||||
xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
|
||||
zip? ( sys-libs/zlib )
|
||||
zlib? ( sys-libs/zlib )
|
||||
virtual/mta
|
||||
"
|
||||
|
||||
php="=${CATEGORY}/${PF}"
|
||||
|
||||
REQUIRED_USE="
|
||||
truetype? ( gd )
|
||||
cjk? ( gd )
|
||||
exif? ( gd )
|
||||
|
||||
xpm? ( gd )
|
||||
gd? ( zlib )
|
||||
simplexml? ( xml )
|
||||
soap? ( xml )
|
||||
wddx? ( xml )
|
||||
xmlrpc? ( || ( xml iconv ) )
|
||||
xmlreader? ( xml )
|
||||
xslt? ( xml )
|
||||
ldap-sasl? ( ldap )
|
||||
mhash? ( hash )
|
||||
phar? ( hash )
|
||||
libmysqlclient? ( || (
|
||||
mysql
|
||||
mysqli
|
||||
pdo
|
||||
) )
|
||||
|
||||
qdbm? ( !gdbm )
|
||||
readline? ( !libedit )
|
||||
recode? ( !imap !mysql !mysqli )
|
||||
sharedmem? ( !threads )
|
||||
|
||||
!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
fpm? (
|
||||
selinux? ( sec-policy/selinux-phpfpm )
|
||||
systemd? ( sys-apps/systemd ) )"
|
||||
|
||||
DEPEND="${DEPEND}
|
||||
sys-devel/flex
|
||||
>=sys-devel/m4-1.4.3
|
||||
>=sys-devel/libtool-1.5.18"
|
||||
|
||||
# Allow users to install production version if they want to
|
||||
|
||||
case "${PHP_INI_VERSION}" in
|
||||
production|development)
|
||||
;;
|
||||
*)
|
||||
PHP_INI_VERSION="development"
|
||||
;;
|
||||
esac
|
||||
|
||||
PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
|
||||
PHP_INI_FILE="php.ini"
|
||||
|
||||
want_apache
|
||||
|
||||
pkg_setup() {
|
||||
depend.apache_pkg_setup
|
||||
}
|
||||
|
||||
php_install_ini() {
|
||||
local phpsapi="${1}"
|
||||
|
||||
# work out where we are installing the ini file
|
||||
php_set_ini_dir "${phpsapi}"
|
||||
|
||||
local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
|
||||
cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
|
||||
|
||||
# default to /tmp for save_path, bug #282768
|
||||
sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
|
||||
|
||||
# Set the extension dir
|
||||
sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
|
||||
|
||||
# Set the include path to point to where we want to find PEAR packages
|
||||
sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
|
||||
|
||||
dodir "${PHP_INI_DIR#${EPREFIX}}"
|
||||
insinto "${PHP_INI_DIR#${EPREFIX}}"
|
||||
newins "${phpinisrc}" "${PHP_INI_FILE}"
|
||||
|
||||
elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
|
||||
elog
|
||||
|
||||
dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
|
||||
dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
|
||||
|
||||
if use_if_iuse opcache; then
|
||||
elog "Adding opcache to $PHP_EXT_INI_DIR"
|
||||
echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
|
||||
dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
|
||||
fi
|
||||
|
||||
# SAPI-specific handling
|
||||
|
||||
if [[ "${sapi}" == "fpm" ]] ; then
|
||||
[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
|
||||
einfo "Installing FPM CGI config file php-fpm.conf"
|
||||
insinto "${PHP_INI_DIR#${EPREFIX}}"
|
||||
newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
|
||||
|
||||
# Remove bogus /etc/php-fpm.conf.default (bug 359906)
|
||||
[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
|
||||
fi
|
||||
|
||||
# Install PHP ini files into /usr/share/php
|
||||
|
||||
dodoc php.ini-development
|
||||
dodoc php.ini-production
|
||||
|
||||
}
|
||||
|
||||
php_set_ini_dir() {
|
||||
PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
|
||||
PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
|
||||
PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
|
||||
# ([empty session.save_path]/session_mm_[sapi][gid].sem)
|
||||
# there is no easy way to circumvent that, all php calls during
|
||||
# install use -n, so no php.ini file will be used.
|
||||
# As such, this is the easiest way to get around
|
||||
addpredict /session_mm_cli250.sem
|
||||
addpredict /session_mm_cli0.sem
|
||||
|
||||
# Change PHP branding
|
||||
# Get the alpha/beta/rc version
|
||||
sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
|
||||
-i configure.in || die "Unable to change PHP branding"
|
||||
|
||||
# Patch PHP to show Gentoo as the server platform
|
||||
sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
|
||||
-i configure.in || die "Failed to fix server platform name"
|
||||
|
||||
# Prevent PHP from activating the Apache config,
|
||||
# as we will do that ourselves
|
||||
sed -i \
|
||||
-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
|
||||
-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
|
||||
configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
|
||||
|
||||
# Patch PHP to support heimdal instead of mit-krb5
|
||||
if has_version "app-crypt/heimdal" ; then
|
||||
sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
|
||||
|| die "Failed to fix heimdal libname"
|
||||
sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
|
||||
|| die "Failed to fix heimdal crypt library reference"
|
||||
fi
|
||||
|
||||
#Add user patches #357637
|
||||
epatch_user
|
||||
|
||||
# Fix overexposed images in GD
|
||||
epatch "${FILESDIR}"/fix_gd_overexposed.patch
|
||||
|
||||
#force rebuilding aclocal.m4
|
||||
rm aclocal.m4
|
||||
eautoreconf
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
# http://bugs.php.net/bug.php?id=48795, bug #343481
|
||||
sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
addpredict /usr/share/snmp/mibs/.index
|
||||
addpredict /var/lib/net-snmp/mib_indexes
|
||||
|
||||
PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
|
||||
|
||||
# This is a global variable and should be in caps. It isn't because the
|
||||
# phpconfutils eclass relies on exactly this name...
|
||||
# for --with-libdir see bug #327025
|
||||
my_conf="
|
||||
--prefix="${PHP_DESTDIR}"
|
||||
--mandir="${PHP_DESTDIR}"/man
|
||||
--infodir="${PHP_DESTDIR}"/info
|
||||
--libdir="${PHP_DESTDIR}"/lib
|
||||
--with-libdir=$(get_libdir)
|
||||
--without-pear
|
||||
$(use_enable threads maintainer-zts)"
|
||||
|
||||
# extension USE flag shared
|
||||
my_conf+="
|
||||
$(use_enable bcmath bcmath )
|
||||
$(use_with bzip2 bz2 "${EPREFIX}"/usr)
|
||||
$(use_enable calendar calendar )
|
||||
$(use_enable ctype ctype )
|
||||
$(use_with curl curl "${EPREFIX}"/usr)
|
||||
$(use_enable xml dom )
|
||||
$(use_with enchant enchant "${EPREFIX}"/usr)
|
||||
$(use_enable exif exif )
|
||||
$(use_enable fileinfo fileinfo )
|
||||
$(use_enable filter filter )
|
||||
$(use_enable ftp ftp )
|
||||
$(use_with nls gettext "${EPREFIX}"/usr)
|
||||
$(use_with gmp gmp "${EPREFIX}"/usr)
|
||||
$(use_enable hash hash )
|
||||
$(use_with mhash mhash "${EPREFIX}"/usr)
|
||||
$(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr))
|
||||
$(use_enable intl intl )
|
||||
$(use_enable ipv6 ipv6 )
|
||||
$(use_enable json json )
|
||||
$(use_with kerberos kerberos "${EPREFIX}"/usr)
|
||||
$(use_enable xml libxml )
|
||||
$(use_with xml libxml-dir "${EPREFIX}"/usr)
|
||||
$(use_enable unicode mbstring )
|
||||
$(use_with crypt mcrypt "${EPREFIX}"/usr)
|
||||
$(use_with mssql mssql "${EPREFIX}"/usr)
|
||||
$(use_with unicode onig "${EPREFIX}"/usr)
|
||||
$(use_with ssl openssl "${EPREFIX}"/usr)
|
||||
$(use_with ssl openssl-dir "${EPREFIX}"/usr)
|
||||
$(use_enable pcntl pcntl )
|
||||
$(use_enable phar phar )
|
||||
$(use_enable pdo pdo )
|
||||
$(use_enable opcache opcache )
|
||||
$(use_with postgres pgsql "${EPREFIX}"/usr)
|
||||
$(use_enable posix posix )
|
||||
$(use_with spell pspell "${EPREFIX}"/usr)
|
||||
$(use_with recode recode "${EPREFIX}"/usr)
|
||||
$(use_enable simplexml simplexml )
|
||||
$(use_enable sharedmem shmop )
|
||||
$(use_with snmp snmp "${EPREFIX}"/usr)
|
||||
$(use_enable soap soap )
|
||||
$(use_enable sockets sockets )
|
||||
$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
|
||||
$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
|
||||
$(use_enable sysvipc sysvmsg )
|
||||
$(use_enable sysvipc sysvsem )
|
||||
$(use_enable sysvipc sysvshm )
|
||||
$(use_with systemd fpm-systemd)
|
||||
$(use_with tidy tidy "${EPREFIX}"/usr)
|
||||
$(use_enable tokenizer tokenizer )
|
||||
$(use_enable wddx wddx )
|
||||
$(use_enable xml xml )
|
||||
$(use_enable xmlreader xmlreader )
|
||||
$(use_enable xmlwriter xmlwriter )
|
||||
$(use_with xmlrpc xmlrpc)
|
||||
$(use_with xslt xsl "${EPREFIX}"/usr)
|
||||
$(use_enable zip zip )
|
||||
$(use_with zlib zlib "${EPREFIX}"/usr)
|
||||
$(use_enable debug debug )"
|
||||
|
||||
# DBA support
|
||||
if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
|
||||
|| use qdbm ; then
|
||||
my_conf="${my_conf} --enable-dba${shared}"
|
||||
fi
|
||||
|
||||
# DBA drivers support
|
||||
my_conf+="
|
||||
$(use_with cdb cdb)
|
||||
$(use_with berkdb db4 ${EPREFIX}/usr)
|
||||
$(use_enable flatfile flatfile )
|
||||
$(use_with gdbm gdbm ${EPREFIX}/usr)
|
||||
$(use_enable inifile inifile )
|
||||
$(use_with qdbm qdbm ${EPREFIX}/usr)"
|
||||
|
||||
# Support for the GD graphics library
|
||||
my_conf+="
|
||||
$(use_with truetype freetype-dir ${EPREFIX}/usr)
|
||||
$(use_with truetype t1lib ${EPREFIX}/usr)
|
||||
$(use_enable cjk gd-jis-conv )
|
||||
$(use_with gd jpeg-dir ${EPREFIX}/usr)
|
||||
$(use_with gd png-dir ${EPREFIX}/usr)
|
||||
$(use_with xpm xpm-dir ${EPREFIX}/usr)"
|
||||
# enable gd last, so configure can pick up the previous settings
|
||||
my_conf+="
|
||||
$(use_with gd gd)"
|
||||
|
||||
# IMAP support
|
||||
if use imap ; then
|
||||
my_conf+="
|
||||
$(use_with imap imap ${EPREFIX}/usr)
|
||||
$(use_with ssl imap-ssl ${EPREFIX}/usr)"
|
||||
fi
|
||||
|
||||
# Interbase/firebird support
|
||||
|
||||
if use firebird ; then
|
||||
my_conf+="
|
||||
$(use_with firebird interbase ${EPREFIX}/usr)"
|
||||
fi
|
||||
|
||||
# LDAP support
|
||||
if use ldap ; then
|
||||
my_conf+="
|
||||
$(use_with ldap ldap ${EPREFIX}/usr)
|
||||
$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
|
||||
fi
|
||||
|
||||
# MySQL support
|
||||
local mysqllib="mysqlnd"
|
||||
local mysqlilib="mysqlnd"
|
||||
use libmysqlclient && mysqllib="${EPREFIX}/usr"
|
||||
use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
|
||||
|
||||
my_conf+=" $(use_with mysql mysql $mysqllib)"
|
||||
my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
|
||||
|
||||
local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
|
||||
if use mysql ; then
|
||||
my_conf+="${mysqlsock}"
|
||||
elif use mysqli ; then
|
||||
my_conf+="${mysqlsock}"
|
||||
fi
|
||||
|
||||
# ODBC support
|
||||
if use odbc ; then
|
||||
my_conf+="
|
||||
$(use_with odbc unixODBC ${EPREFIX}/usr)"
|
||||
fi
|
||||
|
||||
if use iodbc ; then
|
||||
my_conf+="
|
||||
$(use_with iodbc iodbc ${EPREFIX}/usr)"
|
||||
fi
|
||||
|
||||
# Oracle support
|
||||
if use oci8-instant-client ; then
|
||||
my_conf+="
|
||||
$(use_with oci8-instant-client oci8)"
|
||||
fi
|
||||
|
||||
# PDO support
|
||||
if use pdo ; then
|
||||
my_conf+="
|
||||
$(use_with mssql pdo-dblib )
|
||||
$(use_with mysql pdo-mysql ${mysqllib})
|
||||
$(use_with postgres pdo-pgsql )
|
||||
$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
|
||||
$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
|
||||
if use oci8-instant-client ; then
|
||||
my_conf+="
|
||||
$(use_with oci8-instant-client pdo-oci)"
|
||||
fi
|
||||
fi
|
||||
|
||||
# readline/libedit support
|
||||
my_conf+="
|
||||
$(use_with readline readline ${EPREFIX}/usr)
|
||||
$(use_with libedit libedit ${EPREFIX}/usr)"
|
||||
|
||||
# Session support
|
||||
if use session ; then
|
||||
my_conf+="
|
||||
$(use_with sharedmem mm ${EPREFIX}/usr)"
|
||||
else
|
||||
my_conf+="
|
||||
$(use_enable session session )"
|
||||
fi
|
||||
|
||||
# Use pic for shared modules such as apache2's mod_php
|
||||
my_conf="${my_conf} --with-pic"
|
||||
|
||||
# we use the system copy of pcre
|
||||
# --with-pcre-regex affects ext/pcre
|
||||
# --with-pcre-dir affects ext/filter and ext/zip
|
||||
my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
|
||||
|
||||
# Catch CFLAGS problems
|
||||
# Fixes bug #14067.
|
||||
# Changed order to run it in reverse for bug #32022 and #12021.
|
||||
replace-cpu-flags "k6*" "i586"
|
||||
|
||||
# Support user-passed configuration parameters
|
||||
my_conf="${my_conf} ${EXTRA_ECONF:-}"
|
||||
|
||||
# Support the Apache2 extras, they must be set globally for all
|
||||
# SAPIs to work correctly, especially for external PHP extensions
|
||||
|
||||
mkdir -p "${WORKDIR}/sapis-build"
|
||||
for one_sapi in $SAPIS ; do
|
||||
use "${one_sapi}" || continue
|
||||
php_set_ini_dir "${one_sapi}"
|
||||
|
||||
cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
|
||||
cd "${WORKDIR}/sapis-build/${one_sapi}"
|
||||
|
||||
sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
|
||||
--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
|
||||
|
||||
for sapi in $SAPIS ; do
|
||||
case "$sapi" in
|
||||
cli|cgi|embed|fpm)
|
||||
if [[ "${one_sapi}" == "${sapi}" ]] ; then
|
||||
sapi_conf="${sapi_conf} --enable-${sapi}"
|
||||
else
|
||||
sapi_conf="${sapi_conf} --disable-${sapi}"
|
||||
fi
|
||||
;;
|
||||
|
||||
apache2)
|
||||
if [[ "${one_sapi}" == "${sapi}" ]] ; then
|
||||
sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
|
||||
else
|
||||
sapi_conf="${sapi_conf} --without-apxs2"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
econf ${sapi_conf}
|
||||
done
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# snmp seems to run during src_compile, too (bug #324739)
|
||||
addpredict /usr/share/snmp/mibs/.index
|
||||
addpredict /var/lib/net-snmp/mib_indexes
|
||||
|
||||
for sapi in ${SAPIS} ; do
|
||||
if use "${sapi}"; then
|
||||
cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
|
||||
emake || die "emake failed"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# see bug #324739 for what happens when we don't have that
|
||||
addpredict /usr/share/snmp/mibs/.index
|
||||
|
||||
# grab the first SAPI that got built and install common files from there
|
||||
local first_sapi=""
|
||||
for sapi in $SAPIS ; do
|
||||
if use $sapi ; then
|
||||
first_sapi=$sapi
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
# Makefile forgets to create this before trying to write to it...
|
||||
dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
|
||||
|
||||
# Install php environment (without any sapis)
|
||||
cd "${WORKDIR}/sapis-build/$first_sapi"
|
||||
emake INSTALL_ROOT="${D}" \
|
||||
install-build install-headers install-programs \
|
||||
|| die "emake install failed"
|
||||
|
||||
local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
|
||||
|
||||
# Create the directory where we'll put version-specific php scripts
|
||||
keepdir /usr/share/php${PHP_MV}
|
||||
|
||||
local sapi="", file=""
|
||||
local sapi_list=""
|
||||
|
||||
for sapi in ${SAPIS}; do
|
||||
if use "${sapi}" ; then
|
||||
einfo "Installing SAPI: ${sapi}"
|
||||
cd "${WORKDIR}/sapis-build/${sapi}"
|
||||
|
||||
if [[ "${sapi}" == "apache2" ]] ; then
|
||||
# We're specifically not using emake install-sapi as libtool
|
||||
# may cause unnecessary relink failures (see bug #351266)
|
||||
insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
|
||||
newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
|
||||
keepdir "/usr/$(get_libdir)/apache2/modules"
|
||||
else
|
||||
# needed each time, php_install_ini would reset it
|
||||
local dest="${PHP_DESTDIR#${EPREFIX}}"
|
||||
into "${dest}"
|
||||
case "$sapi" in
|
||||
cli)
|
||||
source="sapi/cli/php"
|
||||
;;
|
||||
cgi)
|
||||
source="sapi/cgi/php-cgi"
|
||||
;;
|
||||
fpm)
|
||||
source="sapi/fpm/php-fpm"
|
||||
;;
|
||||
embed)
|
||||
source="libs/libphp${PHP_MV}$(get_libname)"
|
||||
;;
|
||||
*)
|
||||
die "unhandled sapi in src_install"
|
||||
;;
|
||||
esac
|
||||
|
||||
if [[ "${source}" == *"$(get_libname)" ]]; then
|
||||
dolib.so "${source}" || die "Unable to install ${sapi} sapi"
|
||||
else
|
||||
dobin "${source}" || die "Unable to install ${sapi} sapi"
|
||||
local name="$(basename ${source})"
|
||||
dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
|
||||
fi
|
||||
fi
|
||||
|
||||
php_install_ini "${sapi}"
|
||||
|
||||
# construct correct SAPI string for php-config
|
||||
# thanks to ferringb for the bash voodoo
|
||||
if [[ "${sapi}" == "apache2" ]]; then
|
||||
sapi_list="${sapi_list:+${sapi_list} }apache2handler"
|
||||
else
|
||||
sapi_list="${sapi_list:+${sapi_list} }${sapi}"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
# Installing opcache module
|
||||
if use_if_iuse opcache ; then
|
||||
dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
|
||||
fi
|
||||
|
||||
# Install env.d files
|
||||
newenvd "${FILESDIR}/20php5-envd" \
|
||||
"20php${SLOT}"
|
||||
sed -e "s|/lib/|/$(get_libdir)/|g" -i \
|
||||
"${ED}/etc/env.d/20php${SLOT}"
|
||||
sed -e "s|php5|php${SLOT}|g" -i \
|
||||
"${ED}/etc/env.d/20php${SLOT}"
|
||||
|
||||
# set php-config variable correctly (bug #278439)
|
||||
sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
|
||||
"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
|
||||
|
||||
if use fpm ; then
|
||||
if use systemd; then
|
||||
systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
|
||||
else
|
||||
systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
|
||||
PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
|
||||
if [[ ! -x "${PHP_BIN}" ]] ; then
|
||||
ewarn "Test phase requires USE=cli, skipping"
|
||||
return
|
||||
else
|
||||
export TEST_PHP_EXECUTABLE="${PHP_BIN}"
|
||||
fi
|
||||
|
||||
if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
|
||||
export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
|
||||
fi
|
||||
|
||||
REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \
|
||||
"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
|
||||
|
||||
for name in ${EXPECTED_TEST_FAILURES}; do
|
||||
mv "${name}.out" "${name}.out.orig" 2>/dev/null
|
||||
done
|
||||
|
||||
local failed="$(find -name '*.out')"
|
||||
if [[ ${failed} != "" ]] ; then
|
||||
ewarn "The following test cases failed unexpectedly:"
|
||||
for name in ${failed}; do
|
||||
ewarn " ${name/.out/}"
|
||||
done
|
||||
else
|
||||
einfo "No unexpected test failures, all fine"
|
||||
fi
|
||||
|
||||
if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
|
||||
local passed=""
|
||||
for name in ${EXPECTED_TEST_FAILURES}; do
|
||||
[[ -f "${name}.diff" ]] && continue
|
||||
passed="${passed} ${name}"
|
||||
done
|
||||
if [[ ${passed} != "" ]] ; then
|
||||
einfo "The following test cases passed unexpectedly:"
|
||||
for name in ${passed}; do
|
||||
ewarn " ${passed}"
|
||||
done
|
||||
else
|
||||
einfo "None of the known-to-fail tests passed, all fine"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Output some general info to the user
|
||||
if use apache2 ; then
|
||||
APACHE2_MOD_DEFINE="PHP5"
|
||||
APACHE2_MOD_CONF="70_mod_php5"
|
||||
apache-module_pkg_postinst
|
||||
fi
|
||||
|
||||
# Create the symlinks for php
|
||||
for m in ${SAPIS}; do
|
||||
[[ ${m} == 'embed' ]] && continue;
|
||||
if use $m ; then
|
||||
local ci=$(eselect php show $m)
|
||||
if [[ -z $ci ]]; then
|
||||
eselect php set $m php${SLOT}
|
||||
einfo "Switched ${m} to use php:${SLOT}"
|
||||
einfo
|
||||
elif [[ $ci != "php${SLOT}" ]] ; then
|
||||
elog "To switch $m to use php:${SLOT}, run"
|
||||
elog " eselect php set $m php${SLOT}"
|
||||
elog
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
|
||||
elog "to compile extensions for the ${SLOT} ABI"
|
||||
elog
|
||||
if ! use readline && use cli ; then
|
||||
ewarn "Note that in order to use php interactivly, you need to enable"
|
||||
ewarn "the readline USE flag or php -a will hang"
|
||||
fi
|
||||
elog
|
||||
elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
|
||||
elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
|
||||
elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
|
||||
elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
|
||||
|
||||
elog
|
||||
elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
|
||||
elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
|
||||
elog
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
eselect php cleanup
|
||||
}
|
||||
|
|
@ -1,780 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.11.ebuild,v 1.1 2014/04/05 08:14:55 olemarkus Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
|
||||
function php_get_uri ()
|
||||
{
|
||||
case "${1}" in
|
||||
"php-pre")
|
||||
echo "http://downloads.php.net/dsp/${2}"
|
||||
;;
|
||||
"php")
|
||||
echo "http://www.php.net/distributions/${2}"
|
||||
;;
|
||||
"olemarkus")
|
||||
echo "http://dev.gentoo.org/~olemarkus/php/${2}"
|
||||
;;
|
||||
"gentoo")
|
||||
echo "mirror://gentoo/${2}"
|
||||
;;
|
||||
*)
|
||||
die "unhandled case in php_get_uri"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
PHP_MV="$(get_major_version)"
|
||||
SLOT="$(get_version_component_range 1-2)"
|
||||
|
||||
# alias, so we can handle different types of releases (finals, rcs, alphas,
|
||||
# betas, ...) w/o changing the whole ebuild
|
||||
PHP_PV="${PV/_rc/RC}"
|
||||
PHP_PV="${PHP_PV/_alpha/alpha}"
|
||||
PHP_PV="${PHP_PV/_beta/beta}"
|
||||
PHP_RELEASE="php"
|
||||
[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
|
||||
[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
|
||||
[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
|
||||
PHP_P="${PN}-${PHP_PV}"
|
||||
|
||||
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
|
||||
|
||||
PHP_FPM_CONF_VER="1"
|
||||
|
||||
SRC_URI="${PHP_SRC_URI}"
|
||||
|
||||
DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
|
||||
HOMEPAGE="http://php.net/"
|
||||
LICENSE="PHP-3"
|
||||
|
||||
S="${WORKDIR}/${PHP_P}"
|
||||
|
||||
# We can build the following SAPIs in the given order
|
||||
SAPIS="embed cli cgi fpm apache2"
|
||||
|
||||
# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
|
||||
IUSE="${IUSE}
|
||||
${SAPIS/cli/+cli}
|
||||
threads"
|
||||
|
||||
IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
|
||||
crypt +ctype curl debug
|
||||
enchant exif frontbase +fileinfo +filter firebird
|
||||
flatfile ftp gd gdbm gmp +hash +iconv imap inifile
|
||||
intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
|
||||
mssql mysql libmysqlclient mysqli nls
|
||||
oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
|
||||
readline recode selinux +session sharedmem
|
||||
+simplexml snmp soap sockets spell sqlite ssl
|
||||
sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx
|
||||
+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
|
||||
|
||||
DEPEND="
|
||||
>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?]
|
||||
>=dev-libs/libpcre-8.32[unicode]
|
||||
apache2? ( www-servers/apache[threads=] )
|
||||
berkdb? ( =sys-libs/db-4* )
|
||||
bzip2? ( app-arch/bzip2 )
|
||||
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
|
||||
cjk? ( !gd? (
|
||||
virtual/jpeg:0
|
||||
media-libs/libpng:0=
|
||||
sys-libs/zlib
|
||||
) )
|
||||
crypt? ( >=dev-libs/libmcrypt-2.4 )
|
||||
curl? ( >=net-misc/curl-7.10.5 )
|
||||
enchant? ( app-text/enchant )
|
||||
exif? ( !gd? (
|
||||
virtual/jpeg:0
|
||||
media-libs/libpng:0=
|
||||
sys-libs/zlib
|
||||
) )
|
||||
firebird? ( dev-db/firebird )
|
||||
gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
|
||||
gdbm? ( >=sys-libs/gdbm-1.8.0 )
|
||||
gmp? ( >=dev-libs/gmp-4.1.2 )
|
||||
iconv? ( virtual/libiconv )
|
||||
imap? ( virtual/imap-c-client[ssl=] )
|
||||
intl? ( dev-libs/icu:= )
|
||||
iodbc? ( dev-db/libiodbc )
|
||||
kerberos? ( virtual/krb5 )
|
||||
ldap? ( >=net-nds/openldap-1.2.11 )
|
||||
ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
|
||||
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
|
||||
mssql? ( dev-db/freetds[mssql] )
|
||||
libmysqlclient? (
|
||||
mysql? ( virtual/mysql )
|
||||
mysqli? ( >=virtual/mysql-4.1 )
|
||||
)
|
||||
nls? ( sys-devel/gettext )
|
||||
oci8-instant-client? ( dev-db/oracle-instantclient-basic )
|
||||
odbc? ( >=dev-db/unixODBC-1.8.13 )
|
||||
postgres? ( dev-db/postgresql-base )
|
||||
qdbm? ( dev-db/qdbm )
|
||||
readline? ( sys-libs/readline )
|
||||
recode? ( app-text/recode )
|
||||
sharedmem? ( dev-libs/mm )
|
||||
simplexml? ( >=dev-libs/libxml2-2.6.8 )
|
||||
snmp? ( >=net-analyzer/net-snmp-5.2 )
|
||||
soap? ( >=dev-libs/libxml2-2.6.8 )
|
||||
spell? ( >=app-text/aspell-0.50 )
|
||||
sqlite? ( >=dev-db/sqlite-3.7.6.3 )
|
||||
ssl? ( >=dev-libs/openssl-0.9.7 )
|
||||
sybase-ct? ( dev-db/freetds )
|
||||
tidy? ( app-text/htmltidy )
|
||||
truetype? (
|
||||
=media-libs/freetype-2*
|
||||
>=media-libs/t1lib-5.0.0
|
||||
!gd? (
|
||||
virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
|
||||
)
|
||||
unicode? ( dev-libs/oniguruma )
|
||||
wddx? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xml? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
|
||||
xmlreader? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xpm? (
|
||||
x11-libs/libXpm
|
||||
virtual/jpeg:0
|
||||
media-libs/libpng:0= sys-libs/zlib
|
||||
)
|
||||
xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
|
||||
zip? ( sys-libs/zlib )
|
||||
zlib? ( sys-libs/zlib )
|
||||
virtual/mta
|
||||
"
|
||||
|
||||
php="=${CATEGORY}/${PF}"
|
||||
|
||||
REQUIRED_USE="
|
||||
truetype? ( gd )
|
||||
cjk? ( gd )
|
||||
exif? ( gd )
|
||||
|
||||
xpm? ( gd )
|
||||
gd? ( zlib )
|
||||
simplexml? ( xml )
|
||||
soap? ( xml )
|
||||
wddx? ( xml )
|
||||
xmlrpc? ( || ( xml iconv ) )
|
||||
xmlreader? ( xml )
|
||||
xslt? ( xml )
|
||||
ldap-sasl? ( ldap )
|
||||
mhash? ( hash )
|
||||
phar? ( hash )
|
||||
libmysqlclient? ( || (
|
||||
mysql
|
||||
mysqli
|
||||
pdo
|
||||
) )
|
||||
|
||||
qdbm? ( !gdbm )
|
||||
readline? ( !libedit )
|
||||
recode? ( !imap !mysql !mysqli )
|
||||
sharedmem? ( !threads )
|
||||
|
||||
!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
fpm? (
|
||||
selinux? ( sec-policy/selinux-phpfpm )
|
||||
systemd? ( sys-apps/systemd ) )"
|
||||
|
||||
DEPEND="${DEPEND}
|
||||
sys-devel/flex
|
||||
>=sys-devel/m4-1.4.3
|
||||
>=sys-devel/libtool-1.5.18"
|
||||
|
||||
# Allow users to install production version if they want to
|
||||
|
||||
case "${PHP_INI_VERSION}" in
|
||||
production|development)
|
||||
;;
|
||||
*)
|
||||
PHP_INI_VERSION="development"
|
||||
;;
|
||||
esac
|
||||
|
||||
PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
|
||||
PHP_INI_FILE="php.ini"
|
||||
|
||||
want_apache
|
||||
|
||||
pkg_setup() {
|
||||
depend.apache_pkg_setup
|
||||
}
|
||||
|
||||
php_install_ini() {
|
||||
local phpsapi="${1}"
|
||||
|
||||
# work out where we are installing the ini file
|
||||
php_set_ini_dir "${phpsapi}"
|
||||
|
||||
local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
|
||||
cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
|
||||
|
||||
# default to /tmp for save_path, bug #282768
|
||||
sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
|
||||
|
||||
# Set the extension dir
|
||||
sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
|
||||
|
||||
# Set the include path to point to where we want to find PEAR packages
|
||||
sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
|
||||
|
||||
dodir "${PHP_INI_DIR#${EPREFIX}}"
|
||||
insinto "${PHP_INI_DIR#${EPREFIX}}"
|
||||
newins "${phpinisrc}" "${PHP_INI_FILE}"
|
||||
|
||||
elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
|
||||
elog
|
||||
|
||||
dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
|
||||
dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
|
||||
|
||||
if use_if_iuse opcache; then
|
||||
elog "Adding opcache to $PHP_EXT_INI_DIR"
|
||||
echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
|
||||
dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
|
||||
fi
|
||||
|
||||
# SAPI-specific handling
|
||||
|
||||
if [[ "${sapi}" == "fpm" ]] ; then
|
||||
[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
|
||||
einfo "Installing FPM CGI config file php-fpm.conf"
|
||||
insinto "${PHP_INI_DIR#${EPREFIX}}"
|
||||
newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
|
||||
|
||||
# Remove bogus /etc/php-fpm.conf.default (bug 359906)
|
||||
[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
|
||||
fi
|
||||
|
||||
# Install PHP ini files into /usr/share/php
|
||||
|
||||
dodoc php.ini-development
|
||||
dodoc php.ini-production
|
||||
|
||||
}
|
||||
|
||||
php_set_ini_dir() {
|
||||
PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
|
||||
PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
|
||||
PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
|
||||
# ([empty session.save_path]/session_mm_[sapi][gid].sem)
|
||||
# there is no easy way to circumvent that, all php calls during
|
||||
# install use -n, so no php.ini file will be used.
|
||||
# As such, this is the easiest way to get around
|
||||
addpredict /session_mm_cli250.sem
|
||||
addpredict /session_mm_cli0.sem
|
||||
|
||||
# Change PHP branding
|
||||
# Get the alpha/beta/rc version
|
||||
sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
|
||||
-i configure.in || die "Unable to change PHP branding"
|
||||
|
||||
# Patch PHP to show Gentoo as the server platform
|
||||
sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
|
||||
-i configure.in || die "Failed to fix server platform name"
|
||||
|
||||
# Prevent PHP from activating the Apache config,
|
||||
# as we will do that ourselves
|
||||
sed -i \
|
||||
-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
|
||||
-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
|
||||
configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
|
||||
|
||||
# Patch PHP to support heimdal instead of mit-krb5
|
||||
if has_version "app-crypt/heimdal" ; then
|
||||
sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
|
||||
|| die "Failed to fix heimdal libname"
|
||||
sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
|
||||
|| die "Failed to fix heimdal crypt library reference"
|
||||
fi
|
||||
|
||||
#Add user patches #357637
|
||||
epatch_user
|
||||
|
||||
#force rebuilding aclocal.m4
|
||||
rm aclocal.m4
|
||||
eautoreconf
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
# http://bugs.php.net/bug.php?id=48795, bug #343481
|
||||
sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
addpredict /usr/share/snmp/mibs/.index
|
||||
addpredict /var/lib/net-snmp/mib_indexes
|
||||
|
||||
PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
|
||||
|
||||
# This is a global variable and should be in caps. It isn't because the
|
||||
# phpconfutils eclass relies on exactly this name...
|
||||
# for --with-libdir see bug #327025
|
||||
my_conf="
|
||||
--prefix="${PHP_DESTDIR}"
|
||||
--mandir="${PHP_DESTDIR}"/man
|
||||
--infodir="${PHP_DESTDIR}"/info
|
||||
--libdir="${PHP_DESTDIR}"/lib
|
||||
--with-libdir=$(get_libdir)
|
||||
--without-pear
|
||||
$(use_enable threads maintainer-zts)"
|
||||
|
||||
# extension USE flag shared
|
||||
my_conf+="
|
||||
$(use_enable bcmath bcmath )
|
||||
$(use_with bzip2 bz2 "${EPREFIX}"/usr)
|
||||
$(use_enable calendar calendar )
|
||||
$(use_enable ctype ctype )
|
||||
$(use_with curl curl "${EPREFIX}"/usr)
|
||||
$(use_enable xml dom )
|
||||
$(use_with enchant enchant "${EPREFIX}"/usr)
|
||||
$(use_enable exif exif )
|
||||
$(use_enable fileinfo fileinfo )
|
||||
$(use_enable filter filter )
|
||||
$(use_enable ftp ftp )
|
||||
$(use_with nls gettext "${EPREFIX}"/usr)
|
||||
$(use_with gmp gmp "${EPREFIX}"/usr)
|
||||
$(use_enable hash hash )
|
||||
$(use_with mhash mhash "${EPREFIX}"/usr)
|
||||
$(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr))
|
||||
$(use_enable intl intl )
|
||||
$(use_enable ipv6 ipv6 )
|
||||
$(use_enable json json )
|
||||
$(use_with kerberos kerberos "${EPREFIX}"/usr)
|
||||
$(use_enable xml libxml )
|
||||
$(use_with xml libxml-dir "${EPREFIX}"/usr)
|
||||
$(use_enable unicode mbstring )
|
||||
$(use_with crypt mcrypt "${EPREFIX}"/usr)
|
||||
$(use_with mssql mssql "${EPREFIX}"/usr)
|
||||
$(use_with unicode onig "${EPREFIX}"/usr)
|
||||
$(use_with ssl openssl "${EPREFIX}"/usr)
|
||||
$(use_with ssl openssl-dir "${EPREFIX}"/usr)
|
||||
$(use_enable pcntl pcntl )
|
||||
$(use_enable phar phar )
|
||||
$(use_enable pdo pdo )
|
||||
$(use_enable opcache opcache )
|
||||
$(use_with postgres pgsql "${EPREFIX}"/usr)
|
||||
$(use_enable posix posix )
|
||||
$(use_with spell pspell "${EPREFIX}"/usr)
|
||||
$(use_with recode recode "${EPREFIX}"/usr)
|
||||
$(use_enable simplexml simplexml )
|
||||
$(use_enable sharedmem shmop )
|
||||
$(use_with snmp snmp "${EPREFIX}"/usr)
|
||||
$(use_enable soap soap )
|
||||
$(use_enable sockets sockets )
|
||||
$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
|
||||
$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
|
||||
$(use_enable sysvipc sysvmsg )
|
||||
$(use_enable sysvipc sysvsem )
|
||||
$(use_enable sysvipc sysvshm )
|
||||
$(use_with systemd fpm-systemd)
|
||||
$(use_with tidy tidy "${EPREFIX}"/usr)
|
||||
$(use_enable tokenizer tokenizer )
|
||||
$(use_enable wddx wddx )
|
||||
$(use_enable xml xml )
|
||||
$(use_enable xmlreader xmlreader )
|
||||
$(use_enable xmlwriter xmlwriter )
|
||||
$(use_with xmlrpc xmlrpc)
|
||||
$(use_with xslt xsl "${EPREFIX}"/usr)
|
||||
$(use_enable zip zip )
|
||||
$(use_with zlib zlib "${EPREFIX}"/usr)
|
||||
$(use_enable debug debug )"
|
||||
|
||||
# DBA support
|
||||
if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
|
||||
|| use qdbm ; then
|
||||
my_conf="${my_conf} --enable-dba${shared}"
|
||||
fi
|
||||
|
||||
# DBA drivers support
|
||||
my_conf+="
|
||||
$(use_with cdb cdb)
|
||||
$(use_with berkdb db4 ${EPREFIX}/usr)
|
||||
$(use_enable flatfile flatfile )
|
||||
$(use_with gdbm gdbm ${EPREFIX}/usr)
|
||||
$(use_enable inifile inifile )
|
||||
$(use_with qdbm qdbm ${EPREFIX}/usr)"
|
||||
|
||||
# Support for the GD graphics library
|
||||
my_conf+="
|
||||
$(use_with truetype freetype-dir ${EPREFIX}/usr)
|
||||
$(use_with truetype t1lib ${EPREFIX}/usr)
|
||||
$(use_enable cjk gd-jis-conv )
|
||||
$(use_with gd jpeg-dir ${EPREFIX}/usr)
|
||||
$(use_with gd png-dir ${EPREFIX}/usr)
|
||||
$(use_with xpm xpm-dir ${EPREFIX}/usr)"
|
||||
# enable gd last, so configure can pick up the previous settings
|
||||
my_conf+="
|
||||
$(use_with gd gd)"
|
||||
|
||||
# IMAP support
|
||||
if use imap ; then
|
||||
my_conf+="
|
||||
$(use_with imap imap ${EPREFIX}/usr)
|
||||
$(use_with ssl imap-ssl ${EPREFIX}/usr)"
|
||||
fi
|
||||
|
||||
# Interbase/firebird support
|
||||
|
||||
if use firebird ; then
|
||||
my_conf+="
|
||||
$(use_with firebird interbase ${EPREFIX}/usr)"
|
||||
fi
|
||||
|
||||
# LDAP support
|
||||
if use ldap ; then
|
||||
my_conf+="
|
||||
$(use_with ldap ldap ${EPREFIX}/usr)
|
||||
$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
|
||||
fi
|
||||
|
||||
# MySQL support
|
||||
local mysqllib="mysqlnd"
|
||||
local mysqlilib="mysqlnd"
|
||||
use libmysqlclient && mysqllib="${EPREFIX}/usr"
|
||||
use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
|
||||
|
||||
my_conf+=" $(use_with mysql mysql $mysqllib)"
|
||||
my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
|
||||
|
||||
local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
|
||||
if use mysql ; then
|
||||
my_conf+="${mysqlsock}"
|
||||
elif use mysqli ; then
|
||||
my_conf+="${mysqlsock}"
|
||||
fi
|
||||
|
||||
# ODBC support
|
||||
if use odbc ; then
|
||||
my_conf+="
|
||||
$(use_with odbc unixODBC ${EPREFIX}/usr)"
|
||||
fi
|
||||
|
||||
if use iodbc ; then
|
||||
my_conf+="
|
||||
$(use_with iodbc iodbc ${EPREFIX}/usr)"
|
||||
fi
|
||||
|
||||
# Oracle support
|
||||
if use oci8-instant-client ; then
|
||||
my_conf+="
|
||||
$(use_with oci8-instant-client oci8)"
|
||||
fi
|
||||
|
||||
# PDO support
|
||||
if use pdo ; then
|
||||
my_conf+="
|
||||
$(use_with mssql pdo-dblib )
|
||||
$(use_with mysql pdo-mysql ${mysqllib})
|
||||
$(use_with postgres pdo-pgsql )
|
||||
$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
|
||||
$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
|
||||
if use oci8-instant-client ; then
|
||||
my_conf+="
|
||||
$(use_with oci8-instant-client pdo-oci)"
|
||||
fi
|
||||
fi
|
||||
|
||||
# readline/libedit support
|
||||
my_conf+="
|
||||
$(use_with readline readline ${EPREFIX}/usr)
|
||||
$(use_with libedit libedit ${EPREFIX}/usr)"
|
||||
|
||||
# Session support
|
||||
if use session ; then
|
||||
my_conf+="
|
||||
$(use_with sharedmem mm ${EPREFIX}/usr)"
|
||||
else
|
||||
my_conf+="
|
||||
$(use_enable session session )"
|
||||
fi
|
||||
|
||||
# Use pic for shared modules such as apache2's mod_php
|
||||
my_conf="${my_conf} --with-pic"
|
||||
|
||||
# we use the system copy of pcre
|
||||
# --with-pcre-regex affects ext/pcre
|
||||
# --with-pcre-dir affects ext/filter and ext/zip
|
||||
my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
|
||||
|
||||
# Catch CFLAGS problems
|
||||
# Fixes bug #14067.
|
||||
# Changed order to run it in reverse for bug #32022 and #12021.
|
||||
replace-cpu-flags "k6*" "i586"
|
||||
|
||||
# Support user-passed configuration parameters
|
||||
my_conf="${my_conf} ${EXTRA_ECONF:-}"
|
||||
|
||||
# Support the Apache2 extras, they must be set globally for all
|
||||
# SAPIs to work correctly, especially for external PHP extensions
|
||||
|
||||
mkdir -p "${WORKDIR}/sapis-build"
|
||||
for one_sapi in $SAPIS ; do
|
||||
use "${one_sapi}" || continue
|
||||
php_set_ini_dir "${one_sapi}"
|
||||
|
||||
cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
|
||||
cd "${WORKDIR}/sapis-build/${one_sapi}"
|
||||
|
||||
sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
|
||||
--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
|
||||
|
||||
for sapi in $SAPIS ; do
|
||||
case "$sapi" in
|
||||
cli|cgi|embed|fpm)
|
||||
if [[ "${one_sapi}" == "${sapi}" ]] ; then
|
||||
sapi_conf="${sapi_conf} --enable-${sapi}"
|
||||
else
|
||||
sapi_conf="${sapi_conf} --disable-${sapi}"
|
||||
fi
|
||||
;;
|
||||
|
||||
apache2)
|
||||
if [[ "${one_sapi}" == "${sapi}" ]] ; then
|
||||
sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
|
||||
else
|
||||
sapi_conf="${sapi_conf} --without-apxs2"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
econf ${sapi_conf}
|
||||
done
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# snmp seems to run during src_compile, too (bug #324739)
|
||||
addpredict /usr/share/snmp/mibs/.index
|
||||
addpredict /var/lib/net-snmp/mib_indexes
|
||||
|
||||
for sapi in ${SAPIS} ; do
|
||||
if use "${sapi}"; then
|
||||
cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
|
||||
emake || die "emake failed"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# see bug #324739 for what happens when we don't have that
|
||||
addpredict /usr/share/snmp/mibs/.index
|
||||
|
||||
# grab the first SAPI that got built and install common files from there
|
||||
local first_sapi=""
|
||||
for sapi in $SAPIS ; do
|
||||
if use $sapi ; then
|
||||
first_sapi=$sapi
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
# Makefile forgets to create this before trying to write to it...
|
||||
dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
|
||||
|
||||
# Install php environment (without any sapis)
|
||||
cd "${WORKDIR}/sapis-build/$first_sapi"
|
||||
emake INSTALL_ROOT="${D}" \
|
||||
install-build install-headers install-programs \
|
||||
|| die "emake install failed"
|
||||
|
||||
local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
|
||||
|
||||
# Create the directory where we'll put version-specific php scripts
|
||||
keepdir /usr/share/php${PHP_MV}
|
||||
|
||||
local sapi="", file=""
|
||||
local sapi_list=""
|
||||
|
||||
for sapi in ${SAPIS}; do
|
||||
if use "${sapi}" ; then
|
||||
einfo "Installing SAPI: ${sapi}"
|
||||
cd "${WORKDIR}/sapis-build/${sapi}"
|
||||
|
||||
if [[ "${sapi}" == "apache2" ]] ; then
|
||||
# We're specifically not using emake install-sapi as libtool
|
||||
# may cause unnecessary relink failures (see bug #351266)
|
||||
insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
|
||||
newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
|
||||
keepdir "/usr/$(get_libdir)/apache2/modules"
|
||||
else
|
||||
# needed each time, php_install_ini would reset it
|
||||
local dest="${PHP_DESTDIR#${EPREFIX}}"
|
||||
into "${dest}"
|
||||
case "$sapi" in
|
||||
cli)
|
||||
source="sapi/cli/php"
|
||||
;;
|
||||
cgi)
|
||||
source="sapi/cgi/php-cgi"
|
||||
;;
|
||||
fpm)
|
||||
source="sapi/fpm/php-fpm"
|
||||
;;
|
||||
embed)
|
||||
source="libs/libphp${PHP_MV}$(get_libname)"
|
||||
;;
|
||||
*)
|
||||
die "unhandled sapi in src_install"
|
||||
;;
|
||||
esac
|
||||
|
||||
if [[ "${source}" == *"$(get_libname)" ]]; then
|
||||
dolib.so "${source}" || die "Unable to install ${sapi} sapi"
|
||||
else
|
||||
dobin "${source}" || die "Unable to install ${sapi} sapi"
|
||||
local name="$(basename ${source})"
|
||||
dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
|
||||
fi
|
||||
fi
|
||||
|
||||
php_install_ini "${sapi}"
|
||||
|
||||
# construct correct SAPI string for php-config
|
||||
# thanks to ferringb for the bash voodoo
|
||||
if [[ "${sapi}" == "apache2" ]]; then
|
||||
sapi_list="${sapi_list:+${sapi_list} }apache2handler"
|
||||
else
|
||||
sapi_list="${sapi_list:+${sapi_list} }${sapi}"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
# Installing opcache module
|
||||
if use_if_iuse opcache ; then
|
||||
dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
|
||||
fi
|
||||
|
||||
# Install env.d files
|
||||
newenvd "${FILESDIR}/20php5-envd" \
|
||||
"20php${SLOT}"
|
||||
sed -e "s|/lib/|/$(get_libdir)/|g" -i \
|
||||
"${ED}/etc/env.d/20php${SLOT}"
|
||||
sed -e "s|php5|php${SLOT}|g" -i \
|
||||
"${ED}/etc/env.d/20php${SLOT}"
|
||||
|
||||
# set php-config variable correctly (bug #278439)
|
||||
sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
|
||||
"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
|
||||
|
||||
if use fpm ; then
|
||||
if use systemd; then
|
||||
systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
|
||||
else
|
||||
systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
|
||||
PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
|
||||
if [[ ! -x "${PHP_BIN}" ]] ; then
|
||||
ewarn "Test phase requires USE=cli, skipping"
|
||||
return
|
||||
else
|
||||
export TEST_PHP_EXECUTABLE="${PHP_BIN}"
|
||||
fi
|
||||
|
||||
if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
|
||||
export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
|
||||
fi
|
||||
|
||||
REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \
|
||||
"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
|
||||
|
||||
for name in ${EXPECTED_TEST_FAILURES}; do
|
||||
mv "${name}.out" "${name}.out.orig" 2>/dev/null
|
||||
done
|
||||
|
||||
local failed="$(find -name '*.out')"
|
||||
if [[ ${failed} != "" ]] ; then
|
||||
ewarn "The following test cases failed unexpectedly:"
|
||||
for name in ${failed}; do
|
||||
ewarn " ${name/.out/}"
|
||||
done
|
||||
else
|
||||
einfo "No unexpected test failures, all fine"
|
||||
fi
|
||||
|
||||
if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
|
||||
local passed=""
|
||||
for name in ${EXPECTED_TEST_FAILURES}; do
|
||||
[[ -f "${name}.diff" ]] && continue
|
||||
passed="${passed} ${name}"
|
||||
done
|
||||
if [[ ${passed} != "" ]] ; then
|
||||
einfo "The following test cases passed unexpectedly:"
|
||||
for name in ${passed}; do
|
||||
ewarn " ${passed}"
|
||||
done
|
||||
else
|
||||
einfo "None of the known-to-fail tests passed, all fine"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Output some general info to the user
|
||||
if use apache2 ; then
|
||||
APACHE2_MOD_DEFINE="PHP5"
|
||||
APACHE2_MOD_CONF="70_mod_php5"
|
||||
apache-module_pkg_postinst
|
||||
fi
|
||||
|
||||
# Create the symlinks for php
|
||||
for m in ${SAPIS}; do
|
||||
[[ ${m} == 'embed' ]] && continue;
|
||||
if use $m ; then
|
||||
local ci=$(eselect php show $m)
|
||||
if [[ -z $ci ]]; then
|
||||
eselect php set $m php${SLOT}
|
||||
einfo "Switched ${m} to use php:${SLOT}"
|
||||
einfo
|
||||
elif [[ $ci != "php${SLOT}" ]] ; then
|
||||
elog "To switch $m to use php:${SLOT}, run"
|
||||
elog " eselect php set $m php${SLOT}"
|
||||
elog
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
|
||||
elog "to compile extensions for the ${SLOT} ABI"
|
||||
elog
|
||||
if ! use readline && use cli ; then
|
||||
ewarn "Note that in order to use php interactivly, you need to enable"
|
||||
ewarn "the readline USE flag or php -a will hang"
|
||||
fi
|
||||
elog
|
||||
elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
|
||||
elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
|
||||
elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
|
||||
elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
|
||||
|
||||
elog
|
||||
elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
|
||||
elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
|
||||
elog
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
eselect php cleanup
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
DIST vala-0.23.2.tar.xz 2664888 SHA256 f42287019d0911e2ce68e937c2db83e115d6aaf31a76473ac46ed48593d6423c SHA512 b7a35a4514eb3e5bd940f01ce7ff6c90ff8592b0ea9aec7ffb25fc10a03bc62d5572f0d16730e4003e5dc946fb5608feefabe8a2c18bf2666832e5aea9a6c6a7 WHIRLPOOL de65681ed391baf36dad89176aea475a53173bbee8c3de8306100f89fc0b728643f45b2ae6d3f05371d4b4f1975fe4307a212cef93429059c023bd29b36eb33a
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.23.2.ebuild,v 1.4 2013/12/22 15:48:13 jer Exp $
|
||||
|
||||
EAPI="5"
|
||||
GCONF_DEBUG="no"
|
||||
|
||||
inherit gnome2
|
||||
|
||||
DESCRIPTION="Compiler for the GObject type system"
|
||||
HOMEPAGE="https://wiki.gnome.org/Vala"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0.23"
|
||||
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
|
||||
IUSE="test +vapigen"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/glib-2.18:2
|
||||
>=dev-libs/vala-common-${PV}
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
!${CATEGORY}/${PN}:0
|
||||
dev-libs/libxslt
|
||||
sys-devel/flex
|
||||
virtual/pkgconfig
|
||||
virtual/yacc
|
||||
test? (
|
||||
dev-libs/dbus-glib
|
||||
>=dev-libs/glib-2.26:2 )
|
||||
"
|
||||
|
||||
src_configure() {
|
||||
DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
|
||||
gnome2_src_configure \
|
||||
--disable-unversioned \
|
||||
$(use_enable vapigen)
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
DIST libgee-0.13.5.1.tar.xz 641064 SHA256 78cb64dcab493509c4ab275fdd77bac189d2ea615d2ab07e2aa1610a7f89d943 SHA512 675942f2468f93870c635a58b13cde8f3efe3c66a28c93cbccc9c3750b1bf3ae51b05c28fdee04a8b26a3c4247987f35ed002accf5a3426a7c1aae6a32c566e7 WHIRLPOOL 43748b6b6bcd581cee5cc5bab752c80f6e598ab07481a00f65e140dce20a46300200a506ddbf424b2b926a115693e1b38bac17a41fb937da7843c8297fc1fafd
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgee/libgee-0.13.0.ebuild,v 1.1 2013/12/23 23:00:03 eva Exp $
|
||||
|
||||
EAPI="5"
|
||||
GCONF_DEBUG="no"
|
||||
|
||||
inherit gnome2
|
||||
|
||||
DESCRIPTION="GObject-based interfaces and classes for commonly used data structures"
|
||||
HOMEPAGE="https://wiki.gnome.org/Libgee"
|
||||
|
||||
LICENSE="LGPL-2.1+"
|
||||
SLOT="0.8"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-linux"
|
||||
IUSE="+introspection"
|
||||
|
||||
# FIXME: add doc support, requires valadoc
|
||||
RDEPEND="
|
||||
>=dev-libs/glib-2.36:2
|
||||
introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
src_configure() {
|
||||
DOCS="AUTHORS ChangeLog* MAINTAINERS NEWS README"
|
||||
gnome2_src_configure \
|
||||
$(use_enable introspection)
|
||||
VALAC="$(type -P false)"
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
DIST lzo-2.08.tar.gz 589045 SHA256 ac1b3e4dee46febe9fd28737eb7f5692d3232ef1a01da10444394c3d47536614 SHA512 d03ae521000d69dd1fc92112a7b6e642c388b2898d7fb6ac4168e947a895e8d5e77199f78f05e036cefe02f346ea242bca694522f3c7959ab6ca19de956162dd WHIRLPOOL bea0357b01cb64018a5afc7b0934065dda944866aa23f44edd4eb615d53c0242b70c836d2d8144ed64df4a438bea5c1b8b5120ee4a7f08af15db171f85c11ac8
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/lzo-2.08.ebuild,v 1.1 2014/06/30 12:19:14 ssuominen Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils multilib-minimal
|
||||
|
||||
DESCRIPTION="An extremely fast compression and decompression library"
|
||||
HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
|
||||
SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="examples static-libs"
|
||||
|
||||
RDEPEND="abi_x86_32? (
|
||||
!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
|
||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
|
||||
)"
|
||||
|
||||
DOCS="BUGS ChangeLog README THANKS doc/*"
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE=${S} \
|
||||
econf \
|
||||
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
|
||||
--enable-shared \
|
||||
$(use_enable static-libs static)
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
rm -f "${ED}"/usr/share/doc/${PF}/COPYING
|
||||
|
||||
if use examples; then
|
||||
docinto examples
|
||||
dodoc examples/*.{c,h}
|
||||
fi
|
||||
|
||||
prune_libtool_files
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
AUX nss-3.12.6-gentoo-fixup-warnings.patch 301 SHA256 e14b227f762bd21875208e241029966b1e3873edfdf0592ca69bd9714859d329 SHA512 fcb47b120860436987858be53971f020db2d7c2f1bef1300bdca6dcf45d76a9b595c545112c1e7553ac29c412f72eafe3d29cd91ed1ab196b03146a7d8bc1870 WHIRLPOOL 1f59af79d4d7565185a3b841b3e936f7d3dddc642630d261be22c04d04cb0f8dfdd13ddacaa0fe8d69256fcffaee5fc273dfe73fc72f539abb5ed501dd1439c2
|
||||
AUX nss-3.13-gentoo-fixup.patch 6423 SHA256 48cc7824fd90bf2b03954495c93d5466a2ce831c70f876a0e14a7859132db02c SHA512 9a5b79bf77b8105f6417c387554326c41ca176ed78150069cfe13645fd3d63f0c54bbb249b1b0b9a85186129e6eb19eb15f340c8bf417546cdcf7a98891ffd9c WHIRLPOOL 5f8a58562e5df68d7387ddf1dd44b17cbfc231052046066980ee98bd66eb3f50f574446c34aa7c36a8f9055be617b337fd02d24c91d007e24c4591f7c674881c
|
||||
AUX nss-3.13.1-pkcs11n-header-fix.patch 614 SHA256 1792baa694e86a79fb07b8d69bf41665daedaa8692e22b83e327443b15c193ec SHA512 b80bde97cba7681bd3100f75530f6bb351e8f463d7ccc56cd618bf53f29feada579cb96931b855f9d57e1b3381a5f0f2f3b30d1e4994783dc24cb2186a48be16 WHIRLPOOL 3e14bb8ffa16287cb588cdc472aa5741a9c0f41b3184a7bd59ca7f313bc8776a523004c40d11cf1b08c0e4f1ae6e7794726f250aa27ccab24ff7298efbc5594e
|
||||
AUX nss-3.13.1-solaris-gcc.patch 854 SHA256 5a5406334c9ecd1e338fa91416fed5e8bc19eeb7115511552ba267ed8a25d117 SHA512 c4308848c00bcb55161a22b014c073a50ab2b2a13031fc7beb6235f441f35efb144afcac02a50dfb1be2ec00d823287c6b888fd9b5d6d317aa889e50a615d014 WHIRLPOOL 12a0cfa720553f59b6690cdf0c7b96185d0abf6d9eda3fa93546d4557feb9a42ba6e9756544fd8bd723393aeed26296a927e5bb6294bfb11a5f2a4643fee7d4f
|
||||
AUX nss-3.13.5-x32.patch 2304 SHA256 ae402bef2c97cdeac3a00430729d3668167af5f957b1c217e3a79a3d54a3d206 SHA512 c9c4aeca3b7cc62037534b8b6dea04088e07f6d817a4f8a9f3af0de1e494119f140b67b1ed79c8c8af670cd6f86faa5366ae34afe4dda353d5e310c68a8122ee WHIRLPOOL a1507439d64dae60c237c105c3e47d5e20ff80451f97bedfa71b693aa99e9590dfb63f7fdb1bad057a6256159e3efa0a58a5941a9fb4f2d9de7aba3ca7b08102
|
||||
DIST nss-3.13.3_pem.support 191571 SHA256 cb6cf7955203514b3c1210c9b32504b0d2f1c158fa9b5d2509ef0bb34b68374c SHA512 223026adbacf2f325f808210cc050f95cb65cb0fe8c6022109a42bd991fd576e2e96beb5ec8e185dbbd649f4bd4516bc0f7fc10401f47eda806ab2d63f0c23a3 WHIRLPOOL 78345665e54fe67f57bc09311567ad525f9a8dae7d17e600a9639fac820fcf9c64e9f4bacc5df3f90b90a224e374ac44e938962c5248189fe76dad7143bf3476
|
||||
DIST nss-3.13.6-add_spi+cacerts_ca_certs.patch 70095 SHA256 66779b7c64f0f71662f29f8127f78eac086b1415778872cdbfdf3017bacbca9f SHA512 3aaf7671a179e28f2bb80a9d9f753337e15ed46df97724a9517c58f436b4e835815b974de9344bb422326b0625de52e6444523b37f36d4bdcda0a05e9839ce4c WHIRLPOOL 48bd80ffef3ca7f007f02f654cb33e7887bd4b5ce91e5ef2b9c88ca888aeda5ce8d02f41c4ed38b553ade572256fbf84a42de87814c5e6b4252950bd2555a74a
|
||||
DIST nss-3.13.6.tar.gz 6109538 SHA256 f7e90727e0ecc1c29de10da39a79bc9c53b814ccfbf40720e053b29c683d43a0 SHA512 45bc254eb238ea23fdd8d2c9128a22cebe15fda9ed5c9c1d112b5756d4d2b76e7f3a99d3600254bdcd6eeb18bda224d52e676e169207193798200f0d41baa29d WHIRLPOOL 8172b4a29a513ed931d8b9c5b72270e448282ff7454ea8aea9fba23e667f8c76417861f3f716857ba05e38f0ee940fc21d86d7343e1ffc780a849c37929b94aa
|
||||
EBUILD nss-3.13.6.ebuild 6933 SHA256 d42c54c49b7caced527064f211a68124ad06eb987780e6e2dc2646fcc01843b8 SHA512 db4d041165947991396bd0701d917b05c66e562af3c6becb6c5daa155a354c536fa08c0a568fd551eca87c509377eec17e8fbd853147470c260f41295439a3da WHIRLPOOL 76db71efb955b0f0748a35f7163d711410721ad0f87975ad5405dbe02c25db3dc53d8d501ba1726b34e22e037d2ca72b3231b1887990e2672296fe45d41fe628
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- nss-3.12.6b/mozilla/security/coreconf/Linux.mk-old 2010-02-11 12:43:26.000000000 -0600
|
||||
+++ nss-3.12.6b/mozilla/security/coreconf/Linux.mk 2010-02-14 09:13:53.962449644 -0600
|
||||
@@ -120,6 +120,7 @@
|
||||
ifdef MOZ_DEBUG_SYMBOLS
|
||||
OPTIMIZER += -gstabs+
|
||||
endif
|
||||
+OPTIMIZER += -fno-strict-aliasing
|
||||
endif
|
||||
|
||||
|
||||
|
|
@ -1,245 +0,0 @@
|
|||
diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/Makefile
|
||||
--- a/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600
|
||||
+++ b/mozilla/security/nss/config/Makefile 2009-09-14 21:45:45.619639265 -0500
|
||||
@@ -0,0 +1,40 @@
|
||||
+CORE_DEPTH = ../..
|
||||
+DEPTH = ../..
|
||||
+
|
||||
+include $(CORE_DEPTH)/coreconf/config.mk
|
||||
+
|
||||
+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
|
||||
+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
|
||||
+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
|
||||
+PREFIX = /usr
|
||||
+
|
||||
+all: export libs
|
||||
+
|
||||
+export:
|
||||
+ # Create the nss.pc file
|
||||
+ mkdir -p $(DIST)/lib/pkgconfig
|
||||
+ sed -e "s,@prefix@,$(PREFIX)," \
|
||||
+ -e "s,@exec_prefix@,\$${prefix}," \
|
||||
+ -e "s,@libdir@,\$${prefix}/gentoo/nss," \
|
||||
+ -e "s,@includedir@,\$${prefix}/include/nss," \
|
||||
+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
|
||||
+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
|
||||
+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
|
||||
+ nss.pc.in > nss.pc
|
||||
+ chmod 0644 nss.pc
|
||||
+ ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
|
||||
+
|
||||
+ # Create the nss-config script
|
||||
+ mkdir -p $(DIST)/bin
|
||||
+ sed -e "s,@prefix@,$(PREFIX)," \
|
||||
+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
|
||||
+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
|
||||
+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
|
||||
+ nss-config.in > nss-config
|
||||
+ chmod 0755 nss-config
|
||||
+ ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin
|
||||
+
|
||||
+libs:
|
||||
+
|
||||
+dummy: all export libs
|
||||
+
|
||||
diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/config/nss-config.in
|
||||
--- a/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600
|
||||
+++ b/mozilla/security/nss/config/nss-config.in 2009-09-14 21:47:45.190638078 -0500
|
||||
@@ -0,0 +1,145 @@
|
||||
+#!/bin/sh
|
||||
+
|
||||
+prefix=@prefix@
|
||||
+
|
||||
+major_version=@NSS_MAJOR_VERSION@
|
||||
+minor_version=@NSS_MINOR_VERSION@
|
||||
+patch_version=@NSS_PATCH_VERSION@
|
||||
+
|
||||
+usage()
|
||||
+{
|
||||
+ cat <<EOF
|
||||
+Usage: nss-config [OPTIONS] [LIBRARIES]
|
||||
+Options:
|
||||
+ [--prefix[=DIR]]
|
||||
+ [--exec-prefix[=DIR]]
|
||||
+ [--includedir[=DIR]]
|
||||
+ [--libdir[=DIR]]
|
||||
+ [--version]
|
||||
+ [--libs]
|
||||
+ [--cflags]
|
||||
+Dynamic Libraries:
|
||||
+ nss
|
||||
+ ssl
|
||||
+ smime
|
||||
+ nssutil
|
||||
+EOF
|
||||
+ exit $1
|
||||
+}
|
||||
+
|
||||
+if test $# -eq 0; then
|
||||
+ usage 1 1>&2
|
||||
+fi
|
||||
+
|
||||
+lib_ssl=yes
|
||||
+lib_smime=yes
|
||||
+lib_nss=yes
|
||||
+lib_nssutil=yes
|
||||
+
|
||||
+while test $# -gt 0; do
|
||||
+ case "$1" in
|
||||
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
|
||||
+ *) optarg= ;;
|
||||
+ esac
|
||||
+
|
||||
+ case $1 in
|
||||
+ --prefix=*)
|
||||
+ prefix=$optarg
|
||||
+ ;;
|
||||
+ --prefix)
|
||||
+ echo_prefix=yes
|
||||
+ ;;
|
||||
+ --exec-prefix=*)
|
||||
+ exec_prefix=$optarg
|
||||
+ ;;
|
||||
+ --exec-prefix)
|
||||
+ echo_exec_prefix=yes
|
||||
+ ;;
|
||||
+ --includedir=*)
|
||||
+ includedir=$optarg
|
||||
+ ;;
|
||||
+ --includedir)
|
||||
+ echo_includedir=yes
|
||||
+ ;;
|
||||
+ --libdir=*)
|
||||
+ libdir=$optarg
|
||||
+ ;;
|
||||
+ --libdir)
|
||||
+ echo_libdir=yes
|
||||
+ ;;
|
||||
+ --version)
|
||||
+ echo ${major_version}.${minor_version}.${patch_version}
|
||||
+ ;;
|
||||
+ --cflags)
|
||||
+ echo_cflags=yes
|
||||
+ ;;
|
||||
+ --libs)
|
||||
+ echo_libs=yes
|
||||
+ ;;
|
||||
+ ssl)
|
||||
+ lib_ssl=yes
|
||||
+ ;;
|
||||
+ smime)
|
||||
+ lib_smime=yes
|
||||
+ ;;
|
||||
+ nss)
|
||||
+ lib_nss=yes
|
||||
+ ;;
|
||||
+ nssutil)
|
||||
+ lib_nssutil=yes
|
||||
+ ;;
|
||||
+ *)
|
||||
+ usage 1 1>&2
|
||||
+ ;;
|
||||
+ esac
|
||||
+ shift
|
||||
+done
|
||||
+
|
||||
+# Set variables that may be dependent upon other variables
|
||||
+if test -z "$exec_prefix"; then
|
||||
+ exec_prefix=`pkg-config --variable=exec_prefix nss`
|
||||
+fi
|
||||
+if test -z "$includedir"; then
|
||||
+ includedir=`pkg-config --variable=includedir nss`
|
||||
+fi
|
||||
+if test -z "$libdir"; then
|
||||
+ libdir=`pkg-config --variable=libdir nss`
|
||||
+fi
|
||||
+
|
||||
+if test "$echo_prefix" = "yes"; then
|
||||
+ echo $prefix
|
||||
+fi
|
||||
+
|
||||
+if test "$echo_exec_prefix" = "yes"; then
|
||||
+ echo $exec_prefix
|
||||
+fi
|
||||
+
|
||||
+if test "$echo_includedir" = "yes"; then
|
||||
+ echo $includedir
|
||||
+fi
|
||||
+
|
||||
+if test "$echo_libdir" = "yes"; then
|
||||
+ echo $libdir
|
||||
+fi
|
||||
+
|
||||
+if test "$echo_cflags" = "yes"; then
|
||||
+ echo -I$includedir
|
||||
+fi
|
||||
+
|
||||
+if test "$echo_libs" = "yes"; then
|
||||
+ libdirs="-Wl,-R$libdir -L$libdir"
|
||||
+ if test -n "$lib_ssl"; then
|
||||
+ libdirs="$libdirs -lssl${major_version}"
|
||||
+ fi
|
||||
+ if test -n "$lib_smime"; then
|
||||
+ libdirs="$libdirs -lsmime${major_version}"
|
||||
+ fi
|
||||
+ if test -n "$lib_nss"; then
|
||||
+ libdirs="$libdirs -lnss${major_version}"
|
||||
+ fi
|
||||
+ if test -n "$lib_nssutil"; then
|
||||
+ libdirs="$libdirs -lnssutil${major_version}"
|
||||
+ fi
|
||||
+ echo $libdirs
|
||||
+fi
|
||||
+
|
||||
diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/nss.pc.in
|
||||
--- a/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600
|
||||
+++ b/mozilla/security/nss/config/nss.pc.in 2009-09-14 21:45:45.653637310 -0500
|
||||
@@ -0,0 +1,12 @@
|
||||
+prefix=@prefix@
|
||||
+exec_prefix=@exec_prefix@
|
||||
+libdir=@libdir@
|
||||
+includedir=@includedir@
|
||||
+
|
||||
+Name: NSS
|
||||
+Description: Network Security Services
|
||||
+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
|
||||
+Requires: nspr >= 4.8
|
||||
+Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3
|
||||
+Cflags: -I${includedir}
|
||||
+
|
||||
diff -urN a/mozilla/security/nss/Makefile b/mozilla/security/nss/Makefile
|
||||
--- a/mozilla/security/nss/Makefile 2008-12-02 17:24:39.000000000 -0600
|
||||
+++ b/mozilla/security/nss/Makefile 2009-09-14 21:45:45.678657145 -0500
|
||||
@@ -78,7 +78,7 @@
|
||||
# (7) Execute "local" rules. (OPTIONAL). #
|
||||
#######################################################################
|
||||
|
||||
-nss_build_all: build_coreconf build_nspr build_dbm all
|
||||
+nss_build_all: build_coreconf build_dbm all
|
||||
|
||||
nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
|
||||
|
||||
@@ -140,12 +140,6 @@
|
||||
--with-dist-prefix='$(NSPR_PREFIX)' \
|
||||
--with-dist-includedir='$(NSPR_PREFIX)/include'
|
||||
|
||||
-build_nspr: $(NSPR_CONFIG_STATUS)
|
||||
- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE)
|
||||
-
|
||||
-clobber_nspr: $(NSPR_CONFIG_STATUS)
|
||||
- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber
|
||||
-
|
||||
build_dbm:
|
||||
ifndef NSS_DISABLE_DBM
|
||||
cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs
|
||||
diff -urN a/mozilla/security/nss/manifest.mn b/mozilla/security/nss/manifest.mn
|
||||
--- a/mozilla/security/nss/manifest.mn 2008-04-04 15:36:59.000000000 -0500
|
||||
+++ b/mozilla/security/nss/manifest.mn 2009-09-14 21:45:45.703656167 -0500
|
||||
@@ -42,6 +42,6 @@
|
||||
|
||||
RELEASE = nss
|
||||
|
||||
-DIRS = lib cmd
|
||||
+DIRS = lib cmd config
|
||||
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- a/mozilla/security/nss/lib/util/pkcs11n.h 2011-12-11 15:18:57.451617325 -0600
|
||||
+++ a/mozilla/security/nss/lib/util/pkcs11n.h 2011-12-11 15:19:27.652239770 -0600
|
||||
@@ -362,7 +362,7 @@
|
||||
* cast the resulting value to the deprecated type in the #define, thus
|
||||
* producting the warning when the #define is used.
|
||||
*/
|
||||
-#if (__GNUC__ == 4) && (__GNUC_MINOR < 5)
|
||||
+#if (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)
|
||||
/* The mac doesn't like the friendlier deprecate messages. I'm assuming this
|
||||
* is a gcc version issue rather than mac or ppc specific */
|
||||
typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated));
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
--- nss-3.13.1/mozilla/security/coreconf/SunOS5.mk
|
||||
+++ nss-3.13.1/mozilla/security/coreconf/SunOS5.mk
|
||||
@@ -37,6 +37,9 @@
|
||||
|
||||
include $(CORE_DEPTH)/coreconf/UNIX.mk
|
||||
|
||||
+NS_USE_GCC = 1
|
||||
+GCC_USE_GNU_LD = 1
|
||||
+
|
||||
# Sun's WorkShop defines v8, v8plus and v9 architectures.
|
||||
# gcc on Solaris defines v8 and v9 "cpus".
|
||||
# gcc's v9 is equivalent to Workshop's v8plus.
|
||||
@@ -95,7 +98,7 @@
|
||||
endif
|
||||
endif
|
||||
|
||||
-INCLUDES += -I/usr/dt/include -I/usr/openwin/include
|
||||
+#INCLUDES += -I/usr/dt/include -I/usr/openwin/include
|
||||
|
||||
RANLIB = echo
|
||||
CPU_ARCH = sparc
|
||||
@@ -105,11 +108,6 @@
|
||||
NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS)
|
||||
|
||||
MKSHLIB = $(CC) $(DSO_LDOPTS) $(RPATH)
|
||||
-ifdef NS_USE_GCC
|
||||
-ifeq (GNU,$(findstring GNU,$(shell `$(CC) -print-prog-name=ld` -v 2>&1)))
|
||||
- GCC_USE_GNU_LD = 1
|
||||
-endif
|
||||
-endif
|
||||
ifdef MAPFILE
|
||||
ifdef NS_USE_GCC
|
||||
ifdef GCC_USE_GNU_LD
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
diff -8urN a/mozilla/security/coreconf/Linux.mk b/mozilla/security/coreconf/Linux.mk
|
||||
--- a/mozilla/security/coreconf/Linux.mk 2012-06-22 07:55:45.228234872 -0500
|
||||
+++ b/mozilla/security/coreconf/Linux.mk 2012-06-22 07:56:30.171231815 -0500
|
||||
@@ -60,21 +60,28 @@
|
||||
else
|
||||
ifeq ($(OS_TEST),alpha)
|
||||
OS_REL_CFLAGS = -D_ALPHA_
|
||||
CPU_ARCH = alpha
|
||||
else
|
||||
ifeq ($(OS_TEST),x86_64)
|
||||
ifeq ($(USE_64),1)
|
||||
CPU_ARCH = x86_64
|
||||
+ ARCHFLAG = -m64
|
||||
+else
|
||||
+ifeq ($(USE_x32),1)
|
||||
+ OS_REL_CFLAGS = -Di386
|
||||
+ CPU_ARCH = x86
|
||||
+ ARCHFLAG = -mx32
|
||||
else
|
||||
OS_REL_CFLAGS = -Di386
|
||||
CPU_ARCH = x86
|
||||
ARCHFLAG = -m32
|
||||
endif
|
||||
+endif
|
||||
else
|
||||
ifeq ($(OS_TEST),sparc64)
|
||||
CPU_ARCH = sparc
|
||||
else
|
||||
ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
|
||||
CPU_ARCH = arm
|
||||
else
|
||||
ifeq (,$(filter-out parisc%,$(OS_TEST)))
|
||||
diff -8urN a/mozilla/security/nss/lib/freebl/Makefile b/mozilla/security/nss/lib/freebl/Makefile
|
||||
--- a/mozilla/security/nss/lib/freebl/Makefile 2012-06-22 07:55:45.441234854 -0500
|
||||
+++ b/mozilla/security/nss/lib/freebl/Makefile 2012-06-22 07:56:30.172231808 -0500
|
||||
@@ -210,22 +210,26 @@
|
||||
DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
|
||||
# DEFINES += -DMPI_AMD64_ADD
|
||||
# comment the next two lines to turn off intel HW accelleration
|
||||
DEFINES += -DUSE_HW_AES
|
||||
ASFILES += intel-aes.s
|
||||
MPI_SRCS += mpi_amd64.c mp_comba.c
|
||||
endif
|
||||
ifeq ($(CPU_ARCH),x86)
|
||||
- ASFILES = mpi_x86.s
|
||||
- DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
|
||||
- DEFINES += -DMP_ASSEMBLY_DIV_2DX1D
|
||||
- DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
|
||||
- # The floating point ECC code doesn't work on Linux x86 (bug 311432).
|
||||
- #ECL_USE_FP = 1
|
||||
+ ifeq ($(USE_x32),1)
|
||||
+ DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
|
||||
+ else
|
||||
+ ASFILES = mpi_x86.s
|
||||
+ DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
|
||||
+ DEFINES += -DMP_ASSEMBLY_DIV_2DX1D
|
||||
+ DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
|
||||
+ # The floating point ECC code doesn't work on Linux x86 (bug 311432).
|
||||
+ #ECL_USE_FP = 1
|
||||
+ endif
|
||||
endif
|
||||
ifeq ($(CPU_ARCH),arm)
|
||||
DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
|
||||
DEFINES += -DMP_USE_UINT_DIGIT
|
||||
DEFINES += -DSHA_NO_LONG_LONG # avoid 64-bit arithmetic in SHA512
|
||||
MPI_SRCS += mpi_arm.c
|
||||
endif
|
||||
endif # Linux
|
||||
|
|
@ -1,212 +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/nss/nss-3.13.6.ebuild,v 1.1 2012/09/01 23:07:37 anarchy Exp $
|
||||
|
||||
EAPI=3
|
||||
inherit eutils flag-o-matic multilib toolchain-funcs
|
||||
|
||||
NSPR_VER="4.9.2"
|
||||
RTM_NAME="NSS_${PV//./_}_RTM"
|
||||
|
||||
DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
|
||||
HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
|
||||
SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
|
||||
http://dev.gentoo.org/~anarchy/patches/${PN}-3.13.6-add_spi+cacerts_ca_certs.patch
|
||||
http://dev.gentoo.org/~anarchy/patches/${PN}-3.13.3_pem.support"
|
||||
|
||||
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="utils"
|
||||
|
||||
DEPEND="virtual/pkgconfig
|
||||
>=dev-libs/nspr-${NSPR_VER}"
|
||||
|
||||
RDEPEND=">=dev-libs/nspr-${NSPR_VER}
|
||||
>=dev-db/sqlite-3.5
|
||||
sys-libs/zlib"
|
||||
|
||||
src_setup() {
|
||||
export LC_ALL="C"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Custom changes for gentoo
|
||||
epatch "${FILESDIR}/${PN}-3.13-gentoo-fixup.patch"
|
||||
epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch"
|
||||
epatch "${DISTDIR}/${PN}-3.13.6-add_spi+cacerts_ca_certs.patch"
|
||||
epatch "${DISTDIR}/${PN}-3.13.3_pem.support"
|
||||
epatch "${FILESDIR}/${PN}-3.13.5-x32.patch"
|
||||
|
||||
cd "${S}"/mozilla/security/coreconf || die
|
||||
# hack nspr paths
|
||||
echo 'INCLUDES += -I'"${EPREFIX}"'/usr/include/nspr -I$(DIST)/include/dbm' \
|
||||
>> headers.mk || die "failed to append include"
|
||||
|
||||
# modify install path
|
||||
sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
|
||||
-i source.mk || die
|
||||
|
||||
# Respect LDFLAGS
|
||||
sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || die
|
||||
|
||||
# Ensure we stay multilib aware
|
||||
sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib"
|
||||
|
||||
# Fix pkgconfig file for Prefix
|
||||
sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
|
||||
"${S}"/mozilla/security/nss/config/Makefile || die
|
||||
|
||||
epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch"
|
||||
|
||||
# dirty hack
|
||||
cd "${S}"/mozilla/security/nss || die
|
||||
sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
|
||||
lib/ssl/config.mk || die
|
||||
sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
|
||||
cmd/platlibs.mk || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
strip-flags
|
||||
|
||||
echo > "${T}"/test.c || die
|
||||
$(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
|
||||
case $(file "${T}"/test.o) in
|
||||
*32-bit*x86-64*) export USE_x32=1;;
|
||||
*64-bit*|*ppc64*|*x86_64*) export USE_64=1;;
|
||||
*32-bit*|*ppc*|*i386*) ;;
|
||||
*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
|
||||
esac
|
||||
|
||||
export NSPR_INCLUDE_DIR=`nspr-config --includedir`
|
||||
export NSPR_LIB_DIR=`nspr-config --libdir`
|
||||
export BUILD_OPT=1
|
||||
export NSS_USE_SYSTEM_SQLITE=1
|
||||
export NSDISTMODE=copy
|
||||
export NSS_ENABLE_ECC=1
|
||||
export XCFLAGS="${CFLAGS}"
|
||||
export FREEBL_NO_DEPEND=1
|
||||
export ASFLAGS=""
|
||||
|
||||
cd "${S}"/mozilla/security/coreconf || die
|
||||
emake -j1 CC="$(tc-getCC)" || die "coreconf make failed"
|
||||
cd "${S}"/mozilla/security/dbm || die
|
||||
emake -j1 CC="$(tc-getCC)" || die "dbm make failed"
|
||||
cd "${S}"/mozilla/security/nss || die
|
||||
emake -j1 CC="$(tc-getCC)" || die "nss make failed"
|
||||
}
|
||||
|
||||
# Altering these 3 libraries breaks the CHK verification.
|
||||
# All of the following cause it to break:
|
||||
# - stripping
|
||||
# - prelink
|
||||
# - ELF signing
|
||||
# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
|
||||
# Either we have to NOT strip them, or we have to forcibly resign after
|
||||
# stripping.
|
||||
#local_libdir="$(get_libdir)"
|
||||
#export STRIP_MASK="
|
||||
# */${local_libdir}/libfreebl3.so*
|
||||
# */${local_libdir}/libnssdbm3.so*
|
||||
# */${local_libdir}/libsoftokn3.so*"
|
||||
|
||||
export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
|
||||
|
||||
generate_chk() {
|
||||
local shlibsign="$1"
|
||||
local libdir="$2"
|
||||
einfo "Resigning core NSS libraries for FIPS validation"
|
||||
shift 2
|
||||
for i in ${NSS_CHK_SIGN_LIBS} ; do
|
||||
local libname=lib${i}.so
|
||||
local chkname=lib${i}.chk
|
||||
"${shlibsign}" \
|
||||
-i "${libdir}"/${libname} \
|
||||
-o "${libdir}"/${chkname}.tmp \
|
||||
&& mv -f \
|
||||
"${libdir}"/${chkname}.tmp \
|
||||
"${libdir}"/${chkname} \
|
||||
|| die "Failed to sign ${libname}"
|
||||
done
|
||||
}
|
||||
|
||||
cleanup_chk() {
|
||||
local libdir="$1"
|
||||
shift 1
|
||||
for i in ${NSS_CHK_SIGN_LIBS} ; do
|
||||
local libfname="${libdir}/lib${i}.so"
|
||||
# If the major version has changed, then we have old chk files.
|
||||
[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
|
||||
&& rm -f "${libfname}.chk"
|
||||
done
|
||||
}
|
||||
|
||||
src_install () {
|
||||
MINOR_VERSION=12
|
||||
cd "${S}"/mozilla/security/dist || die
|
||||
|
||||
dodir /usr/$(get_libdir) || die
|
||||
cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
|
||||
# We generate these after stripping the libraries, else they don't match.
|
||||
#cp -L */lib/*.chk "${ED}"/usr/$(get_libdir) || die "copying chk files failed"
|
||||
cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
|
||||
|
||||
# Install nss-config and pkgconfig file
|
||||
dodir /usr/bin || die
|
||||
cp -L */bin/nss-config "${ED}"/usr/bin || die
|
||||
dodir /usr/$(get_libdir)/pkgconfig || die
|
||||
cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
|
||||
|
||||
# all the include files
|
||||
insinto /usr/include/nss
|
||||
doins public/nss/*.h || die
|
||||
cd "${ED}"/usr/$(get_libdir) || die
|
||||
local n=
|
||||
for file in *$(get_libname); do
|
||||
n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION})
|
||||
mv ${file} ${n} || die
|
||||
ln -s ${n} ${file} || die
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die
|
||||
fi
|
||||
done
|
||||
|
||||
local nssutils
|
||||
# Always enabled because we need it for chk generation.
|
||||
nssutils="shlibsign"
|
||||
if use utils; then
|
||||
# The tests we do not need to install.
|
||||
#nssutils_test="bltest crmftest dbtest dertimetest
|
||||
#fipstest remtest sdrtest"
|
||||
nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert
|
||||
cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
|
||||
nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
|
||||
pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
|
||||
symkeyutil tstclnt vfychain vfyserv"
|
||||
fi
|
||||
cd "${S}"/mozilla/security/dist/*/bin/ || die
|
||||
for f in $nssutils; do
|
||||
dobin ${f} || die
|
||||
done
|
||||
|
||||
# Prelink breaks the CHK files. We don't have any reliable way to run
|
||||
# shlibsign after prelink.
|
||||
declare -a libs
|
||||
for l in ${NSS_CHK_SIGN_LIBS} ; do
|
||||
libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
|
||||
done
|
||||
OLD_IFS="${IFS}" IFS=":" ; liblist="${libs[*]}" ; IFS="${OLD_IFS}"
|
||||
echo -e "PRELINK_PATH_MASK=${liblist}" >"${T}/90nss" || die
|
||||
unset libs liblist
|
||||
doenvd "${T}/90nss" || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# We must re-sign the libraries AFTER they are stripped.
|
||||
generate_chk "${EROOT}"/usr/bin/shlibsign "${EROOT}"/usr/$(get_libdir)
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
cleanup_chk "${EROOT}"/usr/$(get_libdir)
|
||||
}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
DIST openssl-1.0.1h.tar.gz 4475692 SHA256 9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093 SHA512 687d12ae13e364b15622f68933894050d577a4f8647bd68c7e9e86eb9d9f49cd2ebb0da3c5d3ded0a8746cf7b87e23b167b536116aa9a0402d7e7cc2ee401a92 WHIRLPOOL d453aaf24c6e2c8d9c5c76f76acfdaf8b511719fe25a4748c1681ff1d9e8a64b88249270e94900336cd110e1d7ee53a5e6d778a701967b7addb3f80c8335e5b2
|
||||
DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1
|
||||
|
|
@ -1,164 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-1.0.1,v 1.2 2014/01/17 04:27:03 vapier Exp $
|
||||
#
|
||||
# Openssl doesn't play along nicely with cross-compiling
|
||||
# like autotools based projects, so let's teach it new tricks.
|
||||
#
|
||||
# Review the bundled 'config' script to see why kind of targets
|
||||
# we can pass to the 'Configure' script.
|
||||
|
||||
|
||||
# Testing routines
|
||||
if [[ $1 == "test" ]] ; then
|
||||
for c in \
|
||||
"arm-gentoo-linux-uclibc |linux-generic32 -DL_ENDIAN" \
|
||||
"armv5b-linux-gnu |linux-armv4 -DB_ENDIAN" \
|
||||
"x86_64-pc-linux-gnu |linux-x86_64" \
|
||||
"alpha-linux-gnu |linux-alpha-gcc" \
|
||||
"alphaev56-unknown-linux-gnu |linux-alpha+bwx-gcc" \
|
||||
"i686-pc-linux-gnu |linux-elf" \
|
||||
"whatever-gentoo-freebsdX.Y |BSD-generic32" \
|
||||
"i686-gentoo-freebsdX.Y |BSD-x86-elf" \
|
||||
"sparc64-alpha-freebsdX.Y |BSD-sparc64" \
|
||||
"ia64-gentoo-freebsd5.99234 |BSD-ia64" \
|
||||
"x86_64-gentoo-freebsdX.Y |BSD-x86_64" \
|
||||
"hppa64-aldsF-linux-gnu5.3 |linux-generic32 -DB_ENDIAN" \
|
||||
"powerpc-gentOO-linux-uclibc |linux-ppc" \
|
||||
"powerpc64-unk-linux-gnu |linux-ppc64" \
|
||||
"x86_64-apple-darwinX |darwin64-x86_64-cc" \
|
||||
"powerpc64-apple-darwinX |darwin64-ppc-cc" \
|
||||
"i686-apple-darwinX |darwin-i386-cc" \
|
||||
"i386-apple-darwinX |darwin-i386-cc" \
|
||||
"powerpc-apple-darwinX |darwin-ppc-cc" \
|
||||
"i586-pc-winnt |winnt-parity" \
|
||||
"s390-ibm-linux-gnu |linux-generic32 -DB_ENDIAN" \
|
||||
"s390x-linux-gnu |linux64-s390x" \
|
||||
;do
|
||||
CHOST=${c/|*}
|
||||
ret_want=${c/*|}
|
||||
ret_got=$(CHOST=${CHOST} "$0")
|
||||
|
||||
if [[ ${ret_want} == "${ret_got}" ]] ; then
|
||||
echo "PASS: ${CHOST}"
|
||||
else
|
||||
echo "FAIL: ${CHOST}"
|
||||
echo -e "\twanted: ${ret_want}"
|
||||
echo -e "\twe got: ${ret_got}"
|
||||
fi
|
||||
done
|
||||
exit 0
|
||||
fi
|
||||
[[ -z ${CHOST} && -n $1 ]] && CHOST=$1
|
||||
|
||||
|
||||
# Detect the operating system
|
||||
case ${CHOST} in
|
||||
*-aix*) system="aix";;
|
||||
*-darwin*) system="darwin";;
|
||||
*-freebsd*) system="BSD";;
|
||||
*-hpux*) system="hpux";;
|
||||
*-linux*) system="linux";;
|
||||
*-solaris*) system="solaris";;
|
||||
*-winnt*) system="winnt";;
|
||||
x86_64-*-mingw*) system="mingw64";;
|
||||
*mingw*) system="mingw";;
|
||||
*) exit 0;;
|
||||
esac
|
||||
|
||||
|
||||
# Compiler munging
|
||||
compiler="gcc"
|
||||
if [[ ${CC} == "ccc" ]] ; then
|
||||
compiler=${CC}
|
||||
fi
|
||||
|
||||
|
||||
# Detect target arch
|
||||
machine=""
|
||||
chost_machine=${CHOST%%-*}
|
||||
case ${system} in
|
||||
linux)
|
||||
case ${chost_machine}:${ABI} in
|
||||
aarch64*be) machine="generic64 -DB_ENDIAN";;
|
||||
aarch64*) machine="generic64 -DL_ENDIAN";;
|
||||
alphaev56*|\
|
||||
alphaev[678]*)machine=alpha+bwx-${compiler};;
|
||||
alpha*) machine=alpha-${compiler};;
|
||||
armv[4-9]*b*) machine="armv4 -DB_ENDIAN";;
|
||||
armv[4-9]*) machine="armv4 -DL_ENDIAN";;
|
||||
arm*b*) machine="generic32 -DB_ENDIAN";;
|
||||
arm*) machine="generic32 -DL_ENDIAN";;
|
||||
avr*) machine="generic32 -DL_ENDIAN";;
|
||||
bfin*) machine="generic32 -DL_ENDIAN";;
|
||||
# hppa64*) machine=parisc64;;
|
||||
hppa*) machine="generic32 -DB_ENDIAN";;
|
||||
i[0-9]86*|\
|
||||
x86_64*:x86) machine=elf;;
|
||||
ia64*) machine=ia64;;
|
||||
m68*) machine="generic32 -DB_ENDIAN";;
|
||||
mips*el*) machine="generic32 -DL_ENDIAN";;
|
||||
mips*) machine="generic32 -DB_ENDIAN";;
|
||||
powerpc64*le) machine="generic64 -DL_ENDIAN";;
|
||||
powerpc64*) machine=ppc64;;
|
||||
powerpc*le) machine="generic32 -DL_ENDIAN";;
|
||||
powerpc*) machine=ppc;;
|
||||
# sh64*) machine=elf;;
|
||||
sh*b*) machine="generic32 -DB_ENDIAN";;
|
||||
sh*) machine="generic32 -DL_ENDIAN";;
|
||||
sparc*v7*) machine="generic32 -DB_ENDIAN";;
|
||||
sparc64*) machine=sparcv9;;
|
||||
sparc*) machine=sparcv8;;
|
||||
s390x*) machine=s390x system=linux64;;
|
||||
s390*) machine="generic32 -DB_ENDIAN";;
|
||||
x86_64*:x32) machine=x32;;
|
||||
x86_64*) machine=x86_64;;
|
||||
esac
|
||||
;;
|
||||
BSD)
|
||||
case ${chost_machine} in
|
||||
alpha*) machine=generic64;;
|
||||
i[6-9]86*) machine=x86-elf;;
|
||||
ia64*) machine=ia64;;
|
||||
sparc64*) machine=sparc64;;
|
||||
x86_64*) machine=x86_64;;
|
||||
*) machine=generic32;;
|
||||
esac
|
||||
;;
|
||||
aix)
|
||||
machine=${compiler}
|
||||
;;
|
||||
darwin)
|
||||
case ${chost_machine} in
|
||||
powerpc64) machine=ppc-cc; system=${system}64;;
|
||||
powerpc) machine=ppc-cc;;
|
||||
i?86*) machine=i386-cc;;
|
||||
x86_64) machine=x86_64-cc; system=${system}64;;
|
||||
esac
|
||||
;;
|
||||
hpux)
|
||||
case ${chost_machine} in
|
||||
ia64) machine=ia64-${compiler} ;;
|
||||
esac
|
||||
;;
|
||||
solaris)
|
||||
case ${chost_machine} in
|
||||
i386) machine=x86-${compiler} ;;
|
||||
x86_64*) machine=x86_64-${compiler}; system=${system}64;;
|
||||
sparcv9*) machine=sparcv9-${compiler}; system=${system}64;;
|
||||
sparc*) machine=sparcv8-${compiler};;
|
||||
esac
|
||||
;;
|
||||
winnt)
|
||||
machine=parity
|
||||
;;
|
||||
mingw*)
|
||||
# special case ... no xxx-yyy style name
|
||||
echo ${system}
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
# If we have something, show it
|
||||
[[ -n ${machine} ]] && echo ${system}-${machine}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
http://bugs.gentoo.org/327421
|
||||
|
||||
--- Makefile.org
|
||||
+++ Makefile.org
|
||||
@@ -189,6 +189,7 @@
|
||||
MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \
|
||||
DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)' \
|
||||
MAKEDEPPROG='$(MAKEDEPPROG)' \
|
||||
+ LDFLAGS='${LDFLAGS}' \
|
||||
SHARED_LDFLAGS='$(SHARED_LDFLAGS)' \
|
||||
KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)' \
|
||||
ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)' \
|
||||
--- Makefile.shared
|
||||
+++ Makefile.shared
|
||||
@@ -153,7 +153,7 @@
|
||||
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
|
||||
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
|
||||
|
||||
-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
|
||||
+DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS)"
|
||||
|
||||
#This is rather special. It's a special target with which one can link
|
||||
#applications without bothering with any features that have anything to
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
URL: http://rt.openssl.org/Ticket/Display.html?id=2558
|
||||
Subject: make windres controllable via build env var settings
|
||||
|
||||
atm, the windres code in openssl is only usable via the cross-compile prefix
|
||||
option unlike all the other build tools. so add support for the standard $RC
|
||||
/ $WINDRES env vars as well.
|
||||
|
||||
Index: Configure
|
||||
===================================================================
|
||||
RCS file: /usr/local/src/openssl/CVSROOT/openssl/Configure,v
|
||||
retrieving revision 1.621.2.40
|
||||
diff -u -p -r1.621.2.40 Configure
|
||||
--- Configure 30 Nov 2010 22:19:26 -0000 1.621.2.40
|
||||
+++ Configure 4 Jul 2011 23:12:32 -0000
|
||||
@@ -1094,6 +1094,7 @@ my $shared_extension = $fields[$idx_shar
|
||||
my $ranlib = $ENV{'RANLIB'} || $fields[$idx_ranlib];
|
||||
my $ar = $ENV{'AR'} || "ar";
|
||||
my $arflags = $fields[$idx_arflags];
|
||||
+my $windres = $ENV{'RC'} || $ENV{'WINDRES'} || "windres";
|
||||
my $multilib = $fields[$idx_multilib];
|
||||
|
||||
# if $prefix/lib$multilib is not an existing directory, then
|
||||
@@ -1511,12 +1512,14 @@ while (<IN>)
|
||||
s/^AR=\s*/AR= \$\(CROSS_COMPILE\)/;
|
||||
s/^NM=\s*/NM= \$\(CROSS_COMPILE\)/;
|
||||
s/^RANLIB=\s*/RANLIB= \$\(CROSS_COMPILE\)/;
|
||||
+ s/^WINDRES=\s*/WINDRES= \$\(CROSS_COMPILE\)/;
|
||||
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE\)$cc/ if $cc eq "gcc";
|
||||
}
|
||||
else {
|
||||
s/^CC=.*$/CC= $cc/;
|
||||
s/^AR=\s*ar/AR= $ar/;
|
||||
s/^RANLIB=.*/RANLIB= $ranlib/;
|
||||
+ s/^WINDRES=.*/WINDRES= $windres/;
|
||||
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
|
||||
}
|
||||
s/^CFLAG=.*$/CFLAG= $cflags/;
|
||||
Index: Makefile.org
|
||||
===================================================================
|
||||
RCS file: /usr/local/src/openssl/CVSROOT/openssl/Makefile.org,v
|
||||
retrieving revision 1.295.2.10
|
||||
diff -u -p -r1.295.2.10 Makefile.org
|
||||
--- Makefile.org 27 Jan 2010 16:06:58 -0000 1.295.2.10
|
||||
+++ Makefile.org 4 Jul 2011 23:13:08 -0000
|
||||
@@ -66,6 +66,7 @@ EXE_EXT=
|
||||
ARFLAGS=
|
||||
AR=ar $(ARFLAGS) r
|
||||
RANLIB= ranlib
|
||||
+WINDRES= windres
|
||||
NM= nm
|
||||
PERL= perl
|
||||
TAR= tar
|
||||
@@ -180,6 +181,7 @@ BUILDENV= PLATFORM='$(PLATFORM)' PROCESS
|
||||
CC='$(CC)' CFLAG='$(CFLAG)' \
|
||||
AS='$(CC)' ASFLAG='$(CFLAG) -c' \
|
||||
AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' \
|
||||
+ WINDRES='$(WINDRES)' \
|
||||
CROSS_COMPILE='$(CROSS_COMPILE)' \
|
||||
PERL='$(PERL)' ENGDIRS='$(ENGDIRS)' \
|
||||
SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)' \
|
||||
Index: Makefile.shared
|
||||
===================================================================
|
||||
RCS file: /usr/local/src/openssl/CVSROOT/openssl/Makefile.shared,v
|
||||
retrieving revision 1.72.2.4
|
||||
diff -u -p -r1.72.2.4 Makefile.shared
|
||||
--- Makefile.shared 21 Aug 2010 11:36:49 -0000 1.72.2.4
|
||||
+++ Makefile.shared 4 Jul 2011 23:13:52 -0000
|
||||
@@ -293,7 +293,7 @@ link_a.cygwin:
|
||||
fi; \
|
||||
dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
|
||||
$(PERL) util/mkrc.pl $$dll_name | \
|
||||
- $(CROSS_COMPILE)windres -o rc.o; \
|
||||
+ $(WINDRES) -o rc.o; \
|
||||
extras="$$extras rc.o"; \
|
||||
ALLSYMSFLAGS='-Wl,--whole-archive'; \
|
||||
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
depend on other pc files rather than encoding library info directly in
|
||||
every pkg-config file
|
||||
|
||||
--- a/Makefile.org
|
||||
+++ b/Makefile.org
|
||||
@@ -335,11 +335,11 @@ libssl.pc: Makefile
|
||||
echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
|
||||
echo 'includedir=$${prefix}/include'; \
|
||||
echo ''; \
|
||||
- echo 'Name: OpenSSL'; \
|
||||
+ echo 'Name: OpenSSL-libssl'; \
|
||||
echo 'Description: Secure Sockets Layer and cryptography libraries'; \
|
||||
echo 'Version: '$(VERSION); \
|
||||
- echo 'Requires: '; \
|
||||
- echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
|
||||
+ echo 'Requires.private: libcrypto'; \
|
||||
+ echo 'Libs: -L$${libdir} -lssl'; \
|
||||
echo 'Libs.private: $(EX_LIBS)'; \
|
||||
echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
|
||||
|
||||
@@ -352,10 +353,7 @@ openssl.pc: Makefile
|
||||
echo 'Name: OpenSSL'; \
|
||||
echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
|
||||
echo 'Version: '$(VERSION); \
|
||||
- echo 'Requires: '; \
|
||||
- echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
|
||||
- echo 'Libs.private: $(EX_LIBS)'; \
|
||||
- echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
|
||||
+ echo 'Requires: libssl libcrypto' ) > openssl.pc
|
||||
|
||||
Makefile: Makefile.org Configure config
|
||||
@echo "Makefile is older than Makefile.org, Configure or config."
|
||||
|
|
@ -1,354 +0,0 @@
|
|||
http://rt.openssl.org/Ticket/Display.html?id=2084
|
||||
|
||||
--- a/Makefile.org
|
||||
+++ b/Makefile.org
|
||||
@@ -247,17 +247,17 @@
|
||||
build_libs: build_crypto build_ssl build_engines
|
||||
|
||||
build_crypto:
|
||||
- @dir=crypto; target=all; $(BUILD_ONE_CMD)
|
||||
+ +@dir=crypto; target=all; $(BUILD_ONE_CMD)
|
||||
-build_ssl:
|
||||
+build_ssl: build_crypto
|
||||
- @dir=ssl; target=all; $(BUILD_ONE_CMD)
|
||||
+ +@dir=ssl; target=all; $(BUILD_ONE_CMD)
|
||||
-build_engines:
|
||||
+build_engines: build_crypto
|
||||
- @dir=engines; target=all; $(BUILD_ONE_CMD)
|
||||
+ +@dir=engines; target=all; $(BUILD_ONE_CMD)
|
||||
-build_apps:
|
||||
+build_apps: build_libs
|
||||
- @dir=apps; target=all; $(BUILD_ONE_CMD)
|
||||
+ +@dir=apps; target=all; $(BUILD_ONE_CMD)
|
||||
-build_tests:
|
||||
+build_tests: build_libs
|
||||
- @dir=test; target=all; $(BUILD_ONE_CMD)
|
||||
+ +@dir=test; target=all; $(BUILD_ONE_CMD)
|
||||
-build_tools:
|
||||
+build_tools: build_libs
|
||||
- @dir=tools; target=all; $(BUILD_ONE_CMD)
|
||||
+ +@dir=tools; target=all; $(BUILD_ONE_CMD)
|
||||
|
||||
all_testapps: build_libs build_testapps
|
||||
build_testapps:
|
||||
@@ -497,9 +497,9 @@
|
||||
dist_pem_h:
|
||||
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
|
||||
|
||||
-install: all install_docs install_sw
|
||||
+install: install_docs install_sw
|
||||
|
||||
-install_sw:
|
||||
+install_dirs:
|
||||
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
|
||||
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
|
||||
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
|
||||
@@ -508,6 +508,13 @@
|
||||
$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
|
||||
$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
|
||||
$(INSTALL_PREFIX)$(OPENSSLDIR)/private
|
||||
+ @$(PERL) $(TOP)/util/mkdir-p.pl \
|
||||
+ $(INSTALL_PREFIX)$(MANDIR)/man1 \
|
||||
+ $(INSTALL_PREFIX)$(MANDIR)/man3 \
|
||||
+ $(INSTALL_PREFIX)$(MANDIR)/man5 \
|
||||
+ $(INSTALL_PREFIX)$(MANDIR)/man7
|
||||
+
|
||||
+install_sw: install_dirs
|
||||
@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
|
||||
do \
|
||||
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
|
||||
@@ -511,7 +511,7 @@
|
||||
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
|
||||
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
|
||||
done;
|
||||
- @set -e; target=install; $(RECURSIVE_BUILD_CMD)
|
||||
+ +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
|
||||
@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
|
||||
do \
|
||||
if [ -f "$$i" ]; then \
|
||||
@@ -593,12 +600,7 @@
|
||||
done; \
|
||||
done
|
||||
|
||||
-install_docs:
|
||||
- @$(PERL) $(TOP)/util/mkdir-p.pl \
|
||||
- $(INSTALL_PREFIX)$(MANDIR)/man1 \
|
||||
- $(INSTALL_PREFIX)$(MANDIR)/man3 \
|
||||
- $(INSTALL_PREFIX)$(MANDIR)/man5 \
|
||||
- $(INSTALL_PREFIX)$(MANDIR)/man7
|
||||
+install_docs: install_dirs
|
||||
@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
|
||||
here="`pwd`"; \
|
||||
filecase=; \
|
||||
--- a/Makefile.shared
|
||||
+++ b/Makefile.shared
|
||||
@@ -105,6 +105,7 @@ LINK_SO= \
|
||||
SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
|
||||
LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
|
||||
LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
|
||||
+ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
|
||||
LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
|
||||
$${SHAREDCMD} $${SHAREDFLAGS} \
|
||||
-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
|
||||
@@ -122,6 +124,7 @@ SYMLINK_SO= \
|
||||
done; \
|
||||
fi; \
|
||||
if [ -n "$$SHLIB_SOVER" ]; then \
|
||||
+ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
|
||||
( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
|
||||
ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
|
||||
fi; \
|
||||
--- a/crypto/Makefile
|
||||
+++ b/crypto/Makefile
|
||||
@@ -85,11 +85,11 @@
|
||||
@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
|
||||
|
||||
subdirs:
|
||||
- @target=all; $(RECURSIVE_MAKE)
|
||||
+ +@target=all; $(RECURSIVE_MAKE)
|
||||
|
||||
files:
|
||||
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
|
||||
- @target=files; $(RECURSIVE_MAKE)
|
||||
+ +@target=files; $(RECURSIVE_MAKE)
|
||||
|
||||
links:
|
||||
@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
|
||||
@@ -100,7 +100,7 @@
|
||||
# lib: $(LIB): are splitted to avoid end-less loop
|
||||
lib: $(LIB)
|
||||
@touch lib
|
||||
-$(LIB): $(LIBOBJ)
|
||||
+$(LIB): $(LIBOBJ) | subdirs
|
||||
$(AR) $(LIB) $(LIBOBJ)
|
||||
$(RANLIB) $(LIB) || echo Never mind.
|
||||
|
||||
@@ -110,7 +110,7 @@
|
||||
fi
|
||||
|
||||
libs:
|
||||
- @target=lib; $(RECURSIVE_MAKE)
|
||||
+ +@target=lib; $(RECURSIVE_MAKE)
|
||||
|
||||
install:
|
||||
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
|
||||
@@ -119,7 +119,7 @@
|
||||
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
|
||||
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
|
||||
done;
|
||||
- @target=install; $(RECURSIVE_MAKE)
|
||||
+ +@target=install; $(RECURSIVE_MAKE)
|
||||
|
||||
lint:
|
||||
@target=lint; $(RECURSIVE_MAKE)
|
||||
--- a/engines/Makefile
|
||||
+++ b/engines/Makefile
|
||||
@@ -72,7 +72,7 @@
|
||||
|
||||
all: lib subdirs
|
||||
|
||||
-lib: $(LIBOBJ)
|
||||
+lib: $(LIBOBJ) | subdirs
|
||||
@if [ -n "$(SHARED_LIBS)" ]; then \
|
||||
set -e; \
|
||||
for l in $(LIBNAMES); do \
|
||||
@@ -89,7 +89,7 @@
|
||||
|
||||
subdirs:
|
||||
echo $(EDIRS)
|
||||
- @target=all; $(RECURSIVE_MAKE)
|
||||
+ +@target=all; $(RECURSIVE_MAKE)
|
||||
|
||||
files:
|
||||
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
|
||||
@@ -128,7 +128,7 @@
|
||||
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
|
||||
done; \
|
||||
fi
|
||||
- @target=install; $(RECURSIVE_MAKE)
|
||||
+ +@target=install; $(RECURSIVE_MAKE)
|
||||
|
||||
tags:
|
||||
ctags $(SRC)
|
||||
--- a/test/Makefile
|
||||
+++ b/test/Makefile
|
||||
@@ -123,7 +123,7 @@
|
||||
tags:
|
||||
ctags $(SRC)
|
||||
|
||||
-tests: exe apps $(TESTS)
|
||||
+tests: exe $(TESTS)
|
||||
|
||||
apps:
|
||||
@(cd ..; $(MAKE) DIRS=apps all)
|
||||
@@ -365,109 +365,109 @@
|
||||
link_app.$${shlib_target}
|
||||
|
||||
$(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
|
||||
- @target=$(RSATEST); $(BUILD_CMD)
|
||||
+ +@target=$(RSATEST); $(BUILD_CMD)
|
||||
|
||||
$(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
|
||||
- @target=$(BNTEST); $(BUILD_CMD)
|
||||
+ +@target=$(BNTEST); $(BUILD_CMD)
|
||||
|
||||
$(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
|
||||
- @target=$(ECTEST); $(BUILD_CMD)
|
||||
+ +@target=$(ECTEST); $(BUILD_CMD)
|
||||
|
||||
$(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
|
||||
- @target=$(EXPTEST); $(BUILD_CMD)
|
||||
+ +@target=$(EXPTEST); $(BUILD_CMD)
|
||||
|
||||
$(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
|
||||
- @target=$(IDEATEST); $(BUILD_CMD)
|
||||
+ +@target=$(IDEATEST); $(BUILD_CMD)
|
||||
|
||||
$(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
|
||||
- @target=$(MD2TEST); $(BUILD_CMD)
|
||||
+ +@target=$(MD2TEST); $(BUILD_CMD)
|
||||
|
||||
$(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
|
||||
- @target=$(SHATEST); $(BUILD_CMD)
|
||||
+ +@target=$(SHATEST); $(BUILD_CMD)
|
||||
|
||||
$(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
|
||||
- @target=$(SHA1TEST); $(BUILD_CMD)
|
||||
+ +@target=$(SHA1TEST); $(BUILD_CMD)
|
||||
|
||||
$(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
|
||||
- @target=$(SHA256TEST); $(BUILD_CMD)
|
||||
+ +@target=$(SHA256TEST); $(BUILD_CMD)
|
||||
|
||||
$(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
|
||||
- @target=$(SHA512TEST); $(BUILD_CMD)
|
||||
+ +@target=$(SHA512TEST); $(BUILD_CMD)
|
||||
|
||||
$(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
|
||||
- @target=$(RMDTEST); $(BUILD_CMD)
|
||||
+ +@target=$(RMDTEST); $(BUILD_CMD)
|
||||
|
||||
$(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
|
||||
- @target=$(MDC2TEST); $(BUILD_CMD)
|
||||
+ +@target=$(MDC2TEST); $(BUILD_CMD)
|
||||
|
||||
$(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
|
||||
- @target=$(MD4TEST); $(BUILD_CMD)
|
||||
+ +@target=$(MD4TEST); $(BUILD_CMD)
|
||||
|
||||
$(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
|
||||
- @target=$(MD5TEST); $(BUILD_CMD)
|
||||
+ +@target=$(MD5TEST); $(BUILD_CMD)
|
||||
|
||||
$(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
|
||||
- @target=$(HMACTEST); $(BUILD_CMD)
|
||||
+ +@target=$(HMACTEST); $(BUILD_CMD)
|
||||
|
||||
$(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
|
||||
- @target=$(WPTEST); $(BUILD_CMD)
|
||||
+ +@target=$(WPTEST); $(BUILD_CMD)
|
||||
|
||||
$(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
|
||||
- @target=$(RC2TEST); $(BUILD_CMD)
|
||||
+ +@target=$(RC2TEST); $(BUILD_CMD)
|
||||
|
||||
$(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
|
||||
- @target=$(BFTEST); $(BUILD_CMD)
|
||||
+ +@target=$(BFTEST); $(BUILD_CMD)
|
||||
|
||||
$(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
|
||||
- @target=$(CASTTEST); $(BUILD_CMD)
|
||||
+ +@target=$(CASTTEST); $(BUILD_CMD)
|
||||
|
||||
$(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
|
||||
- @target=$(RC4TEST); $(BUILD_CMD)
|
||||
+ +@target=$(RC4TEST); $(BUILD_CMD)
|
||||
|
||||
$(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
|
||||
- @target=$(RC5TEST); $(BUILD_CMD)
|
||||
+ +@target=$(RC5TEST); $(BUILD_CMD)
|
||||
|
||||
$(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
|
||||
- @target=$(DESTEST); $(BUILD_CMD)
|
||||
+ +@target=$(DESTEST); $(BUILD_CMD)
|
||||
|
||||
$(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
|
||||
- @target=$(RANDTEST); $(BUILD_CMD)
|
||||
+ +@target=$(RANDTEST); $(BUILD_CMD)
|
||||
|
||||
$(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
|
||||
- @target=$(DHTEST); $(BUILD_CMD)
|
||||
+ +@target=$(DHTEST); $(BUILD_CMD)
|
||||
|
||||
$(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
|
||||
- @target=$(DSATEST); $(BUILD_CMD)
|
||||
+ +@target=$(DSATEST); $(BUILD_CMD)
|
||||
|
||||
$(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
|
||||
- @target=$(METHTEST); $(BUILD_CMD)
|
||||
+ +@target=$(METHTEST); $(BUILD_CMD)
|
||||
|
||||
$(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
|
||||
- @target=$(SSLTEST); $(FIPS_BUILD_CMD)
|
||||
+ +@target=$(SSLTEST); $(FIPS_BUILD_CMD)
|
||||
|
||||
$(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
|
||||
- @target=$(ENGINETEST); $(BUILD_CMD)
|
||||
+ +@target=$(ENGINETEST); $(BUILD_CMD)
|
||||
|
||||
$(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
|
||||
- @target=$(EVPTEST); $(BUILD_CMD)
|
||||
+ +@target=$(EVPTEST); $(BUILD_CMD)
|
||||
|
||||
$(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
|
||||
- @target=$(ECDSATEST); $(BUILD_CMD)
|
||||
+ +@target=$(ECDSATEST); $(BUILD_CMD)
|
||||
|
||||
$(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
|
||||
- @target=$(ECDHTEST); $(BUILD_CMD)
|
||||
+ +@target=$(ECDHTEST); $(BUILD_CMD)
|
||||
|
||||
$(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
|
||||
- @target=$(IGETEST); $(BUILD_CMD)
|
||||
+ +@target=$(IGETEST); $(BUILD_CMD)
|
||||
|
||||
$(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
|
||||
- @target=$(JPAKETEST); $(BUILD_CMD)
|
||||
+ +@target=$(JPAKETEST); $(BUILD_CMD)
|
||||
|
||||
$(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
|
||||
- @target=$(ASN1TEST); $(BUILD_CMD)
|
||||
+ +@target=$(ASN1TEST); $(BUILD_CMD)
|
||||
|
||||
$(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
|
||||
- @target=$(SRPTEST); $(BUILD_CMD)
|
||||
+ +@target=$(SRPTEST); $(BUILD_CMD)
|
||||
|
||||
#$(AESTEST).o: $(AESTEST).c
|
||||
# $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
|
||||
@@ -480,7 +480,7 @@
|
||||
# fi
|
||||
|
||||
dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
|
||||
- @target=dummytest; $(BUILD_CMD)
|
||||
+ +@target=dummytest; $(BUILD_CMD)
|
||||
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
||||
--- a/crypto/objects/Makefile
|
||||
+++ b/crypto/objects/Makefile
|
||||
@@ -44,11 +44,11 @@ obj_dat.h: obj_dat.pl obj_mac.h
|
||||
# objects.pl both reads and writes obj_mac.num
|
||||
obj_mac.h: objects.pl objects.txt obj_mac.num
|
||||
$(PERL) objects.pl objects.txt obj_mac.num obj_mac.h
|
||||
- @sleep 1; touch obj_mac.h; sleep 1
|
||||
|
||||
-obj_xref.h: objxref.pl obj_xref.txt obj_mac.num
|
||||
+# This doesn't really need obj_mac.h, but since that rule reads & writes
|
||||
+# obj_mac.num, we can't run in parallel with it.
|
||||
+obj_xref.h: objxref.pl obj_xref.txt obj_mac.num obj_mac.h
|
||||
$(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h
|
||||
- @sleep 1; touch obj_xref.h; sleep 1
|
||||
|
||||
files:
|
||||
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
|
||||
|
|
@ -1,79 +0,0 @@
|
|||
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=51bfed2e26fc13a66e8b5710aa2ce1d7a04af721
|
||||
|
||||
UpstreamStatus: Pending
|
||||
|
||||
Received from H J Liu @ Intel
|
||||
Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors.
|
||||
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13
|
||||
|
||||
ported the patch to the 1.0.0e version
|
||||
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
|
||||
Index: openssl-1.0.0e/Configure
|
||||
===================================================================
|
||||
--- openssl-1.0.0e.orig/Configure
|
||||
+++ openssl-1.0.0e/Configure
|
||||
@@ -393,6 +393,7 @@ my %table=(
|
||||
"debug-linux-generic32","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||
"debug-linux-generic64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||
"debug-linux-x86_64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
|
||||
+"linux-x32", "gcc:-DL_ENDIAN -DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||
"dist", "cc:-O::(unknown)::::::",
|
||||
|
||||
# Basic configs that should work on any (32 and less bit) box
|
||||
Index: openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c
|
||||
===================================================================
|
||||
--- openssl-1.0.0e.orig/crypto/bn/asm/x86_64-gcc.c
|
||||
+++ openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c
|
||||
@@ -55,7 +55,7 @@
|
||||
* machine.
|
||||
*/
|
||||
|
||||
-#ifdef _WIN64
|
||||
+#if defined _WIN64 || !defined __LP64__
|
||||
#define BN_ULONG unsigned long long
|
||||
#else
|
||||
#define BN_ULONG unsigned long
|
||||
@@ -192,9 +192,9 @@ BN_ULONG bn_add_words (BN_ULONG *rp, con
|
||||
asm (
|
||||
" subq %2,%2 \n"
|
||||
".p2align 4 \n"
|
||||
- "1: movq (%4,%2,8),%0 \n"
|
||||
- " adcq (%5,%2,8),%0 \n"
|
||||
- " movq %0,(%3,%2,8) \n"
|
||||
+ "1: movq (%q4,%2,8),%0 \n"
|
||||
+ " adcq (%q5,%2,8),%0 \n"
|
||||
+ " movq %0,(%q3,%2,8) \n"
|
||||
" leaq 1(%2),%2 \n"
|
||||
" loop 1b \n"
|
||||
" sbbq %0,%0 \n"
|
||||
@@ -215,9 +215,9 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, con
|
||||
asm (
|
||||
" subq %2,%2 \n"
|
||||
".p2align 4 \n"
|
||||
- "1: movq (%4,%2,8),%0 \n"
|
||||
- " sbbq (%5,%2,8),%0 \n"
|
||||
- " movq %0,(%3,%2,8) \n"
|
||||
+ "1: movq (%q4,%2,8),%0 \n"
|
||||
+ " sbbq (%q5,%2,8),%0 \n"
|
||||
+ " movq %0,(%q3,%2,8) \n"
|
||||
" leaq 1(%2),%2 \n"
|
||||
" loop 1b \n"
|
||||
" sbbq %0,%0 \n"
|
||||
Index: openssl-1.0.0e/crypto/bn/bn.h
|
||||
===================================================================
|
||||
--- openssl-1.0.0e.orig/crypto/bn/bn.h
|
||||
+++ openssl-1.0.0e/crypto/bn/bn.h
|
||||
@@ -172,6 +172,13 @@ extern "C" {
|
||||
# endif
|
||||
#endif
|
||||
|
||||
+/* Address type. */
|
||||
+#ifdef _WIN64
|
||||
+#define BN_ADDR unsigned long long
|
||||
+#else
|
||||
+#define BN_ADDR unsigned long
|
||||
+#endif
|
||||
+
|
||||
/* assuming long is 64bit - this is the DEC Alpha
|
||||
* unsigned long long is only 64 bits :-(, don't define
|
||||
* BN_LLONG for the DEC Alpha */
|
||||
|
|
@ -1,656 +0,0 @@
|
|||
http://rt.openssl.org/Ticket/Display.html?id=2051
|
||||
user/pass: guest/guest
|
||||
|
||||
Index: apps/s_apps.h
|
||||
===================================================================
|
||||
RCS file: /v/openssl/cvs/openssl/apps/s_apps.h,v
|
||||
retrieving revision 1.21.2.1
|
||||
diff -u -r1.21.2.1 s_apps.h
|
||||
--- apps/s_apps.h 4 Sep 2009 17:42:04 -0000 1.21.2.1
|
||||
+++ apps/s_apps.h 28 Dec 2011 00:28:14 -0000
|
||||
@@ -148,7 +148,7 @@
|
||||
#define PORT_STR "4433"
|
||||
#define PROTOCOL "tcp"
|
||||
|
||||
-int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
|
||||
+int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context, int use_ipv4, int use_ipv6);
|
||||
#ifdef HEADER_X509_H
|
||||
int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
|
||||
#endif
|
||||
@@ -156,7 +156,7 @@
|
||||
int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
|
||||
int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key);
|
||||
#endif
|
||||
-int init_client(int *sock, char *server, int port, int type);
|
||||
+int init_client(int *sock, char *server, int port, int type, int use_ipv4, int use_ipv6);
|
||||
int should_retry(int i);
|
||||
int extract_port(char *str, short *port_ptr);
|
||||
int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p);
|
||||
Index: apps/s_client.c
|
||||
===================================================================
|
||||
RCS file: /v/openssl/cvs/openssl/apps/s_client.c,v
|
||||
retrieving revision 1.123.2.6.2.10
|
||||
diff -u -r1.123.2.6.2.10 s_client.c
|
||||
--- apps/s_client.c 14 Dec 2011 22:18:02 -0000 1.123.2.6.2.10
|
||||
+++ apps/s_client.c 28 Dec 2011 00:28:14 -0000
|
||||
@@ -285,6 +285,10 @@
|
||||
{
|
||||
BIO_printf(bio_err,"usage: s_client args\n");
|
||||
BIO_printf(bio_err,"\n");
|
||||
+ BIO_printf(bio_err," -4 - use IPv4 only\n");
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ BIO_printf(bio_err," -6 - use IPv6 only\n");
|
||||
+#endif
|
||||
BIO_printf(bio_err," -host host - use -connect instead\n");
|
||||
BIO_printf(bio_err," -port port - use -connect instead\n");
|
||||
BIO_printf(bio_err," -connect host:port - who to connect to (default is %s:%s)\n",SSL_HOST_NAME,PORT_STR);
|
||||
@@ -564,6 +567,7 @@
|
||||
int sbuf_len,sbuf_off;
|
||||
fd_set readfds,writefds;
|
||||
short port=PORT;
|
||||
+ int use_ipv4, use_ipv6;
|
||||
int full_log=1;
|
||||
char *host=SSL_HOST_NAME;
|
||||
char *cert_file=NULL,*key_file=NULL;
|
||||
@@ -609,7 +613,11 @@
|
||||
#endif
|
||||
char *sess_in = NULL;
|
||||
char *sess_out = NULL;
|
||||
- struct sockaddr peer;
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ struct sockaddr_storage peer;
|
||||
+#else
|
||||
+ struct sockaddr_in peer;
|
||||
+#endif
|
||||
int peerlen = sizeof(peer);
|
||||
int enable_timeouts = 0 ;
|
||||
long socket_mtu = 0;
|
||||
@@ -630,6 +638,12 @@
|
||||
meth=SSLv2_client_method();
|
||||
#endif
|
||||
|
||||
+ use_ipv4 = 1;
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ use_ipv6 = 1;
|
||||
+#else
|
||||
+ use_ipv6 = 0;
|
||||
+#endif
|
||||
apps_startup();
|
||||
c_Pause=0;
|
||||
c_quiet=0;
|
||||
@@ -951,6 +961,18 @@
|
||||
jpake_secret = *++argv;
|
||||
}
|
||||
#endif
|
||||
+ else if (strcmp(*argv,"-4") == 0)
|
||||
+ {
|
||||
+ use_ipv4 = 1;
|
||||
+ use_ipv6 = 0;
|
||||
+ }
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ else if (strcmp(*argv,"-6") == 0)
|
||||
+ {
|
||||
+ use_ipv4 = 0;
|
||||
+ use_ipv6 = 1;
|
||||
+ }
|
||||
+#endif
|
||||
#ifndef OPENSSL_NO_SRTP
|
||||
else if (strcmp(*argv,"-use_srtp") == 0)
|
||||
{
|
||||
@@ -1259,7 +1276,7 @@
|
||||
|
||||
re_start:
|
||||
|
||||
- if (init_client(&s,host,port,socket_type) == 0)
|
||||
+ if (init_client(&s,host,port,socket_type,use_ipv4,use_ipv6) == 0)
|
||||
{
|
||||
BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error());
|
||||
SHUTDOWN(s);
|
||||
@@ -1285,7 +1302,7 @@
|
||||
{
|
||||
|
||||
sbio=BIO_new_dgram(s,BIO_NOCLOSE);
|
||||
- if (getsockname(s, &peer, (void *)&peerlen) < 0)
|
||||
+ if (getsockname(s, (struct sockaddr *)&peer, (void *)&peerlen) < 0)
|
||||
{
|
||||
BIO_printf(bio_err, "getsockname:errno=%d\n",
|
||||
get_last_socket_error());
|
||||
===================================================================
|
||||
RCS file: /v/openssl/cvs/openssl/apps/s_server.c,v
|
||||
retrieving revision 1.136.2.15.2.13
|
||||
diff -u -r1.136.2.15.2.13 s_server.c
|
||||
--- apps/s_server.c 27 Dec 2011 14:23:22 -0000 1.136.2.15.2.13
|
||||
+++ apps/s_server.c 28 Dec 2011 00:28:14 -0000
|
||||
@@ -558,6 +558,10 @@
|
||||
# endif
|
||||
BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list");
|
||||
#endif
|
||||
+ BIO_printf(bio_err," -4 - use IPv4 only\n");
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ BIO_printf(bio_err," -6 - use IPv6 only\n");
|
||||
+#endif
|
||||
BIO_printf(bio_err," -keymatexport label - Export keying material using label\n");
|
||||
BIO_printf(bio_err," -keymatexportlen len - Export len bytes of keying material (default 20)\n");
|
||||
}
|
||||
@@ -943,6 +947,7 @@
|
||||
int state=0;
|
||||
const SSL_METHOD *meth=NULL;
|
||||
int socket_type=SOCK_STREAM;
|
||||
+ int use_ipv4, use_ipv6;
|
||||
ENGINE *e=NULL;
|
||||
char *inrand=NULL;
|
||||
int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM;
|
||||
@@ -981,6 +986,12 @@
|
||||
/* #error no SSL version enabled */
|
||||
#endif
|
||||
|
||||
+ use_ipv4 = 1;
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ use_ipv6 = 1;
|
||||
+#else
|
||||
+ use_ipv6 = 0;
|
||||
+#endif
|
||||
local_argc=argc;
|
||||
local_argv=argv;
|
||||
|
||||
@@ -1329,6 +1340,18 @@
|
||||
jpake_secret = *(++argv);
|
||||
}
|
||||
#endif
|
||||
+ else if (strcmp(*argv,"-4") == 0)
|
||||
+ {
|
||||
+ use_ipv4 = 1;
|
||||
+ use_ipv6 = 0;
|
||||
+ }
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ else if (strcmp(*argv,"-6") == 0)
|
||||
+ {
|
||||
+ use_ipv4 = 0;
|
||||
+ use_ipv6 = 1;
|
||||
+ }
|
||||
+#endif
|
||||
#ifndef OPENSSL_NO_SRTP
|
||||
else if (strcmp(*argv,"-use_srtp") == 0)
|
||||
{
|
||||
@@ -1884,9 +1907,9 @@
|
||||
BIO_printf(bio_s_out,"ACCEPT\n");
|
||||
(void)BIO_flush(bio_s_out);
|
||||
if (www)
|
||||
- do_server(port,socket_type,&accept_socket,www_body, context);
|
||||
+ do_server(port,socket_type,&accept_socket,www_body, context, use_ipv4, use_ipv6);
|
||||
else
|
||||
- do_server(port,socket_type,&accept_socket,sv_body, context);
|
||||
+ do_server(port,socket_type,&accept_socket,sv_body, context, use_ipv4, use_ipv6);
|
||||
print_stats(bio_s_out,ctx);
|
||||
ret=0;
|
||||
end:
|
||||
Index: apps/s_socket.c
|
||||
===================================================================
|
||||
RCS file: /v/openssl/cvs/openssl/apps/s_socket.c,v
|
||||
retrieving revision 1.43.2.3.2.2
|
||||
diff -u -r1.43.2.3.2.2 s_socket.c
|
||||
--- apps/s_socket.c 2 Dec 2011 14:39:40 -0000 1.43.2.3.2.2
|
||||
+++ apps/s_socket.c 28 Dec 2011 00:28:14 -0000
|
||||
@@ -97,16 +97,16 @@
|
||||
#include "netdb.h"
|
||||
#endif
|
||||
|
||||
-static struct hostent *GetHostByName(char *name);
|
||||
+static struct hostent *GetHostByName(char *name, int domain);
|
||||
#if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
|
||||
static void ssl_sock_cleanup(void);
|
||||
#endif
|
||||
static int ssl_sock_init(void);
|
||||
-static int init_client_ip(int *sock,unsigned char ip[4], int port, int type);
|
||||
-static int init_server(int *sock, int port, int type);
|
||||
-static int init_server_long(int *sock, int port,char *ip, int type);
|
||||
+static int init_client_ip(int *sock,unsigned char *ip, int port, int type, int domain);
|
||||
+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6);
|
||||
+static int init_server_long(int *sock, int port,char *ip, int type, int use_ipv4, int use_ipv6);
|
||||
static int do_accept(int acc_sock, int *sock, char **host);
|
||||
-static int host_ip(char *str, unsigned char ip[4]);
|
||||
+static int host_ip(char *str, unsigned char *ip, int domain);
|
||||
|
||||
#ifdef OPENSSL_SYS_WIN16
|
||||
#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
|
||||
@@ -234,38 +234,68 @@
|
||||
return(1);
|
||||
}
|
||||
|
||||
-int init_client(int *sock, char *host, int port, int type)
|
||||
+int init_client(int *sock, char *host, int port, int type, int use_ipv4, int use_ipv6)
|
||||
{
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ unsigned char ip[16];
|
||||
+#else
|
||||
unsigned char ip[4];
|
||||
+#endif
|
||||
|
||||
- memset(ip, '\0', sizeof ip);
|
||||
- if (!host_ip(host,&(ip[0])))
|
||||
- return 0;
|
||||
- return init_client_ip(sock,ip,port,type);
|
||||
- }
|
||||
-
|
||||
-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
|
||||
- {
|
||||
- unsigned long addr;
|
||||
+ if (use_ipv4)
|
||||
+ if (host_ip(host,ip,AF_INET))
|
||||
+ return(init_client_ip(sock,ip,port,type,AF_INET));
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ if (use_ipv6)
|
||||
+ if (host_ip(host,ip,AF_INET6))
|
||||
+ return(init_client_ip(sock,ip,port,type,AF_INET6));
|
||||
+#endif
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+static int init_client_ip(int *sock, unsigned char ip[4], int port, int type, int domain)
|
||||
+ {
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ struct sockaddr_storage them;
|
||||
+ struct sockaddr_in *them_in = (struct sockaddr_in *)&them;
|
||||
+ struct sockaddr_in6 *them_in6 = (struct sockaddr_in6 *)&them;
|
||||
+#else
|
||||
struct sockaddr_in them;
|
||||
+ struct sockaddr_in *them_in = &them;
|
||||
+#endif
|
||||
+ socklen_t addr_len;
|
||||
int s,i;
|
||||
|
||||
if (!ssl_sock_init()) return(0);
|
||||
|
||||
memset((char *)&them,0,sizeof(them));
|
||||
- them.sin_family=AF_INET;
|
||||
- them.sin_port=htons((unsigned short)port);
|
||||
- addr=(unsigned long)
|
||||
- ((unsigned long)ip[0]<<24L)|
|
||||
- ((unsigned long)ip[1]<<16L)|
|
||||
- ((unsigned long)ip[2]<< 8L)|
|
||||
- ((unsigned long)ip[3]);
|
||||
- them.sin_addr.s_addr=htonl(addr);
|
||||
+ if (domain == AF_INET)
|
||||
+ {
|
||||
+ addr_len = (socklen_t)sizeof(struct sockaddr_in);
|
||||
+ them_in->sin_family=AF_INET;
|
||||
+ them_in->sin_port=htons((unsigned short)port);
|
||||
+#ifndef BIT_FIELD_LIMITS
|
||||
+ memcpy(&them_in->sin_addr.s_addr, ip, 4);
|
||||
+#else
|
||||
+ memcpy(&them_in->sin_addr, ip, 4);
|
||||
+#endif
|
||||
+ }
|
||||
+ else
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ {
|
||||
+ addr_len = (socklen_t)sizeof(struct sockaddr_in6);
|
||||
+ them_in6->sin6_family=AF_INET6;
|
||||
+ them_in6->sin6_port=htons((unsigned short)port);
|
||||
+ memcpy(&(them_in6->sin6_addr), ip, sizeof(struct in6_addr));
|
||||
+ }
|
||||
+#else
|
||||
+ return(0);
|
||||
+#endif
|
||||
|
||||
if (type == SOCK_STREAM)
|
||||
- s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
|
||||
+ s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL);
|
||||
else /* ( type == SOCK_DGRAM) */
|
||||
- s=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP);
|
||||
+ s=socket(domain,SOCK_DGRAM,IPPROTO_UDP);
|
||||
|
||||
if (s == INVALID_SOCKET) { perror("socket"); return(0); }
|
||||
|
||||
@@ -277,29 +315,27 @@
|
||||
if (i < 0) { perror("keepalive"); return(0); }
|
||||
}
|
||||
#endif
|
||||
-
|
||||
- if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)
|
||||
+ if (connect(s,(struct sockaddr *)&them,addr_len) == -1)
|
||||
{ closesocket(s); perror("connect"); return(0); }
|
||||
*sock=s;
|
||||
return(1);
|
||||
}
|
||||
|
||||
-int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context)
|
||||
+int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context, int use_ipv4, int use_ipv6)
|
||||
{
|
||||
int sock;
|
||||
char *name = NULL;
|
||||
int accept_socket = 0;
|
||||
int i;
|
||||
|
||||
- if (!init_server(&accept_socket,port,type)) return(0);
|
||||
-
|
||||
+ if (!init_server(&accept_socket,port,type, use_ipv4, use_ipv6)) return(0);
|
||||
if (ret != NULL)
|
||||
{
|
||||
*ret=accept_socket;
|
||||
/* return(1);*/
|
||||
}
|
||||
- for (;;)
|
||||
- {
|
||||
+ for (;;)
|
||||
+ {
|
||||
if (type==SOCK_STREAM)
|
||||
{
|
||||
if (do_accept(accept_socket,&sock,&name) == 0)
|
||||
@@ -322,41 +358,88 @@
|
||||
}
|
||||
}
|
||||
|
||||
-static int init_server_long(int *sock, int port, char *ip, int type)
|
||||
+static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6)
|
||||
{
|
||||
int ret=0;
|
||||
+ int domain;
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ struct sockaddr_storage server;
|
||||
+ struct sockaddr_in *server_in = (struct sockaddr_in *)&server;
|
||||
+ struct sockaddr_in6 *server_in6 = (struct sockaddr_in6 *)&server;
|
||||
+#else
|
||||
struct sockaddr_in server;
|
||||
+ struct sockaddr_in *server_in = &server;
|
||||
+#endif
|
||||
+ socklen_t addr_len;
|
||||
int s= -1;
|
||||
|
||||
+ if (!use_ipv4 && !use_ipv6)
|
||||
+ goto err;
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ /* we are fine here */
|
||||
+#else
|
||||
+ if (use_ipv6)
|
||||
+ goto err;
|
||||
+#endif
|
||||
if (!ssl_sock_init()) return(0);
|
||||
|
||||
- memset((char *)&server,0,sizeof(server));
|
||||
- server.sin_family=AF_INET;
|
||||
- server.sin_port=htons((unsigned short)port);
|
||||
- if (ip == NULL)
|
||||
- server.sin_addr.s_addr=INADDR_ANY;
|
||||
- else
|
||||
-/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
|
||||
-#ifndef BIT_FIELD_LIMITS
|
||||
- memcpy(&server.sin_addr.s_addr,ip,4);
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ domain = use_ipv6 ? AF_INET6 : AF_INET;
|
||||
#else
|
||||
- memcpy(&server.sin_addr,ip,4);
|
||||
+ domain = AF_INET;
|
||||
#endif
|
||||
-
|
||||
- if (type == SOCK_STREAM)
|
||||
- s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
|
||||
- else /* type == SOCK_DGRAM */
|
||||
- s=socket(AF_INET, SOCK_DGRAM,IPPROTO_UDP);
|
||||
+ if (type == SOCK_STREAM)
|
||||
+ s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL);
|
||||
+ else /* type == SOCK_DGRAM */
|
||||
+ s=socket(domain, SOCK_DGRAM,IPPROTO_UDP);
|
||||
|
||||
if (s == INVALID_SOCKET) goto err;
|
||||
#if defined SOL_SOCKET && defined SO_REUSEADDR
|
||||
+ {
|
||||
+ int j = 1;
|
||||
+ setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
|
||||
+ (void *) &j, sizeof j);
|
||||
+ }
|
||||
+#endif
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ if ((use_ipv4 == 0) && (use_ipv6 == 1))
|
||||
{
|
||||
- int j = 1;
|
||||
- setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
|
||||
- (void *) &j, sizeof j);
|
||||
+ const int on = 1;
|
||||
+
|
||||
+ setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
|
||||
+ (const void *) &on, sizeof(int));
|
||||
}
|
||||
#endif
|
||||
- if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
|
||||
+ if (domain == AF_INET)
|
||||
+ {
|
||||
+ addr_len = (socklen_t)sizeof(struct sockaddr_in);
|
||||
+ memset(server_in, 0, sizeof(struct sockaddr_in));
|
||||
+ server_in->sin_family=AF_INET;
|
||||
+ server_in->sin_port = htons((unsigned short)port);
|
||||
+ if (ip == NULL)
|
||||
+ server_in->sin_addr.s_addr = htonl(INADDR_ANY);
|
||||
+ else
|
||||
+/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
|
||||
+#ifndef BIT_FIELD_LIMITS
|
||||
+ memcpy(&server_in->sin_addr.s_addr, ip, 4);
|
||||
+#else
|
||||
+ memcpy(&server_in->sin_addr, ip, 4);
|
||||
+#endif
|
||||
+ }
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ else
|
||||
+ {
|
||||
+ addr_len = (socklen_t)sizeof(struct sockaddr_in6);
|
||||
+ memset(server_in6, 0, sizeof(struct sockaddr_in6));
|
||||
+ server_in6->sin6_family = AF_INET6;
|
||||
+ server_in6->sin6_port = htons((unsigned short)port);
|
||||
+ if (ip == NULL)
|
||||
+ server_in6->sin6_addr = in6addr_any;
|
||||
+ else
|
||||
+ memcpy(&server_in6->sin6_addr, ip, sizeof(struct in6_addr));
|
||||
+ }
|
||||
+#endif
|
||||
+ if (bind(s, (struct sockaddr *)&server, addr_len) == -1)
|
||||
{
|
||||
#ifndef OPENSSL_SYS_WINDOWS
|
||||
perror("bind");
|
||||
@@ -375,16 +458,23 @@
|
||||
return(ret);
|
||||
}
|
||||
|
||||
-static int init_server(int *sock, int port, int type)
|
||||
+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6)
|
||||
{
|
||||
- return(init_server_long(sock, port, NULL, type));
|
||||
+ return(init_server_long(sock, port, NULL, type, use_ipv4, use_ipv6));
|
||||
}
|
||||
|
||||
static int do_accept(int acc_sock, int *sock, char **host)
|
||||
{
|
||||
int ret;
|
||||
struct hostent *h1,*h2;
|
||||
- static struct sockaddr_in from;
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ struct sockaddr_storage from;
|
||||
+ struct sockaddr_in *from_in = (struct sockaddr_in *)&from;
|
||||
+ struct sockaddr_in6 *from_in6 = (struct sockaddr_in6 *)&from;
|
||||
+#else
|
||||
+ struct sockaddr_in from;
|
||||
+ struct sockaddr_in *from_in = &from;
|
||||
+#endif
|
||||
int len;
|
||||
/* struct linger ling; */
|
||||
|
||||
@@ -431,13 +521,23 @@
|
||||
*/
|
||||
|
||||
if (host == NULL) goto end;
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ if (from.ss_family == AF_INET)
|
||||
+#else
|
||||
+ if (from.sin_family == AF_INET)
|
||||
+#endif
|
||||
#ifndef BIT_FIELD_LIMITS
|
||||
- /* I should use WSAAsyncGetHostByName() under windows */
|
||||
- h1=gethostbyaddr((char *)&from.sin_addr.s_addr,
|
||||
- sizeof(from.sin_addr.s_addr),AF_INET);
|
||||
+ /* I should use WSAAsyncGetHostByName() under windows */
|
||||
+ h1=gethostbyaddr((char *)&from_in->sin_addr.s_addr,
|
||||
+ sizeof(from_in->sin_addr.s_addr), AF_INET);
|
||||
#else
|
||||
- h1=gethostbyaddr((char *)&from.sin_addr,
|
||||
- sizeof(struct in_addr),AF_INET);
|
||||
+ h1=gethostbyaddr((char *)&from_in->sin_addr,
|
||||
+ sizeof(struct in_addr), AF_INET);
|
||||
+#endif
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ else
|
||||
+ h1=gethostbyaddr((char *)&from_in6->sin6_addr,
|
||||
+ sizeof(struct in6_addr), AF_INET6);
|
||||
#endif
|
||||
if (h1 == NULL)
|
||||
{
|
||||
@@ -454,15 +554,23 @@
|
||||
}
|
||||
BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1);
|
||||
|
||||
- h2=GetHostByName(*host);
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ h2=GetHostByName(*host, from.ss_family);
|
||||
+#else
|
||||
+ h2=GetHostByName(*host, from.sin_family);
|
||||
+#endif
|
||||
if (h2 == NULL)
|
||||
{
|
||||
BIO_printf(bio_err,"gethostbyname failure\n");
|
||||
return(0);
|
||||
}
|
||||
- if (h2->h_addrtype != AF_INET)
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ if (h2->h_addrtype != from.ss_family)
|
||||
+#else
|
||||
+ if (h2->h_addrtype != from.sin_family)
|
||||
+#endif
|
||||
{
|
||||
- BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
|
||||
+ BIO_printf(bio_err,"gethostbyname addr address is not correct\n");
|
||||
return(0);
|
||||
}
|
||||
}
|
||||
@@ -477,7 +585,7 @@
|
||||
char *h,*p;
|
||||
|
||||
h=str;
|
||||
- p=strchr(str,':');
|
||||
+ p=strrchr(str,':');
|
||||
if (p == NULL)
|
||||
{
|
||||
BIO_printf(bio_err,"no port defined\n");
|
||||
@@ -485,7 +593,7 @@
|
||||
}
|
||||
*(p++)='\0';
|
||||
|
||||
- if ((ip != NULL) && !host_ip(str,ip))
|
||||
+ if ((ip != NULL) && !host_ip(str,ip,AF_INET))
|
||||
goto err;
|
||||
if (host_ptr != NULL) *host_ptr=h;
|
||||
|
||||
@@ -496,48 +604,58 @@
|
||||
return(0);
|
||||
}
|
||||
|
||||
-static int host_ip(char *str, unsigned char ip[4])
|
||||
+static int host_ip(char *str, unsigned char *ip, int domain)
|
||||
{
|
||||
- unsigned int in[4];
|
||||
+ unsigned int in[4];
|
||||
+ unsigned long l;
|
||||
int i;
|
||||
|
||||
- if (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4)
|
||||
+ if ((domain == AF_INET) &&
|
||||
+ (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4))
|
||||
{
|
||||
+
|
||||
for (i=0; i<4; i++)
|
||||
if (in[i] > 255)
|
||||
{
|
||||
BIO_printf(bio_err,"invalid IP address\n");
|
||||
goto err;
|
||||
}
|
||||
- ip[0]=in[0];
|
||||
- ip[1]=in[1];
|
||||
- ip[2]=in[2];
|
||||
- ip[3]=in[3];
|
||||
- }
|
||||
+ l=htonl((in[0]<<24L)|(in[1]<<16L)|(in[2]<<8L)|in[3]);
|
||||
+ memcpy(ip, &l, 4);
|
||||
+ return 1;
|
||||
+ }
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ else if ((domain == AF_INET6) &&
|
||||
+ (inet_pton(AF_INET6, str, ip) == 1))
|
||||
+ return 1;
|
||||
+#endif
|
||||
else
|
||||
{ /* do a gethostbyname */
|
||||
struct hostent *he;
|
||||
|
||||
if (!ssl_sock_init()) return(0);
|
||||
|
||||
- he=GetHostByName(str);
|
||||
+ he=GetHostByName(str,domain);
|
||||
if (he == NULL)
|
||||
{
|
||||
BIO_printf(bio_err,"gethostbyname failure\n");
|
||||
goto err;
|
||||
}
|
||||
/* cast to short because of win16 winsock definition */
|
||||
- if ((short)he->h_addrtype != AF_INET)
|
||||
+ if ((short)he->h_addrtype != domain)
|
||||
{
|
||||
- BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
|
||||
+ BIO_printf(bio_err,"gethostbyname addr family is not correct\n");
|
||||
return(0);
|
||||
}
|
||||
- ip[0]=he->h_addr_list[0][0];
|
||||
- ip[1]=he->h_addr_list[0][1];
|
||||
- ip[2]=he->h_addr_list[0][2];
|
||||
- ip[3]=he->h_addr_list[0][3];
|
||||
+ if (domain == AF_INET)
|
||||
+ memset(ip, 0, 4);
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ else
|
||||
+ memset(ip, 0, 16);
|
||||
+#endif
|
||||
+ memcpy(ip, he->h_addr_list[0], he->h_length);
|
||||
+ return 1;
|
||||
}
|
||||
- return(1);
|
||||
err:
|
||||
return(0);
|
||||
}
|
||||
@@ -574,7 +692,7 @@
|
||||
static unsigned long ghbn_hits=0L;
|
||||
static unsigned long ghbn_miss=0L;
|
||||
|
||||
-static struct hostent *GetHostByName(char *name)
|
||||
+static struct hostent *GetHostByName(char *name, int domain)
|
||||
{
|
||||
struct hostent *ret;
|
||||
int i,lowi=0;
|
||||
@@ -589,14 +707,20 @@
|
||||
}
|
||||
if (ghbn_cache[i].order > 0)
|
||||
{
|
||||
- if (strncmp(name,ghbn_cache[i].name,128) == 0)
|
||||
+ if ((strncmp(name,ghbn_cache[i].name,128) == 0) &&
|
||||
+ (ghbn_cache[i].ent.h_addrtype == domain))
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (i == GHBN_NUM) /* no hit*/
|
||||
{
|
||||
ghbn_miss++;
|
||||
- ret=gethostbyname(name);
|
||||
+ if (domain == AF_INET)
|
||||
+ ret=gethostbyname(name);
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ else
|
||||
+ ret=gethostbyname2(name, AF_INET6);
|
||||
+#endif
|
||||
if (ret == NULL) return(NULL);
|
||||
/* else add to cache */
|
||||
if(strlen(name) < sizeof ghbn_cache[0].name)
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
https://bugs.gentoo.org/472584
|
||||
http://rt.openssl.org/Ticket/Display.html?id=2387&user=guest&pass=guest
|
||||
|
||||
fix verification handling in s_client. when loading paths, make sure
|
||||
we properly fallback to setting the default paths.
|
||||
|
||||
--- a/apps/s_client.c
|
||||
+++ b/apps/s_client.c
|
||||
@@ -899,7 +899,7 @@
|
||||
if (!set_cert_key_stuff(ctx,cert,key))
|
||||
goto end;
|
||||
|
||||
- if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
|
||||
+ if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) &&
|
||||
(!SSL_CTX_set_default_verify_paths(ctx)))
|
||||
{
|
||||
/* BIO_printf(bio_err,"error setting default verify locations\n"); */
|
||||
|
||||
|
|
@ -1,356 +0,0 @@
|
|||
Forward-ported from openssl-1.0.1e-perl-5.18.patch
|
||||
Fixes install with perl-5.18.
|
||||
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=497286
|
||||
|
||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
||||
|
||||
--- openssl-1.0.1f/doc/apps/cms.pod
|
||||
+++ openssl-1.0.1f/doc/apps/cms.pod
|
||||
@@ -450,28 +450,28 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
the operation was completely successfully.
|
||||
|
||||
-=item 1
|
||||
+=item C<1>
|
||||
|
||||
an error occurred parsing the command options.
|
||||
|
||||
-=item 2
|
||||
+=item C<2>
|
||||
|
||||
one of the input files could not be read.
|
||||
|
||||
-=item 3
|
||||
+=item C<3>
|
||||
|
||||
an error occurred creating the CMS file or when reading the MIME
|
||||
message.
|
||||
|
||||
-=item 4
|
||||
+=item C<4>
|
||||
|
||||
an error occurred decrypting or verifying the message.
|
||||
|
||||
-=item 5
|
||||
+=item C<5>
|
||||
|
||||
the message was verified correctly but an error occurred writing out
|
||||
the signers certificates.
|
||||
--- openssl-1.0.1f/doc/apps/smime.pod
|
||||
+++ openssl-1.0.1f/doc/apps/smime.pod
|
||||
@@ -308,28 +308,28 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
the operation was completely successfully.
|
||||
|
||||
-=item 1
|
||||
+=item C<1>
|
||||
|
||||
an error occurred parsing the command options.
|
||||
|
||||
-=item 2
|
||||
+=item C<2>
|
||||
|
||||
one of the input files could not be read.
|
||||
|
||||
-=item 3
|
||||
+=item C<3>
|
||||
|
||||
an error occurred creating the PKCS#7 file or when reading the MIME
|
||||
message.
|
||||
|
||||
-=item 4
|
||||
+=item C<4>
|
||||
|
||||
an error occurred decrypting or verifying the message.
|
||||
|
||||
-=item 5
|
||||
+=item C<5>
|
||||
|
||||
the message was verified correctly but an error occurred writing out
|
||||
the signers certificates.
|
||||
--- openssl-1.0.1f/doc/ssl/SSL_accept.pod
|
||||
+++ openssl-1.0.1f/doc/ssl/SSL_accept.pod
|
||||
@@ -44,13 +44,13 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
The TLS/SSL handshake was not successful but was shut down controlled and
|
||||
by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
|
||||
return value B<ret> to find out the reason.
|
||||
|
||||
-=item 1
|
||||
+=item C<1>
|
||||
|
||||
The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
|
||||
established.
|
||||
--- openssl-1.0.1f/doc/ssl/SSL_clear.pod
|
||||
+++ openssl-1.0.1f/doc/ssl/SSL_clear.pod
|
||||
@@ -56,12 +56,12 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
The SSL_clear() operation could not be performed. Check the error stack to
|
||||
find out the reason.
|
||||
|
||||
-=item 1
|
||||
+=item C<1>
|
||||
|
||||
The SSL_clear() operation was successful.
|
||||
|
||||
--- openssl-1.0.1f/doc/ssl/SSL_COMP_add_compression_method.pod
|
||||
+++ openssl-1.0.1f/doc/ssl/SSL_COMP_add_compression_method.pod
|
||||
@@ -53,11 +53,11 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
The operation succeeded.
|
||||
|
||||
-=item 1
|
||||
+=item C<1>
|
||||
|
||||
The operation failed. Check the error queue to find out the reason.
|
||||
|
||||
--- openssl-1.0.1f/doc/ssl/SSL_connect.pod
|
||||
+++ openssl-1.0.1f/doc/ssl/SSL_connect.pod
|
||||
@@ -41,13 +41,13 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
The TLS/SSL handshake was not successful but was shut down controlled and
|
||||
by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
|
||||
return value B<ret> to find out the reason.
|
||||
|
||||
-=item 1
|
||||
+=item C<1>
|
||||
|
||||
The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
|
||||
established.
|
||||
--- openssl-1.0.1f/doc/ssl/SSL_CTX_add_session.pod
|
||||
+++ openssl-1.0.1f/doc/ssl/SSL_CTX_add_session.pod
|
||||
@@ -52,13 +52,13 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
The operation failed. In case of the add operation, it was tried to add
|
||||
the same (identical) session twice. In case of the remove operation, the
|
||||
session was not found in the cache.
|
||||
|
||||
-=item 1
|
||||
+=item C<1>
|
||||
|
||||
The operation succeeded.
|
||||
|
||||
--- openssl-1.0.1f/doc/ssl/SSL_CTX_load_verify_locations.pod
|
||||
+++ openssl-1.0.1f/doc/ssl/SSL_CTX_load_verify_locations.pod
|
||||
@@ -100,13 +100,13 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
The operation failed because B<CAfile> and B<CApath> are NULL or the
|
||||
processing at one of the locations specified failed. Check the error
|
||||
stack to find out the reason.
|
||||
|
||||
-=item 1
|
||||
+=item C<1>
|
||||
|
||||
The operation succeeded.
|
||||
|
||||
--- openssl-1.0.1f/doc/ssl/SSL_CTX_set_client_CA_list.pod
|
||||
+++ openssl-1.0.1f/doc/ssl/SSL_CTX_set_client_CA_list.pod
|
||||
@@ -66,13 +66,13 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
A failure while manipulating the STACK_OF(X509_NAME) object occurred or
|
||||
the X509_NAME could not be extracted from B<cacert>. Check the error stack
|
||||
to find out the reason.
|
||||
|
||||
-=item 1
|
||||
+=item C<1>
|
||||
|
||||
The operation succeeded.
|
||||
|
||||
--- openssl-1.0.1f/doc/ssl/SSL_CTX_set_session_id_context.pod
|
||||
+++ openssl-1.0.1f/doc/ssl/SSL_CTX_set_session_id_context.pod
|
||||
@@ -64,13 +64,13 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
The length B<sid_ctx_len> of the session id context B<sid_ctx> exceeded
|
||||
the maximum allowed length of B<SSL_MAX_SSL_SESSION_ID_LENGTH>. The error
|
||||
is logged to the error stack.
|
||||
|
||||
-=item 1
|
||||
+=item C<1>
|
||||
|
||||
The operation succeeded.
|
||||
|
||||
--- openssl-1.0.1f/doc/ssl/SSL_CTX_set_ssl_version.pod
|
||||
+++ openssl-1.0.1f/doc/ssl/SSL_CTX_set_ssl_version.pod
|
||||
@@ -42,11 +42,11 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
The new choice failed, check the error stack to find out the reason.
|
||||
|
||||
-=item 1
|
||||
+=item C<1>
|
||||
|
||||
The operation succeeded.
|
||||
|
||||
--- openssl-1.0.1f/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
|
||||
+++ openssl-1.0.1f/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
|
||||
@@ -96,7 +96,7 @@
|
||||
connection will fail with decryption_error before it will be finished
|
||||
completely.
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
PSK identity was not found. An "unknown_psk_identity" alert message
|
||||
will be sent and the connection setup fails.
|
||||
--- openssl-1.0.1f/doc/ssl/SSL_do_handshake.pod
|
||||
+++ openssl-1.0.1f/doc/ssl/SSL_do_handshake.pod
|
||||
@@ -45,13 +45,13 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
The TLS/SSL handshake was not successful but was shut down controlled and
|
||||
by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
|
||||
return value B<ret> to find out the reason.
|
||||
|
||||
-=item 1
|
||||
+=item C<1>
|
||||
|
||||
The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
|
||||
established.
|
||||
--- openssl-1.0.1f/doc/ssl/SSL_read.pod
|
||||
+++ openssl-1.0.1f/doc/ssl/SSL_read.pod
|
||||
@@ -86,7 +86,7 @@
|
||||
The read operation was successful; the return value is the number of
|
||||
bytes actually read from the TLS/SSL connection.
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
The read operation was not successful. The reason may either be a clean
|
||||
shutdown due to a "close notify" alert sent by the peer (in which case
|
||||
--- openssl-1.0.1f/doc/ssl/SSL_session_reused.pod
|
||||
+++ openssl-1.0.1f/doc/ssl/SSL_session_reused.pod
|
||||
@@ -27,11 +27,11 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
A new session was negotiated.
|
||||
|
||||
-=item 1
|
||||
+=item C<1>
|
||||
|
||||
A session was reused.
|
||||
|
||||
--- openssl-1.0.1f/doc/ssl/SSL_set_fd.pod
|
||||
+++ openssl-1.0.1f/doc/ssl/SSL_set_fd.pod
|
||||
@@ -35,11 +35,11 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
The operation failed. Check the error stack to find out why.
|
||||
|
||||
-=item 1
|
||||
+=item C<1>
|
||||
|
||||
The operation succeeded.
|
||||
|
||||
--- openssl-1.0.1f/doc/ssl/SSL_set_session.pod
|
||||
+++ openssl-1.0.1f/doc/ssl/SSL_set_session.pod
|
||||
@@ -37,11 +37,11 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
The operation failed; check the error stack to find out the reason.
|
||||
|
||||
-=item 1
|
||||
+=item C<1>
|
||||
|
||||
The operation succeeded.
|
||||
|
||||
--- openssl-1.0.1f/doc/ssl/SSL_shutdown.pod
|
||||
+++ openssl-1.0.1f/doc/ssl/SSL_shutdown.pod
|
||||
@@ -92,14 +92,14 @@
|
||||
|
||||
=over 4
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
The shutdown is not yet finished. Call SSL_shutdown() for a second time,
|
||||
if a bidirectional shutdown shall be performed.
|
||||
The output of L<SSL_get_error(3)|SSL_get_error(3)> may be misleading, as an
|
||||
erroneous SSL_ERROR_SYSCALL may be flagged even though no error occurred.
|
||||
|
||||
-=item 1
|
||||
+=item C<1>
|
||||
|
||||
The shutdown was successfully completed. The "close notify" alert was sent
|
||||
and the peer's "close notify" alert was received.
|
||||
--- openssl-1.0.1f/doc/ssl/SSL_write.pod
|
||||
+++ openssl-1.0.1f/doc/ssl/SSL_write.pod
|
||||
@@ -79,7 +79,7 @@
|
||||
The write operation was successful, the return value is the number of
|
||||
bytes actually written to the TLS/SSL connection.
|
||||
|
||||
-=item 0
|
||||
+=item C<0>
|
||||
|
||||
The write operation was not successful. Probably the underlying connection
|
||||
was closed. Call SSL_get_error() with the return value B<ret> to find out,
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
when gcc is given a .s file and told to preprocess it, it outputs nothing
|
||||
|
||||
https://bugs.gentoo.org/499086
|
||||
|
||||
From a2976461784ce463fc7f336cd0dce607d21c2fad Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Sat, 25 Jan 2014 05:44:47 -0500
|
||||
Subject: [PATCH] Revert "Make Makefiles OSF-make-friendly."
|
||||
|
||||
This reverts commit d1cf23ac86c05b22b8780e2c03b67230564d2d34.
|
||||
---
|
||||
crypto/Makefile | 4 +---
|
||||
crypto/bn/Makefile | 4 +---
|
||||
crypto/evp/Makefile | 2 +-
|
||||
crypto/modes/Makefile | 5 +----
|
||||
crypto/sha/Makefile | 4 +---
|
||||
util/shlib_wrap.sh | 6 +-----
|
||||
6 files changed, 6 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/crypto/Makefile b/crypto/Makefile
|
||||
index b253f50..1de9d5f 100644
|
||||
--- a/crypto/Makefile
|
||||
+++ b/crypto/Makefile
|
||||
@@ -86,9 +86,7 @@ ia64cpuid.s: ia64cpuid.S; $(CC) $(CFLAGS) -E ia64cpuid.S > $@
|
||||
ppccpuid.s: ppccpuid.pl; $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@
|
||||
pariscid.s: pariscid.pl; $(PERL) pariscid.pl $(PERLASM_SCHEME) $@
|
||||
alphacpuid.s: alphacpuid.pl
|
||||
- (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
|
||||
- $(PERL) alphacpuid.pl > $$preproc && \
|
||||
- $(CC) -E $$preproc > $@ && rm $$preproc)
|
||||
+ $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
|
||||
|
||||
subdirs:
|
||||
@target=all; $(RECURSIVE_MAKE)
|
||||
diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
|
||||
index b62b676..6c03363 100644
|
||||
--- a/crypto/bn/Makefile
|
||||
+++ b/crypto/bn/Makefile
|
||||
@@ -136,9 +136,7 @@ ppc-mont.s: asm/ppc-mont.pl;$(PERL) asm/ppc-mont.pl $(PERLASM_SCHEME) $@
|
||||
ppc64-mont.s: asm/ppc64-mont.pl;$(PERL) asm/ppc64-mont.pl $(PERLASM_SCHEME) $@
|
||||
|
||||
alpha-mont.s: asm/alpha-mont.pl
|
||||
- (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
|
||||
- $(PERL) asm/alpha-mont.pl > $$preproc && \
|
||||
- $(CC) -E $$preproc > $@ && rm $$preproc)
|
||||
+ $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
|
||||
|
||||
# GNU make "catch all"
|
||||
%-mont.S: asm/%-mont.pl; $(PERL) $< $(PERLASM_SCHEME) $@
|
||||
diff --git a/crypto/modes/Makefile b/crypto/modes/Makefile
|
||||
index ce0dcd6..88ac65e 100644
|
||||
--- a/crypto/modes/Makefile
|
||||
+++ b/crypto/modes/Makefile
|
||||
@@ -55,10 +55,7 @@ aesni-gcm-x86_64.s: asm/aesni-gcm-x86_64.pl
|
||||
ghash-sparcv9.s: asm/ghash-sparcv9.pl
|
||||
$(PERL) asm/ghash-sparcv9.pl $@ $(CFLAGS)
|
||||
ghash-alpha.s: asm/ghash-alpha.pl
|
||||
- (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
|
||||
- $(PERL) asm/ghash-alpha.pl > $$preproc && \
|
||||
- $(CC) -E $$preproc > $@ && rm $$preproc)
|
||||
-
|
||||
+ $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
|
||||
ghash-parisc.s: asm/ghash-parisc.pl
|
||||
$(PERL) asm/ghash-parisc.pl $(PERLASM_SCHEME) $@
|
||||
|
||||
diff --git a/crypto/sha/Makefile b/crypto/sha/Makefile
|
||||
index 64eab6c..63fba69 100644
|
||||
--- a/crypto/sha/Makefile
|
||||
+++ b/crypto/sha/Makefile
|
||||
@@ -60,9 +60,7 @@ sha256-armv4.S: asm/sha256-armv4.pl
|
||||
$(PERL) $< $(PERLASM_SCHEME) $@
|
||||
|
||||
sha1-alpha.s: asm/sha1-alpha.pl
|
||||
- (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
|
||||
- $(PERL) asm/sha1-alpha.pl > $$preproc && \
|
||||
- $(CC) -E $$preproc > $@ && rm $$preproc)
|
||||
+ $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
|
||||
|
||||
# Solaris make has to be explicitly told
|
||||
sha1-x86_64.s: asm/sha1-x86_64.pl; $(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) > $@
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
|
|
@ -1,675 +0,0 @@
|
|||
http://rt.openssl.org/Ticket/Display.html?id=2051
|
||||
user/pass: guest/guest
|
||||
|
||||
Forward ported from openssl-1.0.1e-ipv6.patch
|
||||
|
||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
||||
|
||||
--- openssl-1.0.1h/apps/s_apps.h
|
||||
+++ openssl-1.0.1h/apps/s_apps.h
|
||||
@@ -148,7 +148,7 @@
|
||||
#define PORT_STR "4433"
|
||||
#define PROTOCOL "tcp"
|
||||
|
||||
-int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
|
||||
+int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context, int use_ipv4, int use_ipv6);
|
||||
#ifdef HEADER_X509_H
|
||||
int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
|
||||
#endif
|
||||
@@ -156,7 +156,7 @@
|
||||
int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
|
||||
int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key);
|
||||
#endif
|
||||
-int init_client(int *sock, char *server, int port, int type);
|
||||
+int init_client(int *sock, char *server, int port, int type, int use_ipv4, int use_ipv6);
|
||||
int should_retry(int i);
|
||||
int extract_port(char *str, short *port_ptr);
|
||||
int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p);
|
||||
--- openssl-1.0.1h/apps/s_client.c
|
||||
+++ openssl-1.0.1h/apps/s_client.c
|
||||
@@ -285,6 +285,10 @@
|
||||
{
|
||||
BIO_printf(bio_err,"usage: s_client args\n");
|
||||
BIO_printf(bio_err,"\n");
|
||||
+ BIO_printf(bio_err," -4 - use IPv4 only\n");
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ BIO_printf(bio_err," -6 - use IPv6 only\n");
|
||||
+#endif
|
||||
BIO_printf(bio_err," -host host - use -connect instead\n");
|
||||
BIO_printf(bio_err," -port port - use -connect instead\n");
|
||||
BIO_printf(bio_err," -connect host:port - who to connect to (default is %s:%s)\n",SSL_HOST_NAME,PORT_STR);
|
||||
@@ -568,6 +572,7 @@
|
||||
int sbuf_len,sbuf_off;
|
||||
fd_set readfds,writefds;
|
||||
short port=PORT;
|
||||
+ int use_ipv4, use_ipv6;
|
||||
int full_log=1;
|
||||
char *host=SSL_HOST_NAME;
|
||||
char *cert_file=NULL,*key_file=NULL;
|
||||
@@ -613,7 +618,11 @@
|
||||
#endif
|
||||
char *sess_in = NULL;
|
||||
char *sess_out = NULL;
|
||||
- struct sockaddr peer;
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ struct sockaddr_storage peer;
|
||||
+#else
|
||||
+ struct sockaddr_in peer;
|
||||
+#endif
|
||||
int peerlen = sizeof(peer);
|
||||
int enable_timeouts = 0 ;
|
||||
long socket_mtu = 0;
|
||||
@@ -628,6 +637,12 @@
|
||||
|
||||
meth=SSLv23_client_method();
|
||||
|
||||
+ use_ipv4 = 1;
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ use_ipv6 = 1;
|
||||
+#else
|
||||
+ use_ipv6 = 0;
|
||||
+#endif
|
||||
apps_startup();
|
||||
c_Pause=0;
|
||||
c_quiet=0;
|
||||
@@ -949,6 +964,18 @@
|
||||
jpake_secret = *++argv;
|
||||
}
|
||||
#endif
|
||||
+ else if (strcmp(*argv,"-4") == 0)
|
||||
+ {
|
||||
+ use_ipv4 = 1;
|
||||
+ use_ipv6 = 0;
|
||||
+ }
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ else if (strcmp(*argv,"-6") == 0)
|
||||
+ {
|
||||
+ use_ipv4 = 0;
|
||||
+ use_ipv6 = 1;
|
||||
+ }
|
||||
+#endif
|
||||
#ifndef OPENSSL_NO_SRTP
|
||||
else if (strcmp(*argv,"-use_srtp") == 0)
|
||||
{
|
||||
@@ -1260,7 +1287,7 @@
|
||||
|
||||
re_start:
|
||||
|
||||
- if (init_client(&s,host,port,socket_type) == 0)
|
||||
+ if (init_client(&s,host,port,socket_type,use_ipv4,use_ipv6) == 0)
|
||||
{
|
||||
BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error());
|
||||
SHUTDOWN(s);
|
||||
@@ -1286,7 +1313,7 @@
|
||||
{
|
||||
|
||||
sbio=BIO_new_dgram(s,BIO_NOCLOSE);
|
||||
- if (getsockname(s, &peer, (void *)&peerlen) < 0)
|
||||
+ if (getsockname(s, (struct sockaddr *)&peer, (void *)&peerlen) < 0)
|
||||
{
|
||||
BIO_printf(bio_err, "getsockname:errno=%d\n",
|
||||
get_last_socket_error());
|
||||
--- openssl-1.0.1h/apps/s_server.c
|
||||
+++ openssl-1.0.1h/apps/s_server.c
|
||||
@@ -560,6 +560,10 @@
|
||||
BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list\n");
|
||||
# endif
|
||||
#endif
|
||||
+ BIO_printf(bio_err," -4 - use IPv4 only\n");
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ BIO_printf(bio_err," -6 - use IPv6 only\n");
|
||||
+#endif
|
||||
BIO_printf(bio_err," -keymatexport label - Export keying material using label\n");
|
||||
BIO_printf(bio_err," -keymatexportlen len - Export len bytes of keying material (default 20)\n");
|
||||
}
|
||||
@@ -947,6 +951,7 @@
|
||||
int state=0;
|
||||
const SSL_METHOD *meth=NULL;
|
||||
int socket_type=SOCK_STREAM;
|
||||
+ int use_ipv4, use_ipv6;
|
||||
ENGINE *e=NULL;
|
||||
char *inrand=NULL;
|
||||
int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM;
|
||||
@@ -975,6 +980,12 @@
|
||||
#endif
|
||||
meth=SSLv23_server_method();
|
||||
|
||||
+ use_ipv4 = 1;
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ use_ipv6 = 1;
|
||||
+#else
|
||||
+ use_ipv6 = 0;
|
||||
+#endif
|
||||
local_argc=argc;
|
||||
local_argv=argv;
|
||||
|
||||
@@ -1323,6 +1334,18 @@
|
||||
jpake_secret = *(++argv);
|
||||
}
|
||||
#endif
|
||||
+ else if (strcmp(*argv,"-4") == 0)
|
||||
+ {
|
||||
+ use_ipv4 = 1;
|
||||
+ use_ipv6 = 0;
|
||||
+ }
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ else if (strcmp(*argv,"-6") == 0)
|
||||
+ {
|
||||
+ use_ipv4 = 0;
|
||||
+ use_ipv6 = 1;
|
||||
+ }
|
||||
+#endif
|
||||
#ifndef OPENSSL_NO_SRTP
|
||||
else if (strcmp(*argv,"-use_srtp") == 0)
|
||||
{
|
||||
@@ -1881,9 +1904,9 @@
|
||||
BIO_printf(bio_s_out,"ACCEPT\n");
|
||||
(void)BIO_flush(bio_s_out);
|
||||
if (www)
|
||||
- do_server(port,socket_type,&accept_socket,www_body, context);
|
||||
+ do_server(port,socket_type,&accept_socket,www_body, context, use_ipv4, use_ipv6);
|
||||
else
|
||||
- do_server(port,socket_type,&accept_socket,sv_body, context);
|
||||
+ do_server(port,socket_type,&accept_socket,sv_body, context, use_ipv4, use_ipv6);
|
||||
print_stats(bio_s_out,ctx);
|
||||
ret=0;
|
||||
end:
|
||||
--- openssl-1.0.1h/apps/s_socket.c
|
||||
+++ openssl-1.0.1h/apps/s_socket.c
|
||||
@@ -97,16 +97,16 @@
|
||||
#include "netdb.h"
|
||||
#endif
|
||||
|
||||
-static struct hostent *GetHostByName(char *name);
|
||||
+static struct hostent *GetHostByName(char *name, int domain);
|
||||
#if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
|
||||
static void ssl_sock_cleanup(void);
|
||||
#endif
|
||||
static int ssl_sock_init(void);
|
||||
-static int init_client_ip(int *sock,unsigned char ip[4], int port, int type);
|
||||
-static int init_server(int *sock, int port, int type);
|
||||
-static int init_server_long(int *sock, int port,char *ip, int type);
|
||||
+static int init_client_ip(int *sock,unsigned char *ip, int port, int type, int domain);
|
||||
+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6);
|
||||
+static int init_server_long(int *sock, int port,char *ip, int type, int use_ipv4, int use_ipv6);
|
||||
static int do_accept(int acc_sock, int *sock, char **host);
|
||||
-static int host_ip(char *str, unsigned char ip[4]);
|
||||
+static int host_ip(char *str, unsigned char *ip, int domain);
|
||||
|
||||
#ifdef OPENSSL_SYS_WIN16
|
||||
#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
|
||||
@@ -234,38 +234,68 @@
|
||||
return(1);
|
||||
}
|
||||
|
||||
-int init_client(int *sock, char *host, int port, int type)
|
||||
+int init_client(int *sock, char *host, int port, int type, int use_ipv4, int use_ipv6)
|
||||
{
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ unsigned char ip[16];
|
||||
+#else
|
||||
unsigned char ip[4];
|
||||
+#endif
|
||||
|
||||
- memset(ip, '\0', sizeof ip);
|
||||
- if (!host_ip(host,&(ip[0])))
|
||||
- return 0;
|
||||
- return init_client_ip(sock,ip,port,type);
|
||||
- }
|
||||
-
|
||||
-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
|
||||
- {
|
||||
- unsigned long addr;
|
||||
+ if (use_ipv4)
|
||||
+ if (host_ip(host,ip,AF_INET))
|
||||
+ return(init_client_ip(sock,ip,port,type,AF_INET));
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ if (use_ipv6)
|
||||
+ if (host_ip(host,ip,AF_INET6))
|
||||
+ return(init_client_ip(sock,ip,port,type,AF_INET6));
|
||||
+#endif
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+static int init_client_ip(int *sock, unsigned char ip[4], int port, int type, int domain)
|
||||
+ {
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ struct sockaddr_storage them;
|
||||
+ struct sockaddr_in *them_in = (struct sockaddr_in *)&them;
|
||||
+ struct sockaddr_in6 *them_in6 = (struct sockaddr_in6 *)&them;
|
||||
+#else
|
||||
struct sockaddr_in them;
|
||||
+ struct sockaddr_in *them_in = &them;
|
||||
+#endif
|
||||
+ socklen_t addr_len;
|
||||
int s,i;
|
||||
|
||||
if (!ssl_sock_init()) return(0);
|
||||
|
||||
memset((char *)&them,0,sizeof(them));
|
||||
- them.sin_family=AF_INET;
|
||||
- them.sin_port=htons((unsigned short)port);
|
||||
- addr=(unsigned long)
|
||||
- ((unsigned long)ip[0]<<24L)|
|
||||
- ((unsigned long)ip[1]<<16L)|
|
||||
- ((unsigned long)ip[2]<< 8L)|
|
||||
- ((unsigned long)ip[3]);
|
||||
- them.sin_addr.s_addr=htonl(addr);
|
||||
+ if (domain == AF_INET)
|
||||
+ {
|
||||
+ addr_len = (socklen_t)sizeof(struct sockaddr_in);
|
||||
+ them_in->sin_family=AF_INET;
|
||||
+ them_in->sin_port=htons((unsigned short)port);
|
||||
+#ifndef BIT_FIELD_LIMITS
|
||||
+ memcpy(&them_in->sin_addr.s_addr, ip, 4);
|
||||
+#else
|
||||
+ memcpy(&them_in->sin_addr, ip, 4);
|
||||
+#endif
|
||||
+ }
|
||||
+ else
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ {
|
||||
+ addr_len = (socklen_t)sizeof(struct sockaddr_in6);
|
||||
+ them_in6->sin6_family=AF_INET6;
|
||||
+ them_in6->sin6_port=htons((unsigned short)port);
|
||||
+ memcpy(&(them_in6->sin6_addr), ip, sizeof(struct in6_addr));
|
||||
+ }
|
||||
+#else
|
||||
+ return(0);
|
||||
+#endif
|
||||
|
||||
if (type == SOCK_STREAM)
|
||||
- s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
|
||||
+ s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL);
|
||||
else /* ( type == SOCK_DGRAM) */
|
||||
- s=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP);
|
||||
+ s=socket(domain,SOCK_DGRAM,IPPROTO_UDP);
|
||||
|
||||
if (s == INVALID_SOCKET) { perror("socket"); return(0); }
|
||||
|
||||
@@ -277,29 +307,27 @@
|
||||
if (i < 0) { closesocket(s); perror("keepalive"); return(0); }
|
||||
}
|
||||
#endif
|
||||
-
|
||||
- if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)
|
||||
+ if (connect(s,(struct sockaddr *)&them,addr_len) == -1)
|
||||
{ closesocket(s); perror("connect"); return(0); }
|
||||
*sock=s;
|
||||
return(1);
|
||||
}
|
||||
|
||||
-int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context)
|
||||
+int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context, int use_ipv4, int use_ipv6)
|
||||
{
|
||||
int sock;
|
||||
char *name = NULL;
|
||||
int accept_socket = 0;
|
||||
int i;
|
||||
|
||||
- if (!init_server(&accept_socket,port,type)) return(0);
|
||||
-
|
||||
+ if (!init_server(&accept_socket,port,type, use_ipv4, use_ipv6)) return(0);
|
||||
if (ret != NULL)
|
||||
{
|
||||
*ret=accept_socket;
|
||||
/* return(1);*/
|
||||
}
|
||||
- for (;;)
|
||||
- {
|
||||
+ for (;;)
|
||||
+ {
|
||||
if (type==SOCK_STREAM)
|
||||
{
|
||||
if (do_accept(accept_socket,&sock,&name) == 0)
|
||||
@@ -322,41 +350,88 @@
|
||||
}
|
||||
}
|
||||
|
||||
-static int init_server_long(int *sock, int port, char *ip, int type)
|
||||
+static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6)
|
||||
{
|
||||
int ret=0;
|
||||
+ int domain;
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ struct sockaddr_storage server;
|
||||
+ struct sockaddr_in *server_in = (struct sockaddr_in *)&server;
|
||||
+ struct sockaddr_in6 *server_in6 = (struct sockaddr_in6 *)&server;
|
||||
+#else
|
||||
struct sockaddr_in server;
|
||||
+ struct sockaddr_in *server_in = &server;
|
||||
+#endif
|
||||
+ socklen_t addr_len;
|
||||
int s= -1;
|
||||
|
||||
+ if (!use_ipv4 && !use_ipv6)
|
||||
+ goto err;
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ /* we are fine here */
|
||||
+#else
|
||||
+ if (use_ipv6)
|
||||
+ goto err;
|
||||
+#endif
|
||||
if (!ssl_sock_init()) return(0);
|
||||
|
||||
- memset((char *)&server,0,sizeof(server));
|
||||
- server.sin_family=AF_INET;
|
||||
- server.sin_port=htons((unsigned short)port);
|
||||
- if (ip == NULL)
|
||||
- server.sin_addr.s_addr=INADDR_ANY;
|
||||
- else
|
||||
-/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
|
||||
-#ifndef BIT_FIELD_LIMITS
|
||||
- memcpy(&server.sin_addr.s_addr,ip,4);
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ domain = use_ipv6 ? AF_INET6 : AF_INET;
|
||||
#else
|
||||
- memcpy(&server.sin_addr,ip,4);
|
||||
+ domain = AF_INET;
|
||||
#endif
|
||||
-
|
||||
- if (type == SOCK_STREAM)
|
||||
- s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
|
||||
- else /* type == SOCK_DGRAM */
|
||||
- s=socket(AF_INET, SOCK_DGRAM,IPPROTO_UDP);
|
||||
+ if (type == SOCK_STREAM)
|
||||
+ s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL);
|
||||
+ else /* type == SOCK_DGRAM */
|
||||
+ s=socket(domain, SOCK_DGRAM,IPPROTO_UDP);
|
||||
|
||||
if (s == INVALID_SOCKET) goto err;
|
||||
#if defined SOL_SOCKET && defined SO_REUSEADDR
|
||||
+ {
|
||||
+ int j = 1;
|
||||
+ setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
|
||||
+ (void *) &j, sizeof j);
|
||||
+ }
|
||||
+#endif
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ if ((use_ipv4 == 0) && (use_ipv6 == 1))
|
||||
+ {
|
||||
+ const int on = 1;
|
||||
+
|
||||
+ setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
|
||||
+ (const void *) &on, sizeof(int));
|
||||
+ }
|
||||
+#endif
|
||||
+ if (domain == AF_INET)
|
||||
+ {
|
||||
+ addr_len = (socklen_t)sizeof(struct sockaddr_in);
|
||||
+ memset(server_in, 0, sizeof(struct sockaddr_in));
|
||||
+ server_in->sin_family=AF_INET;
|
||||
+ server_in->sin_port = htons((unsigned short)port);
|
||||
+ if (ip == NULL)
|
||||
+ server_in->sin_addr.s_addr = htonl(INADDR_ANY);
|
||||
+ else
|
||||
+/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
|
||||
+#ifndef BIT_FIELD_LIMITS
|
||||
+ memcpy(&server_in->sin_addr.s_addr, ip, 4);
|
||||
+#else
|
||||
+ memcpy(&server_in->sin_addr, ip, 4);
|
||||
+#endif
|
||||
+ }
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ else
|
||||
{
|
||||
- int j = 1;
|
||||
- setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
|
||||
- (void *) &j, sizeof j);
|
||||
+ addr_len = (socklen_t)sizeof(struct sockaddr_in6);
|
||||
+ memset(server_in6, 0, sizeof(struct sockaddr_in6));
|
||||
+ server_in6->sin6_family = AF_INET6;
|
||||
+ server_in6->sin6_port = htons((unsigned short)port);
|
||||
+ if (ip == NULL)
|
||||
+ server_in6->sin6_addr = in6addr_any;
|
||||
+ else
|
||||
+ memcpy(&server_in6->sin6_addr, ip, sizeof(struct in6_addr));
|
||||
}
|
||||
#endif
|
||||
- if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
|
||||
+ if (bind(s, (struct sockaddr *)&server, addr_len) == -1)
|
||||
{
|
||||
#ifndef OPENSSL_SYS_WINDOWS
|
||||
perror("bind");
|
||||
@@ -375,16 +450,23 @@
|
||||
return(ret);
|
||||
}
|
||||
|
||||
-static int init_server(int *sock, int port, int type)
|
||||
+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6)
|
||||
{
|
||||
- return(init_server_long(sock, port, NULL, type));
|
||||
+ return(init_server_long(sock, port, NULL, type, use_ipv4, use_ipv6));
|
||||
}
|
||||
|
||||
static int do_accept(int acc_sock, int *sock, char **host)
|
||||
{
|
||||
int ret;
|
||||
struct hostent *h1,*h2;
|
||||
- static struct sockaddr_in from;
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ struct sockaddr_storage from;
|
||||
+ struct sockaddr_in *from_in = (struct sockaddr_in *)&from;
|
||||
+ struct sockaddr_in6 *from_in6 = (struct sockaddr_in6 *)&from;
|
||||
+#else
|
||||
+ struct sockaddr_in from;
|
||||
+ struct sockaddr_in *from_in = &from;
|
||||
+#endif
|
||||
int len;
|
||||
/* struct linger ling; */
|
||||
|
||||
@@ -431,13 +513,23 @@
|
||||
*/
|
||||
|
||||
if (host == NULL) goto end;
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ if (from.ss_family == AF_INET)
|
||||
+#else
|
||||
+ if (from.sin_family == AF_INET)
|
||||
+#endif
|
||||
#ifndef BIT_FIELD_LIMITS
|
||||
- /* I should use WSAAsyncGetHostByName() under windows */
|
||||
- h1=gethostbyaddr((char *)&from.sin_addr.s_addr,
|
||||
- sizeof(from.sin_addr.s_addr),AF_INET);
|
||||
+ /* I should use WSAAsyncGetHostByName() under windows */
|
||||
+ h1=gethostbyaddr((char *)&from_in->sin_addr.s_addr,
|
||||
+ sizeof(from_in->sin_addr.s_addr), AF_INET);
|
||||
#else
|
||||
- h1=gethostbyaddr((char *)&from.sin_addr,
|
||||
- sizeof(struct in_addr),AF_INET);
|
||||
+ h1=gethostbyaddr((char *)&from_in->sin_addr,
|
||||
+ sizeof(struct in_addr), AF_INET);
|
||||
+#endif
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ else
|
||||
+ h1=gethostbyaddr((char *)&from_in6->sin6_addr,
|
||||
+ sizeof(struct in6_addr), AF_INET6);
|
||||
#endif
|
||||
if (h1 == NULL)
|
||||
{
|
||||
@@ -455,16 +547,25 @@
|
||||
}
|
||||
BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1);
|
||||
|
||||
- h2=GetHostByName(*host);
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ h2=GetHostByName(*host, from.ss_family);
|
||||
+#else
|
||||
+ h2=GetHostByName(*host, from.sin_family);
|
||||
+#endif
|
||||
+
|
||||
if (h2 == NULL)
|
||||
{
|
||||
BIO_printf(bio_err,"gethostbyname failure\n");
|
||||
closesocket(ret);
|
||||
return(0);
|
||||
}
|
||||
- if (h2->h_addrtype != AF_INET)
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ if (h2->h_addrtype != from.ss_family)
|
||||
+#else
|
||||
+ if (h2->h_addrtype != from.sin_family)
|
||||
+#endif
|
||||
{
|
||||
- BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
|
||||
+ BIO_printf(bio_err,"gethostbyname addr address is not correct\n");
|
||||
closesocket(ret);
|
||||
return(0);
|
||||
}
|
||||
@@ -480,7 +581,7 @@
|
||||
char *h,*p;
|
||||
|
||||
h=str;
|
||||
- p=strchr(str,':');
|
||||
+ p=strrchr(str,':');
|
||||
if (p == NULL)
|
||||
{
|
||||
BIO_printf(bio_err,"no port defined\n");
|
||||
@@ -488,7 +589,7 @@
|
||||
}
|
||||
*(p++)='\0';
|
||||
|
||||
- if ((ip != NULL) && !host_ip(str,ip))
|
||||
+ if ((ip != NULL) && !host_ip(str,ip,AF_INET))
|
||||
goto err;
|
||||
if (host_ptr != NULL) *host_ptr=h;
|
||||
|
||||
@@ -499,48 +600,58 @@
|
||||
return(0);
|
||||
}
|
||||
|
||||
-static int host_ip(char *str, unsigned char ip[4])
|
||||
+static int host_ip(char *str, unsigned char *ip, int domain)
|
||||
{
|
||||
- unsigned int in[4];
|
||||
+ unsigned int in[4];
|
||||
+ unsigned long l;
|
||||
int i;
|
||||
|
||||
- if (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4)
|
||||
+ if ((domain == AF_INET) &&
|
||||
+ (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4))
|
||||
{
|
||||
+
|
||||
for (i=0; i<4; i++)
|
||||
if (in[i] > 255)
|
||||
{
|
||||
BIO_printf(bio_err,"invalid IP address\n");
|
||||
goto err;
|
||||
}
|
||||
- ip[0]=in[0];
|
||||
- ip[1]=in[1];
|
||||
- ip[2]=in[2];
|
||||
- ip[3]=in[3];
|
||||
- }
|
||||
+ l=htonl((in[0]<<24L)|(in[1]<<16L)|(in[2]<<8L)|in[3]);
|
||||
+ memcpy(ip, &l, 4);
|
||||
+ return 1;
|
||||
+ }
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ else if ((domain == AF_INET6) &&
|
||||
+ (inet_pton(AF_INET6, str, ip) == 1))
|
||||
+ return 1;
|
||||
+#endif
|
||||
else
|
||||
{ /* do a gethostbyname */
|
||||
struct hostent *he;
|
||||
|
||||
if (!ssl_sock_init()) return(0);
|
||||
|
||||
- he=GetHostByName(str);
|
||||
+ he=GetHostByName(str,domain);
|
||||
if (he == NULL)
|
||||
{
|
||||
BIO_printf(bio_err,"gethostbyname failure\n");
|
||||
goto err;
|
||||
}
|
||||
/* cast to short because of win16 winsock definition */
|
||||
- if ((short)he->h_addrtype != AF_INET)
|
||||
+ if ((short)he->h_addrtype != domain)
|
||||
{
|
||||
- BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
|
||||
+ BIO_printf(bio_err,"gethostbyname addr family is not correct\n");
|
||||
return(0);
|
||||
}
|
||||
- ip[0]=he->h_addr_list[0][0];
|
||||
- ip[1]=he->h_addr_list[0][1];
|
||||
- ip[2]=he->h_addr_list[0][2];
|
||||
- ip[3]=he->h_addr_list[0][3];
|
||||
+ if (domain == AF_INET)
|
||||
+ memset(ip, 0, 4);
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ else
|
||||
+ memset(ip, 0, 16);
|
||||
+#endif
|
||||
+ memcpy(ip, he->h_addr_list[0], he->h_length);
|
||||
+ return 1;
|
||||
}
|
||||
- return(1);
|
||||
err:
|
||||
return(0);
|
||||
}
|
||||
@@ -577,7 +688,7 @@
|
||||
static unsigned long ghbn_hits=0L;
|
||||
static unsigned long ghbn_miss=0L;
|
||||
|
||||
-static struct hostent *GetHostByName(char *name)
|
||||
+static struct hostent *GetHostByName(char *name, int domain)
|
||||
{
|
||||
struct hostent *ret;
|
||||
int i,lowi=0;
|
||||
@@ -592,14 +703,20 @@
|
||||
}
|
||||
if (ghbn_cache[i].order > 0)
|
||||
{
|
||||
- if (strncmp(name,ghbn_cache[i].name,128) == 0)
|
||||
+ if ((strncmp(name,ghbn_cache[i].name,128) == 0) &&
|
||||
+ (ghbn_cache[i].ent.h_addrtype == domain))
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (i == GHBN_NUM) /* no hit*/
|
||||
{
|
||||
ghbn_miss++;
|
||||
- ret=gethostbyname(name);
|
||||
+ if (domain == AF_INET)
|
||||
+ ret=gethostbyname(name);
|
||||
+#if OPENSSL_USE_IPV6
|
||||
+ else
|
||||
+ ret=gethostbyname2(name, AF_INET6);
|
||||
+#endif
|
||||
if (ret == NULL) return(NULL);
|
||||
/* else add to cache */
|
||||
if(strlen(name) < sizeof ghbn_cache[0].name)
|
||||
--- openssl-1.0.1h/apps/s_socket.c.rej
|
||||
+++ openssl-1.0.1h/apps/s_socket.c.rej
|
||||
@@ -0,0 +1,29 @@
|
||||
+--- apps/s_socket.c 2 Dec 2011 14:39:40 -0000 1.43.2.3.2.2
|
||||
++++ apps/s_socket.c 28 Dec 2011 00:28:14 -0000
|
||||
+@@ -546,15 +646,23 @@
|
||||
+ }
|
||||
+ BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1);
|
||||
+
|
||||
+- h2=GetHostByName(*host);
|
||||
++#if OPENSSL_USE_IPV6
|
||||
++ h2=GetHostByName(*host, from.ss_family);
|
||||
++#else
|
||||
++ h2=GetHostByName(*host, from.sin_family);
|
||||
++#endif
|
||||
+ if (h2 == NULL)
|
||||
+ {
|
||||
+ BIO_printf(bio_err,"gethostbyname failure\n");
|
||||
+ return(0);
|
||||
+ }
|
||||
+- if (h2->h_addrtype != AF_INET)
|
||||
++#if OPENSSL_USE_IPV6
|
||||
++ if (h2->h_addrtype != from.ss_family)
|
||||
++#else
|
||||
++ if (h2->h_addrtype != from.sin_family)
|
||||
++#endif
|
||||
+ {
|
||||
+- BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
|
||||
++ BIO_printf(bio_err,"gethostbyname addr address is not correct\n");
|
||||
+ return(0);
|
||||
+ }
|
||||
+ }
|
||||
|
|
@ -1,238 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1h-r1.ebuild,v 1.7 2014/06/06 05:13:00 vapier Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit eutils flag-o-matic toolchain-funcs multilib
|
||||
|
||||
REV="1.7"
|
||||
DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
|
||||
HOMEPAGE="http://www.openssl.org/"
|
||||
SRC_URI="mirror://openssl/source/${P}.tar.gz
|
||||
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}"
|
||||
|
||||
LICENSE="openssl"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
|
||||
IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test +tls-heartbeat vanilla zlib"
|
||||
|
||||
# Have the sub-libs in RDEPEND with [static-libs] since, logically,
|
||||
# our libssl.a depends on libz.a/etc... at runtime.
|
||||
LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+)] )
|
||||
zlib? ( sys-libs/zlib[static-libs(+)] )
|
||||
kerberos? ( app-crypt/mit-krb5 )"
|
||||
# The blocks are temporary just to make sure people upgrade to a
|
||||
# version that lack runtime version checking. We'll drop them in
|
||||
# the future.
|
||||
RDEPEND="static-libs? ( ${LIB_DEPEND} )
|
||||
!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
|
||||
!<net-misc/openssh-5.9_p1-r4
|
||||
!<net-libs/neon-0.29.6-r1"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-apps/diffutils
|
||||
>=dev-lang/perl-5
|
||||
test? ( sys-devel/bc )"
|
||||
PDEPEND="app-misc/ca-certificates"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${P}.tar.gz
|
||||
SSL_CNF_DIR="/etc/ssl"
|
||||
sed \
|
||||
-e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
|
||||
-e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \
|
||||
"${DISTDIR}"/${PN}-c_rehash.sh.${REV} \
|
||||
> "${WORKDIR}"/c_rehash || die #416717
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Make sure we only ever touch Makefile.org and avoid patching a file
|
||||
# that gets blown away anyways by the Configure script in src_configure
|
||||
rm -f Makefile
|
||||
|
||||
if ! use vanilla ; then
|
||||
epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
|
||||
epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
|
||||
epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch
|
||||
epatch "${FILESDIR}"/${PN}-1.0.1-parallel-build.patch
|
||||
epatch "${FILESDIR}"/${PN}-1.0.1-x32.patch
|
||||
epatch "${FILESDIR}"/${PN}-1.0.1h-ipv6.patch
|
||||
epatch "${FILESDIR}"/${PN}-1.0.1e-s_client-verify.patch #472584
|
||||
epatch "${FILESDIR}"/${PN}-1.0.1f-revert-alpha-perl-generation.patch #499086
|
||||
epatch_user #332661
|
||||
fi
|
||||
|
||||
# disable fips in the build
|
||||
# make sure the man pages are suffixed #302165
|
||||
# don't bother building man pages if they're disabled
|
||||
sed -i \
|
||||
-e '/DIRS/s: fips : :g' \
|
||||
-e '/^MANSUFFIX/s:=.*:=ssl:' \
|
||||
-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
|
||||
-e $(has noman FEATURES \
|
||||
&& echo '/^install:/s:install_docs::' \
|
||||
|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
|
||||
Makefile.org \
|
||||
|| die
|
||||
# show the actual commands in the log
|
||||
sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
|
||||
|
||||
# allow openssl to be cross-compiled
|
||||
cp "${FILESDIR}"/gentoo.config-1.0.1 gentoo.config || die
|
||||
chmod a+rx gentoo.config
|
||||
|
||||
append-flags -fno-strict-aliasing
|
||||
append-flags $(test-flags-CC -Wa,--noexecstack)
|
||||
|
||||
sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
|
||||
# The config script does stupid stuff to prompt the user. Kill it.
|
||||
sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
|
||||
./config --test-sanity || die "I AM NOT SANE"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
unset APPS #197996
|
||||
unset SCRIPTS #312551
|
||||
unset CROSS_COMPILE #311473
|
||||
|
||||
tc-export CC AR RANLIB RC
|
||||
|
||||
# Clean out patent-or-otherwise-encumbered code
|
||||
# Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher)
|
||||
# IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
|
||||
# EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
|
||||
# MDC2: Expired http://en.wikipedia.org/wiki/MDC-2
|
||||
# RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5
|
||||
|
||||
use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
|
||||
echoit() { echo "$@" ; "$@" ; }
|
||||
|
||||
local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
|
||||
|
||||
# See if our toolchain supports __uint128_t. If so, it's 64bit
|
||||
# friendly and can use the nicely optimized code paths. #460790
|
||||
local ec_nistp_64_gcc_128
|
||||
# Disable it for now though #469976
|
||||
#if ! use bindist ; then
|
||||
# echo "__uint128_t i;" > "${T}"/128.c
|
||||
# if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
|
||||
# ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
|
||||
# fi
|
||||
#fi
|
||||
|
||||
local sslout=$(./gentoo.config)
|
||||
einfo "Use configuration ${sslout:-(openssl knows best)}"
|
||||
local config="Configure"
|
||||
[[ -z ${sslout} ]] && config="config"
|
||||
echoit \
|
||||
./${config} \
|
||||
${sslout} \
|
||||
$(use sse2 || echo "no-sse2") \
|
||||
enable-camellia \
|
||||
$(use_ssl !bindist ec) \
|
||||
${ec_nistp_64_gcc_128} \
|
||||
enable-idea \
|
||||
enable-mdc2 \
|
||||
$(use_ssl !bindist rc5) \
|
||||
enable-tlsext \
|
||||
$(use_ssl gmp gmp -lgmp) \
|
||||
$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
|
||||
$(use_ssl rfc3779) \
|
||||
$(use_ssl tls-heartbeat heartbeats) \
|
||||
$(use_ssl zlib) \
|
||||
--prefix="${EPREFIX}"/usr \
|
||||
--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
|
||||
--libdir=$(get_libdir) \
|
||||
shared threads \
|
||||
|| die
|
||||
|
||||
# Clean out hardcoded flags that openssl uses
|
||||
local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
|
||||
-e 's:^CFLAG=::' \
|
||||
-e 's:-fomit-frame-pointer ::g' \
|
||||
-e 's:-O[0-9] ::g' \
|
||||
-e 's:-march=[-a-z0-9]* ::g' \
|
||||
-e 's:-mcpu=[-a-z0-9]* ::g' \
|
||||
-e 's:-m[a-z0-9]* ::g' \
|
||||
)
|
||||
sed -i \
|
||||
-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
|
||||
-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
|
||||
Makefile || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# depend is needed to use $confopts; it also doesn't matter
|
||||
# that it's -j1 as the code itself serializes subdirs
|
||||
emake -j1 depend
|
||||
emake all
|
||||
# rehash is needed to prep the certs/ dir; do this
|
||||
# separately to avoid parallel build issues.
|
||||
emake rehash
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake -j1 test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake INSTALL_PREFIX="${D}" install
|
||||
dobin "${WORKDIR}"/c_rehash #333117
|
||||
dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
|
||||
dohtml -r doc/*
|
||||
use rfc3779 && dodoc engines/ccgost/README.gost
|
||||
|
||||
# This is crappy in that the static archives are still built even
|
||||
# when USE=static-libs. But this is due to a failing in the openssl
|
||||
# build system: the static archives are built as PIC all the time.
|
||||
# Only way around this would be to manually configure+compile openssl
|
||||
# twice; once with shared lib support enabled and once without.
|
||||
use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
|
||||
|
||||
# create the certs directory
|
||||
dodir ${SSL_CNF_DIR}/certs
|
||||
cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
|
||||
rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
|
||||
|
||||
# Namespace openssl programs to prevent conflicts with other man pages
|
||||
cd "${ED}"/usr/share/man
|
||||
local m d s
|
||||
for m in $(find . -type f | xargs grep -L '#include') ; do
|
||||
d=${m%/*} ; d=${d#./} ; m=${m##*/}
|
||||
[[ ${m} == openssl.1* ]] && continue
|
||||
[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
|
||||
mv ${d}/{,ssl-}${m}
|
||||
# fix up references to renamed man pages
|
||||
sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
|
||||
ln -s ssl-${m} ${d}/openssl-${m}
|
||||
# locate any symlinks that point to this man page ... we assume
|
||||
# that any broken links are due to the above renaming
|
||||
for s in $(find -L ${d} -type l) ; do
|
||||
s=${s##*/}
|
||||
rm -f ${d}/${s}
|
||||
ln -s ssl-${m} ${d}/ssl-${s}
|
||||
ln -s ssl-${s} ${d}/openssl-${s}
|
||||
done
|
||||
done
|
||||
[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
|
||||
|
||||
dodir /etc/sandbox.d #254521
|
||||
echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
|
||||
|
||||
diropts -m0700
|
||||
keepdir ${SSL_CNF_DIR}/private
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
has_version ${CATEGORY}/${PN}:0.9.8 && return 0
|
||||
preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
|
||||
c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
|
||||
eend $?
|
||||
|
||||
has_version ${CATEGORY}/${PN}:0.9.8 && return 0
|
||||
preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
DIST vala-0.23.2.tar.xz 2664888 SHA256 f42287019d0911e2ce68e937c2db83e115d6aaf31a76473ac46ed48593d6423c SHA512 b7a35a4514eb3e5bd940f01ce7ff6c90ff8592b0ea9aec7ffb25fc10a03bc62d5572f0d16730e4003e5dc946fb5608feefabe8a2c18bf2666832e5aea9a6c6a7 WHIRLPOOL de65681ed391baf36dad89176aea475a53173bbee8c3de8306100f89fc0b728643f45b2ae6d3f05371d4b4f1975fe4307a212cef93429059c023bd29b36eb33a
|
||||
|
|
@ -1,77 +0,0 @@
|
|||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/vala-common/vala-common-0.23.2.ebuild,v 1.4 2013/12/22 15:47:37 jer Exp $
|
||||
|
||||
EAPI="5"
|
||||
GNOME_ORG_MODULE="vala"
|
||||
|
||||
inherit gnome.org
|
||||
|
||||
DESCRIPTION="Build infrastructure for packages that use Vala"
|
||||
HOMEPAGE="https://wiki.gnome.org/Vala"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
|
||||
IUSE=""
|
||||
|
||||
# Previously ${PN} was part of dev-lang/vala
|
||||
RDEPEND="
|
||||
!<dev-lang/vala-0.10.4-r2
|
||||
!<dev-lang/vala-0.12.1-r1:0.12
|
||||
!<dev-lang/vala-0.14.2-r2:0.14
|
||||
!<dev-lang/vala-0.16.1-r2:0.16
|
||||
!<dev-lang/vala-0.17.5:0.18
|
||||
"
|
||||
DEPEND=""
|
||||
|
||||
src_configure() { :; }
|
||||
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/aclocal
|
||||
doins vala.m4 vapigen/vapigen.m4
|
||||
insinto /usr/share/vala
|
||||
doins vapigen/Makefile.vapigen
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Hack to prevent alternatives_auto_makesym in previously installed
|
||||
# dev-lang/vala's pkg_postrm from overwriting vala-common's files
|
||||
if has_version '<dev-lang/vala-0.10.4-r2:0.10' && [[ -f "${EROOT}usr/share/aclocal/vala-0-10.m4" ]]; then
|
||||
ebegin "Removing old vala-0.10 macros"
|
||||
rm "${EROOT}usr/share/aclocal/vala-0-10.m4" &> /dev/null
|
||||
eend $?
|
||||
fi
|
||||
if has_version '<dev-lang/vala-0.12.1-r1:0.12' && [[ -f "${EROOT}usr/share/aclocal/vala-0-12.m4" ]]; then
|
||||
ebegin "Removing old vala-0.12 macros"
|
||||
rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
|
||||
eend $?
|
||||
fi
|
||||
if has_version '<dev-lang/vala-0.14.2-r2:0.14' && [[ -f "${EROOT}usr/share/aclocal/vala-0-14.m4" ]]; then
|
||||
ebegin "Removing old vala-0.14 macros"
|
||||
rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
|
||||
eend $?
|
||||
fi
|
||||
if has_version '<dev-lang/vala-0.16.1-r2:0.16' && [[ -f "${EROOT}usr/share/aclocal/vala-0-16.m4" ]]; then
|
||||
ebegin "Removing old vala-0.16 macros"
|
||||
rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
|
||||
eend $?
|
||||
if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then
|
||||
ebegin "Removing old vala-0.16 makefile template"
|
||||
rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null
|
||||
eend $?
|
||||
fi
|
||||
fi
|
||||
if has_version '<dev-lang/vala-0.17.5:0.18' && [[ -f "${EROOT}usr/share/aclocal/vala-0-18.m4" ]]; then
|
||||
ebegin "Removing old vala-0.18 macros"
|
||||
rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
|
||||
eend $?
|
||||
if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then
|
||||
ebegin "Removing old vala-0.18 makefile template"
|
||||
rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null
|
||||
eend $?
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
DIST cliff-1.4.5.tar.gz 121371 SHA256 0ec2c40e899cbb4d478aa946e1430600bf596ca2a3f12162a9514e9d580935ec SHA512 5c46bf5c15e542c9fb4734113c37d5b6ebaf38f586a2eeedf3281085904f99014de6e4da01937485ca9b533b26f58226987ab7356d2f4b70e083802d773ab099 WHIRLPOOL 2ff5d4f898eb9a3c3ab7aa99b4ede7417582e692218b5f2073c7c168b1c47dfad31e3c48ab410d2336638135391d5197835e9da956b04542c92d1a9742b26610
|
||||
DIST cliff-1.4.tar.gz 124342 SHA256 e5650c92bdd7917f850fc3ac11bd3ad4abd0cb0be4654770b29b63f288bea316 SHA512 764fa34d8eb4775360912f2dfbccb262a34ee693e76d62d66b848a60fbc260dd2240ac4be7991d77118d4af7152aa3e08cf9b98566391fe574dbfdeb8f59a97b WHIRLPOOL 3e767a4614bd4cdbe4b595c7949605715cee3e88fdd23f89d74cd6ab4dc00dd32a834e2b7bc2c583444d753a1181ec321a5d52c3ccb0c56a6ed02feb4fb6e0d3
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/cliff/cliff-1.4.5.ebuild,v 1.1 2013/10/23 03:23:26 prometheanfire Exp $
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python{2_7,3_2,3_3} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Command Line Interface Formulation Framework"
|
||||
HOMEPAGE="https://github.com/dreamhost/cliff"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="${RDEPEND}
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/prettytable-0.6
|
||||
<dev-python/prettytable-0.8
|
||||
>=dev-python/cmd2-0.6.7[${PYTHON_USEDEP}]
|
||||
virtual/python-argparse[${PYTHON_USEDEP}]
|
||||
test? ( dev-python/nose[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
dev-python/coverage[${PYTHON_USEDEP}]
|
||||
dev-python/pep8[${PYTHON_USEDEP}]
|
||||
dev-python/cmd2[${PYTHON_USEDEP}] )"
|
||||
|
||||
python_test() {
|
||||
nosetests tests || die "Tests fail with ${EPYTHON}"
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/cliff/cliff-1.4.ebuild,v 1.2 2013/09/10 05:26:54 prometheanfire Exp $
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 python3_2 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Command Line Interface Formulation Framework"
|
||||
HOMEPAGE="https://github.com/dreamhost/cliff"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
RDEPEND="virtual/python-argparse[${PYTHON_USEDEP}]
|
||||
>=dev-python/prettytable-0.6
|
||||
<dev-python/prettytable-0.8
|
||||
>=dev-python/cmd2-0.6.4[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyparsing-1.5.7"
|
||||
|
||||
python_prepare() {
|
||||
sed -i '29,37d' "setup.py" || die
|
||||
}
|
||||
|
|
@ -1,151 +0,0 @@
|
|||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
#
|
||||
# gnome2-live.eclass
|
||||
#
|
||||
# Exports additional functions used by live ebuilds written for GNOME packages
|
||||
# Always to be imported *AFTER* gnome2.eclass
|
||||
#
|
||||
# Author: Nirbheek Chauhan <nirbheek@gentoo.org>
|
||||
#
|
||||
|
||||
|
||||
inherit autotools gnome2 gnome2-utils libtool git-2
|
||||
|
||||
# Stolen from git.eclass
|
||||
EXPORTED_FUNCTIONS="src_unpack pkg_postinst"
|
||||
case "${EAPI:-0}" in
|
||||
2|3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare" ;;
|
||||
0|1) ;;
|
||||
*) die "Unknown EAPI, Bug eclass maintainers." ;;
|
||||
esac
|
||||
EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
|
||||
|
||||
# DEPEND on
|
||||
# app-text/gnome-doc-utils for gnome-doc-*
|
||||
# dev-util/gtk-doc for gtkdocize
|
||||
# dev-util/intltool for intltoolize
|
||||
# gnome-base/gnome-common for GNOME_COMMON_INIT
|
||||
DEPEND="${DEPEND}
|
||||
app-text/gnome-doc-utils
|
||||
dev-util/gtk-doc
|
||||
dev-util/intltool
|
||||
gnome-base/gnome-common
|
||||
sys-devel/gettext"
|
||||
|
||||
# Extra options passed to elibtoolize
|
||||
ELTCONF=${ELTCONF:-}
|
||||
|
||||
# Default git module name
|
||||
GNOME_LIVE_MODULE=${GNOME_LIVE_MODULE:-"${PN}"}
|
||||
|
||||
# GIT URI for the project
|
||||
EGIT_REPO_URI="${EGIT_REPO_URI:-"git://git.gnome.org/${GNOME_LIVE_MODULE}"}"
|
||||
|
||||
# Unset SRC_URI auto-set by gnome2.eclass
|
||||
SRC_URI=""
|
||||
|
||||
gnome2-live_get_var() {
|
||||
local var f
|
||||
var="$1"
|
||||
f="$2"
|
||||
echo $(sed -ne "s/${var}(\(.*\))/\1/p" "${f}" | tr -d '[]')
|
||||
}
|
||||
|
||||
gnome2-live_src_unpack() {
|
||||
if test -n "${A}"; then
|
||||
unpack ${A}
|
||||
fi
|
||||
git_src_unpack
|
||||
has src_prepare ${EXPORTED_FUNCTIONS} || gnome2-live_src_prepare
|
||||
}
|
||||
|
||||
gnome2-live_src_prepare() {
|
||||
# Blame git.eclass
|
||||
cd "${S}"
|
||||
for i in ${PATCHES}; do
|
||||
epatch "${i}"
|
||||
done
|
||||
|
||||
# If ChangeLog doesn't exist, maybe it's autogenerated
|
||||
# Avoid a `dodoc` failure by adding an empty ChangeLog
|
||||
if ! test -e ChangeLog; then
|
||||
echo > ChangeLog
|
||||
fi
|
||||
|
||||
# Find and create macro dirs
|
||||
local macro_dirs=($(gnome2-live_get_var AC_CONFIG_MACRO_DIR configure.*))
|
||||
for i in "${macro_dirs[@]}"; do
|
||||
mkdir -p "$i"
|
||||
done
|
||||
|
||||
# We don't run gettextize because that does too much stuff
|
||||
if grep -qe 'GETTEXT' configure.*; then
|
||||
local aux_dir=${S}/$(gnome2-live_get_var AC_CONFIG_AUX_DIR configure.*)
|
||||
mkdir -p "${aux_dir}"
|
||||
test -e "${aux_dir}/config.rpath" || :> "${aux_dir}/config.rpath"
|
||||
test -e "${aux_dir}/ABOUT-NLS" || cp "${ROOT}/usr/share/gettext/ABOUT-NLS" "${aux_dir}"
|
||||
fi
|
||||
|
||||
if grep -qe 'GTK_DOC' configure.*; then
|
||||
ebegin "Running gtkdocize"
|
||||
gtkdocize
|
||||
eend $?
|
||||
fi
|
||||
if grep -qe 'GNOME_DOC_INIT' configure.*; then
|
||||
ebegin "Running gnome-doc-common"
|
||||
gnome-doc-common
|
||||
eend $?
|
||||
ebegin "Running gnome-doc-prepare --automake"
|
||||
gnome-doc-prepare --automake
|
||||
eend $?
|
||||
fi
|
||||
if grep -qe "IT_PROG_INTLTOOL" -e "AC_PROG_INTLTOOL" configure.*; then
|
||||
if grep -qe "AC_PROG_INTLTOOL" configure.*; then
|
||||
eqawarn "This package is using deprecated AC_PROG_INTLTOOL macro."
|
||||
eqawarn "Please fill a bug to the upstream of this package."
|
||||
fi
|
||||
ebegin "Running intltoolize --force"
|
||||
intltoolize --force
|
||||
eend $?
|
||||
fi
|
||||
if test -e m4; then
|
||||
AT_M4DIR=m4 eautoreconf
|
||||
else
|
||||
eautoreconf
|
||||
fi
|
||||
|
||||
# Disable pyc compiling. Doesn't harm if DNE
|
||||
ln -sf $(type -P true) py-compile
|
||||
|
||||
### Keep this in-sync with gnome2.eclass!
|
||||
|
||||
# Don't use the session bus address inherited via the environment
|
||||
# causes test and introspection-building failures
|
||||
unset DBUS_SESSION_BUS_ADDRESS
|
||||
|
||||
# Prevent scrollkeeper access violations
|
||||
gnome2_omf_fix
|
||||
|
||||
# Libtool patching
|
||||
elibtoolize ${ELTCONF}
|
||||
}
|
||||
|
||||
# So that it replaces gnome2_src_unpack in ebuilds that call it
|
||||
gnome2_src_unpack() {
|
||||
gnome2-live_src_unpack
|
||||
}
|
||||
|
||||
# So that it replaces gnome2_src_prepare in ebuilds that call it
|
||||
gnome2_src_prepare() {
|
||||
gnome2-live_src_prepare
|
||||
}
|
||||
|
||||
# Run manually for ebuilds that have a custom pkg_postinst
|
||||
gnome2-live_pkg_postinst() {
|
||||
ewarn "This is a live ebuild, upstream trunks will mostly be UNstable"
|
||||
ewarn "Do NOT report bugs about this package to Gentoo"
|
||||
ewarn "Report upstream bugs (with patches if possible) instead."
|
||||
}
|
||||
|
|
@ -1,3 +1 @@
|
|||
DIST minetest-0.4.10.tar.gz 5291236 SHA256 05d15c8e2c8e53ee9d3006e79c2b59200311a7b879220d8b6f6a6fd2acf806b6 SHA512 0d2f2590df530df9bed11a08a3e67dfa39dae1987b8c1f6a4f4f2ace2c40dea3b5afce445e3b2e17b2bd8a426bdd53d717989018f5da531b1eb10965d953c3bf WHIRLPOOL 016c2bc6f9aed44943f238491c445f48013f76a74f9c09e56c1e70e03fa3ded72b042b9dffa0bed81a9dcdc84358a9be88bbf32119dd45a1e2a9873031be1009
|
||||
DIST minetest-0.4.8.tar.gz 5157034 SHA256 657329dd4733801617f32f110e527ce6e0fc93d30168683842f881414d28c309 SHA512 2ad93bc449bd6ba77f81584e3aec90af8f8d632c7e8238ac3b7fabe2759636f2a0652ff697b53f1d95e95cf96493b1915ddedf18e5df3ef97d5638adce9c9fd4 WHIRLPOOL bf464ace8dc707c4f2875e7041d432462c6988f7b40a2747b4b1b6c2c6a231581c4ef9b144ba632ffe15d179e1530e2a0a5265355cae852488e84838bced727b
|
||||
DIST minetest-0.4.9.tar.gz 5195312 SHA256 b394eeb054aa6cd0f022535e486a0c61504039f48671791da2a84da4bc5b2a26 SHA512 8d4185c99425ffd9de18abbe6de14189e0a7818aa5e554bcef05d66ab3ff16a63b0ce8105eca55609738867d518c95c7fcee08fb62ee424ecbef057a71424bcf WHIRLPOOL 84de3bf1b9287173e7e046e7f293b282aab8fdd23e9b899ea2bb1adcbf80fe9ae8cc76709142c46f6519574fe915037e13154dc4488ebe0b3db9596e6f9c93f8
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
commit a88bfd5b77fa0b5c60e438c0011dbdcee5e14dfd
|
||||
Author: hasufell <hasufell@gentoo.org>
|
||||
Date: Mon Nov 25 00:28:55 2013 +0100
|
||||
|
||||
CMAKE: fix linking order
|
||||
|
||||
this also fixes linking with as-needed wrt
|
||||
https://github.com/minetest/minetest/issues/617
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index a1fee7a..a72bd4a 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -427,18 +427,18 @@ if(BUILD_CLIENT)
|
||||
target_link_libraries(
|
||||
${PROJECT_NAME}
|
||||
${ZLIB_LIBRARIES}
|
||||
- ${IRRLICHT_LIBRARY}
|
||||
+ ${X11_LIBRARIES}
|
||||
${OPENGL_LIBRARIES}
|
||||
+ ${OPENGLES2_LIBRARIES}
|
||||
${JPEG_LIBRARIES}
|
||||
${BZIP2_LIBRARIES}
|
||||
${PNG_LIBRARIES}
|
||||
- ${X11_LIBRARIES}
|
||||
+ ${IRRLICHT_LIBRARY}
|
||||
${GETTEXT_LIBRARY}
|
||||
${SOUND_LIBRARIES}
|
||||
${SQLITE3_LIBRARY}
|
||||
${LUA_LIBRARY}
|
||||
${JSON_LIBRARY}
|
||||
- ${OPENGLES2_LIBRARIES}
|
||||
${PLATFORM_LIBS}
|
||||
${CLIENT_PLATFORM_LIBS}
|
||||
)
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
commit d8dbda3636a91eba52c97450b58f767d5a4a376e
|
||||
Author: hasufell <hasufell@gentoo.org>
|
||||
Date: Mon Nov 25 00:25:55 2013 +0100
|
||||
|
||||
add USE_LUAJIT option
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index a30dc98..a1fee7a 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -179,24 +179,29 @@ if(USE_FREETYPE)
|
||||
endif(USE_FREETYPE)
|
||||
|
||||
|
||||
-find_library(LUA_LIBRARY luajit
|
||||
- NAMES luajit-5.1)
|
||||
-find_path(LUA_INCLUDE_DIR luajit.h
|
||||
- NAMES luajit.h
|
||||
- PATH_SUFFIXES luajit-2.0)
|
||||
-message (STATUS "LuaJIT library: ${LUA_LIBRARY}")
|
||||
-message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}")
|
||||
+option(USE_LUAJIT "Use luajit instead of lua" OFF)
|
||||
|
||||
set(USE_LUAJIT 0)
|
||||
-if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
|
||||
- message (STATUS "LuaJIT found.")
|
||||
- set(USE_LUAJIT 1)
|
||||
-else(LUA_LIBRARY AND LUA_INCLUDE_DIR)
|
||||
- message (STATUS "LuaJIT not found, using bundled Lua.")
|
||||
- set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
|
||||
- set(LUA_LIBRARY "lua")
|
||||
- add_subdirectory(lua)
|
||||
-endif(LUA_LIBRARY AND LUA_INCLUDE_DIR)
|
||||
+if(USE_LUAJIT)
|
||||
+ find_library(LUA_LIBRARY luajit
|
||||
+ NAMES luajit-5.1)
|
||||
+ find_path(LUA_INCLUDE_DIR luajit.h
|
||||
+ NAMES luajit.h
|
||||
+ PATH_SUFFIXES luajit-2.0)
|
||||
+ if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
|
||||
+ message (STATUS "LuaJIT found")
|
||||
+ set(USE_LUAJIT 1)
|
||||
+ else(LUA_LIBRARY AND LUA_INCLUDE_DIR)
|
||||
+ message (FATAL_ERROR "LuaJIT not found!")
|
||||
+ endif(LUA_LIBRARY AND LUA_INCLUDE_DIR)
|
||||
+else(USE_LUAJIT)
|
||||
+ find_package(Lua51)
|
||||
+ if(LUA51_FOUND)
|
||||
+ message (STATUS "Lua51 found")
|
||||
+ else(LUA51_FOUND)
|
||||
+ message (FATAL_ERROR "Lua51 not found!")
|
||||
+ endif(LUA51_FOUND)
|
||||
+endif(USE_LUAJIT)
|
||||
|
||||
mark_as_advanced(LUA_LIBRARY)
|
||||
mark_as_advanced(LUA_INCLUDE_DIR)
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
commit 11d35e62fe13b47c5b34139559e650dfe6ebbd84
|
||||
Author: hasufell <julian.ospald@googlemail.com>
|
||||
Date: Sat Jun 8 13:40:30 2013 +0200
|
||||
|
||||
CMAKE: use shared lib from Irrlicht
|
||||
|
||||
diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
|
||||
index bd00422..4632993 100644
|
||||
--- a/cmake/Modules/FindIrrlicht.cmake
|
||||
+++ b/cmake/Modules/FindIrrlicht.cmake
|
||||
@@ -50,10 +50,11 @@ else()
|
||||
/usr/include/irrlicht
|
||||
)
|
||||
|
||||
- FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
|
||||
+ FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so Irrlicht
|
||||
PATHS
|
||||
/usr/local/lib
|
||||
/usr/lib
|
||||
+ /usr/lib64
|
||||
)
|
||||
endif()
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
commit a88bfd5b77fa0b5c60e438c0011dbdcee5e14dfd
|
||||
Author: hasufell <hasufell@gentoo.org>
|
||||
Date: Mon Nov 25 00:28:55 2013 +0100
|
||||
|
||||
CMAKE: fix linking order
|
||||
|
||||
this also fixes linking with as-needed wrt
|
||||
https://github.com/minetest/minetest/issues/617
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index a1fee7a..a72bd4a 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -427,18 +427,18 @@ if(BUILD_CLIENT)
|
||||
target_link_libraries(
|
||||
${PROJECT_NAME}
|
||||
${ZLIB_LIBRARIES}
|
||||
- ${IRRLICHT_LIBRARY}
|
||||
+ ${X11_LIBRARIES}
|
||||
${OPENGL_LIBRARIES}
|
||||
+ ${OPENGLES2_LIBRARIES}
|
||||
${JPEG_LIBRARIES}
|
||||
${BZIP2_LIBRARIES}
|
||||
${PNG_LIBRARIES}
|
||||
- ${X11_LIBRARIES}
|
||||
+ ${IRRLICHT_LIBRARY}
|
||||
${GETTEXT_LIBRARY}
|
||||
${SOUND_LIBRARIES}
|
||||
${SQLITE3_LIBRARY}
|
||||
${LUA_LIBRARY}
|
||||
${JSON_LIBRARY}
|
||||
- ${OPENGLES2_LIBRARIES}
|
||||
${PLATFORM_LIBS}
|
||||
${CLIENT_PLATFORM_LIBS}
|
||||
)
|
||||
|
|
@ -1,87 +0,0 @@
|
|||
From: Julian Ospald <hasufell@gentoo.org>
|
||||
Date: Sun Dec 8 19:28:11 UTC 2013
|
||||
Subject: prefer pkg-config for freetype2 detection
|
||||
|
||||
https://github.com/minetest/minetest/pull/1042
|
||||
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -173,7 +173,22 @@
|
||||
find_package(OpenGLES2)
|
||||
|
||||
if(USE_FREETYPE)
|
||||
- find_package(Freetype REQUIRED)
|
||||
+ if(UNIX)
|
||||
+ include(FindPkgConfig)
|
||||
+ if(PKG_CONFIG_FOUND)
|
||||
+ pkg_check_modules(FREETYPE QUIET freetype2)
|
||||
+ if(FREETYPE_FOUND)
|
||||
+ SET(FREETYPE_PKGCONFIG_FOUND TRUE)
|
||||
+ SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARIES})
|
||||
+ # because cmake is idiotic
|
||||
+ string(REPLACE ";" " " FREETYPE_CFLAGS_STR ${FREETYPE_CFLAGS})
|
||||
+ string(REPLACE ";" " " FREETYPE_LDFLAGS_STR ${FREETYPE_LDFLAGS})
|
||||
+ endif(FREETYPE_FOUND)
|
||||
+ endif(PKG_CONFIG_FOUND)
|
||||
+ endif(UNIX)
|
||||
+ if(NOT FREETYPE_FOUND)
|
||||
+ find_package(Freetype REQUIRED)
|
||||
+ endif(NOT FREETYPE_FOUND)
|
||||
set(CGUITTFONT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cguittfont")
|
||||
set(CGUITTFONT_LIBRARY cguittfont)
|
||||
endif(USE_FREETYPE)
|
||||
@@ -446,6 +461,12 @@
|
||||
)
|
||||
endif(USE_CURL)
|
||||
if(USE_FREETYPE)
|
||||
+ if(FREETYPE_PKGCONFIG_FOUND)
|
||||
+ set_target_properties(${PROJECT_NAME}
|
||||
+ PROPERTIES
|
||||
+ COMPILE_FLAGS "${FREETYPE_CFLAGS_STR}"
|
||||
+ )
|
||||
+ endif(FREETYPE_PKGCONFIG_FOUND)
|
||||
target_link_libraries(
|
||||
${PROJECT_NAME}
|
||||
${FREETYPE_LIBRARY}
|
||||
--- a/src/cguittfont/CMakeLists.txt
|
||||
+++ b/src/cguittfont/CMakeLists.txt
|
||||
@@ -1,17 +1,29 @@
|
||||
-include_directories(
|
||||
- ${IRRLICHT_INCLUDE_DIR}
|
||||
- ${FREETYPE_INCLUDE_DIRS}
|
||||
-)
|
||||
-
|
||||
# CGUITTFont authors, y u no include headers you use?
|
||||
# Do not add CGUITTFont.cpp to the line below.
|
||||
# xCGUITTFont.cpp is a wrapper file that includes
|
||||
# additional required headers.
|
||||
add_library(cguittfont xCGUITTFont.cpp)
|
||||
|
||||
+if(FREETYPE_PKGCONFIG_FOUND)
|
||||
+ set_target_properties(cguittfont
|
||||
+ PROPERTIES
|
||||
+ COMPILE_FLAGS "${FREETYPE_CFLAGS_STR}"
|
||||
+ LINK_FLAGS "${FREETYPE_LDFLAGS_STR}"
|
||||
+ )
|
||||
+
|
||||
+ include_directories(
|
||||
+ ${IRRLICHT_INCLUDE_DIR}
|
||||
+ )
|
||||
+else(FREETYPE_PKGCONFIG_FOUND)
|
||||
+ include_directories(
|
||||
+ ${IRRLICHT_INCLUDE_DIR}
|
||||
+ ${FREETYPE_INCLUDE_DIRS}
|
||||
+ )
|
||||
+endif(FREETYPE_PKGCONFIG_FOUND)
|
||||
+
|
||||
target_link_libraries(
|
||||
- cguittfont
|
||||
- ${IRRLICHT_LIBRARY}
|
||||
- ${FREETYPE_LIBRARY}
|
||||
- ${ZLIB_LIBRARIES} # needed by freetype, repeated here for safety
|
||||
-)
|
||||
+ cguittfont
|
||||
+ ${IRRLICHT_LIBRARY}
|
||||
+ ${FREETYPE_LIBRARY}
|
||||
+ ${ZLIB_LIBRARIES} # needed by freetype, repeated here for safety
|
||||
+ )
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
commit d8dbda3636a91eba52c97450b58f767d5a4a376e
|
||||
Author: hasufell <hasufell@gentoo.org>
|
||||
Date: Mon Nov 25 00:25:55 2013 +0100
|
||||
|
||||
add USE_LUAJIT option
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index a30dc98..a1fee7a 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -179,24 +179,29 @@ if(USE_FREETYPE)
|
||||
endif(USE_FREETYPE)
|
||||
|
||||
|
||||
-find_library(LUA_LIBRARY luajit
|
||||
- NAMES luajit-5.1)
|
||||
-find_path(LUA_INCLUDE_DIR luajit.h
|
||||
- NAMES luajit.h
|
||||
- PATH_SUFFIXES luajit-2.0)
|
||||
-message (STATUS "LuaJIT library: ${LUA_LIBRARY}")
|
||||
-message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}")
|
||||
+option(USE_LUAJIT "Use luajit instead of lua" OFF)
|
||||
|
||||
set(USE_LUAJIT 0)
|
||||
-if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
|
||||
- message (STATUS "LuaJIT found.")
|
||||
- set(USE_LUAJIT 1)
|
||||
-else(LUA_LIBRARY AND LUA_INCLUDE_DIR)
|
||||
- message (STATUS "LuaJIT not found, using bundled Lua.")
|
||||
- set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
|
||||
- set(LUA_LIBRARY "lua")
|
||||
- add_subdirectory(lua)
|
||||
-endif(LUA_LIBRARY AND LUA_INCLUDE_DIR)
|
||||
+if(USE_LUAJIT)
|
||||
+ find_library(LUA_LIBRARY luajit
|
||||
+ NAMES luajit-5.1)
|
||||
+ find_path(LUA_INCLUDE_DIR luajit.h
|
||||
+ NAMES luajit.h
|
||||
+ PATH_SUFFIXES luajit-2.0)
|
||||
+ if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
|
||||
+ message (STATUS "LuaJIT found")
|
||||
+ set(USE_LUAJIT 1)
|
||||
+ else(LUA_LIBRARY AND LUA_INCLUDE_DIR)
|
||||
+ message (FATAL_ERROR "LuaJIT not found!")
|
||||
+ endif(LUA_LIBRARY AND LUA_INCLUDE_DIR)
|
||||
+else(USE_LUAJIT)
|
||||
+ find_package(Lua51)
|
||||
+ if(LUA51_FOUND)
|
||||
+ message (STATUS "Lua51 found")
|
||||
+ else(LUA51_FOUND)
|
||||
+ message (FATAL_ERROR "Lua51 not found!")
|
||||
+ endif(LUA51_FOUND)
|
||||
+endif(USE_LUAJIT)
|
||||
|
||||
mark_as_advanced(LUA_LIBRARY)
|
||||
mark_as_advanced(LUA_INCLUDE_DIR)
|
||||
|
|
@ -1,163 +0,0 @@
|
|||
From: Julian Ospald <hasufell@gentoo.org>
|
||||
Date: Fri Nov 29 19:34:37 UTC 2013
|
||||
|
||||
This patch is currently not needed in this form, because gentoo irrlicht
|
||||
does not yet have gles2 support. However this will be needed
|
||||
once it does, so we can add a gles2 useflag.
|
||||
|
||||
Also fixes
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=492804
|
||||
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -7,6 +7,7 @@
|
||||
mark_as_advanced(JSON_INCLUDE_DIR JSON_LIBRARY)
|
||||
|
||||
option(ENABLE_CURL "Enable cURL support for fetching media" 1)
|
||||
+option(ENABLE_GLES2 "Enable GLES2 support with irrlicht" 0)
|
||||
|
||||
if (NOT ENABLE_CURL)
|
||||
mark_as_advanced(CLEAR CURL_LIBRARY CURL_INCLUDE_DIR)
|
||||
@@ -170,7 +171,10 @@
|
||||
|
||||
find_package(Sqlite3 REQUIRED)
|
||||
find_package(Json REQUIRED)
|
||||
-find_package(OpenGLES2)
|
||||
+if(ENABLE_GLES2 AND BUILD_CLIENT)
|
||||
+ find_package(OpenGLES2 REQUIRED)
|
||||
+ add_definitions( -DWITH_GLES2 )
|
||||
+endif(ENABLE_GLES2 AND BUILD_CLIENT)
|
||||
|
||||
if(USE_FREETYPE)
|
||||
find_package(Freetype REQUIRED)
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -1331,10 +1331,12 @@
|
||||
else if(driverstring == "ogles1")
|
||||
driverType = video::EDT_OGLES1;
|
||||
#endif
|
||||
+#ifdef WITH_GLES2
|
||||
#ifdef _IRR_COMPILE_WITH_OGLES2_
|
||||
else if(driverstring == "ogles2")
|
||||
driverType = video::EDT_OGLES2;
|
||||
#endif
|
||||
+#endif
|
||||
else
|
||||
{
|
||||
errorstream<<"WARNING: Invalid video_driver specified; defaulting "
|
||||
--- a/cmake/Modules/FindOpenGLES2.cmake
|
||||
+++ b/cmake/Modules/FindOpenGLES2.cmake
|
||||
@@ -19,6 +19,7 @@
|
||||
# win32, apple, android NOT TESED
|
||||
# linux tested and works
|
||||
|
||||
+
|
||||
IF (WIN32)
|
||||
IF (CYGWIN)
|
||||
|
||||
@@ -47,51 +48,57 @@
|
||||
|
||||
ELSE(APPLE)
|
||||
|
||||
- FIND_PATH(OPENGLES2_INCLUDE_DIR GLES2/gl2.h
|
||||
- /usr/openwin/share/include
|
||||
- /opt/graphics/OpenGL/include /usr/X11R6/include
|
||||
- /usr/include
|
||||
- )
|
||||
-
|
||||
- FIND_LIBRARY(OPENGLES2_gl_LIBRARY
|
||||
- NAMES GLESv2
|
||||
- PATHS /opt/graphics/OpenGL/lib
|
||||
+ # prefer pkg-config
|
||||
+ INCLUDE(FindPkgConfig)
|
||||
+ IF (PKG_CONFIG_FOUND)
|
||||
+ pkg_check_modules(OPENGLES2 QUIET glesv2 egl)
|
||||
+ ELSE (PKG_CONFIG_FOUND)
|
||||
+ FIND_PATH(OPENGLES2_INCLUDE_DIR GLES2/gl2.h
|
||||
+ /usr/openwin/share/include
|
||||
+ /opt/graphics/OpenGL/include /usr/X11R6/include
|
||||
+ /usr/include
|
||||
+ )
|
||||
+
|
||||
+ FIND_LIBRARY(OPENGLES2_gl_LIBRARY
|
||||
+ NAMES GLESv2
|
||||
+ PATHS /opt/graphics/OpenGL/lib
|
||||
/usr/openwin/lib
|
||||
/usr/shlib /usr/X11R6/lib
|
||||
/usr/lib
|
||||
- )
|
||||
+ )
|
||||
|
||||
- IF (NOT BUILD_ANDROID)
|
||||
- FIND_PATH(EGL_INCLUDE_DIR EGL/egl.h
|
||||
- /usr/openwin/share/include
|
||||
- /opt/graphics/OpenGL/include /usr/X11R6/include
|
||||
- /usr/include
|
||||
- )
|
||||
-
|
||||
- FIND_LIBRARY(EGL_egl_LIBRARY
|
||||
- NAMES EGL
|
||||
- PATHS /opt/graphics/OpenGL/lib
|
||||
- /usr/openwin/lib
|
||||
- /usr/shlib /usr/X11R6/lib
|
||||
- /usr/lib
|
||||
- )
|
||||
-
|
||||
- # On Unix OpenGL most certainly always requires X11.
|
||||
- # Feel free to tighten up these conditions if you don't
|
||||
- # think this is always true.
|
||||
- # It's not true on OSX.
|
||||
-
|
||||
- IF (OPENGLES2_gl_LIBRARY)
|
||||
- IF(NOT X11_FOUND)
|
||||
- INCLUDE(FindX11)
|
||||
- ENDIF(NOT X11_FOUND)
|
||||
- IF (X11_FOUND)
|
||||
- IF (NOT APPLE)
|
||||
- SET (OPENGLES2_LIBRARIES ${X11_LIBRARIES})
|
||||
- ENDIF (NOT APPLE)
|
||||
- ENDIF (X11_FOUND)
|
||||
- ENDIF (OPENGLES2_gl_LIBRARY)
|
||||
- ENDIF ()
|
||||
+ IF (NOT BUILD_ANDROID)
|
||||
+ FIND_PATH(EGL_INCLUDE_DIR EGL/egl.h
|
||||
+ /usr/openwin/share/include
|
||||
+ /opt/graphics/OpenGL/include /usr/X11R6/include
|
||||
+ /usr/include
|
||||
+ )
|
||||
+
|
||||
+ FIND_LIBRARY(EGL_egl_LIBRARY
|
||||
+ NAMES EGL
|
||||
+ PATHS /opt/graphics/OpenGL/lib
|
||||
+ /usr/openwin/lib
|
||||
+ /usr/shlib /usr/X11R6/lib
|
||||
+ /usr/lib
|
||||
+ )
|
||||
+
|
||||
+ # On Unix OpenGL most certainly always requires X11.
|
||||
+ # Feel free to tighten up these conditions if you don't
|
||||
+ # think this is always true.
|
||||
+ # It's not true on OSX.
|
||||
+
|
||||
+ IF (OPENGLES2_gl_LIBRARY)
|
||||
+ IF(NOT X11_FOUND)
|
||||
+ INCLUDE(FindX11)
|
||||
+ ENDIF(NOT X11_FOUND)
|
||||
+ IF (X11_FOUND)
|
||||
+ IF (NOT APPLE)
|
||||
+ SET (OPENGLES2_LIBRARIES ${X11_LIBRARIES})
|
||||
+ ENDIF (NOT APPLE)
|
||||
+ ENDIF (X11_FOUND)
|
||||
+ ENDIF (OPENGLES2_gl_LIBRARY)
|
||||
+ ENDIF (NOT BUILD_ANDROID)
|
||||
+ ENDIF (PKG_CONFIG_FOUND)
|
||||
|
||||
ENDIF(APPLE)
|
||||
ENDIF (WIN32)
|
||||
@@ -126,5 +133,5 @@
|
||||
IF(OPENGLES2_FOUND)
|
||||
MESSAGE(STATUS "Found system opengles2 library ${OPENGLES2_LIBRARIES}")
|
||||
ELSE ()
|
||||
- SET(OPENGLES2_LIBRARIES "")
|
||||
+ MESSAGE(FATAL_ERROR "OpenGLES2 not found!")
|
||||
ENDIF ()
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
commit 11d35e62fe13b47c5b34139559e650dfe6ebbd84
|
||||
Author: hasufell <julian.ospald@googlemail.com>
|
||||
Date: Sat Jun 8 13:40:30 2013 +0200
|
||||
|
||||
CMAKE: use shared lib from Irrlicht
|
||||
|
||||
diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
|
||||
index bd00422..4632993 100644
|
||||
--- a/cmake/Modules/FindIrrlicht.cmake
|
||||
+++ b/cmake/Modules/FindIrrlicht.cmake
|
||||
@@ -50,10 +50,11 @@ else()
|
||||
/usr/include/irrlicht
|
||||
)
|
||||
|
||||
- FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
|
||||
+ FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so Irrlicht
|
||||
PATHS
|
||||
/usr/local/lib
|
||||
/usr/lib
|
||||
+ /usr/lib64
|
||||
)
|
||||
endif()
|
||||
|
||||
|
|
@ -1,144 +0,0 @@
|
|||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/minetest-0.4.8.ebuild,v 1.1 2013/11/24 23:42:51 hasufell Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils cmake-utils gnome2-utils vcs-snapshot user games
|
||||
|
||||
DESCRIPTION="An InfiniMiner/Minecraft inspired game"
|
||||
HOMEPAGE="http://minetest.net/"
|
||||
SRC_URI="http://github.com/minetest/minetest/tarball/${PV} -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+curl dedicated leveldb luajit nls +server +sound +truetype"
|
||||
|
||||
RDEPEND="dev-db/sqlite:3
|
||||
>=dev-games/irrlicht-1.8-r2
|
||||
sys-libs/zlib
|
||||
curl? ( net-misc/curl )
|
||||
!dedicated? (
|
||||
app-arch/bzip2
|
||||
media-libs/libpng:0
|
||||
virtual/jpeg
|
||||
virtual/opengl
|
||||
x11-libs/libX11
|
||||
x11-libs/libXxf86vm
|
||||
sound? (
|
||||
media-libs/libogg
|
||||
media-libs/libvorbis
|
||||
media-libs/openal
|
||||
)
|
||||
truetype? ( media-libs/freetype:2 )
|
||||
)
|
||||
leveldb? ( dev-libs/leveldb )
|
||||
luajit? ( dev-lang/luajit:2 )
|
||||
!luajit? ( >=dev-lang/lua-5.1.4 )
|
||||
nls? ( virtual/libintl )"
|
||||
DEPEND="${RDEPEND}
|
||||
nls? ( sys-devel/gettext )"
|
||||
|
||||
pkg_setup() {
|
||||
games_pkg_setup
|
||||
|
||||
if use server || use dedicated ; then
|
||||
enewuser ${PN} -1 -1 /var/lib/${PN} ${GAMES_GROUP}
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
vcs-snapshot_src_unpack
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${P}-lua-luajit-option.patch \
|
||||
"${FILESDIR}"/${P}-shared-irrlicht.patch \
|
||||
"${FILESDIR}"/${P}-as-needed.patch
|
||||
|
||||
# correct gettext behavior
|
||||
if [[ -n "${LINGUAS+x}" ]] ; then
|
||||
for i in $(cd po ; echo *) ; do
|
||||
if ! has ${i} ${LINGUAS} ; then
|
||||
rm -r po/${i} || die
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# jthread is modified
|
||||
# json is modified
|
||||
rm -r src/{lua,sqlite} || die
|
||||
|
||||
# set paths
|
||||
sed \
|
||||
-e "s#@BINDIR@#${GAMES_BINDIR}#g" \
|
||||
-e "s#@GROUP@#${GAMES_GROUP}#g" \
|
||||
"${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DRUN_IN_PLACE=0
|
||||
-DCUSTOM_SHAREDIR="${GAMES_DATADIR}/${PN}"
|
||||
-DCUSTOM_BINDIR="${GAMES_BINDIR}"
|
||||
-DCUSTOM_DOCDIR="/usr/share/doc/${PF}"
|
||||
-DCUSTOM_LOCALEDIR="/usr/share/locale"
|
||||
$(usex dedicated "-DBUILD_SERVER=ON -DBUILD_CLIENT=OFF" "$(cmake-utils_use_build server SERVER) -DBUILD_CLIENT=ON")
|
||||
$(cmake-utils_use_enable nls GETTEXT)
|
||||
$(cmake-utils_use_enable curl CURL)
|
||||
$(cmake-utils_use_use luajit LUAJIT)
|
||||
$(cmake-utils_use_enable truetype FREETYPE)
|
||||
$(cmake-utils_use_enable sound SOUND)
|
||||
$(cmake-utils_use_enable leveldb LEVELDB)
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake-utils_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
if use server || use dedicated ; then
|
||||
newinitd "${FILESDIR}"/minetestserver.initd minetest-server
|
||||
newconfd "${T}"/minetestserver.confd minetest-server
|
||||
fi
|
||||
|
||||
prepgamesdirs
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
games_pkg_preinst
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
games_pkg_postinst
|
||||
gnome2_icon_cache_update
|
||||
|
||||
if ! use dedicated ; then
|
||||
elog
|
||||
elog "optional dependencies:"
|
||||
elog " games-action/minetest_game (official mod)"
|
||||
elog " games-action/minetest_common (official mod)"
|
||||
elog " games-action/minetest_build (official mod)"
|
||||
elog " games-action/minetest_survival (official mod)"
|
||||
elog
|
||||
fi
|
||||
|
||||
if use server || use dedicated ; then
|
||||
elog
|
||||
elog "Configure your server via /etc/conf.d/minetest-server"
|
||||
elog "The user \"minetest\" is created with /var/lib/${PN} homedir."
|
||||
elog "Default logfile is ~/minetest-server.log"
|
||||
elog
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
|
@ -1,147 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/minetest-0.4.9.ebuild,v 1.1 2014/01/03 15:24:24 hasufell Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils cmake-utils gnome2-utils vcs-snapshot user games
|
||||
|
||||
DESCRIPTION="An InfiniMiner/Minecraft inspired game"
|
||||
HOMEPAGE="http://minetest.net/"
|
||||
SRC_URI="http://github.com/minetest/minetest/tarball/${PV} -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+curl dedicated leveldb luajit nls +server +sound +truetype"
|
||||
|
||||
RDEPEND="dev-db/sqlite:3
|
||||
>=dev-games/irrlicht-1.8-r2
|
||||
sys-libs/zlib
|
||||
curl? ( net-misc/curl )
|
||||
!dedicated? (
|
||||
app-arch/bzip2
|
||||
media-libs/libpng:0
|
||||
virtual/jpeg
|
||||
virtual/opengl
|
||||
x11-libs/libX11
|
||||
x11-libs/libXxf86vm
|
||||
sound? (
|
||||
media-libs/libogg
|
||||
media-libs/libvorbis
|
||||
media-libs/openal
|
||||
)
|
||||
truetype? ( media-libs/freetype:2 )
|
||||
)
|
||||
leveldb? ( dev-libs/leveldb )
|
||||
luajit? ( dev-lang/luajit:2 )
|
||||
!luajit? ( >=dev-lang/lua-5.1.4[deprecated] )
|
||||
nls? ( virtual/libintl )"
|
||||
DEPEND="${RDEPEND}
|
||||
nls? ( sys-devel/gettext )"
|
||||
|
||||
pkg_setup() {
|
||||
games_pkg_setup
|
||||
|
||||
if use server || use dedicated ; then
|
||||
enewuser ${PN} -1 -1 /var/lib/${PN} ${GAMES_GROUP}
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
vcs-snapshot_src_unpack
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${P}-lua-luajit-option.patch \
|
||||
"${FILESDIR}"/${P}-shared-irrlicht.patch \
|
||||
"${FILESDIR}"/${P}-as-needed.patch \
|
||||
"${FILESDIR}"/${P}-opengles.patch \
|
||||
"${FILESDIR}"/${P}-freetype.patch
|
||||
|
||||
# correct gettext behavior
|
||||
if [[ -n "${LINGUAS+x}" ]] ; then
|
||||
for i in $(cd po ; echo *) ; do
|
||||
if ! has ${i} ${LINGUAS} ; then
|
||||
rm -r po/${i} || die
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# jthread is modified
|
||||
# json is modified
|
||||
rm -r src/{lua,sqlite} || die
|
||||
|
||||
# set paths
|
||||
sed \
|
||||
-e "s#@BINDIR@#${GAMES_BINDIR}#g" \
|
||||
-e "s#@GROUP@#${GAMES_GROUP}#g" \
|
||||
"${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DENABLE_GLES2=0
|
||||
-DRUN_IN_PLACE=0
|
||||
-DCUSTOM_SHAREDIR="${GAMES_DATADIR}/${PN}"
|
||||
-DCUSTOM_BINDIR="${GAMES_BINDIR}"
|
||||
-DCUSTOM_DOCDIR="/usr/share/doc/${PF}"
|
||||
-DCUSTOM_LOCALEDIR="/usr/share/locale"
|
||||
$(usex dedicated "-DBUILD_SERVER=ON -DBUILD_CLIENT=OFF" "$(cmake-utils_use_build server SERVER) -DBUILD_CLIENT=ON")
|
||||
$(cmake-utils_use_enable nls GETTEXT)
|
||||
$(cmake-utils_use_enable curl CURL)
|
||||
$(cmake-utils_use_use luajit LUAJIT)
|
||||
$(cmake-utils_use_enable truetype FREETYPE)
|
||||
$(cmake-utils_use_enable sound SOUND)
|
||||
$(cmake-utils_use_enable leveldb LEVELDB)
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake-utils_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
if use server || use dedicated ; then
|
||||
newinitd "${FILESDIR}"/minetestserver.initd minetest-server
|
||||
newconfd "${T}"/minetestserver.confd minetest-server
|
||||
fi
|
||||
|
||||
prepgamesdirs
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
games_pkg_preinst
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
games_pkg_postinst
|
||||
gnome2_icon_cache_update
|
||||
|
||||
if ! use dedicated ; then
|
||||
elog
|
||||
elog "optional dependencies:"
|
||||
elog " games-action/minetest_game (official mod)"
|
||||
elog " games-action/minetest_common (official mod)"
|
||||
elog " games-action/minetest_build (official mod)"
|
||||
elog " games-action/minetest_survival (official mod)"
|
||||
elog
|
||||
fi
|
||||
|
||||
if use server || use dedicated ; then
|
||||
elog
|
||||
elog "Configure your server via /etc/conf.d/minetest-server"
|
||||
elog "The user \"minetest\" is created with /var/lib/${PN} homedir."
|
||||
elog "Default logfile is ~/minetest-server.log"
|
||||
elog
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
|
@ -1,3 +1 @@
|
|||
DIST minetest_game-0.4.10.tar.gz 901448 SHA256 7624a1e64124c4438256719ccecfc44fe5139733a076394aedad1f785e50019f SHA512 eaff1fbee4e46811649293534ed2e496f40451bd1cc6527feb66da6d916ad31233b561ddae9bf631b41730ae04a17fe67c3f74ca95e527ca8eb6f45fe5dc0c86 WHIRLPOOL c9cc5b321eb6bbf7f60894f28f84d5ace5b17db34b696f0afe978bd19ee4e9b5b7202775d00b597661ec038fcc6160c0f27aa03ff1a38c559e6d3f9968c82aa7
|
||||
DIST minetest_game-0.4.8.tar.gz 751763 SHA256 a323beed31db267c220fbab2621ae025d623b32be34ac28bbdd6ef7d15feea1c SHA512 726344c3521724b7fec6fed8a01f184ddb08b38e354a5a147a93c73cfe48e7c6a49527794cc416a1a7ffa585cc8cf9754971e209e2d6446d8671985d360946d4 WHIRLPOOL 787adcf367cffb716a344937bcd48810945ac17ced39c8944341177a505951fdb927dd690fc5e73f736bdfef26e32ec22c4ea67ab351bbfd085a03c56eb6d2b9
|
||||
DIST minetest_game-0.4.9.tar.gz 753451 SHA256 00a02676105ccfca60db6dc712eacc945b089cb80f81ee333d111de6b1746a0b SHA512 8ebaae71f8ad01bac36c172e9ca56c3976329972b1f85a19c557125cbf1b516a10e742d93fd1c4541ee37e75a923480795a63fa63d3beda8a12f60bdf976ada4 WHIRLPOOL 03a335e556f61c0b3896d767225d988e06701accdc17b3bf53a157fee02f5b7db2d88a9fb08d80fcecb981a2ab96bfdd38b48fa3b82ce3eb71cbc89ff97bc684
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/games-action/minetest_game/minetest_game-0.4.8.ebuild,v 1.1 2013/11/24 23:44:01 hasufell Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit vcs-snapshot games
|
||||
|
||||
DESCRIPTION="The main game for the Minetest game engine"
|
||||
HOMEPAGE="http://github.com/minetest/minetest_game"
|
||||
SRC_URI="http://github.com/minetest/minetest_game/tarball/${PV} -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2 CC-BY-SA-3.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="~games-action/minetest-${PV}[-dedicated]
|
||||
>=games-action/minetest_common-0.4.6"
|
||||
|
||||
src_unpack() {
|
||||
vcs-snapshot_src_unpack
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto "${GAMES_DATADIR}"/minetest/games/${PN}
|
||||
doins -r mods menu
|
||||
doins game.conf
|
||||
|
||||
dodoc README.txt
|
||||
|
||||
prepgamesdirs
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/games-action/minetest_game/minetest_game-0.4.9.ebuild,v 1.1 2014/01/03 15:25:03 hasufell Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit vcs-snapshot games
|
||||
|
||||
DESCRIPTION="The main game for the Minetest game engine"
|
||||
HOMEPAGE="http://github.com/minetest/minetest_game"
|
||||
SRC_URI="http://github.com/minetest/minetest_game/tarball/${PV} -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2 CC-BY-SA-3.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="~games-action/minetest-${PV}[-dedicated]"
|
||||
|
||||
src_unpack() {
|
||||
vcs-snapshot_src_unpack
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto "${GAMES_DATADIR}"/minetest/games/${PN}
|
||||
doins -r mods menu
|
||||
doins game.conf
|
||||
|
||||
dodoc README.txt
|
||||
|
||||
prepgamesdirs
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
DIST UrbanTerror-4.2.012-to-4.2.013.zip 103786786 SHA256 ea88a4fcba89bff56caaa982884bbd10977902a71f61c29a36ce50024cdbe017 SHA512 3c9d256df659888c94c4174e923c5dc331d6a4f19845c954b454e04eb42e6a690fb4cd5c71597659f6cae113c2a301483220fd65efc7d2d82122a8a50634a2e9 WHIRLPOOL bd03ea14e00eb65de61cbb0d33636855330f2bc941c3ade2cb95ca6e59e6f675bf98e84eba6ccf80234a191c960ab3f26c8c4a4a32c997efb4536725f540b781
|
||||
DIST UrbanTerror-4.2.013-to-4.2.014.zip 21228975 SHA256 a389bbd14f3d11f294b7f3af6d543cf7d9001983ea7b71c167e6b5b7954b1db6 SHA512 f31fd4ae95f6270d7400a3e3bbdbf2fcdfb8e61016a1854d598c3d248208dc6a67bb2df8b5e1cc5461fe30caace1a827062030ce4d3e86af7035098590b9664e WHIRLPOOL 919fd5d8884b59398971ead09b60624cbcf73d85c3fe8b3860b12c36ac790ba3e475613b2e9878fc5349ea0a8274ae6554522a43dad20bda69dcb1b87a6b7a07
|
||||
DIST UrbanTerror-4.2.014-to-4.2.015.zip 163283262 SHA256 144ad248245dca61debc5d8b0615af99fb165b8c2a293d270dfa2fcd0d969ea1 SHA512 14bca57c8cd9c5f8cc84c3341546955c4e218ccb8cb6008ef20582640e9fbdc3677342a17743e211a7da72929eacfe68843eed4faf665c8e2cc2d13845c8c1fd WHIRLPOOL a0da3c7bb655b687ba27580af239771f1e271e86327a43e41d0d9160cd451a294d377d7377d172f7602585a8c01d58a2790c5130b8d50baaff2997a35e96a993
|
||||
DIST UrbanTerror-4.2.015-to-4.2.016.zip 48877338 SHA256 d56ab7a366c2adf869c750ce2bc0974b4ee749365d93b78d042ae0d24708c230 SHA512 9f58757cb67f39922b799b9a052d6dab6f4c3404d6a2fe7464cff86b37a1dd8fd2717d99afcfaae9e00e30d7462310bba62ee73921aa899de12c6f665f53fd34 WHIRLPOOL 8b7b6dafc56f5c06a894f8e64251cd6e5c98c92c2b177cdfa897cccb8887ba0a1e3a3d9dfc7b043a7cdaa9c292b75560a7d5c44f23bf9ec022031e826563452b
|
||||
DIST UrbanTerror-4.2.017-to-4.2.018.zip 9485349 SHA256 9d8a4cb258a60b2f464daaa998d9d26244f339fac562fb0c3cb4e00683968163 SHA512 a64e996a8538219ecc4300e25a31c14471593588e236ce4585c65d97b7306db7208f31549c08636657f1bd52142d7ba3aa2e72ab60a375d7a46949b6c18dac48 WHIRLPOOL 239595f7f75cc4fb9976c817a08eaa77e9413a913106b581459c84438babfe68c62ebb9775359c3dad460aeea48afaacd136d318ce9d0aa4abc0bd25ab92736c
|
||||
DIST UrbanTerror42_full012.zip 1529738026 SHA256 5b66e623ae5d065f8fb265e581c3640d3010af30457344874f4970d2d9092e6a SHA512 23d8ac966f6f0fbd52b633b31fc0f333151be0e64b8698b424e9f7a3524034339dd66e95c33ed1e1f451e22baa2522d30fdbc83091a3340b2ed42a55908f31ee WHIRLPOOL b438efe82d621b1800445e30c5eae5df4cfbe8ee02f1c8f58a5e33f0cf3d8261628f2100bb0e7d2782bdba0f578dcd6e626e1d3c775124d304c1c22246bad77a
|
||||
DIST UrbanTerror42_full017.zip 1703717111 SHA256 9916203f84a3e71a6a2fdca8b247bf78a4775d84c3f4472442a13ad157e6d1d3 SHA512 cfcb6c3358f20f9df4cb1da11126b4f3a5e2597f3ab002241be3969e57caeb6767040f78179fb4ccb13e159b12411421cc17f9d19da473c7a9f0dc4fef000c85 WHIRLPOOL 2c2214c78c43e2111cb01cefba37e3cefd6aa262961b8e5872d3ccde87f7f9c264cfc7171bd134fec3aa4546fe22f7e7637a9b59bf1fc3c039a1043e459d0837
|
||||
DIST urbanterror-4.2.015.tar.gz 9466827 SHA256 c8566beba8fa93c8d0db460445b29b488c69821ec824a68de8007ee1d5467a07 SHA512 7e4d66c06575ecc719978a1a1e51b604abfb1ead77a8d48921384b760d94a614b38929f7d1861b8e3e9bafa882d09f9be228ba35801c993de419c6b8da89daa8 WHIRLPOOL 97e4f723ca3f8fc19a34ac4aa7018b2eab7c489fab355e3d5cdcdfc73dd6d5e0457d85b6635c9624e15d3bf6145e1d73de78143f89730a43c000d7786e5d9171
|
||||
DIST urbanterror-4.2.017.tar.gz 10752638 SHA256 a847428923df26ce39604fc0fc4f30639e471c21fccc55eac1cf1cdfbb25125b SHA512 f4962294e6dd6ee9b9d95c526d5a77ff7f1e17f37ba72f907578f2dedd10eb8090ae9b48d7c07213f283f2bdb8cf235ec8d749d165c157ec90733477db038c3c WHIRLPOOL 366ddd149080f22f644349786e6fc81d232812f601ea9bcda3af1865589454083a54acd815388e9b8c2f9e4a3f4f028a639e9235ccfb5fca7f9b0ff728494456
|
||||
DIST urbanterror.svg 1592 SHA256 0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9 SHA512 ff789b35d9b1a2282485495b0d1918c7169906aeac094e7a33c7d77cd51d4787733400e1b9851ce19b38e886508d5fdd09f6cfc96b37a5b41bd0cf403e456b98 WHIRLPOOL 281413cfeb881466c2d8b882d0aa4dcf19013630a462775345c69e78a0cb86c7efed14f5d22b453c89648da682ab5e98e3579a1c975994a8e90b9fb22c37892c
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
commit dc89402ef3305202a2ec51e6c2c073bb1f65fb54
|
||||
Author: hasufell <hasufell@gentoo.org>
|
||||
Date: Wed Jul 10 01:25:27 2013 +0200
|
||||
|
||||
respect CFLAGS/LDFLAGS
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 3c134d5..54989f3 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -213,7 +213,7 @@ ifeq ($(PLATFORM),linux)
|
||||
endif
|
||||
endif
|
||||
|
||||
- BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes -pipe
|
||||
+ BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
|
||||
|
||||
ifeq ($(USE_OPENAL),1)
|
||||
BASE_CFLAGS += -DUSE_OPENAL=1
|
||||
@@ -238,18 +238,17 @@ ifeq ($(PLATFORM),linux)
|
||||
else
|
||||
BASE_CFLAGS += -I/usr/X11R6/include
|
||||
endif
|
||||
- #Anything more then -O2 and *mmx *msse/2/ causes hitching with urbanterror\
|
||||
-#also -march is illrelavent unless you know your target cpu
|
||||
- OPTIMIZE = -O2 -mmmx -msse -msse2 -msse3
|
||||
+ # what an idiotic comment
|
||||
+ OPTIMIZE =
|
||||
#having x86_x64 implys having full SSE support up to SSE3 so we will use it,\
|
||||
#for old cpus we don't care because anything pre Pentium 4/Althlon 1600+ won't run UrbanTerror
|
||||
ifeq ($(ARCH),x86_64)
|
||||
- OPTIMIZE = -O2 -msse -msse2 -msse3
|
||||
+ OPTIMIZE =
|
||||
# experimental x86_64 jit compiler! you need GNU as
|
||||
HAVE_VM_COMPILED = true
|
||||
else
|
||||
ifeq ($(ARCH),i386)
|
||||
- OPTIMIZE = -O2 -mmmx
|
||||
+ OPTIMIZE =
|
||||
|
||||
HAVE_VM_COMPILED=true
|
||||
else
|
||||
@@ -264,7 +263,7 @@ ifeq ($(PLATFORM),linux)
|
||||
BASE_CFLAGS += -DNO_VM_COMPILED
|
||||
endif
|
||||
|
||||
- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 -wall
|
||||
+ DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE)
|
||||
|
||||
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
|
||||
|
||||
@@ -273,7 +272,7 @@ ifeq ($(PLATFORM),linux)
|
||||
SHLIBLDFLAGS=-shared $(LDFLAGS)
|
||||
|
||||
THREAD_LDFLAGS=-lpthread
|
||||
- LDFLAGS=-ldl -lm
|
||||
+ LDFLAGS+=-ldl -lm
|
||||
|
||||
ifeq ($(USE_SDL),1)
|
||||
CLIENT_LDFLAGS=$(shell sdl-config --libs)
|
||||
@@ -1157,13 +1156,13 @@ endif
|
||||
|
||||
$(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
|
||||
$(echo_cmd) "LD $@"
|
||||
- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
|
||||
- $(LDFLAGS) $(LIBSDLMAIN)
|
||||
+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ) \
|
||||
+ $(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
|
||||
|
||||
$(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
|
||||
$(echo_cmd) "LD $@"
|
||||
- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
|
||||
- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
|
||||
+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \
|
||||
+ $(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
|
||||
|
||||
ifneq ($(strip $(LIBSDLMAIN)),)
|
||||
ifneq ($(strip $(LIBSDLMAINSRC)),)
|
||||
|
|
@ -1,75 +0,0 @@
|
|||
Author: hasufell <hasufell@gentoo.org>
|
||||
Date: Wed Jul 10 01:25:27 2013 +0200
|
||||
|
||||
respect CFLAGS/LDFLAGS
|
||||
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -213,7 +213,7 @@
|
||||
endif
|
||||
endif
|
||||
|
||||
- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
|
||||
+ BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
|
||||
|
||||
ifeq ($(USE_OPENAL),1)
|
||||
BASE_CFLAGS += -DUSE_OPENAL=1
|
||||
@@ -239,19 +239,15 @@
|
||||
BASE_CFLAGS += -I/usr/X11R6/include
|
||||
endif
|
||||
|
||||
- OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
|
||||
+ OPTIMIZE =
|
||||
|
||||
ifeq ($(ARCH),x86_64)
|
||||
- OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \
|
||||
- -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
|
||||
- -fstrength-reduce
|
||||
+ OPTIMIZE =
|
||||
# experimental x86_64 jit compiler! you need GNU as
|
||||
HAVE_VM_COMPILED = true
|
||||
else
|
||||
ifeq ($(ARCH),i386)
|
||||
- OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
|
||||
- -funroll-loops -falign-loops=2 -falign-jumps=2 \
|
||||
- -falign-functions=2 -fstrength-reduce
|
||||
+ OPTIMIZE =
|
||||
HAVE_VM_COMPILED=true
|
||||
else
|
||||
ifeq ($(ARCH),ppc)
|
||||
@@ -265,7 +261,7 @@
|
||||
BASE_CFLAGS += -DNO_VM_COMPILED
|
||||
endif
|
||||
|
||||
- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
|
||||
+ DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE)
|
||||
|
||||
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
|
||||
|
||||
@@ -274,7 +270,7 @@
|
||||
SHLIBLDFLAGS=-shared $(LDFLAGS)
|
||||
|
||||
THREAD_LDFLAGS=-lpthread
|
||||
- LDFLAGS=-ldl -lm
|
||||
+ LDFLAGS+=-ldl -lm
|
||||
|
||||
ifeq ($(USE_SDL),1)
|
||||
CLIENT_LDFLAGS=$(shell sdl-config --libs)
|
||||
@@ -1158,13 +1154,13 @@
|
||||
|
||||
$(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
|
||||
$(echo_cmd) "LD $@"
|
||||
- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
|
||||
- $(LDFLAGS) $(LIBSDLMAIN)
|
||||
+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ) \
|
||||
+ $(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
|
||||
|
||||
$(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
|
||||
$(echo_cmd) "LD $@"
|
||||
- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
|
||||
- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
|
||||
+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \
|
||||
+ $(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
|
||||
|
||||
ifneq ($(strip $(LIBSDLMAIN)),)
|
||||
ifneq ($(strip $(LIBSDLMAINSRC)),)
|
||||
|
|
@ -1,141 +0,0 @@
|
|||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.016.ebuild,v 1.1 2013/12/19 17:37:56 hasufell Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit check-reqs eutils gnome2-utils games
|
||||
|
||||
ENGINE_PV=4.2.015
|
||||
FULL_P=UrbanTerror42_full012
|
||||
DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
|
||||
HOMEPAGE="http://www.urbanterror.info/home/"
|
||||
SRC_URI="http://cdn.urbanterror.info/urt/42/zips/${FULL_P}.zip
|
||||
http://cdn.urbanterror.info/urt/42/zips/UrbanTerror-4.2.012-to-4.2.013.zip
|
||||
http://cdn.urbanterror.info/urt/42/zips/UrbanTerror-4.2.013-to-4.2.014.zip
|
||||
http://cdn.urbanterror.info/urt/42/zips/UrbanTerror-4.2.014-to-4.2.015.zip
|
||||
http://cdn.urbanterror.info/urt/42/zips/UrbanTerror-4.2.015-to-4.2.016.zip
|
||||
https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${ENGINE_PV}.tar.gz -> ${PN}-${ENGINE_PV}.tar.gz
|
||||
http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg"
|
||||
|
||||
LICENSE="GPL-2 Q3AEULA-20000111 urbanterror-4.2-maps"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+curl debug dedicated openal +sdl server smp vorbis"
|
||||
RESTRICT="mirror"
|
||||
|
||||
RDEPEND="
|
||||
!dedicated? (
|
||||
virtual/opengl
|
||||
curl? ( net-misc/curl )
|
||||
openal? ( media-libs/openal )
|
||||
sdl? ( media-libs/libsdl[X,audio,joystick,opengl,video] )
|
||||
!sdl? ( x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXxf86dga
|
||||
x11-libs/libXxf86vm )
|
||||
vorbis? ( media-libs/libogg
|
||||
media-libs/libvorbis )
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip
|
||||
dedicated? ( curl? ( net-misc/curl ) )"
|
||||
|
||||
S=${WORKDIR}/ioq3-for-UrbanTerror-4-release-${ENGINE_PV}
|
||||
S_DATA=${WORKDIR}/UrbanTerror42
|
||||
|
||||
CHECKREQS_DISK_BUILD="3300M"
|
||||
CHECKREQS_DISK_USR="1550M"
|
||||
|
||||
pkg_pretend() {
|
||||
check-reqs_pkg_pretend
|
||||
|
||||
if ! use dedicated ; then
|
||||
if ! use sdl && ! use openal ; then
|
||||
ewarn
|
||||
ewarn "Sound support disabled. Enable 'sdl' or 'openal' useflag."
|
||||
ewarn
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
local i
|
||||
default
|
||||
# apply updates
|
||||
for i in {2..5} ; do
|
||||
cp -dRpf \
|
||||
"${WORKDIR}"/UrbanTerror-4.2.01${i}-to-4.2.01$((${i} + 1))/* \
|
||||
"${S_DATA}"/ || die
|
||||
done
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-${ENGINE_PV}-build.patch
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
buildit() { use $1 && echo 1 || echo 0 ; }
|
||||
nobuildit() { use $1 && echo 0 || echo 1 ; }
|
||||
|
||||
emake \
|
||||
ARCH=$(usex amd64 "x86_64" "i386") \
|
||||
DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
|
||||
BUILD_CLIENT=$(nobuildit dedicated) \
|
||||
BUILD_CLIENT_SMP=$(usex smp "$(nobuildit dedicated)" "0") \
|
||||
BUILD_SERVER=$(usex dedicated "1" "$(buildit server)") \
|
||||
USE_SDL=$(buildit sdl) \
|
||||
USE_OPENAL=$(buildit openal) \
|
||||
USE_OPENAL_DLOPEN=0 \
|
||||
USE_CURL=$(buildit curl) \
|
||||
USE_CURL_DLOPEN=0 \
|
||||
USE_CODEC_VORBIS=$(buildit vorbis) \
|
||||
USE_LOCAL_HEADERS=0 \
|
||||
Q="" \
|
||||
$(usex debug "debug" "release")
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local my_arch=$(usex amd64 "x86_64" "i386")
|
||||
|
||||
dodoc ChangeLog README md4-readme.txt
|
||||
dodoc "${S_DATA}"/q3ut4/readme42.txt
|
||||
insinto "${GAMES_DATADIR}"/${PN}/q3ut4
|
||||
doins "${S_DATA}"/q3ut4/*.pk3
|
||||
|
||||
if use !dedicated ; then
|
||||
newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT$(usex smp "-smp" "").${my_arch} ${PN}
|
||||
doicon -s scalable "${DISTDIR}"/${PN}.svg
|
||||
make_desktop_entry ${PN} "UrbanTerror"
|
||||
fi
|
||||
|
||||
if use dedicated || use server ; then
|
||||
newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-dedicated
|
||||
docinto examples
|
||||
dodoc "${S_DATA}"/q3ut4/{server_example.cfg,mapcycle_example.txt}
|
||||
fi
|
||||
|
||||
prepgamesdirs
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
games_pkg_preinst
|
||||
use dedicated || gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
games_pkg_postinst
|
||||
use dedicated || gnome2_icon_cache_update
|
||||
|
||||
if use openal && ! use dedicated ; then
|
||||
einfo
|
||||
elog "You might need to set:"
|
||||
elog " seta s_useopenal \"1\""
|
||||
elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
|
||||
einfo
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use dedicated || gnome2_icon_cache_update
|
||||
}
|
||||
|
|
@ -1,151 +0,0 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.018.ebuild,v 1.1 2014/01/27 00:00:21 hasufell Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit check-reqs eutils gnome2-utils games
|
||||
|
||||
ENGINE_PV=4.2.017
|
||||
FULL_P=UrbanTerror42_full017
|
||||
DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
|
||||
HOMEPAGE="http://www.urbanterror.info/home/"
|
||||
SRC_URI="http://cdn.urbanterror.info/urt/42/zips/${FULL_P}.zip
|
||||
https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${ENGINE_PV}.tar.gz -> ${PN}-${ENGINE_PV}.tar.gz
|
||||
http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg"
|
||||
|
||||
# fetch updates
|
||||
if [[ ${FULL_P#*full} != ${PV##*.} ]] ; then
|
||||
UPDATE_I=${ENGINE_PV:6:1}
|
||||
while [[ ${UPDATE_I} -lt ${PV:6:1} ]] ; do
|
||||
SRC_URI="${SRC_URI} http://cdn.urbanterror.info/urt/42/zips/UrbanTerror-${PV:0:6}${UPDATE_I}-to-${PV:0:6}$(( ${UPDATE_I} + 1)).zip"
|
||||
UPDATE_I=$(( ${UPDATE_I} + 1))
|
||||
done
|
||||
fi
|
||||
unset UPDATE_I
|
||||
|
||||
LICENSE="GPL-2 Q3AEULA-20000111 urbanterror-4.2-maps"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+curl debug dedicated openal +sdl server smp vorbis"
|
||||
RESTRICT="mirror"
|
||||
|
||||
RDEPEND="
|
||||
!dedicated? (
|
||||
virtual/opengl
|
||||
curl? ( net-misc/curl )
|
||||
openal? ( media-libs/openal )
|
||||
sdl? ( media-libs/libsdl[X,audio,joystick,opengl,video] )
|
||||
!sdl? ( x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXxf86dga
|
||||
x11-libs/libXxf86vm )
|
||||
vorbis? ( media-libs/libogg
|
||||
media-libs/libvorbis )
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip
|
||||
dedicated? ( curl? ( net-misc/curl ) )"
|
||||
|
||||
S=${WORKDIR}/ioq3-for-UrbanTerror-4-release-${ENGINE_PV}
|
||||
S_DATA=${WORKDIR}/UrbanTerror42
|
||||
|
||||
CHECKREQS_DISK_BUILD="3300M"
|
||||
CHECKREQS_DISK_USR="1550M"
|
||||
|
||||
pkg_pretend() {
|
||||
check-reqs_pkg_pretend
|
||||
|
||||
if ! use dedicated ; then
|
||||
if ! use sdl && ! use openal ; then
|
||||
ewarn
|
||||
ewarn "Sound support disabled. Enable 'sdl' or 'openal' useflag."
|
||||
ewarn
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
local UPDATE_I
|
||||
default
|
||||
# apply updates
|
||||
if [[ ${FULL_P#*full} != ${PV##*.} ]] ; then
|
||||
UPDATE_I=${ENGINE_PV:6:1}
|
||||
while [[ ${UPDATE_I} -lt ${PV:6:1} ]] ; do
|
||||
cp -dRpf \
|
||||
"${WORKDIR}"/UrbanTerror-${PV:0:6}${UPDATE_I}-to-${PV:0:6}$((${UPDATE_I} + 1))/* \
|
||||
"${S_DATA}"/ || die
|
||||
UPDATE_I=$(( ${UPDATE_I} + 1))
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-${ENGINE_PV}-build.patch
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
buildit() { use $1 && echo 1 || echo 0 ; }
|
||||
nobuildit() { use $1 && echo 0 || echo 1 ; }
|
||||
|
||||
emake \
|
||||
ARCH=$(usex amd64 "x86_64" "i386") \
|
||||
DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
|
||||
BUILD_CLIENT=$(nobuildit dedicated) \
|
||||
BUILD_CLIENT_SMP=$(usex smp "$(nobuildit dedicated)" "0") \
|
||||
BUILD_SERVER=$(usex dedicated "1" "$(buildit server)") \
|
||||
USE_SDL=$(buildit sdl) \
|
||||
USE_OPENAL=$(buildit openal) \
|
||||
USE_OPENAL_DLOPEN=0 \
|
||||
USE_CURL=$(buildit curl) \
|
||||
USE_CURL_DLOPEN=0 \
|
||||
USE_CODEC_VORBIS=$(buildit vorbis) \
|
||||
USE_LOCAL_HEADERS=0 \
|
||||
Q="" \
|
||||
$(usex debug "debug" "release")
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local my_arch=$(usex amd64 "x86_64" "i386")
|
||||
|
||||
dodoc ChangeLog README md4-readme.txt
|
||||
dodoc "${S_DATA}"/q3ut4/readme42.txt
|
||||
insinto "${GAMES_DATADIR}"/${PN}/q3ut4
|
||||
doins "${S_DATA}"/q3ut4/*.pk3
|
||||
|
||||
if use !dedicated ; then
|
||||
newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT$(usex smp "-smp" "").${my_arch} ${PN}
|
||||
doicon -s scalable "${DISTDIR}"/${PN}.svg
|
||||
make_desktop_entry ${PN} "UrbanTerror"
|
||||
fi
|
||||
|
||||
if use dedicated || use server ; then
|
||||
newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-dedicated
|
||||
docinto examples
|
||||
dodoc "${S_DATA}"/q3ut4/{server_example.cfg,mapcycle_example.txt}
|
||||
fi
|
||||
|
||||
prepgamesdirs
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
games_pkg_preinst
|
||||
use dedicated || gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
games_pkg_postinst
|
||||
use dedicated || gnome2_icon_cache_update
|
||||
|
||||
if use openal && ! use dedicated ; then
|
||||
einfo
|
||||
elog "You might need to set:"
|
||||
elog " seta s_useopenal \"1\""
|
||||
elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
|
||||
einfo
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use dedicated || gnome2_icon_cache_update
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=3
|
||||
|
||||
inherit games
|
||||
|
||||
MY_PN="${PN%-data}"
|
||||
MY_P="${MY_PN}-r${PV%_*}-alpha"
|
||||
|
||||
DESCRIPTION="Data files for 0ad"
|
||||
HOMEPAGE="http://wildfiregames.com/0ad/"
|
||||
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0 LPPL-1.3c BitstreamVera"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
rm binaries/data/tools/fontbuilder/fonts/*.txt
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto "${GAMES_DATADIR}"/${MY_PN}
|
||||
doins -r binaries/data/* || die
|
||||
prepgamesdirs
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit games
|
||||
|
||||
MY_P=0ad-0.0.11-alpha
|
||||
DESCRIPTION="Data files for 0ad"
|
||||
HOMEPAGE="http://wildfiregames.com/0ad/"
|
||||
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0 LPPL-1.3c BitstreamVera"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 -*"
|
||||
IUSE=""
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
rm binaries/data/tools/fontbuilder/fonts/*.txt
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto "${GAMES_DATADIR}"/0ad
|
||||
doins -r binaries/data/*
|
||||
prepgamesdirs
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit games
|
||||
|
||||
MY_P=0ad-0.0.12-alpha
|
||||
DESCRIPTION="Data files for 0ad"
|
||||
HOMEPAGE="http://wildfiregames.com/0ad/"
|
||||
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0 LPPL-1.3c BitstreamVera"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 -*"
|
||||
IUSE=""
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
rm binaries/data/tools/fontbuilder/fonts/*.txt
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto "${GAMES_DATADIR}"/0ad
|
||||
doins -r binaries/data/*
|
||||
prepgamesdirs
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit games
|
||||
|
||||
MY_P=0ad-0.0.13-alpha
|
||||
DESCRIPTION="Data files for 0ad"
|
||||
HOMEPAGE="http://wildfiregames.com/0ad/"
|
||||
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0 LPPL-1.3c BitstreamVera"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
rm binaries/data/tools/fontbuilder/fonts/*.txt
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto "${GAMES_DATADIR}"/0ad
|
||||
doins -r binaries/data/*
|
||||
prepgamesdirs
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit games
|
||||
|
||||
MY_P=0ad-0.0.14-alpha
|
||||
DESCRIPTION="Data files for 0ad"
|
||||
HOMEPAGE="http://wildfiregames.com/0ad/"
|
||||
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
rm binaries/data/tools/fontbuilder/fonts/*.txt
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto "${GAMES_DATADIR}"/0ad
|
||||
doins -r binaries/data/*
|
||||
prepgamesdirs
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit games
|
||||
|
||||
MY_P=0ad-0.0.15-alpha
|
||||
DESCRIPTION="Data files for 0ad"
|
||||
HOMEPAGE="http://wildfiregames.com/0ad/"
|
||||
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
rm binaries/data/tools/fontbuilder/fonts/*.txt
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto "${GAMES_DATADIR}"/0ad
|
||||
doins -r binaries/data/*
|
||||
prepgamesdirs
|
||||
}
|
||||
|
|
@ -1,7 +1 @@
|
|||
DIST 0ad-0.0.11-alpha-unix-data.tar.xz 350967036 SHA256 a28dd9160637bc1345223ec6f9c36bb693350e9dcc35a3194f43ed463b3ba20e SHA512 26dc6ea00b67c64041f34fe55ad1280693eae7549161fd85ae1551945ccc5e2afb01ee8834f232d573c15c0d5c81875d047cc69885328bf34c365c554eb12124 WHIRLPOOL 2a37584a0c69132386a9312c77e4a82f2413065b3bcfbf4c3964c78f1bb564f6f099ff0f240591bbc25d07b9746ddc8c9cc7cf9ca3619ece05201253c2b91794
|
||||
DIST 0ad-0.0.12-alpha-unix-data.tar.xz 388143556 SHA256 0efd800a149f2fed70d7e133b93a385e82810844b50154771514d17d9a68ee07 SHA512 54a894788e4854a371ee2ba159778be18c038277989a2024cf272b09062b8d7a4635ef12826a4101ec37e38b355b21ccd9a1c37c4fd6b0d72dd0f6766a15a04d WHIRLPOOL 6277003c2247a3da922b44c784f7b83c1b74acb9f42dec5cea734dc74c051833cc7253b5b1bb098337409ea96e659613b276769979cc5f87bce57e98a796dd02
|
||||
DIST 0ad-0.0.13-alpha-unix-data.tar.xz 420479284 SHA256 284477ddb14732b48ef6740b804294fc8361460190368e60324ce0e22aca4f7e SHA512 a569716369c83062422fa7ba56278ed32731577de76fc7fd9371e5cef56afce78261cf1cb35fa6b7464365a1bd29c2fe2e15f4f46ce40d78ab2f76c8ffee32cd WHIRLPOOL 34c606724549f11f1af88e8a78e87bc41780745fe6260ed00bdba53c68115c8324916bf16b0feed40d4ff4219807b0a06e3b3eb8ad892329dc077d61a4812727
|
||||
DIST 0ad-0.0.14-alpha-unix-data.tar.xz 450006708 SHA256 e046531a55226a15784ce9c31df1d8e6723ad2cedd70a0abb63dc1721bf2a770 SHA512 ad07bed3bc4763e032c764ade24833b02420bec84333e732953df2298c727c5924bd752f7d25c2abcfe8dfe93f9890450983cb962045e039c292f91440b6bb83 WHIRLPOOL 36cfb532f027a4a82d0914984fa00e45a238edbd9de5219f58c9136f64d075308c51f895ce45ed81f985b038c0b7a6f1537eb185fa197f466555ff1400cb5cb2
|
||||
DIST 0ad-0.0.15-alpha-unix-data.tar.xz 503796604 SHA256 ffc81732e08af36fbac358daba6e2aea27687b05e48c7da9f65feee26fa11ee6 SHA512 5a279faf44d8f7f8903b76bc3a3302ece2172f1f031ee3408de4e840b1de4991d13f71062de25682191a06a57d2fa5eac388149c67f8dbce386b1161eb77b460 WHIRLPOOL e96566a0a1b7c8dbcafe0fb2a0453f5da6d87483cb5a0cb38d756fed9fd6b236ba6ed5889371131a09f144e74aa1720f9e27004f4becccdfd36731420cda555d
|
||||
DIST 0ad-0.0.16-alpha-unix-data.tar.xz 526615868 SHA256 0f16d41e81d7349fb16490f3abbfd38bcb3f2b89648355b2b281c5045ddafadc SHA512 a34ae77c6fdc1781bf6f7f7d20ab31f91ab2d1227c2528f40075af8056b41b9c3d4c03debd92e7836a17b64bc0437ed5970338dfc7b171eb4df3f8c5558593d0 WHIRLPOOL 21f837df31fea98b597e78754b2d10b42ea8a6eb15cc2db3bf6f9664d28914e5122e8d80e5f0f61ffa9eeb9f95021525cf236109d311d208d29ed5deecb82379
|
||||
DIST 0ad-r11863-alpha-unix-data.tar.xz 310994700 SHA256 76702023402361d27b61eea37034b08e9e19b282e4cdd69954495d2dd087b90a SHA512 58a9b10e961fbd8e30d1e88bdb7d6ac8e4da8a85455f66bd2d018a9df01e5de88aefacca393d8771f1bada49fd5b888492c8b15f7ddb4700a06de640df226316 WHIRLPOOL 1707bfa712e82db7dbbbc9731bcc465ff33d37ef73f8cbc002a8e4bba94a1367568aa1efebec7f88482d9790239be7e109a395ef139be2472c256ea5f4b563e6
|
||||
|
|
|
|||
|
|
@ -1,145 +0,0 @@
|
|||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit eutils wxwidgets games
|
||||
|
||||
MY_P="0ad-r${PV}-alpha"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
DESCRIPTION="0 A.D. is a free, real-time strategy game currently under development by Wildfire Games."
|
||||
HOMEPAGE="http://wildfiregames.com/0ad/"
|
||||
SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz
|
||||
mirror://sourceforge/zero-ad/${MY_P}-unix-data.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="debug editor nvtt pch test fam"
|
||||
|
||||
RDEPEND=">=dev-lang/spidermonkey-1.8.5
|
||||
dev-libs/boost
|
||||
dev-libs/libxml2
|
||||
media-libs/devil
|
||||
media-libs/openal
|
||||
media-libs/libogg
|
||||
media-libs/libpng
|
||||
media-libs/libsdl[X,joystick]
|
||||
media-libs/libvorbis
|
||||
net-libs/enet:1.3
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
virtual/jpeg
|
||||
virtual/opengl
|
||||
fam? ( virtual/fam )
|
||||
editor? ( x11-libs/wxGTK:2.8 )
|
||||
nvtt? ( dev-util/nvidia-texture-tools )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/zip
|
||||
dev-lang/nasm
|
||||
dev-util/cmake"
|
||||
|
||||
RESTRICT="strip mirror"
|
||||
|
||||
dir=${GAMES_PREFIX_OPT}/${PN}
|
||||
|
||||
pkg_setup() {
|
||||
games_pkg_setup
|
||||
if use editor ; then
|
||||
WX_GTK_VER=2.8 need-wxwidgets unicode
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
UPDATE_ARGS="--with-system-enet --with-system-mozjs185"
|
||||
|
||||
if ! use pch ; then
|
||||
UPDATE_ARGS="${UPDATE_ARGS} --without-pch"
|
||||
fi
|
||||
|
||||
if ! use fam ; then
|
||||
UPDATE_ARGS="${UPDATE_ARGS} --without-fam"
|
||||
fi
|
||||
|
||||
if ! use editor ; then
|
||||
UPDATE_ARGS="${UPDATE_ARGS} --disable-atlas"
|
||||
fi
|
||||
|
||||
if use nvtt ; then
|
||||
UPDATE_ARGS="${UPDATE_ARGS} --with-system-nvtt"
|
||||
else
|
||||
UPDATE_ARGS="${UPDATE_ARGS} --without-nvtt"
|
||||
fi
|
||||
|
||||
cd "${S}/build/workspaces"
|
||||
einfo "Running update-workspaces.sh with ${UPDATE_ARGS}"
|
||||
./update-workspaces.sh ${UPDATE_ARGS} || die "update-workspaces.sh failed"
|
||||
cd gcc
|
||||
|
||||
TARGETS="pyrogenesis Collada"
|
||||
if use test ; then
|
||||
TARGETS="${TARGETS} test"
|
||||
fi
|
||||
if use editor ; then
|
||||
TARGETS="${TARGETS} AtlasUI"
|
||||
fi
|
||||
if use debug ; then
|
||||
CONFIG=Debug
|
||||
else
|
||||
CONFIG=Release
|
||||
fi
|
||||
CONFIG=${CONFIG} emake ${TARGETS} || die "Can't build"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${S}/binaries/system"
|
||||
if use debug ; then
|
||||
./test_dbg || die "Tests failed"
|
||||
else
|
||||
./test || die "Tests failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cd "${S}"/binaries
|
||||
insinto "${dir}"
|
||||
doins -r data || die "doins -r failed"
|
||||
|
||||
insinto "${dir}"/system
|
||||
|
||||
#we install build-in nvtt
|
||||
if use !nvtt ; then
|
||||
doins "${S}"/binaries/system/libnvcore.so || die "doins failed"
|
||||
doins "${S}"/binaries/system/libnvimage.so || die "doins failed"
|
||||
doins "${S}"/binaries/system/libnvmath.so || die "doins failed"
|
||||
doins "${S}"/binaries/system/libnvtt.so || die "doins failed"
|
||||
fi
|
||||
|
||||
if use debug ; then
|
||||
# doins "${S}"/binaries/system/libmozjs185-ps-debug.so.1.0 || die "doins failed"
|
||||
doins "${S}"/binaries/system/libCollada_dbg.so || die "doins failed"
|
||||
if use editor ; then
|
||||
doins "${S}"/binaries/system/libAtlasUI_dbg.so || die "doins failed"
|
||||
fi
|
||||
EXE_NAME=pyrogenesis_dbg
|
||||
else
|
||||
# doins "${S}"/binaries/system/libmozjs185-ps-release.so.1.0 || die "doins failed"
|
||||
doins "${S}"/binaries/system/libCollada.so || die "doins failed"
|
||||
if use editor ; then
|
||||
doins "${S}"/binaries/system/libAtlasUI.so || die "doins failed"
|
||||
fi
|
||||
EXE_NAME=pyrogenesis
|
||||
fi
|
||||
|
||||
exeinto "${dir}"/system
|
||||
doexe "${S}"/binaries/system/${EXE_NAME} || die "doexe failed"
|
||||
|
||||
games_make_wrapper ${PN} ./system/${EXE_NAME} ${dir}
|
||||
doicon "${S}"/build/resources/0ad.png
|
||||
make_desktop_entry "${dir}"/system/${EXE_NAME} "0 A.D."
|
||||
|
||||
prepgamesdirs
|
||||
}
|
||||
|
|
@ -1,115 +0,0 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=4
|
||||
|
||||
WX_GTK_VER="2.8"
|
||||
|
||||
inherit eutils wxwidgets toolchain-funcs games
|
||||
|
||||
MY_P=0ad-0.0.11-alpha
|
||||
DESCRIPTION="A free, real-time strategy game of ancient warfare"
|
||||
HOMEPAGE="http://wildfiregames.com/0ad/"
|
||||
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 MIT CCPL-Attribution-ShareAlike-3.0 as-is"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 -*"
|
||||
IUSE="+audio editor fam pch test"
|
||||
|
||||
RDEPEND="
|
||||
~dev-lang/spidermonkey-1.8.5
|
||||
dev-libs/boost
|
||||
dev-libs/libxml2
|
||||
~games-strategy/0ad-data-${PV}
|
||||
media-gfx/nvidia-texture-tools
|
||||
media-libs/libpng:0
|
||||
media-libs/libsdl[X,opengl,video]
|
||||
net-libs/enet:1.3
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
virtual/jpeg
|
||||
virtual/opengl
|
||||
x11-libs/libX11
|
||||
audio? ( media-libs/libogg
|
||||
media-libs/libvorbis
|
||||
media-libs/openal )
|
||||
editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
|
||||
fam? ( virtual/fam )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
test? ( dev-lang/perl )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-{gentoo,pch}.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
--with-system-nvtt
|
||||
--with-system-enet
|
||||
--with-system-mozjs185
|
||||
--minimal-flags
|
||||
$(usex fam "" "--without-fam")
|
||||
$(usex pch "" "--without-pch")
|
||||
$(usex test "" "--without-tests")
|
||||
$(usex audio "" "--without-audio")
|
||||
$(usex editor "--atlas" "")
|
||||
--collada
|
||||
--bindir="${GAMES_BINDIR}"
|
||||
--libdir="$(games_get_libdir)"/${PN}
|
||||
--datadir="${GAMES_DATADIR}"/${PN}
|
||||
)
|
||||
|
||||
# stock premake4 does not work, use the shipped one
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix
|
||||
|
||||
# regenerate scripts.c so our patch applies
|
||||
cd "${S}"/build/premake/premake4 || die
|
||||
"${S}"/build/premake/premake4/bin/release/premake4 embed || die
|
||||
|
||||
# rebuild premake again... this is the most stupid build system
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix
|
||||
|
||||
# run premake to create build scripts
|
||||
cd "${S}"/build/premake || die
|
||||
"${S}"/build/premake/premake4/bin/release/premake4 \
|
||||
--file="premake4.lua" \
|
||||
--outpath="../workspaces/gcc/" \
|
||||
--platform=$(usex amd64 "x64" "x32") \
|
||||
--os=linux \
|
||||
"${myconf[@]}" \
|
||||
gmake || die "Premake failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# build 3rd party fcollada
|
||||
emake -C libraries/fcollada/src
|
||||
|
||||
# build 0ad
|
||||
emake -C build/workspaces/gcc verbose=1
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd binaries/system || die
|
||||
./test -libdir "${S}/binaries/system" || die "test phase failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dogamesbin binaries/system/pyrogenesis
|
||||
|
||||
exeinto "$(games_get_libdir)"/${PN}
|
||||
doexe binaries/system/libCollada.so
|
||||
use editor && doexe binaries/system/libAtlasUI.so
|
||||
|
||||
dodoc binaries/system/readme.txt
|
||||
doicon build/resources/${PN}.png
|
||||
games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis"
|
||||
make_desktop_entry ${PN} "0 A.D."
|
||||
|
||||
prepgamesdirs
|
||||
}
|
||||
|
|
@ -1,113 +0,0 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=5
|
||||
|
||||
WX_GTK_VER="2.8"
|
||||
|
||||
inherit eutils wxwidgets toolchain-funcs games
|
||||
|
||||
MY_P=0ad-0.0.12-alpha
|
||||
DESCRIPTION="A free, real-time strategy game"
|
||||
HOMEPAGE="http://wildfiregames.com/0ad/"
|
||||
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 MIT CCPL-Attribution-ShareAlike-3.0 as-is"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 -*"
|
||||
IUSE="+audio editor fam pch test"
|
||||
|
||||
RDEPEND="
|
||||
~dev-lang/spidermonkey-1.8.5
|
||||
dev-libs/boost
|
||||
dev-libs/libxml2
|
||||
~games-strategy/0ad-data-${PV}
|
||||
media-gfx/nvidia-texture-tools
|
||||
media-libs/libpng:0
|
||||
media-libs/libsdl[X,opengl,video]
|
||||
net-libs/enet:1.3
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
virtual/jpeg
|
||||
virtual/opengl
|
||||
x11-libs/libX11
|
||||
audio? ( media-libs/libogg
|
||||
media-libs/libvorbis
|
||||
media-libs/openal )
|
||||
editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
test? ( dev-lang/perl )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-gentoo.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
--with-system-nvtt
|
||||
--with-system-enet
|
||||
--with-system-mozjs185
|
||||
--minimal-flags
|
||||
$(usex pch "" "--without-pch")
|
||||
$(usex test "" "--without-tests")
|
||||
$(usex audio "" "--without-audio")
|
||||
$(usex editor "--atlas" "")
|
||||
--collada
|
||||
--bindir="${GAMES_BINDIR}"
|
||||
--libdir="$(games_get_libdir)"/${PN}
|
||||
--datadir="${GAMES_DATADIR}"/${PN}
|
||||
)
|
||||
|
||||
# stock premake4 does not work, use the shipped one
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix
|
||||
|
||||
# regenerate scripts.c so our patch applies
|
||||
cd "${S}"/build/premake/premake4 || die
|
||||
"${S}"/build/premake/premake4/bin/release/premake4 embed || die
|
||||
|
||||
# rebuild premake again... this is the most stupid build system
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix
|
||||
|
||||
# run premake to create build scripts
|
||||
cd "${S}"/build/premake || die
|
||||
"${S}"/build/premake/premake4/bin/release/premake4 \
|
||||
--file="premake4.lua" \
|
||||
--outpath="../workspaces/gcc/" \
|
||||
--platform=$(usex amd64 "x64" "x32") \
|
||||
--os=linux \
|
||||
"${myconf[@]}" \
|
||||
gmake || die "Premake failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# build 3rd party fcollada
|
||||
emake -C libraries/fcollada/src
|
||||
|
||||
# build 0ad
|
||||
emake -C build/workspaces/gcc verbose=1
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd binaries/system || die
|
||||
./test -libdir "${S}/binaries/system" || die "test phase failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dogamesbin binaries/system/pyrogenesis
|
||||
|
||||
exeinto "$(games_get_libdir)"/${PN}
|
||||
doexe binaries/system/libCollada.so
|
||||
use editor && doexe binaries/system/libAtlasUI.so
|
||||
|
||||
dodoc binaries/system/readme.txt
|
||||
doicon build/resources/${PN}.png
|
||||
games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis"
|
||||
make_desktop_entry ${PN}
|
||||
|
||||
prepgamesdirs
|
||||
}
|
||||
|
|
@ -1,113 +0,0 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=5
|
||||
|
||||
WX_GTK_VER="2.8"
|
||||
|
||||
inherit eutils wxwidgets toolchain-funcs games
|
||||
|
||||
MY_P=0ad-0.0.13-alpha
|
||||
DESCRIPTION="A free, real-time strategy game"
|
||||
HOMEPAGE="http://wildfiregames.com/0ad/"
|
||||
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 MIT CCPL-Attribution-ShareAlike-3.0 as-is"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~x86"
|
||||
IUSE="+audio editor fam pch test"
|
||||
|
||||
RDEPEND="
|
||||
~dev-lang/spidermonkey-1.8.5
|
||||
dev-libs/boost
|
||||
dev-libs/libxml2
|
||||
~games-strategy/0ad-data-${PV}
|
||||
media-gfx/nvidia-texture-tools
|
||||
media-libs/libpng:0
|
||||
media-libs/libsdl[X,opengl,video]
|
||||
net-libs/enet:1.3
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
virtual/jpeg
|
||||
virtual/opengl
|
||||
x11-libs/libX11
|
||||
audio? ( media-libs/libogg
|
||||
media-libs/libvorbis
|
||||
media-libs/openal )
|
||||
editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
test? ( dev-lang/perl )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-gentoo.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
--with-system-nvtt
|
||||
--with-system-enet
|
||||
--with-system-mozjs185
|
||||
--minimal-flags
|
||||
$(usex pch "" "--without-pch")
|
||||
$(usex test "" "--without-tests")
|
||||
$(usex audio "" "--without-audio")
|
||||
$(usex editor "--atlas" "")
|
||||
--collada
|
||||
--bindir="${GAMES_BINDIR}"
|
||||
--libdir="$(games_get_libdir)"/${PN}
|
||||
--datadir="${GAMES_DATADIR}"/${PN}
|
||||
)
|
||||
|
||||
# stock premake4 does not work, use the shipped one
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix
|
||||
|
||||
# regenerate scripts.c so our patch applies
|
||||
cd "${S}"/build/premake/premake4 || die
|
||||
"${S}"/build/premake/premake4/bin/release/premake4 embed || die
|
||||
|
||||
# rebuild premake again... this is the most stupid build system
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix
|
||||
|
||||
# run premake to create build scripts
|
||||
cd "${S}"/build/premake || die
|
||||
"${S}"/build/premake/premake4/bin/release/premake4 \
|
||||
--file="premake4.lua" \
|
||||
--outpath="../workspaces/gcc/" \
|
||||
--platform=$(usex amd64 "x64" "x32") \
|
||||
--os=linux \
|
||||
"${myconf[@]}" \
|
||||
gmake || die "Premake failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# build 3rd party fcollada
|
||||
emake -C libraries/source/fcollada/src
|
||||
|
||||
# build 0ad
|
||||
emake -C build/workspaces/gcc verbose=1
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd binaries/system || die
|
||||
./test -libdir "${S}/binaries/system" || die "test phase failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dogamesbin binaries/system/pyrogenesis
|
||||
|
||||
exeinto "$(games_get_libdir)"/${PN}
|
||||
doexe binaries/system/libCollada.so
|
||||
use editor && doexe binaries/system/libAtlasUI.so
|
||||
|
||||
dodoc binaries/system/readme.txt
|
||||
doicon build/resources/${PN}.png
|
||||
games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis"
|
||||
make_desktop_entry ${PN}
|
||||
|
||||
prepgamesdirs
|
||||
}
|
||||
|
|
@ -1,113 +0,0 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=5
|
||||
|
||||
WX_GTK_VER="2.8"
|
||||
|
||||
inherit eutils wxwidgets toolchain-funcs games
|
||||
|
||||
MY_P=0ad-0.0.14-alpha
|
||||
DESCRIPTION="A free, real-time strategy game"
|
||||
HOMEPAGE="http://wildfiregames.com/0ad/"
|
||||
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 as-is"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~x86"
|
||||
IUSE="+audio editor fam pch test"
|
||||
|
||||
RDEPEND="
|
||||
~dev-lang/spidermonkey-1.8.5
|
||||
dev-libs/boost
|
||||
dev-libs/libxml2
|
||||
~games-strategy/0ad-data-${PV}
|
||||
media-gfx/nvidia-texture-tools
|
||||
media-libs/libpng:0
|
||||
media-libs/libsdl[X,opengl,video]
|
||||
net-libs/enet:1.3
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
virtual/jpeg
|
||||
virtual/opengl
|
||||
x11-libs/libX11
|
||||
audio? ( media-libs/libogg
|
||||
media-libs/libvorbis
|
||||
media-libs/openal )
|
||||
editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
test? ( dev-lang/perl )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-gentoo.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
--with-system-nvtt
|
||||
--with-system-enet
|
||||
--with-system-mozjs185
|
||||
--minimal-flags
|
||||
$(usex pch "" "--without-pch")
|
||||
$(usex test "" "--without-tests")
|
||||
$(usex audio "" "--without-audio")
|
||||
$(usex editor "--atlas" "")
|
||||
--collada
|
||||
--bindir="${GAMES_BINDIR}"
|
||||
--libdir="$(games_get_libdir)"/${PN}
|
||||
--datadir="${GAMES_DATADIR}"/${PN}
|
||||
)
|
||||
|
||||
# stock premake4 does not work, use the shipped one
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix
|
||||
|
||||
# regenerate scripts.c so our patch applies
|
||||
cd "${S}"/build/premake/premake4 || die
|
||||
"${S}"/build/premake/premake4/bin/release/premake4 embed || die
|
||||
|
||||
# rebuild premake again... this is the most stupid build system
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix
|
||||
|
||||
# run premake to create build scripts
|
||||
cd "${S}"/build/premake || die
|
||||
"${S}"/build/premake/premake4/bin/release/premake4 \
|
||||
--file="premake4.lua" \
|
||||
--outpath="../workspaces/gcc/" \
|
||||
--platform=$(usex amd64 "x64" "x32") \
|
||||
--os=linux \
|
||||
"${myconf[@]}" \
|
||||
gmake || die "Premake failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# build 3rd party fcollada
|
||||
emake -C libraries/source/fcollada/src
|
||||
|
||||
# build 0ad
|
||||
emake -C build/workspaces/gcc verbose=1
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd binaries/system || die
|
||||
./test -libdir "${S}/binaries/system" || die "test phase failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dogamesbin binaries/system/pyrogenesis
|
||||
|
||||
exeinto "$(games_get_libdir)"/${PN}
|
||||
doexe binaries/system/libCollada.so
|
||||
use editor && doexe binaries/system/libAtlasUI.so
|
||||
|
||||
dodoc binaries/system/readme.txt
|
||||
doicon build/resources/${PN}.png
|
||||
games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis"
|
||||
make_desktop_entry ${PN}
|
||||
|
||||
prepgamesdirs
|
||||
}
|
||||
|
|
@ -1,116 +0,0 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=5
|
||||
|
||||
WX_GTK_VER="2.8"
|
||||
|
||||
inherit eutils wxwidgets toolchain-funcs games
|
||||
|
||||
MY_P=0ad-0.0.15-alpha
|
||||
DESCRIPTION="A free, real-time strategy game"
|
||||
HOMEPAGE="http://wildfiregames.com/0ad/"
|
||||
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 as-is"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~x86"
|
||||
IUSE="+audio editor fam pch test"
|
||||
|
||||
RDEPEND="
|
||||
~dev-lang/spidermonkey-1.8.5
|
||||
dev-libs/boost
|
||||
dev-libs/libxml2
|
||||
~games-strategy/0ad-data-${PV}
|
||||
media-gfx/nvidia-texture-tools
|
||||
media-libs/libpng:0
|
||||
media-libs/libsdl[X,opengl,video]
|
||||
net-libs/enet:1.3
|
||||
net-libs/miniupnpc
|
||||
net-libs/gloox
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
virtual/jpeg
|
||||
virtual/opengl
|
||||
x11-libs/libX11
|
||||
x11-libs/libXcursor
|
||||
audio? ( media-libs/libogg
|
||||
media-libs/libvorbis
|
||||
media-libs/openal )
|
||||
editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
test? ( dev-lang/perl )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-gentoo.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
--with-system-nvtt
|
||||
--with-system-enet
|
||||
--with-system-mozjs185
|
||||
--minimal-flags
|
||||
$(usex pch "" "--without-pch")
|
||||
$(usex test "" "--without-tests")
|
||||
$(usex audio "" "--without-audio")
|
||||
$(usex editor "--atlas" "")
|
||||
--collada
|
||||
--bindir="${GAMES_BINDIR}"
|
||||
--libdir="$(games_get_libdir)"/${PN}
|
||||
--datadir="${GAMES_DATADIR}"/${PN}
|
||||
)
|
||||
|
||||
# stock premake4 does not work, use the shipped one
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix
|
||||
|
||||
# regenerate scripts.c so our patch applies
|
||||
cd "${S}"/build/premake/premake4 || die
|
||||
"${S}"/build/premake/premake4/bin/release/premake4 embed || die
|
||||
|
||||
# rebuild premake again... this is the most stupid build system
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix
|
||||
|
||||
# run premake to create build scripts
|
||||
cd "${S}"/build/premake || die
|
||||
"${S}"/build/premake/premake4/bin/release/premake4 \
|
||||
--file="premake4.lua" \
|
||||
--outpath="../workspaces/gcc/" \
|
||||
--platform=$(usex amd64 "x64" "x32") \
|
||||
--os=linux \
|
||||
"${myconf[@]}" \
|
||||
gmake || die "Premake failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# build 3rd party fcollada
|
||||
emake -C libraries/source/fcollada/src
|
||||
|
||||
# build 0ad
|
||||
emake -C build/workspaces/gcc verbose=1
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd binaries/system || die
|
||||
./test -libdir "${S}/binaries/system" || die "test phase failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dogamesbin binaries/system/pyrogenesis
|
||||
|
||||
exeinto "$(games_get_libdir)"/${PN}
|
||||
doexe binaries/system/libCollada.so
|
||||
use editor && doexe binaries/system/libAtlasUI.so
|
||||
|
||||
dodoc binaries/system/readme.txt
|
||||
doicon build/resources/${PN}.png
|
||||
games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis"
|
||||
make_desktop_entry ${PN}
|
||||
|
||||
prepgamesdirs
|
||||
}
|
||||
|
|
@ -1,121 +0,0 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=5
|
||||
|
||||
WX_GTK_VER="2.8"
|
||||
|
||||
inherit eutils wxwidgets toolchain-funcs games
|
||||
|
||||
MY_P=0ad-0.0.16-alpha
|
||||
DESCRIPTION="A free, real-time strategy game"
|
||||
HOMEPAGE="http://wildfiregames.com/0ad/"
|
||||
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 as-is"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~x86"
|
||||
IUSE="+audio editor fam pch test"
|
||||
|
||||
RDEPEND="
|
||||
dev-lang/spidermonkey:24
|
||||
dev-libs/boost
|
||||
dev-libs/icu
|
||||
dev-libs/libxml2
|
||||
~games-strategy/0ad-data-${PV}
|
||||
media-gfx/nvidia-texture-tools
|
||||
media-libs/libpng:0
|
||||
media-libs/libsdl[X,opengl,video]
|
||||
net-libs/enet:1.3
|
||||
net-libs/miniupnpc
|
||||
net-libs/gloox
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
virtual/jpeg
|
||||
virtual/opengl
|
||||
x11-libs/libX11
|
||||
x11-libs/libXcursor
|
||||
audio? ( media-libs/libogg
|
||||
media-libs/libvorbis
|
||||
media-libs/openal )
|
||||
editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
test? ( dev-lang/perl )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-gentoo.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
--with-system-nvtt
|
||||
--with-system-enet
|
||||
--with-system-miniupnpc
|
||||
--with-system-mozjs24
|
||||
--minimal-flags
|
||||
$(usex pch "" "--without-pch")
|
||||
$(usex test "" "--without-tests")
|
||||
$(usex audio "" "--without-audio")
|
||||
$(usex editor "--atlas" "")
|
||||
--collada
|
||||
--bindir="${GAMES_BINDIR}"
|
||||
--libdir="$(games_get_libdir)"/${PN}
|
||||
--datadir="${GAMES_DATADIR}"/${PN}
|
||||
)
|
||||
|
||||
# stock premake4 does not work, use the shipped one
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix
|
||||
|
||||
# regenerate scripts.c so our patch applies
|
||||
cd "${S}"/build/premake/premake4 || die
|
||||
"${S}"/build/premake/premake4/bin/release/premake4 embed || die
|
||||
|
||||
# rebuild premake again... this is the most stupid build system
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
|
||||
emake -C "${S}"/build/premake/premake4/build/gmake.unix
|
||||
|
||||
# run premake to create build scripts
|
||||
cd "${S}"/build/premake || die
|
||||
"${S}"/build/premake/premake4/bin/release/premake4 \
|
||||
--file="premake4.lua" \
|
||||
--outpath="../workspaces/gcc/" \
|
||||
--platform=$(usex amd64 "x64" "x32") \
|
||||
--os=linux \
|
||||
"${myconf[@]}" \
|
||||
gmake || die "Premake failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# build 3rd party fcollada
|
||||
emake -C libraries/source/fcollada/src
|
||||
|
||||
# build 0ad
|
||||
emake -C build/workspaces/gcc verbose=1
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd binaries/system || die
|
||||
./test -libdir "${S}/binaries/system" || die "test phase failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dogamesbin binaries/system/pyrogenesis
|
||||
|
||||
insinto /usr/share/${PN}
|
||||
doins -r binaries/data/l10n
|
||||
|
||||
exeinto "$(games_get_libdir)"/${PN}
|
||||
doexe binaries/system/libCollada.so
|
||||
use editor && doexe binaries/system/libAtlasUI.so
|
||||
|
||||
dodoc binaries/system/readme.txt
|
||||
doicon build/resources/${PN}.png
|
||||
games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis"
|
||||
make_desktop_entry ${PN}
|
||||
|
||||
prepgamesdirs
|
||||
}
|
||||
|
|
@ -1,8 +1 @@
|
|||
DIST 0ad-0.0.11-alpha-unix-build.tar.xz 8682272 SHA256 a218c42bce111d0bcb02b3a18eb14d7c06a839b8863df362083ebd0835d3c6a3 SHA512 c68b6f1d6dae5d2055910834a38d2bdb03c58f87dd4bc756947f8cda8d585c6a2a0e7950b43289671397e6f1d13247fafe7c3d0bd1f61015ab22414cfebd6e66 WHIRLPOOL a8a64df7aa3587aef7fc12394597b4d92131d8d4081328035364073f032c08850a493cbeddd64fb61dcbc07831737977e04495d41c8bdb342d2409cc8da03ba9
|
||||
DIST 0ad-0.0.12-alpha-unix-build.tar.xz 8693880 SHA256 69d01f9ba12bb78f58fc2c567187cfffe20055591f378724b906e6a48ac73877 SHA512 e8572b166d31c0288a60a56638fe1db793298ebb3fd6fecc2ddb47d54db7934d6d0892f8082b19c8bd1951348e42cf4ce77e005a678dc962fcdbe3cd82c6fcfa WHIRLPOOL a4439c01a6c93d1b9abf957ba9f6888a95c0812925336aa6d937df481a8e98cacd0d65a4a60011e5af72a78f6bc07fb8b520a658b023f6d9ce0562dae771e71a
|
||||
DIST 0ad-0.0.13-alpha-unix-build.tar.xz 10152276 SHA256 6694c34341ae2dcf81912b3242619f853216dc3b9447177931e903421e480e18 SHA512 f4d846d2936ec3f643b971278dd77835d5814ebdeeb96f53ca0c483e9d69282a3c2fcc35c4cb0684a7e5b252500817245b20e73b59c3d636370f98fb7641c233 WHIRLPOOL b63d8345946008d166ae3d6878f1c80f0bfc3e3e67b3e5f96caf14f32ce7d9d1807b084fb4dfd49f298ad50f5609202a1f3525da8ab5973f833031d40176627f
|
||||
DIST 0ad-0.0.14-alpha-unix-build.tar.xz 10172124 SHA256 2034cc71043c970e6229080385b343b08fd5c0b2258372dc19de4c2057267a5c SHA512 85bce78cafd5470dc6fa3dd581ff5b0cdee1187d71a66a5a72bd7b6d6f06da2ee8adad0b2b3df695a1e596696f282418f2e153f971c124cc2217cc11c7397f7c WHIRLPOOL acd8f33e7c1161eb00269502ebecfd6e8106f7f35a622ee4cb1da194d0d0126218a21c3b81c05758bf8583a48cae7d86ef28ec8d8b3c8f81b567a1aaa292d46e
|
||||
DIST 0ad-0.0.15-alpha-unix-build.tar.xz 10222312 SHA256 ceac1e878c314a84d6833d4a675c134d36245ed99ac5ba444238a449cc24471c SHA512 efd454b6d9b0c46d730d55ef5db59ce7b1fa6e15c0db50b901cec4329016e935423fe4e8dda3b7b802979a868fcaca514269b4c4c5e044a775a62d135badfbb4 WHIRLPOOL f279af74409d7fa954193e60085c1d7431aada3e961878ec8530516573c914d1a8a206d2c4f4720e1e7ecc31dc84a63526b3817df362df7f2f06737258dd66e3
|
||||
DIST 0ad-0.0.16-alpha-unix-build.tar.xz 20019680 SHA256 cb965ef7e292bc3a2f1f598a9695e16ff4d786398f384a1ec7d5f9bfe2626de5 SHA512 9fe3440233d9827895b91ade1873afe977d62386a5dd6042d8169b153d576b462381bfc97e637f0b183aff034236380ca6d552ea2755cf08398143ad67121031 WHIRLPOOL 0e2f1ac9799a4b4d4588c2370a78195f2cc415fb2043be815ed2a2f9f179ccd856c405e7c0323f2033d3a6a4d63c08d8d5c8a05b50769ae3b9219717218edef6
|
||||
DIST 0ad-r11863-alpha-unix-build.tar.xz 8657204 SHA256 46c08d380ce098d3d8f577d04d602bb245dfbb7f7da7b1ad009e7a0d4751435f SHA512 a2290c2f3d4d72e7bfea76c5acb1530dffdad9565f0613d87a9ea4616175f435b4d58613c91753081fd973ac9c8f17e6ee9c8617294bcd0d881862a75df19cb7 WHIRLPOOL 759237396e2ec9d79219493e0e835fbf42ebaeb84899025a6ffb1a3feaff51f2f70dd2027dc2e409bde2dfa03ac124ca340cc7952c5050de0d475239786bf249
|
||||
DIST 0ad-r11863-alpha-unix-data.tar.xz 310994700 SHA256 76702023402361d27b61eea37034b08e9e19b282e4cdd69954495d2dd087b90a SHA512 58a9b10e961fbd8e30d1e88bdb7d6ac8e4da8a85455f66bd2d018a9df01e5de88aefacca393d8771f1bada49fd5b888492c8b15f7ddb4700a06de640df226316 WHIRLPOOL 1707bfa712e82db7dbbbc9731bcc465ff33d37ef73f8cbc002a8e4bba94a1367568aa1efebec7f88482d9790239be7e109a395ef139be2472c256ea5f4b563e6
|
||||
|
|
|
|||
|
|
@ -1,135 +0,0 @@
|
|||
From: Julian Ospald <hasufell@gentoo.org>
|
||||
Date: Sun Jun 24 18:32:38 UTC 2012
|
||||
Subject: build system
|
||||
|
||||
respect flags
|
||||
let stripping be handled by the system
|
||||
|
||||
fix minimal-flags option:
|
||||
leave -fvisibility=hidden active
|
||||
leave conditional -fpc-proprocess active
|
||||
|
||||
--- build/premake/premake4.lua
|
||||
+++ build/premake/premake4.lua
|
||||
@@ -135,7 +135,7 @@
|
||||
|
||||
function project_set_build_flags()
|
||||
|
||||
- flags { "Symbols", "NoEditAndContinue" }
|
||||
+ flags { "NoEditAndContinue" }
|
||||
if not _OPTIONS["icc"] and (os.is("windows") or not _OPTIONS["minimal-flags"]) then
|
||||
-- adds the -Wall compiler flag
|
||||
flags { "ExtraWarnings" } -- this causes far too many warnings/remarks on ICC
|
||||
@@ -232,33 +232,19 @@
|
||||
"-fno-omit-frame-pointer"
|
||||
}
|
||||
|
||||
- if not _OPTIONS["without-pch"] then
|
||||
- buildoptions {
|
||||
- -- do something (?) so that ccache can handle compilation with PCH enabled
|
||||
- -- (ccache 3.1+ also requires CCACHE_SLOPPINESS=time_macros for this to work)
|
||||
- "-fpch-preprocess"
|
||||
- }
|
||||
- end
|
||||
-
|
||||
- if arch == "x86" or arch == "amd64" then
|
||||
- buildoptions {
|
||||
- -- enable SSE intrinsics
|
||||
- "-msse"
|
||||
- }
|
||||
- end
|
||||
|
||||
if os.is("linux") or os.is("bsd") then
|
||||
- linkoptions { "-Wl,--no-undefined", "-Wl,--as-needed" }
|
||||
+ linkoptions { "-Wl,--no-undefined" }
|
||||
end
|
||||
|
||||
- if arch == "x86" then
|
||||
- buildoptions {
|
||||
- -- To support intrinsics like __sync_bool_compare_and_swap on x86
|
||||
- -- we need to set -march to something that supports them
|
||||
- "-march=i686"
|
||||
- }
|
||||
- end
|
||||
+ end
|
||||
|
||||
+ if not _OPTIONS["without-pch"] then
|
||||
+ buildoptions {
|
||||
+ -- do something (?) so that ccache can handle compilation with PCH enabled
|
||||
+ -- (ccache 3.1+ also requires CCACHE_SLOPPINESS=time_macros for this to work)
|
||||
+ "-fpch-preprocess"
|
||||
+ }
|
||||
end
|
||||
|
||||
if arch == "arm" then
|
||||
@@ -281,13 +267,11 @@
|
||||
end
|
||||
end
|
||||
|
||||
- if not _OPTIONS["minimal-flags"] then
|
||||
buildoptions {
|
||||
-- Hide symbols in dynamic shared objects by default, for efficiency and for equivalence with
|
||||
-- Windows - they should be exported explicitly with __attribute__ ((visibility ("default")))
|
||||
"-fvisibility=hidden"
|
||||
}
|
||||
- end
|
||||
|
||||
-- X11 includes may be installed in one of a gadzillion of three places
|
||||
-- Famous last words: "You can't include too much! ;-)"
|
||||
--- libraries/fcollada/src/Makefile
|
||||
+++ libraries/fcollada/src/Makefile
|
||||
@@ -9,8 +9,8 @@
|
||||
|
||||
CXX ?= g++
|
||||
CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
|
||||
-CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
|
||||
-CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL
|
||||
+CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
|
||||
+CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL
|
||||
# (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1)
|
||||
CXXFLAGS_TEST := -O0 -g -D_DEBUG
|
||||
LIBS += `pkg-config libxml-2.0 --libs`
|
||||
--- build/premake/premake4/src/tools/gcc.lua
|
||||
+++ build/premake/premake4/src/tools/gcc.lua
|
||||
@@ -136,8 +136,6 @@
|
||||
if not cfg.flags.Symbols then
|
||||
if cfg.system == "macosx" then
|
||||
table.insert(result, "-Wl,-x")
|
||||
- else
|
||||
- table.insert(result, "-s")
|
||||
end
|
||||
end
|
||||
|
||||
--- build/premake/premake4/build/gmake.unix/Premake4.make
|
||||
+++ build/premake/premake4/build/gmake.unix/Premake4.make
|
||||
@@ -26,9 +26,9 @@
|
||||
DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
|
||||
INCLUDES += -I../../src/host/lua-5.1.4/src
|
||||
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
|
||||
- CFLAGS += $(CPPFLAGS) -Wall -Os
|
||||
- CXXFLAGS += $(CPPFLAGS) -Wall -Os
|
||||
- LDFLAGS += -s -rdynamic
|
||||
+ CFLAGS += $(CPPFLAGS) -Wall
|
||||
+ CXXFLAGS += $(CPPFLAGS) -Wall
|
||||
+ LDFLAGS += -rdynamic
|
||||
LIBS += -lm -ldl
|
||||
RESFLAGS += $(DEFINES) $(INCLUDES)
|
||||
LDDEPS +=
|
||||
@@ -48,8 +48,8 @@
|
||||
DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
|
||||
INCLUDES += -I../../src/host/lua-5.1.4/src
|
||||
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
|
||||
- CFLAGS += $(CPPFLAGS) -Wall -g
|
||||
- CXXFLAGS += $(CPPFLAGS) -Wall -g
|
||||
+ CFLAGS += $(CPPFLAGS) -Wall
|
||||
+ CXXFLAGS += $(CPPFLAGS) -Wall
|
||||
LDFLAGS += -rdynamic
|
||||
LIBS += -lm -ldl
|
||||
RESFLAGS += $(DEFINES) $(INCLUDES)
|
||||
@@ -302,4 +302,4 @@
|
||||
$(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lauxlib.d -MT "$@" -o "$@" -c "$<"
|
||||
|
||||
-include $(OBJECTS:%.o=%.d)
|
||||
--include $(GCH:%.h.gch=%.h.d)
|
||||
\ No newline at end of file
|
||||
+-include $(GCH:%.h.gch=%.h.d)
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
http://trac.wildfiregames.com/ticket/1664
|
||||
|
||||
Index: /ps/trunk/source/soundmanager/js/SoundPlayer.cpp
|
||||
===================================================================
|
||||
--- /ps/trunk/source/soundmanager/js/SoundPlayer.cpp (revision 12654)
|
||||
+++ /ps/trunk/source/soundmanager/js/SoundPlayer.cpp (revision 12655)
|
||||
@@ -24,4 +24,6 @@
|
||||
#include "ps/Filesystem.h"
|
||||
#include "soundmanager/SoundManager.h"
|
||||
+
|
||||
+#include <sstream>
|
||||
|
||||
|
||||
Index: /ps/trunk/source/soundmanager/js/MusicSound.cpp
|
||||
===================================================================
|
||||
--- /ps/trunk/source/soundmanager/js/MusicSound.cpp (revision 12654)
|
||||
+++ /ps/trunk/source/soundmanager/js/MusicSound.cpp (revision 12655)
|
||||
@@ -26,4 +26,6 @@
|
||||
#include "ps/Filesystem.h"
|
||||
#include "soundmanager/SoundManager.h"
|
||||
+
|
||||
+#include <sstream>
|
||||
|
||||
|
||||
|
|
@ -1,138 +0,0 @@
|
|||
From: Julian Ospald <hasufell@gentoo.org>
|
||||
Date: Sun Jun 24 18:32:38 UTC 2012
|
||||
Subject: build system
|
||||
|
||||
respect flags
|
||||
let stripping be handled by the system
|
||||
|
||||
fix minimal-flags option:
|
||||
leave -fvisibility=hidden active
|
||||
leave conditional -fpc-preprocess active
|
||||
|
||||
--- build/premake/premake4.lua
|
||||
+++ build/premake/premake4.lua
|
||||
@@ -134,7 +134,7 @@
|
||||
|
||||
function project_set_build_flags()
|
||||
|
||||
- flags { "Symbols", "NoEditAndContinue" }
|
||||
+ flags { "NoEditAndContinue" }
|
||||
if not _OPTIONS["icc"] and (os.is("windows") or not _OPTIONS["minimal-flags"]) then
|
||||
-- adds the -Wall compiler flag
|
||||
flags { "ExtraWarnings" } -- this causes far too many warnings/remarks on ICC
|
||||
@@ -227,33 +227,19 @@
|
||||
"-fno-omit-frame-pointer"
|
||||
}
|
||||
|
||||
- if not _OPTIONS["without-pch"] then
|
||||
- buildoptions {
|
||||
- -- do something (?) so that ccache can handle compilation with PCH enabled
|
||||
- -- (ccache 3.1+ also requires CCACHE_SLOPPINESS=time_macros for this to work)
|
||||
- "-fpch-preprocess"
|
||||
- }
|
||||
+
|
||||
+ if os.is("linux") or os.is("bsd") then
|
||||
+ linkoptions { "-Wl,--no-undefined" }
|
||||
end
|
||||
|
||||
- if arch == "x86" or arch == "amd64" then
|
||||
- buildoptions {
|
||||
- -- enable SSE intrinsics
|
||||
- "-msse"
|
||||
- }
|
||||
- end
|
||||
-
|
||||
- if os.is("linux") or os.is("bsd") then
|
||||
- linkoptions { "-Wl,--no-undefined", "-Wl,--as-needed" }
|
||||
- end
|
||||
-
|
||||
- if arch == "x86" then
|
||||
- buildoptions {
|
||||
- -- To support intrinsics like __sync_bool_compare_and_swap on x86
|
||||
- -- we need to set -march to something that supports them
|
||||
- "-march=i686"
|
||||
- }
|
||||
- end
|
||||
-
|
||||
+ end
|
||||
+
|
||||
+ if not _OPTIONS["without-pch"] then
|
||||
+ buildoptions {
|
||||
+ -- do something (?) so that ccache can handle compilation with PCH enabled
|
||||
+ -- (ccache 3.1+ also requires CCACHE_SLOPPINESS=time_macros for this to work)
|
||||
+ "-fpch-preprocess"
|
||||
+ }
|
||||
end
|
||||
|
||||
if arch == "arm" then
|
||||
@@ -276,13 +262,11 @@
|
||||
end
|
||||
end
|
||||
|
||||
- if not _OPTIONS["minimal-flags"] then
|
||||
buildoptions {
|
||||
-- Hide symbols in dynamic shared objects by default, for efficiency and for equivalence with
|
||||
-- Windows - they should be exported explicitly with __attribute__ ((visibility ("default")))
|
||||
"-fvisibility=hidden"
|
||||
}
|
||||
- end
|
||||
|
||||
-- X11 includes may be installed in one of a gadzillion of three places
|
||||
-- Famous last words: "You can't include too much! ;-)"
|
||||
--- libraries/fcollada/src/Makefile
|
||||
+++ libraries/fcollada/src/Makefile
|
||||
@@ -9,8 +9,8 @@
|
||||
|
||||
CXX ?= g++
|
||||
CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
|
||||
-CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
|
||||
-CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL
|
||||
+CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
|
||||
+CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL
|
||||
# (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1)
|
||||
CXXFLAGS_TEST := -O0 -g -D_DEBUG
|
||||
LIBS += `pkg-config libxml-2.0 --libs`
|
||||
--- build/premake/premake4/src/tools/gcc.lua
|
||||
+++ build/premake/premake4/src/tools/gcc.lua
|
||||
@@ -136,8 +136,6 @@
|
||||
if not cfg.flags.Symbols then
|
||||
if cfg.system == "macosx" then
|
||||
table.insert(result, "-Wl,-x")
|
||||
- else
|
||||
- table.insert(result, "-s")
|
||||
end
|
||||
end
|
||||
|
||||
--- build/premake/premake4/build/gmake.unix/Premake4.make
|
||||
+++ build/premake/premake4/build/gmake.unix/Premake4.make
|
||||
@@ -26,9 +26,9 @@
|
||||
DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
|
||||
INCLUDES += -I../../src/host/lua-5.1.4/src
|
||||
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
|
||||
- CFLAGS += $(CPPFLAGS) -Wall -Os
|
||||
- CXXFLAGS += $(CPPFLAGS) -Wall -Os
|
||||
- LDFLAGS += -s -rdynamic
|
||||
+ CFLAGS += $(CPPFLAGS) -Wall
|
||||
+ CXXFLAGS += $(CPPFLAGS) -Wall
|
||||
+ LDFLAGS += -rdynamic
|
||||
LIBS += -lm -ldl
|
||||
RESFLAGS += $(DEFINES) $(INCLUDES)
|
||||
LDDEPS +=
|
||||
@@ -48,8 +48,8 @@
|
||||
DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
|
||||
INCLUDES += -I../../src/host/lua-5.1.4/src
|
||||
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
|
||||
- CFLAGS += $(CPPFLAGS) -Wall -g
|
||||
- CXXFLAGS += $(CPPFLAGS) -Wall -g
|
||||
+ CFLAGS += $(CPPFLAGS) -Wall
|
||||
+ CXXFLAGS += $(CPPFLAGS) -Wall
|
||||
LDFLAGS += -rdynamic
|
||||
LIBS += -lm -ldl
|
||||
RESFLAGS += $(DEFINES) $(INCLUDES)
|
||||
@@ -302,4 +302,4 @@
|
||||
$(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lauxlib.d -MT "$@" -o "$@" -c "$<"
|
||||
|
||||
-include $(OBJECTS:%.o=%.d)
|
||||
--include $(GCH:%.h.gch=%.h.d)
|
||||
\ No newline at end of file
|
||||
+-include $(GCH:%.h.gch=%.h.d)
|
||||
|
|
@ -1,123 +0,0 @@
|
|||
From: Julian Ospald <hasufell@gentoo.org>
|
||||
Date: Sun Jun 24 18:32:38 UTC 2012
|
||||
Subject: build system
|
||||
|
||||
respect flags
|
||||
let stripping be handled by the system
|
||||
|
||||
fix minimal-flags option:
|
||||
leave -fvisibility=hidden active
|
||||
leave conditional -fpc-preprocess active
|
||||
|
||||
--- build/premake/premake4.lua
|
||||
+++ build/premake/premake4.lua
|
||||
@@ -136,7 +136,7 @@
|
||||
|
||||
function project_set_build_flags()
|
||||
|
||||
- flags { "Symbols", "NoEditAndContinue" }
|
||||
+ flags { "NoEditAndContinue" }
|
||||
if not _OPTIONS["icc"] and (os.is("windows") or not _OPTIONS["minimal-flags"]) then
|
||||
-- adds the -Wall compiler flag
|
||||
flags { "ExtraWarnings" } -- this causes far too many warnings/remarks on ICC
|
||||
@@ -229,13 +229,6 @@
|
||||
"-fno-omit-frame-pointer"
|
||||
}
|
||||
|
||||
- if not _OPTIONS["without-pch"] then
|
||||
- buildoptions {
|
||||
- -- do something (?) so that ccache can handle compilation with PCH enabled
|
||||
- -- (ccache 3.1+ also requires CCACHE_SLOPPINESS=time_macros for this to work)
|
||||
- "-fpch-preprocess"
|
||||
- }
|
||||
- end
|
||||
|
||||
if arch == "x86" or arch == "amd64" then
|
||||
buildoptions {
|
||||
@@ -258,6 +251,15 @@
|
||||
|
||||
end
|
||||
|
||||
+ if not _OPTIONS["without-pch"] then
|
||||
+ buildoptions {
|
||||
+ -- do something (?) so that ccache can handle compilation with PCH enabled
|
||||
+ -- (ccache 3.1+ also requires CCACHE_SLOPPINESS=time_macros for this to work)
|
||||
+ "-fpch-preprocess"
|
||||
+ }
|
||||
+ end
|
||||
+
|
||||
+
|
||||
if arch == "arm" then
|
||||
-- disable warnings about va_list ABI change
|
||||
buildoptions { "-Wno-psabi" }
|
||||
@@ -295,13 +297,11 @@
|
||||
end
|
||||
end
|
||||
|
||||
- if not _OPTIONS["minimal-flags"] then
|
||||
buildoptions {
|
||||
-- Hide symbols in dynamic shared objects by default, for efficiency and for equivalence with
|
||||
-- Windows - they should be exported explicitly with __attribute__ ((visibility ("default")))
|
||||
"-fvisibility=hidden"
|
||||
}
|
||||
- end
|
||||
|
||||
if _OPTIONS["bindir"] then
|
||||
defines { "INSTALLED_BINDIR=" .. _OPTIONS["bindir"] }
|
||||
--- libraries/source/fcollada/src/Makefile
|
||||
+++ libraries/source/fcollada/src/Makefile
|
||||
@@ -9,8 +9,8 @@
|
||||
|
||||
CXX ?= g++
|
||||
CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
|
||||
-CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
|
||||
-CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL
|
||||
+CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
|
||||
+CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL
|
||||
# (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1)
|
||||
CXXFLAGS_TEST := -O0 -g -D_DEBUG
|
||||
LIBS += `pkg-config libxml-2.0 --libs`
|
||||
--- build/premake/premake4/src/tools/gcc.lua
|
||||
+++ build/premake/premake4/src/tools/gcc.lua
|
||||
@@ -136,8 +136,6 @@
|
||||
if not cfg.flags.Symbols then
|
||||
if cfg.system == "macosx" then
|
||||
table.insert(result, "-Wl,-x")
|
||||
- else
|
||||
- table.insert(result, "-s")
|
||||
end
|
||||
end
|
||||
|
||||
--- build/premake/premake4/build/gmake.unix/Premake4.make
|
||||
+++ build/premake/premake4/build/gmake.unix/Premake4.make
|
||||
@@ -26,9 +26,9 @@
|
||||
DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
|
||||
INCLUDES += -I../../src/host/lua-5.1.4/src
|
||||
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
|
||||
- CFLAGS += $(CPPFLAGS) -Wall -Os
|
||||
- CXXFLAGS += $(CPPFLAGS) -Wall -Os
|
||||
- LDFLAGS += -s -rdynamic
|
||||
+ CFLAGS += $(CPPFLAGS) -Wall
|
||||
+ CXXFLAGS += $(CPPFLAGS) -Wall
|
||||
+ LDFLAGS += -rdynamic
|
||||
LIBS += -lm -ldl
|
||||
RESFLAGS += $(DEFINES) $(INCLUDES)
|
||||
LDDEPS +=
|
||||
@@ -48,8 +48,8 @@
|
||||
DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
|
||||
INCLUDES += -I../../src/host/lua-5.1.4/src
|
||||
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
|
||||
- CFLAGS += $(CPPFLAGS) -Wall -g
|
||||
- CXXFLAGS += $(CPPFLAGS) -Wall -g
|
||||
+ CFLAGS += $(CPPFLAGS) -Wall
|
||||
+ CXXFLAGS += $(CPPFLAGS) -Wall
|
||||
LDFLAGS += -rdynamic
|
||||
LIBS += -lm -ldl
|
||||
RESFLAGS += $(DEFINES) $(INCLUDES)
|
||||
@@ -302,4 +302,4 @@
|
||||
$(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lauxlib.d -MT "$@" -o "$@" -c "$<"
|
||||
|
||||
-include $(OBJECTS:%.o=%.d)
|
||||
--include $(GCH:%.h.gch=%.h.d)
|
||||
\ No newline at end of file
|
||||
+-include $(GCH:%.h.gch=%.h.d)
|
||||
|
|
@ -1,93 +0,0 @@
|
|||
From: Julian Ospald <hasufell@gentoo.org>
|
||||
Date: Sun Jun 24 18:32:38 UTC 2012
|
||||
Subject: build system
|
||||
|
||||
respect flags
|
||||
let stripping be handled by the system
|
||||
|
||||
fix minimal-flags option:
|
||||
leave -fvisibility=hidden active
|
||||
leave conditional -fpc-preprocess active
|
||||
|
||||
--- build/premake/premake4.lua
|
||||
+++ build/premake/premake4.lua
|
||||
@@ -138,7 +138,7 @@
|
||||
|
||||
function project_set_build_flags()
|
||||
|
||||
- flags { "Symbols", "NoEditAndContinue" }
|
||||
+ flags { "NoEditAndContinue" }
|
||||
if not _OPTIONS["icc"] and (os.is("windows") or not _OPTIONS["minimal-flags"]) then
|
||||
-- adds the -Wall compiler flag
|
||||
flags { "ExtraWarnings" } -- this causes far too many warnings/remarks on ICC
|
||||
@@ -308,13 +308,11 @@
|
||||
end
|
||||
end
|
||||
|
||||
- if not _OPTIONS["minimal-flags"] then
|
||||
buildoptions {
|
||||
-- Hide symbols in dynamic shared objects by default, for efficiency and for equivalence with
|
||||
-- Windows - they should be exported explicitly with __attribute__ ((visibility ("default")))
|
||||
"-fvisibility=hidden"
|
||||
}
|
||||
- end
|
||||
|
||||
if _OPTIONS["bindir"] then
|
||||
defines { "INSTALLED_BINDIR=" .. _OPTIONS["bindir"] }
|
||||
--- libraries/source/fcollada/src/Makefile
|
||||
+++ libraries/source/fcollada/src/Makefile
|
||||
@@ -14,8 +14,8 @@
|
||||
ifeq ($(OS_CPU),armv7l)
|
||||
CXXFLAGS += -mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=hard
|
||||
endif
|
||||
-CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
|
||||
-CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL
|
||||
+CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
|
||||
+CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL
|
||||
# (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1 until gcc >4.3 is typical.)
|
||||
CXXFLAGS_TEST := -O0 -g -D_DEBUG
|
||||
LIBS += `pkg-config libxml-2.0 --libs`
|
||||
--- build/premake/premake4/src/tools/gcc.lua
|
||||
+++ build/premake/premake4/src/tools/gcc.lua
|
||||
@@ -136,8 +136,6 @@
|
||||
if not cfg.flags.Symbols then
|
||||
if cfg.system == "macosx" then
|
||||
table.insert(result, "-Wl,-x")
|
||||
- else
|
||||
- table.insert(result, "-s")
|
||||
end
|
||||
end
|
||||
|
||||
--- build/premake/premake4/build/gmake.unix/Premake4.make
|
||||
+++ build/premake/premake4/build/gmake.unix/Premake4.make
|
||||
@@ -26,9 +26,9 @@
|
||||
DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
|
||||
INCLUDES += -I../../src/host/lua-5.1.4/src
|
||||
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
|
||||
- CFLAGS += $(CPPFLAGS) -Wall -Os
|
||||
- CXXFLAGS += $(CPPFLAGS) -Wall -Os
|
||||
- LDFLAGS += -s -rdynamic
|
||||
+ CFLAGS += $(CPPFLAGS) -Wall
|
||||
+ CXXFLAGS += $(CPPFLAGS) -Wall
|
||||
+ LDFLAGS += -rdynamic
|
||||
LIBS += -lm -ldl
|
||||
RESFLAGS += $(DEFINES) $(INCLUDES)
|
||||
LDDEPS +=
|
||||
@@ -48,8 +48,8 @@
|
||||
DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
|
||||
INCLUDES += -I../../src/host/lua-5.1.4/src
|
||||
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
|
||||
- CFLAGS += $(CPPFLAGS) -Wall -g
|
||||
- CXXFLAGS += $(CPPFLAGS) -Wall -g
|
||||
+ CFLAGS += $(CPPFLAGS) -Wall
|
||||
+ CXXFLAGS += $(CPPFLAGS) -Wall
|
||||
LDFLAGS += -rdynamic
|
||||
LIBS += -lm -ldl
|
||||
RESFLAGS += $(DEFINES) $(INCLUDES)
|
||||
@@ -302,4 +302,4 @@
|
||||
$(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lauxlib.d -MT "$@" -o "$@" -c "$<"
|
||||
|
||||
-include $(OBJECTS:%.o=%.d)
|
||||
--include $(GCH:%.h.gch=%.h.d)
|
||||
\ No newline at end of file
|
||||
+-include $(GCH:%.h.gch=%.h.d)
|
||||
|
|
@ -1,93 +0,0 @@
|
|||
From: Julian Ospald <hasufell@gentoo.org>
|
||||
Date: Sun Jun 24 18:32:38 UTC 2012
|
||||
Subject: build system
|
||||
|
||||
respect flags
|
||||
let stripping be handled by the system
|
||||
|
||||
fix minimal-flags option:
|
||||
leave -fvisibility=hidden active
|
||||
leave conditional -fpc-preprocess active
|
||||
|
||||
--- build/premake/premake4.lua
|
||||
+++ build/premake/premake4.lua
|
||||
@@ -145,7 +145,7 @@
|
||||
|
||||
function project_set_build_flags()
|
||||
|
||||
- flags { "Symbols", "NoEditAndContinue" }
|
||||
+ flags { "NoEditAndContinue" }
|
||||
if not _OPTIONS["icc"] and (os.is("windows") or not _OPTIONS["minimal-flags"]) then
|
||||
-- adds the -Wall compiler flag
|
||||
flags { "ExtraWarnings" } -- this causes far too many warnings/remarks on ICC
|
||||
@@ -337,13 +337,11 @@
|
||||
end
|
||||
end
|
||||
|
||||
- if not _OPTIONS["minimal-flags"] then
|
||||
buildoptions {
|
||||
-- Hide symbols in dynamic shared objects by default, for efficiency and for equivalence with
|
||||
-- Windows - they should be exported explicitly with __attribute__ ((visibility ("default")))
|
||||
"-fvisibility=hidden"
|
||||
}
|
||||
- end
|
||||
|
||||
if _OPTIONS["bindir"] then
|
||||
defines { "INSTALLED_BINDIR=" .. _OPTIONS["bindir"] }
|
||||
--- libraries/source/fcollada/src/Makefile
|
||||
+++ libraries/source/fcollada/src/Makefile
|
||||
@@ -9,8 +9,8 @@
|
||||
|
||||
CXX ?= g++
|
||||
CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
|
||||
-CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
|
||||
-CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL
|
||||
+CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
|
||||
+CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL
|
||||
# (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1 until gcc >4.3 is typical.)
|
||||
CXXFLAGS_TEST := -O0 -g -D_DEBUG
|
||||
LIBS += `pkg-config libxml-2.0 --libs`
|
||||
--- build/premake/premake4/src/tools/gcc.lua
|
||||
+++ build/premake/premake4/src/tools/gcc.lua
|
||||
@@ -136,8 +136,6 @@
|
||||
if not cfg.flags.Symbols then
|
||||
if cfg.system == "macosx" then
|
||||
table.insert(result, "-Wl,-x")
|
||||
- else
|
||||
- table.insert(result, "-s")
|
||||
end
|
||||
end
|
||||
|
||||
--- build/premake/premake4/build/gmake.unix/Premake4.make
|
||||
+++ build/premake/premake4/build/gmake.unix/Premake4.make
|
||||
@@ -26,9 +26,9 @@
|
||||
DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
|
||||
INCLUDES += -I../../src/host/lua-5.1.4/src
|
||||
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
|
||||
- CFLAGS += $(CPPFLAGS) -Wall -Os
|
||||
- CXXFLAGS += $(CPPFLAGS) -Wall -Os
|
||||
- LDFLAGS += -s -rdynamic
|
||||
+ CFLAGS += $(CPPFLAGS) -Wall
|
||||
+ CXXFLAGS += $(CPPFLAGS) -Wall
|
||||
+ LDFLAGS += -rdynamic
|
||||
LIBS += -lm -ldl
|
||||
RESFLAGS += $(DEFINES) $(INCLUDES)
|
||||
LDDEPS +=
|
||||
@@ -48,8 +48,8 @@
|
||||
DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
|
||||
INCLUDES += -I../../src/host/lua-5.1.4/src
|
||||
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
|
||||
- CFLAGS += $(CPPFLAGS) -Wall -g
|
||||
- CXXFLAGS += $(CPPFLAGS) -Wall -g
|
||||
+ CFLAGS += $(CPPFLAGS) -Wall
|
||||
+ CXXFLAGS += $(CPPFLAGS) -Wall
|
||||
LDFLAGS += -rdynamic
|
||||
LIBS += -lm -ldl
|
||||
RESFLAGS += $(DEFINES) $(INCLUDES)
|
||||
@@ -302,4 +302,4 @@
|
||||
$(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lauxlib.d -MT "$@" -o "$@" -c "$<"
|
||||
|
||||
-include $(OBJECTS:%.o=%.d)
|
||||
--include $(GCH:%.h.gch=%.h.d)
|
||||
\ No newline at end of file
|
||||
+-include $(GCH:%.h.gch=%.h.d)
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue