From nobody Sun Dec 05 10:47:27 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 91763183FC08; Sun, 5 Dec 2021 10:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J6NYW2BHWz4n5Z; Sun, 5 Dec 2021 10:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2B46A16B88; Sun, 5 Dec 2021 10:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B5AlRHf090702; Sun, 5 Dec 2021 10:47:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B5AlRk2090701; Sun, 5 Dec 2021 10:47:27 GMT (envelope-from git) Date: Sun, 5 Dec 2021 10:47:27 GMT Message-Id: <202112051047.1B5AlRk2090701@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 75808722b7b6 - main - cleanup: Remove expired ports: List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75808722b7b6454cf15915ee185ff0b59c1e1b0c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638701247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=etn/lHpy0xRuZYyJhgtwufM11htbnk8zdlfiUuweXeM=; b=F59I122+TJVhlmstmj+PDBzA3pzcGNtRFoAAITiNfxhw/gpApTGy8ryo2AGl6swH5zgmdB 7Bmlaf4/BeBBwZUm/QPRACO1aPAuz6ntpDBc0swAIDiZAOh1oKjcuRF1sfHHB5bjdbuyKb TUlUql723Av7dyj8hjYiRXaZux0u8D1w1Haqz/EGitG7VLHidiv/9pHwk78dV9htAEWndX OZOdrHGKCdN9Eek/87Dz1dFaw/39Zr1RjquVekW59I3AJhXRBXSKJ6RckksyjHmnVFRHSF Os4UkoiT8HgYnJlEbh3PmjFx6BomQSAi9LxmJC4TzHeAESN134imKjjAIKWc4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638701247; a=rsa-sha256; cv=none; b=UYSwc+7w/js8yd0F6CWbBYI5vaQYfrIAz2TgW6lsCzqmH4qxOWeP2l8zXaDAOpIVuL73GD zGIGjGE19jPCeNszdv8vR7duaiufS897IuWPko9Xt6uM3H24IfPCS25mZw31XPTLOctZGw +Q+MwE31rOVHZiGq0JveHutxWMrkOv0/vRbu/0IyTQ3xcNjXxToKIjJQMx6bs4BnfGTPdd 3iKP1FGNBwkkVD8nH6AkVgpVd32VqAJvQLF2VvqOF5ysUsDppuNvoMcTerNSkWTJqhRZM4 qgzCtZXUEJLDUd8LN8HgRHgtW+87IvgcEhJ8RBnPOD9y8X0KPTJOo+MMBjO3Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=75808722b7b6454cf15915ee185ff0b59c1e1b0c commit 75808722b7b6454cf15915ee185ff0b59c1e1b0c Author: Rene Ladan AuthorDate: 2021-12-05 10:47:12 +0000 Commit: Rene Ladan CommitDate: 2021-12-05 10:47:12 +0000 cleanup: Remove expired ports: 2021-12-05 sysutils/bareos17-client: Deprecated, no new release since 2020 2021-12-05 sysutils/bareos17-client-static: Deprecated, no new release since 2020 2021-12-05 sysutils/bareos17-server: Deprecated, no new release since 2020 2021-12-05 www/bareos17-webui: Deprecated, no new release since 2020 --- MOVED | 4 + sysutils/Makefile | 3 - sysutils/bareos17-client-static/Makefile | 28 - sysutils/bareos17-client/Makefile | 26 - sysutils/bareos17-server/Makefile | 254 --- sysutils/bareos17-server/Makefile.common | 38 - sysutils/bareos17-server/distinfo | 3 - sysutils/bareos17-server/files/bareos-barcodes | 51 - sysutils/bareos17-server/files/bareos-dir.in | 55 - sysutils/bareos17-server/files/bareos-fd.in | 46 - sysutils/bareos17-server/files/bareos-sd.in | 37 - sysutils/bareos17-server/files/chio-bareos | 190 -- .../files/patch-autoconf_Make.common.in | 13 - sysutils/bareos17-server/files/patch-configure | 41 - .../files/patch-src-console-Makefile.in | 35 - .../files/patch-src-dird-Makefile.in | 100 - .../files/patch-src-filed-Makefile.in | 69 - .../files/patch-src-lib_bsnprintf.c | 20 - .../files/patch-src-plugins-dird_python-dir.c | 61 - .../files/patch-src-plugins-filed_Makefile.in | 29 - .../files/patch-src-plugins-filed_python-fd.c | 111 -- .../files/patch-src-plugins-stored-Makefile.in | 11 - .../files/patch-src-plugins-stored_python-sd.c | 61 - .../files/patch-src-stored-Makefile.in | 112 -- .../files/patch-src-tests_cats_test.c | 62 - .../files/patch-src-tools_Makefile.in | 11 - .../bareos17-server/files/pkg-deinstall.client.in | 30 - .../bareos17-server/files/pkg-install.client.in | 13 - .../bareos17-server/files/pkg-message.client.in | 17 - .../bareos17-server/files/pkg-message.server.in | 74 - sysutils/bareos17-server/pkg-descr | 6 - sysutils/bareos17-server/pkg-plist | 165 -- sysutils/bareos17-server/pkg-plist.client | 57 - www/Makefile | 1 - www/bareos17-webui/Makefile | 63 - www/bareos17-webui/distinfo | 3 - www/bareos17-webui/files/pkg-message.in | 15 - www/bareos17-webui/pkg-descr | 10 - www/bareos17-webui/pkg-plist | 1952 -------------------- 39 files changed, 4 insertions(+), 3873 deletions(-) diff --git a/MOVED b/MOVED index 71dd85fe1b89..7f0ceb5c6cb5 100644 --- a/MOVED +++ b/MOVED @@ -16607,3 +16607,7 @@ games/linux-unigine-valley|benchmarks/linux-unigine-valley|2021-11-21|Moved to a devel/electron12|devel/electron13|2021-11-24|VSCode update requires a newer major version mail/gmime24-sharp||2021-11-30|Has expired: Use mail/gmime26 or mail/gmime30 mail/gmime24||2021-11-30|Has expired: Use mail/gmime26 or mail/gmime30 +sysutils/bareos17-client|sysutils/bareos18-client|2021-12-05|Has expired: Deprecated, no new release since 2020 +sysutils/bareos17-client-static||2021-12-05|Has expired: Deprecated, no new release since 2020 +sysutils/bareos17-server|sysutils/bareos18-server|2021-12-05|Has expired: Deprecated, no new release since 2020 +www/bareos17-webui|www/bareos18-webui|2021-12-05|Has expired: Deprecated, no new release since 2020 diff --git a/sysutils/Makefile b/sysutils/Makefile index 060404e44d19..d62c888c9167 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -95,9 +95,6 @@ SUBDIR += bareos-client SUBDIR += bareos-server SUBDIR += bareos-traymonitor - SUBDIR += bareos17-client - SUBDIR += bareos17-client-static - SUBDIR += bareos17-server SUBDIR += bareos18-client SUBDIR += bareos18-server SUBDIR += bareos18-traymonitor diff --git a/sysutils/bareos17-client-static/Makefile b/sysutils/bareos17-client-static/Makefile deleted file mode 100644 index 9db2f693a3af..000000000000 --- a/sysutils/bareos17-client-static/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -PORTNAME= bareos -PKGNAMESUFFIX= 17-client-static - -COMMENT= Backup archiving recovery open sourced (static client) - -BROKEN_aarch64= Fails to link: missing sbrk -BROKEN_riscv64= Fails to link: missing sbrk - -CONFLICTS= bareos16-client-static - -PLIST= ${.CURDIR}/pkg-plist -MASTERDIR= ${.CURDIR}/../../sysutils/bareos17-server - -PLIST_FILES= sbin/bareos-fd-static \ - sbin/bconsole-static - -OPTIONS_DEFINE= NLS LMDB -LMDB_DESC= Enable build of LMDB support - -CONFIGURE_ARGS+= --enable-client-only \ - --enable-static-fd \ - --enable-static-cons \ - --disable-libtool \ - --disable-build-dird \ - --disable-build-stored \ - --with-jansson=${LOCALBASE} - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/bareos17-client/Makefile b/sysutils/bareos17-client/Makefile deleted file mode 100644 index dd2433f9c6d9..000000000000 --- a/sysutils/bareos17-client/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -PORTNAME= bareos -PKGNAMESUFFIX= 17-client - -COMMENT= Backup archiving recovery open sourced (client) - -BROKEN_aarch64= Fails to link: missing sbrk -BROKEN_riscv64= Fails to link: missing sbrk - -CONFLICTS= bareos16-client bareos-client - -WITH_CLIENT_ONLY=yes -USE_RC_SUBR= bareos-fd - -PLIST= ${PKGDIR}/pkg-plist.client -MASTERDIR= ${.CURDIR}/../../sysutils/bareos17-server - -OPTIONS_GROUP= PLUGINS -OPTIONS_GROUP_PLUGINS= CEPHFS GFAPI RADOS -OPTIONS_DEFINE= NLS PYTHON LMDB SCSICRYPTO - -CEPHFS_DESC= CEPHFS fd plugin support -GFAPI_DESC= GFAPI fd plugin support -RADOS_DESC= RADOS fd plugin support -LMDB_DESC= Enable build of LMDB support - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/bareos17-server/Makefile b/sysutils/bareos17-server/Makefile deleted file mode 100644 index c797776e282f..000000000000 --- a/sysutils/bareos17-server/Makefile +++ /dev/null @@ -1,254 +0,0 @@ -PORTNAME= bareos -DISTVERSIONPREFIX= Release/ -DISTVERSION= 17.2.10 -PORTREVISION?= 0 -CATEGORIES?= sysutils -PKGNAMEPREFIX?= # -PKGNAMESUFFIX?= 17-server - -MAINTAINER= acm@FreeBSD.org -COMMENT?= Backup archiving recovery open sourced (server) - -LICENSE= AGPLv3 LGPL3 -LICENSE_COMB= multi - -DEPRECATED= Deprecated, no new release since 2020 -EXPIRATION_DATE=2021-12-05 - -CONFLICTS?= bacula*-server bareos16-server - -LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ - libjansson.so:devel/jansson - -USES+= cpe libtool:keepla pkgconfig readline shebangfix -USE_GITHUB= yes - -USERS= bareos -GROUPS= ${USERS} - -PLIST_SUB+= LIB_VERSION=${PORTVERSION} - -GNU_CONFIGURE= yes -USE_LDCONFIG= yes -SHEBANG_LANG= perl -SHEBANG_FILES= ${WRKSRC}/src/cats/make_catalog_backup.pl.in - -CPPFLAGS+= -I${LOCALBASE}/readline -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -OPTIONS_DEFAULT= OPENSSL -OPTIONS_SINGLE= CRYPTO -OPTIONS_SINGLE_CRYPTO= OPENSSL GNUTLS -OPTIONS_SUB= yes -CRYPTO_DESC= Cryptographic library -MTX_DESC= Install mtx for control of autochanger devices -NDMP_DESC= Enable build of NDMP support -SCSICRYPTO_DESC= Build LTO AME crypto plugin - -.if ${PKGNAMESUFFIX} == "17-server" -OPTIONS_GROUP= BACKENDS -OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS -OPTIONS_DEFINE= MTX NDMP NLS PYTHON SCSICRYPTO -OPTIONS_DEFAULT+= PGSQL SCSICRYPTO -OPTIONS_SINGLE_DATABASE= MYSQL PGSQL SQLITE3 -OPTIONS_SINGLE+= DATABASE -DATABASE_DESC= Database support -CEPHFS_DESC= CEPHFS backend support -GFAPI_DESC= GFAPI backend support -RADOS_DESC= RADOS backend support - -NDMP_CONFIGURE_ON= --enable-ndmp=yes -NDMP_CONFIGURE_OFF= --enable-ndmp=no -.endif - -GNUTLS_CONFIGURE_WITH= gnutls=${LOCALBASE} -GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls - -OPENSSL_USES= ssl -OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} -OPENSSL_CONFIGURE_OFF= --with-openssl="no" - -SCSICRYPTO_CONFIGURE_ON= --enable-scsi-crypto=yes -SCSICRYPTO_CONFIGURE_OFF= --enable-scsi-crypto=no - -.if ${PKGNAMESUFFIX} == "17-client" || ${PKGNAMESUFFIX} == "17-server" #Till end of the file -PYTHON_USES= python -PYTHON_CONFIGURE_ON= --with-python=yes -PYTHON_CONFIGURE_OFF= --with-python=no -PYTHON_PLUGIN= yes - -.if !defined(WITH_CLIENT_ONLY) -LIB_DEPENDS+= libbareos.so:sysutils/bareos17-client -USE_RC_SUBR?= bareos-dir bareos-sd -.endif - -.if defined(WITH_CLIENT_ONLY) -SUB_FILES+= pkg-install.client pkg-deinstall.client pkg-message.client -.else -SUB_FILES+= pkg-message.server -.endif - -CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \ - --enable-libtool \ - --enable-smartalloc \ - --sysconfdir=${PREFIX}/etc \ - --with-working-dir=${BAREOS_DIR} \ - --with-scriptdir=${PREFIX}/share/${PORTNAME} \ - --with-logdir=/var/log/bareos \ - --with-readline=${LOCALBASE} \ - --disable-conio \ - --enable-batch-insert \ - --with-plugindir=${PREFIX}/lib/bareos/plugins \ - --with-scriptdir=${PREFIX}/lib/bareos/scripts \ - --with-dump-email=root@localhost \ - --with-job-email=root@localhost \ - --with-db-name=bareos \ - --with-sbin-perm=755 \ - --with-db-user=bareos \ - --with-baseport=9101 \ - --with-pid-dir=/var/run/bareos \ - --with-jansson=${LOCALBASE} - -.if defined(WITH_CLIENT_ONLY) -LMDB_CONFIGURE_ON= --enable-lmdb=yes -LMDB_CONFIGURE_OFF= --enable-lmdb=no -LMDB_CFLAGS= -DMDB_DSYNC=O_SYNC \ - -DMDB_USE_POSIX_MUTEX=1 - -CONFIGURE_ARGS+=--with-fd-user=root \ - --with-fd-group=wheel -.else -CONFIGURE_ARGS+=--with-dir-user=${BAREOS_USER} \ - --with-dir-group=${BAREOS_GROUP} \ - --with-sd-user=${BAREOS_USER} \ - --with-sd-group=operator -.endif - -# The user/group IDs below are registered, see -# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID -# -BAREOS_USER?= bareos -BAREOS_GROUP?= ${BAREOS_USER} -BAREOS_UID?= 997 -BAREOS_GID?= ${BAREOS_UID} -BAREOS_DIR?= /var/db/bareos - -PLIST_SUB+= BAREOS_DIR=${BAREOS_DIR} - -SUB_LIST= BAREOS_USER=${BAREOS_USER} \ - BAREOS_GROUP=${BAREOS_GROUP} \ - BAREOS_UID=${BAREOS_UID} \ - BAREOS_GID=${BAREOS_GID} \ - BAREOS_DIR=${BAREOS_DIR} - -NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls -CEPHFS_CONFIGURE_ON= --with-cephfs=yes -CEPHFS_CONFIGURE_OFF= --with-cephfs=no -CEPHFS_LIB_DEPENDS= libcephfs.so:net/ceph14 -GFAPI_CONFIGURE_ON= --with-glusterfs=${LOCALBASE} -GFAPI_CONFIGURE_OFF= --with-glusterfs=no -GFAPI_LIB_DEPENDS= libglusterfs.so:net/glusterfs -RADOS_CONFIGURE_ON= --with-rados=yes \ - --with-cephfs=yes -RADOS_CONFIGURE_OFF= --with-rados=no \ - --with-cephfs=no -RADOS_LIB_DEPENDS= librados.so:net/ceph14 - -# Client only or full server version -.if defined(WITH_CLIENT_ONLY) -CONFFILES= fd -CONFIGURE_ARGS+= --enable-client-only - -PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.client -PKGINSTALL= ${FILESDIR}/pkg-install.client -.else -# Server only Options -CONFFILES= sd dir -# Server default database - -MYSQL_CONFIGURE_ON= --with-mysql=yes -MYSQL_USES= mysql -SQLITE3_CONFIGURE_ON= --with-sqlite3=yes -SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 -PGSQL_CONFIGURE_ON= --with-postgresql=yes -PGSQL_USES= pgsql - -MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx - -.include - -.if ${PORT_OPTIONS:MMYSQL} -DBTYPE= mysql -SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" -.elif ${PORT_OPTIONS:MSQLITE3} -DBTYPE= sqlite3 -.else -DBTYPE= postgresql -SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql -.endif -PLIST_SUB+= DBTYPE=${DBTYPE} - -.endif - -.if defined(WITH_CLIENT_ONLY) -MP1+= bconsole.1 -MP8+= bareos-fd.8 -.else -MP8+= bareos.8 bareos-dir.8 bareos-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \ - btape.8 btraceback.8 bareos-dbcheck.8 -MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1 -.endif - -MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" - -post-patch: -# This port does not install docs. See bareos-docs for that - ${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in -# Default bconsole.conf is in ${ETCDIR} - @${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in - @${REINPLACE_CMD} -e 's|_NONSHARED||g' ${WRKSRC}/src/filed/Makefile.in - @${REINPLACE_CMD} -e 's|/usr/bin/python-config|${PYTHON_CMD}-config|g' ${WRKSRC}/configure -.if defined(WITH_CLIENT_ONLY) - @${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in -.else -# In server port don't install filed - @${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \ - -e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|\.\./lib/|$$(LOCALBASE)/lib/|g' -e 's|\.\./findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \ - ${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in ${WRKSRC}/src/tests/Makefile.in - @${REINPLACE_CMD} -e 's|\.\./\.\./lib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/plugins/dird/Makefile.in ${WRKSRC}/src/plugins/stored/Makefile.in - @${REINPLACE_CMD} -e 's|fd_plugins.h|filed/fd_plugins.h|g' -e 's|dir_plugins.h|dird/dir_plugins.h|g' -e 's|stored.h|stored/stored.h|g' \ - ${WRKSRC}/src/tools/bpluginfo.c - @${REINPLACE_CMD} -e 's|perl|$(LOCALBASE)/bin/perl|g' ${WRKSRC}/scripts/mtx-changer.in -.endif - -post-extract: -.if defined(WITH_CLIENT_ONLY) -. if defined(PYTHON_PLUGIN) - @${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/fileset - @${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/job -. endif -.endif - @${MV} ${WRKSRC}/src/defaultconfigs/bareos-dir.d/fileset/'Windows All Drives.conf' \ - ${WRKSRC}/src/defaultconfigs/bareos-dir.d/fileset/'WindowsAllDrives.conf' - -.if !target(post-install) -post-install: -.if defined(WITH_CLIENT_ONLY) - ${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/ - ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample -.else - ${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample - ${CHMOD} o+x ${STAGEDIR}${PREFIX}/bin/bsmtp - ${MV} ${STAGEDIR}${ETCDIR}/mtx-changer.conf ${STAGEDIR}${ETCDIR}/mtx-changer.conf.sample - ${MV} ${STAGEDIR}${ETCDIR}/bareos-regress.conf ${STAGEDIR}${ETCDIR}//bareos-regress.conf.sample -.endif - @${MKDIR} ${STAGEDIR}/var/run/bareos -.endif -.else -.include "${MASTERDIR}/Makefile.common" -.endif # 17-client and 17-server are defined -.include diff --git a/sysutils/bareos17-server/Makefile.common b/sysutils/bareos17-server/Makefile.common deleted file mode 100644 index 0cb0e9014b59..000000000000 --- a/sysutils/bareos17-server/Makefile.common +++ /dev/null @@ -1,38 +0,0 @@ -# Created by: Alonso Cardenas - -post-patch: - @${REINPLACE_CMD} -e 's|_NONSHARED||g' ${WRKSRC}/src/filed/Makefile.in - @${REINPLACE_CMD} -e 's|-lbareoscfg|@JANSSON_LIBS@ @LIBINTL@ -lbareoscfg|g' ${WRKSRC}/src/qt-tray-monitor/tray-monitor.pro.in - -post-build: -.if ${PKGNAMEPREFIX} == "nagios-check_" - ${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bareos -.endif - -pre-install: -.if ${PKGNAMESUFFIX} == "17-traymonitor" -. for d in client director monitor storage - ${MKDIR} ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d} - ${FIND} ${WRKSRC}/src/defaultconfigs/tray-monitor.d/${d} -type f -name '*.conf' -exec ${MV} -v {} {}.sample \; -. endfor -.endif - -do-install: -.if ${PKGNAMEPREFIX} == "nagios-check_" - @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios - ${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bareos/check_bareos \ - ${STAGEDIR}${PREFIX}/libexec/nagios -.endif -.if ${PKGNAMESUFFIX} == "17-client-static" - ${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bareos-fd ${STAGEDIR}${PREFIX}/sbin/bareos-fd-static - ${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static -.endif -.if ${PKGNAMESUFFIX} == "17-traymonitor" -# Install config files and preserve existing ones -.for d in client director monitor storage - ${INSTALL_SCRIPT} ${WRKSRC}/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/ -.endfor - ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-tray-monitor/bareos-tray-monitor ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/src/qt-tray-monitor/bareos-tray-monitor.xpm ${STAGEDIR}${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKSRC}/src/qt-tray-monitor/bareos-tray-monitor.desktop ${STAGEDIR}${DESKTOPDIR} -.endif diff --git a/sysutils/bareos17-server/distinfo b/sysutils/bareos17-server/distinfo deleted file mode 100644 index d6f6c0423ab7..000000000000 --- a/sysutils/bareos17-server/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1624924837 -SHA256 (bareos-bareos-Release-17.2.10_GH0.tar.gz) = f6e2526b180e2ef17bcd72f7e27517dbdd0053675b8aef7147e9b24c0b0d7d10 -SIZE (bareos-bareos-Release-17.2.10_GH0.tar.gz) = 4190783 diff --git a/sysutils/bareos17-server/files/bareos-barcodes b/sysutils/bareos17-server/files/bareos-barcodes deleted file mode 100644 index f42cb7f7aeea..000000000000 --- a/sysutils/bareos17-server/files/bareos-barcodes +++ /dev/null @@ -1,51 +0,0 @@ -# -# Bacula barcode simulation file -# used by ${PREFIX}/sbin/chio-bareos (FreeBSD) -# -# The volumenames are returned by the "changer list" command -# labeling in the console is done by "label barcodes" -# (then all volumes belog to the default pool). -# All Lines with an "#" at the bedinning are ignored -# -# !!!! If you export an tape and reinsert another one, -# !!!! don't forget to change the volume name in this file! -# -1:Volume1-100 -2:Volume1-101 -3:Volume1-102 -4:Volume1-103 -5:Volume1-104 -6:Volume1-105 -7:Volume1-106 -8:Volume1-107 -9:Volume1-108 -10:Volume1-109 -11:Volume1-110 -12:Volume1-111 -# -# Further volumes exported from the changer -# -# 36GB AIT2 tapes -#Volume1-100 -#Volume1-101 -#Volume1-102 -#Volume1-103 -#Volume1-104 -#Volume1-105 -#Volume1-106 -#Volume1-107 -#Volume1-108 -#Volume1-109 -#Volume1-110 -#Volume1-111 -#Volume1-112 -#Volume1-113 -#Volume1-114 -#Volume1-115 -# -# 50GB AIT2 tapes -#Volume2-200 -#Volume2-201 -#Volume2-202 -#Volume2-203 -#Volume2-204 diff --git a/sysutils/bareos17-server/files/bareos-dir.in b/sysutils/bareos17-server/files/bareos-dir.in deleted file mode 100644 index 86b62370cbb7..000000000000 --- a/sysutils/bareos17-server/files/bareos-dir.in +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh - -# PROVIDE: bareos_dir -# REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%% -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# bareos_dir_enable (bool): Set to NO by default. -# Set it to YES to enable bareos_dir. -# bareos_dir_flags (params): Set params used to start bareos_dir. -# bareos_dir_config (params): Path to the config file/directory -# - -. /etc/rc.subr - -name="bareos_dir" -rcvar=${name}_enable - -load_rc_config $name - -: ${bareos_dir_enable="NO"} -: ${bareos_dir_flags="-u bareos -g bareos -v"} -: ${bareos_dir_config="%%PREFIX%%/etc/bareos/"} -: ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"} - -command=%%PREFIX%%/sbin/bareos-dir -command_args="-c ${bareos_dir_config}" -pidfile="${bareos_dir_pidfile}" -bconsole_command=/usr/local/bin/bconsole -start_precmd="bareos_start_precmd" -restart_precmd="bareos_dir_configtest" -reload_precmd="bareos_dir_configtest" -reload_cmd="bareos_dir_reload" -configtest_cmd="bareos_dir_configtest" - -bareos_start_precmd() { - [ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*} - bareos_dir_configtest -} - -bareos_dir_configtest() { - echo "Performing sanity check on ${bareos_dir_config} configuration:" - eval ${command} -t -} - -bareos_dir_reload() { - echo "Performing a graceful reload" - # bconsole always exits with 0, so we can't check the return status for success. - echo "reload" | ${bconsole_command} -} - -extra_commands="reload configtest" -run_rc_command "$1" diff --git a/sysutils/bareos17-server/files/bareos-fd.in b/sysutils/bareos17-server/files/bareos-fd.in deleted file mode 100644 index 54647786b12c..000000000000 --- a/sysutils/bareos17-server/files/bareos-fd.in +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -# PROVIDE: bareos_fd -# REQUIRE: DAEMON -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# bareos_fd_enable (bool): Set to NO by default. -# Set it to YES to enable bareos_fd. -# bareos_fd_flags (params): Set params used to start bareos_fd. -# bareos_fd_config (params): Path to the config file/directory -# - -. /etc/rc.subr - -name="bareos_fd" -rcvar=${name}_enable - -load_rc_config $name - -: ${bareos_fd_enable="NO"} -: ${bareos_fd_flags="-u root -g wheel -v"} -: ${bareos_fd_config="%%PREFIX%%/etc/bareos/"} -: ${bareos_fd_pidfile="/var/run/bareos/bareos-fd.9102.pid"} - -command=%%PREFIX%%/sbin/bareos-fd -command_args="-c ${bareos_fd_config}" -pidfile="${bareos_fd_pidfile}" -start_precmd="bareos_start_precmd" - -bareos_start_precmd() { - [ -d "${pidfile%/*}" ] || { - getent passwd bareos > /dev/null 2&>1 - if [ $? -eq 0] ; then - # user bareos exists - install -d -o bareos -g bareos ${pidfile%/*} - else - # bareos_fd as solitair service - install -d -o root -g wheel ${pidfile%/*} - fi - } -} - -run_rc_command "$1" diff --git a/sysutils/bareos17-server/files/bareos-sd.in b/sysutils/bareos17-server/files/bareos-sd.in deleted file mode 100644 index a5efe78e80f7..000000000000 --- a/sysutils/bareos17-server/files/bareos-sd.in +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -# PROVIDE: bareos_sd -# REQUIRE: DAEMON -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf.local or /etc/rc.conf -# to enable this service: -# -# bareos_sd_enable (bool): Set to NO by default. -# Set it to YES to enable bareos_sd. -# bareos_sd_flags (params): Set params used to start bareos_sd. -# bareos_sd_config (params): Path to the config file/directory -# - -. /etc/rc.subr - -name="bareos_sd" -rcvar=${name}_enable - -load_rc_config $name - -: ${bareos_sd_enable="NO"} -: ${bareos_sd_flags="-u bareos -g bareos -v"} -: ${bareos_sd_config="%%PREFIX%%/etc/bareos/"} -: ${bareos_sd_pidfile="/var/run/bareos/bareos-sd.9103.pid"} - -command=%%PREFIX%%/sbin/bareos-sd -command_args="-c ${bareos_sd_config}" -pidfile="${bareos_sd_pidfile}" -start_precmd="bareos_start_precmd" - -bareos_start_precmd() { - [ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*} -} - -run_rc_command "$1" diff --git a/sysutils/bareos17-server/files/chio-bareos b/sysutils/bareos17-server/files/chio-bareos deleted file mode 100644 index f006ef78e6ce..000000000000 --- a/sysutils/bareos17-server/files/chio-bareos +++ /dev/null @@ -1,190 +0,0 @@ -#!/bin/sh -# -# BAREOS interface to tape libraries and autoloaders for FreeBSD -# (by Rudolf Cejka , v1.2, 2012/11/14) -# -# If you set in your Device resource -# Changer Command = "path-to-this-script/chio-changer %c %o %S %a %d" -# you will have the following input to this script: -# chio-changer "changer-device" "command" "slot" "tape-device" "drive-index" -# $1 $2 $3 $4 $5 -# for example (on a FreeBSD system): -# chio-changer /dev/ch0 load 1 /dev/nsa0 0 -# -# If you change the script, take care to return either the chio exit -# code or a 0. If the script exits with a non-zero exit code, BAREOS -# will assume the request failed. -# - -PROGNAME=`basename $0` - -# Uncomment the following line, if you want to log debug output. -#DEBUG=/var/run/bareos/${PROGNAME}.log - -# Uncomment the following line, if you need to eject a tape before moving -# it from the drive. -#OFFLINE=yes - -# Uncomment one or more of the following lines, if you need to wait for -# some time (in seconds) after unloading, loading or transferring a tape. -#OFFLINE_SLEEP=10 -#LOAD_SLEEP=10 -#MOVE_SLEEP=10 - -# Uncomment the following line, if you do not have a changer with volume -# reader. -#FAKE_BARCODES=/usr/local/etc/bareos-barcodes - -usage() -{ - cat < [slot] [tape-device] [drive-index] - -Commands (): - unload Unload a tape into the slot from where it was loaded - load Load a tape from the slot (1-based) - transfer Transfer a tape from the slot to - the slot (1-based) - list List full storage slots - listall List all storage slots and drives with source information - loaded Give slot from where the tape was loaded (0 = empty drive) - slots Give number of available slots - -Example: - ${PROGNAME} /dev/ch0 load 1 Load a tape from the slot 1 - -EOF - exit 1 -} - -# Default settings -CHANGER=/dev/ch0 -TAPE=/dev/nsa0 -DRIVE=0 - -CHIO=/bin/chio -MT=/usr/bin/mt - -if [ -n "${DEBUG}" ]; then - MSG=$0 - for PAR; do MSG="${MSG} \"${PAR}\""; done - echo `date +"%Y/%m/%d %H:%M:%S"` ${MSG} >> ${DEBUG} -fi - -if [ -n "$1" ]; then - CHANGER=$1; -fi -COMMAND=$2 -SLOT=$3 -SLOTDST=$4 -if [ -n "$4" ]; then - TAPE=$4 -fi -if [ -n "$5" ]; then - DRIVE=$5 -fi - -case ${COMMAND} in -unload) - if [ "${OFFLINE}" = yes ]; then - ${MT} -f ${TAPE} offline - if [ $? = 0 -a -n "${OFFLINE_SLEEP}" ]; then - sleep ${OFFLINE_SLEEP} - fi - fi - if [ -z "${SLOT}" ]; then - ${CHIO} -f ${CHANGER} return drive ${DRIVE} - else - ${CHIO} -f ${CHANGER} move drive ${DRIVE} slot $((${SLOT} - 1)) - fi - if [ $? -ne 0 ]; then - # In case of an error, try to unload the cartridge to the first free slot - FREE=`${CHIO} -f ${CHANGER} status slot | \ - sed -ne '/FULL/d;s/^slot *\([0-9]*\):.*/\1/p' | \ - awk 'BEGIN { n = 0 } { n = $1 + 1; exit } END { print n }'` - if [ ${FREE} -gt 0 ]; then - ${CHIO} -f ${CHANGER} move drive ${DRIVE} slot $((${FREE} - 1)) - else - exit 1 - fi - fi - ;; -load) - if [ -z "${SLOT}" ]; then - usage - fi - ${CHIO} -f ${CHANGER} move slot $((${SLOT} - 1)) drive ${DRIVE} - if [ $? -ne 0 ]; then - exit 1 - fi - if [ -n "${LOAD_SLEEP}" ]; then - sleep ${LOAD_SLEEP} - fi - ;; -transfer) - if [ -z "${SLOT}" -o -z "${SLOTDST}" ]; then - usage - fi - ${CHIO} -f ${CHANGER} move slot $((${SLOT} - 1)) slot $((${SLOTDST} - 1)) - if [ $? -ne 0 ]; then - exit 1 - fi - if [ -n "${MOVE_SLEEP}" ]; then - sleep ${MOVE_SLEEP} - fi - ;; -list) - if [ -z "${FAKE_BARCODES}" ]; then - ${CHIO} -f ${CHANGER} status -v slot | \ - sed -ne 's/^slot *\([0-9]*\):.*FULL.*voltag.*<\([^:]*\):.*/\1:\2/p' | \ - awk -F: '{ print $1 + 1 ":" $2 }' - else - if [ -f "${FAKE_BARCODES}" ]; then - grep -v -e "^#" -e "^$" < ${FAKE_BARCODES} - else - echo "${PROGNAME}: Barcode file ${FAKE_BARCODES} is missing" - exit 1 - fi - fi - ;; -listall) - if [ -z "${FAKE_BARCODES}" ]; then - ${CHIO} -f ${CHANGER} status -vS | \ - sed -ne ' - s/^slot *\([0-9]*\):.*ENAB.*FULL.*voltag.*<\([^:]*\):.*/I:\1:F:\2/p;t - s/^slot *\([0-9]*\):.*FULL.*voltag.*<\([^:]*\):.*/S:\1:F:\2/p;t - s/^drive *\([0-9]*\):.*FULL.*voltag.*<\([^:]*\):.*source.*<[^0-9]*\([0-9]*\)>.*/D:\1:F:\3:\2/p;t - s/^slot *\([0-9]*\):.*ENAB.*voltag.*<\([^:]*\):.*/I:\1:E/p;t - s/^slot *\([0-9]*\):.*voltag.*<\([^:]*\):.*/S:\1:E/p;t - s/^drive *\([0-9]*\):.*voltag.*<\([^:]*\):.*/D:\1:E/p' | \ - awk -F: '{ for (n = 1; n <= NF; n++) printf "%s%s", - (n == ($1 == "D" ? 4 : 2)) ? ($n == "" ? 0 : $n + 1) : $n, - (n == NF) ? "\n" : ":" }' - else - if [ -f "${FAKE_BARCODES}" ]; then - grep -v -e "^#" -e "^$" < ${FAKE_BARCODES} | \ - awk -F: '{ print "S:" $1 (match($2, "^ *$") ? ":E" : ":F:" $2) }' - else - echo "${PROGNAME}: Barcode file ${FAKE_BARCODES} is missing" - exit 1 - fi - fi - ;; -loaded) - # If a tape is loaded, but the source slot is unknown (for example, - # after library reboot), try to report the first free slot - FREE=`${CHIO} -f ${CHANGER} status slot | \ - sed -ne '/FULL/d;s/^slot *\([0-9]*\):.*/\1/p' | \ - awk 'BEGIN { n = 0 } { n = $1 + 1; exit } END { print n }'` - ${CHIO} -f ${CHANGER} status -S drive | \ - sed -ne 's/^drive *'${DRIVE}':.*FULL.*source.*<[^0-9]*\([0-9]*\)>.*/\1/p' \ - | awk 'BEGIN { n = 0 } { n = ($1 == "") ? '${FREE}' : $1 + 1 } \ - END { print n }' - ;; -slots) - ${CHIO} -f ${CHANGER} status | grep -c "^slot " - ;; -*) - usage - ;; -esac diff --git a/sysutils/bareos17-server/files/patch-autoconf_Make.common.in b/sysutils/bareos17-server/files/patch-autoconf_Make.common.in deleted file mode 100644 index 38093dc657b0..000000000000 --- a/sysutils/bareos17-server/files/patch-autoconf_Make.common.in +++ /dev/null @@ -1,13 +0,0 @@ ---- autoconf/Make.common.in 2016-11-09 23:17:41.055746000 -0500 -+++ autoconf/Make.common.in 2016-11-09 23:17:59.647897000 -0500 -@@ -62,8 +62,8 @@ - MKDIR = @BUILD_DIR@/autoconf/mkinstalldirs - INSTALL = @INSTALL@ - # add the -s to the following in PRODUCTION mode --INSTALL_PROGRAM = $(INSTALL) -m @SBINPERM@ --INSTALL_LIB = $(INSTALL) -m 755 -+INSTALL_PROGRAM = $(INSTALL) -s -m @SBINPERM@ -+INSTALL_LIB = $(INSTALL) -s -m 755 - INSTALL_DATA = $(INSTALL) -m 644 - INSTALL_SCRIPT = $(INSTALL) -m @SBINPERM@ - INSTALL_CONFIG = $(INSTALL) -m 640 diff --git a/sysutils/bareos17-server/files/patch-configure b/sysutils/bareos17-server/files/patch-configure deleted file mode 100644 index 17a768d4ddf3..000000000000 --- a/sysutils/bareos17-server/files/patch-configure +++ /dev/null @@ -1,41 +0,0 @@ ---- configure 2020-07-09 12:30:11.000000000 -0500 -+++ configure 2021-08-04 23:04:48.496040000 -0500 -@@ -18642,7 +18642,7 @@ - found_so= - found_a= - if test $use_additional = yes; then -- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then -+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext" && test "${enable_static_fd+set}" != set; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then -@@ -22122,7 +22122,7 @@ - found_so= - found_a= - if test $use_additional = yes; then -- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then -+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext" && test "${enable_static_fd+set}" != set; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then -@@ -23610,7 +23610,7 @@ - done - - --ac_fn_c_check_header_mongrel "$LINENO" "cephfs/ceph_statx.h" "ac_cv_header_cephfs_ceph_statx_h" "$ac_includes_default" -+ac_fn_c_check_header_mongrel "$LINENO" "cephfs/ceph_ll_client.h" "ac_cv_header_cephfs_ceph_statx_h" "$ac_includes_default" - if test "x$ac_cv_header_cephfs_ceph_statx_h" = xyes; then : - - $as_echo "#define HAVE_CEPHFS_CEPH_STATX_H 1" >>confdefs.h -@@ -32518,9 +32518,9 @@ - # - # Make sure the $with_glusterfs_directory also makes sense - # -- if test -d "${with_glusterfs_directory}/lib" -a -d "${with_glusterfs_directory}/include"; then -+ if test -d "${with_glusterfs_directory}/lib" -a -d "${with_glusterfs_directory}/include/glusterfs"; then - GLUSTER_LIBS="-L${with_glusterfs_directory}/lib ${GLUSTER_LIBS}" -- GLUSTER_INC="-I${with_glusterfs_directory}/include ${GLUSTER_INC}" -+ GLUSTER_INC="-I${with_glusterfs_directory}/include/glusterfs ${GLUSTER_INC}" - fi - else - GLUSTER_INC="-I/usr/include/glusterfs" diff --git a/sysutils/bareos17-server/files/patch-src-console-Makefile.in b/sysutils/bareos17-server/files/patch-src-console-Makefile.in deleted file mode 100644 index b1526de9fb6f..000000000000 --- a/sysutils/bareos17-server/files/patch-src-console-Makefile.in +++ /dev/null @@ -1,35 +0,0 @@ ---- src/console/Makefile.in 2016-10-16 10:14:36.000000000 -0500 -+++ src/console/Makefile.in 2016-11-16 01:14:33.054997000 -0500 -@@ -28,6 +28,7 @@ - CONS_LIBS = @CONS_LIBS@ - - JANSSON_CPPFLAGS = @JANSSON_INC@ -+JANSSON_LDFLAGS = @JANSSON_LIBS@ - - INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include - -@@ -51,12 +52,12 @@ - bconsole: Makefile $(CONSOBJS) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ - $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_LIBS) \ -- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) -+ $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS) - - static-bconsole: Makefile $(CONSOBJS) ../lib/libbareos.a ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ -- $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_LIBS) \ -- $(OPENSSL_LIBS) $(GNUTLS_LIBS) -+ $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_STATIC_LIBS) \ -+ $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS) - strip $@ - - -@@ -93,7 +94,7 @@ - $(MKDIR) $(DESTDIR)$(bindir) - $(MKDIR) $(DESTDIR)$(sbindir) - $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(bindir)/bconsole; -- @if ! [ -r $(DESTDIR)$(sbindir)/bconsole ]; then $(SYMLINK) $(bindir)/bconsole $(DESTDIR)$(sbindir)/bconsole; fi -+ @if ! [ -r $(DESTDIR)$(sbindir)/bconsole ]; then $(SYMLINK) ../bin/bconsole $(DESTDIR)$(sbindir)/bconsole; fi - @srcconf=bconsole.conf; \ - if test -f ${DESTDIR}${confdir}/$$srcconf; then \ - destconf=$$srcconf.new; \ diff --git a/sysutils/bareos17-server/files/patch-src-dird-Makefile.in b/sysutils/bareos17-server/files/patch-src-dird-Makefile.in deleted file mode 100644 index b106e98bb054..000000000000 --- a/sysutils/bareos17-server/files/patch-src-dird-Makefile.in +++ /dev/null @@ -1,100 +0,0 @@ ---- src/dird/Makefile.in 2018-07-12 07:38:58.000000000 -0500 -+++ src/dird/Makefile.in 2019-05-09 09:40:05.828917000 -0500 *** 3194 LINES SKIPPED ***