X.org 7.2 ports merged into the FreeBSD Ports Tree
Florent Thoumie
--------------enig0BC5A56B08A98E2FA8A4F139
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
As you may already know, the X11 team has been working hard for the past
few months to upgrade X.org ports to 7.2. After a couple of weeks of
testing, we've finally committed this upgrade. We also decided to make
the PREFIX merge at the same time (moving X11BASE into LOCALBASE), which
explains why there are thousands of ports affected by this commit.
X.org went modular some months ago, which means that rather than
releasing a few distfiles, they now have one per component (app, font,
xserver, ...). What does it mean exactly for the FreeBSD user? Well,
instead of having 5 ports for X.org, you'll have 255 of them? We've
tried to make the upgrade as straight-forward as possible (read
UPDATING) but hey, we're mere humans, we make mistakes. If you encounter
any issue: re-read UPDATING, check the wiki page [1] if it's mentioned
already and if it's not, send a mail to x11@.
I don't like write long mail so I'll stop here. I'd just like to thank
everybody who tested things, especially those who started using the
experimental git tree back in november cause things weren't that much
stable at this point. I won't give a list of names to be sure I won't
forget anybody, but I'll give a special mention to Kris who has been
spamming my mailbox for months with all the errorlogs generated by all
the experimental builds he has been running. This is a very ungrateful
work but somebody has to do it.
I wish your machines good luck for the next few days, cause they're
gonna need it.
flz for x11@.
PS: Read UPDATING.
PPS: If things break badly, I'm at the beach, sipping a mojito.
[1] http://wiki.freebsd.org/ModularXorg
--=20
Florent Thoumie
f...@FreeBSD.org
FreeBSD Committer
--------------enig0BC5A56B08A98E2FA8A4F139
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD4DBQFGT2LdMxEkbVFH3PQRCmdpAJjiWIeqaGywIaNfdVQ7aAn1m0avAJ9E5Z1T
1bWuIccRvw9nfLOruiOQJQ==
=AvLw
-----END PGP SIGNATURE-----
--------------enig0BC5A56B08A98E2FA8A4F139--
Peter Jeremy
--3xoW37o/FfUZJwQG
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On 2007-May-19 21:49:28 +0100, Florent Thoumie <f...@freebsd.org> wrote:
>As you may already know, the X11 team has been working hard for the past
>few months to upgrade X.org ports to 7.2. After a couple of weeks of
>testing, we've finally committed this upgrade. We also decided to make
>the PREFIX merge at the same time (moving X11BASE into LOCALBASE), which
>explains why there are thousands of ports affected by this commit.
Thanks very much to everyone who has worked on this.
That rates as the biggest commit I recall seeing:
- Affecting 7868 files
- Updating 6168 ports
- Creating 255 new ports
- 700KB, 14553 line commit message
I presume there will be followup commits at some stage to fix
src/etc/defaults/rc.conf src/etc/defaults/periodic.conf and
src/etc/login.conf
--=20
Peter Jeremy
--3xoW37o/FfUZJwQG
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)
iD8DBQFGT3Ks/opHv/APuIcRAsuYAKCA4kDc6lFI3M0AewPATOuAV+9ImwCcCkO1
tdZpP2ldEknl/kBJkgYMtrQ=
=7bY8
-----END PGP SIGNATURE-----
--3xoW37o/FfUZJwQG--
Doug Barton
> I presume there will be followup commits at some stage to fix
> src/etc/defaults/rc.conf src/etc/defaults/periodic.conf and
> src/etc/login.conf
I presume that by "fix" you mean "remove X11R6 related stuff." My vote
(as someone deeply interested in /etc and especially rc.d related
issues) would be that it be changed in 7-current soonish, and not
changed in RELENG_6 at all. Given that by default there will be
/usr/X11R6 symlinks for the foreseeable future, I don't see any harm
in leaving the status quo as is in RELENG_6, and I see potential POLA
violations if we don't.
Doug
--
This .signature sanitized for your protection
_______________________________________________
freebs...@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-port...@freebsd.org"
Peter Jeremy
--kH8JNVvasRCCW1Oz
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On 2007-May-19 15:10:07 -0700, Doug Barton <do...@FreeBSD.org> wrote:
> Peter Jeremy wrote:
>
>> I presume there will be followup commits at some stage to fix
>> src/etc/defaults/rc.conf src/etc/defaults/periodic.conf and
>> src/etc/login.conf
>
> I presume that by "fix" you mean "remove X11R6 related stuff."
Yes.
> My vote (as=20
> someone deeply interested in /etc and especially rc.d related issues) wou=
ld=20
> be that it be changed in 7-current soonish, and not changed in RELENG_6 a=
t=20
> all. Given that by default there will be /usr/X11R6 symlinks for the=20
> foreseeable future, I don't see any harm in leaving the status quo as is =
in=20
> RELENG_6, and I see potential POLA violations if we don't.
There are POLA violations whatever is done:
If X11R6 references are removed then anyone who hasn't upgraded to xorg
7.2 will lose any X-related startup/libs/manpages/...
If you upgrade to xorg 7.2 but don't cleanup the /etc files then rc.d
and periodic scripts are processe twice. (I was getting warned about
ports with security problems twice).
Possibly mergebase.sh needs to do more fixup itself or include a bigger
warning.
--=20
Peter Jeremy
--kH8JNVvasRCCW1Oz
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)
iD8DBQFGT3v5/opHv/APuIcRApcIAJ9MOqDAM0qI02Ax/l3jBj6EZO7DFwCgt+EW
OgAbEZWRTI/W6Xru6gTOETY=
=nSQc
-----END PGP SIGNATURE-----
--kH8JNVvasRCCW1Oz--
Kris Kennaway
> Peter Jeremy wrote:
>
> >I presume there will be followup commits at some stage to fix
> >src/etc/defaults/rc.conf src/etc/defaults/periodic.conf and
> >src/etc/login.conf
>
> (as someone deeply interested in /etc and especially rc.d related
> issues) would be that it be changed in 7-current soonish, and not
> changed in RELENG_6 at all. Given that by default there will be
> /usr/X11R6 symlinks for the foreseeable future, I don't see any harm
> in leaving the status quo as is in RELENG_6, and I see potential POLA
There are a couple of things that do need to be fixed swiftly,
e.g. the duplicate periodic directories /usr/X11R6 and /usr/local will
mean that periodic scripts run twice. The mergebase script takes care
of this for upgrades but new installations need the change too.
Kris
Doug Barton
> On 2007-May-19 15:10:07 -0700, Doug Barton <do...@FreeBSD.org> wrote:
>> Peter Jeremy wrote:
>>
>>> I presume there will be followup commits at some stage to fix
>>> src/etc/defaults/rc.conf src/etc/defaults/periodic.conf and
>>> src/etc/login.conf
>> I presume that by "fix" you mean "remove X11R6 related stuff."
>
>
>> My vote (as
>> someone deeply interested in /etc and especially rc.d related issues) would
>> be that it be changed in 7-current soonish, and not changed in RELENG_6 at
>> all. Given that by default there will be /usr/X11R6 symlinks for the
>> foreseeable future, I don't see any harm in leaving the status quo as is in
>> RELENG_6, and I see potential POLA violations if we don't.
>
>
> If X11R6 references are removed then anyone who hasn't upgraded to xorg
> 7.2 will lose any X-related startup/libs/manpages/...
>
> If you upgrade to xorg 7.2 but don't cleanup the /etc files then rc.d
> and periodic scripts are processe twice. (I was getting warned about
> ports with security problems twice).
I don't have the X11R6 symlink, so that one hadn't bitten me yet. That
should be fixed in rc.subr in find_local_scripts_new() so that it
doesn't add a script to the list that's already there. That's pretty
easily done, and could/should be MFC'ed.
Doug
--
This .signature sanitized for your protection
_______________________________________________
Doug Barton
> On Sat, May 19, 2007 at 03:10:07PM -0700, Doug Barton wrote:
>> Peter Jeremy wrote:
>>
>>> I presume there will be followup commits at some stage to fix
>>> src/etc/defaults/rc.conf src/etc/defaults/periodic.conf and
>>> src/etc/login.conf
>> issues) would be that it be changed in 7-current soonish, and not
>> changed in RELENG_6 at all. Given that by default there will be
>> /usr/X11R6 symlinks for the foreseeable future, I don't see any harm
>> in leaving the status quo as is in RELENG_6, and I see potential POLA
>> violations if we don't.
>
> e.g. the duplicate periodic directories /usr/X11R6 and /usr/local will
> mean that periodic scripts run twice. The mergebase script takes care
> of this for upgrades but new installations need the change too.
periodic should be pretty straightforward, I've no objection if
someone who knows more about periodic stuff wants to dive in here.
Doug Barton
--------------050904040905090204040404
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Peter Jeremy wrote:
> If you upgrade to xorg 7.2 but don't cleanup the /etc files then rc.d
> and periodic scripts are processe twice.
Here is a lightly tested patch to rc.subr that should do the trick. If
someone wants to give this a ride on a system where this issue has
been a problem, I can commit it in HEAD and let it shake out a bit.
Doug
--
This .signature sanitized for your protection
--------------050904040905090204040404
Content-Type: text/plain;
name="rc.subr-nodupes.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="rc.subr-nodupes.diff"
Index: rc.subr
===================================================================
RCS file: /usr/local/ncvs/src/etc/rc.subr,v
retrieving revision 1.74
diff -u -r1.74 rc.subr
--- rc.subr 10 Mar 2007 13:37:44 -0000 1.74
+++ rc.subr 19 May 2007 23:36:33 -0000
@@ -1460,14 +1460,20 @@
}
find_local_scripts_new () {
+ local dir f
+
local_rc=''
for dir in ${local_startup}; do
if [ -d "${dir}" ]; then
- for file in `grep -l '^# PROVIDE:' ${dir}/* 2>/dev/null`; do
- case "$file" in
+ for f in `grep -l '^# PROVIDE:' ${dir}/* 2>/dev/null`
+ do
+ case "$f" in
*.sample) ;;
- *) if [ -x "$file" ]; then
- local_rc="${local_rc} ${file}"
+ *) if [ -x "$f" ]; then
+ case "$local_rc" in
+ *[\ ]*${f}[\ ]*|*[\ ]*${f}) ;;
+ *) local_rc="${local_rc} $f" ;;
+ esac
fi
;;
esac
--------------050904040905090204040404
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
freebs...@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-port...@freebsd.org"
--------------050904040905090204040404--
Parv
Peter Jeremy thusly...
>
> On 2007-May-19 15:10:07 -0700, Doug Barton <do...@FreeBSD.org>
> > Peter Jeremy wrote:
> >
> >> I presume there will be followup commits at some stage to fix
> >> src/etc/defaults/rc.conf src/etc/defaults/periodic.conf and
> >> src/etc/login.conf
> If you upgrade to xorg 7.2 but don't cleanup the /etc files then
> warned about ports with security problems twice).
I am using FreeBSD 6. I haven't tried xorg 7.2 port(s) yet, but
recently did merge /usr/X11R6 to /usr/local (programs reinstalled,
made link to X11R6 to local, and such). On a reboot after that,
scripts indeed ran twice. That was very annoying. and mildly
surprising, as the scripts are currently dumb enough not to realize
that /usr/X11R6 is a symbolic link to /usr/local.
That was fixed by, in /etc/rc.conf, ...
local_startup="/usr/local/etc/rc.d"
local_periodic="/usr/local/etc/periodic"
- Parv
--
Dag-Erling Smørgrav
> That rates as the biggest commit I recall seeing:
> - Affecting 7868 files
> - Updating 6168 ports
> - Creating 255 new ports
> - 700KB, 14553 line commit message
The commit message never showed up in my inbox...
DES
--=20
Dag-Erling Sm=C3=B8rgrav - d...@des.no
Andrew Pantyukhin
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: base64
Content-Disposition: inline
T24gNS8yMC8wNywgRGFnLUVybGluZyBTbcO4cmdyYXYgPGRlc0BkZXMubm8+IHdyb3RlOgo+IFBl
dGVyIEplcmVteSA8cGV0ZXJqZXJlbXlAb3B0dXNob21lLmNvbS5hdT4gd3JpdGVzOgo+ID4gVGhh
dCByYXRlcyBhcyB0aGUgYmlnZ2VzdCBjb21taXQgSSByZWNhbGwgc2VlaW5nOgo+ID4gLSBBZmZl
Y3RpbmcgNzg2OCBmaWxlcwo+ID4gLSBVcGRhdGluZyA2MTY4IHBvcnRzCj4gPiAtIENyZWF0aW5n
IDI1NSBuZXcgcG9ydHMKPiA+IC0gNzAwS0IsIDE0NTUzIGxpbmUgY29tbWl0IG1lc3NhZ2UKPgo+
IFRoZSBjb21taXQgbWVzc2FnZSBuZXZlciBzaG93ZWQgdXAgaW4gbXkgaW5ib3guLi4KCkZyZXNo
cG9ydHMgbmV2ZXIgc2F3IGl0LCBlaXRoZXI6Cmh0dHA6Ly93d3cuZnJlc2hwb3J0cy5vcmcveDEx
L3hvcmcvCg==
--===============1649917581==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
freebs...@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-port...@freebsd.org"
--===============1649917581==--
Erwin Lansing
--N/GrjenRD+RJfyz+
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Sun, May 20, 2007 at 03:12:50PM +0400, Andrew Pantyukhin wrote:
> On 5/20/07, Dag-Erling Sm=F8rgrav <d...@des.no> wrote:
> > Peter Jeremy <peter...@optushome.com.au> writes:
> > > That rates as the biggest commit I recall seeing:
> > > - Affecting 7868 files
> > > - Updating 6168 ports
> > > - Creating 255 new ports
> > > - 700KB, 14553 line commit message
> >
> > The commit message never showed up in my inbox...
>=20
> Freshports never saw it, either:
> http://www.freshports.org/x11/xorg/
The commit broke freshports in new and interesting ways. The size of
the commit makes two jobs deadlock eachother in some way, but
unfortunately Dan is busy with BSDCan and now PGcon, so it can take a
couple of days before he has time to look more closely into it.
-erwin
--=20
Erwin Lansing http://droso.org
Security is like an onion. (o_ _o)
It's made up of several layers \\\_\ /_/// er...@FreeBSD.org
And it makes you cry. <____) (____> er...@aauug.dk
--N/GrjenRD+RJfyz+
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)
iD8DBQFGUIthqy9aWxUlaZARAhQ9AJ42uIOwqKdAC2EV/SjfAocTwBVJpQCgmj2s
hsDogHZ9cT+29zV2+w7aOOU=
=+IYC
-----END PGP SIGNATURE-----
--N/GrjenRD+RJfyz+--
Kris Kennaway
> Peter Jeremy <peter...@optushome.com.au> writes:
> > That rates as the biggest commit I recall seeing:
> > - Affecting 7868 files
> > - Updating 6168 ports
> > - Creating 255 new ports
> > - 700KB, 14553 line commit message
>
> The commit message never showed up in my inbox...
Check your mail log. On my system I have cvsmail configured to add
diffs to the commit mails (which is implemented by repeatedly querying
cvsweb), and postfix timed out waiting for it to finish (not
surprising), and bounced the email.
Kris
Dag-Erling Smørgrav
> Dag-Erling Sm=C3=B8rgrav <d...@des.no> writes:
>> The commit message never showed up in my inbox...
> Check your mail log. On my system I have cvsmail configured to add
> diffs to the commit mails (which is implemented by repeatedly querying
> cvsweb), and postfix timed out waiting for it to finish (not
> surprising), and bounced the email.
I don't have anything like that set up.
My logs show that nothing larger than ~4000 bytes has been received (nor
rejected) from owner-ports...@freebsd.org in the last two days.
In fact, nothing at all coming from mx2.freebsd.org has been rejected.
The message never left mx2.
DES
--=20
Dag-Erling Sm=C3=B8rgrav - d...@des.no
Erwin Lansing
--Vy1A5eXR7jld12ZH
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Sun, May 20, 2007 at 08:42:05PM +0200, Dag-Erling Smrgrav wrote:
> Kris Kennaway <kr...@obsecurity.org> writes:
> > Dag-Erling Sm=F8rgrav <d...@des.no> writes:
> >> The commit message never showed up in my inbox...
> > Check your mail log. On my system I have cvsmail configured to add
> > diffs to the commit mails (which is implemented by repeatedly querying
> > cvsweb), and postfix timed out waiting for it to finish (not
> > surprising), and bounced the email.
>=20
> I don't have anything like that set up.
>=20
> My logs show that nothing larger than ~4000 bytes has been received (nor
> rejected) from owner-ports...@freebsd.org in the last two days.
> In fact, nothing at all coming from mx2.freebsd.org has been rejected.
>=20
> The message never left mx2.
>=20
Simon mumbled something about ports-committers being special (i.e. an
alias, not a list) and probably already was refused somewhere on
hub/mx2, and the message only went out on cvs-all and cvs-ports.
-erwin
--=20
Erwin Lansing http://droso.org
Security is like an onion. (o_ _o)
It's made up of several layers \\\_\ /_/// er...@FreeBSD.org
And it makes you cry. <____) (____> er...@aauug.dk
--Vy1A5eXR7jld12ZH
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)
iD8DBQFGUJdrqy9aWxUlaZARAoXKAKDEmZToQpW2KFdu096+XCpMuGxWDwCg/qOE
Lh3vnFKSwhyT1uO9SoxVihA=
=iaDG
-----END PGP SIGNATURE-----
--Vy1A5eXR7jld12ZH--
Thomas Hurst
--/04w6evG8XlLl3ft
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
* Erwin Lansing (er...@FreeBSD.org) wrote:
> The commit broke freshports in new and interesting ways. The size of
> the commit makes two jobs deadlock eachother in some way, but
> unfortunately Dan is busy with BSDCan and now PGcon, so it can take a
> couple of days before he has time to look more closely into it.
It broke freshbsd too; the import and database side was fine, but all
those files seemed to cause a minor computational complexity issue with
the version of ActiveRecord I'm using and eager association loading,
meaning the pages were taking minutes of CPU to generate and mostly
timing out.
It was an 18 character diff to remove part of the join and let
ActiveRecord just select files from each commit in seperate queries:
http://freshbsd.org/2007/05/19/?project=3Dfreebsd&committer=3Dflz&module=3D=
ports
Oh, and I've just noticed my times are all off by an hour. !")=A3%^!"&*=A3(
--=20
Thomas 'Freaky' Hurst
http://hur.st/
--/04w6evG8XlLl3ft
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)
iD8DBQFGUJWUNBBHZ542MwQRAhxfAJ0dIJF3W5eduArVfHlb/SJWx6ljFACgmOUe
olrIxBrB6hrtXpAHqlp0uBc=
=xIta
-----END PGP SIGNATURE-----
--/04w6evG8XlLl3ft--
Doug Barton
> I am using FreeBSD 6. I haven't tried xorg 7.2 port(s) yet, but
> recently did merge /usr/X11R6 to /usr/local (programs reinstalled,
> made link to X11R6 to local, and such). On a reboot after that,
> scripts indeed ran twice. That was very annoying. and mildly
> surprising, as the scripts are currently dumb enough not to realize
> that /usr/X11R6 is a symbolic link to /usr/local.
>
> That was fixed by, in /etc/rc.conf, ...
Could you try restoring the default rc.conf entry, and apply the patch
I posted to /etc/rc.subr? It would be nice to get testing from someone
who was actually affected by the problem.
Thanks,
Doug
--
This .signature sanitized for your protection
_______________________________________________
Wes Morgan
> As you may already know, the X11 team has been working hard for the past
> few months to upgrade X.org ports to 7.2. After a couple of weeks of
> testing, we've finally committed this upgrade. We also decided to make
> the PREFIX merge at the same time (moving X11BASE into LOCALBASE), which
> explains why there are thousands of ports affected by this commit.
The xorg-apps port doesn't seem to support building with "WITHOUT_RCMDS"
enabled in src.conf... Most specifically, "x11/xsm" fails.
> I wish your machines good luck for the next few days, cause they're
> gonna need it.
>
> flz for x11@.
>
> PS: Read UPDATING.
> PPS: If things break badly, I'm at the beach, sipping a mojito.
>
> [1] http://wiki.freebsd.org/ModularXorg
>
>
--
Parv
--d6Gm4EdcadzBjdND
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
in message <4650BD2C...@FreeBSD.org>,
wrote Doug Barton thusly...
>
> Parv wrote:
>
> > I am using FreeBSD 6. I haven't tried xorg 7.2 port(s) yet, but
> > recently did merge /usr/X11R6 to /usr/local (programs reinstalled,
> > made link to X11R6 to local, and such). On a reboot after that,
> > scripts indeed ran twice
...
> Could you try restoring the default rc.conf entry, and apply the
> patch I posted to /etc/rc.subr? It would be nice to get testing
> from someone who was actually affected by the problem.
Doug, after commenting out $local_{periodic,startup} lines in
/etc/rc.conf, the patch posted in message
<464F8AAF...@FreeBSD.org> failed to stop double execution of
scripts.
I do not see how the statement on line 1490 ...
1489 case "$local_rc" in
1490 *[\ ]*${f}[\ ]*|*[\ ]*${f}) ;;
1491 *) local_rc="${local_rc} $f" ;;
1492 esac
... work without actually resolving the paths, at least in case of ...
lrwxr-xr-x 1 root wheel 11 May 16 16:30 /usr/X11R6@ -> /misc/local
lrwxr-xr-x 1 root wheel 11 Dec 21 2004 /usr/local@ -> /misc/local
... since 'X11R6' will always be different than 'local'.
Please look over the attached patch (where, at least in my case,
after resolving directories in $local_startup, already_seen function
calls can be omitted just before making file list). The patch is
against this /etc/rc.subr version ...
# $FreeBSD: src/etc/rc.subr,v 1.34.2.20 2007/03/16 15:34:09 yar Exp
- Parv
--
--d6Gm4EdcadzBjdND
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="rc.subr-nodupes-4.diff"
--- /etc/rc.subr--OLD Mon May 21 01:36:05 2007
+++ /etc/rc.subr Mon May 21 01:57:53 2007
@@ -1454,19 +1454,60 @@
echo ${devices2}
}
+# Check if a string, $1, already exists in a space separated collection
+# of strings, $2.
+#
+already_seen () {
+ local _subset _set _rc
+ _subset="$1"
+ _set="$2"
+ _rc=
+ case "$_set" in
+ *[\ ]${_subset}[\ ]* | *[\ ]${_subset} | ${_subset}[\ ]* )
+ _rc=0
+ ;;
+ * )
+ _rc=1
+ ;;
+ esac
+ return $_rc
+}
+
+# Resolve paths, remove duplicates. Values are stored in $real_paths, a
+# space separated string.
+#
+path_resolve () {
+ local _tmp
+ real_paths=''
+ for f in $@; do
+ _tmp=$( realpath "$f" )
+ already_seen "$_tmp" "${real_paths}" && continue
+ real_paths="$_tmp $real_paths"
+ done
+ real_paths=${real_paths% }
+}
+
# Find scripts in local_startup directories that use the old syntax
#
find_local_scripts_old () {
zlist=''
slist=''
- for dir in ${local_startup}; do
+ path_resolve ${local_startup}
+ for dir in ${real_paths}; do
+
if [ -d "${dir}" ]; then
for file in ${dir}/[0-9]*.sh; do
+
+ already_seen "$file" "${zlist}" && continue
+
grep '^# PROVIDE:' $file >/dev/null 2>&1 &&
continue
zlist="$zlist $file"
done
for file in ${dir}/[^0-9]*.sh; do
+
+ already_seen "$file" "${slist}" && continue
+
grep '^# PROVIDE:' $file >/dev/null 2>&1 &&
continue
slist="$slist $file"
@@ -1476,14 +1517,22 @@
}
find_local_scripts_new () {
+ local dir f
local_rc=''
- for dir in ${local_startup}; do
+ path_resolve ${local_startup}
+ for dir in ${real_paths}; do
+
+ already_seen "$dir" "${local_startup}" && continue
+
if [ -d "${dir}" ]; then
- for file in `grep -l '^# PROVIDE:' ${dir}/* 2>/dev/null`; do
- case "$file" in
+ for f in `grep -l '^# PROVIDE:' ${dir}/* 2>/dev/null`
+ do
+ case "$f" in
*.sample) ;;
- *) if [ -x "$file" ]; then
- local_rc="${local_rc} ${file}"
+ *)
+ already_seen "$f" "${local_rc}" && conitnue
+ if [ -x "$f" ]; then
+ local_rc="${local_rc} $f"
fi
;;
esac
--d6Gm4EdcadzBjdND
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
freebs...@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-port...@freebsd.org"
--d6Gm4EdcadzBjdND--
Peter Jeremy
--ew6BAiZeqk4r7MaW
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On 2007-May-19 16:39:27 -0700, Doug Barton <do...@freebsd.org> wrote:
> Peter Jeremy wrote:
>> If you upgrade to xorg 7.2 but don't cleanup the /etc files then rc.d
>> and periodic scripts are processe twice. =20
>
> Here is a lightly tested patch to rc.subr that should do the trick. If=20
> someone wants to give this a ride on a system where this issue has been a=
=20
> problem, I can commit it in HEAD and let it shake out a bit.
Unfortunately, I've already fixed the problem by editing the affected files.
--=20
Peter Jeremy
--ew6BAiZeqk4r7MaW
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)
iD8DBQFGUT57/opHv/APuIcRApeGAKCSivHEGTi//+EKgND/17rysehHagCfbMpV
GhjyJEctPynsYvwj4NGsCwE=
=jwvt
-----END PGP SIGNATURE-----
--ew6BAiZeqk4r7MaW--
Doug Barton
> in message <4650BD2C...@FreeBSD.org>,
> wrote Doug Barton thusly...
>> Parv wrote:
>>
>>> I am using FreeBSD 6. I haven't tried xorg 7.2 port(s) yet, but
>>> recently did merge /usr/X11R6 to /usr/local (programs reinstalled,
>>> made link to X11R6 to local, and such). On a reboot after that,
>>> scripts indeed ran twice
> ...
>> Could you try restoring the default rc.conf entry, and apply the
>> patch I posted to /etc/rc.subr? It would be nice to get testing
>> from someone who was actually affected by the problem.
>
> Doug, after commenting out $local_{periodic,startup} lines in
> /etc/rc.conf, the patch posted in message
> <464F8AAF...@FreeBSD.org> failed to stop double execution of
> scripts.
>
> I do not see how the statement on line 1490 ...
>
>
> 1489 case "$local_rc" in
> 1490 *[\ ]*${f}[\ ]*|*[\ ]*${f}) ;;
> 1491 *) local_rc="${local_rc} $f" ;;
> 1492 esac
>
>
> ... work without actually resolving the paths,
I said it was lightly tested. :) Could you post your patch on the
freebsd-rc list? Forwarding your last message should be ok. I'm up to
my eyeballs in portmaster/xorg7 stuff atm.
Thanks,
Doug
--
This .signature sanitized for your protection
_______________________________________________