From owner-svn-ports-all@freebsd.org Sun Aug 9 13:28:43 2015 Return-Path: Delivered-To: svn-ports-all@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 3A2FE99D087; Sun, 9 Aug 2015 13:28:43 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 2A0E1BFC; Sun, 9 Aug 2015 13:28:43 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t79DShoK040179; Sun, 9 Aug 2015 13:28:43 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t79DSfvv040173; Sun, 9 Aug 2015 13:28:41 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201508091328.t79DSfvv040173@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Sun, 9 Aug 2015 13:28:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393789 - in head/sysutils/polkit: . 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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Aug 2015 13:28:43 -0000 Author: kwm Date: Sun Aug 9 13:28:40 2015 New Revision: 393789 URL: https://svnweb.freebsd.org/changeset/ports/393789 Log: Update polkit to 0.113. [1] - Add LICENSE blob - Adjust dependencies - Reorganize options helper - Update description file PR: 201362 [1], 194789 Submitted by: olivierd@ [1] Tested by: olivierd@, Tobias Berner , and myself Added: head/sysutils/polkit/files/patch-docs_man_polkit.xml (contents, props changed) Deleted: head/sysutils/polkit/files/patch-data_Makefile.in head/sysutils/polkit/files/patch-src_polkitagent_polkitagenthelperprivate.c head/sysutils/polkit/files/patch-src_polkitbackend_Makefile.in head/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendinteractiveauthority.c head/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendlocalauthority.c head/sysutils/polkit/files/patch-src_polkitd_gposixsignal.c Modified: head/sysutils/polkit/Makefile head/sysutils/polkit/distinfo head/sysutils/polkit/files/patch-Makefile.in head/sysutils/polkit/pkg-descr head/sysutils/polkit/pkg-plist Modified: head/sysutils/polkit/Makefile ============================================================================== --- head/sysutils/polkit/Makefile Sun Aug 9 13:22:57 2015 (r393788) +++ head/sysutils/polkit/Makefile Sun Aug 9 13:28:40 2015 (r393789) @@ -2,59 +2,63 @@ # $FreeBSD$ PORTNAME= polkit -PORTVERSION= 0.105 -PORTREVISION= 7 +PORTVERSION= 0.113 CATEGORIES= sysutils gnome MASTER_SITES= http://www.freedesktop.org/software/polkit/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= Framework for controlling access to system-wide components -LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ + libmozjs-17.0.so:${PORTSDIR}/lang/spidermonkey170 RUN_DEPENDS= dbus-launch:${PORTSDIR}/devel/dbus -USE_GNOME= glib20 intlhack introspection -USES= gettext gmake libtool pathfix pkgconfig +USERS= polkitd +GROUPS= polkitd + +USE_GNOME= glib20 intlhack introspection:build +USES= gettext gmake libtool pathfix pkgconfig shebangfix +SHEBANG_FILES= ${WRKSRC}/src/polkitbackend/toarray.pl GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --disable-gtk-doc \ +CONFIGURE_ARGS= --disable-gtk-doc-html \ + --without-html-dir \ --with-authfw=pam \ --with-pam-include=system \ --with-os-type=freebsd \ - --disable-systemd \ - --enable-introspection \ + --with-polkitd-user=${USERS} \ + --disable-static \ + --disable-examples \ + --with-mozjs=mozjs-17.0 \ + --disable-libsystemd-login \ + --disable-test \ + --enable-introspection=yes \ --localstatedir=/var -MAKE_JOBS_UNSAFE=yes -CONFIGURE_ENV= GTKDOC="false" +#MAKE_JOBS_UNSAFE=yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +INSTALL_TARGET= install-strip OPTIONS_DEFINE= MANPAGES - -.include - -.if ${PORT_OPTIONS:MMANPAGES} -BUILD_DEPENDS+= docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml \ - ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl - -USE_GNOME+= libxslt:build -PLIST_SUB+= MANPAGES="" -.else -CONFIGURE_ARGS+=--disable-man-pages -PLIST_SUB+= MANPAGES="@comment " -.endif +MANPAGES_BUILD_DEPENDS= docbook-sgml>=4.5:${PORTSDIR}/textproc/docbook-sgml \ + docbook-xsl>=1.76:${PORTSDIR}/textproc/docbook-xsl +MANPAGES_USE= gnome=libxslt:build +MANPAGES_CONFIGURE_ENABLE= man-pages +OPTIONS_SUB= yes post-patch: @${REINPLACE_CMD} -e 's|/usr/bin/|${PREFIX}/bin/|g' \ ${WRKSRC}/docs/man/pkexec.xml \ ${WRKSRC}/src/examples/org.freedesktop.policykit.examples.pkexec.policy.in + @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \ + ${WRKSRC}/docs/man/polkit.xml post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/ - @${MKDIR} ${STAGEDIR}${PREFIX}/share/polkit-1/rules.d/ + @${MKDIR} ${STAGEDIR}/var/lib/polkit-1 ${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \ - ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so* - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/polkit-1/extensions/lib*.so + ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.sample .include Modified: head/sysutils/polkit/distinfo ============================================================================== --- head/sysutils/polkit/distinfo Sun Aug 9 13:22:57 2015 (r393788) +++ head/sysutils/polkit/distinfo Sun Aug 9 13:28:40 2015 (r393789) @@ -1,2 +1,2 @@ -SHA256 (polkit-0.105.tar.gz) = 8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df -SIZE (polkit-0.105.tar.gz) = 1431080 +SHA256 (polkit-0.113.tar.gz) = e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81 +SIZE (polkit-0.113.tar.gz) = 1448865 Modified: head/sysutils/polkit/files/patch-Makefile.in ============================================================================== --- head/sysutils/polkit/files/patch-Makefile.in Sun Aug 9 13:22:57 2015 (r393788) +++ head/sysutils/polkit/files/patch-Makefile.in Sun Aug 9 13:28:40 2015 (r393789) @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2012-05-15 22:09:33.000000000 +0200 -+++ Makefile.in 2012-05-15 22:10:16.000000000 +0200 -@@ -292,7 +292,7 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = actions data src docs po test -+SUBDIRS = actions data src docs po - NULL = - EXTRA_DIST = \ - HACKING \ +--- Makefile.in.orig 2015-06-19 20:31:12 UTC ++++ Makefile.in +@@ -157,7 +157,7 @@ am__define_uniq_tagged_files = \ + ETAGS = etags + CTAGS = ctags + CSCOPE = cscope +-DIST_SUBDIRS = actions data src docs po test ++DIST_SUBDIRS = actions data src docs po + am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \ + COPYING ChangeLog INSTALL NEWS README compile config.guess \ + config.sub depcomp install-sh ltmain.sh missing Added: head/sysutils/polkit/files/patch-docs_man_polkit.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/polkit/files/patch-docs_man_polkit.xml Sun Aug 9 13:28:40 2015 (r393789) @@ -0,0 +1,89 @@ +--- docs/man/polkit.xml.orig 2013-05-06 18:28:21 UTC ++++ docs/man/polkit.xml +@@ -100,17 +100,17 @@ System Context | + | polkitd(8) | + +------------------+ + | org.freedesktop. | +-| PolicyKit1 |<---------+ +-+------------------+ | +- ^ | +- | +--------------------------------------+ +- | | /usr/share/polkit-1/actions/*.policy | +- | +--------------------------------------+ ++| PolicyKit1 |<------+ +++------------------+ | ++ ^ | ++ | +--------------------------------------------+ ++ | | /usr/local/share/polkit-1/actions/*.policy | ++ | +--------------------------------------------+ + | +- +--------------------------------------+ +- | /etc/polkit-1/rules.d/*.rules | +- | /usr/share/polkit-1/rules.d/*.rules | +- +--------------------------------------+ ++ +------------------------------------------------+ ++ | /usr/local/etc/polkit-1/rules.d/*.rules | ++ | /usr/local/share/polkit-1/rules.d/*.rules | ++ +------------------------------------------------+ + ]]> + + +@@ -217,7 +217,7 @@ System Context | + order to use polkit. Actions correspond to operations that + clients can request the mechanism to carry out and are defined + in XML files that the mechanism installs into the /usr/share/polkit-1/actions ++ class='directory'>/usr/local/share/polkit-1/actions + directory. + + +@@ -473,21 +473,21 @@ System Context | + + polkitd reads + .rules files from the +- /etc/polkit-1/rules.d and +- /usr/share/polkit-1/rules.d ++ /usr/local/etc/polkit-1/rules.d and ++ /usr/local/share/polkit-1/rules.d + directories by sorting the files in lexical order based on the + basename on each file (if there's a tie, files in +- /etc ++ /usr/local/etc + are processed before files in +- /usr). ++ /usr/local/share). + For example, for the following four + files, the order is + + +- /etc/polkit-1/rules.d/10-auth.rules +- /usr/share/polkit-1/rules.d/10-auth.rules +- /etc/polkit-1/rules.d/15-auth.rules +- /usr/share/polkit-1/rules.d/20-auth.rules ++ /usr/local/etc/polkit-1/rules.d/10-auth.rules ++ /usr/local/share/polkit-1/rules.d/10-auth.rules ++ /usr/local/etc/polkit-1/rules.d/15-auth.rules ++ /usr/local/share/polkit-1/rules.d/20-auth.rules + + + Both directories are monitored so if a rules file is changed, +@@ -683,8 +683,8 @@ polkit.addRule(function(action, subject) + will produce the following when the user runs 'pkexec -u bateman bash -i' from a shell: + + + + +@@ -916,7 +916,7 @@ polkit.addRule(function(action, subject) +