summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2015-07-05 18:42:40 (GMT)
committerBritney Fransen <brfransen@gmail.com>2015-07-05 18:42:40 (GMT)
commitcb62d17450b7cc365a7bdbe0dac232af4d22faab (patch)
tree5029982da03bd17140e88bd9a504e442c98c3b94
parentd39f95aa83e0f76ab255322fbfcd35b23236f0a7 (diff)
downloadlinhes_pkgbuild-cb62d17450b7cc365a7bdbe0dac232af4d22faab.zip
linhes_pkgbuild-cb62d17450b7cc365a7bdbe0dac232af4d22faab.tar.gz
linhes_pkgbuild-cb62d17450b7cc365a7bdbe0dac232af4d22faab.tar.bz2
pacman: add makepkg asroot patch
-rw-r--r--abs/core/pacman/PKGBUILD16
-rw-r--r--abs/core/pacman/__changelog2
-rw-r--r--abs/core/pacman/makepkg-asroot.patch22
3 files changed, 34 insertions, 6 deletions
diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD
index f2d4507..a0cbdc2 100644
--- a/abs/core/pacman/PKGBUILD
+++ b/abs/core/pacman/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=pacman
pkgver=4.2.1
-pkgrel=1
+pkgrel=2
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64')
url="http://www.archlinux.org/pacman/"
@@ -21,18 +21,18 @@ replaces=('pacman-contrib')
backup=(etc/pacman.conf etc/makepkg.conf)
install=pacman.install
options=('strip' 'debug')
-source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
pacman.conf.i686
pacman.conf.x86_64
- makepkg.conf)
+ makepkg.conf
+ makepkg-asroot.patch)
md5sums=('2a596fc8f723e99660c0869a74afcf47'
- 'SKIP'
'2db6c94709bb30cc614a176ecf8badb1'
'de74a13618347f08ae4a9637f74471c4'
- '03d578816b56852d803cbafac85b9f09')
+ '03d578816b56852d803cbafac85b9f09'
+ 'bd3319d98bfc9560b0a765241f9ad80c')
validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD') # Allan McRae <allan@archlinux.org>
-
build() {
cd "$pkgname-$pkgver"
@@ -88,4 +88,8 @@ package() {
done
install -Dm644 contrib/PKGBUILD.vim "$pkgdir/usr/share/vim/vimfiles/syntax/PKGBUILD.vim"
+
+ #restore --asroot makepkg option
+ cd $pkgdir/usr/bin/
+ patch -p0 -i $srcdir/makepkg-asroot.patch
}
diff --git a/abs/core/pacman/__changelog b/abs/core/pacman/__changelog
index 56adaed..35b3de6 100644
--- a/abs/core/pacman/__changelog
+++ b/abs/core/pacman/__changelog
@@ -1 +1,3 @@
PKGBUILD: add pacman.install
+PKGBUILD: add makepkg-asroot.patch
+PKGBUILD: remove source sig
diff --git a/abs/core/pacman/makepkg-asroot.patch b/abs/core/pacman/makepkg-asroot.patch
new file mode 100644
index 0000000..f45f0ee
--- /dev/null
+++ b/abs/core/pacman/makepkg-asroot.patch
@@ -0,0 +1,22 @@
+--- makepkg.orig 2015-02-16 13:15:31.079071494 +0000
++++ makepkg 2015-02-16 13:18:14.735730577 +0000
+@@ -3372,7 +3372,7 @@
+ 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild'
+ 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'pkg:' 'repackage'
+ 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps'
+- 'verifysource' 'version')
++ 'verifysource' 'version' 'asroot')
+
+ # Pacman Options
+ OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar')
+@@ -3581,9 +3581,7 @@
+
+ if (( ! INFAKEROOT )); then
+ if (( EUID == 0 )); then
+- error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\
+-catastrophic damage to your system.")" "makepkg"
+- exit 1 # $E_USER_ABORT
++ :
+ fi
+ else
+ if [[ -z $FAKEROOTKEY ]]; then