* [gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/files/
@ 2013-07-12 17:37 Sebastien Fabbro
0 siblings, 0 replies; 10+ messages in thread
From: Sebastien Fabbro @ 2013-07-12 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 36e07f56123f20b904134e1e90b602da7f6c7321
Author: Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Mon Jun 17 21:06:06 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 21:06:06 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=36e07f56
Changed patch format to see if this works better
---
sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch b/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch
index 9b74018..371052d 100644
--- a/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch
+++ b/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch
@@ -1,5 +1,5 @@
---- src/condor_scripts/CMakeLists.txt.orig 2013-06-17 21:20:57.968455000 +0100
-+++ src/condor_scripts/CMakeLists.txt 2013-06-17 21:23:15.039802000 +0100
+--- a/src/condor_scripts/CMakeLists.txt 2013-06-17 21:20:57.968455000 +0100
++++ b/src/condor_scripts/CMakeLists.txt 2013-06-17 21:23:15.039802000 +0100
@@ -27,9 +27,9 @@
install ( FILES condor_configure DESTINATION ${C_SBIN} PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
install ( FILES condor_configure DESTINATION ${C_SBIN} RENAME condor_install PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
@@ -13,8 +13,8 @@
endif(WANT_FULL_DEPLOYMENT)
install ( FILES condor_ssh sshd.sh DESTINATION ${C_LIBEXEC} PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
---- src/condor_tools/CMakeLists.txt.orig 2013-06-17 21:44:18.391088000 +0100
-+++ src/condor_tools/CMakeLists.txt 2013-06-17 21:46:09.950286000 +0100
+--- a/src/condor_tools/CMakeLists.txt 2013-06-17 21:44:18.391088000 +0100
++++ b/src/condor_tools/CMakeLists.txt 2013-06-17 21:46:09.950286000 +0100
@@ -102,13 +102,13 @@
if ( LINUX AND NOT CONDOR_PACKAGE_BUILD )
set( SRC_DIR ${CMAKE_SOURCE_DIR} )
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/files/
@ 2013-07-12 17:37 Sebastien Fabbro
0 siblings, 0 replies; 10+ messages in thread
From: Sebastien Fabbro @ 2013-07-12 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 10f6d6a5ecc03e037409595fc457838db532f770
Author: Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Mon Jun 17 22:29:47 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 22:29:47 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=10f6d6a5
Looks like the condor_tools patch also requires backslashes
---
sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch b/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch
index 3525161..c7c32a2 100644
--- a/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch
+++ b/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch
@@ -20,15 +20,15 @@
set( SRC_DIR ${CMAKE_SOURCE_DIR} )
set( BIN_DIR ${CMAKE_BINARY_DIR} )
- install( CODE "execute_process(COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/lib/condor)" )
-+ install( CODE "execute_process(COMMAND mkdir -p $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/condor)" )
++ install( CODE "execute_process(COMMAND mkdir -p \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/lib/condor)" )
install( CODE "execute_process(COMMAND ${SRC_DIR}/src/condor_scripts/print-libs ${BIN_DIR}/src/condor_tools/condor_version ${SRC_DIR}/src/condor_scripts/syslib-patterns
- COMMAND xargs -isrc cp src ${CMAKE_INSTALL_PREFIX}/lib/condor
-+ COMMAND xargs -isrc cp src $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/condor
++ COMMAND xargs -isrc cp src \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/lib/condor
)" )
# This is required for opensuse, where the system's libssl and
# libcrypto files don't have owner write permission.
- install( CODE "execute_process(COMMAND chmod -R u+w ${CMAKE_INSTALL_PREFIX}/lib/condor/)" )
-+ install( CODE "execute_process(COMMAND chmod -R u+w $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/condor/)" )
++ install( CODE "execute_process(COMMAND chmod -R u+w \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/lib/condor/)" )
endif()
############################################################
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/files/
@ 2013-07-12 17:37 Sebastien Fabbro
0 siblings, 0 replies; 10+ messages in thread
From: Sebastien Fabbro @ 2013-07-12 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 141c79b386269291586b9ec2187f4786963e6e72
Author: Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Mon Jun 17 22:04:43 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 22:04:43 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=141c79b3
Copying diffs from the terminal stripped out tabs, causing them to fail
Try this one...
---
.../files/fix_sandbox_violations-8.0.0.patch | 34 +++++++++++-----------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch b/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch
index 371052d..3525161 100644
--- a/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch
+++ b/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch
@@ -1,5 +1,5 @@
---- a/src/condor_scripts/CMakeLists.txt 2013-06-17 21:20:57.968455000 +0100
-+++ b/src/condor_scripts/CMakeLists.txt 2013-06-17 21:23:15.039802000 +0100
+--- src/condor_scripts/CMakeLists.txt.orig 2013-06-17 23:02:02.815939000 +0100
++++ src/condor_scripts/CMakeLists.txt 2013-06-17 23:02:34.476727000 +0100
@@ -27,9 +27,9 @@
install ( FILES condor_configure DESTINATION ${C_SBIN} PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
install ( FILES condor_configure DESTINATION ${C_SBIN} RENAME condor_install PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
@@ -12,23 +12,23 @@
+ install ( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ./sbin/condor_configure \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/condor_configure)" )
endif(WANT_FULL_DEPLOYMENT)
- install ( FILES condor_ssh sshd.sh DESTINATION ${C_LIBEXEC} PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
---- a/src/condor_tools/CMakeLists.txt 2013-06-17 21:44:18.391088000 +0100
-+++ b/src/condor_tools/CMakeLists.txt 2013-06-17 21:46:09.950286000 +0100
+ install ( FILES condor_ssh sshd.sh DESTINATION ${C_LIBEXEC} PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
+--- src/condor_tools/CMakeLists.txt.orig 2013-06-17 22:50:20.459572000 +0100
++++ src/condor_tools/CMakeLists.txt 2013-06-17 22:52:59.841733000 +0100
@@ -102,13 +102,13 @@
if ( LINUX AND NOT CONDOR_PACKAGE_BUILD )
- set( SRC_DIR ${CMAKE_SOURCE_DIR} )
- set( BIN_DIR ${CMAKE_BINARY_DIR} )
-- install( CODE "execute_process(COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/lib/condor)" )
-+ install( CODE "execute_process(COMMAND mkdir -p $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/condor)" )
- install( CODE "execute_process(COMMAND ${SRC_DIR}/src/condor_scripts/print-libs ${BIN_DIR}/src/condor_tools/condor_version ${SRC_DIR}/src/condor_scripts/syslib-patterns
-- COMMAND xargs -isrc cp src ${CMAKE_INSTALL_PREFIX}/lib/condor
-+ COMMAND xargs -isrc cp src $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/condor
- )" )
- # This is required for opensuse, where the system's libssl and
- # libcrypto files don't have owner write permission.
-- install( CODE "execute_process(COMMAND chmod -R u+w ${CMAKE_INSTALL_PREFIX}/lib/condor/)" )
-+ install( CODE "execute_process(COMMAND chmod -R u+w $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/condor/)" )
+ set( SRC_DIR ${CMAKE_SOURCE_DIR} )
+ set( BIN_DIR ${CMAKE_BINARY_DIR} )
+- install( CODE "execute_process(COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/lib/condor)" )
++ install( CODE "execute_process(COMMAND mkdir -p $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/condor)" )
+ install( CODE "execute_process(COMMAND ${SRC_DIR}/src/condor_scripts/print-libs ${BIN_DIR}/src/condor_tools/condor_version ${SRC_DIR}/src/condor_scripts/syslib-patterns
+- COMMAND xargs -isrc cp src ${CMAKE_INSTALL_PREFIX}/lib/condor
++ COMMAND xargs -isrc cp src $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/condor
+ )" )
+ # This is required for opensuse, where the system's libssl and
+ # libcrypto files don't have owner write permission.
+- install( CODE "execute_process(COMMAND chmod -R u+w ${CMAKE_INSTALL_PREFIX}/lib/condor/)" )
++ install( CODE "execute_process(COMMAND chmod -R u+w $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/condor/)" )
endif()
############################################################
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/files/
@ 2013-07-12 17:37 Sebastien Fabbro
0 siblings, 0 replies; 10+ messages in thread
From: Sebastien Fabbro @ 2013-07-12 17:37 UTC (permalink / raw
To: gentoo-commits
commit: b735d9d4b5b5a4418ee6d64300b5df8195ba7caa
Author: Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Sat Jun 29 21:05:04 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 21:05:04 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b735d9d4
Removed lines symlinking executables into the DESTDIR root
---
sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch b/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch
index c7c32a2..cb46299 100644
--- a/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch
+++ b/sys-cluster/htcondor/files/fix_sandbox_violations-8.0.0.patch
@@ -1,15 +1,12 @@
--- src/condor_scripts/CMakeLists.txt.orig 2013-06-17 23:02:02.815939000 +0100
+++ src/condor_scripts/CMakeLists.txt 2013-06-17 23:02:34.476727000 +0100
-@@ -27,9 +27,9 @@
+@@ -27,9 +27,6 @@
install ( FILES condor_configure DESTINATION ${C_SBIN} PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
install ( FILES condor_configure DESTINATION ${C_SBIN} RENAME condor_install PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
install ( FILES condor_configure DESTINATION ${C_SBIN} RENAME bosco_install PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
- install ( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ./sbin/bosco_install \${CMAKE_INSTALL_PREFIX}/bosco_install)" )
- install ( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ./sbin/condor_install \${CMAKE_INSTALL_PREFIX}/condor_install)" )
- install ( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ./sbin/condor_configure \${CMAKE_INSTALL_PREFIX}/condor_configure)" )
-+ install ( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ./sbin/bosco_install \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bosco_install)" )
-+ install ( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ./sbin/condor_install \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/condor_install)" )
-+ install ( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ./sbin/condor_configure \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/condor_configure)" )
endif(WANT_FULL_DEPLOYMENT)
install ( FILES condor_ssh sshd.sh DESTINATION ${C_LIBEXEC} PERMISSIONS ${CONDOR_SCRIPT_PERMS} )
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/files/
@ 2013-07-12 17:37 Sebastien Fabbro
0 siblings, 0 replies; 10+ messages in thread
From: Sebastien Fabbro @ 2013-07-12 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 139e0c16fbba983639c6996c159a2868a5b77ca0
Author: Chris Kerr <cjk34 <AT> cam <DOT> ac <DOT> uk>
AuthorDate: Tue Jul 2 22:12:12 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 22:12:12 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=139e0c16
Turns out ${PF} doesn't work but htcondor-${VERSION} should be correct
---
sys-cluster/htcondor/files/packaging_directories-8.0.0.patch | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-cluster/htcondor/files/packaging_directories-8.0.0.patch b/sys-cluster/htcondor/files/packaging_directories-8.0.0.patch
index ef3161b..d088264 100644
--- a/sys-cluster/htcondor/files/packaging_directories-8.0.0.patch
+++ b/sys-cluster/htcondor/files/packaging_directories-8.0.0.patch
@@ -21,9 +21,9 @@
+ set( C_ETC etc/condor )
+ set( C_CONFIGD etc/condor/config.d )
+
-+ set( C_ETC_EXAMPLES usr/share/doc/\${PF}/etc/examples )
-+ set( C_SHARE_EXAMPLES usr/share/doc/\${PF} )
-+ set( C_DOC usr/share/doc/\${PF} )
++ set( C_ETC_EXAMPLES usr/share/doc/htcondor-${VERSION}/etc/examples )
++ set( C_SHARE_EXAMPLES usr/share/doc/htcondor-${VERSION} )
++ set( C_DOC usr/share/doc/htcondor-${VERSION} )
+ set( C_LIBEXEC usr/lib\${LIB_SUFFIX}/condor/libexec )
+ set( C_SYSCONFIG etc/default )
+
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/files/
@ 2015-01-12 0:00 Christoph Junghans
0 siblings, 0 replies; 10+ messages in thread
From: Christoph Junghans @ 2015-01-12 0:00 UTC (permalink / raw
To: gentoo-commits
commit: a27a2d6809287a675059ab5ee00f39a71623e57b
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Jan 11 18:52:41 2015 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sun Jan 11 18:52:41 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a27a2d68
sys-cluster/htcondor: Add packaging_directories-8.3.2.patch
---
.../files/packaging_directories-8.3.2.patch | 32 ++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/sys-cluster/htcondor/files/packaging_directories-8.3.2.patch b/sys-cluster/htcondor/files/packaging_directories-8.3.2.patch
new file mode 100644
index 0000000..3faf0a2
--- /dev/null
+++ b/sys-cluster/htcondor/files/packaging_directories-8.3.2.patch
@@ -0,0 +1,32 @@
+--- b/build/cmake/CondorPackageConfig.cmake 2015-01-11 19:46:05.000000000 +0100
++++ a/build/cmake/CondorPackageConfig.cmake 2015-01-11 19:47:05.000000000 +0100
+@@ -406,6 +406,29 @@ elseif( ${OS_NAME} STREQUAL "LINUX" AND
+ set(CMAKE_INSTALL_PREFIX "")
+ set(CPACK_SET_DESTDIR "ON")
+
++ else()
++
++ #Directory overrides
++ set( C_BIN usr/bin )
++ set( C_LIB usr/lib\${LIB_SUFFIX}/condor )
++ set( C_LIB_PUBLIC usr/lib\${LIB_SUFFIX} )
++ set( C_LIB32 usr/lib\${LIB_SUFFIX}/condor )
++ set( C_SBIN usr/sbin )
++ set( C_INCLUDE usr/include/condor )
++ set( C_INCLUDE_PUBLIC usr/include )
++ set( C_MAN usr/share/man )
++ set( C_SRC usr/src)
++ set( C_SQL usr/share/condor/sql)
++ set( C_INIT etc/init.d )
++ set( C_ETC etc/condor )
++ set( C_CONFIGD etc/condor/config.d )
++
++ set( C_ETC_EXAMPLES usr/share/doc/htcondor-${VERSION}/etc/examples )
++ set( C_SHARE_EXAMPLES usr/share/doc/htcondor-${VERSION} )
++ set( C_DOC usr/share/doc/htcondor-${VERSION} )
++ set( C_LIBEXEC usr/lib\${LIB_SUFFIX}/condor/libexec )
++ set( C_SYSCONFIG etc/default )
++
+ endif()
+
+ set( EXTERNALS_LIB "${C_LIB}" )
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/files/
@ 2015-01-12 0:00 Christoph Junghans
0 siblings, 0 replies; 10+ messages in thread
From: Christoph Junghans @ 2015-01-12 0:00 UTC (permalink / raw
To: gentoo-commits
commit: e0cd473d0681da109da341a8422f99c3ba4e0487
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Jan 11 19:01:51 2015 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sun Jan 11 19:01:51 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e0cd473d
sys-cluster/htcondo: Add Apply-the-user-s-condor_config-last-rather-than-first-8.3.2.patch
---
...ondor_config-last-rather-than-first-8.3.2.patch | 25 ++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/sys-cluster/htcondor/files/Apply-the-user-s-condor_config-last-rather-than-first-8.3.2.patch b/sys-cluster/htcondor/files/Apply-the-user-s-condor_config-last-rather-than-first-8.3.2.patch
new file mode 100644
index 0000000..bedd7c5
--- /dev/null
+++ b/sys-cluster/htcondor/files/Apply-the-user-s-condor_config-last-rather-than-first-8.3.2.patch
@@ -0,0 +1,25 @@
+--- src/condor_utils/condor_config.cpp 2014-12-23 18:18:42.000000000 +0100
++++ src/condor_utils/condor_config.cpp 2015-01-11 19:59:17.000000000 +0100
+@@ -1454,18 +1454,14 @@ find_file(const char *env_name, const ch
+ if (!config_source) {
+ // List of condor_config file locations we'll try to open.
+ // As soon as we find one, we'll stop looking.
+- const int locations_length = 4;
++ const int locations_length = 3;
+ MyString locations[locations_length];
+- // 1) $HOME/.condor/condor_config
+- // $HOME/.condor/condor_config was added for BOSCO and never used, We are removing it in 8.3.1, but may put it back if users complain.
+- //find_user_file(locations[0], file_name, false);
+- // 2) /etc/condor/condor_config
+- locations[1].formatstr( "/etc/%s/%s", myDistro->Get(), file_name );
++ locations[0].formatstr( "/etc/%s/%s", myDistro->Get(), file_name );
+ // 3) /usr/local/etc/condor_config (FreeBSD)
+- locations[2].formatstr( "/usr/local/etc/%s", file_name );
++ locations[1].formatstr( "/usr/local/etc/%s", file_name );
+ if (tilde) {
+ // 4) ~condor/condor_config
+- locations[3].formatstr( "%s/%s", tilde, file_name );
++ locations[2].formatstr( "%s/%s", tilde, file_name );
+ }
+
+ int ctr;
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/files/
@ 2015-01-12 0:00 Christoph Junghans
0 siblings, 0 replies; 10+ messages in thread
From: Christoph Junghans @ 2015-01-12 0:00 UTC (permalink / raw
To: gentoo-commits
commit: 19a85a847f3602e1f96aff7f5dac7bdfc3ff9ff5
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Jan 11 18:52:19 2015 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sun Jan 11 18:52:19 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=19a85a84
sys-cluster/htcondor: Add condor_config.generic-8.3.2.patch
---
.../files/condor_config.generic-8.3.2.patch | 43 ++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/sys-cluster/htcondor/files/condor_config.generic-8.3.2.patch b/sys-cluster/htcondor/files/condor_config.generic-8.3.2.patch
new file mode 100644
index 0000000..8e8fac9
--- /dev/null
+++ b/sys-cluster/htcondor/files/condor_config.generic-8.3.2.patch
@@ -0,0 +1,43 @@
+--- b/src/condor_examples/condor_config.generic 2015-01-11 19:34:36.000000000 +0100
++++ a/src/condor_examples/condor_config.generic 2015-01-11 19:38:18.000000000 +0100
+@@ -19,7 +19,7 @@
+ ######################################################################
+
+ ## Where have you installed the bin, sbin and lib condor directories?
+-RELEASE_DIR = /usr/local/condor
++RELEASE_DIR = /usr
+
+ ## Where is the local condor directory for each host? This is where the local config file(s), logs and
+ ## spool/execute directories are located. this is the default for Linux and Unix systems.
+@@ -27,18 +27,22 @@ RELEASE_DIR = /usr/local/condor
+ ## this is the default on Windows sytems
+ #LOCAL_DIR = $(RELEASE_DIR)
+
+-## Where is the machine-specific local config file for each host?
+-LOCAL_CONFIG_FILE = $(LOCAL_DIR)/condor_config.local
+-## If your configuration is on a shared file system, then this might be a better default
+-#LOCAL_CONFIG_FILE = $(RELEASE_DIR)/etc/$(HOSTNAME).local
++## Looking for LOCAL_CONFIG_FILE? You will not find it here. Instead
++## put a file in the LOCAL_CONFIG_DIR below. It is a more extensible
++## means to manage configuration. The order in which configuration
++## files are read from the LOCAL_CONFIG_DIR is lexicographic. For
++## instance, config in 00MyConfig will be overridden by config in
++## 97MyConfig.
+ ## If the local config file is not present, is it an error? (WARNING: This is a potential security issue.)
+-#REQUIRE_LOCAL_CONFIG_FILE = true
++REQUIRE_LOCAL_CONFIG_FILE = false
+
+-## The normal way to do configuration with RPMs is to read all of the
+-## files in a given directory that don't match a regex as configuration files.
++## Where are optional machine-specific local config files located?
+ ## Config files are read in lexicographic order.
+-LOCAL_CONFIG_DIR = $(LOCAL_DIR)/config
+-#LOCAL_CONFIG_DIR_EXCLUDE_REGEXP = ^((\..*)|(.*~)|(#.*)|(.*\.rpmsave)|(.*\.rpmnew))$
++## No default.
++LOCAL_CONFIG_DIR = $(ETC)/config.d
++
++## Blacklist for file processing in the LOCAL_CONFIG_DIR
++LOCAL_CONFIG_DIR_EXCLUDE_REGEXP = ^((\..*)|(.*~)|(#.*)|(.*\.rpmsave)|(.*\.rpmnew))$
+
+ ## Use a host-based security policy. By default CONDOR_HOST and the local machine will be allowed
+ use SECURITY : HOST_BASED
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/files/
@ 2015-01-12 0:00 Christoph Junghans
0 siblings, 0 replies; 10+ messages in thread
From: Christoph Junghans @ 2015-01-12 0:00 UTC (permalink / raw
To: gentoo-commits
commit: 75660830b9e09693235053945815b04fb9e7b666
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Jan 11 18:40:49 2015 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sun Jan 11 18:40:49 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=75660830
sys-cluster/htcondor: Add condor_shadow_dlopen-8.3.2.patch
---
sys-cluster/htcondor/files/condor_shadow_dlopen-8.3.2.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/sys-cluster/htcondor/files/condor_shadow_dlopen-8.3.2.patch b/sys-cluster/htcondor/files/condor_shadow_dlopen-8.3.2.patch
new file mode 100644
index 0000000..5709e70
--- /dev/null
+++ b/sys-cluster/htcondor/files/condor_shadow_dlopen-8.3.2.patch
@@ -0,0 +1,11 @@
+--- b/build/cmake/CondorConfigure.cmake 2015-01-11 19:29:57.000000000 +0100
++++ a/build/cmake/CondorConfigure.cmake 2015-01-11 19:30:40.000000000 +0100
+@@ -841,7 +841,7 @@ set (CONDOR_LIBS "condor_utils;${RT_FOUN
+ set (CONDOR_TOOL_LIBS "condor_utils;${RT_FOUND};${CLASSADS_FOUND};${SECURITY_LIBS};${PCRE_FOUND};${COREDUMPER_FOUND}")
+ set (CONDOR_SCRIPT_PERMS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ if (LINUX OR DARWIN)
+- set (CONDOR_LIBS_FOR_SHADOW "condor_utils_s;classads;${SECURITY_LIBS};${RT_FOUND};${PCRE_FOUND};${OPENSSL_FOUND};${KRB5_FOUND};${POSTGRESQL_FOUND};${COREDUMPER_FOUND};${IOKIT_FOUND};${COREFOUNDATION_FOUND}")
++ set (CONDOR_LIBS_FOR_SHADOW "condor_utils_s;classads;${SECURITY_LIBS};${RT_FOUND};${PCRE_FOUND};${OPENSSL_FOUND};${KRB5_FOUND};${POSTGRESQL_FOUND};${COREDUMPER_FOUND};${IOKIT_FOUND};${COREFOUNDATION_FOUND};dl")
+ if (DARWIN)
+ set (CONDOR_LIBS_FOR_SHADOW "${CONDOR_LIBS_FOR_SHADOW};resolv" )
+ endif (DARWIN)
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/files/
@ 2015-01-25 16:39 Justin Lecher
0 siblings, 0 replies; 10+ messages in thread
From: Justin Lecher @ 2015-01-25 16:39 UTC (permalink / raw
To: gentoo-commits
commit: 4617cc6a0e736a2d379e38315447e1fff125a0a6
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Fri Jan 23 20:08:01 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jan 23 20:08:01 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4617cc6a
sys-cluster/htcondor: Clean patches according to the CLEAN PATCH HOWTO
http://dev.gentoo.org/~vapier/clean-patches
---
...3.2-Apply-the-users-condor_config-last-rather-than-first.patch | 8 ++++++--
.../htcondor/files/htcondor-8.3.2-condor_config.generic.patch | 8 ++++++--
.../htcondor/files/htcondor-8.3.2-packaging_directories.patch | 8 ++++++--
sys-cluster/htcondor/files/htcondor-8.3.2-shadow_dlopen.patch | 7 +++++--
4 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/sys-cluster/htcondor/files/htcondor-8.3.2-Apply-the-users-condor_config-last-rather-than-first.patch b/sys-cluster/htcondor/files/htcondor-8.3.2-Apply-the-users-condor_config-last-rather-than-first.patch
index bedd7c5..f906ec8 100644
--- a/sys-cluster/htcondor/files/htcondor-8.3.2-Apply-the-users-condor_config-last-rather-than-first.patch
+++ b/sys-cluster/htcondor/files/htcondor-8.3.2-Apply-the-users-condor_config-last-rather-than-first.patch
@@ -1,5 +1,9 @@
---- src/condor_utils/condor_config.cpp 2014-12-23 18:18:42.000000000 +0100
-+++ src/condor_utils/condor_config.cpp 2015-01-11 19:59:17.000000000 +0100
+Apply the users condor_config last, rather than first.
+Ported patch from htcondor-8.0.0 to 8.3.2
+
+Patch by Marius Brehler.
+--- src/condor_utils/condor_config.cpp
++++ src/condor_utils/condor_config.cpp
@@ -1454,18 +1454,14 @@ find_file(const char *env_name, const ch
if (!config_source) {
// List of condor_config file locations we'll try to open.
diff --git a/sys-cluster/htcondor/files/htcondor-8.3.2-condor_config.generic.patch b/sys-cluster/htcondor/files/htcondor-8.3.2-condor_config.generic.patch
index 8e8fac9..7b6d337 100644
--- a/sys-cluster/htcondor/files/htcondor-8.3.2-condor_config.generic.patch
+++ b/sys-cluster/htcondor/files/htcondor-8.3.2-condor_config.generic.patch
@@ -1,5 +1,9 @@
---- b/src/condor_examples/condor_config.generic 2015-01-11 19:34:36.000000000 +0100
-+++ a/src/condor_examples/condor_config.generic 2015-01-11 19:38:18.000000000 +0100
+Adjust the generic condor_config to Gentoo's needs.
+Ported patch from htcondor-8.0.0 to 8.3.2
+
+Patch by Marius Brehler.
+--- b/src/condor_examples/condor_config.generic
++++ a/src/condor_examples/condor_config.generic
@@ -19,7 +19,7 @@
######################################################################
diff --git a/sys-cluster/htcondor/files/htcondor-8.3.2-packaging_directories.patch b/sys-cluster/htcondor/files/htcondor-8.3.2-packaging_directories.patch
index 3faf0a2..8acd7c7 100644
--- a/sys-cluster/htcondor/files/htcondor-8.3.2-packaging_directories.patch
+++ b/sys-cluster/htcondor/files/htcondor-8.3.2-packaging_directories.patch
@@ -1,5 +1,9 @@
---- b/build/cmake/CondorPackageConfig.cmake 2015-01-11 19:46:05.000000000 +0100
-+++ a/build/cmake/CondorPackageConfig.cmake 2015-01-11 19:47:05.000000000 +0100
+Adjust the package directories.
+Ported patch from htcondor-8.0.0 to 8.3.2
+
+Patch by Marius Brehler.
+--- b/build/cmake/CondorPackageConfig.cmake
++++ a/build/cmake/CondorPackageConfig.cmake
@@ -406,6 +406,29 @@ elseif( ${OS_NAME} STREQUAL "LINUX" AND
set(CMAKE_INSTALL_PREFIX "")
set(CPACK_SET_DESTDIR "ON")
diff --git a/sys-cluster/htcondor/files/htcondor-8.3.2-shadow_dlopen.patch b/sys-cluster/htcondor/files/htcondor-8.3.2-shadow_dlopen.patch
index 5709e70..010adbd 100644
--- a/sys-cluster/htcondor/files/htcondor-8.3.2-shadow_dlopen.patch
+++ b/sys-cluster/htcondor/files/htcondor-8.3.2-shadow_dlopen.patch
@@ -1,5 +1,8 @@
---- b/build/cmake/CondorConfigure.cmake 2015-01-11 19:29:57.000000000 +0100
-+++ a/build/cmake/CondorConfigure.cmake 2015-01-11 19:30:40.000000000 +0100
+Ported patch from htcondor-8.0.0 to 8.3.2
+
+Patch by Marius Brehler.
+-- b/build/cmake/CondorConfigure.cmake
++++ a/build/cmake/CondorConfigure.cmake
@@ -841,7 +841,7 @@ set (CONDOR_LIBS "condor_utils;${RT_FOUN
set (CONDOR_TOOL_LIBS "condor_utils;${RT_FOUND};${CLASSADS_FOUND};${SECURITY_LIBS};${PCRE_FOUND};${COREDUMPER_FOUND}")
set (CONDOR_SCRIPT_PERMS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-01-25 16:39 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-12 0:00 [gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/files/ Christoph Junghans
-- strict thread matches above, loose matches on Subject: below --
2015-01-25 16:39 Justin Lecher
2015-01-12 0:00 Christoph Junghans
2015-01-12 0:00 Christoph Junghans
2015-01-12 0:00 Christoph Junghans
2013-07-12 17:37 Sebastien Fabbro
2013-07-12 17:37 Sebastien Fabbro
2013-07-12 17:37 Sebastien Fabbro
2013-07-12 17:37 Sebastien Fabbro
2013-07-12 17:37 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox