Date: Wed, 7 Nov 2007 09:40:15 -0500 From: Anish Mistry <amistry@am-productions.biz> To: Ruslan Ermilov <ru@freebsd.org> Cc: cvs-ports@freebsd.org, cvs-all@freebsd.org, Alejandro Pulver <alepulver@freebsd.org>, ports-committers@freebsd.org Subject: Re: cvs commit: ports/sysutils/fusefs-kmod Makefile pkg-message pkg-plist ports/sysutils/fusefs-kmod/files fusefs.in pkg-message.in Message-ID: <200711070940.23223.amistry@am-productions.biz> In-Reply-To: <20071107114256.GA76936@team.vega.ru> References: <200710300310.l9U3AADg093992@repoman.freebsd.org> <20071107114256.GA76936@team.vega.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
--nextPart1658051.MI2DSVP1yE
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
On Wednesday 07 November 2007, you wrote:
> On Tue, Oct 30, 2007 at 03:10:09AM +0000, Alejandro Pulver wrote:
> > alepulver 2007-10-30 03:10:09 UTC
> >
> > FreeBSD ports repository
> >
> > Modified files:
> > sysutils/fusefs-kmod Makefile pkg-plist
> > sysutils/fusefs-kmod/files fusefs.in
> > Added files:
> > sysutils/fusefs-kmod/files pkg-message.in
> > Removed files:
> > sysutils/fusefs-kmod pkg-message
> > Log:
>
> [...]
>
> > - Create a symlink of ${PREFIX}/sbin/mount_fusefs to /usr/sbin
> > to allow mounting from /etc/fstab.
>
> This change results in a broken package because sbin/mount_fusefs
> now appears in the tarball twice, first as a binary file, and then
> as a symlink. This causes /usr/local/sbin/mount_fusefs to be a
>
> symlink to itself when installing a package:
> : $ tar tvf fusefs-kmod-0.3.9.p1_1.tbz
> : -rw-r--r-- 0 root wheel 23 Nov 1 13:41 +COMMENT
> : -rw-r--r-- 0 root wheel 75 Nov 1 13:41 +DESC
> : -rw-r--r-- 0 root wheel 660 Nov 1 13:41 +DISPLAY
> : -rw-r--r-- 0 root wheel 17501 Nov 1 13:41 +MTREE_DIRS
> : -r--r--r-- 0 root wheel 4815 Nov 1 13:41
> : man/man8/mount_fusefs.8.gz -r-xr-xr-x 0 root wheel 63463 Nov
> : 1 13:41 modules/fuse.ko -r-xr-xr-x 0 root wheel 12996 Nov=20
> : 1 13:41 sbin/mount_fusefs [...]
> : lrwxr-xr-x 0 root wheel 0 Nov 1 13:41 sbin/mount_fusefs
> : -> /usr/local/sbin/mount_fusefs -r-xr-xr-x 0 root wheel =20
> : 692 Nov 1 13:41 etc/rc.d/fusefs
>
> The following patch fixes it (an approach similar to the one
> in lang/perl5.8):
>
> %%%
> Index: Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/ports/sysutils/fusefs-kmod/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile 30 Oct 2007 03:10:09 -0000 1.15
> +++ Makefile 7 Nov 2007 10:11:34 -0000
> @@ -86,7 +86,7 @@ pre-install:
> @${MKDIR} ${KMODDIR}
>
> post-install:
> - @${LN} -s ${PREFIX}/sbin/mount_fusefs /usr/sbin
> + @${LN} -fs ${PREFIX}/sbin/mount_fusefs /usr/sbin
> .if defined(WITH_AUTOSETUP) && !defined(PACKAGE_BUILDING)
> @${SED} -e 's|@@PREFIX@@|${PREFIX}|g' \
> ${FILESDIR}/${SETUP} > ${WRKDIR}/${SETUP}
> Index: pkg-plist
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/ports/sysutils/fusefs-kmod/pkg-plist,v
> retrieving revision 1.6
> diff -u -p -r1.6 pkg-plist
> --- pkg-plist 30 Oct 2007 03:10:09 -0000 1.6
> +++ pkg-plist 7 Nov 2007 10:11:14 -0000
> @@ -1,5 +1,7 @@
> modules/fuse.ko
> sbin/mount_fusefs
> +@exec ln -fs %D/%F /usr/sbin
> +@unexec rm -f /usr/sbin/mount_fusefs 2>&1 >/dev/null || true
> @unexec kldxref %D/modules
> @dirrmtry modules
> %%PORTDOCS%%%%DOCSDIR%%/kmod/doc.text
> @@ -21,5 +23,3 @@ sbin/mount_fusefs
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/kmod/html
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/kmod
> @dirrmtry %%DOCSDIR%%
> -@cwd /usr
> -sbin/mount_fusefs
> %%%
>
> (A similar problem exists in some other fusefs-* ports.)
>
>
> Cheers,
Doh! That's what I get when I don't go through the whole progression=20
before approving something. The above patches look fine and works. =20
Commit.
Thanks,
=2D-=20
Anish Mistry
amistry@am-productions.biz
AM Productions http://am-productions.biz/
--nextPart1658051.MI2DSVP1yE
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4 (FreeBSD)
iD8DBQBHMc5XxqA5ziudZT0RAnuNAJ9CB+HWKWOkJPCan8CvYI5X6dkaGwCdEhh0
3KwSJVg1+XH1W3A76HPvLbc=
=r10C
-----END PGP SIGNATURE-----
--nextPart1658051.MI2DSVP1yE--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711070940.23223.amistry>