Menu
▾
▴
ark-commits — cvs commit messages for the Arusha Project
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(46) |
Nov
(42) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(29) |
Feb
(33) |
Mar
(47) |
Apr
(26) |
May
(22) |
Jun
(32) |
Jul
(26) |
Aug
(17) |
Sep
(68) |
Oct
(46) |
Nov
(8) |
Dec
(9) |
| 2003 |
Jan
(16) |
Feb
(36) |
Mar
(40) |
Apr
(15) |
May
(7) |
Jun
(18) |
Jul
(23) |
Aug
(16) |
Sep
(7) |
Oct
(30) |
Nov
(1) |
Dec
(8) |
| 2004 |
Jan
(15) |
Feb
(13) |
Mar
(2) |
Apr
(11) |
May
(90) |
Jun
(2) |
Jul
(7) |
Aug
(7) |
Sep
(9) |
Oct
|
Nov
|
Dec
(5) |
| 2005 |
Jan
|
Feb
(17) |
Mar
(18) |
Apr
(29) |
May
(2) |
Jun
(3) |
Jul
(4) |
Aug
|
Sep
|
Oct
(3) |
Nov
(2) |
Dec
|
| 2006 |
Jan
|
Feb
(4) |
Mar
(3) |
Apr
|
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
(7) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
|
From: Will P. <pa...@us...> - 2007-11-26 11:07:26
|
Update of /cvsroot/ark/sidai/vwrapper In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv628 Modified Files: toolenv Log Message: final version before rewrite Index: toolenv =================================================================== RCS file: /cvsroot/ark/sidai/vwrapper/toolenv,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** toolenv 17 May 2006 10:06:57 -0000 1.10 --- toolenv 26 Nov 2007 11:07:28 -0000 1.11 *************** *** 39,42 **** --- 39,44 ---- ################################################################ + # notes by GordonA at the end + __version__ = "$Revision$"[11:-2] *************** *** 451,452 **** --- 453,560 ---- # the end + + # further notes + + # From: "Gordon Allan" + # Subject: Re: toolenv proposal + # To: "Will Partain" + # Date: Fri, 16 Apr 2004 09:19:25 +0100 + + # > env-spec: a comma-separated list of env-spec-items + # > + # > env-spec-item: + # > Typically an Arusha package name, which has the + # > meaning of "go get environment-manipulating commands from a + # > special file that you know where it is". + # > + # > If the first character is ! , then the rest of the item is taken + # > to be a literal environment-manipulating command itself. + # > + # > The "environment-manipulating" commands comprise a little language, + # > and are executed in order, to produce the final environment that will + # > be used. The commands are: + # > + # > FOO=a/b/c set FOO exactly to a/b/c; duplicates are a problem + # > FOO+=a:b prepend a:b to an existing FOO setting + # > FOO=+a:b append a:b to an existing FOO setting + # > FOO=?a/b set FOO to a/b if it is not set already + # > FOO- remove FOO from the environment + # > comments (#-to-end-of-line) and blank lines are OK, too. + # > __clean__ throw away the environment and start fresh + # > __file__ filename read commands from filename + + # All looks good.. + + # e.g. + + # > COMPILE_ENV="!__clean__,verisity-specman" + # > COMPILE_ENV="$COMPILE_ENV,!SPECMAN_GCC=/my/strange/gcc" + # > toolenv $COMPILE_ENV sn_compile.sh foo.e bar.e -exe out + # > ... + # > RUN_ENV="!__clean__,verisity-specman,synopsys-vcs" + # > RUN_ENV="$RUN_ENV,!VCS_GUBBINS=/foo/gub,!LD_LIBRARY_PATH+=/foo/barf" + # > toolenv $RUN_ENV ./simv arg arg2 + + # [1] But there is a problem in the logic with versioning, I think... + + # Example: + + # At build/compile-time, I use a tool 'vcs' or 'specman' or 'sn_compile.sh' and with + # the wrapper stuff in place I know to add a --use-version=4.2.1 or whatever. + + # But at runtime if I invoke: + # "toolenv verisity-specman,synopsys-vcs ./my_exe" + # then what version number of 'verisity-specman' is used, what version of 'synopsys-vcs' + + # I'd expect (somehow) to be able to say: + + # > VCS_VERSION=7.0.1 + # > SPECMAN_VERSION=4.2.1 + # > ... + # > sn_compile.sh --use-version=$SPECMAN_VERSION foo.e bar.e -exe out + # > vcs --use-version=$VCS_VERSION my.v test.v specman.v other.libs + # > ... + # > RUN_ENV="!__clean__,verisity-specman-$SPECMAN_VERSION,synopsys-vcs-$VCS_VERSION" + # > RUN_ENV="$RUN_ENV,!VCS_GUBBINS=/foo/gub,!LD_LIBRARY_PATH+=/foo/barf" + # > toolenv $RUN_ENV ./simv arg arg2 + + # Can I? That way or another way? + + # Maybe there is no problem though - when I type 'specman --show-versions' it seems + # to return info that makes me think you have thought this through. are there particular + # dependencies between packages coming into play here that the user would need to + # know about? + + # [2] I like the '!' syntax - it is 'in yer face' enough that you can see some overriding is + # going on. I bet folks will forget the syntax quickly though - keep it accessible. + + # [3] The only way to introduce a 'guaranteed clean package env plus override' at *compile* + # time is to use toolenv for the compile also. e.g. instead of : + + # > SPECMAN_GUBBINS=mode-2 + # > sn_compile.sh --use-version=$SPECMAN_VERSION foo.e bar.e -exe out + + # ...you would want: + + # > toolenv "!__clean__,verisity-specman[version?],!SPECMAN_GUBBINS=mode2" sn_compile.sh foo.e bar.e -exe out + + # i.e. the versioning thing needs moved probably from the traditional tool wrapper to the toolenv way. + + # Behind the scenes I guess this is calling toolenv twice :-( + + # So.. instead you could have the toolenv string passed from the wrapped compiler with a new option syntax, e.g.: + # > sn_compile.sh --use-env="!__clean__,verisity-specman[version?],!SPECMAN_GUBBINS=mode2" foo.e bar.e -exe out + + # Hmm. but there is still stuff there that the user didnt really want to know about, i..e the "verisity-specman" package + # which arusha already knows is something that needs setup whenever 'sn_compile.sh' is called. + + # ..but I'd still like a '__clean__' before the 'implicit package' and a '!OVERRIDE=x' after it. + + # So maybe you could have a --use-env option and add a '__default__' flag which means 'get the package[s] for this + # wrapped executable *now* in the comma-separated sequence.' + + # Trying hard to keep it simple.... maybe calling toolenv twice is OK. + + # Cheers, + + # --gordon |
|
From: Will P. <pa...@us...> - 2007-04-09 13:17:20
|
Update of /cvsroot/ark/sidai/package In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv305/package Modified Files: net-config.xml Log Message: updates Index: net-config.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/net-config.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -r1.23 -r1.24 *** net-config.xml 18 Apr 2005 09:27:00 -0000 1.23 --- net-config.xml 9 Apr 2007 13:17:19 -0000 1.24 *************** *** 106,109 **** --- 106,110 ---- <param name="site_netmasks"></param> + <param name="special_localhost_names"></param> <param name="minimal_hosts_table">0</param> <param name="important_external_hosts_table"></param> *************** *** 123,126 **** --- 124,130 ---- extra_args.append('site_netmasks='+site_netmasks) + if special_localhost_names != '': + extra_args.append('special_localhost_names='+special_localhost_names) + if minimal_hosts_table != '0': extra_args.append('minimal_hosts_table='+minimal_hosts_table) |
|
From: Will P. <pa...@us...> - 2007-04-09 13:17:20
|
Update of /cvsroot/ark/sidai/net-config In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv305/net-config Modified Files: hosts.tmpl ifcfg-eth0.tmpl network.tmpl nsswitch.conf.tmpl Log Message: updates Index: hosts.tmpl =================================================================== RCS file: /cvsroot/ark/sidai/net-config/hosts.tmpl,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** hosts.tmpl 26 May 2004 18:40:26 -0000 1.17 --- hosts.tmpl 9 Apr 2007 13:17:18 -0000 1.18 *************** *** 45,48 **** --- 45,52 ---- ret['destname'] = 'etc/inet/hosts' + special_localhost_names = '' + if env.has_key('special_localhost_names'): + special_localhost_names = ' '+env['special_localhost_names'] + minimal_hosts_table = 0 # maximal, then if env.has_key('minimal_hosts_table'): *************** *** 52,56 **** # *** Autogenerated file! Edits will be lost!! *** # ! 127.0.0.1 localhost localhost.localdomain loopback <% if env.has_key('important_external_hosts_table'): --- 56,60 ---- # *** Autogenerated file! Edits will be lost!! *** # ! 127.0.0.1 localhost localhost.localdomain loopback<%= special_localhost_names =%> <% if env.has_key('important_external_hosts_table'): Index: ifcfg-eth0.tmpl =================================================================== RCS file: /cvsroot/ark/sidai/net-config/ifcfg-eth0.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** ifcfg-eth0.tmpl 18 Apr 2005 09:27:00 -0000 1.14 --- ifcfg-eth0.tmpl 9 Apr 2007 13:17:19 -0000 1.15 *************** *** 72,86 **** else: ipaddr = iface['ip-address'] netmask = iface['netmask'] ! network = iface['network'] broadcast = iface['broadcast'] print """DEVICE=%(IFACE_NAME)s ! BOOTPROTO=static BROADCAST=%(broadcast)s IPADDR=%(ipaddr)s ! NETMASK=%(netmask)s ! NETWORK=%(network)s ! ONBOOT=yes ! TYPE=Ethernet""" % vars() %> --- 72,91 ---- else: ipaddr = iface['ip-address'] + hwaddr = iface['mac-address'] netmask = iface['netmask'] ! gateway = iface['gateway'] broadcast = iface['broadcast'] print """DEVICE=%(IFACE_NAME)s ! BOOTPROTO=none ! HWADDR=%(hwaddr)s ! ONBOOT=yes ! NETMASK=%(netmask)s BROADCAST=%(broadcast)s IPADDR=%(ipaddr)s ! USERCTL=no ! PEERING=yes ! GATEWAY=%(gateway)s ! TYPE=Ethernet ! IPV6INIT=no""" % vars() %> Index: network.tmpl =================================================================== RCS file: /cvsroot/ark/sidai/net-config/network.tmpl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** network.tmpl 26 May 2004 18:40:26 -0000 1.12 --- network.tmpl 9 Apr 2007 13:17:19 -0000 1.13 *************** *** 68,71 **** --- 68,72 ---- if info_src == 'dhcp': print """NETWORKING=yes + NETWORKING_IPV6=no HOSTNAME=%(hostn)s""" % vars() Index: nsswitch.conf.tmpl =================================================================== RCS file: /cvsroot/ark/sidai/net-config/nsswitch.conf.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** nsswitch.conf.tmpl 26 May 2004 18:40:26 -0000 1.8 --- nsswitch.conf.tmpl 9 Apr 2007 13:17:19 -0000 1.9 *************** *** 47,51 **** # /etc/nsswitch.conf: Autogenerated file! Edits will be lost!! # ! # Modeled on /etc/nsswitch.files from Solaris, with additions # from Linux land. # --- 47,51 ---- # /etc/nsswitch.conf: Autogenerated file! Edits will be lost!! # ! # Modeled on /etc/nsswitch.dns from Solaris, with additions # from Linux land. # *************** *** 89,101 **** group: files ! hosts: files[NOTFOUND=continue UNAVAIL=return] dns ! ipnodes: files ! # (a solaris8 thing) ! # Uncomment the following line and comment out the above to resolve ! # both IPv4 and IPv6 addresses from the ipnodes databases. Note that ! # IPv4 addresses are searched in all of the ipnodes databases before ! # searching the hosts databases. Before turning this option on, consult ! # the Network Administration Guide for more details on using IPv6. ! #ipnodes: files dns aliases: files --- 89,97 ---- group: files ! hosts: files dns ! # Solaris: ! # Note that IPv4 addresses are searched for in all of the ipnodes databases ! # before searching the hosts databases. ! ipnodes: files dns aliases: files |
|
From: Will P. <pa...@us...> - 2007-03-12 10:53:48
|
Update of /cvsroot/ark/sidai/user-setup In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7182/user-setup Modified Files: common.paths common.sh csh.start-shell sh.start-shell Log Message: misc. updates Index: common.paths =================================================================== RCS file: /cvsroot/ark/sidai/user-setup/common.paths,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** common.paths 30 Jul 2005 12:35:33 -0000 1.8 --- common.paths 12 Mar 2007 10:53:42 -0000 1.9 *************** *** 50,53 **** --- 50,58 ---- fi + # /etc/profile.d/*sh may accumulate interesting things in PATH, + # so we can't just toss all that + path_as_was=$PATH + manpath_as_was=$MANPATH + PATH=$HOME/pub/share/bin:$HOME/bin PATH=$PATH:/our/bin *************** *** 57,61 **** PATH=$PATH:/usr/ccs/bin ! PATH=$PATH:. MANPATH=$HOME/pub/share/man --- 62,66 ---- PATH=$PATH:/usr/ccs/bin ! PATH=$PATH:$path_as_was:. MANPATH=$HOME/pub/share/man *************** *** 63,67 **** MANPATH=$MANPATH:/usr/share/man:/usr/man:/usr/sfw/man MANPATH=$MANPATH:/usr/openwin/share/man:/usr/openwin/man:/usr/dt/share/man:/usr/dt/man ! MANPATH=$MANPATH:/usr/ccs/man: # note, the empty element at the end of the MANPATH means that the # file /etc/man.conf is used under linux --- 68,72 ---- MANPATH=$MANPATH:/usr/share/man:/usr/man:/usr/sfw/man MANPATH=$MANPATH:/usr/openwin/share/man:/usr/openwin/man:/usr/dt/share/man:/usr/dt/man ! MANPATH=$MANPATH:/usr/ccs/man:$manpath_as_was: # note, the empty element at the end of the MANPATH means that the # file /etc/man.conf is used under linux Index: common.sh =================================================================== RCS file: /cvsroot/ark/sidai/user-setup/common.sh,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** common.sh 17 May 2006 10:06:57 -0000 1.17 --- common.sh 12 Mar 2007 10:53:42 -0000 1.18 *************** *** 199,206 **** --- 199,221 ---- # # terminal stuff -- must avoid if doing the CDE thing... + + if tty -s ; then + is_a_tty='yes' + else + is_a_tty='no' + fi + + # NB: NB: some of this logic is necessarily repeated in start-a-shell + if [ "x$DT" != 'x' ] ; then login_from=CDE login_term=CDE_console + elif [ "x$is_a_tty" = 'xno' ] ; then + # dubious, yes; but we really don't want to be running tset, etc + # if there is simply no terminal there + login_from=Linux + login_term=Linux_WM + elif [ "x$GDMSESSION" != 'x' ] ; then login_from=Linux # really GNOME Index: csh.start-shell =================================================================== RCS file: /cvsroot/ark/sidai/user-setup/csh.start-shell,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** csh.start-shell 26 May 2004 18:40:49 -0000 1.2 --- csh.start-shell 12 Mar 2007 10:53:42 -0000 1.3 *************** *** 40,44 **** #echo reading sidai csh.start-shell ! if ( ! $?DT ) then if ( "$SHELL_AS_WAS" != "$SHELL" ) then switch ( "$SHELL" ) --- 40,45 ---- #echo reading sidai csh.start-shell ! if tty -s then ! if ( ! $?DT ) then if ( "$SHELL_AS_WAS" != "$SHELL" ) then switch ( "$SHELL" ) *************** *** 48,66 **** case */bash: ! echo "switching to $SHELL..." # really switch shell exec $SHELL --login # '-login' because it's a login shell breaksw case */tcsh: ! echo "switching to $SHELL..." # really switch shell exec $SHELL # already a login shell breaksw default: ! echo "switching to $SHELL..." # really switch shell exec $SHELL '-l' # '-l' because it's a login shell breaksw endsw endif endif --- 49,68 ---- case */bash: ! #?echo "switching to $SHELL..." # really switch shell exec $SHELL --login # '-login' because it's a login shell breaksw case */tcsh: ! #?echo "switching to $SHELL..." # really switch shell exec $SHELL # already a login shell breaksw default: ! #?echo "switching to $SHELL..." # really switch shell exec $SHELL '-l' # '-l' because it's a login shell breaksw endsw endif + endif endif Index: sh.start-shell =================================================================== RCS file: /cvsroot/ark/sidai/user-setup/sh.start-shell,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** sh.start-shell 17 May 2006 10:06:57 -0000 1.9 --- sh.start-shell 12 Mar 2007 10:53:42 -0000 1.10 *************** *** 40,44 **** #echo reading sidai sh.start-shell ! if [ -z "${DT:-}" -a -z "${GDMSESSION:-}" -a "x$SHELL_AS_WAS" != "x$SHELL" ] ; then # this will be true when we exec: SHELL_AS_WAS="$SHELL"; export SHELL_AS_WAS --- 40,47 ---- #echo reading sidai sh.start-shell ! # NB: don't do this if it isn't a tty! ! ! if tty -s ; then ! if [ -z "${DT:-}" -a -z "${GDMSESSION:-}" -a "x$SHELL_AS_WAS" != "x$SHELL" ] ; then # this will be true when we exec: SHELL_AS_WAS="$SHELL"; export SHELL_AS_WAS *************** *** 47,57 **** /bin/sh) echo NO JOB CONTROL >&2 # stuffed! ;; ! */bash) echo "switching to $SHELL..." >&2 # really switch shell exec $SHELL --login # '-login' because it's a login shell ;; ! *) echo "switching to $SHELL..." >&2 # really switch shell exec $SHELL '-l' # '-l' because it's a login shell ;; esac fi - --- 50,60 ---- /bin/sh) echo NO JOB CONTROL >&2 # stuffed! ;; ! */bash) #?echo "switching to $SHELL..." >&2 # really switch shell exec $SHELL --login # '-login' because it's a login shell ;; ! *) #?echo "switching to $SHELL..." >&2 # really switch shell exec $SHELL '-l' # '-l' because it's a login shell ;; esac + fi fi |
|
From: Will P. <pa...@us...> - 2007-03-12 10:53:47
|
Update of /cvsroot/ark/sidai/dchunk-utils In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7182/dchunk-utils Modified Files: sync-replica Removed Files: prune-replica-snapshots Log Message: misc. updates Index: sync-replica =================================================================== RCS file: /cvsroot/ark/sidai/dchunk-utils/sync-replica,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** sync-replica 7 Feb 2006 11:40:21 -0000 1.11 --- sync-replica 12 Mar 2007 10:53:41 -0000 1.12 *************** *** 204,213 **** if use_dated_snapshots: ! rsyncer_cmd = '%(RSYNCER)s %(rsyncer_verbose)s %(rsyncer_pretend)s -e "%(SSH)s -x" --rsync-path=%(SRC_HOST_RSYNCER)s --bwlimit=100 --archive --delete %(excludes)s --delete-excluded %(prior_dir_stuff)s %(src_hostname)s:%(src_dir)s/ %(dest_dir)s'%vars() elif use_rdiff_backup: # ToDo: HACK HACK HACK (shouldn't have hard PYTHONPATH in there) rsyncer_cmd = "%(RSYNCER)s %(rsyncer_verbose)s --remote-schema '%(SSH)s -x %%s /usr/bin/env PYTHONPATH=/our/share/ark:/our/.-ark-deploy/rdiff-backup--0.13.6/lib/python2.3/site-packages %(SRC_HOST_RSYNCER)s --server' %(excludes)s %(src_hostname)s::%(src_dir)s %(dest_dir)s"%vars() else: ! rsyncer_cmd = '%(RSYNCER)s %(rsyncer_verbose)s %(rsyncer_pretend)s -e "%(SSH)s -x" --rsync-path=%(SRC_HOST_RSYNCER)s --bwlimit=100 --archive --delete %(excludes)s --delete-excluded %(src_hostname)s:%(src_dir)s/ %(dest_dir)s'%vars() if pretend or verbose: --- 204,213 ---- if use_dated_snapshots: ! rsyncer_cmd = '%(RSYNCER)s %(rsyncer_verbose)s %(rsyncer_pretend)s -e "%(SSH)s -x" --rsync-path=%(SRC_HOST_RSYNCER)s --archive --delete %(excludes)s --delete-excluded %(prior_dir_stuff)s %(src_hostname)s:%(src_dir)s/ %(dest_dir)s'%vars() elif use_rdiff_backup: # ToDo: HACK HACK HACK (shouldn't have hard PYTHONPATH in there) rsyncer_cmd = "%(RSYNCER)s %(rsyncer_verbose)s --remote-schema '%(SSH)s -x %%s /usr/bin/env PYTHONPATH=/our/share/ark:/our/.-ark-deploy/rdiff-backup--0.13.6/lib/python2.3/site-packages %(SRC_HOST_RSYNCER)s --server' %(excludes)s %(src_hostname)s::%(src_dir)s %(dest_dir)s"%vars() else: ! rsyncer_cmd = '%(RSYNCER)s %(rsyncer_verbose)s %(rsyncer_pretend)s -e "%(SSH)s -x" --rsync-path=%(SRC_HOST_RSYNCER)s --archive --delete %(excludes)s --delete-excluded %(src_hostname)s:%(src_dir)s/ %(dest_dir)s'%vars() if pretend or verbose: --- prune-replica-snapshots DELETED --- |
|
From: Will P. <pa...@us...> - 2007-03-12 10:53:47
|
Update of /cvsroot/ark/sidai/webpages In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7182/webpages Modified Files: hostname-change.htma Log Message: misc. updates Index: hostname-change.htma =================================================================== RCS file: /cvsroot/ark/sidai/webpages/hostname-change.htma,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** hostname-change.htma 26 May 2004 18:40:51 -0000 1.6 --- hostname-change.htma 12 Mar 2007 10:53:42 -0000 1.7 *************** *** 109,112 **** --- 109,113 ---- But back to our modest change-the-hostname task... Files to edit: <pre> + /etc/inet/ipnodes (NB!) /etc/hostname.<interface-name> (hme0, le0, ...) /etc/nodename |
|
From: Will P. <pa...@us...> - 2007-03-12 10:53:47
|
Update of /cvsroot/ark/sidai/gen-utils In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7182/gen-utils Modified Files: diskstat Log Message: misc. updates Index: diskstat =================================================================== RCS file: /cvsroot/ark/sidai/gen-utils/diskstat,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** diskstat 26 May 2004 18:40:21 -0000 1.13 --- diskstat 12 Mar 2007 10:53:41 -0000 1.14 *************** *** 104,107 **** --- 104,118 ---- # ............................................................... + IGNORABLE = { # first word in a line that indicates things we don't care about + '/devices':1 + , 'Filesystem':1 + , 'ctfs':1 + , 'fd':1 + , 'mnttab':1 + , 'objfs':1 + , 'proc':1 + , 'swap':1 + } + def do_once(hosts, SHOW_ALL, THRESHOLD): RUN_HOST = ark.host.RUN_HOST() *************** *** 137,144 **** l = l[:-1] + l2 ! if string.find(stuff[0],'/dev/') >= 0 \ and string.find(l,'%') >= 0: # a data line... DF_DATA[hostname].append(l) l = pipe.readline() --- 148,165 ---- l = l[:-1] + l2 ! if stuff[0] in IGNORABLE: ! pass ! ! elif string.find(stuff[0],'/dev/') >= 0 \ ! and string.find(l,'%') >= 0: # a data line... ! DF_DATA[hostname].append(l) ! ! elif string.find(stuff[0],'pool') >= 0 \ and string.find(l,'%') >= 0: # a data line... DF_DATA[hostname].append(l) + else: + print >>sys.stderr,'what?=',l + l = pipe.readline() |
|
From: Will P. <pa...@us...> - 2007-03-12 10:53:47
|
Update of /cvsroot/ark/sidai/package-utils In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7182/package-utils Modified Files: tidy-ark-areas Log Message: misc. updates Index: tidy-ark-areas =================================================================== RCS file: /cvsroot/ark/sidai/package-utils/tidy-ark-areas,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** tidy-ark-areas 12 Jul 2004 09:53:59 -0000 1.18 --- tidy-ark-areas 12 Mar 2007 10:53:41 -0000 1.19 *************** *** 139,145 **** for pkg in all_real_pkgs: for host in all_hosts: ! status = pkg.status(ARK_HOST_CTXT=host) ! ! is_relevant = pkg.isRelevant(host_ctxt=host,field_of_interest=what) #print pkg.idString,is_relevant,status,what --- 139,149 ---- for pkg in all_real_pkgs: for host in all_hosts: ! try: ! status = pkg.status(ARK_HOST_CTXT=host) ! is_relevant = pkg.isRelevant(host_ctxt=host,field_of_interest=what) ! except ark.error.MethodDoesntApply,foo: ! # that host doesn't know *anything* about this package ! status = '???' #??? ! is_relevant = 0 #print pkg.idString,is_relevant,status,what |
|
From: Will P. <pa...@us...> - 2007-03-12 10:53:46
|
Update of /cvsroot/ark/sidai/package In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7182/package Modified Files: verisity-specman.xml verisity-vpa-environment.xml Log Message: misc. updates Index: verisity-specman.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/verisity-specman.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -r1.23 -r1.24 *** verisity-specman.xml 4 Mar 2005 14:50:30 -0000 1.23 --- verisity-specman.xml 12 Mar 2007 10:53:41 -0000 1.24 *************** *** 103,106 **** --- 103,107 ---- SPECMAN_HOME=@param:SPECMAN_HOME@ SPECMAN_WEB_BROWSER=?@param:SPECMAN_WEB_BROWSER@ + SN_ENABLE_LICENSE_RELEASE=yes PATH+=@param:SPECMAN_HOME@/@param:PLATFORM@:@param:SPECMAN_HOME@/bin </param> Index: verisity-vpa-environment.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/verisity-vpa-environment.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** verisity-vpa-environment.xml 9 May 2005 09:46:09 -0000 1.1 --- verisity-vpa-environment.xml 12 Mar 2007 10:53:41 -0000 1.2 *************** *** 87,90 **** --- 87,91 ---- SPECMAN_HOME=@param:SPECMAN_HOME@ SPECMAN_WEB_BROWSER=?@param:SPECMAN_WEB_BROWSER@ + SN_ENABLE_LICENSE_RELEASE=yes PATH+=@param:SPECMAN_HOME@/@param:PLATFORM@:@param:SPECMAN_HOME@/bin </param> |
|
From: Will P. <pa...@us...> - 2007-03-12 10:53:45
|
Update of /cvsroot/ark/sidai/arkbase/ark In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7182/arkbase/ark Modified Files: dchunk.py Log Message: misc. updates Index: dchunk.py =================================================================== RCS file: /cvsroot/ark/sidai/arkbase/ark/dchunk.py,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** dchunk.py 16 Nov 2005 14:20:17 -0000 1.35 --- dchunk.py 12 Mar 2007 10:53:40 -0000 1.36 *************** *** 402,405 **** --- 402,408 ---- if self._tbl.has_key('rsync_excludes'): res = res + ' ' + self._tbl['rsync_excludes'] + # replace any newlines with spaces + # (newline-separated is much nicer to maintain) + res = string.replace(res,"\n",' ') return res |
|
From: Will P. <pa...@us...> - 2006-05-17 10:07:36
|
Update of /cvsroot/ark/sidai/user-setup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12254/user-setup Modified Files: bash.profile common.sh dot.emacs sh.start-shell zsh.login Log Message: updates Index: bash.profile =================================================================== RCS file: /cvsroot/ark/sidai/user-setup/bash.profile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** bash.profile 26 May 2004 18:40:49 -0000 1.8 --- bash.profile 17 May 2006 10:06:57 -0000 1.9 *************** *** 59,65 **** if [ -f ~/.bashrc ]; then . ~/.bashrc; fi - # mesg is basically useless these days: - mesg n - # ======================================================================== # run the generic script and produce sh shell output --- 59,62 ---- Index: common.sh =================================================================== RCS file: /cvsroot/ark/sidai/user-setup/common.sh,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** common.sh 7 Feb 2006 11:40:22 -0000 1.16 --- common.sh 17 May 2006 10:06:57 -0000 1.17 *************** *** 203,206 **** --- 203,210 ---- login_term=CDE_console + elif [ "x$GDMSESSION" != 'x' ] ; then + login_from=Linux # really GNOME + login_term=Linux_WM + elif [ "x$TERM" != 'x' -a "x$TERM" = xlinux -a "$IN_XINITRC" = 1 ] ; then login_from=Linux *************** *** 208,212 **** else # not in CDE or linux-console land - mesg n # Stop naughty users writing on your terminal # if it says vt100 at this point (e.g. coming in from cainam), --- 212,215 ---- *************** *** 298,301 **** --- 301,307 ---- ;; + Linux_WM) + ;; + Linux_console) ;; *************** *** 371,374 **** --- 377,383 ---- : i.e. doing the X startup thing... + elif [ $login_term = 'Linux_WM' ] ; then + : i.e. doing the X startup thing... + elif [ $login_term = 'Linux_console' -a "$IN_XINITRC" = '1' ] ; then : i.e. doing the X startup thing... Index: dot.emacs =================================================================== RCS file: /cvsroot/ark/sidai/user-setup/dot.emacs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** dot.emacs 4 Mar 2005 14:50:31 -0000 1.7 --- dot.emacs 17 May 2006 10:06:57 -0000 1.8 *************** *** 1,4 **** --- 1,5 ---- ;; general .emacs stuff; ;; assumes XEmacs 21, probably shouldn't + (message "am here") ; ;; we're not wimps -- we can handle 'em... Index: sh.start-shell =================================================================== RCS file: /cvsroot/ark/sidai/user-setup/sh.start-shell,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** sh.start-shell 26 May 2004 18:40:49 -0000 1.8 --- sh.start-shell 17 May 2006 10:06:57 -0000 1.9 *************** *** 40,44 **** #echo reading sidai sh.start-shell ! if [ -z "${DT:-}" -a "x$SHELL_AS_WAS" != "x$SHELL" ] ; then # this will be true when we exec: SHELL_AS_WAS="$SHELL"; export SHELL_AS_WAS --- 40,44 ---- #echo reading sidai sh.start-shell ! if [ -z "${DT:-}" -a -z "${GDMSESSION:-}" -a "x$SHELL_AS_WAS" != "x$SHELL" ] ; then # this will be true when we exec: SHELL_AS_WAS="$SHELL"; export SHELL_AS_WAS Index: zsh.login =================================================================== RCS file: /cvsroot/ark/sidai/user-setup/zsh.login,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** zsh.login 26 May 2004 18:40:49 -0000 1.7 --- zsh.login 17 May 2006 10:06:57 -0000 1.8 *************** *** 58,64 **** if [ -f ~/.zshrc ]; then . ~/.zshrc; fi - # mesg is basically useless these days: - mesg n - # ======================================================================== # run the generic script and produce sh shell output --- 58,61 ---- |
|
From: Will P. <pa...@us...> - 2006-05-17 10:07:36
|
Update of /cvsroot/ark/sidai/vwrapper In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12254/vwrapper Modified Files: toolenv Log Message: updates Index: toolenv =================================================================== RCS file: /cvsroot/ark/sidai/vwrapper/toolenv,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** toolenv 5 Jul 2004 13:47:05 -0000 1.9 --- toolenv 17 May 2006 10:06:57 -0000 1.10 *************** *** 46,50 **** sys.path.append('/our/lib/sidai-vwrapper') if not os.environ.has_key('ARK_PROFILE'): ! os.environ['ARK_PROFILE'] = '/home/partain/.ark_profile' # EOHACK --- 46,51 ---- sys.path.append('/our/lib/sidai-vwrapper') if not os.environ.has_key('ARK_PROFILE'): ! sys.stderr.write("Sorry, the ARK_PROFILE environment variable needs to be set.\n") ! sys.exit(1) # EOHACK |
|
From: Will P. <pa...@us...> - 2006-05-17 10:07:33
|
Update of /cvsroot/ark/sidai/package In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12254/package Modified Files: openssh-config.xml samba-config.xml Log Message: updates Index: openssh-config.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/openssh-config.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -r1.23 -r1.24 *** openssh-config.xml 11 Jul 2005 09:07:10 -0000 1.23 --- openssh-config.xml 17 May 2006 10:06:57 -0000 1.24 *************** *** 102,106 **** <param name="MKDIR_P">@host:MKDIR-P@</param> ! <param name="SSH_KEYGEN" default="no" /> <param name="FORCE">no</param> <param name="prefix">!sidai_prefix</param> --- 102,106 ---- <param name="MKDIR_P">@host:MKDIR-P@</param> ! <param name="SSH_KEYGEN">/usr/bin/ssh-keygen</param> <param name="FORCE">no</param> <param name="prefix">!sidai_prefix</param> *************** *** 147,149 **** --- 147,159 ---- $INIT_D_DIR/sshd start ]]></code></restart> + + <!-- ..................................................... --> + <reload> + <param name="INIT_D_DIR">@host:INIT-D-DIR@</param> + + <code privileges="root" recordable="no"><![CDATA[ + cd / # so the daemon does not end up w/ a random dir as its cwd + + $INIT_D_DIR/sshd reload + ]]></code></reload> </package> Index: samba-config.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/samba-config.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** samba-config.xml 31 Oct 2005 09:47:38 -0000 1.7 --- samba-config.xml 17 May 2006 10:06:57 -0000 1.8 *************** *** 60,68 **** ^var/local/samba$ copy root root 755 ^var/local/samba/locks$ copy root root 755 - ^var/local/samba/locks/DUMMY$ copy root root 444 ^var/local/samba/logs$ copy root root 755 ! ^var/local/samba/logs/DUMMY$ copy root root 444 ! ^var/local/samba/private$ copy root root 700 ! ^var/local/samba/private/DUMMY$ copy root root 444 </entry></table> </deployment-spec> --- 60,65 ---- ^var/local/samba$ copy root root 755 ^var/local/samba/locks$ copy root root 755 ^var/local/samba/logs$ copy root root 755 ! ^var/local/samba/private$ copy root root 700 </entry></table> </deployment-spec> *************** *** 76,80 **** <compile> <param name="PSEUDO_PROTO_HOST" default="no" /><!-- it *must* be set by now --> ! <param name="FILES">smb.conf.tmpl,locks-DUMMY.tmpl,logs-DUMMY.tmpl,private-DUMMY.tmpl</param> </compile> --- 73,77 ---- <compile> <param name="PSEUDO_PROTO_HOST" default="no" /><!-- it *must* be set by now --> ! <param name="FILES">smb.conf.tmpl</param> </compile> |
|
From: Will P. <pa...@us...> - 2006-05-17 10:07:03
|
Update of /cvsroot/ark/sidai/dchunk-utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12254/dchunk-utils Modified Files: prune-replica-snapshots Log Message: updates Index: prune-replica-snapshots =================================================================== RCS file: /cvsroot/ark/sidai/dchunk-utils/prune-replica-snapshots,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** prune-replica-snapshots 6 Mar 2006 18:07:58 -0000 1.2 --- prune-replica-snapshots 17 May 2006 10:06:57 -0000 1.3 *************** *** 110,113 **** --- 110,114 ---- # non_opts = opts.cmdLineNonOptions() if len(non_opts) < 2: + os.system('/bin/pwd') sys.stderr.write('Must have at least two yyyy-mm-dd arguments\n') sys.exit(1) |
|
From: Will P. <pa...@us...> - 2006-05-17 10:04:31
|
Update of /cvsroot/ark/ARK/arkbase/ark In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11456 Modified Files: ChangeLog package.py Log Message: change behavior when there is no package manifest file Index: ChangeLog =================================================================== RCS file: /cvsroot/ark/ARK/arkbase/ark/ChangeLog,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -r1.49 -r1.50 *** ChangeLog 18 Apr 2005 14:08:39 -0000 1.49 --- ChangeLog 17 May 2006 10:03:54 -0000 1.50 *************** *** 1,2 **** --- 1,8 ---- + 2006-05-17 Will Partain <pa...@dc...> + + * package.py (ArkPkg.sidaiManifestThings): Change the way we react + to no manifest file for a package; in particular, a "satellite" deployment + may not have a manifest file to use. + 2005-04-18 Will Partain <pa...@dc...> Index: package.py =================================================================== RCS file: /cvsroot/ark/ARK/arkbase/ark/package.py,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -r1.53 -r1.54 *** package.py 4 Mar 2005 14:51:21 -0000 1.53 --- package.py 17 May 2006 10:03:54 -0000 1.54 *************** *** 777,781 **** except IOError,e: if e.errno == errno.ENOENT: ! raise ark.error.NoManifestFile,sumfile else: raise IOError,e --- 777,785 ---- except IOError,e: if e.errno == errno.ENOENT: ! # for a "satellite" deployment (e.g.), there may *not* be an md5sums file. ! # In that case, we assume a normal symlink-y deployment (type 1), ! # and carry on ! return (1,[]) ! # old: raise ark.error.NoManifestFile,sumfile else: raise IOError,e |
|
From: Will P. <pa...@us...> - 2006-03-09 10:57:14
|
Update of /cvsroot/ark/sidai/webpages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15705 Modified Files: rhlinux-install.htma Log Message: change remark to be true for ext3 filesystems Index: rhlinux-install.htma =================================================================== RCS file: /cvsroot/ark/sidai/webpages/rhlinux-install.htma,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** rhlinux-install.htma 26 May 2004 18:40:51 -0000 1.14 --- rhlinux-install.htma 9 Mar 2006 10:56:36 -0000 1.15 *************** *** 160,167 **** partitioning are not listed here... <p> ! Remember the number of blocks in the just-created partition(s). ! You need it in the next step. ! <p> ! Create a filesystem: <tt>sudo mke2fs /dev/sdb1 <number-of-blocks></tt> <p> Check it: <tt>sudo fsck -f /dev/sdb1</tt> --- 160,165 ---- partitioning are not listed here... <p> ! Create a filesystem: <tt>sudo mke2fs -j /dev/sdb1</tt> (the ! <tt>-j</tt> ensures it is an `ext3' filesystem) <p> Check it: <tt>sudo fsck -f /dev/sdb1</tt> |
|
From: Will P. <pa...@us...> - 2006-03-06 18:08:07
|
Update of /cvsroot/ark/sidai/dchunk-utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5114 Modified Files: prune-replica-snapshots Log Message: fix typo Index: prune-replica-snapshots =================================================================== RCS file: /cvsroot/ark/sidai/dchunk-utils/prune-replica-snapshots,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** prune-replica-snapshots 6 Mar 2006 12:01:32 -0000 1.1 --- prune-replica-snapshots 6 Mar 2006 18:07:58 -0000 1.2 *************** *** 205,209 **** # get rid of all symlinks and then the empty directories in the output: find_cmd1 = 'find %(dest_dir)s -type l -print0 | xargs -0r /bin/rm 2> /dev/null' % vars() ! find_cmd1 = 'find %(dest_dir)s -depth -type d -print0 | xargs -0r /bin/rmdir 2> /dev/null' % vars() find_cmd = find_cmd1 + '; ' + find_cmd2 if pretend or verbose: --- 205,209 ---- # get rid of all symlinks and then the empty directories in the output: find_cmd1 = 'find %(dest_dir)s -type l -print0 | xargs -0r /bin/rm 2> /dev/null' % vars() ! find_cmd2 = 'find %(dest_dir)s -depth -type d -print0 | xargs -0r /bin/rmdir 2> /dev/null' % vars() find_cmd = find_cmd1 + '; ' + find_cmd2 if pretend or verbose: |
|
From: Will P. <pa...@us...> - 2006-03-06 12:02:10
|
Update of /cvsroot/ark/sidai/dchunk-utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8884/dchunk-utils Added Files: prune-replica-snapshots Log Message: addition --- NEW FILE --- #! /usr/bin/env python ################################################################ # # Copyright (c) 2006, Will Partain # All rights reserved. # # Redistribution and use in source and binary forms, with or # without modification, are permitted provided that the # following conditions are met: # # * Redistributions of source code must retain the above # copyright notice, this list of conditions and the # following disclaimer. # # * Redistributions in binary form must reproduce the above # copyright notice, this list of conditions and the # following disclaimer in the documentation and/or other # materials provided with the distribution. # # * Neither the name of the Arusha Project nor the names of # its contributors may be used to endorse or promote # products derived from this software without specific prior # written permission. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND # CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, # INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT # NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ################################################################ __version__ = "$Revision: 1.1 $"[11:-2] __doc__ = """ ???? """ #import ark.control import ark.host import getopt,os,re,string,sys #import datetime,os,re,string,sys #import ark.error _yyyymmdd_spec = re.compile(r'^\d\d\d\d-\d\d-\d\d$') verbose = None pretend = None MKDIR_P = '/no/idea/about/mkdir -p' RSYNC = '/no/idea/about/rsync' rsync_verbose = '' rsync_pretend = '' def main(): usage = """Blah blah blah""" getopt_spec = [ 'help' , 'verbose' , 'pretend' , 'rsync-verbose' ] global verbose, pretend global MKDIR_P, RSYNC global rsync_verbose, rsync_pretend # print >>sys.stderr,'v=',verbose,'p=',pretend try: opts, non_opts = getopt.getopt(sys.argv[1:], "hvpr", ["help","verbose","pretend","rsync-verbose"]) except getopt.GetoptError: print >>sys.stderr, usage sys.exit(1) for o, a in opts: if o in ("-h", "--help"): print >>sys.stderr, usage sys.exit(0) if o in ("-v", "--verbose"): verbose = True rsync_verbose = '-v' if o in ("-p", "--pretend"): pretend = True rsync_pretend = '--dry-run' if o in ("-r", "--rsync-verbose"): rsync_verbose = '-v' # opts = ark.control.ArkControl(ark.control.ArkOptions(getopt_spec,usage)) # verbose = opts.isSet('verbose') # if opts.isSet('quiet'): verbose = None # pretend = opts.isSet('pretend') # print >>sys.stderr,'v=',verbose,'p=',pretend # some facts about the machine we're on... RUN_HOST = ark.host.RUN_HOST() # the host we're on here... MKDIR_P = RUN_HOST.pgmResource('MKDIR-P') RSYNC = RUN_HOST.pgmResource('RSYNC') # if opts.isSet('rsync-verbose'): rsync_verbose = '-v' # look over these directory args pretty carefully: # non_opts = opts.cmdLineNonOptions() if len(non_opts) < 2: sys.stderr.write('Must have at least two yyyy-mm-dd arguments\n') sys.exit(1) dirs = non_opts for dir in dirs: match = _yyyymmdd_spec.match(dir) if not match: sys.stderr.write('Argument must be of the form yyyy-mm-dd: %s\n'%dir) sys.exit(1) if not os.path.exists(dir): sys.stderr.write('No such directory: %s\n'%dir) sys.exit(1) if not os.path.isdir(dir): sys.stderr.write('Exists, but isn\'t a directory: %s\n'%dir) sys.exit(1) # the dir names *must* be in order: dirs.sort() for i in xrange(len(dirs)-1): me = dirs[i] rest = dirs[i+1:] do_dir(me,rest) # the business end def do_dir(dir,later_dirs): # first, we check for a sentinel that says "We've done this already" if verbose: print >>sys.stderr, "Doing", dir, "..." sentinel_file = os.path.join(dir,".ARK-SNAPSHOT-PRUNED") if os.path.exists(sentinel_file): if verbose: print >>sys.stderr, "NB: previously done: ",dir return # make the directory we're going to copy to (it mustn't exist): dest_dir = dir+".tmp" if os.path.exists(dest_dir): print >>sys.stderr,"dest dir must not exist:",dest_dir sys.exit(1) # can only have 20 compare-dest args: if len(later_dirs) > 20: later_dirs = later_dirs[0:19] later_dirs_stuff = string.join(map(lambda x:'--compare-dest=../'+x,later_dirs),' ') exclude_items = [ "'*.msf'" # index files for Thunderbird, etc. , ".cache" , ".svn" , "Trash" , "WebStatistics.txt" , "WebStatistics.txt,v" , "cyrus.cache" , "cyrus.index" , "cyrus.squat" , "spam-virii" , "spam05-08" , "spam09-15" , "spam16plus" ] excludes = string.join(map(lambda x:'--exclude='+x,exclude_items),' ') if pretend or verbose: print >> sys.stderr, '[ -d %s ] || %s %s' % (dest_dir,MKDIR_P,dest_dir) if not pretend and not os.path.isdir(dest_dir): (mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime) = os.stat(dir) # mkdir then: os.makedirs(dest_dir) # and ensure permissions are what we want os.chown(dest_dir,uid,gid) os.chmod(dest_dir,mode) # do the serious business: rsync = RSYNC r_verbose = rsync_verbose r_pretend = rsync_pretend rsync_cmd = '%(rsync)s %(r_verbose)s %(r_pretend)s --archive --delete %(excludes)s --delete-excluded %(later_dirs_stuff)s %(dir)s/ %(dest_dir)s' % vars() if pretend or verbose: print >> sys.stderr, rsync_cmd if not pretend: # Note: if rsync, it is safe to just run it: status = os.system(rsync_cmd) if status != 0: raise ('failed: '+rsync_cmd) # get rid of all symlinks and then the empty directories in the output: find_cmd1 = 'find %(dest_dir)s -type l -print0 | xargs -0r /bin/rm 2> /dev/null' % vars() find_cmd1 = 'find %(dest_dir)s -depth -type d -print0 | xargs -0r /bin/rmdir 2> /dev/null' % vars() find_cmd = find_cmd1 + '; ' + find_cmd2 if pretend or verbose: print >> sys.stderr, find_cmd if not pretend: # Note: if rsync, it is safe to just run it: status = os.system(find_cmd) # We actually *expect* a failing status, so we don't worry about it # move the new to the old: NB: it might have been trashed entirely move_cmd = '/bin/mv %(dir)s %(dir)s.orig && if [ -d %(dest_dir)s ] ; then /bin/mv %(dest_dir)s %(dir)s; fi' % vars() if pretend or verbose: print >> sys.stderr, move_cmd if not pretend: # Note: if move, it is safe to just run it: status = os.system(move_cmd) if status != 0: raise ('failed: '+move_cmd) # finally, put in the sentinel to indicate "We've done this already" if pretend or verbose: print >>sys.stderr, "touch",sentinel_file if not pretend: cmd = "if [ -d %(dir)s ] ; then touch %(sentinel_file)s; fi" % vars() status = os.system(cmd) if status != 0: raise ('failed: '+cmd) return # we're done # --------------------------------------------------------------- # =============================================================== if __name__ == '__main__': main() |
|
From: Will P. <pa...@us...> - 2006-02-07 18:24:06
|
Update of /cvsroot/ark/sidai/user-setup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28042/user-setup Modified Files: common.sh zsh.rc Log Message: updates Index: common.sh =================================================================== RCS file: /cvsroot/ark/sidai/user-setup/common.sh,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** common.sh 4 Mar 2005 14:50:31 -0000 1.15 --- common.sh 7 Feb 2006 11:40:22 -0000 1.16 *************** *** 275,278 **** --- 275,287 ---- output_cmd '' 'set noglob' + # where is tset, by the way? + if [ -x /usr/bin/tset ] ; then + TSET=/usr/bin/tset + elif [ -x /usr/ucb/tset ] ; then + TSET=/usr/ucb/tset + else + TSET=tset # oh well, take a chance that PATH has it... + fi + case "$login_term" in CDE_console) *************** *** 293,297 **** known) ! output_cmd "eval \`tset -s -Q | sed -e 's,CDE terminal emulator,dtterm,'\`" ;; --- 302,306 ---- known) ! output_cmd "eval \`$TSET -s -Q | sed -e 's,CDE terminal emulator,dtterm,'\`" ;; *************** *** 299,306 **** case "$uname_said" in hppa-hpux*) ! output_cmd "eval \`tset -s -Q -m ':vt100'\`" ;; *) ! output_cmd "tset -s -Q -m ':vt100' >/dev/null" ;; esac --- 308,315 ---- case "$uname_said" in hppa-hpux*) ! output_cmd "eval \`$TSET -s -Q -m ':vt100'\`" ;; *) ! output_cmd "$TSET -s -Q -m ':vt100' >/dev/null" ;; esac *************** *** 310,317 **** case "$uname_said" in hppa-hpux*) ! output_cmd "eval \`tset -s -Q -m ':xterm'\`" ;; *) ! output_cmd "tset -s -Q -m ':xterm' >/dev/null" ;; esac --- 319,326 ---- case "$uname_said" in hppa-hpux*) ! output_cmd "eval \`$TSET -s -Q -m ':xterm'\`" ;; *) ! output_cmd "$TSET -s -Q -m ':xterm' >/dev/null" ;; esac *************** *** 322,329 **** case "$uname_said" in hppa-hpux*) ! output_cmd "eval \`tset -s -Q -m ':?vt100' \`" ;; *) ! output_cmd "tset -s -Q -m ':?xterm' >/dev/null" ;; esac --- 331,338 ---- case "$uname_said" in hppa-hpux*) ! output_cmd "eval \`$TSET -s -Q -m ':?vt100' \`" ;; *) ! output_cmd "$TSET -s -Q -m ':?xterm' >/dev/null" ;; esac Index: zsh.rc =================================================================== RCS file: /cvsroot/ark/sidai/user-setup/zsh.rc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** zsh.rc 26 May 2004 18:40:50 -0000 1.6 --- zsh.rc 7 Feb 2006 11:40:22 -0000 1.7 *************** *** 42,47 **** # # for absolutely all z-shells: ! limit coredumpsize 0 ! limit descriptors 120 # We'd really like to unlimit `datasize' but (at least on HP-UX) # that's a kernel property. --- 42,47 ---- # # for absolutely all z-shells: ! #not after 2005.11:limit coredumpsize 0 ! #not after 2005.11:limit descriptors 120 # We'd really like to unlimit `datasize' but (at least on HP-UX) # that's a kernel property. |
|
From: Will P. <pa...@us...> - 2006-02-07 18:04:31
|
Update of /cvsroot/ark/sidai/sys-cron-config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28042/sys-cron-config Modified Files: sys-user-crontab.tmpl Log Message: updates Index: sys-user-crontab.tmpl =================================================================== RCS file: /cvsroot/ark/sidai/sys-cron-config/sys-user-crontab.tmpl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** sys-user-crontab.tmpl 4 Apr 2005 10:09:41 -0000 1.12 --- sys-user-crontab.tmpl 7 Feb 2006 11:40:22 -0000 1.13 *************** *** 217,220 **** --- 217,223 ---- for dchunk in ark.dchunk.ArkDChunksMgr().unpackSpecs(['ALL']): + #import sys + #sys.stderr.write('dc=%s\n'%(dchunk.idString)) + if not dchunk.appliesToHost(thishost): continue try: *************** *** 232,240 **** if replica.active() != 'yes': continue - #import sys #sys.stderr.write('dc=%s,rn=%s\n'%(dchunk.idString,replica_name)) (dest_hostname,dest_dir,nfs4_junk_info) = replica.masterHostnameAndDir() ! if dest_hostname != thishost._name: continue if string.find(replica_name,'replica') != 0: --- 235,244 ---- if replica.active() != 'yes': continue #sys.stderr.write('dc=%s,rn=%s\n'%(dchunk.idString,replica_name)) (dest_hostname,dest_dir,nfs4_junk_info) = replica.masterHostnameAndDir() ! if dest_hostname != thishost._name: ! #sys.stderr.write('omitted %s %s\n'%(dest_hostname,thishost._name)) ! continue if string.find(replica_name,'replica') != 0: |
|
From: Will P. <pa...@us...> - 2006-02-07 15:30:06
|
Update of /cvsroot/ark/sidai/dchunk-utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28042/dchunk-utils Modified Files: acct-for-diskspace sync-replica Log Message: updates Index: acct-for-diskspace =================================================================== RCS file: /cvsroot/ark/sidai/dchunk-utils/acct-for-diskspace,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** acct-for-diskspace 4 Apr 2005 10:09:38 -0000 1.16 --- acct-for-diskspace 7 Feb 2006 11:40:21 -0000 1.17 *************** *** 71,75 **** """ ! import os,re,string,sys import ark.control import ark.dchunk --- 71,75 ---- """ ! import errno,os,re,string,sys import ark.control import ark.dchunk *************** *** 208,213 **** (device,mountpt,mttype) = match.group(1,2,3) ! # print l, ! # print '<',device,'><',mountpt, '><',mttype, '>' # we're only interested in real, live disk mounts, --- 208,213 ---- (device,mountpt,mttype) = match.group(1,2,3) ! #print l, ! #print '<',device,'><',mountpt, '><',mttype, '>' # we're only interested in real, live disk mounts, *************** *** 261,265 **** def drillDown(level,host,dir): hostname = host._name ! #sys.stderr.write('lev%d: %s:%s\n'%(level,hostname,dir)) if ACCTD.has_key(hostname) and ACCTD[hostname].has_key(dir): ACCTD[hostname][dir] = 2 # done --- 261,265 ---- def drillDown(level,host,dir): hostname = host._name ! # sys.stderr.write('lev%d: %s:%s\n'%(level,hostname,dir)) if ACCTD.has_key(hostname) and ACCTD[hostname].has_key(dir): ACCTD[hostname][dir] = 2 # done *************** *** 273,276 **** --- 273,286 ---- print 'f %s:%s' % (hostname,dir) return + except OSError,e: + if e.errno == errno.EACCES: + print 'P %s:%s # permissions...' % (hostname,dir) + return + else: + # print e.errno + raise # again + except: + # print `e` + raise if not in_play: *************** *** 283,287 **** for sd in substuff: ! dsd = '%s/%s' % (dir,sd) if IGNORE_DIRS.has_key(sd): continue # specifically uninteresting if not in_play: --- 293,300 ---- for sd in substuff: ! if dir == '/': ! dsd = '/%s' % (sd) ! else: ! dsd = '%s/%s' % (dir,sd) if IGNORE_DIRS.has_key(sd): continue # specifically uninteresting if not in_play: Index: sync-replica =================================================================== RCS file: /cvsroot/ark/sidai/dchunk-utils/sync-replica,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** sync-replica 30 Jul 2005 12:35:33 -0000 1.10 --- sync-replica 7 Feb 2006 11:40:21 -0000 1.11 *************** *** 2,6 **** ################################################################ # ! # Copyright (c) 2002-2004, Will Partain # All rights reserved. # --- 2,6 ---- ################################################################ # ! # Copyright (c) 2002-2005, Will Partain # All rights reserved. # *************** *** 55,67 **** --help Print this message and exit. --rdiff-backup Use rdiff-backup instead of rsync. --rsyncer-verbose Run rsync/rdiff-backup verbosely. """ ! import os,re,sys #import os,re,string,sys #import ark.control import ark.dchunk import ark.host #import ark.error --- 55,70 ---- --help Print this message and exit. --rdiff-backup Use rdiff-backup instead of rsync. + --dated-snapshots Do dated snapshots with rsync (instead + of plain rsync or rdiff-backup) --rsyncer-verbose Run rsync/rdiff-backup verbosely. """ ! import datetime,os,re,string,sys #import os,re,string,sys #import ark.control import ark.dchunk import ark.host + import ark.utils # globNormal #import ark.error *************** *** 77,80 **** --- 80,84 ---- , 'pretend' , 'rdiff-backup' + , 'dated-snapshots' , 'rsyncer-verbose' ] *************** *** 84,88 **** if opts.isSet('quiet'): verbose = None pretend = opts.isSet('pretend') ! use_rdiff_backup = opts.isSet('rdiff-backup') non_opts = opts.cmdLineNonOptions() --- 88,97 ---- if opts.isSet('quiet'): verbose = None pretend = opts.isSet('pretend') ! use_rdiff_backup = opts.isSet('rdiff-backup') ! use_dated_snapshots = opts.isSet('dated-snapshots') ! ! if use_rdiff_backup and use_dated_snapshots: ! sys.stderr.write('Only one of: --rdiff-backup, --dated-snapshots\n') ! sys.exit(1) non_opts = opts.cmdLineNonOptions() *************** *** 117,120 **** --- 126,156 ---- (dest_hostname,dest_dir,nfs4_junk_inFo) = replica.masterHostnameAndDir() + if use_dated_snapshots: + prior_dir = dest_dir # remember this root... + prior_dir_stuff = '' + today = datetime.date.today().isoformat() # YYYY-MM-DD + dest_dir += '/%s' % (today) + + cands = ark.utils.globNormal(prior_dir,host_spec='.',globb='????-??-??') + #print >>sys.stderr, 'cands=',cands + + # there could be zero to many candidates; we want --link-dest args + # for (up to) the last five [arbitrary] candidates. Not one, + # just in case that dir was messed up (and we'll do a new + # copy). Not all of them, because it's pointless. + cands.sort() + cands.reverse() + + # mustn't be today: (strip those off) + while len(cands) > 0 and cands[0] == today: + cands = cands[1:] + + #print >>sys.stderr, 'cands=',cands + if len(cands) > 5: # truncate + cands = cands[0:5] + if len(cands) >= 1: + prior_dir_stuff = '--link-dest=' + prior_dir + '/' + string.join(cands, ' --link-dest='+prior_dir+'/') + #print >>sys.stderr, 'cands now=',prior_dir_stuff + RUN_HOST = ark.host.RUN_HOST() # the host we're on here... hosts_mgr = ark.host.ArkHostsMgr() *************** *** 152,169 **** if pretend or verbose: print >> sys.stderr, '[ -d %(dest_dir)s ] || %(MKDIR_P)s %(dest_dir)s' % vars() - if not pretend: - if not os.path.isdir(dest_dir): - if os.path.exists(dest_dir): - sys.stderr.write('Exists but isn\'t a directory:%s\n'%dest_dir) - sys.exit(1) - # mkdir -p then: - os.makedirs(dest_dir) - # and ensure permissions are what we want - # (ToDo: do this for every component in dest_dir that we mkdir??) - os.chown(dest_dir,replica_uid,replica_gid) - os.chmod(dest_dir,replica_mode) ! # ToDo: HACK HACK HACK (shouldn't have hard PYTHONPATH in there) ! if use_rdiff_backup: rsyncer_cmd = "%(RSYNCER)s %(rsyncer_verbose)s --remote-schema '%(SSH)s -x %%s /usr/bin/env PYTHONPATH=/our/share/ark:/our/.-ark-deploy/rdiff-backup--0.13.6/lib/python2.3/site-packages %(SRC_HOST_RSYNCER)s --server' %(excludes)s %(src_hostname)s::%(src_dir)s %(dest_dir)s"%vars() else: --- 188,210 ---- if pretend or verbose: print >> sys.stderr, '[ -d %(dest_dir)s ] || %(MKDIR_P)s %(dest_dir)s' % vars() ! if not pretend: ! dirs_to_make = [ dest_dir ] ! for d in dirs_to_make : ! if not os.path.isdir(d): ! if os.path.exists(d): ! sys.stderr.write('Exists but isn\'t a directory:%s\n'%d) ! sys.exit(1) ! # mkdir -p then: ! os.makedirs(d) ! # and ensure permissions are what we want ! # (ToDo: do this for every component in d that we mkdir??) ! os.chown(d,replica_uid,replica_gid) ! os.chmod(d,replica_mode) ! ! if use_dated_snapshots: ! rsyncer_cmd = '%(RSYNCER)s %(rsyncer_verbose)s %(rsyncer_pretend)s -e "%(SSH)s -x" --rsync-path=%(SRC_HOST_RSYNCER)s --bwlimit=100 --archive --delete %(excludes)s --delete-excluded %(prior_dir_stuff)s %(src_hostname)s:%(src_dir)s/ %(dest_dir)s'%vars() ! elif use_rdiff_backup: ! # ToDo: HACK HACK HACK (shouldn't have hard PYTHONPATH in there) rsyncer_cmd = "%(RSYNCER)s %(rsyncer_verbose)s --remote-schema '%(SSH)s -x %%s /usr/bin/env PYTHONPATH=/our/share/ark:/our/.-ark-deploy/rdiff-backup--0.13.6/lib/python2.3/site-packages %(SRC_HOST_RSYNCER)s --server' %(excludes)s %(src_hostname)s::%(src_dir)s %(dest_dir)s"%vars() else: |
|
From: Will P. <pa...@us...> - 2006-02-07 14:40:04
|
Update of /cvsroot/ark/sidai/package In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28042/package Modified Files: john-the-ripper.xml openssh.xml openssl.xml python.xml Log Message: updates Index: john-the-ripper.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/john-the-ripper.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** john-the-ripper.xml 16 Nov 2005 14:20:18 -0000 1.11 --- john-the-ripper.xml 7 Feb 2006 11:40:21 -0000 1.12 *************** *** 83,87 **** nice ./john whatever-file - </notes> --- 83,86 ---- *************** *** 99,102 **** --- 98,105 ---- case "$PKG_VERSION" in + 1.7*) # hope it's OK + exit 0 + ;; + 1.6.3[9876]) # drop through to the patch ;; Index: openssh.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/openssh.xml,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -r1.31 -r1.32 *** openssh.xml 11 Jul 2005 09:07:10 -0000 1.31 --- openssh.xml 7 Feb 2006 11:40:21 -0000 1.32 *************** *** 87,91 **** <!-- ........................................ --> <install-bits> ! <param name="target">install-nokeys</param> </install-bits> --- 87,91 ---- <!-- ........................................ --> <install-bits> ! <param name="target">install-nosysconf</param> </install-bits> *************** *** 108,112 **** PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` ! if [ "$PKG_VERSION" = "3.9p1" -o "$PKG_VERSION" = "3.8.1p1" -o "$PKG_VERSION" = "3.7.1p2" ] ; then $PATCH -p0 <<\EOPATCH diff -ru1 ../openssh-3.7p1/Makefile.in ./Makefile.in --- 108,120 ---- PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` ! case "$PKG_VERSION" in ! 4.?p?) # drop through to the patch ! ;; ! *) # nothing to do ! echo "do not how how to patch version $PKG_VERSION (maybe too old?)" ! exit 1 ! ;; ! esac ! $PATCH -p0 <<\EOPATCH diff -ru1 ../openssh-3.7p1/Makefile.in ./Makefile.in *************** *** 117,448 **** - (umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH)) $(INSTALL) -m 0755 $(STRIP_OPT) ssh $(DESTDIR)$(bindir)/ssh - @@ -279,32 +278,2 @@ - ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 - - if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ - - $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ - - fi - - @if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ - - $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \ - - fi - - @if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ - - $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ - - fi - - @if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ - - if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ - - $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \ - - fi ; \ - - fi - - @if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \ - - if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \ - - echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \ - - mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \ - - else \ - - $(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \ - - fi ; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \ - - fi - - EOPATCH - - elif [ "$PKG_VERSION" = "3.6.1p2" -o "$PKG_VERSION" = "3.5p1" ] ; then - $PATCH -p0 <<\EOPATCH - diff -ru1 ../openssh-3.5p1/Makefile.in ./Makefile.in - --- ../openssh-3.5p1/Makefile.in 2002-07-14 18:02:21.000000000 +0100 - +++ ./Makefile.in 2002-10-17 22:06:46.274606000 +0100 - @@ -218,3 +218,2 @@ - $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir) - - (umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH)) - $(INSTALL) -m 0755 -s ssh $(DESTDIR)$(bindir)/ssh - @@ -251,33 +250,2 @@ - ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 - - if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ - - $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ - - fi - - @if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ - - $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \ - - fi - - @if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ - - $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ - - fi - - @if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ - - $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ - - if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ - - $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \ - - fi ; \ - - fi - - @if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \ - - if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \ - - echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \ - - mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \ - - else \ - - $(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \ - - fi ; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \ - - fi - - EOPATCH - - elif [ "$PKG_VERSION" = "3.4p1" ] ; then - $PATCH -p0 <<\EOPATCH - diff -ru1 ../openssh-3.4p1/Makefile.in ./Makefile.in - --- ../openssh-3.4p1/Makefile.in 2002-06-21 02:38:53.000000000 +0100 - +++ ./Makefile.in 2002-06-26 11:47:28.583100000 +0100 - @@ -199,3 +199,3 @@ - - -install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key - +install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files - install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files - @@ -246,33 +246,2 @@ - ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 - - if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ - - $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ - - fi - - if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ - - $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \ - - fi - - if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ - - $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ - - fi - - if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ - - $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ - - if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ - - $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \ - - fi ; \ - - fi - - if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \ - - if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \ - - echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \ - - mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \ - - else \ - - $(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \ - - fi ; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \ - - fi - - EOPATCH - - #..................................................................... - elif [ "$PKG_VERSION" = "3.2.2p1" ] ; then - $PATCH -p0 <<\EOPATCH - diff -ru1 ../openssh-3.2.2p1/Makefile.in ./Makefile.in - --- ../openssh-3.2.2p1/Makefile.in Tue Feb 26 19:24:22 2002 - +++ ./Makefile.in Fri Mar 8 11:59:42 2002 - @@ -185,3 +185,3 @@ - - -install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key - +install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files - install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files - @@ -224,33 +224,2 @@ - ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 - - if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ - - $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ - - fi - - if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ - - $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \ - - fi - - if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ - - $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ - - fi - - if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ - - $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ - - if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ - - $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \ - - fi ; \ - - fi - - if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \ - - if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \ - - echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \ - - mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \ - - else \ - - $(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \ - - fi ; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \ - - fi - - EOPATCH - - #..................................................................... - elif [ "$PKG_VERSION" = "3.1p1" ] ; then - $PATCH -p0 <<\EOPATCH - diff -ru1 ../openssh-3.1p1/Makefile.in ./Makefile.in - --- ../openssh-3.1p1/Makefile.in Tue Feb 26 19:24:22 2002 - +++ ./Makefile.in Fri Mar 8 11:59:42 2002 - @@ -185,3 +185,3 @@ - - -install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key - +install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files - install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files - @@ -224,33 +224,2 @@ - ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 - - if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ - - $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ - - fi - - if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ - - $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \ - - fi - - if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ - - $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ - - fi - - if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ - - $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ - - if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ - - $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \ - - fi ; \ - - fi - - if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \ - - if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \ - - echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \ - - mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \ - - else \ - - $(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \ - - fi ; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \ - - fi - EOPATCH - - #..................................................................... - elif [ "$PKG_VERSION" = "3.0.2p1" ] ; then - $PATCH -p0 <<\EOPATCH - diff -ru1 ../openssh-3.0.2p1/Makefile.in ./Makefile.in - --- ../openssh-3.0.2p1/Makefile.in Mon Oct 22 01:53:59 2001 - +++ ./Makefile.in Sun Nov 11 20:16:46 2001 - @@ -178,3 +178,3 @@ - - -install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key - +install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files - install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files - @@ -215,33 +215,2 @@ - #@FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin - - if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ - - $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ - - fi - - if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ - - $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \ - - fi - - if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ - - $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ - - fi - - if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ - - $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ - - if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ - - $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \ - - fi ; \ - - fi - - if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \ - - if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \ - - echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \ - - mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \ - - else \ - - $(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \ - - fi ; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \ - - fi - EOPATCH - - #..................................................................... - elif [ "$PKG_VERSION" = "2.9.9p2" ] ; then - $PATCH -p0 <<\EOPATCH - diff -ru1 ../openssh-2.9.9p2/Makefile.in ./Makefile.in - diff -r -C 2 ../openssh-2.9.9p2/Makefile.in ./Makefile.in - *** ../openssh-2.9.9p2/Makefile.in Tue Sep 18 06:06:22 2001 - --- ./Makefile.in Tue Oct 9 18:13:53 2001 - *************** - *** 174,178 **** - (cd scard ; $(MAKE) -f Makefile.in distprep) - - ! install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key - install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files - - --- 174,178 ---- - (cd scard ; $(MAKE) -f Makefile.in distprep) - - ! install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files - install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files - - *************** - *** 214,245 **** - $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ - fi - - if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ - - $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \ - - fi - - if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ - - $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ - - fi - - if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ - - $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ - - if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ - - $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \ - - fi ; \ - - fi - - if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \ - - if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \ - - echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \ - - mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \ - - else \ - - $(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \ - - fi ; \ - - else \ - - echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \ - - fi - - host-key: ssh-keygen$(EXEEXT) - --- 214,217 ---- - EOPATCH - - #..................................................................... - else - echo "do not how how to patch version $PKG_VERSION" - exit 1 - fi ]]></code></patch> --- 125,129 ---- Index: openssl.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/openssl.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** openssl.xml 30 Jul 2005 12:35:33 -0000 1.22 --- openssl.xml 7 Feb 2006 11:40:21 -0000 1.23 *************** *** 90,96 **** <constraint><dependency type="essential" name="." on-method="host-linkfarm" /></constraint> - <!-- strange constraint, but apparently true --> - <constraint><dependency type="normal" name="perl" /></constraint> - <param name="PKG_PROTO_HOST">!proxy_for.idString</param> <param name="FIND">@proxy-host:FIND@</param> --- 90,93 ---- Index: python.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/python.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -r1.26 -r1.27 *** python.xml 16 Nov 2005 14:20:18 -0000 1.26 --- python.xml 7 Feb 2006 11:40:21 -0000 1.27 *************** *** 161,165 **** # NB: there may be arbitrary weird stuff here; check closely ! if [ "$PKG_VERSION" = "2.3.4" ] ; then $PATCH -p0 <<\EOPATCH --- 161,455 ---- # NB: there may be arbitrary weird stuff here; check closely ! if [ "$PKG_VERSION" = "2.4.2" ] ; then ! ! $PATCH -p0 <<\EOPATCH ! diff -rU1 ../python-2.4.2/Modules/getpath.c ./Modules/getpath.c ! --- ../python-2.4.2/Modules/getpath.c 2004-08-08 02:00:47.000000000 +0100 ! +++ ./Modules/getpath.c 2005-11-19 10:44:23.000000000 +0000 ! @@ -284,2 +284,4 @@ ! /* Search from argv0_path, until root is found */ ! +#if 0 ! + /* partain: no */ ! copy_absolute(prefix, argv0_path); ! @@ -294,2 +296,3 @@ ! } while (prefix[0]); ! +#endif ! ! @@ -337,2 +340,4 @@ ! /* Search from argv0_path, until root is found */ ! +#if 0 ! + /* partain: no */ ! copy_absolute(exec_prefix, argv0_path); ! @@ -347,2 +352,3 @@ ! } while (exec_prefix[0]); ! +#endif ! ! diff -rU1 ../python-2.4.2/setup.py ./setup.py ! --- ../python-2.4.2/setup.py 2005-03-09 22:27:24.000000000 +0000 ! +++ ./setup.py 2005-11-19 10:49:52.000000000 +0000 ! @@ -38,8 +38,3 @@ ! ! - # Check the standard locations ! - for dir in std_dirs: ! - f = os.path.join(dir, filename) ! - if os.path.exists(f): return [] ! - ! - # Check the additional directories ! + # Check the additional directories [partain:we prefer these] ! for dir in paths: ! @@ -49,2 +44,7 @@ ! ! + # Check the standard locations ! + for dir in std_dirs: ! + f = os.path.join(dir, filename) ! + if os.path.exists(f): return [] ! + ! # Not found anywhere ! @@ -241,4 +241,4 @@ ! # Ensure that /usr/local is always used ! - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') ! - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') ! +# add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') ! +# add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') ! ! @@ -268,8 +268,23 @@ ! lib_dirs = self.compiler.library_dirs + [ ! - '/lib64', '/usr/lib64', ! - '/lib', '/usr/lib', ! +# '/lib64', '/usr/lib64', ! +# '/lib', '/usr/lib', ! ] ! - inc_dirs = self.compiler.include_dirs + ['/usr/include'] ! + inc_dirs = self.compiler.include_dirs # + ['/usr/include'] ! exts = [] ! ! + import string ! + flags = open('Iflags') ! + for i in string.split(flags.read(),' '): ! + if i[0:2] != '-I': raise 'odd Iflag'+i ! + inc_dirs.append(i[2:]) ! + flags.close() ! + flags = open('Lflags') ! + for i in string.split(flags.read(),' '): ! + if i[0:6] == '-Wl,-R': continue ! + if i == '-Wl,+b,:\n': continue ! + if i[0:2] != '-L': raise 'odd Lflag'+i ! + lib_dirs.append(i[2:]) ! + flags.close() ! + #debug:sys.stderr.write('Iflags=%s, Lflags=%s\n'%(`inc_dirs`,`lib_dirs`)) ! + ! platform = self.get_platform() ! @@ -423,11 +438,11 @@ ! # readline ! - if self.compiler.find_library_file(lib_dirs, 'readline'): ! + if self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'readline'): ! readline_libs = ['readline'] ! - if self.compiler.find_library_file(lib_dirs, ! + if self.compiler.find_library_file(lib_dirs+['/usr/lib'], ! 'ncurses'): ! readline_libs.append('ncurses') ! - elif self.compiler.find_library_file(lib_dirs, 'curses'): ! + elif self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'curses'): ! readline_libs.append('curses') ! elif self.compiler.find_library_file(lib_dirs + ! - ['/usr/lib/termcap'], ! + ['/usr/lib/termcap','/usr/lib'], ! 'termcap'): ! @@ -435,3 +450,5 @@ ! exts.append( Extension('readline', ['readline.c'], ! - library_dirs=['/usr/lib/termcap'], ! + include_dirs=inc_dirs, ! + library_dirs=['/usr/lib/termcap']+lib_dirs, ! + runtime_library_dirs=lib_dirs, ! libraries=readline_libs) ) ! @@ -440,3 +457,3 @@ ! ! - if self.compiler.find_library_file(lib_dirs, 'crypt'): ! + if self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'crypt'): ! libs = ['crypt'] ! @@ -453,5 +470,5 @@ ! # Detect SSL support for the socket module (via _ssl) ! - ssl_incs = find_file('openssl/ssl.h', inc_dirs, ! - ['/usr/local/ssl/include', ! - '/usr/contrib/ssl/include/' ! + ssl_incs = find_file('openssl/ssl.h', inc_dirs+['/usr/include'], ! + [#'/usr/local/ssl/include', ! + #'/usr/contrib/ssl/include/' ! ] ! @@ -459,3 +476,3 @@ ! if ssl_incs is not None: ! - krb5_h = find_file('krb5.h', inc_dirs, ! + krb5_h = find_file('krb5.h', inc_dirs+['/usr/include'], ! ['/usr/kerberos/include']) ! @@ -464,4 +481,4 @@ ! ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, ! - ['/usr/local/ssl/lib', ! - '/usr/contrib/ssl/lib/' ! + [#'/usr/local/ssl/lib', ! + #'/usr/contrib/ssl/lib/' ! ] ) ! @@ -471,4 +488,5 @@ ! exts.append( Extension('_ssl', ['_ssl.c'], ! - include_dirs = ssl_incs, ! - library_dirs = ssl_libs, ! + include_dirs = inc_dirs, ! + library_dirs = lib_dirs, ! + runtime_library_dirs = lib_dirs, ! libraries = ['ssl', 'crypto'], ! @@ -498,23 +516,23 @@ ! db_inc_paths = [ ! - '/usr/include/db4', ! - '/usr/local/include/db4', ! - '/opt/sfw/include/db4', ! - '/sw/include/db4', ! - '/usr/include/db3', ! - '/usr/local/include/db3', ! - '/opt/sfw/include/db3', ! - '/sw/include/db3', ! +# '/usr/include/db4', ! +# '/usr/local/include/db4', ! +# '/opt/sfw/include/db4', ! +# '/sw/include/db4', ! +# '/usr/include/db3', ! +# '/usr/local/include/db3', ! +# '/opt/sfw/include/db3', ! +# '/sw/include/db3', ! ] ! # 4.x minor number specific paths ! - for x in (0,1,2,3): ! - db_inc_paths.append('/usr/include/db4%d' % x) ! - db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x) ! - db_inc_paths.append('/usr/local/include/db4%d' % x) ! - db_inc_paths.append('/pkg/db-4.%d/include' % x) ! - # 3.x minor number specific paths ! - for x in (2,3): ! - db_inc_paths.append('/usr/include/db3%d' % x) ! - db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x) ! - db_inc_paths.append('/usr/local/include/db3%d' % x) ! - db_inc_paths.append('/pkg/db-3.%d/include' % x) ! +# for x in (0,1,2,3): ! +# db_inc_paths.append('/usr/include/db4%d' % x) ! +# db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x) ! +# db_inc_paths.append('/usr/local/include/db4%d' % x) ! +# db_inc_paths.append('/pkg/db-4.%d/include' % x) ! +# # 3.x minor number specific paths ! +# for x in (2,3): ! +# db_inc_paths.append('/usr/include/db3%d' % x) ! +# db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x) ! +# db_inc_paths.append('/usr/local/include/db3%d' % x) ! +# db_inc_paths.append('/pkg/db-3.%d/include' % x) ! ! @@ -594,5 +612,6 @@ ! exts.append(Extension('_bsddb', ['_bsddb.c'], ! - library_dirs=dblib_dir, ! - runtime_library_dirs=dblib_dir, ! - include_dirs=db_incs, ! + # NB: ignore what the searching {didn't find,found} ! + library_dirs=lib_dirs, ! + runtime_library_dirs=lib_dirs, ! + include_dirs=inc_dirs, ! libraries=dblibs)) ! @@ -629,5 +648,5 @@ ! if platform not in ['cygwin']: ! - if find_file("ndbm.h", inc_dirs, []) is not None: ! + if find_file("ndbm.h", inc_dirs+['/usr/include'], []) is not None: ! # Some systems have -lndbm, others don't ! - if self.compiler.find_library_file(lib_dirs, 'ndbm'): ! + if self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'ndbm'): ! ndbm_libs = ['ndbm'] ! @@ -638,4 +657,4 @@ ! libraries = ndbm_libs ) ) ! - elif (self.compiler.find_library_file(lib_dirs, 'gdbm') ! - and find_file("gdbm/ndbm.h", inc_dirs, []) is not None): ! + elif (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'gdbm') ! + and find_file("gdbm/ndbm.h", inc_dirs+['/usr/include'], []) is not None): ! exts.append( Extension('dbm', ['dbmmodule.c'], ! @@ -653,3 +672,3 @@ ! # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm: ! - if (self.compiler.find_library_file(lib_dirs, 'gdbm')): ! + if (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'gdbm')): ! exts.append( Extension('gdbm', ['gdbmmodule.c'], ! @@ -667,3 +686,3 @@ ! if platform not in ['cygwin', 'atheos']: ! - if (self.compiler.find_library_file(lib_dirs, 'nsl')): ! + if (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'nsl')): ! libs = ['nsl'] ! @@ -676,3 +695,3 @@ ! # provided by the ncurses library. ! - if (self.compiler.find_library_file(lib_dirs, 'ncurses')): ! + if (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'ncurses')): ! curses_libs = ['ncurses'] ! @@ -680,3 +699,3 @@ ! libraries = curses_libs) ) ! - elif (self.compiler.find_library_file(lib_dirs, 'curses') ! + elif (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'curses') ! and platform != 'darwin'): ! @@ -684,5 +703,5 @@ ! # the _curses module. ! - if (self.compiler.find_library_file(lib_dirs, 'terminfo')): ! + if (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'terminfo')): ! curses_libs = ['curses', 'terminfo'] ! - elif (self.compiler.find_library_file(lib_dirs, 'termcap')): ! + elif (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'termcap')): ! curses_libs = ['curses', 'termcap'] ! @@ -696,3 +715,3 @@ ! if (module_enabled(exts, '_curses') and ! - self.compiler.find_library_file(lib_dirs, 'panel')): ! + self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'panel')): ! exts.append( Extension('_curses_panel', ['_curses_panel.c'], ! @@ -713,5 +732,8 @@ ! # http://www.gzip.org/zlib/ ! - zlib_inc = find_file('zlib.h', [], inc_dirs) ! + zlib_inc = find_file('zlib.h', ['/usr/include'], inc_dirs) ! if zlib_inc is not None: ! - zlib_h = zlib_inc[0] + '/zlib.h' ! + if len(zlib_inc) == 0: ! + zlib_h = '/usr/include/zlib.h' ! + else: ! + zlib_h = zlib_inc[0] + '/zlib.h' ! version = '"0.0.0"' ! @@ -727,4 +749,7 @@ ! if version >= version_req: ! - if (self.compiler.find_library_file(lib_dirs, 'z')): ! + if (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'z')): ! exts.append( Extension('zlib', ['zlibmodule.c'], ! + include_dirs=inc_dirs, ! + library_dirs=lib_dirs, ! + runtime_library_dirs=lib_dirs, ! libraries = ['z']) ) ! @@ -732,4 +757,7 @@ ! # Gustavo Niemeyer's bz2 module. ! - if (self.compiler.find_library_file(lib_dirs, 'bz2')): ! + if (self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'bz2')): ! exts.append( Extension('bz2', ['bz2module.c'], ! + library_dirs=lib_dirs, ! + runtime_library_dirs=lib_dirs, ! + include_dirs=inc_dirs, ! libraries = ['bz2']) ) ! @@ -784,3 +812,3 @@ ! # This requires sizeof(int) == sizeof(long) == sizeof(char*) ! - dl_inc = find_file('dlfcn.h', [], inc_dirs) ! + dl_inc = find_file('dlfcn.h', ['/usr/include'], inc_dirs) ! if (dl_inc is not None) and (platform not in ['atheos', 'darwin']): ! @@ -980,4 +1008,4 @@ ! '82', '8.1', '81', '8.0', '80']: ! - tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version) ! - tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version) ! + tklib = self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'tk' + version) ! + tcllib = self.compiler.find_library_file(lib_dirs+['/usr/lib'], 'tcl' + version) ! if tklib and tcllib: ! @@ -1039,3 +1067,3 @@ ! # Check for BLT extension ! - if self.compiler.find_library_file(lib_dirs + added_lib_dirs, ! + if self.compiler.find_library_file(lib_dirs + added_lib_dirs+['/usr/lib'], ! 'BLT8.0'): ! @@ -1043,3 +1071,3 @@ ! libs.append('BLT8.0') ! - elif self.compiler.find_library_file(lib_dirs + added_lib_dirs, ! + elif self.compiler.find_library_file(lib_dirs + added_lib_dirs+['/usr/lib'], ! 'BLT'): ! EOPATCH ! ! elif [ "$PKG_VERSION" = "2.3.4" ] ; then $PATCH -p0 <<\EOPATCH |
|
From: Will P. <pa...@us...> - 2005-11-16 14:20:39
|
Update of /cvsroot/ark/sidai/package In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16649/package Modified Files: ChangeLog amanda.xml apache.xml chkrootkit.xml cyrus-imapd.xml cyrus-sasl.xml flexlm.xml fvwm2.xml gnupg.xml icarus-verilog.xml john-the-ripper.xml python.xml rsync.xml Log Message: updates Index: ChangeLog =================================================================== RCS file: /cvsroot/ark/sidai/package/ChangeLog,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** ChangeLog 12 Jun 2002 11:28:05 -0000 1.20 --- ChangeLog 16 Nov 2005 14:20:17 -0000 1.21 *************** *** 1,2 **** --- 1,8 ---- + 2005-11-16 Will Partain <wil...@ve...> + + * python.xml (configure): Don't set CONFIG_SHELL for the configure + step; Jim Rowan has shown that it breaks things, at least on some + Solarisen. + 2002-06-07 Will Partain <wil...@ve...> Index: amanda.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/amanda.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** amanda.xml 26 May 2004 18:40:27 -0000 1.9 --- amanda.xml 16 Nov 2005 14:20:17 -0000 1.10 *************** *** 101,109 **** <!-- ..................................................... --> <configure> ! <comment>if you want a gnuplot dependency (for amplot), do that at the site level</comment> - <constraint><dependency type="normal" name="readline" on-method="deploy" /></constraint> - <!-- readline for amrecover: not essential --> </configure> --- 101,107 ---- <!-- ..................................................... --> <configure> ! <comment>if you want a gnuplot dependency (for amplot), or readline, do that at the site level</comment> </configure> Index: apache.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/apache.xml,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** apache.xml 25 Apr 2005 12:03:02 -0000 1.25 --- apache.xml 16 Nov 2005 14:20:17 -0000 1.26 *************** *** 104,108 **** PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` ! if [ "$PKG_VERSION" = "2.0.54" -o "$PKG_VERSION" = "2.0.53" -o "$PKG_VERSION" = "2.0.52" -o "$PKG_VERSION" = "2.0.51" -o "$PKG_VERSION" = "2.0.50" -o "$PKG_VERSION" = "2.0.49" -o "$PKG_VERSION" = "2.0.48" -o "$PKG_VERSION" = "2.0.47" -o "$PKG_VERSION" = "2.0.46" -o "$PKG_VERSION" = "2.0.45" -o "$PKG_VERSION" = "2.0.40" ] ; then $PATCH -p0 <<\EOPATCH diff -ru1 ../apache-2.0.49/Makefile.in ./Makefile.in --- 104,117 ---- PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` ! case "$PKG_VERSION" in ! 2.0.5?) # drop through to the patch ! ;; ! 2.0.4?) # ditto ! ;; ! *) echo "do not how how to patch version $PKG_VERSION" ! exit 1 ! ;; ! esac ! $PATCH -p0 <<\EOPATCH diff -ru1 ../apache-2.0.49/Makefile.in ./Makefile.in *************** *** 135,181 **** @(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null ) || true EOPATCH - - elif [ "$PKG_VERSION" = "2.0.39" ] ; then - $PATCH -p0 <<\EOPATCH - diff -rNu2 --exclude='*.orig' --exclude='*.pyc' --exclude='*.pyo' --exclude='*.rej' --exclude='*~' ../apache-2.0.39/Makefile.in ./Makefile.in - --- ../apache-2.0.39/Makefile.in Sat Jun 15 10:41:03 2002 - +++ ./Makefile.in Tue Jun 25 16:11:34 2002 - @@ -106,7 +106,7 @@ - @echo Installing HTML documents - @test -d $(DESTDIR)$(htdocsdir) || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) - - @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) - + @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp --dereference * $(DESTDIR)$(htdocsdir)) - @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) - - @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir)) - + @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp --dereference * $(DESTDIR)$(manualdir)) - -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf - - @@ -114,5 +114,5 @@ - @echo Installing error documents - @test -d $(DESTDIR)$(errordir) || $(MKINSTALLDIRS) $(DESTDIR)$(errordir) - - @cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) - + @cd $(top_srcdir)/docs/error && cp -rp --dereference * $(DESTDIR)$(errordir) - -@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -print | xargs rm -rf - - @@ -120,5 +120,5 @@ - @echo Installing icons - @test -d $(DESTDIR)$(iconsdir) || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) - - @cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) - + @cd $(top_srcdir)/docs/icons && cp -rp --dereference * $(DESTDIR)$(iconsdir) - -@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -print | xargs rm -rf - - @@ -126,5 +126,5 @@ - @echo Installing CGIs - @test -d $(DESTDIR)$(cgidir) || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) - - @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) - + @cd $(top_srcdir)/docs/cgi-examples && cp -rp --dereference * $(DESTDIR)$(cgidir) - -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf - - EOPATCH - - else - echo "do not how how to patch version $PKG_VERSION" - exit 1 - fi ]]></code></patch> </package> --- 144,147 ---- Index: chkrootkit.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/chkrootkit.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** chkrootkit.xml 26 May 2004 18:40:27 -0000 1.9 --- chkrootkit.xml 16 Nov 2005 14:20:17 -0000 1.10 *************** *** 107,111 **** PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` ! if [ "$PKG_VERSION" = "0.42b" ] ; then $PATCH -p0 <<\EOPATCH --- 107,121 ---- PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` ! case "$PKG_VERSION" in ! 0.42b) do_patch='42b' ! ;; ! 0.41) do_patch='41' ! ;; ! *) # nothing to do ! exit 0 ! ;; ! esac ! ! if [ "$do_patch" = "42b" ] ; then $PATCH -p0 <<\EOPATCH *************** *** 151,155 **** EOPATCH ! elif [ "$PKG_VERSION" = "0.41" ] ; then $PATCH -p0 <<\EOPATCH --- 161,165 ---- EOPATCH ! elif [ "$do_patch" = "41" ] ; then $PATCH -p0 <<\EOPATCH *************** *** 195,200 **** EOPATCH - else - : we will assume it is OK fi ]]></code></patch> --- 205,208 ---- Index: cyrus-imapd.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/cyrus-imapd.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** cyrus-imapd.xml 23 Dec 2004 15:44:25 -0000 1.20 --- cyrus-imapd.xml 16 Nov 2005 14:20:17 -0000 1.21 *************** *** 153,157 **** PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` ! if [ "$PKG_VERSION" = "2.1.17" -o "$PKG_VERSION" = "2.1.16" ] ; then $PATCH -p0 <<\EOPATCH diff -ru1 --exclude=CVS ../cyrus-imapd-2.1.16/configure ./configure --- 153,170 ---- PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` ! case "$PKG_VERSION" in ! 2.1.1[76]) ! use_patch=2116 ! ;; ! 2.1.1[543210]|2.1.[987]) ! use_patch=217 ! ;; ! *) ! echo "do not how how to patch version $PKG_VERSION" ! exit 1 ! ;; ! esac ! ! if [ "$use_patch" = "2116" ] ; then $PATCH -p0 <<\EOPATCH diff -ru1 --exclude=CVS ../cyrus-imapd-2.1.16/configure ./configure *************** *** 209,213 **** # ....................................................................... ! elif [ "$PKG_VERSION" = "2.1.15" -o "$PKG_VERSION" = "2.1.14" -o "$PKG_VERSION" = "2.1.13" -o "$PKG_VERSION" = "2.1.12" -o "$PKG_VERSION" = "2.1.11" -o "$PKG_VERSION" = "2.1.9" -o "$PKG_VERSION" = "2.1.8" -o "$PKG_VERSION" = "2.1.7" ] ; then $PATCH -p0 <<\EOPATCH diff -ru1 --exclude=CVS ../cyrus-imapd-2.1.7/configure ./configure --- 222,226 ---- # ....................................................................... ! elif [ "$use_patch" = "217" ]; then $PATCH -p0 <<\EOPATCH diff -ru1 --exclude=CVS ../cyrus-imapd-2.1.7/configure ./configure *************** *** 238,311 **** EOPATCH - - # ....................................................................... - - elif [ "$PKG_VERSION" = "2.1.5" ] ; then - $PATCH -p0 <<\EOPATCH - diff -rNu2 --exclude='*.orig' --exclude='*.pyc' --exclude='*.pyo' --exclude='*.rej' --exclude='*~' --exclude=CVS ../cyrus-imapd-2.1.5/configure ./configure - --- ../cyrus-imapd-2.1.5/configure Tue Apr 30 19:39:22 2002 - +++ ./configure Tue Jun 4 15:29:48 2002 - @@ -1490,12 +1490,12 @@ - - echo "$ac_t""$andrew_runpath_switch" 1>&6 - -CPPFLAGS="${CPPFLAGS} -I/usr/local/include" - - - - # this is CMU ADD LIBPATH - - if test "$andrew_runpath_switch" = "none" ; then - - LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - - else - - LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - - fi - +#CPPFLAGS="${CPPFLAGS} -I/usr/local/include" - +# - +# # this is CMU ADD LIBPATH - +# if test "$andrew_runpath_switch" = "none" ; then - +# LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - +# else - +# LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - +# fi - - - @@ -5224,5 +5224,5 @@ - cmu_saved_LDFLAGS=$LDFLAGS - - - LDFLAGS=$LIB_SASL - + LDFLAGS="$LIB_SASL $LDFLAGS" - - echo $ac_n "checking for sasl_checkapop in -lsasl2""... $ac_c" 1>&6 - EOPATCH - - # ....................................................................... - elif [ "$PKG_VERSION" = "2.1.4" ] ; then - $PATCH -p0 <<\EOPATCH - diff -rNu2 --exclude='*.orig' --exclude='*.pyc' --exclude='*.pyo' --exclude='*.rej' --exclude='*~' --exclude=CVS ../cyrus-imapd-2.1.4/configure ./configure - --- ../cyrus-imapd-2.1.4/configure Tue Apr 30 19:39:22 2002 - +++ ./configure Tue Jun 4 15:29:48 2002 - @@ -1490,12 +1490,12 @@ - - echo "$ac_t""$andrew_runpath_switch" 1>&6 - -CPPFLAGS="${CPPFLAGS} -I/usr/local/include" - - - - # this is CMU ADD LIBPATH - - if test "$andrew_runpath_switch" = "none" ; then - - LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - - else - - LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - - fi - +#CPPFLAGS="${CPPFLAGS} -I/usr/local/include" - +# - +# # this is CMU ADD LIBPATH - +# if test "$andrew_runpath_switch" = "none" ; then - +# LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - +# else - +# LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - +# fi - - - EOPATCH - - else - echo "do not how how to patch version $PKG_VERSION" - exit 1 fi ]]></code></patch> --- 251,254 ---- Index: cyrus-sasl.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/cyrus-sasl.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** cyrus-sasl.xml 23 Dec 2004 15:44:25 -0000 1.18 --- cyrus-sasl.xml 16 Nov 2005 14:20:17 -0000 1.19 *************** *** 109,114 **** PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` # ....................................................................... ! if [ "$PKG_VERSION" = "2.1.20" -o "$PKG_VERSION" = "2.1.19" ] ; then # this patch makes us try *much* harder to get clean-linking $PATCH -p0 <<\EOPATCH --- 109,126 ---- PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` + case "$PKG_VERSION" in + 2.1.20|2.1.19) + use_patch=2119 + ;; + *) + echo "do not how how to patch version $PKG_VERSION" + echo "(no patches provided for versions before 2.1.19)" + exit 1 + ;; + esac + + # ....................................................................... ! if [ "$use_patch" = "2119" ] ; then # this patch makes us try *much* harder to get clean-linking $PATCH -p0 <<\EOPATCH *************** *** 590,1223 **** EOPATCH - elif [ "$PKG_VERSION" = "2.1.17" ] ; then - # as for 2.1.19 but with some actual bug fixes, too - $PATCH -p0 <<\EOPATCH - diff -ru1 ../cyrus-sasl-2.1.17/config/ltconfig ./config/ltconfig - --- ../cyrus-sasl-2.1.17/config/ltconfig 2003-06-12 01:32:43.000000000 +0100 - +++ ./config/ltconfig 2004-01-07 17:18:20.000000000 +0000 - @@ -1155,3 +1155,3 @@ - # support --undefined. This deserves some investigation. FIXME - - archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - + archive_cmds='$CC -nostart $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname -o $lib' - else - @@ -1190,7 +1190,7 @@ - test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~ - - $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ - + $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $LDFLAGS $linkopts~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ - - $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ - + $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $LDFLAGS $linkopts~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ - - $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts' - + $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $LDFLAGS $linkopts' - - @@ -1201,6 +1201,6 @@ - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - + archive_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname -o $lib' - + archive_expsym_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - - archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' - + archive_cmds='$LD -Bshareable $libobjs $deplibs $LDFLAGS $linkopts -o $lib' - # can we support soname and/or expsyms with a.out? -oliva - @@ -1223,4 +1223,4 @@ - elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - + archive_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname -o $lib' - + archive_expsym_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - @@ -1231,3 +1231,3 @@ - sunos4*) - - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - wlarc= - @@ -1239,4 +1239,4 @@ - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - + archive_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname -o $lib' - + archive_expsym_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - @@ -1272,3 +1272,3 @@ - always_export_symbols=yes - - archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname' - + archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $LDFLAGS $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - @@ -1309,4 +1309,4 @@ - allow_undefined_flag=' ${wl}-berok' - - archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}' - - archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' - + archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $LDFLAGS $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}' - + archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $LDFLAGS $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' - case "$host_os" in aix4.[01]|aix4.[01].*) - @@ -1335,3 +1335,3 @@ - # FIXME: Setting linknames here is a bad hack. - - archive_cmds='$CC -o $lib $libobjs $linkopts `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - + archive_cmds='$CC -o $lib $libobjs $linkopts $LDFLAGS `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - @@ -1352,3 +1352,3 @@ - freebsd2.2*) - - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o' - + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - @@ -1360,3 +1360,3 @@ - freebsd2*) - - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_direct=yes - @@ -1368,3 +1368,3 @@ - freebsd*) - - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-R$libdir' - @@ -1376,3 +1376,3 @@ - allow_undefined_flag='-undefined error' - - archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' - + archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $LDFLAGS $linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' - # We need to add '_' to the symbols in $export_symbols first - @@ -1387,3 +1387,3 @@ - allow_undefined_flag='-undefined error' - - archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts $(test x$module != xyes && echo -install_name $rpath/$soname $tmp_verstring)' - + archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $LDFLAGS $linkopts $(test x$module != xyes && echo -install_name $rpath/$soname $tmp_verstring)' - # We need to add '_' to the symbols in $export_symbols first - @@ -1397,4 +1397,4 @@ - case "$host_os" in - - hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; - - *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts' ;; - + hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $LDFLAGS $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; - + *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $LDFLAGS $linkopts' ;; - esac - @@ -1410,5 +1410,5 @@ - if test "$with_gcc" = yes; then - - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - + archive_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - - archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - + archive_cmds='$LD -shared $libobjs $deplibs $LDFLAGS $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - fi - @@ -1420,5 +1420,5 @@ - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' # a.out - + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts' # a.out - else - - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts' # ELF - + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $LDFLAGS $linkopts' # ELF - fi - @@ -1430,3 +1430,3 @@ - openbsd*) - - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-R$libdir' - @@ -1440,3 +1440,3 @@ - allow_undefined_flag=unsupported - - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $linkopts $objdir/$libname.def' - + archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $LDFLAGS $linkopts $objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def' - @@ -1447,6 +1447,6 @@ - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $LDFLAGS $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - fi - @@ -1459,6 +1459,6 @@ - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $LDFLAGS $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $LDFLAGS $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - fi - @@ -1469,3 +1469,3 @@ - sco3.2v5*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_shlibpath_var=no - @@ -1479,5 +1479,5 @@ - # object files and a static libstdc++, better avoid it by now - - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp' - + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts~$rm $lib.exp' - hardcode_libdir_flag_spec='-R$libdir' - @@ -1492,3 +1492,3 @@ - sunos4*) - - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-L$libdir' - @@ -1503,5 +1503,5 @@ - # files that make .init and .fini sections work. - - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - else - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - fi - @@ -1513,3 +1513,3 @@ - sysv4.3*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_shlibpath_var=no - @@ -1522,5 +1522,5 @@ - # object files and a static libstdc++, better avoid it by now - - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp' - + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts~$rm $lib.exp' - hardcode_libdir_flag_spec= - @@ -1531,3 +1531,3 @@ - uts4*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-L$libdir' - @@ -1537,3 +1537,3 @@ - dgux*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-L$libdir' - @@ -1544,3 +1544,3 @@ - if test -d /usr/nec; then - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_shlibpath_var=no - @@ -1553,3 +1553,3 @@ - sysv4.2uw2*) - - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_direct=yes - @@ -1562,3 +1562,3 @@ - unixware7*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - runpath_var='LD_RUN_PATH' - diff -ru1 ../cyrus-sasl-2.1.17/config/ltmain.sh ./config/ltmain.sh - --- ../cyrus-sasl-2.1.17/config/ltmain.sh 2003-07-02 14:29:00.000000000 +0100 - +++ ./config/ltmain.sh 2004-01-07 17:19:58.000000000 +0000 - @@ -1156,2 +1156,19 @@ - - + -Wl,-R*) - + dir=`$echo "X$arg" | $Xsed -e 's/^-Wl,-R//'` - + # We need an absolute path. - + case "$dir" in - + [\\/]* | [A-Za-z]:[\\/]*) ;; - + *) - + $echo "$modename: only absolute run-paths are allowed" 1>&2 - + exit 1 - + ;; - + esac - + case "$xrpath " in - + *" $dir "*) ;; - + *) xrpath="$xrpath $dir" ;; - + esac - + continue - + ;; - + - -static) - @@ -1274,2 +1291,7 @@ - esac;; - + -Wl,-R*) temp_xrpath=`$echo "X$deplib" | $Xsed -e 's/^-Wl,-R//'` - + case " $rpath $xrpath " in - + *" $temp_xrpath "*) ;; - + *) xrpath="$xrpath $temp_xrpath";; - + esac;; - -L*) case "$compile_command $temp_deplibs " in - Only in ./config: ltmain.sh.~1~ - diff -ru1 ../cyrus-sasl-2.1.17/configure ./configure - --- ../cyrus-sasl-2.1.17/configure 2003-12-01 16:35:06.000000000 +0000 - +++ ./configure 2004-01-07 16:48:07.000000000 +0000 - @@ -5134,3 +5134,3 @@ - - - for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - + for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - @@ -5143,3 +5143,3 @@ - ac_check_lib_save_LIBS=$LIBS - -LIBS="-l$dbname $LIBS" - +LIBS="-l$dbname -lpthread $LIBS" - cat >conftest.$ac_ext <<_ACEOF - @@ -5192,3 +5192,3 @@ - if test `eval echo '${'$as_ac_Lib'}'` = yes; then - - BDB_LIBADD="$BDB_LIBADD -l$dbname"; - + BDB_LIBADD="$BDB_LIBADD -l$dbname -lpthread"; - dblib="berkeley"; break - @@ -5255,3 +5255,3 @@ - if test $ac_cv_lib_db_db_open = yes; then - - BDB_LIBADD="$BDB_LIBADD -ldb"; - + BDB_LIBADD="$BDB_LIBADD -ldb -lpthread"; - dblib="berkeley"; dbname=db - @@ -5937,3 +5937,3 @@ - - - for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - + for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - @@ -5946,3 +5946,3 @@ - ac_check_lib_save_LIBS=$LIBS - -LIBS="-l$dbname $LIBS" - +LIBS="-l$dbname -lpthread $LIBS" - cat >conftest.$ac_ext <<_ACEOF - @@ -5995,3 +5995,3 @@ - if test `eval echo '${'$as_ac_Lib'}'` = yes; then - - BDB_LIBADD="$BDB_LIBADD -l$dbname"; - + BDB_LIBADD="$BDB_LIBADD -l$dbname -lpthread"; - dblib="berkeley"; break - @@ -6058,3 +6058,3 @@ - if test $ac_cv_lib_db_db_open = yes; then - - BDB_LIBADD="$BDB_LIBADD -ldb"; - + BDB_LIBADD="$BDB_LIBADD -ldb -lpthread"; - dblib="berkeley"; dbname=db - diff -ru1 ../cyrus-sasl-2.1.17/saslauthd/config/ltconfig ./saslauthd/config/ltconfig - --- ../cyrus-sasl-2.1.17/saslauthd/config/ltconfig 2003-10-08 21:24:14.000000000 +0100 - +++ ./saslauthd/config/ltconfig 2004-01-07 17:22:49.000000000 +0000 - @@ -1155,3 +1155,3 @@ - # support --undefined. This deserves some investigation. FIXME - - archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - + archive_cmds='$CC -nostart $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname -o $lib' - else - @@ -1190,7 +1190,7 @@ - test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~ - - $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ - + $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $LDFLAGS $linkopts~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ - - $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ - + $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $LDFLAGS $linkopts~ - $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ - - $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts' - + $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $LDFLAGS $linkopts' - - @@ -1201,6 +1201,6 @@ - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - + archive_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname -o $lib' - + archive_expsym_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - - archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' - + archive_cmds='$LD -Bshareable $libobjs $deplibs $LDFLAGS $linkopts -o $lib' - # can we support soname and/or expsyms with a.out? -oliva - @@ -1223,4 +1223,4 @@ - elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - + archive_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname -o $lib' - + archive_expsym_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - @@ -1231,3 +1231,3 @@ - sunos4*) - - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - wlarc= - @@ -1239,4 +1239,4 @@ - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - + archive_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname -o $lib' - + archive_expsym_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - @@ -1272,3 +1272,3 @@ - always_export_symbols=yes - - archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname' - + archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $LDFLAGS $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - @@ -1309,4 +1309,4 @@ - allow_undefined_flag=' ${wl}-berok' - - archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}' - - archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' - + archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $LDFLAGS $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}' - + archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $LDFLAGS $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' - case "$host_os" in aix4.[01]|aix4.[01].*) - @@ -1335,3 +1335,3 @@ - # FIXME: Setting linknames here is a bad hack. - - archive_cmds='$CC -o $lib $libobjs $linkopts `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - + archive_cmds='$CC -o $lib $libobjs $linkopts $LDFLAGS `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - @@ -1352,3 +1352,3 @@ - freebsd2.2*) - - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o' - + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - @@ -1360,3 +1360,3 @@ - freebsd2*) - - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_direct=yes - @@ -1368,3 +1368,3 @@ - freebsd*) - - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-R$libdir' - @@ -1376,3 +1376,3 @@ - allow_undefined_flag='-undefined error' - - archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' - + archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $LDFLAGS $linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' - # We need to add '_' to the symbols in $export_symbols first - @@ -1387,3 +1387,3 @@ - allow_undefined_flag='-undefined error' - - archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts $(test x$module != xyes && echo -install_name $rpath/$soname $tmp_verstring)' - + archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $LDFLAGS $linkopts $(test x$module != xyes && echo -install_name $rpath/$soname $tmp_verstring)' - # We need to add '_' to the symbols in $export_symbols first - @@ -1397,4 +1397,4 @@ - case "$host_os" in - - hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; - - *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts' ;; - + hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $LDFLAGS $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; - + *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $LDFLAGS $linkopts' ;; - esac - @@ -1410,5 +1410,5 @@ - if test "$with_gcc" = yes; then - - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - + archive_cmds='$CC -shared $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - - archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - + archive_cmds='$LD -shared $libobjs $deplibs $LDFLAGS $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - fi - @@ -1420,5 +1420,5 @@ - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' # a.out - + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts' # a.out - else - - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts' # ELF - + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $LDFLAGS $linkopts' # ELF - fi - @@ -1430,3 +1430,3 @@ - openbsd*) - - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-R$libdir' - @@ -1440,3 +1440,3 @@ - allow_undefined_flag=unsupported - - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $linkopts $objdir/$libname.def' - + archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $LDFLAGS $linkopts $objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def' - @@ -1447,6 +1447,6 @@ - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $LDFLAGS $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $LDFLAGS $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - fi - @@ -1459,6 +1459,6 @@ - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $LDFLAGS $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $LDFLAGS $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - fi - @@ -1469,3 +1469,3 @@ - sco3.2v5*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_shlibpath_var=no - @@ -1479,5 +1479,5 @@ - # object files and a static libstdc++, better avoid it by now - - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp' - + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts~$rm $lib.exp' - hardcode_libdir_flag_spec='-R$libdir' - @@ -1492,3 +1492,3 @@ - sunos4*) - - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-L$libdir' - @@ -1503,5 +1503,5 @@ - # files that make .init and .fini sections work. - - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - else - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - fi - @@ -1513,3 +1513,3 @@ - sysv4.3*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_shlibpath_var=no - @@ -1522,5 +1522,5 @@ - # object files and a static libstdc++, better avoid it by now - - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp' - + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts~$rm $lib.exp' - hardcode_libdir_flag_spec= - @@ -1531,3 +1531,3 @@ - uts4*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-L$libdir' - @@ -1537,3 +1537,3 @@ - dgux*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_libdir_flag_spec='-L$libdir' - @@ -1544,3 +1544,3 @@ - if test -d /usr/nec; then - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_shlibpath_var=no - @@ -1553,3 +1553,3 @@ - sysv4.2uw2*) - - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - hardcode_direct=yes - @@ -1562,3 +1562,3 @@ - unixware7*) - - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $LDFLAGS $linkopts' - runpath_var='LD_RUN_PATH' - diff -ru1 ../cyrus-sasl-2.1.17/saslauthd/config/ltmain.sh ./saslauthd/config/ltmain.sh - --- ../cyrus-sasl-2.1.17/saslauthd/config/ltmain.sh 2003-07-02 14:29:02.000000000 +0100 - +++ ./saslauthd/config/ltmain.sh 2004-01-07 17:24:33.000000000 +0000 - @@ -1156,2 +1156,19 @@ - - + -Wl,-R*) - + dir=`$echo "X$arg" | $Xsed -e 's/^-Wl,-R//'` - + # We need an absolute path. - + case "$dir" in - + [\\/]* | [A-Za-z]:[\\/]*) ;; - + *) - + $echo "$modename: only absolute run-paths are allowed" 1>&2 - + exit 1 - + ;; - + esac - + case "$xrpath " in - + *" $dir "*) ;; - + *) xrpath="$xrpath $dir" ;; - + esac - + continue - + ;; - + - -static) - @@ -1274,2 +1291,7 @@ - esac;; - + -Wl,-R*) temp_xrpath=`$echo "X$deplib" | $Xsed -e 's/^-Wl,-R//'` - + case " $rpath $xrpath " in - + *" $temp_xrpath "*) ;; - + *) xrpath="$xrpath $temp_xrpath";; - + esac;; - -L*) case "$compile_command $temp_deplibs " in - EOPATCH - - # ....................................................................... - elif [ "$PKG_VERSION" = "2.1.15" -o "$PKG_VERSION" = "2.1.13" -o "$PKG_VERSION" = "2.1.12" -o "$PKG_VERSION" = "2.1.10" -o "$PKG_VERSION" = "2.1.9" ] ; then - $PATCH -p0 <<\EOPATCH - diff -ru1 ../cyrus-sasl-2.1.9/configure ./configure - --- ../cyrus-sasl-2.1.9/configure 2002-10-11 21:57:58.000000000 +0100 - +++ ./configure 2002-12-05 13:57:18.000000000 +0000 - @@ -1524,8 +1524,8 @@ - - - # this is CMU ADD LIBPATH - - if test "$andrew_runpath_switch" = "none" ; then - - LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - - else - - LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - - fi - +# # this is CMU ADD LIBPATH - +# if test "$andrew_runpath_switch" = "none" ; then - +# LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - +# else - +# LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - +# fi - - EOPATCH - - # ....................................................................... - - elif [ "$PKG_VERSION" = "2.1.7" ] ; then - $PATCH -p0 <<\EOPATCH - diff -rNu2 --exclude='*.orig' --exclude='*.pyc' --exclude='*.pyo' --exclude='*.rej' --exclude='*~' --exclude=CVS ../cyrus-sasl-2.1.7/configure ./configure - --- ../cyrus-sasl-2.1.7/configure Tue Mar 26 18:30:27 2002 - +++ ./configure Tue Jun 4 14:34:12 2002 - @@ -1490,12 +1490,12 @@ - - echo "$ac_t""$andrew_runpath_switch" 1>&6 - -CPPFLAGS="-I/usr/local/include ${CPPFLAGS}" - +#CPPFLAGS="-I/usr/local/include ${CPPFLAGS}" - - # this is CMU ADD LIBPATH - - if test "$andrew_runpath_switch" = "none" ; then - - LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - - else - - LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - - fi - +# if test "$andrew_runpath_switch" = "none" ; then - +# LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - +# else - +# LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - +# fi - - - EOPATCH - - # ....................................................................... - - elif [ "$PKG_VERSION" = "2.1.6" ] ; then - $PATCH -p0 <<\EOPATCH - diff -rNu2 --exclude='*.orig' --exclude='*.pyc' --exclude='*.pyo' --exclude='*.rej' --exclude='*~' --exclude=CVS ../cyrus-sasl-2.1.6/configure ./configure - --- ../cyrus-sasl-2.1.6/configure Tue Mar 26 18:30:27 2002 - +++ ./configure Tue Jun 4 14:34:12 2002 - @@ -1490,12 +1490,12 @@ - - echo "$ac_t""$andrew_runpath_switch" 1>&6 - -CPPFLAGS="-I/usr/local/include ${CPPFLAGS}" - +#CPPFLAGS="-I/usr/local/include ${CPPFLAGS}" - - # this is CMU ADD LIBPATH - - if test "$andrew_runpath_switch" = "none" ; then - - LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - - else - - LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - - fi - +# if test "$andrew_runpath_switch" = "none" ; then - +# LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - +# else - +# LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - +# fi - - - EOPATCH - - # ....................................................................... - elif [ "$PKG_VERSION" = "2.1.2" ] ; then - $PATCH -p0 <<\EOPATCH - diff -rNu2 --exclude='*.orig' --exclude='*.pyc' --exclude='*.pyo' --exclude='*.rej' --exclude='*~' --exclude=CVS ../cyrus-sasl-2.1.2/configure ./configure - --- ../cyrus-sasl-2.1.2/configure Tue Mar 26 18:30:27 2002 - +++ ./configure Tue Jun 4 14:34:12 2002 - @@ -1490,12 +1490,12 @@ - - echo "$ac_t""$andrew_runpath_switch" 1>&6 - -CPPFLAGS="-I/usr/local/include ${CPPFLAGS}" - +#CPPFLAGS="-I/usr/local/include ${CPPFLAGS}" - - # this is CMU ADD LIBPATH - - if test "$andrew_runpath_switch" = "none" ; then - - LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - - else - - LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - - fi - +# if test "$andrew_runpath_switch" = "none" ; then - +# LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}" - +# else - +# LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}" - +# fi - - - EOPATCH - - else - echo "do not how how to patch version $PKG_VERSION" - exit 1 fi ]]></code></patch> --- 602,605 ---- Index: flexlm.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/flexlm.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** flexlm.xml 26 May 2004 18:40:27 -0000 1.15 --- flexlm.xml 16 Nov 2005 14:20:17 -0000 1.16 *************** *** 90,96 **** # uncompress binaries /bin/rm -f sbin/lmgrd ! $GZIP -dc $PKG_TGZ_DIR/lmgrd.Z > sbin/lmgrd /bin/rm -f lmutil/lmutil ! $GZIP -dc $PKG_TGZ_DIR/lmutil.Z > lmutil/lmutil $CHMOD 775 sbin/lmgrd lmutil/lmutil --- 90,116 ---- # uncompress binaries /bin/rm -f sbin/lmgrd ! if [ -f $PKG_TGZ_DIR/lmgrd.Z ] ; then ! $GZIP -dc $PKG_TGZ_DIR/lmgrd.Z > sbin/lmgrd ! elif [ -f $PKG_TGZ_DIR/lmgrd.gz ] ; then ! $GZIP -dc $PKG_TGZ_DIR/lmgrd.gz > sbin/lmgrd ! elif [ -f $PKG_TGZ_DIR/lmgrd ] ; then ! /bin/cp -p $PKG_TGZ_DIR/lmgrd sbin/lmgrd ! else ! echo no idea what to do on the lmgrd binary ! exit 1 ! fi ! /bin/rm -f lmutil/lmutil ! if [ -f $PKG_TGZ_DIR/lmutil.Z ] ; then ! $GZIP -dc $PKG_TGZ_DIR/lmutil.Z > lmutil/lmutil ! elif [ -f $PKG_TGZ_DIR/lmutil.gz ] ; then ! $GZIP -dc $PKG_TGZ_DIR/lmutil.gz > lmutil/lmutil ! elif [ -f $PKG_TGZ_DIR/lmutil ] ; then ! /bin/cp -p $PKG_TGZ_DIR/lmutil lmutil/lmutil ! else ! echo no idea what to do on the lmutil binary ! exit 1 ! fi ! $CHMOD 775 sbin/lmgrd lmutil/lmutil Index: fvwm2.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/fvwm2.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** fvwm2.xml 10 Mar 2003 12:38:46 -0000 1.4 --- fvwm2.xml 16 Nov 2005 14:20:18 -0000 1.5 *************** *** 22,25 **** --- 22,34 ---- PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` + do_patch='no' + case "x$PKG_VERSION" in + x21.4.*) do_patch='yes' ;; + *) ;; + esac + + if [ $do_patch = 'no' ] ; then exit 0 ; fi + + $PATCH -p0 <<\EOPATCH diff -rc1 ../fvwm-2.4.0/utils/Makefile.am ./utils/Makefile.am Index: gnupg.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/gnupg.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** gnupg.xml 9 May 2005 09:46:09 -0000 1.11 --- gnupg.xml 16 Nov 2005 14:20:18 -0000 1.12 *************** *** 79,116 **** </install-bits> - <!-- ..................................................... --> - <patch> - <constraint><dependency type="essential" name="." on-method="src-linkfarm" /></constraint> - <param name="PATCH">@proxy-host:PATCH@</param> - <param name="PATCH_BOOT">@proxy-host:PATCH-BOOT@</param> - <param name="PKG_VERSION">!pkg_version</param> - - <code once-per="site" redoable="no"><![CDATA[ - cd $PKG_BUILD_DIR/src - - PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` - - if [ "$PKG_VERSION" = "1.4.1" -o "$PKG_VERSION" = "1.2.7" -o "$PKG_VERSION" = "1.2.6" -o "$PKG_VERSION" = "1.2.5" -o "$PKG_VERSION" = "1.2.4" -o "$PKG_VERSION" = "1.2.3" ] ; then - : ok - - elif [ "$PKG_VERSION" = "1.2.2" ] ; then - $PATCH -p0 <<\EOPATCH - diff -ru1 ../gnupg-1.2.2/checks/defs.inc ./checks/defs.inc - --- ../gnupg-1.2.2/checks/defs.inc 2003-05-01 14:17:46.000000000 +0100 - +++ ./checks/defs.inc 2003-06-02 14:58:29.000000000 +0100 - @@ -101,5 +101,5 @@ - # Make sure we have a valid option files even with VPATH builds. - -if [ -f ./options]; then - +if [ -f ./options ]; then - : - -elif [ -f ./gpg.conf]; then - +elif [ -f ./gpg.conf ]; then - : - EOPATCH - - else - echo "do not how how to patch version $PKG_VERSION" - exit 1 - fi - ]]></code></patch> </package> --- 79,81 ---- Index: icarus-verilog.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/icarus-verilog.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** icarus-verilog.xml 20 Jun 2005 13:55:59 -0000 1.18 --- icarus-verilog.xml 16 Nov 2005 14:20:18 -0000 1.19 *************** *** 70,141 **** </install-bits> - <!-- ..................................................... --> - <patch> - <constraint><dependency type="essential" name="." on-method="src-linkfarm" /></constraint> - <param name="PATCH">@proxy-host:PATCH@</param> - <param name="PATCH_BOOT">@proxy-host:PATCH-BOOT@</param> - <param name="PKG_VERSION">!pkg_version</param> - - <code once-per="site" redoable="no"><![CDATA[ - cd $PKG_BUILD_DIR/src - - PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` - - if [ "$PKG_VERSION" = "0.8" ] ; then - : think it is OK - - elif [ "$PKG_VERSION" -ge "20031202" ] ; then - : think it is OK - - elif [ "$PKG_VERSION" = "20030904" ] ; then - $PATCH -p0 <<\EOPATCH - diff -ru1 ../icarus-verilog-20030904/cadpli/configure.in ./cadpli/configure.in - --- ../icarus-verilog-20030904/cadpli/configure.in 2003-04-23 06:27:44.000000000 +0100 - +++ ./cadpli/configure.in 2003-09-05 17:07:28.000000000 +0100 - @@ -80,2 +80,4 @@ - *-*-solaris*) - + whole_archive="" - + no_whole_archive="" - rdynamic="" - diff -ru1 ../icarus-verilog-20030904/cadpli/configure ./cadpli/configure - --- ../icarus-verilog-20030904/cadpli/configure 2003-09-04 21:47:52.000000000 +0100 - +++ ./cadpli/configure 2003-09-05 17:08:00.000000000 +0100 - @@ -4426,2 +4426,4 @@ - rdynamic="" - + whole_archive="" - + no_whole_archive="" - ;; - EOPATCH - - elif [ "$PKG_VERSION" = "20030518" ] ; then - : think it is OK - elif [ "$PKG_VERSION" = "20030216" ] ; then - : think it is OK - elif [ "$PKG_VERSION" = "20021207" ] ; then - : think it is OK - elif [ "$PKG_VERSION" = "20020907" ] ; then - $PATCH -p0 <<\EOPATCH - diff -ru1 ../icarus-verilog-20020907/lexor.lex ./lexor.lex - --- ../icarus-verilog-20020907/lexor.lex 2002-06-06 19:57:18.000000000 +0100 - +++ ./lexor.lex 2002-09-13 11:50:30.000000000 +0100 - @@ -48,3 +48,3 @@ - */ - -extern YYLTYPE yylloc; - +YYLTYPE yylloc; - - diff -ru1 ../icarus-verilog-20020907/parse.y ./parse.y - --- ../icarus-verilog-20020907/parse.y 2002-09-01 04:01:48.000000000 +0100 - +++ ./parse.y 2002-09-13 11:48:10.000000000 +0100 - @@ -891,3 +891,3 @@ - $$ = tmp; - - delete $1 - + delete $1; - } - EOPATCH - - else - echo "do not how how to patch version $PKG_VERSION" - exit 1 - fi - ]]... [truncated message content] |
|
From: Will P. <pa...@us...> - 2005-11-16 14:20:34
|
Update of /cvsroot/ark/sidai/arkbase/ark In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16649/arkbase/ark Modified Files: dchunk.py Log Message: updates Index: dchunk.py =================================================================== RCS file: /cvsroot/ark/sidai/arkbase/ark/dchunk.py,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -r1.34 -r1.35 *** dchunk.py 6 Jun 2005 17:20:31 -0000 1.34 --- dchunk.py 16 Nov 2005 14:20:17 -0000 1.35 *************** *** 755,759 **** localness = '' ! if backup_host.sameAs(shost): localness = ' local' print "%s\t%s\t%s%s" % (shost.fqdn(),dir,backup_config,localness) --- 755,759 ---- localness = '' ! #no, doesn't work as of amanda 2.4.5: if backup_host.sameAs(shost): localness = ' local' print "%s\t%s\t%s%s" % (shost.fqdn(),dir,backup_config,localness) |
|
From: Will P. <pa...@us...> - 2005-10-31 09:47:46
|
Update of /cvsroot/ark/sidai/package In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32087 Modified Files: ark-template-per-host.xml john-the-ripper.xml samba-config.xml verisity-eanalyzer.xml Log Message: updates Index: ark-template-per-host.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/ark-template-per-host.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** ark-template-per-host.xml 26 May 2004 18:40:27 -0000 1.22 --- ark-template-per-host.xml 31 Oct 2005 09:47:37 -0000 1.23 *************** *** 139,143 **** # build area to install area. for x in * ; do ! if [ -d $x ] ; then /bin/rm -rf $PKG_INSTALL_DIR/$x $TAR cf - $x | ( cd $PKG_INSTALL_DIR && $TAR xf - ) --- 139,145 ---- # build area to install area. for x in * ; do ! if [ "x$x" = "xCVS" ] ; then ! : no do not ! elif [ -d $x ] ; then /bin/rm -rf $PKG_INSTALL_DIR/$x $TAR cf - $x | ( cd $PKG_INSTALL_DIR && $TAR xf - ) Index: john-the-ripper.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/john-the-ripper.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** john-the-ripper.xml 26 May 2004 18:40:28 -0000 1.9 --- john-the-ripper.xml 31 Oct 2005 09:47:38 -0000 1.10 *************** *** 98,102 **** PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` ! if [ "$PKG_VERSION" = "1.6.37" -o "$PKG_VERSION" = "1.6.36" ] ; then $PATCH -p0 <<\EOPATCH diff -ru1 ../john-1.6.36/src/Makefile ./src/Makefile --- 98,102 ---- PATCH=`sidaiPickProgram "$PATCH" "$PATCH_BOOT"` ! if [ "$PKG_VERSION" = "1.6.39" -o "$PKG_VERSION" = "1.6.37" -o "$PKG_VERSION" = "1.6.36" ] ; then $PATCH -p0 <<\EOPATCH diff -ru1 ../john-1.6.36/src/Makefile ./src/Makefile Index: samba-config.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/samba-config.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** samba-config.xml 26 May 2004 18:40:29 -0000 1.6 --- samba-config.xml 31 Oct 2005 09:47:38 -0000 1.7 *************** *** 54,57 **** --- 54,58 ---- <PKGS-UMASK>022</PKGS-UMASK> + <!-- ToDo: out of date, really --> <deployment-spec><table><entry name="."> @TYPE@=manifest *************** *** 92,96 **** <!-- Get the permissions right. ToDo: can we do this in the manifest? --> <!-- ..................................................... --> ! <reveal> <constraint><dependency type="status" name="." value="revealed" /></constraint> <constraint><dependency type="essential" name="." on-method="reveal-bits" /></constraint> --- 93,97 ---- <!-- Get the permissions right. ToDo: can we do this in the manifest? --> <!-- ..................................................... --> ! <old-reveal> <constraint><dependency type="status" name="." value="revealed" /></constraint> <constraint><dependency type="essential" name="." on-method="reveal-bits" /></constraint> *************** *** 99,103 **** $CHMOD 700 /var/local/samba/private ]]></code> ! </reveal> <!-- ..................................................... --> --- 100,104 ---- $CHMOD 700 /var/local/samba/private ]]></code> ! </old-reveal> <!-- ..................................................... --> Index: verisity-eanalyzer.xml =================================================================== RCS file: /cvsroot/ark/sidai/package/verisity-eanalyzer.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** verisity-eanalyzer.xml 26 May 2004 18:40:29 -0000 1.2 --- verisity-eanalyzer.xml 31 Oct 2005 09:47:38 -0000 1.3 *************** *** 66,69 **** --- 66,73 ---- <!-- ..................................................... --> <create-toolenv-helper> + <constraint><host-spec>.:amd64-linux-fc</host-spec></constraint> + <param name="PLATFORM">linux</param> + </create-toolenv-helper> + <create-toolenv-helper> <constraint><host-spec>sidai:ia32-linux</host-spec></constraint> <param name="PLATFORM">linux</param> |
1 message has been excluded from this view by a project administrator.
