OpenPKG Specs / changeset

     1.1 --- a/freeradius/freeradius.patch	Wed Feb 16 18:17:11 2011 +0100
     1.2 +++ b/freeradius/freeradius.patch	Sat Feb 19 00:04:57 2011 +0100
     1.3 @@ -1,6 +1,6 @@
     1.4  Index: Make.inc.in
     1.5 ---- Make.inc.in.orig	2008-09-25 10:41:26 +0200
     1.6 -+++ Make.inc.in	2008-09-25 17:56:09 +0200
     1.7 +--- Make.inc.in.orig	2010-05-24 07:40:58.000000000 +0200
     1.8 ++++ Make.inc.in	2010-05-24 23:54:11.000000000 +0200
     1.9  @@ -15,7 +15,7 @@
    1.10   docdir		= @docdir@
    1.11   mandir		= @mandir@
    1.12 @@ -10,7 +10,7 @@
    1.13   logdir		= @logdir@
    1.14   includedir	= @includedir@
    1.15   raddbdir	= @raddbdir@
    1.16 -@@ -48,7 +48,7 @@
    1.17 +@@ -49,7 +49,7 @@
    1.18   
    1.19   LOGDIR		= ${logdir}
    1.20   RADDBDIR	= ${raddbdir}
    1.21 @@ -20,51 +20,27 @@
    1.22   RADIR		= ${radacctdir}
    1.23   LIBRADIUS	= $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la
    1.24  Index: raddb/radiusd.conf.in
    1.25 ---- raddb/radiusd.conf.in.orig	2008-09-25 10:41:26 +0200
    1.26 -+++ raddb/radiusd.conf.in	2008-09-25 17:56:09 +0200
    1.27 +--- raddb/radiusd.conf.in.orig	2010-05-24 07:40:58.000000000 +0200
    1.28 ++++ raddb/radiusd.conf.in	2010-05-24 23:54:11.000000000 +0200
    1.29  @@ -66,7 +66,7 @@
    1.30   
    1.31   #  Location of config and logfiles.
    1.32   confdir = ${raddbdir}
    1.33 --run_dir = ${localstatedir}/run/radiusd
    1.34 +-run_dir = ${localstatedir}/run/${name}
    1.35  +run_dir = ${localstatedir}
    1.36   
    1.37   # Should likely be ${localstatedir}/lib/radiusd
    1.38   db_dir = ${raddbdir}
    1.39 -Index: src/modules/rlm_sql/drivers/Makefile.in
    1.40 ---- src/modules/rlm_sql/drivers/Makefile.in.orig	2008-09-25 10:41:26 +0200
    1.41 -+++ src/modules/rlm_sql/drivers/Makefile.in	2008-09-25 17:56:09 +0200
    1.42 -@@ -16,7 +16,7 @@
    1.43 +Index: src/main/event.c
    1.44 +--- src/main/event.c.orig	2010-05-24 07:40:58.000000000 +0200
    1.45 ++++ src/main/event.c	2010-05-25 08:53:57.000000000 +0200
    1.46 +@@ -74,7 +74,9 @@
    1.47 + #define PTHREAD_MUTEX_LOCK if (have_children) pthread_mutex_lock
    1.48 + #define PTHREAD_MUTEX_UNLOCK if (have_children) pthread_mutex_unlock
    1.49   
    1.50 - common:
    1.51 - 	@[ -d lib/ ] || mkdir lib
    1.52 --	@for mod in $(SQL_MODULES); do \
    1.53 -+	@for mod in $(SQL_MODULES) NOOP; do \
    1.54 - 		echo "Making $(WHAT_TO_MAKE) in $$mod..."; \
    1.55 --		$(MAKE) $(MFLAGS) -C $$mod $(WHAT_TO_MAKE) || exit $$?; \
    1.56 -+		[ -d $$mod ] || exit 0; $(MAKE) $(MFLAGS) -C $$mod $(WHAT_TO_MAKE) || exit $$?; \
    1.57 - 	done
    1.58 -Index: src/main/command.c
    1.59 ---- src/main/command.c.orig	2009-01-08 19:39:52.565611820 +0100
    1.60 -+++ src/main/command.c	2009-01-08 19:40:18.333372190 +0100
    1.61 -@@ -148,7 +148,7 @@
    1.62 -         salocal.sun_family = AF_UNIX;
    1.63 - 	memcpy(salocal.sun_path, path, len + 1); /* SUN_LEN does strlen */
    1.64 - 	
    1.65 --	socklen = SUN_LEN(&salocal);
    1.66 -+	socklen = sizeof(salocal) - sizeof(salocal.sun_path) + strlen(salocal.sun_path);
    1.67 - 
    1.68 - 	/*
    1.69 - 	 *	Check the path.
    1.70 -Index: src/main/radmin.c
    1.71 ---- src/main/radmin.c.orig	2009-01-08 19:36:15.333428110 +0100
    1.72 -+++ src/main/radmin.c	2009-01-08 19:39:15.131776575 +0100
    1.73 -@@ -112,7 +112,7 @@
    1.74 -         saremote.sun_family = AF_UNIX;
    1.75 - 	memcpy(saremote.sun_path, path, len + 1); /* SUN_LEN does strlen */
    1.76 - 	
    1.77 --	socklen = SUN_LEN(&saremote);
    1.78 -+	socklen = sizeof(saremote) - sizeof(saremote.sun_path) + strlen(saremote.sun_path);
    1.79 - 
    1.80 -         if (connect(sockfd, (struct sockaddr *)&saremote, socklen) < 0) {
    1.81 - 		fprintf(stderr, "%s: Failed connecting to %s: %s\n",
    1.82 ++#if defined(HAVE_PTHREAD_H)
    1.83 + static pthread_t NO_SUCH_CHILD_PID;
    1.84 ++#endif
    1.85 + #else
    1.86 + /*
    1.87 +  *	This is easier than ifdef's throughout the code.

     2.1 --- a/freeradius/freeradius.spec	Wed Feb 16 18:17:11 2011 +0100
     2.2 +++ b/freeradius/freeradius.spec	Sat Feb 19 00:04:57 2011 +0100
     2.3 @@ -1,6 +1,6 @@
     2.4  ##
     2.5  ##  freeradius.spec -- OpenPKG RPM Package Specification
     2.6 -##  Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/>
     2.7 +##  Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/>
     2.8  ##
     2.9  ##  Permission to use, copy, modify, and distribute this software for
    2.10  ##  any purpose with or without fee is hereby granted, provided that
    2.11 @@ -34,8 +34,8 @@
    2.12  Class:        EVAL
    2.13  Group:        RADIUS
    2.14  License:      GPL
    2.15 -Version:      2.1.3
    2.16 -Release:      20090106
    2.17 +Version:      2.1.10
    2.18 +Release:      20100929
    2.19  
    2.20  #   package options
    2.21  %option       with_mysql     no
    2.22 @@ -49,10 +49,8 @@
    2.23  Patch0:       freeradius.patch
    2.24  
    2.25  #   build information
    2.26 -Prefix:       %{l_prefix}
    2.27 -BuildRoot:    %{l_buildroot}
    2.28 -BuildPreReq:  OpenPKG, openpkg >= 20060823, make, gcc, libtool
    2.29 -PreReq:       OpenPKG, openpkg >= 20060823
    2.30 +BuildPreReq:  OpenPKG, openpkg >= 20100101, make, gcc, libtool
    2.31 +PreReq:       OpenPKG, openpkg >= 20100101
    2.32  BuildPreReq:  perl, openssl, gdbm, readline
    2.33  PreReq:       perl, openssl, gdbm, readline
    2.34  %if "%{with_mysql}" == "yes"
    2.35 @@ -71,8 +69,6 @@
    2.36  BuildPreReq:  snmp
    2.37  PreReq:       snmp
    2.38  %endif
    2.39 -AutoReq:      no
    2.40 -AutoReqProv:  no
    2.41  
    2.42  %description
    2.43      FreeRADIUS is one of the most modular and featureful RADIUS servers
    2.44 @@ -119,7 +115,7 @@
    2.45          --with-logdir=%{l_prefix}/var/freeradius \
    2.46          --with-radacctdir=%{l_prefix}/var/freeradius \
    2.47          --with-raddbdir=%{l_prefix}/etc/freeradius \
    2.48 -        --without-threads \
    2.49 +        --with-threads \
    2.50          --with-openssl-includes=%{l_prefix}/include/openssl \
    2.51          --with-openssl-libraries=%{l_prefix}/lib/ \
    2.52          --with-rlm_perl \
    2.53 @@ -179,7 +175,6 @@
    2.54  
    2.55  %install
    2.56      #   install package
    2.57 -    rm -rf $RPM_BUILD_ROOT
    2.58      %{l_shtool} mkdir -f -p -m 755 \
    2.59          $RPM_BUILD_ROOT%{l_prefix}/lib/freeradius
    2.60      %{l_make} %{l_mflags} install \
    2.61 @@ -215,5 +210,4 @@
    2.62  %files -f files
    2.63  
    2.64  %clean
    2.65 -    rm -rf $RPM_BUILD_ROOT
    2.66