[arch-commits] Commit in (4 files)

[Sébastien Luttringer]

    Date: Saturday, March 12, 2016 @ 19:39:34
  Author: seblu
Revision: 261384

Update patch snippet

Modified:
  nftables/trunk/PKGBUILD
  quagga/trunk/PKGBUILD
  radvd/trunk/PKGBUILD
  ulogd/trunk/PKGBUILD

-------------------------+
 nftables/trunk/PKGBUILD |   10 ++++++++--
 quagga/trunk/PKGBUILD   |   12 ++++++++----
 radvd/trunk/PKGBUILD    |   15 ++++++++++++---
 ulogd/trunk/PKGBUILD    |   12 ++++++++----
 4 files changed, 36 insertions(+), 13 deletions(-)

Modified: nftables/trunk/PKGBUILD
===================================================================
--- nftables/trunk/PKGBUILD	2016-03-12 18:32:11 UTC (rev 261383)
+++ nftables/trunk/PKGBUILD	2016-03-12 18:39:34 UTC (rev 261384)
@@ -26,8 +26,14 @@
           'd9f40e751b44dd9dc9fdb3b7eba3cc0a9b7e1b01')
 
 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
   :
 }

Modified: quagga/trunk/PKGBUILD
===================================================================
--- quagga/trunk/PKGBUILD	2016-03-12 18:32:11 UTC (rev 261383)
+++ quagga/trunk/PKGBUILD	2016-03-12 18:39:34 UTC (rev 261384)
@@ -36,11 +36,15 @@
 
 prepare() {
   cd $pkgname-$pkgver
-  shopt -s nullglob
-  for _p in "$srcdir"/*.patch; do
-    msg2 "Applying ${_p##*/}"
-    patch -p 1 -i "$_p"
+  # 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: radvd/trunk/PKGBUILD
===================================================================
--- radvd/trunk/PKGBUILD	2016-03-12 18:32:11 UTC (rev 261383)
+++ radvd/trunk/PKGBUILD	2016-03-12 18:39:34 UTC (rev 261384)
@@ -20,9 +20,18 @@
           'SKIP'
           '2fdba3b0ed28c67dc1c04bfd1439fa4dece88bbc')
 
-#prepare() {
-#  patch -p1 -d $pkgname-$pkgver < '01-fix-rdnssinfo-length-fix.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: ulogd/trunk/PKGBUILD
===================================================================
--- ulogd/trunk/PKGBUILD	2016-03-12 18:32:11 UTC (rev 261383)
+++ ulogd/trunk/PKGBUILD	2016-03-12 18:39:34 UTC (rev 261384)
@@ -42,12 +42,16 @@
          '9b6b3791a1da9433e1779aa5155fdc4a')
 
 prepare() {
-  for _f in "${source[@]}"; do
-    if [[ "$_f" =~ \.patch$ ]]; then
-      msg2 "Apply patch $_f"
-      patch -t -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
+  :
 }
 
 build() {