From ef7b481f7e754e567f50eb001ec5297e2f19fd29 Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Sat, 27 May 2017 20:31:25 -0500 Subject: [PATCH 1/2] Fix mlocate package permission issue #669 --- packages/mlocate.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/mlocate.rb b/packages/mlocate.rb index 7382a17959..98c05f9a5d 100644 --- a/packages/mlocate.rb +++ b/packages/mlocate.rb @@ -1,17 +1,19 @@ require 'package' class Mlocate < Package - version '0.26-1' - source_url 'https://releases.pagure.org/mlocate/mlocate-0.26.tar.xz' # software source tarball url - source_sha1 'c6e6d81b25359c51c545f4b8ba0f3b469227fcbc' # source tarball sha1 sum + version '0.26' + source_url 'https://releases.pagure.org/mlocate/mlocate-0.26.tar.xz' # software source tarball url + source_sha1 'c6e6d81b25359c51c545f4b8ba0f3b469227fcbc' # source tarball sha1 sum - def self.build # self.build contains commands needed to build the software from source - system "sed -i 's/groupname = mlocate/groupname = chronos/g' Makefile.*" # change groupname in all Makefiles + def self.build # self.build contains commands needed to build the software from source + system "mkdir -p /usr/local/opt/mlocate" # create dbdir directory where mlocate.db will be generated + system "sed -i 's,\$(localstatedir)/,/usr/local/opt/,g' Makefile.*" # change from /var (symlinked from /usr/local/var) to /usr/local/opt + system "sed -i 's,groupname = mlocate,groupname = chronos,g' Makefile.*" # change groupname in all Makefiles to avoid permission issues system "./configure" - system "make" # ordered chronologically + system "make" # ordered chronologically end - def self.install # self.install contains commands needed to install the software on the target system - system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" # remember to include DESTDIR set to CREW_DEST_DIR - needed to keep track of changes made to system + def self.install # self.install contains commands needed to install the software on the target system + system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" # remember to include DESTDIR set to CREW_DEST_DIR - needed to keep track of changes made to system end end From 0bb0ce9fc6d15dd34bcba7db5a6e64d899960ac6 Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Sun, 28 May 2017 20:57:02 -0500 Subject: [PATCH 2/2] Change from /usr/local/opt to /usr/local/db - Set \$(whoami) instead of chronos user --- packages/mlocate.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/mlocate.rb b/packages/mlocate.rb index 98c05f9a5d..50e5999df1 100644 --- a/packages/mlocate.rb +++ b/packages/mlocate.rb @@ -2,18 +2,18 @@ require 'package' class Mlocate < Package version '0.26' - source_url 'https://releases.pagure.org/mlocate/mlocate-0.26.tar.xz' # software source tarball url - source_sha1 'c6e6d81b25359c51c545f4b8ba0f3b469227fcbc' # source tarball sha1 sum + source_url 'https://releases.pagure.org/mlocate/mlocate-0.26.tar.xz' # software source tarball url + source_sha1 'c6e6d81b25359c51c545f4b8ba0f3b469227fcbc' # source tarball sha1 sum - def self.build # self.build contains commands needed to build the software from source - system "mkdir -p /usr/local/opt/mlocate" # create dbdir directory where mlocate.db will be generated - system "sed -i 's,\$(localstatedir)/,/usr/local/opt/,g' Makefile.*" # change from /var (symlinked from /usr/local/var) to /usr/local/opt - system "sed -i 's,groupname = mlocate,groupname = chronos,g' Makefile.*" # change groupname in all Makefiles to avoid permission issues + def self.build # self.build contains commands needed to build the software from source + system "mkdir -p /usr/local/db/mlocate" # create dbdir directory where mlocate.db will be generated + system "sed -i 's,\$(localstatedir)/,/usr/local/db/,g' Makefile.*" # change from /var (symlinked from /usr/local/var) to /usr/local/db + system "sed -i \"s/groupname = mlocate/groupname = $(whoami)/g\" Makefile.*" # change groupname in all Makefiles to avoid permission issues system "./configure" - system "make" # ordered chronologically + system "make" # ordered chronologically end - def self.install # self.install contains commands needed to install the software on the target system - system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" # remember to include DESTDIR set to CREW_DEST_DIR - needed to keep track of changes made to system + def self.install # self.install contains commands needed to install the software on the target system + system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" # remember to include DESTDIR set to CREW_DEST_DIR - needed to keep track of changes made to system end end