-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathlibexec.patch
131 lines (124 loc) · 6.48 KB
/
libexec.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
diff -aur cvmfs-cvmfs-2.3.5-old/ChangeLog cvmfs-cvmfs-2.3.5-new/ChangeLog
--- cvmfs-cvmfs-2.3.5-old/ChangeLog 2017-03-22 13:31:02.000000000 +0100
+++ cvmfs-cvmfs-2.3.5-new/ChangeLog 2017-06-12 22:09:24.338401420 +0200
@@ -272,7 +272,7 @@
* Apply umask to the mode when creating files on the Stratum 0/1 (CVM-660)
* Make server transaction handling more robust against failures and
concurrent operations (CVM-665, CVM-666)
- * Install auto.cvmfs in /usr/libexec/cvmfs and make /etc/auto.cvmfs a
+ * Install auto.cvmfs in /usr/lib/cvmfs and make /etc/auto.cvmfs a
symlink (CVM-645)
* Restrict the number of in-flight file processing jobs in the server in
order to not exhaust file descriptor limit
diff -aur cvmfs-cvmfs-2.3.5-old/cvmfs/CMakeLists.txt cvmfs-cvmfs-2.3.5-new/cvmfs/CMakeLists.txt
--- cvmfs-cvmfs-2.3.5-old/cvmfs/CMakeLists.txt 2017-03-22 13:31:02.000000000 +0100
+++ cvmfs-cvmfs-2.3.5-new/cvmfs/CMakeLists.txt 2017-06-12 22:08:46.175549530 +0200
@@ -644,7 +644,7 @@
install (
TARGETS cvmfs_allow_helper cvmfs_deny_helper
RUNTIME
- DESTINATION libexec/cvmfs/authz
+ DESTINATION lib/cvmfs/authz
)
install (
diff -aur cvmfs-cvmfs-2.3.5-old/cvmfs/cvmfs.cc cvmfs-cvmfs-2.3.5-new/cvmfs/cvmfs.cc
--- cvmfs-cvmfs-2.3.5-old/cvmfs/cvmfs.cc 2017-03-22 13:31:02.000000000 +0100
+++ cvmfs-cvmfs-2.3.5-new/cvmfs/cvmfs.cc 2017-06-12 22:08:58.402061949 +0200
@@ -2078,7 +2078,7 @@
bool shared_cache = false;
int64_t quota_limit = cvmfs::kDefaultCacheSizeMb;
string authz_helper = "";
- string authz_search_path = "/usr/libexec/cvmfs/authz";
+ string authz_search_path = "/usr/lib/cvmfs/authz";
string hostname = "";
string proxies = "";
string fallback_proxies = "";
diff -aur cvmfs-cvmfs-2.3.5-old/mount/CMakeLists.txt cvmfs-cvmfs-2.3.5-new/mount/CMakeLists.txt
--- cvmfs-cvmfs-2.3.5-old/mount/CMakeLists.txt 2017-03-22 13:31:02.000000000 +0100
+++ cvmfs-cvmfs-2.3.5-new/mount/CMakeLists.txt 2017-06-12 22:05:41.331215169 +0200
@@ -152,7 +152,7 @@
add_executable (auto.cvmfs ${CVMFS_AUTO_SOURCES})
SET( autofsmap_link /etc/auto.cvmfs)
- SET( autofsmap_dest /usr/libexec/cvmfs)
+ SET( autofsmap_dest /usr/lib/cvmfs)
SET( autofsmap_target ${autofsmap_dest}/auto.cvmfs)
install (
TARGETS auto.cvmfs
diff -aur cvmfs-cvmfs-2.3.5-old/mount/default.d/10-osx.conf cvmfs-cvmfs-2.3.5-new/mount/default.d/10-osx.conf
--- cvmfs-cvmfs-2.3.5-old/mount/default.d/10-osx.conf 2017-03-22 13:31:02.000000000 +0100
+++ cvmfs-cvmfs-2.3.5-new/mount/default.d/10-osx.conf 2017-06-12 22:04:43.265281323 +0200
@@ -1 +1 @@
-CVMFS_AUTHZ_SEARCH_PATH=/usr/local/libexec/cvmfs/authz
+CVMFS_AUTHZ_SEARCH_PATH=/usr/lib/cvmfs/authz
diff -aur cvmfs-cvmfs-2.3.5-old/packaging/debian/cvmfs/cvmfs.install.in cvmfs-cvmfs-2.3.5-new/packaging/debian/cvmfs/cvmfs.install.in
--- cvmfs-cvmfs-2.3.5-old/packaging/debian/cvmfs/cvmfs.install.in 2017-03-22 13:31:02.000000000 +0100
+++ cvmfs-cvmfs-2.3.5-new/packaging/debian/cvmfs/cvmfs.install.in 2017-06-12 22:03:12.186430986 +0200
@@ -10,9 +10,9 @@
usr/lib/libcvmfs_fuse_debug.so
usr/bin/cvmfs_talk
usr/bin/cvmfs_config
-usr/libexec/cvmfs/auto.cvmfs
-usr/libexec/cvmfs/authz/cvmfs_allow_helper
-usr/libexec/cvmfs/authz/cvmfs_deny_helper
+usr/lib/cvmfs/auto.cvmfs
+usr/lib/cvmfs/authz/cvmfs_allow_helper
+usr/lib/cvmfs/authz/cvmfs_deny_helper
etc/auto.cvmfs
sbin/mount.cvmfs
etc/cvmfs/config.sh
diff -aur cvmfs-cvmfs-2.3.5-old/packaging/rpm/cvmfs-universal.spec cvmfs-cvmfs-2.3.5-new/packaging/rpm/cvmfs-universal.spec
--- cvmfs-cvmfs-2.3.5-old/packaging/rpm/cvmfs-universal.spec 2017-03-22 13:31:02.000000000 +0100
+++ cvmfs-cvmfs-2.3.5-new/packaging/rpm/cvmfs-universal.spec 2017-06-12 22:03:48.142643757 +0200
@@ -389,9 +389,9 @@
%{_bindir}/cvmfs_talk
%{_bindir}/cvmfs_fsck
%{_bindir}/cvmfs_config
-/usr/libexec/cvmfs/auto.cvmfs
-/usr/libexec/cvmfs/authz/cvmfs_allow_helper
-/usr/libexec/cvmfs/authz/cvmfs_deny_helper
+/usr/lib/cvmfs/auto.cvmfs
+/usr/lib/cvmfs/authz/cvmfs_allow_helper
+/usr/lib/cvmfs/authz/cvmfs_deny_helper
%{_sysconfdir}/auto.cvmfs
%{_sysconfdir}/cvmfs/config.sh
%if 0%{?selinux_cvmfs}
@@ -498,7 +498,7 @@
- Add libuuid-devel dependency
- Fixes for Fedora 21
* Tue Oct 21 2014 Jakob Blomer <jblomer@cern.ch> - 2.1.20
-- /etc/auto.cvmfs is now a link to /usr/libexec/cvmfs/auto.cvmfs
+- /etc/auto.cvmfs is now a link to /usr/lib/cvmfs/auto.cvmfs
* Thu Apr 10 2014 Jakob Blomer <jblomer@cern.ch> - 2.1.18
- Add /etc/cvmfs/default.d
* Thu Apr 3 2014 Jakob Blomer <jblomer@cern.ch> - 2.1.18
diff -aur cvmfs-cvmfs-2.3.5-old/retire/releasemgr/sshd_config cvmfs-cvmfs-2.3.5-new/retire/releasemgr/sshd_config
--- cvmfs-cvmfs-2.3.5-old/retire/releasemgr/sshd_config 2017-03-22 13:31:02.000000000 +0100
+++ cvmfs-cvmfs-2.3.5-new/retire/releasemgr/sshd_config 2017-06-12 22:07:41.143036673 +0200
@@ -115,7 +115,7 @@
Banner /etc/ssh/ssh_welcome
# override default of no subsystems
-Subsystem sftp /usr/libexec/openssh/sftp-server
+Subsystem sftp /usr/lib/openssh/sftp-server
# Example of overriding settings on a per-user basis
#Match User anoncvs
diff -aur cvmfs-cvmfs-2.3.5-old/test/src/600-securecvmfs/main cvmfs-cvmfs-2.3.5-new/test/src/600-securecvmfs/main
--- cvmfs-cvmfs-2.3.5-old/test/src/600-securecvmfs/main 2017-03-22 13:31:02.000000000 +0100
+++ cvmfs-cvmfs-2.3.5-new/test/src/600-securecvmfs/main 2017-06-12 22:07:13.783381879 +0200
@@ -236,7 +236,7 @@
echo "create a fresh repository named $CVMFS_TEST_REPO with user $CVMFS_TEST_USER"
create_empty_repo $CVMFS_TEST_REPO $CVMFS_TEST_USER /dev/stdout -V "x509%cvmfs:/cvmfs" || return $?
echo "Make sure we don't lock out ourselves when publishing"
- echo "CVMFS_AUTHZ_HELPER=/usr/libexec/cvmfs/authz/cvmfs_allow_helper" | \
+ echo "CVMFS_AUTHZ_HELPER=/usr/lib/cvmfs/authz/cvmfs_allow_helper" | \
sudo tee -a /etc/cvmfs/repositories.d/$CVMFS_TEST_REPO/client.conf
echo "gather information about the just created repo"
diff -aur cvmfs-cvmfs-2.3.5-old/test/src/632-authzhelpers/main cvmfs-cvmfs-2.3.5-new/test/src/632-authzhelpers/main
--- cvmfs-cvmfs-2.3.5-old/test/src/632-authzhelpers/main 2017-03-22 13:31:02.000000000 +0100
+++ cvmfs-cvmfs-2.3.5-new/test/src/632-authzhelpers/main 2017-06-12 22:06:45.943733157 +0200
@@ -46,7 +46,7 @@
local cache_base="$CVMFS_CACHE_BASE"
echo "Ensure that we can access the repo for editing"
- sudo sh -c "echo CVMFS_AUTHZ_HELPER=/usr/libexec/cvmfs/authz/cvmfs_allow_helper \
+ sudo sh -c "echo CVMFS_AUTHZ_HELPER=/usr/lib/cvmfs/authz/cvmfs_allow_helper \
>> ${spool_dir}/client.local" || return 10
echo "put some stuff into $CVMFS_TEST_REPO"