parent
44f54cf57c
commit
b3fbc0c759
@ -1,3 +1,3 @@
|
|||||||
DIST sudo-1.8.3p2.tar.gz 1536943 RMD160 5a6b8574d2245cc89d2ac982eae9cb6ca2414033 SHA1 37d70b133f809116ce631229fa0e727d9f5125ad SHA256 7edcf02ef4dc4f26f524726e8faaa90d7939772c186409ab150d2934e3a9ba31
|
DIST sudo-1.8.3p2.tar.gz 1536943 RMD160 5a6b8574d2245cc89d2ac982eae9cb6ca2414033 SHA1 37d70b133f809116ce631229fa0e727d9f5125ad SHA256 7edcf02ef4dc4f26f524726e8faaa90d7939772c186409ab150d2934e3a9ba31
|
||||||
DIST sudo-1.8.4p4.tar.gz 1608969 RMD160 02875946f3bb9a40637efde20c1a9a3f0b0cfca8 SHA1 49373706709bd4c30d9b3c513eff7be04aecd812 SHA256 bf965b09bde9b0cf7fd2355c53a81884d02d522af2d539cf40218436e9a5051e
|
DIST sudo-1.8.4p4.tar.gz 1608969 RMD160 02875946f3bb9a40637efde20c1a9a3f0b0cfca8 SHA1 49373706709bd4c30d9b3c513eff7be04aecd812 SHA256 bf965b09bde9b0cf7fd2355c53a81884d02d522af2d539cf40218436e9a5051e
|
||||||
DIST sudo-1.8.5.tar.gz 1745494 RMD160 024977a15fdbedd3a3cea75f8817b2f49e1fdb56 SHA1 5365d21aa14c4c5c7913e8ed9c388030d69fbb69 SHA256 eed695f027c784065d152249ea8753c7a6753f6858b848c8b4ece5b61d5a8150
|
DIST sudo-1.8.5p1.tar.gz 1745790 RMD160 e6e6adeffcfe587897b30c4b6a8e8d27b2a1de1c SHA1 8ac1e6b6cb04b2c2b6a1afd6db0fcb1f8a1eca79 SHA256 e99408d1f3815877fb3a2ec23b8b67ebca32425c7034cce30babae306844d231
|
||||||
|
@ -1,2 +1,3 @@
|
|||||||
DIST sysstat-10.0.3.tar.bz2 271868 RMD160 ba59fa29eb17eebc6abe7ed2d8b570580668bbe1 SHA1 d85b261b01daf4d3fdcc69cc852fb8bb747b9f97 SHA256 22023d53f58d3d6f483b21b852d606d135e69984cf6631574633bd4e56c8ff7c
|
DIST sysstat-10.0.3.tar.bz2 271868 RMD160 ba59fa29eb17eebc6abe7ed2d8b570580668bbe1 SHA1 d85b261b01daf4d3fdcc69cc852fb8bb747b9f97 SHA256 22023d53f58d3d6f483b21b852d606d135e69984cf6631574633bd4e56c8ff7c
|
||||||
DIST sysstat-10.0.4.tar.bz2 276962 RMD160 a76e84eab9ecfcb622be9d3437a6ab2b7d3179c4 SHA1 8ab30d2cecccb8dcfbb1cbd4e894139fc67fe0fd SHA256 55d6664bdfe72b3291100627a5e301189d29189e0432676a3678514962837fdb
|
DIST sysstat-10.0.4.tar.bz2 276962 RMD160 a76e84eab9ecfcb622be9d3437a6ab2b7d3179c4 SHA1 8ab30d2cecccb8dcfbb1cbd4e894139fc67fe0fd SHA256 55d6664bdfe72b3291100627a5e301189d29189e0432676a3678514962837fdb
|
||||||
|
DIST sysstat-10.0.5.tar.bz2 282403 RMD160 239575888ccd8d3bea30acd6d22da7a02cea3538 SHA1 8386be30020864727033e45d8fa74c5c4af23be7 SHA256 3e96fdc8d6710f4b642757ff88e3c4296d55838b64ff102feaaf2175f66e875b
|
||||||
|
@ -0,0 +1,93 @@
|
|||||||
|
# Copyright 1999-2012 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.0.5.ebuild,v 1.1 2012/05/17 05:25:12 jer Exp $
|
||||||
|
|
||||||
|
EAPI="4"
|
||||||
|
|
||||||
|
inherit eutils multilib
|
||||||
|
|
||||||
|
DESCRIPTION="System performance tools for Linux"
|
||||||
|
HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
|
||||||
|
SRC_URI="${HOMEPAGE}${P}.tar.bz2"
|
||||||
|
|
||||||
|
LICENSE="GPL-2"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
|
||||||
|
IUSE="cron debug +doc isag nls lm_sensors"
|
||||||
|
|
||||||
|
SYSSTAT_LINGUAS="
|
||||||
|
af cs da de eo es eu fi fr hr id it ja ky lv mt nb nl nn pl pt pt_BR ro ru
|
||||||
|
sk sr sv uk vi zh_CN zh_TW
|
||||||
|
"
|
||||||
|
|
||||||
|
for SYSSTAT_LINGUA in ${SYSSTAT_LINGUAS}; do
|
||||||
|
IUSE="${IUSE} linguas_${SYSSTAT_LINGUA}"
|
||||||
|
done
|
||||||
|
|
||||||
|
RDEPEND="
|
||||||
|
cron? ( sys-process/cronbase )
|
||||||
|
isag? (
|
||||||
|
dev-lang/tk
|
||||||
|
dev-vcs/rcs
|
||||||
|
sci-visualization/gnuplot
|
||||||
|
)
|
||||||
|
nls? ( virtual/libintl )
|
||||||
|
lm_sensors? ( sys-apps/lm_sensors )
|
||||||
|
"
|
||||||
|
DEPEND="
|
||||||
|
${RDEPEND}
|
||||||
|
nls? ( sys-devel/gettext )
|
||||||
|
"
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
local po_count li_count lingua NLSDIR="${S}/nls"
|
||||||
|
|
||||||
|
count() { echo ${#}; }
|
||||||
|
po_count=$(count ${NLSDIR}/*.po)
|
||||||
|
li_count=$(count ${SYSSTAT_LINGUAS})
|
||||||
|
[[ ${po_count} = ${li_count} ]] \
|
||||||
|
|| die "Number of LINGUAS does not match number of .po files"
|
||||||
|
unset count
|
||||||
|
|
||||||
|
einfo "Keeping these locales: ${LINGUAS}."
|
||||||
|
for lingua in ${SYSSTAT_LINGUAS}; do
|
||||||
|
if ! use linguas_${lingua}; then
|
||||||
|
rm -f "${NLSDIR}/${lingua}.po" || die
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
epatch "${FILESDIR}"/${PN}-10.0.4-flags.patch
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
sa_lib_dir=/usr/$(get_libdir)/sa \
|
||||||
|
conf_dir=/etc \
|
||||||
|
rcdir=Gentoo-does-not-use-rc.d \
|
||||||
|
econf \
|
||||||
|
$(use_enable cron install-cron) \
|
||||||
|
$(use_enable debug debuginfo) \
|
||||||
|
$(use_enable doc documentation ) \
|
||||||
|
$(use_enable isag install-isag) \
|
||||||
|
$(use_enable lm_sensors sensors) \
|
||||||
|
$(use_enable nls)
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
emake LFLAGS="${LDFLAGS}"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
keepdir /var/log/sa
|
||||||
|
|
||||||
|
use cron && dodir /etc/cron.{daily,hourly}
|
||||||
|
|
||||||
|
emake \
|
||||||
|
DESTDIR="${D}" \
|
||||||
|
DOC_DIR=/usr/share/doc/${PF} \
|
||||||
|
install
|
||||||
|
|
||||||
|
dodoc contrib/sargraph/sargraph
|
||||||
|
|
||||||
|
newinitd "${FILESDIR}"/sysstat.init.d sysstat
|
||||||
|
|
||||||
|
use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
|
||||||
|
}
|
@ -0,0 +1,27 @@
|
|||||||
|
make it build for mingw targets
|
||||||
|
|
||||||
|
https://bugs.gentoo.org/393573
|
||||||
|
|
||||||
|
--- a/bzip2.c
|
||||||
|
+++ b/bzip2.c
|
||||||
|
@@ -129,7 +129,7 @@
|
||||||
|
#if BZ_LCCWIN32
|
||||||
|
# include <io.h>
|
||||||
|
# include <fcntl.h>
|
||||||
|
-# include <sys\stat.h>
|
||||||
|
+# include <sys/stat.h>
|
||||||
|
|
||||||
|
# define NORETURN /**/
|
||||||
|
# define PATH_SEP '\\'
|
||||||
|
--- a/bzlib.h
|
||||||
|
+++ b/bzlib.h
|
||||||
|
@@ -81,6 +81,9 @@ typedef
|
||||||
|
/* windows.h define small to char */
|
||||||
|
# undef small
|
||||||
|
# endif
|
||||||
|
+# ifndef WINAPI
|
||||||
|
+# define WINAPI
|
||||||
|
+# endif
|
||||||
|
# ifdef BZ_EXPORT
|
||||||
|
# define BZ_API(func) WINAPI func
|
||||||
|
# define BZ_EXTERN extern
|
@ -1,2 +1,3 @@
|
|||||||
DIST rpm2targz-9.0.0.3g.tar.lzma 4299 RMD160 632f83052df1ba9fb966eb06dd7cc81fdeb1b1c4 SHA1 54c1c976823e1040845be143750c559e263c50c3 SHA256 f1ad994f203afac966dd45edff66a9bd18de28a0d512810e21f4809b6e51e071
|
DIST rpm2targz-9.0.0.3g.tar.lzma 4299 RMD160 632f83052df1ba9fb966eb06dd7cc81fdeb1b1c4 SHA1 54c1c976823e1040845be143750c559e263c50c3 SHA256 f1ad994f203afac966dd45edff66a9bd18de28a0d512810e21f4809b6e51e071
|
||||||
DIST rpm2targz-9.0.0.4g.tar.lzma 4749 RMD160 e50c85143e6e65c3538ee6a8bb94fd7ead7930da SHA1 13465fd0f1dea7ff22f85237df0a5d1c641c9f0e SHA256 36de9e468663d16c6b2ae0c5e47c180389235ddc2888024f6a93b4ebef651a2d
|
DIST rpm2targz-9.0.0.4g.tar.lzma 4749 RMD160 e50c85143e6e65c3538ee6a8bb94fd7ead7930da SHA1 13465fd0f1dea7ff22f85237df0a5d1c641c9f0e SHA256 36de9e468663d16c6b2ae0c5e47c180389235ddc2888024f6a93b4ebef651a2d
|
||||||
|
DIST rpm2targz-9.0.0.5g.tar.xz 5740 RMD160 5f1f266e014a8572e8e19c757e3a362480d0a347 SHA1 d6be32fc2b8fcd04c017f9ec1e014d4795b55e31 SHA256 4327b7dd30bf55e473198444b920029624948e24af575edff9ce466dcd4075e0
|
||||||
|
@ -0,0 +1,28 @@
|
|||||||
|
# Copyright 1999-2012 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild,v 1.1 2012/05/17 05:03:23 vapier Exp $
|
||||||
|
|
||||||
|
EAPI="4"
|
||||||
|
|
||||||
|
inherit toolchain-funcs
|
||||||
|
|
||||||
|
DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
|
||||||
|
HOMEPAGE="http://www.slackware.com/config/packages.php"
|
||||||
|
SRC_URI="mirror://gentoo/${P}.tar.xz"
|
||||||
|
|
||||||
|
LICENSE="as-is"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
RDEPEND="app-arch/cpio"
|
||||||
|
DEPEND="app-arch/xz-utils"
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
emake CC="$(tc-getCC)"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
default
|
||||||
|
dodoc *.README*
|
||||||
|
}
|
@ -1,2 +1,3 @@
|
|||||||
DIST unrarsrc-4.1.4.tar.gz 157135 RMD160 0bb200c01f665142b7581b1b40ef1047dca13c57 SHA1 ae4b1e2c99e96527c4a97f980daa547499f42a0f SHA256 705d93285fcd3b9c11f68e52d96395d942bf3c20172dcee14f0d78f1fee57361
|
DIST unrarsrc-4.1.4.tar.gz 157135 RMD160 0bb200c01f665142b7581b1b40ef1047dca13c57 SHA1 ae4b1e2c99e96527c4a97f980daa547499f42a0f SHA256 705d93285fcd3b9c11f68e52d96395d942bf3c20172dcee14f0d78f1fee57361
|
||||||
DIST unrarsrc-4.2.1.tar.gz 161564 RMD160 3909c1ad5849088d8d6b43f4cbd82063327ef3fd SHA1 10f48ec272f413c983032b2e0cbe4e94781c7b3b SHA256 d5b59d98a6604ac41916311bc3b5dce1b94858008fc381aa975311d9248542c0
|
DIST unrarsrc-4.2.1.tar.gz 161564 RMD160 3909c1ad5849088d8d6b43f4cbd82063327ef3fd SHA1 10f48ec272f413c983032b2e0cbe4e94781c7b3b SHA256 d5b59d98a6604ac41916311bc3b5dce1b94858008fc381aa975311d9248542c0
|
||||||
|
DIST unrarsrc-4.2.2.tar.gz 164101 RMD160 0359e465c0d43d16504f281b1bd86c92eb5cdaf3 SHA1 f33365102ddbdf58a8cd4b05c6b71fa2a2b2c20a SHA256 efd5a7053a6efa923618be26f68ae85c2b97e59a27e2e3b3028636df4396820f
|
||||||
|
@ -0,0 +1,52 @@
|
|||||||
|
# Copyright 1999-2012 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.2.2.ebuild,v 1.1 2012/05/17 12:00:51 ssuominen Exp $
|
||||||
|
|
||||||
|
EAPI=4
|
||||||
|
inherit flag-o-matic multilib toolchain-funcs
|
||||||
|
|
||||||
|
MY_PN=${PN}src
|
||||||
|
|
||||||
|
DESCRIPTION="Uncompress rar files"
|
||||||
|
HOMEPAGE="http://www.rarlab.com/rar_add.htm"
|
||||||
|
SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="unRAR"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
|
||||||
|
IUSE=""
|
||||||
|
|
||||||
|
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
|
||||||
|
|
||||||
|
S=${WORKDIR}/unrar
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
sed -i \
|
||||||
|
-e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" \
|
||||||
|
-e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" \
|
||||||
|
makefile.unix || die
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
unrar_make() {
|
||||||
|
emake -f makefile.unix CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
|
||||||
|
}
|
||||||
|
|
||||||
|
unrar_make CXXFLAGS+=" -fPIC" lib
|
||||||
|
ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname)
|
||||||
|
ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname ${PV})
|
||||||
|
|
||||||
|
unrar_make clean
|
||||||
|
unrar_make
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
dobin unrar
|
||||||
|
dodoc readme.txt
|
||||||
|
|
||||||
|
dolib.so libunrar*
|
||||||
|
|
||||||
|
insinto /usr/include/libunrar${PV%.*.*}
|
||||||
|
doins *.hpp
|
||||||
|
dosym libunrar${PV%.*.*} /usr/include/libunrar
|
||||||
|
}
|
@ -0,0 +1,464 @@
|
|||||||
|
# Copyright 1999-2012 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.1.ebuild,v 1.1 2012/05/17 05:58:29 robbat2 Exp $
|
||||||
|
|
||||||
|
EAPI=3
|
||||||
|
inherit autotools eutils perl-module
|
||||||
|
|
||||||
|
MY_P="${P/_}"
|
||||||
|
DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
|
||||||
|
HOMEPAGE="http://www.amanda.org/"
|
||||||
|
SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
|
||||||
|
LICENSE="as-is"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
|
||||||
|
RDEPEND="sys-libs/readline
|
||||||
|
virtual/inetd
|
||||||
|
sys-apps/gawk
|
||||||
|
app-arch/tar
|
||||||
|
>=dev-lang/perl-5.6
|
||||||
|
app-arch/dump
|
||||||
|
net-misc/openssh
|
||||||
|
>=dev-libs/glib-2.26.0
|
||||||
|
nls? ( virtual/libintl )
|
||||||
|
s3? ( >=net-misc/curl-7.10.0 )
|
||||||
|
!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
|
||||||
|
samba? ( net-fs/samba )
|
||||||
|
kerberos? ( app-crypt/mit-krb5 )
|
||||||
|
xfs? ( sys-fs/xfsdump )
|
||||||
|
readline? ( sys-libs/readline )
|
||||||
|
!minimal? (
|
||||||
|
virtual/mailx
|
||||||
|
app-arch/mt-st
|
||||||
|
sys-block/mtx
|
||||||
|
gnuplot? ( sci-visualization/gnuplot )
|
||||||
|
app-crypt/aespipe
|
||||||
|
app-crypt/gnupg
|
||||||
|
)"
|
||||||
|
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
virtual/pkgconfig
|
||||||
|
nls? ( sys-devel/gettext )
|
||||||
|
>=app-text/docbook-xsl-stylesheets-1.72.0
|
||||||
|
app-text/docbook-xml-dtd
|
||||||
|
dev-libs/libxslt
|
||||||
|
"
|
||||||
|
|
||||||
|
IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba xfs"
|
||||||
|
|
||||||
|
S="${WORKDIR}/${MY_P}"
|
||||||
|
|
||||||
|
MYFILESDIR="${T}/files"
|
||||||
|
ENVDIR="/etc/env.d"
|
||||||
|
ENVDFILE="97amanda"
|
||||||
|
TMPENVFILE="${T}/${ENVDFILE}"
|
||||||
|
|
||||||
|
# This is a complete list of Amanda settings that the ebuild takes from the
|
||||||
|
# build environment. This allows users to alter the behavior of the package as
|
||||||
|
# upstream intended, but keeping with Gentoo style. We store a copy of them in
|
||||||
|
# /etc/env.d/97amanda during the install, so that they are preserved for future
|
||||||
|
# installed. This variable name must not start with AMANDA_, as we do not want
|
||||||
|
# it captured into the env file.
|
||||||
|
ENV_SETTINGS_AMANDA="
|
||||||
|
AMANDA_GROUP_GID AMANDA_GROUP_NAME
|
||||||
|
AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
|
||||||
|
AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_INDEX
|
||||||
|
AMANDA_TAR_LISTDIR AMANDA_TAR
|
||||||
|
AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
|
||||||
|
AMANDA_CONFIG_NAME AMANDA_TMPDIR"
|
||||||
|
|
||||||
|
amanda_variable_setup() {
|
||||||
|
|
||||||
|
# Setting vars
|
||||||
|
local currentamanda
|
||||||
|
|
||||||
|
# Grab the current settings
|
||||||
|
currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
|
||||||
|
|
||||||
|
# First we set the defaults
|
||||||
|
[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
|
||||||
|
[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
|
||||||
|
[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
|
||||||
|
[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
|
||||||
|
[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=/bin/bash
|
||||||
|
[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
|
||||||
|
[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
|
||||||
|
|
||||||
|
# This installs Amanda, with the server. However, it could be a client,
|
||||||
|
# just specify an alternate server name in AMANDA_SERVER.
|
||||||
|
[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
|
||||||
|
[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
|
||||||
|
[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
|
||||||
|
[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
|
||||||
|
[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
|
||||||
|
[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=/var/tmp/amanda
|
||||||
|
[ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
|
||||||
|
# These are left empty by default
|
||||||
|
[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
|
||||||
|
[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
|
||||||
|
[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
|
||||||
|
[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
|
||||||
|
|
||||||
|
# What tar to use
|
||||||
|
[ -z "${AMANDA_TAR}" ] && AMANDA_TAR=/bin/tar
|
||||||
|
|
||||||
|
# Now pull in the old stuff
|
||||||
|
if [ -f "${ROOT}${ENVDIR}/${ENVDFILE}" ]; then
|
||||||
|
# We don't just source it as we don't want everything in there.
|
||||||
|
eval $(egrep "^AMANDA_" "${ROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Re-apply the new settings if any
|
||||||
|
[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_setup() {
|
||||||
|
amanda_variable_setup
|
||||||
|
|
||||||
|
# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
|
||||||
|
# another host than HOSTNAME.
|
||||||
|
if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
|
||||||
|
elog "You are installing a client-only version of Amanda."
|
||||||
|
elog "You should set the variable \$AMANDA_SERVER to point at your"
|
||||||
|
elog "Amanda-tape-server, otherwise you will have to specify its name"
|
||||||
|
elog "when using amrecover on the client."
|
||||||
|
elog "For example: Use something like"
|
||||||
|
elog "AMANDA_SERVER=\"myserver\" emerge amanda"
|
||||||
|
elog
|
||||||
|
fi
|
||||||
|
|
||||||
|
enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
|
||||||
|
enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_unpack() {
|
||||||
|
# we do not want the perl src_unpack
|
||||||
|
base_src_unpack
|
||||||
|
}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
# Fix a fun race condition if you use encryption.
|
||||||
|
# This is one of the reasons you should test your recovery procedures often.
|
||||||
|
#epatch "${FILESDIR}"/${PN}-2.6.0p2-amcrypt-ossl-asym-race-fix.patch
|
||||||
|
|
||||||
|
# gentoo bug 248838, check /sbin stuff before /bin
|
||||||
|
#epatch "${FILESDIR}"/${PN}-2.6.0_p2-syslocpath.patch
|
||||||
|
|
||||||
|
# gentoo bug #415587
|
||||||
|
epatch "${FILESDIR}"/amanda-r4593.patch
|
||||||
|
epatch "${FILESDIR}"/amanda-r4595.patch
|
||||||
|
epatch "${FILESDIR}"/amanda-r4698.patch
|
||||||
|
|
||||||
|
# gentoo bug #331111
|
||||||
|
sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am
|
||||||
|
sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am
|
||||||
|
|
||||||
|
eautoreconf
|
||||||
|
|
||||||
|
# places for us to work in
|
||||||
|
mkdir -p "${MYFILESDIR}"
|
||||||
|
# Now we store the settings we just created
|
||||||
|
set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}"
|
||||||
|
|
||||||
|
# Prepare our custom files
|
||||||
|
einfo "Building custom configuration files"
|
||||||
|
local i # our iterator
|
||||||
|
local sedexpr # var for sed expr
|
||||||
|
sedexpr=''
|
||||||
|
for i in ${ENV_SETTINGS_AMANDA} ; do
|
||||||
|
local val
|
||||||
|
eval "val=\"\${${i}}\""
|
||||||
|
sedexpr="${sedexpr}s|__${i}__|${val}|g;"
|
||||||
|
done
|
||||||
|
|
||||||
|
# now apply the sed expr
|
||||||
|
for i in "${FILESDIR}"/amanda-* ; do
|
||||||
|
sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`"
|
||||||
|
done
|
||||||
|
|
||||||
|
(
|
||||||
|
cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1
|
||||||
|
use minimal || cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1
|
||||||
|
) > "${T}"/amandahosts
|
||||||
|
|
||||||
|
if ! use minimal; then
|
||||||
|
sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
|
||||||
|
server-src/am{addclient,serverconfig}.pl || die
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
# fix bug #36316
|
||||||
|
addpredict /var/cache/samba/gencache.tdb
|
||||||
|
|
||||||
|
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
|
||||||
|
source "${TMPENVFILE}"
|
||||||
|
local myconf
|
||||||
|
|
||||||
|
einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
|
||||||
|
myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
|
||||||
|
einfo "Using ${AMANDA_SERVER_INDEX} for index server."
|
||||||
|
myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
|
||||||
|
einfo "Using ${AMANDA_USER_NAME} for amanda user."
|
||||||
|
myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
|
||||||
|
einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
|
||||||
|
myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
|
||||||
|
einfo "Using ${AMANDA_TAR} as Tar implementation."
|
||||||
|
myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
|
||||||
|
einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
|
||||||
|
myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
|
||||||
|
einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
|
||||||
|
myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
|
||||||
|
einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
|
||||||
|
myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
|
||||||
|
|
||||||
|
if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
|
||||||
|
eerror "If you want _both_ UDP and TCP ports, please use only the"
|
||||||
|
eerror "AMANDA_PORTS environment variable for identical ports, or set"
|
||||||
|
eerror "AMANDA_PORTS_BOTH."
|
||||||
|
die "Bad port setup!"
|
||||||
|
fi
|
||||||
|
if [ -n "${AMANDA_PORTS_UDP}" ]; then
|
||||||
|
einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
|
||||||
|
myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
|
||||||
|
fi
|
||||||
|
if [ -n "${AMANDA_PORTS_TCP}" ]; then
|
||||||
|
einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
|
||||||
|
myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
|
||||||
|
fi
|
||||||
|
if [ -n "${AMANDA_PORTS}" ]; then
|
||||||
|
einfo "Using ports ${AMANDA_PORTS/,/-}"
|
||||||
|
myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Extras
|
||||||
|
# Speed option
|
||||||
|
myconf="${myconf} --with-buffered-dump"
|
||||||
|
# "debugging" in the configuration is NOT debug in the conventional sense.
|
||||||
|
# It is actually just useful output in the application, and should remain
|
||||||
|
# enabled. There are some cases of breakage with MTX tape changers as of
|
||||||
|
# 2.5.1p2 that it exposes when turned off as well.
|
||||||
|
myconf="${myconf} --with-debugging"
|
||||||
|
# Where to put our files
|
||||||
|
myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
|
||||||
|
|
||||||
|
# Samba support
|
||||||
|
myconf="${myconf} `use_with samba smbclient /usr/bin/smbclient`"
|
||||||
|
|
||||||
|
# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
|
||||||
|
# default
|
||||||
|
myconf="${myconf} --with-bsd-security"
|
||||||
|
myconf="${myconf} --with-ssh-security"
|
||||||
|
myconf="${myconf} --with-bsdudp-security"
|
||||||
|
myconf="${myconf} --with-bsdtcp-security"
|
||||||
|
|
||||||
|
# kerberos-security mechanism version 5
|
||||||
|
myconf="${myconf} `use_with kerberos krb5-security`"
|
||||||
|
|
||||||
|
# Amazon S3 support
|
||||||
|
myconf="${myconf} `use_enable s3 s3-device`"
|
||||||
|
|
||||||
|
# libcurl is required for S3 but otherwise optional
|
||||||
|
if ! use s3; then
|
||||||
|
myconf="${myconf} $(use_with curl libcurl)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Client only, as requested in bug #127725
|
||||||
|
if use minimal ; then
|
||||||
|
myconf="${myconf} --without-server"
|
||||||
|
else
|
||||||
|
# amplot
|
||||||
|
myconf="${myconf} $(use_with gnuplot)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# IPv6 fun.
|
||||||
|
myconf="${myconf} `use_with ipv6`"
|
||||||
|
# This is to prevent the IPv6-is-working test
|
||||||
|
# As the test fails on binpkg build hosts with no IPv6.
|
||||||
|
use ipv6 && export amanda_cv_working_ipv6=yes
|
||||||
|
|
||||||
|
# I18N
|
||||||
|
myconf="${myconf} `use_enable nls`"
|
||||||
|
|
||||||
|
# Bug #296634: Perl location
|
||||||
|
perlinfo
|
||||||
|
myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
|
||||||
|
|
||||||
|
# Bug 296633: --disable-syntax-checks
|
||||||
|
# Some tests are not safe for production systems
|
||||||
|
myconf="${myconf} --disable-syntax-checks"
|
||||||
|
|
||||||
|
# build manpages
|
||||||
|
myconf="${myconf} --enable-manpage-build"
|
||||||
|
|
||||||
|
econf \
|
||||||
|
$(use_with readline) \
|
||||||
|
${myconf}
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
# Again, do not want the perl-module src_compile
|
||||||
|
base_src_compile
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
|
||||||
|
source ${TMPENVFILE}
|
||||||
|
|
||||||
|
einfo "Doing stock install"
|
||||||
|
# parallel make install b0rked
|
||||||
|
emake -j1 DESTDIR="${D}" install || die
|
||||||
|
|
||||||
|
# Build the envdir file
|
||||||
|
# Don't forget this..
|
||||||
|
einfo "Building environment file"
|
||||||
|
(
|
||||||
|
echo "# These settings are what was present in the environment when this"
|
||||||
|
echo "# Amanda was compiled. Changing anything below this comment will"
|
||||||
|
echo "# have no effect on your application, but it merely exists to"
|
||||||
|
echo "# preserve them for your next emerge of Amanda"
|
||||||
|
cat "${TMPENVFILE}" | sed "s,=\$,='',g"
|
||||||
|
) >> "${MYFILESDIR}/${ENVDFILE}"
|
||||||
|
|
||||||
|
# Env.d
|
||||||
|
einfo "Installing environment config file"
|
||||||
|
doenvd "${MYFILESDIR}/${ENVDFILE}"
|
||||||
|
|
||||||
|
# Lock down next section (up until docs).
|
||||||
|
insopts -m0640
|
||||||
|
# Installing Amanda Xinetd Services Definition
|
||||||
|
einfo "Installing xinetd service file"
|
||||||
|
insinto /etc/xinetd.d
|
||||||
|
if use minimal ; then
|
||||||
|
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
|
||||||
|
else
|
||||||
|
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! use minimal; then
|
||||||
|
einfo "Installing Sample Daily Cron Job for Amanda"
|
||||||
|
insinto /etc/cron.daily
|
||||||
|
newins "${MYFILESDIR}/amanda-cron" amanda
|
||||||
|
fi
|
||||||
|
|
||||||
|
insinto /etc/amanda
|
||||||
|
einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
|
||||||
|
doins "${T}/amandahosts"
|
||||||
|
fperms 600 /etc/amanda/amandahosts
|
||||||
|
|
||||||
|
dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
|
||||||
|
insinto "${AMANDA_USER_HOMEDIR}"
|
||||||
|
einfo "Installing .profile for ${AMANDA_USER_NAME} user"
|
||||||
|
newins "${MYFILESDIR}/amanda-profile" .profile
|
||||||
|
|
||||||
|
insinto /etc/amanda
|
||||||
|
doins "${S}/example/amanda-client.conf"
|
||||||
|
if ! use minimal ; then
|
||||||
|
insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
|
||||||
|
doins "${S}/example/amanda.conf"
|
||||||
|
doins "${S}/example/disklist"
|
||||||
|
keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
|
||||||
|
fi
|
||||||
|
|
||||||
|
keepdir "${AMANDA_TAR_LISTDIR}"
|
||||||
|
keepdir "${AMANDA_USER_HOMEDIR}/amanda"
|
||||||
|
keepdir "${AMANDA_TMPDIR}/dumps"
|
||||||
|
# Just make sure it exists for XFS to work...
|
||||||
|
use xfs && keepdir /var/xfsdump/inventory
|
||||||
|
|
||||||
|
local i
|
||||||
|
for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
|
||||||
|
"${AMANDA_TMPDIR}" /etc/amanda; do
|
||||||
|
einfo "Securing directory (${i})"
|
||||||
|
fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
|
||||||
|
done
|
||||||
|
# Do NOT use -R
|
||||||
|
fperms 0700 \
|
||||||
|
"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
|
||||||
|
"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
|
||||||
|
"${AMANDA_USER_HOMEDIR}/amanda" \
|
||||||
|
"${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
|
||||||
|
/etc/amanda /etc/amanda/${AMANDA_CONFIG_NAME}
|
||||||
|
|
||||||
|
einfo "Setting setuid permissions"
|
||||||
|
amanda_permissions_fix "${D}"
|
||||||
|
|
||||||
|
# Relax permissions again
|
||||||
|
insopts -m0644
|
||||||
|
|
||||||
|
# docs
|
||||||
|
einfo "Installing documentation"
|
||||||
|
dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
|
||||||
|
# our inetd sample
|
||||||
|
einfo "Installing standard inetd sample"
|
||||||
|
newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
|
||||||
|
# Amanda example configs
|
||||||
|
einfo "Installing example configurations"
|
||||||
|
rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
|
||||||
|
mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
|
||||||
|
docinto example1
|
||||||
|
newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
|
||||||
|
newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
|
||||||
|
newdoc "${FILESDIR}/example_global.conf" global.conf
|
||||||
|
|
||||||
|
einfo "Cleaning up dud .la files"
|
||||||
|
perlinfo
|
||||||
|
find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
[ ! -f "${TMPENVFILE}" -a "$EMERGE_FROM" == "binary" ] && \
|
||||||
|
TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
|
||||||
|
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
|
||||||
|
source "${TMPENVFILE}"
|
||||||
|
|
||||||
|
# Migration of amandates from /etc to $localstatedir/amanda
|
||||||
|
if [ -f "${ROOT}/etc/amandates" -a \
|
||||||
|
! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
|
||||||
|
einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
|
||||||
|
einfo "A backup is also placed at /etc/amandates.orig"
|
||||||
|
cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
|
||||||
|
mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
|
||||||
|
cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
|
||||||
|
fi
|
||||||
|
if [ -f "${ROOT}/etc/amandates" ]; then
|
||||||
|
einfo "If you have migrated safely, please delete /etc/amandates"
|
||||||
|
fi
|
||||||
|
|
||||||
|
einfo "Checking setuid permissions"
|
||||||
|
amanda_permissions_fix "${ROOT}"
|
||||||
|
|
||||||
|
elog "You should configure Amanda in /etc/amanda now."
|
||||||
|
elog
|
||||||
|
elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
|
||||||
|
elog "and restart xinetd afterwards!"
|
||||||
|
elog
|
||||||
|
elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
|
||||||
|
elog "as an example of how to configure your inetd."
|
||||||
|
elog
|
||||||
|
elog "NOTICE: If you need raw access to partitions you need to add the"
|
||||||
|
elog "amanda user to the 'disk' group."
|
||||||
|
elog
|
||||||
|
elog "NOTICE: If you have a tape changer, you need to add the amanda user"
|
||||||
|
elog "to the 'tape' group."
|
||||||
|
elog
|
||||||
|
elog "If you use localhost in your disklist your restores may break."
|
||||||
|
elog "You should replace it with the actual hostname!"
|
||||||
|
elog "Please also see the syntax changes to amandahosts."
|
||||||
|
}
|
||||||
|
|
||||||
|
# We have had reports of amanda file permissions getting screwed up.
|
||||||
|
# Losing setuid, becoming too lax etc.
|
||||||
|
# ONLY root and users in the amanda group should be able to run these binaries!
|
||||||
|
amanda_permissions_fix() {
|
||||||
|
local root="$1"
|
||||||
|
[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
|
||||||
|
local le="/usr/libexec/amanda"
|
||||||
|
for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
|
||||||
|
"${le}"/rundump "${le}"/runtar "${le}"/dumper \
|
||||||
|
"${le}"/planner ; do
|
||||||
|
chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
|
||||||
|
chmod u=srwx,g=rx,o= "${root}"/${i}
|
||||||
|
done
|
||||||
|
}
|
@ -0,0 +1,44 @@
|
|||||||
|
#Index: ChangeLog
|
||||||
|
#===================================================================
|
||||||
|
#--- ChangeLog (revision 4592)
|
||||||
|
#+++ ChangeLog (revision 4593)
|
||||||
|
#@@ -1,3 +1,7 @@
|
||||||
|
#+2012-03-10 Jean-Louis Martineau <martineau@zmanda.com>
|
||||||
|
#+ * common-src/glib-util.c, common-src/glib-util.h: Remove
|
||||||
|
#+ g_queue_free_full.
|
||||||
|
#+
|
||||||
|
# 2012-03-09 Jean-Louis Martineau <martineau@zmanda.com>
|
||||||
|
# * client-src/client_util.c, common-src/Makefile.am, common-src/am_sl.c,
|
||||||
|
# common-src/amxml.c: typo.
|
||||||
|
Index: common-src/glib-util.c
|
||||||
|
===================================================================
|
||||||
|
--- common-src/glib-util.c (revision 4592)
|
||||||
|
+++ common-src/glib-util.c (revision 4593)
|
||||||
|
@@ -120,15 +120,6 @@
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-void g_queue_free_full(GQueue * queue) {
|
||||||
|
- while (!g_queue_is_empty(queue)) {
|
||||||
|
- gpointer data;
|
||||||
|
- data = g_queue_pop_head(queue);
|
||||||
|
- amfree(data);
|
||||||
|
- }
|
||||||
|
- g_queue_free(queue);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
void g_ptr_array_free_full(GPtrArray * array) {
|
||||||
|
size_t i;
|
||||||
|
|
||||||
|
Index: common-src/glib-util.h
|
||||||
|
===================================================================
|
||||||
|
--- common-src/glib-util.h (revision 4592)
|
||||||
|
+++ common-src/glib-util.h (revision 4593)
|
||||||
|
@@ -72,7 +72,6 @@
|
||||||
|
|
||||||
|
/* These functions all take a GLib container, and call free() on all the
|
||||||
|
* pointers in the container before free()ing the container itself. */
|
||||||
|
-void g_queue_free_full(GQueue * queue);
|
||||||
|
void g_ptr_array_free_full(GPtrArray * array);
|
||||||
|
|
||||||
|
/* g_value_compare() does what you expect. It returns TRUE if and
|
@ -0,0 +1,26 @@
|
|||||||
|
#Index: ChangeLog
|
||||||
|
#===================================================================
|
||||||
|
#--- ChangeLog (revision 4594)
|
||||||
|
#+++ ChangeLog (revision 4595)
|
||||||
|
#@@ -1,3 +1,7 @@
|
||||||
|
#+2012-03-11 Jean-Louis Martineau <martineau@zmanda.com>
|
||||||
|
#+ * common-src/glib-util.c: g_thread_supported always return TRUE on
|
||||||
|
#+ newer version.
|
||||||
|
#+
|
||||||
|
# 2012-03-10 Jean-Louis Martineau <martineau@zmanda.com>
|
||||||
|
# * common-src/glib-util.c, common-src/glib-util.h: Remove
|
||||||
|
# g_queue_free_full.
|
||||||
|
Index: common-src/glib-util.c
|
||||||
|
===================================================================
|
||||||
|
--- common-src/glib-util.c (revision 4594)
|
||||||
|
+++ common-src/glib-util.c (revision 4595)
|
||||||
|
@@ -42,7 +42,9 @@
|
||||||
|
* is initialized) */
|
||||||
|
#ifdef HAVE_LIBCURL
|
||||||
|
# ifdef G_THREADS_ENABLED
|
||||||
|
+# if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 31))
|
||||||
|
g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */
|
||||||
|
+# endif
|
||||||
|
# endif
|
||||||
|
g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0);
|
||||||
|
#endif
|
@ -0,0 +1,91 @@
|
|||||||
|
Index: device-src/s3.c
|
||||||
|
===================================================================
|
||||||
|
--- device-src/s3.c (revision 4697)
|
||||||
|
+++ device-src/s3.c (revision 4698)
|
||||||
|
@@ -1905,7 +1905,14 @@
|
||||||
|
|
||||||
|
gboolean s3_init(void)
|
||||||
|
{
|
||||||
|
+#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 31))
|
||||||
|
+//# pragma GCC diagnostic push
|
||||||
|
+//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||||
|
static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
|
||||||
|
+//# pragma GCC diagnostic pop
|
||||||
|
+#else
|
||||||
|
+ static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
|
||||||
|
+#endif
|
||||||
|
static gboolean init = FALSE, ret;
|
||||||
|
|
||||||
|
/* n.b. curl_global_init is called in common-src/glib-util.c:glib_init() */
|
||||||
|
#Index: ChangeLog
|
||||||
|
#===================================================================
|
||||||
|
#--- ChangeLog (revision 4697)
|
||||||
|
#+++ ChangeLog (revision 4698)
|
||||||
|
#@@ -1,4 +1,8 @@
|
||||||
|
# 2012-05-08 Jean-Louis Martineau <martineau@zmanda.com>
|
||||||
|
#+ * common-src/amflock.c, common-src/match.c, common-src/util.c,
|
||||||
|
#+ device-src/s3.c: Fix for deprecated G_STATIC_MUTEX_INIT.
|
||||||
|
#+
|
||||||
|
#+2012-05-08 Jean-Louis Martineau <martineau@zmanda.com>
|
||||||
|
# * installcheck/Amanda_Device.pl: Fix indirect tcp.
|
||||||
|
#
|
||||||
|
# 2012-05-08 Jean-Louis Martineau <martineau@zmanda.com>
|
||||||
|
Index: common-src/util.c
|
||||||
|
===================================================================
|
||||||
|
--- common-src/util.c (revision 4697)
|
||||||
|
+++ common-src/util.c (revision 4698)
|
||||||
|
@@ -1147,7 +1147,14 @@
|
||||||
|
struct dirent *entry_p;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 31))
|
||||||
|
+//# pragma GCC diagnostic push
|
||||||
|
+//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||||
|
static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
|
||||||
|
+//# pragma GCC diagnostic pop
|
||||||
|
+#else
|
||||||
|
+ static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
g_static_mutex_lock(&mutex);
|
||||||
|
|
||||||
|
Index: common-src/match.c
|
||||||
|
===================================================================
|
||||||
|
--- common-src/match.c (revision 4697)
|
||||||
|
+++ common-src/match.c (revision 4698)
|
||||||
|
@@ -153,7 +153,14 @@
|
||||||
|
* be called from within threads, so play it safe.
|
||||||
|
*/
|
||||||
|
|
||||||
|
-static GStaticMutex re_cache_mutex = G_STATIC_MUTEX_INIT;
|
||||||
|
+#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 31))
|
||||||
|
+//# pragma GCC diagnostic push
|
||||||
|
+//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||||
|
+ static GStaticMutex re_cache_mutex = G_STATIC_MUTEX_INIT;
|
||||||
|
+//# pragma GCC diagnostic pop
|
||||||
|
+#else
|
||||||
|
+ static GStaticMutex re_cache_mutex = G_STATIC_MUTEX_INIT;
|
||||||
|
+#endif
|
||||||
|
static GHashTable *regex_cache = NULL, *regex_cache_newline = NULL;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Index: common-src/amflock.c
|
||||||
|
===================================================================
|
||||||
|
--- common-src/amflock.c (revision 4697)
|
||||||
|
+++ common-src/amflock.c (revision 4698)
|
||||||
|
@@ -36,7 +36,14 @@
|
||||||
|
* New Implementation
|
||||||
|
*/
|
||||||
|
|
||||||
|
-static GStaticMutex lock_lock = G_STATIC_MUTEX_INIT;
|
||||||
|
+#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 31))
|
||||||
|
+//# pragma GCC diagnostic push
|
||||||
|
+//# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||||
|
+ static GStaticMutex lock_lock = G_STATIC_MUTEX_INIT;
|
||||||
|
+//# pragma GCC diagnostic pop
|
||||||
|
+#else
|
||||||
|
+ static GStaticMutex lock_lock = G_STATIC_MUTEX_INIT;
|
||||||
|
+#endif
|
||||||
|
static GHashTable *locally_locked_files = NULL;
|
||||||
|
static int lock_rw_rd(file_lock *lock, short l_type);
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue