diff -uNr aegis-4.2/Makefile.in aegis-4.2-new/Makefile.in
--- aegis-4.2/Makefile.in	Mon Feb 25 18:14:42 2002
+++ aegis-4.2-new/Makefile.in	Thu Oct 23 13:03:20 2003
@@ -104,6 +104,17 @@
 comdir = @sharedstatedir@
 
 #
+# where to put the system configuration directory
+#
+# ${sysconfdir} is for architecture-neutral files
+#	On a network, this would be shared between all machines
+#	on the network.  It can be mounted read-only.
+#
+# This is where common links to the shell configuration scripts live.
+#
+sysconfdir = @sysconfdir@
+
+#
 # ${libdir} is for architecture-specific files
 #	On a network, this would only be shared between machines
 #	of identical cpu-hw-os flavour.  It can be mounted read-only.
@@ -201,7 +212,7 @@
 #
 HAVE_WEB = @web@
 DocumentRoot = @DocumentRoot@
-ScriptRoot = @ScriptRoot@
+ScriptRoot = @datadir@/cgi-bin
 
 #
 # Mess with the names of installed executables.
@@ -2739,9 +2750,9 @@
 $(RPM_BUILD_ROOT)$(datadir)/cshrc: lib/cshrc lib/.mkdir.datadir
 	$(INSTALL_PROGRAM) lib/cshrc $@
 
-$(RPM_BUILD_ROOT)/etc/profile.d/aegis.csh: \
+$(RPM_BUILD_ROOT)$(sysconfdir)/profile.d/aegis.csh: \
 		$(RPM_BUILD_ROOT)$(datadir)/cshrc
-	-@mkdir -p $(RPM_BUILD_ROOT)/etc/profile.d
+	-@mkdir -p $(RPM_BUILD_ROOT)$(sysconfdir)/profile.d
 	-ln -s $(datadir)/cshrc $@
 
 $(RPM_BUILD_ROOT)$(datadir)/db_forced.sh: lib/db_forced.sh \
@@ -6262,9 +6273,9 @@
 $(RPM_BUILD_ROOT)$(datadir)/profile: lib/profile lib/.mkdir.datadir
 	$(INSTALL_PROGRAM) lib/profile $@
 
-$(RPM_BUILD_ROOT)/etc/profile.d/aegis.sh: \
+$(RPM_BUILD_ROOT)$(sysconfdir)/profile.d/aegis.sh: \
 		$(RPM_BUILD_ROOT)$(datadir)/profile
-	-@mkdir -p $(RPM_BUILD_ROOT)/etc/profile.d
+	-@mkdir -p $(RPM_BUILD_ROOT)$(sysconfdir)/profile.d
 	-ln -s $(datadir)/profile $@
 
 $(RPM_BUILD_ROOT)$(datadir)/remind/awt_dvlp.sh: lib/remind/awt_dvlp.sh \
@@ -14898,8 +14909,8 @@
 
 LibFiles =
 
-DataFiles = $(RPM_BUILD_ROOT)/etc/profile.d/aegis.sh \
-		$(RPM_BUILD_ROOT)/etc/profile.d/aegis.csh \
+DataFiles = $(RPM_BUILD_ROOT)$(sysconfdir)/profile.d/aegis.sh \
+		$(RPM_BUILD_ROOT)$(sysconfdir)/profile.d/aegis.csh \
 		$(RPM_BUILD_ROOT)$(datadir)/aegis.icon \
 		$(RPM_BUILD_ROOT)$(datadir)/aegis.mask \
 		$(RPM_BUILD_ROOT)$(datadir)/aegis.pgm \
diff -uNr aegis-4.2/configure aegis-4.2-new/configure
--- aegis-4.2/configure	Mon Feb 25 18:14:42 2002
+++ aegis-4.2-new/configure	Thu Oct 23 13:03:20 2003
@@ -2824,8 +2824,8 @@
 
 echo $ac_n "checking for owner of aegis library files""... $ac_c" 1>&6
 echo "configure:2827: checking for owner of aegis library files" >&5
-AEGIS_UID=3
-AEGIS_GID=3
+AEGIS_UID=0
+AEGIS_GID=0
 if test "$OSTYPE" != "cygwin32" -a "$OSTYPE" != "cygwin" ; then
 if test -f ${sharedstatedir}/lockfile -o -f ${libdir}/lockfile ; then
 	cat > conftest.$ac_ext << 'EOF'
@@ -2961,7 +2961,7 @@
 	do
 		if test -r $f
 		then
-			tmp=`$AWK '/^ScriptAlias.*cgi-bin/{dir=$3; sub(/\/*$/, "", dir); print dir}' $f | head -1`
+			tmp=`$AWK '/^ *ScriptAlias.*cgi-bin/{dir=$3; sub(/\/*$/, "", dir); print dir}' $f | head -1`
 			test "x$tmp" != "x" && _cv_ScriptRoot="$tmp"
 		fi
 	done
diff -uNr aegis-4.2/libaegis/change/history/label_commnd.c aegis-4.2-new/libaegis/change/history/label_commnd.c
--- aegis-4.2/libaegis/change/history/label_commnd.c	Mon Feb 25 18:14:42 2002
+++ aegis-4.2-new/libaegis/change/history/label_commnd.c	Thu Oct 23 13:03:37 2003
@@ -54,8 +54,8 @@
      * ${Label}
      *      label
      */
-    trace(("change_run_history_label_command(cp = %8.8lX, filename = \"%s\",
-	label = \"%s\",delta = %ld)\n{\n", (long)cp, src->file_name->str_text,
+    trace(("change_run_history_label_command(cp = %8.8lX, filename = \"%s\", label = \"%s\",delta = %ld)\n{\n",
+	(long)cp, src->file_name->str_text,
 	label->str_text, delta));
     assert(cp->reference_count >= 1);
 
diff -uNr aegis-4.2/libaegis/getgr_cache.c aegis-4.2-new/libaegis/getgr_cache.c
--- aegis-4.2/libaegis/getgr_cache.c	Mon Feb 25 18:14:42 2002
+++ aegis-4.2-new/libaegis/getgr_cache.c	Thu Oct 23 13:03:20 2003
@@ -20,6 +20,7 @@
  * MANIFEST: functions to manipulate getgr_caches
  */
 
+#include <sys/types.h>
 #include <ac/string.h>
 
 #include <getgr_cache.h>
diff -Nurd -x'*~' aegis-4.2.orig/common/gettime.y aegis-4.2/common/gettime.y
--- aegis-4.2.orig/common/gettime.y	2002-02-25 18:14:42.000000000 -0500
+++ aegis-4.2/common/gettime.y	2006-03-22 22:52:41.000000000 -0500
@@ -95,6 +95,7 @@
 #define epoch 1970
 
 int yyparse _((void)); /* forward */
+static int yylex _((void)); /* forward */
 
 
 /*
@@ -1263,8 +1264,6 @@
  *	int; the yacc token, 0 means the-end.
  */
 
-static int yylex _((void));
-
 static int
 yylex()
 {