OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 23-Jul-2004 00:32:39 Branch: HEAD Handle: 2004072223323900 Added files: openpkg-src/freeradius freeradius.patch freeradius.spec Log: new package: freeradius 1.0.0pre3 (FreeRADIUS Server) Summary: Revision Changes Path 1.1 +69 -0 openpkg-src/freeradius/freeradius.patch 1.1 +122 -0 openpkg-src/freeradius/freeradius.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/freeradius/freeradius.patch ============================================================================ $ cvs diff -u -r0 -r1.1 freeradius.patch --- /dev/null 2004-07-23 00:32:39 +0200 +++ freeradius.patch 2004-07-23 00:32:39 +0200 @@ -0,0 +1,69 @@ +Index: src/modules/rlm_x99_token/x99_rlm.c +--- src/modules/rlm_x99_token/x99_rlm.c.orig 2004-02-26 20:04:37 +0100 ++++ src/modules/rlm_x99_token/x99_rlm.c 2004-07-22 21:47:04 +0200 +@@ -517,8 +517,8 @@ + } + + /* Fast path if we didn't protect the state. */ +- if (!(user_info.card_id & X99_CF_AM)) +- goto good_state; ++ if ((user_info.card_id & X99_CF_AM)) ++ { /* defeat gcc "label at end of compound statement" error */ + + /* Verify the state. */ + (void) memset(challenge, 0, sizeof(challenge)); +@@ -544,7 +544,7 @@ + "auth: bad state for [%s]: expired", username); + return RLM_MODULE_REJECT; + } +-good_state: ++ } + /* State is good! */ + + } else { +Index: src/main/radiusd.c +--- src/main/radiusd.c.orig 2004-05-28 16:42:27 +0200 ++++ src/main/radiusd.c 2004-07-22 21:57:29 +0200 +@@ -1443,6 +1443,7 @@ + * doing something with it. + */ + if (spawn_flag) { ++#ifdef HAVE_PTHREAD_H + if (!thread_pool_addrequest(request, fun)) { + /* + * FIXME: Maybe just drop +@@ -1451,6 +1452,7 @@ + request_reject(request); + request->finished = TRUE; + } ++#endif + } else { + rad_respond(request, fun); + } +Index: src/modules/rlm_ldap/rlm_ldap.c +--- src/modules/rlm_ldap/rlm_ldap.c.orig 2004-04-30 09:54:56 +0200 ++++ src/modules/rlm_ldap/rlm_ldap.c 2004-07-22 23:12:09 +0200 +@@ -193,6 +193,7 @@ + * every use of the pthread functions. + */ + #define pthread_mutex_lock(a) ++#define pthread_mutex_trylock(a) 0 + #define pthread_mutex_unlock(a) + #define pthread_mutex_init(a,b) + #define pthread_mutex_destroy(a) +Index: src/modules/rlm_sql/drivers/Makefile.in +--- src/modules/rlm_sql/drivers/Makefile.in.orig 2003-10-09 06:00:26.000000000 +0200 ++++ src/modules/rlm_sql/drivers/Makefile.in 2004-07-23 00:20:38.766269000 +0200 +@@ -18,10 +18,10 @@ + + common: + @[ -d lib/ ] || mkdir lib +- @for mod in $(SQL_MODULES); do \ ++ @for mod in $(SQL_MODULES) NOOP; do \ + what=$(WHAT_TO_MAKE); \ + [ "$$what" = "all" ] && what="$(TARGET_LIBS)"; \ + echo "Making $$what in $$mod..."; \ +- (cd $$mod && $(MAKE) $(MFLAGS) $$what) || exit 1;\ ++ [ -d $$mod ] || exit 0; (cd $$mod && $(MAKE) $(MFLAGS) $$what) || exit 1;\ + done + @@ . patch -p0 <<'@@ .' Index: openpkg-src/freeradius/freeradius.spec ============================================================================ $ cvs diff -u -r0 -r1.1 freeradius.spec --- /dev/null 2004-07-23 00:32:39 +0200 +++ freeradius.spec 2004-07-23 00:32:39 +0200 @@ -0,0 +1,122 @@ +## +## freeradius.spec -- OpenPKG RPM Specification +## Copyright (c) 2000-2004 The OpenPKG Project <http://www.openpkg.org/> +## Copyright (c) 2000-2004 Ralf S. Engelschall <[EMAIL PROTECTED]> +## Copyright (c) 2000-2004 Cable & Wireless <http://www.cw.com/> +## +## Permission to use, copy, modify, and distribute this software for +## any purpose with or without fee is hereby granted, provided that +## the above copyright notice and this permission notice appear in all +## copies. +## +## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +## SUCH DAMAGE. +## + +# package version +%define V_real 1.0.0-pre3 +%define V_here 1.0.0pre3 + +# package information +Name: freeradius +Summary: FreeRADIUS Server +URL: http://www.freeradius.org/ +Vendor: The FreeRADIUS Server Project +Packager: The OpenPKG Project +Distribution: OpenPKG +Class: JUNK +Group: Network +License: GPL +Version: %{V_here} +Release: 20040723 + +# list of sources +Source0: ftp://ftp.freeradius.org/pub/radius/freeradius-%{V_real}.tar.gz +Patch0: freeradius.patch + +# build information +Prefix: %{l_prefix} +BuildRoot: %{l_buildroot} +BuildPreReq: OpenPKG, openpkg >= 20040130 +PreReq: OpenPKG, openpkg >= 20040130 +BuildPreReq: make, gcc, perl, openssl, openldap +PreReq: make, gcc, perl, openssl, openldap +AutoReq: no +AutoReqProv: no + +%description + FreeRADIUS is one of the most modular and featureful RADIUS servers + available today. It has been written by a team of developers who + have more than a decade of collective experience in implementing + and deploying RADIUS software, in software engineering, and in Unix + package management. + +%track + prog freeradius = { + version = %{V_real} + url = ftp://ftp.freeradius.org/pub/radius/ + regex = freeradius-(__VER__)\.tar\.gz + } + +%prep + %setup -q -n freeradius-%{V_real} + %patch + %{l_shtool} subst \ + -e 's;\(LIBS *=.* *-lldap\)";\1 -llber -lssl -lcrypto";' \ + src/modules/rlm_ldap/configure + +%build + CC="%{l_cc}" \ + CXX="%{l_cxx}" \ + CFLAGS="%{l_cflags -O} %{l_cppflags}" \ + CXXFLAGS="%{l_cxxflags -O}" \ + CPPFLAGS="%{l_cppflags}" \ + LDFLAGS="%{l_ldflags}" \ + ./configure \ + --prefix=%{l_prefix} \ + --localstatedir=${l_prefix}/var \ + --sysconfdir=${l_prefix}/etc \ + --disable-shared \ + --enable-static \ + --with-logdir=%{l_prefix}/var/freeradius/log \ + --with-radacctdir=%{l_prefix}/var/freeradius/radacct \ + --with-raddbdir=%{l_prefix}/etc/freeradius \ + --without-threads \ + --with-openssl-includes=%{l_prefix}/include/openssl \ + --with-openssl-libraries=%{l_prefix}/lib/ \ + --with-rlm-ldap-include-dir=%{l_prefix}/include/ \ + --with-rlm-ldap-lib-dir=%{l_prefix}/lib/ \ + --without-snmp \ + --without-rlm_eap_sim \ + --without-rlm_eap_tls \ + --without-rlm_eap_peap \ + --without-rlm_eap_ttls \ + --without-rlm_krb5 \ + --without-rlm_sql \ + --without-rlm_sql_postgresql \ + --without-rlm_dbm \ + --enable-strict-dependencies + # --disable-ltdl-install + %{l_make} %{l_mflags} + +%install + rm -rf $RPM_BUILD_ROOT + R="$RPM_BUILD_ROOT" %{l_make} %{l_mflags} install + strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true + %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} + +%files -f files + +%clean + rm -rf $RPM_BUILD_ROOT + @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]