[arch-commits] Commit in (7 files)

[Sébastien Luttringer]

    Date: Saturday, March 12, 2016 @ 19:32:11
  Author: seblu
Revision: 261383

Update prepare with patch snippet

Modified:
  coreutils/trunk/PKGBUILD
  file/trunk/PKGBUILD
  filesystem/trunk/PKGBUILD
  filesystem/trunk/nsswitch.conf
  filesystem/trunk/profile
  patch/trunk/PKGBUILD
  pcre/trunk/PKGBUILD

--------------------------------+
 coreutils/trunk/PKGBUILD       |   14 +++++++++-----
 file/trunk/PKGBUILD            |   15 ++++++++++++---
 filesystem/trunk/PKGBUILD      |    7 ++++---
 filesystem/trunk/nsswitch.conf |    2 +-
 filesystem/trunk/profile       |    2 +-
 patch/trunk/PKGBUILD           |   18 ++++++++++++------
 pcre/trunk/PKGBUILD            |   10 ++++++++--
 7 files changed, 47 insertions(+), 21 deletions(-)

Modified: coreutils/trunk/PKGBUILD
===================================================================
--- coreutils/trunk/PKGBUILD	2016-03-12 18:09:25 UTC (rev 261382)
+++ coreutils/trunk/PKGBUILD	2016-03-12 18:32:11 UTC (rev 261383)
@@ -20,12 +20,16 @@
          'SKIP')
 
 prepare() {
-  local _p
-  for _p in *.patch; do
-   [[ -e $_p ]] || continue
-   msg2 "Applying $_p"
-   patch -p1 -d $pkgname-$pkgver < "$_p"
+  cd $pkgname-$pkgver
+  # apply patch from the source array (should be a pacman feature)
+  local filename
+  for filename in "${source[@]}"; do
+    if [[ "$filename" =~ \.patch$ ]]; then
+      msg2 "Applying patch $filename"
+      patch -p1 -i "$srcdir/$filename"
+    fi
   done
+  :
 }
 
 build() {

Modified: file/trunk/PKGBUILD
===================================================================
--- file/trunk/PKGBUILD	2016-03-12 18:09:25 UTC (rev 261382)
+++ file/trunk/PKGBUILD	2016-03-12 18:32:11 UTC (rev 261383)
@@ -15,9 +15,18 @@
 source=("ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('e6a972d4e10d9e76407a432f4a63cd4c')
 
-#prepare() {
-#  patch -p1 -d $pkgname-$pkgver < '001-fix-bug-with-long-options.patch'
-#}
+prepare() {
+  cd $pkgname-$pkgver
+  # apply patch from the source array (should be a pacman feature)
+  local filename
+  for filename in "${source[@]}"; do
+    if [[ "$filename" =~ \.patch$ ]]; then
+      msg2 "Applying patch $filename"
+      patch -p1 -i "$srcdir/$filename"
+    fi
+  done
+  :
+}
 
 build() {
   cd $pkgname-$pkgver

Modified: filesystem/trunk/PKGBUILD
===================================================================
--- filesystem/trunk/PKGBUILD	2016-03-12 18:09:25 UTC (rev 261382)
+++ filesystem/trunk/PKGBUILD	2016-03-12 18:32:11 UTC (rev 261383)
@@ -3,7 +3,7 @@
 
 pkgname=filesystem
 pkgver=2015.09
-pkgrel=1
+pkgrel=1.1
 pkgdesc='Base filesystem'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -35,7 +35,7 @@
          '6f48288b6fcaf0065fcb7b0e525413e0'
          '22518e922891f9359f971f4f5b4e793c'
          '69e460404f45bdb7288d1de662e56dd9'
-         'cfa3345c485c59e681ab39a44dc7ece1'
+         '6c11d5af3bf8c770766e77312e7bd07f'
          'a8a962370cd0128465d514e6a1f74130'
          '2e193c4a37245f2323ebe87f1a673563'
          '71ed98c52e11ada1f936ac8cb14eecd9')
@@ -149,8 +149,9 @@
 	#
 	# setup /usr/local hierarchy
 	#
-	for d in bin etc games include lib man sbin share src; do
+	for d in bin etc games include lib man share src; do
 		install -d -m755 usr/local/$d
 	done
 	ln -s ../man usr/local/share/man
+	ln -s bin usr/local/sbin
 }

Modified: filesystem/trunk/nsswitch.conf
===================================================================
--- filesystem/trunk/nsswitch.conf	2016-03-12 18:09:25 UTC (rev 261382)
+++ filesystem/trunk/nsswitch.conf	2016-03-12 18:32:11 UTC (rev 261383)
@@ -6,7 +6,7 @@
 
 publickey: files
 
-hosts: files dns myhostname
+hosts: files resolve mymachines myhostname
 networks: files
 
 protocols: files

Modified: filesystem/trunk/profile
===================================================================
--- filesystem/trunk/profile	2016-03-12 18:09:25 UTC (rev 261382)
+++ filesystem/trunk/profile	2016-03-12 18:32:11 UTC (rev 261383)
@@ -4,7 +4,7 @@
 umask 022
 
 # Set our default path
-PATH="/usr/local/sbin:/usr/local/bin:/usr/bin"
+PATH="/usr/local/bin:/usr/bin"
 export PATH
 
 # Load profiles from /etc/profile.d

Modified: patch/trunk/PKGBUILD
===================================================================
--- patch/trunk/PKGBUILD	2016-03-12 18:09:25 UTC (rev 261382)
+++ patch/trunk/PKGBUILD	2016-03-12 18:32:11 UTC (rev 261383)
@@ -19,12 +19,18 @@
 md5sums=('e3da7940431633fb65a01b91d3b7a27a'
          'SKIP')
 
-#prepare() {
-#  # Fix segfault on non-numeric strip-count
-#  # (also segfaults on nonexistent directory passed to -d)
-#  # http://savannah.gnu.org/bugs/?37500
-#  patch -Np1 -d $pkgname-$pkgver < patch-2.7.1-initialize-data-structures-early-enough.patch
-#}
+prepare() {
+  cd $pkgname-$pkgver
+  # apply patch from the source array (should be a pacman feature)
+  local filename
+  for filename in "${source[@]}"; do
+    if [[ "$filename" =~ \.patch$ ]]; then
+      msg2 "Applying patch $filename"
+      patch -p1 -i "$srcdir/$filename"
+    fi
+  done
+  :
+}
 
 build() {
   cd $pkgname-$pkgver

Modified: pcre/trunk/PKGBUILD
===================================================================
--- pcre/trunk/PKGBUILD	2016-03-12 18:09:25 UTC (rev 261382)
+++ pcre/trunk/PKGBUILD	2016-03-12 18:32:11 UTC (rev 261383)
@@ -20,8 +20,14 @@
          '722aba6455a3f0240eaa22289f0176a0')
 
 prepare() {
-  for _f in "${source[@]}"; do
-    [[ "$_f" =~ \.patch$ ]] && { msg2 "$_f"; patch -p1 -d $pkgname-$pkgver < "$_f"; }
+  cd $pkgname-$pkgver
+  # apply patch from the source array (should be a pacman feature)
+  local filename
+  for filename in "${source[@]}"; do
+    if [[ "$filename" =~ \.patch$ ]]; then
+      msg2 "Applying patch $filename"
+      patch -p1 -i "$srcdir/$filename"
+    fi
   done
   :
 }