diff options
| -rw-r--r-- | libre/pacman/PKGBUILD | 18 | ||||
| -rw-r--r-- | libre/pacman/makepkg.conf | 2 | ||||
| -rw-r--r-- | libre/pacman/pacman.conf.i686 | 2 | ||||
| -rw-r--r-- | libre/pacman/pacman.conf.mips64el | 2 | ||||
| -rw-r--r-- | libre/pacman/pacman.conf.x86_64 | 2 | ||||
| -rw-r--r-- | libre/pacman/rePKGBUILD | 37 |
6 files changed, 10 insertions, 53 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index dc0efd603..6bc77a345 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,11 +1,11 @@ # vim: set ts=2 sw=2 et: -# $Id: PKGBUILD 178901 2013-02-28 17:05:39Z dreisner $ +# $Id: PKGBUILD 181860 2013-04-04 22:54:14Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=pacman pkgver=4.1.0 -pkgrel=2 +pkgrel=2.1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -28,10 +28,10 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} makepkg.conf) md5sums=('a0f2b3148bee4784f21cf373cf59a0bc' '4959b8d00056398195f4e549e7bdd346' - '62b92470a566df88110ee39272f3894a' - '2d1bd4fa38017025fbda08720287fc7e' - '2904388f51129c1d22420236bf76b4d3' - 'cde9d3b5179cd3c687dcad00be08bd8c') + '688feb0a552f42643a76f72e7198bfe4' + '765858b55d2112d948932fc645ea538b' + '9e0c64937ef751ae4273fa4d73381484' + '5a94cdf966ad72284ee1aa148202857b') build() { cd $srcdir/$pkgname-$pkgver @@ -61,19 +61,19 @@ package() { i686) mycarch="i686" mychost="i686-pc-linux-gnu" - myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" + myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --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 --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" + myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --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 --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" + myflags="-O2 -march=mips3 -mtune=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4" myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro" ;; esac diff --git a/libre/pacman/makepkg.conf b/libre/pacman/makepkg.conf index ccdd7c9ff..f1ce20fcb 100644 --- a/libre/pacman/makepkg.conf +++ b/libre/pacman/makepkg.conf @@ -11,7 +11,7 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' 'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u' 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'rsync::/usr/bin/rsync -z %u %o' + 'rsync::/usr/bin/rsync --no-motd -z %u %o' 'scp::/usr/bin/scp -C %u %o') # Other common tools: diff --git a/libre/pacman/pacman.conf.i686 b/libre/pacman/pacman.conf.i686 index ec3b75fd2..84cec630c 100644 --- a/libre/pacman/pacman.conf.i686 +++ b/libre/pacman/pacman.conf.i686 @@ -15,8 +15,6 @@ #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 = archlinux-keyring parabola-keyring #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el index 23664b18d..604040640 100644 --- a/libre/pacman/pacman.conf.mips64el +++ b/libre/pacman/pacman.conf.mips64el @@ -15,8 +15,6 @@ #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 = archlinux-keyring parabola-keyring #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64 index fedf1b587..5729b60c5 100644 --- a/libre/pacman/pacman.conf.x86_64 +++ b/libre/pacman/pacman.conf.x86_64 @@ -15,8 +15,6 @@ #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 = archlinux-keyring parabola-keyring #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD deleted file mode 100644 index 810eff5b9..000000000 --- a/libre/pacman/rePKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar> -source PKGBUILD -unset build package md5sums source check -_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 -vf .{INSTALL,PKGINFO} ${srcdir}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT - # put actions for package modifications below this line - -} - -package() { - cp -a ${srcdir}/* ${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: |