Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=61a5a69c96009b1c2bb42c76494022f650a09072
commit 61a5a69c96009b1c2bb42c76494022f650a09072 Author: crazy <[email protected]> Date: Tue Oct 20 18:57:54 2015 +0200 pacman-tools-1.3.4-1-x86_64 * added patches and key * can't bump now . is broken need to take a look tomorrow diff --git a/source/devel/pacman-tools/0001-__pkg_commit_info.patch b/source/devel/pacman-tools/0001-__pkg_commit_info.patch new file mode 100644 index 0000000..cdf15dd --- /dev/null +++ b/source/devel/pacman-tools/0001-__pkg_commit_info.patch @@ -0,0 +1,65 @@ +From 639661fdb5e4b7cc7a46cf64d5eacbc52fa9e721 Mon Sep 17 00:00:00 2001 +From: crazy <[email protected]> +Date: Mon, 19 Oct 2015 08:08:08 +0200 +Subject: [PATCH 1/2] __pkg_commit_info() * check for FrugalBuild first , if + found auto generate $commitmsg * if not print just exit and print a nice msg + * without $commitmsg is like : ------$arch + +--- + repoman | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) + +diff --git a/repoman b/repoman +index 76f9dff..a6e4092 100755 +--- a/repoman ++++ b/repoman +@@ -1,22 +1,22 @@ + #!/bin/bash + # + # repoman, a script to build and maintain packages +-# ++# + # Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011 by Miklos Vajna <[email protected]> +-# ++# + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; either version 2 of the License, or + # (at your option) any later version. +-# ++# + # This program 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 General Public License for more details. +-# ++# + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + # USA. + # + +@@ -601,9 +601,15 @@ $@" | darcs rec -a --pipe . + __pkg_commit_info() + { + local commitmsg +- commitmsg="$pkgname-$pkgver-$pkgrel-$arch" +- msg "Your git commit command is:" +- msg "git commit -a -e -m $commitmsg" ++ if [ -e ./FrugalBuild ]; then ++ commitmsg="$pkgname-$pkgver-$pkgrel-$arch" ++ msg "Your git commit command is:" ++ msg "git commit -a -e -m $commitmsg" ++ else ++ msg "Cannot find any FrugalBuild in `pwd`" ++ msg "Commit command cannot be auto generated" ++ exit 1 ++ fi + } + + commit_info() +-- +2.6.2 + diff --git a/source/devel/pacman-tools/0002-info-added-some-missing-checks.patch b/source/devel/pacman-tools/0002-info-added-some-missing-checks.patch new file mode 100644 index 0000000..11ca028 --- /dev/null +++ b/source/devel/pacman-tools/0002-info-added-some-missing-checks.patch @@ -0,0 +1,37 @@ +From f6057bf8b91d8d1f329b646b39d45a1cf80680b7 Mon Sep 17 00:00:00 2001 +From: crazy <[email protected]> +Date: Mon, 19 Oct 2015 08:15:39 +0200 +Subject: [PATCH 2/2] info() - added some missing checks * since the syntax is + repoman info <package> we need to check for $1 * before doing something , + print a nice msg if not * also reverse the logic in for loop and check first + $1 exists + +--- + repoman | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/repoman b/repoman +index a6e4092..629a353 100755 +--- a/repoman ++++ b/repoman +@@ -958,9 +958,16 @@ search() + info() + { + chk_updated $fst_root ++ if [ -z "$1" ]; then ++ msg " Use repoman info <pkgname> ++ exit 1 ++ fi + for i in ${repos[@]} + do +- if [ -d $fst_root/$i/source/*/$1 ]; then ++ if [ ! -d $fst_root/$i/source/*/$1 ]; then ++ msg " Could not find package $1.. Typo?" ++ exit 1 ++ else + cd $fst_root/$i/source/*/$1 + startdir=`pwd` + source ./FrugalBuild +-- +2.6.2 + diff --git a/source/devel/pacman-tools/FrugalBuild b/source/devel/pacman-tools/FrugalBuild index 78454ba..82fb33d 100644 --- a/source/devel/pacman-tools/FrugalBuild +++ b/source/devel/pacman-tools/FrugalBuild @@ -19,8 +19,10 @@ archs=('i686' 'x86_64' 'arm') backup=(etc/repoman.conf etc/syncpkg{cd/c,d/d,d/ctl}config.py) up2date="Flasttar $url" if ! Fuse $USE_DEVEL; then - source=($url/$pkgname-$pkgver.tar.gz) - signatures=(${source[0]}.asc) + source=($url/$pkgname-$pkgver.tar.gz \ + 0001-__pkg_commit_info.patch \ + 0002-info-added-some-missing-checks.patch) + signatures=("${source[0]}.asc" '' '') if Fuse $USE_STABLE; then source=("${source[@]}" stable.patch) signatures=("${signatures[@]}" '') diff --git a/source/devel/pacman-tools/pacman-tools.key b/source/devel/pacman-tools/pacman-tools.key new file mode 100644 index 0000000..0b44c16 --- /dev/null +++ b/source/devel/pacman-tools/pacman-tools.key @@ -0,0 +1,35 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +mQGiBERmdGoRBACBy3BuNIj+KDXJR2hR/zAe6T5A6f3EKenC0mXfNa/rJTaEU0kh +c7LJGCnjtxRwKp0CF3PzQPU+P7zFfMTxYUjr1ZtD3VoANkbDbZb5dHIFFb3GDK28 +cvD25EXOyrKgNAkxE9T++8mh8k7jX9THGFNjHD7w3yllw3g1S2ehvXVdIwCgqNAC +gj9sqGmNoBAM5wlK6sldq1MD/2UxZIzq8wkvfFm+t6fxhLoGN+3lHvMkNbjE+lgs +IAkiLvTNpOL303k5AATkh5ljHaxmto+G7aYetA9E6CDRSyzA2izcW2g1H6ZMhi48 +e99oLisPuWG0eiWBJq4D5gwb+hYtg+aEcax7PkwcJLkhqjLd59xfz1WXCsrCEw8m +STBdA/4ua+ux+DxOzd3axskuhtX7m0L3x9RgLzUH/NsOyrvAQHiY7RYjlKyP5jGb +FOxn6J/y3SZfq2wYmwGUrYrre6Cd3a6QBP8cyMmB5Su6pbMBlTrgqfiAMXtroou5 +VavFNCWoUl/197bJuPOEci6dZmNwBg3YOm6OD8bm7xduBceHkLRMRnJ1Z2Fsd2Fy +ZSBMaW51eCBBcmNoaXZlcyBWZXJpZmljYXRpb24gS2V5IDxmcnVnYWx3YXJlLWRl +dmVsQGZydWdhbHdhcmUub3JnPohGBBARAgAGBQJFgocOAAoJEHvNbQIDkVCWigoA +oKqW9DDKI86EsRZuiz88PrAOgtxKAJ9kTZc1Wh8bDioF8JpMytPMuEArw4hGBBAR +AgAGBQJFgu5GAAoJEEFKKfUA6A6GIVcAoJD+Hrojb/+cGVYkQdJpuDcH6BzmAJ92 +q4MzXd6azItLylyAz4OSTPv0MohGBBARCAAGBQJVj6rcAAoJEERjCUW9u2hf/tYA +n1irqKssIILXYxWm+8JMyPTr3MjmAJ4vvQhMSg/6hcqCr+M9eBbyhKOQMYhgBBMR +AgAgBQJEZnRqAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQZ7NElSD1VhlP +VwCfRdpRLJc9LCJZNIO5Gn3QaU1xMB0An3HWMgzdn8mxkJhyj9J4K37I8aXtuQIN +BERmdNwQCACrd7e4YTDQSeKhcV3gYgL4jKXZKrRhyX3+n3Ycwo7eLNvMSc5gbVYV +eAaaovolW7O5ZdhXXUmR6Zc8QMzlQ0L1EH/DpFjUnV561kw4WBuE5o5oMiqUjWd3 +woSUsxFXpoffznzFlwIPqEtAAkooSW5FJshsRLSu4/Gj2SDqzgjNdDXDnBR/YV51 +IgYyHFOQSE+vN4yXUjhGI0cZcDPcoafejZty0MixVXP4deb3gBpnsK3VgRgM8n0D +ZL9m2qAHOaXaLxvCrIKacIYlN9SDv4PnuNu7F595Xf9qY8x0KLmYEZaSvVC5ZR35 +YyOxKYexu7g7M1Hyp6UtT81Ctxi9YPL3AAMFB/9FQnl6l3FcBvO38lD7q0pkzEnY +yqHqlh5N7SQXI4oWmE9SGLXWj5MgUSKy/05fYTiU6+tX/U5AXQy/+EN9GGEr/kTb +fU6NIVOkc2wrXaBkWomlAav5HL18NTF1uvjOywyjn3JevJcZ2Bm5l5gaAnWrfcK1 +2udZJyv6b19UpUR195lhU5kT7y4w1hMMXVjx+R7wamKl533HyEJfaUjZHuejOpA/ +VX233OFjnUr2iYw5w/s5ey5Z8lrtA5P6aXm3QRr23MjztedCovk5yJmzsUd/Fkw0 +FHGgWPakLMjgBGhyUT2+1yH5XS0rQA2fJn0Z7pfdZ2SlrJBVgr/UvLnO+770iEkE +GBECAAkFAkRmdNwCGwwACgkQZ7NElSD1VhlbxQCfQnid7EXE2DAhyrbmocGa5Czz +NzkAoIgE96QvLqESutC/tuk6j2q5msud +=BdpP +-----END PGP PUBLIC KEY BLOCK----- _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
