[arch-commits] Commit in backuppc/trunk (05-fix-edit-menu-ordering.patch PKGBUILD)

[Sébastien Luttringer]

    Date: Saturday, August 3, 2013 @ 02:26:50
  Author: seblu
Revision: 95000

upgpkg: backuppc 3.3.0-2

Added:
  backuppc/trunk/05-fix-edit-menu-ordering.patch
Modified:
  backuppc/trunk/PKGBUILD

---------------------------------+
 05-fix-edit-menu-ordering.patch |   29 +++++++++++++++++++++++++++++
 PKGBUILD                        |   10 ++++------
 2 files changed, 33 insertions(+), 6 deletions(-)

Added: 05-fix-edit-menu-ordering.patch
===================================================================
--- 05-fix-edit-menu-ordering.patch	                        (rev 0)
+++ 05-fix-edit-menu-ordering.patch	2013-08-03 00:26:50 UTC (rev 95000)
@@ -0,0 +1,29 @@
+# Copyright © Sébastien Luttringer
+
+# This patch is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This patch is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this patch. If not, see <http://www.gnu.org/licenses/>.
+
+# This patch avoid menu in Host "Edit Config" to swap every load by using
+# alphabetic order.
+
+--- a/lib/BackupPC/CGI/EditConfig.pm	2013-04-14 22:43:32.000000000 +0200
++++ b/lib/BackupPC/CGI/EditConfig.pm	2013-08-02 03:58:38.796000000 +0200
+@@ -492,7 +492,7 @@
+     }
+ 
+     my $groupText;
+-    foreach my $m ( keys(%ConfigMenu) ) {
++    foreach my $m ( sort( keys(%ConfigMenu) ) ) {
+         next if ( $menuDisable{$m}{top} );
+ 	my $text = eval("qq($Lang->{$ConfigMenu{$m}{text}})");
+         if ( $m eq $menu ) {

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-02 23:19:02 UTC (rev 94999)
+++ PKGBUILD	2013-08-03 00:26:50 UTC (rev 95000)
@@ -3,7 +3,7 @@
 
 pkgname=backuppc
 pkgver=3.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Enterprise-grade system for backing up Linux, Windows and MacOS PCs'
 url='http://backuppc.sourceforge.net/'
 license=('GPL2')
@@ -21,8 +21,6 @@
   'rsync: used by rsync transfert method'
   'perl-file-rsyncp: used by rsync transfert method'
   'perl-io-dirent'
-  'apache: used by web admin interface'
-  'mod_perl: used by web admin interface'
 )
 source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/BackupPC-$pkgver.tar.gz"
         "$pkgname.service"
@@ -34,6 +32,7 @@
         '02-move-socket-into-run.patch'
         '03-fix-FS#32642.patch'
         '04-fix-cve-2011-4923.patch'
+        '05-fix-edit-menu-ordering.patch'
 )
 install=$pkgname.install
 backup=("etc/$pkgname/config.pl"
@@ -49,11 +48,10 @@
          'ec087e8b899450e9e7ab18bff77cb1f3'
          'b468820ed542023e1fec7ce8c88a0c3b'
          '3917c474a275e262fde246daf59ffe31'
-         'aca8392c5dea60c3cceeb02ebcc63497')
+         'aca8392c5dea60c3cceeb02ebcc63497'
+         '2a568701fd1caf75490987814786fecf')
 
 prepare() {
-  pwd
-ls
   for _p in *.patch; do
     msg2 "Applying patch $_p"
     patch -p1 -d BackupPC-$pkgver < "$_p"