Date: Sun, 21 May 2017 21:03:09 +0000 (UTC) From: Johan van Selst <johans@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441427 - head/news/inn Message-ID: <201705212103.v4LL39on014147@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: johans Date: Sun May 21 21:03:09 2017 New Revision: 441427 URL: https://svnweb.freebsd.org/changeset/ports/441427 Log: Handle special permissions through pkg-plist and not through make (this broke building as unprivileged user) No changes to the default build or generated package Reported by: naddy Modified: head/news/inn/Makefile head/news/inn/pkg-plist Modified: head/news/inn/Makefile ============================================================================== --- head/news/inn/Makefile Sun May 21 20:34:22 2017 (r441426) +++ head/news/inn/Makefile Sun May 21 21:03:09 2017 (r441427) @@ -60,7 +60,6 @@ CONFIGURE_ARGS+= --mandir=${MANPREFIX}/m UUCP_RNEWS_CONFIGURE_ON=--enable-uucp-rnews UUCP_RNEWS_RUN_DEPENDS= uucp:net/freebsd-uucp -SETGID_INEWS_CONFIGURE_ON= --enable-setgid-inews INNLIB_LONG= 4.0.0 LIBVER_LONG= 3.0.1 @@ -129,6 +128,11 @@ BUILD_DEPENDS+= gpg:security/gnupg RUN_DEPENDS+= gpg:security/gnupg .endif +.if ${PORT_OPTIONS:MSETGID_INEWS} +PLIST_SUB+= MODE_INEWS="2555" +.else +PLIST_SUB+= MODE_INEWS="" +.endif PORTDOCS= CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO TO_BE_STRIPPED= bin/actsync bin/archive bin/auth/passwd/auth_krb5 \ Modified: head/news/inn/pkg-plist ============================================================================== --- head/news/inn/pkg-plist Sun May 21 20:34:22 2017 (r441426) +++ head/news/inn/pkg-plist Sun May 21 21:03:09 2017 (r441427) @@ -1,16 +1,12 @@ @owner news @group news -@exec mkdir -p %%NEWSBASE%% +@preexec mkdir -p %%NEWSBASE%% %%CWDNEWSBASE%% bin/actmerge bin/actsync bin/actsyncd bin/archive -@owner root -@mode 4550 -bin/auth/passwd/ckpasswd -@mode -@owner news +@(root,,4550) bin/auth/passwd/ckpasswd %%KERBEROS%%bin/auth/passwd/auth_krb5 bin/auth/passwd/radius bin/auth/resolv/domain @@ -53,14 +49,10 @@ bin/filter/startup_innd.pl bin/getlist bin/grephistory bin/imapfeed -bin/inews +@(,news,%%MODE_INEWS%%) bin/inews bin/inncheck bin/innconfval -@owner root -@mode 4550 -bin/innbind -@mode -@owner news +@(root,,4550) bin/innbind bin/innd bin/inndf bin/innfeed @@ -352,12 +344,12 @@ man/man8/writelog.8.gz @sample %%DBDIR%%/active.times.sample @sample %%DBDIR%%/newsgroups.sample @comment -------------------------------------------------------------- -%%WITHOUT_TAGGED_HASH%%@unexec f=history.hash; if cmp -s %%DBDIR%%/$f %%EXAMPLESDIR%%/db/$f; then rm -f %%DBDIR%%/$f; fi -%%WITHOUT_TAGGED_HASH%%@unexec f=history.index; if cmp -s %%DBDIR%%/$f %%EXAMPLESDIR%%/db/$f; then rm -f %%DBDIR%%/$f; fi -%%WITHOUT_TAGGED_HASH%%@unexec rm -f %%EXAMPLESDIR%%/db/history.hash 2> /dev/null || true -%%WITHOUT_TAGGED_HASH%%@unexec rm -f %%EXAMPLESDIR%%/db/history.index 2> /dev/null || true -%%WITH_TAGGED_HASH%%@unexec f=history.pag; if cmp -s %%DBDIR%%/$f %%EXAMPLESDIR%%/db/$f; then rm -f %%DBDIR%%/$f; fi -%%WITH_TAGGED_HASH%%@unexec rm -f %%EXAMPLESDIR%%/db/history.pag 2> /dev/null || true +%%WITHOUT_TAGGED_HASH%%@postunexec f=history.hash; if cmp -s %%DBDIR%%/$f %%EXAMPLESDIR%%/db/$f; then rm -f %%DBDIR%%/$f; fi +%%WITHOUT_TAGGED_HASH%%@postunexec f=history.index; if cmp -s %%DBDIR%%/$f %%EXAMPLESDIR%%/db/$f; then rm -f %%DBDIR%%/$f; fi +%%WITHOUT_TAGGED_HASH%%@postunexec rm -f %%EXAMPLESDIR%%/db/history.hash 2> /dev/null || true +%%WITHOUT_TAGGED_HASH%%@postunexec rm -f %%EXAMPLESDIR%%/db/history.index 2> /dev/null || true +%%WITH_TAGGED_HASH%%@postunexec f=history.pag; if cmp -s %%DBDIR%%/$f %%EXAMPLESDIR%%/db/$f; then rm -f %%DBDIR%%/$f; fi +%%WITH_TAGGED_HASH%%@postunexec rm -f %%EXAMPLESDIR%%/db/history.pag 2> /dev/null || true @sample %%CONFDIR%%/actsync.cfg.sample @sample %%CONFDIR%%/actsync.ign.sample @sample %%CONFDIR%%/buffindexed.conf.sample @@ -404,4 +396,4 @@ man/man8/writelog.8.gz @dir %%DBDIR%% @dir %%LOGDIR%%/OLD @dir %%LOGDIR%% -@unexec rmdir %%NEWSBASE%% 2>/dev/null ||( echo "===> If you don't plan to use inn later, you can safely remove %%NEWSBASE%%. Deinstall process kept these files intact:" | fmt && for i in $(find %D/news -type f); do echo " - $i"; done) +@postunexec rmdir %%NEWSBASE%% 2>/dev/null ||( echo "===> If you don't plan to use inn later, you can safely remove %%NEWSBASE%%. Deinstall process kept these files intact:" | fmt && for i in $(find %D/news -type f); do echo " - $i"; done)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705212103.v4LL39on014147>