freeradius/freeradius.patch

Wed, 14 Jan 2009 15:59:12 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 14 Jan 2009 15:59:12 +0100
changeset 86
78e7deb1d6ab
parent 47
120a0b206db9
child 306
cc6a45887422
permissions
-rw-r--r--

Correct and improve many buildconf and code logic blocks. In particular:
1. Document potential problems building with current binutils releases.
2. Document the flawed webkit and explain its temporary exclusion.
3. Document the edition of Qt which is built and installed.
4. Remove the Solaris x11_supdir logic as it is no longer found.
5. Correct several .pr[io] files including QMAKE_CXXFLAGS and INCPATH,
which previously caused preexisting Qt installations to deliver
erroneous old include and library logic instead of relying on
that of the currently building package. -I/opkg/include is now
placed at the end of the compile statements.
6. Don't trust the QMAKE_[INC|LIB]DIR_X11 identifiers in qmake.conf.
7. Allow more 64-bit builds and more properly identify the platform.
8. Place plugins (which are shared objects) in lib instead of share.
9. Build components as plugins when possible if with_shared is enabled.
10. Translate German text to English to be more consistent.
11. Instead of removing the pkgconfig directory of with_shared builds,
place it in a child directory useful for shared building.
12. Document the nonstandard shared build directory structure,
including using the hidden pkgconfig directory (PKG_CONFIG_PATH.)
13. Change %doc to specify files rather than directories in the RPM DB.

     1 Index: Make.inc.in
     2 --- Make.inc.in.orig	2008-09-25 10:41:26 +0200
     3 +++ Make.inc.in	2008-09-25 17:56:09 +0200
     4 @@ -15,7 +15,7 @@
     5  docdir		= @docdir@
     6  mandir		= @mandir@
     7  datadir		= @datadir@
     8 -dictdir		= $(datadir)/freeradius
     9 +dictdir		= $(datadir)
    10  logdir		= @logdir@
    11  includedir	= @includedir@
    12  raddbdir	= @raddbdir@
    13 @@ -48,7 +48,7 @@
    15  LOGDIR		= ${logdir}
    16  RADDBDIR	= ${raddbdir}
    17 -RUNDIR		= ${localstatedir}/run/radiusd
    18 +RUNDIR		= ${localstatedir}
    19  SBINDIR		= ${sbindir}
    20  RADIR		= ${radacctdir}
    21  LIBRADIUS	= $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la
    22 Index: raddb/radiusd.conf.in
    23 --- raddb/radiusd.conf.in.orig	2008-09-25 10:41:26 +0200
    24 +++ raddb/radiusd.conf.in	2008-09-25 17:56:09 +0200
    25 @@ -66,7 +66,7 @@
    27  #  Location of config and logfiles.
    28  confdir = ${raddbdir}
    29 -run_dir = ${localstatedir}/run/radiusd
    30 +run_dir = ${localstatedir}
    32  # Should likely be ${localstatedir}/lib/radiusd
    33  db_dir = ${raddbdir}
    34 Index: src/modules/rlm_sql/drivers/Makefile.in
    35 --- src/modules/rlm_sql/drivers/Makefile.in.orig	2008-09-25 10:41:26 +0200
    36 +++ src/modules/rlm_sql/drivers/Makefile.in	2008-09-25 17:56:09 +0200
    37 @@ -16,7 +16,7 @@
    39  common:
    40  	@[ -d lib/ ] || mkdir lib
    41 -	@for mod in $(SQL_MODULES); do \
    42 +	@for mod in $(SQL_MODULES) NOOP; do \
    43  		echo "Making $(WHAT_TO_MAKE) in $$mod..."; \
    44 -		$(MAKE) $(MFLAGS) -C $$mod $(WHAT_TO_MAKE) || exit $$?; \
    45 +		[ -d $$mod ] || exit 0; $(MAKE) $(MFLAGS) -C $$mod $(WHAT_TO_MAKE) || exit $$?; \
    46  	done
    47 Index: src/main/command.c
    48 --- src/main/command.c.orig	2009-01-08 19:39:52.565611820 +0100
    49 +++ src/main/command.c	2009-01-08 19:40:18.333372190 +0100
    50 @@ -148,7 +148,7 @@
    51          salocal.sun_family = AF_UNIX;
    52  	memcpy(salocal.sun_path, path, len + 1); /* SUN_LEN does strlen */
    54 -	socklen = SUN_LEN(&salocal);
    55 +	socklen = sizeof(salocal) - sizeof(salocal.sun_path) + strlen(salocal.sun_path);
    57  	/*
    58  	 *	Check the path.
    59 Index: src/main/radmin.c
    60 --- src/main/radmin.c.orig	2009-01-08 19:36:15.333428110 +0100
    61 +++ src/main/radmin.c	2009-01-08 19:39:15.131776575 +0100
    62 @@ -112,7 +112,7 @@
    63          saremote.sun_family = AF_UNIX;
    64  	memcpy(saremote.sun_path, path, len + 1); /* SUN_LEN does strlen */
    66 -	socklen = SUN_LEN(&saremote);
    67 +	socklen = sizeof(saremote) - sizeof(saremote.sun_path) + strlen(saremote.sun_path);
    69          if (connect(sockfd, (struct sockaddr *)&saremote, socklen) < 0) {
    70  		fprintf(stderr, "%s: Failed connecting to %s: %s\n",

mercurial