diff --git a/condor.spec b/condor.spec index c7dceed..8e3f50b 100644 --- a/condor.spec +++ b/condor.spec @@ -1,4 +1,4 @@ -%define tarball_version 7.7.1 +%define tarball_version 7.7.2 # Things for F15 or later %if 0%{?fedora} >= 15 @@ -28,7 +28,7 @@ Summary: Condor: High Throughput Computing Name: condor -Version: 7.7.1 +Version: 7.7.2 %define condor_base_release 0.2 %if %git_build %define condor_release %condor_base_release.%{git_rev}git @@ -78,7 +78,7 @@ Source0: condor.tar.gz # # ecafed3e183e9fc6608dc9e55e4dd59b condor_src-7.7.1-all-all.tar.gz # Note: The md5sum of each generated tarball may be different -Source0: condor-7.7.1-UPSTREAM-GT.tar.gz +Source0: condor_src-7.7.2-all-all.tar.gz Source1: generate-tarball.sh %endif @@ -676,6 +676,8 @@ rm -rf %{buildroot} %_mandir/man1/condor_ssh_to_job.1.gz %_mandir/man1/condor_power.1.gz %_mandir/man1/condor_glidein.1.gz +%_mandir/man1/condor_continue.1.gz +%_mandir/man1/condor_suspend.1.gz # bin/condor is a link for checkpoint, reschedule, vacate %_bindir/condor %_bindir/condor_submit_dag @@ -713,6 +715,8 @@ rm -rf %{buildroot} %_bindir/condor_gather_info %_bindir/condor_test_match %_bindir/condor_glidein +%_bindir/condor_continue +%_bindir/condor_suspend # sbin/condor is a link for master_off, off, on, reconfig, # reconfig_schedd, restart %_sbindir/condor @@ -834,8 +838,8 @@ rm -rf %{buildroot} %files classads %defattr(-,root,root,-) %doc LICENSE-2.0.txt NOTICE.txt +%_libdir/libclassad.so.7.7.2 %_libdir/libclassad.so.2 -%_libdir/libclassad.so.2.0.0 ################# %files classads-devel diff --git a/condor_config.generic.patch b/condor_config.generic.patch index 8318a82..a866d41 100644 --- a/condor_config.generic.patch +++ b/condor_config.generic.patch @@ -1,7 +1,5 @@ -diff --git a/src/condor_examples/condor_config.generic b/src/condor_examples/condor_config.generic -index 3375e11..b921459 100644 ---- a/src/condor_examples/condor_config.generic -+++ b/src/condor_examples/condor_config.generic +--- a/src/condor_examples/condor_config.generic 2011-10-25 12:15:41.650632211 -0500 ++++ b/src/condor_examples/condor_config.generic 2011-10-25 12:15:49.969628252 -0500 @@ -1,12 +1,31 @@ ###################################################################### +###################################################################### @@ -38,7 +36,7 @@ index 3375e11..b921459 100644 ## ## The file is divided into four main parts: ## Part 1: Settings you likely want to customize -@@ -53,7 +72,7 @@ CONDOR_HOST = central-manager-hostname.your.domain +@@ -53,7 +72,7 @@ ## Pathnames: ##-------------------------------------------------------------------- ## Where have you installed the bin, sbin and lib condor directories? @@ -47,7 +45,7 @@ index 3375e11..b921459 100644 ## Where is the local condor directory for each host? ## This is where the local config file(s), logs and -@@ -61,17 +80,20 @@ RELEASE_DIR = /usr/local/condor +@@ -61,17 +80,20 @@ LOCAL_DIR = $(TILDE) #LOCAL_DIR = $(RELEASE_DIR)/hosts/$(HOSTNAME) @@ -74,7 +72,7 @@ index 3375e11..b921459 100644 ## If the local config file is not present, is it an error? ## WARNING: This is a potential security issue. -@@ -409,7 +431,22 @@ ALLOW_READ_STARTD = $(ALLOW_READ), $(FLOCK_FROM) +@@ -409,7 +431,22 @@ ## condor account, it's probably condor. Otherwise, it's whatever ## you've set in the CONDOR_IDS environment variable. See the Admin ## manual for details on this. @@ -98,7 +96,7 @@ index 3375e11..b921459 100644 ## If you don't use a fully qualified name in your /etc/hosts file ## (or NIS, etc.) for either your official hostname or as an alias, -@@ -475,7 +512,8 @@ GLIDEIN_SERVER_URLS = \ +@@ -475,7 +512,8 @@ ## the execute machine and just make sure the two strings match. The ## default for this setting is False, since it is more secure this ## way. @@ -108,7 +106,7 @@ index 3375e11..b921459 100644 ## If you would like to be informed in near real-time via condor_q when ## a vanilla/standard/java job is in a suspension state, set this attribute to -@@ -514,8 +552,9 @@ GLIDEIN_SERVER_URLS = \ +@@ -514,8 +552,9 @@ ## just disable it). #NEGOTIATOR_IGNORE_USER_PRIORITIES = False @@ -120,7 +118,7 @@ index 3375e11..b921459 100644 ## This setting tells Condor whether to delegate or copy GSI X509 ## credentials when sending them over the wire between daemons. -@@ -605,6 +644,9 @@ SHARED_PORT_DEBUG = +@@ -605,6 +644,9 @@ MAX_HDFS_LOG = 1000000 HDFS_DEBUG = @@ -130,7 +128,7 @@ index 3375e11..b921459 100644 # High Availability Logs MAX_HAD_LOG = 1000000 HAD_DEBUG = -@@ -927,14 +969,18 @@ TESTINGMODE_CLAIM_WORKLIFE = 1200 +@@ -927,14 +969,18 @@ ###################################################################### ## Pathnames @@ -152,7 +150,7 @@ index 3375e11..b921459 100644 ## If you leave HISTORY undefined (comment it out), no history file ## will be created. -@@ -958,6 +1004,7 @@ HAD_LOG = $(LOG)/HADLog +@@ -958,6 +1004,7 @@ REPLICATION_LOG = $(LOG)/ReplicationLog TRANSFERER_LOG = $(LOG)/TransfererLog HDFS_LOG = $(LOG)/HDFSLog @@ -160,7 +158,7 @@ index 3375e11..b921459 100644 ## Lock files SHADOW_LOCK = $(LOCK)/ShadowLock -@@ -1078,7 +1125,7 @@ DAEMON_LIST = MASTER, STARTD, SCHEDD +@@ -1078,7 +1125,7 @@ #DC_DAEMON_LIST = \ #MASTER, STARTD, SCHEDD, KBDD, COLLECTOR, NEGOTIATOR, EVENTD, \ #VIEW_SERVER, CONDOR_VIEW, VIEW_COLLECTOR, HAWKEYE, CREDD, HAD, \ @@ -169,7 +167,7 @@ index 3375e11..b921459 100644 ## Where are the binaries for these daemons? -@@ -1094,6 +1141,7 @@ ROOSTER = $(LIBEXEC)/condor_rooster +@@ -1094,6 +1141,7 @@ HDFS = $(SBIN)/condor_hdfs SHARED_PORT = $(LIBEXEC)/condor_shared_port TRANSFERER = $(LIBEXEC)/condor_transferer @@ -177,7 +175,7 @@ index 3375e11..b921459 100644 ## When the master starts up, it can place it's address (IP and port) ## into a file. This way, tools running on the local machine don't -@@ -1170,11 +1218,13 @@ PREEN_ARGS = -m -r +@@ -1170,11 +1218,13 @@ ##-------------------------------------------------------------------- ## Address to which Condor will send a weekly e-mail with output of ## condor_status. @@ -191,9 +189,9 @@ index 3375e11..b921459 100644 +## Default is condor.cs.wisc.edu +CONDOR_DEVELOPERS_COLLECTOR = NONE - - ##-------------------------------------------------------------------- -@@ -1183,6 +1233,7 @@ PREEN_ARGS = -m -r + ## When the collector starts up, it can place it's address (IP and port) + ## into a file. This way, tools running on the local machine don't +@@ -1191,6 +1241,7 @@ ## Determine if the Negotiator will honor SlotWeight attributes, which ## may be used to give a slot greater weight when calculating usage. #NEGOTIATOR_USE_SLOT_WEIGHTS = True @@ -201,7 +199,7 @@ index 3375e11..b921459 100644 ## How often the Negotaitor starts a negotiation cycle, defined in -@@ -1620,7 +1671,7 @@ QUEUE_SUPER_USERS = root, condor +@@ -1628,7 +1679,7 @@ ##-------------------------------------------------------------------- ## condor_starter ##-------------------------------------------------------------------- @@ -210,7 +208,7 @@ index 3375e11..b921459 100644 ## jobs on your execute machines. If you want this, uncomment the ## following entry and set it to how "nice" you want the user ## jobs. (1-19) The larger the number, the lower priority the -@@ -1661,7 +1712,7 @@ PROCD = $(SBIN)/condor_procd +@@ -1681,7 +1732,7 @@ # UNIX); the name will be something like: # \\.\pipe\condor_procd # @@ -219,7 +217,7 @@ index 3375e11..b921459 100644 # The procd currently uses a very simplistic logging system. Since this # log will not be rotated like other Condor logs, it is only recommended -@@ -1770,7 +1821,7 @@ JAVA_MAXHEAP_ARGUMENT = -Xmx +@@ -1782,7 +1833,7 @@ ## them here. However, do not remove the existing entries, as Condor ## needs them. @@ -228,7 +226,7 @@ index 3375e11..b921459 100644 ## JAVA_CLASSPATH_ARGUMENT describes the command-line parameter ## used to introduce a new classpath: -@@ -2246,8 +2297,8 @@ MAX_VM_GAHP_LOG = 1000000 +@@ -2275,8 +2326,8 @@ ## What kind of virtual machine program will be used for ## the VM universe? @@ -239,7 +237,7 @@ index 3375e11..b921459 100644 ## How much memory can be used for the VM universe? (Required) ## This value is the maximum amount of memory that can be used by the -@@ -2478,7 +2529,7 @@ KBDD_ADDRESS_FILE = $(LOG)/.kbdd_address +@@ -2503,7 +2554,7 @@ #SSH_TO_JOB_SSHD_ARGS = "-i -e -f %f" # sshd configuration template used by condor_ssh_to_job_sshd_setup.