From: Rainer Hurling on
On 16.01.2010 12:59 (UTC+1), Ed Schouten wrote:
> Hello Rainer,
>
> * Rainer Hurling<rhurlin(a)gwdg.de> wrote:
>> After updating my system i tried to rebuild Xorg ports. All went
>> fine until it has to compile x11/sessreg.
>>
>> It seems that the configure script does not find struct
>> 'utmpx.ut_syslen' and so the build process falls back to utmp?
>>
>> Could you please take a look if this is an issue of the new interface.
>
> I just looked at this problem and sent a patch to the Xorg folks. I
> can't find my email in the xorg-devel archives yet, so I've attached a
> patch to this email. Hopefully the respective port maintainer can turn
> it into something useful.

Ed, many thanks for this patch.

There was a small problem with patching sessreg.c:


patch < sessreg.diff
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/configure.ac b/configure.ac
|index 6e2f470..be1b4b4 100644
|--- a/configure.ac
|+++ b/configure.ac
--------------------------
Patching file configure.ac using Plan A...
Hunk #1 succeeded at 36 with fuzz 2 (offset -3 lines).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sessreg.c b/sessreg.c
|index c674450..992a213 100644
|--- a/sessreg.c
|+++ b/sessreg.c
--------------------------
Patching file sessreg.c using Plan A...
Hunk #1 succeeded at 80 (offset 5 lines).
Hunk #2 succeeded at 88 (offset 5 lines).
Hunk #3 succeeded at 101 with fuzz 2 (offset 5 lines).
Hunk #4 failed at 115.
Hunk #5 succeeded at 189 (offset 5 lines).
Hunk #6 succeeded at 197 (offset 5 lines).
Hunk #7 succeeded at 234 (offset 5 lines).
Hunk #8 succeeded at 262 (offset 5 lines).
Hunk #9 succeeded at 280 (offset 5 lines).
Hunk #10 succeeded at 299 (offset 5 lines).
Hunk #11 succeeded at 342 (offset 5 lines).
Hunk #12 succeeded at 394 (offset 5 lines).
Hunk #13 succeeded at 441 (offset 5 lines).
Hunk #14 succeeded at 449 (offset 5 lines).
Hunk #15 succeeded at 462 (offset 5 lines).
Hunk #16 succeeded at 481 (offset 5 lines).
Hunk #17 succeeded at 549 (offset 5 lines).
1 out of 17 hunks failed--saving rejects to sessreg.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sessreg.h b/sessreg.h
|index 6583d57..6b3edc2 100644
|--- a/sessreg.h
|+++ b/sessreg.h
--------------------------
Patching file sessreg.h using Plan A...
Hunk #1 succeeded at 57 (offset 6 lines).
done


cat sessreg.c.rej
***************
*** 108,114 ****
*/
static int hflag, sflag, xflag, tflag;
static char *host_name = NULL;
static int slot_number;
static char *xservers_file, *ttys_file;
static char *user_name;
static int aflag, dflag;
--- 115,123 ----
*/
static int hflag, sflag, xflag, tflag;
static char *host_name = NULL;
+ #ifdef USE_UTMP
static int slot_number;
+ #endif
static char *xservers_file, *ttys_file;
static char *user_name;
static int aflag, dflag;


Doing this patch manually works. After patching the port compiles again :-)

Rainer
_______________________________________________
freebsd-ports(a)freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscribe(a)freebsd.org"

From: Rainer Hurling on
On 13.01.2010 20:42 (UTC+1), Ed Schouten wrote:
> [..snip..]
> I've noticed there is some breakage in ports, but it shouldn't be too
> serious. I've seen cases where an application includes<utmp.h>, even
> though it doesn't use anything provided by that header. In other cases
> they used fields like UT_NAMESIZE to derive the maximum user name length
> supported by the system, which is clearly not what this definition was
> intended for. I've incremented __FreeBSD_version to 900007 to identify
> the import of utmpx. In case a certain port breaks badly, let me know
> and I'm willing to take a look at it.
>
> Be sure to give it a try and report any issues. Thanks!
>

The next port I found, which does not compile any more after your
commit, is ftp/gftp:


[..snip..]
if cc -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/local/include/glib-2.0
-I/usr/local/lib/glib-2.0/include -D_REENTRANT -D_THREAD_SAFE
-I../intl -DSHARE_DIR=\"/usr/local/share/gftp\"
-DLOCALE_DIR=\"/usr/local/share/locale\" -I/usr/local/include
-D_THREAD_SAFE -O2 -pipe -fno-strict-aliasing -MT protocols.o -MD -MP
-MF ".deps/protocols.Tpo" -c -o protocols.o protocols.c; then mv -f
".deps/protocols.Tpo" ".deps/protocols.Po"; else rm -f
".deps/protocols.Tpo"; exit 1; fi
if cc -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/local/include/glib-2.0
-I/usr/local/lib/glib-2.0/include -D_REENTRANT -D_THREAD_SAFE
-I../intl -DSHARE_DIR=\"/usr/local/share/gftp\"
-DLOCALE_DIR=\"/usr/local/share/locale\" -I/usr/local/include
-D_THREAD_SAFE -O2 -pipe -fno-strict-aliasing -MT pty.o -MD -MP -MF
".deps/pty.Tpo" -c -o pty.o pty.c; then mv -f ".deps/pty.Tpo"
".deps/pty.Po"; else rm -f ".deps/pty.Tpo"; exit 1; fi
In file included from pty.c:69:
/usr/include/utmp.h:2:2: error: #error "<utmp.h> has been replaced by
<utmpx.h>"
*** Error code 1
Stop in /usr/ports/ftp/gftp/work/gftp-2.0.19/lib.
*** Error code 1
Stop in /usr/ports/ftp/gftp/work/gftp-2.0.19/lib.
*** Error code 1
Stop in /usr/ports/ftp/gftp/work/gftp-2.0.19.
*** Error code 1
Stop in /usr/ports/ftp/gftp/work/gftp-2.0.19.
*** Error code 1
Stop in /usr/ports/ftp/gftp.


Is it ok to report such problems in this thread?

Thanks again,
Rainer
_______________________________________________
freebsd-ports(a)freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscribe(a)freebsd.org"

From: Ed Schouten on
* Rainer Hurling <rhurlin(a)gwdg.de> wrote:
> Is it ok to report such problems in this thread?

I think it's better to file PRs for them, to make sure the port
maintainer is also informed. I'll take a look at the gftp problem
tomorrow.

Greetings,
--
Ed Schouten <ed(a)80386.nl>
WWW: http://80386.nl/
From: Ed Schouten on
* Ed Schouten <ed(a)80386.nl> wrote:
> I just looked at this problem and sent a patch to the Xorg folks. I
> can't find my email in the xorg-devel archives yet, so I've attached a
> patch to this email. Hopefully the respective port maintainer can turn
> it into something useful.

And it got fixed upstream:

http://cgit.freedesktop.org/xorg/app/sessreg/commit/?id=9792646873ac0e597cc65ef4a056444fd8f9a7fd

I just asked whether they are planning on releasing this soon, because
then it might just be easier to bump sessreg than backporting it to our
version.

--
Ed Schouten <ed(a)80386.nl>
WWW: http://80386.nl/
From: Oliver Lehmann on
Hi Rainer,

Rainer Hurling wrote:

> The next port I found, which does not compile any more after your
> commit, is ftp/gftp:

I've committed a kinda easy fix for it.

Greetings, Oliver

--
Oliver Lehmann
http://www.pofo.de/
http://wishlist.ans-netz.de/
_______________________________________________
freebsd-ports(a)freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscribe(a)freebsd.org"