[arch-commits] Commit in sudo/trunk (2 files)

[Evangelos Foutras]

    Date: Tuesday, February 10, 2015 @ 17:59:07
  Author: foutrelis
Revision: 231227

Replace sed line with upstream patch

Added:
  sudo/trunk/sudo-1.8.12-move-example-dir-under-the-doc-dir.patch
Modified:
  sudo/trunk/PKGBUILD

------------------------------------------------------+
 PKGBUILD                                             |    4 +
 sudo-1.8.12-move-example-dir-under-the-doc-dir.patch |   41 +++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-10 16:53:22 UTC (rev 231226)
+++ PKGBUILD	2015-02-10 16:59:07 UTC (rev 231227)
@@ -16,10 +16,12 @@
 backup=('etc/sudoers' 'etc/pam.d/sudo')
 install=$pkgname.install
 source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
+        sudo-1.8.12-move-example-dir-under-the-doc-dir.patch
         sudo.tmpfiles.conf
         sudo.pam)
 sha256sums=('163b51841de8ad19276581a6782d61f5948f1f72a0a843371a1c167d3dc4f3b0'
             'SKIP'
+            'a6b3a6066df7fec1bd31cdff33770640bccedb3d57461f61a8b238abea8799b0'
             '080dd97111b3149f8d140ffac68c88acd63da9eacc81fbcc7c43591be13b42fe'
             'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2')
 validpgpkeys=('CCB24BE9E9481B15D34159535A89DFA27EE470C4')
@@ -28,7 +30,7 @@
   cd "$srcdir/$pkgname-$_sudover"
 
   # http://bugzilla.sudo.ws/show_bug.cgi?id=682
-  sed -i 's|\(exampledir = \).*|\1 at docdir@/examples|' {examples/,}Makefile.in
+  patch -Np1 -i ../sudo-1.8.12-move-example-dir-under-the-doc-dir.patch
 }
 
 build() {

Added: sudo-1.8.12-move-example-dir-under-the-doc-dir.patch
===================================================================
--- sudo-1.8.12-move-example-dir-under-the-doc-dir.patch	                        (rev 0)
+++ sudo-1.8.12-move-example-dir-under-the-doc-dir.patch	2015-02-10 16:59:07 UTC (rev 231227)
@@ -0,0 +1,41 @@
+# HG changeset patch
+# User Todd C. Miller <Todd.Miller at courtesan.com>
+# Date 1423587009 25200
+#      Tue Feb 10 09:50:09 2015 -0700
+# Node ID 494d9a0484b66ab9c559d5efe2ee7bdf0803e747
+# Parent  91859f613b88b1653e59ade2330fecd823b12491
+Move example dir under the doc dir to conform to Debian guidelines.
+Bug #682.
+
+diff -r 91859f613b88 -r 494d9a0484b6 Makefile.in
+--- a/Makefile.in	Tue Feb 10 09:37:10 2015 -0700
++++ b/Makefile.in	Tue Feb 10 09:50:09 2015 -0700
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 2010-2014 Todd C. Miller <Todd.Miller at courtesan.com>
++# Copyright (c) 2010-2015 Todd C. Miller <Todd.Miller at courtesan.com>
+ #
+ # Permission to use, copy, modify, and distribute this software for any
+ # purpose with or without fee is hereby granted, provided that the above
+@@ -32,7 +32,7 @@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ docdir = @docdir@
+-exampledir = $(datarootdir)/examples/$(PACKAGE_TARNAME)
++exampledir = $(docdir)/examples
+ mandir = @mandir@
+ rundir = @rundir@
+ vardir = @vardir@
+diff -r 91859f613b88 -r 494d9a0484b6 examples/Makefile.in
+--- a/examples/Makefile.in	Tue Feb 10 09:37:10 2015 -0700
++++ b/examples/Makefile.in	Tue Feb 10 09:50:09 2015 -0700
+@@ -20,7 +20,8 @@
+ #### Start of system configuration section. ####
+ 
+ srcdir = @srcdir@
+-exampledir = $(datarootdir)/examples/$(PACKAGE_TARNAME)
++docdir = @docdir@
++exampledir = $(docdir)/examples
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+