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