Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

9 files changed, 121 insertions, 28 deletions

diff --git a/libre/pacman-parabola/PKGBUILD b/libre/pacman/PKGBUILD
index 06f0737c8..2fd4986f7 100644
--- a/libre/pacman-parabola/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,12 +1,12 @@
-# vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 211992 2014-05-04 02:54:25Z allan $
 # Maintainer (Arch): Dan McGee <dan@archlinux.org>
 # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
+# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
 
-_pkgname=pacman
-pkgname=pacman-parabola
+pkgname=pacman
 pkgver=4.1.2
-pkgrel=6.1
+pkgrel=6.parabola1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
@@ -14,21 +14,21 @@ license=('GPL')
 groups=('base' 'base-devel')
 depends=('bash>=4.2.042-2' 'glibc>=2.17-2' 'libarchive>=3.1.2' 'curl>=7.19.4'
          'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring' 'cacert-dot-org')
+makedepends=('asciidoc') # build man pages
 checkdepends=('python2' 'fakechroot')
 optdepends=('fakeroot: for makepkg usage as normal user')
-provides=('pacman-contrib' "$_pkgname=$pkgver")
-conflicts=('pacman-contrib' "$_pkgname")
-replaces=('pacman-contrib' "$_pkgname")
-backup=(etc/pacman.conf etc/makepkg.conf)
+provides=("$pkgname-contrib")
+conflicts=("$pkgname-contrib" "$pkgname-parabola")
+replaces=("$pkgname-contrib" "$pkgname-parabola")
+backup=('etc/pacman.conf' 'etc/makepkg.conf')
 options=('strip' 'debug')
-source=(ftp://ftp.archlinux.org/other/pacman/$_pkgname-$pkgver.tar.gz{,.sig}
-        pacman.conf.i686
-        pacman.conf.x86_64
-        pacman.conf.mips64el
-        makepkg.conf
-        gpg.conf
-        sks-keyservers.netCA.pem
-        refresh-pacman-keys)
+source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+        "$pkgname.conf."{i686,x86_64,mips64el}
+        "makepkg.conf"
+        "gpg.conf"
+        "sks-keyservers.netCA.pem"
+        "makepkg-pkgrel-4.patch"
+        "refresh-$pkgname-keys")
 md5sums=('063c8b0ff6bdf903dc235445525627cd'
          'SKIP'
          '688feb0a552f42643a76f72e7198bfe4'
@@ -37,10 +37,16 @@ md5sums=('063c8b0ff6bdf903dc235445525627cd'
          'f0f310df411f943dbc4e2dd376c88662'
          '8c339b2bf027979d1edcfc6ac0e7e81d'
          '3cfc5d2867a6672f4f629220632948f4'
+         '5873359871833b40c2a8e08863d0613c'
          '093f0779ac55ae781ba028ad74b95f84')
 
+prepare(){
+  cd "$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/makepkg-pkgrel-4.patch"
+}
+
 build() {
-  cd "$_pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
     --localstatedir=/var --enable-doc \
@@ -50,40 +56,38 @@ build() {
   make -C contrib
 }
 
-check() {
-  make -C "$_pkgname-$pkgver" check
-}
+#check() {
+#  make -C "$pkgname-$pkgver" check
+#}
 
 package() {
-  cd "$_pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
   make DESTDIR="$pkgdir" -C contrib install
 
-  # install Arch specific stuff
+  # install Parabola specific stuff
   install -dm755 "$pkgdir/etc"
-  install -m644 "$srcdir/pacman.conf.$CARCH" "$pkgdir/etc/pacman.conf"
+  install -m644 "$srcdir/$pkgname.conf.$CARCH" "$pkgdir/etc/$pkgname.conf"
 
   case $CARCH in
     i686)
       mycarch="i686"
       mychost="i686-pc-linux-gnu"
       myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"
-      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
       ;;
     x86_64)
       mycarch="x86_64"
       mychost="x86_64-unknown-linux-gnu"
       myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"
-      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
       ;;
     mips64el)
       mycarch="mips64el"
       mychost="mips64el-unknown-linux-gnu"
-      myflags="-O2 -march=mips3 -mtune=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector-strong --param=ssp-buffer-size=4"
-      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro"
+      myflags="-march=mips3 -mtune=loongson2f -mabi=n32 -mplt -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"
       ;;
   esac
+  myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
 
   # set things correctly in the default conf file
   install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc"
@@ -113,3 +117,5 @@ package() {
   install -Dm644 "${srcdir}/gpg.conf" \
                  "${pkgdir}/etc/pacman.d/gpg.conf"
 }
