Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=b1e26f13d50face1ca3408445921bb141abb5852
commit b1e26f13d50face1ca3408445921bb141abb5852 Author: crazy <[email protected]> Date: Sat Jan 2 18:22:43 2016 +0100 pacman-g2-3.9.0-25-x86_64 * added makepkg patch from git commit 2d09bac diff --git a/source/base/pacman-g2/0001-makepkg-check-for-errors.patch b/source/base/pacman-g2/0001-makepkg-check-for-errors.patch new file mode 100644 index 0000000..dd16cf2 --- /dev/null +++ b/source/base/pacman-g2/0001-makepkg-check-for-errors.patch @@ -0,0 +1,107 @@ +From 2d09bac3f7c2314d85528dd4f95c2d95e4ceac46 Mon Sep 17 00:00:00 2001 +From: crazy <[email protected]> +Date: Sat, 2 Jan 2016 17:47:52 +0100 +Subject: [PATCH] makepkg * added checks for broken PATH / wrong installed + files: * -> /usr/usr * -> /usr/etc * -> /usr/<some_file> * -> /<some_file> * + -> /usr/share/pkgconfig * -> /usr/share/perl5 * -> /lib64 * -> /usr/lib64 * + -> /usr/lib/systemd/system * -> broke --prefix=/usr , eg: dirs and files are + installed in / * when found makepkg will bail out with an error + +--- + scripts/makepkg | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 80 insertions(+) + +diff --git a/scripts/makepkg b/scripts/makepkg +index 90e797b..ded62a7 100755 +--- a/scripts/makepkg ++++ b/scripts/makepkg +@@ -1673,6 +1673,86 @@ fi + + cd $startdir + ++## well die here ++ ++for dir in {pkg,pkg.*} ++do ++ [ ! -d ${dir} ] && continue ++ ## wrong pkgconfig path ++ if [ -d ${dir}/usr/share/pkgconfig ]; then ++ error "Your package has broken pkgconfig PATH" ++ error "Files are installed in /usr/share/pkgconfig" ++ error "but should be /usr/lib/pkgconfig!" ++ error "Bailing out, please fix your package!" ++ exit 1 ++ fi ++ ## invalid /usr/etc ++ if [ -d ${dir}/usr/etc ]; then ++ error "Your package has broken /etc PATH" ++ error "Files are installed in /usr/etc" ++ error "but should be /etc!" ++ error "Bailing out, please fix your package!" ++ exit 1 ++ fi ++ ## invalid /usr/usr ++ if [ -d ${dir}/usr/usr ]; then ++ error "Your package has broken /usr PATH" ++ error "Files are installed in /usr/usr" ++ error "but should be /usr!" ++ error "Bailing out, please fix your package!" ++ exit 1 ++ fi ++ ## invalid perl path ++ if [ -d ${dir}/usr/share/perl5 ]; then ++ error "Your package has broken perl PATH" ++ error "Files are installed in /usr/share/perl5" ++ error "but should be /usr/lib/perl5!" ++ error "Bailing out, please fix your package!" ++ exit 1 ++ fi ++ ## try to find broken packages installing stuff in / , eg: /include ++ if [ -d ${dir}/include ] || [ -d ${dir}/share ]; then ++ error "Broken package detected files are installed in /" ++ error "--prefix=/usr may be broken" ++ error "Bailing out, please fix your package!" ++ exit 1 ++ fi ++ ## wrong unit path for systemd ++ if [ -d ${dir}/usr/lib/systemd/system ]; then ++ error "Your package has broken PATH for systemd unit files" ++ error "Files are installed in /usr/lib/systemd/system" ++ error "but should be /lib/systemd/system!" ++ error "Bailing out, please fix your package!" ++ exit 1 ++ fi ++ ## /lib64 and /usr/lib/64 .. this is a symlink in our layout ++ ## so don't install there ++ if [ -d ${dir}/lib64 ] || [ -d ${dir}/usr/lib64 ]; then ++ error "Your package has broken /lib or /usr/lib PATH" ++ error "Files are installed in 'lib64'" ++ error "but should be /lib or /usr/lib!" ++ error "Bailing out, please fix your package!" ++ exit 1 ++ fi ++ ## don't insstall files in /usr/<file> ++ files=$(find ${dir}/usr -maxdepth 1 -type f) ++ if [[ ${files[@]} ]]; then ++ error "Your package seems to install files in /usr/<file>" ++ printf " --> %s\n" ${files[@]} ++ error "Bailing out, please fix your package!" ++ exit 1 ++ fi ++ ## don't install files in / ++ files=$(find ${dir} -maxdepth 1 -type f) ++ if [[ ${files[@]} ]]; then ++ error "Your package seems to install files in /<file>" ++ printf " --> %s\n" ${files[@]} ++ error "Bailing out, please fix your package!" ++ exit 1 ++ fi ++ files= ++done ++ + # unwanted files + msg "Removing unwanted files..." + extra= +-- +2.6.4 + diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index 2b04918..2d1d302 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -10,7 +10,7 @@ USE_STABLE=${USE_STABLE:-"n"} pkgname=pacman-g2 pkgver=3.9.0 Fuse $USE_DEVEL && pkgver=3.8.1.18.gc254053 -pkgrel=24 +pkgrel=25 pkgdesc="A .tar.xz based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/"; backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current}) @@ -53,8 +53,9 @@ if ! Fuse $USE_DEVEL; then 0001-makepkg-use-asneeded-by-default.patch \ 0002-makepkg-print-host-flags-in-build.patch \ 0001-makepkg-fix-optimization-check.patch \ - 0001-try-to-fix-gpg-verify-issues.patch) - signatures=("$source.asc" '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') + 0001-try-to-fix-gpg-verify-issues.patch \ + 0001-makepkg-check-for-errors.patch) + signatures=("$source.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
