[lpf/f19] Fix for umask problem (bz #1080149).

leamas leamas at fedoraproject.org
Sat Aug 30 06:36:53 UTC 2014


commit 938106ade1b8e8c40cdde17b119362a9e94cbd98
Author: Alec Leamas <leamas at nowhere.net>
Date:   Sat Aug 30 06:44:36 2014 +0200

    Fix for umask problem (bz #1080149).
    
    - Fix for missing -y tobuilddep (upstream #24).

 0001-Add-umask-as-required-bz-1080149.patch        |   52 ++++++++++++++++++++
 ...Add-missing-y-to-yum-builddep-upstream-24.patch |   25 +++++++++
 lpf.spec                                           |   17 +++++-
 3 files changed, 91 insertions(+), 3 deletions(-)
---
diff --git a/0001-Add-umask-as-required-bz-1080149.patch b/0001-Add-umask-as-required-bz-1080149.patch
new file mode 100644
index 0000000..b3164bd
--- /dev/null
+++ b/0001-Add-umask-as-required-bz-1080149.patch
@@ -0,0 +1,52 @@
+From e02d0bb4bc73ec59a3e874fb4c8e7e3ee2d70c6a Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas at nowhere.net>
+Date: Sat, 30 Aug 2014 05:55:15 +0200
+Subject: [PATCH 1/2] Add umask as required (bz #1080149).
+
+---
+ scripts/lpf              | 1 +
+ scripts/lpf-pkgbuild     | 2 ++
+ scripts/lpf-sudo-install | 2 ++
+ 3 files changed, 5 insertions(+)
+
+diff --git a/scripts/lpf b/scripts/lpf
+index dfd03cf..bd19c8b 100755
+--- a/scripts/lpf
++++ b/scripts/lpf
+@@ -222,6 +222,7 @@ if [ "$( id -gn )" !=  "$LPF_GROUP" ]; then
+     exec sg pkg-build "$0 $*"
+ fi
+ 
++umask 002
+ trap "do_trap 81" SIGINT ERR
+ 
+ # http://forums.gentoo.org/viewtopic-t-947211-start-0.html
+diff --git a/scripts/lpf-pkgbuild b/scripts/lpf-pkgbuild
+index 5d1b83d..2b5134e 100755
+--- a/scripts/lpf-pkgbuild
++++ b/scripts/lpf-pkgbuild
+@@ -109,6 +109,8 @@ if [[ ! $( id -un ) = "$LPF_USER" && "$UID" -ne '0' ]]; then
+     exec $SUDO -u pkg-build $scriptdir/lpf-pkgbuild "$@"
+ fi
+ 
++umask 002
++
+ cmd="$1"; shift
+ case "$cmd" in
+     'build')
+diff --git a/scripts/lpf-sudo-install b/scripts/lpf-sudo-install
+index b798a54..0db7c73 100755
+--- a/scripts/lpf-sudo-install
++++ b/scripts/lpf-sudo-install
+@@ -8,6 +8,8 @@
+ 
+ set -e
+ 
++umask 002
++
+ scriptdir=${scriptdir:-$( dirname $(readlink -fn $0))}
+ source  $scriptdir/lpf-sudo-defs.bash
+ 
+-- 
+1.8.3.1
+
diff --git a/0002-Add-missing-y-to-yum-builddep-upstream-24.patch b/0002-Add-missing-y-to-yum-builddep-upstream-24.patch
new file mode 100644
index 0000000..bb4a629
--- /dev/null
+++ b/0002-Add-missing-y-to-yum-builddep-upstream-24.patch
@@ -0,0 +1,25 @@
+From b27870145b95de12936035e9c5636cd000dd8e8e Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas at nowhere.net>
+Date: Sat, 30 Aug 2014 06:10:15 +0200
+Subject: [PATCH 2/2] Add missing -y to yum-builddep (upstream #24).
+
+---
+ scripts/lpf-sudo-builddep | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/lpf-sudo-builddep b/scripts/lpf-sudo-builddep
+index cde80ed..403b562 100755
+--- a/scripts/lpf-sudo-builddep
++++ b/scripts/lpf-sudo-builddep
+@@ -18,7 +18,7 @@ for spec in "$@"; do
+     fi
+ done
+ 
+-[ "$good_specs" ] && /usr/bin/yum-builddep $good_specs
++[ "$good_specs" ] && /usr/bin/yum-builddep -y $good_specs
+ 
+ 
+ # vim: set expandtab ts=4 sw=4:
+-- 
+1.8.3.1
+
diff --git a/lpf.spec b/lpf.spec
index 7effdeb..249cd29 100644
--- a/lpf.spec
+++ b/lpf.spec
@@ -3,7 +3,7 @@
 
 Name:           lpf
 Version:        0.1
-Release:        6.%{shortcommit}%{?dist}
+Release:        8.%{shortcommit}%{?dist}
 Summary:        Local package factory - build non-redistributable rpms
 
                 # Icon from iconarchive.com
@@ -28,9 +28,11 @@ Requires:       yum-utils
 Requires:       zenity
 Requires(pre):  shadow-utils
 
-Patch1:        	0001-README-Add-a-note-on-dependencies-22.patch
+Patch1:         0001-README-Add-a-note-on-dependencies-22.patch
 Patch2:         0002-lpf-Bugfix.patch
 Patch3:         0003-pkgbuild-Bugfix-respect-CONFIG-bz-1057878.patch
+Patch4:         0001-Add-umask-as-required-bz-1080149.patch
+Patch5:         0002-Add-missing-y-to-yum-builddep-upstream-24.patch
 
 
 %description
@@ -49,6 +51,8 @@ Besides being interactive the operation is similar to akmod and dkms.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 rm -rf examples
 
 
@@ -106,6 +110,13 @@ fi
 
 
 %changelog
+* Sat Aug 30 2014 Alec Leamas <leamas.alec at gmail.com> - 0.1-8.36e5aa0
+- Fix for umask problem (bz #1080149).
+- Fix for missing -y tobuilddep (upstream #24).
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-7.36e5aa0
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Mon Jan 27 2014 Alec Leamas <leamas.alec at gmail.com> - 0.1-6.36e5aa0
 - Patch for bz #1057878 added.
 
@@ -116,7 +127,7 @@ fi
 - rebuilt
 
 * Wed Jan 08 2014 Alec Leamas <leamas.alec at gmail.com> - 0.1-3.36e5aa0
-- Remove bad requirement, reinstall %check, confirm fedkpg bug fixed.
+- Remove bad requirement, reinstall %%check, confirm fedkpg bug fixed.
 
 * Wed Jan 08 2014 Alec Leamas <leamas.alec at gmail.com> - 0.1-2.36e5aa0
 - Rebuilt, checking fo fedpkg bug.


More information about the scm-commits mailing list