summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch33
-rw-r--r--libre/pacman/PKGBUILD29
-rw-r--r--libre/pacman/pacman.conf3
-rw-r--r--libre/pacman/pacman.conf.mips64el3
-rw-r--r--libre/pacman/pacman.conf.x86_643
-rw-r--r--libre/pacman/rePKGBUILD2
6 files changed, 60 insertions, 13 deletions
diff --git a/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch b/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch
new file mode 100644
index 000000000..503d3367f
--- /dev/null
+++ b/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch
@@ -0,0 +1,33 @@
+From c493eef643ecb3a54c79083c51a8975f816ed9de Mon Sep 17 00:00:00 2001
+From: Allan McRae <allan@archlinux.org>
+Date: Tue, 28 Jun 2011 22:47:35 +1000
+Subject: [PATCH] makepkg: fix removing symbolic link
+
+The path was not being stripped from $file before prefixing with
+$srcdir resulting in the attempted removal of a very weird
+filename.
+
+Signed-off-by: Allan McRae <allan@archlinux.org>
+Signed-off-by: Dan McGee <dan@archlinux.org>
+(cherry picked from commit e92905a2c8c14c7855e2841f44d3c139aa40844c)
+---
+ scripts/makepkg.sh.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
+index 3ace945..b0b0882 100644
+--- a/scripts/makepkg.sh.in
++++ b/scripts/makepkg.sh.in
+@@ -509,7 +509,7 @@ download_sources() {
+ local file=$(get_filepath "$netfile" || true)
+ if [[ -n "$file" ]]; then
+ msg2 "$(gettext "Found %s")" "${file##*/}"
+- rm -f "$srcdir/$file"
++ rm -f "$srcdir/${file##*/}"
+ ln -s "$file" "$srcdir/"
+ continue
+ fi
+--
+1.7.6
+
+
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 71c50694b..28793ed4c 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -2,14 +2,14 @@
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=pacman
-pkgver=3.5.3
-pkgrel=1
+pkgver=3.5.4
+pkgrel=3
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.archlinux.org/pacman/"
license=('GPL')
groups=('base')
-depends=('bash' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist')
+depends=('bash' 'glibc>=2.14' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist')
optdepends=('fakeroot: for makepkg usage as normal user'
'curl: for rankmirrors usage')
backup=(etc/pacman.conf etc/makepkg.conf)
@@ -19,18 +19,23 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
pacman.conf
pacman.conf.x86_64
pacman.conf.mips64el
- makepkg.conf)
-md5sums=('c36c18ed4d8ec69c0ecb4f9684266901'
- 'c7e6dbee04b7c492febea4366519b91d'
- '8809642ed398d2b9b98c5974b8b5e348'
- '3b2e740853e3d1463885675809d4c6ff'
- 'be10d3d2e533515a0470237761415568')
+ makepkg.conf
+ 0001-makepkg-fix-removing-symbolic-link.patch)
+md5sums=('2dd3a85d55ee3dd89abd349aa837447c'
+ 'ba85525fe868f030bef209b0487dd5a5'
+ '7aaccf24479f396d4a5987c8ccd2f3a2'
+ '150a2854816cd67b1608e00f99701c1c'
+ 'be10d3d2e533515a0470237761415568'
+ '7fca372cdfc5d01896490563ee4e13be')
# keep an upgrade path for older installations
PKGEXT='.pkg.tar.gz'
build() {
cd $srcdir/$pkgname-$pkgver
+
+ patch -Np1 < "$srcdir/0001-makepkg-fix-removing-symbolic-link.patch"
+
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --enable-doc
make
@@ -47,14 +52,14 @@ package() {
install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
mycarch="i686"
mychost="i686-pc-linux-gnu"
- myflags="-march=i686 -mtune=generic -O2 -pipe"
- myldflags="-Wl,--hash-style=gnu -Wl,--as-needed"
+ myflags="-mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+ myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
;;
x86_64)
install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
mycarch="x86_64"
mychost="x86_64-unknown-linux-gnu"
- myflags="-march=x86-64 -mtune=generic -O2 -pipe"
+ myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
myldflags="-Wl,--hash-style=gnu -Wl,--as-needed"
;;
mips64el)
diff --git a/libre/pacman/pacman.conf b/libre/pacman/pacman.conf
index 675956d3d..56f2b4670 100644
--- a/libre/pacman/pacman.conf
+++ b/libre/pacman/pacman.conf
@@ -79,6 +79,9 @@ Include = /etc/pacman.d/mirrorlist
[community]
Include = /etc/pacman.d/mirrorlist
+# Parabola also supports community projects and personal repositories, to find
+# them check out this wiki page: http://wiki.parabolagnulinux.org/Repositories
+
# An example of a custom package repository. See the pacman manpage for
# tips on creating your own repositories.
#[custom]
diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el
index caee508fd..82955b965 100644
--- a/libre/pacman/pacman.conf.mips64el
+++ b/libre/pacman/pacman.conf.mips64el
@@ -79,6 +79,9 @@ Include = /etc/pacman.d/mirrorlist
[community]
Include = /etc/pacman.d/mirrorlist
+# Parabola also supports community projects and personal repositories, to find
+# them check out this wiki page: http://wiki.parabolagnulinux.org/Repositories
+
# An example of a custom package repository. See the pacman manpage for
# tips on creating your own repositories.
#[custom]
diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64
index ed460dd8b..503df75e2 100644
--- a/libre/pacman/pacman.conf.x86_64
+++ b/libre/pacman/pacman.conf.x86_64
@@ -88,6 +88,9 @@ Include = /etc/pacman.d/mirrorlist
#[multilib]
#Include = /etc/pacman.d/mirrorlist
+# Parabola also supports community projects and personal repositories, to find
+# them check out this wiki page: http://wiki.parabolagnulinux.org/Repositories
+
# An example of a custom package repository. See the pacman manpage for
# tips on creating your own repositories.
#[custom]
diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD
index af613dc74..2fd342c18 100644
--- a/libre/pacman/rePKGBUILD
+++ b/libre/pacman/rePKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
source PKGBUILD
-CARCH=x86_64
+#CARCH=x86_64
unset build package md5sums source
_repo=core
source=(PKGBUILD