remove the transfer patch

only root can r/w the images, no access for normal users

3 files changed, 0 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5bbdf2dd859..3c4430461237 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,14 +16,12 @@ pkgbase = shifter
 	makedepends = json-c
 	source = https://github.com/NERSC/shifter/archive/16.08.3_2.tar.gz
 	source = build_ssh.patch
-	source = transfer.patch
 	source = shifter-runtime.conf
 	source = shifter-imagegw.conf
 	source = shifter-imagegw.service
 	source = start-imagegw.sh
 	sha512sums = c5de6953909b3c33693a5957c797d3fe505f0a18507cf25e801c0ac8b02f87e8a17388e0768782a659c2c5ee7c879d98e8193ddd8ec0331b965884d2f8eee656
 	sha512sums = bcb8da45ba803f40a76902961b86783d2399732272d68554dd75e09115958c9d1cf5c8d9d6d1f0db406d36a16e404500c47fa40c70d4f17ab0c6b7d94cd28f06
-	sha512sums = b6006b3983fbfef08d262c979437fdaca6806e518887095276e33aadba9faeca45efa86f0f48f8dc5b2a26314c8792e6f17343d3560e4946404144dc7be23cc6
 	sha512sums = 8df5449ea93988364e8c350a2652e661545d883fada2f589b944cc7a2bd0d34b494f31e0f63bb0aea9c82e2805b4c9393b2290575dd14497fcd873b286d51b36
 	sha512sums = c56ad3b92901abdb41cffaeceeff9a6c8dae3882aacf9a4b654a8898f1e26eeadda3ac3ac799b127b176cc31d397652f27a07bcdfbf7f4ede3c6826d08f7bd7d
 	sha512sums = daf8163025a5d4099dc64cab8bab57d0b1a4101f04c563b5b03521b386d87581565d0e03c2fb3a02d791daff16cfb139244cc6bd7a886661e3caa0d107a7cb0a
diff --git a/PKGBUILD b/PKGBUILD
index 33ba78ee2cb4..27ead2d2c137 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,14 +11,12 @@ url="https://github.com/NERSC/shifter"
 license=('BSD')
 source=("https://github.com/NERSC/shifter/archive/${pkgver}_${pkgrel}.tar.gz"
         'build_ssh.patch'
-        'transfer.patch'
         'shifter-runtime.conf'
         'shifter-imagegw.conf'
         'shifter-imagegw.service'
         'start-imagegw.sh')
 sha512sums=('c5de6953909b3c33693a5957c797d3fe505f0a18507cf25e801c0ac8b02f87e8a17388e0768782a659c2c5ee7c879d98e8193ddd8ec0331b965884d2f8eee656'
             'bcb8da45ba803f40a76902961b86783d2399732272d68554dd75e09115958c9d1cf5c8d9d6d1f0db406d36a16e404500c47fa40c70d4f17ab0c6b7d94cd28f06'
-            'b6006b3983fbfef08d262c979437fdaca6806e518887095276e33aadba9faeca45efa86f0f48f8dc5b2a26314c8792e6f17343d3560e4946404144dc7be23cc6'
             '8df5449ea93988364e8c350a2652e661545d883fada2f589b944cc7a2bd0d34b494f31e0f63bb0aea9c82e2805b4c9393b2290575dd14497fcd873b286d51b36'
             'c56ad3b92901abdb41cffaeceeff9a6c8dae3882aacf9a4b654a8898f1e26eeadda3ac3ac799b127b176cc31d397652f27a07bcdfbf7f4ede3c6826d08f7bd7d'
             'daf8163025a5d4099dc64cab8bab57d0b1a4101f04c563b5b03521b386d87581565d0e03c2fb3a02d791daff16cfb139244cc6bd7a886661e3caa0d107a7cb0a'
@@ -27,7 +25,6 @@ sha512sums=('c5de6953909b3c33693a5957c797d3fe505f0a18507cf25e801c0ac8b02f87e8a17
 prepare() {
     cd "${srcdir}/shifter-${pkgver}_${pkgrel}"
     patch -p0 < ../build_ssh.patch
-    patch -p0 < ../transfer.patch
     sed -i -e 's/\/api\/expire\/<system>\/<imgtype>\/<tag>\//\/api\/expire\/<system>\/<imgtype>\/<path:tag>\//' imagegw/shifter_imagegw/api.py
 }
 
diff --git a/transfer.patch b/transfer.patch
deleted file mode 100644
index 360bc0f22ec4..000000000000
--- a/transfer.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- imagegw/shifter_imagegw/transfer.py	2017-05-08 23:53:14.000000000 +0800
-+++ imagegw/shifter_imagegw/transfer.py	2017-07-31 00:16:39.167788950 +0800
-@@ -170,6 +170,10 @@
-         try:
-             mv_cmd = sh_cmd(system, 'mv', temp_fn, target_fn)
-             ret = _exec_and_log(mv_cmd, logger)
-+            if ret == 0:
-+                ## fix permissions on the image file
-+                chmod_cmd = sh_cmd(system, 'chmod', 'a+r', target_fn)
-+                ret = _exec_and_log(chmod_cmd, logger)
-             return ret == 0
-         except:
-             ### TODO we might also need to remove target_fn in this case