root
6 years ago
parent
0c961347fc
commit
34e3094b79
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,3 +1,2 @@
|
||||
DIST logcheck_1.3.15.tar.gz 162397 BLAKE2B 111e16f482c8610ffc39c518b3fd523abaa9720e7873bcadba58d85bd13bd7a8a9d93881e64f5d8cc5cb30c8254f2216fe97d1b77fe1cf77d5e14859ec701621 SHA512 45c9e779fc1d1f417aea3f02e70eff4dbc7cd0b45e04f7efc458a4552866686cbb095d0b5ebaf32a57d423a3753b4573277a464f5539789350b087569e025abf
|
||||
DIST logcheck_1.3.17.tar.xz 130956 BLAKE2B 16fc80f983a17d55e4b5fdcefcc95657e99bb3f5229655b768ab6116a874bf0f080c368bae235802370534df27908d22f52168b9cf1123fce05f9b4d5a484015 SHA512 e4a30b6ccd7a9f0f51354b1a6e577f6a3837e3db078f61b3d3ceaf630a1f1eeae03324e6ec58307f8f723dbd017e1543c15f7dc34e50c0eeb9ee0b160b2c879d
|
||||
DIST logcheck_1.3.18.tar.xz 131252 BLAKE2B 024259d965c02d5f27a82f1df1e947d48e4b1bad705882243c4b743a1c061012f2437ecab1a97265f5a330fdec2f813a36c078dca282f54fdfaab03833340320 SHA512 3ab75969f732efa123d9df2c8b44557e4a7eddef8332a8357463930714148a13130c763c22e562bd60e106abf5e18cf39b3572e0c048727a117fbc67430b7e3f
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit user
|
||||
|
||||
DESCRIPTION="Mails anomalies in the system logfiles to the administrator"
|
||||
HOMEPAGE="http://packages.debian.org/sid/logcheck"
|
||||
SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="!app-admin/logsentry
|
||||
app-misc/lockfile-progs
|
||||
dev-lang/perl
|
||||
dev-perl/mime-construct
|
||||
virtual/mailx
|
||||
${DEPEND}"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup logcheck
|
||||
enewuser logcheck -1 -1 -1 logcheck
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
# Do not install /var/lock, bug #449968 . Use rmdir to make sure
|
||||
# the directories removed are empty.
|
||||
rmdir "${D}/var/lock/logcheck" || die
|
||||
rmdir "${D}/var/lock" || die
|
||||
|
||||
keepdir /var/lib/logcheck
|
||||
dodoc AUTHORS CHANGES CREDITS TODO docs/README.*
|
||||
doman docs/logtail.8 docs/logtail2.8
|
||||
|
||||
exeinto /etc/cron.hourly
|
||||
doexe "${FILESDIR}/${PN}.cron"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
|
||||
|
||||
elog "Please read the guide at https://wiki.gentoo.org/wiki/Logcheck"
|
||||
elog "for installation instructions."
|
||||
}
|
||||
@ -1,48 +0,0 @@
|
||||
From 18fb0be96a146589ccbd642caa9244480c51140b Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Summers <msummers42@gmail.com>
|
||||
Date: Mon, 9 Oct 2017 20:38:52 -0500
|
||||
Subject: [PATCH 1/2] addresses issue #43307, disk.format_ to disk.format
|
||||
|
||||
This change fixes breakage. It appears the disk.format_ func is
|
||||
aliased to disk.format in modules/disk.py
|
||||
---
|
||||
salt/states/blockdev.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/salt/states/blockdev.py b/salt/states/blockdev.py
|
||||
index 4b0dc5ca81d..e6ecfeab3f1 100644
|
||||
--- a/salt/states/blockdev.py
|
||||
+++ b/salt/states/blockdev.py
|
||||
@@ -159,7 +159,7 @@ def formatted(name, fs_type='ext4', force=False, **kwargs):
|
||||
ret['result'] = None
|
||||
return ret
|
||||
|
||||
- __salt__['disk.format_'](name, fs_type, force=force, **kwargs)
|
||||
+ __salt__['disk.format'](name, fs_type, force=force, **kwargs)
|
||||
|
||||
# Repeat fstype check up to 10 times with 3s sleeping between each
|
||||
# to avoid detection failing although mkfs has succeeded
|
||||
|
||||
From 16e1c1dfc86920b7a00dbf7c39b805c359e4d13b Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Summers <matthew.summers@syapse.com>
|
||||
Date: Mon, 16 Oct 2017 09:47:40 -0500
|
||||
Subject: [PATCH 2/2] fixed test addressing issue #43307, disk.format_ to
|
||||
disk.format
|
||||
|
||||
---
|
||||
tests/unit/states/test_blockdev.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/unit/states/test_blockdev.py b/tests/unit/states/test_blockdev.py
|
||||
index e5899f1c70a..9b559dddfe5 100644
|
||||
--- a/tests/unit/states/test_blockdev.py
|
||||
+++ b/tests/unit/states/test_blockdev.py
|
||||
@@ -100,7 +100,7 @@ def test_formatted(self):
|
||||
|
||||
# Test state return when block device format fails
|
||||
with patch.dict(blockdev.__salt__, {'cmd.run': MagicMock(return_value=mock_ext4),
|
||||
- 'disk.format_': MagicMock(return_value=True)}):
|
||||
+ 'disk.format': MagicMock(return_value=True)}):
|
||||
comt = ('Failed to format {0}'.format(name))
|
||||
ret.update({'comment': comt, 'result': False})
|
||||
with patch.object(salt.utils, 'which',
|
||||
Binary file not shown.
@ -1,12 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>brendan@horan.hk</email>
|
||||
<name>Brendan Horan</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +1 @@
|
||||
DIST emacs-26.0.90.tar.xz 43908428 BLAKE2B 20858eb7b06b488451ebdffd7cedf28055f38cb45960c2b74c926204be1225cff297a8ce95a4cf535349fe73b24c9e5347fed3c3decf55492c82daca9fb470c2 SHA512 c263d1d1a12d8b21cc43ddcb46a28ce3a54d0ef09e240518f19bfdabf4c4ceebc3c2d1521aae9808cafdd3e731c93dd22b4f1e7e619e38076aa4ffdbaadea93b
|
||||
DIST emacs-26.0.91.tar.xz 43988932 BLAKE2B 05e5b9d51f92f2719ea22806f73b17903f5941c82a2e4e762b7664ed1b05f7324c0b020ded311dc4f22b7668684f59eaf3f3c2495f85977f3510698d7e0edd09 SHA512 4e20743299ed419c8ad7bea00c5389fb7c81f4e631165fe2b19c4bbd7c2b401416073282814f30bb96e5c3961724bfbb565781c50ee481a4f4c762ca6f480fba
|
||||
|
||||
@ -1,402 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
|
||||
|
||||
if [[ ${PV##*.} = 9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
|
||||
EGIT_BRANCH="emacs-26"
|
||||
EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
|
||||
S="${EGIT_CHECKOUT_DIR}"
|
||||
else
|
||||
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
|
||||
mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
# 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}"
|
||||
[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
|
||||
fi
|
||||
|
||||
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
|
||||
HOMEPAGE="https://www.gnu.org/software/emacs/"
|
||||
|
||||
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
|
||||
SLOT="26"
|
||||
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
|
||||
REQUIRED_USE="?? ( aqua X )"
|
||||
|
||||
RDEPEND="sys-libs/ncurses:0=
|
||||
>=app-eselect/eselect-emacs-1.16
|
||||
>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
|
||||
acl? ( virtual/acl )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
dbus? ( sys-apps/dbus )
|
||||
gpm? ( sys-libs/gpm )
|
||||
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
|
||||
kerberos? ( virtual/krb5 )
|
||||
libxml2? ( >=dev-libs/libxml2-2.2.0 )
|
||||
mailutils? ( net-mail/mailutils[clients] )
|
||||
!mailutils? ( net-libs/liblockfile )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
ssl? ( net-libs/gnutls:0= )
|
||||
systemd? ( sys-apps/systemd )
|
||||
zlib? ( sys-libs/zlib )
|
||||
X? (
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libxcb
|
||||
x11-misc/xbitmaps
|
||||
gconf? ( >=gnome-base/gconf-2.26.2 )
|
||||
gsettings? ( >=dev-libs/glib-2.28.6 )
|
||||
gif? ( media-libs/giflib:0= )
|
||||
jpeg? ( virtual/jpeg:0= )
|
||||
png? ( >=media-libs/libpng-1.4:0= )
|
||||
svg? ( >=gnome-base/librsvg-2.0 )
|
||||
tiff? ( media-libs/tiff:0 )
|
||||
xpm? ( x11-libs/libXpm )
|
||||
imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
|
||||
xft? (
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype
|
||||
x11-libs/libXft
|
||||
x11-libs/libXrender
|
||||
cairo? ( >=x11-libs/cairo-1.12.18 )
|
||||
m17n-lib? (
|
||||
>=dev-libs/libotf-0.9.4
|
||||
>=dev-libs/m17n-lib-1.5.1
|
||||
)
|
||||
)
|
||||
gtk? (
|
||||
xwidgets? (
|
||||
net-libs/webkit-gtk:4=
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/libXcomposite
|
||||
)
|
||||
!xwidgets? (
|
||||
gtk3? ( x11-libs/gtk+:3 )
|
||||
!gtk3? ( x11-libs/gtk+:2 )
|
||||
)
|
||||
)
|
||||
!gtk? (
|
||||
motif? (
|
||||
>=x11-libs/motif-2.3:0
|
||||
x11-libs/libXpm
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
)
|
||||
!motif? (
|
||||
Xaw3d? (
|
||||
x11-libs/libXaw3d
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
)
|
||||
!Xaw3d? ( athena? (
|
||||
x11-libs/libXaw
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
) )
|
||||
)
|
||||
)
|
||||
)"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
gzip-el? ( app-arch/gzip )
|
||||
pax_kernel? ( sys-apps/attr )"
|
||||
|
||||
if [[ ${PV##*.} = 9999 ]]; then
|
||||
DEPEND="${DEPEND}
|
||||
sys-apps/texinfo"
|
||||
fi
|
||||
|
||||
EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
|
||||
SITEFILE="20${PN}-${SLOT}-gentoo.el"
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV##*.} = 9999 ]]; then
|
||||
FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
|
||||
configure.ac)
|
||||
[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
|
||||
einfo "Emacs branch: ${EGIT_BRANCH}"
|
||||
einfo "Commit: ${EGIT_VERSION}"
|
||||
einfo "Emacs version number: ${FULL_VERSION}"
|
||||
[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
|
||||
|| die "Upstream version number changed to ${FULL_VERSION}"
|
||||
fi
|
||||
|
||||
eapply_user
|
||||
|
||||
# Fix filename reference in redirected man page
|
||||
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
|
||||
|| die "unable to sed ctags.1"
|
||||
|
||||
AT_M4DIR=m4 eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
strip-flags
|
||||
filter-flags -pie #526948
|
||||
|
||||
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; then
|
||||
use sound || ewarn \
|
||||
"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
|
||||
myconf+=" --with-sound=alsa"
|
||||
else
|
||||
myconf+=" --with-sound=$(usex sound oss)"
|
||||
fi
|
||||
|
||||
if use X; then
|
||||
myconf+=" --with-x --without-ns"
|
||||
myconf+=" $(use_with gconf)"
|
||||
myconf+=" $(use_with gsettings)"
|
||||
myconf+=" $(use_with toolkit-scroll-bars)"
|
||||
myconf+=" $(use_with gif)"
|
||||
myconf+=" $(use_with jpeg)"
|
||||
myconf+=" $(use_with png)"
|
||||
myconf+=" $(use_with svg rsvg)"
|
||||
myconf+=" $(use_with tiff)"
|
||||
myconf+=" $(use_with xpm)"
|
||||
myconf+=" $(use_with imagemagick)"
|
||||
|
||||
if use xft; then
|
||||
myconf+=" --with-xft"
|
||||
myconf+=" $(use_with cairo)"
|
||||
myconf+=" $(use_with m17n-lib libotf)"
|
||||
myconf+=" $(use_with m17n-lib m17n-flt)"
|
||||
else
|
||||
myconf+=" --without-xft"
|
||||
myconf+=" --without-cairo"
|
||||
myconf+=" --without-libotf --without-m17n-flt"
|
||||
use cairo && ewarn \
|
||||
"USE flag \"cairo\" has no effect if \"xft\" is not set."
|
||||
use m17n-lib && ewarn \
|
||||
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
|
||||
fi
|
||||
|
||||
local f line
|
||||
if use gtk; then
|
||||
einfo "Configuring to build with GIMP Toolkit (GTK+)"
|
||||
while read line; do ewarn "${line}"; done <<-EOF
|
||||
Your version of GTK+ will have problems with closing open
|
||||
displays. This is no problem if you just use one display, but
|
||||
if you use more than one and close one of them Emacs may crash.
|
||||
See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
|
||||
If you intend to use more than one display, then it is strongly
|
||||
recommended that you compile Emacs with the Athena/Lucid or the
|
||||
Motif toolkit instead.
|
||||
EOF
|
||||
if use xwidgets; then
|
||||
myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
|
||||
else
|
||||
myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
|
||||
myconf+=" --without-xwidgets"
|
||||
fi
|
||||
for f in motif Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"gtk\" is set."
|
||||
done
|
||||
elif use motif; then
|
||||
einfo "Configuring to build with Motif toolkit"
|
||||
myconf+=" --with-x-toolkit=motif"
|
||||
for f in Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"motif\" is set."
|
||||
done
|
||||
elif use athena || use Xaw3d; then
|
||||
einfo "Configuring to build with Athena/Lucid toolkit"
|
||||
myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
|
||||
else
|
||||
einfo "Configuring to build with no toolkit"
|
||||
myconf+=" --with-x-toolkit=no"
|
||||
fi
|
||||
! use gtk && use xwidgets && ewarn \
|
||||
"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
|
||||
elif use aqua; then
|
||||
einfo "Configuring to build with Nextstep (Cocoa) support"
|
||||
myconf+=" --with-ns --disable-ns-self-contained"
|
||||
myconf+=" --without-x"
|
||||
else
|
||||
myconf+=" --without-x --without-ns"
|
||||
fi
|
||||
|
||||
econf \
|
||||
--program-suffix="-${EMACS_SUFFIX}" \
|
||||
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
|
||||
--localstatedir="${EPREFIX}"/var \
|
||||
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
|
||||
--without-compress-install \
|
||||
--without-hesiod \
|
||||
--without-pop \
|
||||
--with-file-notification=$(usev inotify || usev gfile || echo no) \
|
||||
$(use_enable acl) \
|
||||
$(use_with dbus) \
|
||||
$(use_with dynamic-loading modules) \
|
||||
$(use_with games gameuser ":gamestat") \
|
||||
$(use_with gpm) \
|
||||
$(use_with kerberos) $(use_with kerberos kerberos5) \
|
||||
$(use_with libxml2 xml2) \
|
||||
$(use_with mailutils) \
|
||||
$(use_with selinux) \
|
||||
$(use_with ssl gnutls) \
|
||||
$(use_with systemd libsystemd) \
|
||||
$(use_with threads) \
|
||||
$(use_with wide-int) \
|
||||
$(use_with zlib) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Disable sandbox when dumping. For the unbelievers, see bug #131505
|
||||
emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
|
||||
}
|
||||
|
||||
src_install () {
|
||||
emake DESTDIR="${D}" NO_BIN_LINK=t install
|
||||
|
||||
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
|
||||
|| die "moving emacs executable failed"
|
||||
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
|
||||
|| die "moving emacs man page failed"
|
||||
|
||||
# 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/{appdata,applications,icons}
|
||||
rm -rf "${ED}/usr/$(get_libdir)"
|
||||
rm -rf "${ED}"/var
|
||||
|
||||
# remove unused <version>/site-lisp dir
|
||||
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
|
||||
|
||||
# remove COPYING file (except for etc/COPYING used by describe-copying)
|
||||
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
|
||||
|
||||
if use gzip-el; then
|
||||
# compress .el files when a corresponding .elc exists
|
||||
find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
|
||||
-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
|
||||
assert "gzip .el failed"
|
||||
fi
|
||||
|
||||
local cdir
|
||||
if use source; then
|
||||
cdir="/usr/share/emacs/${FULL_VERSION}/src"
|
||||
insinto "${cdir}"
|
||||
# This is not meant to install all the source -- just the
|
||||
# C source you might find via find-function
|
||||
doins src/*.{c,h,m}
|
||||
elif has installsources ${FEATURES}; then
|
||||
cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
|
||||
fi
|
||||
|
||||
sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
|
||||
X
|
||||
;;; ${PN}-${SLOT} site-lisp configuration
|
||||
X
|
||||
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
|
||||
Y (setq find-function-C-source-directory
|
||||
Y "${EPREFIX}${cdir}")
|
||||
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 CONTRIBUTE
|
||||
|
||||
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
|
||||
fi
|
||||
|
||||
DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
|
||||
through the Emacs eselect module, which also redirects man and info
|
||||
pages. Therefore, several Emacs versions can be installed at the
|
||||
same time. \"man emacs.eselect\" for details.
|
||||
\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
|
||||
strongly recommended that you use app-admin/emacs-updater to rebuild
|
||||
all byte-compiled elisp files of the installed Emacs packages."
|
||||
use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
|
||||
Installing media-fonts/font-adobe-{75,100}dpi on the X server's
|
||||
machine would satisfy basic Emacs requirements under X11.
|
||||
See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
|
||||
for how to enable anti-aliased fonts."
|
||||
use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
|
||||
\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
|
||||
it into /Applications by yourself."
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
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"
|
||||
elif [[ -d "${ED}"${infodir} ]]; then
|
||||
# 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() {
|
||||
elisp-site-regen
|
||||
readme.gentoo_print_elog
|
||||
|
||||
if use livecd; then
|
||||
# force an update of the emacs symlink for the livecd/dvd,
|
||||
# because some microemacs packages set it with USE=livecd
|
||||
eselect emacs update
|
||||
elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
|
||||
# refresh symlinks in case any installed files have changed
|
||||
eselect emacs set ${EMACS_SUFFIX}
|
||||
else
|
||||
eselect emacs update ifunset
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
elisp-site-regen
|
||||
eselect emacs update ifunset
|
||||
}
|
||||
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST libvirt-4.1.0.tar.xz 15046956 BLAKE2B e5d4fb47d6308b2f74d464b8a4b236fcda96ca71357847ce7bc9c787e89111ed99538e9f7815287d14af24db1bc774012682843edc1e067cdf710e82d0b349c9 SHA512 62d1a228adf3270cc6defe3cbf92dac8c4ce2c434c4d97219571ccef799a4f6304cfd1ba9938338356641285f53ac71145d7b398523021c5ea1dc8e3d49cf894
|
||||
DIST libvirt-4.2.0.tar.xz 15180120 BLAKE2B 0df6caef7f377e627a7ca1d169e1c8032d02fdfb5cc32a3036fbedd021063672114fcef09aa34e7218b56eef0fe64509024fbcd674a0c5f312a7afb9aa3e34a5 SHA512 ced3a7408e95f1663deec03b095780d0f805126506a064a11063d1f313f923eb0ff0ea95f99826514d8cb4e51c850f6f02904e06e5ef8106c38898a0cfe7f9ed
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
DIST virt-manager-1.4.3.tar.gz 2765924 BLAKE2B fa888dc78bb8ab27ff5a507829c5ace5d0e82b7840c9d4ec1857dfd2e62f39172abf116ca3f4d99f4a2c4366f06695a52561e6c816969928df79e623fb4ce9bf SHA512 007f125503fc2c774beefc8047ca2c36aa7177af40d9bc78fa3448fd50d4d35abd4a1dbbf761a8cd538fdf6541eba46c2cd019ba3ff0c7e29b1944d873b74274
|
||||
DIST virt-manager-1.5.0.tar.gz 2797380 BLAKE2B 45ef8c2b98fa1d6f7c4b4fe45bca74e27d595eb4d2e7c80c4e7671c445d8e523b8a4c21eaffc02dea756b7a93f5b3c7f3bdc795a0cf6ef99230bcf0c5683c81b SHA512 b375927776b9132fbd9dacd8223b6c94b89c32d6812394ec7e18df7c66f7e6dec853885e85e2b4b4ffd283e8afe0dd2526bafeac4b55511a4a115ef5798f97da
|
||||
DIST virt-manager-1.5.1.tar.gz 2796831 BLAKE2B 0fc8b266e7dd2ac3f337e3f95f4328ece930ff66605a444bd728183ffb8fb497204f5e73409f42e3d19ccaa009195a552864dc09f9d78efda7c04f4c5292dbf5 SHA512 e0da3b879ea33a8c394c33df85cadac4fbb9cfed65f9a904c5d9bf07232e29f8c96b5242e3f94cae390b7b5d7a20e1c25c3867962f0a39de40e71dc00013d32b
|
||||
|
||||
@ -1,2 +1 @@
|
||||
DIST virt-viewer-5.0.tar.gz 908726 BLAKE2B ffc1e8ce7b74f888289a65a0ad7566c84278cbf1a412b426883313f1b66bb95e10b74fedb256b4ab6b39e4dc6e292e518585fcbaf07e7669b51a5be87cfd257f SHA512 924fa88fd0ca7cc5b3d0a348c0d1104337fe0a06328e32110b4417c64f5d9efaf6df534adbc1eaa69157d229763b773307fa834a66f16156e3703731525eb690
|
||||
DIST virt-viewer-6.0.tar.gz 922916 BLAKE2B 1c2246369474d06188dc2191b9756dbe69cff2d5f997ffb58bdab1143a0e4d6cda0e43b4b082d7921125caa4348635762070fa8e6686ccf7728a90e4e6fc3a18 SHA512 656d48f8ab387d025c406cb5f56164d79104c6c377fae37d9c524b90e512fe873d5d1d6c435d4ea95e71468b7d3384b89789495075cafb1a9e67f583f7d49ec2
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
inherit gnome2
|
||||
|
||||
DESCRIPTION="Graphical console client for connecting to virtual machines"
|
||||
HOMEPAGE="http://virt-manager.org/"
|
||||
SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="sasl +spice +vnc"
|
||||
|
||||
RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
|
||||
app-emulation/libvirt-glib
|
||||
>=dev-libs/libxml2-2.6
|
||||
x11-libs/gtk+:3
|
||||
spice? ( >=net-misc/spice-gtk-0.33[sasl?,gtk3] )
|
||||
vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3] )"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/perl
|
||||
>=dev-util/intltool-0.35.0
|
||||
virtual/pkgconfig
|
||||
spice? ( >=app-emulation/spice-protocol-0.12.10 )"
|
||||
|
||||
REQUIRED_USE="|| ( spice vnc )"
|
||||
|
||||
src_configure() {
|
||||
gnome2_src_configure \
|
||||
--disable-update-mimedb \
|
||||
--without-ovirt \
|
||||
$(use_with vnc gtk-vnc) \
|
||||
$(use_with spice spice-gtk)
|
||||
}
|
||||
Binary file not shown.
@ -1,38 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit games
|
||||
|
||||
DESCRIPTION="Manages renpy symlink"
|
||||
HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
RDEPEND="app-eselect/eselect-lib-bin-symlink"
|
||||
|
||||
S=${WORKDIR}
|
||||
|
||||
pkg_setup() { :; }
|
||||
|
||||
src_prepare() {
|
||||
sed \
|
||||
-e "s#@GAMES_BINDIR@#${GAMES_BINDIR}#" \
|
||||
"${FILESDIR}"/renpy.eselect-${PV} > "${WORKDIR}"/renpy.eselect || die
|
||||
}
|
||||
|
||||
src_configure() { :; }
|
||||
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/eselect/modules
|
||||
doins renpy.eselect
|
||||
}
|
||||
|
||||
pkg_preinst() { :; }
|
||||
|
||||
pkg_postinst() { :; }
|
||||
@ -1,14 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
DESCRIPTION="Manage default renpy version"
|
||||
MAINTAINER="hasufell@gentoo.org"
|
||||
VERSION="0.6"
|
||||
|
||||
SYMLINK_PATH="@GAMES_BINDIR@/renpy"
|
||||
SYMLINK_TARGETS=( renpy-6.14 renpy-6.15 renpy-6.16 renpy-6.17 renpy-6.18 renpy-6.99 )
|
||||
SYMLINK_DESCRIPTION='default renpy'
|
||||
SYMLINK_CRUCIAL=1
|
||||
|
||||
inherit bin-symlink
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,12 @@
|
||||
--- a/test/broker/c/Makefile 2016-02-14 14:36:55.000000000 +0000
|
||||
+++ b/test/broker/c/Makefile 2016-05-05 09:40:31.440608209 +0100
|
||||
@@ -13,7 +13,9 @@
|
||||
$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
|
||||
|
||||
08-tls-psk-bridge.test : 08-tls-psk-bridge.c
|
||||
+ifeq ($(WITH_BRIDGE),yes)
|
||||
$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
|
||||
+endif
|
||||
|
||||
|
||||
reallyclean : clean
|
||||
@ -0,0 +1,100 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit systemd user toolchain-funcs python-any-r1
|
||||
|
||||
DESCRIPTION="An Open Source MQTT v3 Broker"
|
||||
HOMEPAGE="http://mosquitto.org/"
|
||||
SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
|
||||
|
||||
LICENSE="EPL-1.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
|
||||
|
||||
REQUIRED_USE="test? ( bridge )"
|
||||
|
||||
RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
|
||||
ssl? ( dev-libs/openssl:0= )"
|
||||
DEPEND="${RDEPEND}
|
||||
${PYTHON_DEPS}
|
||||
srv? ( net-dns/c-ares )
|
||||
websockets? ( net-libs/libwebsockets )"
|
||||
|
||||
_emake() {
|
||||
LIBDIR=$(get_libdir)
|
||||
emake \
|
||||
CC="$(tc-getCC)" \
|
||||
LIB_SUFFIX="${LIBDIR:3}" \
|
||||
WITH_BRIDGE="$(usex bridge)" \
|
||||
WITH_PERSISTENCE="$(usex persistence)" \
|
||||
WITH_SRV="$(usex srv)" \
|
||||
WITH_TLS="$(usex ssl)" \
|
||||
WITH_WEBSOCKETS="$(usex websockets)" \
|
||||
WITH_WRAP="$(usex tcpd)" \
|
||||
"$@"
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup mosquitto
|
||||
enewuser mosquitto -1 -1 -1 mosquitto
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
eapply "${FILESDIR}/${P}-conditional-tests.patch"
|
||||
if use persistence; then
|
||||
sed -i -e "/^#autosave_interval/s|^#||" \
|
||||
-e "s|^#persistence false$|persistence true|" \
|
||||
-e "/^#persistence_file/s|^#||" \
|
||||
-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
|
||||
mosquitto.conf || die
|
||||
fi
|
||||
|
||||
# Remove prestripping
|
||||
sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
|
||||
client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
|
||||
|
||||
python_setup
|
||||
python_fix_shebang test
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
_emake
|
||||
}
|
||||
|
||||
src_test() {
|
||||
_emake test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
_emake DESTDIR="${D}" prefix=/usr install
|
||||
keepdir /var/lib/mosquitto
|
||||
fowners mosquitto:mosquitto /var/lib/mosquitto
|
||||
dodoc readme.md CONTRIBUTING.md ChangeLog.txt
|
||||
doinitd "${FILESDIR}"/mosquitto
|
||||
insinto /etc/mosquitto
|
||||
doins mosquitto.conf
|
||||
systemd_dounit "${FILESDIR}/mosquitto.service"
|
||||
|
||||
if use examples; then
|
||||
docompress -x "/usr/share/doc/${PF}/examples"
|
||||
docinto "/usr/share/doc/${PF}"
|
||||
doins -r examples
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog ""
|
||||
elog "The Python module has been moved out of mosquitto."
|
||||
elog "See http://mosquitto.org/documentation/python/"
|
||||
elog ""
|
||||
elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
|
||||
elog ""
|
||||
elog " rc-update add mosquitto default"
|
||||
elog " or"
|
||||
elog " systemctl enable mosquitto"
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,21 @@
|
||||
C compiler compiles this code for bot int-based and size_t-based
|
||||
guile. C++ compiler does not (and is what used by texmacs).
|
||||
|
||||
https://bugs.gentoo.org/652054
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 37e9e87..5de2711 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -274,11 +274,11 @@ SET(CMAKE_REQUIRED_FLAGS "-Werror ${Guile_CFLAGS}")
|
||||
SET(CMAKE_REQUIRED_INCLUDES ${Guile_INCLUDE_DIRS})
|
||||
SET(CMAKE_REQUIRED_LIBRARIES ${Guile_LIBRARIES})
|
||||
|
||||
MESSAGE(STATUS "Checking the size_t of guile strings")
|
||||
|
||||
-CHECK_C_SOURCE_COMPILES( "#include <guile/gh.h>
|
||||
+CHECK_CXX_SOURCE_COMPILES( "#include <guile/gh.h>
|
||||
#include <libguile.h>
|
||||
void print_string (SCM s) {
|
||||
int len_r;
|
||||
char* r= gh_scm2newstr (s, &len_r); } int main() { return 0; }
|
||||
" _guile_str_size_test)
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,102 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
GNOME2_LA_PUNT="yes"
|
||||
|
||||
inherit gnome2 systemd
|
||||
|
||||
DESCRIPTION="Simple document viewer for GNOME"
|
||||
HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
|
||||
|
||||
LICENSE="GPL-2+ CC-BY-SA-3.0"
|
||||
# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
|
||||
SLOT="0/evd3.4-evv3.3"
|
||||
IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps"
|
||||
KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
|
||||
|
||||
# atk used in libview
|
||||
# gdk-pixbuf used all over the place
|
||||
COMMON_DEPEND="
|
||||
dev-libs/atk
|
||||
>=dev-libs/glib-2.36:2[dbus]
|
||||
>=dev-libs/libxml2-2.5:2
|
||||
sys-libs/zlib:=
|
||||
x11-libs/gdk-pixbuf:2
|
||||
>=x11-libs/gtk+-3.16.0:3[introspection?]
|
||||
gnome-base/gsettings-desktop-schemas
|
||||
>=x11-libs/cairo-1.10:=
|
||||
>=app-text/poppler-0.33[cairo]
|
||||
djvu? ( >=app-text/djvu-3.5.22:= )
|
||||
dvi? (
|
||||
virtual/tex-base
|
||||
dev-libs/kpathsea:=
|
||||
t1lib? ( >=media-libs/t1lib-5:= ) )
|
||||
gstreamer? (
|
||||
media-libs/gstreamer:1.0
|
||||
media-libs/gst-plugins-base:1.0
|
||||
media-libs/gst-plugins-good:1.0 )
|
||||
gnome? ( gnome-base/gnome-desktop:3= )
|
||||
gnome-keyring? ( >=app-crypt/libsecret-0.5 )
|
||||
introspection? ( >=dev-libs/gobject-introspection-1:= )
|
||||
nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
|
||||
postscript? ( >=app-text/libspectre-0.2:= )
|
||||
tiff? ( >=media-libs/tiff-3.6:0= )
|
||||
xps? ( >=app-text/libgxps-0.2.1:= )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
gnome-base/gvfs
|
||||
gnome-base/librsvg
|
||||
|| (
|
||||
>=x11-themes/adwaita-icon-theme-2.17.1
|
||||
>=x11-themes/hicolor-icon-theme-0.10 )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
app-text/docbook-xml-dtd:4.3
|
||||
app-text/yelp-tools
|
||||
dev-util/gdbus-codegen
|
||||
>=dev-util/gtk-doc-am-1.13
|
||||
>=dev-util/intltool-0.35
|
||||
dev-util/itstool
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# eautoreconf needs:
|
||||
# app-text/yelp-tools
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PV}-CVE-2017-1000159.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
gnome2_src_prepare
|
||||
|
||||
# Do not depend on adwaita-icon-theme, bug #326855, #391859
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=29942
|
||||
sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
|
||||
-i configure || die "sed failed"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
gnome2_src_configure \
|
||||
--disable-static \
|
||||
--enable-pdf \
|
||||
--enable-comics \
|
||||
--enable-thumbnailer \
|
||||
--with-platform=gnome \
|
||||
--enable-dbus \
|
||||
$(use_enable djvu) \
|
||||
$(use_enable dvi) \
|
||||
$(use_enable gstreamer multimedia) \
|
||||
$(use_enable gnome libgnome-desktop) \
|
||||
$(use_with gnome-keyring keyring) \
|
||||
$(use_enable introspection) \
|
||||
$(use_enable nautilus) \
|
||||
$(use_enable nsplugin browser-plugin) \
|
||||
$(use_enable postscript ps) \
|
||||
$(use_enable t1lib) \
|
||||
$(use_enable tiff) \
|
||||
$(use_enable xps) \
|
||||
BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
|
||||
--with-systemduserunitdir="$(systemd_get_userunitdir)"
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
From 350404c76dc8601e2cdd2636490e2afc83d3090e Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Mueller <muelli@cryptobitch.de>
|
||||
Date: Fri, 14 Jul 2017 12:52:14 +0200
|
||||
Subject: [PATCH] dvi: Mitigate command injection attacks by quoting filename
|
||||
|
||||
With commit 1fcca0b8041de0d6074d7e17fba174da36c65f99 came a DVI backend.
|
||||
It exports to PDF via the dvipdfm tool.
|
||||
It calls that tool with the filename of the currently loaded document.
|
||||
If that filename is cleverly crafted, it can escape the currently
|
||||
used manual quoting of the filename. Instead of manually quoting the
|
||||
filename, we use g_shell_quote.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=784947
|
||||
---
|
||||
backend/dvi/dvi-document.c | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/backend/dvi/dvi-document.c b/backend/dvi/dvi-document.c
|
||||
index 4a896e21..28877700 100644
|
||||
--- a/backend/dvi/dvi-document.c
|
||||
+++ b/backend/dvi/dvi-document.c
|
||||
@@ -300,12 +300,14 @@ dvi_document_file_exporter_end (EvFileExporter *exporter)
|
||||
gboolean success;
|
||||
|
||||
DviDocument *dvi_document = DVI_DOCUMENT(exporter);
|
||||
+ gchar* quoted_filename = g_shell_quote (dvi_document->context->filename);
|
||||
|
||||
- command_line = g_strdup_printf ("dvipdfm %s -o %s \"%s\"", /* dvipdfm -s 1,2,.., -o exporter_filename dvi_filename */
|
||||
+ command_line = g_strdup_printf ("dvipdfm %s -o %s %s", /* dvipdfm -s 1,2,.., -o exporter_filename dvi_filename */
|
||||
dvi_document->exporter_opts->str,
|
||||
dvi_document->exporter_filename,
|
||||
- dvi_document->context->filename);
|
||||
-
|
||||
+ quoted_filename);
|
||||
+ g_free (quoted_filename);
|
||||
+
|
||||
success = g_spawn_command_line_sync (command_line,
|
||||
NULL,
|
||||
NULL,
|
||||
--
|
||||
2.17.0
|
||||
|
||||
@ -1 +0,0 @@
|
||||
DIST noweb-2.11b.tgz 738870 BLAKE2B 039bc6673056e1cc5bf68ca9d9f95d266dbe48e54e005b8ee067f679514c4da4470c3f6d08841b5fc998b0f79ee85042bc64dd13cac2820c7604da6792dff0cb SHA512 0363c68aa31549fd806a575e6055b117db51fb5b5f28e7b30bdf3c108b3cf9546e1c6a4e64faf892b013c79665b14d436879800d4e970b0732fbd482b416d0f9
|
||||
@ -1,4 +0,0 @@
|
||||
(add-to-list 'load-path "@SITELISP@")
|
||||
(autoload 'noweb-mode "noweb-mode"
|
||||
"Minor meta mode for editing noweb files." t)
|
||||
(add-to-list 'auto-mode-alist '("\\.nw\\'" . noweb-mode))
|
||||
@ -1,27 +0,0 @@
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=338899
|
||||
|
||||
Index: noweb-2.11b/src/c/Makefile
|
||||
===================================================================
|
||||
--- noweb-2.11b.orig/src/c/Makefile
|
||||
+++ noweb-2.11b/src/c/Makefile
|
||||
@@ -41,16 +41,16 @@ CPIF=>
|
||||
all: nt markup mnt finduses
|
||||
|
||||
nt: $(TANGLEOBJS)
|
||||
- $(CC) $(CFLAGS) -o nt $(TANGLEOBJS)
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o nt $(TANGLEOBJS)
|
||||
|
||||
finduses: $(FINDUSESOBJS)
|
||||
- $(CC) $(CFLAGS) -o finduses $(FINDUSESOBJS)
|
||||
+
|
||||
|
||||
markup: $(MARKUPOBJS)
|
||||
- $(CC) $(CFLAGS) -o markup $(MARKUPOBJS)
|
||||
+
|
||||
|
||||
mnt: $(MNTOBJS)
|
||||
- $(CC) $(CFLAGS) -o mnt $(MNTOBJS)
|
||||
+
|
||||
|
||||
source: $(SRCS)
|
||||
touch: $(SRCS)
|
||||
@ -1,136 +0,0 @@
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=264273
|
||||
|
||||
Index: noweb-2.11b/Makefile
|
||||
===================================================================
|
||||
--- noweb-2.11b.orig/Makefile
|
||||
+++ noweb-2.11b/Makefile
|
||||
@@ -9,14 +9,14 @@ SHELL=/bin/sh
|
||||
CINAME=-Nv`echo $(VERSION) | tr . _`
|
||||
CIMSG=-f -m'standard checkin preparing to export version $(VERSION)'
|
||||
|
||||
-source: ; for i in src; do (cd $$i; make source); done
|
||||
-www: ; for i in src/xdoc examples; do (cd $$i; make www); done
|
||||
+source: ; for i in src; do (cd $$i; $(MAKE) source); done
|
||||
+www: ; for i in src/xdoc examples; do (cd $$i; $(MAKE) www); done
|
||||
|
||||
clean:
|
||||
- for i in src examples contrib; do (cd $$i; make clean); done
|
||||
+ for i in src examples contrib; do (cd $$i; $(MAKE) clean); done
|
||||
rm -f nwsrcfilter *~ */*~
|
||||
clobber: clean
|
||||
- for i in src examples contrib; do (cd $$i; make clobber); done
|
||||
+ for i in src examples contrib; do (cd $$i; $(MAKE) clobber); done
|
||||
|
||||
DATE:
|
||||
(./echo -n "Version $(VERSION) of "; date) > DATE
|
||||
@@ -51,6 +51,6 @@ emacscheck:
|
||||
diff src/elisp/noweb-mode.el $(HOME)/emacs/noweb-mode.el
|
||||
|
||||
checkin:
|
||||
- (cd src; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin)
|
||||
+ (cd src; $(MAKE) "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin)
|
||||
|
||||
|
||||
Index: noweb-2.11b/contrib/norman/Makefile
|
||||
===================================================================
|
||||
--- noweb-2.11b.orig/contrib/norman/Makefile
|
||||
+++ noweb-2.11b/contrib/norman/Makefile
|
||||
@@ -1,10 +1,10 @@
|
||||
LIB=/dev/null # to be overridden
|
||||
DIRS=numarkup
|
||||
|
||||
-all: ; for i in $(DIRS); do (cd $$i; make ICONC=$(ICONC) ICONT=$(ICONT) all); done
|
||||
-install: ; for i in $(DIRS); do (cd $$i; make LIB=$(LIB) BIN=$(BIN) install); done
|
||||
-source: ; for i in $(DIRS); do (cd $$i; make source); done
|
||||
-clean: ; for i in $(DIRS); do (cd $$i; make clean); done
|
||||
+all: ; for i in $(DIRS); do (cd $$i; $(MAKE) ICONC=$(ICONC) ICONT=$(ICONT) all); done
|
||||
+install: ; for i in $(DIRS); do (cd $$i; $(MAKE) LIB=$(LIB) BIN=$(BIN) install); done
|
||||
+source: ; for i in $(DIRS); do (cd $$i; $(MAKE) source); done
|
||||
+clean: ; for i in $(DIRS); do (cd $$i; $(MAKE) clean); done
|
||||
iconlib: # cheap hack for slackmake
|
||||
true
|
||||
|
||||
Index: noweb-2.11b/contrib/norman/numarkup/Makefile
|
||||
===================================================================
|
||||
--- noweb-2.11b.orig/contrib/norman/numarkup/Makefile
|
||||
+++ noweb-2.11b/contrib/norman/numarkup/Makefile
|
||||
@@ -11,11 +11,11 @@ OBJS = main.o pass1.o latex.o input.o sc
|
||||
|
||||
all:
|
||||
noweb -t numarkup.nw
|
||||
- make $(TARGET)
|
||||
+ $(MAKE) $(TARGET)
|
||||
|
||||
install:
|
||||
noweb -t numarkup.nw
|
||||
- make $(TARGET)
|
||||
+ $(MAKE) $(TARGET)
|
||||
strip $(TARGET)
|
||||
cp $(TARGET) $(LIB)
|
||||
|
||||
Index: noweb-2.11b/src/Makefile
|
||||
===================================================================
|
||||
--- noweb-2.11b.orig/src/Makefile
|
||||
+++ noweb-2.11b/src/Makefile
|
||||
@@ -41,9 +41,9 @@ LIBNAME=$(LIB)
|
||||
TEXNAME=$(TEXINPUTS)
|
||||
|
||||
all:
|
||||
- cd c; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" all
|
||||
- for i in shell lib xdoc tex; do (cd $$i; make all); done
|
||||
- cd $(LIBSRC); make "ICONT=$(ICONT)" "ICONC=$(ICONC)" all
|
||||
+ cd c; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" all
|
||||
+ for i in shell lib xdoc tex; do (cd $$i; $(MAKE) all); done
|
||||
+ cd $(LIBSRC); $(MAKE) "ICONT=$(ICONT)" "ICONC=$(ICONC)" all
|
||||
|
||||
FAQ: FAQ.html
|
||||
sleep 1; html2ascii FAQ.html > FAQ
|
||||
@@ -101,13 +101,13 @@ install-code: install-shell
|
||||
-mkdir $(BIN) $(LIB) 2>/dev/null
|
||||
true c/nt c/markup c/mnt c/finduses
|
||||
cp c/nt c/markup c/mnt c/finduses $(LIB)
|
||||
- cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
|
||||
- cd lib; make LIB=$(LIB) install
|
||||
+ cd $(LIBSRC); $(MAKE) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
|
||||
+ cd lib; $(MAKE) LIB=$(LIB) install
|
||||
|
||||
uninstall-code: uninstall-shell
|
||||
rm $(LIB)/nt $(LIB)/markup $(LIB)/mnt $(LIB)/finduses
|
||||
- cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
|
||||
- cd lib; make LIB=$(LIB) uninstall
|
||||
+ cd $(LIBSRC); $(MAKE) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
|
||||
+ cd lib; $(MAKE) LIB=$(LIB) uninstall
|
||||
install-man:
|
||||
-mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null
|
||||
sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 > $(MANDIR)/cpif.$(MANEXT)
|
||||
@@ -193,24 +193,24 @@ install-elisp:
|
||||
uninstall-elisp:
|
||||
rm -f $(ELISP)/noweb-mode.el
|
||||
checkin:
|
||||
- for i in lib tex xdoc; do (cd $$i; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done
|
||||
+ for i in lib tex xdoc; do (cd $$i; $(MAKE) "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done
|
||||
for i in c icon awk; do (cd $$i; ci -l $(CINAME) $(CIMSG) *.nw Makefile); done
|
||||
(cd elisp; ci -l $(CINAME) $(CIMSG) *.el)
|
||||
ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw
|
||||
|
||||
source: FAQ
|
||||
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make CPIF=">" source); done
|
||||
+ for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) CPIF=">" source); done
|
||||
sleep 1
|
||||
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done
|
||||
+ for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) touch); done
|
||||
touch:
|
||||
touch FAQ
|
||||
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done
|
||||
+ for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) touch); done
|
||||
clean:
|
||||
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make clean); done
|
||||
+ for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) clean); done
|
||||
rm -f nwsrcfilter *~ */*~
|
||||
|
||||
clobber: clean
|
||||
- for i in c lib icon awk xdoc; do (cd $$i; make clobber); done
|
||||
+ for i in c lib icon awk xdoc; do (cd $$i; $(MAKE) clobber); done
|
||||
|
||||
Makefile: Makefile.nw
|
||||
chmod +w Makefile
|
||||
@ -1,178 +0,0 @@
|
||||
diff -urN noweb-2.9.orig/src/awk/totex.nw noweb-2.9/src/awk/totex.nw
|
||||
--- noweb-2.9.orig/src/awk/totex.nw 2000-03-27 02:00:00.000000000 +0200
|
||||
+++ noweb-2.9/src/awk/totex.nw 2006-02-17 12:47:05.000000000 +0100
|
||||
@@ -24,7 +24,7 @@
|
||||
@
|
||||
On an ugly system, we have to put it in a file.
|
||||
<<invoke awk program using file>>=
|
||||
-awkfile=/tmp/totex$$.awk
|
||||
+awkfile=$(tempfile -p totex)
|
||||
trap 'rm -f $awkfile; exit 1' 0 1 2 15 # clean up files
|
||||
cat > $awkfile << 'EOF'
|
||||
<<awk program for conversion to {\TeX}>>
|
||||
diff -urN noweb-2.9.orig/src/awkname noweb-2.9/src/awkname
|
||||
--- noweb-2.9.orig/src/awkname 2000-06-23 12:56:00.000000000 +0200
|
||||
+++ noweb-2.9/src/awkname 2006-02-17 12:47:05.000000000 +0100
|
||||
@@ -5,7 +5,7 @@
|
||||
esac
|
||||
|
||||
rc=0
|
||||
-new=/tmp/$$.new; old=/tmp/$$.old
|
||||
+new=$(tempfile -p new); old=$(tempfile -p old)
|
||||
|
||||
for file in lib/emptydefn lib/unmarkup lib/toascii lib/btdefn \
|
||||
awk/noidx awk/totex awk/tohtml awk/noindex \
|
||||
diff -urN noweb-2.9.orig/src/lib/toascii noweb-2.9/src/lib/toascii
|
||||
--- noweb-2.9.orig/src/lib/toascii 2001-03-28 15:49:00.000000000 +0200
|
||||
+++ noweb-2.9/src/lib/toascii 2006-02-17 12:47:05.000000000 +0100
|
||||
@@ -7,9 +7,9 @@
|
||||
*) echo "This can't happen -- $i passed to toascii" 1>&2 ; exit 1 ;;
|
||||
esac
|
||||
done
|
||||
-awkfile="tmp/awk$$.tmp"
|
||||
-textfile="/tmp/text$$.tmp"
|
||||
-tagsfile="/tmp/tags$$.tmp"
|
||||
+awkfile=$(tempfile -p awk -s .tmp)
|
||||
+textfile=$(tempfile -p text -s .tmp)
|
||||
+tagsfile=$(tempfile -p tags -s .tmp)
|
||||
export awkfile textfile tagsfile
|
||||
trap 'rm -f $awkfile $textfile $tagsfile' 0 1 2 10 14 15
|
||||
nawk 'BEGIN { textfile=ENVIRON["textfile"]
|
||||
diff -urN noweb-2.9.orig/src/lib/toascii.nw noweb-2.9/src/lib/toascii.nw
|
||||
--- noweb-2.9.orig/src/lib/toascii.nw 2000-03-27 02:00:00.000000000 +0200
|
||||
+++ noweb-2.9/src/lib/toascii.nw 2006-02-17 12:48:20.000000000 +0100
|
||||
@@ -28,9 +28,9 @@
|
||||
Also arranged here is a temporary file for storage of the awk program on an
|
||||
ugly system, as discussed below.
|
||||
<<arrange temporary files>>=
|
||||
-awkfile="tmp/awk$$.tmp"
|
||||
-textfile="/tmp/text$$.tmp"
|
||||
-tagsfile="/tmp/tags$$.tmp"
|
||||
+awkfile=$(tempfile -p awk -s .tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
|
||||
+textfile=$(tempfile -p text -s .tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
|
||||
+tagsfile=$(tempfile -p tags -s .tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
|
||||
export awkfile textfile tagsfile
|
||||
trap 'rm -f $awkfile $textfile $tagsfile' 0 1 2 10 14 15
|
||||
@ %def textfile tagsfile awkfile
|
||||
diff -urN noweb-2.9.orig/src/shell/cpif noweb-2.9/src/shell/cpif
|
||||
--- noweb-2.9.orig/src/shell/cpif 2000-03-27 02:00:00.000000000 +0200
|
||||
+++ noweb-2.9/src/shell/cpif 2006-02-17 12:47:05.000000000 +0100
|
||||
@@ -17,7 +17,7 @@
|
||||
0) echo 'Usage: '`basename $0`' [ -eq -ne ] file...' 1>&2; exit 2
|
||||
esac
|
||||
|
||||
-new=/tmp/$$
|
||||
+new=$(tempfile)
|
||||
trap 'rm -f $new; exit 1' 1 2 15 # clean up files
|
||||
|
||||
cat >$new
|
||||
diff -urN noweb-2.9.orig/src/shell/nonu noweb-2.9/src/shell/nonu
|
||||
--- noweb-2.9.orig/src/shell/nonu 2000-03-27 02:00:00.000000000 +0200
|
||||
+++ noweb-2.9/src/shell/nonu 2006-02-17 12:47:05.000000000 +0100
|
||||
@@ -2,7 +2,7 @@
|
||||
LIB=/usr/public/pkg/noweb/lib
|
||||
# attempt to convert nuweb to noweb using sam
|
||||
|
||||
-tmp=/tmp/nonu$$
|
||||
+tmp=$(tempfile -p nonu)
|
||||
trap '/bin/rm -f $tmp; exit 1' 1 2 15 # clean up files
|
||||
cp $1 $tmp || exit 1
|
||||
|
||||
diff -urN noweb-2.9.orig/src/shell/noroff noweb-2.9/src/shell/noroff
|
||||
--- noweb-2.9.orig/src/shell/noroff 2001-03-28 15:49:00.000000000 +0200
|
||||
+++ noweb-2.9/src/shell/noroff 2006-02-17 12:47:05.000000000 +0100
|
||||
@@ -35,9 +35,10 @@
|
||||
|
||||
base="`basename $1 | sed '/\./s/\.[^.]*$//'`"
|
||||
tagsfile="$base.nwt"
|
||||
+tmpfile=$(tempfile -p tags)
|
||||
(echo ".so $macrodir/tmac.w"
|
||||
if [ -r "$tagsfile" ]; then
|
||||
- cp $tagsfile /tmp/tags.$$
|
||||
+ cp $tagsfile $tmpfile
|
||||
$AWK '{
|
||||
if (sub(/^###TAG### / , "")) tags[$1] = $2
|
||||
else if (sub(/^###BEGINCHUNKS###/, "")) printf ".de CLIST\n.CLISTBEGIN\n"
|
||||
@@ -88,8 +89,8 @@
|
||||
# print str3
|
||||
# print convquote(str3)
|
||||
# }
|
||||
- function tag(s) { if (s in tags) return tags[s]; else return "???" }' /tmp/tags.$$
|
||||
- rm -f /tmp/tags.$$
|
||||
+ function tag(s) { if (s in tags) return tags[s]; else return "???" }' $tmpfile
|
||||
+ rm -f $tmpfile
|
||||
fi
|
||||
cat "$@") |
|
||||
($ROFF $opts 2>$tagsfile)
|
||||
diff -urN noweb-2.9.orig/src/shell/roff.mm noweb-2.9/src/shell/roff.mm
|
||||
--- noweb-2.9.orig/src/shell/roff.mm 2000-03-27 02:00:00.000000000 +0200
|
||||
+++ noweb-2.9/src/shell/roff.mm 2006-02-17 12:48:20.000000000 +0100
|
||||
@@ -214,7 +214,7 @@
|
||||
.ADDLIST 1a
|
||||
.PRINTLIST
|
||||
|
||||
-awkfile="/tmp/noweb$$.awk"
|
||||
+awkfile=$(tempfile -p noweb -s .awk) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
|
||||
trap 'rm -f $awkfile' 0 1 2 10 14 15
|
||||
cat > $awkfile \&<< 'EOF'
|
||||
\c
|
||||
@@ -1628,14 +1628,15 @@
|
||||
tagsfile="$base.nwt"
|
||||
(echo ".so $macrodir/tmac.w"
|
||||
if [ -r "$tagsfile" ]; then
|
||||
- cp $tagsfile /tmp/tags.$$
|
||||
+ tagstemp=$(tempfile -p tags) || { echo "$0: Cannot create temporary file" >&2; exit 1; }
|
||||
+ cp $tagsfile $tagstemp
|
||||
$AWK '\c
|
||||
.USE "action for \*[BEGINCONVQUOTE]tags\*[ENDCONVQUOTE] line" 11c
|
||||
\&
|
||||
\c
|
||||
.USE "functions" 8a
|
||||
-\&' /tmp/tags.$$
|
||||
- rm -f /tmp/tags.$$
|
||||
+\&' $tagstemp
|
||||
+ rm -f $tagstemp
|
||||
fi
|
||||
cat "$@") |
|
||||
($ROFF $opts 2>$tagsfile)
|
||||
diff -urN noweb-2.9.orig/src/shell/roff.nw noweb-2.9/src/shell/roff.nw
|
||||
--- noweb-2.9.orig/src/shell/roff.nw 2000-03-27 02:00:00.000000000 +0200
|
||||
+++ noweb-2.9/src/shell/roff.nw 2006-02-17 12:47:05.000000000 +0100
|
||||
@@ -80,7 +80,7 @@
|
||||
other, and quoting each quote is ugly. The pragmatic solution is to
|
||||
copy the awk program into a temporary file, using a shell here-document.
|
||||
<<invoke awk program>>=
|
||||
-awkfile="/tmp/noweb$$.awk"
|
||||
+awkfile=$(tempfile -p noweb -s .awk)
|
||||
trap 'rm -f $awkfile' 0 1 2 10 14 15
|
||||
cat > $awkfile << 'EOF'
|
||||
<<awk program>>
|
||||
@@ -662,12 +662,13 @@
|
||||
|
||||
base="`basename $1 | sed '/\./s/\.[^.]*$//'`"
|
||||
tagsfile="$base.nwt"
|
||||
+tmpfile=$(tempfile -p tags)
|
||||
(echo ".so $macrodir/tmac.w"
|
||||
if [ -r "$tagsfile" ]; then
|
||||
- cp $tagsfile /tmp/tags.$$
|
||||
+ cp $tagsfile $tmpfile
|
||||
$AWK '<<action for [[tags]] line>>
|
||||
- <<functions>>' /tmp/tags.$$
|
||||
- rm -f /tmp/tags.$$
|
||||
+ <<functions>>' $tmpfile
|
||||
+ rm -f $tmpfile
|
||||
fi
|
||||
cat "$@") |
|
||||
($ROFF $opts 2>$tagsfile)
|
||||
diff -urN noweb-2.9.orig/src/shell/toroff noweb-2.9/src/shell/toroff
|
||||
--- noweb-2.9.orig/src/shell/toroff 2001-03-28 15:49:00.000000000 +0200
|
||||
+++ noweb-2.9/src/shell/toroff 2006-02-17 12:47:05.000000000 +0100
|
||||
@@ -9,7 +9,7 @@
|
||||
exit 1;;
|
||||
esac
|
||||
done
|
||||
-awkfile="/tmp/noweb$$.awk"
|
||||
+awkfile=$(tempfile -p noweb -s .awk)
|
||||
trap 'rm -f $awkfile' 0 1 2 10 14 15
|
||||
cat > $awkfile << 'EOF'
|
||||
/^@begin docs 0$/ { if (delay) next }
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>tex@gentoo.org</email>
|
||||
<name>Gentoo TeX Project</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1,101 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=3
|
||||
|
||||
inherit eutils toolchain-funcs elisp-common
|
||||
|
||||
DESCRIPTION="a literate programming tool, lighter than web"
|
||||
HOMEPAGE="https://www.cs.tufts.edu/~nr/noweb/"
|
||||
#SRC_URI="ftp://www.eecs.harvard.edu/pub/nr/${P}.tgz"
|
||||
SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tgz"
|
||||
#put on devspace, because no-passive-ftp is required on havard.edu.
|
||||
|
||||
LICENSE="noweb emacs? ( GPL-2 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="emacs examples"
|
||||
|
||||
DEPEND="virtual/tex-base
|
||||
dev-lang/icon
|
||||
sys-apps/debianutils
|
||||
emacs? ( virtual/emacs )"
|
||||
RDEPEND=${DEPEND}
|
||||
|
||||
S=${WORKDIR}/${P}/src
|
||||
|
||||
SITEFILE=50${PN}-gentoo.el
|
||||
|
||||
src_prepare() {
|
||||
# glibc2.10 compat (bug 270757)
|
||||
# mkdir d && cp -r c/* d/
|
||||
sed "s:getline (:getline_nonlibc (:" -i c/getline.{c,h} || die
|
||||
sed "s:getline(:getline_nonlibc(:" -i c/{notangle.c,getline.c,finduses.c} || die
|
||||
# diff -u d/ c/
|
||||
|
||||
epatch "${FILESDIR}"/${PN}-2.9-security.patch
|
||||
# dont run texhash...
|
||||
sed -i -e "s/texhash/true/" Makefile
|
||||
# dont strip...
|
||||
sed -i -e "s/strip/true/" Makefile
|
||||
|
||||
cd "${WORKDIR}/${P}"
|
||||
epatch "${FILESDIR}"/${P}-recmake.patch
|
||||
epatch "${FILESDIR}"/${P}-ldflags.patch
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# noweb tries to use notangle and noweb; see bug #50429
|
||||
( cd c; emake ICONC="icont" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LIBSRC="icon" ) || die
|
||||
export PATH="${PATH}:${T}"
|
||||
emake ICONC="icont" CC="$(tc-getCC)" BIN="${T}" LIB="${T}" LIBSRC="icon" install-code \
|
||||
|| die "make temporal install failed."
|
||||
|
||||
emake ICONC="icont" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LIBSRC="icon" || die "make failed"
|
||||
# Set awk to awk not nawk
|
||||
./awkname awk
|
||||
|
||||
if use emacs; then
|
||||
elisp-compile elisp/noweb-mode.el || die "elisp-compile failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install () {
|
||||
# It needs the directories to exist first...
|
||||
dodir /usr/bin
|
||||
dodir /usr/libexec/${PN}
|
||||
dodir /usr/share/man
|
||||
dodir /usr/share/texmf-site/tex/inputs
|
||||
emake ICONC="icont" \
|
||||
BIN="${ED}/usr/bin" \
|
||||
LIBSRC="icon" \
|
||||
LIBNAME="${EPREFIX}/usr/libexec/${PN}" \
|
||||
LIB="${ED}/usr/libexec/${PN}" \
|
||||
MAN="${ED}/usr/share/man" \
|
||||
TEXNAME="${EPREFIX}/usr/share/texmf-site/tex/inputs" \
|
||||
TEXINPUTS="${ED}/usr/share/texmf-site/tex/inputs" \
|
||||
install || die "make install failed"
|
||||
cd "${WORKDIR}/${P}"
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins examples/*
|
||||
fi
|
||||
dodoc CHANGES README
|
||||
|
||||
if use emacs; then
|
||||
elisp-install ${PN} src/elisp/noweb-mode.{el,elc} \
|
||||
|| die "elisp-install failed"
|
||||
elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
|
||||
|| die "elisp-site-file-install failed"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
einfo "Running texhash to complete installation.."
|
||||
texhash
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
@ -1,120 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit autotools sgml-catalog eutils flag-o-matic multilib toolchain-funcs
|
||||
|
||||
DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML documents"
|
||||
HOMEPAGE="http://openjade.sourceforge.net"
|
||||
SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="static-libs"
|
||||
|
||||
RDEPEND="app-text/sgml-common
|
||||
>=app-text/opensp-1.5.1"
|
||||
DEPEND="dev-lang/perl
|
||||
${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-deplibs.patch
|
||||
epatch "${FILESDIR}"/${P}-ldflags.patch
|
||||
epatch "${FILESDIR}"/${P}-msggen.pl.patch
|
||||
epatch "${FILESDIR}"/${P}-respect-ldflags.patch
|
||||
epatch "${FILESDIR}"/${P}-libosp-la.patch
|
||||
epatch "${FILESDIR}"/${P}-gcc46.patch
|
||||
epatch "${FILESDIR}"/${P}-darwin.patch
|
||||
|
||||
# Please note! Opts are disabled. If you know what you're doing
|
||||
# feel free to remove this line. It may cause problems with
|
||||
# docbook-sgml-utils among other things.
|
||||
#ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
|
||||
strip-flags
|
||||
|
||||
# Default CFLAGS and CXXFLAGS is -O2 but this make openjade segfault
|
||||
# on hppa. Using -O1 works fine. So I force it here.
|
||||
use hppa && replace-flags -O2 -O1
|
||||
|
||||
ln -s config/configure.in configure.ac || die
|
||||
cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die
|
||||
rm config/missing || die
|
||||
|
||||
AT_NOEAUTOMAKE=yes
|
||||
eautoreconf
|
||||
|
||||
SGML_PREFIX="${EPREFIX}"/usr/share/sgml
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# avoids dead-store elimination optimization
|
||||
# leading to segfaults on GCC 6
|
||||
# bug #592590 #596506
|
||||
tc-is-clang || append-cxxflags $(test-flags-CXX -fno-lifetime-dse)
|
||||
|
||||
# We need Prefix env, bug #287358
|
||||
export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
|
||||
econf \
|
||||
--enable-http \
|
||||
--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
|
||||
--enable-default-search-path="${EPREFIX}"/usr/share/sgml \
|
||||
--enable-splibdir="${EPREFIX}"/usr/$(get_libdir) \
|
||||
--libdir="${EPREFIX}"/usr/$(get_libdir) \
|
||||
--datadir="${EPREFIX}"/usr/share/sgml/${P} \
|
||||
$(use_enable static-libs static)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Bug 412725.
|
||||
unset INCLUDE
|
||||
|
||||
emake -j1 SHELL="${BASH}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr/$(get_libdir)
|
||||
|
||||
make DESTDIR="${D}" \
|
||||
SHELL="${BASH}" \
|
||||
libdir="${EPREFIX}"/usr/$(get_libdir) \
|
||||
install install-man
|
||||
|
||||
prune_libtool_files
|
||||
|
||||
dosym openjade /usr/bin/jade
|
||||
dosym onsgmls /usr/bin/nsgmls
|
||||
dosym osgmlnorm /usr/bin/sgmlnorm
|
||||
dosym ospam /usr/bin/spam
|
||||
dosym ospent /usr/bin/spent
|
||||
dosym osx /usr/bin/sgml2xml
|
||||
|
||||
insinto /usr/share/sgml/${P}/
|
||||
doins dsssl/builtins.dsl
|
||||
|
||||
echo 'SYSTEM "builtins.dsl" "builtins.dsl"' > ${ED}/usr/share/sgml/${P}/catalog
|
||||
insinto /usr/share/sgml/${P}/dsssl
|
||||
doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd}
|
||||
newins "${FILESDIR}"/${P}.dsssl-catalog catalog
|
||||
# Breaks sgml2xml among other things
|
||||
# insinto /usr/share/sgml/${P}/unicode
|
||||
# doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
|
||||
insinto /usr/share/sgml/${P}/pubtext
|
||||
doins pubtext/*
|
||||
|
||||
dodoc NEWS README VERSION
|
||||
dohtml doc/*.htm
|
||||
|
||||
insinto /usr/share/doc/${PF}/jadedoc
|
||||
doins jadedoc/*.htm
|
||||
insinto /usr/share/doc/${PF}/jadedoc/images
|
||||
doins jadedoc/images/*
|
||||
}
|
||||
|
||||
sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
|
||||
"/usr/share/sgml/openjade-${PV}/catalog"
|
||||
sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
|
||||
"/usr/share/sgml/openjade-${PV}/dsssl/catalog"
|
||||
sgml-catalog_cat_include "/etc/sgml/sgml-docbook.cat" \
|
||||
"/etc/sgml/${P}.cat"
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue