summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch32
-rw-r--r--libre/pacman/PKGBUILD21
-rw-r--r--libre/pacman/pacman.conf.mips64el32
-rw-r--r--libre/pacman/rePKGBUILD39
4 files changed, 41 insertions, 83 deletions
diff --git a/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch b/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch
deleted file mode 100644
index a14e1de69..000000000
--- a/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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 00faf0842..d8d3a6d26 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,11 +1,11 @@
# vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 146568 2012-01-13 16:47:02Z dreisner $
+# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $
# Maintainer: Dan McGee <dan@archlinux.org>
# Maintainer: Dave Reisner <dave@archlinux.org>
pkgname=pacman
-pkgver=4.0.1
-pkgrel=4
+pkgver=4.0.2
+pkgrel=1
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.archlinux.org/pacman/"
@@ -18,15 +18,16 @@ optdepends=('fakeroot: for makepkg usage as normal user')
backup=(etc/pacman.conf etc/makepkg.conf)
install=pacman.install
options=(!libtool)
-source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
pacman.conf
pacman.conf.x86_64
pacman.conf.mips64el
makepkg.conf)
-md5sums=('76bd88eff8cd94bc9899faa091822dc1'
+md5sums=('289ba4a19a16393096e065cec1cb9b0a'
+ '575140dce3ea597d91b6d081aa3f6a00'
'858d1ffb284afc6b15f72578ba3cac50'
'7dade0c0a4d597c480d779afa4f5097c'
- '150a2854816cd67b1608e00f99701c1c'
+ 'd4ca1a1d8e6708c0302a225628a489eb'
'debc512689a1aa8c124fe0ccf27f5758')
# keep an upgrade path for older installations
@@ -40,6 +41,10 @@ build() {
make
}
+check() {
+ make -C "$pkgname-$pkgver" check
+}
+
package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install
@@ -59,14 +64,14 @@ package() {
mycarch="x86_64"
mychost="x86_64-unknown-linux-gnu"
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"
+ myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
;;
mips64el)
install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf
mycarch="mips64el"
mychost="mips64el-unknown-linux-gnu"
myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
- myldflags=""
+ myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro"
;;
esac
install -m644 $srcdir/makepkg.conf $pkgdir/etc/
diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el
index 82955b965..a74f2d3da 100644
--- a/libre/pacman/pacman.conf.mips64el
+++ b/libre/pacman/pacman.conf.mips64el
@@ -13,11 +13,14 @@
#DBPath = /var/lib/pacman/
#CacheDir = /var/cache/pacman/pkg/
#LogFile = /var/log/pacman.log
+#GPGDir = /etc/pacman.d/gnupg/
HoldPkg = pacman glibc
# If upgrades are available for these packages they will be asked for first
-SyncFirst = pacman
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+# Don't list pacman here unless you want it broken when there is a
+# libarchive or glibc update.
+#SyncFirst =
#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
#CleanMethod = KeepInstalled
Architecture = mips64el
@@ -28,12 +31,25 @@ Architecture = mips64el
#NoUpgrade =
#NoExtract =
-# Misc options (all disabled by default)
+# Misc options
#UseSyslog
-#ShowSize
#UseDelta
#TotalDownload
#CheckSpace
+#VerbosePkgLists
+
+# PGP signature checking
+# NOTE: None of this will work without running `pacman-key --init` first.
+# The compiled in default is equivalent to the following line. This requires
+# you to locally sign and trust packager keys using `pacman-key` for them to be
+# considered valid.
+#SigLevel = Optional TrustedOnly
+# If you wish to check signatures but avoid local sign and trust issues, use
+# the following line. This will treat any key imported into pacman's keyring as
+# trusted.
+#SigLevel = Optional TrustAll
+# For now, off by default unless you read the above.
+SigLevel = Never
#
# REPOSITORIES
@@ -59,24 +75,31 @@ Architecture = mips64el
# after the header, and they will be used before the default mirrors.
#[libre-testing]
+#SigLevel = PackageRequired
#Include = /etc/pacman.d/mirrorlist
[libre]
+#SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
#[testing]
+#SigLevel = PackageRequired
#Include = /etc/pacman.d/mirrorlist
[core]
+#SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
[extra]
+#SigLevel = PackageOptional
Include = /etc/pacman.d/mirrorlist
#[community-testing]
+#SigLevel = PackageRequired
#Include = /etc/pacman.d/mirrorlist
[community]
+#SigLevel = PackageOptional
Include = /etc/pacman.d/mirrorlist
# Parabola also supports community projects and personal repositories, to find
@@ -85,5 +108,6 @@ Include = /etc/pacman.d/mirrorlist
# An example of a custom package repository. See the pacman manpage for
# tips on creating your own repositories.
#[custom]
+#SigLevel = Optional TrustAll
#Server = file:///home/custompkgs
diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD
deleted file mode 100644
index 3967b90ab..000000000
--- a/libre/pacman/rePKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-source PKGBUILD
-CARCH=x86_64
-unset build package md5sums source
-_repo=core
-source=(PKGBUILD
- ftp://ftp.archlinux.org/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
- # files for pkg modifications
- pacman.conf
- pacman.conf.x86_64
- )
-options=(!strip)
-
-build() {
- cd "${srcdir}/"
- rm .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
- # put actions for package modifications below this line
-
-}
-
-package() {
- cd ${srcdir}
- cp -a ./* ${pkgdir}
-
- rm ${pkgdir}/{PKGBUILD,pacman.conf{,.x86_64}}
-
-# No need to repackage for mips64el
- case "$CARCH" in
- i686)
- install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
- ;;
- x86_64)
- install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
- ;;
- esac
-}
-
-
-# vim:set ts=2 sw=2 et: