Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=11b0cedcaab3b838a88a59f85fd321a58b07fd19
commit 11b0cedcaab3b838a88a59f85fd321a58b07fd19 Author: crazy <[email protected]> Date: Sat Jan 2 18:29:21 2016 +0100 pacman-tools-1.3.4-6-x86_64 * added repoman patch from git , commit 5b6d670 diff --git a/source/devel/pacman-tools/0001-repoman.patch b/source/devel/pacman-tools/0001-repoman.patch new file mode 100644 index 0000000..076f37f --- /dev/null +++ b/source/devel/pacman-tools/0001-repoman.patch @@ -0,0 +1,43 @@ +From 5b6d6706bc7bef32ac9a367d92f8a19dcdbb89c4 Mon Sep 17 00:00:00 2001 +From: crazy <[email protected]> +Date: Sat, 2 Jan 2016 03:30:36 +0100 +Subject: [PATCH] repoman * added check for broken paths : /usr/usr + /usr/share/pkgconfig /usr/share/perl5 * and refuse to upload the package + +--- + repoman | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/repoman b/repoman +index 634b413..a29ada9 100755 +--- a/repoman ++++ b/repoman +@@ -403,6 +403,25 @@ upload() + echo "Please fix your package." + exit 1 + fi ++ if echo $src | grep -q fpm$ && pacman-g2 -Ql -p $src | grep -q 'usr/usr'; then ++ echo "$src has broken /usr DIR , files are installed" ++ echo "in /usr/usr , refusing to upload!" ++ echo "Please fix your package." ++ exit 1 ++ fi ++ if echo $src | grep -q fpm$ && pacman-g2 -Ql -p $src | grep -q 'usr/share/pkgconfig'; then ++ echo "$src has invalid pkgconfig path , files are installed" ++ echo "in /usr/share/pkgconfig , should be /usr/lib/pkgconfig, refusing to upload!" ++ echo "Please fix your package." ++ exit 1 ++ fi ++ if echo $src | grep -q fpm$ && pacman-g2 -Ql -p $src | grep -q 'usr/share/perl5'; then ++ echo "$src has invalid perl path , files are installed" ++ echo "in /usr/share/perl5 , refusing to upload!" ++ echo "Please fix your package." ++ exit 1 ++ fi ++ + name=`basename $src` + msg "Requesting a temporary file" + tmp=`_ssh "mktemp"` +-- +2.6.4 + diff --git a/source/devel/pacman-tools/FrugalBuild b/source/devel/pacman-tools/FrugalBuild index 80b852d..9266b6a 100644 --- a/source/devel/pacman-tools/FrugalBuild +++ b/source/devel/pacman-tools/FrugalBuild @@ -7,10 +7,10 @@ USE_STABLE=${USE_STABLE:-"n"} pkgname=pacman-tools pkgver=1.3.4 Fuse $USE_DEVEL && pkgver=1.1.7.13.g544f9ab -pkgrel=5 +pkgrel=6 pkgdesc="Tools for developers for managing packages" url="http://ftp.frugalware.org/pub/other/pacman-tools"; -depends=('bash' 'perl>=5.10.0-8' 'pacman-g2>=3.8.8-3' 'wget>=1.11.4-2' +depends=('bash' 'perl>=5.10.0-8' 'pacman-g2>=3.9.0-25' 'wget>=1.11.4-2' 'python>=2.7' 'libxml2>=2.6.32-2' 'glib2>=2.16.4-2' 'openssl>=1.0.0' 'shadow') makedepends=('asciidoc' 'docbook-xsl' 'docbook-xml' 'sgml-common') @@ -22,8 +22,9 @@ if ! Fuse $USE_DEVEL; then source=($url/$pkgname-$pkgver.tar.gz \ 0001-__pkg_commit_info.patch \ 0002-info-added-some-missing-checks.patch \ - 0001-chkdep.patch 0001-fblint.patch) - signatures=("${source[0]}.asc" '' '' '' '') + 0001-chkdep.patch 0001-fblint.patch \ + 0001-repoman.patch) + signatures=("${source[0]}.asc" '' '' '' '' '') if Fuse $USE_STABLE; then source=("${source[@]}" stable.patch) signatures=("${signatures[@]}" '') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
