root
13 years ago
parent
62280b70c1
commit
7dac1e24df
@ -0,0 +1,22 @@
|
||||
hack until gzip pulls a newer gnulib version
|
||||
|
||||
From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Blake <eblake@redhat.com>
|
||||
Date: Thu, 29 Mar 2012 13:30:41 -0600
|
||||
Subject: [PATCH] stdio: don't assume gets any more
|
||||
|
||||
Gnulib intentionally does not have a gets module, and now that C11
|
||||
and glibc have dropped it, we should be more proactive about warning
|
||||
any user on a platform that still has a declaration of this dangerous
|
||||
interface.
|
||||
|
||||
--- a/lib/stdio.in.h
|
||||
+++ b/lib/stdio.in.h
|
||||
@@ -125,7 +125,6 @@
|
||||
so any use of gets warrants an unconditional warning. Assume it is
|
||||
always declared, since it is required by C89. */
|
||||
#undef gets
|
||||
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
|
||||
|
||||
#if @GNULIB_FOPEN@
|
||||
# if @REPLACE_FOPEN@
|
||||
@ -0,0 +1,22 @@
|
||||
hack until gzip pulls a newer gnulib version
|
||||
|
||||
From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Blake <eblake@redhat.com>
|
||||
Date: Thu, 29 Mar 2012 13:30:41 -0600
|
||||
Subject: [PATCH] stdio: don't assume gets any more
|
||||
|
||||
Gnulib intentionally does not have a gets module, and now that C11
|
||||
and glibc have dropped it, we should be more proactive about warning
|
||||
any user on a platform that still has a declaration of this dangerous
|
||||
interface.
|
||||
|
||||
--- a/gnu/stdio.in.h
|
||||
+++ b/gnu/stdio.in.h
|
||||
@@ -125,7 +125,6 @@
|
||||
so any use of gets warrants an unconditional warning. Assume it is
|
||||
always declared, since it is required by C89. */
|
||||
#undef gets
|
||||
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
|
||||
|
||||
#if @GNULIB_FOPEN@
|
||||
# if @REPLACE_FOPEN@
|
||||
@ -1,369 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild,v 1.3 2012/05/03 18:33:00 jdhore Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit autotools elisp-common eutils flag-o-matic multilib
|
||||
|
||||
if [[ ${PV##*.} = 9999 ]]; then
|
||||
EBZR_PROJECT="emacs"
|
||||
EBZR_BRANCH="trunk"
|
||||
EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
|
||||
# "Nosmart" is much faster for initial branching.
|
||||
EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
|
||||
inherit bzr
|
||||
SRC_URI=""
|
||||
else
|
||||
SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
|
||||
mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.gz"
|
||||
# FULL_VERSION keeps the full version number, which is needed in
|
||||
# order to determine some path information correctly for copy/move
|
||||
# operations later on
|
||||
FULL_VERSION="${PV%%_*}"
|
||||
S="${WORKDIR}/emacs-${FULL_VERSION}"
|
||||
fi
|
||||
|
||||
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
|
||||
HOMEPAGE="http://www.gnu.org/software/emacs/"
|
||||
|
||||
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
|
||||
SLOT="24"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="alsa aqua athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
|
||||
REQUIRED_USE="aqua? ( !X )"
|
||||
|
||||
RDEPEND="sys-libs/ncurses
|
||||
>=app-admin/eselect-emacs-1.2
|
||||
net-libs/liblockfile
|
||||
hesiod? ( net-dns/hesiod )
|
||||
kerberos? ( virtual/krb5 )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
gpm? ( sys-libs/gpm )
|
||||
dbus? ( sys-apps/dbus )
|
||||
gnutls? ( net-libs/gnutls )
|
||||
libxml2? ( >=dev-libs/libxml2-2.2.0 )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
X? (
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
x11-misc/xbitmaps
|
||||
gconf? ( >=gnome-base/gconf-2.26.2 )
|
||||
gsettings? ( >=dev-libs/glib-2.28.6 )
|
||||
gif? ( media-libs/giflib )
|
||||
jpeg? ( virtual/jpeg )
|
||||
png? ( >=media-libs/libpng-1.4:0 )
|
||||
svg? ( >=gnome-base/librsvg-2.0 )
|
||||
tiff? ( media-libs/tiff )
|
||||
xpm? ( x11-libs/libXpm )
|
||||
imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
|
||||
xft? (
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype
|
||||
x11-libs/libXft
|
||||
m17n-lib? (
|
||||
>=dev-libs/libotf-0.9.4
|
||||
>=dev-libs/m17n-lib-1.5.1
|
||||
)
|
||||
)
|
||||
gtk? (
|
||||
gtk3? ( x11-libs/gtk+:3 )
|
||||
!gtk3? ( x11-libs/gtk+:2 )
|
||||
)
|
||||
!gtk? (
|
||||
Xaw3d? ( x11-libs/libXaw3d )
|
||||
!Xaw3d? (
|
||||
athena? ( x11-libs/libXaw )
|
||||
!athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
|
||||
)
|
||||
)
|
||||
)"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
alsa? ( virtual/pkgconfig )
|
||||
dbus? ( virtual/pkgconfig )
|
||||
gnutls? ( virtual/pkgconfig )
|
||||
libxml2? ( virtual/pkgconfig )
|
||||
X? ( virtual/pkgconfig )
|
||||
gzip-el? ( app-arch/gzip )"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
>=app-emacs/emacs-common-gentoo-1.3[X?]"
|
||||
|
||||
EMACS_SUFFIX="emacs-${SLOT}"
|
||||
SITEFILE="20${PN}-${SLOT}-gentoo.el"
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV##*.} = 9999 ]]; then
|
||||
FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \
|
||||
configure.in)
|
||||
[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
|
||||
einfo "Emacs branch: ${EBZR_BRANCH}"
|
||||
einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
|
||||
einfo "Emacs version number: ${FULL_VERSION}"
|
||||
[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
|
||||
|| die "Upstream version number changed to ${FULL_VERSION}"
|
||||
fi
|
||||
|
||||
epatch "${FILESDIR}"/emacs-24.0.92-ns-appdirs.patch
|
||||
|
||||
if ! use alsa; then
|
||||
# ALSA is detected even if not requested by its USE flag.
|
||||
# Suppress it by supplying pkg-config with a wrong library name.
|
||||
sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
|
||||
|| die "unable to sed configure.in"
|
||||
fi
|
||||
if ! use gzip-el; then
|
||||
# Emacs' build system automatically detects the gzip binary and
|
||||
# compresses el files. We don't want that so confuse it with a
|
||||
# wrong binary name
|
||||
sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
|
||||
|| die "unable to sed configure.in"
|
||||
fi
|
||||
|
||||
AT_M4DIR=m4 eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
ALLOWED_FLAGS=""
|
||||
strip-flags
|
||||
|
||||
if use sh; then
|
||||
replace-flags -O[1-9] -O0 #262359
|
||||
elif use ia64; then
|
||||
replace-flags -O[2-9] -O1 #325373
|
||||
else
|
||||
replace-flags -O[3-9] -O2
|
||||
fi
|
||||
|
||||
local myconf
|
||||
|
||||
if use alsa && ! use sound; then
|
||||
einfo "Although sound USE flag is disabled you chose to have alsa,"
|
||||
einfo "so sound is switched on anyway."
|
||||
myconf="${myconf} --with-sound"
|
||||
else
|
||||
myconf="${myconf} $(use_with sound)"
|
||||
fi
|
||||
|
||||
if use X; then
|
||||
myconf="${myconf} --with-x --without-ns"
|
||||
myconf="${myconf} $(use_with gconf)"
|
||||
myconf="${myconf} $(use_with gsettings)"
|
||||
myconf="${myconf} $(use_with toolkit-scroll-bars)"
|
||||
myconf="${myconf} $(use_with wide-int)"
|
||||
myconf="${myconf} $(use_with gif) $(use_with jpeg)"
|
||||
myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
|
||||
myconf="${myconf} $(use_with tiff) $(use_with xpm)"
|
||||
myconf="${myconf} $(use_with imagemagick)"
|
||||
|
||||
if use xft; then
|
||||
myconf="${myconf} --with-xft"
|
||||
myconf="${myconf} $(use_with m17n-lib libotf)"
|
||||
myconf="${myconf} $(use_with m17n-lib m17n-flt)"
|
||||
else
|
||||
myconf="${myconf} --without-xft"
|
||||
myconf="${myconf} --without-libotf --without-m17n-flt"
|
||||
use m17n-lib && ewarn \
|
||||
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
|
||||
fi
|
||||
|
||||
if use gtk; then
|
||||
einfo "Configuring to build with GIMP Toolkit (GTK+)"
|
||||
myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
|
||||
local f
|
||||
for f in athena Xaw3d motif; do
|
||||
use ${f} && ewarn "USE flag \"${f}\" ignored" \
|
||||
"(superseded by \"gtk\")"
|
||||
done
|
||||
elif use athena || use Xaw3d; then
|
||||
einfo "Configuring to build with Athena/Lucid toolkit"
|
||||
myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
|
||||
use motif && ewarn "USE flag \"motif\" ignored" \
|
||||
"(superseded by \"athena\" or \"Xaw3d\")"
|
||||
elif use motif; then
|
||||
einfo "Configuring to build with Motif toolkit"
|
||||
myconf="${myconf} --with-x-toolkit=motif"
|
||||
else
|
||||
einfo "Configuring to build with no toolkit"
|
||||
myconf="${myconf} --with-x-toolkit=no"
|
||||
fi
|
||||
|
||||
! use gtk && use gtk3 \
|
||||
&& ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
|
||||
elif use aqua; then
|
||||
einfo "Configuring to build with Cocoa support"
|
||||
myconf="${myconf} --with-ns --disable-ns-self-contained"
|
||||
myconf="${myconf} --without-x"
|
||||
else
|
||||
myconf="${myconf} --without-x --without-ns"
|
||||
fi
|
||||
|
||||
if [[ ${PV##*.} = 9999 ]]; then
|
||||
# These variables are not needed for building. We add them to
|
||||
# configure options because they are stored in the Emacs binary
|
||||
# and available in variable "system-configuration-options".
|
||||
myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
|
||||
fi
|
||||
|
||||
# According to configure, this option is only used for GNU/Linux
|
||||
# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
|
||||
# out the location because $(get_libdir) does not necessarily return
|
||||
# something that matches the host OS's libdir naming (e.g. RHEL).
|
||||
local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
|
||||
crtdir=${crtdir%/*}
|
||||
|
||||
econf \
|
||||
--program-suffix=-${EMACS_SUFFIX} \
|
||||
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
|
||||
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
|
||||
--with-crt-dir="${crtdir}" \
|
||||
--with-gameuser="${GAMES_USER_DED:-games}" \
|
||||
--without-compress-info \
|
||||
--disable-maintainer-mode \
|
||||
$(use_with hesiod) \
|
||||
$(use_with kerberos) $(use_with kerberos kerberos5) \
|
||||
$(use_with gpm) \
|
||||
$(use_with dbus) \
|
||||
$(use_with gnutls) \
|
||||
$(use_with libxml2 xml2) \
|
||||
$(use_with selinux) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
|
||||
if [[ ${PV##*.} = 9999 ]]; then
|
||||
emake CC="$(tc-getCC)" bootstrap
|
||||
# cleanup, otherwise emacs will be dumped again in src_install
|
||||
(cd src; emake versionclean)
|
||||
fi
|
||||
# set last component of emacs-version to (package revision + 1)
|
||||
touch src/emacs-${FULL_VERSION}.${PR#r}
|
||||
emake CC="$(tc-getCC)"
|
||||
}
|
||||
|
||||
src_install () {
|
||||
local i m
|
||||
|
||||
emake install DESTDIR="${D}"
|
||||
|
||||
rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
|
||||
|| die "removing duplicate emacs executable failed"
|
||||
mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
|
||||
|| die "moving Emacs executable failed"
|
||||
|
||||
# move man pages to the correct place
|
||||
for m in "${ED}"/usr/share/man/man1/* ; do
|
||||
mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
|
||||
done
|
||||
|
||||
# move info dir to avoid collisions with the dir file generated by portage
|
||||
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
|
||||
|| die "moving info dir failed"
|
||||
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
|
||||
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
|
||||
|
||||
# avoid collision between slots, see bug #169033 e.g.
|
||||
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
|
||||
rm -rf "${ED}"/usr/share/{applications,icons}
|
||||
rm "${ED}"/var/lib/games/emacs/{snake,tetris}-scores
|
||||
keepdir /var/lib/games/emacs
|
||||
|
||||
# remove unused <version>/site-lisp dir
|
||||
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
|
||||
|
||||
local c=";;"
|
||||
if use source; then
|
||||
insinto /usr/share/emacs/${FULL_VERSION}/src
|
||||
# This is not meant to install all the source -- just the
|
||||
# C source you might find via find-function
|
||||
doins src/*.{c,h,m}
|
||||
doins -r src/{m,s}
|
||||
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
|
||||
c=""
|
||||
fi
|
||||
|
||||
sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF
|
||||
X
|
||||
;;; ${PN}-${SLOT} site-lisp configuration
|
||||
X
|
||||
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
|
||||
X ${c}(setq find-function-C-source-directory
|
||||
X ${c} "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src")
|
||||
X (let ((path (getenv "INFOPATH"))
|
||||
X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
|
||||
X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
|
||||
X (and path
|
||||
X ;; move Emacs Info dir before anything else in /usr/share/info
|
||||
X (let* ((p (cons nil (split-string path ":" t))) (q p))
|
||||
X (while (and (cdr q) (not (string-match re (cadr q))))
|
||||
X (setq q (cdr q)))
|
||||
X (setcdr q (cons dir (delete dir (cdr q))))
|
||||
X (setq Info-directory-list (prune-directory-list (cdr p)))))))
|
||||
EOF
|
||||
elisp-site-file-install "${T}/${SITEFILE}" || die
|
||||
|
||||
dodoc README BUGS
|
||||
|
||||
if use aqua; then
|
||||
dodir /Applications/Gentoo
|
||||
rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
|
||||
mv nextstep/Emacs.app \
|
||||
"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
|
||||
elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
|
||||
elog "You may want to copy or symlink it into /Applications by yourself."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# move Info dir file to correct name
|
||||
local infodir=/usr/share/info/${EMACS_SUFFIX} f
|
||||
if [[ -f ${ED}${infodir}/dir.orig ]]; then
|
||||
mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
|
||||
else
|
||||
# this should not happen in EAPI 4
|
||||
ewarn "Regenerating Info directory index in ${infodir} ..."
|
||||
rm -f "${ED}"${infodir}/dir{,.*}
|
||||
for f in "${ED}"${infodir}/*; do
|
||||
if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
|
||||
install-info --info-dir="${ED}"${infodir} "${f}" \
|
||||
|| die "install-info failed"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
local f
|
||||
for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
|
||||
[[ -e ${f} ]] || touch "${f}"
|
||||
done
|
||||
chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs
|
||||
|
||||
elisp-site-regen
|
||||
eselect emacs update ifunset
|
||||
|
||||
if use X; then
|
||||
elog "You need to install some fonts for Emacs."
|
||||
elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
|
||||
elog "machine would satisfy basic Emacs requirements under X11."
|
||||
elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
|
||||
elog "for how to enable anti-aliased fonts."
|
||||
elog
|
||||
fi
|
||||
|
||||
elog "You can set the version to be started by /usr/bin/emacs through"
|
||||
elog "the Emacs eselect module, which also redirects man and info pages."
|
||||
elog "Therefore, several Emacs versions can be installed at the same time."
|
||||
elog "\"man emacs.eselect\" for details."
|
||||
elog
|
||||
elog "If you upgrade from a previous major version of Emacs, then it is"
|
||||
elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
|
||||
elog "all byte-compiled elisp files of the installed Emacs packages."
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
elisp-site-regen
|
||||
eselect emacs update ifunset
|
||||
}
|
||||
@ -1,369 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.95.ebuild,v 1.2 2012/05/03 18:33:00 jdhore Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit autotools elisp-common eutils flag-o-matic multilib
|
||||
|
||||
if [[ ${PV##*.} = 9999 ]]; then
|
||||
EBZR_PROJECT="emacs"
|
||||
EBZR_BRANCH="trunk"
|
||||
EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
|
||||
# "Nosmart" is much faster for initial branching.
|
||||
EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
|
||||
inherit bzr
|
||||
SRC_URI=""
|
||||
else
|
||||
SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
|
||||
mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.gz"
|
||||
# FULL_VERSION keeps the full version number, which is needed in
|
||||
# order to determine some path information correctly for copy/move
|
||||
# operations later on
|
||||
FULL_VERSION="${PV%%_*}"
|
||||
S="${WORKDIR}/emacs-${FULL_VERSION}"
|
||||
fi
|
||||
|
||||
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
|
||||
HOMEPAGE="http://www.gnu.org/software/emacs/"
|
||||
|
||||
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
|
||||
SLOT="24"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="alsa aqua athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
|
||||
REQUIRED_USE="aqua? ( !X )"
|
||||
|
||||
RDEPEND="sys-libs/ncurses
|
||||
>=app-admin/eselect-emacs-1.2
|
||||
net-libs/liblockfile
|
||||
hesiod? ( net-dns/hesiod )
|
||||
kerberos? ( virtual/krb5 )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
gpm? ( sys-libs/gpm )
|
||||
dbus? ( sys-apps/dbus )
|
||||
gnutls? ( net-libs/gnutls )
|
||||
libxml2? ( >=dev-libs/libxml2-2.2.0 )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
X? (
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
x11-misc/xbitmaps
|
||||
gconf? ( >=gnome-base/gconf-2.26.2 )
|
||||
gsettings? ( >=dev-libs/glib-2.28.6 )
|
||||
gif? ( media-libs/giflib )
|
||||
jpeg? ( virtual/jpeg )
|
||||
png? ( >=media-libs/libpng-1.4:0 )
|
||||
svg? ( >=gnome-base/librsvg-2.0 )
|
||||
tiff? ( media-libs/tiff )
|
||||
xpm? ( x11-libs/libXpm )
|
||||
imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
|
||||
xft? (
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype
|
||||
x11-libs/libXft
|
||||
m17n-lib? (
|
||||
>=dev-libs/libotf-0.9.4
|
||||
>=dev-libs/m17n-lib-1.5.1
|
||||
)
|
||||
)
|
||||
gtk? (
|
||||
gtk3? ( x11-libs/gtk+:3 )
|
||||
!gtk3? ( x11-libs/gtk+:2 )
|
||||
)
|
||||
!gtk? (
|
||||
Xaw3d? ( x11-libs/libXaw3d )
|
||||
!Xaw3d? (
|
||||
athena? ( x11-libs/libXaw )
|
||||
!athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
|
||||
)
|
||||
)
|
||||
)"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
alsa? ( virtual/pkgconfig )
|
||||
dbus? ( virtual/pkgconfig )
|
||||
gnutls? ( virtual/pkgconfig )
|
||||
libxml2? ( virtual/pkgconfig )
|
||||
X? ( virtual/pkgconfig )
|
||||
gzip-el? ( app-arch/gzip )"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
>=app-emacs/emacs-common-gentoo-1.3[X?]"
|
||||
|
||||
EMACS_SUFFIX="emacs-${SLOT}"
|
||||
SITEFILE="20${PN}-${SLOT}-gentoo.el"
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV##*.} = 9999 ]]; then
|
||||
FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \
|
||||
configure.in)
|
||||
[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
|
||||
einfo "Emacs branch: ${EBZR_BRANCH}"
|
||||
einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
|
||||
einfo "Emacs version number: ${FULL_VERSION}"
|
||||
[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
|
||||
|| die "Upstream version number changed to ${FULL_VERSION}"
|
||||
fi
|
||||
|
||||
epatch "${FILESDIR}"/emacs-24.0.92-ns-appdirs.patch
|
||||
|
||||
if ! use alsa; then
|
||||
# ALSA is detected even if not requested by its USE flag.
|
||||
# Suppress it by supplying pkg-config with a wrong library name.
|
||||
sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
|
||||
|| die "unable to sed configure.in"
|
||||
fi
|
||||
if ! use gzip-el; then
|
||||
# Emacs' build system automatically detects the gzip binary and
|
||||
# compresses el files. We don't want that so confuse it with a
|
||||
# wrong binary name
|
||||
sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
|
||||
|| die "unable to sed configure.in"
|
||||
fi
|
||||
|
||||
AT_M4DIR=m4 eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
ALLOWED_FLAGS=""
|
||||
strip-flags
|
||||
|
||||
if use sh; then
|
||||
replace-flags -O[1-9] -O0 #262359
|
||||
elif use ia64; then
|
||||
replace-flags -O[2-9] -O1 #325373
|
||||
else
|
||||
replace-flags -O[3-9] -O2
|
||||
fi
|
||||
|
||||
local myconf
|
||||
|
||||
if use alsa && ! use sound; then
|
||||
einfo "Although sound USE flag is disabled you chose to have alsa,"
|
||||
einfo "so sound is switched on anyway."
|
||||
myconf="${myconf} --with-sound"
|
||||
else
|
||||
myconf="${myconf} $(use_with sound)"
|
||||
fi
|
||||
|
||||
if use X; then
|
||||
myconf="${myconf} --with-x --without-ns"
|
||||
myconf="${myconf} $(use_with gconf)"
|
||||
myconf="${myconf} $(use_with gsettings)"
|
||||
myconf="${myconf} $(use_with toolkit-scroll-bars)"
|
||||
myconf="${myconf} $(use_with wide-int)"
|
||||
myconf="${myconf} $(use_with gif) $(use_with jpeg)"
|
||||
myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
|
||||
myconf="${myconf} $(use_with tiff) $(use_with xpm)"
|
||||
myconf="${myconf} $(use_with imagemagick)"
|
||||
|
||||
if use xft; then
|
||||
myconf="${myconf} --with-xft"
|
||||
myconf="${myconf} $(use_with m17n-lib libotf)"
|
||||
myconf="${myconf} $(use_with m17n-lib m17n-flt)"
|
||||
else
|
||||
myconf="${myconf} --without-xft"
|
||||
myconf="${myconf} --without-libotf --without-m17n-flt"
|
||||
use m17n-lib && ewarn \
|
||||
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
|
||||
fi
|
||||
|
||||
if use gtk; then
|
||||
einfo "Configuring to build with GIMP Toolkit (GTK+)"
|
||||
myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
|
||||
local f
|
||||
for f in athena Xaw3d motif; do
|
||||
use ${f} && ewarn "USE flag \"${f}\" ignored" \
|
||||
"(superseded by \"gtk\")"
|
||||
done
|
||||
elif use athena || use Xaw3d; then
|
||||
einfo "Configuring to build with Athena/Lucid toolkit"
|
||||
myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
|
||||
use motif && ewarn "USE flag \"motif\" ignored" \
|
||||
"(superseded by \"athena\" or \"Xaw3d\")"
|
||||
elif use motif; then
|
||||
einfo "Configuring to build with Motif toolkit"
|
||||
myconf="${myconf} --with-x-toolkit=motif"
|
||||
else
|
||||
einfo "Configuring to build with no toolkit"
|
||||
myconf="${myconf} --with-x-toolkit=no"
|
||||
fi
|
||||
|
||||
! use gtk && use gtk3 \
|
||||
&& ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
|
||||
elif use aqua; then
|
||||
einfo "Configuring to build with Cocoa support"
|
||||
myconf="${myconf} --with-ns --disable-ns-self-contained"
|
||||
myconf="${myconf} --without-x"
|
||||
else
|
||||
myconf="${myconf} --without-x --without-ns"
|
||||
fi
|
||||
|
||||
if [[ ${PV##*.} = 9999 ]]; then
|
||||
# These variables are not needed for building. We add them to
|
||||
# configure options because they are stored in the Emacs binary
|
||||
# and available in variable "system-configuration-options".
|
||||
myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
|
||||
fi
|
||||
|
||||
# According to configure, this option is only used for GNU/Linux
|
||||
# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
|
||||
# out the location because $(get_libdir) does not necessarily return
|
||||
# something that matches the host OS's libdir naming (e.g. RHEL).
|
||||
local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
|
||||
crtdir=${crtdir%/*}
|
||||
|
||||
econf \
|
||||
--program-suffix=-${EMACS_SUFFIX} \
|
||||
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
|
||||
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
|
||||
--with-crt-dir="${crtdir}" \
|
||||
--with-gameuser="${GAMES_USER_DED:-games}" \
|
||||
--without-compress-info \
|
||||
--disable-maintainer-mode \
|
||||
$(use_with hesiod) \
|
||||
$(use_with kerberos) $(use_with kerberos kerberos5) \
|
||||
$(use_with gpm) \
|
||||
$(use_with dbus) \
|
||||
$(use_with gnutls) \
|
||||
$(use_with libxml2 xml2) \
|
||||
$(use_with selinux) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
|
||||
if [[ ${PV##*.} = 9999 ]]; then
|
||||
emake CC="$(tc-getCC)" bootstrap
|
||||
# cleanup, otherwise emacs will be dumped again in src_install
|
||||
(cd src; emake versionclean)
|
||||
fi
|
||||
# set last component of emacs-version to (package revision + 1)
|
||||
touch src/emacs-${FULL_VERSION}.${PR#r}
|
||||
emake CC="$(tc-getCC)"
|
||||
}
|
||||
|
||||
src_install () {
|
||||
local i m
|
||||
|
||||
emake install DESTDIR="${D}"
|
||||
|
||||
rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
|
||||
|| die "removing duplicate emacs executable failed"
|
||||
mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
|
||||
|| die "moving Emacs executable failed"
|
||||
|
||||
# move man pages to the correct place
|
||||
for m in "${ED}"/usr/share/man/man1/* ; do
|
||||
mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
|
||||
done
|
||||
|
||||
# move info dir to avoid collisions with the dir file generated by portage
|
||||
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
|
||||
|| die "moving info dir failed"
|
||||
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
|
||||
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
|
||||
|
||||
# avoid collision between slots, see bug #169033 e.g.
|
||||
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
|
||||
rm -rf "${ED}"/usr/share/{applications,icons}
|
||||
rm "${ED}"/var/lib/games/emacs/{snake,tetris}-scores
|
||||
keepdir /var/lib/games/emacs
|
||||
|
||||
# remove unused <version>/site-lisp dir
|
||||
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
|
||||
|
||||
local c=";;"
|
||||
if use source; then
|
||||
insinto /usr/share/emacs/${FULL_VERSION}/src
|
||||
# This is not meant to install all the source -- just the
|
||||
# C source you might find via find-function
|
||||
doins src/*.{c,h,m}
|
||||
doins -r src/{m,s}
|
||||
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
|
||||
c=""
|
||||
fi
|
||||
|
||||
sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF
|
||||
X
|
||||
;;; ${PN}-${SLOT} site-lisp configuration
|
||||
X
|
||||
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
|
||||
X ${c}(setq find-function-C-source-directory
|
||||
X ${c} "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src")
|
||||
X (let ((path (getenv "INFOPATH"))
|
||||
X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
|
||||
X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
|
||||
X (and path
|
||||
X ;; move Emacs Info dir before anything else in /usr/share/info
|
||||
X (let* ((p (cons nil (split-string path ":" t))) (q p))
|
||||
X (while (and (cdr q) (not (string-match re (cadr q))))
|
||||
X (setq q (cdr q)))
|
||||
X (setcdr q (cons dir (delete dir (cdr q))))
|
||||
X (setq Info-directory-list (prune-directory-list (cdr p)))))))
|
||||
EOF
|
||||
elisp-site-file-install "${T}/${SITEFILE}" || die
|
||||
|
||||
dodoc README BUGS
|
||||
|
||||
if use aqua; then
|
||||
dodir /Applications/Gentoo
|
||||
rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
|
||||
mv nextstep/Emacs.app \
|
||||
"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
|
||||
elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
|
||||
elog "You may want to copy or symlink it into /Applications by yourself."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# move Info dir file to correct name
|
||||
local infodir=/usr/share/info/${EMACS_SUFFIX} f
|
||||
if [[ -f ${ED}${infodir}/dir.orig ]]; then
|
||||
mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
|
||||
else
|
||||
# this should not happen in EAPI 4
|
||||
ewarn "Regenerating Info directory index in ${infodir} ..."
|
||||
rm -f "${ED}"${infodir}/dir{,.*}
|
||||
for f in "${ED}"${infodir}/*; do
|
||||
if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
|
||||
install-info --info-dir="${ED}"${infodir} "${f}" \
|
||||
|| die "install-info failed"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
local f
|
||||
for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
|
||||
[[ -e ${f} ]] || touch "${f}"
|
||||
done
|
||||
chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs
|
||||
|
||||
elisp-site-regen
|
||||
eselect emacs update ifunset
|
||||
|
||||
if use X; then
|
||||
elog "You need to install some fonts for Emacs."
|
||||
elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
|
||||
elog "machine would satisfy basic Emacs requirements under X11."
|
||||
elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
|
||||
elog "for how to enable anti-aliased fonts."
|
||||
elog
|
||||
fi
|
||||
|
||||
elog "You can set the version to be started by /usr/bin/emacs through"
|
||||
elog "the Emacs eselect module, which also redirects man and info pages."
|
||||
elog "Therefore, several Emacs versions can be installed at the same time."
|
||||
elog "\"man emacs.eselect\" for details."
|
||||
elog
|
||||
elog "If you upgrade from a previous major version of Emacs, then it is"
|
||||
elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
|
||||
elog "all byte-compiled elisp files of the installed Emacs packages."
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
elisp-site-regen
|
||||
eselect emacs update ifunset
|
||||
}
|
||||
@ -1,9 +1,29 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA512
|
||||
|
||||
AUX openscap-0.7.1-sql-fix.patch 1122 RMD160 0a98b86f864b3990c97769141a12f78557046883 SHA1 0058400cf127afd688d065c43b5ff22d6cf0f1c6 SHA256 3918480e8c038490101336bbf46d0db91323d5284e168a4f1e270866c263e3a2
|
||||
DIST openscap-0.7.3.tar.gz 4264040 RMD160 fd2ba5173a23a0df09f641e0630b874d4c5a13dc SHA1 184888158542125c5d9587f375805080a8dc63e4 SHA256 7364f98182891ef6a81674c766cbdc4c53cf86543da2245450f09e43f8987793
|
||||
DIST openscap-0.7.4.tar.gz 4379825 RMD160 b7fe0273a1a6eec8c1dd6f5ffa776ada36ac896a SHA1 9c9d2aa5adb4fb76b27e1de3f641ab98f94ce87d SHA256 a0fb267f02ea9426f4fe8289b85c1cb2ac0dac6e700eccde0eed3b14bdcf0038
|
||||
AUX test_probes_interface.patch 387 RMD160 39a9774aefff83c14c4ab2a68d7fa1a02a57f140 SHA1 e16f915682595b21e0edac2c02ab37275e29ca29 SHA256 b09eb7d712e1aef4d1cd7de59962824b01572e8cca9c41db5f3df6fa11cc5c4c
|
||||
AUX test_probes_process.patch 458 RMD160 61212bbd50306c7cdcb986ee786f0f00d11857e5 SHA1 1fead6859ded04f27abd07f7c999045be5606c74 SHA256 44b47dfce6b0ac96e29430ad3e43257e4797dc8937bb9b63ecc8e1c979c0ba59
|
||||
DIST openscap-0.8.0.tar.gz 4473555 RMD160 835506335d0e422783d5fbf71b3a43a407bfdba5 SHA1 826df8826e38e0eb3d5cbed57662577101897061 SHA256 9755ad0ff58354fc50436ee88d605cc7d5e7f06816ff8c972db1272c44d2bc33
|
||||
EBUILD openscap-0.7.3.ebuild 1747 RMD160 4bea04b6c700c84594fccfa89e68097b8037865a SHA1 8c4c88a16bcd6912183602dc0a830b9a7b4dda14 SHA256 c477d1381da5be52b9ac41ca44d58fd4c99e242e31de98091f30a47ea288a888
|
||||
EBUILD openscap-0.7.4.ebuild 1747 RMD160 c464d7db1152e71d261c132daabb9565b7528288 SHA1 322fd66a4cc67b6a7133fd9349850a036e264833 SHA256 93c8bd09f8a8bc0bf884da3f9a6a98d25d0e861a007b45937ad1ae7d5b8b9e03
|
||||
DIST openscap-0.8.2.tar.gz 4524453 RMD160 06f4a08c9145a09f35b7c82e855922f547a247cb SHA1 a0a6e2b805497cb8ae9879674dd591e8bec90fa9 SHA256 fe7d6b3f20c08feef5c70ff3a02b752b593a8d8a3b3d1302d8e31fe0c29cce11
|
||||
EBUILD openscap-0.8.0.ebuild 2482 RMD160 f5cfc2dbeedba684363c8f20e9483c1dbe90b625 SHA1 643c59e571efc6ccf069e79bdfaa472edc7233c0 SHA256 5de57427c774574ae719652f084ac072a6c4c0eb177025e8b56a7cd8540af9e5
|
||||
MISC ChangeLog 2444 RMD160 df4094ed6d6b1b09963d2bff2405fecb16c7164f SHA1 f73e92081f6e0935d585bba7ead782798851a61e SHA256 e9b11335ffbc45939d24ae60dbac8a4b2fafb9a98feba5973db4289b12a1ae0f
|
||||
EBUILD openscap-0.8.2.ebuild 3522 RMD160 e84b9941ef9d5eacdfcf391ecc80b9e0ae345105 SHA1 b3d552e8805a1f1b023bfee5029c98892f1fe436 SHA256 3cba73aa789f38ed97b700ed598172c06f2e771ce4c34d8846ff8d993dba0d2e
|
||||
MISC ChangeLog 2759 RMD160 58b4400a83accd450cb2d6f523c44229733a1020 SHA1 8a68705137c88f0bd4411b498b3077d4d06d7835 SHA256 e134dcf1f64516c56d1f71a3196fd2e45253556277ecccc007fbe3bcee37626f
|
||||
MISC metadata.xml 690 RMD160 70288627b4da157c34d478ef77a331037be21428 SHA1 c0950ee1c531d606fbfaabfb71d6c3dd71dc045b SHA256 c826790db1cf53df236c92afe8bfbf530a6352195aebe16036eaa58366abbeb5
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
iQIcBAEBCgAGBQJPu/xwAAoJEPqDWhW0r/LCSCEP/jJHVsikJ0FbUjYo2GHE+Lm5
|
||||
fm+XZZYvlUgFBqgb9p/dcuS2+erMW0Kg3hXcGAXMpz0uVDZtInCHO+2TMaltDZRw
|
||||
1rTP+tgq2to44rQXSNZ24nahpglvptmKtodwuRr+GRKYgDwDH1mk6sBvXT2T0035
|
||||
tl1MVm9BFYk3X//b+7z7y5w60xxsXCDVvifLBQ4YdS0qFOUbik4fhRdSYsraeat1
|
||||
qg5vL26RzqLYx7M5u9ZpELCaYRtbpg80lhOIrxOQCmQXuneYyJO5eqWJYAylYlrB
|
||||
y8sUQcPu29Y4r3zQ4LHrnW1spmj09ZMadbfYBzApM3Re1Ym1TT8JjYBUE1guj1yf
|
||||
LZlJU5ZCLcuEPcgLt6O81JCAVBlUZuf+ZPuG7FhSS6pUujNv4oZbHVddP7haXLxy
|
||||
6xK9VHaPyW2E/3OnoO2mrs23owO2SEmGe2gTpzpIJcBWAIdQkXeT+iaw1gXIXsYc
|
||||
R0A1jZLMEE/bT/3MmpFZY2ecICy2lk5+MzH/H4HW+jD/yTFBpK4CRw0L6/3YaOGv
|
||||
uQAwEjJGuGxIThpHGQ26yBCivUp0v081hlbOadGFT2Hwmd4V0fyvpHjcgEx7ptpb
|
||||
9Hl8/XzQauQ/ZlYSUqf4G40U+j3/5Gu8edDQ53mFzlWnZT8gfVl/PgevBh6bJbpr
|
||||
ItPVcDFhT9t1NFbUBKSk
|
||||
=1d8m
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- tests/probes/interface/test_probes_interface.sh.orig 2012-04-05 14:41:53.846540789 +0200
|
||||
+++ tests/probes/interface/test_probes_interface.sh 2012-04-05 14:42:41.141285232 +0200
|
||||
@@ -22,6 +22,8 @@
|
||||
local DF="test_probes_interface.xml"
|
||||
local RF="results.xml"
|
||||
|
||||
+ require "ipcalc" || return 255
|
||||
+
|
||||
[ -f $RF ] && rm -f $RF
|
||||
|
||||
if [ ! -x test_probes_interface ]; then
|
||||
@ -0,0 +1,10 @@
|
||||
--- tests/probes/process/test_probes_process.xml.sh.orig 2012-04-05 15:49:38.746901398 +0200
|
||||
+++ tests/probes/process/test_probes_process.xml.sh 2012-04-05 15:50:02.330775903 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
-TMP_P=(`LD_PRELOAD= ps -A -o pid -o ppid -o comm | awk '$1 != 2 && $2 != 2 {print $3}' | \
|
||||
+TMP_P=(`LD_PRELOAD= ps -A -o pid -o ppid -o comm | grep -v '\[' | awk '$1 != 2 && $2 != 2 {print $3}' | \
|
||||
sed -n '2,30p'`)
|
||||
|
||||
COUNTER=1
|
||||
@ -1,70 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.7.3.ebuild,v 1.4 2011/08/21 03:40:45 phajdan.jr Exp $
|
||||
|
||||
EAPI=3
|
||||
|
||||
PYTHON_DEPEND="2"
|
||||
|
||||
inherit eutils multilib python bash-completion
|
||||
|
||||
DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
|
||||
HOMEPAGE="http://www.open-scap.org/"
|
||||
SRC_URI="http://www.open-scap.org/download/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="bash-completion doc nss perl python sql"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="!nss? ( dev-libs/libgcrypt )
|
||||
nss? ( dev-libs/nss )
|
||||
sql? ( dev-db/opendbx )
|
||||
dev-libs/libpcre
|
||||
dev-libs/libxml2
|
||||
dev-libs/libxslt
|
||||
net-misc/curl"
|
||||
DEPEND="${RDEPEND}
|
||||
perl? ( dev-lang/swig )
|
||||
python? ( dev-lang/swig )"
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
if use python || use perl ; then
|
||||
myconf+=" --enable-bindings"
|
||||
else
|
||||
myconf+=" --disable-bindings"
|
||||
fi
|
||||
if use nss ; then
|
||||
myconf+=" --with-crypto=nss3"
|
||||
else
|
||||
myconf+=" --with-crypto=gcrypt"
|
||||
fi
|
||||
econf ${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}" || die
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
sed -i 's/^Description/&:/' ${D}/usr/$(get_libdir)/pkgconfig/libopenscap.pc || die
|
||||
#--enable-bindings enable all bindings, clean unwanted bindings
|
||||
if use python && ! use perl ; then
|
||||
rm -rf "${D}"/usr/$(get_libdir)/perl5 || die
|
||||
fi
|
||||
if ! use python && use perl ; then
|
||||
rm -rf "${D}"/$(python_get_sitedir) || die
|
||||
fi
|
||||
if use doc ; then
|
||||
dohtml -r docs/html/* || die
|
||||
dodoc docs/examples/* || die
|
||||
fi
|
||||
if ! use bash-completion ; then
|
||||
rm -rf "${D}"/etc/bash_completion.d || die
|
||||
fi
|
||||
}
|
||||
@ -1,70 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.7.4.ebuild,v 1.1 2011/08/19 18:23:13 hwoarang Exp $
|
||||
|
||||
EAPI=3
|
||||
|
||||
PYTHON_DEPEND="2"
|
||||
|
||||
inherit eutils multilib python bash-completion
|
||||
|
||||
DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
|
||||
HOMEPAGE="http://www.open-scap.org/"
|
||||
SRC_URI="http://www.open-scap.org/download/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="bash-completion doc nss perl python sql"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND="!nss? ( dev-libs/libgcrypt )
|
||||
nss? ( dev-libs/nss )
|
||||
sql? ( dev-db/opendbx )
|
||||
dev-libs/libpcre
|
||||
dev-libs/libxml2
|
||||
dev-libs/libxslt
|
||||
net-misc/curl"
|
||||
DEPEND="${RDEPEND}
|
||||
perl? ( dev-lang/swig )
|
||||
python? ( dev-lang/swig )"
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
if use python || use perl ; then
|
||||
myconf+=" --enable-bindings"
|
||||
else
|
||||
myconf+=" --disable-bindings"
|
||||
fi
|
||||
if use nss ; then
|
||||
myconf+=" --with-crypto=nss3"
|
||||
else
|
||||
myconf+=" --with-crypto=gcrypt"
|
||||
fi
|
||||
econf ${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}" || die
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
sed -i 's/^Description/&:/' ${D}/usr/$(get_libdir)/pkgconfig/libopenscap.pc || die
|
||||
#--enable-bindings enable all bindings, clean unwanted bindings
|
||||
if use python && ! use perl ; then
|
||||
rm -rf "${D}"/usr/$(get_libdir)/perl5 || die
|
||||
fi
|
||||
if ! use python && use perl ; then
|
||||
rm -rf "${D}"/$(python_get_sitedir) || die
|
||||
fi
|
||||
if use doc ; then
|
||||
dohtml -r docs/html/* || die
|
||||
dodoc docs/examples/* || die
|
||||
fi
|
||||
if ! use bash-completion ; then
|
||||
rm -rf "${D}"/etc/bash_completion.d || die
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,104 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.8.2.ebuild,v 1.1 2012/05/22 20:51:55 hwoarang Exp $
|
||||
|
||||
EAPI=3
|
||||
|
||||
PYTHON_DEPEND="2"
|
||||
|
||||
inherit eutils multilib python bash-completion-r1
|
||||
|
||||
DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
|
||||
HOMEPAGE="http://www.open-scap.org/"
|
||||
SRC_URI="https://fedorahosted.org/releases/o/p/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="bash-completion doc nss perl python rpm selinux sql test"
|
||||
#RESTRICT="test"
|
||||
|
||||
RDEPEND="!nss? ( dev-libs/libgcrypt )
|
||||
nss? ( dev-libs/nss )
|
||||
rpm? ( >=app-arch/rpm-4.9 )
|
||||
sql? ( dev-db/opendbx )
|
||||
dev-libs/libpcre
|
||||
dev-libs/libxml2
|
||||
dev-libs/libxslt
|
||||
net-misc/curl"
|
||||
DEPEND="${RDEPEND}
|
||||
perl? ( dev-lang/swig )
|
||||
python? ( dev-lang/swig )
|
||||
test? (
|
||||
app-arch/unzip
|
||||
net-misc/ipcalc
|
||||
sys-apps/grep )"
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
|
||||
sed -i 's,/etc/rc.d/init.d,/etc/init.d,' src/OVAL/probes/unix/runlevel.c || die
|
||||
#problem sent upstream https://fedorahosted.org/openscap/ticket/45
|
||||
sed -i 's,unzip,\$1,' tests/test_common.sh || die
|
||||
#problem sent upstream https://fedorahosted.org/openscap/ticket/46
|
||||
epatch ${FILESDIR}/test_probes_interface.patch || die
|
||||
# runlevel isnt supported on gentoo
|
||||
sed -i 's,probecheck "runlevel,probecheck "runlevellllll,' tests/probes/runlevel/test_probes_runlevel.sh || die
|
||||
#According to comment of theses tests, we must modify it. For the moment disable it
|
||||
sed -i 's,.*linux-def_inetlisteningservers_test,#&,' tests/mitre/test_mitre.sh || die
|
||||
sed -i 's,.*ind-def_environmentvariable_test,#&,' tests/mitre/test_mitre.sh || die
|
||||
#This test fail when testing process with [] in names https://fedorahosted.org/openscap/ticket/47
|
||||
epatch ${FILESDIR}/test_probes_process.patch || die
|
||||
|
||||
if ! use rpm ; then
|
||||
sed -i 's,probe_rpminfo_req_deps_ok=yes,probe_rpminfo_req_deps_ok=no,' configure || die
|
||||
sed -i 's,probe_rpminfo_opt_deps_ok=yes,probe_rpminfo_opt_deps_ok=no,' configure || die
|
||||
sed -i 's,probe_rpmverify_req_deps_ok=yes,probe_rpmverify_req_deps_ok=no,' configure || die
|
||||
sed -i 's,probe_rpmverify_opt_deps_ok=yes,probe_rpmverify_opt_deps_ok=no,' configure || die
|
||||
sed -i 's,^probe_rpm.*_deps_missing=,&disabled by USE flag,' configure || die
|
||||
sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
|
||||
fi
|
||||
if ! use selinux ; then
|
||||
sed -i 's,.*selinux.*,#&,' tests/mitre/test_mitre.sh || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
if use python || use perl ; then
|
||||
myconf+=" --enable-bindings"
|
||||
else
|
||||
myconf+=" --disable-bindings"
|
||||
fi
|
||||
if use nss ; then
|
||||
myconf+=" --with-crypto=nss3"
|
||||
else
|
||||
myconf+=" --with-crypto=gcrypt"
|
||||
fi
|
||||
econf ${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}" || die
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
sed -i 's/^Description/&:/' "${D}"/usr/$(get_libdir)/pkgconfig/libopenscap.pc || die
|
||||
#--enable-bindings enable all bindings, clean unwanted bindings
|
||||
if use python && ! use perl ; then
|
||||
rm -rf "${D}"/usr/$(get_libdir)/perl5 || die
|
||||
fi
|
||||
if ! use python && use perl ; then
|
||||
rm -rf "${D}"/$(python_get_sitedir) || die
|
||||
fi
|
||||
if use doc ; then
|
||||
dohtml -r docs/html/* || die
|
||||
dodoc docs/examples/* || die
|
||||
fi
|
||||
if use bash-completion ; then
|
||||
dobashcomp "${D}"/etc/bash_completion.d/oscap
|
||||
fi
|
||||
rm -rf "${D}"/etc/bash_completion.d || die
|
||||
}
|
||||
@ -1,29 +1,37 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA512
|
||||
|
||||
AUX ovaldi-5.10.1.2-add-selinux-libs.patch 494 RMD160 2c9e67ee11cd3094d12788dd4a25e09370bb8e1b SHA1 9c3b0b85f1b8f2c9dceb44ad836c48e57d85f3b8 SHA256 7b2cc39e80170bb2418df7c98e3f46757f452f372f33b40adad8a3081a04bca8
|
||||
AUX ovaldi-5.10.1.2-disable-ldap-probes.patch 514 RMD160 d9f335c85bdba89272fdba201dad01db4f8b9b72 SHA1 cc1392b19ff925583705c8af9059d912784bb261 SHA256 fab78dc2e49a642337c85537199db797ebcc8d5dfe6bd2f977a7d3d43c2f646b
|
||||
AUX ovaldi-5.10.1.2-disable-selinux-probes.patch 3418 RMD160 98c21bcc8d0057b184c90d30a08d9d988401417f SHA1 d0f35753b2af88df54610234ce05c737b6739979 SHA256 0852abf008d39827dff195005df718233c122cfa86a47be27592ecbee1cb08fa
|
||||
AUX ovaldi-5.10.1.2-missing-memory-header.patch 703 RMD160 6688f6b8b8eba5c50055f73ec3744c12ac8db532 SHA1 329b149970902ed44ce1938414660971b91fca9f SHA256 145ba83c3000de0204d6b892702b490c1c592c0f47b4c8d20138a53623abfc1f
|
||||
AUX ovaldi-5.10.1.2-strnicmp.patch 292 RMD160 30058fc991df58e38be9b19855512602879d0136 SHA1 09f4ef19ba2dc009a45ff3b89e93dae6e9fd0cb6 SHA256 aa4a1f23df2fd4b8ed0456a23948cc597d0573eb1e9881f8a8f229b8778f6a54
|
||||
AUX ovaldi-5.10.1.2-xerces3.patch 13510 RMD160 c93dbde89c2d025f3b68a21446820b5c0a950bfb SHA1 ace15aef1a2456dd71f86dd44a3006f3541ff3e0 SHA256 7818b08cb2fe965b14a7732f26f36d4a2a67da70fdf050751b42834e95cac39e
|
||||
AUX ovaldi-5.9.1-disable-ldap-probes.patch 1237 RMD160 5c75a4eb790712f2a5e219035c3bd66b6437b7b4 SHA1 fe627c386fd1e9f299b7caa06b73fe3ac943cae6 SHA256 ca8846757488a75d434a4cc909a96de44cf4b8f6d8f7950c2938630668bbde6a
|
||||
AUX ovaldi-5.9.1-strnicmp.patch 292 RMD160 30058fc991df58e38be9b19855512602879d0136 SHA1 09f4ef19ba2dc009a45ff3b89e93dae6e9fd0cb6 SHA256 aa4a1f23df2fd4b8ed0456a23948cc597d0573eb1e9881f8a8f229b8778f6a54
|
||||
AUX ovaldi-5.9.1-xerces3.patch 12336 RMD160 501377cc5cbe1256a72bf2cd0be8a67943aca50e SHA1 024a2860faf0783c728d468fbe77dd6dc0da5a2f SHA256 70754174e4d390663b79b0dc070eba536d2868ce5b68aae1632e805a52b0e0f0
|
||||
AUX rpmdb.patch 2131 RMD160 eab0ea48e95ae7d278b80b555a73ca456ac07703 SHA1 ae06d023162d19019f27fdbbc9476fcf57d10cad SHA256 d40775d272b8aed6062b983640cf4c0a330a9d318012b922099eeb04d4c1d131
|
||||
AUX use_local_rpmdb.patch 429 RMD160 4a8f35be13522873bcfc5e03842964e84fc557b0 SHA1 70fe83d0f9f1c8716a2a8afec70da94c9183b2be SHA256 e7956ab2c1de68b0c5284641a36136643aa5a6e12cfd8b6042f0484c1cba63cd
|
||||
DIST ovaldi-5.10.1.2-src.tar.bz2 14859172 RMD160 e9d6688610b97b4c3a31c4fabf738002ab409e01 SHA1 1119d253cc5e80272ca5acd1e03c3ef5f95aaae8 SHA256 2d00a1bc730f6635beebd52611ee30c914169626ef5adf68ff313295c483d319
|
||||
DIST ovaldi-5.9.1-src.tar.bz2 14745625 RMD160 ea01a73e0592c007a4611afff1a995ab617ed19b SHA1 7a7667cc2044df49c8413fc01946e00f6ee4a3a5 SHA256 40161ac64fd221543a19f178de283919be2dd7f513a6fb354f1440fe1bfb98e1
|
||||
EBUILD ovaldi-5.10.1.2.ebuild 2414 RMD160 08e5ccbf3ed7452f51beea98f91d18c69f52ef6b SHA1 5a91c573ca1fda5df53a35e73c2cae21d06b7f11 SHA256 a4cd65663769d4e699df17cd7a1945a3db0ac0c1b603e6ee59843ebf4041df44
|
||||
EBUILD ovaldi-5.9.1.ebuild 1862 RMD160 1f8f898a1f9b8552fddc96636db57975577beeae SHA1 2d6d04095b3b7e6150c57d8c53eddd4410e26932 SHA256 d4c7a6cdfe1957bf958a2d553bfdde2a8dfc6dede51286170506c39259dd6632
|
||||
MISC ChangeLog 767 RMD160 2a86f2ca2487521a105fab6b56d6349086b3c280 SHA1 109f632dfe42601483d8d0f19123f88340d05b80 SHA256 90f374946e0ca21998b88d1b12fe89b098261c33e4f30616391b05b214dc6ab7
|
||||
MISC ChangeLog 1238 RMD160 3f27c0c40f31ad284c6bdc1ba945eb68de8d2ab6 SHA1 f3b0758091b06fb2f4e5740ba45dfaaa05e1f253 SHA256 cb8c5d1f55a316326f476a13e7e0769ba893007787c20f4c31c3277483d849bd
|
||||
MISC metadata.xml 565 RMD160 4b6ef0c87213699f88a7c3a0f1233b23079bacc0 SHA1 7960569fb509a8aeccd8632ef8b8160e8f3d6140 SHA256 635243ac3f5b09dc36bd19708ba4e43152189bf63f19579b2f4ea5937a8569e6
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.18 (GNU/Linux)
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
iQIcBAEBCgAGBQJOVP+YAAoJEPqDWhW0r/LCFE8QAKMnHqXV5ARTsqCRdbjzslcm
|
||||
+toWyK++2Mpi4nEAok+zoEtccXYGgOq/tf8kgfHy/c3zK/EaPGRzEQ5WoFvuS+xB
|
||||
JOCpNxosHbDjMUo5xD6YzDZC/DStZL++9Uy29+W8Oh2/HnUMCSJHIEIfcDI0iPXR
|
||||
t9ggF1RCY/j/8Sc1tQOCQ2tH2XYi05BA/oc7NwwOPxAE8ZO4zHe5CLopr/nUWl/h
|
||||
OgknkCSzlNzVMvuJdup7MQ3QGUSnlGUGoKlNduHF/nWzQ6NDNtKxcp0Mtm+EHZ5C
|
||||
fHOxrX/LhagwSA17x3EJ9TLJGv6GZDnl7gnG0V8oerGIIUYUGeZppKEQHVZfRrjv
|
||||
r0mmP1hkvl3XCuDH9rUUH5bJsObiWVZw9VoGxfzBrh/uAPCTy3svZrc4mT9zKmUE
|
||||
AFVoIj9SxWb+9Pdi/pvirt5SmGtqEKIgO00bJi3puJALsrLUksEwpFZS3R0W50oE
|
||||
NaNZgyflWeIYO1po07+0r2nLS4Yp8PPtkmaM5dhBrBuwFXgdUAawgJHJrnxe6I8J
|
||||
jLPob9ZapR4Id4z39H6XbNkNmrw0bT3NAWXzlb+zmek+YQzJXlDjSM5QC+u0EHP0
|
||||
DoQLpW06MCett18OjjwA7tYRAmAqGE0b8tBhg3EFKoUVqutvj3l33QZMZ5upGmOT
|
||||
oDrEDlFhA5rb5fNe4ksF
|
||||
=LQAn
|
||||
iQIcBAEBCgAGBQJPu/0eAAoJEPqDWhW0r/LCHOAQAIPajW250I4kxdILdsd9G4hE
|
||||
2OXO/yW1aicEQ28S2ecry4mBxjkshskPe11hHGoEqjl2GFcNxa3y6gyb5eGMQ0Nu
|
||||
VlYK1IrDogg8J/YawZjW7u9Q4fQSzaN6ePOB3OgcWfXlm/Kb3TuaqyudNOwqIVAA
|
||||
VmzZ07wBi6XQrEppu/XiZhn59eaYJhNEtpqjhKJ/7kmnW04wdk3AHQvpr+J6UTqR
|
||||
KDTETJyGSWzPIaOZXE/4O7dYwCNej0VtS0OmBoEY8ZgN/u7kRyUEmlDUk3WHhCeo
|
||||
Rkyv7466N3omb+kVMbnsPynfWQOpbe5MoLJdw8LhVG8MvOUTRfZdsTN/twPwjVr2
|
||||
oz/rnzesq4O3iUnY0d+lStlhFZwQynJCYCugaUIx7uX33n9jTHrn9/NJgO4MQHlU
|
||||
So1k2sU6kgwDH2GOjhZ1vD3y2OpR+d4craa0aS1o+5cfXwOger6BjTvaEqLQJ/Jv
|
||||
zSEC5oqgmZjliTLJLhFEdOF+M2CF+fsWK0xpmLHK3OwFNVRcH1SpGUPVbXlZo5as
|
||||
MHDDgNhSMtGRN3XPQBbsboxjdfEuYAjlpYA+yr166CoiwCLxNtyu8oesu/sTD+v7
|
||||
9nb9Fj6lqh2RDnqd0+t3rRrIMv6HpZSSbvwdCD7YxXl4dORJy3TN3BNJnLucS/EF
|
||||
FjpXcsn5CFcc7cXUzvpv
|
||||
=5boT
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- project/linux/Makefile.orig 2012-01-02 12:08:20.400871287 +0100
|
||||
+++ project/linux/Makefile 2012-01-02 12:08:48.966488826 +0100
|
||||
@@ -50,7 +50,7 @@
|
||||
LIBDIR = -L/usr/local/lib -L/usr/lib
|
||||
|
||||
# What libraries do we need?
|
||||
-LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt -lblkid
|
||||
+LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt -lblkid -lsepol -lselinux
|
||||
|
||||
# Determine what package management system is being used
|
||||
#PACKAGE_RPM = $(shell /usr/bin/env rpm --version 2>/dev/null)
|
||||
@ -0,0 +1,11 @@
|
||||
--- src/linux/ProbeFactory.cpp 2010-12-10 13:37:00.019140703 +0100
|
||||
+++ src/linux/ProbeFactory.cpp 2010-08-27 21:23:41.000000000 +0200
|
||||
@@ -61,8 +61,6 @@
|
||||
probe = XmlFileContentProbe::Instance();
|
||||
} else if(objectName.compare("textfilecontent54_object") == 0) {
|
||||
probe = TextFileContent54Probe::Instance();
|
||||
- } else if(objectName.compare("ldap_object") == 0) {
|
||||
- probe = LDAPProbe::Instance();
|
||||
|
||||
// here are the objects defined in the unix schema
|
||||
} else if(objectName.compare("file_object") == 0) {
|
||||
@ -0,0 +1,94 @@
|
||||
--- ./src/linux/ProbeFactory.cpp.old 2011-08-18 14:45:11.314556346 +0200
|
||||
+++ ./src/linux/ProbeFactory.cpp 2011-08-18 14:45:23.151011753 +0200
|
||||
@@ -101,10 +101,6 @@
|
||||
#endif
|
||||
} else if (objectName.compare("partition_object") == 0) {
|
||||
probe = PartitionProbe::Instance();
|
||||
- } else if (objectName.compare("selinuxsecuritycontext_object") == 0) {
|
||||
- probe = SelinuxSecurityContextProbe::Instance();
|
||||
- } else if (objectName.compare("selinuxboolean_object") == 0) {
|
||||
- probe = SelinuxBooleanProbe::Instance();
|
||||
} else if (objectName.compare("iflisteners_object") == 0) {
|
||||
probe = IfListenersProbe::Instance();
|
||||
} else {
|
||||
--- src/linux/ProbeFactory.h.old 2011-08-18 14:47:23.226501075 +0200
|
||||
+++ src/linux/ProbeFactory.h 2011-08-18 14:47:34.183998019 +0200
|
||||
@@ -71,8 +71,6 @@
|
||||
#include "InetdProbe.h"
|
||||
|
||||
#include "PartitionProbe.h"
|
||||
-#include "SelinuxSecurityContextProbe.h"
|
||||
-#include "SelinuxBooleanProbe.h"
|
||||
#include "IfListenersProbe.h"
|
||||
|
||||
class AbsProbe;
|
||||
--- src/probes/unix/Process58Probe.cpp.old 2012-05-22 10:09:52.980828398 +0200
|
||||
+++ src/probes/unix/Process58Probe.cpp 2012-05-22 10:11:06.266468168 +0200
|
||||
@@ -29,10 +29,10 @@
|
||||
//****************************************************************************************//
|
||||
|
||||
#ifdef LINUX
|
||||
-# include <selinux/selinux.h>
|
||||
-# include <selinux/context.h>
|
||||
+/*# include <selinux/selinux.h>
|
||||
+# include <selinux/context.h>*/
|
||||
# include <sys/capability.h>
|
||||
-# include <SecurityContextGuard.h>
|
||||
+/*# include <SecurityContextGuard.h>*/
|
||||
#endif
|
||||
|
||||
#include <fstream>
|
||||
@@ -328,7 +328,7 @@
|
||||
pid_t sessionId;
|
||||
uid_t loginuid;
|
||||
uint64_t effCap, *effCapp=&effCap;
|
||||
- string selinuxDomainLabel;
|
||||
+/* string selinuxDomainLabel;*/
|
||||
|
||||
Process58Probe::ProcStatus statStatus, statusStatus, ttyStatus, loginuidStatus;
|
||||
|
||||
@@ -423,10 +423,10 @@
|
||||
}
|
||||
|
||||
// this one doesn't require reading anything in /proc
|
||||
- if (!RetrieveSelinuxDomainLabel(pid, &selinuxDomainLabel, &errMsg)) {
|
||||
+/* if (!RetrieveSelinuxDomainLabel(pid, &selinuxDomainLabel, &errMsg)) {
|
||||
item->AppendMessage(new OvalMessage(errMsg, OvalEnum::LEVEL_ERROR));
|
||||
item->SetStatus(OvalEnum::STATUS_ERROR);
|
||||
- }
|
||||
+ }*/
|
||||
|
||||
// The Linux start time is represented as the number of jiffies (1/100 sec)
|
||||
// that the application was started after the last system reboot. To get an
|
||||
@@ -491,10 +491,10 @@
|
||||
// aren't any.
|
||||
item->AppendElement(new ItemEntity("posix_capability", "", OvalEnum::DATATYPE_STRING, false, OvalEnum::STATUS_ERROR));
|
||||
|
||||
- if (selinuxDomainLabel.empty())
|
||||
+/* if (selinuxDomainLabel.empty())*/
|
||||
item->AppendElement(new ItemEntity("selinux_domain_label", "", OvalEnum::DATATYPE_STRING, false, OvalEnum::STATUS_ERROR));
|
||||
- else
|
||||
- item->AppendElement(new ItemEntity("selinux_domain_label", selinuxDomainLabel));
|
||||
+/* else
|
||||
+ item->AppendElement(new ItemEntity("selinux_domain_label", selinuxDomainLabel));*/
|
||||
|
||||
if (statStatus == PROC_OK)
|
||||
item->AppendElement(new ItemEntity("session_id", Common::ToString(sessionId), OvalEnum::DATATYPE_INTEGER));
|
||||
@@ -709,7 +709,7 @@
|
||||
capMap[capEnum]));
|
||||
}
|
||||
}
|
||||
-
|
||||
+/*
|
||||
bool Process58Probe::RetrieveSelinuxDomainLabel(pid_t pid, string *label, string *err) {
|
||||
security_context_t sctx;
|
||||
int ec = getpidcon(pid, &sctx);
|
||||
@@ -732,7 +732,7 @@
|
||||
*label = tmp;
|
||||
return true;
|
||||
}
|
||||
-
|
||||
+*/
|
||||
#elif defined SUNOS
|
||||
|
||||
void Process58Probe::GetPSInfo(string command, string pidStr, ItemVector* items) {
|
||||
@ -0,0 +1,20 @@
|
||||
--- src/CountFunction.cpp.old 2012-01-02 11:37:27.113604532 +0100
|
||||
+++ src/CountFunction.cpp 2012-01-02 11:37:39.624998573 +0100
|
||||
@@ -29,6 +29,7 @@
|
||||
//****************************************************************************************//
|
||||
|
||||
#include <cstddef>
|
||||
+#include <memory>
|
||||
#include "CountFunction.h"
|
||||
#include "ComponentFactory.h"
|
||||
|
||||
--- src/UniqueFunction.cpp.orig 2012-01-02 11:39:58.564269070 +0100
|
||||
+++ src/UniqueFunction.cpp 2012-01-02 11:40:12.057615550 +0100
|
||||
@@ -29,6 +29,7 @@
|
||||
//****************************************************************************************//
|
||||
|
||||
#include <set>
|
||||
+#include <memory>
|
||||
#include "Common.h"
|
||||
#include "ComponentFactory.h"
|
||||
#include "UniqueFunction.h"
|
||||
@ -0,0 +1,11 @@
|
||||
--- src/Main.h.old 2010-10-22 14:59:13.000000000 +0200
|
||||
+++ src/Main.h 2010-10-22 14:59:38.000000000 +0200
|
||||
@@ -38,7 +38,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef LINUX
|
||||
-# define STRNICMP strnicmp
|
||||
+# define STRNICMP strncasecmp
|
||||
#elif defined SUNOS
|
||||
# define STRNICMP strncasecmp
|
||||
#elif defined DARWIN
|
||||
@ -0,0 +1,306 @@
|
||||
--- src/XmlProcessor.cpp.old 2011-08-18 14:51:20.311616357 +0200
|
||||
+++ src/XmlProcessor.cpp 2011-08-18 14:51:47.214381144 +0200
|
||||
@@ -35,7 +35,6 @@
|
||||
// for dom Writer
|
||||
#include <xercesc/dom/DOMImplementation.hpp>
|
||||
#include <xercesc/dom/DOMImplementationLS.hpp>
|
||||
-#include <xercesc/dom/DOMWriter.hpp>
|
||||
#include <xercesc/framework/StdOutFormatTarget.hpp>
|
||||
#include <xercesc/framework/LocalFileFormatTarget.hpp>
|
||||
#include <xercesc/util/XMLUni.hpp>
|
||||
@@ -53,8 +52,17 @@
|
||||
//****************************************************************************************//
|
||||
// DataDirResolver Class //
|
||||
//****************************************************************************************//
|
||||
-
|
||||
+#if XERCES_VERSION_MAJOR < 3
|
||||
DOMInputSource* DataDirResolver::resolveEntity (const XMLCh *const /*publicId*/, const XMLCh *const systemId, const XMLCh *const /*baseURI*/) {
|
||||
+#else
|
||||
+InputSource* DataDirResolver::resolveEntity(const XMLCh* publicId, const XMLCh* systemId)
|
||||
+{
|
||||
+ return NULL;
|
||||
+ //return DataDirResolver::resolveEntity (publicId, systemId, NULL);
|
||||
+}
|
||||
+
|
||||
+DOMLSInput* DataDirResolver::resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI) {
|
||||
+#endif
|
||||
string path = "";
|
||||
size_t last;
|
||||
string schemapath = Common::GetSchemaPath();
|
||||
@@ -104,13 +112,19 @@
|
||||
|
||||
try {
|
||||
XMLPlatformUtils::Initialize();
|
||||
+#if XERCES_VERSION_MAJOR < 3
|
||||
+#define SetParameter(parser,n,v) parser->setFeature(n,v)
|
||||
+#else
|
||||
+#define SetParameter(parser,n,v) parser->getDomConfig()->setParameter(n,v)
|
||||
+#endif
|
||||
|
||||
parser = makeParser();
|
||||
parserWithCallerAdoption = makeParser();
|
||||
// add one extra feature on this parser to prevent it from
|
||||
// taking ownership of its documents.
|
||||
- parserWithCallerAdoption->setFeature(XMLUni::fgXercesUserAdoptsDOMDocument, true);
|
||||
+ SetParameter(parserWithCallerAdoption, XMLUni::fgXercesUserAdoptsDOMDocument, true);
|
||||
|
||||
+#undef SetParameter
|
||||
} catch (const XMLException& toCatch) {
|
||||
string errMsg = "Error: An error occured durring initialization of the xml utilities:\n";
|
||||
errMsg.append(XmlCommon::ToString(toCatch.getMessage()));
|
||||
@@ -137,32 +151,55 @@
|
||||
|
||||
}
|
||||
|
||||
+#if XERCES_VERSION_MAJOR < 3
|
||||
DOMBuilder *XmlProcessor::makeParser() {
|
||||
+#else
|
||||
+DOMLSParser *XmlProcessor::makeParser() {
|
||||
+#endif
|
||||
// Instantiate the DOM parser.
|
||||
static const XMLCh gLS[] = { chLatin_L, chLatin_S, chNull };
|
||||
DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(gLS);
|
||||
|
||||
+#if XERCES_VERSION_MAJOR < 3
|
||||
DOMBuilder *parser = ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
|
||||
+#else
|
||||
+ DOMLSParser *parser = ((DOMImplementationLS*)impl)->createLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
|
||||
+#endif
|
||||
|
||||
///////////////////////////////////////////////////////
|
||||
// Set features on the builder
|
||||
///////////////////////////////////////////////////////
|
||||
|
||||
- parser->setFeature(XMLUni::fgDOMComments, false); // Discard Comment nodes in the document.
|
||||
- parser->setFeature(XMLUni::fgDOMDatatypeNormalization, true); // Let the validation process do its datatype normalization that is defined in the used schema language.
|
||||
- parser->setFeature(XMLUni::fgDOMNamespaces, true); // Perform Namespace processing
|
||||
- parser->setFeature(XMLUni::fgDOMValidation, true); // Report all validation errors.
|
||||
- parser->setFeature(XMLUni::fgXercesSchema, true); // Enable the parser's schema support.
|
||||
- parser->setFeature(XMLUni::fgXercesSchemaFullChecking, true); // Enable full schema constraint checking, including checking which may be time-consuming or memory intensive. Currently, particle unique attribution constraint checking and particle derivation restriction checking are controlled by this option.
|
||||
- parser->setFeature(XMLUni::fgXercesValidationErrorAsFatal, true); // The parser will treat validation error as fatal and will exit
|
||||
- parser->setFeature(XMLUni::fgXercesDOMHasPSVIInfo, true); // Enable storing of PSVI information in element and attribute nodes.
|
||||
+#if XERCES_VERSION_MAJOR < 3
|
||||
+#define SetParameter(parser,n,v) parser->setFeature(n,v)
|
||||
+#else
|
||||
+#define SetParameter(parser,n,v) parser->getDomConfig()->setParameter(n,v)
|
||||
+#endif
|
||||
+
|
||||
+ SetParameter(parser, XMLUni::fgDOMComments, false); // Discard Comment nodes in the document.
|
||||
+ SetParameter(parser, XMLUni::fgDOMDatatypeNormalization, true); // Let the validation process do its datatype normalization that is defined in the used schema language.
|
||||
+ SetParameter(parser, XMLUni::fgDOMNamespaces, true); // Perform Namespace processing
|
||||
+#if XERCES_VERSION_MAJOR < 3
|
||||
+ SetParameter(parser, XMLUni::fgDOMValidation, true); // Report all validation errors.
|
||||
+#else
|
||||
+ SetParameter(parser, XMLUni::fgDOMValidate, true); // Report all validation errors.
|
||||
+#endif
|
||||
+ SetParameter(parser, XMLUni::fgXercesSchema, true); // Enable the parser's schema support.
|
||||
+ SetParameter(parser, XMLUni::fgXercesSchemaFullChecking, true); // Enable full schema constraint checking, including checking which may be time-consuming or memory intensive. Currently, particle unique attribution constraint checking and particle derivation restriction checking are controlled by this option.
|
||||
+ SetParameter(parser, XMLUni::fgXercesValidationErrorAsFatal, true); // The parser will treat validation error as fatal and will exit
|
||||
+ SetParameter(parser, XMLUni::fgXercesDOMHasPSVIInfo, true); // Enable storing of PSVI information in element and attribute nodes.
|
||||
+#undef SetParameter
|
||||
|
||||
///////////////////////////////////////////////////////
|
||||
//****************************************************************************************//
|
||||
// The following code was added to handle air-gap operation //
|
||||
//****************************************************************************************//
|
||||
/* Look for XML schemas in local directory instead of Internet */
|
||||
+#if XERCES_VERSION_MAJOR < 3
|
||||
parser->setEntityResolver (&resolver);
|
||||
+#else
|
||||
+ parser->getDomConfig()->setParameter(XMLUni::fgXercesEntityResolver, &resolver);
|
||||
+#endif
|
||||
//****************************************************************************************//
|
||||
// End of air-gap code //
|
||||
//****************************************************************************************//
|
||||
@@ -170,7 +207,11 @@
|
||||
///////////////////////////////////////////////////////
|
||||
// Add an Error Handler
|
||||
///////////////////////////////////////////////////////
|
||||
+#if XERCES_VERSION_MAJOR < 3
|
||||
parser->setErrorHandler(&errHandler);
|
||||
+#else
|
||||
+ parser->getDomConfig()->setParameter(XMLUni::fgDOMErrorHandler, &errHandler);
|
||||
+#endif
|
||||
|
||||
return parser;
|
||||
}
|
||||
@@ -250,24 +291,26 @@
|
||||
XMLCh tempStr[100];
|
||||
XMLString::transcode("LS", tempStr, 99);
|
||||
DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(tempStr);
|
||||
+#if XERCES_VERSION_MAJOR < 3
|
||||
DOMWriter *theSerializer = ((DOMImplementationLS*)impl)->createDOMWriter();
|
||||
+#else
|
||||
+ DOMLSSerializer *theSerializer = ((DOMImplementationLS*)impl)->createLSSerializer();
|
||||
+#endif
|
||||
+
|
||||
+#if XERCES_VERSION_MAJOR < 3
|
||||
+#define SetParameter(serializer,n,v) if (serializer->canSetFeature(n,v)) serializer->setFeature(n,v)
|
||||
+#else
|
||||
+#define SetParameter(serializer,n,v) if (serializer->getDomConfig()->canSetParameter(n,v)) serializer->getDomConfig()->setParameter(n,v)
|
||||
+#endif
|
||||
|
||||
// set feature if the serializer supports the feature/mode
|
||||
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTSplitCdataSections, true))
|
||||
- theSerializer->setFeature(XMLUni::fgDOMWRTSplitCdataSections, true);
|
||||
-
|
||||
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true))
|
||||
- theSerializer->setFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true);
|
||||
-
|
||||
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true))
|
||||
- theSerializer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true);
|
||||
-
|
||||
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTBOM, false))
|
||||
- theSerializer->setFeature(XMLUni::fgDOMWRTBOM, false);
|
||||
-
|
||||
- //if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true))
|
||||
- // theSerializer->setFeature(XMLUni::fgDOMWRTBOM, true);
|
||||
+ SetParameter(theSerializer, XMLUni::fgDOMWRTSplitCdataSections, true);
|
||||
+ SetParameter(theSerializer, XMLUni::fgDOMWRTDiscardDefaultContent, true);
|
||||
+ SetParameter(theSerializer, XMLUni::fgDOMWRTFormatPrettyPrint, true);
|
||||
+ SetParameter(theSerializer, XMLUni::fgDOMWRTBOM, false);
|
||||
+ //SetParameter(theSerializer, XMLUni::fgDOMWRTBOM, true);
|
||||
|
||||
+#undef SetParameter
|
||||
//
|
||||
// Plug in a format target to receive the resultant
|
||||
// XML stream from the serializer.
|
||||
@@ -284,7 +327,13 @@
|
||||
//
|
||||
// do the serialization through DOMWriter::writeNode();
|
||||
//
|
||||
+#if XERCES_VERSION_MAJOR < 3
|
||||
theSerializer->writeNode(myFormTarget, *doc);
|
||||
+#else
|
||||
+ DOMLSOutput *output = ((DOMImplementationLS*)impl)->createLSOutput();
|
||||
+ output->setByteStream(myFormTarget);
|
||||
+ theSerializer->write(doc, output);
|
||||
+#endif
|
||||
|
||||
theSerializer->release();
|
||||
delete myFormTarget;
|
||||
--- src/XmlProcessor.h.old 2011-08-18 14:35:41.608703233 +0200
|
||||
+++ src/XmlProcessor.h 2011-08-18 14:39:21.835597094 +0200
|
||||
@@ -38,14 +38,17 @@
|
||||
#include <string>
|
||||
|
||||
// required xerces includes
|
||||
-#include <xercesc/dom/DOMBuilder.hpp>
|
||||
#include <xercesc/dom/DOMDocument.hpp>
|
||||
#include <xercesc/dom/DOMErrorHandler.hpp>
|
||||
#include <xercesc/dom/DOMError.hpp>
|
||||
|
||||
// for entity resolver
|
||||
-#include <xercesc/dom/DOMEntityResolver.hpp>
|
||||
-#include <xercesc/dom/DOMInputSource.hpp>
|
||||
+
|
||||
+#include <xercesc/dom/DOMImplementationRegistry.hpp>
|
||||
+#include <xercesc/dom/DOMLSParser.hpp>
|
||||
+#include <xercesc/sax/EntityResolver.hpp>
|
||||
+#include <xercesc/sax/InputSource.hpp>
|
||||
+#include <xercesc/sax2/SAX2XMLReader.hpp>
|
||||
|
||||
#include "Exception.h"
|
||||
|
||||
@@ -53,12 +56,14 @@
|
||||
This class extends the default DOMEntityResolver and implments the resolve entity method
|
||||
to support
|
||||
*/
|
||||
-class DataDirResolver : public xercesc::DOMEntityResolver {
|
||||
+class DataDirResolver : public xercesc::EntityResolver {
|
||||
public:
|
||||
/**
|
||||
*
|
||||
*/
|
||||
- xercesc::DOMInputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
|
||||
+// xercesc::DOMInputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
|
||||
+ xercesc::InputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId);
|
||||
+ xercesc::DOMLSInput *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -135,7 +140,7 @@
|
||||
/**
|
||||
* Has the common code for creating an XML parser.
|
||||
*/
|
||||
- xercesc::DOMBuilder *makeParser();
|
||||
+ xercesc::DOMLSParser *makeParser();
|
||||
|
||||
static XmlProcessor* instance;
|
||||
|
||||
@@ -144,7 +149,7 @@
|
||||
* owns the documents it builds. Users must manually destroy
|
||||
* those documents.
|
||||
*/
|
||||
- xercesc::DOMBuilder *parserWithCallerAdoption;
|
||||
+ xercesc::DOMLSParser *parserWithCallerAdoption;
|
||||
|
||||
/**
|
||||
* This parser doesn't have user-adoption switched on, so it
|
||||
@@ -156,7 +161,7 @@
|
||||
* appear to ever be switched off. So to make sure this isn't
|
||||
* leaking memory, I have created separate parsers.
|
||||
*/
|
||||
- xercesc::DOMBuilder *parser;
|
||||
+ xercesc::DOMLSParser *parser;
|
||||
|
||||
/** The entity resolver for both parsers. */
|
||||
DataDirResolver resolver;
|
||||
--- src/probes/independent/XmlFileContentProbe.cpp.old 2010-10-22 14:49:22.000000000 +0200
|
||||
+++ src/probes/independent/XmlFileContentProbe.cpp 2010-10-22 14:51:39.000000000 +0200
|
||||
@@ -419,12 +419,24 @@
|
||||
return new DummyEntityResolver::DoNothingBinInputStream();
|
||||
}
|
||||
|
||||
+#if XERCES_VERSION_MAJOR < 3
|
||||
unsigned int DummyEntityResolver::DoNothingBinInputStream::curPos() const
|
||||
+#else
|
||||
+const XMLCh* DummyEntityResolver::DoNothingBinInputStream::getContentType() const
|
||||
+{
|
||||
+ return NULL;
|
||||
+}
|
||||
+XMLFilePos DummyEntityResolver::DoNothingBinInputStream::curPos() const
|
||||
+#endif
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
+#if XERCES_VERSION_MAJOR < 3
|
||||
unsigned int DummyEntityResolver::DoNothingBinInputStream::readBytes(XMLByte *const /*toFill*/, const unsigned int /*maxToRead*/)
|
||||
+#else
|
||||
+XMLSize_t DummyEntityResolver::DoNothingBinInputStream::readBytes(XMLByte *const toFill, XMLSize_t maxToRead)
|
||||
+#endif
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
--- src/probes/independent/XmlFileContentProbe.h.old 2010-10-22 14:55:47.000000000 +0200
|
||||
+++ src/probes/independent/XmlFileContentProbe.h 2010-10-22 14:57:00.000000000 +0200
|
||||
@@ -134,8 +134,14 @@
|
||||
class DoNothingBinInputStream : public BinInputStream
|
||||
{
|
||||
public:
|
||||
+#if XERCES_VERSION_MAJOR < 3
|
||||
virtual unsigned int curPos() const;
|
||||
virtual unsigned int readBytes(XMLByte *const toFill, const unsigned int maxToRead);
|
||||
+#else
|
||||
+ virtual XMLFilePos curPos() const;
|
||||
+ virtual const XMLCh* getContentType() const;
|
||||
+ virtual XMLSize_t readBytes(XMLByte *const toFill, XMLSize_t maxToRead);
|
||||
+#endif
|
||||
};
|
||||
};
|
||||
|
||||
--- src/XmlCommon.cpp.old
|
||||
+++ src/XmlCommon.cpp
|
||||
@@ -546,7 +546,11 @@ void XmlCommon::AddSchemaLocation(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *do
|
||||
string XmlCommon::GetNamespace(DOMElement *element) {
|
||||
|
||||
string xmlns = "";
|
||||
+#if XERCES_VERSION_MAJOR < 3
|
||||
xmlns = XmlCommon::ToString(element->getTypeInfo()->getNamespace());
|
||||
+#else
|
||||
+ xmlns = XmlCommon::ToString(element->getSchemaTypeInfo()->getTypeNamespace());
|
||||
+#endif
|
||||
if (xmlns.compare("") == 0) {
|
||||
xmlns = "";
|
||||
}
|
||||
@ -0,0 +1,78 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-forensics/ovaldi/ovaldi-5.10.1.2.ebuild,v 1.1 2012/05/22 20:54:50 hwoarang Exp $
|
||||
|
||||
EAPI=3
|
||||
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="Free implementation of OVAL"
|
||||
HOMEPAGE="http://oval.mitre.org/language/interpreter.html"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="ldap rpm selinux"
|
||||
|
||||
DEPEND="rpm? ( app-arch/rpm )
|
||||
dev-libs/libgcrypt
|
||||
dev-libs/libpcre
|
||||
dev-libs/xalan-c
|
||||
dev-libs/xerces-c
|
||||
ldap? ( net-nds/openldap )
|
||||
selinux? ( sys-libs/libselinux )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${P}-src"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-xerces3.patch
|
||||
epatch "${FILESDIR}"/${P}-strnicmp.patch
|
||||
epatch "${FILESDIR}"/${P}-missing-memory-header.patch
|
||||
if ! use ldap ; then
|
||||
einfo "Disabling LDAP probes"
|
||||
epatch "${FILESDIR}"/${P}-disable-ldap-probes.patch
|
||||
sed -i 's/-lldap//' project/linux/Makefile || die
|
||||
sed -i 's/.*LDAPProbe.h.*//' src/linux/ProbeFactory.h || die
|
||||
rm src/probes/independent/LDAPProbe.{cpp,h} || die
|
||||
fi
|
||||
|
||||
# rpm probes support is build dependant only on the presence of the rpm binary
|
||||
if use rpm ; then
|
||||
#Same problems as bug 274679, so i do a local copy of the header and patch it
|
||||
cp /usr/include/rpm/rpmdb.h src/probes/linux/ || die
|
||||
epatch "${FILESDIR}"/use_local_rpmdb.patch
|
||||
epatch "${FILESDIR}"/rpmdb.patch
|
||||
else
|
||||
einfo "Disabling rpm probes"
|
||||
sed -i 's/^PACKAGE_RPM/#PACKAGE_RPM/' project/linux/Makefile || die
|
||||
fi
|
||||
# same thing for dpkg, but package dpkg is not sufficient, needs app-arch/apt-pkg that is not on tree
|
||||
einfo "Disabling dpkg probes"
|
||||
sed -i 's/^PACKAGE_DPKG/#PACKAGE_DPKG/' project/linux/Makefile || die
|
||||
|
||||
#Disabling SELinux support
|
||||
if ! use selinux ; then
|
||||
rm src/probes/linux/SelinuxSecurityContextProbe.cpp || die
|
||||
rm src/probes/linux/SelinuxBooleanProbe.cpp || die
|
||||
rm src/probes/linux/SelinuxBooleanProbe.h || die
|
||||
epatch "${FILESDIR}"/${P}-disable-selinux-probes.patch
|
||||
else
|
||||
epatch "${FILESDIR}"/${P}-add-selinux-libs.patch
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile () {
|
||||
emake -C project/linux || die
|
||||
}
|
||||
|
||||
src_install () {
|
||||
# no make install in Makefile
|
||||
dosbin project/linux/Release/ovaldi project/linux/ovaldi.sh || die
|
||||
dodir /var/log/${PN} || die
|
||||
insinto /usr/share/${PN}
|
||||
doins xml/* || die
|
||||
dodoc docs/{README.txt,version.txt} || die
|
||||
doman docs/ovaldi.1 || die
|
||||
}
|
||||
@ -1,28 +1,26 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA512
|
||||
|
||||
DIST yasat-400.tar.gz 89667 RMD160 c361ca444529b633ee567bff12883a22b6b057eb SHA1 539821ba26f7feac83da7187b334070434c21b08 SHA256 89d3b5b68f0c872e0817d77b01736279f606d31a64c2674af319c866b2d3e6b8
|
||||
DIST yasat-421.tar.gz 112834 RMD160 e6efcbeccd7b610814dbf1a01bb605f4a15aa304 SHA1 75f8fcbe205c2e3a2ae970b5df67451f2770e14d SHA256 3db884855051c8ff1489c3a21dee65495e4dd298ae2e9dde9a8e09ab6bf3e166
|
||||
DIST yasat-456.tar.gz 116257 RMD160 4f108007370df58f52da5f17ca033ce7fe0a74bc SHA1 c49b6f31baf69a5f2a95e3dc76c02e371c3d1f55 SHA256 bc6c598693b9bbebd30d3d4dcf54d94b5e519af524296bffa7c6965f1f843c68
|
||||
EBUILD yasat-400.ebuild 561 RMD160 f096b2e43526da083710d83215f3cad917267e78 SHA1 c1b06aa6f10fa5a77ec7ab9a95f8016a96b8ee61 SHA256 eab0ca0091d1262178faa49832b403fa18b929492bc6ef494c9b25aaba9e2c89
|
||||
EBUILD yasat-421.ebuild 561 RMD160 27764b6b9f5ce5afcc587557285daac16f58013c SHA1 85084ffa9875d3923484af55a8c6492d47a60b62 SHA256 265f640dc5d74b751fb4927f7e575427938a3074d37b59cebfb4e3011444c624
|
||||
DIST yasat-526.tar.gz 123976 RMD160 d76118c23ed64a51287a1268f8754364a0979a94 SHA1 15081946fa2481f24e15cd760b1329297f7a0c9d SHA256 a4ff957d59923c7c87fbcde27c894d731a3685b8534be17867d9cdc41974e600
|
||||
EBUILD yasat-456.ebuild 561 RMD160 53a33cee7f2f334f78f2115ea6dbb78760ee1952 SHA1 f68926eab6c319c44ccae1357e71de80dc7e5dda SHA256 b13deb4b9e8c699cb7354347ef32153b0e9c074bc55632f8e175b9061f53bf57
|
||||
MISC ChangeLog 1462 RMD160 0268ccf75583c1ba531f61150797fd2d8764d3e4 SHA1 b0b02f1e6f5c25e34448938f7ce2dbe92f7535e3 SHA256 049a760555f6f1cf697347d6f950f179f20e64f7a2145367c526e300e5845c4e
|
||||
EBUILD yasat-526.ebuild 587 RMD160 8468525283164c7ef61cef6236c7d1573eb4a656 SHA1 afa0519f88743abb795efc8f01b443ba1e44740b SHA256 8e48800bfdd283e1ede7a040abb7cf6ee037f5b7f7210fb6ffa9dda0f39babfe
|
||||
MISC ChangeLog 1682 RMD160 4f0914888830c1da1a3637f68929e8918ef9f710 SHA1 15479cb46bb703e3c34349a67926ca543eb9ac5e SHA256 3d18ecd1d1775e603574e0b7a0ed3e13e51a12e5252085a55332d85bcd3038b4
|
||||
MISC metadata.xml 506 RMD160 9723e436c6988331e57769b55127e35bdd28ec2b SHA1 b36e85d48afd11af045c8982ea1a0a3680d07e25 SHA256 493a2d62a9e6bcdbb025215977edf3774be7791f52be8c5e88176569a987085d
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.18 (GNU/Linux)
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
iQIcBAEBCgAGBQJPT/SMAAoJEPqDWhW0r/LCYK8QAIffpgWcbbZBUlcTlawn3ALT
|
||||
xb4VEY1Dc0bOURyrhRV/XHqbOzJskPAdQS95amvkx0OpJZcdKnXGHwem/OLm8W5t
|
||||
UxoB+4ClLuC07WAs/zvN+A1PbvV7Ungip5uLOWMu+QHOURRbCoRARr+MPIfg6JSz
|
||||
4RCdo5OwAP6fJWIcqj8FSQAuZb2bDwKc6/8NG2uONJ/zlXI958/O3lxQi52bLuK0
|
||||
mUJ1ipcr893P77FqXMXUuRGCOHjTVy4jO2X0+qy9nT7YZbzo48HTghd4VIZA/QU2
|
||||
wIw8wSBkC1ldMC+jD9JMWOzpVeCaAlakBH73MZclWZ/zY1ZthFVCfPvdqYyPQ711
|
||||
OkMfi3w64a+bSu608zTAZ9Ndg1Z0CTf7xct2aNR0YmKoS/uTdPzoUOeph26KBsq+
|
||||
uXAmNNAFwSbofFrH9ILfTi6m90oWN3WPOq3Mzmjh7QF5fFrbDdmigj7mdxtsfw6/
|
||||
ZYY3G6ZCMNRtYoKmmITU96BlvGu+uHiueZJYBGPHnE94ak5vX9ft5n7qPs+mCdK1
|
||||
u1ye7Iu9OIY44gtSQlxns2lmF2GRlbOV1Mijz8P31yF2hReNIHOv9mcfqszXZxka
|
||||
7a1WpJxwblsxgqtp3iUxHeG/SmiXM/gTSCUny2YQfuxNfA8T9e/wQXM9nDmALigv
|
||||
ZCWLcAWmtT/XQy4ZLdcL
|
||||
=NFzi
|
||||
iQIcBAEBCgAGBQJPu/43AAoJEPqDWhW0r/LC960P/RsnSs62QSfM0bW3wFQO0ZEl
|
||||
eDWKrNYsywKPT/PlXweppEzJNAH2sJSdkg55YjZzqhRknsuuympItYevFN11Colt
|
||||
x4aiyF3ExJRQ6EPOA9bhS15BUsDzTSppIGDVWNlTJDMj0T7RKfb8Hm6dVsFPzdI3
|
||||
MviqNcLJ+CkPFYl4gOQ1TKWuF8CDSdzojz2xl5/n5MUPHMPq+qclTA4HTu+gX54H
|
||||
anUHzBKrJdKTa6LWWr+4wwt3bJv24MKQ1KQFisEnWavEXLaqcCklHu7mJyLFBR8l
|
||||
AGh+2pIe+4McvDTBPLBvyr3CmCKWjHQQyNa5rjNTvJ6XJfxIjAWIvlfDGvMB0xtB
|
||||
4sn0/YeBhirtkCy+nBVt7GI8N5Q9EZYMyup2dZDYKFX0ctWOlTqkjjuM4ibAc9h5
|
||||
+dOLFKMenUK1WvzjAUIxT1AEHFVgcjYKL9PkZ89S+ipP8j9QqCSdBxFxCfPGz6b/
|
||||
1INvJxw+zt/fOodQoNxeFk27Gbdz/HLXTczAKnSCI4SNYEhoog8Waotc+nWC5HOm
|
||||
zrLpHbRsJkPzsGpbvDN9lENjoBFT3P/cO7zLZbnLJ/kAGA/7K9oNnUlQH0zoEZl2
|
||||
Eu4dzdYUlNNqckbyZh2qLzcioWVP4qr6XgCh6P9Uh/D3K3xo0lUpPEQLSLV6u79Q
|
||||
CMY7h2ZekGD+FmOsmRUi
|
||||
=d9/7
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-forensics/yasat/yasat-421.ebuild,v 1.1 2011/06/16 08:57:28 hwoarang Exp $
|
||||
|
||||
DESCRIPTION="Security and system auditing tool"
|
||||
HOMEPAGE="http://yasat.sourceforge.net"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~sparc ~x86"
|
||||
IUSE=""
|
||||
|
||||
S=${WORKDIR}/${PN}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}" PREFIX="/usr" SYSCONFDIR="/etc" || die
|
||||
dodoc README CHANGELOG || die
|
||||
}
|
||||
@ -1,16 +1,18 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
Hash: SHA1
|
||||
|
||||
DIST acdctl-1.1.tar.bz2 10827 RMD160 1b0f735583d1be57d44744a7f9ab763ba1612c25 SHA1 1721953cb53d4de003657c42f28fe654a76e2b5b SHA256 d6c6d83672682d5d803431010bce3112becf5c6a42e1918da3f814b1e3af4f43
|
||||
EBUILD acdctl-1.1.ebuild 528 RMD160 0f8588df7ff33f02add10b018c6077be921bf495 SHA1 1b803da649671cbc067e9538df91d30634bf3b8b SHA256 494bdef113a050a4e8f7798ee3d47fcec23ff636a748983cb063fcbecf38294b
|
||||
MISC ChangeLog 753 RMD160 d3dfc5bb720aee16f57a9ea8f0e6036c38da5207 SHA1 a956ed029497b2970a1ee39e5558ad10295c3f63 SHA256 ceb26ace3c78345efafd2dcf5c7306025ff194e59ba8983bd0b0d4bac700f542
|
||||
EBUILD acdctl-1.1.ebuild 550 RMD160 5cce351a14e2993fd3ce9d2b112102e0fc63da52 SHA1 4fa4c1af79e9815437ef6fa992e004e3c2c71c3d SHA256 ebd66d3f60ce670d104ef6a12daa68f5cabf9c1e829f7bc866af39d9cb239bd4
|
||||
MISC ChangeLog 878 RMD160 e600516675bb7c6c500b6ae6b88700945364c6f9 SHA1 fb3e0995f5396b13c033543d9071c4cb273394f9 SHA256 5638c77dc7eb05a013fd32b2860ca693b9b0cec1ca4a56b5f321829439d95d52
|
||||
MISC metadata.xml 474 RMD160 dc8cf5c3dd9fec99a8a7d426fd2c33cd6dfec14f SHA1 c7dfb3c22c0784ccad6f688287937e9cfb7e8547 SHA256 57481f2edcc0584c64f00789d74592c5b9be49c78013598e329ce5b83e7dbfbb
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.18 (GNU/Linux)
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
iJwEAQEIAAYFAk58/5gACgkQfXuS5UK5QB3AxAP/a9WoV+VPybCnHdAsML6fSkZe
|
||||
Ah5b4Yf+DW9GcloMyNySVyuGrOXPKAxcJvSbQTuA4AwDB6p5unTpDLDh8NFdh/Kq
|
||||
A1QBh99stCTrhTzdpkqFcY8ODRMwyIqCeP3ReSazxpNhB2bwaXEo+I1jUvj9d9Ke
|
||||
axjeW1QHovkS17/YucU=
|
||||
=i1yv
|
||||
iQEcBAEBAgAGBQJPu72mAAoJEEdUh39IaPFN69UH/iE4/xRfnBPrfy/CfYtZyyu4
|
||||
dNY69KUZHhSVODYGYQsumv47rr8vM7bKcqMAZOT3NsiQB9i+MxEQrDtF+LYMJ3W0
|
||||
NqEde8jY2YBpWHgdaFgHsHd78ebxYGK4JnqV2DDYbCXo87hW33PJuUBPw0imCROC
|
||||
kd1Nj3N7vPYFz9b8mwGlJVXAcmG0/mv8Nh026lwTek6/4OkH0ncFLUayLUQT85yQ
|
||||
aYYjdp5FkU49+V03BTC8uAeiHjlhlR+QApqC7dAPvDT4Yv8Mu+fSdVtHyK51s1mu
|
||||
IEwp6ww4QEwkptkqHH0ee9hCX2WFcM8CyEOPdHwnAmux1VoVFhr4f3D2cBD7KOA=
|
||||
=2rJV
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -0,0 +1,548 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.4.2.ebuild,v 1.1 2012/05/23 00:22:24 dilfridge Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
KDE_REQUIRED="optional"
|
||||
QT_MINIMAL="4.7.4"
|
||||
KDE_SCM="git"
|
||||
CMAKE_REQUIRED="never"
|
||||
|
||||
PYTHON_DEPEND="2"
|
||||
PYTHON_USE_WITH="threads,xml"
|
||||
|
||||
# experimental ; release ; old
|
||||
# Usually the tarballs are moved a lot so this should make
|
||||
# everyone happy.
|
||||
DEV_URI="
|
||||
http://dev-builds.libreoffice.org/pre-releases/src
|
||||
http://download.documentfoundation.org/libreoffice/src
|
||||
http://download.documentfoundation.org/libreoffice/old/src
|
||||
"
|
||||
EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
|
||||
ADDONS_URI="http://dev-www.libreoffice.org/src/"
|
||||
|
||||
BRANDING="${PN}-branding-gentoo-0.5.tar.xz"
|
||||
# PATCHSET="${P}-patchset-01.tar.xz"
|
||||
|
||||
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
|
||||
inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
|
||||
unset SCM_ECLASS
|
||||
|
||||
DESCRIPTION="LibreOffice, a full office productivity suite."
|
||||
HOMEPAGE="http://www.libreoffice.org"
|
||||
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
|
||||
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
|
||||
|
||||
# Split modules following git/tarballs
|
||||
# Core MUST be first!
|
||||
MODULES="core binfilter help"
|
||||
# Only release has the tarballs
|
||||
if [[ ${PV} != *9999* ]]; then
|
||||
for i in ${DEV_URI}; do
|
||||
for mod in ${MODULES}; do
|
||||
if [[ ${mod} == binfilter ]]; then
|
||||
SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.tar.xz )"
|
||||
else
|
||||
SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
|
||||
fi
|
||||
done
|
||||
unset mod
|
||||
done
|
||||
unset i
|
||||
fi
|
||||
unset DEV_URI
|
||||
|
||||
# Really required addons
|
||||
# These are bundles that can't be removed for now due to huge patchsets.
|
||||
# If you want them gone, patches are welcome.
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
|
||||
ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
|
||||
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
|
||||
ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
|
||||
ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
|
||||
ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
|
||||
ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
|
||||
SRC_URI+=" ${ADDONS_SRC}"
|
||||
|
||||
unset ADDONS_URI
|
||||
unset EXT_URI
|
||||
unset ADDONS_SRC
|
||||
|
||||
IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome +graphite gstreamer +gtk
|
||||
jemalloc kde mysql nlpsolver +nsplugin odk opengl pdfimport postgres svg test
|
||||
+vba +webdav +xmlsec"
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
NSS_DEPEND="
|
||||
>=dev-libs/nspr-4.8.8
|
||||
>=dev-libs/nss-3.12.9
|
||||
"
|
||||
|
||||
COMMON_DEPEND="
|
||||
app-arch/zip
|
||||
app-arch/unzip
|
||||
>=app-text/hunspell-1.3.2-r3
|
||||
app-text/mythes
|
||||
>=app-text/libexttextcat-3.2
|
||||
app-text/libwpd:0.9[tools]
|
||||
app-text/libwpg:0.2
|
||||
>=app-text/libwps-0.2.2
|
||||
dev-cpp/libcmis
|
||||
dev-db/unixODBC
|
||||
dev-libs/expat
|
||||
>=dev-libs/glib-2.28
|
||||
>=dev-libs/hyphen-2.7.1
|
||||
>=dev-libs/icu-4.8.1.1
|
||||
>=dev-lang/perl-5.0
|
||||
>=dev-libs/openssl-1.0.0d
|
||||
>=dev-libs/redland-1.0.14[ssl]
|
||||
>=media-libs/fontconfig-2.8.0
|
||||
media-libs/freetype:2
|
||||
>=media-libs/libpng-1.4
|
||||
media-libs/libvisio
|
||||
>=net-misc/curl-7.21.4
|
||||
sci-mathematics/lpsolve
|
||||
>=sys-libs/db-4.8
|
||||
virtual/jpeg
|
||||
>=x11-libs/cairo-1.10.0[X]
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
dbus? ( >=dev-libs/dbus-glib-0.92 )
|
||||
eds? ( gnome-extra/evolution-data-server )
|
||||
gnome? (
|
||||
gnome-base/gconf:2
|
||||
gnome-base/orbit
|
||||
)
|
||||
gtk? ( >=x11-libs/gtk+-2.24:2 )
|
||||
graphite? ( media-gfx/graphite2 )
|
||||
gstreamer? (
|
||||
>=media-libs/gstreamer-0.10
|
||||
>=media-libs/gst-plugins-base-0.10
|
||||
)
|
||||
java? (
|
||||
>=dev-java/bsh-2.0_beta4
|
||||
dev-java/lucene:2.9
|
||||
dev-java/lucene-analyzers:2.3
|
||||
)
|
||||
jemalloc? ( dev-libs/jemalloc )
|
||||
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
|
||||
opengl? ( virtual/opengl )
|
||||
pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] )
|
||||
postgres? ( >=dev-db/postgresql-base-8.4.0 )
|
||||
svg? ( gnome-base/librsvg )
|
||||
webdav? ( net-libs/neon )
|
||||
xmlsec? ( ${NSS_DEPEND} )
|
||||
"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!app-office/libreoffice-bin
|
||||
!app-office/libreoffice-bin-debug
|
||||
!app-office/openoffice-bin
|
||||
!app-office/openoffice
|
||||
media-fonts/libertine-ttf
|
||||
media-fonts/liberation-fonts
|
||||
media-fonts/urw-fonts
|
||||
cups? ( net-print/cups )
|
||||
java? ( >=virtual/jre-1.6 )
|
||||
"
|
||||
|
||||
PDEPEND="
|
||||
>=app-office/libreoffice-l10n-3.5.0
|
||||
"
|
||||
|
||||
# FIXME: cppunit should be moved to test conditional
|
||||
# after everything upstream is under gbuild
|
||||
# as dmake execute tests right away
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-libs/boost-1.46
|
||||
>=dev-libs/libxml2-2.7.8
|
||||
dev-libs/libxslt
|
||||
dev-perl/Archive-Zip
|
||||
dev-util/cppunit
|
||||
>=dev-util/gperf-3
|
||||
dev-util/intltool
|
||||
dev-util/mdds
|
||||
virtual/pkgconfig
|
||||
media-libs/sampleicc
|
||||
net-misc/npapi-sdk
|
||||
net-print/cups
|
||||
>=sys-apps/findutils-4.4.2
|
||||
sys-devel/bison
|
||||
sys-apps/coreutils
|
||||
sys-devel/flex
|
||||
sys-devel/gettext
|
||||
>=sys-devel/make-3.82
|
||||
sys-libs/zlib
|
||||
x11-libs/libXt
|
||||
x11-libs/libXtst
|
||||
x11-proto/randrproto
|
||||
x11-proto/xextproto
|
||||
x11-proto/xineramaproto
|
||||
x11-proto/xproto
|
||||
java? (
|
||||
=virtual/jdk-1.6*
|
||||
>=dev-java/ant-core-1.7
|
||||
test? ( dev-java/junit:4 )
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
# this can't be upstreamed :(
|
||||
"${FILESDIR}/${PN}-system-pyuno.patch"
|
||||
"${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch"
|
||||
"${FILESDIR}/${PN}-3.5-doublebuild.patch"
|
||||
)
|
||||
|
||||
REQUIRED_USE="
|
||||
nsplugin? ( gtk )
|
||||
gnome? ( gtk )
|
||||
eds? ( gnome )
|
||||
nlpsolver? ( java )
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${PN}-core-${PV}"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
pkg_pretend() {
|
||||
local pgslot
|
||||
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
CHECKREQS_MEMORY="512M"
|
||||
CHECKREQS_DISK_BUILD="6G"
|
||||
check-reqs_pkg_pretend
|
||||
|
||||
if [[ $(gcc-major-version) -lt 4 ]]; then
|
||||
eerror "Compilation with gcc older than 4.0 is not supported"
|
||||
die "Too old gcc found."
|
||||
fi
|
||||
fi
|
||||
|
||||
# ensure pg version
|
||||
if use postgres; then
|
||||
pgslot=$(postgresql-config show)
|
||||
if [[ ${pgslot//.} < 90 ]] ; then
|
||||
eerror "PostgreSQL slot must be set to 9.0 or higher."
|
||||
eerror " postgresql-config set 9.0"
|
||||
die "PostgreSQL slot is not set to 9.0 or higher."
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
java-pkg-opt-2_pkg_setup
|
||||
kde4-base_pkg_setup
|
||||
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
CHECKREQS_MEMORY="512M"
|
||||
CHECKREQS_DISK_BUILD="6G"
|
||||
check-reqs_pkg_pretend
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
local mod dest tmplfile tmplname mypv
|
||||
|
||||
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
|
||||
if use branding; then
|
||||
unpack "${BRANDING}"
|
||||
fi
|
||||
|
||||
if [[ ${PV} != *9999* ]]; then
|
||||
for mod in ${MODULES}; do
|
||||
if [[ ${mod} == binfilter ]] && ! use binfilter; then
|
||||
continue
|
||||
fi
|
||||
unpack "${PN}-${mod}-${PV}.tar.xz"
|
||||
if [[ ${mod} != core ]]; then
|
||||
mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
|
||||
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
|
||||
fi
|
||||
done
|
||||
else
|
||||
for mod in ${MODULES}; do
|
||||
if [[ ${mod} == binfilter ]] && ! use binfilter; then
|
||||
continue
|
||||
fi
|
||||
mypv=${PV/.9999}
|
||||
[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
|
||||
EGIT_PROJECT="${PN}/${mod}"
|
||||
EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
|
||||
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
|
||||
EGIT_NOUNPACK="true"
|
||||
git-2_src_unpack
|
||||
if [[ ${mod} != core ]]; then
|
||||
mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
|
||||
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
|
||||
fi
|
||||
done
|
||||
unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# optimization flags
|
||||
export ARCH_FLAGS="${CXXFLAGS}"
|
||||
export LINKFLAGSOPTIMIZE="${LDFLAGS}"
|
||||
|
||||
# patchset
|
||||
if [[ -n ${PATCHSET} ]]; then
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
|
||||
EPATCH_SUFFIX="patch" \
|
||||
epatch
|
||||
fi
|
||||
|
||||
base_src_prepare
|
||||
|
||||
# please no debug in binfilter, it blows up things insanely
|
||||
if use binfilter && ! use binfilterdebug ; then
|
||||
for name in $(find "${S}/binfilter" -name makefile.mk) ; do
|
||||
sed -i -e '1i\CFLAGS+= -g0' $name || die
|
||||
done
|
||||
fi
|
||||
|
||||
eautoreconf
|
||||
# hack in the autogen.sh
|
||||
touch autogen.lastrun
|
||||
# system pyuno mess
|
||||
sed \
|
||||
-e "s:%eprefix%:${EPREFIX}:g" \
|
||||
-e "s:%libdir%:$(get_libdir):g" \
|
||||
-i pyuno/source/module/uno.py \
|
||||
-i scripting/source/pyprov/officehelper.py || die
|
||||
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local java_opts
|
||||
local internal_libs
|
||||
local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
|
||||
|
||||
# recheck that there is some value in jobs
|
||||
[[ -z ${jbs} ]] && jbs="1"
|
||||
|
||||
# sane: just sane.h header that is used for scan in writer, not
|
||||
# linked or anything else, worthless to depend on
|
||||
# vigra: just uses templates from there
|
||||
# it is serious pain in the ass for packaging
|
||||
# should be replaced by boost::gil if someone interested
|
||||
internal_libs+="
|
||||
--without-system-sane
|
||||
--without-system-vigra
|
||||
"
|
||||
|
||||
if use java; then
|
||||
# hsqldb: system one is too new
|
||||
# saxon: system one does not work properly
|
||||
java_opts="
|
||||
--without-system-hsqldb
|
||||
--without-system-saxon
|
||||
--with-ant-home="${ANT_HOME}"
|
||||
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
|
||||
--with-java-target-version=$(java-pkg_get-target)
|
||||
--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
|
||||
--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
|
||||
--with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
|
||||
--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
|
||||
"
|
||||
if use test; then
|
||||
java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
|
||||
else
|
||||
java_opts+=" --without-junit"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use branding; then
|
||||
internal_libs+="
|
||||
--with-about-bitmap="${WORKDIR}/branding-about.png"
|
||||
--with-intro-bitmap="${WORKDIR}/branding-intro.png"
|
||||
"
|
||||
fi
|
||||
|
||||
# system headers/libs/...: enforce using system packages
|
||||
# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
|
||||
# --enable-cairo: ensure that cairo is always required
|
||||
# --enable-*-link: link to the library rather than just dlopen on runtime
|
||||
# --enable-release-build: build the libreoffice as release
|
||||
# --disable-fetch-external: prevent dowloading during compile phase
|
||||
# --disable-gnome-vfs: old gnome virtual fs support
|
||||
# --disable-kdeab: kde3 adressbook
|
||||
# --disable-kde: kde3 support
|
||||
# --disable-ldap: ldap requires internal mozilla stuff, same like mozab
|
||||
# --disable-mozilla: disable mozilla build that is used for adresbook, not
|
||||
# affecting the nsplugin that is always ON
|
||||
# --disable-pch: precompiled headers cause build crashes
|
||||
# --disable-rpath: relative runtime path is not desired
|
||||
# --disable-static-gtk: ensure that gtk is linked dynamically
|
||||
# --disable-ugly: disable ugly pieces of code
|
||||
# --disable-zenity: disable build icon
|
||||
# --enable-extension-integration: enable any extension integration support
|
||||
# --with-{max-jobs,num-cpus}: ensuring parallel building
|
||||
# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
|
||||
# --without-stlport: disable deprecated extensions framework
|
||||
# --disable-ext-report-builder: too much java packages pulled in
|
||||
econf \
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
|
||||
--with-system-headers \
|
||||
--with-system-libs \
|
||||
--with-system-jars \
|
||||
--with-system-dicts \
|
||||
--enable-cairo-canvas \
|
||||
--enable-largefile \
|
||||
--enable-python=system \
|
||||
--enable-randr \
|
||||
--enable-randr-link \
|
||||
--enable-release-build \
|
||||
--enable-unix-qstart-libpng \
|
||||
--enable-mergelibs \
|
||||
--disable-ccache \
|
||||
--disable-crashdump \
|
||||
--disable-dependency-tracking \
|
||||
--disable-epm \
|
||||
--disable-fetch-external \
|
||||
--disable-gnome-vfs \
|
||||
--disable-ext-report-builder \
|
||||
--disable-kdeab \
|
||||
--disable-kde \
|
||||
--disable-ldap \
|
||||
--disable-mozilla \
|
||||
--disable-online-update \
|
||||
--disable-pch \
|
||||
--disable-rpath \
|
||||
--disable-systray \
|
||||
--disable-static-gtk \
|
||||
--disable-strip-solver \
|
||||
--disable-ugly \
|
||||
--disable-zenity \
|
||||
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
|
||||
--with-build-version="Gentoo official package" \
|
||||
--enable-extension-integration \
|
||||
--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
|
||||
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
|
||||
--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
|
||||
--with-external-tar="${DISTDIR}" \
|
||||
--with-lang="" \
|
||||
--with-max-jobs=${jbs} \
|
||||
--with-num-cpus=2 \
|
||||
--with-unix-wrapper=libreoffice \
|
||||
--with-vendor="Gentoo Foundation" \
|
||||
--with-x \
|
||||
--without-afms \
|
||||
--without-fonts \
|
||||
--without-myspell-dicts \
|
||||
--without-stlport \
|
||||
--without-system-mozilla \
|
||||
--without-help \
|
||||
--with-helppack-integration \
|
||||
--without-sun-templates \
|
||||
$(use_enable binfilter) \
|
||||
$(use_enable dbus) \
|
||||
$(use_enable eds evolution2) \
|
||||
$(use_enable gnome gconf) \
|
||||
$(use_enable gnome gio) \
|
||||
$(use_enable gnome lockdown) \
|
||||
$(use_enable graphite) \
|
||||
$(use_enable gstreamer) \
|
||||
$(use_enable gtk) \
|
||||
--disable-gtk3 \
|
||||
$(use_enable java ext-scripting-beanshell) \
|
||||
$(use_enable kde kde4) \
|
||||
$(use_enable mysql ext-mysql-connector) \
|
||||
$(use_enable nlpsolver ext-nlpsolver) \
|
||||
$(use_enable nsplugin) \
|
||||
$(use_enable odk) \
|
||||
$(use_enable opengl) \
|
||||
$(use_enable pdfimport ext-pdfimport) \
|
||||
$(use_enable postgres postgresql-sdbc) \
|
||||
$(use_enable svg librsvg system) \
|
||||
$(use_enable test linkoo) \
|
||||
$(use_enable vba) \
|
||||
$(use_enable vba activex-component) \
|
||||
$(use_enable webdav neon) \
|
||||
$(use_enable xmlsec) \
|
||||
$(use_with java) \
|
||||
$(use_with mysql system-mysql-cppconn) \
|
||||
${internal_libs} \
|
||||
${java_opts}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# hack for offlinehelp, this needs fixing upstream at some point
|
||||
# it is broken because we send --without-help
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
|
||||
(
|
||||
source "${S}/Env.Host.sh" 2&> /dev/null
|
||||
|
||||
local path="${SOLARVER}/${INPATH}/res/img"
|
||||
mkdir -p "${path}" || die
|
||||
|
||||
echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=default_images/res/helpimg > \"${path}/helpimg.ilst\""
|
||||
perl "${S}/helpcontent2/helpers/create_ilst.pl" \
|
||||
-dir=default_images/res/helpimg \
|
||||
> "${path}/helpimg.ilst"
|
||||
[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
|
||||
)
|
||||
|
||||
# not a proper make script
|
||||
make build || die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
make check || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# This is not Makefile so no buildserver
|
||||
make DESTDIR="${D}" distro-pack-install -o build -o check || die
|
||||
|
||||
# Fix bash completion placement
|
||||
newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
|
||||
rm -rf "${ED}"/etc/
|
||||
|
||||
# symlink the nsplugin to system location
|
||||
if use nsplugin; then
|
||||
inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
|
||||
fi
|
||||
|
||||
if use branding; then
|
||||
insinto /usr/$(get_libdir)/${PN}/program
|
||||
newins "${WORKDIR}/branding-sofficerc" sofficerc
|
||||
fi
|
||||
|
||||
# Hack for offlinehelp, this needs fixing upstream at some point.
|
||||
# It is broken because we send --without-help
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
|
||||
insinto /usr/$(get_libdir)/libreoffice/help
|
||||
doins xmlhelp/util/*.xsl
|
||||
}
|
||||
|
||||
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 cups || \
|
||||
ewarn 'You will need net-print/cups to be able to print and export to PDF with libreoffice.'
|
||||
|
||||
use java || \
|
||||
ewarn 'If you plan to use lbase aplication you should enable java or you will get various crashes.'
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
kde4-base_pkg_postrm
|
||||
}
|
||||
@ -1,9 +1,23 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA1
|
||||
|
||||
AUX 10-blackberry.rules 1983 RMD160 bea10908beef0558402b8a8888ebc0ea4e561562 SHA1 c94747478a616c67cd115662c7a5bb4ad6220611 SHA256 26d15257fc5f48089a1b8559e7ac93101bdbc4434e409214c67dda130f05159a
|
||||
AUX barry-0.16-gcc45.patch 310 RMD160 42a67dc4baba475a1ef0352d2efc842d21cfaf7a SHA1 3247f8f102e8e5a72be89206df0891b641ebaa1a SHA256 f341443d2de4a229eeed8409ccd7e52d3ce8cb3dc3ab5607f69657a3472785f6
|
||||
AUX blacklist-berry_charge.conf 65 RMD160 5fbc61819a71cb266a93053c99d32ea2424c5683 SHA1 5320c555ecd5b844bb4db5a238538abc472b2516 SHA256 26003dcfdf7da0a677cbc72e01615fc694ccd2e884269da9a22d722f7549386e
|
||||
DIST barry-0.16.tar.bz2 4981342 RMD160 407d1ae1d4c42a589093bd2cc4ad791f230ab23c SHA1 011b1f42c3832f30942744dc8f577dc0eaf2189c SHA256 60f0055399a6d97445e069b804bcc8a1c60f5fc999fcec385dcd4484990ec220
|
||||
DIST barry-0.17.1.tar.bz2 7618810 RMD160 444ac06937bde1b913b6a3132dce25caebc066c1 SHA1 99fbf38a124d0836ca386f21c8604ae8fb6a740b SHA256 8bff44bc0ff88aee6bb55d50c5dc84949c92f01841304833da4a50ab171e34ae
|
||||
EBUILD barry-0.16.ebuild 2343 RMD160 17b2a40cedd73da2f9d945cce25e4b30b7ac81f1 SHA1 ab1b83dcfdb692233e60fe2b166591af5d052312 SHA256 45b642a10a73da66dfc9a3641b22a0e08065f7e5d7107ea293bc3274e4179f68
|
||||
EBUILD barry-0.17.1.ebuild 2582 RMD160 c158099f8c334d5009ad5540af466171198e8fb6 SHA1 57571627fe8db11909a742d97a65186070da387f SHA256 58d1710c00df171e83e805ce59285e94ad4b67d03aef81f726ada9455c69b76a
|
||||
MISC ChangeLog 3795 RMD160 79b9183ed73894425bea77730903242e4903b01f SHA1 d7ca6fb7fc2a04fdc1c0b0615d84198761a77c08 SHA256 d88e26d33d0ecc7ab028ba4d58ef78272ba4257e74be76826629ada849b20f33
|
||||
EBUILD barry-0.16.ebuild 2345 RMD160 8b017887d541ffb9eb910c419e37893815f49433 SHA1 0cee080b0acc94edba7a8a952997182cea5bfc29 SHA256 4d0f7b198d93a7b97439ba7c982c76bc57243ad8b22ddb8927280ebd9735e633
|
||||
EBUILD barry-0.17.1.ebuild 2584 RMD160 f1c14bbe8fb23182ba6886ebb53b141ad62847c6 SHA1 d9500148b644a1613b341775b83e1940c5257cd8 SHA256 c19bb93b9efeeb52c36507b03634867258ea63bc60524b2724bd2a1df3fa9477
|
||||
MISC ChangeLog 3944 RMD160 43838d5d33c84ebc902b7e3bb20e00b3b468ca17 SHA1 cb5878517847fffd207f02aa6fc4426132c3c31d SHA256 0f3895cafa43bab4fa0ec8e48f1bb9f541120814d0ec0b70f1067915c25ee76b
|
||||
MISC metadata.xml 612 RMD160 595ca42f506b2cd4210929dbfe814719b0cb60e0 SHA1 3980d439b80c0fc90a34e1a829f48e6965bca8e5 SHA256 d2bbc5b8ee764c1bc941bc5375bc3d868ef3d697e86acf6e1ed3b9addeaffcf4
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
iQEcBAEBAgAGBQJPu8B3AAoJEEdUh39IaPFNxYYH/0lygrwcl0+PoJ5qmMs2Jp6p
|
||||
l3pqNXMzQi4OYq/AJYHP5P5ltm+YBHOceWri7XJZMelDZUHoOOEIoWXjHybuYU0E
|
||||
+HZSQU3XOk+vYKwrHD1lVQ5kg88fbjqmU05sJ2YaN8KoCagVkMrvS/iPwX3dzSRU
|
||||
0riNgmTTujGtm3StBE4QfZWNk1yLEZuU8wmtBpAZf4kGjadlYyFfNyrB/aK+Xt3/
|
||||
ACNy/lKH376hQiJssNmqubp1VAxLFXKVgDB0WWpHAzQ6cvv5hVSoRVNKK10ZaSBq
|
||||
J72z956VXiEX4Crj2iBlqEJhf19vPjRKG+ICjiX5YK+g42c/kLwNiRlFpMB/ddg=
|
||||
=pvG7
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue