Attachment 164171 Details for Bug 205280 – patch

[patch] patch

mk-sample.patch (text/plain), 2.10 KB, created by Yuri Victorovich on 2015-12-13 03:20:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2015-12-13 03:20:56 UTC

Size: 2.10 KB

patch

obsolete

>Index: Mk/Scripts/check-stagedir.sh
>===================================================================
>--- Mk/Scripts/check-stagedir.sh	(revision 403379)
>+++ Mk/Scripts/check-stagedir.sh	(working copy)
>@@ -95,7 +95,7 @@
> 	sed_files_gen="s!^${PREFIX}/!!g; ${sed_plist_sub} \
> 	    ${sed_portdocsexamples} /^share\/licenses/d; \
> 	    \#${LOCALBASE}/lib/debug#d;"
>-	sed_dirs_gen="s!^${PREFIX}/!!g; ${sed_plist_sub} s,^,@dir ,; \
>+	sed_dirs_gen="s!^${PREFIX}/!!g; ${sed_plist_sub} s,^([^@]),@dir \1,; \
> 	    ${sed_portdocsexamples} \
> 	    /^@dir share\/licenses/d;"
> 
>@@ -107,6 +107,35 @@
> 
> }
> 
>+plist_add_creds() {
>+	local dir=$1
>+	local usr_deft=$2
>+	local grp_deft=$3
>+	local usr=$usr_deft
>+	local grp=$grp_deft
>+	while read file; do
>+	  local u=$(stat -f %Su "$dir/$file")
>+	  local g=$(stat -f %Sg "$dir/$file")
>+	  if [ $u != $usr ]; then
>+	    usr=$u
>+	    if [ $usr != $usr_deft ]; then
>+	      echo "@owner $usr"
>+	    else
>+	      echo "@owner"
>+	    fi
>+	  fi
>+	  if [ $g != $grp ]; then
>+	    grp=$g
>+	    if [ $grp != $grp_deft ]; then
>+	      echo "@group $grp"
>+	    else
>+	      echo "@group"
>+	    fi
>+	  fi
>+	  echo $file
>+	done
>+}
>+
> # Generate plist from staged files
> generate_plist() {
> 	: >${WRKDIR}/.staged-plist
>@@ -115,7 +144,9 @@
> 	find ${STAGEDIR} -type f -o -type l | sort | \
> 	    sed -e "s,${STAGEDIR},," >${WRKDIR}/.staged-files
> 	comm -13 ${WRKDIR}/.plist-files ${WRKDIR}/.staged-files | \
>-	    sed -e "${sed_files_gen}" \
>+	    plist_add_creds ${STAGEDIR} root wheel | \
>+	    sed -e "${sed_files_gen}" | \
>+	    sed -E 's/^(.+\.sample)$/@sample \1/'
> 	     >>${WRKDIR}/.staged-plist || :
> 
> 	### HANDLE DIRS
>@@ -131,8 +162,10 @@
> 	awk '{print FNR, $0}' ${WRKDIR}/.staged-dirs-dfs \
> 	    >${WRKDIR}/.staged-dirs-dfs-sorted
> 	# Find all staged dirs and then sort them by depth-first (find -ds)
>-	comm -13 ${WRKDIR}/.traced-dirs ${WRKDIR}/.staged-dirs-sorted \
>-	    | sort_dfs | sed "${sed_dirs_gen}" \
>+	comm -13 ${WRKDIR}/.traced-dirs ${WRKDIR}/.staged-dirs-sorted | \
>+	    sort_dfs | \
>+	    plist_add_creds ${STAGEDIR} root wheel | \
>+	    sed -E "${sed_dirs_gen}" \
> 	    >>${WRKDIR}/.staged-plist || :
> }
>

Actions: View | Diff

Attachments on bug 205280: 164166 | 164167 | 164169 | 164170 | 164171