root
10 years ago
parent
7ba53829c5
commit
87485b3efd
@ -1,90 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.17.19.ebuild,v 1.1 2014/10/20 21:49:42 jer Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils multilib autotools toolchain-funcs
|
||||
|
||||
DESCRIPTION="Package maintenance system for Debian"
|
||||
HOMEPAGE="http://packages.qa.debian.org/dpkg"
|
||||
SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
|
||||
IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-lang/perl-5.6.0
|
||||
dev-perl/TimeDate
|
||||
>=sys-libs/ncurses-5.2-r7
|
||||
bzip2? ( app-arch/bzip2 )
|
||||
lzma? ( app-arch/xz-utils )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
zlib? ( >=sys-libs/zlib-1.1.4 )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
app-arch/xz-utils
|
||||
sys-devel/flex
|
||||
virtual/pkgconfig
|
||||
nls? (
|
||||
app-text/po4a
|
||||
>=sys-devel/gettext-0.18.2
|
||||
)
|
||||
test? (
|
||||
dev-perl/DateTime-Format-DateParse
|
||||
dev-perl/IO-String
|
||||
dev-perl/Test-Pod
|
||||
virtual/perl-Test-Harness
|
||||
)
|
||||
"
|
||||
|
||||
DOCS=( ChangeLog THANKS TODO )
|
||||
|
||||
src_prepare() {
|
||||
# do not expect Debian's gzip --rsyncable extension
|
||||
epatch "${FILESDIR}"/${PN}-1.17.0-gzip-rsyncable.patch
|
||||
|
||||
epatch "${FILESDIR}"/${PN}-1.17.1-flags.patch
|
||||
|
||||
# Force the use of the running bash for get-version (this file is never
|
||||
# installed, so no need to worry about hardcoding a temporary bash)
|
||||
sed -i -e '1c\#!'"${BASH}" get-version || die
|
||||
|
||||
# test fails (bug #414095)
|
||||
sed -i utils/Makefile.am \
|
||||
-e '/^test_cases/d;/100_update_alternatives/d' || die
|
||||
|
||||
use nls && strip-linguas -i po
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC
|
||||
econf \
|
||||
$(use_enable nls) \
|
||||
$(use_enable unicode) \
|
||||
$(use_enable update-alternatives) \
|
||||
$(use_with bzip2 bz2) \
|
||||
$(use_with lzma liblzma) \
|
||||
$(use_with selinux) \
|
||||
$(use_with zlib) \
|
||||
--disable-compiler-warnings \
|
||||
--disable-dselect \
|
||||
--disable-silent-rules \
|
||||
--disable-start-stop-daemon \
|
||||
--localstatedir="${EPREFIX}"/var
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake AR=$(tc-getAR)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
|
||||
keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
|
||||
}
|
||||
@ -1,90 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.17.20.ebuild,v 1.1 2014/10/23 08:57:49 jer Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils multilib autotools toolchain-funcs
|
||||
|
||||
DESCRIPTION="Package maintenance system for Debian"
|
||||
HOMEPAGE="http://packages.qa.debian.org/dpkg"
|
||||
SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
|
||||
IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-lang/perl-5.6.0
|
||||
dev-perl/TimeDate
|
||||
>=sys-libs/ncurses-5.2-r7
|
||||
bzip2? ( app-arch/bzip2 )
|
||||
lzma? ( app-arch/xz-utils )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
zlib? ( >=sys-libs/zlib-1.1.4 )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
app-arch/xz-utils
|
||||
sys-devel/flex
|
||||
virtual/pkgconfig
|
||||
nls? (
|
||||
app-text/po4a
|
||||
>=sys-devel/gettext-0.18.2
|
||||
)
|
||||
test? (
|
||||
dev-perl/DateTime-Format-DateParse
|
||||
dev-perl/IO-String
|
||||
dev-perl/Test-Pod
|
||||
virtual/perl-Test-Harness
|
||||
)
|
||||
"
|
||||
|
||||
DOCS=( ChangeLog THANKS TODO )
|
||||
|
||||
src_prepare() {
|
||||
# do not expect Debian's gzip --rsyncable extension
|
||||
epatch "${FILESDIR}"/${PN}-1.17.0-gzip-rsyncable.patch
|
||||
|
||||
epatch "${FILESDIR}"/${PN}-1.17.1-flags.patch
|
||||
|
||||
# Force the use of the running bash for get-version (this file is never
|
||||
# installed, so no need to worry about hardcoding a temporary bash)
|
||||
sed -i -e '1c\#!'"${BASH}" get-version || die
|
||||
|
||||
# test fails (bug #414095)
|
||||
sed -i utils/Makefile.am \
|
||||
-e '/^test_cases/d;/100_update_alternatives/d' || die
|
||||
|
||||
use nls && strip-linguas -i po
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC
|
||||
econf \
|
||||
$(use_enable nls) \
|
||||
$(use_enable unicode) \
|
||||
$(use_enable update-alternatives) \
|
||||
$(use_with bzip2 bz2) \
|
||||
$(use_with lzma liblzma) \
|
||||
$(use_with selinux) \
|
||||
$(use_with zlib) \
|
||||
--disable-compiler-warnings \
|
||||
--disable-dselect \
|
||||
--disable-silent-rules \
|
||||
--disable-start-stop-daemon \
|
||||
--localstatedir="${EPREFIX}"/var
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake AR=$(tc-getAR)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
|
||||
keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
|
||||
}
|
||||
@ -0,0 +1,397 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-7.0.5-r1.ebuild,v 1.1 2014/11/28 09:59:29 tomjbe Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils multilib qt4-r2 systemd user
|
||||
|
||||
MY_PV=${PV/_beta/-b}
|
||||
MY_P=${PN}-${MY_PV}
|
||||
|
||||
DESCRIPTION="Featureful client/server network backup suite"
|
||||
HOMEPAGE="http://www.bacula.org/"
|
||||
SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="AGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
|
||||
IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 logwatch mysql postgres qt4 readline +sqlite3 ssl static tcpd vim-syntax X"
|
||||
|
||||
DEPEND="
|
||||
dev-libs/gmp
|
||||
!bacula-clientonly? (
|
||||
postgres? ( virtual/postgresql[threads] )
|
||||
mysql? ( virtual/mysql )
|
||||
sqlite3? ( dev-db/sqlite:3 )
|
||||
!bacula-nodir? ( virtual/mta )
|
||||
)
|
||||
qt4? (
|
||||
dev-qt/qtsvg:4
|
||||
x11-libs/qwt:5
|
||||
)
|
||||
logwatch? ( sys-apps/logwatch )
|
||||
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
|
||||
readline? ( >=sys-libs/readline-4.1 )
|
||||
static? (
|
||||
acl? ( virtual/acl[static-libs] )
|
||||
sys-libs/zlib[static-libs]
|
||||
dev-libs/lzo[static-libs]
|
||||
sys-libs/ncurses[static-libs]
|
||||
ssl? ( dev-libs/openssl[static-libs] )
|
||||
)
|
||||
!static? (
|
||||
acl? ( virtual/acl )
|
||||
sys-libs/zlib
|
||||
dev-libs/lzo
|
||||
sys-libs/ncurses
|
||||
ssl? ( dev-libs/openssl )
|
||||
)"
|
||||
RDEPEND="${DEPEND}
|
||||
!bacula-clientonly? (
|
||||
!bacula-nosd? (
|
||||
sys-block/mtx
|
||||
app-arch/mt-st
|
||||
)
|
||||
)
|
||||
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
|
||||
|
||||
REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite3 ) bacula-clientonly )
|
||||
static? ( bacula-clientonly )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
#XOR and !bacula-clientonly controlled by REQUIRED_USE
|
||||
use mysql && export mydbtype="mysql"
|
||||
use postgres && export mydbtype="postgresql"
|
||||
use sqlite3 && export mydbtype="sqlite3"
|
||||
|
||||
# create the daemon group and user
|
||||
if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
|
||||
enewgroup bacula
|
||||
einfo
|
||||
einfo "The group 'bacula' has been created. Any users you add to this"
|
||||
einfo "group have access to files created by the daemons."
|
||||
einfo
|
||||
fi
|
||||
|
||||
if use bacula-clientonly && use static && use qt4; then
|
||||
ewarn
|
||||
ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag."
|
||||
ewarn
|
||||
fi
|
||||
|
||||
if ! use bacula-clientonly; then
|
||||
if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
|
||||
enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
|
||||
einfo
|
||||
einfo "The user 'bacula' has been created. Please see the bacula manual"
|
||||
einfo "for information about running bacula as a non-root user."
|
||||
einfo
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# adjusts default configuration files for several binaries
|
||||
# to /etc/bacula/<config> instead of ./<config>
|
||||
pushd src >&/dev/null || die
|
||||
for f in console/console.c dird/dird.c filed/filed.c \
|
||||
stored/bcopy.c stored/bextract.c stored/bls.c \
|
||||
stored/bscan.c stored/btape.c stored/stored.c \
|
||||
qt-console/main.cpp; do
|
||||
sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
|
||||
|| die "sed on ${f} failed"
|
||||
done
|
||||
popd >&/dev/null || die
|
||||
|
||||
# bug 466688 drop deprecated categories from Desktop file
|
||||
sed -i -e 's/Application;//' scripts/bat.desktop.in || die
|
||||
|
||||
# bug 466690 Use CXXFLAGS instead of CFLAGS
|
||||
sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
|
||||
|
||||
# drop automatic install of unneeded documentation (for bug 356499)
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-doc.patch
|
||||
|
||||
# bug #310087
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
|
||||
|
||||
# bug #311161
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
|
||||
|
||||
# bat needs to respect LDFLAGS
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
|
||||
|
||||
# bug #328701
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
|
||||
|
||||
epatch "${FILESDIR}"/7.0.2/${PN}-7.0.2-fix-static.patch
|
||||
|
||||
# do not strip binaries
|
||||
sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
|
||||
sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
|
||||
|
||||
# fix file not found error during make depend
|
||||
epatch "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
|
||||
|
||||
# Fix systemd unit files:
|
||||
# bug 497748
|
||||
sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
|
||||
sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
|
||||
# bug 504370
|
||||
sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
|
||||
|
||||
# Fix tmpfiles config for client-only (no bacula user) install
|
||||
# NOTE: Change only first occurance (user) not second (group)
|
||||
# bug 528398
|
||||
if use bacula-clientonly; then
|
||||
sed -i -e 's/bacula/root/' platforms/systemd/bacula.conf.in || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=''
|
||||
|
||||
if use bacula-clientonly; then
|
||||
myconf="${myconf} \
|
||||
$(use_enable bacula-clientonly client-only) \
|
||||
$(use_enable !static libtool) \
|
||||
$(use_enable static static-cons) \
|
||||
$(use_enable static static-fd)"
|
||||
else
|
||||
myconf="${myconf} \
|
||||
$(use_enable !bacula-nodir build-dird) \
|
||||
$(use_enable !bacula-nosd build-stored)"
|
||||
# bug #311099
|
||||
# database support needed by dir-only *and* sd-only
|
||||
# build as well (for building bscan, btape, etc.)
|
||||
myconf="${myconf} \
|
||||
--with-${mydbtype} \
|
||||
--enable-batch-insert"
|
||||
fi
|
||||
|
||||
# do not build bat if 'static' clientonly
|
||||
if ! use bacula-clientonly || ! use static; then
|
||||
myconf="${myconf} \
|
||||
$(use_enable qt4 bat)"
|
||||
fi
|
||||
|
||||
myconf="${myconf} \
|
||||
$(use_with X x) \
|
||||
$(use_enable !readline conio) \
|
||||
$(use_enable readline) \
|
||||
$(use_with readline readline /usr) \
|
||||
$(use_with ssl openssl) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable acl) \
|
||||
$(use_with tcpd tcp-wrappers)"
|
||||
|
||||
econf \
|
||||
--libdir=/usr/$(get_libdir) \
|
||||
--docdir=/usr/share/doc/${PF} \
|
||||
--htmldir=/usr/share/doc/${PF}/html \
|
||||
--with-pid-dir=/var/run \
|
||||
--sysconfdir=/etc/bacula \
|
||||
--with-subsys-dir=/var/lock/subsys \
|
||||
--with-working-dir=/var/lib/bacula \
|
||||
--with-logdir=/var/lib/bacula \
|
||||
--with-scriptdir=/usr/libexec/bacula \
|
||||
--with-systemd=$(systemd_get_unitdir) \
|
||||
--with-dir-user=bacula \
|
||||
--with-dir-group=bacula \
|
||||
--with-sd-user=root \
|
||||
--with-sd-group=bacula \
|
||||
--with-fd-user=root \
|
||||
--with-fd-group=bacula \
|
||||
--enable-smartalloc \
|
||||
--disable-afs \
|
||||
--host=${CHOST} \
|
||||
${myconf}
|
||||
# correct configuration for QT based bat
|
||||
if use qt4 ; then
|
||||
pushd src/qt-console
|
||||
eqmake4
|
||||
popd
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Make build log verbose (bug #447806)
|
||||
emake NO_ECHO=""
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
doicon scripts/bacula.png
|
||||
|
||||
# install bat icon and desktop file when enabled
|
||||
# (for some reason ./configure doesn't pick this up)
|
||||
if use qt4 && ! use static ; then
|
||||
doicon src/qt-console/images/bat_icon.png
|
||||
domenu scripts/bat.desktop
|
||||
fi
|
||||
|
||||
# remove some scripts we don't need at all
|
||||
rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
|
||||
|
||||
# rename statically linked apps
|
||||
if use bacula-clientonly && use static ; then
|
||||
pushd "${D}"/usr/sbin || die
|
||||
mv static-bacula-fd bacula-fd || die
|
||||
mv static-bconsole bconsole || die
|
||||
popd || die
|
||||
fi
|
||||
|
||||
# extra files which 'make install' doesn't cover
|
||||
if ! use bacula-clientonly; then
|
||||
# the database update scripts
|
||||
diropts -m0750
|
||||
insinto /usr/libexec/bacula/updatedb
|
||||
insopts -m0754
|
||||
doins "${S}"/updatedb/*
|
||||
fperms 0640 /usr/libexec/bacula/updatedb/README
|
||||
|
||||
# the logrotate configuration
|
||||
# (now unconditional wrt bug #258187)
|
||||
diropts -m0755
|
||||
insinto /etc/logrotate.d
|
||||
insopts -m0644
|
||||
newins "${S}"/scripts/logrotate bacula
|
||||
|
||||
# the logwatch scripts
|
||||
if use logwatch; then
|
||||
diropts -m0750
|
||||
dodir /etc/log.d/scripts/services
|
||||
dodir /etc/log.d/scripts/shared
|
||||
dodir /etc/log.d/conf/logfiles
|
||||
dodir /etc/log.d/conf/services
|
||||
pushd "${S}"/scripts/logwatch >&/dev/null || die
|
||||
emake DESTDIR="${D}" install
|
||||
popd >&/dev/null || die
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! use qt4; then
|
||||
rm -vf "${D}"/usr/share/man/man1/bat.1*
|
||||
fi
|
||||
rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
|
||||
if use bacula-clientonly || use bacula-nodir; then
|
||||
rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
|
||||
rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
|
||||
rm -vf "${D}"/usr/libexec/bacula/create_*_database
|
||||
rm -vf "${D}"/usr/libexec/bacula/drop_*_database
|
||||
rm -vf "${D}"/usr/libexec/bacula/make_*_tables
|
||||
rm -vf "${D}"/usr/libexec/bacula/update_*_tables
|
||||
rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
|
||||
rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
|
||||
rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
|
||||
fi
|
||||
if use bacula-clientonly || use bacula-nosd; then
|
||||
rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bcopy.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bextract.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bls.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bscan.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/btape.8*
|
||||
rm -vf "${D}"/usr/libexec/bacula/disk-changer
|
||||
rm -vf "${D}"/usr/libexec/bacula/mtx-changer
|
||||
rm -vf "${D}"/usr/libexec/bacula/dvd-handler
|
||||
fi
|
||||
|
||||
# documentation
|
||||
dodoc ChangeLog ReleaseNotes SUPPORT technotes
|
||||
|
||||
# install examples (bug #457504)
|
||||
if use examples; then
|
||||
docinto examples/
|
||||
dodoc -r examples/*
|
||||
fi
|
||||
|
||||
# vim-files
|
||||
if use vim-syntax; then
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins scripts/bacula.vim
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
newins scripts/filetype.vim bacula_ft.vim
|
||||
fi
|
||||
|
||||
# setup init scripts
|
||||
myscripts="bacula-fd"
|
||||
if ! use bacula-clientonly; then
|
||||
if ! use bacula-nodir; then
|
||||
myscripts="${myscripts} bacula-dir"
|
||||
fi
|
||||
if ! use bacula-nosd; then
|
||||
myscripts="${myscripts} bacula-sd"
|
||||
fi
|
||||
fi
|
||||
for script in ${myscripts}; do
|
||||
# copy over init script and config to a temporary location
|
||||
# so we can modify them as needed
|
||||
cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
|
||||
cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
|
||||
|
||||
# now set the database dependancy for the director init script
|
||||
case "${script}" in
|
||||
bacula-dir)
|
||||
case "${mydbtype}" in
|
||||
sqlite3)
|
||||
# sqlite3 databases don't have a daemon
|
||||
sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
|
||||
;;
|
||||
*)
|
||||
# all other databases have daemons
|
||||
sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
|
||||
# install init script and config
|
||||
newinitd "${T}/${script}".initd "${script}"
|
||||
newconfd "${T}/${script}".confd "${script}"
|
||||
done
|
||||
|
||||
systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
|
||||
systemd_dotmpfilesd "${S}"/platforms/systemd/bacula.conf
|
||||
|
||||
# make sure the working directory exists
|
||||
diropts -m0750
|
||||
keepdir /var/lib/bacula
|
||||
|
||||
# make sure bacula group can execute bacula libexec scripts
|
||||
fowners -R root:bacula /usr/libexec/bacula
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use bacula-clientonly; then
|
||||
fowners root:bacula /var/lib/bacula
|
||||
else
|
||||
fowners bacula:bacula /var/lib/bacula
|
||||
fi
|
||||
|
||||
if ! use bacula-clientonly && ! use bacula-nodir; then
|
||||
einfo
|
||||
einfo "If this is a new install, you must create the ${mydbtype} databases with:"
|
||||
einfo " /usr/libexec/bacula/create_${mydbtype}_database"
|
||||
einfo " /usr/libexec/bacula/make_${mydbtype}_tables"
|
||||
einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges"
|
||||
einfo
|
||||
fi
|
||||
|
||||
if use sqlite3; then
|
||||
einfo
|
||||
einfo "Be aware that Bacula does not officially support SQLite database anymore."
|
||||
einfo "Best use it only for a client-only installation. See Bug #445540."
|
||||
einfo
|
||||
fi
|
||||
|
||||
einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
|
||||
einfo "you have to enable 'USE=qt4'."
|
||||
einfo
|
||||
}
|
||||
@ -1,22 +1,22 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX dynamips-0.2.10-makefile.patch 1724 SHA256 2b3e04a4a4a9e6a8791f9ae15a50371e63c5f724745bedc9047943881a8fd131 SHA512 e74c67ee4f83dfd2cea75b98814a3284c7fd2d105b2498f4323a8d6cf30d4e08e478b7eff6a9b22e711308be2fd62ee26973d15f2b5382f015a69b8448e95aff WHIRLPOOL 79641a8f12898a8b883cd4e073d03e4821d1b30ec29b2e1731cb1cc52411154a049ca595dee840e5e2a14941495532ff97a2d6d3276faaba4b42282e02e24398
|
||||
AUX 0.2.14-docs.patch 551 SHA256 e0828229fbafec8ca09c3097dc503d1bfbb0bebcdbb85e4bad8139e82125f8ed SHA512 31884a56bffd2bdfee76949ecc5c0d68fd10e30bea52315fbafb8e4c60b033f1baf2a380a67686af91b0ee49ae97f4012c778bf6f69d6dd583375d8f6b7e98de WHIRLPOOL ffdea34239ee1f74f121b43bd2f6e753fdbef19696efe893c47908dc8708cd6320cf5410fba104cf9fec4274d29b19db92bfdcf712241a14e8e4226f98267929
|
||||
AUX dynamips-0.2.12-makefile.patch 458 SHA256 1ccdbd3f34ab61e66efd750d0508beeaebf7ba78408c93c572ee7ebe34a619ee SHA512 9f298052970a277221d9cf4a936290dcf832e633b72d860267128e898b882b3d84f6366a881ac736ba9e7c79639c3f429061c7c959f3d77121b36ff847eee91c WHIRLPOOL 1f0a821530fcda978a711392d1fbf09d42137d283d6443957ec9cc9eef8cf31f517ab383507013038aed8ff0c85d995ed2a55807add101d626dd8e1f2a4490e7
|
||||
DIST dynamips-0.2.10-source.zip 966018 SHA256 d62f739547134aeb0ee5a6b28a52772ae79a93cb6426b712cbddc72cb0b7ba44 SHA512 41b1d5c22036e21ce9a518f117a64634a71deb0632777f813221ade14bafe6d84182224e28e67a676e87da677c83262a8ebe37fa6dee0290626c24e676341e35 WHIRLPOOL 0904214700b0f2e349a283189f65fcc21475b00690aa4a42aa17cbb837132b3a46f628dfd9dbb95e66a02078079baa372cc3baabbd3b3cbb582a4536e95895c8
|
||||
DIST dynamips-0.2.12-source.zip 995877 SHA256 b8a60c2ff577ec3a5c2b892bce654a68cc072c79fbca2b708d36d42bd3e9eb12 SHA512 08f388027e3234a44a75de77f30d6c96f0d881c4db60435a237f6ae6e3804872fda422ab11249f5c7283054f7d2d8466886dcd6056e59fc90802e67fa7cb8c55 WHIRLPOOL 2e627071914fe11ae20b7f00ba7b81b7bde95a008d84a1786e2f57ab07ec2a0d836218e72040b34f8badbefb289fceab2c5f7324bf5d5cfca0d433ed968dc6ae
|
||||
EBUILD dynamips-0.2.10.ebuild 1077 SHA256 6383073699c78cb0b61fb1283e00871c9f0984765600d11a80682ce12da0e4a3 SHA512 cfb98252c7b51dc123e1b18a0c34ace7e5f2e3300156bb9235411c5e7317484be28581b76b44452744c1ee9c77d27d4bc239923e36f65ebeaf2e0cec812c2de1 WHIRLPOOL fa609688e51b2fe759d3fff2b593ac1789edfff78dc9f2105e7a8008537a0f6863bf8d3f2bd7d480c229883ba2b36fba18afe192e1ebfe34a437aeb5589e0a5c
|
||||
DIST dynamips-0.2.14-source.zip 961813 SHA256 ce77cf6e6e784142333d3b9dcc6c70ab7b1f676ff2a40b7d4fb738e14f01e789 SHA512 8c3d85998a61cae1e3e82501a00e886c954686f9a19a44acb7dee8b13911c0155ce2cdfecbdc41ed5d279266abdf77a5c3f2753fde12217b138313ffa46dabf8 WHIRLPOOL d20a78c701cdbb7f38c4e6f6848b5b3b0a80d8bef372cb13cc25c65d52652001e701f54d1e5a805e4279a4cf457f953387e7cbda124e9f4f57c8615296d8fc7e
|
||||
EBUILD dynamips-0.2.12.ebuild 1051 SHA256 544e3fbc3a1b5e2f118a1f7004098c9f0f33251102afe5778360f46ffee76cf7 SHA512 eace73f09a228bcea7366dbd5081966d7262edaa9385d2d36fdaee86c9b740e7cf17a4d2b3f7b86bded9dbdc3e06caf706f602be151b59d38e8b20c3f0285293 WHIRLPOOL 6220c4379979a42311dd377fa0276edec405a369363f1e1b706dba8ada5d97e553959471ae0c5988c53addcf855a022f55b8ee1612149163d4f9523665cb254a
|
||||
MISC ChangeLog 3266 SHA256 0f8a287f54573166923d6864644a32a2115d043043f95939bf55f284f46d196e SHA512 6cf72c55aff6adf9a2851537db06b3be56d7811058f45c38d97e6a1cadcd44d4ee0d2250db4a7b2a9d5b047f4283f7f06d907c302d2984778848b1c4be13c838 WHIRLPOOL 8a8317a78b3a845b0ed42ebc125087535821852d405208730faa7f781ede859abd557d4a7dce50c42ba3afd5a0aa463947ba790b39bae11a1da7a6364feac08b
|
||||
EBUILD dynamips-0.2.14-r1.ebuild 941 SHA256 08c8847c07bfd674173efc35885d57edab374d219ca09707d3557976afc1f1a7 SHA512 87a738fff9ad9561dc2558bfb0b6c2a757508b144511e8c203101905f788ba8693a80a698b046f9ea94975b7f5a75309a62d646bab545540a64cb6f6884d4df5 WHIRLPOOL 68fc19483a9d3280de850bdf2893b1ee3b6fef66281a1696bc604c27048764d947383113ca4e8538903a1153b39b6b285372900cfd44b22b191cedc914f05b54
|
||||
MISC ChangeLog 3878 SHA256 b8a6d55b972e2e5cf059d5d9581a942d43821295b1258b3c1ff5edbce9ec849d SHA512 e2bc2e5f5ab0db7a2687f4b180bc76aeb5a684115c9b9c269c790d53c8daeba785070aa78462bd6f673f992b80d8853534107531fa41703aa9378c5e4966751b WHIRLPOOL 2bbaeff9c2b4e9ddeaf3bd199ab6d7c04d5eafd892a734a4c4e098dba192bc03cbdeb736eae975018fe793023be258ac9921c5bc8ff3a711f795381d05fc1038
|
||||
MISC metadata.xml 490 SHA256 4440c17eea35f8c8a7a6f638eb3e8e0d1bae1203fa8baad8a3b295a612c8d497 SHA512 1c0ea4687c88896c4504b653352fe47e95aa434e1031b876c4c2723d194e5c97bd0b1f6ea54f3595251a024f17d250a6ede41088813af872d2657b102bd7170a WHIRLPOOL 79f983dad82a92afc07efe8b8bfb7b27787c6ef69e1262508c80d5eeb9c1ee84ef1c7cf331bf25c74ed5fff8f3daa9e8af5cd57c313d8c10c0c19435c1da5ad5
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iQEcBAEBCAAGBQJUdiYsAAoJECo/aRed92677lQIAISpQ60Z7idnNtTnpFHrmrQj
|
||||
SzDvjij3qP6Xe8WfdzZ2ungijDR9sLTLjAjsMIFj29rydRgIb+6uY/bqO1oPTpp0
|
||||
KqNeEzMGjhhrd3azp1quwyrQ9HUc2WD6dSIJ5wdxF3K7YSMER4NBmfcqTfUKLs/0
|
||||
DoCzZtgagRZNvFx9pP27Iv7JVncieRbcgliD1exgEf4wga1SFqRYzDZX0rPY2wR+
|
||||
wn4x+UqmCklh4ltitlP+vWtEgyAHPmRP73qQK8DMpPZyShlM0K5LikTegX9vAAhR
|
||||
YetbP4yCnBugDGdptFTr+kiptJh4og6U2a3MaIBF3T6lIpxsrh9xOcxqmAEB1io=
|
||||
=jlDv
|
||||
iQEcBAEBCAAGBQJUeEXfAAoJECo/aRed92674YgH/3ISiHSKgTJ8zWt7pka1ZYgH
|
||||
magPLMjYS6GZ0TG1YSGajwPb1G5Dhv1XHJS765qfQIFNV0cV2dwfVZlT0Nn1fH80
|
||||
pLO8ycj5+CynXbdGY3OBLur79L8a0/puIVTn4gxx3ryErl2Bm7ebJUQzAUPE2DuU
|
||||
KSWqLGLWaFfJh38i8FoLgqItKcuGmfj25riJI0SxYxzkyBhfOtzzOw1sOQF8KFqX
|
||||
g6doI9iPQ+ZOS/vTmTmT4PVRkEirp0lVKOd3GM6fVopoQuhxSZHmHnBgnOQfRnDz
|
||||
icA1f88BgYUUeX2kpBrKSFBoUO4n3go+XPXOOTJqGA94uARkP2rSWqi3rNMnHAo=
|
||||
=j8nj
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/dynamips-0.2.10.ebuild,v 1.2 2014/06/13 18:12:46 pinkbyte Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
MY_P="${P}-source"
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
DESCRIPTION="Cisco 7200/3600 Simulator"
|
||||
HOMEPAGE="http://www.gns3.net/dynamips/"
|
||||
SRC_URI="mirror://sourceforge/project/gns-3/Dynamips/${PV}/${MY_P}.zip"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
RDEPEND="dev-libs/elfutils
|
||||
net-libs/libpcap"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${P}-makefile.patch"
|
||||
|
||||
# enable verbose build
|
||||
sed -i \
|
||||
-e 's/@$(CC)/$(CC)/g' \
|
||||
stable/Makefile || die 'sed on stable/Makefile failed'
|
||||
# respect compiler
|
||||
tc-export CC
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
if use amd64 || use x86; then
|
||||
emake DYNAMIPS_ARCH="${ARCH}"
|
||||
else
|
||||
emake DYNAMIS_ARCH="nojit"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install () {
|
||||
newbin dynamips.stable dynamips
|
||||
dobin stable/nvram_export
|
||||
doman man/*
|
||||
dodoc README README.hypervisor TODO
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/dynamips/dynamips-0.2.14-r1.ebuild,v 1.1 2014/11/28 09:52:31 pinkbyte Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="Cisco 7200/3600 Simulator"
|
||||
HOMEPAGE="http://www.gns3.net/dynamips/"
|
||||
SRC_URI="mirror://sourceforge/project/gns-3/Dynamips/${PV}/${P}-source.zip"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
IUSE="ipv6"
|
||||
|
||||
RDEPEND="dev-libs/elfutils
|
||||
net-libs/libpcap"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip"
|
||||
|
||||
DOCS=( ChangeLog README RELEASE-NOTES )
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PV}-docs.patch" )
|
||||
|
||||
src_prepare() {
|
||||
# comment out DYNAMIPS_FLAGS to respect CFLAGS
|
||||
sed -e "s:^set ( DYNAMIPS_FLAGS:#&:" -i cmake/dependencies.cmake || die
|
||||
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake-utils_use_enable ipv6 IPV6)
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
--- CMakeLists-orig.txt 2014-11-28 14:51:14.375913296 +0900
|
||||
+++ CMakeLists.txt 2014-11-28 14:52:09.579369288 +0900
|
||||
@@ -37,16 +37,6 @@
|
||||
add_subdirectory ( stable )
|
||||
add_subdirectory ( unstable )
|
||||
|
||||
-install_docs (
|
||||
- "ChangeLog"
|
||||
- "COPYING"
|
||||
- "MAINTAINERS"
|
||||
- "README"
|
||||
- "README.hypervisor"
|
||||
- "RELEASE-NOTES"
|
||||
- "TODO"
|
||||
- )
|
||||
-
|
||||
# uninstall target - leaves behind any directory created during install
|
||||
set ( _templatefile "${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" )
|
||||
set ( _scriptfile "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" )
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
--- stable/Makefile.orig 2013-10-20 11:17:50.242929187 +0400
|
||||
+++ stable/Makefile 2013-10-20 11:19:19.395936956 +0400
|
||||
@@ -3,12 +3,7 @@
|
||||
|
||||
# Replace x86 by amd64 for a build on x86_64.
|
||||
# Use "nojit" for architectures that are not x86 or x86_64.
|
||||
-DYNAMIPS_ARCH?=x86
|
||||
-#DYNAMIPS_ARCH?=amd64
|
||||
-
|
||||
-ifeq ($(DYNAMIPS_ARCH),ppc32)
|
||||
-DYNAMIPS_ARCH=x86
|
||||
-endif
|
||||
+DYNAMIPS_ARCH?=nojit
|
||||
|
||||
# Get include files from the current directory and from the common directory
|
||||
INCLUDE+=-I. -I../common
|
||||
@@ -47,7 +42,7 @@
|
||||
PPC32_ARCH_INC_FILE=\"ppc32_$(DYNAMIPS_ARCH)_trans.h\"
|
||||
OSNAME=unknown
|
||||
|
||||
-CFLAGS+= $(INCLUDE) -Wall -O2 -fomit-frame-pointer \
|
||||
+CFLAGS+= $(INCLUDE) -Wall \
|
||||
-DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" -DJIT_CPU=CPU_$(DYNAMIPS_ARCH) \
|
||||
-DMIPS64_ARCH_INC_FILE=$(MIPS64_ARCH_INC_FILE) \
|
||||
-DPPC32_ARCH_INC_FILE=$(PPC32_ARCH_INC_FILE) \
|
||||
@@ -72,7 +67,7 @@
|
||||
# PCAP_LIB=-lpcap
|
||||
OSNAME=Linux
|
||||
CFLAGS+=-I/usr/include -I. $(PTHREAD_CFLAGS)
|
||||
- LIBS=-L/usr/lib -L. -ldl -lrt -luuid -lelf $(PTHREAD_LIBS)
|
||||
+ LIBS=$(LDFLAGS) -L/usr/lib -L. -ldl -lrt -luuid -lelf $(PTHREAD_LIBS)
|
||||
DESTDIR=/usr
|
||||
else
|
||||
ifeq ($(shell uname -s), Darwin)
|
||||
@@ -274,7 +269,7 @@
|
||||
|
||||
asmdefs$(BIN_EXT): asmdefs.c mips64.h
|
||||
@echo "Linking $@"
|
||||
- @$(CC) -Wall $(CFLAGS) -o $@ asmdefs.c
|
||||
+ @$(CC) -Wall $(CFLAGS) $(LDFLAGS) -o $@ asmdefs.c
|
||||
|
||||
asmdefs.h: asmdefs$(BIN_EXT)
|
||||
@echo "Building assembly definitions header file"
|
||||
@@ -282,7 +277,7 @@
|
||||
|
||||
nvram_export$(BIN_EXT): nvram_export.o fs_nvram.o
|
||||
@echo "Linking $@"
|
||||
- @$(CC) -Wall $(CFLAGS) $(INCLUDE) -o $@ nvram_export.o fs_nvram.o
|
||||
+ @$(CC) -Wall $(CFLAGS) $(LDFLAGS) $(INCLUDE) -o $@ nvram_export.o fs_nvram.o
|
||||
|
||||
install: $(PROG) nvram_export$(BIN_EXT)
|
||||
@echo "Installing"
|
||||
@ -1,11 +1,27 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX task-1.9.4-lua-automagic.patch 907 SHA256 8e42b81c13030fb40342e127906ea528265bde9da61d7a48b67de56ef115f7cd SHA512 3ab332dc2d8457c97625d30aa89ea304a1b7a1ee6a735a76438dcacfb219200ec9ffe40c147854b2750da6514de13fa8c084f5b48ed4b55163f9da57ca30d6b7 WHIRLPOOL c2ea68f731dfc228ace2d98e6e233fb54245621eeafb178d62be2d5422ecb3fa8949bac1e0c0174ca9fd44cf7bbc2d75e3dfa14d4eb247c49b14941ad6aa1e3c
|
||||
AUX task-2.0.0_beta4-rcdir.patch 1735 SHA256 75656f1520b3a86bf23f9bfddea02ca76dc5bae687a89c791e6679f29cf88b1e SHA512 6341edca1682172779617d4914a7ae4356c71947f3f19f6949559627ce9ac14b85fd02c46df84e9c57043b59cdd58c7ce72711608827f9297486c52d224c4b24 WHIRLPOOL dda07f52690344219885570d64b62a44076b53dbeb2491f7643351cf338d1a1c6e31783cd78596b87c78df442805dd1a5aef3bc3dd5a250422447819a6b6a622
|
||||
AUX task-2.3.0-gnutls-automagic.patch 1055 SHA256 8adeb0734d5d46987f62f7edb38064a64061bf7416e5bc2057de914ec3033911 SHA512 d20f35e1aaef55afcbf0c40ca643c43d3f72d3c4c97ed0c6adf396afbf25e6c45435cd5236e37b5c0f9076d5759727b62e1546bc84020294c7a9589e5e9089d1 WHIRLPOOL b29ec217487bf5aa0a624dd7400376e711f1e7eaaa5657529ca73068dc78923f867f4a52251c10fed02df3addc57e85a5cfc228feea81c1c50894274f9ab136d
|
||||
AUX task-2.3.0-issue-1473-rcdir-fix.patch 1155 SHA256 6cf754ba77ebda5d012bfe60a5d8b737a6551238bdc1346c3090c6999dbc4084 SHA512 b856a63a29ed7a06d87be8a9edd2c94d01f9d1a213086189628c1e99588a6537903317744b5149ea67d5b613b456a829d05d87d320938f736689836fdaedcb1c WHIRLPOOL 64a18744226b6a595b3acabc1e5450c3092bb7d7017c1b857f604e240afd1689f309d8e40007dc2aa8f4f21efcc54bf50575aa6de7604fa0d09270ee32b8f3f3
|
||||
DIST task-2.1.2.tar.gz 4639841 SHA256 cf5171b54b6d2d2dcd9c559f437cf8a2cb3836c7631edf96a16efbf8b4383e36 SHA512 b9c802503b5580f6c1b965cdee1e39386e818027adba69699071d28dca12c27b37963bb9586b17a764c3430d3405a55febae176b6ef087798660020f2f683b86 WHIRLPOOL cba5aeb279021cb98b9c23c417182f7f2ebd9a05468bd283d10703f2b177c36f9e7c71c2466d4ebaadfa4b9524bd86c202e93be45fa172037c0d1b5e0d51c20a
|
||||
DIST task-2.2.0.tar.gz 1190905 SHA256 39e25dd285e6bc8474337a5868cb2ec55675978fa1f08c802e6da58b4181ee14 SHA512 16ff1ccd037d62fc99ea0a31647714d3ccf8a90948b67d845d55e08e4bf49bb6a7f69f7464f485093abeff0672f17dc5f6d4efd96d2e447316975d185082f862 WHIRLPOOL c790c59a8867249ede33d51a85d33987a51f1031db225267fdac4e50e6f8ac3f94abc8ef80577648a783aa85d4b1297e7e8be55103750e46bb521d1282c8555e
|
||||
DIST task-2.3.0.tar.gz 1238592 SHA256 2b9a289109e691e305b84631622299853134cf195d4c9af962759b640176ac73 SHA512 9a17ec79735800edb6b5b4c6eede6ef62e8374a80a4f566b967e8ee45883e0d3533d4c3643a858f12adf6b9021fb8c9d54cae7620ca4749cf4237f0235e1d483 WHIRLPOOL a160a0df5d6ab27ee6fa608964ea38c950f786519737578406248812b8e13f5dcf03045ecb7d9437b824b1aa76d2124396d381397729270f17796d00ef0aee18
|
||||
EBUILD task-2.1.2.ebuild 1653 SHA256 8d553a4a3be2f1eac195805db1ed8331ebba5b06a490657766e1dd7bde56280b SHA512 b6ec3889756a093c068ca8b09223336efb5d856b56f7a12ae8fb5156f1d3165065d485f46a334229313ea609e34ff94164c1cccae952d5098673980fdd80c0ad WHIRLPOOL a91b74866c8165ee3032914afa621d0c98532391cf7a7a2cc32a68ff9396ee3735d9b08019b8378c294c1fc1d6023d8f918886a38a91d602076a39929c7361d2
|
||||
EBUILD task-2.2.0.ebuild 1469 SHA256 45e0dd925b78438b11fea88972955737c26f2c218bd69f6613c064b68ddf7cba SHA512 ab9bb90d63ff26dfc9b5953de96dd3888e81e3f7bbaf24e61354250933daa710139416e6341d8c384ff3e424a49f8510d391a98ea9b3f83eb1db46e56f391fab WHIRLPOOL 0f538cd0abd6bbf112820bfffec5e7819ca822fdec212bb7a2cc8b7bdf15abf71528ea710b08eafd1edc3bdc2bbdb9eb9b5446427425125c475d146a8d30ea90
|
||||
EBUILD task-2.3.0.ebuild 1408 SHA256 1ba6c711040c676012e272f28dfa2b505660c96b05acb0c3203fb8e53e42fc46 SHA512 4307fd095288d964d7867a547d438136319fdff2e10d7cafe12b33bc8f85b41ec0549656816db343e3cb367c48013d5ffd82ad0566c617a95a5d5840d762fc62 WHIRLPOOL 9bc34c622dce6d58f582a717282c16518a5a2d90683d6be322d473aa5f30cc3ab2826e6b964c662536c106134f321a8a48106bf4a1627446207bf8677ca787f4
|
||||
MISC ChangeLog 6921 SHA256 c3aadf05ba3db7c47b4d78b0ee463581744e0310d405dbfc11ccf82b0a2dd05f SHA512 fd424bf9ff57cd0b37a74086764a7048b3545600229668c3f92c65523b45beb991123118a81d4fab2dc6f345254c7c94470a76130197ce11d4baf3fefb9654b1 WHIRLPOOL 4f2e63b1c6db1e5dc859d23db84efbe67e3baab03cef4759b38351e746bf4d0d32c46596d53d8286009e719c2f48d6a4967f008a41d99b1b7ebb9860401f2300
|
||||
EBUILD task-2.1.2.ebuild 1627 SHA256 da11b812313dca482a1fd28ea0ccb41690e6ed30e9fbf1747f4271eded6cf3cd SHA512 badd1d50dcb87242fdf2a50620eb749a304cbe9aabdbeaebfcb7ddf485aba33e942a157f74dc1459d46e6c59699d403b35696cc05b779c7a13a1cc10be2c5f42 WHIRLPOOL b3dd595fa8220bbbbdaa60b394b02c77c78c20ba95e037413aa95f3b7be3465e53cec06fe4435eb8ddd21f0f8e313ba56e3cc2c791799121034a2402d6a71d10
|
||||
EBUILD task-2.2.0.ebuild 1443 SHA256 b347612e79177eee79efb37ff1bacdf4c7df0afb0f6337d9305ad13f9edb89db SHA512 6a94c4b7105af278b811075a64869f0048dc4ee7f012e3dcd082c63c7344ee214059458546d853db05e6f7d913b2d4aae5e46d6a4bb5154867e6984581983273 WHIRLPOOL 4258bdd315292a96c5d5890d8e96bc9fcb75efb333065b93f7f6fe49f2fdbb91b70d3cbb3353f4c4107e54cd1f202d3446c459a6fcddd3257963749e175e3d11
|
||||
EBUILD task-2.3.0-r1.ebuild 1488 SHA256 b10bbfccf6bab9ec335bd0a5bb9dbdddcf580d27884814b27c3635ef69b8bf46 SHA512 e88d5482a78daadc5074881fc747145d4a104b3e7cdba8743e8e2a8100942b88d9e9751741d1dd99e065cd55d202ec804a553f874fdd18b104246d9680935e0a WHIRLPOOL 37eec1a014abeb4240c488effa5989e97c9a9545456cc47f1ef3593cc6e93c15416059d6d0812bbea688fbb6fa62601b72cb307ca467b01ae907131ebf28d5ef
|
||||
EBUILD task-2.3.0.ebuild 1383 SHA256 38a3fcf605dd2075c27263557d9e85737910563eba83b2bf826c79da0a87a13a SHA512 bd53cc0af761c7a2068fd751dd562734c58f5d37a9664893381a9ce9002a1b69e0b3d898c637df94cd46486dd83459d44d7e2911fffb0632bba07e34c68ecebc WHIRLPOOL feab609b4a3a22711fb76db6a22d15d21cab71d0da844ed0619fb3f50732736ba873afc6046a7c0a5e5c6868f4c193645d2e2011de22fa19f006f35c5c9220ae
|
||||
MISC ChangeLog 7243 SHA256 982ed1fd90b48a367b09003dfe8ca657a8d5c6488c15463d29775a278d87b7c4 SHA512 1554cae8cbd15acfbd65dc739a439c837c4cc8503d8c55299e633493b3247ac500d486d48a31299778bee1579fa30ad2d779d517fa0734f58e7ed4fd15b21c9e WHIRLPOOL be6b86835609468da3945d79dc9c7294d15a233bc8120c9cac4bb420ffa0f38f37da2b89a65a62dd7eb8158bbc277134f9078ca9047ab328530ab96e489ce2e9
|
||||
MISC metadata.xml 228 SHA256 1b7e281c5478397754b53aa513c61f0477cdbe9900bb3b795239e5770ee52665 SHA512 a056b549dccf17ee69a41734313bd6d31ec01b17f001589ed40a05612ffdc1b46bb63a8c7931c5109b5dc86756e752fb53226c6fd7fe97d3fb9173318879aeb5 WHIRLPOOL cd9298d522880abd757087ecec3835327043dbd25acecaa0ac30b4e337ee24c6d2f423c666b017406a92cd62c28a2f02aeae69a12fcdbdf41e8344cb5b793b9b
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iQEcBAEBCAAGBQJUeLhWAAoJEEqz6FtPBkyjyXwH/A0Edz6ZPMSW2i6fDxqB8tOr
|
||||
awnqXB/k6pEXAnMa8BN/eTm0fZ3o5v1mUb1zg0SJX2mS5N6/PI9h4cp1TlWnopmA
|
||||
blCOxqZ21TebNPe9zhLgV6n2gBdIciz+sYHeqnFpT+OSf7g4uNo/4d4P3lviEo5H
|
||||
NXo+2FOeN1c9QIDSBplQi3u69odzfbU/LUDOiNvq5j2g9JHakrSrZdXzak9PBv9v
|
||||
GBuYWs6VRPswiXUvXTKJ+stxvIjqRS4ptwX8UpJZW/ujRbamj4yruYeJ7UfUtx/0
|
||||
DXwwrH3N7c1HTFBFTC1uMECIX1XNLAYBcH5QnVt3d4rJep3Euw6BNyRWQbNu5P0=
|
||||
=gh/K
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
--- task-2.3.0/CMakeLists.txt
|
||||
+++ task-2.3.0/CMakeLists.txt
|
||||
@@ -9,6 +9,8 @@
|
||||
project (task)
|
||||
set (PROJECT_VERSION "2.3.0")
|
||||
|
||||
+OPTION(USE_GNUTLS "Build gnutls support." ON)
|
||||
+
|
||||
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
set (LINUX true)
|
||||
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
@@ -59,13 +61,15 @@
|
||||
set (PACKAGE_VERSION "${VERSION}")
|
||||
set (PACKAGE_STRING "${PACKAGE} ${VERSION}")
|
||||
|
||||
-message ("-- Looking for GnuTLS")
|
||||
-find_package (GnuTLS)
|
||||
-if (GNUTLS_FOUND)
|
||||
- set (HAVE_LIBGNUTLS true)
|
||||
- set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${GNUTLS_INCLUDE_DIR})
|
||||
- set (TASK_LIBRARIES ${TASK_LIBRARIES} ${GNUTLS_LIBRARIES})
|
||||
-endif (GNUTLS_FOUND)
|
||||
+if (USE_GNUTLS)
|
||||
+ message ("-- Looking for GnuTLS")
|
||||
+ find_package (GnuTLS)
|
||||
+ if (GNUTLS_FOUND)
|
||||
+ set (HAVE_LIBGNUTLS true)
|
||||
+ set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${GNUTLS_INCLUDE_DIR})
|
||||
+ set (TASK_LIBRARIES ${TASK_LIBRARIES} ${GNUTLS_LIBRARIES})
|
||||
+ endif (GNUTLS_FOUND)
|
||||
+endif (USE_GNUTLS)
|
||||
|
||||
#message ("-- Looking for pthread")
|
||||
#find_path (PTHREAD_INCLUDE_DIR pthread.h)
|
||||
@ -0,0 +1,62 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-misc/task/task-2.3.0-r1.ebuild,v 1.1 2014/11/28 18:00:46 radhermit Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils cmake-utils bash-completion-r1
|
||||
|
||||
DESCRIPTION="Taskwarrior is a command-line todo list manager"
|
||||
HOMEPAGE="http://taskwarrior.org/"
|
||||
SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
|
||||
IUSE="gnutls vim-syntax zsh-completion"
|
||||
|
||||
DEPEND="gnutls? ( net-libs/gnutls )
|
||||
sys-libs/readline
|
||||
elibc_glibc? ( sys-apps/util-linux )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
# use the correct directory locations
|
||||
sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" \
|
||||
scripts/add-ons/* || die
|
||||
|
||||
# don't automatically install scripts
|
||||
sed -i '/scripts/d' CMakeLists.txt || die
|
||||
|
||||
epatch "${FILESDIR}"/${P}-issue-1473-rcdir-fix.patch
|
||||
epatch "${FILESDIR}"/${P}-gnutls-automagic.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
mycmakeargs=(
|
||||
$(cmake-utils_use_use gnutls GNUTLS)
|
||||
-DTASK_DOCDIR=share/doc/${PF}
|
||||
-DTASK_RCDIR=share/${PN}/rc
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
newbashcomp scripts/bash/task.sh task
|
||||
|
||||
if use vim-syntax ; then
|
||||
rm scripts/vim/README
|
||||
insinto /usr/share/vim/vimfiles
|
||||
doins -r scripts/vim/*
|
||||
fi
|
||||
|
||||
if use zsh-completion ; then
|
||||
insinto /usr/share/zsh/site-functions
|
||||
doins scripts/zsh/*
|
||||
fi
|
||||
|
||||
exeinto /usr/share/${PN}/scripts
|
||||
doexe scripts/add-ons/*
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
# ChangeLog for app-text/groonga-normalizer-mysql
|
||||
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/groonga-normalizer-mysql/ChangeLog,v 1.1 2014/11/29 03:10:55 grknight Exp $
|
||||
|
||||
*groonga-normalizer-mysql-1.0.6 (29 Nov 2014)
|
||||
|
||||
29 Nov 2014; Brian Evans <grknight@gentoo.org>
|
||||
+groonga-normalizer-mysql-1.0.6.ebuild, +metadata.xml:
|
||||
New package which will be needed for the Mroonga storage engine in dev-
|
||||
db/mariadb
|
||||
@ -0,0 +1,18 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
DIST groonga-normalizer-mysql-1.0.6.tar.gz 430461 SHA256 7e037aa42b7a3212140674d39a8dc0d722670d744f99e019bde308db91eb4d85 SHA512 36ef0344ba73633669d12dd13b08cd336b2b77a7c76e11b52b5ce17fcf20b17a0ea8a3f68be1be91d07e3fe5a87b667664d7a503a54ba1cace3bd6c252286821 WHIRLPOOL 7e36266b5bade8bd1bb288f3936b059f57b24ea3662610999d5b9667688076b1de21d99ea21b774af43793fbef4feeb605eb4051bd95a5d0e0d36c49507307f7
|
||||
EBUILD groonga-normalizer-mysql-1.0.6.ebuild 855 SHA256 82ea4c125c3813396b5092a39be24cf08447c23fb276355e6e564e7c8aca20a6 SHA512 85e015b067b223bad789ae045881623294d5bdff207fd8d1d00300509dce7fc4d357d95767f01d3f893abc92e8e8a936aca19eda2449ff91a04d8568c3fefd75 WHIRLPOOL 1a4fcc37dc9c30d94b00f4afe0442e450cab6f41186c659df4468c14598a0c8bbc6b2f80e504c2e917efde19d54f24ff84d4e7f1c42030dbaaeedbaac7918793
|
||||
MISC ChangeLog 481 SHA256 b544aa52565e3bd77579046841a5a996448edeefae95a235dd60f30a43a97913 SHA512 7bc4650903c83faa5172cb25a01e2b41ce3c00b1c966941f6a229c607fa9de1c96c5c1210c0b91ff75c89b391e174816bb5feddaa2cf43138aa53cfc72e0c412 WHIRLPOOL 4b70bda12a7421a978c30dc8221746ebc858c3f5ae3f374f82a5e806e4cefe261b937a6c59e070d94b03657a6efdd4401dff0f1027c5fccedc85ae70255647a7
|
||||
MISC metadata.xml 202 SHA256 832d005b541eb8e0a698b806d10dfd7db34b12d5b7b19d76d6dccd4563dc0d56 SHA512 f42b42f0d9deaf6fc0c350f95ef27225ff8479114aec495be26816ceaa3c0628927371601bb032d6724170b4df77ddcf40f187ddc2d5561ae682dc91ef9d211c WHIRLPOOL e8e046c3d68a678c13d1bbf80f9963c6138a74695ea02112588b096e091e56efda37f62d4b54af5147ba86f72a6904f66c4890527be0d5741d40bc4c25f9df9f
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iQEcBAEBCAAGBQJUeTlDAAoJEE4V4vFnx44dPlcH/jT1nCmuBlpqdh5E7PiovKwx
|
||||
mpWDK5DC4GJUhMulZpEzR92Ojh43Uk8l9U7goSByc9bKArgd2ZsJQMXrK2pBxqCy
|
||||
57wLsftDvhVzRrvflJc5dl7N8WtF4lf1i2QcOwBgKWB1y25AEih9ZFqz+bwcn5ia
|
||||
+bd+dQTIhRgPMpZOzwQzjcq6iD+FsGCgtdDDA1QEtX6E5IOgDLRmOCzGhRhqhwq4
|
||||
0Ap5+XHpZbnUnSzhfSdfS2ucN+w90vbVwzEVs4hrVuLMQuoFu5uAEnFB/Plr7IaV
|
||||
dmtsNY35cqJHU/s/L/hcb6PNuWp5VlXbYlgpuTLGPWjtVbR8VA882TDie3MAMLk=
|
||||
=+7xt
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -0,0 +1,38 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild,v 1.1 2014/11/29 03:10:55 grknight Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils autotools
|
||||
|
||||
DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
|
||||
HOMEPAGE="http://groonga.org/"
|
||||
SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="app-text/groonga"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
DOCS=( README.md )
|
||||
|
||||
src_prepare() {
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--without-ruby19 \
|
||||
--docdir="${EROOT}usr/share/doc/${P}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
prune_libtool_files
|
||||
# Dont install README twice nor license
|
||||
rm -r "${D}usr/share/doc/${PN}" || die
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>grknight@gentoo.org</email>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -0,0 +1,9 @@
|
||||
# ChangeLog for app-text/groonga
|
||||
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/groonga/ChangeLog,v 1.1 2014/11/29 02:30:24 grknight Exp $
|
||||
|
||||
*groonga-4.0.7 (29 Nov 2014)
|
||||
|
||||
29 Nov 2014; Brian Evans <grknight@gentoo.org> +files/groonga.confd,
|
||||
+files/groonga.initd, +groonga-4.0.7.ebuild, +metadata.xml:
|
||||
New Package based on older work in the matsuu overlay by MATSUU Takuto
|
||||
@ -0,0 +1,20 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
AUX groonga.confd 409 SHA256 ffa9f777d5a854a1c5953cc027cd2e3e59ccf383f9190133faaa3cd5d6b15179 SHA512 a15e490fa74f5095cff1eddf50aae40d1b186c243ca5407731a01afb2074727d1088dad37cb130697dd7667bd326f936567d06a1e51957a16f3c4db3e046bf36 WHIRLPOOL f25cffe104f89296e8d51d6cd9c5371251b9b14dbb230d73e6da40064fe3449a4c86d6790683b0dedd37a47b6540a08586bfc461408e41ba0c0fb7c52631a298
|
||||
AUX groonga.initd 578 SHA256 088c9b8713fd75822dd38a25997fb3447f90347ebfe0491aae66812a5b62afc1 SHA512 9727f5b954214a65bb58e3f066db562ca767a7f2d35a876eda7c49b39d6601ec49807f8f697d4ec2ce14f73823d492c82b198d2f5feb777ff95d00f1a264faef WHIRLPOOL d58659a792ab4ac3b007e962ddbae6aaf0e12f0de02089e40d1bf0d025bec158c2d629d8e9595046f7cbd781894582ff4886130e6d1daec6665ea9315ca72c23
|
||||
DIST groonga-4.0.7.tar.gz 10990151 SHA256 ec1d19b05c7a592a316e845ff4c5549c6236cc7ea83423c0fc7831c16161bbbf SHA512 942c28205ffb2c7d3ba767ff68b342ef5b7b9fef72131782635e86682c82a4ea3dad9d5263a42563ded22db573015c9859e49dc20c812f7a6534478b22d8b9a8 WHIRLPOOL 2473c14bcc50c87bfb925e73cc3c4cd2c02915ac498a5e40aeee312ac9873857406e38e8146fabe722250f2d258b6444813d4c47726c16ce4cfceea35f207d3a
|
||||
EBUILD groonga-4.0.7.ebuild 2515 SHA256 e2985f9c8e22637f3b5f472d08b2a89630fc63ec09729286e83c74ef40b441cc SHA512 d7cdb573471b7be19814f4d994be1b0d0c29364e1cf35889346116f29ab14cfd8770aa9da57202c82939a7741120617cffe67452d8453479b4f1e4998bf81958 WHIRLPOOL bbbe28a04ba113946844ef5c267306dd73a99edcfcaa007ff3169934bf5cfa004e9350eac2efac25c798286d1d2758dda893dbaf732d287173ec54ebea881af3
|
||||
MISC ChangeLog 443 SHA256 cf9933ef787dbe29a0e62df71f8db8b8e1ebbb175f9d10f176b92c2c08a66cf0 SHA512 499276aacc7909f0c5e8c78fcbb8c11517f4d25d127a9e6ef06007371eec5895fd5096cb5a5d467ffe8102ffcdfccc1abed67fb17ad6e00f174973ec01cb4e99 WHIRLPOOL d6dac3eff481d50abcc3327b8d617777adfcc7de5324d6a9dd115fb6048437fbecf6e61aad28a89d8ac308201019f7bdbc88d67af0abda264466c31f259ebea0
|
||||
MISC metadata.xml 1192 SHA256 843308dfff5dd504955601f21930f93b516072a3cb7feda6472d3a70395e57c4 SHA512 91ddf13f0338aa1c9415ca03a162bf413973fdd32a06f26b226ac3712e5aef6e54650622dc3d1d07855fa72c5c84417a21affff65eabb45a82478b71329db1bf WHIRLPOOL f660f6759ea44b2ca7f8bcb8933e6285e516470b8ce454b178762cdbd6900b7f58652f4079678a42918e127cc52bfce6ddce4f9570436afa2ef5f95a76160c30
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iQEcBAEBCAAGBQJUeS/FAAoJEE4V4vFnx44dGCIH/jgu6F8q3igz8A0S9TM9O/nI
|
||||
5iY6E6uOxnxBFWbBKDQbfEPZaTj0uk5XfNFbegk/8q5ZF3hHSHhG44ZHgEvX/3tQ
|
||||
iUxwNLtFleyGjBwFQcLqH27rSKgmPzHjed7KT+TZRXv6gi42IwvGpLwSTPh8XfgU
|
||||
Qb+loUvwkjeaUS6iE8LUkj3Brf1Hn1o3Fm1Hcc9Te5gVEJJlGrvVEw/n3TksDF4K
|
||||
jvMtVJUdjJtIr740XjnFNQB43boad5Rr55wncVbFT1RcMSi7qYnWok0yRpkNGClw
|
||||
wXPUhI8CQhr9hqxbmE9occ8sjYrLGh6uxrqE369hOeQ1OeudsDrggfCR4hSfC5c=
|
||||
=rQuc
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -0,0 +1,12 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/groonga/files/groonga.confd,v 1.1 2014/11/29 02:30:24 grknight Exp $
|
||||
|
||||
# Default
|
||||
#USER=groonga
|
||||
#GROUP=groonga
|
||||
#ADDRESS=127.0.0.1
|
||||
#DATABASE=/var/lib/groonga/db/db
|
||||
#LOG_PATH=/var/log/groonga/groonga.log
|
||||
#QUERY_LOG_PATH=/var/log/groonga/query.log
|
||||
#PROTOCOL=gqtp
|
||||
@ -0,0 +1,21 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/groonga/files/groonga.initd,v 1.1 2014/11/29 02:30:24 grknight Exp $
|
||||
|
||||
depend() {
|
||||
use net
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting groonga"
|
||||
checkpath -d /run/groonga -o ${USER:-groonga}:${GROUP:-groonnga}
|
||||
start-stop-daemon --start --quiet --exec /usr/sbin/groonga -- ${GROONGA_OPTS}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping groonga"
|
||||
start-stop-daemon --stop --quiet --pidfile /var/spool/groonga/groonga.pid
|
||||
eend $?
|
||||
}
|
||||
@ -0,0 +1,91 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/groonga/groonga-4.0.7.ebuild,v 1.1 2014/11/29 02:30:24 grknight Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils libtool user
|
||||
|
||||
DESCRIPTION="An Embeddable Fulltext Search Engine"
|
||||
HOMEPAGE="http://groonga.org/"
|
||||
SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc ruby sphinx static-libs uyield zeromq zlib"
|
||||
|
||||
RDEPEND="benchmark? ( >=dev-libs/glib-2.8 )
|
||||
libedit? ( >=dev-libs/libedit-3 )
|
||||
libevent? ( dev-libs/libevent )
|
||||
lzo? ( dev-libs/lzo )
|
||||
mecab? ( >=app-text/mecab-0.80 )
|
||||
msgpack? ( dev-libs/msgpack )
|
||||
ruby? ( dev-lang/ruby )
|
||||
sphinx? ( >=dev-python/sphinx-1.0.1 )
|
||||
zeromq? ( net-libs/zeromq )
|
||||
zlib? ( sys-libs/zlib )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
sphinx? ( dev-python/sphinx )"
|
||||
|
||||
REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup groonga
|
||||
enewuser groonga -1 -1 -1 groonga
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# httpd is a bundled copy of nginx; disabled for security reasons
|
||||
# prce only is used with httpd
|
||||
# kytea and libstemmer are not available in portage
|
||||
econf \
|
||||
--disable-groonga-httpd \
|
||||
--without-pcre \
|
||||
--without-kytea \
|
||||
--without-libstemmer \
|
||||
--with-log-path="${EROOT}var/log/${PN}.log" \
|
||||
--docdir="${EROOT}usr/share/doc/${P}" \
|
||||
$(use_enable abort) \
|
||||
$(use_enable benchmark) \
|
||||
$(use_enable debug memory-debug) \
|
||||
$(use_enable doc document) \
|
||||
$(use_enable dynamic-malloc-change) \
|
||||
$(use_enable exact-alloc-count) \
|
||||
$(use_enable fmalloc) \
|
||||
$(use_enable futex) \
|
||||
$(use_enable libedit) \
|
||||
$(use_with libevent) \
|
||||
$(use_with lzo) \
|
||||
$(use_with mecab) \
|
||||
$(use_with msgpack message-pack) \
|
||||
$(use_enable nfkc) \
|
||||
$(use_with ruby) \
|
||||
$(use_with sphinx sphinx-build) \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable uyield) \
|
||||
$(use_enable zeromq) \
|
||||
$(use_with zlib)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
prune_libtool_files
|
||||
|
||||
newinitd "${FILESDIR}/${PN}.initd" ${PN}
|
||||
newconfd "${FILESDIR}/${PN}.confd" ${PN}
|
||||
|
||||
keepdir /var/{log,spool}/${PN}
|
||||
fowners groonga:groonga /var/{log,spool}/${PN}
|
||||
|
||||
dodoc README.md
|
||||
|
||||
use examples || rm -r "${D}usr/share/${PN}" || die
|
||||
# Extra init script
|
||||
rm -r "${D}usr/sbin/groonga-httpd-restart" || die
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>grknight@gentoo.org</email>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="abort">Enable query abortion</flag>
|
||||
<flag name="benchmark">Build benchmark programs</flag>
|
||||
<flag name="dynamic-malloc-change">Allow dynamic memory allocation change for testing</flag>
|
||||
<flag name="exact-alloc-count">Atomic counting for memory alloc count</flag>
|
||||
<flag name="fmalloc">Make memory allocation failed in specified condition for debug</flag>
|
||||
<flag name="futex">Use futex</flag>
|
||||
<flag name="libevent">Enable <pkg>dev-libs/libevent</pkg> used for suggestion</flag>
|
||||
<flag name="mecab">Use <pkg>app-text/mecab</pkg> for morphological analysis</flag>
|
||||
<flag name="msgpack">Enable <pkg>dev-libs/msgpack</pkg> used for suggestion</flag>
|
||||
<flag name="nfkc">Use nfkc based utf8 normalization</flag>
|
||||
<flag name="sphinx">Enable document generation by <pkg>app-misc/sphinx</pkg></flag>
|
||||
<flag name="uyield">Build for detecting race conditions</flag>
|
||||
<flag name="zeromq">Enable <pkg>net-libs/zeromq</pkg> used for suggestion</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/gentoo-syntax-20141102.ebuild,v 1.1 2014/11/02 22:08:26 radhermit Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/gentoo-syntax-20141129.ebuild,v 1.2 2014/11/29 08:21:30 radhermit Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: Gentoo and portage related syntax highlighting, filetype, and indent settings"
|
||||
HOMEPAGE="http://www.gentoo.org/"
|
||||
HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
|
||||
|
||||
LICENSE="vim"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
@ -0,0 +1,30 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-vim/notes/notes-0.29.ebuild,v 1.1 2014/11/28 15:10:11 radhermit Exp $
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="sqlite"
|
||||
|
||||
inherit python-single-r1 vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: easy note taking in vim"
|
||||
HOMEPAGE="http://peterodding.com/code/vim/notes/"
|
||||
SRC_URI="https://github.com/xolox/vim-notes/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
LICENSE="MIT"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
>=app-vim/vim-misc-1.16.1"
|
||||
|
||||
VIM_PLUGIN_HELPFILES="${PN}.txt"
|
||||
|
||||
S=${WORKDIR}/vim-${P}
|
||||
|
||||
src_prepare() {
|
||||
# remove unnecessary files
|
||||
rm addon-info.json INSTALL.md README.md || die
|
||||
|
||||
python_fix_shebang .
|
||||
}
|
||||
@ -0,0 +1,112 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-4.02.1.ebuild,v 1.1 2014/11/28 15:42:01 aballier Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit flag-o-matic eutils multilib versionator toolchain-funcs
|
||||
|
||||
PATCHLEVEL="6"
|
||||
MY_P="${P/_/+}"
|
||||
DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
|
||||
HOMEPAGE="http://www.ocaml.org/"
|
||||
SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.xz
|
||||
mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
|
||||
|
||||
LICENSE="QPL-1.0 LGPL-2"
|
||||
# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
|
||||
# so here we go with the subslot.
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
|
||||
IUSE="emacs latex ncurses +ocamlopt X xemacs"
|
||||
|
||||
RDEPEND="
|
||||
ncurses? ( sys-libs/ncurses )
|
||||
X? ( x11-libs/libX11 x11-proto/xproto )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
PDEPEND="emacs? ( app-emacs/ocaml-mode )
|
||||
xemacs? ( app-xemacs/ocaml )"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
pkg_setup() {
|
||||
# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
|
||||
# results in relocations if gcc wants to create a PIE executable
|
||||
if gcc-specs-pie ; then
|
||||
append-ldflags -nopie
|
||||
ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
|
||||
ewarn "We have appended -nopie to ocaml build options"
|
||||
ewarn "because linking an executable with pie while the objects are not pic will not work"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
export LC_ALL=C
|
||||
local myconf=""
|
||||
|
||||
# Causes build failures because it builds some programs with -pg,
|
||||
# bug #270920
|
||||
filter-flags -fomit-frame-pointer
|
||||
# Bug #285993
|
||||
filter-mfpmath sse
|
||||
|
||||
# It doesn't compile on alpha without this LDFLAGS
|
||||
use alpha && append-ldflags "-Wl,--no-relax"
|
||||
|
||||
use ncurses || myconf="${myconf} -no-curses"
|
||||
use X || myconf="${myconf} -no-graph"
|
||||
|
||||
# ocaml uses a home-brewn configure script, preventing it to use econf.
|
||||
RAW_LDFLAGS="$(raw-ldflags)" ./configure -prefix "${EPREFIX}"/usr \
|
||||
--bindir "${EPREFIX}"/usr/bin \
|
||||
--libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
|
||||
--mandir "${EPREFIX}"/usr/share/man \
|
||||
-host "${CHOST}" \
|
||||
-cc "$(tc-getCC)" \
|
||||
-as "$(tc-getAS)" \
|
||||
-aspp "$(tc-getCC) -c" \
|
||||
-partialld "$(tc-getLD) -r" \
|
||||
--with-pthread ${myconf} || die "configure failed!"
|
||||
|
||||
# http://caml.inria.fr/mantis/view.php?id=4698
|
||||
export CCLINKFLAGS="${LDFLAGS}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake world
|
||||
|
||||
# Native code generation can be disabled now
|
||||
if use ocamlopt ; then
|
||||
# bug #279968
|
||||
emake opt
|
||||
emake opt.opt
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake BINDIR="${ED}"/usr/bin \
|
||||
LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
|
||||
MANDIR="${ED}"/usr/share/man \
|
||||
install
|
||||
|
||||
# Symlink the headers to the right place
|
||||
dodir /usr/include
|
||||
dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml
|
||||
|
||||
dodoc Changes INSTALL README
|
||||
|
||||
# Create and envd entry for latex input files
|
||||
if use latex ; then
|
||||
echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
|
||||
doenvd "${T}"/99ocamldoc
|
||||
fi
|
||||
|
||||
# Install ocaml-rebuild portage set
|
||||
insinto /usr/share/portage/config/sets
|
||||
doins "${FILESDIR}/ocaml.conf"
|
||||
}
|
||||
@ -1,100 +0,0 @@
|
||||
cut the crap of inventing paths, or adding search paths that we don't use
|
||||
|
||||
--- Configure
|
||||
+++ Configure
|
||||
@@ -102,28 +102,6 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
-: Proper PATH setting
|
||||
-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
|
||||
-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
|
||||
-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
|
||||
-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
|
||||
-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
|
||||
-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
|
||||
-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
|
||||
-paths="$paths /sbin /usr/sbin /usr/libexec"
|
||||
-paths="$paths /system/gnu_library/bin"
|
||||
-
|
||||
-for p in $paths
|
||||
-do
|
||||
- case "$p_$PATH$p_" in
|
||||
- *$p_$p$p_*) ;;
|
||||
- *) test -d $p && PATH=$PATH$p_$p ;;
|
||||
- esac
|
||||
-done
|
||||
-
|
||||
-PATH=.$p_$PATH
|
||||
-export PATH
|
||||
-
|
||||
: shall we be using ksh?
|
||||
inksh=''
|
||||
needksh=''
|
||||
@@ -8282,66 +8260,6 @@
|
||||
;;
|
||||
esac
|
||||
|
||||
-# How will the perl executable find the installed shared $libperl?
|
||||
-# Add $xxx to ccdlflags.
|
||||
-# If we can't figure out a command-line option, use $shrpenv to
|
||||
-# set env LD_RUN_PATH. The main perl makefile uses this.
|
||||
-shrpdir=$archlibexp/CORE
|
||||
-xxx=''
|
||||
-tmp_shrpenv=''
|
||||
-if "$useshrplib"; then
|
||||
- case "$osname" in
|
||||
- aix)
|
||||
- # We'll set it in Makefile.SH...
|
||||
- ;;
|
||||
- solaris)
|
||||
- xxx="-R $shrpdir"
|
||||
- ;;
|
||||
- freebsd|netbsd|openbsd|interix|dragonfly)
|
||||
- xxx="-Wl,-R$shrpdir"
|
||||
- ;;
|
||||
- bsdos|linux|irix*|dec_osf|gnu*)
|
||||
- xxx="-Wl,-rpath,$shrpdir"
|
||||
- ;;
|
||||
- next)
|
||||
- # next doesn't like the default...
|
||||
- ;;
|
||||
- beos)
|
||||
- # beos doesn't like the default, either.
|
||||
- ;;
|
||||
- haiku)
|
||||
- # Haiku doesn't like the default, either.
|
||||
- ;;
|
||||
- hpux*)
|
||||
- # hpux doesn't like the default, either.
|
||||
- tmp_shrpenv="env LDOPTS=\"+s +b${shrpdir}\""
|
||||
- ;;
|
||||
- cygwin)
|
||||
- # cygwin needs only ldlibpth
|
||||
- ;;
|
||||
- *)
|
||||
- tmp_shrpenv="env LD_RUN_PATH=$shrpdir"
|
||||
- ;;
|
||||
- esac
|
||||
- case "$xxx" in
|
||||
- '') ;;
|
||||
- *)
|
||||
- # Only add $xxx if it isn't already in ccdlflags.
|
||||
- case " $ccdlflags " in
|
||||
- *" $xxx "*) ;;
|
||||
- *) ccdlflags="$ccdlflags $xxx"
|
||||
- cat <<EOM >&4
|
||||
-
|
||||
-Adding $xxx to the flags
|
||||
-passed to $ld so that the perl executable will find the
|
||||
-installed shared $libperl.
|
||||
-
|
||||
-EOM
|
||||
- ;;
|
||||
- esac
|
||||
- ;;
|
||||
- esac
|
||||
-fi
|
||||
# Fix ccdlflags in AIX for building external extensions.
|
||||
# (For building Perl itself bare -bE:perl.exp is needed,
|
||||
# Makefile.SH takes care of this.)
|
||||
@ -1,40 +0,0 @@
|
||||
# do not assume '.' being in PATH on hpux,
|
||||
# use 'gcc' as linker, link with '-lm'.
|
||||
|
||||
--- hints/hpux.sh
|
||||
+++ hints/hpux.sh
|
||||
@@ -190,7 +190,7 @@
|
||||
$define|true|[Yy])
|
||||
echo '#include <stdio.h>\nint main(){long l;printf("%d\\n",sizeof(l));}'>try.c
|
||||
$cc -o try $ccflags $ldflags try.c
|
||||
- if [ "`try`" = "8" ]; then
|
||||
+ if [ "`./try`" = "8" ]; then
|
||||
case "$use64bitall" in
|
||||
$define|true|[Yy]) ;;
|
||||
*) cat <<EOM >&4
|
||||
@@ -338,7 +338,7 @@
|
||||
} /* main */
|
||||
EOF
|
||||
$cc -o try $ccflags $ldflags try.c
|
||||
- maxdsiz=`try`
|
||||
+ maxdsiz=`./try`
|
||||
rm -f try try.c core
|
||||
if [ $maxdsiz -le 64 ]; then
|
||||
# 64 Mb is probably not enough to optimize toke.c
|
||||
@@ -363,11 +363,12 @@
|
||||
"") optimize="-g -O" ;;
|
||||
*O[3456789]*) optimize=`echo "$optimize" | sed -e 's/O[3-9]/O2/'` ;;
|
||||
esac
|
||||
- #ld="$cc"
|
||||
- ld=/usr/bin/ld
|
||||
+ ld="$cc"
|
||||
+ #ld=/usr/bin/ld
|
||||
cccdlflags='-fPIC'
|
||||
- #lddlflags='-shared'
|
||||
- lddlflags='-b'
|
||||
+ lddlflags='-shared'
|
||||
+ #lddlflags='-b'
|
||||
+ libs='-lm'
|
||||
case "$optimize" in
|
||||
*-g*-O*|*-O*-g*)
|
||||
# gcc without gas will not accept -g
|
||||
@ -1,70 +0,0 @@
|
||||
1) Match "powerpc-ibm-aix5.3.0.0-gcc" as gcc too.
|
||||
|
||||
2) Creating shared library on aix with full soname support, following
|
||||
http://lists.gnu.org/archive/html/libtool/2011-01/msg00023.html
|
||||
http://lists.gnu.org/archive/html/libtool/2011-02/msg00000.html
|
||||
|
||||
Once there is an agreement on that, this patch basically is designed
|
||||
for upstream perl to be applied when their soname would change anyway.
|
||||
However, there is 'strip' being used, and I don't know yet what to
|
||||
use instead in cross-aix setups with recent binutils.
|
||||
|
||||
--- Makefile.SH
|
||||
+++ Makefile.SH
|
||||
@@ -92,12 +92,12 @@
|
||||
;;
|
||||
aix*)
|
||||
case "$cc" in
|
||||
- gcc*)
|
||||
- shrpldflags="-shared -Wl,-H512 -Wl,-T512 -Wl,-bhalt:4 -Wl,-bM:SRE -Wl,-bE:perl.exp"
|
||||
+ *gcc*)
|
||||
+ shrpldflags="-shared -Wl,-H512 -Wl,-T512 -Wl,-bhalt:4 -Wl,-bE:perl.exp"
|
||||
case "$osvers" in
|
||||
- 3*) shrpldflags="$shrpldflags -e _nostart"
|
||||
+ 3*) shrpldflags="$shrpldflags -Wl,-bM:SRE -e _nostart"
|
||||
;;
|
||||
- *) shrpldflags="$shrpldflags -Wl,-bnoentry"
|
||||
+ *) shrpldflags="$shrpldflags -Wl,-G -Wl,-bernotok -Wl,-bnoentry"
|
||||
;;
|
||||
esac
|
||||
shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
|
||||
@@ -105,11 +105,11 @@
|
||||
linklibperl_nonshr='-lperl_nonshr'
|
||||
;;
|
||||
*)
|
||||
- shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp"
|
||||
+ shrpldflags="-H512 -T512 -bhalt:4 -bE:perl.exp"
|
||||
case "$osvers" in
|
||||
- 3*) shrpldflags="$shrpldflags -e _nostart"
|
||||
+ 3*) shrpldflags="$shrpldflags -bM:SRE -e _nostart"
|
||||
;;
|
||||
- *) shrpldflags="$shrpldflags -b noentry"
|
||||
+ *) shrpldflags="$shrpldflags -G -bernotok -b noentry"
|
||||
;;
|
||||
esac
|
||||
shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
|
||||
@@ -763,11 +763,19 @@
|
||||
!NO!SUBS!
|
||||
case "$osname" in
|
||||
aix)
|
||||
- $spitshell >>$Makefile <<'!NO!SUBS!'
|
||||
- rm -f libperl$(OBJ_EXT)
|
||||
- mv $@ libperl$(OBJ_EXT)
|
||||
- $(AR) qv $(LIBPERL) libperl$(OBJ_EXT)
|
||||
-!NO!SUBS!
|
||||
+ bits=32
|
||||
+ if test X"$use64bitall" = Xdefine; then bits=64; fi
|
||||
+ $spitshell >>$Makefile <<!GROK!THIS!
|
||||
+ rm -f shr.imp shr.o
|
||||
+ mv \$@ shr.o
|
||||
+ strip -e shr.o
|
||||
+ ( echo '#! libperl.so.${revision}.${patchlevel}(shr.o)' \\
|
||||
+ ; echo '# ${bits}' \\
|
||||
+ ; grep -v '^#!' perl.exp \\
|
||||
+ ) > shr.imp
|
||||
+ \$(AR) qv \$@ shr.imp shr.o
|
||||
+ rm -f shr.imp shr.o
|
||||
+!GROK!THIS!
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@ -1,21 +0,0 @@
|
||||
reported: http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2011-04/msg01014.html
|
||||
|
||||
diff -ru perl-5.12.3.orig/hints/interix.sh perl-5.12.3/hints/interix.sh
|
||||
--- perl-5.12.3.orig/hints/interix.sh 2011-04-27 08:34:00 +0200
|
||||
+++ perl-5.12.3/hints/interix.sh 2011-04-27 08:53:46 +0200
|
||||
@@ -6,14 +6,13 @@
|
||||
cc='gcc'
|
||||
cccdlflags="-DPIC $cccdlflags"
|
||||
ccdlflags='-Wl,-E'
|
||||
-ccflags="-D_ALL_SOURCE $ccflags"
|
||||
-d_poll="$undef"
|
||||
ld='gcc'
|
||||
lddlflags="-shared $lddlflags"
|
||||
rpathflag='-Wl,-R'
|
||||
sharpbang='#!'
|
||||
usemymalloc='false'
|
||||
usenm='false'
|
||||
+firstmakefile=GNUmakefile
|
||||
|
||||
# This script UU/usethreads.cbu will get 'called-back' by Configure
|
||||
# after it has prompted the user for whether to use threads.
|
||||
@ -1,321 +0,0 @@
|
||||
http://rt.perl.org/rt3/Ticket/Display.html?id=89502
|
||||
|
||||
--- perl-5.12.3/Configure 2011-02-21 09:18:09.000000000 +0000
|
||||
+++ perl-5.12.3/Configure 2011-02-21 09:38:49.000000000 +0000
|
||||
@@ -1275,6 +1275,9 @@
|
||||
elif test -n "$DJGPP"; then
|
||||
: DOS DJGPP
|
||||
_exe=".exe"
|
||||
+elif test -f "/kern/cookiejar"; then
|
||||
+: MiNT
|
||||
+ _exe=""
|
||||
elif test -d c:/. -o -n "$is_os2" ; then
|
||||
: OS/2 or cygwin
|
||||
_exe=".exe"
|
||||
@@ -1402,7 +1405,7 @@
|
||||
xcat=/bin/cat
|
||||
test -f $xcat$_exe || xcat=/usr/bin/cat
|
||||
if test ! -f $xcat$_exe; then
|
||||
- for p in `echo $PATH | sed -e "s/$p_/ /g"` $paths; do
|
||||
+ for p in `echo $PATH | sed -e 's/$p_/ /g'` $paths; do
|
||||
if test -f $p/cat$_exe; then
|
||||
xcat=$p/cat
|
||||
break
|
||||
--- perl-5.12.3/ext/DynaLoader/dl_dld.xs 2010-11-21 21:40:55.000000000 +0000
|
||||
+++ perl-5.12.3/ext/DynaLoader/dl_dld.xs 2011-02-21 09:38:51.000000000 +0000
|
||||
@@ -116,6 +116,18 @@
|
||||
goto haverror;
|
||||
}
|
||||
|
||||
+ DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dld_link(libm.a)\n"));
|
||||
+ if (dlderr = dld_link("/usr/lib/libm.a")) {
|
||||
+ SaveError(aTHX_ "dld_link(libm.a): %s", dld_strerror(dlderr));
|
||||
+ goto haverror;
|
||||
+ }
|
||||
+
|
||||
+ DLDEBUG(1,PerlIO_printf(Perl_debug_log, "dld_link(libc.a)\n"));
|
||||
+ if (dlderr = dld_link("/usr/lib/libc.a")) {
|
||||
+ SaveError(aTHX_ "dld_link(libc.a): %s", dld_strerror(dlderr));
|
||||
+ goto haverror;
|
||||
+ }
|
||||
+
|
||||
max = AvFILL(dl_resolve_using);
|
||||
for (x = 0; x <= max; x++) {
|
||||
char *sym = SvPVX(*av_fetch(dl_resolve_using, x, 0));
|
||||
--- perl-5.12.3/malloc.c 2011-01-09 20:20:57.000000000 +0000
|
||||
+++ perl-5.12.3/malloc.c 2011-02-21 09:38:51.000000000 +0000
|
||||
@@ -264,7 +264,7 @@
|
||||
#define MIN_BUC_POW2 (sizeof(void*) > 4 ? 3 : 2) /* Allow for 4-byte arena. */
|
||||
#define MIN_BUCKET (MIN_BUC_POW2 * BUCKETS_PER_POW2)
|
||||
|
||||
-#if !(defined(I286) || defined(atarist))
|
||||
+#if !defined(I286)
|
||||
/* take 2k unless the block is bigger than that */
|
||||
# define LOG_OF_MIN_ARENA 11
|
||||
#else
|
||||
@@ -551,8 +551,8 @@
|
||||
*/
|
||||
#define u_short unsigned short
|
||||
|
||||
-/* 286 and atarist like big chunks, which gives too much overhead. */
|
||||
-#if (defined(RCHECK) || defined(I286) || defined(atarist)) && defined(PACK_MALLOC)
|
||||
+/* 286 like big chunks, which gives too much overhead. */
|
||||
+#if (defined(RCHECK) || defined(I286)) && defined(PACK_MALLOC)
|
||||
# undef PACK_MALLOC
|
||||
#endif
|
||||
|
||||
@@ -1734,16 +1734,14 @@
|
||||
/* Second, check alignment. */
|
||||
slack = 0;
|
||||
|
||||
-#if !defined(atarist) /* on the atari we dont have to worry about this */
|
||||
-# ifndef I286 /* The sbrk(0) call on the I286 always returns the next segment */
|
||||
+#ifndef I286 /* The sbrk(0) call on the I286 always returns the next segment */
|
||||
/* WANTED_ALIGNMENT may be more than NEEDED_ALIGNMENT, but this may
|
||||
improve performance of memory access. */
|
||||
if (PTR2UV(cp) & (WANTED_ALIGNMENT - 1)) { /* Not aligned. */
|
||||
slack = WANTED_ALIGNMENT - (PTR2UV(cp) & (WANTED_ALIGNMENT - 1));
|
||||
add += slack;
|
||||
}
|
||||
-# endif
|
||||
-#endif /* !atarist */
|
||||
+#endif
|
||||
|
||||
if (add) {
|
||||
DEBUG_m(PerlIO_printf(Perl_debug_log,
|
||||
--- perl-5.12.3/miniperlmain.c 2011-01-09 20:20:57.000000000 +0000
|
||||
+++ perl-5.12.3/miniperlmain.c 2011-02-21 09:38:49.000000000 +0000
|
||||
@@ -45,7 +45,7 @@
|
||||
#if defined (atarist)
|
||||
/* The Atari operating system doesn't have a dynamic stack. The
|
||||
stack size is determined from this value. */
|
||||
-long _stksize = 64 * 1024;
|
||||
+long _stksize = 256 * 1024;
|
||||
#endif
|
||||
|
||||
#if defined(PERL_GLOBAL_STRUCT_PRIVATE)
|
||||
--- perl-5.12.3/os2/perlrexx.c 2010-11-21 21:40:56.000000000 +0000
|
||||
+++ perl-5.12.3/os2/perlrexx.c 2011-02-21 09:42:49.000000000 +0000
|
||||
@@ -38,7 +38,7 @@
|
||||
#if defined (atarist)
|
||||
/* The Atari operating system doesn't have a dynamic stack. The
|
||||
stack size is determined from this value. */
|
||||
-long _stksize = 64 * 1024;
|
||||
+long _stksize = 256 * 1024;
|
||||
#endif
|
||||
|
||||
/* Register any extra external extensions */
|
||||
--- perl-5.12.3/perl.c 2011-02-21 09:17:19.000000000 +0000
|
||||
+++ perl-5.12.3/perl.c 2011-02-21 09:38:50.000000000 +0000
|
||||
@@ -3272,10 +3272,6 @@
|
||||
"\n\nOS/2 port Copyright (c) 1990, 1991, Raymond Chen, Kai Uwe Rommel\n"
|
||||
"Version 5 port Copyright (c) 1994-2002, Andreas Kaiser, Ilya Zakharevich\n");
|
||||
#endif
|
||||
-#ifdef atarist
|
||||
- PerlIO_printf(PerlIO_stdout(),
|
||||
- "atariST series port, ++jrb bammi@cadence.com\n");
|
||||
-#endif
|
||||
#ifdef __BEOS__
|
||||
PerlIO_printf(PerlIO_stdout(),
|
||||
"BeOS port Copyright Tom Spindler, 1997-1999\n");
|
||||
--- perl-5.12.3/perl.h 2011-01-09 20:20:57.000000000 +0000
|
||||
+++ perl-5.12.3/perl.h 2011-02-21 09:38:50.000000000 +0000
|
||||
@@ -497,7 +497,7 @@
|
||||
*/
|
||||
|
||||
/* define this once if either system, instead of cluttering up the src */
|
||||
-#if defined(MSDOS) || defined(atarist) || defined(WIN32) || defined(NETWARE)
|
||||
+#if defined(MSDOS) || defined(WIN32) || defined(NETWARE)
|
||||
#define DOSISH 1
|
||||
#endif
|
||||
|
||||
--- perl-5.12.3/perlio.c 2009-04-14 23:47:25.000000000 +0000
|
||||
+++ perl-5.12.3/perlio.c 2010-03-23 18:36:15.000000000 +0000
|
||||
@@ -135,17 +135,6 @@
|
||||
* This used to be contents of do_binmode in doio.c
|
||||
*/
|
||||
#ifdef DOSISH
|
||||
-# if defined(atarist)
|
||||
- PERL_UNUSED_ARG(iotype);
|
||||
- if (!fflush(fp)) {
|
||||
- if (mode & O_BINARY)
|
||||
- ((FILE *) fp)->_flag |= _IOBIN;
|
||||
- else
|
||||
- ((FILE *) fp)->_flag &= ~_IOBIN;
|
||||
- return 1;
|
||||
- }
|
||||
- return 0;
|
||||
-# else
|
||||
dTHX;
|
||||
PERL_UNUSED_ARG(iotype);
|
||||
#ifdef NETWARE
|
||||
@@ -153,7 +142,7 @@
|
||||
#else
|
||||
if (PerlLIO_setmode(fileno(fp), mode) != -1) {
|
||||
#endif
|
||||
-# if defined(WIN32) && defined(__BORLANDC__)
|
||||
+# if defined(WIN32) && defined(__BORLANDC__)
|
||||
/*
|
||||
* The translation mode of the stream is maintained independent
|
||||
of
|
||||
@@ -169,12 +158,11 @@
|
||||
fp->flags |= _F_BIN;
|
||||
else
|
||||
fp->flags &= ~_F_BIN;
|
||||
-# endif
|
||||
+# endif
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
return 0;
|
||||
-# endif
|
||||
#else
|
||||
# if defined(USEMYBINMODE)
|
||||
dTHX;
|
||||
--- perl-5.12.3/pp_sys.c 2011-01-09 20:20:58.000000000 +0000
|
||||
+++ perl-5.12.3/pp_sys.c 2011-02-21 09:38:50.000000000 +0000
|
||||
@@ -3308,14 +3308,6 @@
|
||||
RETPUSHNO;
|
||||
}
|
||||
|
||||
-#if defined(atarist) /* this will work with atariST. Configure will
|
||||
- make guesses for other systems. */
|
||||
-# define FILE_base(f) ((f)->_base)
|
||||
-# define FILE_ptr(f) ((f)->_ptr)
|
||||
-# define FILE_cnt(f) ((f)->_cnt)
|
||||
-# define FILE_bufsiz(f) ((f)->_cnt + ((f)->_ptr - (f)->_base))
|
||||
-#endif
|
||||
-
|
||||
PP(pp_fttext)
|
||||
{
|
||||
dVAR;
|
||||
@@ -5567,30 +5559,6 @@
|
||||
case 8:
|
||||
retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7]);
|
||||
break;
|
||||
-#ifdef atarist
|
||||
- case 9:
|
||||
- retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8]);
|
||||
- break;
|
||||
- case 10:
|
||||
- retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9]);
|
||||
- break;
|
||||
- case 11:
|
||||
- retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9],
|
||||
- a[10]);
|
||||
- break;
|
||||
- case 12:
|
||||
- retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9],
|
||||
- a[10],a[11]);
|
||||
- break;
|
||||
- case 13:
|
||||
- retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9],
|
||||
- a[10],a[11],a[12]);
|
||||
- break;
|
||||
- case 14:
|
||||
- retval = syscall(a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7],a[8],a[9],
|
||||
- a[10],a[11],a[12],a[13]);
|
||||
- break;
|
||||
-#endif /* atarist */
|
||||
}
|
||||
SP = ORIGMARK;
|
||||
PUSHi(retval);
|
||||
--- perl-5.12.3/util.c 2011-01-09 20:20:58.000000000 +0000
|
||||
+++ perl-5.12.3/util.c 2011-02-21 09:38:51.000000000 +0000
|
||||
@@ -2545,7 +2545,7 @@
|
||||
return PerlIO_fdopen(p[This], mode);
|
||||
}
|
||||
#else
|
||||
-#if defined(atarist) || defined(EPOC)
|
||||
+#if defined(EPOC)
|
||||
FILE *popen();
|
||||
PerlIO *
|
||||
Perl_my_popen(pTHX_ const char *cmd, const char *mode)
|
||||
@@ -2994,7 +2994,7 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if defined(atarist) || defined(OS2) || defined(EPOC)
|
||||
+#if defined(OS2) || defined(EPOC)
|
||||
int pclose();
|
||||
#ifdef HAS_FORK
|
||||
int /* Cannot prototype with I32
|
||||
@@ -3111,7 +3111,7 @@
|
||||
I32 len = 0;
|
||||
int retval;
|
||||
char *bufend;
|
||||
-#if defined(DOSISH) && !defined(OS2) && !defined(atarist)
|
||||
+#if defined(DOSISH) && !defined(OS2)
|
||||
# define SEARCH_EXTS ".bat", ".cmd", NULL
|
||||
# define MAX_EXT_LEN 4
|
||||
#endif
|
||||
@@ -3234,28 +3234,25 @@
|
||||
|
||||
bufend = s + strlen(s);
|
||||
while (s < bufend) {
|
||||
-#if defined(atarist) || defined(DOSISH)
|
||||
+#if defined(DOSISH)
|
||||
for (len = 0; *s
|
||||
-# ifdef atarist
|
||||
- && *s != ','
|
||||
-# endif
|
||||
&& *s != ';'; len++, s++) {
|
||||
if (len < sizeof tmpbuf)
|
||||
tmpbuf[len] = *s;
|
||||
}
|
||||
if (len < sizeof tmpbuf)
|
||||
tmpbuf[len] = '\0';
|
||||
-#else /* ! (atarist || DOSISH) */
|
||||
+#else /* ! (DOSISH) */
|
||||
s = delimcpy(tmpbuf, tmpbuf + sizeof tmpbuf, s, bufend,
|
||||
':',
|
||||
&len);
|
||||
-#endif /* ! (atarist || DOSISH) */
|
||||
+#endif /* ! (DOSISH) */
|
||||
if (s < bufend)
|
||||
s++;
|
||||
if (len + 1 + strlen(scriptname) + MAX_EXT_LEN >= sizeof tmpbuf)
|
||||
continue; /* don't search dir with too-long name */
|
||||
if (len
|
||||
-# if defined(atarist) || defined(DOSISH)
|
||||
+# if defined(DOSISH)
|
||||
&& tmpbuf[len - 1] != '/'
|
||||
&& tmpbuf[len - 1] != '\\'
|
||||
# endif
|
||||
--- perl-5.12.3/hints/freemint.sh 2011-01-09 20:20:58.000000000 +0000
|
||||
+++ perl-5.12.3/hints/freemint.sh 2011-02-21 09:38:51.000000000 +0000
|
||||
@@ -0,0 +1,34 @@
|
||||
+# hints/freemint.sh
|
||||
+#
|
||||
+# talk to guido@freemint.de if you want to change this file.
|
||||
+# Please read the README.mint file.
|
||||
+#
|
||||
+# misc stuff
|
||||
+
|
||||
+archname="m68k-freemint"
|
||||
+
|
||||
+cccdlflags=' '; # avoid -fPIC
|
||||
+ccdlflags="-Wl,-whole-archive -lgcc -lpthread -Wl,-no-whole-archive"
|
||||
+
|
||||
+# libs
|
||||
+libpth="$prefix/lib /usr/local/lib /usr/lib"
|
||||
+glibpth="$libpth"
|
||||
+xlibpth="$libpth"
|
||||
+
|
||||
+ccflags="$ccflags -D_GNU_SOURCE"
|
||||
+libswanted='m dld'
|
||||
+dl_src='dl_dld.xs'
|
||||
+dlext='o'
|
||||
+lddlflags='-r'
|
||||
+ldflags='-static'
|
||||
+so='none'
|
||||
+useshrplib='false'
|
||||
+
|
||||
+#sbrk() returns -1 (failure) somewhere in lib/unicore/mktables at
|
||||
+#around 14M, so we need to use system malloc() as our sbrk()
|
||||
+malloc_cflags='ccflags="-DUSE_PERL_SBRK -DPERL_SBRK_VIA_MALLOC $ccflags"'
|
||||
+
|
||||
+# Locales aren't feeling well. We crash if -Ox used.
|
||||
+locale_cflags='optimize="-O0"'
|
||||
+LC_ALL=C; export LC_ALL;
|
||||
+LANG=C; export LANG;
|
||||
@ -1,164 +0,0 @@
|
||||
From f2a571dae7d70f7e3b59022834d8003ecd2df884 Mon Sep 17 00:00:00 2001
|
||||
From: Yves Orton <demerphq@gmail.com>
|
||||
Date: Tue, 12 Feb 2013 10:53:05 +0100
|
||||
Subject: [PATCH] Prevent premature hsplit() calls, and only trigger REHASH
|
||||
after hsplit()
|
||||
|
||||
Triggering a hsplit due to long chain length allows an attacker
|
||||
to create a carefully chosen set of keys which can cause the hash
|
||||
to use 2 * (2**32) * sizeof(void *) bytes ram. AKA a DOS via memory
|
||||
exhaustion. Doing so also takes non trivial time.
|
||||
|
||||
Eliminating this check, and only inspecting chain length after a
|
||||
normal hsplit() (triggered when keys>buckets) prevents the attack
|
||||
entirely, and makes such attacks relatively benign.
|
||||
|
||||
(cherry picked from commit f1220d61455253b170e81427c9d0357831ca0fac)
|
||||
---
|
||||
ext/Hash-Util-FieldHash/t/10_hash.t | 18 ++++++++++++++++--
|
||||
hv.c | 26 ++++++--------------------
|
||||
t/op/hash.t | 20 +++++++++++++++++---
|
||||
3 files changed, 39 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/ext/Hash-Util-FieldHash/t/10_hash.t b/ext/Hash-Util-FieldHash/t/10_hash.t
|
||||
index 2cfb4e8..d58f053 100644
|
||||
--- a/ext/Hash-Util-FieldHash/t/10_hash.t
|
||||
+++ b/ext/Hash-Util-FieldHash/t/10_hash.t
|
||||
@@ -38,15 +38,29 @@ use constant START => "a";
|
||||
|
||||
# some initial hash data
|
||||
fieldhash my %h2;
|
||||
-%h2 = map {$_ => 1} 'a'..'cc';
|
||||
+my $counter= "a";
|
||||
+$h2{$counter++}++ while $counter ne 'cd';
|
||||
|
||||
ok (!Internals::HvREHASH(%h2),
|
||||
"starting with pre-populated non-pathological hash (rehash flag if off)");
|
||||
|
||||
my @keys = get_keys(\%h2);
|
||||
+my $buckets= buckets(\%h2);
|
||||
$h2{$_}++ for @keys;
|
||||
+$h2{$counter++}++ while buckets(\%h2) == $buckets; # force a split
|
||||
ok (Internals::HvREHASH(%h2),
|
||||
- scalar(@keys) . " colliding into the same bucket keys are triggering rehash");
|
||||
+ scalar(@keys) . " colliding into the same bucket keys are triggering rehash after split");
|
||||
+
|
||||
+# returns the number of buckets in a hash
|
||||
+sub buckets {
|
||||
+ my $hr = shift;
|
||||
+ my $keys_buckets= scalar(%$hr);
|
||||
+ if ($keys_buckets=~m!/([0-9]+)\z!) {
|
||||
+ return 0+$1;
|
||||
+ } else {
|
||||
+ return 8;
|
||||
+ }
|
||||
+}
|
||||
|
||||
sub get_keys {
|
||||
my $hr = shift;
|
||||
diff --git a/hv.c b/hv.c
|
||||
index 89c6456..8659678 100644
|
||||
--- a/hv.c
|
||||
+++ b/hv.c
|
||||
@@ -35,7 +35,8 @@ holds the key and hash value.
|
||||
#define PERL_HASH_INTERNAL_ACCESS
|
||||
#include "perl.h"
|
||||
|
||||
-#define HV_MAX_LENGTH_BEFORE_SPLIT 14
|
||||
+#define HV_MAX_LENGTH_BEFORE_REHASH 14
|
||||
+#define SHOULD_DO_HSPLIT(xhv) ((xhv)->xhv_keys > (xhv)->xhv_max) /* HvTOTALKEYS(hv) > HvMAX(hv) */
|
||||
|
||||
static const char S_strtab_error[]
|
||||
= "Cannot modify shared string table in hv_%s";
|
||||
@@ -818,23 +819,8 @@ Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen,
|
||||
xhv->xhv_keys++; /* HvTOTALKEYS(hv)++ */
|
||||
if (!counter) { /* initial entry? */
|
||||
xhv->xhv_fill++; /* HvFILL(hv)++ */
|
||||
- } else if (xhv->xhv_keys > (IV)xhv->xhv_max) {
|
||||
+ } else if ( SHOULD_DO_HSPLIT(xhv) ) {
|
||||
hsplit(hv);
|
||||
- } else if(!HvREHASH(hv)) {
|
||||
- U32 n_links = 1;
|
||||
-
|
||||
- while ((counter = HeNEXT(counter)))
|
||||
- n_links++;
|
||||
-
|
||||
- if (n_links > HV_MAX_LENGTH_BEFORE_SPLIT) {
|
||||
- /* Use only the old HvKEYS(hv) > HvMAX(hv) condition to limit
|
||||
- bucket splits on a rehashed hash, as we're not going to
|
||||
- split it again, and if someone is lucky (evil) enough to
|
||||
- get all the keys in one list they could exhaust our memory
|
||||
- as we repeatedly double the number of buckets on every
|
||||
- entry. Linear search feels a less worse thing to do. */
|
||||
- hsplit(hv);
|
||||
- }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1180,7 +1166,7 @@ S_hsplit(pTHX_ HV *hv)
|
||||
|
||||
|
||||
/* Pick your policy for "hashing isn't working" here: */
|
||||
- if (longest_chain <= HV_MAX_LENGTH_BEFORE_SPLIT /* split worked? */
|
||||
+ if (longest_chain <= HV_MAX_LENGTH_BEFORE_REHASH /* split worked? */
|
||||
|| HvREHASH(hv)) {
|
||||
return;
|
||||
}
|
||||
@@ -2551,8 +2537,8 @@ S_share_hek_flags(pTHX_ const char *str, I32 len, register U32 hash, int flags)
|
||||
xhv->xhv_keys++; /* HvTOTALKEYS(hv)++ */
|
||||
if (!next) { /* initial entry? */
|
||||
xhv->xhv_fill++; /* HvFILL(hv)++ */
|
||||
- } else if (xhv->xhv_keys > (IV)xhv->xhv_max /* HvKEYS(hv) > HvMAX(hv) */) {
|
||||
- hsplit(PL_strtab);
|
||||
+ } else if ( SHOULD_DO_HSPLIT(xhv) ) {
|
||||
+ hsplit(PL_strtab);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/t/op/hash.t b/t/op/hash.t
|
||||
index 9bde518..45eb782 100644
|
||||
--- a/t/op/hash.t
|
||||
+++ b/t/op/hash.t
|
||||
@@ -39,22 +39,36 @@ use constant THRESHOLD => 14;
|
||||
use constant START => "a";
|
||||
|
||||
# some initial hash data
|
||||
-my %h2 = map {$_ => 1} 'a'..'cc';
|
||||
+my %h2;
|
||||
+my $counter= "a";
|
||||
+$h2{$counter++}++ while $counter ne 'cd';
|
||||
|
||||
ok (!Internals::HvREHASH(%h2),
|
||||
"starting with pre-populated non-pathological hash (rehash flag if off)");
|
||||
|
||||
my @keys = get_keys(\%h2);
|
||||
+my $buckets= buckets(\%h2);
|
||||
$h2{$_}++ for @keys;
|
||||
+$h2{$counter++}++ while buckets(\%h2) == $buckets; # force a split
|
||||
ok (Internals::HvREHASH(%h2),
|
||||
- scalar(@keys) . " colliding into the same bucket keys are triggering rehash");
|
||||
+ scalar(@keys) . " colliding into the same bucket keys are triggering rehash after split");
|
||||
+
|
||||
+# returns the number of buckets in a hash
|
||||
+sub buckets {
|
||||
+ my $hr = shift;
|
||||
+ my $keys_buckets= scalar(%$hr);
|
||||
+ if ($keys_buckets=~m!/([0-9]+)\z!) {
|
||||
+ return 0+$1;
|
||||
+ } else {
|
||||
+ return 8;
|
||||
+ }
|
||||
+}
|
||||
|
||||
sub get_keys {
|
||||
my $hr = shift;
|
||||
|
||||
# the minimum of bits required to mount the attack on a hash
|
||||
my $min_bits = log(THRESHOLD)/log(2);
|
||||
-
|
||||
# if the hash has already been populated with a significant amount
|
||||
# of entries the number of mask bits can be higher
|
||||
my $keys = scalar keys %$hr;
|
||||
--
|
||||
1.8.1.3
|
||||
|
||||
@ -1,100 +0,0 @@
|
||||
cut the crap of inventing paths, or adding search paths that we don't use
|
||||
|
||||
--- Configure
|
||||
+++ Configure
|
||||
@@ -105,28 +105,6 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
-: Proper PATH setting
|
||||
-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
|
||||
-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
|
||||
-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
|
||||
-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
|
||||
-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
|
||||
-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
|
||||
-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
|
||||
-paths="$paths /sbin /usr/sbin /usr/libexec"
|
||||
-paths="$paths /system/gnu_library/bin"
|
||||
-
|
||||
-for p in $paths
|
||||
-do
|
||||
- case "$p_$PATH$p_" in
|
||||
- *$p_$p$p_*) ;;
|
||||
- *) test -d $p && PATH=$PATH$p_$p ;;
|
||||
- esac
|
||||
-done
|
||||
-
|
||||
-PATH=.$p_$PATH
|
||||
-export PATH
|
||||
-
|
||||
: shall we be using ksh?
|
||||
inksh=''
|
||||
needksh=''
|
||||
@@ -8287,66 +8265,6 @@
|
||||
;;
|
||||
esac
|
||||
|
||||
-# How will the perl executable find the installed shared $libperl?
|
||||
-# Add $xxx to ccdlflags.
|
||||
-# If we can't figure out a command-line option, use $shrpenv to
|
||||
-# set env LD_RUN_PATH. The main perl makefile uses this.
|
||||
-shrpdir=$archlibexp/CORE
|
||||
-xxx=''
|
||||
-tmp_shrpenv=''
|
||||
-if "$useshrplib"; then
|
||||
- case "$osname" in
|
||||
- aix)
|
||||
- # We'll set it in Makefile.SH...
|
||||
- ;;
|
||||
- solaris)
|
||||
- xxx="-R $shrpdir"
|
||||
- ;;
|
||||
- freebsd|mirbsd|netbsd|openbsd|interix|dragonfly)
|
||||
- xxx="-Wl,-R$shrpdir"
|
||||
- ;;
|
||||
- bsdos|linux|irix*|dec_osf|gnu*)
|
||||
- xxx="-Wl,-rpath,$shrpdir"
|
||||
- ;;
|
||||
- next)
|
||||
- # next doesn't like the default...
|
||||
- ;;
|
||||
- beos)
|
||||
- # beos doesn't like the default, either.
|
||||
- ;;
|
||||
- haiku)
|
||||
- # Haiku doesn't like the default, either.
|
||||
- ;;
|
||||
- hpux*)
|
||||
- # hpux doesn't like the default, either.
|
||||
- tmp_shrpenv="env LDOPTS=\"+s +b${shrpdir}\""
|
||||
- ;;
|
||||
- cygwin)
|
||||
- # cygwin needs only ldlibpth
|
||||
- ;;
|
||||
- *)
|
||||
- tmp_shrpenv="env LD_RUN_PATH=$shrpdir"
|
||||
- ;;
|
||||
- esac
|
||||
- case "$xxx" in
|
||||
- '') ;;
|
||||
- *)
|
||||
- # Only add $xxx if it isn't already in ccdlflags.
|
||||
- case " $ccdlflags " in
|
||||
- *" $xxx "*) ;;
|
||||
- *) ccdlflags="$ccdlflags $xxx"
|
||||
- cat <<EOM >&4
|
||||
-
|
||||
-Adding $xxx to the flags
|
||||
-passed to $ld so that the perl executable will find the
|
||||
-installed shared $libperl.
|
||||
-
|
||||
-EOM
|
||||
- ;;
|
||||
- esac
|
||||
- ;;
|
||||
- esac
|
||||
-fi
|
||||
# Fix ccdlflags in AIX for building external extensions.
|
||||
# (For building Perl itself bare -bE:perl.exp is needed,
|
||||
# Makefile.SH takes care of this.)
|
||||
@ -1,21 +0,0 @@
|
||||
Bug #105054.
|
||||
|
||||
We do not want the build root in the linked perl module's RUNPATH, so strip
|
||||
paths containing PORTAGE_TMPDIR if its set.
|
||||
|
||||
--- perl-5.8.7/lib/ExtUtils/MM_Unix.pm 2005-09-10 14:06:59.000000000 +0200
|
||||
+++ perl-5.8.7.az/lib/ExtUtils/MM_Unix.pm 2005-09-10 15:25:52.000000000 +0200
|
||||
@@ -1915,6 +1915,13 @@
|
||||
# LD_RUN_PATH now computed by ExtUtils::Liblist
|
||||
($self->{EXTRALIBS}, $self->{BSLOADLIBS},
|
||||
$self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;
|
||||
+ # We do not want the build root in RPATH
|
||||
+ if (exists $ENV{PORTAGE_TMPDIR}) {
|
||||
+ # If we have PORTAGE_TMPDIR set, strip that, as just testing for
|
||||
+ # /usr and /opt might not be sufficient
|
||||
+ $self->{LD_RUN_PATH} = join ':', grep !/^\Q$ENV{PORTAGE_TMPDIR}/,
|
||||
+ split /:/, $self->{LD_RUN_PATH};
|
||||
+ }
|
||||
last;
|
||||
}
|
||||
}
|
||||
@ -1,280 +0,0 @@
|
||||
SECURITY [CAN-2005-0448]:
|
||||
|
||||
Rewrite File::Path::rmtree to avoid race condition which allows an
|
||||
attacker with write permission on directories in the tree being
|
||||
removed to make files setuid or to remove arbitrary files (see
|
||||
http://bugs.debian.org/286905 and http://bugs.debian.org/286922).
|
||||
|
||||
Revised for 5.8.8-7etch6 to avoid failure when rmtree removes the
|
||||
current directory.
|
||||
|
||||
diff --git a/lib/File/Path.pm b/lib/File/Path.pm
|
||||
index 2e41ff3..fd32b96 100644
|
||||
--- a/lib/File/Path.pm
|
||||
+++ b/lib/File/Path.pm
|
||||
@@ -72,33 +72,17 @@ or C<unlink> to remove it, or that it's skipping it.
|
||||
|
||||
=item *
|
||||
|
||||
-a boolean value, which if TRUE will cause C<rmtree> to
|
||||
-skip any files to which you do not have delete access
|
||||
-(if running under VMS) or write access (if running
|
||||
-under another OS). This will change in the future when
|
||||
-a criterion for 'delete permission' under OSs other
|
||||
-than VMS is settled. (defaults to FALSE)
|
||||
+a boolean value, which if FALSE (the default for non-root users) will
|
||||
+cause C<rmtree> to adjust the mode of directories (if required) prior
|
||||
+to attempting to remove the contents. Note that on interruption or
|
||||
+failure of C<rmtree>, directories may be left with more permissive
|
||||
+modes for the owner.
|
||||
|
||||
=back
|
||||
|
||||
It returns the number of files successfully deleted. Symlinks are
|
||||
simply deleted and not followed.
|
||||
|
||||
-B<NOTE:> There are race conditions internal to the implementation of
|
||||
-C<rmtree> making it unsafe to use on directory trees which may be
|
||||
-altered or moved while C<rmtree> is running, and in particular on any
|
||||
-directory trees with any path components or subdirectories potentially
|
||||
-writable by untrusted users.
|
||||
-
|
||||
-Additionally, if the third parameter is not TRUE and C<rmtree> is
|
||||
-interrupted, it may leave files and directories with permissions altered
|
||||
-to allow deletion (and older versions of this module would even set
|
||||
-files and directories to world-read/writable!)
|
||||
-
|
||||
-Note also that the occurrence of errors in C<rmtree> can be determined I<only>
|
||||
-by trapping diagnostic messages using C<$SIG{__WARN__}>; it is not apparent
|
||||
-from the return value.
|
||||
-
|
||||
=head1 DIAGNOSTICS
|
||||
|
||||
=over 4
|
||||
@@ -172,111 +156,127 @@ sub mkpath {
|
||||
@created;
|
||||
}
|
||||
|
||||
-sub rmtree {
|
||||
- my($roots, $verbose, $safe) = @_;
|
||||
- my(@files);
|
||||
- my($count) = 0;
|
||||
- $verbose ||= 0;
|
||||
- $safe ||= 0;
|
||||
+sub _rmtree;
|
||||
+sub _rmtree
|
||||
+{
|
||||
+ my ($path, $prefix, $up, $up_dev, $up_ino, $verbose, $safe) = @_;
|
||||
+ my $up_name = $up eq '..' ? 'parent' : 'initial';
|
||||
+
|
||||
+ my ($dev, $ino) = lstat $path or return 0;
|
||||
+ unless (-d _)
|
||||
+ {
|
||||
+ print "unlink $prefix$path\n" if $verbose;
|
||||
+ unless (unlink $path)
|
||||
+ {
|
||||
+ carp "Can't remove file $prefix$path ($!)";
|
||||
+ return 0;
|
||||
+ }
|
||||
|
||||
- if ( defined($roots) && length($roots) ) {
|
||||
- $roots = [$roots] unless ref $roots;
|
||||
+ return 1;
|
||||
}
|
||||
- else {
|
||||
- carp "No root path(s) specified\n";
|
||||
- return 0;
|
||||
+
|
||||
+ unless (chdir $path)
|
||||
+ {
|
||||
+ carp "Can't chdir to $prefix$path ($!)";
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
- my($root);
|
||||
- foreach $root (@{$roots}) {
|
||||
- if ($Is_MacOS) {
|
||||
- $root = ":$root" if $root !~ /:/;
|
||||
- $root =~ s#([^:])\z#$1:#;
|
||||
- } else {
|
||||
- $root =~ s#/\z##;
|
||||
- }
|
||||
- (undef, undef, my $rp) = lstat $root or next;
|
||||
- $rp &= 07777; # don't forget setuid, setgid, sticky bits
|
||||
- if ( -d _ ) {
|
||||
- # notabene: 0700 is for making readable in the first place,
|
||||
- # it's also intended to change it to writable in case we have
|
||||
- # to recurse in which case we are better than rm -rf for
|
||||
- # subtrees with strange permissions
|
||||
- chmod($rp | 0700, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
|
||||
- or carp "Can't make directory $root read+writeable: $!"
|
||||
- unless $safe;
|
||||
-
|
||||
- if (opendir my $d, $root) {
|
||||
- no strict 'refs';
|
||||
- if (!defined ${"\cTAINT"} or ${"\cTAINT"}) {
|
||||
- # Blindly untaint dir names
|
||||
- @files = map { /^(.*)$/s ; $1 } readdir $d;
|
||||
- } else {
|
||||
- @files = readdir $d;
|
||||
- }
|
||||
- closedir $d;
|
||||
- }
|
||||
- else {
|
||||
- carp "Can't read $root: $!";
|
||||
- @files = ();
|
||||
- }
|
||||
+ # avoid a race condition where a directory may be replaced by a
|
||||
+ # symlink between the lstat and the chdir
|
||||
+ my ($new_dev, $new_ino, $perm) = stat '.';
|
||||
+ unless ("$new_dev:$new_ino" eq "$dev:$ino")
|
||||
+ {
|
||||
+ croak "Directory $prefix$path changed before chdir, aborting";
|
||||
+ }
|
||||
|
||||
- # Deleting large numbers of files from VMS Files-11 filesystems
|
||||
- # is faster if done in reverse ASCIIbetical order
|
||||
- @files = reverse @files if $Is_VMS;
|
||||
- ($root = VMS::Filespec::unixify($root)) =~ s#\.dir\z## if $Is_VMS;
|
||||
- if ($Is_MacOS) {
|
||||
- @files = map("$root$_", @files);
|
||||
- } else {
|
||||
- @files = map("$root/$_", grep $_!~/^\.{1,2}\z/s,@files);
|
||||
- }
|
||||
- $count += rmtree(\@files,$verbose,$safe);
|
||||
- if ($safe &&
|
||||
- ($Is_VMS ? !&VMS::Filespec::candelete($root) : !-w $root)) {
|
||||
- print "skipped $root\n" if $verbose;
|
||||
- next;
|
||||
- }
|
||||
- chmod $rp | 0700, $root
|
||||
- or carp "Can't make directory $root writeable: $!"
|
||||
- if $force_writeable;
|
||||
- print "rmdir $root\n" if $verbose;
|
||||
- if (rmdir $root) {
|
||||
- ++$count;
|
||||
- }
|
||||
- else {
|
||||
- carp "Can't remove directory $root: $!";
|
||||
- chmod($rp, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
|
||||
- or carp("and can't restore permissions to "
|
||||
- . sprintf("0%o",$rp) . "\n");
|
||||
- }
|
||||
- }
|
||||
- else {
|
||||
- if ($safe &&
|
||||
- ($Is_VMS ? !&VMS::Filespec::candelete($root)
|
||||
- : !(-l $root || -w $root)))
|
||||
- {
|
||||
- print "skipped $root\n" if $verbose;
|
||||
- next;
|
||||
- }
|
||||
- chmod $rp | 0600, $root
|
||||
- or carp "Can't make file $root writeable: $!"
|
||||
- if $force_writeable;
|
||||
- print "unlink $root\n" if $verbose;
|
||||
- # delete all versions under VMS
|
||||
- for (;;) {
|
||||
- unless (unlink $root) {
|
||||
- carp "Can't unlink file $root: $!";
|
||||
- if ($force_writeable) {
|
||||
- chmod $rp, $root
|
||||
- or carp("and can't restore permissions to "
|
||||
- . sprintf("0%o",$rp) . "\n");
|
||||
- }
|
||||
- last;
|
||||
- }
|
||||
- ++$count;
|
||||
- last unless $Is_VMS && lstat $root;
|
||||
- }
|
||||
+ $perm &= 07777;
|
||||
+ my $nperm = $perm | 0700;
|
||||
+ unless ($safe or $nperm == $perm or chmod $nperm, '.')
|
||||
+ {
|
||||
+ carp "Can't make directory $prefix$path read+writeable ($!)";
|
||||
+ $nperm = $perm;
|
||||
+ }
|
||||
+
|
||||
+ my $count = 0;
|
||||
+ if (opendir my $dir, '.')
|
||||
+ {
|
||||
+ my $entry;
|
||||
+ while (defined ($entry = readdir $dir))
|
||||
+ {
|
||||
+ next if $entry =~ /^\.\.?$/;
|
||||
+ $entry =~ /^(.*)$/s; $entry = $1; # untaint
|
||||
+ $count += _rmtree $entry, "$prefix$path/", '..', $dev, $ino,
|
||||
+ $verbose, $safe;
|
||||
}
|
||||
+
|
||||
+ closedir $dir;
|
||||
+ }
|
||||
+
|
||||
+ # restore directory permissions if required (in case the rmdir
|
||||
+ # below fails) now, while we're still in the directory and may do
|
||||
+ # so without a race via '.'
|
||||
+ unless ($nperm == $perm or chmod $perm, '.')
|
||||
+ {
|
||||
+ carp "Can't restore permissions on directory $prefix$path ($!)";
|
||||
+ }
|
||||
+
|
||||
+ # don't leave the caller in an unexpected directory
|
||||
+ unless (chdir $up)
|
||||
+ {
|
||||
+ croak "Can't return to $up_name directory from $prefix$path ($!)";
|
||||
+ }
|
||||
+
|
||||
+ # ensure that a chdir .. didn't take us somewhere other than
|
||||
+ # where we expected (see CVE-2002-0435)
|
||||
+ unless (($new_dev, $new_ino) = stat '.'
|
||||
+ and "$new_dev:$new_ino" eq "$up_dev:$up_ino")
|
||||
+ {
|
||||
+ croak "\u$up_name directory changed since entering $prefix$path";
|
||||
+ }
|
||||
+
|
||||
+ print "rmdir $prefix$path\n" if $verbose;
|
||||
+ if (rmdir $path)
|
||||
+ {
|
||||
+ $count++;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ carp "Can't remove directory $prefix$path ($!)";
|
||||
+ }
|
||||
+
|
||||
+ return $count;
|
||||
+}
|
||||
+
|
||||
+sub rmtree
|
||||
+{
|
||||
+ my ($p, $verbose, $safe) = @_;
|
||||
+ $p = [] unless defined $p and length $p;
|
||||
+ $p = [ $p ] unless ref $p;
|
||||
+ my @paths = grep defined && length, @$p;
|
||||
+
|
||||
+ # default to "unsafe" for non-root (will chmod dirs)
|
||||
+ $safe = $> ? 0 : 1 unless defined $safe;
|
||||
+
|
||||
+ unless (@paths)
|
||||
+ {
|
||||
+ carp "No root path(s) specified";
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ opendir my $oldpwd, '.' or do {
|
||||
+ carp "Can't fetch initial working directory";
|
||||
+ return;
|
||||
+ };
|
||||
+
|
||||
+ my ($dev, $ino) = stat '.' or do {
|
||||
+ carp "Can't stat initial working directory";
|
||||
+ return;
|
||||
+ };
|
||||
+
|
||||
+ my $count = 0;
|
||||
+ for my $path (@paths)
|
||||
+ {
|
||||
+ $count += _rmtree $path, '', $oldpwd, $dev, $ino, $verbose, $safe;
|
||||
}
|
||||
|
||||
$count;
|
||||
@ -1,111 +0,0 @@
|
||||
diff -Naurp perl-5.8.8-orig/lib/ExtUtils/Liblist.pm perl-5.8.8/lib/ExtUtils/Liblist.pm
|
||||
--- perl-5.8.8-orig/lib/ExtUtils/Liblist.pm 2003-04-07 14:58:17.000000000 -0400
|
||||
+++ perl-5.8.8/lib/ExtUtils/Liblist.pm 2006-02-07 09:57:04.000000000 -0500
|
||||
@@ -87,6 +87,11 @@ libraries. LD_RUN_PATH is a colon separ
|
||||
in LDLOADLIBS. It is passed as an environment variable to the process
|
||||
that links the shared library.
|
||||
|
||||
+The Red Hat extension: This generation of LD_RUN_PATH is disabled by default.
|
||||
+To use the generated LD_RUN_PATH for all links, set the USE_MM_LD_RUN_PATH
|
||||
+MakeMaker object attribute / argument, (or set the $USE_MM_LD_RUN_PATH
|
||||
+environment variable).
|
||||
+
|
||||
=head2 BSLOADLIBS
|
||||
|
||||
List of those libraries that are needed but can be linked in
|
||||
diff -Naurp perl-5.8.8-orig/lib/ExtUtils/MM_Unix.pm perl-5.8.8/lib/ExtUtils/MM_Unix.pm
|
||||
--- perl-5.8.8-orig/lib/ExtUtils/MM_Unix.pm 2005-05-21 05:42:56.000000000 -0400
|
||||
+++ perl-5.8.8/lib/ExtUtils/MM_Unix.pm 2006-02-07 09:56:08.000000000 -0500
|
||||
@@ -941,7 +941,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
|
||||
}
|
||||
|
||||
my $ld_run_path_shell = "";
|
||||
- if ($self->{LD_RUN_PATH} ne "") {
|
||||
+ if (($self->{LD_RUN_PATH} ne "") && ($self->{USE_MM_LD_RUN_PATH})) {
|
||||
$ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" ';
|
||||
}
|
||||
|
||||
diff -Naurp perl-5.8.8-orig/lib/ExtUtils/MakeMaker.pm perl-5.8.8/lib/ExtUtils/MakeMaker.pm
|
||||
--- perl-5.8.8-orig/lib/ExtUtils/MakeMaker.pm 2005-10-21 10:11:04.000000000 -0400
|
||||
+++ perl-5.8.8/lib/ExtUtils/MakeMaker.pm 2006-02-07 09:55:03.000000000 -0500
|
||||
@@ -233,7 +233,7 @@ sub full_setup {
|
||||
PERL_SRC PERM_RW PERM_RWX
|
||||
PL_FILES PM PM_FILTER PMLIBDIRS POLLUTE PPM_INSTALL_EXEC
|
||||
PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ
|
||||
- SIGN SKIP TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG
|
||||
+ SKIP TYPEMAPS USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG
|
||||
XS_VERSION clean depend dist dynamic_lib linkext macro realclean
|
||||
tool_autosplit
|
||||
|
||||
@@ -371,6 +371,26 @@ sub new {
|
||||
exit 0;
|
||||
}
|
||||
|
||||
+ # USE_MM_LD_RUN_PATH - borrowed from RedHat to disable automatic RPATH generation
|
||||
+ if ( ( ! $self->{USE_MM_LD_RUN_PATH} )
|
||||
+ &&( ("@ARGV" =~ /\bUSE_MM_LD_RUN_PATH(=([01]))?\b/)
|
||||
+ ||( exists( $ENV{USE_MM_LD_RUN_PATH} )
|
||||
+ &&( $ENV{USE_MM_LD_RUN_PATH} =~ /([01])?$/ )
|
||||
+ )
|
||||
+ )
|
||||
+ )
|
||||
+ {
|
||||
+ my $v = $1;
|
||||
+ if( $v )
|
||||
+ {
|
||||
+ $v = ($v=~/=([01])$/)[0];
|
||||
+ }else
|
||||
+ {
|
||||
+ $v = 1;
|
||||
+ };
|
||||
+ $self->{USE_MM_LD_RUN_PATH}=$v;
|
||||
+ };
|
||||
+
|
||||
print STDOUT "MakeMaker (v$VERSION)\n" if $Verbose;
|
||||
if (-f "MANIFEST" && ! -f "Makefile"){
|
||||
check_manifest();
|
||||
@@ -2057,6 +2077,44 @@ precedence. A typemap in the current di
|
||||
precedence, even if it isn't listed in TYPEMAPS. The default system
|
||||
typemap has lowest precedence.
|
||||
|
||||
+=item USE_MM_LD_RUN_PATH
|
||||
+
|
||||
+boolean
|
||||
+This feature is borrowed from Red Hat to deal with RPATH issues.
|
||||
+Please see bug 81745 - http://bugs.gentoo.org/81745 - for more
|
||||
+information.
|
||||
+
|
||||
+The Red Hat perl MakeMaker distribution differs from the standard
|
||||
+upstream release in that it disables use of the MakeMaker generated
|
||||
+LD_RUN_PATH by default, UNLESS this attribute is specified , or the
|
||||
+USE_MM_LD_RUN_PATH environment variable is set during the MakeMaker run.
|
||||
+
|
||||
+The upstream MakeMaker will set the ld(1) environment variable LD_RUN_PATH
|
||||
+to the concatenation of every -L ld(1) option directory in which a -l ld(1)
|
||||
+option library is found, which is used as the ld(1) -rpath option if none
|
||||
+is specified. This means that, if your application builds shared libraries
|
||||
+and your MakeMaker application links to them, that the absolute paths of the
|
||||
+libraries in the build tree will be inserted into the RPATH header of all
|
||||
+MakeMaker generated binaries, and that such binaries will be unable to link
|
||||
+to these libraries if they do not still reside in the build tree directories
|
||||
+(unlikely) or in the system library directories (/lib or /usr/lib), regardless
|
||||
+of any LD_LIBRARY_PATH setting. So if you specified -L../mylib -lmylib , and
|
||||
+your 'libmylib.so' gets installed into /some_directory_other_than_usr_lib,
|
||||
+your MakeMaker application will be unable to link to it, even if LD_LIBRARY_PATH
|
||||
+is set to include /some_directory_other_than_usr_lib, because RPATH overrides
|
||||
+LD_LIBRARY_PATH.
|
||||
+
|
||||
+So for Red Hat MakeMaker builds LD_RUN_PATH is NOT generated by default for
|
||||
+every link. You can still use explicit -rpath ld options or the LD_RUN_PATH
|
||||
+environment variable during the build to generate an RPATH for the binaries.
|
||||
+
|
||||
+You can set the USE_MM_LD_RUN_PATH attribute to 1 on the MakeMaker command
|
||||
+line or in the WriteMakefile arguments to enable generation of LD_RUN_PATH
|
||||
+for every link command.
|
||||
+
|
||||
+USE_MM_LD_RUN_PATH will default to 1 (LD_RUN_PATH will be used) IF the
|
||||
+$USE_MM_LD_RUN_PATH environment variable is set during a MakeMaker run.
|
||||
+
|
||||
=item VENDORPREFIX
|
||||
|
||||
Like PERLPREFIX, but only for the vendor install locations.
|
||||
@ -1,12 +0,0 @@
|
||||
--- perl-5.8.8/ext/IPC/SysV/SysV.xs.no_asm_page_h 2001-06-30 14:46:07.000000000 -0400
|
||||
+++ perl-5.8.8/ext/IPC/SysV/SysV.xs 2006-06-02 17:37:22.000000000 -0400
|
||||
@@ -3,9 +3,6 @@
|
||||
#include "XSUB.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
-#ifdef __linux__
|
||||
-# include <asm/page.h>
|
||||
-#endif
|
||||
#if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
|
||||
#ifndef HAS_SEM
|
||||
# include <sys/ipc.h>
|
||||
@ -1,33 +0,0 @@
|
||||
--- Configure.orig 2009-11-04 11:09:08.934965499 +0100
|
||||
+++ Configure 2009-11-04 11:13:19.055305854 +0100
|
||||
@@ -7617,7 +7617,7 @@
|
||||
cat <<EOM
|
||||
You appear to have ELF support. I'll use $cc to build dynamic libraries.
|
||||
EOM
|
||||
- dflt="$cc"
|
||||
+ dflt="$cc $optimize"
|
||||
else
|
||||
echo "I'll use ld to build dynamic libraries."
|
||||
dflt='ld'
|
||||
--- Makefile.SH.orig 2009-11-04 15:34:22.643322823 +0100
|
||||
+++ Makefile.SH 2009-11-04 15:34:30.110147884 +0100
|
||||
@@ -201,7 +201,7 @@
|
||||
LD = $ld
|
||||
|
||||
LDFLAGS = $ldflags
|
||||
-CLDFLAGS = $ldflags
|
||||
+CLDFLAGS = \$(OPTIMIZE) $ldflags
|
||||
|
||||
mallocsrc = $mallocsrc
|
||||
mallocobj = $mallocobj
|
||||
--- x2p/Makefile.SH.orig 2009-11-04 15:54:14.146759212 +0100
|
||||
+++ x2p/Makefile.SH 2009-11-04 15:54:19.963253154 +0100
|
||||
@@ -107,7 +107,7 @@
|
||||
$(REALPERL) -I../lib ../utils/perlcc -I .. -L .. $(plextract) -v -log ../compilelog;
|
||||
|
||||
a2p$(EXE_EXT): $(obj) a2p$(OBJ_EXT)
|
||||
- $(CC) -o a2p $(LDFLAGS) $(obj) a2p$(OBJ_EXT) $(libs)
|
||||
+ $(CC) -o a2p $(OPTIMIZE) $(LDFLAGS) $(obj) a2p$(OBJ_EXT) $(libs)
|
||||
|
||||
# I now supply a2p.c with the kits, so the following section is
|
||||
# used only if you force byacc to run by saying
|
||||
@ -1,22 +0,0 @@
|
||||
--- perl.h.orig 2006-03-29 08:53:46.000000000 -0500
|
||||
+++ perl.h 2006-03-29 08:54:19.000000000 -0500
|
||||
@@ -159,7 +159,7 @@ struct perl_thread;
|
||||
#endif
|
||||
|
||||
#ifndef PERL_UNUSED_DECL
|
||||
-# ifdef HASATTRIBUTE_UNUSED
|
||||
+# if defined(HASATTRIBUTE_UNUSED) && !defined(__cplusplus)
|
||||
# define PERL_UNUSED_DECL __attribute__unused__
|
||||
# else
|
||||
# define PERL_UNUSED_DECL
|
||||
--- XSUB.h.orig 2006-03-29 08:54:24.000000000 -0500
|
||||
+++ XSUB.h 2006-03-29 08:54:48.000000000 -0500
|
||||
@@ -91,7 +91,7 @@ handled automatically by C<xsubpp>.
|
||||
#if defined(__CYGWIN__) && defined(USE_DYNAMIC_LOADING)
|
||||
# define XS(name) __declspec(dllexport) void name(pTHX_ CV* cv)
|
||||
#else
|
||||
-# ifdef HASATTRIBUTE_UNUSED
|
||||
+# if defined(HASATTRIBUTE_UNUSED) && !defined(__cplusplus)
|
||||
# define XS(name) void name(pTHX_ CV* cv __attribute__unused__)
|
||||
# else
|
||||
# define XS(name) void name(pTHX_ CV* cv)
|
||||
@ -1,22 +0,0 @@
|
||||
Use $CC to link (and check for broken compilers), such that we don't get
|
||||
linked modules of a different bitness.
|
||||
http://bugs.gentoo.org/show_bug.cgi?id=297751
|
||||
|
||||
--- hints/darwin.sh
|
||||
+++ hints/darwin.sh
|
||||
@@ -128,13 +128,13 @@
|
||||
ccflags="${ccflags} ${cppflags}"
|
||||
|
||||
# Known optimizer problems.
|
||||
-case "`cc -v 2>&1`" in
|
||||
+case "`${cc:-gcc} -v 2>&1`" in
|
||||
*"3.1 20020105"*) toke_cflags='optimize=""' ;;
|
||||
esac
|
||||
|
||||
# Shared library extension is .dylib.
|
||||
# Bundle extension is .bundle.
|
||||
-ld='cc';
|
||||
+ld="${cc:-gcc}";
|
||||
so='dylib';
|
||||
dlext='bundle';
|
||||
usedl='define';
|
||||
@ -1,170 +0,0 @@
|
||||
Index: perl-5.8.8/Configure
|
||||
===================================================================
|
||||
--- perl-5.8.8.orig/Configure 2006-01-08 14:51:03 +0000
|
||||
+++ perl-5.8.8/Configure 2006-02-14 13:41:41 +0000
|
||||
@@ -3130,6 +3130,8 @@
|
||||
dgux) osname=dgux
|
||||
osvers="$3"
|
||||
;;
|
||||
+ dragonfly) osname=dragonfly
|
||||
+ osvers="$3" ;;
|
||||
dynixptx*) osname=dynixptx
|
||||
osvers=`echo "$4"|sed 's/^v//'`
|
||||
;;
|
||||
@@ -7889,7 +7891,7 @@
|
||||
solaris)
|
||||
xxx="-R $shrpdir"
|
||||
;;
|
||||
- freebsd|netbsd|openbsd|interix)
|
||||
+ freebsd|netbsd|openbsd|dragonfly|interix)
|
||||
xxx="-Wl,-R$shrpdir"
|
||||
;;
|
||||
bsdos|linux|irix*|dec_osf|gnu*)
|
||||
Index: perl-5.8.8/Makefile.SH
|
||||
===================================================================
|
||||
--- perl-5.8.8.orig/Makefile.SH 2006-01-24 12:49:44 +0000
|
||||
+++ perl-5.8.8/Makefile.SH 2006-02-14 13:46:57 +0000
|
||||
@@ -73,7 +73,7 @@
|
||||
sunos*)
|
||||
linklibperl="-lperl"
|
||||
;;
|
||||
- netbsd*|freebsd[234]*|openbsd*)
|
||||
+ netbsd*|freebsd[234]*|openbsd*|dragonfly*)
|
||||
linklibperl="-L. -lperl"
|
||||
;;
|
||||
interix*)
|
||||
@@ -990,6 +990,10 @@
|
||||
n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
|
||||
@$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
|
||||
|
||||
+.PHONY: printconfig
|
||||
+printconfig:
|
||||
+ @eval `$(LDLIBPTH) ./perl -Ilib -V:$(CONFIGVAR)`; echo $$$(CONFIGVAR)
|
||||
+
|
||||
.PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \
|
||||
realclean _realcleaner clobber _clobber \
|
||||
distclean veryclean _verycleaner
|
||||
Index: perl-5.8.8/hints/dragonfly.sh
|
||||
===================================================================
|
||||
--- perl-5.8.8.orig/hints/dragonfly.sh 1970-01-01 00:00:00 +0000
|
||||
+++ perl-5.8.8/hints/dragonfly.sh 2006-02-14 13:15:04 +0000
|
||||
@@ -0,0 +1,118 @@
|
||||
+# hints/dragonfly.sh
|
||||
+#
|
||||
+# This file is mostly copied from hints/freebsd.sh with the OS version
|
||||
+# information taken out and only the FreeBSD-4 information intact.
|
||||
+# Please check with Todd Willey <xtoddx@gmail.com> before making
|
||||
+# modifications to this file.
|
||||
+
|
||||
+case "$osvers" in
|
||||
+*) usevfork='true'
|
||||
+ case "$usemymalloc" in
|
||||
+ "") usemymalloc='n'
|
||||
+ ;;
|
||||
+ esac
|
||||
+ libswanted=`echo $libswanted | sed 's/ malloc / /'`
|
||||
+ ;;
|
||||
+esac
|
||||
+
|
||||
+# Dynamic Loading flags have not changed much, so they are separated
|
||||
+# out here to avoid duplicating them everywhere.
|
||||
+case "$osvers" in
|
||||
+*)
|
||||
+ objformat=`/usr/bin/objformat`
|
||||
+ if [ x$objformat = xelf ]; then
|
||||
+ libpth="/usr/lib /usr/local/lib"
|
||||
+ glibpth="/usr/lib /usr/local/lib"
|
||||
+ ldflags="-Wl,-E "
|
||||
+ lddlflags="-shared "
|
||||
+ else
|
||||
+ if [ -e /usr/lib/aout ]; then
|
||||
+ libpth="/usr/lib/aout /usr/local/lib /usr/lib"
|
||||
+ glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
|
||||
+ fi
|
||||
+ lddlflags='-Bshareable'
|
||||
+ fi
|
||||
+ cccdlflags='-DPIC -fPIC'
|
||||
+ ;;
|
||||
+esac
|
||||
+
|
||||
+case "$osvers" in
|
||||
+*)
|
||||
+ ccflags="${ccflags} -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
|
||||
+ if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
|
||||
+ usenm=false
|
||||
+ fi
|
||||
+ ;;
|
||||
+esac
|
||||
+
|
||||
+cat <<'EOM' >&4
|
||||
+
|
||||
+Some users have reported that Configure halts when testing for
|
||||
+the O_NONBLOCK symbol with a syntax error. This is apparently a
|
||||
+sh error. Rerunning Configure with ksh apparently fixes the
|
||||
+problem. Try
|
||||
+ ksh Configure [your options]
|
||||
+
|
||||
+EOM
|
||||
+
|
||||
+# From: Anton Berezin <tobez@plab.ku.dk>
|
||||
+# To: perl5-porters@perl.org
|
||||
+# Subject: [PATCH 5.005_54] Configure - hints/freebsd.sh signal handler type
|
||||
+# Date: 30 Nov 1998 19:46:24 +0100
|
||||
+# Message-ID: <864srhhvcv.fsf@lion.plab.ku.dk>
|
||||
+
|
||||
+signal_t='void'
|
||||
+d_voidsig='define'
|
||||
+
|
||||
+# This script UU/usethreads.cbu will get 'called-back' by Configure
|
||||
+# after it has prompted the user for whether to use threads.
|
||||
+cat > UU/usethreads.cbu <<'EOCBU'
|
||||
+case "$usethreads" in
|
||||
+$define|true|[yY]*)
|
||||
+ lc_r=`/sbin/ldconfig -r|grep ':-lc_r'|awk '{print $NF}'|sed -n '$p'`
|
||||
+ case "$osvers" in
|
||||
+ *)
|
||||
+ if [ ! -r "$lc_r" ]; then
|
||||
+ cat <<EOM >&4
|
||||
+POSIX threads should be supported by FreeBSD $osvers --
|
||||
+but your system is missing the shared libc_r.
|
||||
+(/sbin/ldconfig -r doesn't find any).
|
||||
+
|
||||
+Consider using the latest STABLE release.
|
||||
+EOM
|
||||
+ exit 1
|
||||
+ fi
|
||||
+ case "$osvers" in
|
||||
+ *) ldflags="-pthread $ldflags"
|
||||
+ ;;
|
||||
+ esac
|
||||
+ # Both in 4.x and 5.x gethostbyaddr_r exists but
|
||||
+ # it is "Temporary function, not threadsafe"...
|
||||
+ # Presumably earlier it didn't even exist.
|
||||
+ d_gethostbyaddr_r="undef"
|
||||
+ d_gethostbyaddr_r_proto="0"
|
||||
+ ;;
|
||||
+
|
||||
+ esac
|
||||
+
|
||||
+ set `echo X "$libswanted "| sed -e 's/ c / c_r /'`
|
||||
+ shift
|
||||
+ libswanted="$*"
|
||||
+ # Configure will probably pick the wrong libc to use for nm scan.
|
||||
+ # The safest quick-fix is just to not use nm at all...
|
||||
+ usenm=false
|
||||
+
|
||||
+ unset lc_r
|
||||
+
|
||||
+ # Even with the malloc mutexes the Perl malloc does not
|
||||
+ # seem to be threadsafe in FreeBSD?
|
||||
+ case "$usemymalloc" in
|
||||
+ '') usemymalloc=n ;;
|
||||
+ esac
|
||||
+esac
|
||||
+EOCBU
|
||||
+
|
||||
+# malloc wrap works
|
||||
+case "$usemallocwrap" in
|
||||
+'') usemallocwrap='define' ;;
|
||||
+esac
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
Index: perl-5.8.8/hints/freebsd.sh
|
||||
===================================================================
|
||||
--- perl-5.8.8.orig/hints/freebsd.sh
|
||||
+++ perl-5.8.8/hints/freebsd.sh
|
||||
@@ -88,6 +88,8 @@ case "$osvers" in
|
||||
esac
|
||||
libswanted=`echo $libswanted | sed 's/ malloc / /'`
|
||||
libswanted=`echo $libswanted | sed 's/ bind / /'`
|
||||
+ libswanted=`echo $libswanted | sed 's/ dl / /'`
|
||||
+ libswanted=`echo $libswanted | sed 's/ c / /'`
|
||||
# iconv gone in Perl 5.8.1, but if someone compiles 5.8.0 or earlier.
|
||||
libswanted=`echo $libswanted | sed 's/ iconv / /'`
|
||||
d_setregid='define'
|
||||
@@ -102,6 +104,10 @@ case "$osvers" in
|
||||
;;
|
||||
esac
|
||||
libswanted=`echo $libswanted | sed 's/ malloc / /'`
|
||||
+ libswanted=`echo $libswanted | sed 's/ bind / /'`
|
||||
+ libswanted=`echo $libswanted | sed 's/ dl / /'`
|
||||
+ libswanted=`echo $libswanted | sed 's/ iconv / /'`
|
||||
+ libswanted=`echo $libswanted | sed 's/ c / /'`
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -116,17 +122,17 @@ case "$osvers" in
|
||||
|
||||
*)
|
||||
objformat=`/usr/bin/objformat`
|
||||
- if [ x$objformat = xelf ]; then
|
||||
- libpth="/usr/lib /usr/local/lib"
|
||||
- glibpth="/usr/lib /usr/local/lib"
|
||||
- ldflags="-Wl,-E "
|
||||
- lddlflags="-shared "
|
||||
- else
|
||||
+ if [ x$objformat = xaout ]; then
|
||||
if [ -e /usr/lib/aout ]; then
|
||||
libpth="/usr/lib/aout /usr/local/lib /usr/lib"
|
||||
glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
|
||||
fi
|
||||
lddlflags='-Bshareable'
|
||||
+ else
|
||||
+ libpth="/usr/lib /usr/local/lib"
|
||||
+ glibpth="/usr/lib /usr/local/lib"
|
||||
+ ldflags="-Wl,-E"
|
||||
+ lddlflags="-shared "
|
||||
fi
|
||||
cccdlflags='-DPIC -fPIC'
|
||||
;;
|
||||
@@ -137,7 +143,7 @@ case "$osvers" in
|
||||
|
||||
*)
|
||||
ccflags="${ccflags} -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
|
||||
- if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
|
||||
+ if /usr/bin/file -L /usr/lib/libc.so | grep -vq "not stripped" ; then
|
||||
usenm=false
|
||||
fi
|
||||
;;
|
||||
@ -1,72 +0,0 @@
|
||||
ExtUtils/Command.pm (among other things) expects to be able to destroy
|
||||
a strangely-permissioned testdir. This is a backport of the chdir/chmod
|
||||
work performed in File::Path released in Perl 5.10.0.
|
||||
|
||||
--- perl-5.8.7.orig/lib/File/Path.pm 2008-12-05 13:23:32.000000000 -0800
|
||||
+++ perl-5.8.7/lib/File/Path.pm 2008-12-05 13:33:13.000000000 -0800
|
||||
@@ -162,7 +162,7 @@
|
||||
{
|
||||
my ($path, $prefix, $up, $up_dev, $up_ino, $verbose, $safe) = @_;
|
||||
|
||||
- my ($dev, $ino) = lstat $path or return 0;
|
||||
+ my ($dev, $ino, $perm) = lstat $path or return 0;
|
||||
unless (-d _)
|
||||
{
|
||||
print "unlink $prefix$path\n" if $verbose;
|
||||
@@ -175,15 +175,25 @@
|
||||
return 1;
|
||||
}
|
||||
|
||||
- unless (chdir $path)
|
||||
- {
|
||||
+ if (!chdir($path)) {
|
||||
+ # see if we can escalate privileges to get in
|
||||
+ # (e.g. funny protection mask such as -w- instead of rwx)
|
||||
+ $perm &= 07777;
|
||||
+ my $nperm = $perm | 0700;
|
||||
+ if (!($safe or $nperm == $perm or chmod($nperm, $path))) {
|
||||
+ carp "cannot make $prefix$path read-write-exec";
|
||||
+ return 0;
|
||||
+ }
|
||||
+ elsif (!chdir($path)) {
|
||||
carp "Can't chdir to $prefix$path ($!)";
|
||||
return 0;
|
||||
+ }
|
||||
}
|
||||
|
||||
# avoid a race condition where a directory may be replaced by a
|
||||
# symlink between the lstat and the chdir
|
||||
- my ($new_dev, $new_ino, $perm) = stat '.';
|
||||
+ my ($new_dev, $new_ino);
|
||||
+ ($new_dev, $new_ino, $perm) = stat '.';
|
||||
unless ("$new_dev:$new_ino" eq "$dev:$ino")
|
||||
{
|
||||
croak "Directory $prefix$path changed before chdir, aborting";
|
||||
--- perl-5.8.8.orig/lib/ExtUtils/t/Command.t
|
||||
+++ perl-5.8.8/lib/ExtUtils/t/Command.t
|
||||
@@ -23,7 +23,7 @@
|
||||
}
|
||||
|
||||
BEGIN {
|
||||
- use Test::More tests => 38;
|
||||
+ use Test::More tests => 39;
|
||||
use File::Spec;
|
||||
}
|
||||
|
||||
@@ -148,7 +148,7 @@
|
||||
$^O eq 'NetWare' || $^O eq 'dos' || $^O eq 'cygwin' ||
|
||||
$^O eq 'MacOS'
|
||||
) {
|
||||
- skip( "different file permission semantics on $^O", 4);
|
||||
+ skip( "different file permission semantics on $^O", 5);
|
||||
}
|
||||
|
||||
@ARGV = ('testdir');
|
||||
@@ -178,6 +178,7 @@
|
||||
|
||||
@ARGV = ('testdir');
|
||||
rm_rf;
|
||||
+ ok( ! -e 'testdir', 'rm_rf can delete a read-only dir' );
|
||||
}
|
||||
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff -Naur perl-5.8.8-orig/makedepend.SH perl-5.8.8/makedepend.SH
|
||||
--- perl-5.8.8-orig/makedepend.SH 2006-10-01 20:05:40.000000000 -0600
|
||||
+++ perl-5.8.8/makedepend.SH 2006-10-01 20:07:03.000000000 -0600
|
||||
@@ -167,6 +167,7 @@
|
||||
-e '/^#.*<builtin>/d' \
|
||||
-e '/^#.*<built-in>/d' \
|
||||
-e '/^#.*<command line>/d' \
|
||||
+ -e '/^#.*<command-line>/d' \
|
||||
-e '/^#.*"-"/d' \
|
||||
-e '/: file path prefix .* never used$/d' \
|
||||
-e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
|
||||
@ -1,76 +0,0 @@
|
||||
--- a/Configure
|
||||
+++ b/Configure
|
||||
@@ -1255,12 +1255,12 @@ libnames=''
|
||||
: change the next line if compiling for Xenix/286 on Xenix/386
|
||||
xlibpth='/usr/lib/386 /lib/386'
|
||||
: Possible local library directories to search.
|
||||
-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
|
||||
-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
|
||||
+loclibpth="/usr/local/lib32 /opt/local/lib32 /usr/gnu/lib32"
|
||||
+loclibpth="$loclibpth /opt/gnu/lib32 /usr/GNU/lib32 /opt/GNU/lib32"
|
||||
|
||||
: general looking path for locating libraries
|
||||
-glibpth="/lib /usr/lib $xlibpth"
|
||||
-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
|
||||
+glibpth="/lib32 /usr/lib32 $xlibpth"
|
||||
+glibpth="$glibpth /usr/ccs/lib32 /usr/ucblib /usr/local/lib32"
|
||||
test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
|
||||
test -f /shlib/libc.so && glibpth="/shlib $glibpth"
|
||||
|
||||
@@ -5945,8 +5945,8 @@ fi
|
||||
: Reproduce behavior of 5.005 and earlier, maybe drop that in 5.7.
|
||||
case "$installstyle" in
|
||||
'') case "$prefix" in
|
||||
- *perl*) dflt='lib';;
|
||||
- *) dflt='lib/perl5' ;;
|
||||
+ *perl*) dflt='lib32';;
|
||||
+ *) dflt='lib32/perl5' ;;
|
||||
esac
|
||||
;;
|
||||
*) dflt="$installstyle" ;;
|
||||
@@ -5962,8 +5962,8 @@ installstyle=$dflt
|
||||
: /opt/perl/lib/perl5... would be redundant.
|
||||
: The default "style" setting is made in installstyle.U
|
||||
case "$installstyle" in
|
||||
-*lib/perl5*) set dflt privlib lib/$package/$version ;;
|
||||
-*) set dflt privlib lib/$version ;;
|
||||
+*lib32/perl5*) set dflt privlib lib32/$package/$version ;;
|
||||
+*) set dflt privlib lib32/$version ;;
|
||||
esac
|
||||
eval $prefixit
|
||||
$cat <<EOM
|
||||
@@ -6465,8 +6465,8 @@ siteprefixexp="$ansexp"
|
||||
prog=`echo $package | $sed 's/-*[0-9.]*$//'`
|
||||
case "$sitelib" in
|
||||
'') case "$installstyle" in
|
||||
- *lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
|
||||
- *) dflt=$siteprefix/lib/site_$prog/$version ;;
|
||||
+ *lib32/perl5*) dflt=$siteprefix/lib32/$package/site_$prog/$version ;;
|
||||
+ *) dflt=$siteprefix/lib32/site_$prog/$version ;;
|
||||
esac
|
||||
;;
|
||||
*) dflt="$sitelib"
|
||||
@@ -6592,8 +6592,8 @@ case "$vendorprefix" in
|
||||
'')
|
||||
prog=`echo $package | $sed 's/-*[0-9.]*$//'`
|
||||
case "$installstyle" in
|
||||
- *lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
|
||||
- *) dflt=$vendorprefix/lib/vendor_$prog/$version ;;
|
||||
+ *lib32/perl5*) dflt=$vendorprefix/lib32/$package/vendor_$prog/$version ;;
|
||||
+ *) dflt=$vendorprefix/lib32/vendor_$prog/$version ;;
|
||||
esac
|
||||
;;
|
||||
*) dflt="$vendorlib"
|
||||
@@ -10550,9 +10550,9 @@ else
|
||||
else
|
||||
for net in net socket
|
||||
do
|
||||
- if test -f /usr/lib/lib$net$_a; then
|
||||
- ( ($nm $nm_opt /usr/lib/lib$net$_a | eval $nm_extract) || \
|
||||
- $ar t /usr/lib/lib$net$_a) 2>/dev/null >> libc.list
|
||||
+ if test -f /usr/lib32/lib$net$_a; then
|
||||
+ ( ($nm $nm_opt /usr/lib32/lib$net$_a | eval $nm_extract) || \
|
||||
+ $ar t /usr/lib32/lib$net$_a) 2>/dev/null >> libc.list
|
||||
if $contains socket libc.list >/dev/null 2>&1; then
|
||||
d_socket="$define"
|
||||
socketlib="-l$net"
|
||||
@ -1,76 +0,0 @@
|
||||
--- a/Configure
|
||||
+++ b/Configure
|
||||
@@ -1255,12 +1255,12 @@ libnames=''
|
||||
: change the next line if compiling for Xenix/286 on Xenix/386
|
||||
xlibpth='/usr/lib/386 /lib/386'
|
||||
: Possible local library directories to search.
|
||||
-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
|
||||
-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
|
||||
+loclibpth="/usr/local/lib64 /opt/local/lib64 /usr/gnu/lib64"
|
||||
+loclibpth="$loclibpth /opt/gnu/lib64 /usr/GNU/lib64 /opt/GNU/lib64"
|
||||
|
||||
: general looking path for locating libraries
|
||||
-glibpth="/lib /usr/lib $xlibpth"
|
||||
-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
|
||||
+glibpth="/lib64 /usr/lib64 $xlibpth"
|
||||
+glibpth="$glibpth /usr/ccs/lib64 /usr/ucblib /usr/local/lib64"
|
||||
test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
|
||||
test -f /shlib/libc.so && glibpth="/shlib $glibpth"
|
||||
|
||||
@@ -5945,8 +5945,8 @@ fi
|
||||
: Reproduce behavior of 5.005 and earlier, maybe drop that in 5.7.
|
||||
case "$installstyle" in
|
||||
'') case "$prefix" in
|
||||
- *perl*) dflt='lib';;
|
||||
- *) dflt='lib/perl5' ;;
|
||||
+ *perl*) dflt='lib64';;
|
||||
+ *) dflt='lib64/perl5' ;;
|
||||
esac
|
||||
;;
|
||||
*) dflt="$installstyle" ;;
|
||||
@@ -5962,8 +5962,8 @@ installstyle=$dflt
|
||||
: /opt/perl/lib/perl5... would be redundant.
|
||||
: The default "style" setting is made in installstyle.U
|
||||
case "$installstyle" in
|
||||
-*lib/perl5*) set dflt privlib lib/$package/$version ;;
|
||||
-*) set dflt privlib lib/$version ;;
|
||||
+*lib64/perl5*) set dflt privlib lib64/$package/$version ;;
|
||||
+*) set dflt privlib lib64/$version ;;
|
||||
esac
|
||||
eval $prefixit
|
||||
$cat <<EOM
|
||||
@@ -6465,8 +6465,8 @@ siteprefixexp="$ansexp"
|
||||
prog=`echo $package | $sed 's/-*[0-9.]*$//'`
|
||||
case "$sitelib" in
|
||||
'') case "$installstyle" in
|
||||
- *lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
|
||||
- *) dflt=$siteprefix/lib/site_$prog/$version ;;
|
||||
+ *lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;;
|
||||
+ *) dflt=$siteprefix/lib64/site_$prog/$version ;;
|
||||
esac
|
||||
;;
|
||||
*) dflt="$sitelib"
|
||||
@@ -6592,8 +6592,8 @@ case "$vendorprefix" in
|
||||
'')
|
||||
prog=`echo $package | $sed 's/-*[0-9.]*$//'`
|
||||
case "$installstyle" in
|
||||
- *lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
|
||||
- *) dflt=$vendorprefix/lib/vendor_$prog/$version ;;
|
||||
+ *lib64/perl5*) dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;;
|
||||
+ *) dflt=$vendorprefix/lib64/vendor_$prog/$version ;;
|
||||
esac
|
||||
;;
|
||||
*) dflt="$vendorlib"
|
||||
@@ -10550,9 +10550,9 @@ else
|
||||
else
|
||||
for net in net socket
|
||||
do
|
||||
- if test -f /usr/lib/lib$net$_a; then
|
||||
- ( ($nm $nm_opt /usr/lib/lib$net$_a | eval $nm_extract) || \
|
||||
- $ar t /usr/lib/lib$net$_a) 2>/dev/null >> libc.list
|
||||
+ if test -f /usr/lib64/lib$net$_a; then
|
||||
+ ( ($nm $nm_opt /usr/lib64/lib$net$_a | eval $nm_extract) || \
|
||||
+ $ar t /usr/lib64/lib$net$_a) 2>/dev/null >> libc.list
|
||||
if $contains socket libc.list >/dev/null 2>&1; then
|
||||
d_socket="$define"
|
||||
socketlib="-l$net"
|
||||
@ -1,25 +0,0 @@
|
||||
commit adeb94125ab7de8d20c129a905a5159972ad9fd1
|
||||
Author: Ricardo SIGNES <rjbs@cpan.org>
|
||||
Date: Mon Oct 22 05:01:09 2007 -0400
|
||||
|
||||
hostname.t busted
|
||||
Message-ID: <20071022130109.GA16748@knight>
|
||||
|
||||
p4raw-id: //depot/perl@32180
|
||||
|
||||
diff --git a/lib/Net/t/hostname.t b/lib/Net/t/hostname.t
|
||||
index 758d304..4013d74 100644
|
||||
--- a/lib/Net/t/hostname.t
|
||||
+++ b/lib/Net/t/hostname.t
|
||||
@@ -26,7 +26,10 @@ print "1..5\n";
|
||||
$domain = domainname();
|
||||
|
||||
if(defined $domain && $domain ne "") {
|
||||
- print "ok 1\n";
|
||||
+ print "ok 1 - defined, non-empty domainname\n";
|
||||
+}
|
||||
+elsif (not defined $domain) {
|
||||
+ print "ok 1 # SKIP domain not fully defined\n";
|
||||
}
|
||||
else {
|
||||
print "not ok 1\n";
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue