diff options
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | 0000-fedora-patch-tirpc.patch | 100 | ||||
| -rw-r--r-- | PKGBUILD | 17 |
3 files changed, 120 insertions, 4 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Tue Feb 6 09:26:29 UTC 2018 +# Tue Dec 4 18:35:30 UTC 2018 pkgbase = amanda pkgdesc = Advanced Maryland Automatic Network Disk Archiver network backup for Linux Windows clients, supports SSH, AES, GPG, encryption, tape, RAIT, mirror, changers, Amazon S3, ipv6, DVD, NDMP, VTL, advanced scripting pkgver = 3.5.1 - pkgrel = 1 + pkgrel = 2 url = http://www.amanda.org install = amanda.install arch = i686 @@ -37,6 +37,7 @@ pkgbase = amanda depends = perl-xml-parser depends = perl-xml-sax depends = perl-xml-simple + depends = libtirpc optdepends = sudo: run commands as amanda user optdepends = gnuplot: amplot pictures optdepends = dump: creating backups in dump format @@ -62,10 +63,12 @@ pkgbase = amanda source = https://prdownloads.sourceforge.net/amanda/amanda-3.5.1.tar.gz source = xinetd.amanda.udp source = xinetd.amanda.tcp + source = 0000-fedora-patch-tirpc.patch source = tapetypes.txt sha256sums = 88ce1ac62f8c30b8d607786a3ca335444a4249ae976baf083956e943b3b409f1 sha256sums = 3db294c9d7c610e9c0d531dcc2725dbddf1213fad64f04bc7cf9b1b9c30e9803 sha256sums = 46446a8dc4ee8ec39ed0a3e2636fb02a198565e8111abe8392c456da56a007ce + sha256sums = ae51f305b49bd7c94e854c2784ee4b58dabf74bc43bfe9a738d3d03322938861 sha256sums = c368e7f9d6d1df703619476e0fcf06e841a7ec86a5a7b86dc499821fbb0a137e pkgname = amanda diff --git a/0000-fedora-patch-tirpc.patch b/0000-fedora-patch-tirpc.patch new file mode 100644 index 000000000000..11d348076584 --- /dev/null +++ b/0000-fedora-patch-tirpc.patch @@ -0,0 +1,100 @@ +diff --git a/config/amanda/amanda_configure.m4 b/config/amanda/amanda_configure.m4 +index 5b427ae..f90810f 100644 +--- a/config/amanda/amanda_configure.m4 ++++ b/config/amanda/amanda_configure.m4 +@@ -18,7 +18,6 @@ AC_PREREQ(2.64) + # Take care of some early Amanda-specific setup + # + AMANDA_CONFIGURE_ARGS +-AMANDA_INIT_SUMMARY + AMANDA_SNAPSHOT_STAMP + AMANDA_SPLIT_VERSION + AMANDA_CONFIG_LOCAL +diff --git a/config/amanda/components.m4 b/config/amanda/components.m4 +index f2a07db..7628453 100644 +--- a/config/amanda/components.m4 ++++ b/config/amanda/components.m4 +@@ -186,7 +186,21 @@ AC_DEFUN([AMANDA_WITHOUT_NDMP], [ + n | no) WANT_NDMP=false;; + *) AC_MSG_ERROR([You must not supply an argument to --with-ndmp option.]) ;; + esac +- ]) ++ ]) ++ AC_CHECK_HEADERS(rpc/rpc.h, HAVE_RPC_RPC_H=1) ++ if test x"$WANT_NDMP" = x"true"; then ++ if test x"$HAVE_RPC_RPC_H" = x"1"; then ++ WANT_NDMP=true ++ else ++ AMANDA_CHECK_TIRPC ++ if test x"$HAVE_RPC_RPC_H" = x"1"; then ++ WANT_NDMP=true ++ else ++ WANT_NDMP=false ++ AMANDA_MSG_WARN([Disabling NDMP because rpc/rpc.h is not found]) ++ fi ++ fi ++ fi + ]) + + # SYNOPSIS +diff --git a/config/amanda/libs.m4 b/config/amanda/libs.m4 +index 0388c9b..a640557 100644 +--- a/config/amanda/libs.m4 ++++ b/config/amanda/libs.m4 +@@ -183,6 +183,44 @@ AC_DEFUN([AMANDA_CHECK_GLIB], [ + AMANDA_ADD_LIBS($GLIB_LIBS) + ]) + ++# SYNOPSIS ++# ++# AMANDA_CHECK_TIRPC ++# ++# OVERVIEW ++# ++# Search for tirpc. ++# ++AC_DEFUN([AMANDA_CHECK_TIRPC], ++[ ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, [], $LOCSYSPATH:/opt/csw/bin:/usr/local/bin:/opt/local/bin) ++ ++ tirpc_ld_flags=`$PKG_CONFIG libtirpc --libs-only-L 2>/dev/null` ++ tirpc_lib_flags=`$PKG_CONFIG libtirpc --libs-only-l --libs-only-other 2>/dev/null` ++ tirpc_cppflags=`$PKG_CONFIG libtirpc --cflags-only-I 2>/dev/null` ++ tirpc_cflags=`$PKG_CONFIG libtirpc --cflags-only-other 2>/dev/null` ++ ++ _libtirpc_save_cppflags=$CPPFLAGS ++ CPPFLAGS="$CPPFLAGS $tirpc_cppflags" ++ _libtirpc_save_libs=$LIBS ++ LIBS="$LIBS $tirpc_lib_flags" ++ ++ unset HAVE_RPC_RPC_H ++ unset ac_cv_header_rpc_rpc_h ++ AC_CHECK_HEADERS(rpc/rpc.h, HAVE_RPC_RPC_H=1) ++ ++ CPPFLAGS=$_libtirpc_save_cppflags ++ LIBS=$_libtirpc_save_libs ++ ++ if test x"$HAVE_RPC_RPC_H" = x"1"; then ++ AMANDA_ADD_LDFLAGS($tirpc_ld_flags) ++ AMANDA_ADD_LIBS($tirpc_lib_flags) ++ ++ AMANDA_ADD_CPPFLAGS($tirpc_cppflags) ++ AMANDA_ADD_CFLAGS($tirpc_cflags) ++ fi ++]) ++ + # LIBCURL_CHECK_CONFIG is from the libcurl + # distribution and licensed under the BSD license: + # Copyright (c) 1996 - 2007, Daniel Stenberg, <daniel@haxx.se>. +diff --git a/configure.ac b/configure.ac +index 89c4890..8d325b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,6 +13,7 @@ AMANDA_VERSION + gl_EARLY + gl_INIT + ++AMANDA_INIT_SUMMARY + AMANDA_CONFIGURE + + AC_DEFINE([USE_GETTEXT], 1, [Define to 1 if files will be processed with gettextize]) @@ -66,7 +66,7 @@ set -u pkgname='amanda' #pkgver='3.3.9' pkgver='3.5.1' -pkgrel='1' +pkgrel='2' pkgdesc='Advanced Maryland Automatic Network Disk Archiver network backup for Linux Windows clients, supports SSH, AES, GPG, encryption, tape, RAIT, mirror, changers, Amazon S3, ipv6, DVD, NDMP, VTL, advanced scripting' arch=('i686' 'x86_64') url='http://www.amanda.org' @@ -113,6 +113,7 @@ depends+=( # From manual install #'perl-extutils-embed' # developers only ) +depends+=('libtirpc') # 0000-fedora-patch-tirpc.patch optdepends=( 'sudo: run commands as amanda user' 'gnuplot: amplot pictures' @@ -147,10 +148,19 @@ install="${pkgname}.install" _tapetypes=('tapetypes.txt') _verwatch=('http://www.amanda.org/download.php' '\([0-9\.]\+\)' 't') _srcdir="${pkgname}-${pkgver}" -source=("https://prdownloads.sourceforge.net/amanda/amanda-${pkgver}.tar.gz" "xinetd.${pkgname}".{udp,tcp} "${_tapetypes[@]}") +source=( + "https://prdownloads.sourceforge.net/amanda/amanda-${pkgver}.tar.gz" + "xinetd.${pkgname}".{udp,tcp} + '0000-fedora-patch-tirpc.patch' # https://src.fedoraproject.org/rpms/amanda/tree/master + "${_tapetypes[@]}" + # https://bugs.gentoo.org/663182 + # https://bugs.gentoo.org/656340 + # https://fedoraproject.org/wiki/Changes/SunRPCRemoval +) sha256sums=('88ce1ac62f8c30b8d607786a3ca335444a4249ae976baf083956e943b3b409f1' '3db294c9d7c610e9c0d531dcc2725dbddf1213fad64f04bc7cf9b1b9c30e9803' '46446a8dc4ee8ec39ed0a3e2636fb02a198565e8111abe8392c456da56a007ce' + 'ae51f305b49bd7c94e854c2784ee4b58dabf74bc43bfe9a738d3d03322938861' 'c368e7f9d6d1df703619476e0fcf06e841a7ec86a5a7b86dc499821fbb0a137e') if [ ! -z "${_opt_bsd}" ]; then @@ -201,6 +211,8 @@ prepare() { false fi + patch -Nup1 -i "${srcdir}/0000-fedora-patch-tirpc.patch" + # rm -r 'packaging' # cleaner path listings, crashes make # grep -shroe '/[a-z][a-z/]*/' | grep -e 'etc\|usr\|var' | sort -u @@ -259,6 +271,7 @@ build() { _install_check if [ ! -s 'Makefile' ]; then + autoreconf # 0000-fedora-patch-tirpc.patch local _opts=() if [ ! -z "${_opt_bsd}" ]; then _opts+=("--with-bsd${_opt_bsd}-security") |