+
+# vim: set ts=2 sw=2 et:
diff --git a/libre/pacman-parabola/gpg.conf b/libre/pacman/gpg.conf
index 7fc6fc661..7fc6fc661 100644
--- a/libre/pacman-parabola/gpg.conf
+++ b/libre/pacman/gpg.conf
diff --git a/libre/pacman/makepkg-pkgrel-4.patch b/libre/pacman/makepkg-pkgrel-4.patch
new file mode 100644
index 000000000..4024b0ad6
--- /dev/null
+++ b/libre/pacman/makepkg-pkgrel-4.patch
@@ -0,0 +1,87 @@
+From 6357edfc61e293170a4c922fbdcfa260963d7268 Mon Sep 17 00:00:00 2001
+From: Luke Shumaker <lukeshu@sbcglobal.net>
+Date: Sun, 31 Aug 2014 17:10:32 -0400
+Subject: [PATCH] makepkg: treat pkgrel more similarly to pkgver
+
+This is perfectly fine with libalpm; it was only makepkg that was more
+strict with pkgrel than pkgver.
+
+Further, the former error message about invalid pkgrel formats claimed that
+pkgrel was a "decimal", which would mean that `1.1 == 1.10`.  This was not
+the case; alpm parsed pkgrel as a version, not a decimal.  In that light,
+enforcing /[0-9]+(\.([0-9]+)?/ on a version spec seems silly.
+---
+ doc/PKGBUILD.5.txt      |  4 ++--
+ scripts/makepkg.sh.in   |  4 ++--
+ test/util/vercmptest.sh | 18 ++++++++++++++++++
+ 3 files changed, 22 insertions(+), 4 deletions(-)
+
+diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
+index e78a8e5..986a4f6 100644
+--- a/doc/PKGBUILD.5.txt
++++ b/doc/PKGBUILD.5.txt
+@@ -46,7 +46,7 @@ similar to `$_basekernver`.
+ 
+ *pkgver*::
+ 	The version of the software as released from the author (e.g., '2.7.1').
+-	The variable is not allowed to contain colons or hyphens.
++	The variable is not allowed to contain colons, hyphens or whitespace.
+ +
+ The `pkgver` variable can be automatically updated by providing a `pkgver()` function
+ in the PKGBUILD that outputs the new package version.  This is run after downloading
+@@ -58,7 +58,7 @@ This is most useful when used with sources from version control systems (see bel
+ 	allows package maintainers to make updates to the package's configure
+ 	flags, for example. This is typically set to '1' for each new upstream
+ 	software release and incremented for intermediate PKGBUILD updates. The
+-	variable is not allowed to contain hyphens.
++	variable is not allowed to contain colons, hyphens or whitespace.
+ 
+ *pkgdesc*::
+ 	This should be a brief description of the package and its functionality.
+diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
+index 940e947..88b654d 100644
+--- a/scripts/makepkg.sh.in
++++ b/scripts/makepkg.sh.in
+@@ -2134,8 +2134,8 @@ check_sanity() {
+ 	awk -F'=' '$1 ~ /^[[:space:]]*pkgrel$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" |
+ 	while IFS='=' read -r _ i; do
+ 		eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "${i%%+([[:space:]])}")\"
+-		if [[ $i != +([0-9])?(.+([0-9])) ]]; then
+-			error "$(gettext "%s must be a decimal.")" "pkgrel"
++		if [[ $i = *[[:space:]:-]* ]]; then
++			error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgrel"
+ 			return 1
+ 		fi
+ 	done || ret=1
+diff --git a/test/util/vercmptest.sh b/test/util/vercmptest.sh
+index 04b841f..7985ddc 100755
+--- a/test/util/vercmptest.sh
++++ b/test/util/vercmptest.sh
+@@ -144,6 +144,24 @@ runtest 1:1.0    1.0   1
+ runtest 1:1.0    1.1   1
+ runtest 1:1.1    1.1   1
+ 
++# complex pkgrel values
++runtest 1-1.5.0    1-1.5.0     0
++runtest 1-1.5.1    1-1.5.0     1
++runtest 1-1.5.1    1-1.5       1
++runtest 1-1.5b     1-1.5      -1
++runtest 1-1.5b     1-1.5.1    -1
++runtest 1-1.0a     1-1.0alpha -1
++runtest 1-1.0alpha 1-1.0b     -1
++runtest 1-1.0b     1-1.0beta  -1
++runtest 1-1.0beta  1-1.0rc    -1
++runtest 1-1.0rc    1-1.0      -1
++runtest 1-1.5.a    1-1.5       1
++runtest 1-1.5.b    1-1.5.a     1
++runtest 1-1.5.1    1-1.5.b     1
++runtest 1-2        1-2.par1    1
++runtest 1-2        1-2.par1    1
++runtest 1-3        1-2.par1   -1
++
+ #END TESTS
+ 
+ if [[ $failure -eq 0 ]]; then
+-- 
+2.1.0
+
diff --git a/libre/pacman-parabola/makepkg.conf b/libre/pacman/makepkg.conf
index 758d7d029..758d7d029 100644
--- a/libre/pacman-parabola/makepkg.conf
+++ b/libre/pacman/makepkg.conf
diff --git a/libre/pacman-parabola/pacman.conf.i686 b/libre/pacman/pacman.conf.i686
index 84cec630c..84cec630c 100644
--- a/libre/pacman-parabola/pacman.conf.i686
+++ b/libre/pacman/pacman.conf.i686
diff --git a/libre/pacman-parabola/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el
index 604040640..604040640 100644
--- a/libre/pacman-parabola/pacman.conf.mips64el
+++ b/libre/pacman/pacman.conf.mips64el
diff --git a/libre/pacman-parabola/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64
index 03a8cf3a6..03a8cf3a6 100644
--- a/libre/pacman-parabola/pacman.conf.x86_64
+++ b/libre/pacman/pacman.conf.x86_64
diff --git a/libre/pacman-parabola/refresh-pacman-keys b/libre/pacman/refresh-pacman-keys
index e96dc34e5..e96dc34e5 100644
--- a/libre/pacman-parabola/refresh-pacman-keys
+++ b/libre/pacman/refresh-pacman-keys
diff --git a/libre/pacman-parabola/sks-keyservers.netCA.pem b/libre/pacman/sks-keyservers.netCA.pem
index 24a2ad2e8..24a2ad2e8 100644
--- a/libre/pacman-parabola/sks-keyservers.netCA.pem
+++ b/libre/pacman/sks-keyservers.netCA.pem