From owner-svn-ports-head@freebsd.org Fri Oct 9 19:09:29 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D55DD9D2C12; Fri, 9 Oct 2015 19:09:29 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9196C1F7C; Fri, 9 Oct 2015 19:09:29 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t99J9SaE070776; Fri, 9 Oct 2015 19:09:28 GMT (envelope-from dvl@FreeBSD.org) Received: (from dvl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t99J9Rxe070769; Fri, 9 Oct 2015 19:09:27 GMT (envelope-from dvl@FreeBSD.org) Message-Id: <201510091909.t99J9Rxe070769@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dvl set sender to dvl@FreeBSD.org using -f From: Dan Langille Date: Fri, 9 Oct 2015 19:09:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398952 - in head/sysutils: bacula-docs bacula-server bacula-server/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Oct 2015 19:09:30 -0000 Author: dvl Date: Fri Oct 9 19:09:27 2015 New Revision: 398952 URL: https://svnweb.freebsd.org/changeset/ports/398952 Log: Upgrade to 7.2.0 Approved by: mat (mentor) Added: head/sysutils/bacula-server/files/patch-src_filed_acl.c (contents, props changed) head/sysutils/bacula-server/files/patch-src_findlib_fstype.c (contents, props changed) Modified: head/sysutils/bacula-docs/Makefile head/sysutils/bacula-docs/distinfo head/sysutils/bacula-server/Makefile head/sysutils/bacula-server/distinfo head/sysutils/bacula-server/pkg-plist Modified: head/sysutils/bacula-docs/Makefile ============================================================================== --- head/sysutils/bacula-docs/Makefile Fri Oct 9 18:56:16 2015 (r398951) +++ head/sysutils/bacula-docs/Makefile Fri Oct 9 19:09:27 2015 (r398952) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bacula -PORTVERSION= 7.0.3 +PORTVERSION= 7.2.0 CATEGORIES= sysutils MASTER_SITES= SF PKGNAMESUFFIX= -docs Modified: head/sysutils/bacula-docs/distinfo ============================================================================== --- head/sysutils/bacula-docs/distinfo Fri Oct 9 18:56:16 2015 (r398951) +++ head/sysutils/bacula-docs/distinfo Fri Oct 9 19:09:27 2015 (r398952) @@ -1,2 +1,2 @@ -SHA256 (bacula-docs-7.0.3.tar.bz2) = b92f32d7b291529b14f4752c8678aad41aaa833afd83fd25bbcb487a2fb45076 -SIZE (bacula-docs-7.0.3.tar.bz2) = 40114560 +SHA256 (bacula-docs-7.2.0.tar.bz2) = d17d5cd888c59a29c15d467843c279fa0e15accb8a911cec360fbe5d69971937 +SIZE (bacula-docs-7.2.0.tar.bz2) = 42744334 Modified: head/sysutils/bacula-server/Makefile ============================================================================== --- head/sysutils/bacula-server/Makefile Fri Oct 9 18:56:16 2015 (r398951) +++ head/sysutils/bacula-server/Makefile Fri Oct 9 19:09:27 2015 (r398952) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= bacula -DISTVERSION= 7.0.5 -PORTREVISION?= 4 +DISTVERSION= 7.2.0 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -176,7 +175,6 @@ post-patch: ${WRKSRC}/src/tools/Makefile.in .endif - .if !target(post-install) post-install: .if defined(WITH_CLIENT_ONLY) Modified: head/sysutils/bacula-server/distinfo ============================================================================== --- head/sysutils/bacula-server/distinfo Fri Oct 9 18:56:16 2015 (r398951) +++ head/sysutils/bacula-server/distinfo Fri Oct 9 19:09:27 2015 (r398952) @@ -1,2 +1,2 @@ -SHA256 (bacula-7.0.5.tar.gz) = 1457849eb33011b43371801b62ffa13d29bebe51be8d5a36da563b87bb094a49 -SIZE (bacula-7.0.5.tar.gz) = 3216406 +SHA256 (bacula-7.2.0.tar.gz) = 818606fe69c50c3ca21b91e609d4ac6ca08e4189419b89d3ec2e81c8c0389e1c +SIZE (bacula-7.2.0.tar.gz) = 3301720 Added: head/sysutils/bacula-server/files/patch-src_filed_acl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/bacula-server/files/patch-src_filed_acl.c Fri Oct 9 19:09:27 2015 (r398952) @@ -0,0 +1,190 @@ +--- src/filed/acl.c.orig 2015-08-13 13:52:24 UTC ++++ src/filed/acl.c +@@ -927,7 +927,7 @@ static bacl_rtn_code generic_set_acl_on_ + * Define the supported ACL streams for this OS + */ + static int os_access_acl_streams[1] = { +- STREAM_ACL_DARWIN_ACCESS_ACL ++ STREAM_ACL_DARWIN_ACCESS + }; + static int os_default_acl_streams[1] = { + -1 +@@ -988,11 +988,11 @@ static bacl_rtn_code (*os_restore_acl_st + * Define the supported ACL streams for these OSes + */ + static int os_access_acl_streams[2] = { +- STREAM_ACL_FREEBSD_ACCESS_ACL, +- STREAM_ACL_FREEBSD_NFS4_ACL ++ STREAM_ACL_FREEBSD_ACCESS, ++ STREAM_ACL_FREEBSD_NFS4 + }; + static int os_default_acl_streams[1] = { +- STREAM_ACL_FREEBSD_DEFAULT_ACL ++ STREAM_ACL_FREEBSD_DEFAULT + }; + + static bacl_rtn_code freebsd_backup_acl_streams(JCR *jcr, FF_PKT *ff_pkt) +@@ -1065,7 +1065,7 @@ static bacl_rtn_code freebsd_backup_acl_ + return bacl_rtn_fatal; + + if (jcr->acl_ctx->content_length > 0) { +- if (send_acl_stream(jcr, STREAM_ACL_FREEBSD_NFS4_ACL) == bacl_rtn_fatal) ++ if (send_acl_stream(jcr, STREAM_ACL_FREEBSD_NFS4) == bacl_rtn_fatal) + return bacl_rtn_fatal; + } + break; +@@ -1077,7 +1077,7 @@ static bacl_rtn_code freebsd_backup_acl_ + return bacl_rtn_fatal; + + if (jcr->acl_ctx->content_length > 0) { +- if (send_acl_stream(jcr, STREAM_ACL_FREEBSD_ACCESS_ACL) == bacl_rtn_fatal) ++ if (send_acl_stream(jcr, STREAM_ACL_FREEBSD_ACCESS) == bacl_rtn_fatal) + return bacl_rtn_fatal; + } + +@@ -1088,7 +1088,7 @@ static bacl_rtn_code freebsd_backup_acl_ + if (generic_get_acl_from_os(jcr, BACL_TYPE_DEFAULT) == bacl_rtn_fatal) + return bacl_rtn_fatal; + if (jcr->acl_ctx->content_length > 0) { +- if (send_acl_stream(jcr, STREAM_ACL_FREEBSD_DEFAULT_ACL) == bacl_rtn_fatal) ++ if (send_acl_stream(jcr, STREAM_ACL_FREEBSD_DEFAULT) == bacl_rtn_fatal) + return bacl_rtn_fatal; + } + } +@@ -1113,13 +1113,13 @@ static bacl_rtn_code freebsd_restore_acl + */ + switch (stream) { + case STREAM_UNIX_ACCESS_ACL: +- case STREAM_ACL_FREEBSD_ACCESS_ACL: ++ case STREAM_ACL_FREEBSD_ACCESS: + case STREAM_UNIX_DEFAULT_ACL: +- case STREAM_ACL_FREEBSD_DEFAULT_ACL: ++ case STREAM_ACL_FREEBSD_DEFAULT: + acl_enabled = pathconf(jcr->last_fname, _PC_ACL_EXTENDED); + acl_type_name = "POSIX"; + break; +- case STREAM_ACL_FREEBSD_NFS4_ACL: ++ case STREAM_ACL_FREEBSD_NFS4: + #if defined(_PC_ACL_NFS4) + acl_enabled = pathconf(jcr->last_fname, _PC_ACL_NFS4); + #endif +@@ -1159,12 +1159,12 @@ static bacl_rtn_code freebsd_restore_acl + */ + switch (stream) { + case STREAM_UNIX_ACCESS_ACL: +- case STREAM_ACL_FREEBSD_ACCESS_ACL: ++ case STREAM_ACL_FREEBSD_ACCESS: + return generic_set_acl_on_os(jcr, BACL_TYPE_ACCESS, content, content_length); + case STREAM_UNIX_DEFAULT_ACL: +- case STREAM_ACL_FREEBSD_DEFAULT_ACL: ++ case STREAM_ACL_FREEBSD_DEFAULT: + return generic_set_acl_on_os(jcr, BACL_TYPE_DEFAULT, content, content_length); +- case STREAM_ACL_FREEBSD_NFS4_ACL: ++ case STREAM_ACL_FREEBSD_NFS4: + return generic_set_acl_on_os(jcr, BACL_TYPE_NFS4, content, content_length); + default: + break; +@@ -1273,11 +1273,11 @@ static bacl_rtn_code (*os_restore_acl_st + * Define the supported ACL streams for this OS + */ + static int os_access_acl_streams[1] = { +- STREAM_ACL_TRU64_ACCESS_ACL ++ STREAM_ACL_TRU64_ACCESS + }; + static int os_default_acl_streams[2] = { +- STREAM_ACL_TRU64_DEFAULT_ACL, +- STREAM_ACL_TRU64_DEFAULT_DIR_ACL ++ STREAM_ACL_TRU64_DEFAULT, ++ STREAM_ACL_TRU64_DEFAULT_DIR + }; + + static bacl_rtn_code tru64_backup_acl_streams(JCR *jcr, FF_PKT *ff_pkt) +@@ -1564,8 +1564,8 @@ char *acl_strerror(int); + * Define the supported ACL streams for this OS + */ + static int os_access_acl_streams[2] = { +- STREAM_ACL_SOLARIS_ACLENT, +- STREAM_ACL_SOLARIS_ACE ++ STREAM_ACL_SOLARIS_POSIX, ++ STREAM_ACL_SOLARIS_NFS4 + }; + static int os_default_acl_streams[1] = { + -1 +@@ -1653,10 +1653,10 @@ static bacl_rtn_code solaris_backup_acl_ + + switch (acl_type(aclp)) { + case ACLENT_T: +- stream_status = send_acl_stream(jcr, STREAM_ACL_SOLARIS_ACLENT); ++ stream_status = send_acl_stream(jcr, STREAM_ACL_SOLARIS_POSIX); + break; + case ACE_T: +- stream_status = send_acl_stream(jcr, STREAM_ACL_SOLARIS_ACE); ++ stream_status = send_acl_stream(jcr, STREAM_ACL_SOLARIS_NFS4); + break; + default: + break; +@@ -1673,8 +1673,8 @@ static bacl_rtn_code solaris_restore_acl + acl_t *aclp; + int acl_enabled, error; + +- if (stream != STREAM_UNIX_ACCESS_ACL || stream != STREAM_ACL_SOLARIS_ACLENT || +- stream != STREAM_ACL_SOLARIS_ACE) { ++ if (stream != STREAM_UNIX_ACCESS_ACL || stream != STREAM_ACL_SOLARIS_POSIX || ++ stream != STREAM_ACL_SOLARIS_NFS4) { + return bacl_rtn_error; + } + +@@ -1709,7 +1709,7 @@ static bacl_rtn_code solaris_restore_acl + * On a filesystem with ACL support make sure this particular ACL type can be restored. + */ + switch (stream) { +- case STREAM_ACL_SOLARIS_ACLENT: ++ case STREAM_ACL_SOLARIS_POSIX: + /* + * An aclent can be restored on filesystems with _ACL_ACLENT_ENABLED or _ACL_ACE_ENABLED support. + */ +@@ -1720,7 +1720,7 @@ static bacl_rtn_code solaris_restore_acl + return bacl_rtn_error; + } + break; +- case STREAM_ACL_SOLARIS_ACE: ++ case STREAM_ACL_SOLARIS_NFS4: + /* + * An ace can only be restored on a filesystem with _ACL_ACE_ENABLED support. + */ +@@ -1750,7 +1750,7 @@ static bacl_rtn_code solaris_restore_acl + * Validate that the conversion gave us the correct acl type. + */ + switch (stream) { +- case STREAM_ACL_SOLARIS_ACLENT: ++ case STREAM_ACL_SOLARIS_POSIX: + if (acl_type(aclp) != ACLENT_T) { + Mmsg1(jcr->errmsg, + _("wrong encoding of acl type in acl stream on file \"%s\"\n"), +@@ -1758,7 +1758,7 @@ static bacl_rtn_code solaris_restore_acl + return bacl_rtn_error; + } + break; +- case STREAM_ACL_SOLARIS_ACE: ++ case STREAM_ACL_SOLARIS_NFS4: + if (acl_type(aclp) != ACE_T) { + Mmsg1(jcr->errmsg, + _("wrong encoding of acl type in acl stream on file \"%s\"\n"), +@@ -1802,7 +1802,7 @@ static bacl_rtn_code solaris_restore_acl + * Define the supported ACL streams for this OS + */ + static int os_access_acl_streams[1] = { +- STREAM_ACL_SOLARIS_ACLENT ++ STREAM_ACL_SOLARIS_POSIX + }; + static int os_default_acl_streams[1] = { + -1 +@@ -1861,7 +1861,7 @@ static bacl_rtn_code solaris_backup_acl_ + pm_strcpy(jcr->acl_ctx->content, acl_text); + actuallyfree(acl_text); + free(acls); +- return send_acl_stream(jcr, STREAM_ACL_SOLARIS_ACLENT); ++ return send_acl_stream(jcr, STREAM_ACL_SOLARIS_POSIX); + } + + berrno be; Added: head/sysutils/bacula-server/files/patch-src_findlib_fstype.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/bacula-server/files/patch-src_findlib_fstype.c Fri Oct 9 19:09:27 2015 (r398952) @@ -0,0 +1,22 @@ +--- src/findlib/fstype.c.orig 2015-08-13 13:52:24 UTC ++++ src/findlib/fstype.c +@@ -31,7 +31,9 @@ + #include "find.h" + #include + #include +- ++#ifdef HAVE_SUN_OS ++ #include ++#endif + #else /* Set up for testing a stand alone program */ + + #include +@@ -373,7 +375,7 @@ bool read_mtab(mtab_handler_t *mtab_hand + mtab_handler(user_ctx, &st, mnt.mnt_fstype, mnt.mnt_mountp, + mnt.mnt_mntopts, mnt.mnt_special); + } +- fclose(fp); ++ fclose(mntfp); + V(mutex); + #endif + Modified: head/sysutils/bacula-server/pkg-plist ============================================================================== --- head/sysutils/bacula-server/pkg-plist Fri Oct 9 18:56:16 2015 (r398951) +++ head/sysutils/bacula-server/pkg-plist Fri Oct 9 19:09:27 2015 (r398952) @@ -13,7 +13,6 @@ sbin/bacula-sd sbin/bcopy sbin/bextract sbin/bls -sbin/bpluginfo sbin/bregex sbin/bscan sbin/bsmtp