From 51baaebd15467dbde699aac6eff930df413cc994 Mon Sep 17 00:00:00 2001 From: "Fajar A. Nugraha" Date: Fri, 10 Aug 2012 11:39:39 +0700 Subject: [PATCH] redhat:remove patches already applied upstream Removed: * redhat/freeradius-man.patch * redhat/freeradius-perl.patch * redhat/freeradius-unix-passwd-expire.patch Modified:redhat/freeradius.spec --- redhat/freeradius-man.patch | 260 --------------------- redhat/freeradius-perl.patch | 65 ------ redhat/freeradius-unix-passwd-expire.patch | 39 ---- redhat/freeradius.spec | 12 +- 4 files changed, 6 insertions(+), 370 deletions(-) delete mode 100644 redhat/freeradius-man.patch delete mode 100644 redhat/freeradius-perl.patch delete mode 100644 redhat/freeradius-unix-passwd-expire.patch diff --git a/redhat/freeradius-man.patch b/redhat/freeradius-man.patch deleted file mode 100644 index 6c694c5314f..00000000000 --- a/redhat/freeradius-man.patch +++ /dev/null @@ -1,260 +0,0 @@ -From 12bbe0c8289260f7db62e010a5e7168ce7bc5644 Mon Sep 17 00:00:00 2001 -From: John Dennis -Date: Fri, 13 Jan 2012 12:45:14 -0500 -Subject: [PATCH] Fix typo in name of rlm_dbm_parser man page -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -It was rlm_dbm_parse but should be rlm_dbm_parser to match the -executable name. Also fix name in man page. ---- - src/modules/rlm_dbm/Makefile.in | 2 +- - src/modules/rlm_dbm/rlm_dbm_parse.8 | 109 ---------------------------------- - src/modules/rlm_dbm/rlm_dbm_parser.8 | 109 ++++++++++++++++++++++++++++++++++ - 3 files changed, 110 insertions(+), 110 deletions(-) - delete mode 100644 src/modules/rlm_dbm/rlm_dbm_parse.8 - create mode 100644 src/modules/rlm_dbm/rlm_dbm_parser.8 - -diff --git a/src/modules/rlm_dbm/Makefile.in b/src/modules/rlm_dbm/Makefile.in -index f970538..cd537ec 100644 ---- a/src/modules/rlm_dbm/Makefile.in -+++ b/src/modules/rlm_dbm/Makefile.in -@@ -29,4 +29,4 @@ rlm_dbm_install: rlm_dbm_cat rlm_dbm_parser - $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) \ - rlm_dbm_parser$(EXEEXT) $(R)$(bindir) - $(INSTALL) -m 644 rlm_dbm_cat.8 $(R)$(mandir)/man8 -- $(INSTALL) -m 644 rlm_dbm_parse.8 $(R)$(mandir)/man8 -+ $(INSTALL) -m 644 rlm_dbm_parser.8 $(R)$(mandir)/man8 -diff --git a/src/modules/rlm_dbm/rlm_dbm_parse.8 b/src/modules/rlm_dbm/rlm_dbm_parse.8 -deleted file mode 100644 -index 51dd1fc..0000000 ---- a/src/modules/rlm_dbm/rlm_dbm_parse.8 -+++ /dev/null -@@ -1,109 +0,0 @@ --.TH RLM_DBM_PARSE 8 --.SH NAME --rlm_dbm_parse - transforms simple syntax into rlm_dbm format --.SH SYNOPSIS --.B rlm_dbm_parse --.RB [ \-c ] --.RB [ \-d --.IR raddb ] --.RB [ \-i --.IR inputfile ] --.RB [ \-o --.IR outputfile ] --.RB [ \-x ] --.RB [ \-v ] --.RB [ \-q ] --[\fIusername ...\fP] -- --.SH DESCRIPTION --\fBrlm_dbm_parse\fP reads a file of the syntax defined below, and writes --a database file usable by rlm_dbm or edits current database. --.PP -- --.SH INPUT FORMAT -- --\fIrlm_dbm_parse\fP reads a format similar to the one used by the files --module. In incomplete RFC2234 ABNF, it looks like this: -- --.nf --entries = *entry --entry = identifier TAB definition --identifier = username / group-name --username = +PCHAR --groupname = +PCHAR --definition = (check-item ",")* LF ( *( reply-item ",") / ";" ) LF --check-item = AS IN FILES --reply-item = AS IN FILES --* need definition of username and groupname --.fi -- --As an example, these are the standard files definitions (files module). -- --.nf --DEFAULT Service-Type == Framed-User -- Framed-IP-Address = 255.255.255.254, -- Framed-MTU = 576, -- Service-Type = Framed-User, -- Fall-Through = Yes -- --#except who call from number 555-666 --DEFAULT Auth-Type := Reject,Service-Type ==Framed-User, -- Calling-Station-ID == "555-666" -- --#or call number 555-667 --DEFAULT Auth-Type := Reject,Service-Type ==Framed-User, -- Calling-Station-ID == "555-667" --.fi -- --To be a valid rlm_dbm input file, it should look like this: -- --.nf --DEFAULT Service-Type == Framed-User # (1) -- Framed-IP-Address = 255.255.255.254, # comma, list cont'd -- Framed-MTU = 576, -- Service-Type = Framed-User, -- Fall-Through = Yes # \\n, end of list -- Auth-Type := Reject,Service-Type ==Framed-User, # (2) -- Calling-Station-ID == "555-666" -- ; # ;, no reply items -- Auth-Type := Reject,Service-Type ==Framed-User, # (3) -- Calling-Station-ID == "555-667" -- ; # ditto --.fi -- --This user (the DEFAULT user) contains three entries, 1, 2 and 3. The --first entry has a list of reply items, terminated by a reply item --without a trailing comma. Entries 2 and 3 has empty reply lists, as --indicated by the semicolon. This is necessary to separate an empty --line (which is ignored) from the empty list. --Definition Fall-Through = Yes used in order to say module to check next --record. By default Fall-Through = Yes. -- --.SH OPTIONS -- --.IP \-d\ \fIraddb\fP --Use \fIraddb\fP as the radiusd configuration directory. --.IP \-i\ \fIinputfile\fP --Use \fIfile\fP as the input file. If not defined then use standard input. --.IP \-o\ \fIoutputfile\fP --Use \fIfile\fP as the output file. --.IP \-c --Create a new database (empty output file before writing) --.IP \-x --Enable debug mode. Multiple x flags increase debug level. --.IP \-q --Do not print statistics (quiet). --.IP \-v --Print the version and exit. --.IP \-r --Remove a username or group name from the database. -- --.SH SEE ALSO --radiusd(8) --.SH AUTHORS --.TP --Author: --Andrei Koulik --.TP --Documentation: --Bjørn Nordbø -diff --git a/src/modules/rlm_dbm/rlm_dbm_parser.8 b/src/modules/rlm_dbm/rlm_dbm_parser.8 -new file mode 100644 -index 0000000..94137da ---- /dev/null -+++ b/src/modules/rlm_dbm/rlm_dbm_parser.8 -@@ -0,0 +1,109 @@ -+.TH RLM_DBM_PARSER 8 -+.SH NAME -+rlm_dbm_parser - transforms simple syntax into rlm_dbm format -+.SH SYNOPSIS -+.B rlm_dbm_parser -+.RB [ \-c ] -+.RB [ \-d -+.IR raddb ] -+.RB [ \-i -+.IR inputfile ] -+.RB [ \-o -+.IR outputfile ] -+.RB [ \-x ] -+.RB [ \-v ] -+.RB [ \-q ] -+[\fIusername ...\fP] -+ -+.SH DESCRIPTION -+\fBrlm_dbm_parser\fP reads a file of the syntax defined below, and writes -+a database file usable by rlm_dbm or edits current database. -+.PP -+ -+.SH INPUT FORMAT -+ -+\fIrlm_dbm_parser\fP reads a format similar to the one used by the files -+module. In incomplete RFC2234 ABNF, it looks like this: -+ -+.nf -+entries = *entry -+entry = identifier TAB definition -+identifier = username / group-name -+username = +PCHAR -+groupname = +PCHAR -+definition = (check-item ",")* LF ( *( reply-item ",") / ";" ) LF -+check-item = AS IN FILES -+reply-item = AS IN FILES -+* need definition of username and groupname -+.fi -+ -+As an example, these are the standard files definitions (files module). -+ -+.nf -+DEFAULT Service-Type == Framed-User -+ Framed-IP-Address = 255.255.255.254, -+ Framed-MTU = 576, -+ Service-Type = Framed-User, -+ Fall-Through = Yes -+ -+#except who call from number 555-666 -+DEFAULT Auth-Type := Reject,Service-Type ==Framed-User, -+ Calling-Station-ID == "555-666" -+ -+#or call number 555-667 -+DEFAULT Auth-Type := Reject,Service-Type ==Framed-User, -+ Calling-Station-ID == "555-667" -+.fi -+ -+To be a valid rlm_dbm input file, it should look like this: -+ -+.nf -+DEFAULT Service-Type == Framed-User # (1) -+ Framed-IP-Address = 255.255.255.254, # comma, list cont'd -+ Framed-MTU = 576, -+ Service-Type = Framed-User, -+ Fall-Through = Yes # \\n, end of list -+ Auth-Type := Reject,Service-Type ==Framed-User, # (2) -+ Calling-Station-ID == "555-666" -+ ; # ;, no reply items -+ Auth-Type := Reject,Service-Type ==Framed-User, # (3) -+ Calling-Station-ID == "555-667" -+ ; # ditto -+.fi -+ -+This user (the DEFAULT user) contains three entries, 1, 2 and 3. The -+first entry has a list of reply items, terminated by a reply item -+without a trailing comma. Entries 2 and 3 has empty reply lists, as -+indicated by the semicolon. This is necessary to separate an empty -+line (which is ignored) from the empty list. -+Definition Fall-Through = Yes used in order to say module to check next -+record. By default Fall-Through = Yes. -+ -+.SH OPTIONS -+ -+.IP \-d\ \fIraddb\fP -+Use \fIraddb\fP as the radiusd configuration directory. -+.IP \-i\ \fIinputfile\fP -+Use \fIfile\fP as the input file. If not defined then use standard input. -+.IP \-o\ \fIoutputfile\fP -+Use \fIfile\fP as the output file. -+.IP \-c -+Create a new database (empty output file before writing) -+.IP \-x -+Enable debug mode. Multiple x flags increase debug level. -+.IP \-q -+Do not print statistics (quiet). -+.IP \-v -+Print the version and exit. -+.IP \-r -+Remove a username or group name from the database. -+ -+.SH SEE ALSO -+radiusd(8) -+.SH AUTHORS -+.TP -+Author: -+Andrei Koulik -+.TP -+Documentation: -+Bjørn Nordbø --- -1.7.7.5 - diff --git a/redhat/freeradius-perl.patch b/redhat/freeradius-perl.patch deleted file mode 100644 index 8e451422fc8..00000000000 --- a/redhat/freeradius-perl.patch +++ /dev/null @@ -1,65 +0,0 @@ -commit ecb3cd1dbedb764ab98532dae5e0b5bfc9571b00 -Author: Alan T. DeKok -Date: Thu Dec 1 14:21:03 2011 +0100 - - Perl clone should be called sequentially, not in parallel. - - Adding a mutex fixes this. - - Patch from Eike Dehling - -diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c -index 5c82e89..4682ba5 100644 ---- a/src/modules/rlm_perl/rlm_perl.c -+++ b/src/modules/rlm_perl/rlm_perl.c -@@ -77,6 +77,8 @@ typedef struct perl_inst { - char *perl_flags; - PerlInterpreter *perl; - pthread_key_t *thread_key; -+ -+ pthread_mutex_t clone_mutex; - } PERL_INST; - /* - * A mapping of configuration file names to internal variables. -@@ -434,6 +436,8 @@ static int perl_instantiate(CONF_SECTION *conf, void **instance) - */ - - #ifdef USE_ITHREADS -+ pthread_mutex_init(&inst->clone_mutex, NULL); -+ - inst->thread_key = rad_malloc(sizeof(*inst->thread_key)); - memset(inst->thread_key,0,sizeof(*inst->thread_key)); - -@@ -656,8 +660,10 @@ static int rlmperl_call(void *instance, REQUEST *request, char *function_name) - HV *rad_request_hv; - HV *rad_request_proxy_hv; - HV *rad_request_proxy_reply_hv; -- -+ - #ifdef USE_ITHREADS -+ pthread_mutex_lock(&inst->clone_mutex); -+ - PerlInterpreter *interp; - - interp = rlm_perl_clone(inst->perl,inst->thread_key); -@@ -665,9 +671,12 @@ static int rlmperl_call(void *instance, REQUEST *request, char *function_name) - dTHXa(interp); - PERL_SET_CONTEXT(interp); - } -+ -+ pthread_mutex_unlock(&inst->clone_mutex); - #else - PERL_SET_CONTEXT(inst->perl); - #endif -+ - { - dSP; - -@@ -974,6 +983,7 @@ static int perl_detach(void *instance) - - #ifdef USE_ITHREADS - rlm_perl_destruct(inst->perl); -+ pthread_mutex_destroy(&inst->clone_mutex); - #else - perl_destruct(inst->perl); - perl_free(inst->perl); diff --git a/redhat/freeradius-unix-passwd-expire.patch b/redhat/freeradius-unix-passwd-expire.patch deleted file mode 100644 index ee75c3aa2a1..00000000000 --- a/redhat/freeradius-unix-passwd-expire.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- freeradius-server-2.1.12.orig/src/modules/rlm_unix/rlm_unix.c 2011-09-30 10:12:07.000000000 -0400 -+++ freeradius/freeradius-server/src/modules/rlm_unix/rlm_unix.c 2012-02-27 15:10:19.782821614 -0500 -@@ -274,9 +274,17 @@ - /* - * Check if password has expired. - */ -+ if (spwd && spwd->sp_lstchg > 0 && spwd->sp_max >= 0 && -+ (request->timestamp / 86400) > (spwd->sp_lstchg + spwd->sp_max)) { -+ radlog_request(L_AUTH, 0, request, "[%s]: password has expired", name); -+ return RLM_MODULE_REJECT; -+ } -+ /* -+ * Check if account has expired. -+ */ - if (spwd && spwd->sp_expire > 0 && - (request->timestamp / 86400) > spwd->sp_expire) { -- radlog_request(L_AUTH, 0, request, "[%s]: password has expired", name); -+ radlog_request(L_AUTH, 0, request, "[%s]: account has expired", name); - return RLM_MODULE_REJECT; - } - #endif -@@ -363,7 +371,7 @@ - if (fr_crypt_check((char *) request->password->vp_strvalue, - (char *) vp->vp_strvalue) != 0) { - radlog_request(L_AUTH, 0, request, "invalid password \"%s\"", -- request->username->vp_strvalue); -+ request->password->vp_strvalue); - return RLM_MODULE_REJECT; - } - #endif /* OSFFIA */ -@@ -440,7 +448,7 @@ - * Which type is this. - */ - if ((vp = pairfind(request->packet->vps, PW_ACCT_STATUS_TYPE))==NULL) { -- radlog(L_ERR, "rlm_unix: no Accounting-Status-Type attribute in request."); -+ RDEBUG("no Accounting-Status-Type attribute in request."); - return RLM_MODULE_NOOP; - } - status = vp->vp_integer; diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec index 1063a0c8032..b8436aa672b 100644 --- a/redhat/freeradius.spec +++ b/redhat/freeradius.spec @@ -13,11 +13,11 @@ Source103: freeradius-pam-conf Patch1: freeradius-cert-config.patch Patch2: freeradius-radtest.patch -Patch3: freeradius-man.patch -Patch4: freeradius-unix-passwd-expire.patch +#Patch3: freeradius-man.patch +#Patch4: freeradius-unix-passwd-expire.patch Patch5: freeradius-radeapclient-ipv6.patch Patch6: freeradius-postgres-sql.patch -Patch7: freeradius-perl.patch +#Patch7: freeradius-perl.patch Obsoletes: freeradius-devel Obsoletes: freeradius-libs @@ -149,11 +149,11 @@ This plugin provides the unixODBC support for the FreeRADIUS server project. %setup -q -n freeradius-server-%{version} %patch1 -p1 -b .cert-config %patch2 -p1 -b .radtest -%patch3 -p1 -b .man -%patch4 -p1 -b unix-passwd-expire +#%patch3 -p1 -b .man +#%patch4 -p1 -b unix-passwd-expire %patch5 -p1 -b radeapclient-ipv6 %patch6 -p1 -b postgres-sql -%patch7 -p1 -b perl +#%patch7 -p1 -b perl # Some source files mistakenly have execute permissions set find $RPM_BUILD_DIR/freeradius-server-%{version} \( -name '*.c' -o -name '*.h' \) -a -perm /0111 -exec chmod a-x {} + -- 2.47.3