[arch-commits] Commit in (20 files)

Sébastien Luttringer seblu at archlinux.org
Sun Mar 13 12:18:18 UTC 2016


    Date: Sunday, March 13, 2016 @ 13:18:18
  Author: seblu
Revision: 166538

Unify my way of patching

Added:
  iperf/trunk/01-FS#25159.patch
    (from rev 166537, iperf/trunk/client.cpp.patch)
  sysvbanner/trunk/01-man.patch
    (from rev 166537, sysvbanner/trunk/man.patch)
  ucarp/trunk/02-fix-downscript-on-error.patch
    (from rev 166537, ucarp/trunk/02-fix-downscript-on-error.c)
Modified:
  aiccu/trunk/PKGBUILD
  backuppc/trunk/PKGBUILD
  docker/trunk/PKGBUILD
  httperf/trunk/PKGBUILD
  iperf/trunk/PKGBUILD
  ipvsadm/trunk/PKGBUILD
  linux-tools/trunk/PKGBUILD
  mailman/trunk/PKGBUILD
  netperf/trunk/PKGBUILD
  python-progressbar/trunk/PKGBUILD
  rblcheck/trunk/PKGBUILD
  sysvbanner/trunk/PKGBUILD
  ucarp/trunk/PKGBUILD
  virtualbox/trunk/PKGBUILD
Deleted:
  iperf/trunk/client.cpp.patch
  sysvbanner/trunk/man.patch
  ucarp/trunk/02-fix-downscript-on-error.c

----------------------------------------------+
 aiccu/trunk/PKGBUILD                         |   12 +++++++++---
 backuppc/trunk/PKGBUILD                      |   12 +++++++++---
 docker/trunk/PKGBUILD                        |    2 +-
 httperf/trunk/PKGBUILD                       |   11 +++++++++--
 iperf/trunk/01-FS#25159.patch                |   17 +++++++++++++++++
 iperf/trunk/PKGBUILD                         |   16 +++++++++++++---
 iperf/trunk/client.cpp.patch                 |   17 -----------------
 ipvsadm/trunk/PKGBUILD                       |   15 ++++++++++++---
 linux-tools/trunk/PKGBUILD                   |   14 +++++++++-----
 mailman/trunk/PKGBUILD                       |   20 ++++++++++++--------
 netperf/trunk/PKGBUILD                       |   11 ++++++++++-
 python-progressbar/trunk/PKGBUILD            |   16 +++++++++++++++-
 rblcheck/trunk/PKGBUILD                      |   11 ++++++++---
 sysvbanner/trunk/01-man.patch                |   16 ++++++++++++++++
 sysvbanner/trunk/PKGBUILD                    |   16 ++++++++++++++--
 sysvbanner/trunk/man.patch                   |   16 ----------------
 ucarp/trunk/02-fix-downscript-on-error.c     |   12 ------------
 ucarp/trunk/02-fix-downscript-on-error.patch |   12 ++++++++++++
 ucarp/trunk/PKGBUILD                         |   15 +++++++++++----
 virtualbox/trunk/PKGBUILD                    |    2 +-
 20 files changed, 178 insertions(+), 85 deletions(-)

