[26097] in Source-Commits
/svn/athena r25388 - in trunk/third/moira: . clients/chsh debian gen regtape
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Aug 24 14:17:27 2011
Date: Wed, 24 Aug 2011 14:17:21 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201108241817.p7OIHLJv008285@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-08-24 14:17:21 -0400 (Wed, 24 Aug 2011)
New Revision: 25388
Modified:
trunk/third/moira/clients/chsh/chsh.c
trunk/third/moira/configure
trunk/third/moira/configure.in
trunk/third/moira/debian/changelog
trunk/third/moira/gen/nagios-cluster.gen
trunk/third/moira/libtool
trunk/third/moira/regtape/common.h
trunk/third/moira/regtape/staff.pc
trunk/third/moira/regtape/student.pc
trunk/third/moira/regtape/student.sql
Log:
In moira:
* Re-snapshot moira at r4048
Modified: trunk/third/moira/clients/chsh/chsh.c
===================================================================
--- trunk/third/moira/clients/chsh/chsh.c 2011-08-24 15:34:02 UTC (rev 25387)
+++ trunk/third/moira/clients/chsh/chsh.c 2011-08-24 18:17:21 UTC (rev 25388)
@@ -1,4 +1,4 @@
-/* $Id: chsh.c 4009 2010-06-22 05:50:47Z zacheiss $
+/* $Id: chsh.c 4048 2011-08-24 18:07:26Z zacheiss $
*
* Talk to the Moira database to change a person's login shell. The chosen
* shell must exist. A warning will be issued if the shell is not in
@@ -24,19 +24,18 @@
#include <string.h>
#include <unistd.h>
#include <sys/param.h>
+#include <errno.h>
#define argis(a, b) (!strcmp(*arg + 1, a) || !strcmp(*arg + 1, b))
-RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/clients/chsh/chsh.c $ $Id: chsh.c 4009 2010-06-22 05:50:47Z zacheiss $");
+RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/clients/chsh/chsh.c $ $Id: chsh.c 4048 2011-08-24 18:07:26Z zacheiss $");
void usage(void);
int get_shell(int argc, char **argv, void *username);
int get_winshell(int argc, char **argv, void *username);
int get_fmodtime(int argc, char **argv, void *username);
void check_shell(char *shell);
-#ifndef HAVE_GETUSERSHELL
-char *getusershell(void);
-#endif
+char *mr_getusershell(void);
char *whoami;
char *username;
@@ -283,7 +282,7 @@
char *valid_shell;
int ok = 0;
- while ((valid_shell = (char *)getusershell()))
+ while ((valid_shell = (char *)mr_getusershell()))
{
if (!strcmp(shell, valid_shell))
{
@@ -327,10 +326,7 @@
exit(1);
}
-#ifndef HAVE_GETUSERSHELL
-#include <sys/param.h>
-
-char *getusershell(void)
+char *mr_getusershell(void)
{
static FILE *shells = NULL;
@@ -373,4 +369,3 @@
return buf;
}
}
-#endif
Modified: trunk/third/moira/configure
===================================================================
--- trunk/third/moira/configure 2011-08-24 15:34:02 UTC (rev 25387)
+++ trunk/third/moira/configure 2011-08-24 18:17:21 UTC (rev 25388)
@@ -20991,8 +20991,7 @@
-
-for ac_func in getusershell strlcpy strlcat uname strvis
+for ac_func in strlcpy strlcat uname strvis
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
Modified: trunk/third/moira/configure.in
===================================================================
--- trunk/third/moira/configure.in 2011-08-24 15:34:02 UTC (rev 25387)
+++ trunk/third/moira/configure.in 2011-08-24 18:17:21 UTC (rev 25388)
@@ -448,7 +448,7 @@
AC_SUBST(CURSES_SUBDIRS)
-AC_CHECK_FUNCS(getusershell strlcpy strlcat uname strvis)
+AC_CHECK_FUNCS(strlcpy strlcat uname strvis)
AC_CHECK_FUNC(sigaction, AC_DEFINE(HAVE_POSIX_SIGNALS))
Modified: trunk/third/moira/debian/changelog
===================================================================
--- trunk/third/moira/debian/changelog 2011-08-24 15:34:02 UTC (rev 25387)
+++ trunk/third/moira/debian/changelog 2011-08-24 18:17:21 UTC (rev 25388)
@@ -1,4 +1,4 @@
-debathena-moira (4.0.0+svn20110728-r4045-0debathena3) unstable; urgency=low
+debathena-moira (4.0.0+svn20110728-r4048-0debathena1) unstable; urgency=low
[ Geoffrey Thomas ]
* Conflict with the stella package.
@@ -6,8 +6,9 @@
[ Jonathan Reed ]
* Use correct lt-nl comparison in moira-update-server postinst to avoid
enabling update_server everywhere.
+ * Re-snapshot moira at r4048
- -- Jonathan Reed <jdreed@mit.edu> Wed, 24 Aug 2011 11:13:27 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 24 Aug 2011 14:16:47 -0400
debathena-moira (4.0.0+svn20110728-r4045-0debathena2) unstable; urgency=low
Modified: trunk/third/moira/gen/nagios-cluster.gen
===================================================================
--- trunk/third/moira/gen/nagios-cluster.gen 2011-08-24 15:34:02 UTC (rev 25387)
+++ trunk/third/moira/gen/nagios-cluster.gen 2011-08-24 18:17:21 UTC (rev 25388)
@@ -1,6 +1,6 @@
#!/moira/bin/perl -Tw
-# $Id: nagios-cluster.gen 4031 2011-03-04 21:09:08Z jweiss $
+# $Id: nagios-cluster.gen 4047 2011-08-22 21:04:03Z jweiss $
# The following exit codes are defined and MUST BE CONSISTENT with the
# error codes the library uses:
$MR_DBMS_ERR = 47836421;
@@ -88,6 +88,12 @@
use modules-service
}
+define service{
+ host_name $name
+ contact_groups noone
+ use usbhid-service
+ }
+
END
}
Modified: trunk/third/moira/libtool
===================================================================
--- trunk/third/moira/libtool 2011-08-24 15:34:02 UTC (rev 25387)
+++ trunk/third/moira/libtool 2011-08-24 18:17:21 UTC (rev 25388)
@@ -30,10 +30,10 @@
# the same distribution terms that you use for the rest of that program.
# A sed program that does not truncate output.
-SED="/usr/athena/bin/sed"
+SED="/bin/sed"
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="/usr/athena/bin/sed -e s/^X//"
+Xsed="/bin/sed -e s/^X//"
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -44,7 +44,7 @@
# ### BEGIN LIBTOOL CONFIG
-# Libtool was configured on host brad-majors.mit.edu:
+# Libtool was configured on host contents-vnder-pressvre:
# Shell to use when invoking shell scripts.
SHELL="/bin/bash"
@@ -56,17 +56,17 @@
build_old_libs=yes
# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=yes
+build_libtool_need_lc=no
# Whether or not to disallow shared libs when runtime libs are static
allow_libtool_libs_with_static_runtimes=no
# Whether or not to optimize for fast installation.
-fast_install=needless
+fast_install=yes
# The host system.
host_alias=
-host=sparc-sun-solaris2.10
+host=x86_64-unknown-linux-gnu
# An echo program that does not interpret backslashes.
echo="echo"
@@ -85,16 +85,16 @@
with_gcc=yes
# An ERE matcher.
-EGREP="egrep"
+EGREP="grep -E"
# The linker used to build libraries.
-LD="/usr/ccs/bin/ld"
+LD="/usr/bin/ld -m elf_x86_64"
# Whether we need hard or soft links.
LN_S="ln -s"
# A BSD-compatible nm program.
-NM="/usr/ccs/bin/nm -p"
+NM="/usr/bin/nm -B"
# A symbol stripping program
STRIP="strip"
@@ -138,7 +138,7 @@
pic_mode=default
# What is the maximum length of a command?
-max_cmd_len=262144
+max_cmd_len=32768
# Does compiler simultaneously support -c and -o options?
compiler_c_o="yes"
@@ -168,10 +168,10 @@
no_builtin_flag=" -fno-builtin"
# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=""
+export_dynamic_flag_spec="\${wl}--export-dynamic"
# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="-z allextract\$convenience -z defaultextract"
+whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
# Compiler flag to generate thread-safe objects.
thread_safe_flag_spec=""
@@ -202,10 +202,12 @@
old_archive_from_expsyms_cmds=""
# Commands used to build and install a shared archive.
-archive_cmds="\$CC -shared \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags"
-archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~
- \$CC -shared \${wl}-M \${wl}\$lib.exp \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags~\$rm \$lib.exp"
-postinstall_cmds="chmod +x \$lib"
+archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
+archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
+cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~
+\$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
+ \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
+postinstall_cmds=""
postuninstall_cmds=""
# Commands used to build a loadable module (assumed same as above if empty)
@@ -213,8 +215,8 @@
module_expsym_cmds=""
# Commands to strip libraries.
-old_striplib=""
-striplib=""
+old_striplib="strip --strip-debug"
+striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -246,16 +248,16 @@
allow_undefined_flag=""
# Flag that forces no undefined symbols.
-no_undefined_flag=" -z text"
+no_undefined_flag=""
# Commands used to finish a libtool library installation in a directory.
-finish_cmds=""
+finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
# Same as above, but a single script fragment to be evaled but not shown.
finish_eval=""
# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
+global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
# Transform the output of nm in a proper C declaration
global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
@@ -264,13 +266,13 @@
global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'"
# This is the shared library runtime path variable.
-runpath_var=
+runpath_var=LD_RUN_PATH
# This is the shared library path variable.
shlibpath_var=LD_LIBRARY_PATH
# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=yes
+shlibpath_overrides_runpath=no
# How to hardcode a shared library path into an executable.
hardcode_action=immediate
@@ -280,7 +282,7 @@
# Flag to hardcode $libdir into a binary during linking.
# This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec="-R\$libdir"
+hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
# If ld is used when linking, flag to hardcode $libdir into
# a binary during linking. This must work even if $libdir does
@@ -300,7 +302,7 @@
# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
# the resulting binary.
-hardcode_shlibpath_var=no
+hardcode_shlibpath_var=unsupported
# Set to yes if building a shared library automatically hardcodes DIR into the library
# and all subsequent libraries and executables linked against it.
@@ -308,16 +310,16 @@
# Variables whose values should be saved in libtool wrapper scripts and
# restored at relink time.
-variables_saved_for_relink="PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+variables_saved_for_relink="PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=yes
+link_all_deplibs=unknown
# Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/sfw/lib/gcc/sparc-sun-solaris2.10/3.4.3/ /usr/lib/gcc/sparc-sun-solaris2.10/3.4.3/ /usr/sfw/lib/gcc/sparc-sun-solaris2.10/3.4.3/../../../../sparc-sun-solaris2.10/lib/sparc-sun-solaris2.10/3.4.3/ /usr/sfw/lib/gcc/sparc-sun-solaris2.10/3.4.3/../../../../sparc-sun-solaris2.10/lib/ /usr/ccs/lib/sparc-sun-solaris2.10/3.4.3/ /usr/ccs/lib/ /usr/sfw/lib/gcc/sparc-sun-solaris2.10/3.4.3/../../../sparc-sun-solaris2.10/3.4.3/ /usr/sfw/lib/gcc/sparc-sun-solaris2.10/3.4.3/../../../ /lib/sparc-sun-solaris2.10/3.4.3/ /lib/ /usr/lib/sparc-sun-solaris2.10/3.4.3/ /usr/lib/"
+sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64"
# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 include /etc/ld.so.conf.d/*.conf "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path=""
@@ -6767,7 +6769,7 @@
# End:
# ### BEGIN LIBTOOL TAG CONFIG: CXX
-# Libtool was configured on host brad-majors.mit.edu:
+# Libtool was configured on host contents-vnder-pressvre:
# Shell to use when invoking shell scripts.
SHELL="/bin/bash"
@@ -6785,11 +6787,11 @@
allow_libtool_libs_with_static_runtimes=no
# Whether or not to optimize for fast installation.
-fast_install=needless
+fast_install=yes
# The host system.
host_alias=
-host=sparc-sun-solaris2.10
+host=x86_64-unknown-linux-gnu
# An echo program that does not interpret backslashes.
echo="echo"
@@ -6808,16 +6810,16 @@
with_gcc=yes
# An ERE matcher.
-EGREP="egrep"
+EGREP="grep -E"
# The linker used to build libraries.
-LD="/usr/ccs/bin/ld"
+LD="/usr/bin/ld -m elf_x86_64"
# Whether we need hard or soft links.
LN_S="ln -s"
# A BSD-compatible nm program.
-NM="/usr/ccs/bin/nm -p"
+NM="/usr/bin/nm -B"
# A symbol stripping program
STRIP="strip"
@@ -6861,7 +6863,7 @@
pic_mode=default
# What is the maximum length of a command?
-max_cmd_len=262144
+max_cmd_len=32768
# Does compiler simultaneously support -c and -o options?
compiler_c_o="yes"
@@ -6891,10 +6893,10 @@
no_builtin_flag=" -fno-builtin"
# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=""
+export_dynamic_flag_spec="\${wl}--export-dynamic"
# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=""
+whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
# Compiler flag to generate thread-safe objects.
thread_safe_flag_spec=""
@@ -6925,10 +6927,9 @@
old_archive_from_expsyms_cmds=""
# Commands used to build and install a shared archive.
-archive_cmds="\$CC -shared -nostdlib \$LDFLAGS \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-h \$wl\$soname -o \$lib"
-archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~
- \$CC -shared -nostdlib \${wl}-M \$wl\$lib.exp -o \$lib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags~\$rm \$lib.exp"
-postinstall_cmds="chmod +x \$lib"
+archive_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
+archive_expsym_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib"
+postinstall_cmds=""
postuninstall_cmds=""
# Commands used to build a loadable module (assumed same as above if empty)
@@ -6936,16 +6937,16 @@
module_expsym_cmds=""
# Commands to strip libraries.
-old_striplib=""
-striplib=""
+old_striplib="strip --strip-debug"
+striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects="/usr/sfw/lib/gcc/sparc-sun-solaris2.10/3.4.3/crti.o /usr/ccs/lib/values-Xa.o /usr/sfw/lib/gcc/sparc-sun-solaris2.10/3.4.3/crtbegin.o"
+predep_objects="/usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../../../lib/crti.o /usr/lib/gcc/x86_64-linux-gnu/4.4.3/crtbeginS.o"
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects="/usr/sfw/lib/gcc/sparc-sun-solaris2.10/3.4.3/crtend.o /usr/sfw/lib/gcc/sparc-sun-solaris2.10/3.4.3/crtn.o"
+postdep_objects="/usr/lib/gcc/x86_64-linux-gnu/4.4.3/crtendS.o /usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../../../lib/crtn.o"
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -6953,11 +6954,11 @@
# Dependencies to place after the objects being linked to create a
# shared library.
-postdeps="-lstdc++ -lm -R/usr/sfw/lib -lgcc_s -R/usr/sfw/lib -lgcc_s"
+postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path="-R/usr/sfw/lib -L/usr/sfw/lib/gcc/sparc-sun-solaris2.10/3.4.3 -L/usr/sfw/lib/gcc/sparc-sun-solaris2.10/3.4.3/../../../../sparc-sun-solaris2.10/lib -L/usr/ccs/lib -L/usr/sfw/lib/gcc/sparc-sun-solaris2.10/3.4.3/../../.."
+compiler_lib_search_path="-L/usr/lib/gcc/x86_64-linux-gnu/4.4.3 -L/usr/lib/gcc/x86_64-linux-gnu/4.4.3 -L/usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../.."
# Method to check whether dependent libraries are shared objects.
deplibs_check_method="pass_all"
@@ -6969,16 +6970,16 @@
allow_undefined_flag=""
# Flag that forces no undefined symbols.
-no_undefined_flag=" \${wl}-z \${wl}defs"
+no_undefined_flag=""
# Commands used to finish a libtool library installation in a directory.
-finish_cmds=""
+finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
# Same as above, but a single script fragment to be evaled but not shown.
finish_eval=""
# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
+global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
# Transform the output of nm in a proper C declaration
global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
@@ -6987,13 +6988,13 @@
global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'"
# This is the shared library runtime path variable.
-runpath_var=
+runpath_var=LD_RUN_PATH
# This is the shared library path variable.
shlibpath_var=LD_LIBRARY_PATH
# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=yes
+shlibpath_overrides_runpath=no
# How to hardcode a shared library path into an executable.
hardcode_action=immediate
@@ -7003,7 +7004,7 @@
# Flag to hardcode $libdir into a binary during linking.
# This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec="\${wl}-R \$wl\$libdir"
+hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
# If ld is used when linking, flag to hardcode $libdir into
# a binary during linking. This must work even if $libdir does
@@ -7031,16 +7032,16 @@
# Variables whose values should be saved in libtool wrapper scripts and
# restored at relink time.
-variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=unknown
# Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/sfw/lib/gcc/sparc-sun-solaris2.10/3.4.3/ /usr/lib/gcc/sparc-sun-solaris2.10/3.4.3/ /usr/sfw/lib/gcc/sparc-sun-solaris2.10/3.4.3/../../../../sparc-sun-solaris2.10/lib/sparc-sun-solaris2.10/3.4.3/ /usr/sfw/lib/gcc/sparc-sun-solaris2.10/3.4.3/../../../../sparc-sun-solaris2.10/lib/ /usr/ccs/lib/sparc-sun-solaris2.10/3.4.3/ /usr/ccs/lib/ /usr/sfw/lib/gcc/sparc-sun-solaris2.10/3.4.3/../../../sparc-sun-solaris2.10/3.4.3/ /usr/sfw/lib/gcc/sparc-sun-solaris2.10/3.4.3/../../../ /lib/sparc-sun-solaris2.10/3.4.3/ /lib/ /usr/lib/sparc-sun-solaris2.10/3.4.3/ /usr/lib/"
+sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64"
# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 include /etc/ld.so.conf.d/*.conf "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path=""
@@ -7064,7 +7065,7 @@
# ### BEGIN LIBTOOL TAG CONFIG: F77
-# Libtool was configured on host brad-majors.mit.edu:
+# Libtool was configured on host contents-vnder-pressvre:
# Shell to use when invoking shell scripts.
SHELL="/bin/bash"
@@ -7082,11 +7083,11 @@
allow_libtool_libs_with_static_runtimes=no
# Whether or not to optimize for fast installation.
-fast_install=needless
+fast_install=yes
# The host system.
host_alias=
-host=sparc-sun-solaris2.10
+host=x86_64-unknown-linux-gnu
# An echo program that does not interpret backslashes.
echo="echo"
@@ -7099,22 +7100,22 @@
LTCC="gcc"
# A language-specific compiler.
-CC="f77"
+CC="f95"
# Is the compiler the GNU C compiler?
-with_gcc=
+with_gcc=yes
# An ERE matcher.
-EGREP="egrep"
+EGREP="grep -E"
# The linker used to build libraries.
-LD="/usr/ccs/bin/ld"
+LD="/usr/bin/ld -m elf_x86_64"
# Whether we need hard or soft links.
LN_S="ln -s"
# A BSD-compatible nm program.
-NM="/usr/ccs/bin/nm -p"
+NM="/usr/bin/nm -B"
# A symbol stripping program
STRIP="strip"
@@ -7154,14 +7155,14 @@
exeext=""
# Additional compiler flags for building library objects.
-pic_flag=""
+pic_flag=" -fPIC"
pic_mode=default
# What is the maximum length of a command?
-max_cmd_len=262144
+max_cmd_len=32768
# Does compiler simultaneously support -c and -o options?
-compiler_c_o="no"
+compiler_c_o="yes"
# Must we lock files when doing compilation ?
need_locks="no"
@@ -7188,10 +7189,10 @@
no_builtin_flag=""
# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=""
+export_dynamic_flag_spec="\${wl}--export-dynamic"
# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="-z allextract\$convenience -z defaultextract"
+whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
# Compiler flag to generate thread-safe objects.
thread_safe_flag_spec=""
@@ -7222,10 +7223,12 @@
old_archive_from_expsyms_cmds=""
# Commands used to build and install a shared archive.
-archive_cmds="\$CC -shared \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags"
-archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~
- \$CC -shared \${wl}-M \${wl}\$lib.exp \${wl}-h \${wl}\$soname -o \$lib \$libobjs \$deplibs \$compiler_flags~\$rm \$lib.exp"
-postinstall_cmds="chmod +x \$lib"
+archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
+archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
+cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~
+\$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
+ \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
+postinstall_cmds=""
postuninstall_cmds=""
# Commands used to build a loadable module (assumed same as above if empty)
@@ -7233,8 +7236,8 @@
module_expsym_cmds=""
# Commands to strip libraries.
-old_striplib=""
-striplib=""
+old_striplib="strip --strip-debug"
+striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -7266,16 +7269,16 @@
allow_undefined_flag=""
# Flag that forces no undefined symbols.
-no_undefined_flag=" -z text"
+no_undefined_flag=""
# Commands used to finish a libtool library installation in a directory.
-finish_cmds=""
+finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
# Same as above, but a single script fragment to be evaled but not shown.
finish_eval=""
# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BDRT][BDRT]*\\)[ ][ ]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
+global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
# Transform the output of nm in a proper C declaration
global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
@@ -7284,13 +7287,13 @@
global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'"
# This is the shared library runtime path variable.
-runpath_var=
+runpath_var=LD_RUN_PATH
# This is the shared library path variable.
shlibpath_var=LD_LIBRARY_PATH
# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=yes
+shlibpath_overrides_runpath=no
# How to hardcode a shared library path into an executable.
hardcode_action=immediate
@@ -7300,7 +7303,7 @@
# Flag to hardcode $libdir into a binary during linking.
# This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec="-R\$libdir"
+hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
# If ld is used when linking, flag to hardcode $libdir into
# a binary during linking. This must work even if $libdir does
@@ -7320,7 +7323,7 @@
# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
# the resulting binary.
-hardcode_shlibpath_var=no
+hardcode_shlibpath_var=unsupported
# Set to yes if building a shared library automatically hardcodes DIR into the library
# and all subsequent libraries and executables linked against it.
@@ -7328,16 +7331,16 @@
# Variables whose values should be saved in libtool wrapper scripts and
# restored at relink time.
-variables_saved_for_relink="PATH LD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=yes
+link_all_deplibs=unknown
# Compile-time system search path for libraries
-sys_lib_search_path_spec=""
+sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64"
# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 include /etc/ld.so.conf.d/*.conf "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path=""
Modified: trunk/third/moira/regtape/common.h
===================================================================
--- trunk/third/moira/regtape/common.h 2011-08-24 15:34:02 UTC (rev 25387)
+++ trunk/third/moira/regtape/common.h 2011-08-24 18:17:21 UTC (rev 25388)
@@ -1,4 +1,4 @@
-/* $Id: common.h 4041 2011-06-23 22:09:46Z zacheiss $
+/* $Id: common.h 4046 2011-08-18 18:46:48Z zacheiss $
*
* Copyright (C) 1987-1999 by the Massachusetts Institute of Technology
*
@@ -24,7 +24,7 @@
char *xphone2;
/* Only used by student load */
- char *school_code;
+ char *reg_type;
};
void fixphone(char *phone);
Modified: trunk/third/moira/regtape/staff.pc
===================================================================
--- trunk/third/moira/regtape/staff.pc 2011-08-24 15:34:02 UTC (rev 25387)
+++ trunk/third/moira/regtape/staff.pc 2011-08-24 18:17:21 UTC (rev 25388)
@@ -1,4 +1,4 @@
-/* $Id: staff.pc 4041 2011-06-23 22:09:46Z zacheiss $
+/* $Id: staff.pc 4046 2011-08-18 18:46:48Z zacheiss $
*
* Load data into Moira from Personnel Office data file
*
@@ -19,7 +19,7 @@
EXEC SQL INCLUDE sqlca;
-RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/regtape/staff.pc $ $Id: staff.pc 4041 2011-06-23 22:09:46Z zacheiss $");
+RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/regtape/staff.pc $ $Id: staff.pc 4046 2011-08-18 18:46:48Z zacheiss $");
/* File format is:
*
@@ -185,7 +185,7 @@
e.haddr = e.hphone = "";
/* Not used for employees. */
- e.school_code = "";
+ e.reg_type = "";
/* The following is really gross, but it happens to successfully convert
* new-style Warehouse office descriptions into (more-readable) old-style
Modified: trunk/third/moira/regtape/student.pc
===================================================================
--- trunk/third/moira/regtape/student.pc 2011-08-24 15:34:02 UTC (rev 25387)
+++ trunk/third/moira/regtape/student.pc 2011-08-24 18:17:21 UTC (rev 25388)
@@ -21,7 +21,7 @@
EXEC SQL INCLUDE sqlca;
-RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/regtape/student.pc $ $Id: student.pc 4041 2011-06-23 22:09:46Z zacheiss $");
+RCSID("$HeadURL: svn+ssh://svn.mit.edu/moira/trunk/moira/regtape/student.pc $ $Id: student.pc 4046 2011-08-18 18:46:48Z zacheiss $");
/* File format is:
@@ -67,8 +67,8 @@
#define LEN_OADDR 30
#define LOC_OPHONE (LOC_OADDR + LEN_OADDR)
#define LEN_OPHONE 20
-#define LOC_SCHOOL_CODE (LOC_OPHONE + LEN_OPHONE)
-#define LEN_SCHOOL_CODE 2
+#define LOC_REG_TYPE (LOC_OPHONE + LEN_OPHONE)
+#define LEN_REG_TYPE 50
EXEC SQL BEGIN DECLARE SECTION;
int who;
@@ -139,7 +139,7 @@
while ((e = get_next_entry(in)))
{
/* Don't require secure registration for cross-registered students. */
- if (!strcmp(e->school_code, "Z"))
+ if (!strcmp(e->reg_type, "Cross-Registered"))
process_entry(e, 0);
else
process_entry(e, 1);
@@ -174,7 +174,7 @@
static char state[LEN_STATE + 1], phone[LEN_PHONE + 1];
static char ophone[LEN_OPHONE + 1], title[128];
static char zip[LEN_ZIP + 1], oaddr[LEN_OADDR + 1];
- static char school_code[LEN_SCHOOL_CODE + 1];
+ static char reg_type[LEN_REG_TYPE + 1];
static int nyear = 0;
int ends_jr, ends_iii, ends_iv, ends_sr, ends_ii, ends_v;
char *p;
@@ -220,8 +220,8 @@
strtrim(oaddr);
strlcpy(ophone, &buf[LOC_OPHONE], LEN_OPHONE + 1);
strtrim(ophone);
- strlcpy(school_code, &buf[LOC_SCHOOL_CODE], LEN_SCHOOL_CODE + 1);
- strtrim(school_code);
+ strlcpy(reg_type, &buf[LOC_REG_TYPE], LEN_REG_TYPE + 1);
+ strtrim(reg_type);
e.first = first;
e.last = last;
@@ -255,7 +255,7 @@
e.dept = course;
/* Used to detect cross-registered students. */
- e.school_code = school_code;
+ e.reg_type = reg_type;
e.oaddr = oaddr;
fixaddress(e.oaddr);
Modified: trunk/third/moira/regtape/student.sql
===================================================================
--- trunk/third/moira/regtape/student.sql 2011-08-24 15:34:02 UTC (rev 25387)
+++ trunk/third/moira/regtape/student.sql 2011-08-24 18:17:21 UTC (rev 25388)
@@ -1,8 +1,8 @@
set head off
set feedback off
set pagesize 0
-set linesize 256
+set linesize 512
spool /moira/load/student.input.unsorted
-select rpad(nvl(mit_id, ' '), 9, ' ') || rpad(nvl(last_name, ' '), 30, ' ') || rpad(nvl(first_name, ' '), 30, ' ') || rpad(nvl(middle_name, ' '), 30, ' ') || rpad(nvl(student_year, ' '), 1, ' ') || rpad(nvl(department, ' '), 4, ' ') || rpad(nvl(term_street1, ' '), 30, ' ') || rpad(nvl(term_city, ' '), 40, ' ') || rpad(nvl(term_state, ' '), 2, ' ') || rpad(nvl(term_zip, ' '), 9, ' ') || rpad(nvl(term_phone1, ' '), 20, ' ') || rpad(nvl(office_location, ' '), 30, ' ') || rpad(nvl(office_phone, ' '), 20, ' ') || rpad(nvl(school_code, ' '), 1, ' ') from wareuser.moira_student;
+select rpad(nvl(mit_id, ' '), 9, ' ') || rpad(nvl(last_name, ' '), 30, ' ') || rpad(nvl(first_name, ' '), 30, ' ') || rpad(nvl(middle_name, ' '), 30, ' ') || rpad(nvl(student_year, ' '), 1, ' ') || rpad(nvl(department, ' '), 4, ' ') || rpad(nvl(term_street1, ' '), 30, ' ') || rpad(nvl(term_city, ' '), 40, ' ') || rpad(nvl(term_state, ' '), 2, ' ') || rpad(nvl(term_zip, ' '), 9, ' ') || rpad(nvl(term_phone1, ' '), 20, ' ') || rpad(nvl(office_location, ' '), 30, ' ') || rpad(nvl(office_phone, ' '), 20, ' ') || rpad(nvl(reg_type, ' '), 50, ' ') from wareuser.moira_student;
spool off
quit
