FreeBSD Bugzilla – Attachment 107518 Details for
Bug 148320
[PATCH] net-mgmt/ifgraph: use USERS/GROUPS
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
ifgraph-0.4.10_3.patch
ifgraph-0.4.10_3.patch (text/plain), 2.86 KB, created by
baptiste.daroussin
on 2010-07-02 16:40:07 UTC
(
hide
)
Description:
ifgraph-0.4.10_3.patch
Filename:
MIME Type:
Creator:
baptiste.daroussin
Created:
2010-07-02 16:40:07 UTC
Size:
2.86 KB
patch
obsolete
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/ifgraph.orig/Makefile /usr/ports/net-mgmt/ifgraph/Makefile >--- /usr/ports/net-mgmt/ifgraph.orig/Makefile 2010-03-28 08:41:52.000000000 +0200 >+++ /usr/ports/net-mgmt/ifgraph/Makefile 2010-07-02 17:31:59.983407842 +0200 >@@ -26,17 +26,14 @@ > PKGINSTALL= ${WRKDIR}/pkg-install > PKGDEINSTALL= ${WRKDIR}/pkg-deinstall > >-IFGRAPH_USER= ifgraph >-IFGRAPH_GROUP= ifgraph >+USERS= ifgraph >+GROUPS= ifgraph > > PLFILES= find-if.pl ifgraph.pl makegraph.pl > DOCFILES= CHANGELOG INSTALACAO INSTALL TODO LICENSE.TXT MUDANCAS > > SUB_FILES= crontab pkg-deinstall pkg-install pkg-message >-SUB_LIST= USER=${IFGRAPH_USER} GROUP=${IFGRAPH_GROUP} PERL=${PERL} >- >-pre-install: >- @ ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL >+SUB_LIST= USER=${USERS} PERL=${PERL} > > do-install: > .for plfile in ${PLFILES} >diff -ruN --exclude=CVS /usr/ports/net-mgmt/ifgraph.orig/files/pkg-deinstall.in /usr/ports/net-mgmt/ifgraph/files/pkg-deinstall.in >--- /usr/ports/net-mgmt/ifgraph.orig/files/pkg-deinstall.in 2010-01-24 19:51:29.000000000 +0100 >+++ /usr/ports/net-mgmt/ifgraph/files/pkg-deinstall.in 2010-07-02 17:32:59.793172747 +0200 >@@ -16,23 +16,4 @@ > > ;; > >-POST-DEINSTALL) >- echo '---> Starting post-deinstall script:' >- >- if [ -f %%PREFIX%%/etc/ifgraph.conf -o \ >- -d %%PREFIX%%/ifgraph -o \ >- -d %%PREFIX%%/var/ifgraph ]; then >- echo '---> You seem to have made some custom ifGraph configuration.' >- echo '---> - The "%%USER%%" user and "%%GROUP%%" group were therefore not deleted.' >- echo '---> - You may delete them with "pw groupdel %%GROUP%%; pw userdel %%USER%%".' >- >- else >- echo '---> Removing group "%%GROUP%%"' >- /usr/sbin/pw groupdel -n %%GROUP%% >- echo '---> Removing user "%%USER%%"' >- echo 'y' | /usr/sbin/pw userdel -n %%USER%% >- fi >- >- ;; >- > esac >diff -ruN --exclude=CVS /usr/ports/net-mgmt/ifgraph.orig/files/pkg-install.in /usr/ports/net-mgmt/ifgraph/files/pkg-install.in >--- /usr/ports/net-mgmt/ifgraph.orig/files/pkg-install.in 2010-01-24 19:51:29.000000000 +0100 >+++ /usr/ports/net-mgmt/ifgraph/files/pkg-install.in 2010-07-02 17:31:06.306630031 +0200 >@@ -6,34 +6,6 @@ > PATH=/bin:/usr/bin:/usr/sbin > > case $2 in >- >-PRE-INSTALL) >- echo "---> Starting pre-install script:" >- >- if [ -z "%%USER%%" -o \ >- -z "%%GROUP%%" ]; then >- echo "ERROR: A required pragma was empty" >- exit 1 >- fi >- >- if pw showgroup "%%GROUP%%" 2>/dev/null; then >- echo "---> Using existing group \"%%GROUP%%\"" >- else >- echo "---> Adding group \"%%GROUP%%\"" >- pw addgroup %%GROUP%% -h - || exit 1 >- fi >- >- # Create user if required >- if pw showuser "%%USER%%" 2>/dev/null; then >- echo "---> Using existing user \"%%USER%%\"" >- else >- echo "---> Adding user \"%%USER%%\"" >- pw adduser %%USER%% -g %%GROUP%% -h - \ >- -s "/sbin/nologin" -c "ifGraph User" || exit 1 >- fi >- >- ;; >- > POST-INSTALL) > echo "---> Starting post-install script:"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 148320
: 107518