From 2718610408692fd2c9325efcee404df0e2d2b613aa86bd63ee3366ef30954119 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 5 May 2008 23:17:29 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freeradius-server?expand=0&rev=3 --- freeradius-server-2.0.3-codecleanup.patch | 67 +++++++++++++++++++++++ freeradius-server.changes | 5 ++ freeradius-server.spec | 19 +++++-- 3 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 freeradius-server-2.0.3-codecleanup.patch diff --git a/freeradius-server-2.0.3-codecleanup.patch b/freeradius-server-2.0.3-codecleanup.patch new file mode 100644 index 0000000..37c0072 --- /dev/null +++ b/freeradius-server-2.0.3-codecleanup.patch @@ -0,0 +1,67 @@ +--- src/modules/rlm_smb/rfcnb-util.c ++++ src/modules/rlm_smb/rfcnb-util.c +@@ -208,7 +208,7 @@ + + /* Free up a packet */ + +-int RFCNB_Free_Pkt(struct RFCNB_Pkt *pkt) ++void RFCNB_Free_Pkt(struct RFCNB_Pkt *pkt) + + { struct RFCNB_Pkt *pkt_next; char *data_ptr; + +--- src/modules/rlm_smb/rfcnb-util.h ++++ src/modules/rlm_smb/rfcnb-util.h +@@ -52,3 +52,4 @@ + struct in_addr *Dest_IP, + int * port); + ++void RFCNB_Free_Pkt(struct RFCNB_Pkt *pkt); +--- src/modules/rlm_smb/session.c ++++ src/modules/rlm_smb/session.c +@@ -41,6 +41,7 @@ + + #include "rfcnb-priv.h" + #include "rfcnb-util.h" ++#include "rfcnb-io.h" + + int RFCNB_Stats[RFCNB_MAX_STATS]; + +@@ -315,7 +316,7 @@ + void *RFCNB_Listen() + + { +- ++ return NULL; + } + + /* Pick up the last error response as a string, hmmm, this routine should */ +@@ -357,7 +358,7 @@ + + /* Pick up the last error response and return in string ... */ + +-int RFCNB_Get_Error_Msg(int code, char *msg_buf, int len) ++void RFCNB_Get_Error_Msg(int code, char *msg_buf, int len) + + { + +--- src/modules/rlm_smb/smbencrypt.c ++++ src/modules/rlm_smb/smbencrypt.c +@@ -25,6 +25,7 @@ + RCSID("$Id: smbencrypt.c,v 1.7 2007/04/02 14:48:35 nbk Exp $") + + #include ++#include + #ifdef HAVE_SYS_VFS_H + #include + #endif +--- src/modules/rlm_sql/drivers/rlm_sql_sqlite/sql_sqlite.c ++++ src/modules/rlm_sql/drivers/rlm_sql_sqlite/sql_sqlite.c +@@ -63,7 +63,7 @@ + snprintf(buffer, sizeof(buffer), "%s/sqlite_radius_client_database", + radius_dir); + radlog(L_INFO, "rlm_sql_sqlite: Opening sqlite database %s for #%d", +- sqlsocket->id); ++ buffer, sqlsocket->id); + + status = sqlite3_open(buffer, &sqlite_sock->pDb); + radlog(L_INFO, "rlm_sql_sqlite: sqlite3_open() = %d\n", status); diff --git a/freeradius-server.changes b/freeradius-server.changes index dcfbe2a..80bd32c 100644 --- a/freeradius-server.changes +++ b/freeradius-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 5 15:02:10 CEST 2008 - pth@suse.de + +- Fix coding errors that made the package fail to build. + ------------------------------------------------------------------- Wed Mar 19 17:23:48 CET 2008 - prusnak@suse.cz diff --git a/freeradius-server.spec b/freeradius-server.spec index fec906e..76704b8 100644 --- a/freeradius-server.spec +++ b/freeradius-server.spec @@ -12,7 +12,7 @@ Name: freeradius-server Version: 2.0.3 -Release: 1 +Release: 15 License: GPL v2 only; LGPL v2.1 only Group: Productivity/Networking/Radius/Servers Provides: radiusd @@ -26,6 +26,7 @@ Patch0: %{name}-%{version}-ltdl.patch Patch1: %{name}-%{version}-dialup_admin.patch Patch2: %{name}-%{version}-rcradiusd.patch Patch3: %{name}-%{version}-raddb.patch +Patch4: %{name}-%{version}-codecleanup.patch PreReq: %{_sbindir}/useradd %{_sbindir}/groupadd PreReq: perl PreReq: %insserv_prereq %fillup_prereq @@ -68,6 +69,7 @@ Authors: %if %_oracle_support == 1 %package oracle + BuildRequires: oracle-instantclient-basic oracle-instantclient-devel Group: Productivity/Networking/Radius/Servers Summary: FreeRADIUS Oracle database support @@ -86,6 +88,7 @@ attributes Selecting a particular configuration Authentication methods %endif %package libs +License: GPL v2 only; LGPL v2.1 only Group: Productivity/Networking/Radius/Servers Summary: FreeRADIUS shared library @@ -103,6 +106,7 @@ Authors: various other people %package utils +License: GPL v2 only; LGPL v2.1 only Group: Productivity/Networking/Radius/Servers Summary: FreeRADIUS Clients Requires: %{name}-libs = %{version} @@ -133,6 +137,7 @@ Authors: various other people %package dialupadmin +License: GPL v2 only; LGPL v2.1 only Group: Productivity/Networking/Radius/Servers Summary: Web management for FreeRADIUS Requires: http_daemon mod_php_any php @@ -154,6 +159,7 @@ Authors: Thanasis Duitsis %package devel +License: GPL v2 only; LGPL v2.1 only Group: Development/Libraries/C and C++ Summary: FreeRADIUS Development Files (static libs) Requires: %{name}-libs = %{version} @@ -172,6 +178,7 @@ Authors: various other people %package doc +License: GPL v2 only; LGPL v2.1 only Group: Productivity/Networking/Radius/Servers Summary: FreeRADIUS Documentation Requires: %{name} @@ -195,9 +202,11 @@ Authors: %patch1 %patch2 %patch3 +%patch4 %build -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -fstack-protector" +#export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -fstack-protector" +export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fstack-protector" %ifarch x86_64 ppc ppc64 s390 s390x export CFLAGS="$CFLAGS -fPIC -DPIC" %endif @@ -413,6 +422,8 @@ rm -rf $RPM_BUILD_ROOT %attr(644,root,root) %{_includedir}/freeradius/*.h %changelog +* Mon May 05 2008 pth@suse.de +- Fix coding errors that made the package fail to build. * Wed Mar 19 2008 prusnak@suse.cz - updated to 2.0.3 Feature improvements @@ -635,7 +646,7 @@ rm -rf $RPM_BUILD_ROOT * More dictionary updates * Security and portability fixes to rlm_otp * Miscellaneous bug fixes -* Mon Jun 05 2006 stark@suse.de +* Tue Jun 06 2006 stark@suse.de - update to version 1.1.2 * Allow tagged VSA's for Juniper. * Allow Ascend "abinary" format to be specified as octets, @@ -667,7 +678,7 @@ rm -rf $RPM_BUILD_ROOT - changed php requires to generic ones (for php5) * Sat Jan 14 2006 stark@suse.de - use --with-udpfromto useful for systems with multiple addresses -* Thu Jan 12 2006 stark@suse.de +* Fri Jan 13 2006 stark@suse.de - update to version 1.1.0 * Wed Jan 11 2006 stark@suse.de - adding stack-protector to CFLAGS