Modified: aiccu/trunk/PKGBUILD
===================================================================
--- aiccu/trunk/PKGBUILD	2016-03-13 10:53:08 UTC (rev 166537)
+++ aiccu/trunk/PKGBUILD	2016-03-13 12:18:18 UTC (rev 166538)
@@ -28,10 +28,16 @@
          '592de37319b62e6a85129735a5dab564')
 
 prepare() {
-  cd $pkgname
-  for _p in "$srcdir"/*.patch; do
-    patch -p1 -i "$_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 -N -i "$srcdir/$filename"
+    fi
   done
+  :
 }
 
 build() {

Modified: backuppc/trunk/PKGBUILD
===================================================================
--- backuppc/trunk/PKGBUILD	2016-03-13 10:53:08 UTC (rev 166537)
+++ backuppc/trunk/PKGBUILD	2016-03-13 12:18:18 UTC (rev 166538)
@@ -54,10 +54,16 @@
          'd48f3032e65a8fc4409454fe04faf9e1')
 
 prepare() {
-  for _p in *.patch; do
-    msg2 "Applying patch $_p"
-    patch -p1 -d BackupPC-$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 -N -i "$srcdir/$filename"
+    fi
   done
+  :
 }
 
 package() {

Modified: docker/trunk/PKGBUILD
===================================================================
--- docker/trunk/PKGBUILD	2016-03-13 10:53:08 UTC (rev 166537)
+++ docker/trunk/PKGBUILD	2016-03-13 12:18:18 UTC (rev 166538)
@@ -28,7 +28,7 @@
   for filename in "${source[@]}"; do
     if [[ "$filename" =~ \.patch$ ]]; then
       msg2 "Applying patch $filename"
-      patch -p1 -i "$srcdir/$filename"
+      patch -p1 -N -i "$srcdir/$filename"
     fi
   done
   :

Modified: httperf/trunk/PKGBUILD
===================================================================
--- httperf/trunk/PKGBUILD	2016-03-13 10:53:08 UTC (rev 166537)
+++ httperf/trunk/PKGBUILD	2016-03-13 12:18:18 UTC (rev 166538)
@@ -18,10 +18,17 @@
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../use-SSLv23_client_method.patch
+  # 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 -N -i "$srcdir/$filename"
+    fi
+  done
+  :
 }
 
-
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr

Copied: iperf/trunk/01-FS#25159.patch (from rev 166537, iperf/trunk/client.cpp.patch)
===================================================================
--- iperf/trunk/01-FS#25159.patch	                        (rev 0)
+++ iperf/trunk/01-FS#25159.patch	2016-03-13 12:18:18 UTC (rev 166538)
@@ -0,0 +1,17 @@
+--- a/src/Client.cpp	2010-04-01 22:23:17.000000000 +0200
++++ b/src/Client.cpp	2011-07-19 11:03:42.000000000 +0200
+@@ -212,10 +212,10 @@
+     char* readAt = mBuf;
+ 
+ #if HAVE_THREAD
+-    if ( !isUDP( mSettings ) ) {
+-	RunTCP();
+-	return;
+-    }
++//    if ( !isUDP( mSettings ) ) {
++//	RunTCP();
++//	return;
++//    }
+ #endif
+     
+     // Indicates if the stream is readable 

Modified: iperf/trunk/PKGBUILD
===================================================================
--- iperf/trunk/PKGBUILD	2016-03-13 10:53:08 UTC (rev 166537)
+++ iperf/trunk/PKGBUILD	2016-03-13 12:18:18 UTC (rev 166538)
@@ -15,16 +15,26 @@
 source=("http://downloads.sourceforge.net/iperf/iperf-$pkgver.tar.gz"
         'iperf-tcp.service'
         'iperf-udp.service'
-        'client.cpp.patch')
+        '01-FS#25159.patch')
 md5sums=('44b5536b67719f4250faed632a3cd016'
          '1d8660b540aa0db2e627d3d400cb8de4'
          'a27a8d27b1585bc999a04a2f082e2726'
          '82ce63c87cc8bb2f0f94069857ac14a9')
+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 -N -i "$srcdir/$filename"
+    fi
+  done
+  :
+}
 
 build() {
   cd $pkgname-$pkgver
-  # fix FS#25159
-  patch -Np1 -i "$srcdir/client.cpp.patch"
   ./configure --prefix=/usr \
               --enable-ipv6 \
               --enable-multicast \

Deleted: iperf/trunk/client.cpp.patch
===================================================================
--- iperf/trunk/client.cpp.patch	2016-03-13 10:53:08 UTC (rev 166537)
+++ iperf/trunk/client.cpp.patch	2016-03-13 12:18:18 UTC (rev 166538)
@@ -1,17 +0,0 @@
---- a/src/Client.cpp	2010-04-01 22:23:17.000000000 +0200
-+++ b/src/Client.cpp	2011-07-19 11:03:42.000000000 +0200
-@@ -212,10 +212,10 @@
-     char* readAt = mBuf;
- 
- #if HAVE_THREAD
--    if ( !isUDP( mSettings ) ) {
--	RunTCP();
--	return;
--    }
-+//    if ( !isUDP( mSettings ) ) {
-+//	RunTCP();
-+//	return;
-+//    }
- #endif
-     
-     // Indicates if the stream is readable 

Modified: ipvsadm/trunk/PKGBUILD
===================================================================
--- ipvsadm/trunk/PKGBUILD	2016-03-13 10:53:08 UTC (rev 166537)
+++ ipvsadm/trunk/PKGBUILD	2016-03-13 12:18:18 UTC (rev 166538)
@@ -21,9 +21,18 @@
             '4960ea254128347b03665d51817f29cb643cf2ebca13f5f46649257552ad3ceb'
             '25506d07f412cccab6f2f3a2a1900d5eeda27bc58602d14f44910c4e036b5341')
 
-#prepare() {
-  #patch -p1 -d $pkgname-$pkgver < 01-fix-not-showing-all-server.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 -N -i "$srcdir/$filename"
+    fi
+  done
+  :
+}
 
 build() {
   cd $pkgname-$pkgver

Modified: linux-tools/trunk/PKGBUILD
===================================================================
--- linux-tools/trunk/PKGBUILD	2016-03-13 10:53:08 UTC (rev 166537)
+++ linux-tools/trunk/PKGBUILD	2016-03-13 12:18:18 UTC (rev 166538)
@@ -48,12 +48,16 @@
          'a73ea3ea6d9c9ecb1cc910871eead3ff')
 
 prepare() {
-  local _patch
-  for _patch in patch-$pkgver.? *.patch; do
-    [[ -e "$_patch" ]] || continue
-    msg2 "Applying $_patch"
-    patch -N -p1 -d linux < "$_patch"
+  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 -N -i "$srcdir/$filename"
+    fi
   done
+  :
 }
 
 build() {

Modified: mailman/trunk/PKGBUILD
===================================================================
--- mailman/trunk/PKGBUILD	2016-03-13 10:53:08 UTC (rev 166537)
+++ mailman/trunk/PKGBUILD	2016-03-13 12:18:18 UTC (rev 166538)
@@ -61,17 +61,21 @@
          'ba9bb00dd25448b85859926ed562e638')
 
 prepare() {
-  # some files in mailman doesn't use configure parameter
-  find $pkgname-$_pkgver -type f -exec \
-    sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
+  cd $pkgname-$_pkgver
 
-  # apply patch from sources
-  for _p in "${source[@]}"; do
-    if [[ "$_p" =~ .+\.patch$ ]]; then
-      msg2 "Applying patch $_p"
-      patch -p1 -d $pkgname-$_pkgver < "$_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 -N -i "$srcdir/$filename"
     fi
   done
+
+  # some files in mailman doesn't use configure parameter
+  msg2 'Fix python2 sheebang'
+  find . -type f -exec \
+    sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
 }
 
 build() {

Modified: netperf/trunk/PKGBUILD
===================================================================
--- netperf/trunk/PKGBUILD	2016-03-13 10:53:08 UTC (rev 166537)
+++ netperf/trunk/PKGBUILD	2016-03-13 12:18:18 UTC (rev 166538)
@@ -20,7 +20,16 @@
          '0160c47c86ff1fca8df64cfb4cd4d9f2')
 
 prepare() {
-  patch -d $pkgname-$pkgver -p1 < 001-fix-inlining.patch
+  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 -N -i "$srcdir/$filename"
+    fi
+  done
+  :
 }
 
 build() {

Modified: python-progressbar/trunk/PKGBUILD
===================================================================
--- python-progressbar/trunk/PKGBUILD	2016-03-13 10:53:08 UTC (rev 166537)
+++ python-progressbar/trunk/PKGBUILD	2016-03-13 12:18:18 UTC (rev 166538)
@@ -14,11 +14,25 @@
 sha1sums=('aebb94b452990468c77090fb43b335cf0a724353'
           '5dc63611e364e90441cbc90fe2530b9fab67e780')
 
+prepare() {
+  cd progressbar-$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 -N -i "$srcdir/$filename"
+    fi
+  done
+
+}
+
 build() {
   cd progressbar-$pkgver
-  patch -p 1 -i "$srcdir"/01-python33.patch
   python setup.py build --build-lib=build/python
   python2 setup.py build --build-lib=build/python2
+
+  msg2 'Fix python2 sheebang'
   find build/python2 -type f -exec \
     sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
 }

Modified: rblcheck/trunk/PKGBUILD
===================================================================
--- rblcheck/trunk/PKGBUILD	2016-03-13 10:53:08 UTC (rev 166537)
+++ rblcheck/trunk/PKGBUILD	2016-03-13 12:18:18 UTC (rev 166538)
@@ -24,10 +24,15 @@
 
 prepare() {
   cd $pkgname
-  for p in "$srcdir"/*.patch; do
-    msg2 "Apply patch ${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 -N -i "$srcdir/$filename"
+    fi
   done
+  :
 }
 
 build() {

Copied: sysvbanner/trunk/01-man.patch (from rev 166537, sysvbanner/trunk/man.patch)
===================================================================
--- sysvbanner/trunk/01-man.patch	                        (rev 0)
+++ sysvbanner/trunk/01-man.patch	2016-03-13 12:18:18 UTC (rev 166538)
@@ -0,0 +1,16 @@
+--- a/banner.1	2007-04-08 00:26:57.000000000 +0200
++++ b/banner.1	2011-12-01 04:16:43.677157180 +0100
+@@ -3,12 +3,10 @@
+ banner \- print large banner
+ .SH SYNOPSIS
+ .B banner
+-.I text
++.B [\fItext\fB]
+ .br
+ .SH "DESCRIPTION"
+ .B banner
+ prints out the first 10 characters of
+ .I text
+ in large letters.
+-.SH SEE ALSO
+-.BR banner "(6)."

Modified: sysvbanner/trunk/PKGBUILD
===================================================================
--- sysvbanner/trunk/PKGBUILD	2016-03-13 10:53:08 UTC (rev 166537)
+++ sysvbanner/trunk/PKGBUILD	2016-03-13 12:18:18 UTC (rev 166538)
@@ -11,13 +11,25 @@
 conflicts=('bsd-games')
 license=('custom')
 source=("http://ftp.debian.org/debian/pool/main/s/sysvbanner/${pkgname}_${pkgver}.tar.gz"
-        'man.patch')
+        '01-man.patch')
 md5sums=('5a7bd216a42faa20bfd91268a77cc41d'
          '003aa4532e00c32f747dfba6566c094d')
 
+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 -N -i "$srcdir/$filename"
+    fi
+  done
+  :
+}
+
 build() {
   cd $pkgname-$pkgver
-  patch -p 1 < ../man.patch
   make
 }
 

Deleted: sysvbanner/trunk/man.patch
===================================================================
--- sysvbanner/trunk/man.patch	2016-03-13 10:53:08 UTC (rev 166537)
+++ sysvbanner/trunk/man.patch	2016-03-13 12:18:18 UTC (rev 166538)
@@ -1,16 +0,0 @@
---- a/banner.1	2007-04-08 00:26:57.000000000 +0200
-+++ b/banner.1	2011-12-01 04:16:43.677157180 +0100
-@@ -3,12 +3,10 @@
- banner \- print large banner
- .SH SYNOPSIS
- .B banner
--.I text
-+.B [\fItext\fB]
- .br
- .SH "DESCRIPTION"
- .B banner
- prints out the first 10 characters of
- .I text
- in large letters.
--.SH SEE ALSO
--.BR banner "(6)."

Deleted: ucarp/trunk/02-fix-downscript-on-error.c
===================================================================
--- ucarp/trunk/02-fix-downscript-on-error.c	2016-03-13 10:53:08 UTC (rev 166537)
+++ ucarp/trunk/02-fix-downscript-on-error.c	2016-03-13 12:18:18 UTC (rev 166538)
@@ -1,12 +0,0 @@
---- ucarp-1.5.1.orig/src/carp.c
-+++ ucarp-1.5.1/src/carp.c
-@@ -843,6 +843,9 @@
-         if ((pfds[0].revents & (POLLERR | POLLHUP)) != 0) {
-             logfile(LOG_ERR, _("exiting: pfds[0].revents = %d"),
-                     pfds[0].revents);
-+            if ((sc.sc_state != BACKUP) && (shutdown_at_exit != 0)) {
-+                (void) spawn_handler(dev_desc_fd, downscript);
-+            }
-             break;
-         }
-         if (gettimeofday(&now, NULL) != 0) {

Copied: ucarp/trunk/02-fix-downscript-on-error.patch (from rev 166537, ucarp/trunk/02-fix-downscript-on-error.c)
===================================================================
--- ucarp/trunk/02-fix-downscript-on-error.patch	                        (rev 0)
+++ ucarp/trunk/02-fix-downscript-on-error.patch	2016-03-13 12:18:18 UTC (rev 166538)
@@ -0,0 +1,12 @@
+--- ucarp-1.5.1.orig/src/carp.c
++++ ucarp-1.5.1/src/carp.c
+@@ -843,6 +843,9 @@
+         if ((pfds[0].revents & (POLLERR | POLLHUP)) != 0) {
+             logfile(LOG_ERR, _("exiting: pfds[0].revents = %d"),
+                     pfds[0].revents);
++            if ((sc.sc_state != BACKUP) && (shutdown_at_exit != 0)) {
++                (void) spawn_handler(dev_desc_fd, downscript);
++            }
+             break;
+         }
+         if (gettimeofday(&now, NULL) != 0) {

Modified: ucarp/trunk/PKGBUILD
===================================================================
--- ucarp/trunk/PKGBUILD	2016-03-13 10:53:08 UTC (rev 166537)
+++ ucarp/trunk/PKGBUILD	2016-03-13 12:18:18 UTC (rev 166538)
@@ -14,7 +14,7 @@
         "$pkgname.service"
         "$pkgname.8"
         '01-fix-getopt.patch'
-        '02-fix-downscript-on-error.c')
+        '02-fix-downscript-on-error.patch')
 md5sums=('e3caa733316a32c09e5d3817617e9145'
          'fdc72a8d6f89224b40c78705df1f46f9'
          '2ccfdc464b88c437b38bd0324cf1fef3'
@@ -22,9 +22,16 @@
          '09d26233c37956cf08e629554a91b8cd')
 
 prepare() {
-  # Apply patches
-  patch -N -p1 -d $pkgname-$pkgver < 01-fix-getopt.patch
-  patch -N -p1 -d $pkgname-$pkgver < 02-fix-downscript-on-error.c
+  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 -N -i "$srcdir/$filename"
+    fi
+  done
+  :
 }
 
 build() {

Modified: virtualbox/trunk/PKGBUILD
===================================================================
--- virtualbox/trunk/PKGBUILD	2016-03-13 10:53:08 UTC (rev 166537)
+++ virtualbox/trunk/PKGBUILD	2016-03-13 12:18:18 UTC (rev 166538)
@@ -89,7 +89,7 @@
     for _f in "${source[@]}"; do
         [[ "$_f" =~ \.patch$ ]] && {
             msg2 "Applying patch $_f"
-            patch -p1 -i "$srcdir/$_f"
+            patch -p1 -N -i "$srcdir/$_f"
         }
     done
 



More information about the arch-commits mailing list