Automatic report from sources (radiusd) between 01.09.2007 - 02.09.2007 GMT
CVS log entries from 01.09.2007 (Sat) 08:00:01 - 02.09.2007 (Sun) 08:00:02 GMT ===================================================== Summary by authors ===================================================== Author: pnixon File: radiusd/raddb/sql/postgresql/dialup.conf; Revisions: 1.5 File: radiusd/raddb/Makefile; Revisions: 1.32 ===================================================== Log entries ===================================================== Description: Remove realms and nasspasswd otherwise install fails now that the files no longer exist Modified files: File: radiusd/raddb/Makefile; Revision: 1.32; Date: 2007/09/01 17:48:10; Author: pnixon; Lines: (+7 -6) ------------------------------- Description: Set realm field to NULL instead of '' when no realm exists Modified files: File: radiusd/raddb/sql/postgresql/dialup.conf; Revision: 1.5; Date: 2007/09/01 20:21:48; Author: pnixon; Lines: (+5 -4) ===================================================== Summary of modified files ===================================================== File: radiusd/raddb/Makefile Revisions: 1.32 Authors: pnixon (+7 -6) ------------------------------- File: radiusd/raddb/sql/postgresql/dialup.conf Revisions: 1.5 Authors: pnixon (+5 -4) -- Automatic cron job from /web/pages/us.freeradius.org/bin/new_makelog.pl
Automatic cvs log generator wrote:
Description: Remove realms and nasspasswd otherwise install fails now that the files no longer exist Modified files: File: radiusd/raddb/Makefile; Revision: 1.32;
? Those references were deleted a while ago. The only change I can see that you made is that the list of FILES has been re-formatted, and policy.txt" has been removed. Alan DeKok.
On Sun 02 Sep 2007, Alan DeKok wrote:
Automatic cvs log generator wrote:
Description: Remove realms and nasspasswd otherwise install fails now that the files no longer exist Modified files: File: radiusd/raddb/Makefile; Revision: 1.32;
? Those references were deleted a while ago. The only change I can see that you made is that the list of FILES has been re-formatted, and policy.txt" has been removed.
That is weird. I did not remove policy.txt or reformat anything. The commit I made can be seen by "cvs diff -r 1.30 -r 1.31 Makefile" These changes definitely were not made previously as yesterday's cvs snapshot failed to build when I uploaded it to the SUSE build server so I went and investigated. I also did a cvs up in my local checkout before making these changes and committing, but cvs did give me a strange message about merging (dont remember the exact wording) when I committed. Given that the nightly cvs snapshots are performed by my server in Texas, and I also did a local cvs up on my notebook, I don't think I made a mistake here.. Is something screwy with our cvs server? Cheers -- Peter Nixon http://peternixon.net/
Peter Nixon wrote:
That is weird. I did not remove policy.txt or reformat anything. The commit I made can be seen by "cvs diff -r 1.30 -r 1.31 Makefile"
Which were done by Nicolas, over a week ago. The code in 2.0.0-pre2 is also what I expect. That was released only 4 days ago, and the only commit since then was by someone resembling "pnixon". :)
These changes definitely were not made previously as yesterday's cvs snapshot failed to build when I uploaded it to the SUSE build server
They're in 2.0.0-pre2. It doesn't reference "realms" or "naspasswd" in raddb/Makefile.
so I went and investigated. I also did a cvs up in my local checkout before making these changes and committing, but cvs did give me a strange message about merging (dont remember the exact wording) when I committed.
Hmm... me, too. "conflict in merge", or something like that. If you do a series of "cvs update -r1.xx raddb/Makefile, you'll see the same thing.
Given that the nightly cvs snapshots are performed by my server in Texas, and I also did a local cvs up on my notebook, I don't think I made a mistake here.. Is something screwy with our cvs server?
Perhaps. I have a number of complete backups, so that should help. Looking at the raw RCS files, the diff from 1.30 to 1.31 has realms & naspasswd removed, policy.txt is added, and the text is reformatted. The version in 1.32 has the FILES=... entry reverted back to exactly what it was in 1.30. On the other hand, I have older checkouts I haven't updated, and the version 1.31 there is definitely different from the version 1.31 in 2.0.0-pre2. The CVS commit logs on freeradius-devel say: https://lists.freeradius.org/pipermail/freeradius-devel/2007-August/011683.h... With 1.31 done by Nicolas. However, they ALSO say: https://lists.freeradius.org/pipermail/freeradius-devel/2007-August/011658.h... with 1.31 done by me. Oops. That's... odd. So maybe someone did "cvs admin -o 1.31 raddb/Makefile", and nuked my changes. You would have had my version of 1.31, while 2.0.0-pre2 has the one Nicolas committed. I don't know how it happened, but it does look weird. Alan DeKok.
Hi,
no longer exist Modified files: File: radiusd/raddb/Makefile; Revision: 1.32;
? Those references were deleted a while ago. The only change I can see that you made is that the list of FILES has been re-formatted, and policy.txt" has been removed.
That is weird. I did not remove policy.txt or reformat anything. The commit I made can be seen by "cvs diff -r 1.30 -r 1.31 Makefile"
hmm, i can confirm they were removed a little while back as i had contacted Alan about the build failing due to their presence in the Makefile...and that evening, the CVS installed fine. alan
Peter Nixon wrote:
On Sun 02 Sep 2007, Alan DeKok wrote:
Automatic cvs log generator wrote:
Description: Remove realms and nasspasswd otherwise install fails now that the files no longer exist Modified files: File: radiusd/raddb/Makefile; Revision: 1.32;
? Those references were deleted a while ago. The only change I can see that you made is that the list of FILES has been re-formatted, and policy.txt" has been removed.
That is weird. I did not remove policy.txt or reformat anything. The commit I made can be seen by "cvs diff -r 1.30 -r 1.31 Makefile"
This shows the changes I've made on August 19th when I also fixed the messed up indentation and added policy.txt that was leaved uninstalled. Your commit is "cvs diff -u -r 1.31 -r 1.32 raddb/Makefile"
These changes definitely were not made previously as yesterday's cvs snapshot failed to build when I uploaded it to the SUSE build server so I went and investigated.
That's strange because the Makefile in freeradius-server-2.0.0-pre2.tar.gz is correct. -- Nicolas Baradakis
On Sun 02 Sep 2007, Nicolas Baradakis wrote:
Peter Nixon wrote:
On Sun 02 Sep 2007, Alan DeKok wrote:
Automatic cvs log generator wrote:
Description: Remove realms and nasspasswd otherwise install fails now that the files no longer exist Modified files: File: radiusd/raddb/Makefile; Revision: 1.32;
? Those references were deleted a while ago. The only change I can see that you made is that the list of FILES has been re-formatted, and policy.txt" has been removed.
That is weird. I did not remove policy.txt or reformat anything. The commit I made can be seen by "cvs diff -r 1.30 -r 1.31 Makefile"
This shows the changes I've made on August 19th when I also fixed the messed up indentation and added policy.txt that was leaved uninstalled.
Your commit is "cvs diff -u -r 1.31 -r 1.32 raddb/Makefile"
These changes definitely were not made previously as yesterday's cvs snapshot failed to build when I uploaded it to the SUSE build server so I went and investigated.
That's strange because the Makefile in freeradius-server-2.0.0-pre2.tar.gz is correct.
Yep. But somehow that nightly cvs snapshot still had the old Makefile :-( -- Peter Nixon http://peternixon.net/
Peter Nixon wrote:
That's strange because the Makefile in freeradius-server-2.0.0-pre2.tar.gz is correct.
Yep. But somehow that nightly cvs snapshot still had the old Makefile :-(
I'm inclined to 'cvs admin -o 1.32 raddb/Makefile' That will return it to the 1.31 which is in 2.0.0-pre2, and which looks to be good. Objections? Alan DeKok.
Nicolas Baradakis wrote:
These changes definitely were not made previously as yesterday's cvs snapshot failed to build when I uploaded it to the SUSE build server so I went and investigated.
That's strange because the Makefile in freeradius-server-2.0.0-pre2.tar.gz is correct.
I think a fresh snapshot would have resulted in the correct file. A "cvs update" MAY have merged things incorrectly... Alan DeKok.
On Mon 03 Sep 2007, Alan DeKok wrote:
Nicolas Baradakis wrote:
These changes definitely were not made previously as yesterday's cvs snapshot failed to build when I uploaded it to the SUSE build server so I went and investigated.
That's strange because the Makefile in freeradius-server-2.0.0-pre2.tar.gz is correct.
I think a fresh snapshot would have resulted in the correct file. A "cvs update" MAY have merged things incorrectly...
Well, the nightly snapshots to "cvs up".. Maybe I should change that. -- Peter Nixon http://peternixon.net/
Peter Nixon wrote:
I think a fresh snapshot would have resulted in the correct file. A "cvs update" MAY have merged things incorrectly...
Well, the nightly snapshots to "cvs up".. Maybe I should change that.
It works *normally*. i.e. when no one does "cvs admin -o" Which I will do right now on raddb/Makefile. I'll then do a (nearly) empty commit, to get a different version 1.32. Alan DeKok.
participants (5)
-
A.L.M.Buxey＠lboro.ac.uk -
Alan DeKok -
Automatic cvs log generator -
Nicolas Baradakis -
Peter Nixon